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 2017-12-25 04:44:28 +01:00
parent ff97938fbc
commit 0abc5e020f
4 changed files with 4 additions and 4 deletions

View file

@ -23,7 +23,7 @@ Name[gl]=Animación ao premer o rato
Name[he]=הנפשה של לחיצה עם העכבר
Name[hu]=Egérkattintás animáció
Name[ia]=Animation de click de mus
Name[id]=Animasi Klik Tetikus
Name[id]=Animasi Klik Mouse
Name[is]=Hreyfingar við músarsmell
Name[it]=Animazione del clic del mouse
Name[ja]=

View file

@ -37,7 +37,7 @@ Name[hne]=मुसुवा चिनहा
Name[hr]=Oznaka miša
Name[hu]=Egérnyom
Name[ia]=Marca de mus
Name[id]=Tanda Tetikus
Name[id]=Tanda Mouse
Name[is]=Músarspor
Name[it]=Pennarello
Name[ja]=

View file

@ -38,7 +38,7 @@ Name[hne]=मुसुवा ट्रैक करव
Name[hr]=Praćenje miša
Name[hu]=Egérkövetés
Name[ia]=Tracia mus
Name[id]=Lacak Tetikus
Name[id]=Lacak Mouse
Name[is]=Elta mús
Name[it]=Trova il mouse
Name[ja]=

View file

@ -117,7 +117,7 @@ Comment[gl]=Accións do rato nas xanelas
Comment[he]=הגדרות פעולות עכבר
Comment[hu]=Egérműveletek az ablakokon
Comment[ia]=Actiones de mus sur fenestras
Comment[id]=Aksi Tetikus di Jendela
Comment[id]=Aksi Mouse di Jendela
Comment[it]=Azioni del mouse sulle finestre
Comment[ja]=
Comment[ko]=