Added translations for the new features in 1.2, currently we have Dutch, English and German.

Greenshot/Forms/DropShadowSettingsForm.Designer.cs

@@ -151,7 +151,6 @@ namespace Greenshot.Forms {
 			this.buttonOK.Name = "buttonOK";
 			this.buttonOK.Size = new System.Drawing.Size(75, 23);
 			this.buttonOK.TabIndex = 11;
-			this.buttonOK.Text = "Ok";
 			this.buttonOK.UseVisualStyleBackColor = true;
 			this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
 			// 
@@ -163,7 +162,6 @@ namespace Greenshot.Forms {
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.Size = new System.Drawing.Size(75, 23);
 			this.buttonCancel.TabIndex = 12;
-			this.buttonCancel.Text = "Cancel";
 			this.buttonCancel.UseVisualStyleBackColor = true;
 			// 
 			// labelDarkness
@@ -174,7 +172,6 @@ namespace Greenshot.Forms {
 			this.labelDarkness.Name = "labelDarkness";
 			this.labelDarkness.Size = new System.Drawing.Size(92, 13);
 			this.labelDarkness.TabIndex = 13;
-			this.labelDarkness.Text = "Shadow darkness";
 			// 
 			// labelOffset
 			// 
@@ -184,7 +181,6 @@ namespace Greenshot.Forms {
 			this.labelOffset.Name = "labelOffset";
 			this.labelOffset.Size = new System.Drawing.Size(75, 13);
 			this.labelOffset.TabIndex = 14;
-			this.labelOffset.Text = "Shadow offset";
 			// 
 			// labelThickness
 			// 
@@ -194,7 +190,6 @@ namespace Greenshot.Forms {
 			this.labelThickness.Name = "labelThickness";
 			this.labelThickness.Size = new System.Drawing.Size(94, 13);
 			this.labelThickness.TabIndex = 15;
-			this.labelThickness.Text = "Shadow thickness";
 			// 
 			// DropShadowSettingsForm
 			// 
@@ -220,7 +215,6 @@ namespace Greenshot.Forms {
 			this.MinimizeBox = false;
 			this.Name = "DropShadowSettingsForm";
 			this.ShowIcon = false;
-			this.Text = "Dropshadow settings";
 			((System.ComponentModel.ISupportInitialize)(this.thickness)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.offsetX)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.offsetY)).EndInit();

Greenshot/Forms/ImageEditorForm.Designer.cs

@@ -409,7 +409,7 @@ namespace Greenshot {
 			this.btnSpeechBubble.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
 			this.btnSpeechBubble.Image = ((System.Drawing.Image)(resources.GetObject("btnSpeechBubble.Image")));
 			this.btnSpeechBubble.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.btnSpeechBubble.Text = "Add speech bubble";
+			this.btnSpeechBubble.LanguageKey = "editor_speechbubble";
 			this.btnSpeechBubble.Name = "btnSpeechBubble";
 			this.btnSpeechBubble.Size = new System.Drawing.Size(22, 20);
 			this.btnSpeechBubble.Click += new System.EventHandler(this.BtnSpeechBubbleClick);
@@ -420,7 +420,7 @@ namespace Greenshot {
 			this.btnStepLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
 			this.btnStepLabel.Image = ((System.Drawing.Image)(resources.GetObject("btnStepLabel01.Image")));
 			this.btnStepLabel.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.btnStepLabel.Text = "Add counter";
+			this.btnStepLabel.LanguageKey = "editor_counter";
 			this.btnStepLabel.Name = "btnStepLabel";
 			this.btnStepLabel.Size = new System.Drawing.Size(22, 20);
 			this.btnStepLabel.Click += new System.EventHandler(this.BtnStepLabelClick);
@@ -504,7 +504,6 @@ namespace Greenshot {
 			// 
 			// btnResize
 			// 
-			this.btnResize.Text = "Resize";
 			this.btnResize.Name = "btnResize";
 			this.btnResize.Size = new System.Drawing.Size(22, 20);
 			this.btnResize.Click += new System.EventHandler(this.BtnResizeClick);

Greenshot/Forms/ResizeSettingsForm.Designer.cs

@@ -61,7 +61,6 @@ namespace Greenshot.Forms {
 			this.buttonOK.Name = "buttonOK";
 			this.buttonOK.Size = new System.Drawing.Size(75, 23);
 			this.buttonOK.TabIndex = 6;
-			this.buttonOK.Text = "Ok";
 			this.buttonOK.UseVisualStyleBackColor = true;
 			this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
 			// 
@@ -73,7 +72,6 @@ namespace Greenshot.Forms {
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.Size = new System.Drawing.Size(75, 23);
 			this.buttonCancel.TabIndex = 7;
-			this.buttonCancel.Text = "Cancel";
 			this.buttonCancel.UseVisualStyleBackColor = true;
 			// 
 			// checkbox_aspectratio
@@ -84,7 +82,6 @@ namespace Greenshot.Forms {
 			this.checkbox_aspectratio.Name = "checkbox_aspectratio";
 			this.checkbox_aspectratio.Size = new System.Drawing.Size(124, 17);
 			this.checkbox_aspectratio.TabIndex = 5;
-			this.checkbox_aspectratio.Text = "Maintain aspect ratio";
 			this.checkbox_aspectratio.UseVisualStyleBackColor = true;
 			// 
 			// label_width
@@ -95,7 +92,6 @@ namespace Greenshot.Forms {
 			this.label_width.Name = "label_width";
 			this.label_width.Size = new System.Drawing.Size(35, 13);
 			this.label_width.TabIndex = 14;
-			this.label_width.Text = "Width";
 			// 
 			// label_height
 			// 
@@ -105,7 +101,6 @@ namespace Greenshot.Forms {
 			this.label_height.Name = "label_height";
 			this.label_height.Size = new System.Drawing.Size(38, 13);
 			this.label_height.TabIndex = 15;
-			this.label_height.Text = "Height";
 			// 
 			// textbox_height
 			// 
@@ -165,7 +160,6 @@ namespace Greenshot.Forms {
 			this.MinimizeBox = false;
 			this.Name = "ResizeSettingsForm";
 			this.ShowIcon = false;
-			this.Text = "Resize settings";
 			this.ResumeLayout(false);
 			this.PerformLayout();
 

Greenshot/Forms/TornEdgeSettingsForm.Designer.cs

@@ -165,7 +165,6 @@ namespace Greenshot.Forms {
 			this.buttonOK.Name = "buttonOK";
 			this.buttonOK.Size = new System.Drawing.Size(75, 23);
 			this.buttonOK.TabIndex = 11;
-			this.buttonOK.Text = "Ok";
 			this.buttonOK.UseVisualStyleBackColor = true;
 			this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
 			// 
@@ -177,7 +176,6 @@ namespace Greenshot.Forms {
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.Size = new System.Drawing.Size(75, 23);
 			this.buttonCancel.TabIndex = 12;
-			this.buttonCancel.Text = "Cancel";
 			this.buttonCancel.UseVisualStyleBackColor = true;
 			// 
 			// labelDarkness
@@ -188,7 +186,6 @@ namespace Greenshot.Forms {
 			this.labelDarkness.Name = "labelDarkness";
 			this.labelDarkness.Size = new System.Drawing.Size(92, 13);
 			this.labelDarkness.TabIndex = 13;
-			this.labelDarkness.Text = "Shadow darkness";
 			// 
 			// labelOffset
 			// 
@@ -198,7 +195,6 @@ namespace Greenshot.Forms {
 			this.labelOffset.Name = "labelOffset";
 			this.labelOffset.Size = new System.Drawing.Size(75, 13);
 			this.labelOffset.TabIndex = 14;
-			this.labelOffset.Text = "Shadow offset";
 			// 
 			// labelThickness
 			// 
@@ -208,7 +204,6 @@ namespace Greenshot.Forms {
 			this.labelThickness.Name = "labelThickness";
 			this.labelThickness.Size = new System.Drawing.Size(94, 13);
 			this.labelThickness.TabIndex = 15;
-			this.labelThickness.Text = "Shadow thickness";
 			// 
 			// toothsize
 			// 
@@ -240,7 +235,6 @@ namespace Greenshot.Forms {
 			this.label_toothsize.Name = "label_toothsize";
 			this.label_toothsize.Size = new System.Drawing.Size(56, 13);
 			this.label_toothsize.TabIndex = 17;
-			this.label_toothsize.Text = "Tooth size";
 			// 
 			// label_horizontaltoothrange
 			// 
@@ -250,7 +244,6 @@ namespace Greenshot.Forms {
 			this.label_horizontaltoothrange.Name = "label_horizontaltoothrange";
 			this.label_horizontaltoothrange.Size = new System.Drawing.Size(111, 13);
 			this.label_horizontaltoothrange.TabIndex = 19;
-			this.label_horizontaltoothrange.Text = "Horizontal tooth range";
 			// 
 			// horizontaltoothrange
 			// 
@@ -282,7 +275,6 @@ namespace Greenshot.Forms {
 			this.labelVerticaltoothrange.Name = "labelVerticaltoothrange";
 			this.labelVerticaltoothrange.Size = new System.Drawing.Size(99, 13);
 			this.labelVerticaltoothrange.TabIndex = 21;
-			this.labelVerticaltoothrange.Text = "Vertical tooth range";
 			// 
 			// verticaltoothrange
 			// 
@@ -313,7 +305,7 @@ namespace Greenshot.Forms {
 			this.top.Name = "top";
 			this.top.Size = new System.Drawing.Size(88, 17);
 			this.top.TabIndex = 22;
-			this.top.Text = "Tear top side";
+			this.top.LanguageKey = "editor_tornedge_top";
 			this.top.UseVisualStyleBackColor = true;
 			// 
 			// right
@@ -323,7 +315,7 @@ namespace Greenshot.Forms {
 			this.right.Name = "right";
 			this.right.Size = new System.Drawing.Size(93, 17);
 			this.right.TabIndex = 23;
-			this.right.Text = "Tear right side";
+			this.right.LanguageKey = "editor_tornedge_right";
 			this.right.UseVisualStyleBackColor = true;
 			// 
 			// bottom
@@ -333,7 +325,7 @@ namespace Greenshot.Forms {
 			this.bottom.Name = "bottom";
 			this.bottom.Size = new System.Drawing.Size(105, 17);
 			this.bottom.TabIndex = 24;
-			this.bottom.Text = "Tear bottom side";
+			this.bottom.LanguageKey = "editor_tornedge_bottom";
 			this.bottom.UseVisualStyleBackColor = true;
 			// 
 			// left
@@ -343,7 +335,7 @@ namespace Greenshot.Forms {
 			this.left.Name = "left";
 			this.left.Size = new System.Drawing.Size(87, 17);
 			this.left.TabIndex = 25;
-			this.left.Text = "Tear left side";
+			this.left.LanguageKey = "editor_tornedge_left";
 			this.left.UseVisualStyleBackColor = true;
 			// 
 			// shadowCheckbox
@@ -353,7 +345,7 @@ namespace Greenshot.Forms {
 			this.shadowCheckbox.Name = "shadowCheckbox";
 			this.shadowCheckbox.Size = new System.Drawing.Size(110, 17);
 			this.shadowCheckbox.TabIndex = 26;
-			this.shadowCheckbox.Text = "Generate shadow";
+			this.shadowCheckbox.LanguageKey = "editor_tornedge_shadow";
 			this.shadowCheckbox.UseVisualStyleBackColor = true;
 			this.shadowCheckbox.CheckedChanged += new System.EventHandler(this.shadowCheckbox_CheckedChanged);
 			// 
@@ -392,7 +384,6 @@ namespace Greenshot.Forms {
 			this.MinimizeBox = false;
 			this.Name = "TornEdgeSettingsForm";
 			this.ShowIcon = false;
-			this.Text = "Torn edges settings";
 			((System.ComponentModel.ISupportInitialize)(this.thickness)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.offsetX)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.offsetY)).EndInit();

Greenshot/Languages/language-de-DE.xml

@@ -104,10 +104,6 @@ schnell zu finden. Vielen Dank :)</resource>
 		<resource name="editor_drawline">Linie zeichnen (L)</resource>
 		<resource name="editor_drawrectangle">Rechteck zeichnen (R)</resource>
 		<resource name="editor_drawtextbox">Textbox hinzufügen (T)</resource>
-		<resource name="editor_dropshadow_darkness">Schatten-Intensität</resource>
-		<resource name="editor_dropshadow_offset">Schatten-Versatz</resource>
-		<resource name="editor_dropshadow_settings">Schatten-Einstellungen</resource>
-		<resource name="editor_dropshadow_thickness">Schatten-Breite</resource>
 		<resource name="editor_duplicate">Gewähltes Element duplizieren</resource>
 		<resource name="editor_edit">Bearbeiten</resource>
 		<resource name="editor_effects">Effekte</resource>
@@ -290,5 +286,29 @@ Sie können aber auch alle Greenshot-Funktionen über das Kontextmenü des Green
 		<resource name="WindowCaptureMode.Auto">Automatisch</resource>
 		<resource name="WindowCaptureMode.GDI">Standardfarbe verwenden</resource>
 		<resource name="WindowCaptureMode.Screen">Wie angezeigt</resource>
+
+		<!-- 1.2 -->
+		<resource name="editor_dropshadow_darkness">Schatten-Intensität</resource>
+		<resource name="editor_dropshadow_offset">Schatten-Versatz</resource>
+		<resource name="editor_dropshadow_settings">Schatten-Einstellungen</resource>
+		<resource name="editor_dropshadow_thickness">Schatten-Breite</resource>
+		<resource name="editor_tornedge_horizontaltoothrange">Horizontale Zahnabstand</resource>
+		<resource name="editor_tornedge_settings">Gerissene Kanten Einstellungen</resource>
+		<resource name="editor_tornedge_toothsize">Zahn große</resource>
+		<resource name="editor_tornedge_verticaltoothrange">Vertikale Zahnabstand</resource>
+		<resource name="editor_tornedge_left">Linker Kante einreißen</resource>
+		<resource name="editor_tornedge_right">Rechter Kante einreißen</resource>
+		<resource name="editor_tornedge_top">Top Kante einreißen</resource>
+		<resource name="editor_tornedge_bottom">Boden Kante einreißen</resource>
+		<resource name="editor_tornedge_shadow">Schatten erstellen</resource>
+
+		<resource name="editor_counter">Zähler zufügen</resource>
+		<resource name="editor_speechbubble">Sprechblase zufügen</resource>
+
+		<resource name="editor_resize">Größe ändern</resource>
+		<resource name="editor_resize_settings">Einstellungen größe ändern</resource>
+		<resource name="editor_resize_aspectratio">Aspektratio behalten</resource>
+		<resource name="editor_resize_width">Breidte</resource>
+		<resource name="editor_resize_height">Höhe</resource>
 	</resources>
 </language>

Greenshot/Languages/language-en-US.xml

@@ -104,10 +104,6 @@ Also, we would highly appreciate if you checked whether a tracker item already e
 		<resource name="editor_drawline">Draw line (L)</resource>
 		<resource name="editor_drawrectangle">Draw rectangle (R)</resource>
 		<resource name="editor_drawtextbox">Add textbox (T)</resource>
-		<resource name="editor_dropshadow_darkness">Shadow darkness</resource>
-		<resource name="editor_dropshadow_offset">Shadow offset</resource>
-		<resource name="editor_dropshadow_settings">Dropshadow settings</resource>
-		<resource name="editor_dropshadow_thickness">Shadow thickness</resource>
 		<resource name="editor_duplicate">Duplicate selected element</resource>
 		<resource name="editor_edit">Edit</resource>
 		<resource name="editor_effects">Effects</resource>
@@ -155,10 +151,6 @@ Also, we would highly appreciate if you checked whether a tracker item already e
 		<resource name="editor_thickness">Line thickness</resource>
 		<resource name="editor_title">Greenshot image editor</resource>
 		<resource name="editor_torn_edge">Torn edge</resource>
-		<resource name="editor_tornedge_horizontaltoothrange">Horizontal tooth range</resource>
-		<resource name="editor_tornedge_settings">Torn edges settings</resource>
-		<resource name="editor_tornedge_toothsize">Tooth size</resource>
-		<resource name="editor_tornedge_verticaltoothrange">Vertical tooth range</resource>
 		<resource name="editor_undo">Undo {0}</resource>
 		<resource name="editor_uponelevel">Up one level</resource>
 		<resource name="editor_uptotop">Up to top</resource>
@@ -290,5 +282,31 @@ All Greenshot features still work directly from the tray icon context menu witho
 		<resource name="WindowCaptureMode.Auto">Automatically</resource>
 		<resource name="WindowCaptureMode.GDI">Use default color</resource>
 		<resource name="WindowCaptureMode.Screen">As displayed</resource>
-	</resources>
+
+    <!-- 1.2 -->
+    <resource name="editor_dropshadow_darkness">Shadow darkness</resource>
+    <resource name="editor_dropshadow_offset">Shadow offset</resource>
+    <resource name="editor_dropshadow_settings">Dropshadow settings</resource>
+    <resource name="editor_dropshadow_thickness">Shadow thickness</resource>
+
+    <resource name="editor_tornedge_horizontaltoothrange">Horizontal tooth range</resource>
+    <resource name="editor_tornedge_settings">Torn edges settings</resource>
+    <resource name="editor_tornedge_toothsize">Tooth size</resource>
+    <resource name="editor_tornedge_verticaltoothrange">Vertical tooth range</resource>
+    <resource name="editor_tornedge_left">Tear left side</resource>
+    <resource name="editor_tornedge_right">Tear right side</resource>
+    <resource name="editor_tornedge_top">Tear top side</resource>
+    <resource name="editor_tornedge_bottom">Tear bottom side</resource>
+    <resource name="editor_tornedge_shadow">Generate shadow</resource>
+    
+    <resource name="editor_counter">Add counter</resource>
+    <resource name="editor_speechbubble">Add speechbubble</resource>
+
+    <resource name="editor_resize">Resize</resource>
+    <resource name="editor_resize_settings">Resize settings</resource>
+    <resource name="editor_resize_aspectratio">Maintain aspect ratio</resource>
+    <resource name="editor_resize_width">Width</resource>
+    <resource name="editor_resize_height">Height</resource>
+    
+  </resources>
 </language>

Greenshot/Languages/language-nl-NL.xml

@@ -256,5 +256,29 @@ Alle Greenshot functies werken ook over het context menu.</resource>
 		<resource name="WindowCaptureMode.Auto">Automatisch</resource>
 		<resource name="WindowCaptureMode.GDI">Standaard kleur</resource>
 		<resource name="WindowCaptureMode.Screen">Zoals zichtbaar</resource>
+
+		<!-- 1.2 -->
+		<resource name="editor_dropshadow_darkness">Schaduw intensiteit</resource>
+		<resource name="editor_dropshadow_offset">Schaduw verspringing</resource>
+		<resource name="editor_dropshadow_settings">Schaduw</resource>
+		<resource name="editor_dropshadow_thickness">Schaduw dikte</resource>
+		<resource name="editor_tornedge_horizontaltoothrange">Horizontale tand afstand</resource>
+		<resource name="editor_tornedge_settings">Gescheurde kanten</resource>
+		<resource name="editor_tornedge_toothsize">Tand grootte</resource>
+		<resource name="editor_tornedge_verticaltoothrange">Vertikale tand afstand</resource>
+		<resource name="editor_tornedge_left">Linkerkant scheuren</resource>
+		<resource name="editor_tornedge_right">Rechterkant scheuren</resource>
+		<resource name="editor_tornedge_top">Bovenkant scheuren</resource>
+		<resource name="editor_tornedge_bottom">Onderkant scheuern</resource>
+		<resource name="editor_tornedge_shadow">Schaduw</resource>
+
+		<resource name="editor_counter">Teller toevoegen</resource>
+		<resource name="editor_speechbubble">Tekstballon toevoegen</resource>
+
+		<resource name="editor_resize">Grootte veranderen</resource>
+		<resource name="editor_resize_settings">Grootte veranderen</resource>
+		<resource name="editor_resize_aspectratio">Aspect ratio behouden</resource>
+		<resource name="editor_resize_width">Breedte</resource>
+		<resource name="editor_resize_height">Hoogte</resource>
 	</resources>
 </language>