diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.Designer.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.Designer.cs
index 27a9e0e..7a561a8 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.Designer.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.Designer.cs
@@ -37,7 +37,7 @@
this.labelTitle = new System.Windows.Forms.Label();
this.labelVersionCaption = new Acacia.Controls.KCopyLabel();
this.labelRevisionCaption = new Acacia.Controls.KCopyLabel();
- this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+ this.textLicense = new System.Windows.Forms.RichTextBox();
this.labelDateCaption = new Acacia.Controls.KCopyLabel();
this.linkKopano = new System.Windows.Forms.LinkLabel();
this.labelVersionValue = new Acacia.Controls.KCopyLabel();
@@ -63,7 +63,7 @@
this._layoutForm.Controls.Add(this.labelTitle, 1, 0);
this._layoutForm.Controls.Add(this.labelVersionCaption, 0, 2);
this._layoutForm.Controls.Add(this.labelRevisionCaption, 0, 3);
- this._layoutForm.Controls.Add(this.richTextBox1, 0, 6);
+ this._layoutForm.Controls.Add(this.textLicense, 0, 6);
this._layoutForm.Controls.Add(this.labelDateCaption, 0, 4);
this._layoutForm.Controls.Add(this.linkKopano, 1, 1);
this._layoutForm.Controls.Add(this.labelVersionValue, 1, 2);
@@ -112,14 +112,14 @@
this.labelRevisionCaption.ReadOnly = true;
this.labelRevisionCaption.TabStop = false;
//
- // richTextBox1
+ // textLicense
//
- this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this._layoutForm.SetColumnSpan(this.richTextBox1, 2);
- resources.ApplyResources(this.richTextBox1, "richTextBox1");
- this.richTextBox1.Name = "richTextBox1";
- this.richTextBox1.ReadOnly = true;
- this.richTextBox1.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBox1_LinkClicked);
+ this.textLicense.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this._layoutForm.SetColumnSpan(this.textLicense, 2);
+ resources.ApplyResources(this.textLicense, "textLicense");
+ this.textLicense.Name = "textLicense";
+ this.textLicense.ReadOnly = true;
+ this.textLicense.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBox1_LinkClicked);
//
// labelDateCaption
//
@@ -186,7 +186,7 @@
private Controls.KCopyLabel labelRevisionCaption;
private Controls.KCopyLabel labelDateCaption;
private System.Windows.Forms.LinkLabel linkKopano;
- private System.Windows.Forms.RichTextBox richTextBox1;
+ private System.Windows.Forms.RichTextBox textLicense;
private Controls.KCopyLabel labelVersionValue;
}
}
\ No newline at end of file
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.cs
index 81fee1f..b48feb2 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.cs
@@ -44,6 +44,16 @@ namespace Acacia.Features.DebugSupport
labelVersionValue.Text = BuildVersions.VERSION;
labelRevisionValue.Text = BuildVersions.REVISION;
labelDateValue.Text = LibUtils.BuildTime.ToString();
+
+ // Hardcoded to prevent translations
+ textLicense.Text =
+@"Copyright 2016 Kopano b.v.
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License, version 3, as published by the Free Software Foundation.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License along with this program. If not, see ";
}
private void linkKopano_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.resx b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.resx
index 94107b3..5ef79f7 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.resx
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.resx
@@ -133,10 +133,13 @@
- 73, 132
+ 70, 117
+
+
+ 2, 2, 2, 2
- 355, 15
+ 252, 13
7
@@ -160,10 +163,13 @@
NoControl
- 73, 111
+ 70, 100
+
+
+ 2, 2, 2, 2
- 355, 15
+ 252, 13
6
@@ -184,7 +190,10 @@
Fill
- 3, 3
+ 2, 2
+
+
+ 2, 2, 2, 2
64, 64
@@ -217,10 +226,13 @@
Microsoft Sans Serif, 16.2pt
- 73, 0
+ 70, 0
+
+
+ 2, 0, 2, 0
- 355, 70
+ 252, 68
1
@@ -244,10 +256,13 @@
3
- 3, 90
+ 2, 83
+
+
+ 2, 2, 2, 2
- 56, 15
+ 42, 13
1
@@ -271,10 +286,13 @@
NoControl
- 3, 111
+ 2, 100
+
+
+ 2, 2, 2, 2
- 62, 15
+ 46, 13
4
@@ -294,44 +312,44 @@
5
-
+
Fill
-
- 3, 173
+
+ 2, 150
-
- 425, 272
+
+ 2, 2, 2, 2
-
+
+ 320, 208
+
+
9
-
- Copyright 2016 Kopano b.v.
-
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License, version 3, as published by the Free Software Foundation.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>
+
+
-
- richTextBox1
+
+ textLicense
-
+
System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
_layoutForm
-
+
6
- 3, 132
+ 2, 117
+
+
+ 2, 2, 2, 2
- 38, 15
+ 28, 13
5
@@ -355,10 +373,13 @@ You should have received a copy of the GNU Affero General Public License along w
True
- 73, 70
+ 70, 68
+
+
+ 2, 0, 2, 0
- 132, 17
+ 107, 13
8
@@ -382,10 +403,13 @@ You should have received a copy of the GNU Affero General Public License along w
Fill
- 73, 90
+ 70, 83
+
+
+ 2, 2, 2, 2
- 355, 15
+ 252, 13
10
@@ -406,13 +430,16 @@ You should have received a copy of the GNU Affero General Public License along w
Fill
- 3, 3
+ 2, 2
+
+
+ 2, 2, 2, 2
7
- 431, 448
+ 324, 360
0
@@ -430,7 +457,7 @@ You should have received a copy of the GNU Affero General Public License along w
0
- <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelDateValue" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelRevisionValue" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="icon" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelTitle" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelVersionCaption" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelRevisionCaption" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="richTextBox1" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelDateCaption" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="linkKopano" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelVersionValue" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,Percent,100" /></TableLayoutSettings>
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelDateValue" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelRevisionValue" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="icon" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelTitle" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelVersionCaption" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelRevisionCaption" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="textLicense" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelDateCaption" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="linkKopano" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelVersionValue" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,16,Percent,100" /></TableLayoutSettings>
True
@@ -442,13 +469,13 @@ You should have received a copy of the GNU Affero General Public License along w
Fill
- 3, 456
+ 2, 366
- 3, 2, 3, 2
+ 2, 2, 2, 2
- 431, 39
+ 324, 35
1
@@ -469,13 +496,16 @@ You should have received a copy of the GNU Affero General Public License along w
Fill
- 8, 7
+ 6, 6
+
+
+ 2, 2, 2, 2
2
- 437, 497
+ 328, 403
0
@@ -499,16 +529,19 @@ You should have received a copy of the GNU Affero General Public License along w
True
- 8, 16
+ 6, 13
True
- 453, 511
+ 340, 415
+
+
+ 2, 2, 2, 2
- 8, 7, 8, 7
+ 6, 6, 6, 6
CenterParent
diff --git a/translations/KOE.pot b/translations/KOE.pot
index 0d3ca24..8613e2e 100644
--- a/translations/KOE.pot
+++ b/translations/KOE.pot
@@ -34,19 +34,6 @@ msgctxt "AcaciaZPushPlugin\\Features\\DebugSupport\\AboutDialog\\labelRevisionCa
msgid "Revision"
msgstr ""
-#: AcaciaZPushPlugin\Features\DebugSupport\AboutDialog\richTextBox1.Text
-#, csharp-format
-msgctxt "AcaciaZPushPlugin\\Features\\DebugSupport\\AboutDialog\\richTextBox1.Text"
-msgid ""
-"Copyright 2016 Kopano b.v.\n"
-"\n"
-"This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License, version 3, as published by the Free Software Foundation.\n"
-"\n"
-"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 Affero General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU Affero General Public License along with this program. If not, see "
-msgstr ""
-
#: AcaciaZPushPlugin\Features\DebugSupport\AboutDialog\labelDateCaption.Text
#, csharp-format
msgctxt "AcaciaZPushPlugin\\Features\\DebugSupport\\AboutDialog\\labelDateCaption.Text"
diff --git a/translations/en.po b/translations/en.po
index a6978a9..788ecfe 100644
--- a/translations/en.po
+++ b/translations/en.po
@@ -34,26 +34,6 @@ msgctxt "AcaciaZPushPlugin\\Features\\DebugSupport\\AboutDialog\\labelRevisionCa
msgid "Revision"
msgstr "Revision"
-#: AcaciaZPushPlugin\Features\DebugSupport\AboutDialog\richTextBox1.Text
-#, csharp-format
-msgctxt "AcaciaZPushPlugin\\Features\\DebugSupport\\AboutDialog\\richTextBox1.Text"
-msgid ""
-"Copyright 2016 Kopano b.v.\n"
-"\n"
-"This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License, version 3, as published by the Free Software Foundation.\n"
-"\n"
-"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 Affero General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU Affero General Public License along with this program. If not, see "
-msgstr ""
-"Copyright 2016 Kopano b.v.\n"
-"\n"
-"This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License, version 3, as published by the Free Software Foundation.\n"
-"\n"
-"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 Affero General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU Affero General Public License along with this program. If not, see "
-
#: AcaciaZPushPlugin\Features\DebugSupport\AboutDialog\labelDateCaption.Text
#, csharp-format
msgctxt "AcaciaZPushPlugin\\Features\\DebugSupport\\AboutDialog\\labelDateCaption.Text"