haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update issue #321

Browse Source 
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
This commit is contained in:
kenneth.skovhede@gmail.com
2010-12-28 14:27:34 +00:00
parent cf3072a10e
commit 75000e64eb
16 changed files with 129 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/CommandLine/Decrypter/Duplicati.CommandLine.Decrypter.csproj
+3
View File
@@ -18,6 +18,8 @@
</UpgradeBackupLocation>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -78,6 +80,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Duplicati.snk" />
<None Include="Resources\Usage.txt" />
<Content Include="TrayUnknown.ico" />
</ItemGroup>
Duplicati/CommandLine/Decrypter/Duplicati.snk
BIN
View File
Binary file not shown.
Duplicati/GUI/HelperControls/ThreadPriorityPicker.Designer.cs
Generated
+9 -18
View File
@@ -28,48 +28,39 @@
/// </summary>
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();
Duplicati/GUI/HelperControls/ThreadPriorityPicker.resx
+90
View File
@@ -117,4 +117,94 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ThreadPriority.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ThreadPriority.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="ThreadPriority.Items" xml:space="preserve">
<value>High (Not recommended)</value>
</data>
<data name="ThreadPriority.Items1" xml:space="preserve">
<value>Above normal</value>
</data>
<data name="ThreadPriority.Items2" xml:space="preserve">
<value>Normal</value>
</data>
<data name="ThreadPriority.Items3" xml:space="preserve">
<value>Below normal</value>
</data>
<data name="ThreadPriority.Items4" xml:space="preserve">
<value>Low</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ThreadPriority.Location" type="System.Drawing.Point, System.Drawing">
<value>152, 0</value>
</data>
<data name="ThreadPriority.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 21</value>
</data>
<data name="ThreadPriority.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="&gt;&gt;ThreadPriority.Name" xml:space="preserve">
<value>ThreadPriority</value>
</data>
<data name="&gt;&gt;ThreadPriority.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ThreadPriority.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;ThreadPriority.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="ThreadPriorityEnabled.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="ThreadPriorityEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="ThreadPriorityEnabled.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="ThreadPriorityEnabled.Size" type="System.Drawing.Size, System.Drawing">
<value>108, 17</value>
</data>
<data name="ThreadPriorityEnabled.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
</data>
<data name="ThreadPriorityEnabled.Text" xml:space="preserve">
<value>Set thread priority</value>
</data>
<data name="&gt;&gt;ThreadPriorityEnabled.Name" xml:space="preserve">
<value>ThreadPriorityEnabled</value>
</data>
<data name="&gt;&gt;ThreadPriorityEnabled.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ThreadPriorityEnabled.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;ThreadPriorityEnabled.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>322, 23</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>ThreadPriorityPicker</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj
+3
View File
@@ -17,6 +17,8 @@
</UpgradeBackupLocation>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -120,6 +122,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Duplicati.snk" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Duplicati/Library/Backend/CloudFiles/Duplicati.snk
BIN
View File
Binary file not shown.
Duplicati/Library/Backend/SSH/Duplicati.Library.Backend.SSH.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Backend</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.SSH</AssemblyName>
<SignAssembly>false</SignAssembly>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Duplicati/Library/Backend/SSH/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -50,5 +50,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.1.299")]
[assembly: AssemblyFileVersion("1.0.1.299")]
[assembly: AssemblyVersion("1.0.1.276")]
[assembly: AssemblyFileVersion("1.0.1.276")]
Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj
+3
View File
@@ -14,6 +14,8 @@
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -83,6 +85,7 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="Duplicati.snk" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Duplicati/Library/Backend/TahoeLAFS/Duplicati.snk
BIN
View File
Binary file not shown.
Duplicati/Library/Backend/TahoeLAFS/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.1.276")]
[assembly: AssemblyFileVersion("1.0.1.276")]
Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
+3
View File
@@ -17,6 +17,8 @@
</UpgradeBackupLocation>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -109,6 +111,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Duplicati.snk" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Duplicati/Library/Backend/WEBDAV/Duplicati.snk
BIN
View File
Binary file not shown.
Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj
+5
View File
@@ -12,6 +12,8 @@
<AssemblyName>Duplicati.Library.Modules.Builtin</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -72,6 +74,9 @@
<LastGenOutput>ConsolePassphraseInput.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Duplicati.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Duplicati/Library/Modules/Builtin/Duplicati.snk
BIN
View File
Binary file not shown.
Duplicati/Localization/configuration.xml
+8 -10
View File
@@ -3,9 +3,7 @@
<assembly name="Duplicati" folder="GUI" namespace="Duplicati.GUI">
<exclude>Datamodel</exclude>
</assembly>
<assembly name="Duplicati.Datamodel" folder="GUI\Datamodel">
<exclude>Datamodel</exclude>
</assembly>
<assembly name="Duplicati.Datamodel" folder="GUI\Datamodel" />
<assembly name="Duplicati.CommandLine" folder="CommandLine">
<exclude>Decrypter</exclude>
</assembly>
@@ -26,13 +24,13 @@
<assembly name="Duplicati.Library.Modules.Builtin" folder="Library\Modules\Builtin" />
<assembly name="Duplicati.Library.Backend.FTP" folder="Library\Backend\FTP" />
<assembly name="Duplicati.Library.Backend.File" folder="Library\Backend\File" />
<assembly name="Duplicati.Library.Backend.SSH" folder="Library\Backend\SSH" />
<assembly name="Duplicati.Library.Backend.S3" folder="Library\Backend\S3" />
<assembly name="Duplicati.Library.Backend.WEBDAV" folder="Library\Backend\WEBDAV" />
<assembly name="Duplicati.Library.Backend.CloudFiles" folder="Library\Backend\CloudFiles" />
<assembly name="Duplicati.Library.Backend.TahoeLAFS" folder="Library\Backend\TahoeLAFS" />
<assembly name="Duplicati.Library.Backend.FTP" folder="Library\Backend\FTP" namespace="Duplicati.Library.Backend" />
<assembly name="Duplicati.Library.Backend.File" folder="Library\Backend\File" namespace="Duplicati.Library.Backend" />
<assembly name="Duplicati.Library.Backend.SSH" folder="Library\Backend\SSH" namespace="Duplicati.Library.Backend" />
<assembly name="Duplicati.Library.Backend.S3" folder="Library\Backend\S3" namespace="Duplicati.Library.Backend" />
<assembly name="Duplicati.Library.Backend.WEBDAV" folder="Library\Backend\WEBDAV" namespace="Duplicati.Library.Backend" />
<assembly name="Duplicati.Library.Backend.CloudFiles" folder="Library\Backend\CloudFiles" namespace="Duplicati.Library.Backend" />
<assembly name="Duplicati.Library.Backend.TahoeLAFS" folder="Library\Backend\TahoeLAFS" namespace="Duplicati.Library.Backend" />
<keyfile>..\GUI\Duplicati.snk</keyfile>
<versionassembly>..\GUI\bin\release\Duplicati.exe</versionassembly>