Merge pull request #340 from United600/localization

Review translations and add french
character-map-uwp · Jun 14, 2024 · 1023edf · 1023edf
2 parents fb5b620 + 7979d70
commit 1023edf
Show file tree

Hide file tree

Showing 29 changed files with 1,441 additions and 484 deletions.
diff --git a/CharacterMap/CharacterMap/CharacterMap.csproj b/CharacterMap/CharacterMap/CharacterMap.csproj
@@ -466,6 +466,7 @@
     <PRIResource Include="Strings\en-US\Resources.resw" />
     <PRIResource Include="Strings\en-GB\Resources.resw" />
     <PRIResource Include="Strings\de-DE\Resources.resw" />
+    <PRIResource Include="Strings\fr-FR\Resources.resw" />
     <PRIResource Include="Strings\pl-PL\Resources.resw" />
     <PRIResource Include="Strings\pt-PT\Resources.resw" />
     <PRIResource Include="Strings\it-IT\Resources.resw" />

diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
@@ -14,7 +14,10 @@
     SecondaryButtonClick="{x:Bind Hide}"
     SecondaryButtonStyle="{StaticResource DefaultThemeButtonStyle}"
     Style="{StaticResource DefaultThemeContentDialogStyle}"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    d:PrimaryButtonText="Create"
+    d:SecondaryButtonText="Cancel"
+    d:Title="Create Collection">
 
     <Grid
         MinWidth="{Binding MinWidth}"
@@ -53,6 +56,7 @@
                     <TextBlock
                         FontFamily="{StaticResource SymbolThemeFontFamily}"
                         Foreground="{ThemeResource AccentFillColorDefaultBrush}"
+                        IsTextScaleFactorEnabled="False"
                         Text="&#xE897;" />
                 </controls:UXButton>
 
@@ -69,7 +73,10 @@
                             Margin="0 -2"
                             Orientation="Horizontal"
                             Spacing="4">
-                            <TextBlock x:Uid="SmartCollectionFilePathFilter" VerticalAlignment="Center" />
+                            <TextBlock
+                                x:Uid="SmartCollectionFilePathFilter"
+                                VerticalAlignment="Center"
+                                d:Text="File Path Filter" />
                             <Border
                                 Padding="4 2"
                                 VerticalAlignment="Center"
@@ -90,7 +97,10 @@
                             Margin="0 -2"
                             Orientation="Horizontal"
                             Spacing="4">
-                            <TextBlock x:Uid="SmartCollectionFoundryFilter" VerticalAlignment="Center" />
+                            <TextBlock
+                                x:Uid="SmartCollectionFoundryFilter"
+                                VerticalAlignment="Center"
+                                d:Text="Foundry Filter" />
                             <Border
                                 Padding="4 2"
                                 VerticalAlignment="Center"
@@ -111,7 +121,10 @@
                             Margin="0 -2"
                             Orientation="Horizontal"
                             Spacing="4">
-                            <TextBlock x:Uid="SmartCollectionDesignerFilter" VerticalAlignment="Center" />
+                            <TextBlock
+                                x:Uid="SmartCollectionDesignerFilter"
+                                VerticalAlignment="Center"
+                                d:Text="Designer Filter" />
                             <Border
                                 Padding="4 2"
                                 VerticalAlignment="Center"
@@ -132,7 +145,10 @@
                             Margin="0 -2"
                             Orientation="Horizontal"
                             Spacing="4">
-                            <TextBlock VerticalAlignment="Center" Text="Character filter" />
+                            <TextBlock
+                                x:Uid="SmartCollectionCharacterFilter"
+                                VerticalAlignment="Center"
+                                d:Text="Character Filter" />
                             <Border
                                 Padding="4 2"
                                 VerticalAlignment="Center"
@@ -142,7 +158,8 @@
                                     FontFamily="Consolas"
                                     FontSize="12"
                                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    Text="char:" />
+                                    Text="{core:Localizer Key=CharacterFilter}"
+                                    d:Text="char:" />
                             </Border>
                         </StackPanel>
                     </TextBox.Header>
@@ -154,7 +171,7 @@
             x:Name="FilterPreview"
             x:Load="{x:Bind TemplateSettings.IsSmartCollection, Mode=OneWay}"
             Grid.Column="1"
-            Width="208"
+            Width="256"
             Margin="16 0 -8 0"
             Padding="8"
             Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"

diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
@@ -39,7 +39,7 @@ public void Populate(IFontCollection c)
         {
             IsSmartCollection = true;
 
-            Populate("char:",       Localization.Get("CharFilter"),    s => FilterCharacters = s);
+            Populate("char:",       Localization.Get("CharacterFilter"),    s => FilterCharacters = s);
             Populate("filepath:",   Localization.Get("FilePathFilter"),     s => FilterFilePath = s);
             Populate("foundry:",    Localization.Get("FoundryFilter"),      s => FilterFoundry = s);
             Populate("designer:",   Localization.Get("DesignerFilter"),     s => FilterDesigner = s);

diff --git a/CharacterMap/CharacterMap/Core/FontFinder.cs b/CharacterMap/CharacterMap/Core/FontFinder.cs
@@ -653,7 +653,7 @@ public static FontQueryResults QueryFontList(
         if (!string.IsNullOrWhiteSpace(query))
         {
             string q;
-            if (IsQuery(query, Localization.Get("CharFilter"), "char:", out q))
+            if (IsQuery(query, Localization.Get("CharacterFilter"), "char:", out q))
             {
                 foreach (var ch in q)
                 {

diff --git a/CharacterMap/CharacterMap/Core/Properties.cs b/CharacterMap/CharacterMap/Core/Properties.cs
@@ -1479,7 +1479,7 @@ static partial void OnPreviewStringTriggerChanged(DependencyObject d, Dependency
             if (t.GetFirstAncestorOfType<PreviewTip>() is { } pt 
                 && GetTag(pt) is MainViewModel vm
                 && vm.FontSearch is { Length: > 4 } query
-                && FontFinder.IsQuery(query, Localization.Get("CharFilter"), "char:", out string q))
+                && FontFinder.IsQuery(query, Localization.Get("CharacterFilter"), "char:", out string q))
                 text = q;
 
             // Set TextBlock text

diff --git a/CharacterMap/CharacterMap/MultilingualResources/CharacterMap.de-DE.xlf b/CharacterMap/CharacterMap/MultilingualResources/CharacterMap.de-DE.xlf
@@ -20,7 +20,7 @@
         </trans-unit>
         <trans-unit id="BtnCopy.Text" translate="yes" xml:space="preserve">
           <source>Copy as text</source>
-          <target state="translated">Kopie (nur Zeichen)</target>
+          <target state="translated">Als Text kopieren</target>
         </trans-unit>
         <trans-unit id="BtnSelect.Content" translate="yes" xml:space="preserve">
           <source>Select</source>
@@ -32,8 +32,7 @@
         </trans-unit>
         <trans-unit id="ColorGlyphToggle.OffContent" translate="yes" xml:space="preserve">
           <source>Monochrome Glyphs</source>
-          <target state="needs-review-translation">Monochrome Glyphen</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Monochrome Glyphen</target>
         </trans-unit>
         <trans-unit id="ColorGlyphToggle.OnContent" translate="yes" xml:space="preserve">
           <source>Color glyphs</source>
@@ -961,8 +960,7 @@ Erwäge, die Details über diesen Fehler bei GitHub mitzuteilen, damit wir dir b
         </trans-unit>
         <trans-unit id="OptionScriptCJKUnifiedIdeographs.Text" translate="yes" xml:space="preserve">
           <source>CJK (Chinese/Japanese/Korean)</source>
-          <target state="needs-review-translation">CJK</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">CJK (Chinesisch/Japanisch/Koreanisch)</target>
         </trans-unit>
         <trans-unit id="OptionScriptCyrillic.Text" translate="yes" xml:space="preserve">
           <source>Cyrillic</source>
@@ -2082,7 +2080,7 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
         </trans-unit>
         <trans-unit id="FileNameWriterStringFormat" translate="yes" xml:space="preserve">
           <source>{0}, e.g. {1}</source>
-          <target state="new">{0}, e.g. {1}</target>
+          <target state="translated">{0}, z. B. {1}</target>
         </trans-unit>
         <trans-unit id="FileNameWriterUnicodeCPDesc" translate="yes" xml:space="preserve">
           <source>Unicode index/codepoint value</source>
@@ -2106,7 +2104,7 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
         </trans-unit>
         <trans-unit id="ExampleFormat" translate="yes" xml:space="preserve">
           <source>e.g. {0}</source>
-          <target state="new">e.g. {0}</target>
+          <target state="translated">z. B. {0}</target>
         </trans-unit>
         <trans-unit id="FileNameWriterFontVerDesc" translate="yes" xml:space="preserve">
           <source>Font version number, if applicable</source>
@@ -2161,11 +2159,6 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
           <target state="new">Restore</target>
           <note from="MultilingualBuild" annotates="source" priority="2">Opposite of Fullscreen</note>
         </trans-unit>
-        <trans-unit id="CharFilter" translate="yes" xml:space="preserve">
-          <source>char:</source>
-          <target state="new">char:</target>
-          <note from="MultilingualBuild" annotates="source" priority="2">Command used for character searches. Should be short.</note>
-        </trans-unit>
         <trans-unit id="CreateSmartCollectionCheck.Content" translate="yes" xml:space="preserve">
           <source>Create as Smart Collection</source>
           <target state="new">Create as Smart Collection</target>
@@ -2174,6 +2167,11 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
           <source>View online documentation for Smart Collections</source>
           <target state="new">View online documentation for Smart Collections</target>
         </trans-unit>
+        <trans-unit id="CharacterFilter" translate="yes" xml:space="preserve">
+          <source>char:</source>
+          <target state="new">char:</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">Command used for character searches. Should be short.</note>
+        </trans-unit>
         <trans-unit id="DesignerFilter" translate="yes" xml:space="preserve">
           <source>designer:</source>
           <target state="new">designer:</target>
@@ -2201,6 +2199,10 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
           <source>Foundry Filter</source>
           <target state="new">Foundry Filter</target>
         </trans-unit>
+        <trans-unit id="SmartCollectionCharacterFilter.Text" translate="yes" xml:space="preserve">
+          <source>Character Filter</source>
+          <target state="new">Character Filter</target>
+        </trans-unit>
         <trans-unit id="DigEditCollection.PrimaryButtonText" translate="yes" xml:space="preserve">
           <source>Edit</source>
           <target state="new">Edit</target>
@@ -2239,7 +2241,7 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
         </trans-unit>
         <trans-unit id="RefreshResultsLabel.Text" translate="yes" xml:space="preserve">
           <source>Refresh results</source>
-          <target state="new">Refresh results</target>
+          <target state="translated">Ergebnisse aktualisieren</target>
         </trans-unit>
         <trans-unit id="ResultsCountLabel" translate="yes" xml:space="preserve">
           <source>{0} results</source>
@@ -2257,6 +2259,10 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
           <source>Font List Preview ToolTip</source>
           <target state="new">Font List Preview ToolTip</target>
         </trans-unit>
+        <trans-unit id="CalligraphyPenInkToolbarButtonToolTip" translate="yes" xml:space="preserve">
+          <source>Calligraphy pen</source>
+          <target state="translated">Füllfederhalter</target>
+        </trans-unit>
       </group>
     </body>
   </file>

diff --git a/CharacterMap/CharacterMap/MultilingualResources/CharacterMap.en-GB.xlf b/CharacterMap/CharacterMap/MultilingualResources/CharacterMap.en-GB.xlf
@@ -28,8 +28,7 @@
         </trans-unit>
         <trans-unit id="ColoredGlyphLabel.Text" translate="yes" xml:space="preserve">
           <source>Colored Glyph</source>
-          <target state="needs-review-translation">Colourization</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Coloured Glyph</target>
         </trans-unit>
         <trans-unit id="ColorGlyphToggle.OffContent" translate="yes" xml:space="preserve">
           <source>Monochrome Glyphs</source>
@@ -2160,11 +2159,6 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
           <target state="new">Restore</target>
           <note from="MultilingualBuild" annotates="source" priority="2">Opposite of Fullscreen</note>
         </trans-unit>
-        <trans-unit id="CharFilter" translate="yes" xml:space="preserve">
-          <source>char:</source>
-          <target state="new">char:</target>
-          <note from="MultilingualBuild" annotates="source" priority="2">Command used for character searches. Should be short.</note>
-        </trans-unit>
         <trans-unit id="CreateSmartCollectionCheck.Content" translate="yes" xml:space="preserve">
           <source>Create as Smart Collection</source>
           <target state="new">Create as Smart Collection</target>
@@ -2173,6 +2167,11 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
           <source>View online documentation for Smart Collections</source>
           <target state="new">View online documentation for Smart Collections</target>
         </trans-unit>
+        <trans-unit id="CharacterFilter" translate="yes" xml:space="preserve">
+          <source>char:</source>
+          <target state="new">char:</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">Command used for character searches. Should be short.</note>
+        </trans-unit>
         <trans-unit id="DesignerFilter" translate="yes" xml:space="preserve">
           <source>designer:</source>
           <target state="new">designer:</target>
@@ -2200,6 +2199,10 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
           <source>Foundry Filter</source>
           <target state="new">Foundry Filter</target>
         </trans-unit>
+        <trans-unit id="SmartCollectionCharacterFilter.Text" translate="yes" xml:space="preserve">
+          <source>Character Filter</source>
+          <target state="new">Character Filter</target>
+        </trans-unit>
         <trans-unit id="DigEditCollection.PrimaryButtonText" translate="yes" xml:space="preserve">
           <source>Edit</source>
           <target state="new">Edit</target>
@@ -2256,6 +2259,10 @@ Otherwise, "All Fonts" is selected by default on every launch.</target>
           <source>Font List Preview ToolTip</source>
           <target state="new">Font List Preview ToolTip</target>
         </trans-unit>
+        <trans-unit id="CalligraphyPenInkToolbarButtonToolTip" translate="yes" xml:space="preserve">
+          <source>Calligraphy pen</source>
+          <target state="new">Calligraphy pen</target>
+        </trans-unit>
       </group>
     </body>
   </file>