SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
lengyijun · Mar 28, 2024 · 2ae6717 · 2ae6717
1 parent 081ec7d
commit 2ae6717
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop
@@ -195,6 +195,7 @@ InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;
 X-KDE-Keywords=XPS
 X-KDE-Keywords[ar]=XPS
+X-KDE-Keywords[ast]=XPS
 X-KDE-Keywords[az]=XPS
 X-KDE-Keywords[be]=XPS
 X-KDE-Keywords[bg]=XPS

diff --git a/generators/xps/org.kde.mobile.okular_xps.desktop b/generators/xps/org.kde.mobile.okular_xps.desktop
@@ -189,6 +189,7 @@ InitialPreference=2
 NoDisplay=true
 X-KDE-Keywords=XPS
 X-KDE-Keywords[ar]=XPS
+X-KDE-Keywords[ast]=XPS
 X-KDE-Keywords[az]=XPS
 X-KDE-Keywords[be]=XPS
 X-KDE-Keywords[bg]=XPS

diff --git a/okular_part.json b/okular_part.json
@@ -9,6 +9,7 @@
         ],
         "Name": "Okular",
         "Name[ar]": "اوكلار",
+        "Name[ast]": "Okular",
         "Name[az]": "Okular",
         "Name[be]": "Okular",
         "Name[bg]": "Okular",