From 75000e64eb415fa54e6d85efa45ce6ff3bdf0377 Mon Sep 17 00:00:00 2001 From: "kenneth.skovhede@gmail.com" Date: Tue, 28 Dec 2010 14:27:34 +0000 Subject: [PATCH] Update issue #321 Status: Fixed There were some issues with namespaces and signing of the files, which caused the translations to not load. git-svn-id: https://duplicati.googlecode.com/svn/trunk@649 59da171f-624f-0410-aa54-27559c288bec --- .../Duplicati.CommandLine.Decrypter.csproj | 3 + Duplicati/CommandLine/Decrypter/Duplicati.snk | Bin 0 -> 596 bytes .../ThreadPriorityPicker.Designer.cs | 27 ++---- .../HelperControls/ThreadPriorityPicker.resx | 90 ++++++++++++++++++ ...uplicati.Library.Backend.CloudFiles.csproj | 3 + .../Library/Backend/CloudFiles/Duplicati.snk | Bin 0 -> 596 bytes .../SSH/Duplicati.Library.Backend.SSH.csproj | 2 +- .../Backend/SSH/Properties/AssemblyInfo.cs | 4 +- ...Duplicati.Library.Backend.TahoeLAFS.csproj | 3 + .../Library/Backend/TahoeLAFS/Duplicati.snk | Bin 0 -> 596 bytes .../TahoeLAFS/Properties/AssemblyInfo.cs | 4 +- .../Duplicati.Library.Backend.WEBDAV.csproj | 3 + .../Library/Backend/WEBDAV/Duplicati.snk | Bin 0 -> 596 bytes .../Duplicati.Library.Modules.Builtin.csproj | 5 + .../Library/Modules/Builtin/Duplicati.snk | Bin 0 -> 596 bytes Duplicati/Localization/configuration.xml | 18 ++-- 16 files changed, 129 insertions(+), 33 deletions(-) create mode 100644 Duplicati/CommandLine/Decrypter/Duplicati.snk create mode 100644 Duplicati/Library/Backend/CloudFiles/Duplicati.snk create mode 100644 Duplicati/Library/Backend/TahoeLAFS/Duplicati.snk create mode 100644 Duplicati/Library/Backend/WEBDAV/Duplicati.snk create mode 100644 Duplicati/Library/Modules/Builtin/Duplicati.snk diff --git a/Duplicati/CommandLine/Decrypter/Duplicati.CommandLine.Decrypter.csproj b/Duplicati/CommandLine/Decrypter/Duplicati.CommandLine.Decrypter.csproj index 43f3aa6ee..88dce91f1 100644 --- a/Duplicati/CommandLine/Decrypter/Duplicati.CommandLine.Decrypter.csproj +++ b/Duplicati/CommandLine/Decrypter/Duplicati.CommandLine.Decrypter.csproj @@ -18,6 +18,8 @@ + true + Duplicati.snk true @@ -78,6 +80,7 @@ + diff --git a/Duplicati/CommandLine/Decrypter/Duplicati.snk b/Duplicati/CommandLine/Decrypter/Duplicati.snk new file mode 100644 index 0000000000000000000000000000000000000000..e0c1e2dd86119728adaeefc5f14f2e597dabceeb GIT binary patch literal 596 zcmZQ)VqjoUVPFUfb~IvOVPIfnU}U&>ZqBFG;TL!xbC@f=sW??FHp%RuD04u?d|@dM zp47GKm!Hl%dFaei`<5*qzAgXqbzUyVi_n}?OMO*3eH|OE?krr| zFEl@9)L*-L?Q8KJPtTajTTV9l{O!|eX~_>-AD#yZ=6m07=(;Lz?67b_fmBH7>6XPy zU(fsaYt6=H^BbXYGcsePe{{ZI&XLwz9=grGu+&OTZN+`>n#aL@H_qHKNL{x|{OX?< z|2?cWgj<|a*&Wn5qtR68+v$gad`lNSIGSM4$`K*nE_8`M(8%hLo?+%X^GU{qHtmys zKah1))%qg*H$8)~{Blp<;-4#gv3~y3w(VO5op^Nq_Qo%mz;QX`zXzj&$<=3DJ8QK~doHe9_tNXtnN&4~oeV$j z^o2{LFP>08&A&p7*^IG!Mnm`8x8Lq$er`8lWi+;b>yXC%XWDAv$p-_y)7-T(lU$#a z#IstS7OnePcICwJ+w3(l+=qQ0gsr@P>rWc{j)4B;9b4MXBe*rpp6LBh{}W&Ed`G$N IQKi@%02MtM!T private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ThreadPriorityPicker)); this.ThreadPriority = new System.Windows.Forms.ComboBox(); this.ThreadPriorityEnabled = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // ThreadPriority // - this.ThreadPriority.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.ThreadPriority, "ThreadPriority"); this.ThreadPriority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ThreadPriority.Enabled = false; this.ThreadPriority.FormattingEnabled = true; this.ThreadPriority.Items.AddRange(new object[] { - "High (Not recommended)", - "Above normal", - "Normal", - "Below normal", - "Low"}); - this.ThreadPriority.Location = new System.Drawing.Point(152, 0); + resources.GetString("ThreadPriority.Items"), + resources.GetString("ThreadPriority.Items1"), + resources.GetString("ThreadPriority.Items2"), + resources.GetString("ThreadPriority.Items3"), + resources.GetString("ThreadPriority.Items4")}); this.ThreadPriority.Name = "ThreadPriority"; - this.ThreadPriority.Size = new System.Drawing.Size(168, 21); - this.ThreadPriority.TabIndex = 20; this.ThreadPriority.SelectedIndexChanged += new System.EventHandler(this.ThreadPriority_SelectedIndexChanged); // // ThreadPriorityEnabled // - this.ThreadPriorityEnabled.AutoSize = true; - this.ThreadPriorityEnabled.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.ThreadPriorityEnabled.Location = new System.Drawing.Point(0, 0); + resources.ApplyResources(this.ThreadPriorityEnabled, "ThreadPriorityEnabled"); this.ThreadPriorityEnabled.Name = "ThreadPriorityEnabled"; - this.ThreadPriorityEnabled.Size = new System.Drawing.Size(108, 17); - this.ThreadPriorityEnabled.TabIndex = 19; - this.ThreadPriorityEnabled.Text = "Set thread priority"; this.ThreadPriorityEnabled.UseVisualStyleBackColor = true; this.ThreadPriorityEnabled.CheckedChanged += new System.EventHandler(this.ThreadPriorityEnabled_CheckedChanged); // // ThreadPriorityPicker // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.ThreadPriority); this.Controls.Add(this.ThreadPriorityEnabled); this.Name = "ThreadPriorityPicker"; - this.Size = new System.Drawing.Size(322, 23); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Duplicati/GUI/HelperControls/ThreadPriorityPicker.resx b/Duplicati/GUI/HelperControls/ThreadPriorityPicker.resx index ff31a6db5..5d4da87ef 100644 --- a/Duplicati/GUI/HelperControls/ThreadPriorityPicker.resx +++ b/Duplicati/GUI/HelperControls/ThreadPriorityPicker.resx @@ -117,4 +117,94 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Top, Right + + + + False + + + High (Not recommended) + + + Above normal + + + Normal + + + Below normal + + + Low + + + + 152, 0 + + + 168, 21 + + + 20 + + + ThreadPriority + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + NoControl + + + 0, 0 + + + 108, 17 + + + 19 + + + Set thread priority + + + ThreadPriorityEnabled + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + 6, 13 + + + 322, 23 + + + ThreadPriorityPicker + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj index 630278731..dafd769d9 100644 --- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj @@ -17,6 +17,8 @@ + true + Duplicati.snk true @@ -120,6 +122,7 @@ +