mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
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
df6fb87ac8
commit
bfd4327177
1 changed files with 2 additions and 0 deletions
|
|
@ -50,6 +50,7 @@
|
|||
"Description[eo]": "Sistemnaviga prakomenca modulo por Plasma Mobile",
|
||||
"Description[es]": "Módulo de navegación del sistema del primer inicio para Plasma Mobile",
|
||||
"Description[fr]": "Module de démarrage initial pour le système de navigation pour Plasma Mobile",
|
||||
"Description[gl]": "Módulo de inicio de navegación do sistema para Plasma Mobile.",
|
||||
"Description[he]": "מודול להפעלה ראשונית של ניווט במערכת לפלזמה לניידים",
|
||||
"Description[ia]": "Modulo initialstart de Systema de Navigation per Plasma Mobile",
|
||||
"Description[it]": "Modulo di avvio iniziale della navigazione del sistema per Plasma Mobile",
|
||||
|
|
@ -67,6 +68,7 @@
|
|||
"Name[ca]": "Navegació del sistema",
|
||||
"Name[es]": "Navegación del sistema",
|
||||
"Name[fr]": "Système de navigation",
|
||||
"Name[gl]": "Navegación do sistema",
|
||||
"Name[he]": "ניווט במערכת",
|
||||
"Name[ia]": "Systema de Navigation",
|
||||
"Name[it]": "Navigazione del sistema",
|
||||
|
|
|
|||
Loading…
Reference in a new issue