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:
parent
862365354e
commit
27e287359c
2 changed files with 2 additions and 0 deletions
|
@ -14,6 +14,7 @@
|
|||
"Description[fr]": "Configurer la synchronisation des périphériques",
|
||||
"Description[gl]": "Configurar a sincronización de dispositivos.",
|
||||
"Description[he]": "הגדרת סנכרון מכשירים",
|
||||
"Description[hu]": "Eszközszinkronizáció beállítása",
|
||||
"Description[ia]": "Configura Synchronisation de dispositivo",
|
||||
"Description[is]": "Grunnstilla samstillingu tækja",
|
||||
"Description[it]": "Configura la sincronizzazione del dispositivo",
|
||||
|
|
|
@ -62,6 +62,7 @@
|
|||
"Description[fr]": "Gérer les appareils connectés",
|
||||
"Description[gl]": "Xestionar os dispositivos conectados.",
|
||||
"Description[he]": "ניהול התקנים מחוברים",
|
||||
"Description[hu]": "Csatlakoztatott eszközök kezelése",
|
||||
"Description[ia]": "Gere dispositivos connectite",
|
||||
"Description[is]": "Stjórna tengdum tækjum",
|
||||
"Description[it]": "Gestisci i dispositivi connessi",
|
||||
|
|
Loading…
Reference in a new issue