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"
This commit is contained in:
l10n daemon script 2021-11-28 01:32:42 +00:00
parent 1d95dd3eaf
commit 20e5fc62b1
3 changed files with 0 additions and 3 deletions

View file

@ -37,7 +37,6 @@ 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

View file

@ -32,7 +32,6 @@ 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

View file

@ -34,7 +34,6 @@ Name[he]=פלסטיק
Name[hi]=ि
Name[hne]=ि
Name[hr]=Plastika
Name[hsb]=Plastik
Name[hu]=Plastik
Name[ia]=Plastik
Name[id]=Plastik