Merge remote-tracking branch 'upstream/next' into rkapka-master

rubberduck-vba · Dec 1, 2017 · d9b8155 · d9b8155
2 parents 3618de9 + c21a156
commit d9b8155
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 7 deletions.
diff --git a/RetailCoder.VBE/UI/About/AboutControl.xaml b/RetailCoder.VBE/UI/About/AboutControl.xaml
@@ -182,8 +182,8 @@ Stephen Bullen (Smart Indenter)
             </StackPanel>
         </Border>
         <TextBlock Grid.Row="2" Grid.Column="1"
-                    Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_Copyright}"
-                    FontSize="8" Margin="10"
-                    VerticalAlignment="Bottom" HorizontalAlignment="Center" Height="11" Width="237" />
+                   Text="{Binding AboutCopyright}"
+                   FontSize="8" Margin="10"
+                   VerticalAlignment="Bottom" HorizontalAlignment="Center" Height="11" Width="237" />
     </Grid>
 </UserControl>
diff --git a/RetailCoder.VBE/UI/About/AboutControlViewModel.cs b/RetailCoder.VBE/UI/About/AboutControlViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Reflection;
 using NLog;
 using Rubberduck.UI.Command;
 using Rubberduck.VersionCheck;
@@ -33,5 +32,8 @@ public CommandBase UriCommand
                 });
             }
         }
+
+        public string AboutCopyright =>
+            string.Format(RubberduckUI.AboutWindow_Copyright, DateTime.Now.Year);
     }
 }
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.de.resx b/RetailCoder.VBE/UI/RubberduckUI.de.resx
@@ -2064,4 +2064,28 @@ Möchten sie die Einstellungen in Rubberduck importieren?</value>
     <value>Rubberduck TODO Markierungen - {0}
 {1} Markierungen gefunden.</value>
   </data>
-</root>
+  <data name="AboutWindow_CopyVersionCaption" xml:space="preserve">
+    <value>Erfolgreich Kopiert</value>
+  </data>
+  <data name="AboutWindow_CopyVersionLabel" xml:space="preserve">
+    <value>Hier klicken, um Versionsinformation in Zwischenablage zu kopieren.</value>
+  </data>
+  <data name="AboutWindow_CopyVersionMessage" xml:space="preserve">
+    <value>Versionsinformation in Zwischenablage kopiert.</value>
+  </data>
+  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
+    <value>Codemetrikergebnisse</value>
+  </data>
+  <data name="RubberduckMenu_CodeMetrics" xml:space="preserve">
+    <value>Codemetriken</value>
+  </data>
+  <data name="CodeMetrics_Complexity" xml:space="preserve">
+    <value>Zyklomatische Komplexität</value>
+  </data>
+  <data name="CodeMetrics_Lines" xml:space="preserve">
+    <value>Codezeilen</value>
+  </data>
+  <data name="CodeMetrics_Nesting" xml:space="preserve">
+    <value>Maximale Einrückung</value>
+  </data>
+</root>
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -710,7 +710,7 @@ Are you sure you want to proceed with this rename?</value>
     <value>About Rubberduck</value>
   </data>
   <data name="AboutWindow_Copyright" xml:space="preserve">
-    <value>© Copyright 2014-2017 Mathieu Guindon &amp; Christopher McClellan</value>
+    <value>© Copyright 2014-{0} Mathieu Guindon &amp; Christopher McClellan</value>
   </data>
   <data name="AboutWindow_SpecialThanksLabel" xml:space="preserve">
     <value>Special Thanks</value>

diff --git a/Rubberduck.RegexAssistant/Rubberduck.RegexAssistant.csproj b/Rubberduck.RegexAssistant/Rubberduck.RegexAssistant.csproj
@@ -68,6 +68,8 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="i18n\AssistantResources.de.resx" />
+    <EmbeddedResource Include="i18n\AssistantResources.fr.resx" />
     <EmbeddedResource Include="i18n\AssistantResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>AssistantResources.Designer.cs</LastGenOutput>