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
f700de56f8
commit
e84ca82c9a
2 changed files with 4 additions and 0 deletions
|
@ -13,6 +13,7 @@
|
|||
"Description[fr]": "Masquer le pointeur de la souris en l'absence d'activités ou d'évènements de clavier",
|
||||
"Description[gl]": "Agochar o cursor en caso de inactividade ou entrada do teclado.",
|
||||
"Description[he]": "להסתיר את סמן העכבר בהעדר פעילות או קלט מקלדת",
|
||||
"Description[hu]": "Egérmutató elrejtése inaktivitás vagy billentyűzet-bevitel esetén",
|
||||
"Description[ia]": "Cela cursor de mus sur inactivitate o ingresso de claviero",
|
||||
"Description[is]": "Fela músarbendil við aðgerðaleysi eða innslátt",
|
||||
"Description[it]": "Nascondi il puntatore del mouse in caso di inattività o inserimento da tastiera",
|
||||
|
@ -42,6 +43,7 @@
|
|||
"Name[fr]": "Masquer le pointeur",
|
||||
"Name[gl]": "Agochar o cursor",
|
||||
"Name[he]": "הסתרת סמן",
|
||||
"Name[hu]": "Kurzor elrejtése",
|
||||
"Name[ia]": "Cela Cursor",
|
||||
"Name[is]": "Fela bendil",
|
||||
"Name[it]": "Nascondi il puntatore",
|
||||
|
|
|
@ -65,6 +65,7 @@
|
|||
"Description[fr]": "Afficher le nom des écrans",
|
||||
"Description[gl]": "Amosar os nomes das pantallas.",
|
||||
"Description[he]": "הצגת שמות מסכים",
|
||||
"Description[hu]": "Képernyőnevek megjelenítése",
|
||||
"Description[ia]": "Monstra nomines de schermo",
|
||||
"Description[is]": "Birta skjáheiti",
|
||||
"Description[it]": "Mostra i nomi degli schermi",
|
||||
|
@ -99,6 +100,7 @@
|
|||
"Name[fr]": "Positionnement de la sortie",
|
||||
"Name[gl]": "Localizador de saída",
|
||||
"Name[he]": "מאתר פלט",
|
||||
"Name[hu]": "Kimenetkereső",
|
||||
"Name[ia]": "Locator de Exito",
|
||||
"Name[is]": "Úttakshnitill",
|
||||
"Name[it]": "Localizzatore uscita",
|
||||
|
|
Loading…
Reference in a new issue