Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.

.gitignore

@@ -0,0 +1,19 @@
+.svn/
+*.gsp
+*.bak
+*INSTALLER*.exe
+*INSTALLER*.zip
+*.paf.exe
+*-SVN.*
+bin/
+obj/
+fugue/
+*Credentials.private.cs
+*Credentials.orig.cs
+upgradeLog.htm
+upgradeLog.XML
+*.log
+/Greenshot/releases/additional_files/readme.txt
+/*.error
+
+/Greenshot/releases/innosetup/setup.iss

Greenshot/App.config

@@ -6,5 +6,8 @@
   </startup>
   <runtime>
     <loadFromRemoteSources enabled="true"/>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="App\Greenshot"/>
+    </assemblyBinding>
   </runtime>
 </configuration>

Greenshot/AssemblyInfo.cs.template

@@ -47,4 +47,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("1.1.4.$WCREV$")]
+[assembly: AssemblyVersion("1.1.6.$WCREV$")]

Greenshot/Configuration/EditorConfiguration.cs

@@ -57,6 +57,13 @@ namespace Greenshot.Configuration {
 
 		[IniProperty("SuppressSaveDialogAtClose", Description="Suppressed the 'do you want to save' dialog when closing the editor.", DefaultValue="False")]
 		public bool SuppressSaveDialogAtClose;
+
+		public override void AfterLoad() {
+			base.AfterLoad();
+			if (RecentColors == null) {
+				RecentColors = new List<Color>();
+			}
+		}
 		/// <param name="requestingType">Type of the class for which to create the field</param>
 		/// <param name="fieldType">FieldType of the field to construct</param>
 		/// <param name="scope">FieldType of the field to construct</param>

Greenshot/Drawing/TextContainer.cs

@@ -47,7 +47,7 @@ namespace Greenshot.Drawing {
 		/// The StringFormat object is not serializable!!
 		/// </summary>
 		[NonSerialized]
-		StringFormat stringFormat;
+		StringFormat stringFormat = new StringFormat();
 		
 		private string text;
 		// there is a binding on the following property!
@@ -192,39 +192,46 @@ namespace Greenshot.Drawing {
 			bool fontBold = GetFieldValueAsBool(FieldType.FONT_BOLD);
 			bool fontItalic = GetFieldValueAsBool(FieldType.FONT_ITALIC);
 			float fontSize = GetFieldValueAsFloat(FieldType.FONT_SIZE);
-			
+			try {
-			if (fontInvalidated && fontFamily != null && fontSize != 0) {
+				if (fontInvalidated && fontFamily != null && fontSize != 0) {
-				FontStyle fs = FontStyle.Regular;
+					FontStyle fs = FontStyle.Regular;
-				
+					
-				bool hasStyle = false;
+					bool hasStyle = false;
-				using(FontFamily fam = new FontFamily(fontFamily)) {
+					using(FontFamily fam = new FontFamily(fontFamily)) {
-					bool boldAvailable = fam.IsStyleAvailable(FontStyle.Bold);
+						bool boldAvailable = fam.IsStyleAvailable(FontStyle.Bold);
-					if (fontBold && boldAvailable) {
+						if (fontBold && boldAvailable) {
-						fs |= FontStyle.Bold;
+							fs |= FontStyle.Bold;
-						hasStyle = true;
+							hasStyle = true;
-					}
+						}
 
-					bool italicAvailable = fam.IsStyleAvailable(FontStyle.Italic);
+						bool italicAvailable = fam.IsStyleAvailable(FontStyle.Italic);
-					if (fontItalic && italicAvailable) {
+						if (fontItalic && italicAvailable) {
-						fs |= FontStyle.Italic;
+							fs |= FontStyle.Italic;
-						hasStyle = true;
+							hasStyle = true;
-					}
+						}
 
-					if (!hasStyle) {
+						if (!hasStyle) {
-						bool regularAvailable = fam.IsStyleAvailable(FontStyle.Regular);
+							bool regularAvailable = fam.IsStyleAvailable(FontStyle.Regular);
-						if (regularAvailable) {
+							if (regularAvailable) {
-							fs = FontStyle.Regular;
+								fs = FontStyle.Regular;
-						} else {
+							} else {
-							if (boldAvailable) {
+								if (boldAvailable) {
-								fs = FontStyle.Bold;
+									fs = FontStyle.Bold;
-							} else if(italicAvailable) {
+								} else if(italicAvailable) {
-								fs = FontStyle.Italic;
+									fs = FontStyle.Italic;
+								}
 							}
 						}
+						font = new Font(fam, fontSize, fs, GraphicsUnit.Pixel);
 					}
-					font = new Font(fam, fontSize, fs, GraphicsUnit.Pixel);
+					fontInvalidated = false;
 				}
-				fontInvalidated = false;
+			} catch (Exception ex) {
+				ex.Data.Add("fontFamily", fontFamily);
+				ex.Data.Add("fontBold", fontBold);
+				ex.Data.Add("fontItalic", fontItalic);
+				ex.Data.Add("fontSize", fontSize);
+				throw;
 			}
 			
 			stringFormat.Alignment = (StringAlignment)GetFieldValue(FieldType.TEXT_HORIZONTAL_ALIGNMENT);

Greenshot/Forms/ImageEditorForm.cs

@@ -90,7 +90,6 @@ namespace Greenshot {
 				var thread = new Thread(delegate() {AddDestinations();});
 				thread.Name = "add destinations";
 				thread.Start();
-				IniConfig.IniChanged += new FileSystemEventHandler(ReloadConfiguration);
 			};
 
 			// Make sure the editor is placed on the same location as the last editor was on close
@@ -356,18 +355,6 @@ namespace Greenshot {
 			ImageEditorFormResize(sender, new EventArgs());
 		}
 
-		private void ReloadConfiguration(object source, FileSystemEventArgs e) {
-			this.Invoke((MethodInvoker) delegate {
-				// Even update language when needed
-				ApplyLanguage();
-
-				// Fix title
-				if (surface != null && surface.CaptureDetails != null && surface.CaptureDetails.Title != null) {
-					this.Text = surface.CaptureDetails.Title + " - " + Language.GetString(LangKey.editor_title);
-				}
-			});
-		}
-		
 		public ISurface Surface {
 			get {
 				return surface;
@@ -680,7 +667,6 @@ namespace Greenshot {
 		}
 
 		void ImageEditorFormFormClosing(object sender, FormClosingEventArgs e) {
-			IniConfig.IniChanged -= new FileSystemEventHandler(ReloadConfiguration);
 			if (surface.Modified && !editorConfiguration.SuppressSaveDialogAtClose) {
 				// Make sure the editor is visible
 				WindowDetails.ToForeground(this.Handle);
@@ -1277,13 +1263,16 @@ namespace Greenshot {
 		}
 
 		private void ImageEditorFormResize(object sender, EventArgs e) {
-			if (this.Surface == null) {
+			if (this.Surface == null || this.Surface.Image == null || this.panel1 == null) {
 				return;
 			}
 			Size imageSize = this.Surface.Image.Size;
 			Size currentClientSize = this.panel1.ClientSize;
 			var canvas = this.Surface as Control;
 			Panel panel = (Panel)canvas.Parent;
+			if (panel == null) {
+				return;
+			}
 			int offsetX = -panel.HorizontalScroll.Value;
 			int offsetY = -panel.VerticalScroll.Value;
 			if (canvas != null) {

Greenshot/Forms/MainForm.cs

@@ -153,6 +153,10 @@ namespace Greenshot {
 						helpOutput.AppendLine("\t\tSet the language of Greenshot, e.g. greenshot /language en-US.");
 						helpOutput.AppendLine();
 						helpOutput.AppendLine();
+						helpOutput.AppendLine("\t/inidirectory [directory]");
+						helpOutput.AppendLine("\t\tSet the directory where the greenshot.ini should be stored & read.");
+						helpOutput.AppendLine();
+						helpOutput.AppendLine();
 						helpOutput.AppendLine("\t[filename]");
 						helpOutput.AppendLine("\t\tOpen the bitmap files in the running Greenshot instance or start a new instance");
 						Console.WriteLine(helpOutput.ToString());
@@ -201,7 +205,13 @@ namespace Greenshot {
 						IniConfig.Save();
 						continue;
 					}
-					
+
+					// Setting the INI-directory
+					if (argument.ToLower().Equals("/inidirectory")) {
+						IniConfig.IniDirectory = args[++argumentNr];
+						continue;
+					}
+
 					// Files to open
 					filesToOpen.Add(argument);
 				}
@@ -338,8 +348,6 @@ namespace Greenshot {
 			// Disable access to the settings, for feature #3521446
 			contextmenu_settings.Visible = !conf.DisableSettings;
 
-			IniConfig.IniChanged += new FileSystemEventHandler(ReloadConfiguration);
-			
 			// Make sure all hotkeys pass this window!
 			HotkeyControl.RegisterHotkeyHWND(this.Handle);
 			RegisterHotkeys();
@@ -441,7 +449,14 @@ namespace Greenshot {
 						LOG.Info("Reload requested");
 						try {
 							IniConfig.Reload();
-							ReloadConfiguration(null, null);
+							this.Invoke((MethodInvoker)delegate {
+								// Even update language when needed
+								UpdateUI();
+								// Update the hotkey
+								// Make sure the current hotkeys are disabled
+								HotkeyControl.UnregisterHotkeys();
+								RegisterHotkeys();
+							});
 						} catch {}
 						break;
 					case CommandEnum.OpenFile:
@@ -462,23 +477,6 @@ namespace Greenshot {
 			}
 		}
 		
-		/// <summary>
-		/// This is called when the ini-file changes
-		/// </summary>
-		/// <param name="source"></param>
-		/// <param name="e"></param>
-		private void ReloadConfiguration(object source, FileSystemEventArgs e) {
-			Language.CurrentLanguage = null;	// Reload
-			this.Invoke((MethodInvoker) delegate {
-				// Even update language when needed
-				UpdateUI();
-				// Update the hotkey
-				// Make sure the current hotkeys are disabled
-				HotkeyControl.UnregisterHotkeys();
-				RegisterHotkeys();
-			});
-		}
-
 		public ContextMenuStrip MainMenu {
 			get {return contextMenu;}
 		}

Greenshot/Forms/SettingsForm.Designer.cs

@@ -99,8 +99,8 @@ namespace Greenshot {
             this.checkbox_ie_capture = new GreenshotPlugin.Controls.GreenshotCheckBox();
             this.groupbox_windowscapture = new GreenshotPlugin.Controls.GreenshotGroupBox();
             this.colorButton_window_background = new Greenshot.Controls.ColorButton();
-            this.label_window_capture_mode = new GreenshotPlugin.Controls.GreenshotLabel();
+            this.radiobuttonWindowCapture = new GreenshotPlugin.Controls.GreenshotRadioButton();
-            this.checkbox_capture_windows_interactive = new GreenshotPlugin.Controls.GreenshotCheckBox();
+            this.radiobuttonInteractiveCapture = new GreenshotPlugin.Controls.GreenshotRadioButton();
             this.combobox_window_capture_mode = new System.Windows.Forms.ComboBox();
             this.groupbox_capture = new GreenshotPlugin.Controls.GreenshotGroupBox();
             this.checkbox_notifications = new GreenshotPlugin.Controls.GreenshotCheckBox();
@@ -186,7 +186,6 @@ namespace Greenshot {
             this.label_storagelocation.Name = "label_storagelocation";
             this.label_storagelocation.Size = new System.Drawing.Size(126, 23);
             this.label_storagelocation.TabIndex = 11;
-            this.label_storagelocation.Text = "Storage location";
             // 
             // settings_cancel
             // 
@@ -195,7 +194,6 @@ namespace Greenshot {
             this.settings_cancel.Name = "settings_cancel";
             this.settings_cancel.Size = new System.Drawing.Size(75, 23);
             this.settings_cancel.TabIndex = 7;
-            this.settings_cancel.Text = "Cancel";
             this.settings_cancel.UseVisualStyleBackColor = true;
             this.settings_cancel.Click += new System.EventHandler(this.Settings_cancelClick);
             // 
@@ -206,7 +204,6 @@ namespace Greenshot {
             this.settings_confirm.Name = "settings_confirm";
             this.settings_confirm.Size = new System.Drawing.Size(75, 23);
             this.settings_confirm.TabIndex = 6;
-            this.settings_confirm.Text = "Ok";
             this.settings_confirm.UseVisualStyleBackColor = true;
             this.settings_confirm.Click += new System.EventHandler(this.Settings_okayClick);
             // 
@@ -227,7 +224,6 @@ namespace Greenshot {
             this.label_screenshotname.Name = "label_screenshotname";
             this.label_screenshotname.Size = new System.Drawing.Size(126, 23);
             this.label_screenshotname.TabIndex = 9;
-            this.label_screenshotname.Text = "Filename pattern";
             // 
             // textbox_screenshotname
             // 
@@ -244,7 +240,6 @@ namespace Greenshot {
             this.label_language.Name = "label_language";
             this.label_language.Size = new System.Drawing.Size(181, 23);
             this.label_language.TabIndex = 10;
-            this.label_language.Text = "Language";
             // 
             // combobox_language
             // 
@@ -273,7 +268,6 @@ namespace Greenshot {
             this.label_primaryimageformat.Name = "label_primaryimageformat";
             this.label_primaryimageformat.Size = new System.Drawing.Size(126, 19);
             this.label_primaryimageformat.TabIndex = 8;
-            this.label_primaryimageformat.Text = "Image format";
             // 
             // groupbox_preferredfilesettings
             // 
@@ -292,7 +286,6 @@ namespace Greenshot {
             this.groupbox_preferredfilesettings.Size = new System.Drawing.Size(412, 122);
             this.groupbox_preferredfilesettings.TabIndex = 13;
             this.groupbox_preferredfilesettings.TabStop = false;
-            this.groupbox_preferredfilesettings.Text = "Preferred Output File Settings";
             // 
             // btnPatternHelp
             // 
@@ -312,7 +305,6 @@ namespace Greenshot {
             this.checkbox_copypathtoclipboard.PropertyName = "OutputFileCopyPathToClipboard";
             this.checkbox_copypathtoclipboard.Size = new System.Drawing.Size(394, 24);
             this.checkbox_copypathtoclipboard.TabIndex = 18;
-            this.checkbox_copypathtoclipboard.Text = "Copy file path to clipboard every time an image is saved";
             this.checkbox_copypathtoclipboard.UseVisualStyleBackColor = true;
             // 
             // groupbox_applicationsettings
@@ -326,7 +318,6 @@ namespace Greenshot {
             this.groupbox_applicationsettings.Size = new System.Drawing.Size(412, 68);
             this.groupbox_applicationsettings.TabIndex = 14;
             this.groupbox_applicationsettings.TabStop = false;
-            this.groupbox_applicationsettings.Text = "Application Settings";
             // 
             // checkbox_autostartshortcut
             // 
@@ -335,7 +326,6 @@ namespace Greenshot {
             this.checkbox_autostartshortcut.Name = "checkbox_autostartshortcut";
             this.checkbox_autostartshortcut.Size = new System.Drawing.Size(397, 25);
             this.checkbox_autostartshortcut.TabIndex = 15;
-            this.checkbox_autostartshortcut.Text = "Launch Greenshot on startup";
             this.checkbox_autostartshortcut.UseVisualStyleBackColor = true;
             // 
             // groupbox_qualitysettings
@@ -351,7 +341,6 @@ namespace Greenshot {
             this.groupbox_qualitysettings.Size = new System.Drawing.Size(412, 106);
             this.groupbox_qualitysettings.TabIndex = 14;
             this.groupbox_qualitysettings.TabStop = false;
-            this.groupbox_qualitysettings.Text = "Quality settings";
             // 
             // checkbox_reducecolors
             // 
@@ -361,7 +350,6 @@ namespace Greenshot {
             this.checkbox_reducecolors.PropertyName = "OutputFileReduceColors";
             this.checkbox_reducecolors.Size = new System.Drawing.Size(394, 25);
             this.checkbox_reducecolors.TabIndex = 17;
-            this.checkbox_reducecolors.Text = "Reduce the amount of colors to a maximum of 256";
             this.checkbox_reducecolors.UseVisualStyleBackColor = true;
             // 
             // checkbox_alwaysshowqualitydialog
@@ -372,7 +360,6 @@ namespace Greenshot {
             this.checkbox_alwaysshowqualitydialog.PropertyName = "OutputFilePromptQuality";
             this.checkbox_alwaysshowqualitydialog.Size = new System.Drawing.Size(394, 25);
             this.checkbox_alwaysshowqualitydialog.TabIndex = 16;
-            this.checkbox_alwaysshowqualitydialog.Text = "Show quality dialog every time an image is saved";
             this.checkbox_alwaysshowqualitydialog.UseVisualStyleBackColor = true;
             // 
             // label_jpegquality
@@ -382,7 +369,6 @@ namespace Greenshot {
             this.label_jpegquality.Name = "label_jpegquality";
             this.label_jpegquality.Size = new System.Drawing.Size(116, 23);
             this.label_jpegquality.TabIndex = 13;
-            this.label_jpegquality.Text = "JPEG quality";
             // 
             // textBoxJpegQuality
             // 
@@ -414,7 +400,6 @@ namespace Greenshot {
             this.groupbox_destination.Size = new System.Drawing.Size(412, 311);
             this.groupbox_destination.TabIndex = 16;
             this.groupbox_destination.TabStop = false;
-            this.groupbox_destination.Text = "Destination";
             // 
             // checkbox_picker
             // 
@@ -423,7 +408,6 @@ namespace Greenshot {
             this.checkbox_picker.Name = "checkbox_picker";
             this.checkbox_picker.Size = new System.Drawing.Size(394, 24);
             this.checkbox_picker.TabIndex = 19;
-            this.checkbox_picker.Text = "Select destination dynamically";
             this.checkbox_picker.UseVisualStyleBackColor = true;
             this.checkbox_picker.CheckStateChanged += new System.EventHandler(this.DestinationsCheckStateChanged);
             // 
@@ -477,7 +461,6 @@ namespace Greenshot {
             this.tab_general.Padding = new System.Windows.Forms.Padding(3);
             this.tab_general.Size = new System.Drawing.Size(423, 351);
             this.tab_general.TabIndex = 0;
-            this.tab_general.Text = "General";
             this.tab_general.UseVisualStyleBackColor = true;
             // 
             // groupbox_network
@@ -491,7 +474,6 @@ namespace Greenshot {
             this.groupbox_network.Size = new System.Drawing.Size(412, 72);
             this.groupbox_network.TabIndex = 54;
             this.groupbox_network.TabStop = false;
-            this.groupbox_network.Text = "Network and updates";
             // 
             // numericUpDown_daysbetweencheck
             // 
@@ -508,7 +490,6 @@ namespace Greenshot {
             this.label_checkperiod.Name = "label_checkperiod";
             this.label_checkperiod.Size = new System.Drawing.Size(334, 23);
             this.label_checkperiod.TabIndex = 19;
-            this.label_checkperiod.Text = "Update check interval in days (0=no check)";
             // 
             // checkbox_usedefaultproxy
             // 
@@ -518,7 +499,6 @@ namespace Greenshot {
             this.checkbox_usedefaultproxy.PropertyName = "UseProxy";
             this.checkbox_usedefaultproxy.Size = new System.Drawing.Size(397, 25);
             this.checkbox_usedefaultproxy.TabIndex = 17;
-            this.checkbox_usedefaultproxy.Text = "Use default system proxy";
             this.checkbox_usedefaultproxy.UseVisualStyleBackColor = true;
             // 
             // groupbox_hotkeys
@@ -539,7 +519,6 @@ namespace Greenshot {
             this.groupbox_hotkeys.Size = new System.Drawing.Size(412, 152);
             this.groupbox_hotkeys.TabIndex = 15;
             this.groupbox_hotkeys.TabStop = false;
-            this.groupbox_hotkeys.Text = "Hotkeys";
             // 
             // label_lastregion_hotkey
             // 
@@ -548,7 +527,6 @@ namespace Greenshot {
             this.label_lastregion_hotkey.Name = "label_lastregion_hotkey";
             this.label_lastregion_hotkey.Size = new System.Drawing.Size(212, 20);
             this.label_lastregion_hotkey.TabIndex = 53;
-            this.label_lastregion_hotkey.Text = "Capture last region";
             // 
             // lastregion_hotkeyControl
             // 
@@ -567,7 +545,6 @@ namespace Greenshot {
             this.label_ie_hotkey.Name = "label_ie_hotkey";
             this.label_ie_hotkey.Size = new System.Drawing.Size(212, 20);
             this.label_ie_hotkey.TabIndex = 51;
-            this.label_ie_hotkey.Text = "Capture Internet Explorer";
             // 
             // ie_hotkeyControl
             // 
@@ -586,7 +563,6 @@ namespace Greenshot {
             this.label_region_hotkey.Name = "label_region_hotkey";
             this.label_region_hotkey.Size = new System.Drawing.Size(212, 20);
             this.label_region_hotkey.TabIndex = 49;
-            this.label_region_hotkey.Text = "Capture region";
             // 
             // label_window_hotkey
             // 
@@ -595,7 +571,6 @@ namespace Greenshot {
             this.label_window_hotkey.Name = "label_window_hotkey";
             this.label_window_hotkey.Size = new System.Drawing.Size(212, 23);
             this.label_window_hotkey.TabIndex = 48;
-            this.label_window_hotkey.Text = "Capture window";
             // 
             // label_fullscreen_hotkey
             // 
@@ -604,7 +579,6 @@ namespace Greenshot {
             this.label_fullscreen_hotkey.Name = "label_fullscreen_hotkey";
             this.label_fullscreen_hotkey.Size = new System.Drawing.Size(212, 23);
             this.label_fullscreen_hotkey.TabIndex = 47;
-            this.label_fullscreen_hotkey.Text = "Capture full screen";
             // 
             // region_hotkeyControl
             // 
@@ -647,7 +621,6 @@ namespace Greenshot {
             this.tab_capture.Name = "tab_capture";
             this.tab_capture.Size = new System.Drawing.Size(423, 351);
             this.tab_capture.TabIndex = 3;
-            this.tab_capture.Text = "Capture";
             this.tab_capture.UseVisualStyleBackColor = true;
             // 
             // groupbox_editor
@@ -659,7 +632,6 @@ namespace Greenshot {
             this.groupbox_editor.Size = new System.Drawing.Size(416, 50);
             this.groupbox_editor.TabIndex = 27;
             this.groupbox_editor.TabStop = false;
-            this.groupbox_editor.Text = "Editor";
             // 
             // checkbox_editor_match_capture_size
             // 
@@ -670,7 +642,6 @@ namespace Greenshot {
             this.checkbox_editor_match_capture_size.SectionName = "Editor";
             this.checkbox_editor_match_capture_size.Size = new System.Drawing.Size(397, 24);
             this.checkbox_editor_match_capture_size.TabIndex = 26;
-            this.checkbox_editor_match_capture_size.Text = "Match capture size";
             this.checkbox_editor_match_capture_size.UseVisualStyleBackColor = true;
             // 
             // groupbox_iecapture
@@ -682,7 +653,6 @@ namespace Greenshot {
             this.groupbox_iecapture.Size = new System.Drawing.Size(416, 50);
             this.groupbox_iecapture.TabIndex = 2;
             this.groupbox_iecapture.TabStop = false;
-            this.groupbox_iecapture.Text = "Internet Explorer capture";
             // 
             // checkbox_ie_capture
             // 
@@ -692,14 +662,13 @@ namespace Greenshot {
             this.checkbox_ie_capture.PropertyName = "IECapture";
             this.checkbox_ie_capture.Size = new System.Drawing.Size(404, 24);
             this.checkbox_ie_capture.TabIndex = 26;
-            this.checkbox_ie_capture.Text = "Internet Explorer capture";
             this.checkbox_ie_capture.UseVisualStyleBackColor = true;
             // 
             // groupbox_windowscapture
             // 
             this.groupbox_windowscapture.Controls.Add(this.colorButton_window_background);
-            this.groupbox_windowscapture.Controls.Add(this.label_window_capture_mode);
+            this.groupbox_windowscapture.Controls.Add(this.radiobuttonWindowCapture);
-            this.groupbox_windowscapture.Controls.Add(this.checkbox_capture_windows_interactive);
+            this.groupbox_windowscapture.Controls.Add(this.radiobuttonInteractiveCapture);
             this.groupbox_windowscapture.Controls.Add(this.combobox_window_capture_mode);
             this.groupbox_windowscapture.LanguageKey = "settings_windowscapture";
             this.groupbox_windowscapture.Location = new System.Drawing.Point(4, 141);
@@ -707,7 +676,6 @@ namespace Greenshot {
             this.groupbox_windowscapture.Size = new System.Drawing.Size(416, 80);
             this.groupbox_windowscapture.TabIndex = 1;
             this.groupbox_windowscapture.TabStop = false;
-            this.groupbox_windowscapture.Text = "Window capture";
             // 
             // colorButton_window_background
             // 
@@ -720,26 +688,30 @@ namespace Greenshot {
             this.colorButton_window_background.TabIndex = 45;
             this.colorButton_window_background.UseVisualStyleBackColor = true;
             // 
-            // label_window_capture_mode
             // 
-            this.label_window_capture_mode.LanguageKey = "settings_window_capture_mode";
+            // radiobuttonWindowCapture
-            this.label_window_capture_mode.Location = new System.Drawing.Point(6, 46);
-            this.label_window_capture_mode.Name = "label_window_capture_mode";
-            this.label_window_capture_mode.Size = new System.Drawing.Size(205, 23);
-            this.label_window_capture_mode.TabIndex = 26;
-            this.label_window_capture_mode.Text = "Window capture mode";
             // 
-            // checkbox_capture_windows_interactive
+            this.radiobuttonWindowCapture.AutoSize = true;
+            this.radiobuttonWindowCapture.LanguageKey = "settings_window_capture_mode";
+            this.radiobuttonWindowCapture.Location = new System.Drawing.Point(11, 44);
+            this.radiobuttonWindowCapture.Name = "radiobuttonWindowCapture";
+            this.radiobuttonWindowCapture.Size = new System.Drawing.Size(132, 17);
+            this.radiobuttonWindowCapture.TabIndex = 47;
+            this.radiobuttonWindowCapture.TabStop = true;
+            this.radiobuttonWindowCapture.UseVisualStyleBackColor = true;
             // 
-            this.checkbox_capture_windows_interactive.LanguageKey = "settings_capture_windows_interactive";
+            // radiobuttonInteractiveCapture
-            this.checkbox_capture_windows_interactive.Location = new System.Drawing.Point(9, 19);
-            this.checkbox_capture_windows_interactive.Name = "checkbox_capture_windows_interactive";
-            this.checkbox_capture_windows_interactive.PropertyName = "CaptureWindowsInteractive";
-            this.checkbox_capture_windows_interactive.Size = new System.Drawing.Size(394, 18);
-            this.checkbox_capture_windows_interactive.TabIndex = 19;
-            this.checkbox_capture_windows_interactive.Text = "Use interactive window capture mode";
-            this.checkbox_capture_windows_interactive.UseVisualStyleBackColor = true;
             // 
+            this.radiobuttonInteractiveCapture.AutoSize = true;
+            this.radiobuttonInteractiveCapture.LanguageKey = "settings_capture_windows_interactive";
+            this.radiobuttonInteractiveCapture.Location = new System.Drawing.Point(11, 20);
+            this.radiobuttonInteractiveCapture.Name = "radiobuttonInteractiveCapture";
+            this.radiobuttonInteractiveCapture.PropertyName = "CaptureWindowsInteractive";
+            this.radiobuttonInteractiveCapture.Size = new System.Drawing.Size(203, 17);
+            this.radiobuttonInteractiveCapture.TabIndex = 46;
+            this.radiobuttonInteractiveCapture.TabStop = true;
+            this.radiobuttonInteractiveCapture.UseVisualStyleBackColor = true;
+            this.radiobuttonInteractiveCapture.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
             // combobox_window_capture_mode
             // 
             this.combobox_window_capture_mode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -784,7 +756,6 @@ namespace Greenshot {
             this.checkbox_notifications.PropertyName = "ShowTrayNotification";
             this.checkbox_notifications.Size = new System.Drawing.Size(399, 24);
             this.checkbox_notifications.TabIndex = 26;
-            this.checkbox_notifications.Text = "Show notifications";
             this.checkbox_notifications.UseVisualStyleBackColor = true;
             // 
             // checkbox_playsound
@@ -795,7 +766,6 @@ namespace Greenshot {
             this.checkbox_playsound.PropertyName = "PlayCameraSound";
             this.checkbox_playsound.Size = new System.Drawing.Size(399, 24);
             this.checkbox_playsound.TabIndex = 18;
-            this.checkbox_playsound.Text = "Play camera sound";
             this.checkbox_playsound.UseVisualStyleBackColor = true;
             // 
             // checkbox_capture_mousepointer
@@ -806,7 +776,6 @@ namespace Greenshot {
             this.checkbox_capture_mousepointer.PropertyName = "CaptureMousepointer";
             this.checkbox_capture_mousepointer.Size = new System.Drawing.Size(394, 24);
             this.checkbox_capture_mousepointer.TabIndex = 17;
-            this.checkbox_capture_mousepointer.Text = "Capture mousepointer";
             this.checkbox_capture_mousepointer.UseVisualStyleBackColor = true;
             // 
             // numericUpDownWaitTime
@@ -834,7 +803,6 @@ namespace Greenshot {
             this.label_waittime.Name = "label_waittime";
             this.label_waittime.Size = new System.Drawing.Size(331, 16);
             this.label_waittime.TabIndex = 25;
-            this.label_waittime.Text = "Milliseconds to wait before capture";
             // 
             // tab_output
             // 
@@ -847,7 +815,6 @@ namespace Greenshot {
             this.tab_output.Padding = new System.Windows.Forms.Padding(3);
             this.tab_output.Size = new System.Drawing.Size(423, 351);
             this.tab_output.TabIndex = 1;
-            this.tab_output.Text = "Output";
             this.tab_output.UseVisualStyleBackColor = true;
             // 
             // tab_destinations
@@ -858,7 +825,6 @@ namespace Greenshot {
             this.tab_destinations.Name = "tab_destinations";
             this.tab_destinations.Size = new System.Drawing.Size(423, 351);
             this.tab_destinations.TabIndex = 4;
-            this.tab_destinations.Text = "Destination";
             this.tab_destinations.UseVisualStyleBackColor = true;
             // 
             // tab_printer
@@ -872,7 +838,6 @@ namespace Greenshot {
             this.tab_printer.Padding = new System.Windows.Forms.Padding(3);
             this.tab_printer.Size = new System.Drawing.Size(423, 351);
             this.tab_printer.TabIndex = 2;
-            this.tab_printer.Text = "Printer";
             this.tab_printer.UseVisualStyleBackColor = true;
             // 
             // groupBoxColors
@@ -888,7 +853,6 @@ namespace Greenshot {
             this.groupBoxColors.Size = new System.Drawing.Size(331, 124);
             this.groupBoxColors.TabIndex = 34;
             this.groupBoxColors.TabStop = false;
-            this.groupBoxColors.Text = "Color settings";
             // 
             // checkboxPrintInverted
             // 
@@ -901,7 +865,6 @@ namespace Greenshot {
             this.checkboxPrintInverted.PropertyName = "OutputPrintInverted";
             this.checkboxPrintInverted.Size = new System.Drawing.Size(141, 17);
             this.checkboxPrintInverted.TabIndex = 28;
-            this.checkboxPrintInverted.Text = "Print with inverted colors";
             this.checkboxPrintInverted.TextAlign = System.Drawing.ContentAlignment.TopLeft;
             this.checkboxPrintInverted.UseVisualStyleBackColor = true;
             // 
@@ -916,7 +879,6 @@ namespace Greenshot {
             this.radioBtnColorPrint.PropertyName = "OutputPrintColor";
             this.radioBtnColorPrint.Size = new System.Drawing.Size(90, 17);
             this.radioBtnColorPrint.TabIndex = 29;
-            this.radioBtnColorPrint.Text = "Full color print";
             this.radioBtnColorPrint.TextAlign = System.Drawing.ContentAlignment.TopLeft;
             this.radioBtnColorPrint.UseVisualStyleBackColor = true;
             // 
@@ -946,7 +908,6 @@ namespace Greenshot {
             this.radioBtnMonochrome.PropertyName = "OutputPrintMonochrome";
             this.radioBtnMonochrome.Size = new System.Drawing.Size(148, 17);
             this.radioBtnMonochrome.TabIndex = 30;
-            this.radioBtnMonochrome.Text = "Force black/white printing";
             this.radioBtnMonochrome.TextAlign = System.Drawing.ContentAlignment.TopLeft;
             this.radioBtnMonochrome.UseVisualStyleBackColor = true;
             // 
@@ -964,7 +925,6 @@ namespace Greenshot {
             this.groupBoxPrintLayout.Size = new System.Drawing.Size(331, 151);
             this.groupBoxPrintLayout.TabIndex = 33;
             this.groupBoxPrintLayout.TabStop = false;
-            this.groupBoxPrintLayout.Text = "Page layout settings";
             // 
             // checkboxDateTime
             // 
@@ -977,7 +937,6 @@ namespace Greenshot {
             this.checkboxDateTime.PropertyName = "OutputPrintFooter";
             this.checkboxDateTime.Size = new System.Drawing.Size(187, 17);
             this.checkboxDateTime.TabIndex = 26;
-            this.checkboxDateTime.Text = "Print date / time at bottom of page";
             this.checkboxDateTime.TextAlign = System.Drawing.ContentAlignment.TopLeft;
             this.checkboxDateTime.UseVisualStyleBackColor = true;
             // 
@@ -992,7 +951,6 @@ namespace Greenshot {
             this.checkboxAllowShrink.PropertyName = "OutputPrintAllowShrink";
             this.checkboxAllowShrink.Size = new System.Drawing.Size(168, 17);
             this.checkboxAllowShrink.TabIndex = 21;
-            this.checkboxAllowShrink.Text = "Shrink printout to fit paper size";
             this.checkboxAllowShrink.TextAlign = System.Drawing.ContentAlignment.TopLeft;
             this.checkboxAllowShrink.UseVisualStyleBackColor = true;
             // 
@@ -1007,7 +965,6 @@ namespace Greenshot {
             this.checkboxAllowEnlarge.PropertyName = "OutputPrintAllowEnlarge";
             this.checkboxAllowEnlarge.Size = new System.Drawing.Size(174, 17);
             this.checkboxAllowEnlarge.TabIndex = 22;
-            this.checkboxAllowEnlarge.Text = "Enlarge printout to fit paper size";
             this.checkboxAllowEnlarge.TextAlign = System.Drawing.ContentAlignment.TopLeft;
             this.checkboxAllowEnlarge.UseVisualStyleBackColor = true;
             // 
@@ -1022,7 +979,6 @@ namespace Greenshot {
             this.checkboxAllowRotate.PropertyName = "OutputPrintAllowRotate";
             this.checkboxAllowRotate.Size = new System.Drawing.Size(187, 17);
             this.checkboxAllowRotate.TabIndex = 23;
-            this.checkboxAllowRotate.Text = "Rotate printout to page orientation";
             this.checkboxAllowRotate.TextAlign = System.Drawing.ContentAlignment.TopLeft;
             this.checkboxAllowRotate.UseVisualStyleBackColor = true;
             // 
@@ -1037,7 +993,6 @@ namespace Greenshot {
             this.checkboxAllowCenter.PropertyName = "OutputPrintCenter";
             this.checkboxAllowCenter.Size = new System.Drawing.Size(137, 17);
             this.checkboxAllowCenter.TabIndex = 24;
-            this.checkboxAllowCenter.Text = "Center printout on page";
             this.checkboxAllowCenter.TextAlign = System.Drawing.ContentAlignment.TopLeft;
             this.checkboxAllowCenter.UseVisualStyleBackColor = true;
             // 
@@ -1060,7 +1015,6 @@ namespace Greenshot {
             this.tab_plugins.Name = "tab_plugins";
             this.tab_plugins.Size = new System.Drawing.Size(423, 351);
             this.tab_plugins.TabIndex = 2;
-            this.tab_plugins.Text = "Plugins";
             this.tab_plugins.UseVisualStyleBackColor = true;
             // 
             // groupbox_plugins
@@ -1102,7 +1056,6 @@ namespace Greenshot {
             this.button_pluginconfigure.Name = "button_pluginconfigure";
             this.button_pluginconfigure.Size = new System.Drawing.Size(75, 23);
             this.button_pluginconfigure.TabIndex = 1;
-            this.button_pluginconfigure.Text = "Configure";
             this.button_pluginconfigure.UseVisualStyleBackColor = true;
             this.button_pluginconfigure.Click += new System.EventHandler(this.Button_pluginconfigureClick);
             // 
@@ -1150,7 +1103,6 @@ namespace Greenshot {
             this.checkbox_reuseeditor.SectionName = "Editor";
             this.checkbox_reuseeditor.Size = new System.Drawing.Size(394, 24);
             this.checkbox_reuseeditor.TabIndex = 31;
-            this.checkbox_reuseeditor.Text = "Reuse editor if possible";
             this.checkbox_reuseeditor.UseVisualStyleBackColor = true;
             // 
             // checkbox_minimizememoryfootprint
@@ -1161,7 +1113,6 @@ namespace Greenshot {
             this.checkbox_minimizememoryfootprint.PropertyName = "MinimizeWorkingSetSize";
             this.checkbox_minimizememoryfootprint.Size = new System.Drawing.Size(394, 24);
             this.checkbox_minimizememoryfootprint.TabIndex = 30;
-            this.checkbox_minimizememoryfootprint.Text = "Minimize memory footprint, but with a performance penalty (not adviced).";
             this.checkbox_minimizememoryfootprint.UseVisualStyleBackColor = true;
             // 
             // checkbox_checkunstableupdates
@@ -1172,7 +1123,6 @@ namespace Greenshot {
             this.checkbox_checkunstableupdates.PropertyName = "CheckForUnstable";
             this.checkbox_checkunstableupdates.Size = new System.Drawing.Size(394, 24);
             this.checkbox_checkunstableupdates.TabIndex = 29;
-            this.checkbox_checkunstableupdates.Text = "Check for unstable updates";
             this.checkbox_checkunstableupdates.UseVisualStyleBackColor = true;
             // 
             // checkbox_suppresssavedialogatclose
@@ -1184,7 +1134,6 @@ namespace Greenshot {
             this.checkbox_suppresssavedialogatclose.SectionName = "Editor";
             this.checkbox_suppresssavedialogatclose.Size = new System.Drawing.Size(394, 24);
             this.checkbox_suppresssavedialogatclose.TabIndex = 28;
-            this.checkbox_suppresssavedialogatclose.Text = "Suppress the save dialog when closing the editor";
             this.checkbox_suppresssavedialogatclose.UseVisualStyleBackColor = true;
             // 
             // label_counter
@@ -1195,7 +1144,6 @@ namespace Greenshot {
             this.label_counter.Name = "label_counter";
             this.label_counter.Size = new System.Drawing.Size(246, 13);
             this.label_counter.TabIndex = 27;
-            this.label_counter.Text = "The number for the ${NUM} in the filename pattern";
             // 
             // textbox_counter
             // 
@@ -1231,7 +1179,6 @@ namespace Greenshot {
             this.checkbox_thumbnailpreview.PropertyName = "ThumnailPreview";
             this.checkbox_thumbnailpreview.Size = new System.Drawing.Size(394, 24);
             this.checkbox_thumbnailpreview.TabIndex = 23;
-            this.checkbox_thumbnailpreview.Text = "Show window thumbnails in context menu (for Vista and windows 7)";
             this.checkbox_thumbnailpreview.UseVisualStyleBackColor = true;
             // 
             // checkbox_optimizeforrdp
@@ -1242,7 +1189,6 @@ namespace Greenshot {
             this.checkbox_optimizeforrdp.PropertyName = "OptimizeForRDP";
             this.checkbox_optimizeforrdp.Size = new System.Drawing.Size(394, 24);
             this.checkbox_optimizeforrdp.TabIndex = 22;
-            this.checkbox_optimizeforrdp.Text = "Make some optimizations for usage with remote desktop";
             this.checkbox_optimizeforrdp.UseVisualStyleBackColor = true;
             // 
             // checkbox_autoreducecolors
@@ -1253,8 +1199,6 @@ namespace Greenshot {
             this.checkbox_autoreducecolors.PropertyName = "OutputFileAutoReduceColors";
             this.checkbox_autoreducecolors.Size = new System.Drawing.Size(408, 24);
             this.checkbox_autoreducecolors.TabIndex = 21;
-            this.checkbox_autoreducecolors.Text = "Create an 8-bit image if the colors are less than 256 while having a > 8 bits ima" +
-    "ge";
             this.checkbox_autoreducecolors.UseVisualStyleBackColor = true;
             // 
             // label_clipboardformats
@@ -1265,7 +1209,6 @@ namespace Greenshot {
             this.label_clipboardformats.Name = "label_clipboardformats";
             this.label_clipboardformats.Size = new System.Drawing.Size(88, 13);
             this.label_clipboardformats.TabIndex = 20;
-            this.label_clipboardformats.Text = "Clipboard formats";
             // 
             // checkbox_enableexpert
             // 
@@ -1274,7 +1217,6 @@ namespace Greenshot {
             this.checkbox_enableexpert.Name = "checkbox_enableexpert";
             this.checkbox_enableexpert.Size = new System.Drawing.Size(394, 24);
             this.checkbox_enableexpert.TabIndex = 19;
-            this.checkbox_enableexpert.Text = "I know what I am doing!";
             this.checkbox_enableexpert.UseVisualStyleBackColor = true;
             this.checkbox_enableexpert.CheckedChanged += new System.EventHandler(this.checkbox_enableexpert_CheckedChanged);
             // 
@@ -1374,9 +1316,9 @@ namespace Greenshot {
 		private GreenshotPlugin.Controls.GreenshotLabel label_ie_hotkey;
 		private GreenshotPlugin.Controls.HotkeyControl lastregion_hotkeyControl;
 		private GreenshotPlugin.Controls.GreenshotLabel label_lastregion_hotkey;
-        private GreenshotPlugin.Controls.GreenshotGroupBox groupbox_hotkeys;
+		private GreenshotPlugin.Controls.GreenshotGroupBox groupbox_hotkeys;
 		private Greenshot.Controls.ColorButton colorButton_window_background;
-		private GreenshotPlugin.Controls.GreenshotLabel label_window_capture_mode;
+		private GreenshotPlugin.Controls.GreenshotRadioButton radiobuttonWindowCapture;
 		private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_ie_capture;
 		private GreenshotPlugin.Controls.GreenshotGroupBox groupbox_capture;
 		private GreenshotPlugin.Controls.GreenshotGroupBox groupbox_windowscapture;
@@ -1385,15 +1327,15 @@ namespace Greenshot {
 		private System.Windows.Forms.ComboBox combobox_window_capture_mode;
 		private System.Windows.Forms.NumericUpDown numericUpDownWaitTime;
 		private GreenshotPlugin.Controls.GreenshotLabel label_waittime;
-		private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_capture_windows_interactive;
+		private GreenshotPlugin.Controls.GreenshotRadioButton radiobuttonInteractiveCapture;
 		private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_capture_mousepointer;
 		private GreenshotPlugin.Controls.GreenshotTabPage tab_printer;
 		private System.Windows.Forms.ListView listview_plugins;
 		private GreenshotPlugin.Controls.GreenshotButton button_pluginconfigure;
 		private GreenshotPlugin.Controls.GreenshotGroupBox groupbox_plugins;
-        private GreenshotPlugin.Controls.GreenshotTabPage tab_plugins;
+		private GreenshotPlugin.Controls.GreenshotTabPage tab_plugins;
 		private System.Windows.Forms.Button btnPatternHelp;
-        private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_copypathtoclipboard;
+		private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_copypathtoclipboard;
 		private GreenshotPlugin.Controls.GreenshotTabPage tab_output;
 		private GreenshotPlugin.Controls.GreenshotTabPage tab_general;
 		private System.Windows.Forms.TabControl tabcontrol;
@@ -1425,7 +1367,7 @@ namespace Greenshot {
 		private GreenshotPlugin.Controls.GreenshotLabel label_clipboardformats;
 		private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_enableexpert;
 		private System.Windows.Forms.ListView listview_clipboardformats;
-        private System.Windows.Forms.ColumnHeader columnHeader1;
+		private System.Windows.Forms.ColumnHeader columnHeader1;
 		private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_autoreducecolors;
 		private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_optimizeforrdp;
 		private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_thumbnailpreview;

Greenshot/Forms/SettingsForm.cs

@@ -342,7 +342,8 @@ namespace Greenshot {
 
 			SetWindowCaptureMode(coreConfiguration.WindowCaptureMode);
 			// Disable editing when the value is fixed
-			combobox_window_capture_mode.Enabled = !coreConfiguration.Values["WindowCaptureMode"].IsFixed;
+			combobox_window_capture_mode.Enabled = !coreConfiguration.CaptureWindowsInteractive && !coreConfiguration.Values["WindowCaptureMode"].IsFixed;
+			radiobuttonWindowCapture.Checked = !coreConfiguration.CaptureWindowsInteractive;
 
 			trackBarJpegQuality.Value = coreConfiguration.OutputFileJpegQuality;
 			trackBarJpegQuality.Enabled = !coreConfiguration.Values["OutputFileJpegQuality"].IsFixed;
@@ -352,19 +353,24 @@ namespace Greenshot {
 
 			numericUpDownWaitTime.Value = coreConfiguration.CaptureDelay >=0?coreConfiguration.CaptureDelay:0;
 			numericUpDownWaitTime.Enabled = !coreConfiguration.Values["CaptureDelay"].IsFixed;
-			// Autostart checkbox logic.
+			if (IniConfig.IsPortable) {
-			if (StartupHelper.hasRunAll()) {
+				checkbox_autostartshortcut.Visible = false;
-				// Remove runUser if we already have a run under all
+				checkbox_autostartshortcut.Checked = false;
-				StartupHelper.deleteRunUser();
-				checkbox_autostartshortcut.Enabled = StartupHelper.canWriteRunAll();
-				checkbox_autostartshortcut.Checked = true; // We already checked this
-			} else if (StartupHelper.IsInStartupFolder()) {
-				checkbox_autostartshortcut.Enabled = false;
-				checkbox_autostartshortcut.Checked = true; // We already checked this
 			} else {
-				// No run for all, enable the checkbox and set it to true if the current user has a key
+				// Autostart checkbox logic.
-				checkbox_autostartshortcut.Enabled = StartupHelper.canWriteRunUser();
+				if (StartupHelper.hasRunAll()) {
-				checkbox_autostartshortcut.Checked = StartupHelper.hasRunUser();
+					// Remove runUser if we already have a run under all
+					StartupHelper.deleteRunUser();
+					checkbox_autostartshortcut.Enabled = StartupHelper.canWriteRunAll();
+					checkbox_autostartshortcut.Checked = true; // We already checked this
+				} else if (StartupHelper.IsInStartupFolder()) {
+					checkbox_autostartshortcut.Enabled = false;
+					checkbox_autostartshortcut.Checked = true; // We already checked this
+				} else {
+					// No run for all, enable the checkbox and set it to true if the current user has a key
+					checkbox_autostartshortcut.Enabled = StartupHelper.canWriteRunUser();
+					checkbox_autostartshortcut.Checked = StartupHelper.hasRunUser();
+				}
 			}
 			
 			numericUpDown_daysbetweencheck.Value = coreConfiguration.UpdateCheckInterval;
@@ -591,6 +597,10 @@ namespace Greenshot {
 			CheckBox checkBox = sender as CheckBox;
 			ExpertSettingsEnableState(checkBox.Checked);
 		}
+
+		private void radiobutton_CheckedChanged(object sender, EventArgs e) {
+			combobox_window_capture_mode.Enabled = radiobuttonWindowCapture.Checked;
+		}
 	}
 
 	public class ListviewWithDestinationComparer : System.Collections.IComparer {

Greenshot/Greenshot.csproj

@@ -213,9 +213,6 @@
     <Compile Include="Helpers\ProcessorHelper.cs" />
     <Compile Include="Help\HelpFileLoader.cs" />
     <Compile Include="Processors\TitleFixProcessor.cs" />
-    <None Include="Greenshot.exe.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <Compile Include="Helpers\WindowWrapper.cs" />
     <Compile Include="Memento\AddElementMemento.cs" />
     <Compile Include="Memento\ChangeFieldHolderMemento.cs" />
@@ -400,7 +397,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <PropertyGroup>
-    <PreBuildEvent>"$(MSBuildProjectDirectory)\tools\TortoiseSVN\SubWCRev.exe" "$(MSBuildProjectDirectory)\.." "$(MSBuildProjectDirectory)\AssemblyInfo.cs.template" "$(MSBuildProjectDirectory)\AssemblyInfo.cs"
+    <PreBuildEvent>
 copy "$(ProjectDir)log4net-debug.xml" "$(SolutionDir)bin\$(Configuration)\log4net.xml"</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86' ">

Greenshot/Help/HelpFileLoader.cs

@@ -1,83 +1,83 @@
-/*
+/*
- * Created by SharpDevelop.
+ * Created by SharpDevelop.
- * User: jens
+ * User: jens
- * Date: 09.04.2012
+ * Date: 09.04.2012
- * Time: 19:24
+ * Time: 19:24
- * 
+ * 
- * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
- */
+ */
-using Greenshot.Configuration;
+using Greenshot.Configuration;
-using GreenshotPlugin.Core;
+using GreenshotPlugin.Core;
-using System;
+using System;
-using System.Diagnostics;
+using System.Diagnostics;
-using System.Net;
+using System.Net;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+
-namespace Greenshot.Help
+namespace Greenshot.Help
-{
+{
-	/// <summary>
+	/// <summary>
-	/// Description of HelpFileLoader.
+	/// Description of HelpFileLoader.
-	/// </summary>
+	/// </summary>
-	public sealed class HelpFileLoader
+	public sealed class HelpFileLoader
-	{
+	{
-		
+		
-		private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(HelpFileLoader));
+		private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(HelpFileLoader));
-		
+		
-		private const string EXT_HELP_URL = @"http://getgreenshot.org/help/";
+		private const string EXT_HELP_URL = @"http://getgreenshot.org/help/";
-		
+		
-		private HelpFileLoader() {
+		private HelpFileLoader() {
-		}
+		}
-		
+		
-		public static void LoadHelp() {
+		public static void LoadHelp() {
-			string uri = findOnlineHelpUrl(Language.CurrentLanguage);
+			string uri = findOnlineHelpUrl(Language.CurrentLanguage);
-			if(uri == null) {
+			if(uri == null) {
-				uri = Language.HelpFilePath;
+				uri = Language.HelpFilePath;
-			}
+			}
-			Process.Start(uri);			
+			Process.Start(uri);			
-		}
+		}
-		
+		
-		/// <returns>URL of help file in selected ietf, or (if not present) default ietf, or null (if not present, too. probably indicating that there is no internet connection)</returns>
+		/// <returns>URL of help file in selected ietf, or (if not present) default ietf, or null (if not present, too. probably indicating that there is no internet connection)</returns>
-		private static string findOnlineHelpUrl(string currentIETF) {
+		private static string findOnlineHelpUrl(string currentIETF) {
-			string ret = null;
+			string ret = null;
-			
+			
-			string extHelpUrlForCurrrentIETF = EXT_HELP_URL;
+			string extHelpUrlForCurrrentIETF = EXT_HELP_URL;
-			
+			
-			if(!currentIETF.Equals("en-US")) {
+			if(!currentIETF.Equals("en-US")) {
-				extHelpUrlForCurrrentIETF += currentIETF.ToLower() + "/";
+				extHelpUrlForCurrrentIETF += currentIETF.ToLower() + "/";
-			}
+			}
-			
+			
-			HttpStatusCode? httpStatusCode = getHttpStatus(extHelpUrlForCurrrentIETF);
+			HttpStatusCode? httpStatusCode = getHttpStatus(extHelpUrlForCurrrentIETF);
-			if(httpStatusCode == HttpStatusCode.OK) {
+			if(httpStatusCode == HttpStatusCode.OK) {
-				ret = extHelpUrlForCurrrentIETF;
+				ret = extHelpUrlForCurrrentIETF;
-			} else if(httpStatusCode != null && !extHelpUrlForCurrrentIETF.Equals(EXT_HELP_URL)) {
+			} else if(httpStatusCode != null && !extHelpUrlForCurrrentIETF.Equals(EXT_HELP_URL)) {
-				LOG.DebugFormat("Localized online help not found at {0}, will try {1} as fallback", extHelpUrlForCurrrentIETF, EXT_HELP_URL);
+				LOG.DebugFormat("Localized online help not found at {0}, will try {1} as fallback", extHelpUrlForCurrrentIETF, EXT_HELP_URL);
-				httpStatusCode = getHttpStatus(EXT_HELP_URL);
+				httpStatusCode = getHttpStatus(EXT_HELP_URL);
-				if(httpStatusCode == HttpStatusCode.OK) {
+				if(httpStatusCode == HttpStatusCode.OK) {
-					ret = EXT_HELP_URL;
+					ret = EXT_HELP_URL;
-				} else {
+				} else {
-					LOG.WarnFormat("{0} returned status {1}", EXT_HELP_URL, httpStatusCode);
+					LOG.WarnFormat("{0} returned status {1}", EXT_HELP_URL, httpStatusCode);
-				}
+				}
-			} else if(httpStatusCode == null){
+			} else if(httpStatusCode == null){
-				LOG.Info("Internet connection does not seem to be available, will load help from file system.");
+				LOG.Info("Internet connection does not seem to be available, will load help from file system.");
-			}
+			}
-			
+			
-			return ret;
+			return ret;
-		}
+		}
-		
+		
-		/// <summary>
+		/// <summary>
-		/// Retrieves HTTP status for a given url.
+		/// Retrieves HTTP status for a given url.
-		/// </summary>
+		/// </summary>
-		/// <param name="url">URL for which the HTTP status is to be checked</param>
+		/// <param name="url">URL for which the HTTP status is to be checked</param>
-		/// <returns>An HTTP status code, or null if there is none (probably indicating that there is no internet connection available</returns>
+		/// <returns>An HTTP status code, or null if there is none (probably indicating that there is no internet connection available</returns>
-		private static HttpStatusCode? getHttpStatus(string url) {
+		private static HttpStatusCode? getHttpStatus(string url) {
-			try {
+			try {
-				HttpWebRequest req = (HttpWebRequest)NetworkHelper.CreateWebRequest(url);
+				HttpWebRequest req = (HttpWebRequest)NetworkHelper.CreateWebRequest(url);
-				HttpWebResponse res = (HttpWebResponse)req.GetResponse();
+				HttpWebResponse res = (HttpWebResponse)req.GetResponse();
-				return res.StatusCode;
+				return res.StatusCode;
-			} catch(WebException e) {
+			} catch(WebException e) {
-				if(e.Response != null) return ((HttpWebResponse)e.Response).StatusCode;
+				if(e.Response != null) return ((HttpWebResponse)e.Response).StatusCode;
-				else return null;
+				else return null;
-			}
+			}
-		}
+		}
-	}
+	}
-}
+}

Greenshot/Helpers/DestinationHelper.cs

@@ -24,6 +24,7 @@ using System.Collections.Generic;
 using Greenshot.Plugin;
 using GreenshotPlugin.Core;
 using Greenshot.Destinations;
+using Greenshot.IniFile;
 
 namespace Greenshot.Helpers {
 	/// <summary>
@@ -32,6 +33,7 @@ namespace Greenshot.Helpers {
 	public static class DestinationHelper {
 		private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(DestinationHelper));
 		private static Dictionary<string, IDestination> RegisteredDestinations = new Dictionary<string, IDestination>();
+		private static CoreConfiguration coreConfig = IniConfig.GetIniSection<CoreConfiguration>();
 
 		/// Initialize the destinations		
 		static DestinationHelper() {
@@ -64,8 +66,10 @@ namespace Greenshot.Helpers {
 		/// </summary>
 		/// <param name="destination"></param>
 		public static void RegisterDestination(IDestination destination) {
-			// don't test the key, an exception should happen wenn it's not unique
+			if (coreConfig.ExcludeDestinations == null || !coreConfig.ExcludeDestinations.Contains(destination.Designation)) {
-			RegisteredDestinations.Add(destination.Designation, destination);
+				// don't test the key, an exception should happen wenn it's not unique
+				RegisteredDestinations.Add(destination.Designation, destination);
+			}
 		}
 
 		/// <summary>
@@ -77,9 +81,10 @@ namespace Greenshot.Helpers {
 			foreach (PluginAttribute pluginAttribute in PluginHelper.Instance.Plugins.Keys) {
 				IGreenshotPlugin plugin = PluginHelper.Instance.Plugins[pluginAttribute];
 				try {
-					var dests = plugin.Destinations();
+					foreach (IDestination destination in plugin.Destinations()) {
-					if (dests != null) {
+						if (coreConfig.ExcludeDestinations == null || !coreConfig.ExcludeDestinations.Contains(destination.Designation)) {
-						destinations.AddRange(dests);
+							destinations.Add(destination);
+						}
 					}
 				} catch (Exception ex) {
 					LOG.ErrorFormat("Couldn't get destinations from the plugin {0}", pluginAttribute.Name);

Greenshot/Helpers/IECaptureHelper.cs

@@ -145,6 +145,7 @@ namespace Greenshot.Helpers {
 							try {
 								IHTMLDocument2 document2 = getHTMLDocument(ieWindow);
 								string title = document2.title;
+								System.Runtime.InteropServices.Marshal.ReleaseComObject(document2);
 								if (string.IsNullOrEmpty(title)) {
 									singleWindowText.Add(ieWindow.Text);
 								} else {
@@ -581,29 +582,6 @@ namespace Greenshot.Helpers {
 			}
 			return returnBitmap;
 		}
-		
-		/// <summary>
-		/// Used as an example
-		/// </summary>
-		/// <param name="documentContainer"></param>
-		/// <param name="graphicsTarget"></param>
-		/// <param name="returnBitmap"></param>
-		private static void ParseElements(DocumentContainer documentContainer, Graphics graphicsTarget, Bitmap returnBitmap) {
-			foreach(ElementContainer element in documentContainer.GetElementsByTagName("input", new string[]{"greenshot"})) {
-				if (element.attributes.ContainsKey("greenshot") && element.attributes["greenshot"] != null) {
-					string greenshotAction = element.attributes["greenshot"];
-					if ("hide".Equals(greenshotAction)) {
-						using (Brush brush = new SolidBrush(Color.Black)) {
-							graphicsTarget.FillRectangle(brush, element.rectangle);
-						}
-					} else if ("red".Equals(greenshotAction)) {
-						using (Brush brush = new SolidBrush(Color.Red)) {
-							graphicsTarget.FillRectangle(brush, element.rectangle);
-						}
-					}
-				}
-			}
-		}
 
 		/// <summary>
 		/// This method takes the actual capture of the document (frame)

Greenshot/Helpers/IEInterop/IEContainer.cs

@@ -31,18 +31,11 @@ using Greenshot.Interop.IE;
 using Greenshot.IniFile;
 
 namespace Greenshot.Helpers.IEInterop {
-	public class ElementContainer {
-		public Rectangle rectangle;
-		public string id;
-		public Dictionary<string, string> attributes = new Dictionary<string, string>();
-	}
-
 	public class DocumentContainer {
 		private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(DocumentContainer));
 		private static CoreConfiguration configuration = IniConfig.GetIniSection<CoreConfiguration>();
-		private static readonly List<string> CAPTURE_TAGS = new List<string>();
+		private const int  E_ACCESSDENIED = unchecked((int)0x80070005L);
-        private const int  E_ACCESSDENIED = unchecked((int)0x80070005L);
+		private static readonly Guid IID_IWebBrowserApp = new Guid("0002DF05-0000-0000-C000-000000000046");
-        private static readonly Guid IID_IWebBrowserApp = new Guid("0002DF05-0000-0000-C000-000000000046");
 		private static readonly Guid IID_IWebBrowser2 = new Guid("D30C1661-CDAF-11D0-8A3E-00C04FC9E26E");
 		private static int counter = 0;
 		private int id = counter++;
@@ -60,30 +53,6 @@ namespace Greenshot.Helpers.IEInterop {
 		private double zoomLevelX = 1;
 		private double zoomLevelY = 1;
 		private List<DocumentContainer> frames = new List<DocumentContainer>();
-		
-		static DocumentContainer() {
-			CAPTURE_TAGS.Add("LABEL");
-			CAPTURE_TAGS.Add("DIV");
-			CAPTURE_TAGS.Add("IMG");
-			CAPTURE_TAGS.Add("INPUT");
-			CAPTURE_TAGS.Add("BUTTON");
-			CAPTURE_TAGS.Add("TD");
-			CAPTURE_TAGS.Add("TR");
-			CAPTURE_TAGS.Add("TH");
-			CAPTURE_TAGS.Add("TABLE");
-			CAPTURE_TAGS.Add("TBODY");
-			CAPTURE_TAGS.Add("SPAN");
-			CAPTURE_TAGS.Add("A");
-			CAPTURE_TAGS.Add("UL");
-			CAPTURE_TAGS.Add("LI");
-			CAPTURE_TAGS.Add("H1");
-			CAPTURE_TAGS.Add("H2");
-			CAPTURE_TAGS.Add("H3");
-			CAPTURE_TAGS.Add("H4");
-			CAPTURE_TAGS.Add("H5");
-			CAPTURE_TAGS.Add("FORM");
-			CAPTURE_TAGS.Add("FIELDSET");
-		}
 
 		private DocumentContainer(IHTMLWindow2 frameWindow, WindowDetails contentWindow, DocumentContainer parent) {
 			//IWebBrowser2 webBrowser2 = frame as IWebBrowser2;
@@ -108,19 +77,16 @@ namespace Greenshot.Helpers.IEInterop {
 
 			this.parent = parent;
 			// Calculate startLocation for the frames
-			IHTMLWindow3 window3 = (IHTMLWindow3)document2.parentWindow;
+			IHTMLWindow2 window2 = document2.parentWindow;
-//			IHTMLElement element = window2.document.body;
+			IHTMLWindow3 window3 = (IHTMLWindow3)window2;
-//			long x = 0;
-//			long y = 0;
-//			do {
-//				x += element.offsetLeft;
-//				y += element.offsetTop;
-//				element = element.offsetParent;
-//			} while (element != null);
-//			startLocation = new Point((int)x, (int)y);
 			Point contentWindowLocation = contentWindow.WindowRectangle.Location;
 			int x = window3.screenLeft - contentWindowLocation.X;
 			int y = window3.screenTop - contentWindowLocation.Y;
+
+			// Release IHTMLWindow 2+3 com objects
+			releaseCom(window2);
+			releaseCom(window3);
+
 			startLocation = new Point(x, y);
 			Init(document2, contentWindow);
 		}
@@ -129,7 +95,17 @@ namespace Greenshot.Helpers.IEInterop {
 			Init(document2, contentWindow);
 			LOG.DebugFormat("Creating DocumentContainer for Document {0} found in window with rectangle {1}", name, SourceRectangle);
 		}
-		
+
+		/// <summary>
+		/// Helper method to release com objects
+		/// </summary>
+		/// <param name="comObject"></param>
+		private void releaseCom(object comObject) {
+			if (comObject != null) {
+				Marshal.ReleaseComObject(comObject);
+			}
+		}
+
 		/// <summary>
 		/// Private helper method for the constructors
 		/// </summary>
@@ -152,12 +128,15 @@ namespace Greenshot.Helpers.IEInterop {
 				LOG.Error("Error checking the compatibility mode:");
 				LOG.Error(ex);
 			}
+			// Do not release IHTMLDocument5 com object, as this also gives problems with the document2!
+			//Marshal.ReleaseComObject(document5);
+
 			Rectangle clientRectangle = contentWindow.WindowRectangle;
 			try {
 				IHTMLWindow2 window2 = (IHTMLWindow2)document2.parentWindow;
 				//IHTMLWindow3 window3 = (IHTMLWindow3)document2.parentWindow;
-				IHTMLScreen2 screen2 = (IHTMLScreen2)window2.screen;
 				IHTMLScreen screen = window2.screen;
+				IHTMLScreen2 screen2 = (IHTMLScreen2)screen;
 				if (parent != null) {
 					// Copy parent values
 					zoomLevelX = parent.zoomLevelX;
@@ -188,6 +167,10 @@ namespace Greenshot.Helpers.IEInterop {
 					}
 				}
 				LOG.DebugFormat("Zoomlevel {0}, {1}", zoomLevelX, zoomLevelY);
+				// Release com objects
+				releaseCom(window2);
+				releaseCom(screen);
+				releaseCom(screen2);
 			} catch (Exception e) {
 				LOG.Warn("Can't get certain properties for documents, using default. Due to: ", e);
 			}
@@ -226,10 +209,14 @@ namespace Greenshot.Helpers.IEInterop {
 						} else {
 							LOG.DebugFormat("Skipping frame {0}", frameData.Name);
 						}
+						// Clean up frameWindow
+						releaseCom(frameWindow);
 					} catch (Exception e) {
 						LOG.Warn("Problem while trying to get information from a frame, skipping the frame!", e);
 					}
 				}
+				// Clean up collection
+				releaseCom(frameCollection);
 			} catch (Exception ex) {
 				LOG.Warn("Problem while trying to get the frames, skipping!", ex);
 			}
@@ -239,6 +226,8 @@ namespace Greenshot.Helpers.IEInterop {
 				foreach (IHTMLElement frameElement in document3.getElementsByTagName("IFRAME")) {
 					try {
 						CorrectFrameLocations(frameElement);
+						// Clean up frameElement
+						releaseCom(frameElement);
 					} catch (Exception e) {
 						LOG.Warn("Problem while trying to get information from an iframe, skipping the frame!", e);
 					}
@@ -248,30 +237,32 @@ namespace Greenshot.Helpers.IEInterop {
 			}
 		}
 		
-		private void DisableScrollbars(IHTMLDocument2 document2) {
+		/// <summary>
-			try {
+		/// Corrent the frame locations with the information
-				setAttribute("scroll","no");
+		/// </summary>
-				IHTMLBodyElement body = (IHTMLBodyElement)document2.body;
+		/// <param name="frameElement"></param>
-				body.scroll="no";
-				document2.body.style.borderStyle = "none";
-			} catch (Exception ex) {
-				LOG.Warn("Can't disable scroll", ex);
-			}
-		}
-		
 		private void CorrectFrameLocations(IHTMLElement frameElement) {
 			long x = 0;
 			long y = 0;
 			IHTMLElement element = frameElement;
+			IHTMLElement oldElement = null;
 			do {
 				x += element.offsetLeft;
 				y += element.offsetTop;
 				element = element.offsetParent;
+				// Release element, but prevent the frameElement to be released
+				if (oldElement != null) {
+					releaseCom(oldElement);
+				}
+				oldElement = element;
 			} while (element != null);
+
 			Point elementLocation = new Point((int)x, (int)y);
 			IHTMLElement2 element2 = (IHTMLElement2)frameElement;
 			IHTMLRect rec = element2.getBoundingClientRect();
 			Point elementBoundingLocation = new Point(rec.left, rec.top);
+			// Release IHTMLRect
+			releaseCom(rec);
 			LOG.DebugFormat("Looking for iframe to correct at {0}", elementBoundingLocation);
 			foreach(DocumentContainer foundFrame in frames) {
 				Point frameLocation = foundFrame.SourceLocation;
@@ -320,7 +311,7 @@ namespace Greenshot.Helpers.IEInterop {
 			try {
 				// Convert IHTMLWindow2 to IWebBrowser2 using IServiceProvider.
 				Interop.IServiceProvider sp = (Interop.IServiceProvider)htmlWindow;
-				
+
 				// Use IServiceProvider.QueryService to get IWebBrowser2 object.
 				Object brws = null;
 				Guid webBrowserApp = IID_IWebBrowserApp.Clone();
@@ -336,128 +327,6 @@ namespace Greenshot.Helpers.IEInterop {
 			}
 			return null;
 		}
-
-		/// <summary>
-		/// Wrapper around getElementsByTagName
-		/// </summary>
-		/// <param name="tagName">tagName is the name of the tag to look for, e.g. "input"</param>
-		/// <param name="retrieveAttributes">If true then all attributes are retrieved. This is slow!</param>
-		/// <returns></returns>
-		public List<ElementContainer> GetElementsByTagName(string tagName, string[] attributes) {
-			List<ElementContainer> elements = new List<ElementContainer>();
-			foreach(IHTMLElement element in document3.getElementsByTagName(tagName)) {
-				if (element.offsetWidth <= 0 || element.offsetHeight <= 0) {
-					// not visisble
-					continue;
-				}
-				ElementContainer elementContainer = new ElementContainer();
-				elementContainer.id = element.id;
-				
-				if (attributes != null) {
-					foreach(string attributeName in attributes) {
-						object attributeValue = element.getAttribute(attributeName, 0);
-						if (attributeValue != null && attributeValue != DBNull.Value && !elementContainer.attributes.ContainsKey(attributeName)) {
-							elementContainer.attributes.Add(attributeName, attributeValue.ToString());
-						}
-					}
-				}
-				
-				Point elementLocation = new Point((int)element.offsetLeft, (int)element.offsetTop);
-				elementLocation.Offset(this.DestinationLocation);
-				IHTMLElement parent = element.offsetParent;
-				while (parent != null) {
-					elementLocation.Offset((int)parent.offsetLeft, (int)parent.offsetTop);
-					parent = parent.offsetParent;
-				}
-				Rectangle elementRectangle = new Rectangle(elementLocation, new Size((int)element.offsetWidth, (int)element.offsetHeight));
-				elementContainer.rectangle = elementRectangle;
-				elements.Add(elementContainer);
-			}
-			return elements;
-		}
-
-		/// <summary>
-		/// Create a CaptureElement for every element on the page, which can be used by the editor.
-		/// </summary>
-		/// <returns></returns>
-		public CaptureElement CreateCaptureElements(Size documentSize) {
-			LOG.DebugFormat("CreateCaptureElements for {0}", Name);
-			IHTMLElement baseElement;
-			if (!isDTD) {
-				baseElement = document2.body;
-			} else {
-				baseElement = document3.documentElement;
-			}
-			IHTMLElement2 baseElement2 = baseElement as IHTMLElement2;
-			IHTMLRect htmlRect = baseElement2.getBoundingClientRect();
-			if (Size.Empty.Equals(documentSize)) {
-				documentSize = new Size(ScrollWidth, ScrollHeight);
-			}
-			Rectangle baseElementBounds = new Rectangle(DestinationLocation.X + htmlRect.left, DestinationLocation.Y + htmlRect.top, documentSize.Width, documentSize.Height);
-			if (baseElementBounds.Width <= 0 || baseElementBounds.Height <= 0) {
-				// not visisble
-				return null;
-			}
-
-			CaptureElement captureBaseElement = new CaptureElement(name, baseElementBounds);
-		
-			foreach(IHTMLElement bodyElement in baseElement.children) {
-				if ("BODY".Equals(bodyElement.tagName)) {
-					captureBaseElement.Children.AddRange(RecurseElements(bodyElement));
-				}
-			}
-			return captureBaseElement;
-		}
-		
-		/// <summary>
-		/// Recurse into the document tree
-		/// </summary>
-		/// <param name="parentElement">IHTMLElement we want to recurse into</param>
-		/// <returns>List of ICaptureElements with child elements</returns>
-		private List<ICaptureElement> RecurseElements(IHTMLElement parentElement) {
-			List<ICaptureElement> childElements = new List<ICaptureElement>();
-			foreach(IHTMLElement element in parentElement.children) {
-				string tagName = element.tagName;
-
-				// Skip elements we aren't interested in
-				if (!CAPTURE_TAGS.Contains(tagName)) {
-					continue;
-				}
-
-				ICaptureElement captureElement = new CaptureElement(tagName);
-				captureElement.Children.AddRange(RecurseElements(element));
-
-				// Get Bounds
-				IHTMLElement2 element2 = element as IHTMLElement2;
-				IHTMLRect htmlRect = element2.getBoundingClientRect();
-				
-				int left = htmlRect.left;
-				int top = htmlRect.top;
-				int right = htmlRect.right;
-				int bottom = htmlRect.bottom;
-				
-				// Offset
-				left += DestinationLocation.X;
-				top += DestinationLocation.Y;
-				right += DestinationLocation.X;
-				bottom += DestinationLocation.Y;
-
-				// Fit to floating children
-				foreach(ICaptureElement childElement in captureElement.Children) {
-					//left = Math.Min(left, childElement.Bounds.Left);
-					//top = Math.Min(top, childElement.Bounds.Top);
-					right = Math.Max(right, childElement.Bounds.Right);
-					bottom = Math.Max(bottom, childElement.Bounds.Bottom);
-				}
-				Rectangle bounds = new Rectangle(left, top, right-left, bottom-top);
-
-				if (bounds.Width > 0 && bounds.Height > 0) {
-					captureElement.Bounds = bounds;
-					childElements.Add(captureElement);
-				}
-			}
-			return childElements;
-		}
 		
 		public Color BackgroundColor {
 			get {
@@ -523,11 +392,15 @@ namespace Greenshot.Helpers.IEInterop {
 		/// <param name="document2">The IHTMLDocument2</param>
 		/// <param name="document3">The IHTMLDocument3</param>
 		public void setAttribute(string attribute, string value) {
+			IHTMLElement element = null;
 			if (!isDTD) {
-				document2.body.setAttribute(attribute, value, 1);
+				element = document2.body;
 			} else {
-				document3.documentElement.setAttribute(attribute, value, 1);
+				element = document3.documentElement;
 			}
+			element.setAttribute(attribute, value, 1);
+			// Release IHTMLElement com object
+			releaseCom(element);
 		}
 
 		/// <summary>
@@ -538,12 +411,16 @@ namespace Greenshot.Helpers.IEInterop {
 		/// <param name="document3">The IHTMLDocument3</param>
 		/// <returns>object with the attribute value</returns>
 		public object getAttribute(string attribute) {
+			IHTMLElement element = null;
 			object retVal = 0;
 			if (!isDTD) {
-				retVal = document2.body.getAttribute(attribute, 1);
+				element = document2.body;
 			} else {
-				retVal = document3.documentElement.getAttribute(attribute, 1);
+				element = document3.documentElement;
 			}
+			retVal = element.getAttribute(attribute, 1);
+			// Release IHTMLElement com object
+			releaseCom(element);
 			return retVal;
 		}
 		

Greenshot/Helpers/PrintHelper.cs

@@ -122,7 +122,7 @@ namespace Greenshot.Helpers {
 				DialogResult? printOptionsResult = ShowPrintOptionsDialog();
 				try {
 					if (printOptionsResult == null || printOptionsResult == DialogResult.OK) {
-						if (IsColorPrint()) {
+						if (!IsColorPrint()) {
 							printDocument.DefaultPageSettings.Color = false;
 						}
 						printDocument.Print();
@@ -196,7 +196,7 @@ namespace Greenshot.Helpers {
 				// rotate the image if it fits the page better
 				if (conf.OutputPrintAllowRotate) {
 					if ((pageRect.Width > pageRect.Height && imageRect.Width < imageRect.Height) || (pageRect.Width < pageRect.Height && imageRect.Width > imageRect.Height)) {
-						image.RotateFlip(RotateFlipType.Rotate90FlipNone);
+						image.RotateFlip(RotateFlipType.Rotate270FlipNone);
 						imageRect = image.GetBounds(ref gu);
 						if (alignment.Equals(ContentAlignment.TopLeft)) {
 							alignment = ContentAlignment.TopRight;

Greenshot/Helpers/UpdateHelper.cs

@@ -86,7 +86,6 @@ namespace Greenshot.Experimental {
 						MainForm.Instance.NotifyIcon.ShowBalloonTip(10000, "Greenshot", Language.GetFormattedString(LangKey.update_found, "'" + latestGreenshot.File + "'"), ToolTipIcon.Info);
 					}
 					conf.LastUpdateCheck = DateTime.Now;
-					IniConfig.Save();
 				} catch (Exception e) {
 					LOG.Error("An error occured while checking for updates, the error will be ignored: ", e);
 				}
@@ -107,7 +106,7 @@ namespace Greenshot.Experimental {
 					Process.Start(downloadLink);
 				}
 			} catch (Exception) {
-				MessageBox.Show(Language.GetFormattedString(LangKey.error_openlink, latestGreenshot.Link), Language.GetString(LangKey.error));
+				MessageBox.Show(Language.GetFormattedString(LangKey.error_openlink, downloadLink), Language.GetString(LangKey.error));
 			} finally {
 				MainForm.Instance.NotifyIcon.BalloonTipClicked -= HandleBalloonTipClick;
 				MainForm.Instance.NotifyIcon.BalloonTipClosed -= CleanupBalloonTipClick;

Greenshot/Languages/help-de-DE.html

@@ -187,7 +187,12 @@
 		<a href="#editor-shapes">Formen-Werkzeuge</a>.
 		Zeichnen Sie einfach ein Textelement in der gewünschten Größe und geben Sie
 		den gewünschten Text ein.<br>
-		Durch Doppelklicken können Sie den Text eines bestehenden Textelements bearbeiten.
+		Durch Doppelklicken können Sie den Text eines bestehenden Textelements bearbeiten.<br>
+		Drücken Sie <kbd>Return</kbd> oder <kbd>Enter</kbd> um die Bearbeitung des Textes zu beenden.
+	</p>
+	<p class="hint">
+		Wenn Sie Zeilenumbrüche innerhalb einer Textbox benötigen, drücken Sie <kbd>Shift</kbd> + <kbd>Return</kbd> oder
+		<kbd>Shift</kbd> + <kbd>Enter</kbd>.
 	</p>
 	
 	<a name="editor-highlight"></a>

Greenshot/Languages/help-en-US.html

@@ -203,7 +203,12 @@
 		Usage of the text tool <kbd>T</kbd> is similar to the usage of the 
 		<a href="#editor-shapes">shape</a> tools. Just draw the text element to the desired
 		size, then type in the text.<br>
-		Double click an existing text element to edit the text.
+		Double click an existing text element to edit the text.<br>
+		Hit <kbd>Return</kbd> or <kbd>Enter</kbd> when you have finished editing.
+	</p>
+	<p class="hint">
+		If you need to insert line breaks within a text box, hit <kbd>Shift</kbd> + <kbd>Return</kbd> or
+		<kbd>Shift</kbd> + <kbd>Enter</kbd>.
 	</p>
 	
 	<a name="editor-highlight"></a>

Greenshot/Languages/language-de-x-franconia.xml

@@ -1,278 +1,278 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Frängisch" ietf="de-x-franconia" version="1.0.5" languagegroup="1">
+<language description="Frängisch" ietf="de-x-franconia" version="1.0.5" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="about_bugs">Lefft was falsch, meldst di hier</resource>
+		<resource name="about_bugs">Lefft was falsch, meldst di hier</resource>
-		<resource name="about_donations">Wenn der Greenshot gfälld, kannsd uns gern a weng helfn:</resource>
+		<resource name="about_donations">Wenn der Greenshot gfälld, kannsd uns gern a weng helfn:</resource>
-		<resource name="about_host">Greenshot is a bei sourceforge, und zwa dordn:</resource>
+		<resource name="about_host">Greenshot is a bei sourceforge, und zwa dordn:</resource>
-		<resource name="about_icons">Dei Fuztl-Bildla sin vom Yusuke Kamiyamane's Fugue icon set (Griäidif Gommens Äddribuschn 3.0 Laisns)</resource>
+		<resource name="about_icons">Dei Fuztl-Bildla sin vom Yusuke Kamiyamane's Fugue icon set (Griäidif Gommens Äddribuschn 3.0 Laisns)</resource>
-		<resource name="about_license">Kobbireid (C) 2007-2012 Domas Braun, Jens Glingen, Robin Grohm
+		<resource name="about_license">Kobbireid (C) 2007-2012 Domas Braun, Jens Glingen, Robin Grohm
-A Garandie gibds für Greenshot ned, des kannst vergessn. Greenshot is umsonsd und wennsd mogst, kannsd es a rumreichn.
+A Garandie gibds für Greenshot ned, des kannst vergessn. Greenshot is umsonsd und wennsd mogst, kannsd es a rumreichn.
-Mehr Infos zur GNU Dschännerel Bablig Laisns:</resource>
+Mehr Infos zur GNU Dschännerel Bablig Laisns:</resource>
-		<resource name="about_title">Was issn Greenshot???</resource>
+		<resource name="about_title">Was issn Greenshot???</resource>
-		<resource name="application_title">Greenshot - des subber Sgrienschod-Duhl</resource>
+		<resource name="application_title">Greenshot - des subber Sgrienschod-Duhl</resource>
-		<resource name="bugreport_cancel">Legg mich</resource>
+		<resource name="bugreport_cancel">Legg mich</resource>
-		<resource name="bugreport_info">Des doud mer etz leid, da hammer wohl an Fehler.
+		<resource name="bugreport_info">Des doud mer etz leid, da hammer wohl an Fehler.
-Wenns mogst, kannsd uns gern a weng helfn, den Fehler zer findn, wennsd uns an Brichd schiggst.
+Wenns mogst, kannsd uns gern a weng helfn, den Fehler zer findn, wennsd uns an Brichd schiggst.
-Undn steht a Interned-Adressn, do gehst etz hin und maxd an neun Brichd.
+Undn steht a Interned-Adressn, do gehst etz hin und maxd an neun Brichd.
-Dann schreibst no nei, wassd widder für an Scheiß gmachd hasd, gobiersd des Dexdfeld in die Bschreibung nei und saggsd halt noch, wassd so gmachd hast,
+Dann schreibst no nei, wassd widder für an Scheiß gmachd hasd, gobiersd des Dexdfeld in die Bschreibung nei und saggsd halt noch, wassd so gmachd hast,
-damid mers selber brobiern könna.
+damid mers selber brobiern könna.
-Wennsd etz der Gschichd noch die Grone aufsedzn mogst, schausd vorher amal, ob vor dir scho anner so bläid war. Dodafär gibds däi Suchn.
+Wennsd etz der Gschichd noch die Grone aufsedzn mogst, schausd vorher amal, ob vor dir scho anner so bläid war. Dodafär gibds däi Suchn.
-Dangschee, wassd scho :)</resource>
+Dangschee, wassd scho :)</resource>
-		<resource name="bugreport_title">Scheiße, Fehler</resource>
+		<resource name="bugreport_title">Scheiße, Fehler</resource>
-		<resource name="CANCEL">Legg mich</resource>
+		<resource name="CANCEL">Legg mich</resource>
-		<resource name="clipboard_error">Scheiße, etz hat des mid der Zwischnablach ned glabbd.</resource>
+		<resource name="clipboard_error">Scheiße, etz hat des mid der Zwischnablach ned glabbd.</resource>
-		<resource name="clipboard_inuse">Sachamal, ich kann nix in däi Zwischnablach schreim. Der do hoggd draff: {0}</resource>
+		<resource name="clipboard_inuse">Sachamal, ich kann nix in däi Zwischnablach schreim. Der do hoggd draff: {0}</resource>
-		<resource name="ClipboardFormat.DIB">Gerädeunabhängiches Bidmäb (DIB)</resource>
+		<resource name="ClipboardFormat.DIB">Gerädeunabhängiches Bidmäb (DIB)</resource>
-		<resource name="ClipboardFormat.HTML">HTML</resource>
+		<resource name="ClipboardFormat.HTML">HTML</resource>
-		<resource name="ClipboardFormat.HTMLDATAURL">HTML (mit Bildla)</resource>
+		<resource name="ClipboardFormat.HTMLDATAURL">HTML (mit Bildla)</resource>
-		<resource name="ClipboardFormat.PNG">PNG</resource>
+		<resource name="ClipboardFormat.PNG">PNG</resource>
-		<resource name="colorpicker_alpha">Alpha</resource>
+		<resource name="colorpicker_alpha">Alpha</resource>
-		<resource name="colorpicker_apply">Mach mer</resource>
+		<resource name="colorpicker_apply">Mach mer</resource>
-		<resource name="colorpicker_blue">Blau</resource>
+		<resource name="colorpicker_blue">Blau</resource>
-		<resource name="colorpicker_green">Grün</resource>
+		<resource name="colorpicker_green">Grün</resource>
-		<resource name="colorpicker_htmlcolor">HTML Farb</resource>
+		<resource name="colorpicker_htmlcolor">HTML Farb</resource>
-		<resource name="colorpicker_recentcolors">Zledzd bnudzde Farm</resource>
+		<resource name="colorpicker_recentcolors">Zledzd bnudzde Farm</resource>
-		<resource name="colorpicker_red">Rod</resource>
+		<resource name="colorpicker_red">Rod</resource>
-		<resource name="colorpicker_title">Farbauswahl</resource>
+		<resource name="colorpicker_title">Farbauswahl</resource>
-		<resource name="colorpicker_transparent">Dransbarend</resource>
+		<resource name="colorpicker_transparent">Dransbarend</resource>
-		<resource name="config_unauthorizedaccess_write">Wasn etz los? Ich kann ned schbaichern. Schau amal, was da los is: '{0}'.</resource>
+		<resource name="config_unauthorizedaccess_write">Wasn etz los? Ich kann ned schbaichern. Schau amal, was da los is: '{0}'.</resource>
-		<resource name="contextmenu_about">Was issn Greenshot???</resource>
+		<resource name="contextmenu_about">Was issn Greenshot???</resource>
-		<resource name="contextmenu_capturearea">A Schdüggerla abmoln</resource>
+		<resource name="contextmenu_capturearea">A Schdüggerla abmoln</resource>
-		<resource name="contextmenu_captureclipboard">Bild vo der Zwischnablach aufmachn</resource>
+		<resource name="contextmenu_captureclipboard">Bild vo der Zwischnablach aufmachn</resource>
-		<resource name="contextmenu_capturefullscreen">En ganzn Bildschirm abmoln</resource>
+		<resource name="contextmenu_capturefullscreen">En ganzn Bildschirm abmoln</resource>
-		<resource name="contextmenu_capturefullscreen_all">alle</resource>
+		<resource name="contextmenu_capturefullscreen_all">alle</resource>
-		<resource name="contextmenu_capturefullscreen_bottom">undn</resource>
+		<resource name="contextmenu_capturefullscreen_bottom">undn</resource>
-		<resource name="contextmenu_capturefullscreen_left">lings</resource>
+		<resource name="contextmenu_capturefullscreen_left">lings</resource>
-		<resource name="contextmenu_capturefullscreen_right">rechds</resource>
+		<resource name="contextmenu_capturefullscreen_right">rechds</resource>
-		<resource name="contextmenu_capturefullscreen_top">ohm</resource>
+		<resource name="contextmenu_capturefullscreen_top">ohm</resource>
-		<resource name="contextmenu_captureie">Inderned Eggsblohrer abmoln</resource>
+		<resource name="contextmenu_captureie">Inderned Eggsblohrer abmoln</resource>
-		<resource name="contextmenu_captureiefromlist">Inderned Eggsblohrer abmoln</resource>
+		<resource name="contextmenu_captureiefromlist">Inderned Eggsblohrer abmoln</resource>
-		<resource name="contextmenu_capturelastregion">En ledzdn Breich nochamal abmoln</resource>
+		<resource name="contextmenu_capturelastregion">En ledzdn Breich nochamal abmoln</resource>
-		<resource name="contextmenu_capturewindow">Fensder abmoln</resource>
+		<resource name="contextmenu_capturewindow">Fensder abmoln</resource>
-		<resource name="contextmenu_capturewindowfromlist">Fensder aus Lisde abmoln</resource>
+		<resource name="contextmenu_capturewindowfromlist">Fensder aus Lisde abmoln</resource>
-		<resource name="contextmenu_donate">A weng helfn</resource>
+		<resource name="contextmenu_donate">A weng helfn</resource>
-		<resource name="contextmenu_exit">Wech mid dem Misd</resource>
+		<resource name="contextmenu_exit">Wech mid dem Misd</resource>
-		<resource name="contextmenu_help">Hüüülfe!</resource>
+		<resource name="contextmenu_help">Hüüülfe!</resource>
-		<resource name="contextmenu_openfile">Dadei aufmachn</resource>
+		<resource name="contextmenu_openfile">Dadei aufmachn</resource>
-		<resource name="contextmenu_openrecentcapture">Ledzdn Sgrienschod im Eggsblorer ozeing</resource>
+		<resource name="contextmenu_openrecentcapture">Ledzdn Sgrienschod im Eggsblorer ozeing</resource>
-		<resource name="contextmenu_quicksettings">Zaggich rumdogdern</resource>
+		<resource name="contextmenu_quicksettings">Zaggich rumdogdern</resource>
-		<resource name="contextmenu_settings">Rumdogdern...</resource>
+		<resource name="contextmenu_settings">Rumdogdern...</resource>
-		<resource name="destination_exportfailed">Scheiße, des war nix '{0}'. Brobiers hald nochamal.</resource>
+		<resource name="destination_exportfailed">Scheiße, des war nix '{0}'. Brobiers hald nochamal.</resource>
-		<resource name="editor_align_bottom">Undn</resource>
+		<resource name="editor_align_bottom">Undn</resource>
-		<resource name="editor_align_center">Middich</resource>
+		<resource name="editor_align_center">Middich</resource>
-		<resource name="editor_align_horizontal">Lings/Rechds ausrichdna</resource>
+		<resource name="editor_align_horizontal">Lings/Rechds ausrichdna</resource>
-		<resource name="editor_align_left">Lings</resource>
+		<resource name="editor_align_left">Lings</resource>
-		<resource name="editor_align_middle">Middich</resource>
+		<resource name="editor_align_middle">Middich</resource>
-		<resource name="editor_align_right">Rechds</resource>
+		<resource name="editor_align_right">Rechds</resource>
-		<resource name="editor_align_top">Ohm</resource>
+		<resource name="editor_align_top">Ohm</resource>
-		<resource name="editor_align_vertical">Ohm/Undn ausrichdna</resource>
+		<resource name="editor_align_vertical">Ohm/Undn ausrichdna</resource>
-		<resource name="editor_arrange">Anordnen</resource>
+		<resource name="editor_arrange">Anordnen</resource>
-		<resource name="editor_arrowheads">Bfeilschbidzn</resource>
+		<resource name="editor_arrowheads">Bfeilschbidzn</resource>
-		<resource name="editor_arrowheads_both">Beide</resource>
+		<resource name="editor_arrowheads_both">Beide</resource>
-		<resource name="editor_arrowheads_end">Endbungd</resource>
+		<resource name="editor_arrowheads_end">Endbungd</resource>
-		<resource name="editor_arrowheads_none">Kanne</resource>
+		<resource name="editor_arrowheads_none">Kanne</resource>
-		<resource name="editor_arrowheads_start">Anfangsbunkd</resource>
+		<resource name="editor_arrowheads_start">Anfangsbunkd</resource>
-		<resource name="editor_autocrop">Audomadisch zamschneidn</resource>
+		<resource name="editor_autocrop">Audomadisch zamschneidn</resource>
-		<resource name="editor_backcolor">Hindergrundfarm</resource>
+		<resource name="editor_backcolor">Hindergrundfarm</resource>
-		<resource name="editor_blur_radius">Weichzeichner-Rodius</resource>
+		<resource name="editor_blur_radius">Weichzeichner-Rodius</resource>
-		<resource name="editor_bold">Fedd</resource>
+		<resource name="editor_bold">Fedd</resource>
-		<resource name="editor_border">Rohma</resource>
+		<resource name="editor_border">Rohma</resource>
-		<resource name="editor_brightness">Hellichgeid</resource>
+		<resource name="editor_brightness">Hellichgeid</resource>
-		<resource name="editor_cancel">Ahh, doch ned</resource>
+		<resource name="editor_cancel">Ahh, doch ned</resource>
-		<resource name="editor_clipboardfailed">Des woa nix mid der Zwischnablach. Brobiers einfach nochamal.</resource>
+		<resource name="editor_clipboardfailed">Des woa nix mid der Zwischnablach. Brobiers einfach nochamal.</resource>
-		<resource name="editor_close">Wech!</resource>
+		<resource name="editor_close">Wech!</resource>
-		<resource name="editor_close_on_save">Moggsd dei Gschmarri ned schbeichern?</resource>
+		<resource name="editor_close_on_save">Moggsd dei Gschmarri ned schbeichern?</resource>
-		<resource name="editor_close_on_save_title">Bild schbeichern?</resource>
+		<resource name="editor_close_on_save_title">Bild schbeichern?</resource>
-		<resource name="editor_confirm">Fei wärgli!</resource>
+		<resource name="editor_confirm">Fei wärgli!</resource>
-		<resource name="editor_copyimagetoclipboard">Grafig in däi Zwischnblach nei</resource>
+		<resource name="editor_copyimagetoclipboard">Grafig in däi Zwischnblach nei</resource>
-		<resource name="editor_copypathtoclipboard">Bfad in däi Zwischnblach nei</resource>
+		<resource name="editor_copypathtoclipboard">Bfad in däi Zwischnblach nei</resource>
-		<resource name="editor_copytoclipboard">Kobiern</resource>
+		<resource name="editor_copytoclipboard">Kobiern</resource>
-		<resource name="editor_crop">Zamschneidn (C)</resource>
+		<resource name="editor_crop">Zamschneidn (C)</resource>
-		<resource name="editor_cursortool">Angriffln (ESC)</resource>
+		<resource name="editor_cursortool">Angriffln (ESC)</resource>
-		<resource name="editor_cuttoclipboard">Ausschneidn</resource>
+		<resource name="editor_cuttoclipboard">Ausschneidn</resource>
-		<resource name="editor_deleteelement">Wech mid dem Ding!</resource>
+		<resource name="editor_deleteelement">Wech mid dem Ding!</resource>
-		<resource name="editor_downonelevel">Aanz nach hindn</resource>
+		<resource name="editor_downonelevel">Aanz nach hindn</resource>
-		<resource name="editor_downtobottom">Ganz nach hindn</resource>
+		<resource name="editor_downtobottom">Ganz nach hindn</resource>
-		<resource name="editor_drawarrow">An Bfeil moln (A)</resource>
+		<resource name="editor_drawarrow">An Bfeil moln (A)</resource>
-		<resource name="editor_drawellipse">An Greis moln (E)</resource>
+		<resource name="editor_drawellipse">An Greis moln (E)</resource>
-		<resource name="editor_drawfreehand">A weng rumgridzln (F)</resource>
+		<resource name="editor_drawfreehand">A weng rumgridzln (F)</resource>
-		<resource name="editor_drawhighlighter">Hervorheem (H)</resource>
+		<resource name="editor_drawhighlighter">Hervorheem (H)</resource>
-		<resource name="editor_drawline">An Schdrich moln (L)</resource>
+		<resource name="editor_drawline">An Schdrich moln (L)</resource>
-		<resource name="editor_drawrectangle">A Vieregg moln (R)</resource>
+		<resource name="editor_drawrectangle">A Vieregg moln (R)</resource>
-		<resource name="editor_drawtextbox">An Dexd draff schreim (T)</resource>
+		<resource name="editor_drawtextbox">An Dexd draff schreim (T)</resource>
-		<resource name="editor_duplicate">Elemend dubliziern</resource>
+		<resource name="editor_duplicate">Elemend dubliziern</resource>
-		<resource name="editor_edit">Beabbeidn</resource>
+		<resource name="editor_edit">Beabbeidn</resource>
-		<resource name="editor_effects">Effegde</resource>
+		<resource name="editor_effects">Effegde</resource>
-		<resource name="editor_email">I-Mehl</resource>
+		<resource name="editor_email">I-Mehl</resource>
-		<resource name="editor_file">Dadei</resource>
+		<resource name="editor_file">Dadei</resource>
-		<resource name="editor_fontsize">Größe</resource>
+		<resource name="editor_fontsize">Größe</resource>
-		<resource name="editor_forecolor">Rahmafarb</resource>
+		<resource name="editor_forecolor">Rahmafarb</resource>
-		<resource name="editor_grayscale">Grauschdufn</resource>
+		<resource name="editor_grayscale">Grauschdufn</resource>
-		<resource name="editor_highlight_area">Breich hervorheem</resource>
+		<resource name="editor_highlight_area">Breich hervorheem</resource>
-		<resource name="editor_highlight_grayscale">Grauschdufn</resource>
+		<resource name="editor_highlight_grayscale">Grauschdufn</resource>
-		<resource name="editor_highlight_magnify">Vergrößän</resource>
+		<resource name="editor_highlight_magnify">Vergrößän</resource>
-		<resource name="editor_highlight_mode">Hervorheem - Modus</resource>
+		<resource name="editor_highlight_mode">Hervorheem - Modus</resource>
-		<resource name="editor_highlight_text">Dexdmarger</resource>
+		<resource name="editor_highlight_text">Dexdmarger</resource>
-		<resource name="editor_image_shadow">Schaddn</resource>
+		<resource name="editor_image_shadow">Schaddn</resource>
-		<resource name="editor_imagesaved">Do is etz dei Bild: {0}.</resource>
+		<resource name="editor_imagesaved">Do is etz dei Bild: {0}.</resource>
-		<resource name="editor_insertwindow">Fensder nei gladschn</resource>
+		<resource name="editor_insertwindow">Fensder nei gladschn</resource>
-		<resource name="editor_invert">Inverdiern</resource>
+		<resource name="editor_invert">Inverdiern</resource>
-		<resource name="editor_italic">Gusiev</resource>
+		<resource name="editor_italic">Gusiev</resource>
-		<resource name="editor_load_objects">Objegde aus Dadei ladn</resource>
+		<resource name="editor_load_objects">Objegde aus Dadei ladn</resource>
-		<resource name="editor_magnification_factor">Vergrößerungsfagdor</resource>
+		<resource name="editor_magnification_factor">Vergrößerungsfagdor</resource>
-		<resource name="editor_match_capture_size">Anbassen an Aufnahmebereich</resource>
+		<resource name="editor_match_capture_size">Anbassen an Aufnahmebereich</resource>
-		<resource name="editor_obfuscate">Zensiern (O)</resource>
+		<resource name="editor_obfuscate">Zensiern (O)</resource>
-		<resource name="editor_obfuscate_blur">Absofdn</resource>
+		<resource name="editor_obfuscate_blur">Absofdn</resource>
-		<resource name="editor_obfuscate_mode">Zensier - Modus</resource>
+		<resource name="editor_obfuscate_mode">Zensier - Modus</resource>
-		<resource name="editor_obfuscate_pixelize">Verbixln</resource>
+		<resource name="editor_obfuscate_pixelize">Verbixln</resource>
-		<resource name="editor_object">Objegd</resource>
+		<resource name="editor_object">Objegd</resource>
-		<resource name="editor_opendirinexplorer">Verzeichnis im Windous Eggsblorer öffnen</resource>
+		<resource name="editor_opendirinexplorer">Verzeichnis im Windous Eggsblorer öffnen</resource>
-		<resource name="editor_pastefromclipboard">Eifüchn</resource>
+		<resource name="editor_pastefromclipboard">Eifüchn</resource>
-		<resource name="editor_pixel_size">Bixlgröß</resource>
+		<resource name="editor_pixel_size">Bixlgröß</resource>
-		<resource name="editor_preview_quality">Vorschaugwalidäd</resource>
+		<resource name="editor_preview_quality">Vorschaugwalidäd</resource>
-		<resource name="editor_print">Druggn</resource>
+		<resource name="editor_print">Druggn</resource>
-		<resource name="editor_redo">Widderherschdelln {0}</resource>
+		<resource name="editor_redo">Widderherschdelln {0}</resource>
-		<resource name="editor_resetsize">Größe zrüggsedzn</resource>
+		<resource name="editor_resetsize">Größe zrüggsedzn</resource>
-		<resource name="editor_rotateccw">Gechern Uhrzeichersinn drehn</resource>
+		<resource name="editor_rotateccw">Gechern Uhrzeichersinn drehn</resource>
-		<resource name="editor_rotatecw">Im Uhrzeichersinn drehn</resource>
+		<resource name="editor_rotatecw">Im Uhrzeichersinn drehn</resource>
-		<resource name="editor_save">Schbeichern</resource>
+		<resource name="editor_save">Schbeichern</resource>
-		<resource name="editor_save_objects">Objegde in Dadei schbeichern</resource>
+		<resource name="editor_save_objects">Objegde in Dadei schbeichern</resource>
-		<resource name="editor_saveas">Schbeichern under...</resource>
+		<resource name="editor_saveas">Schbeichern under...</resource>
-		<resource name="editor_selectall">Alle Objegde auswähln</resource>
+		<resource name="editor_selectall">Alle Objegde auswähln</resource>
-		<resource name="editor_senttoprinter">Drugger läffd: '{0}'</resource>
+		<resource name="editor_senttoprinter">Drugger läffd: '{0}'</resource>
-		<resource name="editor_shadow">Schaddn An/Aus</resource>
+		<resource name="editor_shadow">Schaddn An/Aus</resource>
-		<resource name="editor_storedtoclipboard">Bild is in der Zwischnablach.</resource>
+		<resource name="editor_storedtoclipboard">Bild is in der Zwischnablach.</resource>
-		<resource name="editor_thickness">Linienschdärge</resource>
+		<resource name="editor_thickness">Linienschdärge</resource>
-		<resource name="editor_title">Greenshot Edidor</resource>
+		<resource name="editor_title">Greenshot Edidor</resource>
-		<resource name="editor_torn_edge">Ausgfranzde Kandn</resource>
+		<resource name="editor_torn_edge">Ausgfranzde Kandn</resource>
-		<resource name="editor_undo">Rüggängich {0}</resource>
+		<resource name="editor_undo">Rüggängich {0}</resource>
-		<resource name="editor_uponelevel">Aanz nach vorn</resource>
+		<resource name="editor_uponelevel">Aanz nach vorn</resource>
-		<resource name="editor_uptotop">Ganz nach vorn</resource>
+		<resource name="editor_uptotop">Ganz nach vorn</resource>
-		<resource name="EmailFormat.MAPI">MAPI Glaiend</resource>
+		<resource name="EmailFormat.MAPI">MAPI Glaiend</resource>
-		<resource name="EmailFormat.OUTLOOK_HTML">Audlugg mid HTML</resource>
+		<resource name="EmailFormat.OUTLOOK_HTML">Audlugg mid HTML</resource>
-		<resource name="EmailFormat.OUTLOOK_TXT">Audlugg mit Dexd</resource>
+		<resource name="EmailFormat.OUTLOOK_TXT">Audlugg mit Dexd</resource>
-		<resource name="error">Scheißdregg</resource>
+		<resource name="error">Scheißdregg</resource>
-		<resource name="error_multipleinstances">Greenshot läffd scho.</resource>
+		<resource name="error_multipleinstances">Greenshot läffd scho.</resource>
-		<resource name="error_nowriteaccess">Es schbeichern hat ned glabbd: {0}
+		<resource name="error_nowriteaccess">Es schbeichern hat ned glabbd: {0}
-Schau hald amal, obsd da übbahabds hi schreim däffsd oder duhs woannersch hi.</resource>
+Schau hald amal, obsd da übbahabds hi schreim däffsd oder duhs woannersch hi.</resource>
-		<resource name="error_openfile">Däi Dadei gäid ned aff: "{0}"</resource>
+		<resource name="error_openfile">Däi Dadei gäid ned aff: "{0}"</resource>
-		<resource name="error_openlink">Der Ling gäid ned aff: '{0}'</resource>
+		<resource name="error_openlink">Der Ling gäid ned aff: '{0}'</resource>
-		<resource name="error_save">Dees woa nix. Schbeichers bidde woannersch hi.</resource>
+		<resource name="error_save">Dees woa nix. Schbeichers bidde woannersch hi.</resource>
-		<resource name="expertsettings">Exbädde</resource>
+		<resource name="expertsettings">Exbädde</resource>
-		<resource name="expertsettings_autoreducecolors">8-Bit-Bilder machn bei wenicher als 256 Farm</resource>
+		<resource name="expertsettings_autoreducecolors">8-Bit-Bilder machn bei wenicher als 256 Farm</resource>
-		<resource name="expertsettings_checkunstableupdates">Auch inschdabile Abdäids anbiedn</resource>
+		<resource name="expertsettings_checkunstableupdates">Auch inschdabile Abdäids anbiedn</resource>
-		<resource name="expertsettings_clipboardformats">Zwischnablach-Formade</resource>
+		<resource name="expertsettings_clipboardformats">Zwischnablach-Formade</resource>
-		<resource name="expertsettings_counter">Werd für ${NUM} im Dadeiname-Musder</resource>
+		<resource name="expertsettings_counter">Werd für ${NUM} im Dadeiname-Musder</resource>
-		<resource name="expertsettings_enableexpert">Ich wass scho was ich mach, du bläide Sau!</resource>
+		<resource name="expertsettings_enableexpert">Ich wass scho was ich mach, du bläide Sau!</resource>
-		<resource name="expertsettings_footerpattern">Undn draff druggn</resource>
+		<resource name="expertsettings_footerpattern">Undn draff druggn</resource>
-		<resource name="expertsettings_minimizememoryfootprint">Schbeicher schbarn (kosd Berformänz - max ned)</resource>
+		<resource name="expertsettings_minimizememoryfootprint">Schbeicher schbarn (kosd Berformänz - max ned)</resource>
-		<resource name="expertsettings_optimizeforrdp">Für Rimoud Desgdob obdimiern</resource>
+		<resource name="expertsettings_optimizeforrdp">Für Rimoud Desgdob obdimiern</resource>
-		<resource name="expertsettings_reuseeditorifpossible">Edidor numol bnudzn wenns gäihd</resource>
+		<resource name="expertsettings_reuseeditorifpossible">Edidor numol bnudzn wenns gäihd</resource>
-		<resource name="expertsettings_suppresssavedialogatclose">Ned nervn beim zumachn vom Edidor</resource>
+		<resource name="expertsettings_suppresssavedialogatclose">Ned nervn beim zumachn vom Edidor</resource>
-		<resource name="expertsettings_thumbnailpreview">Fensder-Vorschau im Gondexdmenü ozeing (für Visda und Windous 7)</resource>
+		<resource name="expertsettings_thumbnailpreview">Fensder-Vorschau im Gondexdmenü ozeing (für Visda und Windous 7)</resource>
-		<resource name="exported_to">Exbordierd nach: {0}</resource>
+		<resource name="exported_to">Exbordierd nach: {0}</resource>
-		<resource name="exported_to_error">Exbord nach {0} is fehlgschlong</resource>
+		<resource name="exported_to_error">Exbord nach {0} is fehlgschlong</resource>
-		<resource name="help_title">Greenshot Hüüülfe</resource>
+		<resource name="help_title">Greenshot Hüüülfe</resource>
-		<resource name="hotkeys">Dasdnküdzl</resource>
+		<resource name="hotkeys">Dasdnküdzl</resource>
-		<resource name="jpegqualitydialog_choosejpegquality">Dschäibeg-Qualidäd auswähln.</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">Dschäibeg-Qualidäd auswähln.</resource>
-		<resource name="OK">Bassd</resource>
+		<resource name="OK">Bassd</resource>
-		<resource name="print_error">Des Druggn hat ned glabbd.</resource>
+		<resource name="print_error">Des Druggn hat ned glabbd.</resource>
-		<resource name="printoptions_allowcenter">Ausdrugg in däi Middn baggn</resource>
+		<resource name="printoptions_allowcenter">Ausdrugg in däi Middn baggn</resource>
-		<resource name="printoptions_allowenlarge">Ausdrugg auf Seidngröß vergrößern</resource>
+		<resource name="printoptions_allowenlarge">Ausdrugg auf Seidngröß vergrößern</resource>
-		<resource name="printoptions_allowrotate">Drehung vom Ausdrugg ans Seidenformad anbassn</resource>
+		<resource name="printoptions_allowrotate">Drehung vom Ausdrugg ans Seidenformad anbassn</resource>
-		<resource name="printoptions_allowshrink">Ausdrugg auf Seidengröß vergleinern</resource>
+		<resource name="printoptions_allowshrink">Ausdrugg auf Seidengröß vergleinern</resource>
-		<resource name="printoptions_dontaskagain">Als Schdandard sbeichern und nimmer nervn</resource>
+		<resource name="printoptions_dontaskagain">Als Schdandard sbeichern und nimmer nervn</resource>
-		<resource name="printoptions_inverted">Farm umkehrn</resource>
+		<resource name="printoptions_inverted">Farm umkehrn</resource>
-		<resource name="printoptions_printgrayscale">Nur grau druggn</resource>
+		<resource name="printoptions_printgrayscale">Nur grau druggn</resource>
-		<resource name="printoptions_timestamp">Dadum und Uhrzeid mid draff gladschn</resource>
+		<resource name="printoptions_timestamp">Dadum und Uhrzeid mid draff gladschn</resource>
-		<resource name="printoptions_title">Greenshot Druggeinschdellungen</resource>
+		<resource name="printoptions_title">Greenshot Druggeinschdellungen</resource>
-		<resource name="qualitydialog_dontaskagain">Als Schdandardgwalidäd schbeichern und nimmer nervn</resource>
+		<resource name="qualitydialog_dontaskagain">Als Schdandardgwalidäd schbeichern und nimmer nervn</resource>
-		<resource name="qualitydialog_title">Greenshot Gwalidäd</resource>
+		<resource name="qualitydialog_title">Greenshot Gwalidäd</resource>
-		<resource name="quicksettings_destination_file">Soford schbeichern (mit bevorzugdn Ausgabedadei-Einschdellungen)</resource>
+		<resource name="quicksettings_destination_file">Soford schbeichern (mit bevorzugdn Ausgabedadei-Einschdellungen)</resource>
-		<resource name="settings_alwaysshowprintoptionsdialog">Druggeinschdellungen vor jeem Ausdrugg ozeing</resource>
+		<resource name="settings_alwaysshowprintoptionsdialog">Druggeinschdellungen vor jeem Ausdrugg ozeing</resource>
-		<resource name="settings_alwaysshowqualitydialog">Gwalidädseinschdellungen vor jeem Schbeichern ozeing</resource>
+		<resource name="settings_alwaysshowqualitydialog">Gwalidädseinschdellungen vor jeem Schbeichern ozeing</resource>
-		<resource name="settings_applicationsettings">Brogrammeinschdellungen</resource>
+		<resource name="settings_applicationsettings">Brogrammeinschdellungen</resource>
-		<resource name="settings_autostartshortcut">Greenshot mit Windous schdaddn</resource>
+		<resource name="settings_autostartshortcut">Greenshot mit Windous schdaddn</resource>
-		<resource name="settings_capture">Abmoln</resource>
+		<resource name="settings_capture">Abmoln</resource>
-		<resource name="settings_capture_mousepointer">Mauszeicher mid abmoln</resource>
+		<resource name="settings_capture_mousepointer">Mauszeicher mid abmoln</resource>
-		<resource name="settings_capture_windows_interactive">Fensder-Deile einzeln abmoln</resource>
+		<resource name="settings_capture_windows_interactive">Fensder-Deile einzeln abmoln</resource>
-		<resource name="settings_checkperiod">Alle X Daache aff Abdäids dschäggn (0=ned dschäggn)</resource>
+		<resource name="settings_checkperiod">Alle X Daache aff Abdäids dschäggn (0=ned dschäggn)</resource>
-		<resource name="settings_configureplugin">Rumdogdern</resource>
+		<resource name="settings_configureplugin">Rumdogdern</resource>
-		<resource name="settings_copypathtoclipboard">Beim schbeichern en Bfad in däi Zwischnablaach baggn.</resource>
+		<resource name="settings_copypathtoclipboard">Beim schbeichern en Bfad in däi Zwischnablaach baggn.</resource>
-		<resource name="settings_destination">Ziele</resource>
+		<resource name="settings_destination">Ziele</resource>
-		<resource name="settings_destination_clipboard">In däi Zwischnablaach</resource>
+		<resource name="settings_destination_clipboard">In däi Zwischnablaach</resource>
-		<resource name="settings_destination_editor">Im Greenshot-Edidor aufmachn</resource>
+		<resource name="settings_destination_editor">Im Greenshot-Edidor aufmachn</resource>
-		<resource name="settings_destination_email">I-Mehl</resource>
+		<resource name="settings_destination_email">I-Mehl</resource>
-		<resource name="settings_destination_file">Sofodd schbeichern</resource>
+		<resource name="settings_destination_file">Sofodd schbeichern</resource>
-		<resource name="settings_destination_fileas">Schbeichern under (mit Dialooch)</resource>
+		<resource name="settings_destination_fileas">Schbeichern under (mit Dialooch)</resource>
-		<resource name="settings_destination_picker">Schdändich froong</resource>
+		<resource name="settings_destination_picker">Schdändich froong</resource>
-		<resource name="settings_destination_printer">An Drugger schiggn</resource>
+		<resource name="settings_destination_printer">An Drugger schiggn</resource>
-		<resource name="settings_editor">Edidor</resource>
+		<resource name="settings_editor">Edidor</resource>
-		<resource name="settings_filenamepattern">Dadeinamen-Musder</resource>
+		<resource name="settings_filenamepattern">Dadeinamen-Musder</resource>
-		<resource name="settings_general">Allgemein</resource>
+		<resource name="settings_general">Allgemein</resource>
-		<resource name="settings_iecapture">Inderned Eggsblorer abmoln</resource>
+		<resource name="settings_iecapture">Inderned Eggsblorer abmoln</resource>
-		<resource name="settings_jpegquality">JPEG-Gwalidäd</resource>
+		<resource name="settings_jpegquality">JPEG-Gwalidäd</resource>
-		<resource name="settings_language">Schbrache</resource>
+		<resource name="settings_language">Schbrache</resource>
-		<resource name="settings_message_filenamepattern">Däi Bladzhalder gibds:
+		<resource name="settings_message_filenamepattern">Däi Bladzhalder gibds:
-${YYYY} Jahr, 4-schdellich
+${YYYY} Jahr, 4-schdellich
-${MM} Monad, 2-schdellich
+${MM} Monad, 2-schdellich
-${DD} Daach, 2-schdellich
+${DD} Daach, 2-schdellich
-${hh} Schdunde, 2-schdellich
+${hh} Schdunde, 2-schdellich
-${mm} Minude, 2-schdellich
+${mm} Minude, 2-schdellich
-${ss} Sekunde, 2-schdellich
+${ss} Sekunde, 2-schdellich
-${NUM} ingremendiernde Zahl, 6-schdellich
+${NUM} ingremendiernde Zahl, 6-schdellich
-${title} Fensderdiddl
+${title} Fensderdiddl
-${user} Windous-Benudzername
+${user} Windous-Benudzername
-${domain} Windous-Domäne
+${domain} Windous-Domäne
-${hostname} Kombjudername
+${hostname} Kombjudername
-
+
-Greenshot kann a Ordner selber ohleeng. 
+Greenshot kann a Ordner selber ohleeng. 
-Wennsd Ordner vom Dadeinamen drennen willsd, nimssd an Beggsläsch \ 
+Wennsd Ordner vom Dadeinamen drennen willsd, nimssd an Beggsläsch \ 
-So hald: ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss} 
+So hald: ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss} 
-Da gibds dann an Ordner fürn agduelln Dooch im Schdandard-Schbeicherord und däi Foddos landn dann da drin und heißn wäi die Uhrzeid.
+Da gibds dann an Ordner fürn agduelln Dooch im Schdandard-Schbeicherord und däi Foddos landn dann da drin und heißn wäi die Uhrzeid.
-z.B. C:\Users\MaxMusdermann\Desgdob\2012-08-13\12-58-32.png</resource>
+z.B. C:\Users\MaxMusdermann\Desgdob\2012-08-13\12-58-32.png</resource>
-		<resource name="settings_network">Nedswerch und Abdäids</resource>
+		<resource name="settings_network">Nedswerch und Abdäids</resource>
-		<resource name="settings_output">Ausgabe</resource>
+		<resource name="settings_output">Ausgabe</resource>
-		<resource name="settings_playsound">Kameradoon abschbieln</resource>
+		<resource name="settings_playsound">Kameradoon abschbieln</resource>
-		<resource name="settings_plugins">Blaggins</resource>
+		<resource name="settings_plugins">Blaggins</resource>
-		<resource name="settings_plugins_createdby">Zammbasdeld vom</resource>
+		<resource name="settings_plugins_createdby">Zammbasdeld vom</resource>
-		<resource name="settings_plugins_dllpath">DLL Bfod</resource>
+		<resource name="settings_plugins_dllpath">DLL Bfod</resource>
-		<resource name="settings_plugins_name">Name</resource>
+		<resource name="settings_plugins_name">Name</resource>
-		<resource name="settings_plugins_version">Väsion</resource>
+		<resource name="settings_plugins_version">Väsion</resource>
-		<resource name="settings_preferredfilesettings">Bevorzugde Ausgabedadei-Einschdellungen</resource>
+		<resource name="settings_preferredfilesettings">Bevorzugde Ausgabedadei-Einschdellungen</resource>
-		<resource name="settings_primaryimageformat">Bildformad</resource>
+		<resource name="settings_primaryimageformat">Bildformad</resource>
-		<resource name="settings_printer">Drugger</resource>
+		<resource name="settings_printer">Drugger</resource>
-		<resource name="settings_printoptions">Druggeinschdellungen</resource>
+		<resource name="settings_printoptions">Druggeinschdellungen</resource>
-		<resource name="settings_qualitysettings">Gwalidädseinschdellungen</resource>
+		<resource name="settings_qualitysettings">Gwalidädseinschdellungen</resource>
-		<resource name="settings_reducecolors">Ned mehr als 256 Farm</resource>
+		<resource name="settings_reducecolors">Ned mehr als 256 Farm</resource>
-		<resource name="settings_registerhotkeys">Globale Dasdnkombis agdiviern</resource>
+		<resource name="settings_registerhotkeys">Globale Dasdnkombis agdiviern</resource>
-		<resource name="settings_showflashlight">Blidslichd ozeing</resource>
+		<resource name="settings_showflashlight">Blidslichd ozeing</resource>
-		<resource name="settings_shownotify">Bnachrichdigunga ozeing</resource>
+		<resource name="settings_shownotify">Bnachrichdigunga ozeing</resource>
-		<resource name="settings_storagelocation">Schbeicherord</resource>
+		<resource name="settings_storagelocation">Schbeicherord</resource>
-		<resource name="settings_title">Rumdogdern</resource>
+		<resource name="settings_title">Rumdogdern</resource>
-		<resource name="settings_tooltip_filenamepattern">Musder für die Dadeinamen beim Schbeichern von Sgrienschods</resource>
+		<resource name="settings_tooltip_filenamepattern">Musder für die Dadeinamen beim Schbeichern von Sgrienschods</resource>
-		<resource name="settings_tooltip_language">Schbrache der Benudzeroberfläche</resource>
+		<resource name="settings_tooltip_language">Schbrache der Benudzeroberfläche</resource>
-		<resource name="settings_tooltip_primaryimageformat">Schdandard Bildformad</resource>
+		<resource name="settings_tooltip_primaryimageformat">Schdandard Bildformad</resource>
-		<resource name="settings_tooltip_registerhotkeys">Wennsd des Häggerla sedzd, wern beim Schdaddn von Greenshot däi Dasdnkürzl Drucken, Strg + Drucken, Alt + Drucken reservierd solang Greenshot läffd.</resource>
+		<resource name="settings_tooltip_registerhotkeys">Wennsd des Häggerla sedzd, wern beim Schdaddn von Greenshot däi Dasdnkürzl Drucken, Strg + Drucken, Alt + Drucken reservierd solang Greenshot läffd.</resource>
-		<resource name="settings_tooltip_storagelocation">Schdandardbfad für Sgrienschods. Leer lassn für Desgdob.</resource>
+		<resource name="settings_tooltip_storagelocation">Schdandardbfad für Sgrienschods. Leer lassn für Desgdob.</resource>
-		<resource name="settings_usedefaultproxy">Schdandard-Broxysörver vom Bedriebssysdem benudzn</resource>
+		<resource name="settings_usedefaultproxy">Schdandard-Broxysörver vom Bedriebssysdem benudzn</resource>
-		<resource name="settings_visualization">Effegde</resource>
+		<resource name="settings_visualization">Effegde</resource>
-		<resource name="settings_waittime">Millisekundn waddn vorm abmoln</resource>
+		<resource name="settings_waittime">Millisekundn waddn vorm abmoln</resource>
-		<resource name="settings_window_capture_mode">Fensder-abmol-Modus</resource>
+		<resource name="settings_window_capture_mode">Fensder-abmol-Modus</resource>
-		<resource name="settings_windowscapture">Fensder abmoln</resource>
+		<resource name="settings_windowscapture">Fensder abmoln</resource>
-		<resource name="tooltip_firststart">Hier rechds gliggn oder die {0} Dasde drüggn.</resource>
+		<resource name="tooltip_firststart">Hier rechds gliggn oder die {0} Dasde drüggn.</resource>
-		<resource name="update_found">Was hasdn du für an aldn Scheiß?! Magsd des neue Greenshot {0} ham?</resource>
+		<resource name="update_found">Was hasdn du für an aldn Scheiß?! Magsd des neue Greenshot {0} ham?</resource>
-		<resource name="wait_ie_capture">Etz watzd an Momend! Des dauerd a weng...</resource>
+		<resource name="wait_ie_capture">Etz watzd an Momend! Des dauerd a weng...</resource>
-		<resource name="warning">Hinweis</resource>
+		<resource name="warning">Hinweis</resource>
-		<resource name="warning_hotkeys">Die globale Dasdnkombi "{0}" konnd ned agdivierd wern. 
+		<resource name="warning_hotkeys">Die globale Dasdnkombi "{0}" konnd ned agdivierd wern. 
-Warscheinli hoggd irgend so a andrer Debb draff. 
+Warscheinli hoggd irgend so a andrer Debb draff. 
-Endweder ändersd die Dasdnkombi für Greenshot, oder du bisd a Mann und findsd die Sau!
+Endweder ändersd die Dasdnkombi für Greenshot, oder du bisd a Mann und findsd die Sau!
-
+
-Wennsd mogsd, kannsd nadürlich a einfach es Gondexdmenü nehmen (des grüne G rechds undn).</resource>
+Wennsd mogsd, kannsd nadürlich a einfach es Gondexdmenü nehmen (des grüne G rechds undn).</resource>
-		<resource name="WindowCaptureMode.Aero">Selber a Farm aussuchn</resource>
+		<resource name="WindowCaptureMode.Aero">Selber a Farm aussuchn</resource>
-		<resource name="WindowCaptureMode.AeroTransparent">Dransbarens erhaldn</resource>
+		<resource name="WindowCaptureMode.AeroTransparent">Dransbarens erhaldn</resource>
-		<resource name="WindowCaptureMode.Auto">Audomadisch</resource>
+		<resource name="WindowCaptureMode.Auto">Audomadisch</resource>
-		<resource name="WindowCaptureMode.GDI">Schdandardfarm benudzn</resource>
+		<resource name="WindowCaptureMode.GDI">Schdandardfarm benudzn</resource>
-		<resource name="WindowCaptureMode.Screen">Wäisd es siggsd</resource>
+		<resource name="WindowCaptureMode.Screen">Wäisd es siggsd</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-et-EE.xml

@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<language description="Eesti" ietf="et-EE" version="1.1.4" languagegroup="2">
+	<resources>
+		<resource name="about_bugs">Palun saatke veateated</resource>
+		<resource name="about_donations">Greenshoti kasutamismugavust ja arendust saate toetada siin:</resource>
+		<resource name="about_host">Greenshot asub portaalis sourceforge.net</resource>
+		<resource name="about_icons">Yusuke Kamiyamane on ikoonide tegija Fugue ikooni paketist (Creative Commons Attribution 3.0 litsents)</resource>
+		<resource name="about_license">Copyright (C) 2007-2013 Thomas Braun, Jens Klingen, Robin Krom
+Greenshot ei paku GARANTIID. See on vabaravaline programm ja Te võite seda levitava vabalt teatud tingimuste alusel.
+Lisainfo GNU Põhilise Avaliku Litsentsi kohta:</resource>
+		<resource name="about_title">Info Greenshoti kohta</resource>
+		<resource name="application_title">Greenshot - revolutsiooniline kuvatõmmise tööriist</resource>
+		<resource name="bugreport_cancel">Sulge</resource>
+		<resource name="bugreport_info">Vabandust aga ilmnes tundmatu viga.
+
+Hea uudis on: saate meil aidata seda eemaldada saates meile veateate.
+Uue veateate  teavitamiseks, palun külastage kõrvalolevat URLi ja tekstialalt asetage sisu kirjeldusse. 
+
+Vea paremaks parandamiseks lisage palun arusaadav kokkuvõte veast ja lisage ka pisidetailid.
+Me oleksime väga tänulik, kui te enne kontrolliksite, ega sellest veast pole juba teavitatud. (Postituse kiiresti leidmiseks kasutage otsingut.) Aitäh :)</resource>
+		<resource name="bugreport_title">Viga</resource>
+		<resource name="CANCEL">Loobu</resource>
+		<resource name="clipboard_error">Lõikelauale kirjutamisel ilmnes ootamatu viga.</resource>
+		<resource name="clipboard_inuse">Greenshot ei suutnud lõikelauale kirjutada, sest {0} protsess blokeeris ligipääsu.</resource>
+		<resource name="clipboard_noimage">Lõikelaua pilti ei leitud.</resource>
+		<resource name="ClipboardFormat.BITMAP">Windowsi pisipilt</resource>
+		<resource name="ClipboardFormat.DIB">Seadme isesesev pisipilt (DIB)</resource>
+		<resource name="ClipboardFormat.HTML">HTML</resource>
+		<resource name="ClipboardFormat.HTMLDATAURL">HTML koos tekstisisese pildiga</resource>
+		<resource name="ClipboardFormat.PNG">PNG</resource>
+		<resource name="colorpicker_alpha">Alpha</resource>
+		<resource name="colorpicker_apply">Kinnita</resource>
+		<resource name="colorpicker_blue">Sinine</resource>
+		<resource name="colorpicker_green">Roheline</resource>
+		<resource name="colorpicker_htmlcolor">HTMLi värv</resource>
+		<resource name="colorpicker_recentcolors">Viimati kasutatud värvid</resource>
+		<resource name="colorpicker_red">Punane</resource>
+		<resource name="colorpicker_title">Värvivalik</resource>
+		<resource name="colorpicker_transparent">Läbipaistvus</resource>
+		<resource name="com_rejected">Greenshotile keelas ligipääsu sihtkoht {0}, arvatavasti on dialoog avatud. Sulgege dialoog ja proovige uuesti.</resource>
+		<resource name="com_rejected_title">Greenshotile keelati ligipääs</resource>
+		<resource name="config_unauthorizedaccess_write">Greenshoti seadistusfaili ei suudetud salvestada. Palun kontrollige '{0}' ligipääsu seadmeid.</resource>
+		<resource name="contextmenu_about">Info Greenshoti kohta</resource>
+		<resource name="contextmenu_capturearea">Haarake teatud regioon</resource>
+		<resource name="contextmenu_captureclipboard">Avage pilt lõikelaualt</resource>
+		<resource name="contextmenu_capturefullscreen">Haarake kogu ekraan</resource>
+		<resource name="contextmenu_capturefullscreen_all">kõik</resource>
+		<resource name="contextmenu_capturefullscreen_bottom">alt</resource>
+		<resource name="contextmenu_capturefullscreen_left">vasakult</resource>
+		<resource name="contextmenu_capturefullscreen_right">paremalt</resource>
+		<resource name="contextmenu_capturefullscreen_top">ülevalt</resource>
+		<resource name="contextmenu_captureie">Haarake Internet Explorer</resource>
+		<resource name="contextmenu_captureiefromlist">Haarake Internet Explorer loendist</resource>
+		<resource name="contextmenu_capturelastregion">Haarake hiljutine regioon</resource>
+		<resource name="contextmenu_capturewindow">Haarake aken</resource>
+		<resource name="contextmenu_capturewindowfromlist">Haarake aken loendist</resource>
+		<resource name="contextmenu_donate">Toetage Greenshoti</resource>
+		<resource name="contextmenu_exit">Välju</resource>
+		<resource name="contextmenu_help">Abi</resource>
+		<resource name="contextmenu_openfile">Avage pilt failist</resource>
+		<resource name="contextmenu_openrecentcapture">Avage viimane haaratud asukoht</resource>
+		<resource name="contextmenu_quicksettings">Kiirsätted</resource>
+		<resource name="contextmenu_settings">Eelistused...</resource>
+		<resource name="destination_exportfailed">{0}-le saatmisel ilmnes viga. Palun proovige uuesti.</resource>
+		<resource name="editor_align_bottom">All</resource>
+		<resource name="editor_align_center">Keskel</resource>
+		<resource name="editor_align_horizontal">Horisontaalne joondus</resource>
+		<resource name="editor_align_left">Vasak</resource>
+		<resource name="editor_align_middle">Keskel</resource>
+		<resource name="editor_align_right">Parem</resource>
+		<resource name="editor_align_top">Üleval</resource>
+		<resource name="editor_align_vertical">Vertikaaljoondus</resource>
+		<resource name="editor_arrange">Korrasta</resource>
+		<resource name="editor_arrowheads">Noolepead</resource>
+		<resource name="editor_arrowheads_both">Mõlemad</resource>
+		<resource name="editor_arrowheads_end">Lõpppunkt</resource>
+		<resource name="editor_arrowheads_none">Tühi</resource>
+		<resource name="editor_arrowheads_start">Alguspunkt</resource>
+		<resource name="editor_autocrop">Automaatne lõikus</resource>
+		<resource name="editor_backcolor">Täitke värviga</resource>
+		<resource name="editor_blur_radius">Uduse ala raadius</resource>
+		<resource name="editor_bold">Paks</resource>
+		<resource name="editor_border">Äär</resource>
+		<resource name="editor_brightness">Heledus</resource>
+		<resource name="editor_cancel">Loobu</resource>
+		<resource name="editor_clipboardfailed">Lõikelaua kasutamisel ilmnes viga. Palun proovi uuesti.</resource>
+		<resource name="editor_close">Sulge</resource>
+		<resource name="editor_close_on_save">Kas te tahate salvestada kuvatõmmist?</resource>
+		<resource name="editor_close_on_save_title">Salvestage pilt?</resource>
+		<resource name="editor_confirm">Kinnitan</resource>
+		<resource name="editor_copyimagetoclipboard">Kopeerige pilt lõikelauale</resource>
+		<resource name="editor_copypathtoclipboard">Kopeerige asukoht lõikelauale</resource>
+		<resource name="editor_copytoclipboard">Kopeeri</resource>
+		<resource name="editor_crop">Lõika (C)</resource>
+		<resource name="editor_cursortool">Valiku tööriist (ESC)</resource>
+		<resource name="editor_cuttoclipboard">Lõika</resource>
+		<resource name="editor_deleteelement">Kustuta</resource>
+		<resource name="editor_downonelevel">Samm allapoole</resource>
+		<resource name="editor_downtobottom">Samm lõppu</resource>
+		<resource name="editor_drawarrow">Joonista nool (A)</resource>
+		<resource name="editor_drawellipse">Joonistage ellip (E)</resource>
+		<resource name="editor_drawfreehand">Joonistage vaba käega (F)</resource>
+		<resource name="editor_drawhighlighter">Tooge esile (H)</resource>
+		<resource name="editor_drawline">Joonistage joon (L)</resource>
+		<resource name="editor_drawrectangle">Joonistage ristkülik (R)</resource>
+		<resource name="editor_drawtextbox">Lisage tekstikast (T)</resource>
+		<resource name="editor_dropshadow_darkness">Varjutav tugevus</resource>
+		<resource name="editor_dropshadow_offset">Varju tasakaalustamine</resource>
+		<resource name="editor_dropshadow_settings">Langeva varju seaded</resource>
+		<resource name="editor_dropshadow_thickness">Varju paksus</resource>
+		<resource name="editor_duplicate">Tehke valitud elemendist koopia</resource>
+		<resource name="editor_edit">Muutke</resource>
+		<resource name="editor_effects">Efektid</resource>
+		<resource name="editor_email">E-post</resource>
+		<resource name="editor_file">Fail</resource>
+		<resource name="editor_fontsize">Suurus</resource>
+		<resource name="editor_forecolor">Joone värv</resource>
+		<resource name="editor_grayscale">Halli skaala</resource>
+		<resource name="editor_highlight_area">Tooge esiplaanile</resource>
+		<resource name="editor_highlight_grayscale">Hall skaala</resource>
+		<resource name="editor_highlight_magnify">Suurendamine</resource>
+		<resource name="editor_highlight_mode">Tõstke esile</resource>
+		<resource name="editor_highlight_text">Tõstke esile teksti</resource>
+		<resource name="editor_image_shadow">Langev vari</resource>
+		<resource name="editor_imagesaved">Pilt salvestati {0}.</resource>
+		<resource name="editor_insertwindow">Sisestage aken</resource>
+		<resource name="editor_invert">Võtke tegevus tagasi</resource>
+		<resource name="editor_italic">Kaldkiri</resource>
+		<resource name="editor_load_objects">Laadige objektid failist</resource>
+		<resource name="editor_magnification_factor">Suurendusfaktor</resource>
+		<resource name="editor_match_capture_size">Katke haaratava ala suurus</resource>
+		<resource name="editor_obfuscate">Varjutage (O)</resource>
+		<resource name="editor_obfuscate_blur">Udune ala</resource>
+		<resource name="editor_obfuscate_mode">Varjus olev ala</resource>
+		<resource name="editor_obfuscate_pixelize">Mosaiik</resource>
+		<resource name="editor_object">Objekt</resource>
+		<resource name="editor_opendirinexplorer">Avage asukoht Windows Exploreriga</resource>
+		<resource name="editor_pastefromclipboard">Asetage</resource>
+		<resource name="editor_pixel_size">Piksli suurus</resource>
+		<resource name="editor_preview_quality">Eelvaate kvaliteet</resource>
+		<resource name="editor_print">Printige</resource>
+		<resource name="editor_redo">Tehke uuesti {0}</resource>
+		<resource name="editor_resetsize">Taastage normaalne suurus</resource>
+		<resource name="editor_resize_percent">Protsent</resource>
+		<resource name="editor_resize_pixel">Pikslid</resource>
+		<resource name="editor_rotateccw">Pöörake loendurit päripäeva (Control + ,)</resource>
+		<resource name="editor_rotatecw">Pöörake päripäeva (Control + .)</resource>
+		<resource name="editor_save">Salvesta</resource>
+		<resource name="editor_save_objects">Salvestage objektid faili</resource>
+		<resource name="editor_saveas">Salvestage nimega...</resource>
+		<resource name="editor_selectall">Valige kõik</resource>
+		<resource name="editor_senttoprinter">Printimiskäsklus saadeti '{0}'.</resource>
+		<resource name="editor_shadow">Langev vari</resource>
+		<resource name="editor_storedtoclipboard">Pilt taastati lõikelauale.</resource>
+		<resource name="editor_thickness">Joone paksus</resource>
+		<resource name="editor_title">Greenshoti pildihaldur</resource>
+		<resource name="editor_torn_edge">Rebenev äär</resource>
+		<resource name="editor_tornedge_horizontaltoothrange">Horisontaalne hammasvahemik</resource>
+		<resource name="editor_tornedge_settings">Rebeneva ääre seaded</resource>
+		<resource name="editor_tornedge_toothsize">Rebenemise suurus</resource>
+		<resource name="editor_tornedge_verticaltoothrange">Vertikaalne hambavahemik</resource>
+		<resource name="editor_undo">Võtke tagasi {0}</resource>
+		<resource name="editor_uponelevel">Aste ülespoole</resource>
+		<resource name="editor_uptotop">Kuni ülesse äärde</resource>
+		<resource name="EmailFormat.MAPI">MAPI klient</resource>
+		<resource name="EmailFormat.OUTLOOK_HTML">Outlook koos HTML-iga</resource>
+		<resource name="EmailFormat.OUTLOOK_TXT">Outlook koos tekstiga</resource>
+		<resource name="error">Viga</resource>
+		<resource name="error_multipleinstances">Greenshot on juba käivitatud.</resource>
+		<resource name="error_nowriteaccess">Faili ei suudetud salvestada {0}.
+Palun kontrollige valitud hoiuala kirjutamisõigust.</resource>
+		<resource name="error_openfile">"{0}" ei suudetud avada.</resource>
+		<resource name="error_openlink">Ei suudetud avada '{0}'.</resource>
+		<resource name="error_save">Ei suudetud salvestada kuvatõmmist, palun valige sobivam asukoht.</resource>
+		<resource name="expertsettings">Ekspert</resource>
+		<resource name="expertsettings_autoreducecolors">Looge 8-bitine pilt, kui värvid on väiksemad kui 256 ja 8 bitisel pildil</resource>
+		<resource name="expertsettings_checkunstableupdates">Kontrollige testimisel olevaid uuendusi</resource>
+		<resource name="expertsettings_clipboardformats">Lõikelaua formaadid</resource>
+		<resource name="expertsettings_counter">${NUM} number failinime atribuutides</resource>
+		<resource name="expertsettings_enableexpert">Ma tean, mida ma teen!</resource>
+		<resource name="expertsettings_footerpattern">Printeri alumine muster</resource>
+		<resource name="expertsettings_minimizememoryfootprint">Vähendage mälu alumist mustrit aga koos jõudluse langusega (ei soovitata).</resource>
+		<resource name="expertsettings_optimizeforrdp">Väliste töölaudade kasutamiseks tehke vajalikud optimiseeringud</resource>
+		<resource name="expertsettings_reuseeditorifpossible">Kui võimalik, taaskasutage kohandajat</resource>
+		<resource name="expertsettings_suppresssavedialogatclose">Kohandaja sulgemisel pressige kokku salvestatud dialoog</resource>
+		<resource name="expertsettings_thumbnailpreview">Kuvage kontekstimenüüs pisipildid aknast (Vista ja windows 7 jaoks)</resource>
+		<resource name="exported_to">Eksporditud: {0}</resource>
+		<resource name="exported_to_error">Eksportimisel {0} tekkis viga:</resource>
+		<resource name="help_title">Greenshoti abi</resource>
+		<resource name="hotkeys">Kiirklahvid</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">Palun valige oma pildile JPEG kvaliteet.</resource>
+		<resource name="OK">Ok</resource>
+		<resource name="print_error">Printimisel tekkis viga.</resource>
+		<resource name="printoptions_allowcenter">Printige lehe keskele</resource>
+		<resource name="printoptions_allowenlarge">Suurendage printimise ala, et pilt kattuks paberi suurusega</resource>
+		<resource name="printoptions_allowrotate">Pöörake pilti paberi suuna järgi</resource>
+		<resource name="printoptions_allowshrink">Vähendage pilti, et see mahuks paberile</resource>
+		<resource name="printoptions_colors">Värvi seaded</resource>
+		<resource name="printoptions_dontaskagain">Salvestage need valikud tavaseadetena ja ärge enam küsige</resource>
+		<resource name="printoptions_inverted">Printige ümberpööratud värvidega</resource>
+		<resource name="printoptions_layout">Lehekülje välimuse seaded</resource>
+		<resource name="printoptions_printcolor">Täielik värviline printimine</resource>
+		<resource name="printoptions_printgrayscale">Sundige printimist hallil skaalal</resource>
+		<resource name="printoptions_printmonochrome">Sundige must/valget printimist</resource>
+		<resource name="printoptions_timestamp">Printige kuupäev / aeg lehekülje alla</resource>
+		<resource name="printoptions_title">Greenshoti printimisvalikud</resource>
+		<resource name="qualitydialog_dontaskagain">Salvestage need valikud tavaseadetena ja ärge enam küsige</resource>
+		<resource name="qualitydialog_title">Greenshoti kvaliteet</resource>
+		<resource name="quicksettings_destination_file">Salvestage otse (kasutades selleks eelistatud faili väljundi seadeid)</resource>
+		<resource name="settings_alwaysshowprintoptionsdialog">Igal printimiskorral kuvage printimise valikute dialoog</resource>
+		<resource name="settings_alwaysshowqualitydialog">Igal pildi salvestamise korral kuvage kvaliteedi dialoog</resource>
+		<resource name="settings_applicationsettings">Rakenduse seaded</resource>
+		<resource name="settings_autostartshortcut">Käivitage Greenshot koos Windowsiga</resource>
+		<resource name="settings_capture">Haarake</resource>
+		<resource name="settings_capture_mousepointer">Haarake hiirenool</resource>
+		<resource name="settings_capture_windows_interactive">Kasutage interaktiivset akna haaramismeetodit</resource>
+		<resource name="settings_checkperiod">Uuendamise intervall (0=uuendamist ei toimu)</resource>
+		<resource name="settings_configureplugin">Seadistage</resource>
+		<resource name="settings_copypathtoclipboard">Iga pildi salvestamisega kopeerige faili asukoht lõikelauale</resource>
+		<resource name="settings_destination">Asukoht</resource>
+		<resource name="settings_destination_clipboard">Kopeerige lõikelauale</resource>
+		<resource name="settings_destination_editor">Avage pildihalduris</resource>
+		<resource name="settings_destination_email">E-post</resource>
+		<resource name="settings_destination_file">Salvestage otse (kasutades kõrvalolevaid seadeid)</resource>
+		<resource name="settings_destination_fileas">Salvestega nimega (dialoogi kuvamin)</resource>
+		<resource name="settings_destination_picker">Valige asukoht dünaamiliselt</resource>
+		<resource name="settings_destination_printer">Saatke printerisse</resource>
+		<resource name="settings_editor">Kohandaja</resource>
+		<resource name="settings_filenamepattern">Faili nime atribuudid</resource>
+		<resource name="settings_general">Põhiline</resource>
+		<resource name="settings_iecapture">Internet Exploreri haaramine</resource>
+		<resource name="settings_jpegquality">JPEG kvaliteet</resource>
+		<resource name="settings_language">Keel</resource>
+		<resource name="settings_message_filenamepattern">See kohatäitja täidetakse automaatselt defineeritud mustris:
+${YYYY} aasta, 4 numbrit
+${MM} kuu, 2 numbrit
+${DD} päev, 2 numbrit
+${hh} tund, 2 numbrit
+${mm} minut, 2 numbrit
+${ss} sekund, 2 numbrit
+${NUM} suurenev number, 6 numbrit
+${title} Akna pealkiri
+${user} Windowsi kasutaja
+${domain} Windowsi domeen
+${hostname} Arvuti nimi
+
+Greenshotiga on võimalik asukohti salvestada dünaamiliselt, selleks kasutage kaldkriipsu (\), et kaustad ja faili nimi oleks eraldatud.
+Näiteks: Kohatäitja ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss}
+loob praeguse päeva jaoks kausta Teie sihtkausta, nt 2008-06-29, kuvatõmmise faili nimi on tuletatud praegusest
+kellaajast, nt 11_58_32 (lisaks seadetes määratud laiend)</resource>
+		<resource name="settings_network">Võrk ja uuendused</resource>
+		<resource name="settings_output">Väljund</resource>
+		<resource name="settings_playsound">Esitage kaamera heli</resource>
+		<resource name="settings_plugins">Laiendid</resource>
+		<resource name="settings_plugins_createdby">Laiendi omanik</resource>
+		<resource name="settings_plugins_dllpath">DLLi asukoht</resource>
+		<resource name="settings_plugins_name">Nimi</resource>
+		<resource name="settings_plugins_version">Versioon</resource>
+		<resource name="settings_preferredfilesettings">Eelistatud väljundi seade</resource>
+		<resource name="settings_primaryimageformat">Pildi formaat</resource>
+		<resource name="settings_printer">Printer</resource>
+		<resource name="settings_printoptions">Printimisvalikud</resource>
+		<resource name="settings_qualitysettings">Kvaliteedi seaded</resource>
+		<resource name="settings_reducecolors">Vähendage värvide arvu 256ni</resource>
+		<resource name="settings_registerhotkeys">Registreerige kiirklahvid</resource>
+		<resource name="settings_showflashlight">Kuvage välklamp</resource>
+		<resource name="settings_shownotify">Kuvage teateid</resource>
+		<resource name="settings_storagelocation">Hoiuse asukoht</resource>
+		<resource name="settings_title">Seaded</resource>
+		<resource name="settings_tooltip_filenamepattern">Kuvatõmmiste salvestamise ajal kasutatav atribuut</resource>
+		<resource name="settings_tooltip_language">Greenshoti kasutajaliidese keel</resource>
+		<resource name="settings_tooltip_primaryimageformat">Kasutatav pildiformaat</resource>
+		<resource name="settings_tooltip_registerhotkeys">Määrab, kas kiirklahvid Prnt, Ctrl + Print, Alt + Prnt on jäetud Greenshoti programmi käivitumise ajast kuni programmist väljumiseni.</resource>
+		<resource name="settings_tooltip_storagelocation">Kuvatõmmiste asukoht (töölauale salvestamise soovil jätke see tühjaks)</resource>
+		<resource name="settings_usedefaultproxy">Kasutage süsteemi proksit</resource>
+		<resource name="settings_visualization">Efektid</resource>
+		<resource name="settings_waittime">Pildi tegemise ooteaeg millisekundites</resource>
+		<resource name="settings_window_capture_mode">Akna haaramise meetod</resource>
+		<resource name="settings_windowscapture">Akna pildistamine</resource>
+		<resource name="settings_zoom">Kuvage suurendaja</resource>
+		<resource name="tooltip_firststart">Tehke parem-klõps siia või vajutage klahvi {0}.</resource>
+		<resource name="update_found">reenshoti uuem versioon on saadaval! Kas te soovite alla laadida Greenshot {0}?</resource>
+		<resource name="wait_ie_capture">Palun oodake, kui pilti Internet Exploreris tehakse...</resource>
+		<resource name="warning">Hoiatus</resource>
+		<resource name="warning_hotkeys">Kiirklahv(e) "{0}" ei suudetud registreerida. Teine tööriist väidab kasutavat sama(u) kiirklahvi(e)! Muutke või deaktiviseerige kiirklahv(id).
+
+Kõik Greenshoti lisad töötavad süsteemisalvest ilma kiirklahvide olemasoluta.</resource>
+		<resource name="WindowCaptureMode.Aero">Kasutage kohandatud värvi</resource>
+		<resource name="WindowCaptureMode.AeroTransparent">Säilitage läbipaistvus</resource>
+		<resource name="WindowCaptureMode.Auto">Automaatselt</resource>
+		<resource name="WindowCaptureMode.GDI">Kasutage tavalist värvi</resource>
+		<resource name="WindowCaptureMode.Screen">Nagu kuvatud</resource>
+	</resources>
+</language>

Greenshot/Languages/language-fa-IR.xml

@@ -1,203 +1,203 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="پارسی" ietf="fa-IR" version="1.0.0" languagegroup="d">
+<language description="پارسی" ietf="fa-IR" version="1.0.0" languagegroup="d">
-	<resources>
+	<resources>
-		<resource name="about_bugs">:لطفا مشکلات این نرم افزار را به این آدرس گزارش دهید</resource>
+		<resource name="about_bugs">:لطفا مشکلات این نرم افزار را به این آدرس گزارش دهید</resource>
-		<resource name="about_donations">:اگر از گرین شات خوشتان آماده و علاقه مند به پشتیبانی هستید</resource>
+		<resource name="about_donations">:اگر از گرین شات خوشتان آماده و علاقه مند به پشتیبانی هستید</resource>
-		<resource name="about_host">:جایگاه بارگذاری گرین شات در سورس فورج.نت</resource>
+		<resource name="about_host">:جایگاه بارگذاری گرین شات در سورس فورج.نت</resource>
-		<resource name="about_icons">(Creative Commons Attribution 3.0 license)  آیکنها ازمجموعه آیکنهای  یوسوکه کامیامانه</resource>
+		<resource name="about_icons">(Creative Commons Attribution 3.0 license)  آیکنها ازمجموعه آیکنهای  یوسوکه کامیامانه</resource>
-		<resource name="about_license">توماس براون، جنز کلینگن، رابین کروم                  (C) حق پخش ۲۰۰۷  ـ   ۲۰۱۰   
+		<resource name="about_license">توماس براون، جنز کلینگن، رابین کروم                  (C) حق پخش ۲۰۰۷  ـ   ۲۰۱۰   
-         .گرین شات گارانتی ندارد. این یک نرم افزار رایگان میباشد و میتوان آنرا در برخی شرایط دوباره پخش نمود   
+         .گرین شات گارانتی ندارد. این یک نرم افزار رایگان میباشد و میتوان آنرا در برخی شرایط دوباره پخش نمود   
-                                :اطلاعات بیشتر در مورد استفاده و پخش</resource>
+                                :اطلاعات بیشتر در مورد استفاده و پخش</resource>
-		<resource name="about_title">درباره گریین شات</resource>
+		<resource name="about_title">درباره گریین شات</resource>
-		<resource name="application_title">گرین شات ـ ابزار نمونه برداری از تصویر</resource>
+		<resource name="application_title">گرین شات ـ ابزار نمونه برداری از تصویر</resource>
-		<resource name="bugreport_cancel">بستن</resource>
+		<resource name="bugreport_cancel">بستن</resource>
-		<resource name="bugreport_info">مشکل
+		<resource name="bugreport_info">مشکل
-
+
-               خبر خوب این است که  : شما می توانید با پر کردن یک گزارش اشکال، در حل آن اشکال به ما کمک کنید    
+               خبر خوب این است که  : شما می توانید با پر کردن یک گزارش اشکال، در حل آن اشکال به ما کمک کنید    
-
+
- زیر، ایجاد یک گزارش اشکال جدید و چسباندن مطالب از منطقه متن را به شرح.لطفا URL
+ زیر، ایجاد یک گزارش اشکال جدید و چسباندن مطالب از منطقه متن را به شرح.لطفا URL
-
+
-لطفا خلاصه ای معنادار و در جوف قرار دادن هر گونه اطلاعات شما در نظر می شود مفید برای بازتولید مسئله.
+لطفا خلاصه ای معنادار و در جوف قرار دادن هر گونه اطلاعات شما در نظر می شود مفید برای بازتولید مسئله.
-همچنین، ما بسیار خواهد بود اگر شما بررسی اینکه آیا یک آیتم ردگیر در حال حاضر برای این اشکال وجود دارد قدردانی. (شما می توانید به جستجو برای پیدا کردن کسانی که به سرعت استفاده کنید) با تشکر از شما :)</resource>
+همچنین، ما بسیار خواهد بود اگر شما بررسی اینکه آیا یک آیتم ردگیر در حال حاضر برای این اشکال وجود دارد قدردانی. (شما می توانید به جستجو برای پیدا کردن کسانی که به سرعت استفاده کنید) با تشکر از شما :)</resource>
-		<resource name="bugreport_title">اشتباه</resource>
+		<resource name="bugreport_title">اشتباه</resource>
-		<resource name="clipboard_error">.مشکل ذخیره سازی در حافظه موقت</resource>
+		<resource name="clipboard_error">.مشکل ذخیره سازی در حافظه موقت</resource>
-		<resource name="clipboard_inuse">.بدلیل مسدود شدن دسترسی توسط روند   {0} ، ذخیره سازی در حافظه موقت امکانپذیر نمی باشد</resource>
+		<resource name="clipboard_inuse">.بدلیل مسدود شدن دسترسی توسط روند   {0} ، ذخیره سازی در حافظه موقت امکانپذیر نمی باشد</resource>
-		<resource name="colorpicker_alpha">غلظت</resource>
+		<resource name="colorpicker_alpha">غلظت</resource>
-		<resource name="colorpicker_apply">بکار ببر</resource>
+		<resource name="colorpicker_apply">بکار ببر</resource>
-		<resource name="colorpicker_blue">آبی</resource>
+		<resource name="colorpicker_blue">آبی</resource>
-		<resource name="colorpicker_green">سبز</resource>
+		<resource name="colorpicker_green">سبز</resource>
-		<resource name="colorpicker_htmlcolor">HTML رنگ</resource>
+		<resource name="colorpicker_htmlcolor">HTML رنگ</resource>
-		<resource name="colorpicker_recentcolors">آخرین رنگهای استفاده شده</resource>
+		<resource name="colorpicker_recentcolors">آخرین رنگهای استفاده شده</resource>
-		<resource name="colorpicker_red">قرمز</resource>
+		<resource name="colorpicker_red">قرمز</resource>
-		<resource name="colorpicker_title">نمونه بردار رنگ</resource>
+		<resource name="colorpicker_title">نمونه بردار رنگ</resource>
-		<resource name="colorpicker_transparent">پشت نما</resource>
+		<resource name="colorpicker_transparent">پشت نما</resource>
-		<resource name="config_unauthorizedaccess_write">ذخیره تنظیمات گریین شاتامکان پذیر نمی باشد. لطفا مجوز دسترسی به    '{0}'   را بررسی نمایید
+		<resource name="config_unauthorizedaccess_write">ذخیره تنظیمات گریین شاتامکان پذیر نمی باشد. لطفا مجوز دسترسی به    '{0}'   را بررسی نمایید
-		
+		
-Could not save Greenshot's configuration file. Please check access permissions for '{0}'.</resource>
+Could not save Greenshot's configuration file. Please check access permissions for '{0}'.</resource>
-		<resource name="contextmenu_about">درباره گرین شات</resource>
+		<resource name="contextmenu_about">درباره گرین شات</resource>
-		<resource name="contextmenu_capturearea">نمونه برداری از یک  ناحیه</resource>
+		<resource name="contextmenu_capturearea">نمونه برداری از یک  ناحیه</resource>
-		<resource name="contextmenu_captureclipboard">بازکردن تصویراز حافظه موقت</resource>
+		<resource name="contextmenu_captureclipboard">بازکردن تصویراز حافظه موقت</resource>
-		<resource name="contextmenu_capturefullscreen">نمونه برداری ازتمام صفحه</resource>
+		<resource name="contextmenu_capturefullscreen">نمونه برداری ازتمام صفحه</resource>
-		<resource name="contextmenu_capturelastregion">نمونه برداری ازآخرین ناحیه</resource>
+		<resource name="contextmenu_capturelastregion">نمونه برداری ازآخرین ناحیه</resource>
-		<resource name="contextmenu_capturewindow">نمونه برداری از یک  پنجره</resource>
+		<resource name="contextmenu_capturewindow">نمونه برداری از یک  پنجره</resource>
-		<resource name="contextmenu_donate">پشتیبانی نمودن گرین شات</resource>
+		<resource name="contextmenu_donate">پشتیبانی نمودن گرین شات</resource>
-		<resource name="contextmenu_exit">بستن</resource>
+		<resource name="contextmenu_exit">بستن</resource>
-		<resource name="contextmenu_help">راهنمایی</resource>
+		<resource name="contextmenu_help">راهنمایی</resource>
-		<resource name="contextmenu_openfile">بازکردن تصویراز پوشه</resource>
+		<resource name="contextmenu_openfile">بازکردن تصویراز پوشه</resource>
-		<resource name="contextmenu_quicksettings">تنظیمات فوری</resource>
+		<resource name="contextmenu_quicksettings">تنظیمات فوری</resource>
-		<resource name="contextmenu_settings">...تنظیمات</resource>
+		<resource name="contextmenu_settings">...تنظیمات</resource>
-		<resource name="editor_arrange">مرتب کردن</resource>
+		<resource name="editor_arrange">مرتب کردن</resource>
-		<resource name="editor_arrowheads">نوکهای پیکان</resource>
+		<resource name="editor_arrowheads">نوکهای پیکان</resource>
-		<resource name="editor_arrowheads_both">هردو</resource>
+		<resource name="editor_arrowheads_both">هردو</resource>
-		<resource name="editor_arrowheads_end">نقطه پایان</resource>
+		<resource name="editor_arrowheads_end">نقطه پایان</resource>
-		<resource name="editor_arrowheads_none">هیچکدام</resource>
+		<resource name="editor_arrowheads_none">هیچکدام</resource>
-		<resource name="editor_arrowheads_start">نقطه شروع</resource>
+		<resource name="editor_arrowheads_start">نقطه شروع</resource>
-		<resource name="editor_backcolor">رنگ پرکننده</resource>
+		<resource name="editor_backcolor">رنگ پرکننده</resource>
-		<resource name="editor_blur_radius">شدت  محو کردن</resource>
+		<resource name="editor_blur_radius">شدت  محو کردن</resource>
-		<resource name="editor_bold">ضخیم</resource>
+		<resource name="editor_bold">ضخیم</resource>
-		<resource name="editor_brightness">روشنایی</resource>
+		<resource name="editor_brightness">روشنایی</resource>
-		<resource name="editor_cancel">لغو</resource>
+		<resource name="editor_cancel">لغو</resource>
-		<resource name="editor_clipboardfailed">مشکل در دسترسی به حافظه موقت. لطفا دوباره انجام دهید</resource>
+		<resource name="editor_clipboardfailed">مشکل در دسترسی به حافظه موقت. لطفا دوباره انجام دهید</resource>
-		<resource name="editor_close">ببند</resource>
+		<resource name="editor_close">ببند</resource>
-		<resource name="editor_close_on_save">تصویر ذخیره شود؟</resource>
+		<resource name="editor_close_on_save">تصویر ذخیره شود؟</resource>
-		<resource name="editor_close_on_save_title">تصویر ذخیره شود؟</resource>
+		<resource name="editor_close_on_save_title">تصویر ذخیره شود؟</resource>
-		<resource name="editor_confirm">تایید</resource>
+		<resource name="editor_confirm">تایید</resource>
-		<resource name="editor_copyimagetoclipboard">ذخیره سازی در حافظه موقت</resource>
+		<resource name="editor_copyimagetoclipboard">ذخیره سازی در حافظه موقت</resource>
-		<resource name="editor_copypathtoclipboard">ذخیره مسیر در حافظه موقت</resource>
+		<resource name="editor_copypathtoclipboard">ذخیره مسیر در حافظه موقت</resource>
-		<resource name="editor_copytoclipboard">رونویس</resource>
+		<resource name="editor_copytoclipboard">رونویس</resource>
-		<resource name="editor_crop">چیدن		
+		<resource name="editor_crop">چیدن		
-(C دکمه)</resource>
+(C دکمه)</resource>
-		<resource name="editor_cursortool">انتخابگر 
+		<resource name="editor_cursortool">انتخابگر 
-(ESC دکمه)</resource>
+(ESC دکمه)</resource>
-		<resource name="editor_cuttoclipboard">برش</resource>
+		<resource name="editor_cuttoclipboard">برش</resource>
-		<resource name="editor_deleteelement">پاک کردن</resource>
+		<resource name="editor_deleteelement">پاک کردن</resource>
-		<resource name="editor_downonelevel">یک سطح پایین</resource>
+		<resource name="editor_downonelevel">یک سطح پایین</resource>
-		<resource name="editor_downtobottom">به پایین ترین سطح</resource>
+		<resource name="editor_downtobottom">به پایین ترین سطح</resource>
-		<resource name="editor_drawarrow">کشیدن پیکان 
+		<resource name="editor_drawarrow">کشیدن پیکان 
-(A دکمه)</resource>
+(A دکمه)</resource>
-		<resource name="editor_drawellipse">کشیدن دایره یا بیضی
+		<resource name="editor_drawellipse">کشیدن دایره یا بیضی
-(E دکمه)</resource>
+(E دکمه)</resource>
-		<resource name="editor_drawhighlighter">برجسته 
+		<resource name="editor_drawhighlighter">برجسته 
-(H  دکمه)</resource>
+(H  دکمه)</resource>
-		<resource name="editor_drawline">کشیدن خط
+		<resource name="editor_drawline">کشیدن خط
-(L دکمه)</resource>
+(L دکمه)</resource>
-		<resource name="editor_drawrectangle">کشیدن مربع یا مستطیل
+		<resource name="editor_drawrectangle">کشیدن مربع یا مستطیل
-(R دکمه)</resource>
+(R دکمه)</resource>
-		<resource name="editor_drawtextbox">اضافه کردن نوشته
+		<resource name="editor_drawtextbox">اضافه کردن نوشته
-(T دکمه)</resource>
+(T دکمه)</resource>
-		<resource name="editor_duplicate">رونویسی از بخش انتخاب شده</resource>
+		<resource name="editor_duplicate">رونویسی از بخش انتخاب شده</resource>
-		<resource name="editor_edit">ویرایش</resource>
+		<resource name="editor_edit">ویرایش</resource>
-		<resource name="editor_email">ایمیل</resource>
+		<resource name="editor_email">ایمیل</resource>
-		<resource name="editor_file">پوشه</resource>
+		<resource name="editor_file">پوشه</resource>
-		<resource name="editor_fontsize">اندازه</resource>
+		<resource name="editor_fontsize">اندازه</resource>
-		<resource name="editor_forecolor">رنگ خط</resource>
+		<resource name="editor_forecolor">رنگ خط</resource>
-		<resource name="editor_highlight_area">برجسته نمودن ناحیه</resource>
+		<resource name="editor_highlight_area">برجسته نمودن ناحیه</resource>
-		<resource name="editor_highlight_grayscale">خاکستری</resource>
+		<resource name="editor_highlight_grayscale">خاکستری</resource>
-		<resource name="editor_highlight_magnify">بزرگنمایی</resource>
+		<resource name="editor_highlight_magnify">بزرگنمایی</resource>
-		<resource name="editor_highlight_mode">حالت برجسته</resource>
+		<resource name="editor_highlight_mode">حالت برجسته</resource>
-		<resource name="editor_highlight_text">برجسته نمودن نوشته</resource>
+		<resource name="editor_highlight_text">برجسته نمودن نوشته</resource>
-		<resource name="editor_imagesaved">.تصویر در  {0} ذخیره شد</resource>
+		<resource name="editor_imagesaved">.تصویر در  {0} ذخیره شد</resource>
-		<resource name="editor_italic">یک وری</resource>
+		<resource name="editor_italic">یک وری</resource>
-		<resource name="editor_load_objects">بازخوانی شیی ازفایل</resource>
+		<resource name="editor_load_objects">بازخوانی شیی ازفایل</resource>
-		<resource name="editor_magnification_factor">بزرگنمایی</resource>
+		<resource name="editor_magnification_factor">بزرگنمایی</resource>
-		<resource name="editor_obfuscate">مبهم 
+		<resource name="editor_obfuscate">مبهم 
-(O دکمه)</resource>
+(O دکمه)</resource>
-		<resource name="editor_obfuscate_blur">محو کردن</resource>
+		<resource name="editor_obfuscate_blur">محو کردن</resource>
-		<resource name="editor_obfuscate_mode">حالت مبهم</resource>
+		<resource name="editor_obfuscate_mode">حالت مبهم</resource>
-		<resource name="editor_obfuscate_pixelize">شطرنجی</resource>
+		<resource name="editor_obfuscate_pixelize">شطرنجی</resource>
-		<resource name="editor_object">ابزار</resource>
+		<resource name="editor_object">ابزار</resource>
-		<resource name="editor_opendirinexplorer">بازکردن پرونه در ویندوزاکسپلورر</resource>
+		<resource name="editor_opendirinexplorer">بازکردن پرونه در ویندوزاکسپلورر</resource>
-		<resource name="editor_pastefromclipboard">چسباندن</resource>
+		<resource name="editor_pastefromclipboard">چسباندن</resource>
-		<resource name="editor_pixel_size">اندازه پیکسل</resource>
+		<resource name="editor_pixel_size">اندازه پیکسل</resource>
-		<resource name="editor_preview_quality">کیفیت پیشنمایش</resource>
+		<resource name="editor_preview_quality">کیفیت پیشنمایش</resource>
-		<resource name="editor_print">چاپ</resource>
+		<resource name="editor_print">چاپ</resource>
-		<resource name="editor_save">ذخیره</resource>
+		<resource name="editor_save">ذخیره</resource>
-		<resource name="editor_save_objects">ذخیره شیی در فایل</resource>
+		<resource name="editor_save_objects">ذخیره شیی در فایل</resource>
-		<resource name="editor_saveas">...ذخیره با نام</resource>
+		<resource name="editor_saveas">...ذخیره با نام</resource>
-		<resource name="editor_selectall">اتخاب همه</resource>
+		<resource name="editor_selectall">اتخاب همه</resource>
-		<resource name="editor_senttoprinter">.چاپ به     ' {0} ' فرستاده شد</resource>
+		<resource name="editor_senttoprinter">.چاپ به     ' {0} ' فرستاده شد</resource>
-		<resource name="editor_shadow">سایه</resource>
+		<resource name="editor_shadow">سایه</resource>
-		<resource name="editor_image_shadow">سایه</resource>
+		<resource name="editor_image_shadow">سایه</resource>
-		<resource name="editor_storedtoclipboard">.تصویر در حافظه موقت ذخیره شد</resource>
+		<resource name="editor_storedtoclipboard">.تصویر در حافظه موقت ذخیره شد</resource>
-		<resource name="editor_thickness">ضخامت خط</resource>
+		<resource name="editor_thickness">ضخامت خط</resource>
-		<resource name="editor_title">ویرایشگر گرین شات</resource>
+		<resource name="editor_title">ویرایشگر گرین شات</resource>
-		<resource name="editor_uponelevel">یک سطح بالا</resource>
+		<resource name="editor_uponelevel">یک سطح بالا</resource>
-		<resource name="editor_uptotop">به بالاترین سطح</resource>
+		<resource name="editor_uptotop">به بالاترین سطح</resource>
-		<resource name="error">اشتباه</resource>
+		<resource name="error">اشتباه</resource>
-		<resource name="error_multipleinstances">.گرین شات قبلا اجرا شده است</resource>
+		<resource name="error_multipleinstances">.گرین شات قبلا اجرا شده است</resource>
-		<resource name="error_nowriteaccess">.ذخیره سازی در  {0} امکانپذیر نمیباشد
+		<resource name="error_nowriteaccess">.ذخیره سازی در  {0} امکانپذیر نمیباشد
-                .امکان ذخیره سازی را بررسی نمایید</resource>
+                .امکان ذخیره سازی را بررسی نمایید</resource>
-		<resource name="error_openfile">بازکردن پوشه  "{0}"  امکان پذیر نمی باشد</resource>
+		<resource name="error_openfile">بازکردن پوشه  "{0}"  امکان پذیر نمی باشد</resource>
-		<resource name="error_openlink">.آدرس‌ پیدا نشد</resource>
+		<resource name="error_openlink">.آدرس‌ پیدا نشد</resource>
-		<resource name="error_save">.ذخیره سازی امکانپذیرنمی باشد، لطفا محل مناسبی رابرگزینید</resource>
+		<resource name="error_save">.ذخیره سازی امکانپذیرنمی باشد، لطفا محل مناسبی رابرگزینید</resource>
-		<resource name="help_title">راهنمایی گرین شات</resource>
+		<resource name="help_title">راهنمایی گرین شات</resource>
-		<resource name="jpegqualitydialog_choosejpegquality">.را انخاب نمایید JPEG لطفا تنظیمات کیفیت</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">.را انخاب نمایید JPEG لطفا تنظیمات کیفیت</resource>
-		<resource name="jpegqualitydialog_dontaskagain">همیشه با این کیفیت</resource>
+		<resource name="jpegqualitydialog_dontaskagain">همیشه با این کیفیت</resource>
-		<resource name="jpegqualitydialog_title">گرین شات JPEG کیفیت</resource>
+		<resource name="jpegqualitydialog_title">گرین شات JPEG کیفیت</resource>
-		<resource name="print_error">مشکل درچاپ</resource>
+		<resource name="print_error">مشکل درچاپ</resource>
-		<resource name="printoptions_allowcenter">چاپ در مرکز صفحه</resource>
+		<resource name="printoptions_allowcenter">چاپ در مرکز صفحه</resource>
-		<resource name="printoptions_allowenlarge">همخوانی تصویر با اندازه کاغذ ـ  بزرگنمایی</resource>
+		<resource name="printoptions_allowenlarge">همخوانی تصویر با اندازه کاغذ ـ  بزرگنمایی</resource>
-		<resource name="printoptions_allowrotate">همخوانی جهت  تصویربا کاغذ ـ  چرخش</resource>
+		<resource name="printoptions_allowrotate">همخوانی جهت  تصویربا کاغذ ـ  چرخش</resource>
-		<resource name="printoptions_allowshrink">همخوانی تصویر با اندازه کاغذ ـ  کوچک نمایی</resource>
+		<resource name="printoptions_allowshrink">همخوانی تصویر با اندازه کاغذ ـ  کوچک نمایی</resource>
-		<resource name="printoptions_dontaskagain">ذخیره تنظیمات به عنوان پیش فرض</resource>
+		<resource name="printoptions_dontaskagain">ذخیره تنظیمات به عنوان پیش فرض</resource>
-		<resource name="printoptions_timestamp">چاپ تاریخ وزمان در پایین صفحه</resource>
+		<resource name="printoptions_timestamp">چاپ تاریخ وزمان در پایین صفحه</resource>
-		<resource name="printoptions_title">حالتهای چاپ  گرین شات</resource>
+		<resource name="printoptions_title">حالتهای چاپ  گرین شات</resource>
-		<resource name="quicksettings_destination_file">ذخیره سازی مستقیم با تنظیمات پیش فرض</resource>
+		<resource name="quicksettings_destination_file">ذخیره سازی مستقیم با تنظیمات پیش فرض</resource>
-		<resource name="settings_alwaysshowjpegqualitydialog">JPEG نمایش کیفیت در هر بار ذخیره سازی</resource>
+		<resource name="settings_alwaysshowjpegqualitydialog">JPEG نمایش کیفیت در هر بار ذخیره سازی</resource>
-		<resource name="settings_alwaysshowprintoptionsdialog">نمایش تنظیمات چاپ برای هر چاپ</resource>
+		<resource name="settings_alwaysshowprintoptionsdialog">نمایش تنظیمات چاپ برای هر چاپ</resource>
-		<resource name="settings_applicationsettings">تنظیمات نرم افزار</resource>
+		<resource name="settings_applicationsettings">تنظیمات نرم افزار</resource>
-		<resource name="settings_autostartshortcut">گرین شات بصورت خودکار همراه با ویندوز اجرا شود</resource>
+		<resource name="settings_autostartshortcut">گرین شات بصورت خودکار همراه با ویندوز اجرا شود</resource>
-		<resource name="settings_capture">نمونه برداری</resource>
+		<resource name="settings_capture">نمونه برداری</resource>
-		<resource name="settings_capture_mousepointer">نمونه برداری از پیکان ماوس</resource>
+		<resource name="settings_capture_mousepointer">نمونه برداری از پیکان ماوس</resource>
-		<resource name="settings_capture_windows_interactive">حالت تعاملی نمونه برداری پنجره</resource>
+		<resource name="settings_capture_windows_interactive">حالت تعاملی نمونه برداری پنجره</resource>
-		<resource name="settings_copypathtoclipboard">ذخیره مسیر در حافظه موقت با هر ذخیره سازی تصویر</resource>
+		<resource name="settings_copypathtoclipboard">ذخیره مسیر در حافظه موقت با هر ذخیره سازی تصویر</resource>
-		<resource name="settings_destination">مقصد</resource>
+		<resource name="settings_destination">مقصد</resource>
-		<resource name="settings_destination_clipboard">رونویس در حافظه موقت</resource>
+		<resource name="settings_destination_clipboard">رونویس در حافظه موقت</resource>
-		<resource name="settings_destination_editor">باز کردن در ویرایشگر</resource>
+		<resource name="settings_destination_editor">باز کردن در ویرایشگر</resource>
-		<resource name="settings_destination_email">ایمیل</resource>
+		<resource name="settings_destination_email">ایمیل</resource>
-		<resource name="settings_destination_file">بی درنگ با تنظیمات پایین ذخیره کن</resource>
+		<resource name="settings_destination_file">بی درنگ با تنظیمات پایین ذخیره کن</resource>
-		<resource name="settings_destination_fileas">ذخیره سازی با</resource>
+		<resource name="settings_destination_fileas">ذخیره سازی با</resource>
-		<resource name="settings_destination_printer">فرستادن به چاپگر</resource>
+		<resource name="settings_destination_printer">فرستادن به چاپگر</resource>
-		<resource name="settings_filenamepattern">شیوه نامگذاری</resource>
+		<resource name="settings_filenamepattern">شیوه نامگذاری</resource>
-		<resource name="settings_general">همگانی</resource>
+		<resource name="settings_general">همگانی</resource>
-		<resource name="settings_jpegquality">JPEG کیفیت</resource>
+		<resource name="settings_jpegquality">JPEG کیفیت</resource>
-		<resource name="settings_jpegsettings">JPEG تنظیمات</resource>
+		<resource name="settings_jpegsettings">JPEG تنظیمات</resource>
-		<resource name="settings_language">زبان</resource>
+		<resource name="settings_language">زبان</resource>
-		<resource name="settings_message_filenamepattern">نمایندههای زیر به صورت خودکار در الگوی تعریف شده جایگزین خواهد شد 
+		<resource name="settings_message_filenamepattern">نمایندههای زیر به صورت خودکار در الگوی تعریف شده جایگزین خواهد شد 
-%YYYY% year, 4 digits
+%YYYY% year, 4 digits
-%MM% month, 2 digits
+%MM% month, 2 digits
-%DD% day, 2 digits
+%DD% day, 2 digits
-%hh% hour, 2 digits
+%hh% hour, 2 digits
-%mm% minute, 2 digits
+%mm% minute, 2 digits
-%ss% second, 2 digits
+%ss% second, 2 digits
-%NUM% incrementing number, 6 digits
+%NUM% incrementing number, 6 digits
-%title% Window title
+%title% Window title
-%user% Windows user
+%user% Windows user
-%domain% Windows domain
+%domain% Windows domain
-%hostname% PC name
+%hostname% PC name
-
+
-شما همچنین می توانید از گرین شات برای ایجاد خودکاردایرکتوری استفاده نمایید ازو یا نماد بک اسلش (\) استفاده نمایید تا پرونده وپوشه ایجاد شوند
+شما همچنین می توانید از گرین شات برای ایجاد خودکاردایرکتوری استفاده نمایید ازو یا نماد بک اسلش (\) استفاده نمایید تا پرونده وپوشه ایجاد شوند
- %title%_%YYYY%-%MM%-%DD%_%hh%-%mm%-%ss%  :به عنوان مثال</resource>
+ %title%_%YYYY%-%MM%-%DD%_%hh%-%mm%-%ss%  :به عنوان مثال</resource>
-		<resource name="settings_output">خروجی</resource>
+		<resource name="settings_output">خروجی</resource>
-		<resource name="settings_playsound">پخش صدای عکس گرفتن</resource>
+		<resource name="settings_playsound">پخش صدای عکس گرفتن</resource>
-		<resource name="settings_preferredfilesettings">تنظیمات مورد پسند پوشه خروجی</resource>
+		<resource name="settings_preferredfilesettings">تنظیمات مورد پسند پوشه خروجی</resource>
-		<resource name="settings_primaryimageformat">قالب تصویر</resource>
+		<resource name="settings_primaryimageformat">قالب تصویر</resource>
-		<resource name="settings_printer">چاپگر</resource>
+		<resource name="settings_printer">چاپگر</resource>
-		<resource name="settings_printoptions">حالتهای چاپ</resource>
+		<resource name="settings_printoptions">حالتهای چاپ</resource>
-		<resource name="settings_registerhotkeys">ثبت دکمه های میانبر</resource>
+		<resource name="settings_registerhotkeys">ثبت دکمه های میانبر</resource>
-		<resource name="settings_showflashlight">نمایش نور</resource>
+		<resource name="settings_showflashlight">نمایش نور</resource>
-		<resource name="settings_storagelocation">محل ذخیره سازی</resource>
+		<resource name="settings_storagelocation">محل ذخیره سازی</resource>
-		<resource name="settings_title">تنظیمات</resource>
+		<resource name="settings_title">تنظیمات</resource>
-		<resource name="settings_tooltip_filenamepattern">شیوه نامگذاری نمونه ها در هنگام ذخیره سازی</resource>
+		<resource name="settings_tooltip_filenamepattern">شیوه نامگذاری نمونه ها در هنگام ذخیره سازی</resource>
-		<resource name="settings_tooltip_language">(زبان نمایش کاربر ( نیاز به راه اندازی از نو</resource>
+		<resource name="settings_tooltip_language">(زبان نمایش کاربر ( نیاز به راه اندازی از نو</resource>
-		<resource name="settings_tooltip_primaryimageformat">پیش فرض قالب تصویر</resource>
+		<resource name="settings_tooltip_primaryimageformat">پیش فرض قالب تصویر</resource>
-		<resource name="settings_tooltip_registerhotkeys">.برای استفاده بوسیله گرین شات رزرو شده اند Prnt, Ctrl + Print, Alt + Prnt قبل از بسته شدن گرین شات، مشخص می کند که آیا دکمه های</resource>
+		<resource name="settings_tooltip_registerhotkeys">.برای استفاده بوسیله گرین شات رزرو شده اند Prnt, Ctrl + Print, Alt + Prnt قبل از بسته شدن گرین شات، مشخص می کند که آیا دکمه های</resource>
-		<resource name="settings_tooltip_storagelocation">(محل ذخیره سازی نمونه ها ( برای ذخیره سازی در دسکتاپ,  خالی بگذارید</resource>
+		<resource name="settings_tooltip_storagelocation">(محل ذخیره سازی نمونه ها ( برای ذخیره سازی در دسکتاپ,  خالی بگذارید</resource>
-		<resource name="settings_visualization">جلوه های ویژه</resource>
+		<resource name="settings_visualization">جلوه های ویژه</resource>
-		<resource name="settings_waittime">مکث (میلی ثانیه) تا نمونه برداری</resource>
+		<resource name="settings_waittime">مکث (میلی ثانیه) تا نمونه برداری</resource>
-		<resource name="tooltip_firststart">را فشار دهید Print	اینجا کلیک راست کنید یا دکمه	
+		<resource name="tooltip_firststart">را فشار دهید Print	اینجا کلیک راست کنید یا دکمه	
-Right-click here or press the Print-key.</resource>
+Right-click here or press the Print-key.</resource>
-		<resource name="warning">هشدار</resource>
+		<resource name="warning">هشدار</resource>
-		<resource name="warning_hotkeys">.ثبت و استفاده از یک یا چند تا از میانبرها امکان پذیر نمی باشد. ممکن است نرم افزار دیگری از میانبرها استفاده می کند</resource>
+		<resource name="warning_hotkeys">.ثبت و استفاده از یک یا چند تا از میانبرها امکان پذیر نمی باشد. ممکن است نرم افزار دیگری از میانبرها استفاده می کند</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-id-ID.xml

@@ -28,7 +28,7 @@ Juga, kami sangat terbantu apabila anda mengecek laporan lain yang sama dengan k
 		<resource name="ClipboardFormat.HTML">HTML</resource>
 		<resource name="ClipboardFormat.HTMLDATAURL">HTML dengan gambar inline</resource>
 		<resource name="ClipboardFormat.PNG">PNG</resource>
-		<resource name="colorpicker_alpha">Alpha</resource>
+		<resource name="colorpicker_alpha">Alfa</resource>
 		<resource name="colorpicker_apply">Lakukan</resource>
 		<resource name="colorpicker_blue">Biru</resource>
 		<resource name="colorpicker_green">Hijau</resource>
@@ -223,7 +223,7 @@ Harap cek aksesibilitas menuis pada lokasi penyimpanan yang dipilih.</resource>
 		<resource name="settings_destination_email">E-Mail</resource>
 		<resource name="settings_destination_file">Simpan cepat (menggunakan pengaturan berikut)</resource>
 		<resource name="settings_destination_fileas">Simpan sebagai (tampilkan dialog)</resource>
-		<resource name="settings_destination_picker">Pilih dsetinasi secara dinamis</resource>
+		<resource name="settings_destination_picker">Pilih destinasi secara dinamis</resource>
 		<resource name="settings_destination_printer">Kirim ke printer</resource>
 		<resource name="settings_editor">Editor</resource>
 		<resource name="settings_filenamepattern">Pola nama berkas</resource>
@@ -277,6 +277,7 @@ cont, 11_58_32 (ditambah ekstensi yang ditetapkan pada pengaturan)</resource>
 		<resource name="settings_waittime">Milisekon untuk menunggu sebelum menagkap</resource>
 		<resource name="settings_window_capture_mode">Moda penangkap jendela</resource>
 		<resource name="settings_windowscapture">Tangkap jendela</resource>
+		<resource name="settings_zoom">Tampilkan Pembesar</resource>
 		<resource name="tooltip_firststart">Klik kanan disini atau tekan tombol {0}.</resource>
 		<resource name="update_found">Versi baru Greenshot telah tersedia! Apakah anda ingin mengunduh Greenshot {0}?</resource>
 		<resource name="wait_ie_capture">Harap tunggu ketika halaman Internet Explorer sedang ditangkap</resource>

Greenshot/Languages/language-installer-de-DE.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Deutsch" ietf="de-DE" version="1.0.0" languagegroup="1">
+<language description="Deutsch" ietf="de-DE" version="1.0.0" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="startup">{#ExeName} starten wenn Windows hochfährt</resource>
+		<resource name="startup">{#ExeName} starten wenn Windows hochfährt</resource>
-		<resource name="startgreenshot">{#ExeName} starten</resource>
+		<resource name="startgreenshot">{#ExeName} starten</resource>
-		<resource name="jira">Jira Plug-in</resource>
+		<resource name="jira">Jira Plug-in</resource>
-		<resource name="confluence">Confluence Plug-in</resource>
+		<resource name="confluence">Confluence Plug-in</resource>
-		<resource name="externalcommand">Öffne mit ein externem Kommando Plug-in</resource>
+		<resource name="externalcommand">Öffne mit ein externem Kommando Plug-in</resource>
-		<resource name="ocr">OCR Plug-in (benötigt Microsoft Office Document Imaging (MODI))</resource>
+		<resource name="ocr">OCR Plug-in (benötigt Microsoft Office Document Imaging (MODI))</resource>
-		<resource name="imgur">Imgur Plug-in (Siehe: http://imgur.com)</resource>
+		<resource name="imgur">Imgur Plug-in (Siehe: http://imgur.com)</resource>
-		<resource name="language">Zusätzliche Sprachen</resource>
+		<resource name="language">Zusätzliche Sprachen</resource>
-		<resource name="optimize">Optimierung der Leistung, kann etwas dauern.</resource>
+		<resource name="optimize">Optimierung der Leistung, kann etwas dauern.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-installer-en-US.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="English" ietf="en-US" version="1.0.0" languagegroup="1">
+<language description="English" ietf="en-US" version="1.0.0" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="startup">Start {#ExeName} with Windows start</resource>
+		<resource name="startup">Start {#ExeName} with Windows start</resource>
-		<resource name="startgreenshot">Start {#ExeName}</resource>
+		<resource name="startgreenshot">Start {#ExeName}</resource>
-		<resource name="jira">Jira plug-in</resource>
+		<resource name="jira">Jira plug-in</resource>
-		<resource name="confluence">Confluence plug-in</resource>
+		<resource name="confluence">Confluence plug-in</resource>
-		<resource name="externalcommand">Open with external command plug-in</resource>
+		<resource name="externalcommand">Open with external command plug-in</resource>
-		<resource name="ocr">OCR plug-in (needs Microsoft Office Document Imaging (MODI))</resource>
+		<resource name="ocr">OCR plug-in (needs Microsoft Office Document Imaging (MODI))</resource>
-		<resource name="imgur">Imgur plug-in (See: http://imgur.com)</resource>
+		<resource name="imgur">Imgur plug-in (See: http://imgur.com)</resource>
-		<resource name="language">Additional languages</resource>
+		<resource name="language">Additional languages</resource>
-		<resource name="optimize">Optimizing performance, this may take a while.</resource>
+		<resource name="optimize">Optimizing performance, this may take a while.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-installer-es-ES.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Español" ietf="es-ES" version="1.0.4" languagegroup="1">
+<language description="Español" ietf="es-ES" version="1.0.4" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="confluence">Extensión para Confluence</resource>
+		<resource name="confluence">Extensión para Confluence</resource>
-		<resource name="externalcommand">Extensión para abrir con programas externos</resource>
+		<resource name="externalcommand">Extensión para abrir con programas externos</resource>
-		<resource name="imgur">Extensión para Imgur (Ver http://imgur.com)</resource>
+		<resource name="imgur">Extensión para Imgur (Ver http://imgur.com)</resource>
-		<resource name="jira">Extensión para Jira</resource>
+		<resource name="jira">Extensión para Jira</resource>
-		<resource name="language">Idiomas adicionales</resource>
+		<resource name="language">Idiomas adicionales</resource>
-		<resource name="ocr">Extensión para OCR (necesita Microsoft Office Document Imaging (MODI))</resource>
+		<resource name="ocr">Extensión para OCR (necesita Microsoft Office Document Imaging (MODI))</resource>
-		<resource name="optimize">Optimizando rendimiento; por favor, espera.</resource>
+		<resource name="optimize">Optimizando rendimiento; por favor, espera.</resource>
-		<resource name="startgreenshot">Lanzar {#ExeName}</resource>
+		<resource name="startgreenshot">Lanzar {#ExeName}</resource>
-		<resource name="startup">Lanzar {#ExeName} al iniciarse Windows</resource>
+		<resource name="startup">Lanzar {#ExeName} al iniciarse Windows</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-installer-fi-FI.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<language description="Finnish" ietf="fi-FI" version="1.0.0" languagegroup="1">
+<language description="Finnish" ietf="fi-FI" version="1.0.0" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="startup">Käynnistä {#ExeName} Windowsin käynnistyessä</resource>
+		<resource name="startup">Käynnistä {#ExeName} Windowsin käynnistyessä</resource>
-		<resource name="startgreenshot">Käynnistä {#ExeName}</resource>
+		<resource name="startgreenshot">Käynnistä {#ExeName}</resource>
-		<resource name="jira">Jira-liitännäinen</resource>
+		<resource name="jira">Jira-liitännäinen</resource>
-		<resource name="confluence">Confluence-liitännäinen</resource>
+		<resource name="confluence">Confluence-liitännäinen</resource>
-		<resource name="externalcommand">Avaa Ulkoinen komento-liitännäisellä</resource>
+		<resource name="externalcommand">Avaa Ulkoinen komento-liitännäisellä</resource>
-		<resource name="ocr">OCR-liitännäinen (Tarvitaan: Microsoft Office Document Imaging (MODI))</resource>
+		<resource name="ocr">OCR-liitännäinen (Tarvitaan: Microsoft Office Document Imaging (MODI))</resource>
-		<resource name="imgur">Imgur-liitännäinen (Katso: http://imgur.com)</resource>
+		<resource name="imgur">Imgur-liitännäinen (Katso: http://imgur.com)</resource>
-		<resource name="language">Lisäkielet</resource>
+		<resource name="language">Lisäkielet</resource>
-		<resource name="optimize">Optimoidaan suorituskykyä, tämä voi kestää hetken.</resource>
+		<resource name="optimize">Optimoidaan suorituskykyä, tämä voi kestää hetken.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-installer-fr-FR.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="French" ietf="fr-FR" version="1.0.1" languagegroup="1">
+<language description="French" ietf="fr-FR" version="1.0.1" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="confluence">Greffon Confluence</resource>
+		<resource name="confluence">Greffon Confluence</resource>
-		<resource name="externalcommand">Ouvrir avec le greffon de commande externe</resource>
+		<resource name="externalcommand">Ouvrir avec le greffon de commande externe</resource>
-		<resource name="imgur">Greffon Imgur (Voir: http://imgur.com)</resource>
+		<resource name="imgur">Greffon Imgur (Voir: http://imgur.com)</resource>
-		<resource name="jira">Greffon Jira</resource>
+		<resource name="jira">Greffon Jira</resource>
-		<resource name="language">Langues additionnelles</resource>
+		<resource name="language">Langues additionnelles</resource>
-		<resource name="ocr">Greffon OCR (nécessite Document Imaging de Microsoft Office [MODI])</resource>
+		<resource name="ocr">Greffon OCR (nécessite Document Imaging de Microsoft Office [MODI])</resource>
-		<resource name="optimize">Optimisation des performances, Ceci peut prendre un certain temps.</resource>
+		<resource name="optimize">Optimisation des performances, Ceci peut prendre un certain temps.</resource>
-		<resource name="startgreenshot">Démarrer {#ExeName}</resource>
+		<resource name="startgreenshot">Démarrer {#ExeName}</resource>
-		<resource name="startup">Lancer {#ExeName} au démarrage de Windows</resource>
+		<resource name="startup">Lancer {#ExeName} au démarrage de Windows</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-installer-nl-NL.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Nederlands" ietf="nl-NL" version="1.0.0" languagegroup="1">
+<language description="Nederlands" ietf="nl-NL" version="1.0.0" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="optimize">Prestaties verbeteren, kan even duren.</resource>
+		<resource name="optimize">Prestaties verbeteren, kan even duren.</resource>
-		<resource name="language">Extra talen</resource>
+		<resource name="language">Extra talen</resource>
-		<resource name="imgur">Imgur plug-in (Zie: http://imgur.com)</resource>
+		<resource name="imgur">Imgur plug-in (Zie: http://imgur.com)</resource>
-		<resource name="ocr">OCR plug-in (heeft Microsoft Office Document Imaging (MODI) nodig)</resource>
+		<resource name="ocr">OCR plug-in (heeft Microsoft Office Document Imaging (MODI) nodig)</resource>
-		<resource name="externalcommand">Open met externes commando plug-in</resource>
+		<resource name="externalcommand">Open met externes commando plug-in</resource>
-		<resource name="confluence">Confluence plug-in</resource>
+		<resource name="confluence">Confluence plug-in</resource>
-		<resource name="jira">Jira plug-in</resource>
+		<resource name="jira">Jira plug-in</resource>
-		<resource name="startgreenshot">Start {#ExeName}</resource>
+		<resource name="startgreenshot">Start {#ExeName}</resource>
-		<resource name="startup">Start {#ExeName} wanneer Windows opstart</resource>
+		<resource name="startup">Start {#ExeName} wanneer Windows opstart</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-installer-sr-RS.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Српски" ietf="sr-RS" version="1.0.0" languagegroup="1">
+<language description="Српски" ietf="sr-RS" version="1.0.0" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="confluence">Прикључак за Конфлуенс</resource>
+		<resource name="confluence">Прикључак за Конфлуенс</resource>
-		<resource name="externalcommand">Отвори са прикључком за спољне наредбе</resource>
+		<resource name="externalcommand">Отвори са прикључком за спољне наредбе</resource>
-		<resource name="imgur">Прикључак за Имиџер (http://imgur.com)</resource>
+		<resource name="imgur">Прикључак за Имиџер (http://imgur.com)</resource>
-		<resource name="jira">Прикључак за Џиру</resource>
+		<resource name="jira">Прикључак за Џиру</resource>
-		<resource name="language">Додатни језици</resource>
+		<resource name="language">Додатни језици</resource>
-		<resource name="ocr">OCR прикључак (захтева Microsoft Office Document Imaging (MODI))</resource>
+		<resource name="ocr">OCR прикључак (захтева Microsoft Office Document Imaging (MODI))</resource>
-		<resource name="optimize">Оптимизујем перформансе…</resource>
+		<resource name="optimize">Оптимизујем перформансе…</resource>
-		<resource name="startgreenshot">Покрени Гриншот</resource>
+		<resource name="startgreenshot">Покрени Гриншот</resource>
-		<resource name="startup">Покрени програм са системом</resource>
+		<resource name="startup">Покрени програм са системом</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-installer-uk-UA.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<language description="Українська" ietf="uk-UA" version="1.0.0" languagegroup="5">
+	<resources>
+		<resource name="confluence">Плагін Confluence</resource>
+		<resource name="externalcommand">Відкрити з плагіном зовнішніх команд</resource>
+		<resource name="imgur">Плагін Imgur (див.: http://imgur.com)</resource>
+		<resource name="jira">Плагін Jira</resource>
+		<resource name="language">Додаткові мови</resource>
+		<resource name="ocr">Плагін OCR (потребує Microsoft Office Document Imaging (MODI))</resource>
+		<resource name="optimize">Оптимізація продуктивності, це може забрати час.</resource>
+		<resource name="startgreenshot">Запустити {#ExeName}</resource>
+		<resource name="startup">Запускати {#ExeName} під час запуску Windows</resource>
+	</resources>
+</language>

Greenshot/Languages/language-installer-zh-CN.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="" ietf="" version="" languagegroup="">
+<language description="" ietf="" version="" languagegroup="">
-	<resources>
+	<resources>
-		<resource name="confluence">Confluence插件</resource>
+		<resource name="confluence">Confluence插件</resource>
-		<resource name="externalcommand">使用外部命令打开插件</resource>
+		<resource name="externalcommand">使用外部命令打开插件</resource>
-		<resource name="imgur">Imgur插件( (请访问： http://imgur.com))</resource>
+		<resource name="imgur">Imgur插件( (请访问： http://imgur.com))</resource>
-		<resource name="jira">Jira插件</resource>
+		<resource name="jira">Jira插件</resource>
-		<resource name="language">其它语言</resource>
+		<resource name="language">其它语言</resource>
-		<resource name="ocr">OCR插件(需要Microsoft Office Document Imaging (MODI)的支持)</resource>
+		<resource name="ocr">OCR插件(需要Microsoft Office Document Imaging (MODI)的支持)</resource>
-		<resource name="optimize">正在优化性能，这可能需要一点时间。</resource>
+		<resource name="optimize">正在优化性能，这可能需要一点时间。</resource>
-		<resource name="startgreenshot">启动{#ExeName}</resource>
+		<resource name="startgreenshot">启动{#ExeName}</resource>
-		<resource name="startup">让{#ExeName}随Windows一起启动</resource>
+		<resource name="startup">让{#ExeName}随Windows一起启动</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-it-IT.xml

@@ -180,6 +180,7 @@ Verifica l'accesso in scrittura sulla destinazione di salvataggio.</resource>
 	<resource name="printoptions_dontaskagain">Salva le opzioni come default, e non chiedere più</resource>
 	<resource name="printoptions_inverted">Stampa con colori invertiti (negativo)</resource>
 	<resource name="printoptions_printgrayscale">Forza stampa in scala di grigi</resource>
+    <resource name="printoptions_printmonochrome">Forza stampa in bianco e nero</resource>
 	<resource name="printoptions_timestamp">Stampa data / ora sul piede della pagina</resource>
 	<resource name="printoptions_title">Opzioni di stampa di Greenshot</resource>
 	<resource name="qualitydialog_dontaskagain">Save come qualità di default, e non chiedere più</resource>
@@ -244,6 +245,7 @@ corrente, es: 11_58_32 (più l'estensione definita nelle impostazioni)</resource
 	<resource name="settings_registerhotkeys">Registra scorciatoie di tastiera</resource>
 	<resource name="settings_showflashlight">Mostra torcia elettrica</resource>
 	<resource name="settings_shownotify">Mostra le notifiche</resource>
+	<resource name="settings_zoom">Mostra lente ingrandimento</resource>	
 	<resource name="settings_storagelocation">Destinaz. salvataggio</resource>
 	<resource name="settings_title">Impostazioni</resource>
 	<resource name="settings_tooltip_filenamepattern">Modello usato per generare il nome file in fase di salvataggio delle immagini</resource>

Greenshot/Languages/language-ko-KR.xml

@@ -1,194 +1,194 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="한국의" ietf="ko-KR" version="1.0.0" languagegroup="8">
+<language description="한국의" ietf="ko-KR" version="1.0.0" languagegroup="8">
-	<resources>
+	<resources>
-		<resource name="about_bugs">버그는 아래 URL로 전달바랍니다.</resource>
+		<resource name="about_bugs">버그는 아래 URL로 전달바랍니다.</resource>
-		<resource name="about_donations">Greenshot이 마음에 드신다면 아래 URL로 방문하셔서 지원할 수 있습니다.</resource>
+		<resource name="about_donations">Greenshot이 마음에 드신다면 아래 URL로 방문하셔서 지원할 수 있습니다.</resource>
-		<resource name="about_host">Greenshot은 sourceforge.net 관리하에 아래 링크에서 호스팅되고 있음</resource>
+		<resource name="about_host">Greenshot은 sourceforge.net 관리하에 아래 링크에서 호스팅되고 있음</resource>
-		<resource name="about_icons">아이콘들은 Yusuke Kamiyamane's Fugue icon set으로부터 제공 받은 것입니다. (Creative Commons Attribution 3.0 license)</resource>
+		<resource name="about_icons">아이콘들은 Yusuke Kamiyamane's Fugue icon set으로부터 제공 받은 것입니다. (Creative Commons Attribution 3.0 license)</resource>
-		<resource name="about_license">Copyright (C) 2007-2010 Thomas Braun, Jens Klingen, Robin Krom
+		<resource name="about_license">Copyright (C) 2007-2010 Thomas Braun, Jens Klingen, Robin Krom
-Greenshot comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.
+Greenshot comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.
-Details about the GNU General Public License:</resource>
+Details about the GNU General Public License:</resource>
-		<resource name="about_title">Greenshot(Greenshot)에 관해...</resource>
+		<resource name="about_title">Greenshot(Greenshot)에 관해...</resource>
-		<resource name="application_title">Greenshot - the revolutionary screenshot utility</resource>
+		<resource name="application_title">Greenshot - the revolutionary screenshot utility</resource>
-		<resource name="bugreport_cancel">닫기</resource>
+		<resource name="bugreport_cancel">닫기</resource>
-		<resource name="bugreport_info">Sorry, an unexpected error occured.
+		<resource name="bugreport_info">Sorry, an unexpected error occured.
-
+
-The good news is: you can help us getting rid of it by filing a bug report.
+The good news is: you can help us getting rid of it by filing a bug report.
-Please visit the URL below, create a new bug report and paste the contents from the text area into the description.
+Please visit the URL below, create a new bug report and paste the contents from the text area into the description.
-
+
-Please add a meaningful summary and enclose any information you consider to be helpful for reproducing the issue.
+Please add a meaningful summary and enclose any information you consider to be helpful for reproducing the issue.
-Also, we would highly appreciate if you checked whether a tracker item already exists for this bug. (You can use the search to find those quickly.) Thank you :)</resource>
+Also, we would highly appreciate if you checked whether a tracker item already exists for this bug. (You can use the search to find those quickly.) Thank you :)</resource>
-		<resource name="bugreport_title">에러</resource>
+		<resource name="bugreport_title">에러</resource>
-		<resource name="clipboard_error">클립보드에 쓰는 동안 예상하지 못한 에러가 발생</resource>
+		<resource name="clipboard_error">클립보드에 쓰는 동안 예상하지 못한 에러가 발생</resource>
-		<resource name="clipboard_inuse">{0} 프로세스로 인해 클립보드에 저장할 수 없습니다.</resource>
+		<resource name="clipboard_inuse">{0} 프로세스로 인해 클립보드에 저장할 수 없습니다.</resource>
-		<resource name="colorpicker_alpha">알파값</resource>
+		<resource name="colorpicker_alpha">알파값</resource>
-		<resource name="colorpicker_apply">적용</resource>
+		<resource name="colorpicker_apply">적용</resource>
-		<resource name="colorpicker_blue">파랑</resource>
+		<resource name="colorpicker_blue">파랑</resource>
-		<resource name="colorpicker_green">초록</resource>
+		<resource name="colorpicker_green">초록</resource>
-		<resource name="colorpicker_htmlcolor">HTML 색</resource>
+		<resource name="colorpicker_htmlcolor">HTML 색</resource>
-		<resource name="colorpicker_recentcolors">최근 선택 색</resource>
+		<resource name="colorpicker_recentcolors">최근 선택 색</resource>
-		<resource name="colorpicker_red">빨강</resource>
+		<resource name="colorpicker_red">빨강</resource>
-		<resource name="colorpicker_title">색 고르기</resource>
+		<resource name="colorpicker_title">색 고르기</resource>
-		<resource name="colorpicker_transparent">투명</resource>
+		<resource name="colorpicker_transparent">투명</resource>
-		<resource name="config_unauthorizedaccess_write">환경파일을 저장할 수 없습니다. '{0}'에 대한 접근권한을 확인해보세요.</resource>
+		<resource name="config_unauthorizedaccess_write">환경파일을 저장할 수 없습니다. '{0}'에 대한 접근권한을 확인해보세요.</resource>
-		<resource name="contextmenu_about">Greenshot에 관해</resource>
+		<resource name="contextmenu_about">Greenshot에 관해</resource>
-		<resource name="contextmenu_capturearea">캡쳐 영역 지정</resource>
+		<resource name="contextmenu_capturearea">캡쳐 영역 지정</resource>
-		<resource name="contextmenu_captureclipboard">클립보드에서 이미지 열기</resource>
+		<resource name="contextmenu_captureclipboard">클립보드에서 이미지 열기</resource>
-		<resource name="contextmenu_capturefullscreen">전체화면</resource>
+		<resource name="contextmenu_capturefullscreen">전체화면</resource>
-		<resource name="contextmenu_capturelastregion">이전 캡쳐 영역</resource>
+		<resource name="contextmenu_capturelastregion">이전 캡쳐 영역</resource>
-		<resource name="contextmenu_capturewindow">윈도우 캡쳐</resource>
+		<resource name="contextmenu_capturewindow">윈도우 캡쳐</resource>
-		<resource name="contextmenu_donate">Greenshot 응원하기</resource>
+		<resource name="contextmenu_donate">Greenshot 응원하기</resource>
-		<resource name="contextmenu_exit">끝내기</resource>
+		<resource name="contextmenu_exit">끝내기</resource>
-		<resource name="contextmenu_help">도움말</resource>
+		<resource name="contextmenu_help">도움말</resource>
-		<resource name="contextmenu_openfile">파일에서 이미지 열기</resource>
+		<resource name="contextmenu_openfile">파일에서 이미지 열기</resource>
-		<resource name="contextmenu_quicksettings">빠른 옵션</resource>
+		<resource name="contextmenu_quicksettings">빠른 옵션</resource>
-		<resource name="contextmenu_settings">환경설정...</resource>
+		<resource name="contextmenu_settings">환경설정...</resource>
-		<resource name="editor_arrange">정렬</resource>
+		<resource name="editor_arrange">정렬</resource>
-		<resource name="editor_arrowheads">화살표 모양</resource>
+		<resource name="editor_arrowheads">화살표 모양</resource>
-		<resource name="editor_arrowheads_both">양쪽</resource>
+		<resource name="editor_arrowheads_both">양쪽</resource>
-		<resource name="editor_arrowheads_end">끝</resource>
+		<resource name="editor_arrowheads_end">끝</resource>
-		<resource name="editor_arrowheads_none">없음</resource>
+		<resource name="editor_arrowheads_none">없음</resource>
-		<resource name="editor_arrowheads_start">시작</resource>
+		<resource name="editor_arrowheads_start">시작</resource>
-		<resource name="editor_backcolor">채우기 색</resource>
+		<resource name="editor_backcolor">채우기 색</resource>
-		<resource name="editor_blur_radius">원형 흐리기</resource>
+		<resource name="editor_blur_radius">원형 흐리기</resource>
-		<resource name="editor_bold">진하게</resource>
+		<resource name="editor_bold">진하게</resource>
-		<resource name="editor_brightness">밝기</resource>
+		<resource name="editor_brightness">밝기</resource>
-		<resource name="editor_cancel">취소</resource>
+		<resource name="editor_cancel">취소</resource>
-		<resource name="editor_clipboardfailed">클립보드 접근시 에러 발생, 다시 시도하세요.</resource>
+		<resource name="editor_clipboardfailed">클립보드 접근시 에러 발생, 다시 시도하세요.</resource>
-		<resource name="editor_close">닫기</resource>
+		<resource name="editor_close">닫기</resource>
-		<resource name="editor_close_on_save">스크린샷을 저장하시겠습니까?</resource>
+		<resource name="editor_close_on_save">스크린샷을 저장하시겠습니까?</resource>
-		<resource name="editor_close_on_save_title">이미지 저장?</resource>
+		<resource name="editor_close_on_save_title">이미지 저장?</resource>
-		<resource name="editor_confirm">확인</resource>
+		<resource name="editor_confirm">확인</resource>
-		<resource name="editor_copyimagetoclipboard">클립보드로 이미지 복사</resource>
+		<resource name="editor_copyimagetoclipboard">클립보드로 이미지 복사</resource>
-		<resource name="editor_copypathtoclipboard">파일 저장 위치 클립보드로 복사하기</resource>
+		<resource name="editor_copypathtoclipboard">파일 저장 위치 클립보드로 복사하기</resource>
-		<resource name="editor_copytoclipboard">복사</resource>
+		<resource name="editor_copytoclipboard">복사</resource>
-		<resource name="editor_crop">자르기 (C)</resource>
+		<resource name="editor_crop">자르기 (C)</resource>
-		<resource name="editor_cursortool">선택도구 (ESC)</resource>
+		<resource name="editor_cursortool">선택도구 (ESC)</resource>
-		<resource name="editor_cuttoclipboard">자르기</resource>
+		<resource name="editor_cuttoclipboard">자르기</resource>
-		<resource name="editor_deleteelement">삭제</resource>
+		<resource name="editor_deleteelement">삭제</resource>
-		<resource name="editor_downonelevel">Down one level
+		<resource name="editor_downonelevel">Down one level
-		한칸 뒤로</resource>
+		한칸 뒤로</resource>
-		<resource name="editor_downtobottom">맨 뒤로</resource>
+		<resource name="editor_downtobottom">맨 뒤로</resource>
-		<resource name="editor_drawarrow">화살표 그리기 (A)</resource>
+		<resource name="editor_drawarrow">화살표 그리기 (A)</resource>
-		<resource name="editor_drawellipse">타원형 (E)</resource>
+		<resource name="editor_drawellipse">타원형 (E)</resource>
-		<resource name="editor_drawhighlighter">돋보이기 (H)</resource>
+		<resource name="editor_drawhighlighter">돋보이기 (H)</resource>
-		<resource name="editor_drawline">선 그리기</resource>
+		<resource name="editor_drawline">선 그리기</resource>
-		<resource name="editor_drawrectangle">사각형 (R)</resource>
+		<resource name="editor_drawrectangle">사각형 (R)</resource>
-		<resource name="editor_drawtextbox">텍스트 추가 (T)</resource>
+		<resource name="editor_drawtextbox">텍스트 추가 (T)</resource>
-		<resource name="editor_duplicate">선택된 요소 추가하기</resource>
+		<resource name="editor_duplicate">선택된 요소 추가하기</resource>
-		<resource name="editor_edit">편집</resource>
+		<resource name="editor_edit">편집</resource>
-		<resource name="editor_email">이메일</resource>
+		<resource name="editor_email">이메일</resource>
-		<resource name="editor_file">파일</resource>
+		<resource name="editor_file">파일</resource>
-		<resource name="editor_fontsize">크기</resource>
+		<resource name="editor_fontsize">크기</resource>
-		<resource name="editor_forecolor">선 색</resource>
+		<resource name="editor_forecolor">선 색</resource>
-		<resource name="editor_highlight_area">하일라이트 구간</resource>
+		<resource name="editor_highlight_area">하일라이트 구간</resource>
-		<resource name="editor_highlight_grayscale">그레이스케일</resource>
+		<resource name="editor_highlight_grayscale">그레이스케일</resource>
-		<resource name="editor_highlight_magnify">확대</resource>
+		<resource name="editor_highlight_magnify">확대</resource>
-		<resource name="editor_highlight_mode">돋보이기</resource>
+		<resource name="editor_highlight_mode">돋보이기</resource>
-		<resource name="editor_highlight_text">하일라이트 텍스트</resource>
+		<resource name="editor_highlight_text">하일라이트 텍스트</resource>
-		<resource name="editor_imagesaved">{0} 위치에 이미지 저장</resource>
+		<resource name="editor_imagesaved">{0} 위치에 이미지 저장</resource>
-		<resource name="editor_italic">이탤릭</resource>
+		<resource name="editor_italic">이탤릭</resource>
-		<resource name="editor_load_objects">파일로 부터 객체 불러오기</resource>
+		<resource name="editor_load_objects">파일로 부터 객체 불러오기</resource>
-		<resource name="editor_magnification_factor">확대 factor</resource>
+		<resource name="editor_magnification_factor">확대 factor</resource>
-		<resource name="editor_obfuscate">모자이크 (O)</resource>
+		<resource name="editor_obfuscate">모자이크 (O)</resource>
-		<resource name="editor_obfuscate_blur">흐림</resource>
+		<resource name="editor_obfuscate_blur">흐림</resource>
-		<resource name="editor_obfuscate_mode">모자이크 처리</resource>
+		<resource name="editor_obfuscate_mode">모자이크 처리</resource>
-		<resource name="editor_obfuscate_pixelize">픽셀화</resource>
+		<resource name="editor_obfuscate_pixelize">픽셀화</resource>
-		<resource name="editor_object">오브젝트</resource>
+		<resource name="editor_object">오브젝트</resource>
-		<resource name="editor_opendirinexplorer">윈도우 익스플로어에서 디렉토리 열기</resource>
+		<resource name="editor_opendirinexplorer">윈도우 익스플로어에서 디렉토리 열기</resource>
-		<resource name="editor_pastefromclipboard">붙여넣기</resource>
+		<resource name="editor_pastefromclipboard">붙여넣기</resource>
-		<resource name="editor_pixel_size">픽셀 크기</resource>
+		<resource name="editor_pixel_size">픽셀 크기</resource>
-		<resource name="editor_preview_quality">품질 미리보기</resource>
+		<resource name="editor_preview_quality">품질 미리보기</resource>
-		<resource name="editor_print">프린트</resource>
+		<resource name="editor_print">프린트</resource>
-		<resource name="editor_save">저장</resource>
+		<resource name="editor_save">저장</resource>
-		<resource name="editor_save_objects">파일로 객체 저장하기</resource>
+		<resource name="editor_save_objects">파일로 객체 저장하기</resource>
-		<resource name="editor_saveas">다른이름으로 저장</resource>
+		<resource name="editor_saveas">다른이름으로 저장</resource>
-		<resource name="editor_selectall">전체선택</resource>
+		<resource name="editor_selectall">전체선택</resource>
-		<resource name="editor_senttoprinter">프린터 작업이 '{0}' 으로 전달되었습니다.</resource>
+		<resource name="editor_senttoprinter">프린터 작업이 '{0}' 으로 전달되었습니다.</resource>
-		<resource name="editor_shadow">그림자</resource>
+		<resource name="editor_shadow">그림자</resource>
-		<resource name="editor_image_shadow">그림자</resource>
+		<resource name="editor_image_shadow">그림자</resource>
-		<resource name="editor_storedtoclipboard">클립보드에 이미지 저장</resource>
+		<resource name="editor_storedtoclipboard">클립보드에 이미지 저장</resource>
-		<resource name="editor_thickness">선 굵기</resource>
+		<resource name="editor_thickness">선 굵기</resource>
-		<resource name="editor_title">Greenshot 이미지 편집기</resource>
+		<resource name="editor_title">Greenshot 이미지 편집기</resource>
-		<resource name="editor_uponelevel">한칸 앞으로</resource>
+		<resource name="editor_uponelevel">한칸 앞으로</resource>
-		<resource name="editor_uptotop">맨 앞으로</resource>
+		<resource name="editor_uptotop">맨 앞으로</resource>
-		<resource name="error">에러</resource>
+		<resource name="error">에러</resource>
-		<resource name="error_multipleinstances">Greenshot이 이미 실행중입니다.</resource>
+		<resource name="error_multipleinstances">Greenshot이 이미 실행중입니다.</resource>
-		<resource name="error_nowriteaccess">{0} 이름으로 저장할 수 없습니다.
+		<resource name="error_nowriteaccess">{0} 이름으로 저장할 수 없습니다.
-		선택된 저장 장소의 저장 가능여부를 확인해주세요.</resource>
+		선택된 저장 장소의 저장 가능여부를 확인해주세요.</resource>
-		<resource name="error_openfile">"{0}" 파일이 열리지 않습니다.</resource>
+		<resource name="error_openfile">"{0}" 파일이 열리지 않습니다.</resource>
-		<resource name="error_openlink">링크를 열수 없습니다.</resource>
+		<resource name="error_openlink">링크를 열수 없습니다.</resource>
-		<resource name="error_save">스크린샷을 저장할 수 없습니다. 적절한 저장 위치를 선택해주세요.</resource>
+		<resource name="error_save">스크린샷을 저장할 수 없습니다. 적절한 저장 위치를 선택해주세요.</resource>
-		<resource name="help_title">Greenshot 도움말</resource>
+		<resource name="help_title">Greenshot 도움말</resource>
-		<resource name="jpegqualitydialog_choosejpegquality">JPEG 이미지 품질을 선택하세요.</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">JPEG 이미지 품질을 선택하세요.</resource>
-		<resource name="jpegqualitydialog_dontaskagain">기본 JPEG 이미지 품질을 저장하고 다시 묻지 않음.</resource>
+		<resource name="jpegqualitydialog_dontaskagain">기본 JPEG 이미지 품질을 저장하고 다시 묻지 않음.</resource>
-		<resource name="jpegqualitydialog_title">Greenshot JPEG 품질</resource>
+		<resource name="jpegqualitydialog_title">Greenshot JPEG 품질</resource>
-		<resource name="print_error">프린터로 보내는 도중 에러가 발생했습니다.</resource>
+		<resource name="print_error">프린터로 보내는 도중 에러가 발생했습니다.</resource>
-		<resource name="printoptions_allowcenter">페이지 중간 출력</resource>
+		<resource name="printoptions_allowcenter">페이지 중간 출력</resource>
-		<resource name="printoptions_allowenlarge">페이지 사이즈에 맞게 출력</resource>
+		<resource name="printoptions_allowenlarge">페이지 사이즈에 맞게 출력</resource>
-		<resource name="printoptions_allowrotate">페이지 방향(가로세로)에 따라 프린트 회전</resource>
+		<resource name="printoptions_allowrotate">페이지 방향(가로세로)에 따라 프린트 회전</resource>
-		<resource name="printoptions_allowshrink">페이지 크기에 맞게 프린트 축소</resource>
+		<resource name="printoptions_allowshrink">페이지 크기에 맞게 프린트 축소</resource>
-		<resource name="printoptions_dontaskagain">기본 옵션으로 저장하고 다시 묻지 않기</resource>
+		<resource name="printoptions_dontaskagain">기본 옵션으로 저장하고 다시 묻지 않기</resource>
-		<resource name="printoptions_timestamp">페이지의 아래에 날짜/시간 인쇄하기</resource>
+		<resource name="printoptions_timestamp">페이지의 아래에 날짜/시간 인쇄하기</resource>
-		<resource name="printoptions_title">Greenshot 프린터 옵션</resource>
+		<resource name="printoptions_title">Greenshot 프린터 옵션</resource>
-		<resource name="quicksettings_destination_file">바로 저장하기 (파일 세팅 활용)</resource>
+		<resource name="quicksettings_destination_file">바로 저장하기 (파일 세팅 활용)</resource>
-		<resource name="settings_alwaysshowjpegqualitydialog">JPEG 이미지가 저장될때마다 JPEG 품질 다이얼로그 박스 보여짐</resource>
+		<resource name="settings_alwaysshowjpegqualitydialog">JPEG 이미지가 저장될때마다 JPEG 품질 다이얼로그 박스 보여짐</resource>
-		<resource name="settings_alwaysshowprintoptionsdialog">이미지가 출력될때마다 프린트 옵션화면 보이기</resource>
+		<resource name="settings_alwaysshowprintoptionsdialog">이미지가 출력될때마다 프린트 옵션화면 보이기</resource>
-		<resource name="settings_applicationsettings">프로그램 세팅</resource>
+		<resource name="settings_applicationsettings">프로그램 세팅</resource>
-		<resource name="settings_autostartshortcut">윈도우 시작시 Greenshot 시작하기</resource>
+		<resource name="settings_autostartshortcut">윈도우 시작시 Greenshot 시작하기</resource>
-		<resource name="settings_capture">화면캡쳐</resource>
+		<resource name="settings_capture">화면캡쳐</resource>
-		<resource name="settings_capture_mousepointer">화면캡쳐 마우스포인트</resource>
+		<resource name="settings_capture_mousepointer">화면캡쳐 마우스포인트</resource>
-		<resource name="settings_capture_windows_interactive">대화형 윈도우 캡쳐 모드를 사용</resource>
+		<resource name="settings_capture_windows_interactive">대화형 윈도우 캡쳐 모드를 사용</resource>
-		<resource name="settings_copypathtoclipboard">이미지 저장시 파일 저장 위치 클립보드로 복사하기</resource>
+		<resource name="settings_copypathtoclipboard">이미지 저장시 파일 저장 위치 클립보드로 복사하기</resource>
-		<resource name="settings_destination">화면캡쳐 방법</resource>
+		<resource name="settings_destination">화면캡쳐 방법</resource>
-		<resource name="settings_destination_clipboard">클립보드로 복사</resource>
+		<resource name="settings_destination_clipboard">클립보드로 복사</resource>
-		<resource name="settings_destination_editor">이미지 편집기에서 열기</resource>
+		<resource name="settings_destination_editor">이미지 편집기에서 열기</resource>
-		<resource name="settings_destination_email">이메일</resource>
+		<resource name="settings_destination_email">이메일</resource>
-		<resource name="settings_destination_file">바로 저장하기(아래 세팅 활용)</resource>
+		<resource name="settings_destination_file">바로 저장하기(아래 세팅 활용)</resource>
-		<resource name="settings_destination_fileas">다른 이름으로 저장하기(다이얼로그박스 보여주기)</resource>
+		<resource name="settings_destination_fileas">다른 이름으로 저장하기(다이얼로그박스 보여주기)</resource>
-		<resource name="settings_destination_printer">프린터로 보내기</resource>
+		<resource name="settings_destination_printer">프린터로 보내기</resource>
-		<resource name="settings_filenamepattern">파일명 저장방식</resource>
+		<resource name="settings_filenamepattern">파일명 저장방식</resource>
-		<resource name="settings_general">일반</resource>
+		<resource name="settings_general">일반</resource>
-		<resource name="settings_jpegquality">JPEG 품질</resource>
+		<resource name="settings_jpegquality">JPEG 품질</resource>
-		<resource name="settings_jpegsettings">JPEG 세팅</resource>
+		<resource name="settings_jpegsettings">JPEG 세팅</resource>
-		<resource name="settings_language">언어</resource>
+		<resource name="settings_language">언어</resource>
-		<resource name="settings_message_filenamepattern">파일이름은 아래 표기된 방식으로 자동으로 변경됩니다:
+		<resource name="settings_message_filenamepattern">파일이름은 아래 표기된 방식으로 자동으로 변경됩니다:
-%YYYY% 년, 4 digits
+%YYYY% 년, 4 digits
-%MM% 월, 2 digits
+%MM% 월, 2 digits
-%DD% 일, 2 digits
+%DD% 일, 2 digits
-%hh% 시, 2 digits
+%hh% 시, 2 digits
-%mm% 분, 2 digits
+%mm% 분, 2 digits
-%ss% 초, 2 digits
+%ss% 초, 2 digits
-%NUM% 숫자, 6 digits
+%NUM% 숫자, 6 digits
-%title% 윈도우 타이틀
+%title% 윈도우 타이틀
-%user% 윈도우 사용자
+%user% 윈도우 사용자
-%domain% 윈도우 도메인
+%domain% 윈도우 도메인
-%hostname% PC 이름
+%hostname% PC 이름
-
+
-역슬래시(\) 표시를 사용할 경우 파일 저장시 디렉토리를 만들수 있습니다.
+역슬래시(\) 표시를 사용할 경우 파일 저장시 디렉토리를 만들수 있습니다.
-
+
-예제: 이런 방식(%YYYY%-%MM%-%DD%\%hh%-%mm%-%ss%)의 포맷을 사용할 경우 현재 디렉토리 위치에서 현재 날짜의 폴더에 현재시간의 파일명으로 파일을 생성할 수 있습니다.</resource>
+예제: 이런 방식(%YYYY%-%MM%-%DD%\%hh%-%mm%-%ss%)의 포맷을 사용할 경우 현재 디렉토리 위치에서 현재 날짜의 폴더에 현재시간의 파일명으로 파일을 생성할 수 있습니다.</resource>
-		<resource name="settings_output">저장</resource>
+		<resource name="settings_output">저장</resource>
-		<resource name="settings_playsound">카메라 촬영음</resource>
+		<resource name="settings_playsound">카메라 촬영음</resource>
-		<resource name="settings_preferredfilesettings">생성파일 환경 세팅</resource>
+		<resource name="settings_preferredfilesettings">생성파일 환경 세팅</resource>
-		<resource name="settings_primaryimageformat">이미지 포맷</resource>
+		<resource name="settings_primaryimageformat">이미지 포맷</resource>
-		<resource name="settings_printer">프린터</resource>
+		<resource name="settings_printer">프린터</resource>
-		<resource name="settings_printoptions">프린트 옵션</resource>
+		<resource name="settings_printoptions">프린트 옵션</resource>
-		<resource name="settings_registerhotkeys">단축기 등록하기</resource>
+		<resource name="settings_registerhotkeys">단축기 등록하기</resource>
-		<resource name="settings_showflashlight">카메라 플래시</resource>
+		<resource name="settings_showflashlight">카메라 플래시</resource>
-		<resource name="settings_storagelocation">저장위치</resource>
+		<resource name="settings_storagelocation">저장위치</resource>
-		<resource name="settings_title">세팅</resource>
+		<resource name="settings_title">세팅</resource>
-		<resource name="settings_tooltip_filenamepattern">스크린샷 저장시 파일명을 저장하는 방식</resource>
+		<resource name="settings_tooltip_filenamepattern">스크린샷 저장시 파일명을 저장하는 방식</resource>
-		<resource name="settings_tooltip_language">사용자 언어환경 (변경시 재부팅 필요)</resource>
+		<resource name="settings_tooltip_language">사용자 언어환경 (변경시 재부팅 필요)</resource>
-		<resource name="settings_tooltip_primaryimageformat">기본 저장 이미지 포맷</resource>
+		<resource name="settings_tooltip_primaryimageformat">기본 저장 이미지 포맷</resource>
-		<resource name="settings_tooltip_registerhotkeys">프로그램 시작시 윈도우의 Ctrl + Print, Alt + Prnt 키를 단축키로 활용할 것인지 결정</resource>
+		<resource name="settings_tooltip_registerhotkeys">프로그램 시작시 윈도우의 Ctrl + Print, Alt + Prnt 키를 단축키로 활용할 것인지 결정</resource>
-		<resource name="settings_tooltip_storagelocation">기본 저장 위치(빈칸이면 바탕화면으로 저장)</resource>
+		<resource name="settings_tooltip_storagelocation">기본 저장 위치(빈칸이면 바탕화면으로 저장)</resource>
-		<resource name="settings_visualization">효과</resource>
+		<resource name="settings_visualization">효과</resource>
-		<resource name="settings_waittime">밀리 초 캡쳐하기전 대기</resource>
+		<resource name="settings_waittime">밀리 초 캡쳐하기전 대기</resource>
-		<resource name="tooltip_firststart">여기 오른쪽 마우스 버튼을 클릭하거나 프린터키를 누르세요.</resource>
+		<resource name="tooltip_firststart">여기 오른쪽 마우스 버튼을 클릭하거나 프린터키를 누르세요.</resource>
-		<resource name="warning">주의</resource>
+		<resource name="warning">주의</resource>
-		<resource name="warning_hotkeys">One or several hotkeys could not be registered. Therefore, it might not be possible to use the Greenshot hotkeys.
+		<resource name="warning_hotkeys">One or several hotkeys could not be registered. Therefore, it might not be possible to use the Greenshot hotkeys.
-This problem is probably caused by another tool claiming usage of the same hotkeys.
+This problem is probably caused by another tool claiming usage of the same hotkeys.
-Please deactivate software making use of the Print button. You can also simply use all Greenshot features from the tray icon context menu.</resource>
+Please deactivate software making use of the Print button. You can also simply use all Greenshot features from the tray icon context menu.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-nl-NL.xml

@@ -7,7 +7,7 @@
 		<resource name="about_icons">Iconen van de icon set van Yusuke Kamiyamane's Fugue (Creative Commons Attribution 3.0 license)</resource>
 		<resource name="about_license">Copyright (C) 2007-2013 Thomas Braun, Jens Klingen, Robin Krom
 Greenshot komt zonder enige garantie! Dit is gratis software, en U kunt het distribueren onder bepaalde voorwaarden.
-Deteils over de GNU General Public License:</resource>
+Details over de GNU General Public License:</resource>
 		<resource name="about_title">Over Greenshot</resource>
 		<resource name="about_translation">Nederlandse vertaling door Jurjen Ladenius en Thomas Smid</resource>
 		<resource name="application_title">Greenshot - de revolutionaire screenshot utility</resource>

Greenshot/Languages/language-pl-PL.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<language description="Polski" ietf="pl-PL" version="1.0.0" languagegroup="2">
+<language description="Polski" ietf="pl-PL" version="1.1.4" languagegroup="2">
 	<resources>
 		<resource name="about_bugs">Tutaj proszę zgłaszać błędy:</resource>
 		<resource name="about_donations">Jeśli podoba Ci się Greenshot, chętnie przyjmiemy Twoje wsparcie:</resource>
@@ -9,6 +9,7 @@
 Greenshot nie jest objęty JAKĄKOLWIEK GWARANCJĄ. Jako wolne oprogramowanie może być rozpowszechniany na określonych warunkach.
 Szczegóły na temat Powszechnej Licencji Publicznej GNU:</resource>
 		<resource name="about_title">O Greenshot</resource>
+		<resource name="about_translation">Polskie tłumaczenie: Paweł Matyja, piotrex (https://github.com/piotrex)</resource>
 		<resource name="application_title">Greenshot - rewolucyjne narzędzie do zrzutów ekranu</resource>
 		<resource name="bugreport_cancel">Zamknij</resource>
 		<resource name="bugreport_info">Niestety, wystąpił nieoczekiwany błąd.
@@ -19,8 +20,15 @@ Odwiedź poniższy URL, utwórz nowy raport błędu i wstaw do pola opisu zawart
 Dodaj sensowne podsumowanie oraz wszelkie informacje, które uważasz za istotne do odtworzenia zaistniałej sytuacji.
 Będziemy wdzięczni, jeśli najpierw sprawdzisz, czy takie zdarzenie nie zostało już zarejestrowane. (Użyj wyszukiwarki, aby to zweryfikować.) Dziękujemy :)</resource>
 		<resource name="bugreport_title">Błąd</resource>
+		<resource name="CANCEL">Anuluj</resource>
 		<resource name="clipboard_error">Podczas zapisu do schowka wystąpił nieprzewidziany błąd.</resource>
 		<resource name="clipboard_inuse">Greenshot nie mógł dokonać zapisu do schowka, ponieważ proces {0} zablokował dostęp.</resource>
+		<resource name="clipboard_noimage">Nie można odnaleźć obrazu ze schowka.</resource>
+		<resource name="ClipboardFormat.BITMAP">Bitmapa Windows</resource>
+		<resource name="ClipboardFormat.DIB">Bitmapa DIB</resource>
+		<resource name="ClipboardFormat.HTML">HTML</resource>
+		<resource name="ClipboardFormat.HTMLDATAURL">HTML z obrazami w kodzie</resource>
+		<resource name="ClipboardFormat.PNG">PNG</resource>
 		<resource name="colorpicker_alpha">Kanał alfa</resource>
 		<resource name="colorpicker_apply">Zastosuj</resource>
 		<resource name="colorpicker_blue">Niebieski</resource>
@@ -30,28 +38,50 @@ Będziemy wdzięczni, jeśli najpierw sprawdzisz, czy takie zdarzenie nie zosta
 		<resource name="colorpicker_red">Czerwony</resource>
 		<resource name="colorpicker_title">Pobieranie koloru</resource>
 		<resource name="colorpicker_transparent">Przezroczysty</resource>
+		<resource name="com_rejected">Miejsce zapisu {0} nie pozwala Greenshotowi uzyskać dostęp, prawdopodobnie przez otwarte okno. Zamknij okno i spróbuj ponownie.</resource>
+		<resource name="com_rejected_title">Greenshot nie może uzyskać dostępu</resource>
 		<resource name="config_unauthorizedaccess_write">Nie powiódł się zapis pliku konfiguracyjnego Greenshota. Proszę sprawdzić uprawnienia dostępu dla {0}.</resource>
 		<resource name="contextmenu_about">O Greenshot</resource>
 		<resource name="contextmenu_capturearea">Zrzuć obszar</resource>
 		<resource name="contextmenu_captureclipboard">Otwórz obraz ze schowka</resource>
 		<resource name="contextmenu_capturefullscreen">Zrzuć pełny ekran</resource>
+		<resource name="contextmenu_capturefullscreen_all">całość</resource>
+		<resource name="contextmenu_capturefullscreen_bottom">od dołu</resource>
+		<resource name="contextmenu_capturefullscreen_left">od lewej</resource>
+		<resource name="contextmenu_capturefullscreen_right">od prawej</resource>
+		<resource name="contextmenu_capturefullscreen_top">od góry</resource>
+		<resource name="contextmenu_captureie">Przechwyć Internet Explorer</resource>
+		<resource name="contextmenu_captureiefromlist">Przechwyć Internet Explorer z listy</resource>
 		<resource name="contextmenu_capturelastregion">Zrzuć poprzedni obszar</resource>
 		<resource name="contextmenu_capturewindow">Zrzuć okno</resource>
+		<resource name="contextmenu_capturewindowfromlist">Przechwyć okno z listy</resource>
 		<resource name="contextmenu_donate">Wsparcie Greenshota</resource>
 		<resource name="contextmenu_exit">Wyjście</resource>
 		<resource name="contextmenu_help">Pomoc</resource>
 		<resource name="contextmenu_openfile">Otwórz obraz z pliku</resource>
+		<resource name="contextmenu_openrecentcapture">Otwórz ostatnią lokalizację zapisu</resource>
 		<resource name="contextmenu_quicksettings">Szybki dostęp do opcji</resource>
 		<resource name="contextmenu_settings">Preferencje...</resource>
+		<resource name="destination_exportfailed">Błąd podczas eksportowania do {0}. Proszę spróbować później.</resource>
+		<resource name="editor_align_bottom">Do dołu</resource>
+		<resource name="editor_align_center">Wyśrodkowane</resource>
+		<resource name="editor_align_horizontal">Wyrównanie w poziomie</resource>
+		<resource name="editor_align_left">Do lewej</resource>
+		<resource name="editor_align_middle">Do środka</resource>
+		<resource name="editor_align_right">Do prawej</resource>
+		<resource name="editor_align_top">Do góry</resource>
+		<resource name="editor_align_vertical">Wyrównanie w pionie</resource>
 		<resource name="editor_arrange">Zmień rozmieszczenie</resource>
 		<resource name="editor_arrowheads">Groty strzałki</resource>
 		<resource name="editor_arrowheads_both">Oba</resource>
 		<resource name="editor_arrowheads_end">Końcowy</resource>
 		<resource name="editor_arrowheads_none">Żaden</resource>
 		<resource name="editor_arrowheads_start">Początkowy</resource>
+		<resource name="editor_autocrop">Przytnij automatycznie</resource>
 		<resource name="editor_backcolor">Kolor wypełnienia</resource>
 		<resource name="editor_blur_radius">Promień rozmycia</resource>
 		<resource name="editor_bold">Pogrubienie</resource>
+		<resource name="editor_border">Obramowanie</resource>
 		<resource name="editor_brightness">Jaskrawość</resource>
 		<resource name="editor_cancel">Anuluj</resource>
 		<resource name="editor_clipboardfailed">Błąd przy próbie dostępu do schowka. Spróbuj ponownie.</resource>
@@ -70,25 +100,36 @@ Będziemy wdzięczni, jeśli najpierw sprawdzisz, czy takie zdarzenie nie zosta
 		<resource name="editor_downtobottom">Na sam dół</resource>
 		<resource name="editor_drawarrow">Rysuj strzałkę (A)</resource>
 		<resource name="editor_drawellipse">Rysuj elipsę (E)</resource>
+		<resource name="editor_drawfreehand">Rysuj odręcznie (F)</resource>
 		<resource name="editor_drawhighlighter">Uwydatnienie (H)</resource>
 		<resource name="editor_drawline">Rysuj linię (L)</resource>
 		<resource name="editor_drawrectangle">Rysuj prostokąt (R)</resource>
 		<resource name="editor_drawtextbox">Dodaj pole tekstowe (T)</resource>
+		<resource name="editor_dropshadow_darkness">Intensywność cienia</resource>
+		<resource name="editor_dropshadow_offset">Przesunięcie cienia</resource>
+		<resource name="editor_dropshadow_settings">Ustawienia cienia</resource>
+		<resource name="editor_dropshadow_thickness">Intensywność cienia</resource>
 		<resource name="editor_duplicate">Duplikuj wybrany element</resource>
 		<resource name="editor_edit">Edycja</resource>
+		<resource name="editor_effects">Efekty</resource>
 		<resource name="editor_email">Wyślij e-mailem</resource>
 		<resource name="editor_file">Plik</resource>
 		<resource name="editor_fontsize">Rozmiar</resource>
 		<resource name="editor_forecolor">Kolor linii</resource>
+		<resource name="editor_grayscale">Skala szarości</resource>
 		<resource name="editor_highlight_area">Uwydatnienie obszaru</resource>
 		<resource name="editor_highlight_grayscale">Wyszarzenie</resource>
 		<resource name="editor_highlight_magnify">Powiększenie</resource>
 		<resource name="editor_highlight_mode">Tryb uwydatnienia</resource>
 		<resource name="editor_highlight_text">Uwydatnienie tekstu</resource>
+		<resource name="editor_image_shadow">Rzuć cień</resource>
 		<resource name="editor_imagesaved">Obraz został zapisany w {0}.</resource>
+		<resource name="editor_insertwindow">Wklej okno</resource>
+		<resource name="editor_invert">Negatyw</resource>
 		<resource name="editor_italic">Pochylenie</resource>
 		<resource name="editor_load_objects">Załaduj obiekty z pliku</resource>
 		<resource name="editor_magnification_factor">Współczynnik powiększenia</resource>
+		<resource name="editor_match_capture_size">Dopasowuj wielkość zrzutów</resource>
 		<resource name="editor_obfuscate">Zamglenie (O)</resource>
 		<resource name="editor_obfuscate_blur">Rozmywanie</resource>
 		<resource name="editor_obfuscate_mode">Tryb zamglenia</resource>
@@ -99,18 +140,32 @@ Będziemy wdzięczni, jeśli najpierw sprawdzisz, czy takie zdarzenie nie zosta
 		<resource name="editor_pixel_size">Rozmiar piksela</resource>
 		<resource name="editor_preview_quality">Jakość podglądu</resource>
 		<resource name="editor_print">Drukuj</resource>
+		<resource name="editor_redo">Cofnij {0}</resource>
+		<resource name="editor_resetsize">Domyślny rozmiar</resource>
+		<resource name="editor_resize_percent">Procent</resource>
+		<resource name="editor_resize_pixel">Pikseli</resource>
+		<resource name="editor_rotateccw">Obróć w lewo (Ctrl + ,)</resource>
+		<resource name="editor_rotatecw">Obróć w prawo (Ctrl + .)</resource>
 		<resource name="editor_save">Zapisz</resource>
 		<resource name="editor_save_objects">Zapisz obiekty do pliku</resource>
 		<resource name="editor_saveas">Zapisz jako...</resource>
 		<resource name="editor_selectall">Zaznacz wszystko</resource>
 		<resource name="editor_senttoprinter">Zadanie drukowania zostało wysłane do '{0}'.</resource>
 		<resource name="editor_shadow">Cień</resource>
-		<resource name="editor_image_shadow">Cień</resource>
 		<resource name="editor_storedtoclipboard">Obraz został zapisany w schowku.</resource>
 		<resource name="editor_thickness">Grubość linii</resource>
 		<resource name="editor_title">Greenshot - edytor obrazów</resource>
+		<resource name="editor_torn_edge">Poszarpane krawędzie</resource>
+		<resource name="editor_tornedge_horizontaltoothrange">Poziomy zasięg poszarpania</resource>
+		<resource name="editor_tornedge_settings">Ustawienia poszarpanych krawędzi</resource>
+		<resource name="editor_tornedge_toothsize">Rozmiar poszarpania</resource>
+		<resource name="editor_tornedge_verticaltoothrange">Pionowy zasięg poszarpania</resource>
+		<resource name="editor_undo">Cofnij {0}</resource>
 		<resource name="editor_uponelevel">Jeden poziom w górę</resource>
 		<resource name="editor_uptotop">Na samą górę</resource>
+		<resource name="EmailFormat.MAPI">Klient MAPI</resource>
+		<resource name="EmailFormat.OUTLOOK_HTML">Outlook z HTML</resource>
+		<resource name="EmailFormat.OUTLOOK_TXT">Outlook z tekstem</resource>
 		<resource name="error">Błąd</resource>
 		<resource name="error_multipleinstances">Instancja aplikacji Greenshot jest już uruchomiona.</resource>
 		<resource name="error_nowriteaccess">Nie można wykonać zapisu do {0}.
@@ -118,26 +173,50 @@ Sprawdź możliwość zapisu w wybranej lokalizacji.</resource>
 		<resource name="error_openfile">Nie można otworzyć pliku {0}.</resource>
 		<resource name="error_openlink">Nie można otworzyć odsyłacza.</resource>
 		<resource name="error_save">Nie można zapisać zrzutu ekranu, proszę wskazać bardziej odpowiednią lokalizację.</resource>
+		<resource name="expertsettings">Ekspert</resource>
+		<resource name="expertsettings_autoreducecolors">Twórz obraz 8-bitowy, kiedy kolorów jest mniej niż 256, gdy ma się do czynienia z obrazem &gt; 8-bitowym</resource>
+		<resource name="expertsettings_checkunstableupdates">Sprawdzaj niestabilne wersje</resource>
+		<resource name="expertsettings_clipboardformats">Formaty schowka</resource>
+		<resource name="expertsettings_counter">Numer dla ${NUM} we wzorcu nazwy pliku</resource>
+		<resource name="expertsettings_enableexpert">Wiem, co robię!</resource>
+		<resource name="expertsettings_footerpattern">Wzorzec stopki wydruku</resource>
+		<resource name="expertsettings_minimizememoryfootprint">Minimalizuj użycie pamięci kosztem wydajności (nie polecane)</resource>
+		<resource name="expertsettings_optimizeforrdp">Optymalizacje korzystania z programu w zdalnym pulpicie</resource>
+		<resource name="expertsettings_reuseeditorifpossible">Korzystaj ponownie z edytora, kiedy to tylko możliwe</resource>
+		<resource name="expertsettings_suppresssavedialogatclose">Nie pytaj o zapisywanie przy zamykaniu edytora</resource>
+		<resource name="expertsettings_thumbnailpreview">Pokazuj miniaturki oknien w menu kontekstowym (Vista i Win 7)</resource>
+		<resource name="exported_to">Wyeksportowano do: {0}</resource>
+		<resource name="exported_to_error">Wystąpił błąd przy eksportowaniu do {0}:</resource>
 		<resource name="help_title">Greenshot - pomoc</resource>
+		<resource name="hotkeys">Skróty klawiszowe</resource>
 		<resource name="jpegqualitydialog_choosejpegquality">Proszę wybrać poziom jakości dla pliku JPEG.</resource>
-		<resource name="jpegqualitydialog_dontaskagain">Zapisz jako domyślny poziom jakości JPEG i nie pytaj ponownie</resource>
+		<resource name="OK">OK</resource>
-		<resource name="jpegqualitydialog_title">Greenshot - jakość JPEG</resource>
 		<resource name="print_error">Podczas próby wydruku wystąpił błąd.</resource>
 		<resource name="printoptions_allowcenter">Wycentruj wydruk na stronie</resource>
 		<resource name="printoptions_allowenlarge">Powiększ wydruk do rozmiaru papieru</resource>
 		<resource name="printoptions_allowrotate">Obróć wydruk odpowiednio do ułożenia strony</resource>
 		<resource name="printoptions_allowshrink">Pomniejsz wydruk do rozmiaru papieru</resource>
+		<resource name="printoptions_colors">Ustawienia kolorów</resource>
 		<resource name="printoptions_dontaskagain">Zapisz opcje jako domyślne i nie pytaj ponownie</resource>
+		<resource name="printoptions_inverted">Drukuj z odwóconymi kolorami</resource>
+		<resource name="printoptions_layout">Ustawienia strony</resource>
+		<resource name="printoptions_printcolor">Drukowanie w pełnych kolorach</resource>
+		<resource name="printoptions_printgrayscale">Wymuś drukowanie w skali szarości</resource>
+		<resource name="printoptions_printmonochrome">Wymuś drukowanie czarno-białe</resource>
 		<resource name="printoptions_timestamp">Drukuj datę/czas u dołu strony</resource>
 		<resource name="printoptions_title">Greenshot - opcje drukowania</resource>
+		<resource name="qualitydialog_dontaskagain">Ustaw jakość jako domyślną i nie pytaj już więcej</resource>
+		<resource name="qualitydialog_title">Jakość zrzutu</resource>
 		<resource name="quicksettings_destination_file">Zapisz bezpośrednio (używając ustawień dla pliku wyjściowego)</resource>
-		<resource name="settings_alwaysshowjpegqualitydialog">Pokazuj okno ustawień jakości JPEG przy każdym zapisie obrazu</resource>
 		<resource name="settings_alwaysshowprintoptionsdialog">Pokazuj okno opcji wydruku przy każdej próbie wydruku obrazu</resource>
+		<resource name="settings_alwaysshowqualitydialog">Wybieraj jakość przy każdym zapisie obrazu</resource>
 		<resource name="settings_applicationsettings">Ustawienia aplikacji</resource>
 		<resource name="settings_autostartshortcut">Uruchom Greenshot podczas startu systemu</resource>
 		<resource name="settings_capture">Zrzucanie ekranu</resource>
 		<resource name="settings_capture_mousepointer">Zrzucaj wskaźnik myszy</resource>
 		<resource name="settings_capture_windows_interactive">Tryb interaktywnego zrzucania okna</resource>
+		<resource name="settings_checkperiod">Co ile dni sprawdzać aktualizacje (0 = nie sprawdzaj)</resource>
+		<resource name="settings_configureplugin">Konfiguracja</resource>
 		<resource name="settings_copypathtoclipboard">Kopiuj ścieżkę pliku do schowka przy każdym zapisie obrazu</resource>
 		<resource name="settings_destination">Miejsce zrzutu ekranu</resource>
 		<resource name="settings_destination_clipboard">Kopiuj do schowka</resource>
@@ -145,37 +224,48 @@ Sprawdź możliwość zapisu w wybranej lokalizacji.</resource>
 		<resource name="settings_destination_email">Wyślij e-mailem</resource>
 		<resource name="settings_destination_file">Zapisz bezpośrednio (wg ustawień poniżej)</resource>
 		<resource name="settings_destination_fileas">Zapisz jako (z oknem dialogowym)</resource>
+		<resource name="settings_destination_picker">Wybieraj miejsce dynamicznie</resource>
 		<resource name="settings_destination_printer">Wyślij do drukarki</resource>
+		<resource name="settings_editor">Edytor</resource>
 		<resource name="settings_filenamepattern">Szablon nazwy pliku</resource>
 		<resource name="settings_general">Ogólne</resource>
+		<resource name="settings_iecapture">Przechwytywanie Internet Explorera</resource>
 		<resource name="settings_jpegquality">Jakość JPEG</resource>
-		<resource name="settings_jpegsettings">Ustawienia JPEG</resource>
 		<resource name="settings_language">Język</resource>
 		<resource name="settings_message_filenamepattern">Wzorce symboliczne w zdefiniowanych szablonach zostaną zastąpione automatycznie:
-${YYYY} - rok, 4 cyfry
+%YYYY% - rok, 4 cyfry
-${MM} - miesiąc, 2 cyfry
+%MM% - miesiąc, 2 cyfry
-${DD} - dzień, 2 cyfry
+%DD% - dzień, 2 cyfry
-${hh} - godzina, 2 cyfry
+%hh% - godzina, 2 cyfry
-${mm} - minuta, 2 cyfry
+%mm% - minuta, 2 cyfry
-${ss} - sekunda, 2 cyfry
+%ss% - sekunda, 2 cyfry
-${NUM} - liczba zwiększana o 1 (autonumeracja), 6 cyfr
+%NUM% - liczba zwiększana o 1 (autonumeracja), 6 cyfr
-${title} - tytuł okna
+%title% - tytuł okna
-${user} - zalogowany użytkownik
+%user% - zalogowany użytkownik
-${domain} - nazwa domeny
+%domain% - nazwa domeny
-${hostname} - nazwa komputera
+%hostname% - nazwa komputera
 
 Możliwe jest także dynamiczne tworzenie folderów - wystarczy użyć znaku odwrotnego ukośnika (\) do rozdzielenia nazw folderów i plików.
-Przykład: szablon ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss}
+Przykład: szablon %YYYY%-%MM%-%DD%\%hh%-%mm%-%ss%
 utworzy w domyślnym miejscu zapisu folder dla bieżącego dnia, np. 2008-06-29, a nazwy plików ze zrzutami ekranu będą tworzone
 na podstawie bieżącego czasu, np. 11-58-32 (plus rozszerzenie zdefiniowane w ustawieniach).</resource>
-		<resource name="settings_output">Wyjście</resource>
+		<resource name="settings_network">Śieć i aktualizacje</resource>
+		<resource name="settings_output">Plik wyjściowy</resource>
 		<resource name="settings_playsound">Odtwarzaj dźwięk migawki aparatu</resource>
+		<resource name="settings_plugins">Wtyczki</resource>
+		<resource name="settings_plugins_createdby">Stworzone przez</resource>
+		<resource name="settings_plugins_dllpath">Ścieżka do DLL</resource>
+		<resource name="settings_plugins_name">Nazwa</resource>
+		<resource name="settings_plugins_version">Wersja</resource>
 		<resource name="settings_preferredfilesettings">Preferowane ustawienia pliku wyjściowego</resource>
 		<resource name="settings_primaryimageformat">Format obrazu</resource>
 		<resource name="settings_printer">Drukarka</resource>
 		<resource name="settings_printoptions">Opcje drukowania</resource>
+		<resource name="settings_qualitysettings">Ustawienia jakości</resource>
+		<resource name="settings_reducecolors">Redukuj liczbę kolorów maksymalnie do 256</resource>
 		<resource name="settings_registerhotkeys">Zarejestruj skróty klawiaturowe</resource>
 		<resource name="settings_showflashlight">Pokazuj błysk flesza</resource>
+		<resource name="settings_shownotify">Pokazuj powiadomienia</resource>
 		<resource name="settings_storagelocation">Miejsce zapisu</resource>
 		<resource name="settings_title">Ustawienia</resource>
 		<resource name="settings_tooltip_filenamepattern">Szablon używany do tworzenia nazw plików podczas zapisywania zrzutów ekranu</resource>
@@ -183,12 +273,23 @@ na podstawie bieżącego czasu, np. 11-58-32 (plus rozszerzenie zdefiniowane w u
 		<resource name="settings_tooltip_primaryimageformat">Domyślny format pliku graficznego ze zrzutem ekranu</resource>
 		<resource name="settings_tooltip_registerhotkeys">Określa, czy skróty klawiaturowe Print, Ctrl + Print, Alt + Print są zarezerwowane do globalnego użytku przez Greenshot od chwili jego uruchomienia aż do momentu zamknięcia.</resource>
 		<resource name="settings_tooltip_storagelocation">Domyślne miejsce zapisywania zrzutów ekranu (pozostaw puste, aby zapis odbywał się na pulpit)</resource>
+		<resource name="settings_usedefaultproxy">Używaj domyślnego proxy</resource>
 		<resource name="settings_visualization">Efekty</resource>
 		<resource name="settings_waittime">milisekund oczekiwania przed wykonaniem zrzutu ekranu</resource>
+		<resource name="settings_window_capture_mode">Styl obramowania okien</resource>
+		<resource name="settings_windowscapture">Przechwytywanie okna</resource>
+		<resource name="settings_zoom">Pokazuj przybliżenie</resource>
 		<resource name="tooltip_firststart">Kliknij prawym klawiszem myszy lub naciśnij klawisz Print.</resource>
+		<resource name="update_found">Jest dostępna nowa wersja Greenshot! Chcesz pobrać Greenshot {0}?</resource>
+		<resource name="wait_ie_capture">Proszę czekać aż strona Internet Explorera zostanie przechwycona...</resource>
 		<resource name="warning">Ostrzeżenie</resource>
 		<resource name="warning_hotkeys">Nie udało się zarejestrować jednego lub kilku skrótów klawiaturowych. Z tego powodu używanie skrótów klawiaturowych Greenshota może nie być możliwe.
 Przyczyną problemu może być wykorzystywanie tych samych skrótów klawiaturowych przez inną aplikację.
 Proszę wyłączyć oprogramowanie korzystające z klawisza Print. Możliwe jest również zwyczajne korzystanie ze wszystkich funkcji Greenshota za pomocą menu kontekstowego ikony w obszarze powiadomień na pasku zadań.</resource>
+		<resource name="WindowCaptureMode.Aero">Używaj własnego koloru</resource>
+		<resource name="WindowCaptureMode.AeroTransparent">Bez przezroczystości</resource>
+		<resource name="WindowCaptureMode.Auto">Automatycznie</resource>
+		<resource name="WindowCaptureMode.GDI">Używaj domyślnego koloru</resource>
+		<resource name="WindowCaptureMode.Screen">Tak jak wyświetlane</resource>
 	</resources>
 </language>

Greenshot/Languages/language-ru-RU.xml

@@ -266,6 +266,7 @@ ${hostname} Имя ПК
 		<resource name="settings_registerhotkeys">Регистрация горячих клавиш</resource>
 		<resource name="settings_showflashlight">Показывать вспышку</resource>
 		<resource name="settings_shownotify">Показывать уведомления</resource>
+		<resource name="settings_zoom">Показать лупу</resource>
 		<resource name="settings_storagelocation">Место хранения</resource>
 		<resource name="settings_title">Настройки</resource>
 		<resource name="settings_tooltip_filenamepattern">Шаблон, используемый для создания имён файлов при сохранении скриншотов</resource>
@@ -291,4 +292,4 @@ ${hostname} Имя ПК
 		<resource name="WindowCaptureMode.GDI">Использ. цвет по умолчанию</resource>
 		<resource name="WindowCaptureMode.Screen">Как отображается</resource>
 	</resources>
-</language>
+</language>

Greenshot/Languages/language-sk-SK.xml

@@ -1,280 +1,280 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Slovenčina" ietf="sk-SK" version="1.0.4" languagegroup="2">
+<language description="Slovenčina" ietf="sk-SK" version="1.0.4" languagegroup="2">
-	<resources>
+	<resources>
-		<resource name="about_bugs">Prosím oznámte chyby na</resource>
+		<resource name="about_bugs">Prosím oznámte chyby na</resource>
-		<resource name="about_donations">Ak se vám Greenshot páči, uvítame vašu podporu:</resource>
+		<resource name="about_donations">Ak se vám Greenshot páči, uvítame vašu podporu:</resource>
-		<resource name="about_host">Greenshot je na sourceforge.net</resource>
+		<resource name="about_host">Greenshot je na sourceforge.net</resource>
-		<resource name="about_icons">Ikony z Yusuke Kamiyamane's Fugue icon set (Creative Commons Attribution 3.0 license)</resource>
+		<resource name="about_icons">Ikony z Yusuke Kamiyamane's Fugue icon set (Creative Commons Attribution 3.0 license)</resource>
-		<resource name="about_license">Copyright (C) 2007-2013 Thomas Braun, Jens Klingen, Robin Krom
+		<resource name="about_license">Copyright (C) 2007-2013 Thomas Braun, Jens Klingen, Robin Krom
-Greenshot je ÚPLNE BEZ ZÁRUKY. Toto je FREE software, a môžete ho distribuovať za určitých podmienok.
+Greenshot je ÚPLNE BEZ ZÁRUKY. Toto je FREE software, a môžete ho distribuovať za určitých podmienok.
-Podrobnosti o GNU General Public License:</resource>
+Podrobnosti o GNU General Public License:</resource>
-		<resource name="about_title">O Greenshote</resource>
+		<resource name="about_title">O Greenshote</resource>
-		<resource name="application_title">Greenshot - revolučná screenshot utilita</resource>
+		<resource name="application_title">Greenshot - revolučná screenshot utilita</resource>
-		<resource name="bugreport_cancel">Zavrieť</resource>
+		<resource name="bugreport_cancel">Zavrieť</resource>
-		<resource name="bugreport_info">Ospravedlňujeme sa za neočakávanú chybu.
+		<resource name="bugreport_info">Ospravedlňujeme sa za neočakávanú chybu.
-        
+        
-Dobrá správa je, že nám môžete pomôť zbaviť se jej podaním hlásenia o chybe.
+Dobrá správa je, že nám môžete pomôť zbaviť se jej podaním hlásenia o chybe.
-Prosím, navštívte nižšie uvedenú URL adresu, vytvorte nové hlásenie o chybe a vložte obsah z textovej oblasti do popisu.
+Prosím, navštívte nižšie uvedenú URL adresu, vytvorte nové hlásenie o chybe a vložte obsah z textovej oblasti do popisu.
-
+
-Prosím, pridajte zmysluplné zhrnutie a uveďte všetky informácie, které považujete za užitočné pre reprodukciu problému.
+Prosím, pridajte zmysluplné zhrnutie a uveďte všetky informácie, které považujete za užitočné pre reprodukciu problému.
-Tiež by sme velmi ocenili, keby ste najskôr skontrolovali, či už neexistuje pre túto chybu tracker. (Môžete použiť vyhľadávanie.) Ďakujeme :)</resource>
+Tiež by sme velmi ocenili, keby ste najskôr skontrolovali, či už neexistuje pre túto chybu tracker. (Môžete použiť vyhľadávanie.) Ďakujeme :)</resource>
-		<resource name="bugreport_title">Chyba</resource>
+		<resource name="bugreport_title">Chyba</resource>
-		<resource name="CANCEL">Zrušiť</resource>
+		<resource name="CANCEL">Zrušiť</resource>
-		<resource name="clipboard_error">Neočakávaná chyba pri zápise do schránky.</resource>
+		<resource name="clipboard_error">Neočakávaná chyba pri zápise do schránky.</resource>
-		<resource name="clipboard_inuse">Greenshot nemôhol zapísať do schránky - proces {0} zablokoval prístup.</resource>
+		<resource name="clipboard_inuse">Greenshot nemôhol zapísať do schránky - proces {0} zablokoval prístup.</resource>
-		<resource name="ClipboardFormat.DIB">Device Independend Bitmap (DIB)</resource>
+		<resource name="ClipboardFormat.DIB">Device Independend Bitmap (DIB)</resource>
-		<resource name="ClipboardFormat.HTML">HTML</resource>
+		<resource name="ClipboardFormat.HTML">HTML</resource>
-		<resource name="ClipboardFormat.HTMLDATAURL">HTML with inline images</resource>
+		<resource name="ClipboardFormat.HTMLDATAURL">HTML with inline images</resource>
-		<resource name="ClipboardFormat.PNG">PNG</resource>
+		<resource name="ClipboardFormat.PNG">PNG</resource>
-		<resource name="colorpicker_alpha">Alpha</resource>
+		<resource name="colorpicker_alpha">Alpha</resource>
-		<resource name="colorpicker_apply">Použiť</resource>
+		<resource name="colorpicker_apply">Použiť</resource>
-		<resource name="colorpicker_blue">Modrá</resource>
+		<resource name="colorpicker_blue">Modrá</resource>
-		<resource name="colorpicker_green">Zelená</resource>
+		<resource name="colorpicker_green">Zelená</resource>
-		<resource name="colorpicker_htmlcolor">HTML farba</resource>
+		<resource name="colorpicker_htmlcolor">HTML farba</resource>
-		<resource name="colorpicker_recentcolors">Naposledy použité farby</resource>
+		<resource name="colorpicker_recentcolors">Naposledy použité farby</resource>
-		<resource name="colorpicker_red">Červená</resource>
+		<resource name="colorpicker_red">Červená</resource>
-		<resource name="colorpicker_title">Výber farby</resource>
+		<resource name="colorpicker_title">Výber farby</resource>
-		<resource name="colorpicker_transparent">Priehľadný</resource>
+		<resource name="colorpicker_transparent">Priehľadný</resource>
-		<resource name="config_unauthorizedaccess_write">Nemožno uložiť konfiguračný súbor Greenshotu. Prosím skontrolujte prístupové práva k '{0}'.</resource>
+		<resource name="config_unauthorizedaccess_write">Nemožno uložiť konfiguračný súbor Greenshotu. Prosím skontrolujte prístupové práva k '{0}'.</resource>
-		<resource name="contextmenu_about">O Greenshot</resource>
+		<resource name="contextmenu_about">O Greenshot</resource>
-		<resource name="contextmenu_capturearea">Zachytiť oblasť</resource>
+		<resource name="contextmenu_capturearea">Zachytiť oblasť</resource>
-		<resource name="contextmenu_captureclipboard">Otvoriť obrázok zo schránky</resource>
+		<resource name="contextmenu_captureclipboard">Otvoriť obrázok zo schránky</resource>
-		<resource name="contextmenu_capturefullscreen">Zachytiť celú obrazovku</resource>
+		<resource name="contextmenu_capturefullscreen">Zachytiť celú obrazovku</resource>
-		<resource name="contextmenu_capturefullscreen_all">všetko</resource>
+		<resource name="contextmenu_capturefullscreen_all">všetko</resource>
-		<resource name="contextmenu_capturefullscreen_bottom">dole</resource>
+		<resource name="contextmenu_capturefullscreen_bottom">dole</resource>
-		<resource name="contextmenu_capturefullscreen_left">vľavo</resource>
+		<resource name="contextmenu_capturefullscreen_left">vľavo</resource>
-		<resource name="contextmenu_capturefullscreen_right">vpravo</resource>
+		<resource name="contextmenu_capturefullscreen_right">vpravo</resource>
-		<resource name="contextmenu_capturefullscreen_top">hore</resource>
+		<resource name="contextmenu_capturefullscreen_top">hore</resource>
-		<resource name="contextmenu_captureie">Zachytiť Internet Explorer</resource>
+		<resource name="contextmenu_captureie">Zachytiť Internet Explorer</resource>
-		<resource name="contextmenu_captureiefromlist">Zachytiť Internet Explorer zo zoznamu</resource>
+		<resource name="contextmenu_captureiefromlist">Zachytiť Internet Explorer zo zoznamu</resource>
-		<resource name="contextmenu_capturelastregion">Zachytiť predchádzajúcu oblasť</resource>
+		<resource name="contextmenu_capturelastregion">Zachytiť predchádzajúcu oblasť</resource>
-		<resource name="contextmenu_capturewindow">Zachytiť aktívne okno</resource>
+		<resource name="contextmenu_capturewindow">Zachytiť aktívne okno</resource>
-		<resource name="contextmenu_capturewindowfromlist">Zachytiť okno zo zoznamu</resource>
+		<resource name="contextmenu_capturewindowfromlist">Zachytiť okno zo zoznamu</resource>
-		<resource name="contextmenu_donate">Podpora Greenshotu</resource>
+		<resource name="contextmenu_donate">Podpora Greenshotu</resource>
-		<resource name="contextmenu_exit">Ukončiť</resource>
+		<resource name="contextmenu_exit">Ukončiť</resource>
-		<resource name="contextmenu_help">Nápoveda</resource>
+		<resource name="contextmenu_help">Nápoveda</resource>
-		<resource name="contextmenu_openfile">Otvoriť obrázok zo súboru</resource>
+		<resource name="contextmenu_openfile">Otvoriť obrázok zo súboru</resource>
-		<resource name="contextmenu_openrecentcapture">Otvoriť posledné miesto uloženia</resource>
+		<resource name="contextmenu_openrecentcapture">Otvoriť posledné miesto uloženia</resource>
-		<resource name="contextmenu_quicksettings">Rýchle nastavenia</resource>
+		<resource name="contextmenu_quicksettings">Rýchle nastavenia</resource>
-		<resource name="contextmenu_settings">Predvoľby...</resource>
+		<resource name="contextmenu_settings">Predvoľby...</resource>
-		<resource name="destination_exportfailed">Chyba pri exporte do {0}. Prosím skúste to znova.</resource>
+		<resource name="destination_exportfailed">Chyba pri exporte do {0}. Prosím skúste to znova.</resource>
-		<resource name="editor_arrange">Usporiadať</resource>
+		<resource name="editor_arrange">Usporiadať</resource>
-		<resource name="editor_arrowheads">Hlavička šípky</resource>
+		<resource name="editor_arrowheads">Hlavička šípky</resource>
-		<resource name="editor_arrowheads_both">Oba</resource>
+		<resource name="editor_arrowheads_both">Oba</resource>
-		<resource name="editor_arrowheads_end">Koncový bod</resource>
+		<resource name="editor_arrowheads_end">Koncový bod</resource>
-		<resource name="editor_arrowheads_none">Žiaden</resource>
+		<resource name="editor_arrowheads_none">Žiaden</resource>
-		<resource name="editor_arrowheads_start">Začiatočný bod</resource>
+		<resource name="editor_arrowheads_start">Začiatočný bod</resource>
-		<resource name="editor_autocrop">Automatické orezanie</resource>
+		<resource name="editor_autocrop">Automatické orezanie</resource>
-		<resource name="editor_backcolor">Farba výplne</resource>
+		<resource name="editor_backcolor">Farba výplne</resource>
-		<resource name="editor_blur_radius">Rádius rozmazania</resource>
+		<resource name="editor_blur_radius">Rádius rozmazania</resource>
-		<resource name="editor_bold">Tučné</resource>
+		<resource name="editor_bold">Tučné</resource>
-		<resource name="editor_border">Orámovať</resource>		
+		<resource name="editor_border">Orámovať</resource>		
-		<resource name="editor_brightness">Jas</resource>
+		<resource name="editor_brightness">Jas</resource>
-		<resource name="editor_cancel">Zrušiť</resource>
+		<resource name="editor_cancel">Zrušiť</resource>
-		<resource name="editor_clipboardfailed">Chyba pri prístupe k schránke. Prosím skúste to znova.</resource>
+		<resource name="editor_clipboardfailed">Chyba pri prístupe k schránke. Prosím skúste to znova.</resource>
-		<resource name="editor_close">Zavrieť</resource>
+		<resource name="editor_close">Zavrieť</resource>
-		<resource name="editor_close_on_save">Chcete uložiť snímku?</resource>
+		<resource name="editor_close_on_save">Chcete uložiť snímku?</resource>
-		<resource name="editor_close_on_save_title">Uložiť obrázok?</resource>
+		<resource name="editor_close_on_save_title">Uložiť obrázok?</resource>
-		<resource name="editor_confirm">Potvrdiť</resource>
+		<resource name="editor_confirm">Potvrdiť</resource>
-		<resource name="editor_copyimagetoclipboard">Kopírovať obrázok do schránky</resource>
+		<resource name="editor_copyimagetoclipboard">Kopírovať obrázok do schránky</resource>
-		<resource name="editor_copypathtoclipboard">Kopírovať cestu do schránky</resource>
+		<resource name="editor_copypathtoclipboard">Kopírovať cestu do schránky</resource>
-		<resource name="editor_copytoclipboard">Kopírovať</resource>
+		<resource name="editor_copytoclipboard">Kopírovať</resource>
-		<resource name="editor_crop">Orezať (C)</resource>
+		<resource name="editor_crop">Orezať (C)</resource>
-		<resource name="editor_cursortool">Nástroj pre výber (ESC)</resource>
+		<resource name="editor_cursortool">Nástroj pre výber (ESC)</resource>
-		<resource name="editor_cuttoclipboard">Vystrihnúť</resource>
+		<resource name="editor_cuttoclipboard">Vystrihnúť</resource>
-		<resource name="editor_deleteelement">Zmazať</resource>
+		<resource name="editor_deleteelement">Zmazať</resource>
-		<resource name="editor_downonelevel">Nižšie o jednu úroveň</resource>
+		<resource name="editor_downonelevel">Nižšie o jednu úroveň</resource>
-		<resource name="editor_downtobottom">Dole na koniec</resource>
+		<resource name="editor_downtobottom">Dole na koniec</resource>
-		<resource name="editor_drawarrow">Nakresli šípku (A)</resource>
+		<resource name="editor_drawarrow">Nakresli šípku (A)</resource>
-		<resource name="editor_drawellipse">Nakresli elipsu (E)</resource>
+		<resource name="editor_drawellipse">Nakresli elipsu (E)</resource>
-		<resource name="editor_drawfreehand">Kreslenie voľnou rukou (F)</resource>
+		<resource name="editor_drawfreehand">Kreslenie voľnou rukou (F)</resource>
-		<resource name="editor_drawhighlighter">Zvýraznenie (H)</resource>
+		<resource name="editor_drawhighlighter">Zvýraznenie (H)</resource>
-		<resource name="editor_drawline">Nakresli čiaru (L)</resource>
+		<resource name="editor_drawline">Nakresli čiaru (L)</resource>
-		<resource name="editor_drawrectangle">Nakresli obdĺžnik (R)</resource>
+		<resource name="editor_drawrectangle">Nakresli obdĺžnik (R)</resource>
-		<resource name="editor_drawtextbox">Pridať textbox (T)</resource>
+		<resource name="editor_drawtextbox">Pridať textbox (T)</resource>
-		<resource name="editor_duplicate">Duplikuj vybraný prvok</resource>
+		<resource name="editor_duplicate">Duplikuj vybraný prvok</resource>
-		<resource name="editor_edit">Upraviť</resource>
+		<resource name="editor_edit">Upraviť</resource>
-		<resource name="editor_effects">Efekty</resource>
+		<resource name="editor_effects">Efekty</resource>
-		<resource name="editor_email">E-Mail</resource>
+		<resource name="editor_email">E-Mail</resource>
-		<resource name="editor_file">Súbor</resource>
+		<resource name="editor_file">Súbor</resource>
-		<resource name="editor_fontsize">Veľkosť</resource>
+		<resource name="editor_fontsize">Veľkosť</resource>
-		<resource name="editor_forecolor">Farba čiary</resource>
+		<resource name="editor_forecolor">Farba čiary</resource>
-		<resource name="editor_grayscale">Stupne šedej</resource>
+		<resource name="editor_grayscale">Stupne šedej</resource>
-		<resource name="editor_highlight_area">Zvýrazniť oblasť</resource>
+		<resource name="editor_highlight_area">Zvýrazniť oblasť</resource>
-		<resource name="editor_highlight_grayscale">V odtieňoch šedej</resource>
+		<resource name="editor_highlight_grayscale">V odtieňoch šedej</resource>
-		<resource name="editor_highlight_magnify">Zväčšiť</resource>
+		<resource name="editor_highlight_magnify">Zväčšiť</resource>
-		<resource name="editor_highlight_mode">Režim zvýraznenia</resource>
+		<resource name="editor_highlight_mode">Režim zvýraznenia</resource>
-		<resource name="editor_highlight_text">Zvýrazniť text</resource>
+		<resource name="editor_highlight_text">Zvýrazniť text</resource>
-		<resource name="editor_image_shadow">Vrhať tieň</resource>
+		<resource name="editor_image_shadow">Vrhať tieň</resource>
-		<resource name="editor_imagesaved">Obrázok uložený do {0}.</resource>
+		<resource name="editor_imagesaved">Obrázok uložený do {0}.</resource>
-		<resource name="editor_insertwindow">Vložiť okno</resource>
+		<resource name="editor_insertwindow">Vložiť okno</resource>
-		<resource name="editor_invert">Invertovať</resource>
+		<resource name="editor_invert">Invertovať</resource>
-		<resource name="editor_italic">Kurzíva</resource>
+		<resource name="editor_italic">Kurzíva</resource>
-		<resource name="editor_load_objects">Načítať objekty zo súboru</resource>
+		<resource name="editor_load_objects">Načítať objekty zo súboru</resource>
-		<resource name="editor_magnification_factor">Faktor zväčšenia</resource>
+		<resource name="editor_magnification_factor">Faktor zväčšenia</resource>
-		<resource name="editor_match_capture_size">Zmenšiť editor podľa veľkosti snímky</resource>
+		<resource name="editor_match_capture_size">Zmenšiť editor podľa veľkosti snímky</resource>
-		<resource name="editor_obfuscate">Rozostrenie (O)</resource>
+		<resource name="editor_obfuscate">Rozostrenie (O)</resource>
-		<resource name="editor_obfuscate_blur">Rozmazať</resource>
+		<resource name="editor_obfuscate_blur">Rozmazať</resource>
-		<resource name="editor_obfuscate_mode">Režim rozostrenia</resource>
+		<resource name="editor_obfuscate_mode">Režim rozostrenia</resource>
-		<resource name="editor_obfuscate_pixelize">Pixelizovať</resource>
+		<resource name="editor_obfuscate_pixelize">Pixelizovať</resource>
-		<resource name="editor_object">Objekt</resource>
+		<resource name="editor_object">Objekt</resource>
-		<resource name="editor_opendirinexplorer">Otvor adresár v prieskumníku Windows</resource>
+		<resource name="editor_opendirinexplorer">Otvor adresár v prieskumníku Windows</resource>
-		<resource name="editor_pastefromclipboard">Vložiť</resource>
+		<resource name="editor_pastefromclipboard">Vložiť</resource>
-		<resource name="editor_pixel_size">Veľkosť pixelu</resource>
+		<resource name="editor_pixel_size">Veľkosť pixelu</resource>
-		<resource name="editor_preview_quality">Ukážka kvality</resource>
+		<resource name="editor_preview_quality">Ukážka kvality</resource>
-		<resource name="editor_print">Tlač</resource>
+		<resource name="editor_print">Tlač</resource>
-		<resource name="editor_redo">Znova {0}</resource>
+		<resource name="editor_redo">Znova {0}</resource>
-		<resource name="editor_resetsize">Obnovit veľkosť</resource>
+		<resource name="editor_resetsize">Obnovit veľkosť</resource>
-		<resource name="editor_rotateccw">Otočiť proti smeru hodinových ručičiek</resource>
+		<resource name="editor_rotateccw">Otočiť proti smeru hodinových ručičiek</resource>
-		<resource name="editor_rotatecw">Otočiť v smere hodinových ručičiek</resource>
+		<resource name="editor_rotatecw">Otočiť v smere hodinových ručičiek</resource>
-		<resource name="editor_save">Uložiť</resource>
+		<resource name="editor_save">Uložiť</resource>
-		<resource name="editor_save_objects">Uložiť objekty do súboru</resource>
+		<resource name="editor_save_objects">Uložiť objekty do súboru</resource>
-		<resource name="editor_saveas">Uložiť ako...</resource>
+		<resource name="editor_saveas">Uložiť ako...</resource>
-		<resource name="editor_selectall">Vybrať všetko</resource>
+		<resource name="editor_selectall">Vybrať všetko</resource>
-		<resource name="editor_senttoprinter">Tlačová úloha odoslaná do '{0}'.</resource>
+		<resource name="editor_senttoprinter">Tlačová úloha odoslaná do '{0}'.</resource>
-		<resource name="editor_shadow">Tieň</resource>
+		<resource name="editor_shadow">Tieň</resource>
-		<resource name="editor_image_shadow">Tieň</resource>
+		<resource name="editor_image_shadow">Tieň</resource>
-		<resource name="editor_storedtoclipboard">Obrázek je uložený do schránky.</resource>
+		<resource name="editor_storedtoclipboard">Obrázek je uložený do schránky.</resource>
-		<resource name="editor_thickness">Hrúbka čiary</resource>
+		<resource name="editor_thickness">Hrúbka čiary</resource>
-		<resource name="editor_title">Greenshot editor obrázkov</resource>
+		<resource name="editor_title">Greenshot editor obrázkov</resource>
-		<resource name="editor_torn_edge">Potrhané okraje</resource>
+		<resource name="editor_torn_edge">Potrhané okraje</resource>
-		<resource name="editor_undo">Naspäť {0}</resource>
+		<resource name="editor_undo">Naspäť {0}</resource>
-		<resource name="editor_uponelevel">Vyššie o jednu úroveň</resource>
+		<resource name="editor_uponelevel">Vyššie o jednu úroveň</resource>
-		<resource name="editor_uptotop">Hore na začiatok</resource>
+		<resource name="editor_uptotop">Hore na začiatok</resource>
-		<resource name="EmailFormat.MAPI">MAPI client</resource>
+		<resource name="EmailFormat.MAPI">MAPI client</resource>
-		<resource name="EmailFormat.OUTLOOK_HTML">Outlook with HTML</resource>
+		<resource name="EmailFormat.OUTLOOK_HTML">Outlook with HTML</resource>
-		<resource name="EmailFormat.OUTLOOK_TXT">Outlook with text</resource>
+		<resource name="EmailFormat.OUTLOOK_TXT">Outlook with text</resource>
-		<resource name="error">Chyba</resource>
+		<resource name="error">Chyba</resource>
-		<resource name="error_multipleinstances">Greenshot je už spustený.</resource>
+		<resource name="error_multipleinstances">Greenshot je už spustený.</resource>
-		<resource name="error_nowriteaccess">Nedá sa uložiť súbor do {0}.
+		<resource name="error_nowriteaccess">Nedá sa uložiť súbor do {0}.
-Skontrolujte prosím možnosť zapisovať do vybraného umiestnenia.</resource>
+Skontrolujte prosím možnosť zapisovať do vybraného umiestnenia.</resource>
-		<resource name="error_openfile">Súbor "{0}" nemožno otvoriť.</resource>
+		<resource name="error_openfile">Súbor "{0}" nemožno otvoriť.</resource>
-		<resource name="error_openlink">Nedá sa otvoriť odkaz.</resource>
+		<resource name="error_openlink">Nedá sa otvoriť odkaz.</resource>
-		<resource name="error_save">Nedá sa uložiť snímka, prosím nájdite vhodné umiestnenie.</resource>
+		<resource name="error_save">Nedá sa uložiť snímka, prosím nájdite vhodné umiestnenie.</resource>
-		<resource name="expertsettings">Expert</resource>
+		<resource name="expertsettings">Expert</resource>
-		<resource name="expertsettings_autoreducecolors">Vytvoriť 8-bit obrázok ak má snímka menej ako 256 farieb</resource>
+		<resource name="expertsettings_autoreducecolors">Vytvoriť 8-bit obrázok ak má snímka menej ako 256 farieb</resource>
-		<resource name="expertsettings_checkunstableupdates">Kontrola dostupnosti nestabilných aktualizácií</resource>
+		<resource name="expertsettings_checkunstableupdates">Kontrola dostupnosti nestabilných aktualizácií</resource>
-		<resource name="expertsettings_clipboardformats">Formáty schránky</resource>
+		<resource name="expertsettings_clipboardformats">Formáty schránky</resource>
-		<resource name="expertsettings_counter">Číslo pre ${NUM} v šablóne názvu súboru</resource>
+		<resource name="expertsettings_counter">Číslo pre ${NUM} v šablóne názvu súboru</resource>
-		<resource name="expertsettings_enableexpert">Viem čo robím!</resource>
+		<resource name="expertsettings_enableexpert">Viem čo robím!</resource>
-		<resource name="expertsettings_footerpattern">Šablóna pre tlač päty</resource>
+		<resource name="expertsettings_footerpattern">Šablóna pre tlač päty</resource>
-		<resource name="expertsettings_minimizememoryfootprint">Zníženie nárokov na pamäť za cenu zníženia výkonnosti (neodporúča sa).</resource>
+		<resource name="expertsettings_minimizememoryfootprint">Zníženie nárokov na pamäť za cenu zníženia výkonnosti (neodporúča sa).</resource>
-		<resource name="expertsettings_optimizeforrdp">Optimalizácia pre použitie so vzdialenou plochou</resource>
+		<resource name="expertsettings_optimizeforrdp">Optimalizácia pre použitie so vzdialenou plochou</resource>
-		<resource name="expertsettings_reuseeditorifpossible">Ak sa dá, znova použi už otvorený editor</resource>
+		<resource name="expertsettings_reuseeditorifpossible">Ak sa dá, znova použi už otvorený editor</resource>
-		<resource name="expertsettings_suppresssavedialogatclose">Potlačiť dialóg  Uložiť  pri zatváraní editoru</resource>
+		<resource name="expertsettings_suppresssavedialogatclose">Potlačiť dialóg  Uložiť  pri zatváraní editoru</resource>
-		<resource name="expertsettings_thumbnailpreview">Zobraz miniatúry okien v kontextovom menu (Vista a Windows 7)</resource>
+		<resource name="expertsettings_thumbnailpreview">Zobraz miniatúry okien v kontextovom menu (Vista a Windows 7)</resource>
-		<resource name="exported_to">Exportované do: {0}</resource>
+		<resource name="exported_to">Exportované do: {0}</resource>
-		<resource name="exported_to_error">Chyba pri exporte do {0}:</resource>
+		<resource name="exported_to_error">Chyba pri exporte do {0}:</resource>
-		<resource name="help_title">Greenshot nápoveda</resource>
+		<resource name="help_title">Greenshot nápoveda</resource>
-		<resource name="hotkeys">Klávesové skratky</resource>
+		<resource name="hotkeys">Klávesové skratky</resource>
-		<resource name="jpegqualitydialog_choosejpegquality">Prosím, vyberte kvalitu pre váš JPEG obrázok.</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">Prosím, vyberte kvalitu pre váš JPEG obrázok.</resource>
-		<resource name="jpegqualitydialog_dontaskagain">Uložiť ako predvolenú JPEG kvalitu a nepýtať sa znova</resource>
+		<resource name="jpegqualitydialog_dontaskagain">Uložiť ako predvolenú JPEG kvalitu a nepýtať sa znova</resource>
-		<resource name="jpegqualitydialog_title">Greenshot JPEG kvalita</resource>
+		<resource name="jpegqualitydialog_title">Greenshot JPEG kvalita</resource>
-		<resource name="OK">Ok</resource>
+		<resource name="OK">Ok</resource>
-		<resource name="print_error">Nastala chyba pri pokuse tlačiť.</resource>
+		<resource name="print_error">Nastala chyba pri pokuse tlačiť.</resource>
-		<resource name="printoptions_allowcenter">Zarovnať na stred</resource>
+		<resource name="printoptions_allowcenter">Zarovnať na stred</resource>
-		<resource name="printoptions_allowenlarge">Zväčšiť na veľkosť papiera</resource>
+		<resource name="printoptions_allowenlarge">Zväčšiť na veľkosť papiera</resource>
-		<resource name="printoptions_allowrotate">Zmeniť orientáciu papiera</resource>
+		<resource name="printoptions_allowrotate">Zmeniť orientáciu papiera</resource>
-		<resource name="printoptions_allowshrink">Zmenšiť na veľkosť papiera</resource>
+		<resource name="printoptions_allowshrink">Zmenšiť na veľkosť papiera</resource>
-		<resource name="printoptions_dontaskagain">Uložiť možnosti ako predvolené a viac sa nepýtať</resource>
+		<resource name="printoptions_dontaskagain">Uložiť možnosti ako predvolené a viac sa nepýtať</resource>
-		<resource name="printoptions_inverted">Tlačiť s invertovanými farbami</resource>
+		<resource name="printoptions_inverted">Tlačiť s invertovanými farbami</resource>
-		<resource name="printoptions_printgrayscale">Vynútiť tlač v odtieňoch šedej</resource>
+		<resource name="printoptions_printgrayscale">Vynútiť tlač v odtieňoch šedej</resource>
-		<resource name="printoptions_timestamp">Tlač dátumu / času v dolnej časti stránky</resource>
+		<resource name="printoptions_timestamp">Tlač dátumu / času v dolnej časti stránky</resource>
-		<resource name="printoptions_title">Možnosti tlače</resource>
+		<resource name="printoptions_title">Možnosti tlače</resource>
-		<resource name="qualitydialog_dontaskagain">Uložiť ako predvolenú kvalitu a viackrát sa nepýtať</resource>
+		<resource name="qualitydialog_dontaskagain">Uložiť ako predvolenú kvalitu a viackrát sa nepýtať</resource>
-		<resource name="qualitydialog_title">Greenshot kvalita</resource>
+		<resource name="qualitydialog_title">Greenshot kvalita</resource>
-		<resource name="quicksettings_destination_file">Uložiť priamo (pomocou preferovaného nastavenia výstupného súboru)</resource>
+		<resource name="quicksettings_destination_file">Uložiť priamo (pomocou preferovaného nastavenia výstupného súboru)</resource>
-		<resource name="settings_alwaysshowjpegqualitydialog">Zobraziť dialóg JPEG kvality vždy, keď je obrázok ukladaný vo formáte JPEG</resource>
+		<resource name="settings_alwaysshowjpegqualitydialog">Zobraziť dialóg JPEG kvality vždy, keď je obrázok ukladaný vo formáte JPEG</resource>
-		<resource name="settings_alwaysshowprintoptionsdialog">Ukázať možnosti tlače vždy pred vytlačením obrázku</resource>
+		<resource name="settings_alwaysshowprintoptionsdialog">Ukázať možnosti tlače vždy pred vytlačením obrázku</resource>
-		<resource name="settings_alwaysshowqualitydialog">Zobraziť dialóg kvality vždy pri ukladaní obrázku</resource>
+		<resource name="settings_alwaysshowqualitydialog">Zobraziť dialóg kvality vždy pri ukladaní obrázku</resource>
-		<resource name="settings_applicationsettings">Nastavenie aplikácie</resource>
+		<resource name="settings_applicationsettings">Nastavenie aplikácie</resource>
-		<resource name="settings_autostartshortcut">Spustiť Greenshot pri štarte</resource>
+		<resource name="settings_autostartshortcut">Spustiť Greenshot pri štarte</resource>
-		<resource name="settings_capture">Spraviť snímku</resource>
+		<resource name="settings_capture">Spraviť snímku</resource>
-		<resource name="settings_capture_mousepointer">Zachytiť aj kurzor myši</resource>
+		<resource name="settings_capture_mousepointer">Zachytiť aj kurzor myši</resource>
-		<resource name="settings_capture_windows_interactive">Interaktívny výber pri snímaní okien</resource>
+		<resource name="settings_capture_windows_interactive">Interaktívny výber pri snímaní okien</resource>
-		<resource name="settings_checkperiod">Interval kontroly dostupnosti aktualizácií v dňoch (0=nekontrolovať)</resource>
+		<resource name="settings_checkperiod">Interval kontroly dostupnosti aktualizácií v dňoch (0=nekontrolovať)</resource>
-		<resource name="settings_configureplugin">Konfigurovať</resource>
+		<resource name="settings_configureplugin">Konfigurovať</resource>
-		<resource name="settings_copypathtoclipboard">Kopírovať cestu k súboru do schránky pri každom ukladaní obrázku.</resource>
+		<resource name="settings_copypathtoclipboard">Kopírovať cestu k súboru do schránky pri každom ukladaní obrázku.</resource>
-		<resource name="settings_destination">Cieľ screenshotu</resource>
+		<resource name="settings_destination">Cieľ screenshotu</resource>
-		<resource name="settings_destination_clipboard">Kopírovať do schránky</resource>
+		<resource name="settings_destination_clipboard">Kopírovať do schránky</resource>
-		<resource name="settings_destination_editor">Otvoriť v editore obrázkov</resource>
+		<resource name="settings_destination_editor">Otvoriť v editore obrázkov</resource>
-		<resource name="settings_destination_email">E-Mail</resource>
+		<resource name="settings_destination_email">E-Mail</resource>
-		<resource name="settings_destination_file">Uložiť priamo (pomocou nastavení nižšie)</resource>
+		<resource name="settings_destination_file">Uložiť priamo (pomocou nastavení nižšie)</resource>
-		<resource name="settings_destination_fileas">Uložiť ako (zobraz dialóg)</resource>
+		<resource name="settings_destination_fileas">Uložiť ako (zobraz dialóg)</resource>
-		<resource name="settings_destination_picker">Vyberte cieľ dynamicky</resource>		
+		<resource name="settings_destination_picker">Vyberte cieľ dynamicky</resource>		
-		<resource name="settings_destination_printer">Poslať do tlačiarne</resource>
+		<resource name="settings_destination_printer">Poslať do tlačiarne</resource>
-		<resource name="settings_editor">Editor</resource>
+		<resource name="settings_editor">Editor</resource>
-		<resource name="settings_filenamepattern">Meno súboru - šablona</resource>
+		<resource name="settings_filenamepattern">Meno súboru - šablona</resource>
-		<resource name="settings_general">Hlavné</resource>
+		<resource name="settings_general">Hlavné</resource>
-		<resource name="settings_iecapture">Snímanie Internet Explorera</resource>
+		<resource name="settings_iecapture">Snímanie Internet Explorera</resource>
-		<resource name="settings_jpegquality">JPEG kavalita</resource>
+		<resource name="settings_jpegquality">JPEG kavalita</resource>
-		<resource name="settings_jpegsettings">JPEG nastavenia</resource>
+		<resource name="settings_jpegsettings">JPEG nastavenia</resource>
-		<resource name="settings_language">Jazyk</resource>
+		<resource name="settings_language">Jazyk</resource>
-		<resource name="settings_message_filenamepattern">Následujúce symboly budú automaticky nahradené v definovanej šablóne:
+		<resource name="settings_message_filenamepattern">Následujúce symboly budú automaticky nahradené v definovanej šablóne:
-
+
-${YYYY}  rok, 4 číslice
+${YYYY}  rok, 4 číslice
-${MM}  mesiac, 2 číslice
+${MM}  mesiac, 2 číslice
-${DD}  deň, 2 číslice
+${DD}  deň, 2 číslice
-${hh}  hodina, 2 číslice
+${hh}  hodina, 2 číslice
-${mm}  minúta, 2 číslice
+${mm}  minúta, 2 číslice
-${ss}  sekunda, 2 číslice
+${ss}  sekunda, 2 číslice
-${NUM}  počítadlo, 6 číslic
+${NUM}  počítadlo, 6 číslic
-${title}  Titul okna
+${title}  Titul okna
-${user}  používateľ Windows
+${user}  používateľ Windows
-${domain}  doména Windows
+${domain}  doména Windows
-${hostname}  meno PC 
+${hostname}  meno PC 
-
+
-Môžete tiež vytvárať adresáre Greenshot dynamicky. 
+Môžete tiež vytvárať adresáre Greenshot dynamicky. 
-Stačí použiť spätné lomítko (\) na oddelenie podadresárov od názvov súborov.
+Stačí použiť spätné lomítko (\) na oddelenie podadresárov od názvov súborov.
-
+
-Príklad:  ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss}
+Príklad:  ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss}
-
+
-bude vytvárať priečinky pre aktuálny deň vo vašom predvolenom úložisku,napr. 2008-06-29,
+bude vytvárať priečinky pre aktuálny deň vo vašom predvolenom úložisku,napr. 2008-06-29,
-názov súboru bude založený na aktuálnom čase, napr. 11-58-32
+názov súboru bude založený na aktuálnom čase, napr. 11-58-32
-(+ je možné ďalšie rozšírenie definície podľa šablóny ako ju doplníme v Nastaveniach)</resource>
+(+ je možné ďalšie rozšírenie definície podľa šablóny ako ju doplníme v Nastaveniach)</resource>
-		<resource name="settings_network">Sieť a aktualizácie</resource>
+		<resource name="settings_network">Sieť a aktualizácie</resource>
-		<resource name="settings_output">Výstup</resource>
+		<resource name="settings_output">Výstup</resource>
-		<resource name="settings_playsound">Prehrať zvuk fotoaparátu</resource>
+		<resource name="settings_playsound">Prehrať zvuk fotoaparátu</resource>
-		<resource name="settings_plugins">Zásuvné moduly</resource>
+		<resource name="settings_plugins">Zásuvné moduly</resource>
-		<resource name="settings_plugins_createdby">Vytvoril</resource>
+		<resource name="settings_plugins_createdby">Vytvoril</resource>
-		<resource name="settings_plugins_dllpath">DLL cesta</resource>
+		<resource name="settings_plugins_dllpath">DLL cesta</resource>
-		<resource name="settings_plugins_name">Názov</resource>
+		<resource name="settings_plugins_name">Názov</resource>
-		<resource name="settings_plugins_version">Verzia</resource>
+		<resource name="settings_plugins_version">Verzia</resource>
-		<resource name="settings_preferredfilesettings">Preferované nastavenie výstupného súboru</resource>
+		<resource name="settings_preferredfilesettings">Preferované nastavenie výstupného súboru</resource>
-		<resource name="settings_primaryimageformat">Formát obrázku</resource>
+		<resource name="settings_primaryimageformat">Formát obrázku</resource>
-		<resource name="settings_printer">Tlačiareň</resource>
+		<resource name="settings_printer">Tlačiareň</resource>
-		<resource name="settings_printoptions">Možnosti tlače</resource>
+		<resource name="settings_printoptions">Možnosti tlače</resource>
-		<resource name="settings_qualitysettings">Nastavenia kvality</resource>
+		<resource name="settings_qualitysettings">Nastavenia kvality</resource>
-		<resource name="settings_reducecolors">Redukcia počtu farieb na max. 256 farieb</resource>
+		<resource name="settings_reducecolors">Redukcia počtu farieb na max. 256 farieb</resource>
-		<resource name="settings_registerhotkeys">Registrovať klávesové skratky</resource>
+		<resource name="settings_registerhotkeys">Registrovať klávesové skratky</resource>
-		<resource name="settings_showflashlight">Zobraziť záblesk</resource>
+		<resource name="settings_showflashlight">Zobraziť záblesk</resource>
-		<resource name="settings_shownotify">Zobraziť upozornenie</resource>
+		<resource name="settings_shownotify">Zobraziť upozornenie</resource>
-		<resource name="settings_storagelocation">Úložné miesto</resource>
+		<resource name="settings_storagelocation">Úložné miesto</resource>
-		<resource name="settings_title">Nastavenia</resource>
+		<resource name="settings_title">Nastavenia</resource>
-		<resource name="settings_tooltip_filenamepattern">Šablona použitá pre generovanie súborov pri ukladaní snímok</resource>
+		<resource name="settings_tooltip_filenamepattern">Šablona použitá pre generovanie súborov pri ukladaní snímok</resource>
-		<resource name="settings_tooltip_language">Jazyk uživateľského rozhrania (vyžaduje reštart)</resource>
+		<resource name="settings_tooltip_language">Jazyk uživateľského rozhrania (vyžaduje reštart)</resource>
-		<resource name="settings_tooltip_primaryimageformat">Obrázok vo formáte použitý ako predvolený</resource>
+		<resource name="settings_tooltip_primaryimageformat">Obrázok vo formáte použitý ako predvolený</resource>
-		<resource name="settings_tooltip_registerhotkeys">Definuje, či sú skratky PrnScr, Ctrl + PrnScr, Alt + PrnScr vyhradené pre použitie Greenshot počas behu programu.</resource>
+		<resource name="settings_tooltip_registerhotkeys">Definuje, či sú skratky PrnScr, Ctrl + PrnScr, Alt + PrnScr vyhradené pre použitie Greenshot počas behu programu.</resource>
-		<resource name="settings_tooltip_storagelocation">Miesto, kde sú screenshoty uložené vo východzom nastavení (nechajte prázdne pre uloženie do počítača)</resource>
+		<resource name="settings_tooltip_storagelocation">Miesto, kde sú screenshoty uložené vo východzom nastavení (nechajte prázdne pre uloženie do počítača)</resource>
-		<resource name="settings_usedefaultproxy">Použiť systémový proxy</resource>
+		<resource name="settings_usedefaultproxy">Použiť systémový proxy</resource>
-		<resource name="settings_visualization">Efekty</resource>
+		<resource name="settings_visualization">Efekty</resource>
-		<resource name="settings_waittime">Koľko milisekúnd čakať pred vytvorením snímky</resource>
+		<resource name="settings_waittime">Koľko milisekúnd čakať pred vytvorením snímky</resource>
-		<resource name="settings_window_capture_mode">Režim snímania zaoblených a aero okien</resource>
+		<resource name="settings_window_capture_mode">Režim snímania zaoblených a aero okien</resource>
-		<resource name="settings_windowscapture">Snímanie okna</resource>
+		<resource name="settings_windowscapture">Snímanie okna</resource>
-		<resource name="tooltip_firststart">Tu kliknúť pravým tlačidlom myši alebo stlačte PrtScr.</resource>
+		<resource name="tooltip_firststart">Tu kliknúť pravým tlačidlom myši alebo stlačte PrtScr.</resource>
-		<resource name="update_found">K dispozícii je novšia verzia Greenshot! Chcete stiahnuť Greenshot {0}?</resource>
+		<resource name="update_found">K dispozícii je novšia verzia Greenshot! Chcete stiahnuť Greenshot {0}?</resource>
-		<resource name="wait_ie_capture">Prosím počkať kým sa nasníma stránka z Internet Explorera...
+		<resource name="wait_ie_capture">Prosím počkať kým sa nasníma stránka z Internet Explorera...
-
+
-( Ak vidíte toto hlásenie dlhšie a Internet Explorer je minimalizovaný
+( Ak vidíte toto hlásenie dlhšie a Internet Explorer je minimalizovaný
-  treba ho obnoviť alebo maximalizovať. )</resource>
+  treba ho obnoviť alebo maximalizovať. )</resource>
-		<resource name="warning">Varovanie</resource>
+		<resource name="warning">Varovanie</resource>
-		<resource name="warning_hotkeys">Jedna alebo viac klávesových skratiek nemohla byť zapísaná. Proto nemusia fungovať klávesové skratky Greenshot.
+		<resource name="warning_hotkeys">Jedna alebo viac klávesových skratiek nemohla byť zapísaná. Proto nemusia fungovať klávesové skratky Greenshot.
-Problém je pravdepodobne v dôsledku blokovania iným nástrojom, ktorý používa rovnaké klávesové skratky.
+Problém je pravdepodobne v dôsledku blokovania iným nástrojom, ktorý používa rovnaké klávesové skratky.
-Prosím deaktivujte iný software využívajúci PrintScreen tlačidlo. Môžete tiež využiť všetky funkcie Greenshot z kontextového menu tray ikony.</resource>
+Prosím deaktivujte iný software využívajúci PrintScreen tlačidlo. Môžete tiež využiť všetky funkcie Greenshot z kontextového menu tray ikony.</resource>
-		<resource name="WindowCaptureMode.Aero">Použiť vlastnú farbu</resource>
+		<resource name="WindowCaptureMode.Aero">Použiť vlastnú farbu</resource>
-		<resource name="WindowCaptureMode.AeroTransparent">Zachovaj priehľadnosť</resource>
+		<resource name="WindowCaptureMode.AeroTransparent">Zachovaj priehľadnosť</resource>
-		<resource name="WindowCaptureMode.Auto">Automaticky</resource>
+		<resource name="WindowCaptureMode.Auto">Automaticky</resource>
-		<resource name="WindowCaptureMode.GDI">Použiť predvolenú farbu</resource>
+		<resource name="WindowCaptureMode.GDI">Použiť predvolenú farbu</resource>
-		<resource name="WindowCaptureMode.Screen">Ako je zobrazené</resource>
+		<resource name="WindowCaptureMode.Screen">Ako je zobrazené</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-sr-RS.xml

@@ -1,265 +1,265 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Српски" ietf="sr-RS" version="1.0.4" languagegroup="5">
+<language description="Српски" ietf="sr-RS" version="1.0.4" languagegroup="5">
-	<resources>
+	<resources>
-		<resource name="about_bugs">Пријавите грешке на:</resource>
+		<resource name="about_bugs">Пријавите грешке на:</resource>
-		<resource name="about_donations">Ако вам се свиђа Гриншот, помозите нам:</resource>
+		<resource name="about_donations">Ако вам се свиђа Гриншот, помозите нам:</resource>
-		<resource name="about_host">Гриншот покреће Сорсфорџ (sourceforge.net):</resource>
+		<resource name="about_host">Гриншот покреће Сорсфорџ (sourceforge.net):</resource>
-		<resource name="about_icons">Иконе су преузете из пакета „Fugue“ Јусуке Камијамане (лиценца Кријејтив комонс Ауторство 3.0)</resource>
+		<resource name="about_icons">Иконе су преузете из пакета „Fugue“ Јусуке Камијамане (лиценца Кријејтив комонс Ауторство 3.0)</resource>
-		<resource name="about_license">Ауторска права © 2007–2012 Томас Браун, Џенс Клинџен, Робин Кром
+		<resource name="about_license">Ауторска права © 2007–2012 Томас Браун, Џенс Клинџен, Робин Кром
-Гриншот се издаје БЕЗ ИКАКВЕ ГАРАНЦИЈЕ. Он је бесплатан програм, који можете да делите под одређеним условима.
+Гриншот се издаје БЕЗ ИКАКВЕ ГАРАНЦИЈЕ. Он је бесплатан програм, који можете да делите под одређеним условима.
-Више информација о ГНУ-овој општој јавној лиценци:</resource>
+Више информација о ГНУ-овој општој јавној лиценци:</resource>
-		<resource name="about_title">О програму</resource>
+		<resource name="about_title">О програму</resource>
-		<resource name="application_title">Гриншот – револуционарни програм за сликање екрана</resource>
+		<resource name="application_title">Гриншот – револуционарни програм за сликање екрана</resource>
-		<resource name="bugreport_cancel">Затвори</resource>
+		<resource name="bugreport_cancel">Затвори</resource>
-		<resource name="bugreport_info">Дошло је до неочекиване грешке.
+		<resource name="bugreport_info">Дошло је до неочекиване грешке.
-Добра вест је то да нам можете помоћи да је се решимо тако што ћете попунити извештај о грешци.
+Добра вест је то да нам можете помоћи да је се решимо тако што ћете попунити извештај о грешци.
-Посетите доленаведену адресу, направите нови извештај о грешци и налепите садржај из текстуалног оквира на опис.
+Посетите доленаведену адресу, направите нови извештај о грешци и налепите садржај из текстуалног оквира на опис.
-Молимо вас да додате резиме и приложите било какве податке које сматрате корисним за отклањање грешке.
+Молимо вас да додате резиме и приложите било какве податке које сматрате корисним за отклањање грешке.
-Такође вас молимо да проверите да ли већ постоји слична грешка. За то користите претрагу. Хвала вам.</resource>
+Такође вас молимо да проверите да ли већ постоји слична грешка. За то користите претрагу. Хвала вам.</resource>
-		<resource name="bugreport_title">Грешка</resource>
+		<resource name="bugreport_title">Грешка</resource>
-		<resource name="CANCEL">Откажи</resource>
+		<resource name="CANCEL">Откажи</resource>
-		<resource name="clipboard_error">Дошло је до неочекиване грешке при уписивању у оставу.</resource>
+		<resource name="clipboard_error">Дошло је до неочекиване грешке при уписивању у оставу.</resource>
-		<resource name="clipboard_inuse">Не могу да пишем у оставу јер је процес {0} забранио приступ.</resource>
+		<resource name="clipboard_inuse">Не могу да пишем у оставу јер је процес {0} забранио приступ.</resource>
-		<resource name="ClipboardFormat.DIB">Device-Independent Bitmap (DIB)</resource>
+		<resource name="ClipboardFormat.DIB">Device-Independent Bitmap (DIB)</resource>
-		<resource name="ClipboardFormat.HTML">HTML</resource>
+		<resource name="ClipboardFormat.HTML">HTML</resource>
-		<resource name="ClipboardFormat.HTMLDATAURL">HTML (са сликама)</resource>
+		<resource name="ClipboardFormat.HTMLDATAURL">HTML (са сликама)</resource>
-		<resource name="ClipboardFormat.PNG">PNG</resource>
+		<resource name="ClipboardFormat.PNG">PNG</resource>
-		<resource name="colorpicker_alpha">Алфа:</resource>
+		<resource name="colorpicker_alpha">Алфа:</resource>
-		<resource name="colorpicker_apply">Примени</resource>
+		<resource name="colorpicker_apply">Примени</resource>
-		<resource name="colorpicker_blue">Плава:</resource>
+		<resource name="colorpicker_blue">Плава:</resource>
-		<resource name="colorpicker_green">Зелена:</resource>
+		<resource name="colorpicker_green">Зелена:</resource>
-		<resource name="colorpicker_htmlcolor">HTML боја</resource>
+		<resource name="colorpicker_htmlcolor">HTML боја</resource>
-		<resource name="colorpicker_recentcolors">Недавно коришћене боје</resource>
+		<resource name="colorpicker_recentcolors">Недавно коришћене боје</resource>
-		<resource name="colorpicker_red">Црвена:</resource>
+		<resource name="colorpicker_red">Црвена:</resource>
-		<resource name="colorpicker_title">Бирач боја</resource>
+		<resource name="colorpicker_title">Бирач боја</resource>
-		<resource name="colorpicker_transparent">Провидно</resource>
+		<resource name="colorpicker_transparent">Провидно</resource>
-		<resource name="config_unauthorizedaccess_write">Не могу да сачувам датотеку са подешавањима. Проверите дозволе за приступ за „{0}“.</resource>
+		<resource name="config_unauthorizedaccess_write">Не могу да сачувам датотеку са подешавањима. Проверите дозволе за приступ за „{0}“.</resource>
-		<resource name="contextmenu_about">О програму</resource>
+		<resource name="contextmenu_about">О програму</resource>
-		<resource name="contextmenu_capturearea">Област сликања</resource>
+		<resource name="contextmenu_capturearea">Област сликања</resource>
-		<resource name="contextmenu_captureclipboard">Отвори слику из оставе</resource>
+		<resource name="contextmenu_captureclipboard">Отвори слику из оставе</resource>
-		<resource name="contextmenu_capturefullscreen">Усликај цео екран</resource>
+		<resource name="contextmenu_capturefullscreen">Усликај цео екран</resource>
-		<resource name="contextmenu_capturefullscreen_all">све</resource>
+		<resource name="contextmenu_capturefullscreen_all">све</resource>
-		<resource name="contextmenu_capturefullscreen_bottom">дно</resource>
+		<resource name="contextmenu_capturefullscreen_bottom">дно</resource>
-		<resource name="contextmenu_capturefullscreen_left">лево</resource>
+		<resource name="contextmenu_capturefullscreen_left">лево</resource>
-		<resource name="contextmenu_capturefullscreen_right">десно</resource>
+		<resource name="contextmenu_capturefullscreen_right">десно</resource>
-		<resource name="contextmenu_capturefullscreen_top">врх</resource>
+		<resource name="contextmenu_capturefullscreen_top">врх</resource>
-		<resource name="contextmenu_captureie">Усликај Интернет експлорер</resource>
+		<resource name="contextmenu_captureie">Усликај Интернет експлорер</resource>
-		<resource name="contextmenu_captureiefromlist">Усликај Интернет експлорер са списка</resource>
+		<resource name="contextmenu_captureiefromlist">Усликај Интернет експлорер са списка</resource>
-		<resource name="contextmenu_capturelastregion">Усликај последњу област</resource>
+		<resource name="contextmenu_capturelastregion">Усликај последњу област</resource>
-		<resource name="contextmenu_capturewindow">Усликај прозор</resource>
+		<resource name="contextmenu_capturewindow">Усликај прозор</resource>
-		<resource name="contextmenu_capturewindowfromlist">Усликај прозор са списка</resource>
+		<resource name="contextmenu_capturewindowfromlist">Усликај прозор са списка</resource>
-		<resource name="contextmenu_donate">Подржите нас</resource>
+		<resource name="contextmenu_donate">Подржите нас</resource>
-		<resource name="contextmenu_exit">Изађи</resource>
+		<resource name="contextmenu_exit">Изађи</resource>
-		<resource name="contextmenu_help">Помоћ</resource>
+		<resource name="contextmenu_help">Помоћ</resource>
-		<resource name="contextmenu_openfile">Отвори слику из датотеке…</resource>
+		<resource name="contextmenu_openfile">Отвори слику из датотеке…</resource>
-		<resource name="contextmenu_openrecentcapture">Отвори последње место сликања</resource>
+		<resource name="contextmenu_openrecentcapture">Отвори последње место сликања</resource>
-		<resource name="contextmenu_quicksettings">Брзе поставке</resource>
+		<resource name="contextmenu_quicksettings">Брзе поставке</resource>
-		<resource name="contextmenu_settings">Поставке…</resource>
+		<resource name="contextmenu_settings">Поставке…</resource>
-		<resource name="destination_exportfailed">Грешка при увозу „{0}“. Покушајте поново.</resource>
+		<resource name="destination_exportfailed">Грешка при увозу „{0}“. Покушајте поново.</resource>
-		<resource name="editor_arrange">Распореди</resource>
+		<resource name="editor_arrange">Распореди</resource>
-		<resource name="editor_arrowheads">Врхови стрелице</resource>
+		<resource name="editor_arrowheads">Врхови стрелице</resource>
-		<resource name="editor_arrowheads_both">Оба</resource>
+		<resource name="editor_arrowheads_both">Оба</resource>
-		<resource name="editor_arrowheads_end">Крајња тачка</resource>
+		<resource name="editor_arrowheads_end">Крајња тачка</resource>
-		<resource name="editor_arrowheads_none">Ништа</resource>
+		<resource name="editor_arrowheads_none">Ништа</resource>
-		<resource name="editor_arrowheads_start">Почетна тачка</resource>
+		<resource name="editor_arrowheads_start">Почетна тачка</resource>
-		<resource name="editor_autocrop">Аутоматско опсецање</resource>
+		<resource name="editor_autocrop">Аутоматско опсецање</resource>
-		<resource name="editor_backcolor">Пуне боје</resource>
+		<resource name="editor_backcolor">Пуне боје</resource>
-		<resource name="editor_blur_radius">Замагљење радијуса</resource>
+		<resource name="editor_blur_radius">Замагљење радијуса</resource>
-		<resource name="editor_bold">Масно</resource>
+		<resource name="editor_bold">Масно</resource>
-		<resource name="editor_border">Ивице</resource>
+		<resource name="editor_border">Ивице</resource>
-		<resource name="editor_brightness">Осветљеност</resource>
+		<resource name="editor_brightness">Осветљеност</resource>
-		<resource name="editor_cancel">Откажи</resource>
+		<resource name="editor_cancel">Откажи</resource>
-		<resource name="editor_clipboardfailed">Грешка при приступању остави. Покушајте поново.</resource>
+		<resource name="editor_clipboardfailed">Грешка при приступању остави. Покушајте поново.</resource>
-		<resource name="editor_close">Затвори</resource>
+		<resource name="editor_close">Затвори</resource>
-		<resource name="editor_close_on_save">Желите ли да сачувате снимак екрана?</resource>
+		<resource name="editor_close_on_save">Желите ли да сачувате снимак екрана?</resource>
-		<resource name="editor_close_on_save_title">Чување слике</resource>
+		<resource name="editor_close_on_save_title">Чување слике</resource>
-		<resource name="editor_confirm">Потврди</resource>
+		<resource name="editor_confirm">Потврди</resource>
-		<resource name="editor_copyimagetoclipboard">Умножи слику</resource>
+		<resource name="editor_copyimagetoclipboard">Умножи слику</resource>
-		<resource name="editor_copypathtoclipboard">Умножи путању</resource>
+		<resource name="editor_copypathtoclipboard">Умножи путању</resource>
-		<resource name="editor_copytoclipboard">Умножи</resource>
+		<resource name="editor_copytoclipboard">Умножи</resource>
-		<resource name="editor_crop">Опсеци (C)</resource>
+		<resource name="editor_crop">Опсеци (C)</resource>
-		<resource name="editor_cursortool">Алатка за одабир (ESC)</resource>
+		<resource name="editor_cursortool">Алатка за одабир (ESC)</resource>
-		<resource name="editor_cuttoclipboard">Исеци</resource>
+		<resource name="editor_cuttoclipboard">Исеци</resource>
-		<resource name="editor_deleteelement">Обриши</resource>
+		<resource name="editor_deleteelement">Обриши</resource>
-		<resource name="editor_downonelevel">За један ниже</resource>
+		<resource name="editor_downonelevel">За један ниже</resource>
-		<resource name="editor_downtobottom">Скроз надоле</resource>
+		<resource name="editor_downtobottom">Скроз надоле</resource>
-		<resource name="editor_drawarrow">Нацртај стрелицу (A)</resource>
+		<resource name="editor_drawarrow">Нацртај стрелицу (A)</resource>
-		<resource name="editor_drawellipse">Нацртај елипсу (E)</resource>
+		<resource name="editor_drawellipse">Нацртај елипсу (E)</resource>
-		<resource name="editor_drawfreehand">Слободном руком (F)</resource>
+		<resource name="editor_drawfreehand">Слободном руком (F)</resource>
-		<resource name="editor_drawhighlighter">Истицање (H)</resource>
+		<resource name="editor_drawhighlighter">Истицање (H)</resource>
-		<resource name="editor_drawline">Нацртај линију (L)</resource>
+		<resource name="editor_drawline">Нацртај линију (L)</resource>
-		<resource name="editor_drawrectangle">Нацртај правоугаоник (R)</resource>
+		<resource name="editor_drawrectangle">Нацртај правоугаоник (R)</resource>
-		<resource name="editor_drawtextbox">Додај текст (T)</resource>
+		<resource name="editor_drawtextbox">Додај текст (T)</resource>
-		<resource name="editor_duplicate">Удвостручи изабрано</resource>
+		<resource name="editor_duplicate">Удвостручи изабрано</resource>
-		<resource name="editor_edit">Уређивање</resource>
+		<resource name="editor_edit">Уређивање</resource>
-		<resource name="editor_effects">Ефекти</resource>
+		<resource name="editor_effects">Ефекти</resource>
-		<resource name="editor_email">Е-пошта</resource>
+		<resource name="editor_email">Е-пошта</resource>
-		<resource name="editor_file">Датотека</resource>
+		<resource name="editor_file">Датотека</resource>
-		<resource name="editor_fontsize">Величина</resource>
+		<resource name="editor_fontsize">Величина</resource>
-		<resource name="editor_forecolor">Боја линије</resource>
+		<resource name="editor_forecolor">Боја линије</resource>
-		<resource name="editor_grayscale">Сиве нијансе</resource>
+		<resource name="editor_grayscale">Сиве нијансе</resource>
-		<resource name="editor_highlight_area">Истакни област</resource>
+		<resource name="editor_highlight_area">Истакни област</resource>
-		<resource name="editor_highlight_grayscale">Сиве нијансе</resource>
+		<resource name="editor_highlight_grayscale">Сиве нијансе</resource>
-		<resource name="editor_highlight_magnify">Увећај приказ</resource>
+		<resource name="editor_highlight_magnify">Увећај приказ</resource>
-		<resource name="editor_highlight_mode">Режим истицања</resource>
+		<resource name="editor_highlight_mode">Режим истицања</resource>
-		<resource name="editor_highlight_text">Истакни текст</resource>
+		<resource name="editor_highlight_text">Истакни текст</resource>
-		<resource name="editor_image_shadow">Исцртај сенку</resource>
+		<resource name="editor_image_shadow">Исцртај сенку</resource>
-		<resource name="editor_imagesaved">Слика је сачувана у {0}.</resource>
+		<resource name="editor_imagesaved">Слика је сачувана у {0}.</resource>
-		<resource name="editor_insertwindow">Убаци прозор</resource>
+		<resource name="editor_insertwindow">Убаци прозор</resource>
-		<resource name="editor_invert">Обрни боје</resource>
+		<resource name="editor_invert">Обрни боје</resource>
-		<resource name="editor_italic">Курзив</resource>
+		<resource name="editor_italic">Курзив</resource>
-		<resource name="editor_load_objects">Учитај објекте из датотеке…</resource>
+		<resource name="editor_load_objects">Учитај објекте из датотеке…</resource>
-		<resource name="editor_magnification_factor">Фактор увећања</resource>
+		<resource name="editor_magnification_factor">Фактор увећања</resource>
-		<resource name="editor_match_capture_size">Поклопи величину слике</resource>
+		<resource name="editor_match_capture_size">Поклопи величину слике</resource>
-		<resource name="editor_obfuscate">Замагљење (O)</resource>
+		<resource name="editor_obfuscate">Замагљење (O)</resource>
-		<resource name="editor_obfuscate_blur">Замагли</resource>
+		<resource name="editor_obfuscate_blur">Замагли</resource>
-		<resource name="editor_obfuscate_mode">Режим затамњења</resource>
+		<resource name="editor_obfuscate_mode">Режим затамњења</resource>
-		<resource name="editor_obfuscate_pixelize">Пикселизуј</resource>
+		<resource name="editor_obfuscate_pixelize">Пикселизуј</resource>
-		<resource name="editor_object">Објекат</resource>
+		<resource name="editor_object">Објекат</resource>
-		<resource name="editor_opendirinexplorer">Отвори фасциклу у Виндоус експлореру</resource>
+		<resource name="editor_opendirinexplorer">Отвори фасциклу у Виндоус експлореру</resource>
-		<resource name="editor_pastefromclipboard">Убаци</resource>
+		<resource name="editor_pastefromclipboard">Убаци</resource>
-		<resource name="editor_pixel_size">Величина пиксела</resource>
+		<resource name="editor_pixel_size">Величина пиксела</resource>
-		<resource name="editor_preview_quality">Преглед квалитета</resource>
+		<resource name="editor_preview_quality">Преглед квалитета</resource>
-		<resource name="editor_print">Одштампај</resource>
+		<resource name="editor_print">Одштампај</resource>
-		<resource name="editor_redo">Понови {0}</resource>
+		<resource name="editor_redo">Понови {0}</resource>
-		<resource name="editor_resetsize">Поништи величину</resource>
+		<resource name="editor_resetsize">Поништи величину</resource>
-		<resource name="editor_rotateccw">Окрени улево</resource>
+		<resource name="editor_rotateccw">Окрени улево</resource>
-		<resource name="editor_rotatecw">Окрени удесно</resource>
+		<resource name="editor_rotatecw">Окрени удесно</resource>
-		<resource name="editor_save">Сачувај</resource>
+		<resource name="editor_save">Сачувај</resource>
-		<resource name="editor_save_objects">Сачувај објекте у датотеку…</resource>
+		<resource name="editor_save_objects">Сачувај објекте у датотеку…</resource>
-		<resource name="editor_saveas">Сачувај као…</resource>
+		<resource name="editor_saveas">Сачувај као…</resource>
-		<resource name="editor_selectall">Изабери све</resource>
+		<resource name="editor_selectall">Изабери све</resource>
-		<resource name="editor_senttoprinter">Задужење за штампање је послато у „{0}“.</resource>
+		<resource name="editor_senttoprinter">Задужење за штампање је послато у „{0}“.</resource>
-		<resource name="editor_shadow">Исцртај сенке</resource>
+		<resource name="editor_shadow">Исцртај сенке</resource>
-		<resource name="editor_storedtoclipboard">Слика је смештена у оставу.</resource>
+		<resource name="editor_storedtoclipboard">Слика је смештена у оставу.</resource>
-		<resource name="editor_thickness">Дебљина линије</resource>
+		<resource name="editor_thickness">Дебљина линије</resource>
-		<resource name="editor_title">Уређивач слика</resource>
+		<resource name="editor_title">Уређивач слика</resource>
-		<resource name="editor_torn_edge">Расцепи ивице</resource>
+		<resource name="editor_torn_edge">Расцепи ивице</resource>
-		<resource name="editor_undo">Опозови {0}</resource>
+		<resource name="editor_undo">Опозови {0}</resource>
-		<resource name="editor_uponelevel">За један више</resource>
+		<resource name="editor_uponelevel">За један више</resource>
-		<resource name="editor_uptotop">Скроз нагоре</resource>
+		<resource name="editor_uptotop">Скроз нагоре</resource>
-		<resource name="EmailFormat.MAPI">MAPI клијент</resource>
+		<resource name="EmailFormat.MAPI">MAPI клијент</resource>
-		<resource name="EmailFormat.OUTLOOK_HTML">Аутлук са HTML-ом</resource>
+		<resource name="EmailFormat.OUTLOOK_HTML">Аутлук са HTML-ом</resource>
-		<resource name="EmailFormat.OUTLOOK_TXT">Аутлук са текстом</resource>
+		<resource name="EmailFormat.OUTLOOK_TXT">Аутлук са текстом</resource>
-		<resource name="error">Грешка</resource>
+		<resource name="error">Грешка</resource>
-		<resource name="error_multipleinstances">Гриншот је већ укључен.</resource>
+		<resource name="error_multipleinstances">Гриншот је већ укључен.</resource>
-		<resource name="error_nowriteaccess">Не могу да сачувам датотеку у {0}.
+		<resource name="error_nowriteaccess">Не могу да сачувам датотеку у {0}.
-Проверите да ли се на изабраном складишту може писати.</resource>
+Проверите да ли се на изабраном складишту може писати.</resource>
-		<resource name="error_openfile">Не могу да отворим датотеку „{0}“.</resource>
+		<resource name="error_openfile">Не могу да отворим датотеку „{0}“.</resource>
-		<resource name="error_openlink">Не могу да отворим везу „{0}“.</resource>
+		<resource name="error_openlink">Не могу да отворим везу „{0}“.</resource>
-		<resource name="error_save">Не могу да сачувам снимак екрана. Пронађите погодно место.</resource>
+		<resource name="error_save">Не могу да сачувам снимак екрана. Пронађите погодно место.</resource>
-		<resource name="expertsettings">Напредно</resource>
+		<resource name="expertsettings">Напредно</resource>
-		<resource name="expertsettings_autoreducecolors">Направи осмобитне слике које имају мање од 256 боја</resource>
+		<resource name="expertsettings_autoreducecolors">Направи осмобитне слике које имају мање од 256 боја</resource>
-		<resource name="expertsettings_checkunstableupdates">Провери нестабилне доградње</resource>
+		<resource name="expertsettings_checkunstableupdates">Провери нестабилне доградње</resource>
-		<resource name="expertsettings_clipboardformats">Формати оставе:</resource>
+		<resource name="expertsettings_clipboardformats">Формати оставе:</resource>
-		<resource name="expertsettings_counter">Број за ${NUM} у називима датотека:</resource>
+		<resource name="expertsettings_counter">Број за ${NUM} у називима датотека:</resource>
-		<resource name="expertsettings_enableexpert">Знам шта радим!</resource>
+		<resource name="expertsettings_enableexpert">Знам шта радим!</resource>
-		<resource name="expertsettings_footerpattern">Подножје за штампу:</resource>
+		<resource name="expertsettings_footerpattern">Подножје за штампу:</resource>
-		<resource name="expertsettings_minimizememoryfootprint">Умањи отисак меморије, науштрб перформансама (не препоручује се)</resource>
+		<resource name="expertsettings_minimizememoryfootprint">Умањи отисак меморије, науштрб перформансама (не препоручује се)</resource>
-		<resource name="expertsettings_optimizeforrdp">Оптимизуј за коришћење с удаљеним рачунарима</resource>
+		<resource name="expertsettings_optimizeforrdp">Оптимизуј за коришћење с удаљеним рачунарима</resource>
-		<resource name="expertsettings_reuseeditorifpossible">Поново користи уређивач (ако је могуће)</resource>
+		<resource name="expertsettings_reuseeditorifpossible">Поново користи уређивач (ако је могуће)</resource>
-		<resource name="expertsettings_suppresssavedialogatclose">Потисни прозорче за чување по затварању уређивача</resource>
+		<resource name="expertsettings_suppresssavedialogatclose">Потисни прозорче за чување по затварању уређивача</resource>
-		<resource name="expertsettings_thumbnailpreview">Умањени прикази у приручном менију (Виста и 7)</resource>
+		<resource name="expertsettings_thumbnailpreview">Умањени прикази у приручном менију (Виста и 7)</resource>
-		<resource name="exported_to">Извезено: {0}</resource>
+		<resource name="exported_to">Извезено: {0}</resource>
-		<resource name="exported_to_error">Дошло је до грешке при извозу у {0}:</resource>
+		<resource name="exported_to_error">Дошло је до грешке при извозу у {0}:</resource>
-		<resource name="help_title">Помоћ</resource>
+		<resource name="help_title">Помоћ</resource>
-		<resource name="hotkeys">Пречице</resource>
+		<resource name="hotkeys">Пречице</resource>
-		<resource name="jpegqualitydialog_choosejpegquality">Изаберите JPEG квалитет за слику.</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">Изаберите JPEG квалитет за слику.</resource>
-		<resource name="OK">У реду</resource>
+		<resource name="OK">У реду</resource>
-		<resource name="print_error">Дошло је до грешке при штампању.</resource>
+		<resource name="print_error">Дошло је до грешке при штампању.</resource>
-		<resource name="printoptions_allowcenter">Центрирај испис на страници</resource>
+		<resource name="printoptions_allowcenter">Центрирај испис на страници</resource>
-		<resource name="printoptions_allowenlarge">Повећај испис тако да стане на папир</resource>
+		<resource name="printoptions_allowenlarge">Повећај испис тако да стане на папир</resource>
-		<resource name="printoptions_allowrotate">Окрени испис према усмерењу странице</resource>
+		<resource name="printoptions_allowrotate">Окрени испис према усмерењу странице</resource>
-		<resource name="printoptions_allowshrink">Смањи испис тако да стане на папир</resource>
+		<resource name="printoptions_allowshrink">Смањи испис тако да стане на папир</resource>
-		<resource name="printoptions_dontaskagain">Сачувај поставке као подразумеване и не питај поново</resource>
+		<resource name="printoptions_dontaskagain">Сачувај поставке као подразумеване и не питај поново</resource>
-		<resource name="printoptions_inverted">Одштампај с обрнутим бојама</resource>
+		<resource name="printoptions_inverted">Одштампај с обрнутим бојама</resource>
-		<resource name="printoptions_printgrayscale">Наметни штампање у сивим нијансама</resource>
+		<resource name="printoptions_printgrayscale">Наметни штампање у сивим нијансама</resource>
-		<resource name="printoptions_timestamp">Датум/време штампања на дну странице</resource>
+		<resource name="printoptions_timestamp">Датум/време штампања на дну странице</resource>
-		<resource name="printoptions_title">Поставке штампања</resource>
+		<resource name="printoptions_title">Поставке штампања</resource>
-		<resource name="qualitydialog_dontaskagain">Сачувај као подразумевани квалитет и не питај поново</resource>
+		<resource name="qualitydialog_dontaskagain">Сачувај као подразумевани квалитет и не питај поново</resource>
-		<resource name="qualitydialog_title">Квалитет</resource>
+		<resource name="qualitydialog_title">Квалитет</resource>
-		<resource name="quicksettings_destination_file">Сачувај директно (уз коришћење поставки излазних датотека)</resource>
+		<resource name="quicksettings_destination_file">Сачувај директно (уз коришћење поставки излазних датотека)</resource>
-		<resource name="settings_alwaysshowprintoptionsdialog">Прикажи поставке штампања при сваком штампању</resource>
+		<resource name="settings_alwaysshowprintoptionsdialog">Прикажи поставке штампања при сваком штампању</resource>
-		<resource name="settings_alwaysshowqualitydialog">Прикажи поставке квалитета при сваком штампању</resource>
+		<resource name="settings_alwaysshowqualitydialog">Прикажи поставке квалитета при сваком штампању</resource>
-		<resource name="settings_applicationsettings">Подешавања програма</resource>
+		<resource name="settings_applicationsettings">Подешавања програма</resource>
-		<resource name="settings_autostartshortcut">Покрени програм са системом</resource>
+		<resource name="settings_autostartshortcut">Покрени програм са системом</resource>
-		<resource name="settings_capture">Сликање</resource>
+		<resource name="settings_capture">Сликање</resource>
-		<resource name="settings_capture_mousepointer">Усликај показивач миша</resource>
+		<resource name="settings_capture_mousepointer">Усликај показивач миша</resource>
-		<resource name="settings_capture_windows_interactive">Интерактивно сликање прозора</resource>
+		<resource name="settings_capture_windows_interactive">Интерактивно сликање прозора</resource>
-		<resource name="settings_checkperiod">Период за проверу доградњи у данима (0 – искључено)</resource>
+		<resource name="settings_checkperiod">Период за проверу доградњи у данима (0 – искључено)</resource>
-		<resource name="settings_configureplugin">Подеси…</resource>
+		<resource name="settings_configureplugin">Подеси…</resource>
-		<resource name="settings_copypathtoclipboard">Умножи путању датотеке при сваком чувању</resource>
+		<resource name="settings_copypathtoclipboard">Умножи путању датотеке при сваком чувању</resource>
-		<resource name="settings_destination">Одредиште</resource>
+		<resource name="settings_destination">Одредиште</resource>
-		<resource name="settings_destination_clipboard">Умножи</resource>
+		<resource name="settings_destination_clipboard">Умножи</resource>
-		<resource name="settings_destination_editor">Отвори у уређивачу слика</resource>
+		<resource name="settings_destination_editor">Отвори у уређивачу слика</resource>
-		<resource name="settings_destination_email">Е-пошта</resource>
+		<resource name="settings_destination_email">Е-пошта</resource>
-		<resource name="settings_destination_file">Сачувај директно (уз коришћење доњих поставки)</resource>
+		<resource name="settings_destination_file">Сачувај директно (уз коришћење доњих поставки)</resource>
-		<resource name="settings_destination_fileas">Сачувај као (уз приказивање прозорчета)</resource>
+		<resource name="settings_destination_fileas">Сачувај као (уз приказивање прозорчета)</resource>
-		<resource name="settings_destination_picker">Динамички изабери одредиште</resource>
+		<resource name="settings_destination_picker">Динамички изабери одредиште</resource>
-		<resource name="settings_destination_printer">Пошаљи штампачу</resource>
+		<resource name="settings_destination_printer">Пошаљи штампачу</resource>
-		<resource name="settings_editor">Уређивач</resource>
+		<resource name="settings_editor">Уређивач</resource>
-		<resource name="settings_filenamepattern">Образац за називе:</resource>
+		<resource name="settings_filenamepattern">Образац за називе:</resource>
-		<resource name="settings_general">Опште</resource>
+		<resource name="settings_general">Опште</resource>
-		<resource name="settings_iecapture">Сликање Интернет експлорера</resource>
+		<resource name="settings_iecapture">Сликање Интернет експлорера</resource>
-		<resource name="settings_jpegquality">JPEG квалитет</resource>
+		<resource name="settings_jpegquality">JPEG квалитет</resource>
-		<resource name="settings_language">Језик:</resource>
+		<resource name="settings_language">Језик:</resource>
-		<resource name="settings_message_filenamepattern">Следећи чувари места биће аутоматски замењени у наведеном обрасцу:
+		<resource name="settings_message_filenamepattern">Следећи чувари места биће аутоматски замењени у наведеном обрасцу:
-${YYYY} година, 4 цифре
+${YYYY} година, 4 цифре
-${MM} година, 2 цифре
+${MM} година, 2 цифре
-${DD} дан, 2 цифре
+${DD} дан, 2 цифре
-${hh} сат, 2 цифре
+${hh} сат, 2 цифре
-${mm} минут, 2 цифре
+${mm} минут, 2 цифре
-${ss} секунд, 2 цифре
+${ss} секунд, 2 цифре
-${NUM} увећавајући број, 6 цифара
+${NUM} увећавајући број, 6 цифара
-${title} наслов прозора
+${title} наслов прозора
-${user} Виндоусов корисник
+${user} Виндоусов корисник
-${domain} Виндоусов домен
+${domain} Виндоусов домен
-${hostname} назив рачунара
+${hostname} назив рачунара
-
+
-Гриншот може и да аутоматски прави фасцикле. 
+Гриншот може и да аутоматски прави фасцикле. 
-Користите обрнуту косу црту (\) да раздвојите фасцикле и називе датотека.
+Користите обрнуту косу црту (\) да раздвојите фасцикле и називе датотека.
-Примерице, образац ${DD}. ${MM}. ${YYYY}\${hh}.${mm}.${ss} 
+Примерице, образац ${DD}. ${MM}. ${YYYY}\${hh}.${mm}.${ss} 
-створиће фасциклу за текући дан у подразумеваном складишту, нпр. 29. 6. 2008., а садржани назив слике биће 11_58_32 (уз екстензију коју сте наместили у подешавањима).</resource>
+створиће фасциклу за текући дан у подразумеваном складишту, нпр. 29. 6. 2008., а садржани назив слике биће 11_58_32 (уз екстензију коју сте наместили у подешавањима).</resource>
-		<resource name="settings_network">Мрежа и доградње</resource>
+		<resource name="settings_network">Мрежа и доградње</resource>
-		<resource name="settings_output">Излаз</resource>
+		<resource name="settings_output">Излаз</resource>
-		<resource name="settings_playsound">Пусти звук камере</resource>
+		<resource name="settings_playsound">Пусти звук камере</resource>
-		<resource name="settings_plugins">Прикључци</resource>
+		<resource name="settings_plugins">Прикључци</resource>
-		<resource name="settings_plugins_createdby">Направио</resource>
+		<resource name="settings_plugins_createdby">Направио</resource>
-		<resource name="settings_plugins_dllpath">Путања DLL-а</resource>
+		<resource name="settings_plugins_dllpath">Путања DLL-а</resource>
-		<resource name="settings_plugins_name">Назив</resource>
+		<resource name="settings_plugins_name">Назив</resource>
-		<resource name="settings_plugins_version">Верзија</resource>
+		<resource name="settings_plugins_version">Верзија</resource>
-		<resource name="settings_preferredfilesettings">Поставке излазних датотека</resource>
+		<resource name="settings_preferredfilesettings">Поставке излазних датотека</resource>
-		<resource name="settings_primaryimageformat">Формат слике:</resource>
+		<resource name="settings_primaryimageformat">Формат слике:</resource>
-		<resource name="settings_printer">Штампач</resource>
+		<resource name="settings_printer">Штампач</resource>
-		<resource name="settings_printoptions">Поставке штампања</resource>
+		<resource name="settings_printoptions">Поставке штампања</resource>
-		<resource name="settings_qualitysettings">Поставке квалитета</resource>
+		<resource name="settings_qualitysettings">Поставке квалитета</resource>
-		<resource name="settings_reducecolors">Смањи износ боја на највише 256</resource>
+		<resource name="settings_reducecolors">Смањи износ боја на највише 256</resource>
-		<resource name="settings_registerhotkeys">Додели пречице</resource>
+		<resource name="settings_registerhotkeys">Додели пречице</resource>
-		<resource name="settings_showflashlight">Прикажи батеријску лампу</resource>
+		<resource name="settings_showflashlight">Прикажи батеријску лампу</resource>
-		<resource name="settings_shownotify">Прикажи обавештења</resource>
+		<resource name="settings_shownotify">Прикажи обавештења</resource>
-		<resource name="settings_storagelocation">Место складишта:</resource>
+		<resource name="settings_storagelocation">Место складишта:</resource>
-		<resource name="settings_title">Подешавања</resource>
+		<resource name="settings_title">Подешавања</resource>
-		<resource name="settings_tooltip_filenamepattern">Образац који се користи за стварање назива датотека при чувању слика.</resource>
+		<resource name="settings_tooltip_filenamepattern">Образац који се користи за стварање назива датотека при чувању слика.</resource>
-		<resource name="settings_tooltip_language">Језик корисничког окружења програма.</resource>
+		<resource name="settings_tooltip_language">Језик корисничког окружења програма.</resource>
-		<resource name="settings_tooltip_primaryimageformat">Подразумевани формат слике.</resource>
+		<resource name="settings_tooltip_primaryimageformat">Подразумевани формат слике.</resource>
-		<resource name="settings_tooltip_registerhotkeys">Одређује да ли су пречице Print, Ctrl + Print и Alt + Print заузете за друге програме при покретању Гриншота, па све до његовог искључивања.</resource>
+		<resource name="settings_tooltip_registerhotkeys">Одређује да ли су пречице Print, Ctrl + Print и Alt + Print заузете за друге програме при покретању Гриншота, па све до његовог искључивања.</resource>
-		<resource name="settings_tooltip_storagelocation">Подразумевано место за снимке екрана (оставите празно ради чувања на радној површини).</resource>
+		<resource name="settings_tooltip_storagelocation">Подразумевано место за снимке екрана (оставите празно ради чувања на радној површини).</resource>
-		<resource name="settings_usedefaultproxy">Подразумевани мрежни посредник система</resource>
+		<resource name="settings_usedefaultproxy">Подразумевани мрежни посредник система</resource>
-		<resource name="settings_visualization">Ефекти</resource>
+		<resource name="settings_visualization">Ефекти</resource>
-		<resource name="settings_waittime">— број милисекунди пре сликања</resource>
+		<resource name="settings_waittime">— број милисекунди пре сликања</resource>
-		<resource name="settings_window_capture_mode">Режим сликања прозора</resource>
+		<resource name="settings_window_capture_mode">Режим сликања прозора</resource>
-		<resource name="settings_windowscapture">Сликање прозора</resource>
+		<resource name="settings_windowscapture">Сликање прозора</resource>
-		<resource name="tooltip_firststart">Кликните десни клик или притисните тастер {0}.</resource>
+		<resource name="tooltip_firststart">Кликните десни клик или притисните тастер {0}.</resource>
-		<resource name="update_found">Доступна је нова верзија програма. Желите ли да преузмете Гриншот {0}?</resource>
+		<resource name="update_found">Доступна је нова верзија програма. Желите ли да преузмете Гриншот {0}?</resource>
-		<resource name="wait_ie_capture">Сачекајте док се страница у Интернет експлореру не слика…</resource>
+		<resource name="wait_ie_capture">Сачекајте док се страница у Интернет експлореру не слика…</resource>
-		<resource name="warning">Упозорење</resource>
+		<resource name="warning">Упозорење</resource>
-		<resource name="warning_hotkeys">Не могу да доделим пречицу „{0}“. Узрок томе је вероватно други програм који користи исту пречицу.
+		<resource name="warning_hotkeys">Не могу да доделим пречицу „{0}“. Узрок томе је вероватно други програм који користи исту пречицу.
-
+
-Све могућности програма још увек раде директно из приручног менија у системској траци.</resource>
+Све могућности програма још увек раде директно из приручног менија у системској траци.</resource>
-		<resource name="WindowCaptureMode.Aero">користи прилагођену боју</resource>
+		<resource name="WindowCaptureMode.Aero">користи прилагођену боју</resource>
-		<resource name="WindowCaptureMode.AeroTransparent">задржи провидност</resource>
+		<resource name="WindowCaptureMode.AeroTransparent">задржи провидност</resource>
-		<resource name="WindowCaptureMode.Auto">аутоматски</resource>
+		<resource name="WindowCaptureMode.Auto">аутоматски</resource>
-		<resource name="WindowCaptureMode.GDI">подразумевана боја</resource>
+		<resource name="WindowCaptureMode.GDI">подразумевана боја</resource>
-		<resource name="WindowCaptureMode.Screen">као што је приказано</resource>
+		<resource name="WindowCaptureMode.Screen">као што је приказано</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-uk-UA.xml

@@ -1,293 +1,293 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Українська" ietf="uk-UA" version="1.1.2.2572" languagegroup="5">
+<language description="Українська" ietf="uk-UA" version="1.1.2.2572" languagegroup="5">
-	<resources>
+	<resources>
-		<resource name="about_bugs">Про помилки повідомляйте на</resource>
+		<resource name="about_bugs">Про помилки повідомляйте на</resource>
-		<resource name="about_donations">Якщо Вам подобається Greenshot, то можете підтримати нас:</resource>
+		<resource name="about_donations">Якщо Вам подобається Greenshot, то можете підтримати нас:</resource>
-		<resource name="about_host">Greenshot is розташовується на sourceforge.net</resource>
+		<resource name="about_host">Greenshot is розташовується на sourceforge.net</resource>
-		<resource name="about_icons">Набір іконок Fugue від Yusuke Kamiyamane (ліцензія Creative Commons Attribution 3.0)</resource>
+		<resource name="about_icons">Набір іконок Fugue від Yusuke Kamiyamane (ліцензія Creative Commons Attribution 3.0)</resource>
-		<resource name="about_license">Авторство © 2007-2013 Thomas Braun, Jens Klingen, Robin Krom
+		<resource name="about_license">Авторство © 2007-2013 Thomas Braun, Jens Klingen, Robin Krom
-Greenshot постачається АБСОЛЮТНО БЕЗ ҐАРАНТІЇ. Це вільне програмне забезпечення, Ви можете розповсюджувати його за певних умов.
+Greenshot постачається АБСОЛЮТНО БЕЗ ҐАРАНТІЇ. Це вільне програмне забезпечення, Ви можете розповсюджувати його за певних умов.
-Подробиці Загальної Публічної Ліцензії GNU:</resource>
+Подробиці Загальної Публічної Ліцензії GNU:</resource>
-		<resource name="about_title">Про Greenshot</resource>
+		<resource name="about_title">Про Greenshot</resource>
-		<resource name="application_title">Greenshot – революційна утиліта для отримання знімків екрану</resource>
+		<resource name="application_title">Greenshot – революційна утиліта для отримання знімків екрану</resource>
-		<resource name="bugreport_cancel">Закрити</resource>
+		<resource name="bugreport_cancel">Закрити</resource>
-		<resource name="bugreport_info">Вибачте, виникла непередбачувана помилка.
+		<resource name="bugreport_info">Вибачте, виникла непередбачувана помилка.
-
+
-Гарна новина: Ви можете допомогти нам виправити програму, надіславши звіт про помилку.
+Гарна новина: Ви можете допомогти нам виправити програму, надіславши звіт про помилку.
-Будь ласка, створіть за посиланням новий звіт про помилку та скопіюйте вміст текстової області в опис.
+Будь ласка, створіть за посиланням новий звіт про помилку та скопіюйте вміст текстової області в опис.
-
+
-Будь ласка, додайте короткий опис та будь-яку іншу інформацію, що допоможе нам відтворити помилку.
+Будь ласка, додайте короткий опис та будь-яку іншу інформацію, що допоможе нам відтворити помилку.
-Також ми будемо вдячні Вам за перевірку наявності цієї помилки на нашому трекері. (Радимо використовувати пошук.) Дякуємо Вам :)</resource>
+Також ми будемо вдячні Вам за перевірку наявності цієї помилки на нашому трекері. (Радимо використовувати пошук.) Дякуємо Вам :)</resource>
-		<resource name="bugreport_title">Помилка</resource>
+		<resource name="bugreport_title">Помилка</resource>
-		<resource name="CANCEL">Скасувати</resource>
+		<resource name="CANCEL">Скасувати</resource>
-		<resource name="clipboard_error">При записі в буфер обміну відбулась несподівана помилка.</resource>
+		<resource name="clipboard_error">При записі в буфер обміну відбулась несподівана помилка.</resource>
-		<resource name="clipboard_inuse">Greenshot не зміг записати дані у буфер обміну, доступ до якого заблокований процесом {0}.</resource>
+		<resource name="clipboard_inuse">Greenshot не зміг записати дані у буфер обміну, доступ до якого заблокований процесом {0}.</resource>
-		<resource name="clipboard_noimage">Неможливо знайти зображення у буфері обміну.</resource>
+		<resource name="clipboard_noimage">Неможливо знайти зображення у буфері обміну.</resource>
-		<resource name="ClipboardFormat.BITMAP">Растрове зображення Windows</resource>
+		<resource name="ClipboardFormat.BITMAP">Растрове зображення Windows</resource>
-		<resource name="ClipboardFormat.DIB">Растрове зображення (DIB)</resource>
+		<resource name="ClipboardFormat.DIB">Растрове зображення (DIB)</resource>
-		<resource name="ClipboardFormat.HTML">HTML</resource>
+		<resource name="ClipboardFormat.HTML">HTML</resource>
-		<resource name="ClipboardFormat.HTMLDATAURL">HTML з вбудованими зображеннями</resource>
+		<resource name="ClipboardFormat.HTMLDATAURL">HTML з вбудованими зображеннями</resource>
-		<resource name="ClipboardFormat.PNG">PNG</resource>
+		<resource name="ClipboardFormat.PNG">PNG</resource>
-		<resource name="colorpicker_alpha">Альфа</resource>
+		<resource name="colorpicker_alpha">Альфа</resource>
-		<resource name="colorpicker_apply">Застосувати</resource>
+		<resource name="colorpicker_apply">Застосувати</resource>
-		<resource name="colorpicker_blue">Синій</resource>
+		<resource name="colorpicker_blue">Синій</resource>
-		<resource name="colorpicker_green">Зелений</resource>
+		<resource name="colorpicker_green">Зелений</resource>
-		<resource name="colorpicker_htmlcolor">Колір HTML</resource>
+		<resource name="colorpicker_htmlcolor">Колір HTML</resource>
-		<resource name="colorpicker_recentcolors">Останні використані кольори</resource>
+		<resource name="colorpicker_recentcolors">Останні використані кольори</resource>
-		<resource name="colorpicker_red">Червоний</resource>
+		<resource name="colorpicker_red">Червоний</resource>
-		<resource name="colorpicker_title">Вибір кольору</resource>
+		<resource name="colorpicker_title">Вибір кольору</resource>
-		<resource name="colorpicker_transparent">Прозорий</resource>
+		<resource name="colorpicker_transparent">Прозорий</resource>
-		<resource name="com_rejected">Призначення {0} відхилило доступ Greenshot, можливо через відкрите діалогове вікно. Зайкрийте діалогове вікно та спробуйте знову.</resource>
+		<resource name="com_rejected">Призначення {0} відхилило доступ Greenshot, можливо через відкрите діалогове вікно. Зайкрийте діалогове вікно та спробуйте знову.</resource>
-		<resource name="com_rejected_title">Доступ Greenshot відхилено</resource>
+		<resource name="com_rejected_title">Доступ Greenshot відхилено</resource>
-		<resource name="config_unauthorizedaccess_write">Неможливо зберегти файл налаштувань Greenshot. Будь ласка, перевірте доступ до „{0}“.</resource>
+		<resource name="config_unauthorizedaccess_write">Неможливо зберегти файл налаштувань Greenshot. Будь ласка, перевірте доступ до „{0}“.</resource>
-		<resource name="contextmenu_about">Про Greenshot</resource>
+		<resource name="contextmenu_about">Про Greenshot</resource>
-		<resource name="contextmenu_capturearea">Захоплення області</resource>
+		<resource name="contextmenu_capturearea">Захоплення області</resource>
-		<resource name="contextmenu_captureclipboard">Відкрити зображення з буферу обміну</resource>
+		<resource name="contextmenu_captureclipboard">Відкрити зображення з буферу обміну</resource>
-		<resource name="contextmenu_capturefullscreen">Захопити весь екран</resource>
+		<resource name="contextmenu_capturefullscreen">Захопити весь екран</resource>
-		<resource name="contextmenu_capturefullscreen_all">все</resource>
+		<resource name="contextmenu_capturefullscreen_all">все</resource>
-		<resource name="contextmenu_capturefullscreen_bottom">знизу</resource>
+		<resource name="contextmenu_capturefullscreen_bottom">знизу</resource>
-		<resource name="contextmenu_capturefullscreen_left">зліва</resource>
+		<resource name="contextmenu_capturefullscreen_left">зліва</resource>
-		<resource name="contextmenu_capturefullscreen_right">справа</resource>
+		<resource name="contextmenu_capturefullscreen_right">справа</resource>
-		<resource name="contextmenu_capturefullscreen_top">згори</resource>
+		<resource name="contextmenu_capturefullscreen_top">згори</resource>
-		<resource name="contextmenu_captureie">Захопити Internet Explorer</resource>
+		<resource name="contextmenu_captureie">Захопити Internet Explorer</resource>
-		<resource name="contextmenu_captureiefromlist">Захопити Internet Explorer зі списку</resource>
+		<resource name="contextmenu_captureiefromlist">Захопити Internet Explorer зі списку</resource>
-		<resource name="contextmenu_capturelastregion">Захоплення останньої області</resource>
+		<resource name="contextmenu_capturelastregion">Захоплення останньої області</resource>
-		<resource name="contextmenu_capturewindow">Захоплення вікна</resource>
+		<resource name="contextmenu_capturewindow">Захоплення вікна</resource>
-		<resource name="contextmenu_capturewindowfromlist">Захопити вікно зі списку</resource>
+		<resource name="contextmenu_capturewindowfromlist">Захопити вікно зі списку</resource>
-		<resource name="contextmenu_donate">Підтримати Greenshot</resource>
+		<resource name="contextmenu_donate">Підтримати Greenshot</resource>
-		<resource name="contextmenu_exit">Вихід</resource>
+		<resource name="contextmenu_exit">Вихід</resource>
-		<resource name="contextmenu_help">Допомога</resource>
+		<resource name="contextmenu_help">Допомога</resource>
-		<resource name="contextmenu_openfile">Відкрити зображення з файла</resource>
+		<resource name="contextmenu_openfile">Відкрити зображення з файла</resource>
-		<resource name="contextmenu_openrecentcapture">Відкрити місце збереження останнього знімку</resource>
+		<resource name="contextmenu_openrecentcapture">Відкрити місце збереження останнього знімку</resource>
-		<resource name="contextmenu_quicksettings">Швидкі параметри</resource>
+		<resource name="contextmenu_quicksettings">Швидкі параметри</resource>
-		<resource name="contextmenu_settings">Параметри...</resource>
+		<resource name="contextmenu_settings">Параметри...</resource>
-		<resource name="destination_exportfailed">Помилка експорту {0}. Будь ласка, спробуйте ще.</resource>
+		<resource name="destination_exportfailed">Помилка експорту {0}. Будь ласка, спробуйте ще.</resource>
-		<resource name="editor_align_bottom">Знизу</resource>
+		<resource name="editor_align_bottom">Знизу</resource>
-		<resource name="editor_align_center">По центру</resource>
+		<resource name="editor_align_center">По центру</resource>
-		<resource name="editor_align_horizontal">Горизонтальне вирівнювання</resource>
+		<resource name="editor_align_horizontal">Горизонтальне вирівнювання</resource>
-		<resource name="editor_align_left">По лівому краю</resource>
+		<resource name="editor_align_left">По лівому краю</resource>
-		<resource name="editor_align_middle">По середині</resource>
+		<resource name="editor_align_middle">По середині</resource>
-		<resource name="editor_align_right">По правому краю</resource>
+		<resource name="editor_align_right">По правому краю</resource>
-		<resource name="editor_align_top">Вгорі</resource>
+		<resource name="editor_align_top">Вгорі</resource>
-		<resource name="editor_align_vertical">Вертикальне вирівнювання</resource>
+		<resource name="editor_align_vertical">Вертикальне вирівнювання</resource>
-		<resource name="editor_arrange">Впорядкувати</resource>
+		<resource name="editor_arrange">Впорядкувати</resource>
-		<resource name="editor_arrowheads">Кінці стрілки</resource>
+		<resource name="editor_arrowheads">Кінці стрілки</resource>
-		<resource name="editor_arrowheads_both">З обох сторін</resource>
+		<resource name="editor_arrowheads_both">З обох сторін</resource>
-		<resource name="editor_arrowheads_end">Наприкінці</resource>
+		<resource name="editor_arrowheads_end">Наприкінці</resource>
-		<resource name="editor_arrowheads_none">Немає</resource>
+		<resource name="editor_arrowheads_none">Немає</resource>
-		<resource name="editor_arrowheads_start">На початку</resource>
+		<resource name="editor_arrowheads_start">На початку</resource>
-		<resource name="editor_autocrop">Автоматичне обрізання</resource>
+		<resource name="editor_autocrop">Автоматичне обрізання</resource>
-		<resource name="editor_backcolor">Колір заливки</resource>
+		<resource name="editor_backcolor">Колір заливки</resource>
-		<resource name="editor_blur_radius">Радіус розмиття</resource>
+		<resource name="editor_blur_radius">Радіус розмиття</resource>
-		<resource name="editor_bold">Жирний</resource>
+		<resource name="editor_bold">Жирний</resource>
-		<resource name="editor_border">Межа</resource>
+		<resource name="editor_border">Межа</resource>
-		<resource name="editor_brightness">Яскравість</resource>
+		<resource name="editor_brightness">Яскравість</resource>
-		<resource name="editor_cancel">Скасувати</resource>
+		<resource name="editor_cancel">Скасувати</resource>
-		<resource name="editor_clipboardfailed">Помилка доступу до буферу обміну. Будь ласка, спробуйте ще.</resource>
+		<resource name="editor_clipboardfailed">Помилка доступу до буферу обміну. Будь ласка, спробуйте ще.</resource>
-		<resource name="editor_close">Закрити</resource>
+		<resource name="editor_close">Закрити</resource>
-		<resource name="editor_close_on_save">Зберегти знімок екрану?</resource>
+		<resource name="editor_close_on_save">Зберегти знімок екрану?</resource>
-		<resource name="editor_close_on_save_title">Зберегти зображення?</resource>
+		<resource name="editor_close_on_save_title">Зберегти зображення?</resource>
-		<resource name="editor_confirm">Підтвердити</resource>
+		<resource name="editor_confirm">Підтвердити</resource>
-		<resource name="editor_copyimagetoclipboard">Копіювати зображення у буфер обміну</resource>
+		<resource name="editor_copyimagetoclipboard">Копіювати зображення у буфер обміну</resource>
-		<resource name="editor_copypathtoclipboard">Копіювати шлях у буфер обміну</resource>
+		<resource name="editor_copypathtoclipboard">Копіювати шлях у буфер обміну</resource>
-		<resource name="editor_copytoclipboard">Копіювати</resource>
+		<resource name="editor_copytoclipboard">Копіювати</resource>
-		<resource name="editor_crop">Обрізати (С)</resource>
+		<resource name="editor_crop">Обрізати (С)</resource>
-		<resource name="editor_cursortool">Інструмент вибору (Esc)</resource>
+		<resource name="editor_cursortool">Інструмент вибору (Esc)</resource>
-		<resource name="editor_cuttoclipboard">Вирізати</resource>
+		<resource name="editor_cuttoclipboard">Вирізати</resource>
-		<resource name="editor_deleteelement">Видалити</resource>
+		<resource name="editor_deleteelement">Видалити</resource>
-		<resource name="editor_downonelevel">Вниз на один рівень</resource>
+		<resource name="editor_downonelevel">Вниз на один рівень</resource>
-		<resource name="editor_downtobottom">На задній план</resource>
+		<resource name="editor_downtobottom">На задній план</resource>
-		<resource name="editor_drawarrow">Стрілка (Ф)</resource>
+		<resource name="editor_drawarrow">Стрілка (Ф)</resource>
-		<resource name="editor_drawellipse">Еліпс (У)</resource>
+		<resource name="editor_drawellipse">Еліпс (У)</resource>
-		<resource name="editor_drawfreehand">Від руки (А)</resource>
+		<resource name="editor_drawfreehand">Від руки (А)</resource>
-		<resource name="editor_drawhighlighter">Підсвічування (Р)</resource>
+		<resource name="editor_drawhighlighter">Підсвічування (Р)</resource>
-		<resource name="editor_drawline">Лінія (Д)</resource>
+		<resource name="editor_drawline">Лінія (Д)</resource>
-		<resource name="editor_drawrectangle">Прямокутник (К)</resource>
+		<resource name="editor_drawrectangle">Прямокутник (К)</resource>
-		<resource name="editor_drawtextbox">Додати текст (Е)</resource>
+		<resource name="editor_drawtextbox">Додати текст (Е)</resource>
-		<resource name="editor_dropshadow_darkness">Тьмяність тіні</resource>
+		<resource name="editor_dropshadow_darkness">Тьмяність тіні</resource>
-		<resource name="editor_dropshadow_offset">Зсув тіні</resource>
+		<resource name="editor_dropshadow_offset">Зсув тіні</resource>
-		<resource name="editor_dropshadow_settings">Параметри тіні</resource>
+		<resource name="editor_dropshadow_settings">Параметри тіні</resource>
-		<resource name="editor_dropshadow_thickness">Товщина тіні</resource>
+		<resource name="editor_dropshadow_thickness">Товщина тіні</resource>
-		<resource name="editor_duplicate">Дублювати вибраний елемент</resource>
+		<resource name="editor_duplicate">Дублювати вибраний елемент</resource>
-		<resource name="editor_edit">Змінити</resource>
+		<resource name="editor_edit">Змінити</resource>
-		<resource name="editor_effects">Ефекти</resource>
+		<resource name="editor_effects">Ефекти</resource>
-		<resource name="editor_email">Ел. пошта</resource>
+		<resource name="editor_email">Ел. пошта</resource>
-		<resource name="editor_file">Файл</resource>
+		<resource name="editor_file">Файл</resource>
-		<resource name="editor_fontsize">Розмір</resource>
+		<resource name="editor_fontsize">Розмір</resource>
-		<resource name="editor_forecolor">Колір лінії</resource>
+		<resource name="editor_forecolor">Колір лінії</resource>
-		<resource name="editor_grayscale">Відтінки сірого</resource>
+		<resource name="editor_grayscale">Відтінки сірого</resource>
-		<resource name="editor_highlight_area">Підсвічення області</resource>
+		<resource name="editor_highlight_area">Підсвічення області</resource>
-		<resource name="editor_highlight_grayscale">Відтінки сірого</resource>
+		<resource name="editor_highlight_grayscale">Відтінки сірого</resource>
-		<resource name="editor_highlight_magnify">Збільшення</resource>
+		<resource name="editor_highlight_magnify">Збільшення</resource>
-		<resource name="editor_highlight_mode">Режим підсвічування</resource>
+		<resource name="editor_highlight_mode">Режим підсвічування</resource>
-		<resource name="editor_highlight_text">Підсвічення тексту</resource>
+		<resource name="editor_highlight_text">Підсвічення тексту</resource>
-		<resource name="editor_image_shadow">Тінь</resource>
+		<resource name="editor_image_shadow">Тінь</resource>
-		<resource name="editor_imagesaved">Зображення збережено в {0}.</resource>
+		<resource name="editor_imagesaved">Зображення збережено в {0}.</resource>
-		<resource name="editor_insertwindow">Вставити вікно</resource>
+		<resource name="editor_insertwindow">Вставити вікно</resource>
-		<resource name="editor_invert">Інверсія</resource>
+		<resource name="editor_invert">Інверсія</resource>
-		<resource name="editor_italic">Курсив</resource>
+		<resource name="editor_italic">Курсив</resource>
-		<resource name="editor_load_objects">Завантажити об’єкти з файла</resource>
+		<resource name="editor_load_objects">Завантажити об’єкти з файла</resource>
-		<resource name="editor_magnification_factor">Коефіцієнт збільшення</resource>
+		<resource name="editor_magnification_factor">Коефіцієнт збільшення</resource>
-		<resource name="editor_match_capture_size">Відповідає розміру захоплення</resource>
+		<resource name="editor_match_capture_size">Відповідає розміру захоплення</resource>
-		<resource name="editor_obfuscate">Затемнення (Щ)</resource>
+		<resource name="editor_obfuscate">Затемнення (Щ)</resource>
-		<resource name="editor_obfuscate_blur">Розмиття</resource>
+		<resource name="editor_obfuscate_blur">Розмиття</resource>
-		<resource name="editor_obfuscate_mode">Режим затемнення</resource>
+		<resource name="editor_obfuscate_mode">Режим затемнення</resource>
-		<resource name="editor_obfuscate_pixelize">Пікселізація</resource>
+		<resource name="editor_obfuscate_pixelize">Пікселізація</resource>
-		<resource name="editor_object">Об’єкт</resource>
+		<resource name="editor_object">Об’єкт</resource>
-		<resource name="editor_opendirinexplorer">Відкрити катлог у Провіднику Windows</resource>
+		<resource name="editor_opendirinexplorer">Відкрити катлог у Провіднику Windows</resource>
-		<resource name="editor_pastefromclipboard">Вставити</resource>
+		<resource name="editor_pastefromclipboard">Вставити</resource>
-		<resource name="editor_pixel_size">Розмір піксела</resource>
+		<resource name="editor_pixel_size">Розмір піксела</resource>
-		<resource name="editor_preview_quality">Якість попереднього перегляду</resource>
+		<resource name="editor_preview_quality">Якість попереднього перегляду</resource>
-		<resource name="editor_print">Роздрукувати</resource>
+		<resource name="editor_print">Роздрукувати</resource>
-		<resource name="editor_redo">Повторити {0}</resource>
+		<resource name="editor_redo">Повторити {0}</resource>
-		<resource name="editor_resetsize">Скинути розмір</resource>
+		<resource name="editor_resetsize">Скинути розмір</resource>
-		<resource name="editor_resize_percent">відсотків</resource>
+		<resource name="editor_resize_percent">відсотків</resource>
-		<resource name="editor_resize_pixel">пікселів</resource>
+		<resource name="editor_resize_pixel">пікселів</resource>
-		<resource name="editor_rotateccw">Оберт проти годинникової стрілки (Ctrl + Б)</resource>
+		<resource name="editor_rotateccw">Оберт проти годинникової стрілки (Ctrl + Б)</resource>
-		<resource name="editor_rotatecw">Оберт за годинниковою стрілкою (Ctrl + Ю)</resource>
+		<resource name="editor_rotatecw">Оберт за годинниковою стрілкою (Ctrl + Ю)</resource>
-		<resource name="editor_save">Зберегти</resource>
+		<resource name="editor_save">Зберегти</resource>
-		<resource name="editor_save_objects">Зберегти об’єкти в файл</resource>
+		<resource name="editor_save_objects">Зберегти об’єкти в файл</resource>
-		<resource name="editor_saveas">Зберегти як...</resource>
+		<resource name="editor_saveas">Зберегти як...</resource>
-		<resource name="editor_selectall">Виділити все</resource>
+		<resource name="editor_selectall">Виділити все</resource>
-		<resource name="editor_senttoprinter">Завдання друку надіслано на „{0}“.</resource>
+		<resource name="editor_senttoprinter">Завдання друку надіслано на „{0}“.</resource>
-		<resource name="editor_shadow">Тінь</resource>
+		<resource name="editor_shadow">Тінь</resource>
-		<resource name="editor_storedtoclipboard">Зображення надіслано в буфер обміну.</resource>
+		<resource name="editor_storedtoclipboard">Зображення надіслано в буфер обміну.</resource>
-		<resource name="editor_thickness">Товщина лінії</resource>
+		<resource name="editor_thickness">Товщина лінії</resource>
-		<resource name="editor_title">Редактор зображень Greenshot</resource>
+		<resource name="editor_title">Редактор зображень Greenshot</resource>
-		<resource name="editor_torn_edge">Розірваний край</resource>
+		<resource name="editor_torn_edge">Розірваний край</resource>
-		<resource name="editor_tornedge_horizontaltoothrange">Горизонтальна частота зубців</resource>
+		<resource name="editor_tornedge_horizontaltoothrange">Горизонтальна частота зубців</resource>
-		<resource name="editor_tornedge_settings">Параметри розірваного краю</resource>
+		<resource name="editor_tornedge_settings">Параметри розірваного краю</resource>
-		<resource name="editor_tornedge_toothsize">Розмір зубця</resource>
+		<resource name="editor_tornedge_toothsize">Розмір зубця</resource>
-		<resource name="editor_tornedge_verticaltoothrange">Вертикальна частота зубців</resource>
+		<resource name="editor_tornedge_verticaltoothrange">Вертикальна частота зубців</resource>
-		<resource name="editor_undo">Скасувати {0}</resource>
+		<resource name="editor_undo">Скасувати {0}</resource>
-		<resource name="editor_uponelevel">Вгору на один рівень</resource>
+		<resource name="editor_uponelevel">Вгору на один рівень</resource>
-		<resource name="editor_uptotop">На передній план</resource>
+		<resource name="editor_uptotop">На передній план</resource>
-		<resource name="EmailFormat.MAPI">Клієнт MAPI</resource>
+		<resource name="EmailFormat.MAPI">Клієнт MAPI</resource>
-		<resource name="EmailFormat.OUTLOOK_HTML">Outlook з HTML</resource>
+		<resource name="EmailFormat.OUTLOOK_HTML">Outlook з HTML</resource>
-		<resource name="EmailFormat.OUTLOOK_TXT">Outlook з текстом</resource>
+		<resource name="EmailFormat.OUTLOOK_TXT">Outlook з текстом</resource>
-		<resource name="error">Помилка</resource>
+		<resource name="error">Помилка</resource>
-		<resource name="error_multipleinstances">Вже запущено примірник Greenshot.</resource>
+		<resource name="error_multipleinstances">Вже запущено примірник Greenshot.</resource>
-		<resource name="error_nowriteaccess">Неможливо зберегти файл в {0}.
+		<resource name="error_nowriteaccess">Неможливо зберегти файл в {0}.
-Будь ласка, перевірте доступність вибраної теки.</resource>
+Будь ласка, перевірте доступність вибраної теки.</resource>
-		<resource name="error_openfile">Неможливо відкрити файл „{0}“.</resource>
+		<resource name="error_openfile">Неможливо відкрити файл „{0}“.</resource>
-		<resource name="error_openlink">Неможливо відкрити посилання „{0}“.</resource>
+		<resource name="error_openlink">Неможливо відкрити посилання „{0}“.</resource>
-		<resource name="error_save">Неможливо зберегти знімок. Будь ласка, знайдіть відповідне місце.</resource>
+		<resource name="error_save">Неможливо зберегти знімок. Будь ласка, знайдіть відповідне місце.</resource>
-		<resource name="expertsettings">Експертні</resource>
+		<resource name="expertsettings">Експертні</resource>
-		<resource name="expertsettings_autoreducecolors">Створити 8-бітне зображення, якщо більш ніж 8-бітне має менше 256 кольорів</resource>
+		<resource name="expertsettings_autoreducecolors">Створити 8-бітне зображення, якщо більш ніж 8-бітне має менше 256 кольорів</resource>
-		<resource name="expertsettings_checkunstableupdates">Перевірити наявність нестабільних оновлень</resource>
+		<resource name="expertsettings_checkunstableupdates">Перевірити наявність нестабільних оновлень</resource>
-		<resource name="expertsettings_clipboardformats">Формати буферу обміну</resource>
+		<resource name="expertsettings_clipboardformats">Формати буферу обміну</resource>
-		<resource name="expertsettings_counter">Номер для ${NUM} у шаблон назви файла</resource>
+		<resource name="expertsettings_counter">Номер для ${NUM} у шаблон назви файла</resource>
-		<resource name="expertsettings_enableexpert">Я знаю що я роблю!</resource>
+		<resource name="expertsettings_enableexpert">Я знаю що я роблю!</resource>
-		<resource name="expertsettings_footerpattern">Нижній колонтитул</resource>
+		<resource name="expertsettings_footerpattern">Нижній колонтитул</resource>
-		<resource name="expertsettings_minimizememoryfootprint">Зменшити споживання пам’яті, з погіршенням продуктивності (не рекомендовано).</resource>
+		<resource name="expertsettings_minimizememoryfootprint">Зменшити споживання пам’яті, з погіршенням продуктивності (не рекомендовано).</resource>
-		<resource name="expertsettings_optimizeforrdp">Зробити кілька оптимізацій для використання з віддалених стільниць</resource>
+		<resource name="expertsettings_optimizeforrdp">Зробити кілька оптимізацій для використання з віддалених стільниць</resource>
-		<resource name="expertsettings_reuseeditorifpossible">За можливості повторно використовувати редактор</resource>
+		<resource name="expertsettings_reuseeditorifpossible">За можливості повторно використовувати редактор</resource>
-		<resource name="expertsettings_suppresssavedialogatclose">Заборонити діалог збереження при закритті редактора</resource>
+		<resource name="expertsettings_suppresssavedialogatclose">Заборонити діалог збереження при закритті редактора</resource>
-		<resource name="expertsettings_thumbnailpreview">Показувати вікно ескізів у контекстному меню (для Vista та Windows 7)</resource>
+		<resource name="expertsettings_thumbnailpreview">Показувати вікно ескізів у контекстному меню (для Vista та Windows 7)</resource>
-		<resource name="exported_to">Експортовано: {0}</resource>
+		<resource name="exported_to">Експортовано: {0}</resource>
-		<resource name="exported_to_error">Відбулась помилка під час експорту до {0}:</resource>
+		<resource name="exported_to_error">Відбулась помилка під час експорту до {0}:</resource>
-		<resource name="help_title">Довідка Greenshot</resource>
+		<resource name="help_title">Довідка Greenshot</resource>
-		<resource name="hotkeys">Гарячі клавіши</resource>
+		<resource name="hotkeys">Гарячі клавіши</resource>
-		<resource name="jpegqualitydialog_choosejpegquality">Будь ласка, виберіть JPEG-якість зображення.</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">Будь ласка, виберіть JPEG-якість зображення.</resource>
-		<resource name="OK">Гаразд</resource>
+		<resource name="OK">Гаразд</resource>
-		<resource name="print_error">Під час друку виникла помилка.</resource>
+		<resource name="print_error">Під час друку виникла помилка.</resource>
-		<resource name="printoptions_allowcenter">Центрувати на сторінці</resource>
+		<resource name="printoptions_allowcenter">Центрувати на сторінці</resource>
-		<resource name="printoptions_allowenlarge">Збільшити до розмірів сторінки</resource>
+		<resource name="printoptions_allowenlarge">Збільшити до розмірів сторінки</resource>
-		<resource name="printoptions_allowrotate">Повернути відповідно до орієнтації сторінки</resource>
+		<resource name="printoptions_allowrotate">Повернути відповідно до орієнтації сторінки</resource>
-		<resource name="printoptions_allowshrink">Зменшити до розмірів сторінки</resource>
+		<resource name="printoptions_allowshrink">Зменшити до розмірів сторінки</resource>
-    <resource name="printoptions_colors">Параметри кольору</resource>
+    <resource name="printoptions_colors">Параметри кольору</resource>
-    <resource name="printoptions_dontaskagain">Зберегти ці параметри і не запитувати знову</resource>
+    <resource name="printoptions_dontaskagain">Зберегти ці параметри і не запитувати знову</resource>
-		<resource name="printoptions_inverted">Друк з інвертованими кольорами</resource>
+		<resource name="printoptions_inverted">Друк з інвертованими кольорами</resource>
-    <resource name="printoptions_layout">Параметри макета сторінки</resource>
+    <resource name="printoptions_layout">Параметри макета сторінки</resource>
-    <resource name="printoptions_printcolor">Повноколірний друк</resource>
+    <resource name="printoptions_printcolor">Повноколірний друк</resource>
-    <resource name="printoptions_printgrayscale">Примусовий друк у відтінках сірого</resource>
+    <resource name="printoptions_printgrayscale">Примусовий друк у відтінках сірого</resource>
-    <resource name="printoptions_printmonochrome">Примусовий чорно-білий друк</resource>
+    <resource name="printoptions_printmonochrome">Примусовий чорно-білий друк</resource>
-    <resource name="printoptions_timestamp">Друкувати дату та час внизу сторінки</resource>
+    <resource name="printoptions_timestamp">Друкувати дату та час внизу сторінки</resource>
-		<resource name="printoptions_title">Параметри друку Greenshot</resource>
+		<resource name="printoptions_title">Параметри друку Greenshot</resource>
-		<resource name="qualitydialog_dontaskagain">Зберегти як стандартну якість і не запитувати знову</resource>
+		<resource name="qualitydialog_dontaskagain">Зберегти як стандартну якість і не запитувати знову</resource>
-		<resource name="qualitydialog_title">Якість Greenshot</resource>
+		<resource name="qualitydialog_title">Якість Greenshot</resource>
-		<resource name="quicksettings_destination_file">Безпосереднє збереження (з використанням наперед визначених параметрів)</resource>
+		<resource name="quicksettings_destination_file">Безпосереднє збереження (з використанням наперед визначених параметрів)</resource>
-		<resource name="settings_alwaysshowprintoptionsdialog">Показувати вікно параметрів друку при кожному роздрукуванні</resource>
+		<resource name="settings_alwaysshowprintoptionsdialog">Показувати вікно параметрів друку при кожному роздрукуванні</resource>
-		<resource name="settings_alwaysshowqualitydialog">Вікно вибору якості при кожному збереженні зображення</resource>
+		<resource name="settings_alwaysshowqualitydialog">Вікно вибору якості при кожному збереженні зображення</resource>
-		<resource name="settings_applicationsettings">Параметри програми</resource>
+		<resource name="settings_applicationsettings">Параметри програми</resource>
-		<resource name="settings_autostartshortcut">Запускати Greenshot при запуску системи</resource>
+		<resource name="settings_autostartshortcut">Запускати Greenshot при запуску системи</resource>
-		<resource name="settings_capture">Захоплення</resource>
+		<resource name="settings_capture">Захоплення</resource>
-		<resource name="settings_capture_mousepointer">Захоплювати курсор миші</resource>
+		<resource name="settings_capture_mousepointer">Захоплювати курсор миші</resource>
-		<resource name="settings_capture_windows_interactive">Використовувати інтерактивний режим захоплення вікна</resource>
+		<resource name="settings_capture_windows_interactive">Використовувати інтерактивний режим захоплення вікна</resource>
-		<resource name="settings_checkperiod">Інтервал перевірки оновлення у днях (0=не перевіряти)</resource>
+		<resource name="settings_checkperiod">Інтервал перевірки оновлення у днях (0=не перевіряти)</resource>
-		<resource name="settings_configureplugin">Налаштувати</resource>
+		<resource name="settings_configureplugin">Налаштувати</resource>
-		<resource name="settings_copypathtoclipboard">Копіювати у буфер обміну шлях до файла при збереженні зображення</resource>
+		<resource name="settings_copypathtoclipboard">Копіювати у буфер обміну шлях до файла при збереженні зображення</resource>
-		<resource name="settings_destination">Призначення</resource>
+		<resource name="settings_destination">Призначення</resource>
-		<resource name="settings_destination_clipboard">Копіювати у буфер обміну</resource>
+		<resource name="settings_destination_clipboard">Копіювати у буфер обміну</resource>
-		<resource name="settings_destination_editor">Відкрити у редакторі зображень</resource>
+		<resource name="settings_destination_editor">Відкрити у редакторі зображень</resource>
-		<resource name="settings_destination_email">Ел. пошта</resource>
+		<resource name="settings_destination_email">Ел. пошта</resource>
-		<resource name="settings_destination_file">Безпосереднє збереження (використовуючи параметри нижче)</resource>
+		<resource name="settings_destination_file">Безпосереднє збереження (використовуючи параметри нижче)</resource>
-		<resource name="settings_destination_fileas">Зберегти як (відображення діалогу)</resource>
+		<resource name="settings_destination_fileas">Зберегти як (відображення діалогу)</resource>
-		<resource name="settings_destination_picker">Динамічний вибір призначення</resource>
+		<resource name="settings_destination_picker">Динамічний вибір призначення</resource>
-		<resource name="settings_destination_printer">Роздрукувати</resource>
+		<resource name="settings_destination_printer">Роздрукувати</resource>
-		<resource name="settings_editor">Редактор</resource>
+		<resource name="settings_editor">Редактор</resource>
-		<resource name="settings_filenamepattern">Шаблон назви файла</resource>
+		<resource name="settings_filenamepattern">Шаблон назви файла</resource>
-		<resource name="settings_general">Загальні</resource>
+		<resource name="settings_general">Загальні</resource>
-		<resource name="settings_iecapture">Захоплення Internet Explorer</resource>
+		<resource name="settings_iecapture">Захоплення Internet Explorer</resource>
-		<resource name="settings_jpegquality">Якість JPEG</resource>
+		<resource name="settings_jpegquality">Якість JPEG</resource>
-		<resource name="settings_language">Мова</resource>
+		<resource name="settings_language">Мова</resource>
-		<resource name="settings_message_filenamepattern">Наступні заповнювачі будуть автоматично замінені у визначеному шаблоні:
+		<resource name="settings_message_filenamepattern">Наступні заповнювачі будуть автоматично замінені у визначеному шаблоні:
-${YYYY} рік, 4 цифри
+${YYYY} рік, 4 цифри
-${MM} місяць, 2 цифри
+${MM} місяць, 2 цифри
-${DD} день, 2 цифри
+${DD} день, 2 цифри
-${hh} години, 2 цифри
+${hh} години, 2 цифри
-${mm} хвилини, 2 цифри
+${mm} хвилини, 2 цифри
-${ss} секунди, 2 цифри
+${ss} секунди, 2 цифри
-${NUM} номер, що збільшується, 6 цифр
+${NUM} номер, що збільшується, 6 цифр
-${title} заголовок вікна
+${title} заголовок вікна
-${user} ім’я користувача Windows
+${user} ім’я користувача Windows
-${domain} домен Windows
+${domain} домен Windows
-${hostname} назва комп’ютера
+${hostname} назва комп’ютера
-
+
-Ви також можете примусити Greenshot створювати динамічні каталоги, просто використовуючи символ похилої риски (\) як роздільник між теками та назвою файла.
+Ви також можете примусити Greenshot створювати динамічні каталоги, просто використовуючи символ похилої риски (\) як роздільник між теками та назвою файла.
-Наприклад, шаблон ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss}
+Наприклад, шаблон ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss}
-створюватиме у стандартній теці теку для поточного дня (наприклад, 2012-01-27), в якій будуть знімки з назвою файла, що базуватиметься на поточному часі (наприклад, 11_58_32) (плюс зазначене у параметрах розширення).</resource>
+створюватиме у стандартній теці теку для поточного дня (наприклад, 2012-01-27), в якій будуть знімки з назвою файла, що базуватиметься на поточному часі (наприклад, 11_58_32) (плюс зазначене у параметрах розширення).</resource>
-		<resource name="settings_network">Мережа та оновлення</resource>
+		<resource name="settings_network">Мережа та оновлення</resource>
-		<resource name="settings_output">Виведення</resource>
+		<resource name="settings_output">Виведення</resource>
-		<resource name="settings_playsound">Відтворити звук камери</resource>
+		<resource name="settings_playsound">Відтворити звук камери</resource>
-		<resource name="settings_plugins">Плагіни</resource>
+		<resource name="settings_plugins">Плагіни</resource>
-		<resource name="settings_plugins_createdby">Створений</resource>
+		<resource name="settings_plugins_createdby">Створений</resource>
-		<resource name="settings_plugins_dllpath">Шлях до DLL</resource>
+		<resource name="settings_plugins_dllpath">Шлях до DLL</resource>
-		<resource name="settings_plugins_name">Назва</resource>
+		<resource name="settings_plugins_name">Назва</resource>
-		<resource name="settings_plugins_version">Версія</resource>
+		<resource name="settings_plugins_version">Версія</resource>
-		<resource name="settings_preferredfilesettings">Параметри кінцевого файла</resource>
+		<resource name="settings_preferredfilesettings">Параметри кінцевого файла</resource>
-		<resource name="settings_primaryimageformat">Формат зображення</resource>
+		<resource name="settings_primaryimageformat">Формат зображення</resource>
-		<resource name="settings_printer">Принтер</resource>
+		<resource name="settings_printer">Принтер</resource>
-		<resource name="settings_printoptions">Параметри друку</resource>
+		<resource name="settings_printoptions">Параметри друку</resource>
-		<resource name="settings_qualitysettings">Параметри якості</resource>
+		<resource name="settings_qualitysettings">Параметри якості</resource>
-		<resource name="settings_reducecolors">Зменшити максимальну кількість кольорів до 256</resource>
+		<resource name="settings_reducecolors">Зменшити максимальну кількість кольорів до 256</resource>
-		<resource name="settings_registerhotkeys">Зареєструвати гарячі клавіші</resource>
+		<resource name="settings_registerhotkeys">Зареєструвати гарячі клавіші</resource>
-		<resource name="settings_showflashlight">Показати спалах</resource>
+		<resource name="settings_showflashlight">Показати спалах</resource>
-		<resource name="settings_shownotify">Показувати сповіщення</resource>
+		<resource name="settings_shownotify">Показувати сповіщення</resource>
-		<resource name="settings_zoom">Показувати лупу</resource>
+		<resource name="settings_zoom">Показувати лупу</resource>
-		<resource name="settings_storagelocation">Тека для знімків</resource>
+		<resource name="settings_storagelocation">Тека для знімків</resource>
-		<resource name="settings_title">Параметри</resource>
+		<resource name="settings_title">Параметри</resource>
-		<resource name="settings_tooltip_filenamepattern">Шаблон, що використовується для генерації назв файлів при збереженні знімків</resource>
+		<resource name="settings_tooltip_filenamepattern">Шаблон, що використовується для генерації назв файлів при збереженні знімків</resource>
-		<resource name="settings_tooltip_language">Мова інтерфейсу користувача</resource>
+		<resource name="settings_tooltip_language">Мова інтерфейсу користувача</resource>
-		<resource name="settings_tooltip_primaryimageformat">Стандартний формат зображення</resource>
+		<resource name="settings_tooltip_primaryimageformat">Стандартний формат зображення</resource>
-		<resource name="settings_tooltip_registerhotkeys">Визначає резервацію поєднання клавіш Ctrl+PrtScr, Alt+PrtScr та клавіші PrtScr (PrintScreen) для глобального використання у Greenshot після запуску програми і до її закриття.</resource>
+		<resource name="settings_tooltip_registerhotkeys">Визначає резервацію поєднання клавіш Ctrl+PrtScr, Alt+PrtScr та клавіші PrtScr (PrintScreen) для глобального використання у Greenshot після запуску програми і до її закриття.</resource>
-		<resource name="settings_tooltip_storagelocation">Стандартна тека для збереження знімків (залиште порожнім для збереження на стільниці)</resource>
+		<resource name="settings_tooltip_storagelocation">Стандартна тека для збереження знімків (залиште порожнім для збереження на стільниці)</resource>
-		<resource name="settings_usedefaultproxy">Використовувати стандартний проксі системи</resource>
+		<resource name="settings_usedefaultproxy">Використовувати стандартний проксі системи</resource>
-		<resource name="settings_visualization">Ефекти</resource>
+		<resource name="settings_visualization">Ефекти</resource>
-		<resource name="settings_waittime">Затримка перед захопленням (мс)</resource>
+		<resource name="settings_waittime">Затримка перед захопленням (мс)</resource>
-		<resource name="settings_window_capture_mode">Режим захоплення вікна</resource>
+		<resource name="settings_window_capture_mode">Режим захоплення вікна</resource>
-		<resource name="settings_windowscapture">Захоплення вікна</resource>
+		<resource name="settings_windowscapture">Захоплення вікна</resource>
-		<resource name="tooltip_firststart">Притиск правою кнопкою миші або натиснути клавішу {0}.</resource>
+		<resource name="tooltip_firststart">Притиск правою кнопкою миші або натиснути клавішу {0}.</resource>
-		<resource name="update_found">Доступна новіша версія Greenshot! Чи хочете Ви завантажити Greenshot {0}?</resource>
+		<resource name="update_found">Доступна новіша версія Greenshot! Чи хочете Ви завантажити Greenshot {0}?</resource>
-		<resource name="wait_ie_capture">Будь ласка, зачекайте поки захоплюється сторінка в Internet Explorer...</resource>
+		<resource name="wait_ie_capture">Будь ласка, зачекайте поки захоплюється сторінка в Internet Explorer...</resource>
-		<resource name="warning">Попередження</resource>
+		<resource name="warning">Попередження</resource>
-		<resource name="warning_hotkeys">Неможливо зареєструвати гарячі клавіші „{0}“. Можливо, вони вже використовуються іншою програмою! Ви можете змінити гарячі клавіші або вимкнути/змінити програму, що використовує такі ж комбінації клавіш.
+		<resource name="warning_hotkeys">Неможливо зареєструвати гарячі клавіші „{0}“. Можливо, вони вже використовуються іншою програмою! Ви можете змінити гарячі клавіші або вимкнути/змінити програму, що використовує такі ж комбінації клавіш.
-
+
-Всі функції Greenshot досі працюють безпосередньо з контекстного меню іконки у лотку без застосування гарячих клавіш.</resource>
+Всі функції Greenshot досі працюють безпосередньо з контекстного меню іконки у лотку без застосування гарячих клавіш.</resource>
-		<resource name="WindowCaptureMode.Aero">Використовувати користувацький колір</resource>
+		<resource name="WindowCaptureMode.Aero">Використовувати користувацький колір</resource>
-		<resource name="WindowCaptureMode.AeroTransparent">Зберігати прозорість</resource>
+		<resource name="WindowCaptureMode.AeroTransparent">Зберігати прозорість</resource>
-		<resource name="WindowCaptureMode.Auto">Автоматично</resource>
+		<resource name="WindowCaptureMode.Auto">Автоматично</resource>
-		<resource name="WindowCaptureMode.GDI">Використовувати стандартний колір</resource>
+		<resource name="WindowCaptureMode.GDI">Використовувати стандартний колір</resource>
-		<resource name="WindowCaptureMode.Screen">Як відображається</resource>
+		<resource name="WindowCaptureMode.Screen">Як відображається</resource>
-	</resources>
+	</resources>
-</language>
+</language>

Greenshot/Languages/language-vi-VN.xml

@@ -1,192 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Việt" ietf="vi-VN" version="1.0.0" languagegroup="e">
+<language description="Việt" ietf="vi-VN" version="1.0.0" languagegroup="e">
-	<resources>
+	<resources>
-		<resource name="about_bugs">Địa chỉ gửi báo cáo lỗi:</resource>
+		<resource name="about_bugs">Địa chỉ gửi báo cáo lỗi:</resource>
-		<resource name="about_donations">Hãy ủng hộ nếu bạn thấy Greenshot hữu dụng:</resource>
+		<resource name="about_donations">Hãy ủng hộ nếu bạn thấy Greenshot hữu dụng:</resource>
-		<resource name="about_host">Greenshot được tài trợ bởi sourceforge.net</resource>
+		<resource name="about_host">Greenshot được tài trợ bởi sourceforge.net</resource>
-		<resource name="about_icons">Dùng biểu tượng Fugue (Giấy phép Commons Attribution 3.0 license) :</resource>
+		<resource name="about_icons">Dùng biểu tượng Fugue (Giấy phép Commons Attribution 3.0 license) :</resource>
-		<resource name="about_license">Bản quyền (C) 2007-2012 Thomas Braun, Jens Klingen, Robin Krom
+		<resource name="about_license">Bản quyền (C) 2007-2012 Thomas Braun, Jens Klingen, Robin Krom
-		Greenshot không đi kèm theo đảm bảo nào và được phân phối dưới giấy phép GNU General Public License.</resource>
+		Greenshot không đi kèm theo đảm bảo nào và được phân phối dưới giấy phép GNU General Public License.</resource>
-		<resource name="about_title">Giới thiệu Greenshot</resource>
+		<resource name="about_title">Giới thiệu Greenshot</resource>
-		<resource name="application_title">Greenshot - Công cụ chụp màn hình</resource>
+		<resource name="application_title">Greenshot - Công cụ chụp màn hình</resource>
-		<resource name="bugreport_cancel">Đóng</resource>
+		<resource name="bugreport_cancel">Đóng</resource>
-		<resource name="bugreport_info">Xảy ra lỗi.
+		<resource name="bugreport_info">Xảy ra lỗi.
-		Xin hãy báo cáo lỗi này tới người phát triển để chương trình hoàn thiện hơn.
+		Xin hãy báo cáo lỗi này tới người phát triển để chương trình hoàn thiện hơn.
-		Đây là cách bạn đóng góp cho Greenshot cũng như cộng đồng mã mở.</resource>
+		Đây là cách bạn đóng góp cho Greenshot cũng như cộng đồng mã mở.</resource>
-		<resource name="bugreport_title">Lỗi</resource>
+		<resource name="bugreport_title">Lỗi</resource>
-		<resource name="clipboard_error">Có lỗi khi chép ảnh vào clipboard.</resource>
+		<resource name="clipboard_error">Có lỗi khi chép ảnh vào clipboard.</resource>
-		<resource name="clipboard_inuse">Greenshot không ghi được vào clipboard vì bị chặn bởi {0}.</resource>
+		<resource name="clipboard_inuse">Greenshot không ghi được vào clipboard vì bị chặn bởi {0}.</resource>
-		<resource name="colorpicker_alpha">Alpha</resource>
+		<resource name="colorpicker_alpha">Alpha</resource>
-		<resource name="colorpicker_apply">Áp dụng</resource>
+		<resource name="colorpicker_apply">Áp dụng</resource>
-		<resource name="colorpicker_blue">Xanh</resource>
+		<resource name="colorpicker_blue">Xanh</resource>
-		<resource name="colorpicker_green">Xanh lục</resource>
+		<resource name="colorpicker_green">Xanh lục</resource>
-		<resource name="colorpicker_htmlcolor">Màu HTML</resource>
+		<resource name="colorpicker_htmlcolor">Màu HTML</resource>
-		<resource name="colorpicker_recentcolors">Màu đã chọn</resource>
+		<resource name="colorpicker_recentcolors">Màu đã chọn</resource>
-		<resource name="colorpicker_red">Đỏ</resource>
+		<resource name="colorpicker_red">Đỏ</resource>
-		<resource name="colorpicker_title">Chọn màu</resource>
+		<resource name="colorpicker_title">Chọn màu</resource>
-		<resource name="colorpicker_transparent">Trong suốt</resource>
+		<resource name="colorpicker_transparent">Trong suốt</resource>
-		<resource name="config_unauthorizedaccess_write">Không lưu được thiết lập Greenshot. Hãy kiểm tra quyền truy cập tới {0}.</resource>
+		<resource name="config_unauthorizedaccess_write">Không lưu được thiết lập Greenshot. Hãy kiểm tra quyền truy cập tới {0}.</resource>
-		<resource name="contextmenu_about">Giới thiêu Greenshot</resource>
+		<resource name="contextmenu_about">Giới thiêu Greenshot</resource>
-		<resource name="contextmenu_capturearea">Chọn vùng chụp</resource>
+		<resource name="contextmenu_capturearea">Chọn vùng chụp</resource>
-		<resource name="contextmenu_captureclipboard">Mở ảnh từ clipboard</resource>
+		<resource name="contextmenu_captureclipboard">Mở ảnh từ clipboard</resource>
-		<resource name="contextmenu_capturefullscreen">Chụp toàn màn hình</resource>
+		<resource name="contextmenu_capturefullscreen">Chụp toàn màn hình</resource>
-		<resource name="contextmenu_capturelastregion">Vùng chụp lần trước</resource>
+		<resource name="contextmenu_capturelastregion">Vùng chụp lần trước</resource>
-		<resource name="contextmenu_capturewindow">Chụp cửa sổ</resource>
+		<resource name="contextmenu_capturewindow">Chụp cửa sổ</resource>
-		<resource name="contextmenu_donate">Hỗ trợ Greenshot</resource>
+		<resource name="contextmenu_donate">Hỗ trợ Greenshot</resource>
-		<resource name="contextmenu_exit">Thoát</resource>
+		<resource name="contextmenu_exit">Thoát</resource>
-		<resource name="contextmenu_help">Trợ giúp</resource>
+		<resource name="contextmenu_help">Trợ giúp</resource>
-		<resource name="contextmenu_openfile">Mở tệp ảnh</resource>
+		<resource name="contextmenu_openfile">Mở tệp ảnh</resource>
-		<resource name="contextmenu_quicksettings">Thiết lập nhanh</resource>
+		<resource name="contextmenu_quicksettings">Thiết lập nhanh</resource>
-		<resource name="contextmenu_settings">Thiết lập...</resource>
+		<resource name="contextmenu_settings">Thiết lập...</resource>
-		<resource name="editor_arrange">Bố trí</resource>
+		<resource name="editor_arrange">Bố trí</resource>
-		<resource name="editor_arrowheads">Mũi tên có đuôi</resource>
+		<resource name="editor_arrowheads">Mũi tên có đuôi</resource>
-		<resource name="editor_arrowheads_both">Hai đầu</resource>
+		<resource name="editor_arrowheads_both">Hai đầu</resource>
-		<resource name="editor_arrowheads_end">Điểm cuối</resource>
+		<resource name="editor_arrowheads_end">Điểm cuối</resource>
-		<resource name="editor_arrowheads_none">không</resource>
+		<resource name="editor_arrowheads_none">không</resource>
-		<resource name="editor_arrowheads_start">Điểm đầu</resource>
+		<resource name="editor_arrowheads_start">Điểm đầu</resource>
-		<resource name="editor_backcolor">Tô đè</resource>
+		<resource name="editor_backcolor">Tô đè</resource>
-		<resource name="editor_blur_radius">Bán kính blur</resource>
+		<resource name="editor_blur_radius">Bán kính blur</resource>
-		<resource name="editor_bold">Chữ đậm</resource>
+		<resource name="editor_bold">Chữ đậm</resource>
-		<resource name="editor_brightness">Độ sáng</resource>
+		<resource name="editor_brightness">Độ sáng</resource>
-		<resource name="editor_cancel">Hủy</resource>
+		<resource name="editor_cancel">Hủy</resource>
-		<resource name="editor_clipboardfailed">Không truy cập được tới clipboard. Hãy thử lại.</resource>
+		<resource name="editor_clipboardfailed">Không truy cập được tới clipboard. Hãy thử lại.</resource>
-		<resource name="editor_close">Đóng</resource>
+		<resource name="editor_close">Đóng</resource>
-		<resource name="editor_close_on_save">Lưu ảnh chụp?</resource>
+		<resource name="editor_close_on_save">Lưu ảnh chụp?</resource>
-		<resource name="editor_close_on_save_title">Xác nhận lưu ảnh</resource>
+		<resource name="editor_close_on_save_title">Xác nhận lưu ảnh</resource>
-		<resource name="editor_confirm">Kiểm tra</resource>
+		<resource name="editor_confirm">Kiểm tra</resource>
-		<resource name="editor_copyimagetoclipboard">Chép ảnh vào clipboard</resource>
+		<resource name="editor_copyimagetoclipboard">Chép ảnh vào clipboard</resource>
-		<resource name="editor_copypathtoclipboard">Chép đuờng dẫn tới clipboard.</resource>
+		<resource name="editor_copypathtoclipboard">Chép đuờng dẫn tới clipboard.</resource>
-		<resource name="editor_copytoclipboard">Chép</resource>
+		<resource name="editor_copytoclipboard">Chép</resource>
-		<resource name="editor_crop">Cắt (C)</resource>
+		<resource name="editor_crop">Cắt (C)</resource>
-		<resource name="editor_cursortool">Công cụ chọn (ESC)</resource>
+		<resource name="editor_cursortool">Công cụ chọn (ESC)</resource>
-		<resource name="editor_cuttoclipboard">Cắt</resource>
+		<resource name="editor_cuttoclipboard">Cắt</resource>
-		<resource name="editor_deleteelement">Xóa</resource>
+		<resource name="editor_deleteelement">Xóa</resource>
-		<resource name="editor_downonelevel">Xuống một tầng sau</resource>
+		<resource name="editor_downonelevel">Xuống một tầng sau</resource>
-		<resource name="editor_downtobottom">Mặt cuối cùng</resource>
+		<resource name="editor_downtobottom">Mặt cuối cùng</resource>
-		<resource name="editor_drawarrow">Vẽ mũi tên (A)</resource>
+		<resource name="editor_drawarrow">Vẽ mũi tên (A)</resource>
-		<resource name="editor_drawellipse">Vẽ hình e-líp (E)</resource>
+		<resource name="editor_drawellipse">Vẽ hình e-líp (E)</resource>
-		<resource name="editor_drawhighlighter">Tô sáng (H)</resource>
+		<resource name="editor_drawhighlighter">Tô sáng (H)</resource>
-		<resource name="editor_drawline">Vẽ đường thẳng (L)</resource>
+		<resource name="editor_drawline">Vẽ đường thẳng (L)</resource>
-		<resource name="editor_drawrectangle">Vẽ hình chữ nhật (R)</resource>
+		<resource name="editor_drawrectangle">Vẽ hình chữ nhật (R)</resource>
-		<resource name="editor_drawtextbox">Chèn văn bản (T)</resource>
+		<resource name="editor_drawtextbox">Chèn văn bản (T)</resource>
-		<resource name="editor_duplicate">Nhân bản phần tử đã chọn</resource>
+		<resource name="editor_duplicate">Nhân bản phần tử đã chọn</resource>
-		<resource name="editor_edit">Biên soạn</resource>
+		<resource name="editor_edit">Biên soạn</resource>
-		<resource name="editor_email">Email</resource>
+		<resource name="editor_email">Email</resource>
-		<resource name="editor_file">Tệp</resource>
+		<resource name="editor_file">Tệp</resource>
-		<resource name="editor_fontsize">Cỡ</resource>
+		<resource name="editor_fontsize">Cỡ</resource>
-		<resource name="editor_forecolor">Màu dòng kẻ</resource>
+		<resource name="editor_forecolor">Màu dòng kẻ</resource>
-		<resource name="editor_highlight_area">Tô sáng vùng</resource>
+		<resource name="editor_highlight_area">Tô sáng vùng</resource>
-		<resource name="editor_highlight_grayscale">tô xám</resource>
+		<resource name="editor_highlight_grayscale">tô xám</resource>
-		<resource name="editor_highlight_magnify">phóng to</resource>
+		<resource name="editor_highlight_magnify">phóng to</resource>
-		<resource name="editor_highlight_mode">Chế độ tô sáng</resource>
+		<resource name="editor_highlight_mode">Chế độ tô sáng</resource>
-		<resource name="editor_highlight_text">Tô sáng văn bản</resource>
+		<resource name="editor_highlight_text">Tô sáng văn bản</resource>
-		<resource name="editor_imagesaved">Cất thành công {0}.</resource>
+		<resource name="editor_imagesaved">Cất thành công {0}.</resource>
-		<resource name="editor_italic">Chữ nghiêng</resource>
+		<resource name="editor_italic">Chữ nghiêng</resource>
-		<resource name="editor_load_objects">Tải đối tượng từ tệp</resource>
+		<resource name="editor_load_objects">Tải đối tượng từ tệp</resource>
-		<resource name="editor_magnification_factor">Tỉ lệ phóng đại</resource>
+		<resource name="editor_magnification_factor">Tỉ lệ phóng đại</resource>
-		<resource name="editor_obfuscate">Hiệu ứng blur (O)</resource>
+		<resource name="editor_obfuscate">Hiệu ứng blur (O)</resource>
-		<resource name="editor_obfuscate_blur">làm nhòe</resource>
+		<resource name="editor_obfuscate_blur">làm nhòe</resource>
-		<resource name="editor_obfuscate_mode">blur</resource>
+		<resource name="editor_obfuscate_mode">blur</resource>
-		<resource name="editor_obfuscate_pixelize">mosaic</resource>
+		<resource name="editor_obfuscate_pixelize">mosaic</resource>
-		<resource name="editor_object">Đối tượng</resource>
+		<resource name="editor_object">Đối tượng</resource>
-		<resource name="editor_opendirinexplorer">Hiển thị thư mục bằng Explorer</resource>
+		<resource name="editor_opendirinexplorer">Hiển thị thư mục bằng Explorer</resource>
-		<resource name="editor_pastefromclipboard">Dán</resource>
+		<resource name="editor_pastefromclipboard">Dán</resource>
-		<resource name="editor_pixel_size">Cỡ điểm ảnh</resource>
+		<resource name="editor_pixel_size">Cỡ điểm ảnh</resource>
-		<resource name="editor_preview_quality">Chất lượng ảnh xem trước</resource>
+		<resource name="editor_preview_quality">Chất lượng ảnh xem trước</resource>
-		<resource name="editor_print">In</resource>
+		<resource name="editor_print">In</resource>
-		<resource name="editor_save">Lưu</resource>
+		<resource name="editor_save">Lưu</resource>
-		<resource name="editor_save_objects">Lưu đối tượng vào tệp</resource>
+		<resource name="editor_save_objects">Lưu đối tượng vào tệp</resource>
-		<resource name="editor_saveas">Lưu thành tệp...</resource>
+		<resource name="editor_saveas">Lưu thành tệp...</resource>
-		<resource name="editor_selectall">Chọn tất cả</resource>
+		<resource name="editor_selectall">Chọn tất cả</resource>
-		<resource name="editor_senttoprinter">Đã gửi yêu cầu in'{0}'.</resource>
+		<resource name="editor_senttoprinter">Đã gửi yêu cầu in'{0}'.</resource>
-		<resource name="editor_shadow">Đổ bóng</resource>
+		<resource name="editor_shadow">Đổ bóng</resource>
-		<resource name="editor_image_shadow">Đổ bóng</resource>
+		<resource name="editor_image_shadow">Đổ bóng</resource>
-		<resource name="editor_storedtoclipboard">Đã chép ảnh vào clipboard.</resource>
+		<resource name="editor_storedtoclipboard">Đã chép ảnh vào clipboard.</resource>
-		<resource name="editor_thickness">Độ dày của đường kẻ</resource>
+		<resource name="editor_thickness">Độ dày của đường kẻ</resource>
-		<resource name="editor_title">Trình soạn thảo ảnh Greenshot</resource>
+		<resource name="editor_title">Trình soạn thảo ảnh Greenshot</resource>
-		<resource name="editor_uponelevel">Lên mộttầng trước</resource>
+		<resource name="editor_uponelevel">Lên mộttầng trước</resource>
-		<resource name="editor_uptotop">Màn hình trước</resource>
+		<resource name="editor_uptotop">Màn hình trước</resource>
-		<resource name="error">Lỗi</resource>
+		<resource name="error">Lỗi</resource>
-		<resource name="error_multipleinstances">Greenshot đã đang chạy.</resource>
+		<resource name="error_multipleinstances">Greenshot đã đang chạy.</resource>
-		<resource name="error_nowriteaccess">Không thể lưu tệp {0}.
+		<resource name="error_nowriteaccess">Không thể lưu tệp {0}.
-		Hãy kiểm tra quyền viết tới thư mục lưu.</resource>
+		Hãy kiểm tra quyền viết tới thư mục lưu.</resource>
-		<resource name="error_openfile">Không mở được tệp {0}</resource>
+		<resource name="error_openfile">Không mở được tệp {0}</resource>
-		<resource name="error_openlink">Không thể mở liên kết</resource>
+		<resource name="error_openlink">Không thể mở liên kết</resource>
-		<resource name="error_save">Không thể lưu ảnh chụp. Hãy chọn nơi lưu khác.</resource>
+		<resource name="error_save">Không thể lưu ảnh chụp. Hãy chọn nơi lưu khác.</resource>
-		<resource name="help_title">Trợ giúp Greenshot</resource>
+		<resource name="help_title">Trợ giúp Greenshot</resource>
-		<resource name="jpegqualitydialog_choosejpegquality">Hãy đặt chất lượng tệp JPEG</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">Hãy đặt chất lượng tệp JPEG</resource>
-		<resource name="jpegqualitydialog_dontaskagain">Lưu thiết lập chất lượng JPEG mặc định và sẽ không hỏi lại.</resource>
+		<resource name="jpegqualitydialog_dontaskagain">Lưu thiết lập chất lượng JPEG mặc định và sẽ không hỏi lại.</resource>
-		<resource name="jpegqualitydialog_title">Greenshot - Thiết lập chất lượng JPEG</resource>
+		<resource name="jpegqualitydialog_title">Greenshot - Thiết lập chất lượng JPEG</resource>
-		<resource name="print_error">Lỗi khi in</resource>
+		<resource name="print_error">Lỗi khi in</resource>
-		<resource name="printoptions_allowcenter">Đặt ở giữa trang</resource>
+		<resource name="printoptions_allowcenter">Đặt ở giữa trang</resource>
-		<resource name="printoptions_allowenlarge">Phóng to vừa khít ảnh</resource>
+		<resource name="printoptions_allowenlarge">Phóng to vừa khít ảnh</resource>
-		<resource name="printoptions_allowrotate">Quay ảnh theo hướng của trang</resource>
+		<resource name="printoptions_allowrotate">Quay ảnh theo hướng của trang</resource>
-		<resource name="printoptions_allowshrink">Thu nhỏ ảnh theo cỡ giấy.</resource>
+		<resource name="printoptions_allowshrink">Thu nhỏ ảnh theo cỡ giấy.</resource>
-		<resource name="printoptions_dontaskagain">Lưu vào thiết lập mặc định và không hỏi lại.</resource>
+		<resource name="printoptions_dontaskagain">Lưu vào thiết lập mặc định và không hỏi lại.</resource>
-		<resource name="printoptions_timestamp">In ngày/giờ vào chân trang</resource>
+		<resource name="printoptions_timestamp">In ngày/giờ vào chân trang</resource>
-		<resource name="printoptions_title">Tùy chọn in Greenshot</resource>
+		<resource name="printoptions_title">Tùy chọn in Greenshot</resource>
-		<resource name="quicksettings_destination_file">Lưu vào thư mục (dùng đường dẫn mặc định)</resource>
+		<resource name="quicksettings_destination_file">Lưu vào thư mục (dùng đường dẫn mặc định)</resource>
-		<resource name="settings_alwaysshowjpegqualitydialog">Hiển thị hộp thọat đặt chất lượng ảnh JPEG khi lưu.</resource>
+		<resource name="settings_alwaysshowjpegqualitydialog">Hiển thị hộp thọat đặt chất lượng ảnh JPEG khi lưu.</resource>
-		<resource name="settings_alwaysshowprintoptionsdialog">Luôn hiển thị hộp thoại in khi in ảnh.</resource>
+		<resource name="settings_alwaysshowprintoptionsdialog">Luôn hiển thị hộp thoại in khi in ảnh.</resource>
-		<resource name="settings_applicationsettings">Thiết lập chương trình</resource>
+		<resource name="settings_applicationsettings">Thiết lập chương trình</resource>
-		<resource name="settings_autostartshortcut">Đăng ký Greenshot chạy khởi động Windows.</resource>
+		<resource name="settings_autostartshortcut">Đăng ký Greenshot chạy khởi động Windows.</resource>
-		<resource name="settings_capture">Chụp</resource>
+		<resource name="settings_capture">Chụp</resource>
-		<resource name="settings_capture_mousepointer">Chụp con trỏ (chuột)</resource>
+		<resource name="settings_capture_mousepointer">Chụp con trỏ (chuột)</resource>
-		<resource name="settings_capture_windows_interactive">Chụp màn hình ở chế độ không-hỏi</resource>
+		<resource name="settings_capture_windows_interactive">Chụp màn hình ở chế độ không-hỏi</resource>
-		<resource name="settings_copypathtoclipboard">Khi lưu ảnh, luôn đường dẫn chép ảnh tới clipboard</resource>
+		<resource name="settings_copypathtoclipboard">Khi lưu ảnh, luôn đường dẫn chép ảnh tới clipboard</resource>
-		<resource name="settings_destination">Thao tác sau khi chụp màn hình</resource>
+		<resource name="settings_destination">Thao tác sau khi chụp màn hình</resource>
-		<resource name="settings_destination_clipboard">Chép vào clipboard</resource>
+		<resource name="settings_destination_clipboard">Chép vào clipboard</resource>
-		<resource name="settings_destination_editor">Mở trình soạn thảo ảnh</resource>
+		<resource name="settings_destination_editor">Mở trình soạn thảo ảnh</resource>
-		<resource name="settings_destination_email">Email</resource>
+		<resource name="settings_destination_email">Email</resource>
-		<resource name="settings_destination_file">Lưu mặc định (Sử dụng thiết lập ở dưới)</resource>
+		<resource name="settings_destination_file">Lưu mặc định (Sử dụng thiết lập ở dưới)</resource>
-		<resource name="settings_destination_fileas">Lưu dưới dạng (hiện hộp thoại)</resource>
+		<resource name="settings_destination_fileas">Lưu dưới dạng (hiện hộp thoại)</resource>
-		<resource name="settings_destination_printer">In</resource>
+		<resource name="settings_destination_printer">In</resource>
-		<resource name="settings_filenamepattern">Dạng tên tệp</resource>
+		<resource name="settings_filenamepattern">Dạng tên tệp</resource>
-		<resource name="settings_general">Thông thường</resource>
+		<resource name="settings_general">Thông thường</resource>
-		<resource name="settings_jpegquality">Chất lượng JPEG</resource>
+		<resource name="settings_jpegquality">Chất lượng JPEG</resource>
-		<resource name="settings_jpegsettings">Thiết lập JPEG</resource>
+		<resource name="settings_jpegsettings">Thiết lập JPEG</resource>
-		<resource name="settings_language">Ngôn ngữ hiển thị</resource>
+		<resource name="settings_language">Ngôn ngữ hiển thị</resource>
-		<resource name="settings_message_filenamepattern">Định dạng tên tệp như sau名称のパターンには以下のプレースホルダーが使用できます。
+		<resource name="settings_message_filenamepattern">Định dạng tên tệp như sau名称のパターンには以下のプレースホルダーが使用できます。
-		
+		
-		%YYYY% năm, hai chữ số
+		%YYYY% năm, hai chữ số
-		%MM% tháng, hai chữ số
+		%MM% tháng, hai chữ số
-		%DD% ngày, hai chữ số
+		%DD% ngày, hai chữ số
-		%hh% giờ, hai chữ số
+		%hh% giờ, hai chữ số
-		%mm% phút, hai chữ số
+		%mm% phút, hai chữ số
-		%ss% giây, hai chữ số
+		%ss% giây, hai chữ số
-		%NUM% đánh số, 6 chữ số
+		%NUM% đánh số, 6 chữ số
-		%title% Tên cửa sổ
+		%title% Tên cửa sổ
-		%user% Tên người dùng 
+		%user% Tên người dùng 
-		%domain% Tên miền Windows
+		%domain% Tên miền Windows
-		%hostname% Tên PC
+		%hostname% Tên PC
-
+
-		Có thể chỉ định tên thư mục trong mẫu tên tệp.
+		Có thể chỉ định tên thư mục trong mẫu tên tệp.
-		Hãy dùng ký tự (\) để ngăn cách.
+		Hãy dùng ký tự (\) để ngăn cách.
-
+
-		Ví dụ:  %YYYY%-%MM%-%DD%\%hh%-%mm%-%ss% 
+		Ví dụ:  %YYYY%-%MM%-%DD%\%hh%-%mm%-%ss% 
-		Sẽ tạo thư mục 2011-06-14 và lưu ảnh với tên là thời gian dạng 23-59-59,
+		Sẽ tạo thư mục 2011-06-14 và lưu ảnh với tên là thời gian dạng 23-59-59,
-		tiếp đó là đuôi tệp.</resource>
+		tiếp đó là đuôi tệp.</resource>
-		<resource name="settings_output">Xuất</resource>
+		<resource name="settings_output">Xuất</resource>
-		<resource name="settings_playsound">Tiếng cửa sập</resource>
+		<resource name="settings_playsound">Tiếng cửa sập</resource>
-		<resource name="settings_preferredfilesettings">Thiết lập mặc định xuất file</resource>
+		<resource name="settings_preferredfilesettings">Thiết lập mặc định xuất file</resource>
-		<resource name="settings_primaryimageformat">Định dạng ảnh</resource>
+		<resource name="settings_primaryimageformat">Định dạng ảnh</resource>
-		<resource name="settings_printer">Máy in</resource>
+		<resource name="settings_printer">Máy in</resource>
-		<resource name="settings_printoptions">Tùy chọn in</resource>
+		<resource name="settings_printoptions">Tùy chọn in</resource>
-		<resource name="settings_registerhotkeys">Đăng ký phím tắt</resource>
+		<resource name="settings_registerhotkeys">Đăng ký phím tắt</resource>
-		<resource name="settings_showflashlight">Dùng hiệu ứng đèn</resource>
+		<resource name="settings_showflashlight">Dùng hiệu ứng đèn</resource>
-		<resource name="settings_storagelocation">Nơi lưu</resource>
+		<resource name="settings_storagelocation">Nơi lưu</resource>
-		<resource name="settings_title">Thiết lập</resource>
+		<resource name="settings_title">Thiết lập</resource>
-		<resource name="settings_tooltip_filenamepattern">Dạng tên file khi lưu ảnh</resource>
+		<resource name="settings_tooltip_filenamepattern">Dạng tên file khi lưu ảnh</resource>
-		<resource name="settings_tooltip_language">Ngôn ngữ giao diện (cần khởi động lại Greenshot sau khi thay đổi)</resource>
+		<resource name="settings_tooltip_language">Ngôn ngữ giao diện (cần khởi động lại Greenshot sau khi thay đổi)</resource>
-		<resource name="settings_tooltip_primaryimageformat">Định dạng ảnh mặc định</resource>
+		<resource name="settings_tooltip_primaryimageformat">Định dạng ảnh mặc định</resource>
-		<resource name="settings_tooltip_registerhotkeys">Greenshot sẽ dùng các phím Prnt, Ctrl + Print, Alt + Prnt từ khi khởi động tới khi kết thúc.</resource>
+		<resource name="settings_tooltip_registerhotkeys">Greenshot sẽ dùng các phím Prnt, Ctrl + Print, Alt + Prnt từ khi khởi động tới khi kết thúc.</resource>
-		<resource name="settings_tooltip_storagelocation">Vị trí mặc định lưu ảnh chụp màn hình (Để trống nếu lưu vào desktop)</resource>
+		<resource name="settings_tooltip_storagelocation">Vị trí mặc định lưu ảnh chụp màn hình (Để trống nếu lưu vào desktop)</resource>
-		<resource name="settings_visualization">Hiệu ứng</resource>
+		<resource name="settings_visualization">Hiệu ứng</resource>
-		<resource name="settings_waittime">Mili giây (thời gian trễ lấy ảnh)</resource>
+		<resource name="settings_waittime">Mili giây (thời gian trễ lấy ảnh)</resource>
-		<resource name="tooltip_firststart">Nhấp chuột phải, hoặc nhấn phím Print Screen.</resource>
+		<resource name="tooltip_firststart">Nhấp chuột phải, hoặc nhấn phím Print Screen.</resource>
-		<resource name="warning">Cảnh cáo</resource>
+		<resource name="warning">Cảnh cáo</resource>
-		<resource name="warning_hotkeys">Có phím tắt đã được đăng ký trùng. Kiểm tra (ví dụ phím Print Screen)
+		<resource name="warning_hotkeys">Có phím tắt đã được đăng ký trùng. Kiểm tra (ví dụ phím Print Screen)
-		xem các phần mềm khác có sử dụng các phím tắt của Greenshot hay không.
+		xem các phần mềm khác có sử dụng các phím tắt của Greenshot hay không.
-		Ngoài ra, có thể điều khiển Greenshot bằng cách nhấp chuột phải và biểu tưởng ở phía phải dưới màn hình.</resource>
+		Ngoài ra, có thể điều khiển Greenshot bằng cách nhấp chuột phải và biểu tưởng ở phía phải dưới màn hình.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-website-en-US.xml

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="English" ietf="en-US" version="1.0.0" languagegroup="1">
+<language description="English" ietf="en-US" version="1.0.0" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="home_downloads">Downloads</resource>
+		<resource name="home_downloads">Downloads</resource>
-		<resource name="home_headline">Greenshot - a free screenshot tool optimized for productivity</resource>
+		<resource name="home_headline">Greenshot - a free screenshot tool optimized for productivity</resource>
-		<resource name="home_opensource">Greenshot is free and open source</resource>
+		<resource name="home_opensource">Greenshot is free and open source</resource>
-		<resource name="home_opensource_donate">If you find that Greenshot saves you a lot of time and/or money, you are very welcome to &lt;a href="/support/"&gt;support the development&lt;/a&gt; of this screenshot software.</resource>
+		<resource name="home_opensource_donate">If you find that Greenshot saves you a lot of time and/or money, you are very welcome to &lt;a href="/support/"&gt;support the development&lt;/a&gt; of this screenshot software.</resource>
-		<resource name="home_opensource_gpl">Greenshot was published under &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;, i.e. this software can be downloaded and used free of charge, even in a commercial environment.</resource>
+		<resource name="home_opensource_gpl">Greenshot was published under &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;, i.e. this software can be downloaded and used free of charge, even in a commercial environment.</resource>
-		<resource name="home_seemore">Want to see more?</resource>
+		<resource name="home_seemore">Want to see more?</resource>
-		<resource name="home_seemore_screenshots">Of course there is more that Greenshot can do for you. Have a look at some &lt;a title="Screenshots of Greenshot in action" href="/screenshots/"&gt;screenshots&lt;/a&gt; of Greenshot in action or try the &lt;a title="Download the latest stable version of Greenshot" href="/downloads/"&gt;latest release&lt;/a&gt;.</resource>
+		<resource name="home_seemore_screenshots">Of course there is more that Greenshot can do for you. Have a look at some &lt;a title="Screenshots of Greenshot in action" href="/screenshots/"&gt;screenshots&lt;/a&gt; of Greenshot in action or try the &lt;a title="Download the latest stable version of Greenshot" href="/downloads/"&gt;latest release&lt;/a&gt;.</resource>
-		<resource name="home_whatis">What is Greenshot????</resource>
+		<resource name="home_whatis">What is Greenshot????</resource>
-		<resource name="home_whatis_create">Quickly create screenshots of a selected region, window or fullscreen; you can even capture complete (scrolling) web pages from Internet Explorer.</resource>
+		<resource name="home_whatis_create">Quickly create screenshots of a selected region, window or fullscreen; you can even capture complete (scrolling) web pages from Internet Explorer.</resource>
-		<resource name="home_whatis_edit">Easily annotate, highlight or obfuscate parts of the screenshot.</resource>
+		<resource name="home_whatis_edit">Easily annotate, highlight or obfuscate parts of the screenshot.</resource>
-		<resource name="home_whatis_intro">Greenshot is a light-weight screenshot software tool for Windows with the following key features:</resource>
+		<resource name="home_whatis_intro">Greenshot is a light-weight screenshot software tool for Windows with the following key features:</resource>
-		<resource name="home_whatis_more">...and a lot more options simplyfying creation of and work with screenshots every day.</resource>
+		<resource name="home_whatis_more">...and a lot more options simplyfying creation of and work with screenshots every day.</resource>
-		<resource name="home_whatis_send">Export the screenshot in various ways: save to file, send to printer, copy to clipboard, attach to e-mail, send Office programs or upload to photo sites like Flickr or Picasa, and others.</resource>
+		<resource name="home_whatis_send">Export the screenshot in various ways: save to file, send to printer, copy to clipboard, attach to e-mail, send Office programs or upload to photo sites like Flickr or Picasa, and others.</resource>
-		<resource name="home_whatis_usage">Being easy to understand and configurable, Greenshot is an efficient tool for project managers, software developers, technical writers, testers and anyone else creating screenshots.</resource>
+		<resource name="home_whatis_usage">Being easy to understand and configurable, Greenshot is an efficient tool for project managers, software developers, technical writers, testers and anyone else creating screenshots.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-website-es-ES.xml

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Español" ietf="en-ES" version="1.0.2" languagegroup="1">
+<language description="Español" ietf="en-ES" version="1.0.2" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="home_downloads">Descargas</resource>
+		<resource name="home_downloads">Descargas</resource>
-		<resource name="home_headline">Greenshot - herramienta libre de captura de pantalla, optimizada para una mayor productividad</resource>
+		<resource name="home_headline">Greenshot - herramienta libre de captura de pantalla, optimizada para una mayor productividad</resource>
-		<resource name="home_opensource">Greenshot es código libre y abierto</resource>
+		<resource name="home_opensource">Greenshot es código libre y abierto</resource>
-		<resource name="home_opensource_donate">Si Greenshot te ahorra tiempo y/o dinero, puedes &lt;a href="/support/"&gt;apoyar el desarrollo&lt;/a&gt; de esta aplicación de captura de pantallas.</resource>
+		<resource name="home_opensource_donate">Si Greenshot te ahorra tiempo y/o dinero, puedes &lt;a href="/support/"&gt;apoyar el desarrollo&lt;/a&gt; de esta aplicación de captura de pantallas.</resource>
-		<resource name="home_opensource_gpl">Greenshot se publica bajo licencia &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;. Esta aplicación se puede descargar y utilizar de forma gratuita, incluso en un entorno comercial.</resource>
+		<resource name="home_opensource_gpl">Greenshot se publica bajo licencia &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;. Esta aplicación se puede descargar y utilizar de forma gratuita, incluso en un entorno comercial.</resource>
-		<resource name="home_seemore">¿Quieres ver más?</resource>
+		<resource name="home_seemore">¿Quieres ver más?</resource>
-		<resource name="home_seemore_screenshots">Por supuesto hay mucho más que Greenshot puede hacer. Echa un vistazo a algunas &lt;a href="/screenshots/"&gt;capturas de pantalla&lt;/a&gt; de Greenshot en acción o prueba la &lt;a href="/downloads/"&gt;última versión&lt;/a&gt;.</resource>
+		<resource name="home_seemore_screenshots">Por supuesto hay mucho más que Greenshot puede hacer. Echa un vistazo a algunas &lt;a href="/screenshots/"&gt;capturas de pantalla&lt;/a&gt; de Greenshot en acción o prueba la &lt;a href="/downloads/"&gt;última versión&lt;/a&gt;.</resource>
-		<resource name="home_whatis">¿Qué es Greenshot?</resource>
+		<resource name="home_whatis">¿Qué es Greenshot?</resource>
-		<resource name="home_whatis_create">Creación rápida de capturas de una región seleccionado, una ventana o toda la pantalla; se puede incluso capturar (desplazando) páginas completas de Internet Explorer.</resource>
+		<resource name="home_whatis_create">Creación rápida de capturas de una región seleccionado, una ventana o toda la pantalla; se puede incluso capturar (desplazando) páginas completas de Internet Explorer.</resource>
-		<resource name="home_whatis_edit">Anotación, resalte y ocultación de partes de la captura de pantalla fácilmente.</resource>
+		<resource name="home_whatis_edit">Anotación, resalte y ocultación de partes de la captura de pantalla fácilmente.</resource>
-		<resource name="home_whatis_intro">Greenshot es una herramienta ligera de captura de pantalla para Windows con las características esenciales:</resource>
+		<resource name="home_whatis_intro">Greenshot es una herramienta ligera de captura de pantalla para Windows con las características esenciales:</resource>
-		<resource name="home_whatis_more">... y muchas más opciones para simplificar el día a día en la creación y el trabajo con capturas de pantalla.</resource>
+		<resource name="home_whatis_more">... y muchas más opciones para simplificar el día a día en la creación y el trabajo con capturas de pantalla.</resource>
-		<resource name="home_whatis_send">Exportar la captura de pantalla de diversas maneras: guardar en archivo, imprimir, copiar al portapapeles, adjuntar a un correo electrónico, enviar a programa de Office o subir a sitios de fotos como Flickr o Picasa, entre otros.</resource>
+		<resource name="home_whatis_send">Exportar la captura de pantalla de diversas maneras: guardar en archivo, imprimir, copiar al portapapeles, adjuntar a un correo electrónico, enviar a programa de Office o subir a sitios de fotos como Flickr o Picasa, entre otros.</resource>
-		<resource name="home_whatis_usage">Al ser fácil de entender y configurar, Greenshot es una herramienta eficaz para gestores de proyecto, desarrolladores de software, escritores técnicos, evaluadores y cualquier persona que necesite capturas de pantalla.</resource>
+		<resource name="home_whatis_usage">Al ser fácil de entender y configurar, Greenshot es una herramienta eficaz para gestores de proyecto, desarrolladores de software, escritores técnicos, evaluadores y cualquier persona que necesite capturas de pantalla.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-website-fr-FR.xml

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="French" ietf="fr-FR" version="1.0.0" languagegroup="1">
+<language description="French" ietf="fr-FR" version="1.0.0" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="home_downloads">Téléchargement</resource>
+		<resource name="home_downloads">Téléchargement</resource>
-		<resource name="home_headline">Greenshot - Un outil de capture d’écran gratuit pour une productivité optimale</resource>
+		<resource name="home_headline">Greenshot - Un outil de capture d’écran gratuit pour une productivité optimale</resource>
-		<resource name="home_opensource">Greenshot est gratuit et «Open Source».</resource>
+		<resource name="home_opensource">Greenshot est gratuit et «Open Source».</resource>
-		<resource name="home_opensource_donate">Si vous trouvez que Greenshot vous permet de faire des économies de temps et d’argent, vous êtes les bienvenus si vous nous apportez &lt;a href="/support/"&gt;votre support dans le développement&lt;/a&gt; de ce logiciel de capture d’écran.</resource>
+		<resource name="home_opensource_donate">Si vous trouvez que Greenshot vous permet de faire des économies de temps et d’argent, vous êtes les bienvenus si vous nous apportez &lt;a href="/support/"&gt;votre support dans le développement&lt;/a&gt; de ce logiciel de capture d’écran.</resource>
-		<resource name="home_opensource_gpl">Greenshot a été publié sous &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;, à savoir que ce logiciel peut être utilisé gratuitement, même dans un environnement commercial.</resource>
+		<resource name="home_opensource_gpl">Greenshot a été publié sous &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;, à savoir que ce logiciel peut être utilisé gratuitement, même dans un environnement commercial.</resource>
-		<resource name="home_seemore">Voulez-vous en savoir plus?</resource>
+		<resource name="home_seemore">Voulez-vous en savoir plus?</resource>
-		<resource name="home_seemore_screenshots">Bien entendu Greenshot peut en faire beaucoup plus pour vous. Prenez la peine de regarder quelques &lt;a href="/screenshots/"&gt;captures d’écran&lt;/a&gt; de Greenshot en action ou essayer &lt;a title="Download the latest stable version of Greenshot" href="/downloads/"&gt;la dernière mise à niveau&lt;/a&gt;.</resource>
+		<resource name="home_seemore_screenshots">Bien entendu Greenshot peut en faire beaucoup plus pour vous. Prenez la peine de regarder quelques &lt;a href="/screenshots/"&gt;captures d’écran&lt;/a&gt; de Greenshot en action ou essayer &lt;a title="Download the latest stable version of Greenshot" href="/downloads/"&gt;la dernière mise à niveau&lt;/a&gt;.</resource>
-		<resource name="home_whatis">Qu’est ce que Greenshot?</resource>
+		<resource name="home_whatis">Qu’est ce que Greenshot?</resource>
-		<resource name="home_whatis_create">Créer rapidement des captures d'une zone, d'une fenêtre ou d’un écran complet ; Il est même possible de capturer des pages web complètes (défilement) dans Internet Explorer.</resource>
+		<resource name="home_whatis_create">Créer rapidement des captures d'une zone, d'une fenêtre ou d’un écran complet ; Il est même possible de capturer des pages web complètes (défilement) dans Internet Explorer.</resource>
-		<resource name="home_whatis_edit">Annoter, surligner, assombrir ou brouiller facilement des parties de la capture.</resource>
+		<resource name="home_whatis_edit">Annoter, surligner, assombrir ou brouiller facilement des parties de la capture.</resource>
-		<resource name="home_whatis_intro">Greenshot est un logiciel de capture d’écran léger pour Windows avec les fonctionnalités majeures suivantes:</resource>
+		<resource name="home_whatis_intro">Greenshot est un logiciel de capture d’écran léger pour Windows avec les fonctionnalités majeures suivantes:</resource>
-		<resource name="home_whatis_more">...et bien d'autres options qui permettent de simplifier le travail de création ou de gestion journaliers des captures d’écran.</resource>
+		<resource name="home_whatis_more">...et bien d'autres options qui permettent de simplifier le travail de création ou de gestion journaliers des captures d’écran.</resource>
-		<resource name="home_whatis_send">Exporter la capture de multiples façons: sauvegarde vers un fichier, impression, copie dans le presse-papier, joindre à un courriel, envoi vers des programmes Office ou envoi vers des sites de photos comme Flickr ou Picasa, et d’autres encore.</resource>
+		<resource name="home_whatis_send">Exporter la capture de multiples façons: sauvegarde vers un fichier, impression, copie dans le presse-papier, joindre à un courriel, envoi vers des programmes Office ou envoi vers des sites de photos comme Flickr ou Picasa, et d’autres encore.</resource>
-		<resource name="home_whatis_usage">Simple et facile à configurer, Greenshot est un outil efficace pour des responsables de projet, développeurs de logiciel, Concepteurs de manuels techniques, testeurs ou autres personnes créant des captures d’écran.</resource>
+		<resource name="home_whatis_usage">Simple et facile à configurer, Greenshot est un outil efficace pour des responsables de projet, développeurs de logiciel, Concepteurs de manuels techniques, testeurs ou autres personnes créant des captures d’écran.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-website-it-IT.xml

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Italiano" ietf="it-IT" version="1.0.2" languagegroup="1">
+<language description="Italiano" ietf="it-IT" version="1.0.2" languagegroup="1">
-	<resources>
+	<resources>
-		<resource name="home_downloads">Download</resource>
+		<resource name="home_downloads">Download</resource>
-		<resource name="home_headline">Greenshot - strumento di cattura gratis ottimizzato per la produttività</resource>
+		<resource name="home_headline">Greenshot - strumento di cattura gratis ottimizzato per la produttività</resource>
-		<resource name="home_opensource">Greenshot è gratuito e open source</resource>
+		<resource name="home_opensource">Greenshot è gratuito e open source</resource>
-		<resource name="home_opensource_donate">Se si scopre che Greenshot risparmiare un sacco di tempo e / o denaro, è possibile &lt;a href="/support/"&gt;sostenere lo sviluppo&lt;/a&gt; di questa strumento di cattura.</resource>
+		<resource name="home_opensource_donate">Se si scopre che Greenshot risparmiare un sacco di tempo e / o denaro, è possibile &lt;a href="/support/"&gt;sostenere lo sviluppo&lt;/a&gt; di questa strumento di cattura.</resource>
-		<resource name="home_opensource_gpl">Greenshot è pubblicato sotto licenza &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;. Questo software può essere scaricato e utilizzato gratuitamente, anche in un ambiente commerciale.</resource>
+		<resource name="home_opensource_gpl">Greenshot è pubblicato sotto licenza &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;. Questo software può essere scaricato e utilizzato gratuitamente, anche in un ambiente commerciale.</resource>
-		<resource name="home_seemore">Vuoi saperne di più?</resource>
+		<resource name="home_seemore">Vuoi saperne di più?</resource>
-		<resource name="home_seemore_screenshots">Naturalmente c'è molto di più che si può fare per Greenshot. Check out alcuni &lt;a href="/screenshots/"&gt;screenshot&lt;/a&gt; di Greenshot in azione o provare la versione &lt;a href="/downloads/"&gt;più recente&lt;/a&gt;.</resource>
+		<resource name="home_seemore_screenshots">Naturalmente c'è molto di più che si può fare per Greenshot. Check out alcuni &lt;a href="/screenshots/"&gt;screenshot&lt;/a&gt; di Greenshot in azione o provare la versione &lt;a href="/downloads/"&gt;più recente&lt;/a&gt;.</resource>
-		<resource name="home_whatis">Greenshot - Che cosa è questo?</resource>
+		<resource name="home_whatis">Greenshot - Che cosa è questo?</resource>
-		<resource name="home_whatis_create">Rapidamente rendere le immagini di uno schermo selezionata regione, finestra o completo schermo. È possibile anche catturare le pagine web da Internet Explorer completi (scorrimento).</resource>
+		<resource name="home_whatis_create">Rapidamente rendere le immagini di uno schermo selezionata regione, finestra o completo schermo. È possibile anche catturare le pagine web da Internet Explorer completi (scorrimento).</resource>
-		<resource name="home_whatis_edit">Annotare, evidenziare o nascondere parti di screenshot è facilmente.</resource>
+		<resource name="home_whatis_edit">Annotare, evidenziare o nascondere parti di screenshot è facilmente.</resource>
-		<resource name="home_whatis_intro">Greenshot è uno strumento di cattura schermo per Windows con leggeri caratteristiche essenziali:</resource>
+		<resource name="home_whatis_intro">Greenshot è uno strumento di cattura schermo per Windows con leggeri caratteristiche essenziali:</resource>
-		<resource name="home_whatis_more">... e molte altre opzioni per creare e lavorare con le immagini ogni giorno.</resource>
+		<resource name="home_whatis_more">... e molte altre opzioni per creare e lavorare con le immagini ogni giorno.</resource>
-		<resource name="home_whatis_send">Esportazione screenshot in vari modi: salvare in un file, stampa, copia negli appunti, attaccare a un messaggio, inviare ai programmi di Office o caricare su siti di foto come Flickr e Picasa, tra gli altri.</resource>
+		<resource name="home_whatis_send">Esportazione screenshot in vari modi: salvare in un file, stampa, copia negli appunti, attaccare a un messaggio, inviare ai programmi di Office o caricare su siti di foto come Flickr e Picasa, tra gli altri.</resource>
-		<resource name="home_whatis_usage">Essere facile da capire e configurare, Greenshot è uno strumento efficace per i project manager, sviluppatori di software, redattori tecnici, collaudatori e chiunque altro la creazione di screenshot.</resource>
+		<resource name="home_whatis_usage">Essere facile da capire e configurare, Greenshot è uno strumento efficace per i project manager, sviluppatori di software, redattori tecnici, collaudatori e chiunque altro la creazione di screenshot.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-website-uk-UA.xml

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<language description="Українська" ietf="uk-UA" version="1.0.0" languagegroup="5">
+<language description="Українська" ietf="uk-UA" version="1.0.0" languagegroup="5">
-	<resources>
+	<resources>
-		<resource name="home_downloads">Завантаження</resource>
+		<resource name="home_downloads">Завантаження</resource>
-		<resource name="home_headline">Greenshot — безкоштовний інструмент для створення знімків екрану, оптимізований для покращення продуктивності</resource>
+		<resource name="home_headline">Greenshot — безкоштовний інструмент для створення знімків екрану, оптимізований для покращення продуктивності</resource>
-		<resource name="home_opensource">Greenshot безкоштовний і з відкритим кодом</resource>
+		<resource name="home_opensource">Greenshot безкоштовний і з відкритим кодом</resource>
-		<resource name="home_opensource_donate">Якщо Вам здається, що Greenshot зберігає чимало Вашого часу та/або грошей, Ви можете &lt;a href="/support/"&gt;підтримати розробку&lt;/a&gt; цього програмного забезпечення для створення знімків екрану.</resource>
+		<resource name="home_opensource_donate">Якщо Вам здається, що Greenshot зберігає чимало Вашого часу та/або грошей, Ви можете &lt;a href="/support/"&gt;підтримати розробку&lt;/a&gt; цього програмного забезпечення для створення знімків екрану.</resource>
-		<resource name="home_opensource_gpl">Greenshot розповсюджується відповідно до &lt;a href="http://en.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;, тобто це програмне забезпечення можна вільно завантажувати та використовувати навіть з комерційною метою.</resource>
+		<resource name="home_opensource_gpl">Greenshot розповсюджується відповідно до &lt;a href="http://uk.wikipedia.org/wiki/GNU_General_Public_License" target="_blank"&gt;GPL&lt;/a&gt;, тобто це програмне забезпечення можна вільно завантажувати та використовувати навіть з комерційною метою.</resource>
-		<resource name="home_seemore">Хочете побачити більше?</resource>
+		<resource name="home_seemore">Хочете побачити більше?</resource>
-		<resource name="home_seemore_screenshots">Звісно, Greenshot може зробити для Вас набагато більше. Подивіться кілька &lt;a href="/screenshots/"&gt;знімків&lt;/a&gt; Greenshot у дії та спробуйте &lt;a href="/downloads/"&gt;останній реліз&lt;/a&gt;.</resource>
+		<resource name="home_seemore_screenshots">Звісно, Greenshot може зробити для Вас набагато більше. Подивіться кілька &lt;a title="Знімки Greenshot у дії" href="/screenshots/"&gt;знімків&lt;/a&gt; Greenshot у дії та спробуйте &lt;a title="Завантажити найновішу стабільну версію Greenshot" href="/downloads/"&gt;останній реліз&lt;/a&gt;.</resource>
-		<resource name="home_whatis">Що таке Greenshot?</resource>
+		<resource name="home_whatis">Що таке Greenshot???</resource>
-		<resource name="home_whatis_create">Швидке створення знімків вибраної області, вікна або всього екрану; Ви навіть можете захоплювати всю (з прокручуванням) Інтернет-сторінку в Internet Explorer.</resource>
+		<resource name="home_whatis_create">Швидке створення знімків вибраної області, вікна або всього екрану; Ви навіть можете захоплювати всю (з прокручуванням) Інтернет-сторінку в Internet Explorer.</resource>
-		<resource name="home_whatis_edit">Легке коментування, підсвічування або виділення частин знімку.</resource>
+		<resource name="home_whatis_edit">Легке коментування, підсвічування або виділення частин знімку.</resource>
-		<resource name="home_whatis_intro">Greenshot — це невеличка програма для створення знімків екрану для Windows з такими основними можливостями:</resource>
+		<resource name="home_whatis_intro">Greenshot — це невеличка програма для створення знімків екрану для Windows з такими основними можливостями:</resource>
-		<resource name="home_whatis_more">...та чимало інших можливостей, що спрощують свторення та обробку знімків.</resource>
+		<resource name="home_whatis_more">...та чимало інших можливостей, що спрощують свторення та обробку знімків.</resource>
-		<resource name="home_whatis_send">Кілька варіантів експорту знімків: збереження в файл, друк, копіювання в буфер обміну, долучення до електронного листа, надсилання до офісних програм або вивантаження на фото-хостинги штибу Flickr або Picasa тощо.</resource>
+		<resource name="home_whatis_send">Кілька варіантів експорту знімків: збереження в файл, друк, копіювання в буфер обміну, долучення до електронного листа, надсилання до офісних програм або вивантаження на фото-хостинги штибу Flickr або Picasa тощо.</resource>
-		<resource name="home_whatis_usage">Будучи зручним в налаштуванні та розумінні, Greenshot є ефективним інструментом для менеджерів проектів, розробників програмного забезепечення, технарів-письменників, тестерів та будь-кого іншого, кому потрібно створювати знімки.</resource>
+		<resource name="home_whatis_usage">Будучи зручним в налаштуванні та розумінні, Greenshot є ефективним інструментом для менеджерів проектів, розробників програмного забезепечення, технарів-письменників, тестерів та будь-кого іншого, кому потрібно створювати знімки.</resource>
-	</resources>
+	</resources>
 </language>

Greenshot/Languages/language-zh-TW.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<language description="正體中文" ietf="zh-TW" version="1.0.0" languagegroup="9">
+<language description="正體中文" ietf="zh-TW" version="1.1.4" languagegroup="9">
 	<resources>
-		<resource name="about_bugs">如果發現任何錯誤, 請回報到以下網址</resource>
+		<resource name="about_bugs">請回報錯誤到以下網址</resource>
 		<resource name="about_donations">如果您喜歡 Greenshot，歡迎您支持我們:</resource>
 		<resource name="about_host">Greenshot 的主機在 sourceforge.net 網址是</resource>
-		<resource name="about_icons">圖片來源: Yusuke Kamiyamane's Fugue icon set (Creative Commons Attribution 3.0 授權)</resource>
+		<resource name="about_icons">圖片來源: Yusuke Kamiyamane's Fugue 圖示集 (Creative Commons Attribution 3.0 授權)</resource>
 		<resource name="about_license">Copyright (C) 2007-2013 Thomas Braun, Jens Klingen, Robin Krom
-Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您可以在 GNU 通用公共授權下任意散佈本軟體。
+Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體，您可以在 GNU General Public License 下任意散佈本軟體。
-關於 GNU 通用公共授權詳細資料:</resource>
+關於GNU General Public License 詳細資料:</resource>
 		<resource name="about_title">關於 Greenshot</resource>
-		<resource name="application_title">Greenshot - 革命性的截圖工具</resource>
+		<resource name="application_title">Greenshot - 革命性的螢幕截圖工具</resource>
 		<resource name="bugreport_cancel">關閉</resource>
 		<resource name="bugreport_info">很抱歉，發生未預期錯誤。
 
 您可以藉由填寫錯誤回報來協助我們修正錯誤。
-請點擊以下的連結, 新增一個錯誤報告並將下面文字方塊中的資訊貼到報告的內容中，並請稍微敘述錯誤發生時的情況。
+請訪問以下的連結，新增一個錯誤報告並將下方文字方塊中的資訊貼到報告的內容中，並請稍微敘述錯誤發生時的情況。
 
-另外, 我們強烈建議您在站內搜尋一下是否已經有人回報此錯誤。
+另外，我們強烈建議您在站內搜尋一下是否已經有人回報此錯誤。
 感謝您 :)</resource>
 		<resource name="bugreport_title">錯誤</resource>
 		<resource name="CANCEL">取消</resource>
@@ -39,10 +39,10 @@ Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您
 		<resource name="colorpicker_transparent">透明</resource>
 		<resource name="com_rejected">目的地 {0} 拒絕 Greenshot 存取，可能已開啟對話方塊。 關閉對話方塊並重試。</resource>
 		<resource name="com_rejected_title">拒絕 Greenshot 存取</resource>
-		<resource name="config_unauthorizedaccess_write">無法儲存 Greenshot 的組態檔，請檢查 '{0}' 的存取權限。</resource>
+		<resource name="config_unauthorizedaccess_write">無法儲存 Greenshot 的組態檔，請檢查「{0}」的存取權限。</resource>
 		<resource name="contextmenu_about">關於 Greenshot</resource>
 		<resource name="contextmenu_capturearea">擷取區域</resource>
-		<resource name="contextmenu_captureclipboard">從剪貼簿載入圖片</resource>
+		<resource name="contextmenu_captureclipboard">從剪貼簿開啟圖片</resource>
 		<resource name="contextmenu_capturefullscreen">擷取全螢幕</resource>
 		<resource name="contextmenu_capturefullscreen_all">全部</resource>
 		<resource name="contextmenu_capturefullscreen_bottom">下</resource>
@@ -59,9 +59,9 @@ Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您
 		<resource name="contextmenu_help">說明</resource>
 		<resource name="contextmenu_openfile">從檔案開啟圖片</resource>
 		<resource name="contextmenu_openrecentcapture">開啟上次擷取位置</resource>
-		<resource name="contextmenu_quicksettings">快速設定</resource>
+		<resource name="contextmenu_quicksettings">快速喜好設定</resource>
 		<resource name="contextmenu_settings">喜好設定...</resource>
-		<resource name="destination_exportfailed">匯出到 {0} 時錯誤。 請重試。</resource>
+		<resource name="destination_exportfailed">匯出到 {0} 時錯誤，請重試。</resource>
 		<resource name="editor_align_bottom">靠下</resource>
 		<resource name="editor_align_center">垂直置中</resource>
 		<resource name="editor_align_horizontal">水平對齊</resource>
@@ -77,7 +77,7 @@ Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您
 		<resource name="editor_arrowheads_none">無</resource>
 		<resource name="editor_arrowheads_start">起點</resource>
 		<resource name="editor_autocrop">自動裁剪</resource>
-		<resource name="editor_backcolor">填滿顏色</resource>
+		<resource name="editor_backcolor">填色</resource>
 		<resource name="editor_blur_radius">模糊半徑</resource>
 		<resource name="editor_bold">粗體</resource>
 		<resource name="editor_border">框線</resource>
@@ -91,7 +91,7 @@ Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您
 		<resource name="editor_copyimagetoclipboard">複製圖片到剪貼簿</resource>
 		<resource name="editor_copypathtoclipboard">複製路徑到剪貼簿</resource>
 		<resource name="editor_copytoclipboard">複製</resource>
-		<resource name="editor_crop">裁切 (C)</resource>
+		<resource name="editor_crop">裁剪 (C)</resource>
 		<resource name="editor_cursortool">選取工具 (ESC)</resource>
 		<resource name="editor_cuttoclipboard">剪下</resource>
 		<resource name="editor_deleteelement">刪除</resource>
@@ -100,12 +100,12 @@ Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您
 		<resource name="editor_drawarrow">繪製箭頭 (A)</resource>
 		<resource name="editor_drawellipse">繪製橢圓 (E)</resource>
 		<resource name="editor_drawfreehand">自由繪製 (F)</resource>
-		<resource name="editor_drawhighlighter">醒目標示 (H)</resource>
+		<resource name="editor_drawhighlighter">標示 (H)</resource>
 		<resource name="editor_drawline">繪製直線 (L)</resource>
 		<resource name="editor_drawrectangle">繪製矩形 (R)</resource>
-		<resource name="editor_drawtextbox">加入文字 (T)</resource>
+		<resource name="editor_drawtextbox">加入文字方塊 (T)</resource>
 		<resource name="editor_dropshadow_darkness">陰影黑暗</resource>
-		<resource name="editor_dropshadow_offset">陰影位移</resource>
+		<resource name="editor_dropshadow_offset">陰影偏移</resource>
 		<resource name="editor_dropshadow_settings">陰影設定</resource>
 		<resource name="editor_dropshadow_thickness">陰影厚度</resource>
 		<resource name="editor_duplicate">複製選取的元素</resource>
@@ -114,7 +114,7 @@ Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您
 		<resource name="editor_email">電子郵件</resource>
 		<resource name="editor_file">檔案</resource>
 		<resource name="editor_fontsize">大小</resource>
-		<resource name="editor_forecolor">線段色彩</resource>
+		<resource name="editor_forecolor">直線色彩</resource>
 		<resource name="editor_grayscale">灰階</resource>
 		<resource name="editor_highlight_area">標示區域</resource>
 		<resource name="editor_highlight_grayscale">灰階</resource>
@@ -139,39 +139,39 @@ Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您
 		<resource name="editor_pixel_size">像素大小</resource>
 		<resource name="editor_preview_quality">預覽品質</resource>
 		<resource name="editor_print">列印</resource>
-		<resource name="editor_redo">復原 {0}</resource>
+		<resource name="editor_redo">重做 {0}</resource>
 		<resource name="editor_resetsize">重設大小</resource>
 		<resource name="editor_resize_percent">百分比</resource>
 		<resource name="editor_resize_pixel">像素</resource>
-		<resource name="editor_rotateccw">逆時針旋轉</resource>
+		<resource name="editor_rotateccw">逆時針旋轉 (Ctrl + ,)</resource>
-		<resource name="editor_rotatecw">順時針旋轉</resource>
+		<resource name="editor_rotatecw">順時針旋轉 (Ctrl + .)</resource>
 		<resource name="editor_save">儲存</resource>
 		<resource name="editor_save_objects">儲存物件到檔案</resource>
 		<resource name="editor_saveas">另存新檔...</resource>
 		<resource name="editor_selectall">全選</resource>
-		<resource name="editor_senttoprinter">已使用 '{0}' 來進行列印工作。</resource>
+		<resource name="editor_senttoprinter">列印工作已傳送到「{0}」。</resource>
 		<resource name="editor_shadow">陰影</resource>
-		<resource name="editor_storedtoclipboard">圖片已儲存到剪貼簿.</resource>
+		<resource name="editor_storedtoclipboard">圖片已儲存到剪貼簿。</resource>
-		<resource name="editor_thickness">線段粗細</resource>
+		<resource name="editor_thickness">直線粗細</resource>
 		<resource name="editor_title">Greenshot 圖片編輯器</resource>
 		<resource name="editor_torn_edge">撕裂邊緣</resource>
-		<resource name="editor_tornedge_horizontaltoothrange">水平撕裂範圍</resource>
+		<resource name="editor_tornedge_horizontaltoothrange">水平鋸齒範圍</resource>
 		<resource name="editor_tornedge_settings">撕裂邊緣設定</resource>
-		<resource name="editor_tornedge_toothsize">撕裂大小</resource>
+		<resource name="editor_tornedge_toothsize">鋸齒大小</resource>
-		<resource name="editor_tornedge_verticaltoothrange">垂直撕裂範圍</resource>
+		<resource name="editor_tornedge_verticaltoothrange">垂直鋸齒範圍</resource>
 		<resource name="editor_undo">復原 {0}</resource>
 		<resource name="editor_uponelevel">上移一層</resource>
 		<resource name="editor_uptotop">移到最上層</resource>
 		<resource name="EmailFormat.MAPI">MAPI 用戶端</resource>
-		<resource name="EmailFormat.OUTLOOK_HTML">使用 HTML 的 Outlook</resource>
+		<resource name="EmailFormat.OUTLOOK_HTML">Outlook 使用 HTML</resource>
-		<resource name="EmailFormat.OUTLOOK_TXT">使用文字的 Outlook</resource>
+		<resource name="EmailFormat.OUTLOOK_TXT">Outlook 使用文字</resource>
 		<resource name="error">錯誤</resource>
 		<resource name="error_multipleinstances">Greenshot 已經在執行。</resource>
 		<resource name="error_nowriteaccess">無法儲存檔案到 {0}。
 請檢查選取的存放位置可以寫入。</resource>
-		<resource name="error_openfile">無法開啟檔案 "{0}"。</resource>
+		<resource name="error_openfile">無法開啟檔案「{0}」。</resource>
-		<resource name="error_openlink">無法開啟連結 '{0}'。</resource>
+		<resource name="error_openlink">無法開啟連結「{0}」。</resource>
-		<resource name="error_save">無法儲存螢幕擷取，請尋找適合的位置。</resource>
+		<resource name="error_save">無法儲存螢幕擷圖，請尋找適合的位置。</resource>
 		<resource name="expertsettings">專家</resource>
 		<resource name="expertsettings_autoreducecolors">在 &gt; 8 位元圖像時，如果色彩小於 256 則建立 8 位元圖像</resource>
 		<resource name="expertsettings_checkunstableupdates">檢查 Beta 版更新</resource>
@@ -179,70 +179,74 @@ Greenshot 不對這個程式做任何擔保。 這個程式是自由軟體, 您
 		<resource name="expertsettings_counter">檔案名稱樣式中 ${NUM} 的數字</resource>
 		<resource name="expertsettings_enableexpert">我明白我所做的動作!</resource>
 		<resource name="expertsettings_footerpattern">印表機頁尾樣式</resource>
-		<resource name="expertsettings_minimizememoryfootprint">最小化記憶體頁尾列印，但降低效能 (不建議)。</resource>
+		<resource name="expertsettings_minimizememoryfootprint">最小化記憶體佔用空間，但降低效能 (不建議)。</resource>
 		<resource name="expertsettings_optimizeforrdp">進行使用遠端桌面的一些最佳化</resource>
 		<resource name="expertsettings_reuseeditorifpossible">盡可能重複使用編輯器</resource>
 		<resource name="expertsettings_suppresssavedialogatclose">關閉編輯器時略過儲存對話方塊</resource>
-		<resource name="expertsettings_thumbnailpreview">在內容功能表顯示視窗縮圖 (針對 Vista 和 windows 7)</resource>
+		<resource name="expertsettings_thumbnailpreview">在內容功能表顯示視窗縮圖 (針對 Vista 和 Windows 7)</resource>
 		<resource name="exported_to">匯出到: {0}</resource>
 		<resource name="exported_to_error">匯出到 {0} 時發生錯誤:</resource>
 		<resource name="help_title">Greenshot 說明</resource>
 		<resource name="hotkeys">熱鍵</resource>
-		<resource name="jpegqualitydialog_choosejpegquality">請選擇您想要的 JPEG 圖片品質。</resource>
+		<resource name="jpegqualitydialog_choosejpegquality">請選擇圖片的 JPEG品質。</resource>
 		<resource name="OK">確定</resource>
 		<resource name="print_error">嘗試列印時發生錯誤。</resource>
 		<resource name="printoptions_allowcenter">列印在紙張的正中央</resource>
-		<resource name="printoptions_allowenlarge">放大輸出以符合紙張大小</resource>
+		<resource name="printoptions_allowenlarge">放大列印輸出以符合紙張大小</resource>
-		<resource name="printoptions_allowrotate">旋轉圖片</resource>
+		<resource name="printoptions_allowrotate">旋轉列印輸出為頁面方向</resource>
-		<resource name="printoptions_allowshrink">縮小輸出以符合紙張大小</resource>
+		<resource name="printoptions_allowshrink">縮小列印輸出以符合紙張大小</resource>
+		<resource name="printoptions_colors">色彩設定</resource>
 		<resource name="printoptions_dontaskagain">儲存選項為預設值並不再詢問</resource>
 		<resource name="printoptions_inverted">反向色彩列印</resource>
+		<resource name="printoptions_layout">頁面配置設定</resource>
+		<resource name="printoptions_printcolor">全彩列印</resource>
 		<resource name="printoptions_printgrayscale">強制灰階列印</resource>
+		<resource name="printoptions_printmonochrome">強制黑白列印</resource>
 		<resource name="printoptions_timestamp">在頁尾列印日期 / 時間</resource>
 		<resource name="printoptions_title">Greenshot 列印選項</resource>
 		<resource name="qualitydialog_dontaskagain">儲存為預設品質並不再詢問</resource>
 		<resource name="qualitydialog_title">Greenshot 品質</resource>
-		<resource name="quicksettings_destination_file">直接儲存 (使用慣用的檔案輸出設定)</resource>
+		<resource name="quicksettings_destination_file">直接儲存 (使用慣用的輸出檔案設定)</resource>
 		<resource name="settings_alwaysshowprintoptionsdialog">每次列印圖片時顯示列印選項對話方塊</resource>
 		<resource name="settings_alwaysshowqualitydialog">每次儲存圖片時顯示品質對話方塊</resource>
 		<resource name="settings_applicationsettings">應用程式設定</resource>
-		<resource name="settings_autostartshortcut">開機自動執行 Greenshot</resource>
+		<resource name="settings_autostartshortcut">開機啟動 Greenshot</resource>
 		<resource name="settings_capture">擷取</resource>
 		<resource name="settings_capture_mousepointer">擷取滑鼠指標</resource>
 		<resource name="settings_capture_windows_interactive">使用互動式視窗擷取模式</resource>
-		<resource name="settings_checkperiod">檢查更新間隔天數 (0=不檢查)</resource>
+		<resource name="settings_checkperiod">檢查更新間隔天數 (0 = 不檢查)</resource>
 		<resource name="settings_configureplugin">組態</resource>
 		<resource name="settings_copypathtoclipboard">每次儲存圖片時都將路徑複製到剪貼簿</resource>
 		<resource name="settings_destination">目的地</resource>
 		<resource name="settings_destination_clipboard">複製到剪貼簿</resource>
-		<resource name="settings_destination_editor">用圖片編輯器開啟</resource>
+		<resource name="settings_destination_editor">在圖片編輯器開啟</resource>
 		<resource name="settings_destination_email">電子郵件</resource>
 		<resource name="settings_destination_file">直接儲存 (使用以下設定)</resource>
 		<resource name="settings_destination_fileas">另存新檔 (顯示對話方塊)</resource>
 		<resource name="settings_destination_picker">動態選取目的地</resource>
 		<resource name="settings_destination_printer">傳送到印表機</resource>
 		<resource name="settings_editor">編輯器</resource>
-		<resource name="settings_filenamepattern">檔名格式</resource>
+		<resource name="settings_filenamepattern">檔案名稱樣式</resource>
 		<resource name="settings_general">一般</resource>
 		<resource name="settings_iecapture">Internet Explorer 擷取</resource>
 		<resource name="settings_jpegquality">JPEG 品質</resource>
 		<resource name="settings_language">語言</resource>
-		<resource name="settings_message_filenamepattern">您可以使用以下的格式來指定檔名, 兩個%括起來的地方會被取代為日期、時間等:
+		<resource name="settings_message_filenamepattern">在樣式定義中以下預留位置將自動取代:
-${YYYY}  年,  4個數字
+${YYYY}  年，4 位數字
-${MM}  月,  2個數字
+${MM}  月，2 位數字
-${DD}  日,  2個數字
+${DD}  日，2 位數字
-${hh}  時,  2個數字
+${hh}  時，2 位數字
-${mm}  分,  2個數字
+${mm}  分，2 位數字
-${ss}  秒,  2個數字
+${ss}  秒，2 位數字
-${NUM}  自動編號,  6個數字
+${NUM}  自動編號，6 位數字
-${title}   抓取視窗的標題
+${title}   視窗標題
 ${user}   Windows 使用者名稱
-${domain}   Windows   網域名稱
+${domain}   Windows 網域名稱
 ${hostname}   電腦名稱
 
-您也可以讓 Greenshot 自動產生資料夾, 只要用把右斜線( \ )放在資料夾名稱和檔名的中間就可以了
+您也可以讓 Greenshot 動態建立資料夾，只要使用右斜線 ( \ ) 分隔資料夾和檔案名稱。
-例: ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss}
+例如: 樣式   ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss}
-這樣寫的話, Greenshot 會在預設儲存路徑下建立一個以今天日期為名稱的資料夾(如 2008-06-29), 然後在這個資料夾下儲存圖片檔, 檔名為目前的時間(如 11-58-32)再加上圖片的副檔名</resource>
+將在預設存放位置產生目前日期的資料夾，例如: 2013-05-01，包含螢幕截圖的檔案名稱將根據目前時間，例如: 11_58_32 (再加上設定中定義的附檔名)</resource>
 		<resource name="settings_network">網路和更新</resource>
 		<resource name="settings_output">輸出</resource>
 		<resource name="settings_playsound">播放快門聲</resource>
@@ -256,7 +260,7 @@ ${hostname}   電腦名稱
 		<resource name="settings_printer">印表機</resource>
 		<resource name="settings_printoptions">列印設定</resource>
 		<resource name="settings_qualitysettings">品質設定</resource>
-		<resource name="settings_reducecolors">降低色彩數為最大的 256</resource>
+		<resource name="settings_reducecolors">降低色彩數為最大的 256 色</resource>
 		<resource name="settings_registerhotkeys">註冊熱鍵</resource>
 		<resource name="settings_showflashlight">顯示閃光</resource>
 		<resource name="settings_shownotify">顯示通知</resource>
@@ -272,11 +276,12 @@ ${hostname}   電腦名稱
 		<resource name="settings_waittime">擷取之前等待的時間 (毫秒)</resource>
 		<resource name="settings_window_capture_mode">視窗擷取模式</resource>
 		<resource name="settings_windowscapture">視窗擷取</resource>
+		<resource name="settings_zoom">顯示放大鏡</resource>
 		<resource name="tooltip_firststart">右鍵按一下這裡或是按下 {0} 鍵。</resource>
 		<resource name="update_found">Greenshot 的新版本可以使用! 您要下載 Greenshot {0} 嗎?</resource>
 		<resource name="wait_ie_capture">擷取 Internet Explorer 中頁面時請稍候...</resource>
 		<resource name="warning">警告</resource>
-		<resource name="warning_hotkeys">無法註冊熱鍵 "{0}"。 這個問題可能是另一個工具要求使用相同的熱鍵。 您可以變更熱鍵設定或停用/變更軟體使用熱鍵。
+		<resource name="warning_hotkeys">無法註冊熱鍵「{0}」。 這個問題可能是另一個工具要求使用相同的熱鍵。 您可以變更熱鍵設定或停用/變更軟體使用熱鍵。
 
 Greenshot 所有功能仍然可以直接從通知區圖示的內容功能表動作而不需熱鍵。</resource>
 		<resource name="WindowCaptureMode.Aero">使用自訂色彩</resource>

Greenshot/Languages/plugin-translations-readme.txt

@@ -1,10 +1,10 @@
-Looking for language files for translatabe plugins?
+Looking for language files for translatabe plugins?
-Please refer to these:
+Please refer to these:
-
+
- * http://greenshot.svn.sourceforge.net/svnroot/greenshot/trunk/GreenshotConfluencePlugin/Languages/
+ * http://greenshot.svn.sourceforge.net/svnroot/greenshot/trunk/GreenshotConfluencePlugin/Languages/
- * http://greenshot.svn.sourceforge.net/viewvc/greenshot/trunk/GreenshotImgurPlugin/Languages/
+ * http://greenshot.svn.sourceforge.net/viewvc/greenshot/trunk/GreenshotImgurPlugin/Languages/
- * http://greenshot.svn.sourceforge.net/viewvc/greenshot/trunk/GreenshotJiraPlugin/Languages/
+ * http://greenshot.svn.sourceforge.net/viewvc/greenshot/trunk/GreenshotJiraPlugin/Languages/
- * http://greenshot.svn.sourceforge.net/viewvc/greenshot/trunk/Greenshot-OCR-Plugin/Languages/
+ * http://greenshot.svn.sourceforge.net/viewvc/greenshot/trunk/Greenshot-OCR-Plugin/Languages/
- 
+ 
- Thanks a lot :)
+ Thanks a lot :)
-
+

Greenshot/Processors/TitleFixProcessor.cs

@@ -53,9 +53,6 @@ namespace Greenshot.Processors  {
 				}
 				config.IsDirty = true;
 			}
-			if(config.IsDirty) {
-				IniConfig.Save();
-			}
 		}
 		
 		public override string Designation {

Greenshot/releases/additional_files/readme.template.txt

@@ -2,7 +2,41 @@ Greenshot: A screenshot tool optimized for productivity. Save a screenshot or a
 
 CHANGE LOG:
 
-1.1.4 build $WCREV$ Release
+1.1.6 build $WCREV$ Bugfix Release
+
+Bugs resolved (for bug details go to http://sourceforge.net/p/greenshot/bugs and search on the ID):
+* Bug #1515: Changed the settings GUI to clearly show that the interactive Window capture mode doesn't use the windows capture mode settings.
+* Bug #1517: export to Microsoft Word always goes to the last active Word instance.
+* Bug #1525/#1486: Greenshot looses configuration settings. (At least we hope this is resolved)
+* Bug #1528: export to Microsoft Excel isn't stored in file, which results in a "red cross" when opening on a different or MUCH later on the same computer.
+* Bug #1544: EntryPointNotFoundException when using higlight area or blur
+* Bug #1546: Exception in the editor when using multiple destination, among which the editor, and a picker (e.g. Word) is shown.
+* Not reported: Canceling Imgur authorization or upload caused an NullPointerReference
+
+Features:
+* Added EXIF orientation support when copying images from the clipboard
+* Feature #596: Added commandline option "/inidirectory <directory>" to specify the location of the greenshot.ini, this can e.g. be used for multi-profiles...
+* Removed reading the greenshot.ini if it was changed manually outside of Greenshot while it is running, this should increase stability. People should now exit Greenshot before modifying this file manually.
+
+Improvements:
+* Printouts are now rotated counter-clockwise instead of clockwise, for most people this should be preferable (#1552)
+
+1.1.5 build 2643 Bugfix Release
+
+Bugs resolved (for bug details go to http://sourceforge.net/p/greenshot/bugs and search on the ID):
+* Bug #1510: Under Windows Vista when trying to apply a drop-shadow or a torn-edge effect a GDIPlus error occurs.
+* Bug #1512/#1514: Will not print color
+* Not reported: Annotations where not visible when exporting to Office destinations after writing in the Greenshot format.
+* Not reported: Removed the update check in Greenshot for PortableApps
+
+Languages:
+* New translation: Estonian
+* Updated translations: Russian, Polish and Italian
+* New installer translation: Ukrainian
+* New plugin translations: Polish
+
+
+1.1.4 build 2622 Release
 
 Features added:
 * General: Added zoom when capturing with a option in the settings for disabling the zoom. (this can also be done via the "z" key while capturing.)
@@ -16,11 +50,6 @@ Features added:
 * Plug-in: Added Photobucket plugin
 
 Bugs resolved (for bug details go to http://sourceforge.net/p/greenshot/bugs and search on the ID):
-* Bug #1484, #1494: External Command plug-in issues. e.g. when clicking edit in the External Command plug-in settings, than cancel, and than edit again an error occured.
-* Bug #1499: Stability improvements for when Greenshot tries to open the explorer.exe
-* Bug #1500: Error while dragging an obfuscation
-* Fixed some additional unreported issues
-* Bug #1504: InvalidCastException when using the brightness-filter
 * Bug #1327, #1401 & #1410 : On Windows XP Firefox/java captures are mainly black. This fix should also work with other OS versions and applications.
 * Bug #1340: Fixed issue with opening a screenshow from the clipboard which was created in a remote desktop
 * Bug #1375, #1396 & #1397: Exporting captures to Microsoft Office applications give problems when the Office application shows a dialog, this is fixed by displaying a retry dialog with info.
@@ -38,6 +67,10 @@ Bugs resolved (for bug details go to http://sourceforge.net/p/greenshot/bugs and
 * Bug #1444: Colors were disappearing when "Create an 8-bit image if colors are less than 256 while having a > 8 bits image" was turned on
 * Bug #1462: Auto-filename generation cropping title text after period 
 * Bug #1481: when pasting elements from one editor into another the element could end up outside the visible area 
+* Bug #1484, #1494: External Command plug-in issues. e.g. when clicking edit in the External Command plug-in settings, than cancel, and than edit again an error occured.
+* Bug #1499: Stability improvements for when Greenshot tries to open the explorer.exe
+* Bug #1500: Error while dragging an obfuscation
+* Bug #1504: InvalidCastException when using the brightness-filter
 * Reported in forum: Fixed a problem with the OCR, it sometimes didn't work. See: http://sourceforge.net/p/greenshot/discussion/676082/thread/31a08c8c
 * Not reported: Flickr configuration for the Family, Friend & Public wasn't stored.
 * Not reported: If Greenshot is linked in a Windows startup folder, the "Start with startup" checkbox wasn't checked.

Greenshot/releases/appinfo.ini.template

@@ -21,8 +21,8 @@ CommercialUse=true
 EULAVersion=true
 
 [Version]
-PackageVersion=1.1.4.$WCREV$
+PackageVersion=1.1.6.$WCREV$
-DisplayVersion=1.1.4.$WCREV$
+DisplayVersion=1.1.6.$WCREV$
 
 [SpecialPaths]
 Plugins=NONE

Greenshot/releases/build.bat

@@ -1,4 +1,27 @@
 @echo off
+echo File preparations
+echo Getting current Version
+cd ..
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\additional_files\readme.template.txt releases\additional_files\readme.txt
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\innosetup\setup.iss releases\innosetup\setup-SVN.iss
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\package_zip.bat releases\package_zip-SVN.bat
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\appinfo.ini.template releases\portable\App\AppInfo\appinfo.ini
+tools\TortoiseSVN\SubWCRev.exe ..\ AssemblyInfo.cs.template AssemblyInfo.cs
+rem Plugins
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotBoxPlugin ..\GreenshotBoxPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotBoxPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotConfluencePlugin ..\GreenshotConfluencePlugin\Properties\AssemblyInfo.cs.template ..\GreenshotConfluencePlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotDropboxPlugin ..\GreenshotDropboxPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotDropboxPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotExternalCommandPlugin ..\GreenshotExternalCommandPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotExternalCommandPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotFlickrPlugin ..\GreenshotFlickrPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotFlickrPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotImgurPlugin ..\GreenshotImgurPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotImgurPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotJiraPlugin ..\GreenshotJiraPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotJiraPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotOCRPlugin ..\GreenshotOCRPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotOCRPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotOfficePlugin ..\GreenshotOfficePlugin\Properties\AssemblyInfo.cs.template ..\GreenshotOfficePlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotPhotobucketPlugin ..\GreenshotPhotobucketPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotPhotobucketPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotPicasaPlugin ..\GreenshotPicasaPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotPicasaPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\GreenshotPlugin ..\GreenshotPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotPlugin\Properties\AssemblyInfo.cs
+tools\TortoiseSVN\SubWCRev.exe ..\PluginExample ..\PluginExample\Properties\AssemblyInfo.cs.template ..\PluginExample\Properties\AssemblyInfo.cs
+cd releases
 echo Starting Greenshot BUILD
 \Windows\Microsoft.NET\Framework\v3.5\MSBuild ..\Greenshot.sln /t:Clean;Build /p:Configuration=Release /p:Platform="Any CPU" > build.log
 if %ERRORLEVEL% GEQ 1 (
@@ -6,13 +29,7 @@ echo An error occured, please check the build log!
 pause
 exit -1
 )
-echo File preparations
 cd ..
-echo Getting current Version
-tools\TortoiseSVN\SubWCRev.exe ..\ releases\additional_files\readme.template.txt releases\additional_files\readme.txt
-tools\TortoiseSVN\SubWCRev.exe ..\ releases\innosetup\setup.iss releases\innosetup\setup-SVN.iss
-tools\TortoiseSVN\SubWCRev.exe ..\ releases\package_zip.bat releases\package_zip-SVN.bat
-tools\TortoiseSVN\SubWCRev.exe ..\ releases\appinfo.ini.template releases\portable\App\AppInfo\appinfo.ini
 cd bin\Release
 del *.log
 echo Making MD5

Greenshot/releases/innosetup/scripts/isxdl/isxdl.iss

@@ -2,11 +2,13 @@
 Source: "scripts\isxdl\isxdl.dll"; Flags: dontcopy
 
 [Code]
+//replace PAnsiChar with PChar on non-unicode Inno Setup
 procedure isxdl_AddFile(URL, Filename: PAnsiChar);
 external 'isxdl_AddFile@files:isxdl.dll stdcall';
 
 function isxdl_DownloadFiles(hWnd: Integer): Integer;
 external 'isxdl_DownloadFiles@files:isxdl.dll stdcall';
 
+//replace PAnsiChar with PChar on non-unicode Inno Setup
 function isxdl_SetOption(Option, Value: PAnsiChar): Integer;
-external 'isxdl_SetOption@files:isxdl.dll stdcall';
+external 'isxdl_SetOption@files:isxdl.dll stdcall';

Greenshot/releases/innosetup/scripts/products.iss

@@ -1,43 +1,35 @@
-#include "..\scripts\isxdl\isxdl.iss"
+#include "isxdl\isxdl.iss"
 
 [CustomMessages]
 DependenciesDir=MyProgramDependencies
 
 en.depdownload_msg=The following applications are required before setup can continue:%n%n%1%nDownload and install now?
 de.depdownload_msg=Die folgenden Programme werden benötigt bevor das Setup fortfahren kann:%n%n%1%nJetzt downloaden und installieren?
-nl.depdownload_msg=Die volgende programmas zijn nodig voor dat de setup door kan gaan:%n%n%1%nNu downloaden en installeren?
 
 en.depdownload_memo_title=Download dependencies
 de.depdownload_memo_title=Abhängigkeiten downloaden
-nl.depdownload_memo_title=Afhankelijkheiden downloaden
 
 en.depinstall_memo_title=Install dependencies
 de.depinstall_memo_title=Abhängigkeiten installieren
-nl.depinstall_memo_title=Afhankelijkheiden installeren
 
 en.depinstall_title=Installing dependencies
 de.depinstall_title=Installiere Abhängigkeiten
-nl.depinstall_title=Installeer afhankelijkheiden
 
 en.depinstall_description=Please wait while Setup installs dependencies on your computer.
 de.depinstall_description=Warten Sie bitte während Abhängigkeiten auf Ihrem Computer installiert wird.
-nl.depinstall_description=Wachten AUB terwijl de afhankelijkheiden op uw computer geinstalleerd worden.
 
 en.depinstall_status=Installing %1...
 de.depinstall_status=Installiere %1...
-nl.depinstall_status=Installeer %1...
 
 en.depinstall_missing=%1 must be installed before setup can continue. Please install %1 and run Setup again.
 de.depinstall_missing=%1 muss installiert werden bevor das Setup fortfahren kann. Bitte installieren Sie %1 und starten Sie das Setup erneut.
-nl.depinstall_missing=%1 moet geinstalleerd worden voordat de setup door kan gaan. Installeer AUB %1 en start de setup nogmals.
 
 en.depinstall_error=An error occured while installing the dependencies. Please restart the computer and run the setup again or install the following dependencies manually:%n
 de.depinstall_error=Ein Fehler ist während der Installation der Abghängigkeiten aufgetreten. Bitte starten Sie den Computer neu und führen Sie das Setup erneut aus oder installieren Sie die folgenden Abhängigkeiten per Hand:%n
-nl.depinstall_error=Er is een fout tijdens de installatie van de afhankelijkheiden opgetreden. Start uw computer door en laat de setup nog een keer lopen of installeer de volgende afhankelijkheiden met de hand:%n
 
-en.isxdl_langfile=english.ini
+en.isxdl_langfile=
 de.isxdl_langfile=german2.ini
-nl.isxdl_langfile=english.ini
+
 
 [Files]
 Source: "scripts\isxdl\german2.ini"; Flags: dontcopy
@@ -48,94 +40,157 @@ type
 		File: String;
 		Title: String;
 		Parameters: String;
+		InstallClean : boolean;
+		MustRebootAfter : boolean;
 	end;
-	
+
+	InstallResult = (InstallSuccessful, InstallRebootRequired, InstallError);
+
 var
 	installMemo, downloadMemo, downloadMessage: string;
 	products: array of TProduct;
+	delayedReboot: boolean;
 	DependencyPage: TOutputProgressWizardPage;
 
-  
+
-procedure AddProduct(FileName, Parameters, Title, Size, URL: string);
+procedure AddProduct(FileName, Parameters, Title, Size, URL: string; InstallClean : boolean; MustRebootAfter : boolean);
 var
 	path: string;
 	i: Integer;
 begin
 	installMemo := installMemo + '%1' + Title + #13;
-	
+
 	path := ExpandConstant('{src}{\}') + CustomMessage('DependenciesDir') + '\' + FileName;
 	if not FileExists(path) then begin
 		path := ExpandConstant('{tmp}{\}') + FileName;
-		
+
 		isxdl_AddFile(URL, path);
-		
+
 		downloadMemo := downloadMemo + '%1' + Title + #13;
-		downloadMessage := downloadMessage + '    ' + Title + ' (' + Size + ')' + #13;
+		downloadMessage := downloadMessage + '	' + Title + ' (' + Size + ')' + #13;
 	end;
-	
+
 	i := GetArrayLength(products);
 	SetArrayLength(products, i + 1);
 	products[i].File := path;
 	products[i].Title := Title;
 	products[i].Parameters := Parameters;
+	products[i].InstallClean := InstallClean;
+	products[i].MustRebootAfter := MustRebootAfter;
 end;
 
-function InstallProducts: Boolean;
+function SmartExec(prod : TProduct; var ResultCode : Integer) : boolean;
+begin
+	if (LowerCase(Copy(prod.File,Length(prod.File)-2,3)) = 'exe') then begin
+		Result := Exec(prod.File, prod.Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
+	end else begin
+		Result := ShellExec('', prod.File, prod.Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
+	end;
+end;
+
+function PendingReboot : boolean;
+var	names: String;
+begin
+	if (RegQueryMultiStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager', 'PendingFileRenameOperations', names)) then begin
+		Result := true;
+	end else if ((RegQueryMultiStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager', 'SetupExecute', names)) and (names <> ''))  then begin
+		Result := true;
+	end else begin
+		Result := false;
+	end;
+end;
+
+function InstallProducts: InstallResult;
 var
 	ResultCode, i, productCount, finishCount: Integer;
 begin
-	Result := true;
+	Result := InstallSuccessful;
 	productCount := GetArrayLength(products);
-		
+
 	if productCount > 0 then begin
 		DependencyPage := CreateOutputProgressPage(CustomMessage('depinstall_title'), CustomMessage('depinstall_description'));
 		DependencyPage.Show;
-		
+
 		for i := 0 to productCount - 1 do begin
+			if (products[i].InstallClean and (delayedReboot or PendingReboot())) then begin
+				Result := InstallRebootRequired;
+				break;
+			end;
+
 			DependencyPage.SetText(FmtMessage(CustomMessage('depinstall_status'), [products[i].Title]), '');
 			DependencyPage.SetProgress(i, productCount);
-			
+
-			if Exec(products[i].File, products[i].Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode) then begin
+			if SmartExec(products[i], ResultCode) then begin
-				//success; ResultCode contains the exit code
+				//setup executed; ResultCode contains the exit code
-				if ResultCode = 0 then
+				//MsgBox(products[i].Title + ' install executed. Result Code: ' + IntToStr(ResultCode), mbInformation, MB_OK);
-					finishCount := finishCount + 1
+				if (products[i].MustRebootAfter) then begin
-				else begin
+					//delay reboot after install if we installed the last dependency anyways
-					Result := false;
+					if (i = productCount - 1) then begin
+						delayedReboot := true;
+					end else begin
+						Result := InstallRebootRequired;
+					end;
+					break;
+				end else if (ResultCode = 0) then begin
+					finishCount := finishCount + 1;
+				end else if (ResultCode = 3010) then begin
+					//ResultCode 3010: A restart is required to complete the installation. This message indicates success.
+					delayedReboot := true;
+					finishCount := finishCount + 1;
+				end else begin
+					Result := InstallError;
 					break;
 				end;
 			end else begin
-				//failure; ResultCode contains the error code
+				//MsgBox(products[i].Title + ' install failed. Result Code: ' + IntToStr(ResultCode), mbInformation, MB_OK);
-				Result := false;
+				Result := InstallError;
 				break;
 			end;
 		end;
-		
+
 		//only leave not installed products for error message
 		for i := 0 to productCount - finishCount - 1 do begin
 			products[i] := products[i+finishCount];
 		end;
 		SetArrayLength(products, productCount - finishCount);
-		
+
 		DependencyPage.Hide;
 	end;
 end;
 
-function PrepareToInstall(var NeedsRestart: Boolean): String;
+function PrepareToInstall(var NeedsRestart: boolean): String;
 var
 	i: Integer;
 	s: string;
 begin
-	if not InstallProducts() then begin
+	delayedReboot := false;
-		s := CustomMessage('depinstall_error');
+
-		
+	case InstallProducts() of
-		for i := 0 to GetArrayLength(products) - 1 do begin
+		InstallError: begin
-			s := s + #13 + '    ' + products[i].Title;
+			s := CustomMessage('depinstall_error');
-		end;
+
-		
+			for i := 0 to GetArrayLength(products) - 1 do begin
-		Result := s;
+				s := s + #13 + '	' + products[i].Title;
+			end;
+
+			Result := s;
+			end;
+		InstallRebootRequired: begin
+			Result := products[0].Title;
+			NeedsRestart := true;
+
+			//write into the registry that the installer needs to be executed again after restart
+			RegWriteStringValue(HKEY_CURRENT_USER, 'SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce', 'InstallBootstrap', ExpandConstant('{srcexe}'));
+			end;
 	end;
 end;
 
+function NeedRestart : boolean;
+begin
+	if (delayedReboot) then
+		Result := true;
+end;
+
 function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
 var
 	s: string;
@@ -146,27 +201,26 @@ begin
 		s := s + CustomMessage('depinstall_memo_title') + ':' + NewLine + FmtMessage(installMemo, [Space]) + NewLine;
 
 	s := s + MemoDirInfo + NewLine + NewLine + MemoGroupInfo
-	
+
 	if MemoTasksInfo <> '' then
 		s := s + NewLine + NewLine + MemoTasksInfo;
 
 	Result := s
 end;
 
-function ProductNextButtonClick(CurPageID: Integer): Boolean;
+function NextButtonClick(CurPageID: Integer): boolean;
 begin
 	Result := true;
 
 	if CurPageID = wpReady then begin
-
 		if downloadMemo <> '' then begin
 			//change isxdl language only if it is not english because isxdl default language is already english
-			if ActiveLanguage() <> 'en' then begin
+			if (ActiveLanguage() <> 'en') then begin
 				ExtractTemporaryFile(CustomMessage('isxdl_langfile'));
 				isxdl_SetOption('language', ExpandConstant('{tmp}{\}') + CustomMessage('isxdl_langfile'));
 			end;
 			//isxdl_SetOption('title', FmtMessage(SetupMessage(msgSetupWindowTitle), [CustomMessage('appname')]));
-			
+
 			if SuppressibleMsgBox(FmtMessage(CustomMessage('depdownload_msg'), [downloadMessage]), mbConfirmation, MB_YESNO, IDYES) = IDNO then
 				Result := false
 			else if isxdl_DownloadFiles(StrToInt(ExpandConstant('{wizardhwnd}'))) = 0 then
@@ -175,23 +229,39 @@ begin
 	end;
 end;
 
-function IsX64: Boolean;
+function IsX86: boolean;
+begin
+	Result := (ProcessorArchitecture = paX86) or (ProcessorArchitecture = paUnknown);
+end;
+
+function IsX64: boolean;
 begin
 	Result := Is64BitInstallMode and (ProcessorArchitecture = paX64);
 end;
 
-function IsIA64: Boolean;
+function IsIA64: boolean;
 begin
 	Result := Is64BitInstallMode and (ProcessorArchitecture = paIA64);
 end;
 
-function GetURL(x86, x64, ia64: String): String;
+function GetString(x86, x64, ia64: String): String;
 begin
-	if IsX64() and (x64 <> '') then
+	if IsX64() and (x64 <> '') then begin
 		Result := x64;
-	if IsIA64() and (ia64 <> '') then
+	end else if IsIA64() and (ia64 <> '') then begin
 		Result := ia64;
-	
+	end else begin
-	if Result = '' then
 		Result := x86;
+	end;
+end;
+
+function GetArchitectureString(): String;
+begin
+	if IsX64() then begin
+		Result := '_x64';
+	end else if IsIA64() then begin
+		Result := '_ia64';
+	end else begin
+		Result := '';
+	end;
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx11.iss

@@ -5,21 +5,21 @@
 [CustomMessages]
 dotnetfx11_title=.NET Framework 1.1
 
-dotnetfx11_size=23.1 MB
+en.dotnetfx11_size=23.1 MB
+de.dotnetfx11_size=23,1 MB
 
-[Code]	
+
+[Code]
 const
 	dotnetfx11_url = 'http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe';
 
 procedure dotnetfx11();
-var
-	version: cardinal;
 begin
-	RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v1.1.4322', 'Install', version);
+	if (IsX86() and not netfxinstalled(NetFx11, '')) then
-	if version <> 1 then
 		AddProduct('dotnetfx11.exe',
 			'/q:a /c:"install /qb /l"',
 			CustomMessage('dotnetfx11_title'),
 			CustomMessage('dotnetfx11_size'),
-			dotnetfx11_url);
+			dotnetfx11_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx11lp.iss

@@ -11,17 +11,14 @@ de.dotnetfx11lp_url=http://download.microsoft.com/download/6/8/2/6821e687-526a-4
 
 [Code]
 procedure dotnetfx11lp();
-var
-	version: cardinal;
 begin
-	if ActiveLanguage() <> 'en' then begin
+	if (ActiveLanguage() <> 'en') then begin
-		RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\' + CustomMessage('dotnetfx11lp_lcid'), 'Install', version);
+		if (IsX86() and not netfxinstalled(NetFx11, CustomMessage('dotnetfx11lp_lcid'))) then
-		
+			AddProduct('dotnetfx11' + ActiveLanguage() + '.exe',
-		if version <> 1 then
-			AddProduct(ExpandConstant('dotnetfx11_langpack.exe'),
 				'/q:a /c:"inst.exe /qb /l"',
 				CustomMessage('dotnetfx11lp_title'),
 				CustomMessage('dotnetfx11lp_size'),
-				CustomMessage('dotnetfx11lp_url'));
+				CustomMessage('dotnetfx11lp_url'),
+				false, false);
 	end;
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx11sp1.iss

@@ -5,21 +5,21 @@
 [CustomMessages]
 dotnetfx11sp1_title=.NET Framework 1.1 Service Pack 1
 
-dotnetfx11sp1_size=10.5 MB
+en.dotnetfx11sp1_size=10.5 MB
+de.dotnetfx11sp1_size=10,5 MB
 
-[Code]	
+
+[Code]
 const
 	dotnetfx11sp1_url = 'http://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af5b94b/NDP1.1sp1-KB867460-X86.exe';
 
 procedure dotnetfx11sp1();
-var
-	version: cardinal;
 begin
-	RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v1.1.4322', 'SP', version);
+	if (IsX86() and (netfxspversion(NetFx11, '') < 1)) then
-	if version < 1 then
+		AddProduct('dotnetfx11sp1.exe',
-		AddProduct('dotnetfx11sp1.exe', 
 			'/q',
 			CustomMessage('dotnetfx11sp1_title'),
 			CustomMessage('dotnetfx11sp1_size'),
-			dotnetfx11sp1_url);
+			dotnetfx11sp1_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx20.iss

@@ -1,7 +1,7 @@
 // requires Windows 2000 Service Pack 3, Windows 98, Windows 98 Second Edition, Windows ME, Windows Server 2003, Windows XP Service Pack 2
 // requires internet explorer 5.0.1 or higher
 // requires windows installer 2.0 on windows 98, ME
-// requires windows installer 3.1 on windows 2000 or higher
+// requires Windows Installer 3.1 on windows 2000 or higher
 // http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
 
 [CustomMessages]
@@ -9,22 +9,20 @@ dotnetfx20_title=.NET Framework 2.0
 
 dotnetfx20_size=23 MB
 
-[Code]	
+
+[Code]
 const
 	dotnetfx20_url = 'http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe';
 	dotnetfx20_url_x64 = 'http://download.microsoft.com/download/a/3/f/a3f1bf98-18f3-4036-9b68-8e6de530ce0a/NetFx64.exe';
 	dotnetfx20_url_ia64 = 'http://download.microsoft.com/download/f/8/6/f86148a4-e8f7-4d08-a484-b4107f238728/NetFx64.exe';
 
 procedure dotnetfx20();
-var
-	version: cardinal;
 begin
-	RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\NET Framework Setup\NDP\v2.0.50727', 'Install', version);
+	if (not netfxinstalled(NetFx20, '')) then
-	if version <> 1 then begin
+		AddProduct('dotnetfx20' + GetArchitectureString() + '.exe',
-		AddProduct('dotnetfx20.exe',
+			'/passive /norestart /lang:ENU',
-			'/q:a /t:' + ExpandConstant('{tmp}{\}') + 'dotnetfx20 /c:"install /qb /l"',
 			CustomMessage('dotnetfx20_title'),
 			CustomMessage('dotnetfx20_size'),
-			GetURL(dotnetfx20_url, dotnetfx20_url_x64, dotnetfx20_url_ia64));
+			GetString(dotnetfx20_url, dotnetfx20_url_x64, dotnetfx20_url_ia64),
-	end;
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx20lp.iss

@@ -2,39 +2,27 @@
 
 [CustomMessages]
 de.dotnetfx20lp_title=.NET Framework 2.0 Sprachpaket: Deutsch
-nl.dotnetfx20lp_title=
-en.dotnetfx20lp_title=
 
-dotnetfx20lp_size=1,8 MB
+de.dotnetfx20lp_size=1,8 MB
 
 ;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
-dotnetfx20lp_lcid=1031
+de.dotnetfx20lp_lcid=1031
-
-nl.dotnetfx20lp_url=
-nl.dotnetfx20lp_url_x64=
-nl.dotnetfx20lp_url_ia64=
-
-en.dotnetfx20lp_url=
-en.dotnetfx20lp_url_x64=
-en.dotnetfx20lp_url_ia64=
 
 de.dotnetfx20lp_url=http://download.microsoft.com/download/2/9/7/29768238-56c3-4ea6-abba-4c5246f2bc81/langpack.exe
 de.dotnetfx20lp_url_x64=http://download.microsoft.com/download/2/e/f/2ef250ba-a868-4074-a4c9-249004866f87/langpack.exe
 de.dotnetfx20lp_url_ia64=http://download.microsoft.com/download/8/9/8/898c5670-5e74-41c4-82fc-68dd837af627/langpack.exe
 
+
 [Code]
 procedure dotnetfx20lp();
-var
-	version: cardinal;
 begin
-	if ActiveLanguage() <> 'en' then begin
+	if (ActiveLanguage() <> 'en') then begin
-		RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\' + CustomMessage('dotnetfx20lp_lcid'), 'Install', version);
+		if (not netfxinstalled(NetFx20, CustomMessage('dotnetfx20lp_lcid'))) then
-		
+			AddProduct('dotnetfx20' + GetArchitectureString() + '_' + ActiveLanguage() + '.exe',
-		if version <> 1 then
+				'/passive /norestart /lang:ENU',
-			AddProduct(ExpandConstant('dotnetfx20_langpack.exe'),
-				'/q:a /c:"install /qb /l"',
 				CustomMessage('dotnetfx20lp_title'),
 				CustomMessage('dotnetfx20lp_size'),
-				GetURL(CustomMessage('dotnetfx20lp_url'), CustomMessage('dotnetfx20lp_url_x64'), CustomMessage('dotnetfx20lp_url_ia64')));
+				CustomMessage('dotnetfx20lp_url' + GetArchitectureString()),
+				false, false);
 	end;
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx20sp1.iss

@@ -5,23 +5,23 @@
 [CustomMessages]
 dotnetfx20sp1_title=.NET Framework 2.0 Service Pack 1
 
-dotnetfx20sp1_size=23.6 MB
+en.dotnetfx20sp1_size=23.6 MB
+de.dotnetfx20sp1_size=23,6 MB
 
-[Code]	
+
+[Code]
 const
 	dotnetfx20sp1_url = 'http://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe';
 	dotnetfx20sp1_url_x64 = 'http://download.microsoft.com/download/9/8/6/98610406-c2b7-45a4-bdc3-9db1b1c5f7e2/NetFx20SP1_x64.exe';
 	dotnetfx20sp1_url_ia64 = 'http://download.microsoft.com/download/c/9/7/c97d534b-8a55-495d-ab06-ad56f4b7f155/NetFx20SP1_ia64.exe';
 
 procedure dotnetfx20sp1();
-var
-	version: cardinal;
 begin
-	RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v2.0.50727', 'SP', version);
+	if (netfxspversion(NetFx20, '') < 1) then
-	if version < 1 then
+		AddProduct('dotnetfx20sp1' + GetArchitectureString() + '.exe',
-		AddProduct('dotnetfx20sp1.exe',
+			'/passive /norestart /lang:ENU',
-			'/q:a /t:' + ExpandConstant('{tmp}{\}') + 'dotnetfx20sp1 /c:"install /qb /l /msipassthru MSI_PROP_BEGIN" REBOOT=Suppress "MSI_PROP_END"',
 			CustomMessage('dotnetfx20sp1_title'),
 			CustomMessage('dotnetfx20sp1_size'),
-			GetURL(dotnetfx20sp1_url, dotnetfx20sp1_url_x64, dotnetfx20sp1_url_ia64));
+			GetString(dotnetfx20sp1_url, dotnetfx20sp1_url_x64, dotnetfx20sp1_url_ia64),
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx20sp1lp.iss

@@ -1,40 +1,28 @@
 //http://www.microsoft.com/downloads/details.aspx?FamilyID=1cc39ffe-a2aa-4548-91b3-855a2de99304
 
 [CustomMessages]
-nl.dotnetfx20sp1lp_title=.NET Framework 2.0 SP1 Taalpakket: Nederlands
 de.dotnetfx20sp1lp_title=.NET Framework 2.0 SP1 Sprachpaket: Deutsch
-en.dotnetfx20sp1lp_title=
 
-dotnetfx20sp1lp_size=3,4 MB
+de.dotnetfx20sp1lp_size=3,4 MB
 
 ;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
-dotnetfx20sp1lp_lcid=1031
+de.dotnetfx20sp1lp_lcid=1031
-
-nl.dotnetfx20sp1lp_url=http://download.microsoft.com/download/1/5/d/15de28a3-f1d1-459f-9583-d168cfa05e3f/NetFx20SP1_x86nl.exe
-nl.dotnetfx20sp1lp_url_x64=
-nl.dotnetfx20sp1lp_url_ia64=
-
-en.dotnetfx20sp1lp_url=
-en.dotnetfx20sp1lp_url_x64=
-en.dotnetfx20sp1lp_url_ia64=
 
 de.dotnetfx20sp1lp_url=http://download.microsoft.com/download/8/a/a/8aab7e6a-5e58-4e83-be99-f5fb49fe811e/NetFx20SP1_x86de.exe
 de.dotnetfx20sp1lp_url_x64=http://download.microsoft.com/download/1/4/2/1425872f-c564-4ab2-8c9e-344afdaecd44/NetFx20SP1_x64de.exe
 de.dotnetfx20sp1lp_url_ia64=http://download.microsoft.com/download/a/0/b/a0bef431-19d8-433c-9f42-6e2824a8cb90/NetFx20SP1_ia64de.exe
 
+
 [Code]
 procedure dotnetfx20sp1lp();
-var
-	version: cardinal;
 begin
-	if ActiveLanguage() <> 'en' then begin
+	if (ActiveLanguage() <> 'en') then begin
-		RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\' + CustomMessage('dotnetfx20sp1lp_lcid'), 'SP', version);
+		if (netfxspversion(NetFx20, CustomMessage('dotnetfx20sp1lp_lcid')) < 1) then
-		
+			AddProduct('dotnetfx20sp1' + GetArchitectureString() + '_' + ActiveLanguage() + '.exe',
-		if version < 1 then
+				'/passive /norestart /lang:ENU',
-			AddProduct(ExpandConstant('dotnetfx20sp1_langpack.exe'),
-				'/q:a /c:"install /qb /l"',
 				CustomMessage('dotnetfx20sp1lp_title'),
 				CustomMessage('dotnetfx20sp1lp_size'),
-				GetURL(CustomMessage('dotnetfx20sp1lp_url'), CustomMessage('dotnetfx20sp1lp_url_x64'), CustomMessage('dotnetfx20sp1lp_url_ia64')));
+				CustomMessage('dotnetfx20sp1lp_url' + GetArchitectureString()),
+				false, false);
 	end;
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx20sp2.iss

@@ -3,23 +3,23 @@
 [CustomMessages]
 dotnetfx20sp2_title=.NET Framework 2.0 Service Pack 2
 
-dotnetfx20sp2_size=24 MB - 52 MB
+en.dotnetfx20sp2_size=24 MB - 52 MB
+de.dotnetfx20sp2_size=24 MB - 52 MB
 
-[Code]	
+
+[Code]
 const
 	dotnetfx20sp2_url = 'http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe';
 	dotnetfx20sp2_url_x64 = 'http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe';
 	dotnetfx20sp2_url_ia64 = 'http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_ia64.exe';
 
 procedure dotnetfx20sp2();
-var
-	version: cardinal;
 begin
-	RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v2.0.50727', 'SP', version);
+	if (netfxspversion(NetFx20, '') < 2) then
-	if version < 2 then
+		AddProduct('dotnetfx20sp2' + GetArchitectureString() + '.exe',
-		AddProduct('dotnetfx20sp2.exe',
+			'/passive /norestart /lang:ENU',
-			'/lang:enu /qb /norestart',
 			CustomMessage('dotnetfx20sp2_title'),
 			CustomMessage('dotnetfx20sp2_size'),
-			GetURL(dotnetfx20sp2_url, dotnetfx20sp2_url_x64, dotnetfx20sp2_url_ia64));
+			GetString(dotnetfx20sp2_url, dotnetfx20sp2_url_x64, dotnetfx20sp2_url_ia64),
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx20sp2lp.iss

@@ -1,22 +1,12 @@
 //http://www.microsoft.com/downloads/details.aspx?FamilyID=c69789e0-a4fa-4b2e-a6b5-3b3695825992
 
 [CustomMessages]
-nl.dotnetfx20sp2lp_title=.NET Framework 2.0 SP2 Taalpakket: Nederlands
 de.dotnetfx20sp2lp_title=.NET Framework 2.0 SP2 Sprachpaket: Deutsch
-en.dotnetfx20sp2lp_title=
 
-dotnetfx20sp2lp_size=3,4 MB
+de.dotnetfx20sp2lp_size=3,4 MB
 
 ;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
-dotnetfx20sp2lp_lcid=1031
+de.dotnetfx20sp2lp_lcid=1031
-
-en.dotnetfx20sp2lp_url=
-en.dotnetfx20sp2lp_url_x64=
-en.dotnetfx20sp2lp_url_ia64=
-
-nl.dotnetfx20sp2lp_url=http://download.microsoft.com/download/7/a/5/7a5ca52b-08ac-40f5-9a6d-6cce78b1db28/NetFx20SP2_x86nl.exe
-nl.dotnetfx20sp2lp_url_x64=
-nl.dotnetfx20sp2lp_url_ia64=
 
 de.dotnetfx20sp2lp_url=http://download.microsoft.com/download/0/b/1/0b175c8e-34bd-46c0-bfcd-af8d33770c58/netfx20sp2_x86de.exe
 de.dotnetfx20sp2lp_url_x64=http://download.microsoft.com/download/4/e/c/4ec67a11-879d-4550-9c25-fd9ab4261b46/netfx20sp2_x64de.exe
@@ -25,17 +15,14 @@ de.dotnetfx20sp2lp_url_ia64=http://download.microsoft.com/download/a/3/3/a3349a2
 
 [Code]
 procedure dotnetfx20sp2lp();
-var
-	version: cardinal;
 begin
-	if ActiveLanguage() <> 'en' then begin
+	if (ActiveLanguage() <> 'en') then begin
-		RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\' + CustomMessage('dotnetfx20sp2lp_lcid'), 'SP', version);
+		if (netfxspversion(NetFx20, CustomMessage('dotnetfx20sp2lp_lcid')) < 2) then
-		
+			AddProduct('dotnetfx20sp2' + GetArchitectureString() + '_' + ActiveLanguage() + '.exe',
-		if version < 2 then
+				'/lang:enu /passive /norestart"',
-			AddProduct(ExpandConstant('dotnetfx20sp2_langpack.exe'),
-				'/lang:enu /qb /norestart"',
 				CustomMessage('dotnetfx20sp2lp_title'),
 				CustomMessage('dotnetfx20sp2lp_size'),
-				GetURL(CustomMessage('dotnetfx20sp2lp_url'), CustomMessage('dotnetfx20sp2lp_url_x64'), CustomMessage('dotnetfx20sp2lp_url_ia64')));
+				CustomMessage('dotnetfx20sp2lp_url' + GetArchitectureString()),
+				false, false);
 	end;
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx35.iss

@@ -1,5 +1,5 @@
 // requires Windows Server 2003 Service Pack 1, Windows Server 2008, Windows Vista, Windows XP Service Pack 2
-// requires windows installer 3.1
+// requires Windows Installer 3.1
 // WARNING: express setup (downloads and installs the components depending on your OS) if you want to deploy it on cd or network download the full bootsrapper on website below
 // http://www.microsoft.com/downloads/details.aspx?FamilyId=333325FD-AE52-4E35-B531-508D977D32A6
 
@@ -8,19 +8,18 @@ dotnetfx35_title=.NET Framework 3.5
 
 dotnetfx35_size=3 MB - 197 MB
 
+
 [Code]
 const
 	dotnetfx35_url = 'http://download.microsoft.com/download/7/0/3/703455ee-a747-4cc8-bd3e-98a615c3aedb/dotNetFx35setup.exe';
 
 procedure dotnetfx35();
-var
-	version: cardinal;
 begin
-	RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v3.5', 'Install', version);
+	if (netfxinstalled(NetFx35, '') = false) then
-	if version <> 1 then
+		AddProduct('dotnetfx35' + GetArchitectureString() + '.exe',
-		AddProduct('dotnetfx35.exe',
+			'/lang:enu /passive /norestart',
-			'/lang:enu /qb /norestart',
 			CustomMessage('dotnetfx35_title'),
 			CustomMessage('dotnetfx35_size'),
-			dotnetfx35_url);
+			dotnetfx35_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx35lp.iss

@@ -11,17 +11,14 @@ de.dotnetfx35lp_url=http://download.microsoft.com/download/d/1/e/d1e617c3-c7f4-4
 
 [Code]
 procedure dotnetfx35lp();
-var
-	version: cardinal;
 begin
-	if ActiveLanguage() <> 'en' then begin
+	if (ActiveLanguage() <> 'en') then begin
-		RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v3.5\' + CustomMessage('dotnetfx35lp_lcid'), 'Install', version);
+		if (not netfxinstalled(NetFx35, CustomMessage('dotnetfx35lp_lcid'))) then
-		
+			AddProduct('dotnetfx35' + GetArchitectureString() + '_' + ActiveLanguage() + '.exe',
-		if version <> 1 then
+				'/lang:enu /passive /norestart',
-			AddProduct('dotnetfx35_langpack.exe',
-				'/lang:enu /qb /norestart',
 				CustomMessage('dotnetfx35lp_title'),
 				CustomMessage('dotnetfx35lp_size'),
-				CustomMessage('dotnetfx35lp_url'));
+				CustomMessage('dotnetfx35lp_url'),
+				false, false);
 	end;
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx35sp1.iss

@@ -1,26 +1,26 @@
 // requires Windows Server 2003 Service Pack 1, Windows Server 2008, Windows Vista, Windows XP Service Pack 2
-// requires windows installer 3.1
+// requires Windows Installer 3.1
 // WARNING: express setup (downloads and installs the components depending on your OS) if you want to deploy it on cd or network download the full bootsrapper on website below
 // http://www.microsoft.com/downloads/details.aspx?FamilyID=ab99342f-5d1a-413d-8319-81da479ab0d7
 
 [CustomMessages]
 dotnetfx35sp1_title=.NET Framework 3.5 Service Pack 1
 
-dotnetfx35sp1_size=3 MB - 232 MB
+en.dotnetfx35sp1_size=3 MB - 232 MB
+de.dotnetfx35sp1_size=3 MB - 232 MB
 
-[Code]	
+
+[Code]
 const
 	dotnetfx35sp1_url = 'http://download.microsoft.com/download/0/6/1/061f001c-8752-4600-a198-53214c69b51f/dotnetfx35setup.exe';
 
 procedure dotnetfx35sp1();
-var
-	version: cardinal;
 begin
-	RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v3.5', 'SP', version);
+	if (netfxspversion(NetFx35, '') < 1) then
-	if version < 1 then
+		AddProduct('dotnetfx35sp1' + GetArchitectureString() + '.exe',
-		AddProduct('dotnetfx35sp1.exe',
+			'/lang:enu /passive /norestart',
-			'/lang:enu /qb /norestart',
 			CustomMessage('dotnetfx35sp1_title'),
 			CustomMessage('dotnetfx35sp1_size'),
-			dotnetfx35sp1_url);
+			dotnetfx35sp1_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx35sp1lp.iss

@@ -11,17 +11,14 @@ de.dotnetfx35sp1lp_url=http://download.microsoft.com/download/d/7/2/d728b7b9-454
 
 [Code]
 procedure dotnetfx35sp1lp();
-var
-	version: cardinal;
 begin
-	if ActiveLanguage() <> 'en' then begin
+	if (ActiveLanguage() <> 'en') then begin
-		RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v3.5\' + CustomMessage('dotnetfx35sp1lp_lcid'), 'SP', version);
+		if (netfxspversion(NetFx35, CustomMessage('dotnetfx35sp1lp_lcid')) < 1) then
-		
+			AddProduct('dotnetfx35sp1' + GetArchitectureString() + '_' + ActiveLanguage() + '.exe',
-		if version < 1 then
+				'/lang:enu /passive /norestart',
-			AddProduct('dotnetfx35sp1_langpack.exe',
-				'/lang:enu /qb /norestart',
 				CustomMessage('dotnetfx35sp1lp_title'),
 				CustomMessage('dotnetfx35sp1lp_size'),
-				CustomMessage('dotnetfx35sp1lp_url'));
+				CustomMessage('dotnetfx35sp1lp_url'),
+				false, false);
 	end;
 end;

Greenshot/releases/innosetup/scripts/products/dotnetfx40client.iss

@@ -0,0 +1,30 @@
+// requires Windows 7, Windows 7 Service Pack 1, Windows Server 2003 Service Pack 2, Windows Server 2008, Windows Server 2008 R2, Windows Server 2008 R2 SP1, Windows Vista Service Pack 1, Windows XP Service Pack 3
+// requires Windows Installer 3.1
+// requires Internet Explorer 5.01
+// WARNING: express setup (downloads and installs the components depending on your OS) if you want to deploy it on cd or network download the full bootsrapper on website below
+// http://www.microsoft.com/downloads/en/details.aspx?FamilyID=5765d7a8-7722-4888-a970-ac39b33fd8ab
+
+[CustomMessages]
+dotnetfx40client_title=.NET Framework 4.0 Client
+
+dotnetfx40client_size=3 MB - 197 MB
+
+;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
+en.dotnetfx40client_lcid=''
+de.dotnetfx40client_lcid='/lcid 1031 '
+
+
+[Code]
+const
+	dotnetfx40client_url = 'http://download.microsoft.com/download/7/B/6/7B629E05-399A-4A92-B5BC-484C74B5124B/dotNetFx40_Client_setup.exe';
+
+procedure dotnetfx40client();
+begin
+	if (not netfxinstalled(NetFx40Client, '')) then
+		AddProduct('dotNetFx40_Client_setup.exe',
+			CustomMessage('dotnetfx40client_lcid') + '/passive /norestart',
+			CustomMessage('dotnetfx40client_title'),
+			CustomMessage('dotnetfx40client_size'),
+			dotnetfx40client_url,
+			false, false);
+end;

Greenshot/releases/innosetup/scripts/products/dotnetfx40full.iss

@@ -0,0 +1,30 @@
+// requires Windows 7, Windows 7 Service Pack 1, Windows Server 2003 Service Pack 2, Windows Server 2008, Windows Server 2008 R2, Windows Server 2008 R2 SP1, Windows Vista Service Pack 1, Windows XP Service Pack 3
+// requires Windows Installer 3.1
+// requires Internet Explorer 5.01
+// WARNING: express setup (downloads and installs the components depending on your OS) if you want to deploy it on cd or network download the full bootsrapper on website below
+// http://www.microsoft.com/downloads/en/details.aspx?FamilyID=9cfb2d51-5ff4-4491-b0e5-b386f32c0992
+
+[CustomMessages]
+dotnetfx40full_title=.NET Framework 4.0 Full
+
+dotnetfx40full_size=3 MB - 197 MB
+
+;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
+en.dotnetfx40full_lcid=''
+de.dotnetfx40full_lcid='/lcid 1031 '
+
+
+[Code]
+const
+	dotnetfx40full_url = 'http://download.microsoft.com/download/1/B/E/1BE39E79-7E39-46A3-96FF-047F95396215/dotNetFx40_Full_setup.exe';
+
+procedure dotnetfx40full();
+begin
+	if (not netfxinstalled(NetFx40Full, '')) then
+		AddProduct('dotNetFx40_Full_setup.exe',
+			CustomMessage('dotnetfx40full_lcid') + '/q /passive /norestart',
+			CustomMessage('dotnetfx40full_title'),
+			CustomMessage('dotnetfx40full_size'),
+			dotnetfx40full_url,
+			false, false);
+end;

Greenshot/releases/innosetup/scripts/products/dotnetfxversion.iss

@@ -0,0 +1,69 @@
+[Code]
+type
+	NetFXType = (NetFx10, NetFx11, NetFx20, NetFx30, NetFx35, NetFx40Client, NetFx40Full);
+
+const
+	netfx11plus_reg = 'Software\Microsoft\NET Framework Setup\NDP\';
+
+function netfxinstalled(version: NetFXType; lcid: string): boolean;
+var
+	regVersion: cardinal;
+	regVersionString: string;
+begin
+	if (lcid <> '') then
+		lcid := '\' + lcid;
+
+	if (version = NetFx10) then begin
+		RegQueryStringValue(HKLM, 'Software\Microsoft\.NETFramework\Policy\v1.0\3705', 'Install', regVersionString);
+		Result := regVersionString <> '';
+	end else begin
+		case version of
+			NetFx11:
+				RegQueryDWordValue(HKLM, netfx11plus_reg + 'v1.1.4322' + lcid, 'Install', regVersion);
+			NetFx20:
+				RegQueryDWordValue(HKLM, netfx11plus_reg + 'v2.0.50727' + lcid, 'Install', regVersion);
+			NetFx30:
+				RegQueryDWordValue(HKLM, netfx11plus_reg + 'v3.0\Setup' + lcid, 'InstallSuccess', regVersion);
+			NetFx35:
+				RegQueryDWordValue(HKLM, netfx11plus_reg + 'v3.5' + lcid, 'Install', regVersion);
+			NetFx40Client:
+				RegQueryDWordValue(HKLM, netfx11plus_reg + 'v4\Client' + lcid, 'Install', regVersion);
+			NetFx40Full:
+				RegQueryDWordValue(HKLM, netfx11plus_reg + 'v4\Full' + lcid, 'Install', regVersion);
+		end;
+		Result := (regVersion <> 0);
+	end;
+end;
+
+function netfxspversion(version: NetFXType; lcid: string): integer;
+var
+	regVersion: cardinal;
+begin
+	if (lcid <> '') then
+		lcid := '\' + lcid;
+
+	case version of
+		NetFx10:
+			//not supported
+			regVersion := -1;
+		NetFx11:
+			if (not RegQueryDWordValue(HKLM, netfx11plus_reg + 'v1.1.4322' + lcid, 'SP', regVersion)) then
+				regVersion := -1;
+		NetFx20:
+			if (not RegQueryDWordValue(HKLM, netfx11plus_reg + 'v2.0.50727' + lcid, 'SP', regVersion)) then
+				regVersion := -1;
+		NetFx30:
+			if (not RegQueryDWordValue(HKLM, netfx11plus_reg + 'v3.0' + lcid, 'SP', regVersion)) then
+				regVersion := -1;
+		NetFx35:
+			if (not RegQueryDWordValue(HKLM, netfx11plus_reg + 'v3.5' + lcid, 'SP', regVersion)) then
+				regVersion := -1;
+		NetFx40Client:
+			if (not RegQueryDWordValue(HKLM, netfx11plus_reg + 'v4\Client' + lcid, 'Servicing', regVersion)) then
+				regVersion := -1;
+		NetFx40Full:
+			if (not RegQueryDWordValue(HKLM, netfx11plus_reg + 'v4\Full' + lcid, 'Servicing', regVersion)) then
+				regVersion := -1;
+	end;
+	Result := regVersion;
+end;

Greenshot/releases/innosetup/scripts/products/fileversion.iss

@@ -5,10 +5,10 @@ var
 begin
 	version := IntToStr(word(VersionMS shr 16));
 	version := version + '.' + IntToStr(word(VersionMS and not $ffff0000));
-	
+
 	version := version + '.' + IntToStr(word(VersionLS shr 16));
 	version := version + '.' + IntToStr(word(VersionLS and not $ffff0000));
-	
+
 	Result := version;
 end;
 
@@ -20,4 +20,4 @@ begin
 		Result := GetFullVersion(versionMS, versionLS)
 	else
 		Result := '0';
-end;
+end;

Greenshot/releases/innosetup/scripts/products/ie6.iss

@@ -5,7 +5,9 @@
 [CustomMessages]
 ie6_title=Internet Explorer 6
 
-ie6_size=1 MB - 77.5 MB
+en.ie6_size=1 MB - 77.5 MB
+de.ie6_size=1 MB - 77,5 MB
+
 
 [Code]
 const
@@ -16,10 +18,11 @@ var
 	version: string;
 begin
 	RegQueryStringValue(HKLM, 'Software\Microsoft\Internet Explorer', 'Version', version);
-	if version < MinVersion then
+	if (compareversion(version, MinVersion) < 0) then
 		AddProduct('ie6.exe',
 			'/q:a /C:"setup /QNT"',
 			CustomMessage('ie6_title'),
 			CustomMessage('ie6_size'),
-			ie6_url);
+			ie6_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/iis.iss

@@ -5,7 +5,7 @@ iis_title=Internet Information Services (IIS)
 [Code]
 function iis(): boolean;
 begin
-	if not RegKeyExists(HKLM, 'SYSTEM\CurrentControlSet\Services\W3SVC\Security') then
+	if (not RegKeyExists(HKLM, 'SYSTEM\CurrentControlSet\Services\W3SVC\Security')) then
 		MsgBox(FmtMessage(CustomMessage('depinstall_missing'), [CustomMessage('iis_title')]), mbError, MB_OK)
 	else
 		Result := true;

Greenshot/releases/innosetup/scripts/products/jet4sp8.iss

@@ -3,7 +3,9 @@
 [CustomMessages]
 jet4sp8_title=Jet 4
 
-jet4sp8_size=3.7 MB
+en.jet4sp8_size=3.7 MB
+de.jet4sp8_size=3,7 MB
+
 
 [Code]
 const
@@ -12,10 +14,11 @@ const
 procedure jet4sp8(MinVersion: string);
 begin
 	//check for Jet4 Service Pack 8 installation
-	if fileversion(ExpandConstant('{sys}{\}msjet40.dll')) < MinVersion then
+	if (compareversion(fileversion(ExpandConstant('{sys}{\}msjet40.dll')), MinVersion) < 0) then
 		AddProduct('jet4sp8.exe',
 			'/q:a /c:"install /qb /l"',
 			CustomMessage('jet4sp8_title'),
 			CustomMessage('jet4sp8_size'),
-			jet4sp8_url);
+			jet4sp8_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/kb835732.iss

@@ -5,9 +5,10 @@
 [CustomMessages]
 en.kb835732_title=Windows 2000 Security Update (KB835732)
 de.kb835732_title=Windows 2000 Sicherheitsupdate (KB835732)
-nl.kb835732_title=Windows 2000 Veiligheidsupdate (KB835732)
 
-kb835732_size=6.8 MB
+en.kb835732_size=6.8 MB
+de.kb835732_size=6,8 MB
+
 
 [Code]
 const
@@ -15,12 +16,13 @@ const
 
 procedure kb835732();
 begin
-	if (minwinspversion(5, 0, 2) and maxwinspversion(5, 0, 4)) then begin		
+	if (exactwinversion(5, 0) and (minwinspversion(5, 0, 2) and maxwinspversion(5, 0, 4))) then begin
-		if not RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Updates\Windows 2000\SP5\KB835732\Filelist') then
+		if (not RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Updates\Windows 2000\SP5\KB835732\Filelist')) then
 			AddProduct('kb835732.exe',
 				'/q:a /c:"install /q"',
 				CustomMessage('kb835732_title'),
 				CustomMessage('kb835732_size'),
-				kb835732_url);
+				kb835732_url,
+				false, false);
 	end;
 end;

Greenshot/releases/innosetup/scripts/products/mdac28.iss

@@ -1,7 +1,9 @@
 [CustomMessages]
 mdac28_title=Microsoft Data Access Components 2.8
 
-mdac28_size=5.4 MB
+en.mdac28_size=5.4 MB
+de.mdac28_size=5,4 MB
+
 
 [Code]
 const
@@ -13,10 +15,11 @@ var
 begin
 	//check for MDAC installation
 	RegQueryStringValue(HKLM, 'Software\Microsoft\DataAccess', 'FullInstallVer', version);
-	if version < MinVersion then
+	if (compareversion(version, MinVersion) < 0) then
 		AddProduct('mdac28.exe',
 			'/q:a /c:"install /qb /l"',
 			CustomMessage('mdac28_title'),
 			CustomMessage('mdac28_size'),
-			mdac28_url);
+			mdac28_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/msi20.iss

@@ -1,7 +1,8 @@
 [CustomMessages]
 msi20_title=Windows Installer 2.0
 
-msi20_size=1.7 MB
+en.msi20_size=1.7 MB
+de.msi20_size=1,7 MB
 
 
 [Code]
@@ -11,10 +12,11 @@ const
 procedure msi20(MinVersion: string);
 begin
 	// Check for required Windows Installer 2.0 on Windows 98 and ME
-	if maxwinversion(4, 9) and (fileversion(ExpandConstant('{sys}{\}msi.dll')) < MinVersion) then
+	if (IsX86() and maxwinversion(4, 9) and (compareversion(fileversion(ExpandConstant('{sys}{\}msi.dll')), MinVersion) < 0)) then
 		AddProduct('msi20.exe',
 			'/q:a /c:"msiinst /delayrebootq"',
 			CustomMessage('msi20_title'),
 			CustomMessage('msi20_size'),
-			msi20_url);
+			msi20_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/msi31.iss

@@ -1,7 +1,9 @@
 [CustomMessages]
 msi31_title=Windows Installer 3.1
 
-msi31_size=2.5 MB
+en.msi31_size=2.5 MB
+de.msi31_size=2,5 MB
+
 
 [Code]
 const
@@ -10,10 +12,11 @@ const
 procedure msi31(MinVersion: string);
 begin
 	// Check for required Windows Installer 3.0 on Windows 2000 or higher
-	if minwinversion(5, 0) and (fileversion(ExpandConstant('{sys}{\}msi.dll')) < MinVersion) then
+	if (IsX86() and minwinversion(5, 0) and (compareversion(fileversion(ExpandConstant('{sys}{\}msi.dll')), MinVersion) < 0)) then
 		AddProduct('msi31.exe',
-			'/qb /norestart',
+			'/passive /norestart',
 			CustomMessage('msi31_title'),
 			CustomMessage('msi31_size'),
-			msi31_url);
+			msi31_url,
+			false, false);
 end;

Greenshot/releases/innosetup/scripts/products/msi45.iss

@@ -0,0 +1,45 @@
+[CustomMessages]
+msi45_title=Windows Installer 4.5
+
+en.msi45win60_size=1.7 MB
+de.msi45win60_size=1,7 MB
+
+en.msi45win52_size=3.0 MB
+de.msi45win52_size=3,0 MB
+
+en.msi45win51_size=3.2 MB
+de.msi45win51_size=3,2 MB
+
+
+[Code]
+const
+	msi45win60_url = 'http://download.microsoft.com/download/2/6/1/261fca42-22c0-4f91-9451-0e0f2e08356d/Windows6.0-KB942288-v2-x86.msu';
+	msi45win52_url = 'http://download.microsoft.com/download/2/6/1/261fca42-22c0-4f91-9451-0e0f2e08356d/WindowsServer2003-KB942288-v4-x86.exe';
+	msi45win51_url = 'http://download.microsoft.com/download/2/6/1/261fca42-22c0-4f91-9451-0e0f2e08356d/WindowsXP-KB942288-v3-x86.exe';
+
+procedure msi45(MinVersion: string);
+begin
+	if (IsX86() and (compareversion(fileversion(ExpandConstant('{sys}{\}msi.dll')), MinVersion) < 0)) then begin
+		if minwinversion(6, 0) then
+			AddProduct('msi45_60.msu',
+				'/quiet /norestart',
+				CustomMessage('msi45_title'),
+				CustomMessage('msi45win60_size'),
+				msi45win60_url,
+				false, false)
+		else if minwinversion(5, 2) then
+			AddProduct('msi45_52.exe',
+				'/quiet /norestart',
+				CustomMessage('msi45_title'),
+				CustomMessage('msi45win52_size'),
+				msi45win52_url,
+				false, false)
+		else if minwinversion(5, 1) then
+			AddProduct('msi45_51.exe',
+				'/quiet /norestart',
+				CustomMessage('msi45_title'),
+				CustomMessage('msi45win51_size'),
+				msi45win51_url,
+				false, false);
+	end;
+end;

Greenshot/releases/innosetup/scripts/products/sql2005express.iss

@@ -1,32 +1,42 @@
-// requires Windows 2000 Service Pack 4, Windows Server 2003 Service Pack 1, Windows XP Service Pack 2
+// SQL Server Express is supported on x64 and EMT64 systems in Windows On Windows (WOW). SQL Server Express is not supported on IA64 systems
-// SQL Express 2005 Service Pack 1+ should be installed for SQL Express 2005 to work on Vista
+// requires Microsoft .NET Framework 2.0 or later
-// requires windows installer 3.1
+// SQLEXPR32.EXE is a smaller package that can be used to install SQL Server Express on 32-bit operating systems only. The larger SQLEXPR.EXE package supports installing onto both 32-bit and 64-bit (WOW install) operating systems. There is no other difference between these packages.
-// http://www.microsoft.com/downloads/details.aspx?FamilyID=220549b5-0b07-4448-8848-dcc397514b41
+// http://www.microsoft.com/download/en/details.aspx?id=15291
 
 [CustomMessages]
-sql2005express_title=SQL Server 2005 Express
+sql2005express_title=SQL Server 2005 Express SP3
 
-en.sql2005express_size=57.7 MB
+en.sql2005express_size=38.1 MB
-de.sql2005express_size=57,7 MB
+de.sql2005express_size=38,1 MB
+
+en.sql2005express_size_x64=58.1 MB
+de.sql2005express_size_x64=58,1 MB
 
 
 [Code]
 const
-	sql2005express_url = 'http://download.microsoft.com/download/f/1/0/f10c4f60-630e-4153-bd53-c3010e4c513b/SQLEXPR.EXE';
+	sql2005express_url = 'http://download.microsoft.com/download/4/B/E/4BED5810-C8C0-4697-BDC3-DBC114B8FF6D/SQLEXPR32_NLA.EXE';
+	sql2005express_url_x64 = 'http://download.microsoft.com/download/4/B/E/4BED5810-C8C0-4697-BDC3-DBC114B8FF6D/SQLEXPR_NLA.EXE';
 
 procedure sql2005express();
 var
-	version: cardinal;
+	version: string;
 begin
 	//CHECK NOT FINISHED YET
 	//RTM: 9.00.1399.06
 	//Service Pack 1: 9.1.2047.00
 	//Service Pack 2: 9.2.3042.00
-	RegQueryDWordValue(HKLM, 'Software\Microsoft\Microsoft SQL Server\90\DTS\Setup', 'Install', version);
+	// Newer detection method required for SP3 and x64
-	if version <> 1 then
+	//Service Pack 3: 9.00.4035.00
-		AddProduct('sql2005express.exe',
+	//RegQueryDWordValue(HKLM, 'Software\Microsoft\Microsoft SQL Server\90\DTS\Setup', 'Install', version);
-			'/qb',
+	RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\Microsoft SQL Server\SQLEXPRESS\MSSQLServer\CurrentVersion', 'CurrentVersion', version);
-			CustomMessage('sql2005express_title'),
+	if (version < '9.00.4035') then begin
-			CustomMessage('sql2005express_size'),
+		if (not isIA64()) then
-			sql2005express_url);
+			AddProduct('sql2005express' + GetArchitectureString() + '.exe',
+				'/qb ADDLOCAL=ALL INSTANCENAME=SQLEXPRESS',
+				CustomMessage('sql2005express_title'),
+				CustomMessage('sql2005express_size' + GetArchitectureString()),
+				GetString(sql2005express_url, sql2005express_url_x64, ''),
+				false, false);
+	end;
 end;

Greenshot/releases/innosetup/scripts/products/sql2008express.iss

@@ -0,0 +1,39 @@
+// requires Windows 7, Windows Server 2003, Windows Server 2008, Windows Server 2008 R2, Windows Vista, Windows XP
+// requires Microsoft .NET Framework 3.5 SP 1 or later
+// requires Windows Installer 4.5 or later
+// SQL Server Express is supported on x64 and EMT64 systems in Windows On Windows (WOW). SQL Server Express is not supported on IA64 systems
+// SQLEXPR32.EXE is a smaller package that can be used to install SQL Server Express on 32-bit operating systems only. The larger SQLEXPR.EXE package supports installing onto both 32-bit and 64-bit (WOW install) operating systems. There is no other difference between these packages.
+// http://www.microsoft.com/download/en/details.aspx?id=3743
+
+[CustomMessages]
+sql2008expressr2_title=SQL Server 2008 Express R2
+
+en.sql2008expressr2_size=58.2 MB
+de.sql2008expressr2_size=58,2 MB
+
+en.sql2008expressr2_size_x64=74.1 MB
+de.sql2008expressr2_size_x64=74,1 MB
+
+
+[Code]
+const
+	sql2008expressr2_url = 'http://download.microsoft.com/download/5/1/A/51A153F6-6B08-4F94-A7B2-BA1AD482BC75/SQLEXPR32_x86_ENU.exe';
+	sql2008expressr2_url_x64 = 'http://download.microsoft.com/download/5/1/A/51A153F6-6B08-4F94-A7B2-BA1AD482BC75/SQLEXPR_x64_ENU.exe';
+
+procedure sql2008express();
+var
+	version: string;
+begin
+	// This check does not take into account that a full version of SQL Server could be installed,
+	// making Express unnecessary.
+	RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\Microsoft SQL Server\SQLEXPRESS\MSSQLServer\CurrentVersion', 'CurrentVersion', version);
+	if (compareversion(version, '10.5') < 0) then begin
+		if (not isIA64()) then
+			AddProduct('sql2008expressr2' + GetArchitectureString() + '.exe',
+				'/QS  /IACCEPTSQLSERVERLICENSETERMS /ACTION=Install /FEATURES=All /INSTANCENAME=SQLEXPRESS /SQLSVCACCOUNT="NT AUTHORITY\Network Service" /SQLSYSADMINACCOUNTS="builtin\administrators"',
+				CustomMessage('sql2008expressr2_title'),
+				CustomMessage('sql2008expressr2_size' + GetArchitectureString()),
+				GetString(sql2008expressr2_url, sql2008expressr2_url_x64, ''),
+				false, false);
+	end;
+end;

Greenshot/releases/innosetup/scripts/products/sqlcompact35sp2.iss

@@ -0,0 +1,21 @@
+[CustomMessages]
+sqlcompact35sp2_title=SQL Server Compact 3.5 Service Pack 2
+
+en.sqlcompact35sp2_size=5.3 MB
+de.sqlcompact35sp2_size=5,3 MB
+
+
+[Code]
+const
+	sqlcompact35sp2_url = 'http://download.microsoft.com/download/E/C/1/EC1B2340-67A0-4B87-85F0-74D987A27160/SSCERuntime-ENU.exe';
+
+procedure sqlcompact35sp2();
+begin
+	if (isX86() and not RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Microsoft SQL Server Compact Edition\v3.5')) then
+		AddProduct('sqlcompact35sp2.msi',
+			'/qb',
+			CustomMessage('sqlcompact35sp2_title'),
+			CustomMessage('sqlcompact35sp2_size'),
+			sqlcompact35sp2_url,
+			false, false);
+end;

Greenshot/releases/innosetup/scripts/products/stringversion.iss

@@ -0,0 +1,52 @@
+function stringtoversion(var temp: String): Integer;
+var
+	part: String;
+	pos1: Integer;
+
+begin
+	if (Length(temp) = 0) then begin
+		Result := -1;
+		Exit;
+	end;
+
+	pos1 := Pos('.', temp);
+	if (pos1 = 0) then begin
+		Result := StrToInt(temp);
+		temp := '';
+	end else begin
+		part := Copy(temp, 1, pos1 - 1);
+		temp := Copy(temp, pos1 + 1, Length(temp));
+		Result := StrToInt(part);
+	end;
+end;
+
+function compareinnerversion(var x, y: String): Integer;
+var
+	num1, num2: Integer;
+
+begin
+	num1 := stringtoversion(x);
+	num2 := stringtoversion(y);
+	if (num1 = -1) or (num2 = -1) then begin
+		Result := 0;
+		Exit;
+	end;
+
+	if (num1 < num2) then begin
+		Result := -1;
+	end else if (num1 > num2) then begin
+		Result := 1;
+	end else begin
+		Result := compareinnerversion(x, y);
+	end;
+end;
+
+function compareversion(versionA, versionB: String): Integer;
+var
+  temp1, temp2: String;
+
+begin
+    temp1 := versionA;
+    temp2 := versionB;
+    Result := compareinnerversion(temp1, temp2);
+end;

Greenshot/releases/innosetup/scripts/products/vcredist2010.iss

@@ -0,0 +1,42 @@
+// requires Windows 7, Windows 7 Service Pack 1, Windows Server 2003 Service Pack 2, Windows Server 2008, Windows Server 2008 R2, Windows Server 2008 R2 SP1, Windows Vista Service Pack 1, Windows XP Service Pack 3
+// requires Windows Installer 3.1 or later
+// requires Internet Explorer 5.01 or later
+// http://www.microsoft.com/downloads/en/details.aspx?FamilyID=9cfb2d51-5ff4-4491-b0e5-b386f32c0992
+
+[CustomMessages]
+vcredist2010_title=Visual C++ 2010 Redistributable
+
+en.vcredist2010_size=4.8 MB
+de.vcredist2010_size=4,8 MB
+
+en.vcredist2010_size_x64=5.5 MB
+de.vcredist2010_size_x64=5,5 MB
+
+en.vcredist2010_size_ia64=2.2 MB
+de.vcredist2010_size_ia64=2,2 MB
+
+;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
+en.vcredist2010_lcid=''
+de.vcredist2010_lcid='/lcid 1031 '
+
+
+[Code]
+const
+	vcredist2010_url = 'http://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe';
+	vcredist2010_url_x64 = 'http://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe';
+	vcredist2010_url_ia64 = 'http://download.microsoft.com/download/3/3/A/33A75193-2CBC-424E-A886-287551FF1EB5/vcredist_IA64.exe';
+
+procedure vcredist2010();
+var
+	version: cardinal;
+begin
+	RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\' + GetString('x86', 'x64', 'ia64'), 'Install', version);
+
+	if (version <> 1) then
+		AddProduct('vcredist2010' + GetArchitectureString() + '.exe',
+			CustomMessage('vcredist2010_lcid') + '/passive /norestart',
+			CustomMessage('vcredist2010_title'),
+			CustomMessage('vcredist2010_size' + GetArchitectureString()),
+			GetString(vcredist2010_url, vcredist2010_url_x64, vcredist2010_url_ia64),
+			false, false);
+end;

Greenshot/releases/innosetup/scripts/products/wic.iss

@@ -0,0 +1,55 @@
+//requires Windows Server 2003, Windows Server 2003 R2 Datacenter Edition (32-Bit x86), Windows Server 2003 R2 Enterprise Edition (32-Bit x86), Windows Server 2003 R2 Standard Edition (32-bit x86), Windows XP Service Pack 2
+
+[CustomMessages]
+wic_title=Windows Imaging Component
+ 
+en.wic_size=1.2 MB
+de.wic_size=1,2 MB
+ 
+
+[Code]
+const
+	wic_url = 'http://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99387d4f/wic_x86_';
+	wic_url_x64 = 'http://download.microsoft.com/download/6/4/5/645fed5f-a6e7-44d9-9d10-fe83348796b0/wic_x64';
+
+function GetConvertedLanguageID(): string;
+begin
+	case ActiveLanguage() of
+		'en': //English
+			Result := 'enu';
+		'zh': //Chinese
+			Result := 'chs';
+		'de': //German
+			Result := 'deu';
+		'es': //Spanish
+			Result := 'esn';
+		'fr': //French
+			Result := 'fra';
+		'it': //Italian
+			Result := 'ita';
+		'ja': //Japanese
+			Result := 'jpn';
+		'nl': //Dutch
+			Result := 'nld';
+		'pt': //Portuguese
+			Result := 'ptb';
+		'ru': //Russian
+			Result := 'rus';
+	end;
+end;
+
+procedure wic();
+begin
+	if (not isIA64()) then begin
+		//only needed on Windows XP SP2 or Windows Server 2003
+		if ((exactwinversion(5, 1) and exactwinspversion(5, 1, 2)) or (exactwinversion(5, 2))) then begin
+			if (not FileExists(GetEnv('windir') + '\system32\windowscodecs.dll')) then
+				AddProduct('wic' + GetArchitectureString() + '_' + GetConvertedLanguageID() + '.exe',
+					'/q',
+					CustomMessage('wic_title'),
+					CustomMessage('wic_size'),
+					GetString(wic_url, wic_url_x64, '') + GetConvertedLanguageID() + '.exe',
+					false, false);
+		end;
+	end;
+end;

Greenshot/releases/innosetup/scripts/products/winversion.iss

@@ -1,7 +1,7 @@
 [Code]
 var
 	WindowsVersion: TWindowsVersion;
-	
+
 procedure initwinversion();
 begin
 	GetWindowsVersionEx(WindowsVersion);

Greenshot/releases/innosetup/setup - 4.0.iss

@@ -0,0 +1,582 @@
+#define ExeName "Greenshot"
+#define Version "2.0.0.$WCREV$"
+
+[Files]
+Source: ..\..\bin\Release\Greenshot.exe; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
+Source: ..\..\bin\Release\GreenshotPlugin.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
+Source: ..\..\bin\Release\Greenshot.exe.config; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
+Source: ..\..\bin\Release\checksum.MD5; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
+;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
+Source: ..\additional_files\installer.txt; DestDir: {app}; Components: greenshot; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion
+Source: ..\additional_files\license.txt; DestDir: {app}; Components: greenshot; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion
+Source: ..\additional_files\readme.txt; DestDir: {app}; Components: greenshot; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion
+
+; Core language files
+Source: ..\..\Languages\*nl-NL*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*en-US*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*de-DE*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion;
+
+; Additional language files
+Source: ..\..\Languages\*ar-SY*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\arSY; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*cs-CZ*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\csCZ; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*da-DK*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\daDK; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*de-x-franconia*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\dexfranconia; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*el-GR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\elGR; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*es-ES*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\esES; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*fa-IR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\faIR; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*fi-FI*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\fiFI; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*fr-FR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\frFR; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*fr-QC*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\frQC; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*he-IL*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\heIL; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*hu-HU*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\huHU; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*id-ID*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\idID; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*it-IT*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\itIT; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*ja-JP*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\jaJP; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*ko-KR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\koKR; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*lt-LT*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\ltLT; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*my-MM*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\myMM; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*nn-NO*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\nnNO; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*pl-PL*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\plPL; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*pt-BR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\ptBR; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*pt-PT*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\ptPT; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*ro-RO*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\roRO; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*ru-RU*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\ruRU; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*sk-SK*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\skSK; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*sl-SI*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\slSI; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*sr-RS*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\srRS; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*sv-SE*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\svSE; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*tr-TR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\trTR; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*uk-UA*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\ukUA; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*vi-VN*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\viVN; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*zh-CN*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\zhCN; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*zh-TW*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\zhTW; Flags: overwritereadonly ignoreversion replacesameversion;
+
+;Office Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotOfficePlugin\GreenshotOfficePlugin.gsp; DestDir: {app}\Plugins\GreenshotOfficePlugin; Components: plugins\office; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotOfficePlugin\*; DestDir: {app}\Languages\Plugins\GreenshotOfficePlugin; Components: plugins\office; Flags: overwritereadonly ignoreversion replacesameversion;
+;OCR Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotOCRPlugin\GreenshotOCRPlugin.gsp; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Plugins\GreenshotOCRPlugin\GreenshotOCRCommand.exe; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotOCRPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly ignoreversion replacesameversion;
+;JIRA Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotJiraPlugin\GreenshotJiraPlugin.gsp; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotJiraPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly ignoreversion replacesameversion;
+;Imgur Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotImgurPlugin\GreenshotImgurPlugin.gsp; DestDir: {app}\Plugins\GreenshotImgurPlugin; Components: plugins\imgur; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotImgurPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotImgurPlugin; Components: plugins\imgur; Flags: overwritereadonly ignoreversion replacesameversion;
+;Box Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotBoxPlugin\GreenshotBoxPlugin.gsp; DestDir: {app}\Plugins\GreenshotBoxPlugin; Components: plugins\box; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotBoxPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotBoxPlugin; Components: plugins\box; Flags: overwritereadonly ignoreversion replacesameversion;
+;DropBox Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotDropBoxPlugin\GreenshotDropboxPlugin.gsp; DestDir: {app}\Plugins\GreenshotDropBoxPlugin; Components: plugins\dropbox; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotDropBoxPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotDropBoxPlugin; Components: plugins\dropbox; Flags: overwritereadonly ignoreversion replacesameversion;
+;Flickr Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotFlickrPlugin\GreenshotFlickrPlugin.gsp; DestDir: {app}\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly ignoreversion replacesameversion;
+;Photobucket Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotPhotobucketPlugin\GreenshotPhotobucketPlugin.gsp; DestDir: {app}\Plugins\GreenshotPhotobucketPlugin; Components: plugins\photobucket; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotPhotobucketPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotPhotobucketPlugin; Components: plugins\photobucket; Flags: overwritereadonly ignoreversion replacesameversion;
+;Picasa Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotPicasaPlugin\GreenshotPicasaPlugin.gsp; DestDir: {app}\Plugins\GreenshotPicasaPlugin; Components: plugins\picasa; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotPicasaPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotPicasaPlugin; Components: plugins\picasa; Flags: overwritereadonly ignoreversion replacesameversion;
+;Confluence Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotConfluencePlugin\GreenshotConfluencePlugin.gsp; DestDir: {app}\Plugins\GreenshotConfluencePlugin; Components: plugins\confluence; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotConfluencePlugin\*; DestDir: {app}\Languages\Plugins\GreenshotConfluencePlugin; Components: plugins\confluence; Flags: overwritereadonly ignoreversion replacesameversion;
+;ExternalCommand Plugin
+Source: ..\..\bin\Release\Plugins\GreenshotExternalCommandPlugin\GreenshotExternalCommandPlugin.gsp; DestDir: {app}\Plugins\GreenshotExternalCommandPlugin; Components: plugins\externalcommand; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Languages\Plugins\GreenshotExternalCommandPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotExternalCommandPlugin; Components: plugins\externalcommand; Flags: overwritereadonly ignoreversion replacesameversion;
+;Network Import Plugin
+;Source: ..\..\bin\Release\Plugins\GreenshotNetworkImportPlugin\*; DestDir: {app}\Plugins\GreenshotNetworkImportPlugin; Components: plugins\networkimport; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+[Setup]
+; changes associations is used when the installer installs new extensions, it clears the explorer icon cache
+ChangesAssociations=yes
+AppId={#ExeName}
+AppName={#ExeName}
+AppMutex=F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08
+AppPublisher={#ExeName}
+AppPublisherURL=http://getgreenshot.org
+AppSupportURL=http://getgreenshot.org
+AppUpdatesURL=http://getgreenshot.org
+AppVerName={#ExeName} {#Version}
+AppVersion={#Version}
+ArchitecturesInstallIn64BitMode=x64
+Compression=lzma2/ultra64
+SolidCompression=yes
+DefaultDirName={code:DefDirRoot}\{#ExeName}
+DefaultGroupName={#ExeName}
+InfoBeforeFile=..\additional_files\readme.txt
+LicenseFile=..\additional_files\license.txt
+LanguageDetectionMethod=uilanguage
+MinVersion=0,5.01.2600
+OutputBaseFilename={#ExeName}-INSTALLER-{#Version}-UNSTABLE
+OutputDir=..\
+PrivilegesRequired=none
+SetupIconFile=..\..\icons\applicationIcon\icon.ico
+UninstallDisplayIcon={app}\{#ExeName}.exe
+Uninstallable=true
+VersionInfoCompany={#ExeName}
+VersionInfoProductName={#ExeName}
+VersionInfoTextVersion={#Version}
+VersionInfoVersion={#Version}
+; Reference a bitmap, max size 164x314
+WizardImageFile=installer-large.bmp
+; Reference a bitmap, max size 55x58
+WizardSmallImageFile=installer-small.bmp
+[Registry]
+; Delete all startup entries, so we don't have leftover values
+Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Run; ValueType: none; ValueName: {#ExeName}; Flags: deletevalue noerror;
+Root: HKLM; Subkey: Software\Microsoft\Windows\CurrentVersion\Run; ValueType: none; ValueName: {#ExeName}; Flags: deletevalue noerror;
+Root: HKCU32; Subkey: Software\Microsoft\Windows\CurrentVersion\Run; ValueType: none; ValueName: {#ExeName}; Flags: deletevalue noerror; Check: IsWin64()
+Root: HKLM32; Subkey: Software\Microsoft\Windows\CurrentVersion\Run; ValueType: none; ValueName: {#ExeName}; Flags: deletevalue noerror; Check: IsWin64()
+; Create the startup entries if requested to do so
+; HKEY_LOCAL_USER - for current user only
+Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Run; ValueType: string; ValueName: {#ExeName}; ValueData: {app}\{#ExeName}.exe; Permissions: users-modify; Flags: uninsdeletevalue noerror; Tasks: startup; Check: IsRegularUser
+; HKEY_LOCAL_MACHINE - for all users
+Root: HKLM; Subkey: Software\Microsoft\Windows\CurrentVersion\Run; ValueType: string; ValueName: {#ExeName}; ValueData: {app}\{#ExeName}.exe; Permissions: users-modify; Flags: uninsdeletevalue noerror; Tasks: startup; Check: not IsRegularUser
+; Register our own filetype for admin
+Root: HKLM; Subkey: Software\Classes\.greenshot; ValueType: string; ValueName: ""; ValueData: "Greenshot"; Flags: uninsdeletevalue noerror; Check: not IsRegularUser
+Root: HKLM; Subkey: Software\Classes\Greenshot; ValueType: string; ValueName: ""; ValueData: "Greenshot File"; Flags: uninsdeletevalue noerror; Check: not IsRegularUser
+Root: HKLM; Subkey: Software\Classes\Greenshot\DefaultIcon; ValueType: string; ValueName: ""; ValueData: "{app}\Greenshot.EXE,0"; Flags: uninsdeletevalue noerror; Check: not IsRegularUser
+Root: HKLM; Subkey: Software\Classes\Greenshot\shell\open\command; ValueType: string; ValueName: ""; ValueData: """{app}\Greenshot.EXE"" --openfile ""%1"""; Flags: uninsdeletevalue noerror; Check: not IsRegularUser
+; Register our own filetype for normal user
+Root: HKCU; Subkey: Software\Classes\.greenshot; ValueType: string; ValueName: ""; ValueData: "Greenshot"; Flags: uninsdeletevalue noerror; Check: IsRegularUser
+Root: HKCU; Subkey: Software\Classes\Greenshot; ValueType: string; ValueName: ""; ValueData: "Greenshot File"; Flags: uninsdeletevalue noerror; Check: IsRegularUser
+Root: HKCU; Subkey: Software\Classes\Greenshot\DefaultIcon; ValueType: string; ValueName: ""; ValueData: "{app}\Greenshot.EXE,0"; Flags: uninsdeletevalue noerror; Check: IsRegularUser
+Root: HKCU; Subkey: Software\Classes\Greenshot\shell\open\command; ValueType: string; ValueName: ""; ValueData: """{app}\Greenshot.EXE"" --openfile ""%1"""; Flags: uninsdeletevalue noerror; Check: IsRegularUser
+[Icons]
+Name: {group}\{#ExeName}; Filename: {app}\{#ExeName}.exe; WorkingDir: {app}
+Name: {group}\Uninstall {#ExeName}; Filename: {uninstallexe}; WorkingDir: {app}; AppUserModelID: "{#ExeName}.{#ExeName}"
+Name: {group}\Readme.txt; Filename: {app}\readme.txt; WorkingDir: {app}
+Name: {group}\License.txt; Filename: {app}\license.txt; WorkingDir: {app}
+[Languages]
+Name: en; MessagesFile: compiler:Default.isl
+Name: cn; MessagesFile: compiler:Languages\ChineseSimplified.isl
+Name: de; MessagesFile: compiler:Languages\German.isl
+Name: es; MessagesFile: compiler:Languages\Spanish.isl
+Name: fi; MessagesFile: compiler:Languages\Finnish.isl
+Name: fr; MessagesFile: compiler:Languages\French.isl
+Name: nl; MessagesFile: compiler:Languages\Dutch.isl
+Name: nn; MessagesFile: compiler:Languages\NorwegianNynorsk.isl
+Name: sr; MessagesFile: compiler:Languages\SerbianCyrillic.isl
+
+[Tasks]
+Name: startup; Description: {cm:startup}
+
+[CustomMessages]
+
+de.confluence=Confluence Plug-in
+de.default=Standard installation
+en.office=Microsoft Office Plug-in
+de.externalcommand=Öffne mit ein externem Kommando Plug-in
+de.imgur=Imgur Plug-in (Siehe: http://imgur.com)
+de.jira=Jira Plug-in
+de.language=Zusätzliche Sprachen
+de.ocr=OCR Plug-in (benötigt Microsoft Office Document Imaging (MODI))
+de.optimize=Optimierung der Leistung, kann etwas dauern.
+de.startgreenshot={#ExeName} starten
+de.startup={#ExeName} starten wenn Windows hochfährt
+
+en.confluence=Confluence plug-in
+en.default=Default installation
+en.office=Microsoft Office plug-in
+en.externalcommand=Open with external command plug-in
+en.imgur=Imgur plug-in (See: http://imgur.com)
+en.jira=Jira plug-in
+en.language=Additional languages
+en.ocr=OCR plug-in (needs Microsoft Office Document Imaging (MODI))
+en.optimize=Optimizing performance, this may take a while.
+en.startgreenshot=Start {#ExeName}
+en.startup=Start {#ExeName} with Windows start
+
+es.confluence=Extensión para Confluence
+es.default=${default}
+es.externalcommand=Extensión para abrir con programas externos
+es.imgur=Extensión para Imgur (Ver http://imgur.com)
+es.jira=Extensión para Jira
+es.language=Idiomas adicionales
+es.ocr=Extensión para OCR (necesita Microsoft Office Document Imaging (MODI))
+es.optimize=Optimizando rendimiento; por favor, espera.
+es.startgreenshot=Lanzar {#ExeName}
+es.startup=Lanzar {#ExeName} al iniciarse Windows
+
+fi.confluence=Confluence-liitännäinen
+fi.default=${default}
+fi.office=Microsoft-Office-liitännäinen
+fi.externalcommand=Avaa Ulkoinen komento-liitännäisellä
+fi.imgur=Imgur-liitännäinen (Katso: http://imgur.com)
+fi.jira=Jira-liitännäinen
+fi.language=Lisäkielet
+fi.ocr=OCR-liitännäinen (Tarvitaan: Microsoft Office Document Imaging (MODI))
+fi.optimize=Optimoidaan suorituskykyä, tämä voi kestää hetken.
+fi.startgreenshot=Käynnistä {#ExeName}
+fi.startup=Käynnistä {#ExeName} Windowsin käynnistyessä
+
+fr.confluence=Greffon Confluence
+fr.default=${default}
+fr.office=Greffon Microsoft Office
+fr.externalcommand=Ouvrir avec le greffon de commande externe
+fr.imgur=Greffon Imgur (Voir: http://imgur.com)
+fr.jira=Greffon Jira
+fr.language=Langues additionnelles
+fr.ocr=Greffon OCR (nécessite Document Imaging de Microsoft Office [MODI])
+fr.optimize=Optimisation des performances, Ceci peut prendre un certain temps.
+fr.startgreenshot=Démarrer {#ExeName}
+fr.startup=Lancer {#ExeName} au démarrage de Windows
+
+nl.confluence=Confluence plug-in
+nl.default=Default installation
+nl.office=Microsoft Office plug-in
+nl.externalcommand=Open met externes commando plug-in
+nl.imgur=Imgur plug-in (Zie: http://imgur.com)
+nl.jira=Jira plug-in
+nl.language=Extra talen
+nl.ocr=OCR plug-in (heeft Microsoft Office Document Imaging (MODI) nodig)
+nl.optimize=Prestaties verbeteren, kan even duren.
+nl.startgreenshot=Start {#ExeName}
+nl.startup=Start {#ExeName} wanneer Windows opstart
+
+nn.confluence=Confluence-tillegg
+nn.default=Default installation 
+nn.office=Microsoft Office Tillegg
+nn.externalcommand=Tillegg for å opne med ekstern kommando
+nn.imgur=Imgur-tillegg (sjå http://imgur.com)
+nn.jira=Jira-tillegg
+nn.language=Andre språk
+nn.ocr=OCR-tillegg (krev Microsoft Office Document Imaging (MODI))
+nn.optimize=Optimaliserar ytelse, dette kan ta litt tid...
+nn.startgreenshot=Start {#ExeName}
+nn.startup=Start {#ExeName} når Windows startar
+
+sr.confluence=Прикључак за Конфлуенс
+sr.default=${default}
+sr.externalcommand=Отвори са прикључком за спољне наредбе
+sr.imgur=Прикључак за Имиџер (http://imgur.com)
+sr.jira=Прикључак за Џиру
+sr.language=Додатни језици
+sr.ocr=OCR прикључак (захтева Microsoft Office Document Imaging (MODI))
+sr.optimize=Оптимизујем перформансе…
+sr.startgreenshot=Покрени Гриншот
+sr.startup=Покрени програм са системом
+
+cn.confluence=Confluence插件
+cn.default=${default}
+cn.externalcommand=使用外部命令打开插件
+cn.imgur=Imgur插件( (请访问： http://imgur.com))
+cn.jira=Jira插件
+cn.language=其它语言
+cn.ocr=OCR插件(需要Microsoft Office Document Imaging (MODI)的支持)
+cn.optimize=正在优化性能，这可能需要一点时间。
+cn.startgreenshot=启动{#ExeName}
+cn.startup=让{#ExeName}随Windows一起启动
+
+
+[Types]
+Name: "default"; Description: "{cm:default}"
+Name: "full"; Description: "{code:FullInstall}"
+Name: "compact"; Description: "{code:CompactInstall}"
+Name: "custom"; Description: "{code:CustomInstall}"; Flags: iscustom
+
+[Components]
+Name: "greenshot"; Description: "Greenshot"; Types: default full compact custom; Flags: fixed
+Name: "plugins\office"; Description: {cm:office}; Types: default full custom; Flags: disablenouninstallwarning 
+Name: "plugins\ocr"; Description: {cm:ocr}; Types: default full custom; Flags: disablenouninstallwarning 
+Name: "plugins\jira"; Description: {cm:jira}; Types: full custom; Flags: disablenouninstallwarning 
+Name: "plugins\imgur"; Description: {cm:imgur}; Types: default full custom; Flags: disablenouninstallwarning 
+Name: "plugins\confluence"; Description: {cm:confluence}; Types: full custom; Flags: disablenouninstallwarning
+Name: "plugins\externalcommand"; Description: {cm:externalcommand}; Types: default full custom; Flags: disablenouninstallwarning 
+;Name: "plugins\networkimport"; Description: "Network Import Plugin"; Types: full
+Name: "plugins\box"; Description: "Box Plugin"; Types: full custom; Flags: disablenouninstallwarning
+Name: "plugins\dropbox"; Description: "Dropbox Plugin"; Types: full custom; Flags: disablenouninstallwarning
+Name: "plugins\flickr"; Description: "Flickr Plugin"; Types: full custom; Flags: disablenouninstallwarning 
+Name: "plugins\picasa"; Description: "Picasa Plugin"; Types: full custom; Flags: disablenouninstallwarning 
+Name: "plugins\photobucket"; Description: "Photobucket Plugin"; Types: full custom; Flags: disablenouninstallwarning 
+Name: "languages"; Description: {cm:language}; Types: full custom; Flags: disablenouninstallwarning
+Name: "languages\arSY"; Description: "العربية"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('d')
+Name: "languages\csCZ"; Description: "Ceština"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\daDK"; Description: "Dansk"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\dexfranconia"; Description: "Frängisch (Deutsch)"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\elGR"; Description: "ελληνικά"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('4')
+Name: "languages\esES"; Description: "Español"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\faIR"; Description: "پارسی"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('d')
+Name: "languages\fiFI"; Description: "Suomi"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\frFR"; Description: "Français"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\frQC"; Description: "Français - Québec"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\heIL"; Description: "עִבְרִית"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('c')
+Name: "languages\huHU"; Description: "Magyar"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('2')
+Name: "languages\idID"; Description: "Bahasa Indonesia"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\itIT"; Description: "Italiano"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\jaJP"; Description: "日本語"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('7')
+Name: "languages\koKR"; Description: "한국의"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('8')
+Name: "languages\ltLT"; Description: "Lietuvių"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('3')
+Name: "languages\myMM"; Description: "မြန်မာစာ"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('b')
+Name: "languages\nnNO"; Description: "Nynorsk"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\plPL"; Description: "Polski"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('2')
+Name: "languages\ptBR"; Description: "Português do Brasil"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\ptPT"; Description: "Português de Portugal"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\ruRU"; Description: "Pусский"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('5')
+Name: "languages\roRO"; Description: "Română"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('2')
+Name: "languages\skSK"; Description: "Slovenčina"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('2')
+Name: "languages\slSI"; Description: "Slovenščina"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('2')
+Name: "languages\srRS"; Description: "Српски"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('5')
+Name: "languages\svSE"; Description: "Svenska"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\trTR"; Description: "Türk"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('6')
+Name: "languages\ukUA"; Description: "Українська"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('5')
+Name: "languages\viVN"; Description: "Việt"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('e')
+Name: "languages\zhCN"; Description: "简体中文"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('a')
+Name: "languages\zhTW"; Description: "繁體中文"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('9')
+[Code]
+// Do we have a regular user trying to install this?
+function IsRegularUser(): Boolean;
+begin
+	Result := not (IsAdminLoggedOn or IsPowerUserLoggedOn);
+end;
+
+// The following code is used to select the installation path, this is localappdata if non poweruser
+function DefDirRoot(Param: String): String;
+begin
+	if IsRegularUser then
+		Result := ExpandConstant('{localappdata}')
+	else
+		Result := ExpandConstant('{pf}')
+end;
+	
+
+function FullInstall(Param : String) : String;
+begin
+	result := SetupMessage(msgFullInstallation);
+end;
+
+function CustomInstall(Param : String) : String;
+begin
+	result := SetupMessage(msgCustomInstallation);
+end;
+
+function CompactInstall(Param : String) : String;
+begin
+	result := SetupMessage(msgCompactInstallation);
+end;
+/////////////////////////////////////////////////////////////////////
+// The following uninstall code was found at:
+// http://stackoverflow.com/questions/2000296/innosetup-how-to-automatically-uninstall-previous-installed-version
+// and than modified to work in a 32/64 bit environment
+/////////////////////////////////////////////////////////////////////
+function GetUninstallStrings(): array of String;
+var
+	sUnInstPath: String;
+	sUnInstallString: String;
+	asUninstallStrings : array of String;
+	index : Integer;
+begin
+	sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1');
+	sUnInstallString := '';
+	index := 0;
+	
+	// Retrieve uninstall string from HKLM32 or HKCU32
+	if RegQueryStringValue(HKLM32, sUnInstPath, 'UninstallString', sUnInstallString) then
+	begin
+		SetArrayLength(asUninstallStrings, index + 1);
+		asUninstallStrings[index] := sUnInstallString;
+		index := index +1;
+	end;
+
+	if RegQueryStringValue(HKCU32, sUnInstPath, 'UninstallString', sUnInstallString) then
+	begin
+		SetArrayLength(asUninstallStrings, index + 1);
+		asUninstallStrings[index] := sUnInstallString;
+		index := index +1;
+	end;
+	
+	// Only for Windows with 64 bit support: Retrieve uninstall string from HKLM64 or HKCU64
+	if IsWin64 then
+	begin
+		if RegQueryStringValue(HKLM64, sUnInstPath, 'UninstallString', sUnInstallString) then
+		begin
+			SetArrayLength(asUninstallStrings, index + 1);
+			asUninstallStrings[index] := sUnInstallString;
+			index := index +1;
+		end;
+
+		if RegQueryStringValue(HKCU64, sUnInstPath, 'UninstallString', sUnInstallString) then
+		begin
+			SetArrayLength(asUninstallStrings, index + 1);
+			asUninstallStrings[index] := sUnInstallString;
+			index := index +1;
+		end;
+	end;
+	Result := asUninstallStrings;
+end;
+
+/////////////////////////////////////////////////////////////////////
+procedure UnInstallOldVersions();
+var
+	sUnInstallString: String;
+	index: Integer;
+	isUninstallMade: Boolean;
+	iResultCode : Integer;
+	asUninstallStrings : array of String;
+begin
+	isUninstallMade := false;
+	asUninstallStrings := GetUninstallStrings();
+	for index := 0 to (GetArrayLength(asUninstallStrings) -1) do
+	begin
+		sUnInstallString := RemoveQuotes(asUninstallStrings[index]);
+		if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+			isUninstallMade := true;
+	end;
+
+	// Wait a few seconds to prevent installation issues, otherwise files are removed in one process while the other tries to link to them
+	if (isUninstallMade) then
+		Sleep(2000);
+end;
+
+/////////////////////////////////////////////////////////////////////
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+	if (CurStep=ssInstall) then
+	begin
+		UnInstallOldVersions();
+	end;
+end;
+/////////////////////////////////////////////////////////////////////
+// End of unstall code
+/////////////////////////////////////////////////////////////////////
+
+// Build a list of greenshot parameters from the supplied installer parameters
+function GetParamsForGS(argument: String): String;
+var
+	i: Integer;
+	parametersString: String;
+	currentParameter: String;
+	foundStart: Boolean;
+	foundNoRun: Boolean;
+	foundLanguage: Boolean;
+begin
+	foundNoRun := false;
+	foundLanguage := false;
+	foundStart := false;
+	for i:= 0 to ParamCount() do begin
+		currentParameter := ParamStr(i);
+		
+		// check if norun is supplied
+		if Lowercase(currentParameter) = '/norun' then begin
+			foundNoRun := true;
+			continue;
+		end;
+
+		if foundStart then begin
+			parametersString := parametersString + ' ' + currentParameter;
+			foundStart := false;
+		end
+		else begin
+			if Lowercase(currentParameter) = '/language' then begin
+				foundStart := true;
+				foundLanguage := true;
+				parametersString := parametersString + ' ' + currentParameter;
+			end;
+		end;
+	end;
+	if not foundLanguage then begin
+		parametersString := parametersString + ' /language ' + ExpandConstant('{language}');
+	end;
+	if foundNoRun then begin
+		parametersString := parametersString + ' /norun';
+	end;
+	// For debugging comment out the following
+	//MsgBox(parametersString, mbInformation, MB_OK);
+
+	Result := parametersString;
+end;
+
+// Check if language group is installed
+function hasLanguageGroup(argument: String): Boolean;
+var
+	keyValue: String;
+	returnValue: Boolean;
+begin
+	returnValue := true;
+	if (RegQueryStringValue( HKLM, 'SYSTEM\CurrentControlSet\Control\Nls\Language Groups', argument, keyValue)) then begin
+		if Length(keyValue) = 0 then begin
+			returnValue := false;
+		end;
+	end;
+	Result := returnValue;
+end;
+
+function hasDotNet(version: string; service: cardinal): Boolean;
+// Indicates whether the specified version and service pack of the .NET Framework is installed.
+//
+// version -- Specify one of these strings for the required .NET Framework version:
+//    'v1.1.4322'     .NET Framework 1.1
+//    'v2.0.50727'    .NET Framework 2.0
+//    'v3.0'          .NET Framework 3.0
+//    'v3.5'          .NET Framework 3.5
+//    'v4\Client'     .NET Framework 4.0 Client Profile
+//    'v4\Full'       .NET Framework 4.0 Full Installation
+//
+// service -- Specify any non-negative integer for the required service pack level:
+//    0               No service packs required
+//    1, 2, etc.      Service pack 1, 2, etc. required
+var
+    key: string;
+    install, serviceCount: cardinal;
+    success: boolean;
+begin
+    key := 'SOFTWARE\Microsoft\NET Framework Setup\NDP\' + version;
+    // .NET 3.0 uses value InstallSuccess in subkey Setup
+    if Pos('v3.0', version) = 1 then begin
+        success := RegQueryDWordValue(HKLM, key + '\Setup', 'InstallSuccess', install);
+    end else begin
+        success := RegQueryDWordValue(HKLM, key, 'Install', install);
+    end;
+    // .NET 4.0 uses value Servicing instead of SP
+    if Pos('v4', version) = 1 then begin
+        success := success and RegQueryDWordValue(HKLM, key, 'Servicing', serviceCount);
+    end else begin
+        success := success and RegQueryDWordValue(HKLM, key, 'SP', serviceCount);
+    end;
+    result := success and (install = 1) and (serviceCount >= service);
+end;
+
+function hasDotNet40() : boolean;
+begin
+	Result := hasDotNet('v4\Client',0) or hasDotNet('v4\Full',0);
+end;
+
+function getNGENPath(argument: String) : String;
+var
+	installPath: string;
+begin
+	if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4.5\Client', 'InstallPath', installPath) then begin
+		if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4.5\Full', 'InstallPath', installPath) then begin
+			if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client', 'InstallPath', installPath) then begin
+				if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'InstallPath', installPath) then begin
+					// 3.5 doesn't have NGEN and is using the .net 2.0 installation
+					installPath := ExpandConstant('{dotnet20}');
+				end;
+			end;
+		end;
+	end;
+	Result := installPath;
+end;
+
+// Initialize the setup
+function InitializeSetup(): Boolean;
+begin
+	// Only check for 2.0 and install if we don't have .net 3.5 or higher
+	if not hasDotNet40() then
+	begin
+	end;
+	Result := true;
+end;
+[Run]
+Filename: "{code:getNGENPath}\ngen.exe"; Parameters: "install ""{app}\{#ExeName}.exe"""; StatusMsg: "{cm:optimize}"; Flags: runhidden runasoriginaluser
+Filename: "{code:getNGENPath}\ngen.exe"; Parameters: "install ""{app}\GreenshotPlugin.dll"""; StatusMsg: "{cm:optimize}"; Flags: runhidden runasoriginaluser
+Filename: "{app}\{#ExeName}.exe"; Description: "{cm:startgreenshot}"; Parameters: "{code:GetParamsForGS}"; WorkingDir: "{app}"; Flags: nowait postinstall runasoriginaluser
+Filename: "http://getgreenshot.org/thank-you/?language={language}&version={#Version}"; Flags: shellexec runasoriginaluser
+
+[InstallDelete]
+Name: {app}; Type: filesandordirs;
+
+[UninstallRun]
+Filename: "{code:GetNGENPath}\ngen.exe"; Parameters: "uninstall ""{app}\{#ExeName}.exe"""; StatusMsg: "Cleanup"; Flags: runhidden
+Filename: "{code:GetNGENPath}\ngen.exe"; Parameters: "uninstall ""{app}\GreenshotPlugin.dll"""; StatusMsg: "Cleanup"; Flags: runhidden

Greenshot/releases/innosetup/setup.iss

@@ -1,16 +1,16 @@
 #define ExeName "Greenshot"
-#define Version "1.1.4.$WCREV$"
+#define Version "1.1.6.$WCREV$"
 
-; Include the scripts to install .NET Framework 2.0
+; Include the scripts to install .NET Framework
 ; See http://www.codeproject.com/KB/install/dotnetfx_innosetup_instal.aspx
 #include "scripts\products.iss"
+#include "scripts\products\stringversion.iss"
 #include "scripts\products\winversion.iss"
 #include "scripts\products\fileversion.iss"
 #include "scripts\products\msi20.iss"
 #include "scripts\products\msi31.iss"
-#include "scripts\products\dotnetfx20.iss"
+#include "scripts\products\dotnetfxversion.iss"
-#include "scripts\products\dotnetfx20sp1.iss"
+#include "scripts\products\dotnetfx35sp1.iss"
-#include "scripts\products\dotnetfx20sp2.iss"
 
 [Files]
 Source: ..\..\bin\Release\Greenshot.exe; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
@@ -36,6 +36,7 @@ Source: ..\..\Languages\*da-DK*; Excludes: "*installer*,*website*"; DestDir: {ap
 Source: ..\..\Languages\*de-x-franconia*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\dexfranconia; Flags: overwritereadonly ignoreversion replacesameversion;
 Source: ..\..\Languages\*el-GR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\elGR; Flags: overwritereadonly ignoreversion replacesameversion;
 Source: ..\..\Languages\*es-ES*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\esES; Flags: overwritereadonly ignoreversion replacesameversion;
+Source: ..\..\Languages\*et-EE*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\etEE; Flags: overwritereadonly ignoreversion replacesameversion;
 Source: ..\..\Languages\*fa-IR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\faIR; Flags: overwritereadonly ignoreversion replacesameversion;
 Source: ..\..\Languages\*fi-FI*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\fiFI; Flags: overwritereadonly ignoreversion replacesameversion;
 Source: ..\..\Languages\*fr-FR*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\frFR; Flags: overwritereadonly ignoreversion replacesameversion;
@@ -68,6 +69,7 @@ Source: ..\..\bin\Release\Plugins\GreenshotOfficePlugin\GreenshotOfficePlugin.gs
 ;OCR Plugin
 Source: ..\..\bin\Release\Plugins\GreenshotOCRPlugin\GreenshotOCRPlugin.gsp; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
 Source: ..\..\bin\Release\Plugins\GreenshotOCRPlugin\GreenshotOCRCommand.exe; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: ..\..\bin\Release\Plugins\GreenshotOCRPlugin\GreenshotOCRCommand.exe.config; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
 Source: ..\..\bin\Release\Languages\Plugins\GreenshotOCRPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly ignoreversion replacesameversion;
 ;JIRA Plugin
 Source: ..\..\bin\Release\Plugins\GreenshotJiraPlugin\GreenshotJiraPlugin.gsp; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
@@ -149,11 +151,7 @@ Root: HKLM; Subkey: Software\Classes\.greenshot; ValueType: string; ValueName: "
 Root: HKLM; Subkey: Software\Classes\Greenshot; ValueType: string; ValueName: ""; ValueData: "Greenshot File"; Flags: uninsdeletevalue noerror; Check: not IsRegularUser
 Root: HKLM; Subkey: Software\Classes\Greenshot\DefaultIcon; ValueType: string; ValueName: ""; ValueData: "{app}\Greenshot.EXE,0"; Flags: uninsdeletevalue noerror; Check: not IsRegularUser
 Root: HKLM; Subkey: Software\Classes\Greenshot\shell\open\command; ValueType: string; ValueName: ""; ValueData: """{app}\Greenshot.EXE"" --openfile ""%1"""; Flags: uninsdeletevalue noerror; Check: not IsRegularUser
-; Register our own filetype for normal user
+
-Root: HKCU; Subkey: Software\Classes\.greenshot; ValueType: string; ValueName: ""; ValueData: "Greenshot"; Flags: uninsdeletevalue noerror; Check: IsRegularUser
-Root: HKCU; Subkey: Software\Classes\Greenshot; ValueType: string; ValueName: ""; ValueData: "Greenshot File"; Flags: uninsdeletevalue noerror; Check: IsRegularUser
-Root: HKCU; Subkey: Software\Classes\Greenshot\DefaultIcon; ValueType: string; ValueName: ""; ValueData: "{app}\Greenshot.EXE,0"; Flags: uninsdeletevalue noerror; Check: IsRegularUser
-Root: HKCU; Subkey: Software\Classes\Greenshot\shell\open\command; ValueType: string; ValueName: ""; ValueData: """{app}\Greenshot.EXE"" --openfile ""%1"""; Flags: uninsdeletevalue noerror; Check: IsRegularUser
 [Icons]
 Name: {group}\{#ExeName}; Filename: {app}\{#ExeName}.exe; WorkingDir: {app}
 Name: {group}\Uninstall {#ExeName}; Filename: {uninstallexe}; WorkingDir: {app}; AppUserModelID: "{#ExeName}.{#ExeName}"
@@ -169,6 +167,7 @@ Name: fr; MessagesFile: compiler:Languages\French.isl
 Name: nl; MessagesFile: compiler:Languages\Dutch.isl
 Name: nn; MessagesFile: compiler:Languages\NorwegianNynorsk.isl
 Name: sr; MessagesFile: compiler:Languages\SerbianCyrillic.isl
+Name: uk; MessagesFile: compiler:Languages\Ukrainian.isl
 
 [Tasks]
 Name: startup; Description: {cm:startup}
@@ -269,6 +268,17 @@ sr.optimize=Оптимизујем перформансе…
 sr.startgreenshot=Покрени Гриншот
 sr.startup=Покрени програм са системом
 
+uk.confluence=Плагін Confluence
+uk.default=${default}
+uk.externalcommand=Відкрити з плагіном зовнішніх команд
+uk.imgur=Плагін Imgur (див.: http://imgur.com)
+uk.jira=Плагін Jira
+uk.language=Додаткові мови
+uk.ocr=Плагін OCR (потребує Microsoft Office Document Imaging (MODI))
+uk.optimize=Оптимізація продуктивності, це може забрати час.
+uk.startgreenshot=Запустити {#ExeName}
+uk.startup=Запускати {#ExeName} під час запуску Windows
+
 cn.confluence=Confluence插件
 cn.default=${default}
 cn.externalcommand=使用外部命令打开插件
@@ -308,6 +318,7 @@ Name: "languages\daDK"; Description: "Dansk"; Types: full custom; Flags: disable
 Name: "languages\dexfranconia"; Description: "Frängisch (Deutsch)"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
 Name: "languages\elGR"; Description: "ελληνικά"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('4')
 Name: "languages\esES"; Description: "Español"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
+Name: "languages\etEE"; Description: "Eesti"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('2')
 Name: "languages\faIR"; Description: "پارسی"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('d')
 Name: "languages\fiFI"; Description: "Suomi"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
 Name: "languages\frFR"; Description: "Français"; Types: full custom; Flags: disablenouninstallwarning; Check: hasLanguageGroup('1')
@@ -512,73 +523,25 @@ begin
 	Result := returnValue;
 end;
 
-function hasDotNet(version: string; service: cardinal): Boolean;
+function hasDotNet() : boolean;
-// Indicates whether the specified version and service pack of the .NET Framework is installed.
-//
-// version -- Specify one of these strings for the required .NET Framework version:
-//    'v1.1.4322'     .NET Framework 1.1
-//    'v2.0.50727'    .NET Framework 2.0
-//    'v3.0'          .NET Framework 3.0
-//    'v3.5'          .NET Framework 3.5
-//    'v4\Client'     .NET Framework 4.0 Client Profile
-//    'v4\Full'       .NET Framework 4.0 Full Installation
-//
-// service -- Specify any non-negative integer for the required service pack level:
-//    0               No service packs required
-//    1, 2, etc.      Service pack 1, 2, etc. required
-var
-    key: string;
-    install, serviceCount: cardinal;
-    success: boolean;
 begin
-    key := 'SOFTWARE\Microsoft\NET Framework Setup\NDP\' + version;
+	// .NET 4.5 = 4.0 full (with a "Release" key, but this is not interresting!)
-    // .NET 3.0 uses value InstallSuccess in subkey Setup
+	Result := netfxinstalled(NetFX20, '') or netfxinstalled(NetFX30, '') or netfxinstalled(NetFX35, '') or netfxinstalled(NetFX40Client, '') or netfxinstalled(NetFX40Full, '');
-    if Pos('v3.0', version) = 1 then begin
-        success := RegQueryDWordValue(HKLM, key + '\Setup', 'InstallSuccess', install);
-    end else begin
-        success := RegQueryDWordValue(HKLM, key, 'Install', install);
-    end;
-    // .NET 4.0 uses value Servicing instead of SP
-    if Pos('v4', version) = 1 then begin
-        success := success and RegQueryDWordValue(HKLM, key, 'Servicing', serviceCount);
-    end else begin
-        success := success and RegQueryDWordValue(HKLM, key, 'SP', serviceCount);
-    end;
-    result := success and (install = 1) and (serviceCount >= service);
-end;
-
-function hasDotNet20() : boolean;
-begin
-	Result := hasDotNet('v2.0.50727',0);
-end;
-
-function hasDotNet40() : boolean;
-begin
-	Result := hasDotNet('v4\Client',0) or hasDotNet('v4\Full',0);
 end;
 
 function hasDotNet35FullOrHigher() : boolean;
 begin
-	Result := hasDotNet('v3.5',0) or hasDotNet('v4\Full',0) or hasDotNet('4.5\Full',0);
+	Result := netfxinstalled(NetFX35, '') or netfxinstalled(NetFX40Full, '');
-end;
-
-function hasDotNet35OrHigher() : boolean;
-begin
-	Result := hasDotNet('v3.5',0) or hasDotNet('v4\Client',0) or hasDotNet('v4\Full',0) or hasDotNet('4.5\Client',0) or hasDotNet('4.5\Full',0);
 end;
 
 function getNGENPath(argument: String) : String;
 var
 	installPath: string;
 begin
-	if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4.5\Client', 'InstallPath', installPath) then begin
+	if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'InstallPath', installPath) then begin
-		if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4.5\Full', 'InstallPath', installPath) then begin
+		if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client', 'InstallPath', installPath) then begin
-			if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client', 'InstallPath', installPath) then begin
+			// 3.5 doesn't have NGEN and is using the .net 2.0 installation
-				if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'InstallPath', installPath) then begin
+			installPath := ExpandConstant('{dotnet20}');
-					// 3.5 doesn't have NGEN and is using the .net 2.0 installation
-					installPath := ExpandConstant('{dotnet20}');
-				end;
-			end;
 		end;
 	end;
 	Result := installPath;
@@ -587,24 +550,15 @@ end;
 // Initialize the setup
 function InitializeSetup(): Boolean;
 begin
-	// Only check for 2.0 and install if we don't have .net 3.5 or higher
+	// Check for .NET and install 3.5 if we don't have it
-	if not hasDotNet35OrHigher() then
+	if not hasDotNet() then
 	begin
-		// Enhance installer otherwise .NET installations won't work
+		// Enhance installer, if needed, otherwise .NET installations won't work
 		msi20('2.0');
 		msi31('3.0');
 		
-		//install .netfx 2.0 sp2 if possible; if not sp1 if possible; if not .netfx 2.0
+		//install .net 3.5
-		if minwinversion(5, 1) then begin
+		dotnetfx35sp1();
-			dotnetfx20sp2();
-		end else begin
-			if minwinversion(5, 0) and minwinspversion(5, 0, 4) then begin
-				// kb835732();
-				dotnetfx20sp1();
-			end else begin
-				dotnetfx20();
-			end;
-		end;
 	end;
 	Result := true;
 end;

Greenshot/releases/package_zip.bat

@@ -23,6 +23,6 @@ del /s *.bak
 del /s *installer*.xml
 del /s *website*.xml
 del /s *template.txt
-..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.4.$WCREV$.zip *
+..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.6.$WCREV$.zip *
 cd ..
 rmdir /s /q NO-INSTALLER

Greenshot/tools/FileVerifier++/COPYING.TXT

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appinfo.ini

@@ -8,7 +8,7 @@ AppID=PortableApps.comInstaller
 Publisher=PortableApps.com
 Homepage=PortableApps.com/go/PortableApps.comInstaller
 Category=Development
-Description=Create PortableApps.com Format installers for portable apps
+Description=PortableApps.com Format installer creator
 Language=Multilingual
 
 [License]
@@ -18,8 +18,8 @@ Freeware=true
 CommercialUse=true
 
 [Version]
-PackageVersion=3.0.5.0
+PackageVersion=3.0.6.0
-DisplayVersion=3.0.5
+DisplayVersion=3.0.6
 
 [Control]
 Icons=1

Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.nsi

@@ -1,4 +1,4 @@
-;Copyright 2007-2012 John T. Haller of PortableApps.com
+;Copyright 2007-2013 John T. Haller of PortableApps.com
 ;Website: http://PortableApps.com/
 
 ;This software is OSI Certified Open Source Software.
@@ -24,8 +24,8 @@
 ;as published at PortableApps.com/development. It may also be used with commercial
 ;software by contacting PortableApps.com.
 
-!define PORTABLEAPPSINSTALLERVERSION "3.0.5.0"
+!define PORTABLEAPPSINSTALLERVERSION "3.0.6.0"
-!define PORTABLEAPPS.COMFORMATVERSION "3.0.5"
+!define PORTABLEAPPS.COMFORMATVERSION "3.0.6"
 
 !if ${__FILE__} == "PortableApps.comInstallerPlugin.nsi"
 	!include PortableApps.comInstallerPluginConfig.nsh
@@ -279,6 +279,7 @@ Var MINIMIZEINSTALLER
 	Var DOWNLOADEDFILE
 	Var DOWNLOADALREADYEXISTED
 	Var SECONDDOWNLOADATTEMPT
+	Var DownloadURLActual
 !endif
 Var INTERNALEULAVERSION
 Var InstallingStatusString
@@ -908,6 +909,7 @@ FunctionEnd
 	${If} $DOWNLOADALREADYEXISTED == "true"
 		StrCpy $DOWNLOADEDFILE "$EXEDIR\${DownloadFileName}"
 	${Else}
+		StrCpy $DownloadURLActual ${DownloadURL}
 		DownloadTheFile:
 		CreateDirectory `$PLUGINSDIR\Downloaded`
 		SetDetailsPrint both
@@ -922,9 +924,9 @@ FunctionEnd
 		Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
 		
 		${If} $(downloading) != ""
-			inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE $(downloading) $(downloadconnecting) $(downloadsecond) $(downloadminute) $(downloadhour) $(downloadplural) "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s $(downloadremaining))" "${DownloadURL}" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
+			inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE $(downloading) $(downloadconnecting) $(downloadsecond) $(downloadminute) $(downloadhour) $(downloadplural) "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s $(downloadremaining))" "$DownloadURLActual" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
 		${Else}
-			inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE "Downloading %s..." "Connecting..." second minute hour s "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s remaining)" "${DownloadURL}" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
+			inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE "Downloading %s..." "Connecting..." second minute hour s "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s remaining)" "$DownloadURLActual" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
 		${EndIf}
 		SetDetailsPrint both
 		DetailPrint $InstallingStatusString
@@ -961,13 +963,22 @@ FunctionEnd
 				${EndIf}
 			!endif
 		${Else}
+			Delete "$INTERNET_CACHE\${DownloadFileName}"
+			Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
+			StrCpy $0 $DownloadURLActual 
+			
+			;Use backup PA.c download server if necessary
+			${WordFind} "$DownloadURLActual" "http://download2.portableapps.com" "#" $R0
+			${If} $R0 == 1
+				${WordReplace} "$DownloadURLActual" "http://download2.portableapps.com" "http://download.portableapps.com" "+" $DownloadURLActual
+				Goto DownloadTheFile
+			${EndIf}
+			
 			${If} $SECONDDOWNLOADATTEMPT != true
 			${AndIf} $DOWNLOADRESULT != "Cancelled"
 				StrCpy $SECONDDOWNLOADATTEMPT true
 				Goto DownloadTheFile
 			${EndIf}
-			Delete "$INTERNET_CACHE\${DownloadFileName}"
-			Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
 			SetDetailsPrint textonly
 				DetailPrint ""
 			SetDetailsPrint listonly

Greenshot/tools/PortableApps.comInstaller/Other/Source/InstallerWizard.nsi

@@ -1,4 +1,4 @@
-;Copyright (C) 2006-2012 John T. Haller
+;Copyright (C) 2006-2013 John T. Haller
 
 ;Website: http://PortableApps.com/Installer
 
@@ -20,9 +20,9 @@
 ;Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 !define APPNAME "PortableApps.com Installer"
-!define VER "3.0.5.0"
+!define VER "3.0.6.0"
 !define WEBSITE "PortableApps.com/Installer"
-!define FRIENDLYVER "3.0.5"
+!define FRIENDLYVER "3.0.6"
 !define PORTABLEAPPS.COMFORMATVERSION "3.0"
 
 ;=== Program Details

Greenshot/tools/TortoiseSVN/CyrusSASL License.txt

@@ -1,44 +0,0 @@
-/* CMU libsasl
- * Tim Martin
- * Rob Earhart
- * Rob Siemborski
- */
-/* 
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
- *    details, please contact  
- *      Office of Technology Transfer
- *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */