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"
2021-11-29 01:38:36 +00:00 · 2021-11-29 01:38:36 +00:00 · 3bb3c604c8
commit 3bb3c604c8
parent 20e5fc62b1
3 changed files with 3 additions and 0 deletions
--- a/src/effects/blur/blur_config.desktop
+++ b/src/effects/blur/blur_config.desktop
@ -37,6 +37,7 @@ Name[he]=טשטוש
 Name[hi]=धुंधला करें
 Name[hne]=धुंधला करव
 Name[hr]=Mrlja
+Name[hsb]=Młowojty
 Name[hu]=Elmosódás
 Name[ia]=Obscura (Blur)
 Name[id]=Buram
--- a/src/effects/login/package/metadata.desktop
+++ b/src/effects/login/package/metadata.desktop
@ -32,6 +32,7 @@ Name[he]=כניסה
 Name[hi]=लॉगइन
 Name[hne]=लागइन
 Name[hr]=Prijava
+Name[hsb]=Přizjewjenje
 Name[hu]=Bejelentkezés
 Name[ia]=Accesso de identification
 Name[id]=Login
--- a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
+++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
@ -34,6 +34,7 @@ Name[he]=פלסטיק
 Name[hi]=प्लास्टिक
 Name[hne]=प्लास्टिक
 Name[hr]=Plastika
+Name[hsb]=Plastik
 Name[hu]=Plastik
 Name[ia]=Plastik
 Name[id]=Plastik