Merge pull request #2 from yakovypg/Desktop

Merge Desktop into master
yakovypg · Aug 9, 2023 · 1fa9eb5 · 1fa9eb5
2 parents 2c8a621 + 6692b59
commit 1fa9eb5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/Applications/YpdfDesktop/Models/Localization/English.cs b/Applications/YpdfDesktop/Models/Localization/English.cs
@@ -89,8 +89,8 @@ protected override void SetLocale()
             AddPageNumbers = "add page nums";
             AddWatermark = "add watermark";
             RemoveWatermark = "rm watermark";
-            ImageToPdf = "image2pdf";
-            TextToPdf = "text2pdf";
+            ImageToPdf = "image to pdf";
+            TextToPdf = "text to pdf";
             ExtractImages = "extract images";
             ExtractText = "extract text";
             SetPassword = "set password";

diff --git a/Applications/YpdfDesktop/Views/Pages/ToolsView.axaml b/Applications/YpdfDesktop/Views/Pages/ToolsView.axaml
@@ -90,8 +90,11 @@
 									  Value="{Binding IconName}" />
 
 							<TextBlock Grid.Row="1"
+									   Margin="3, 5"
+									   TextAlignment="Center"
 									   VerticalAlignment="Center"
 									   HorizontalAlignment="Center"
+									   TextTrimming="CharacterEllipsis"
 									   Foreground="{Binding DataContext.SettingsVM.Theme.ToolTileTextForeground, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
 									   Text="{Binding Name}" />
 						</Grid>

diff --git a/Applications/YpdfDesktop/YpdfDesktop.csproj b/Applications/YpdfDesktop/YpdfDesktop.csproj
@@ -14,8 +14,8 @@
 	<PackageReadmeFile>README.md</PackageReadmeFile>
 	<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
 	<PackageTags>pdf;pdf-converter;split-pdf;merge-pdf;pdf-tools;pdf2image;pdf-watermark;pdf2text;pdf-password;rotate-pdf;image2pdf;compress-pdf;text2pdf;divide-pdf;crop-pdf;reorder-pdf;remove-pages-pdf;page-numbers-pdf</PackageTags>
-	<FileVersion>1.0.1.0</FileVersion>
-	<AssemblyVersion>1.0.1.0</AssemblyVersion>
+	<FileVersion>1.0.1.1</FileVersion>
+	<AssemblyVersion>1.0.1.1</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Applications/ypdf/ypdf.csproj b/Applications/ypdf/ypdf.csproj
@@ -12,8 +12,8 @@
 	<PackageReadmeFile>README.md</PackageReadmeFile>
 	<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
 	<PackageTags>pdf;pdf-converter;split-pdf;merge-pdf;pdf-tools;pdf2image;pdf-watermark;pdf2text;pdf-password;rotate-pdf;image2pdf;compress-pdf;text2pdf;divide-pdf;crop-pdf;reorder-pdf;remove-pages-pdf;page-numbers-pdf</PackageTags>
-	<FileVersion>1.0.1.0</FileVersion>
-	<AssemblyVersion>1.0.1.0</AssemblyVersion>
+	<FileVersion>1.0.1.1</FileVersion>
+	<AssemblyVersion>1.0.1.1</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Components/Locales/English.json b/Components/Locales/English.json
@@ -78,8 +78,8 @@
   "AddPageNumbers": "add page nums",
   "AddWatermark": "add watermark",
   "RemoveWatermark": "rm watermark",
-  "ImageToPdf": "image2pdf",
-  "TextToPdf": "text2pdf",
+  "ImageToPdf": "image to pdf",
+  "TextToPdf": "text to pdf",
   "ExtractImages": "extract images",
   "ExtractText": "extract text",
   "SetPassword": "set password",

diff --git a/Components/Locales/Russian.json b/Components/Locales/Russian.json
@@ -73,9 +73,9 @@
   "Merge": "объединить",
   "Compress": "сжать",
   "HandlePages": "страницы",
-  "CropPages": "обрезать стр.",
-  "DividePages": "делить стр.",
-  "AddPageNumbers": "номера стр.",
+  "CropPages": "обрезать",
+  "DividePages": "разделить",
+  "AddPageNumbers": "номера",
   "AddWatermark": "водяной знак",
   "RemoveWatermark": "водяной знак",
   "ImageToPdf": "фото в pdf",