Commit 45b65cd3 authored by Script Kiddy's avatar Script Kiddy

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"
parent 98a6cb9b
......@@ -34,6 +34,7 @@ Name[pt_BR]=Ferramentas externas
Name[ro]=Unelte externe
Name[ru]=Внешние инструменты
Name[si]=බාහිර මෙවලම්
Name[sk]=Externé nástroje
Name[sv]=Externa verktyg
Name[tg]=Асбобҳои берунӣ
Name[ug]=سىرتقى قوراللار
......@@ -77,6 +78,7 @@ Comment[pt_BR]=Ferramentas externas
Comment[ro]=Unelte externe
Comment[ru]=Внешние инструменты
Comment[si]=බාහිර මෙවලම්
Comment[sk]=Externé nástroje
Comment[sv]=Externa verktyg
Comment[tg]=Асбобҳои берунӣ
Comment[ug]=سىرتقى قوراللار
......@@ -13,6 +13,7 @@
"Name[el]": "Friedrich W. H. Kossebau",
"Name[en_GB]": "Friedrich W. H. Kossebau",
"Name[es]": "Friedrich W. H. Kossebau",
"Name[et]": "Friedrich W. H. Kossebau",
"Name[eu]": "Friedrich W. H. Kossebau",
"Name[fi]": "Friedrich W. H. Kossebau",
"Name[fr]": "Friedrich W. H. Kossebau",
......@@ -49,6 +50,7 @@
"Description[el]": "Προεπισκόπηση του εγγράφου στον τύπο αποθήκευσης προορισμού",
"Description[en_GB]": "Preview the document in the target format",
"Description[es]": "Mostrar vista previa del documento en el formato de destino",
"Description[et]": "Dokumendi eelvaatlus sihtvormingus",
"Description[eu]": "Aurreikusi dokumentua helburu formatuan",
"Description[fi]": "Esikatsele asiakirjaa kohdemuodossa",
"Description[fr]": "Aperçu du document dans le format de destination",
......@@ -87,6 +89,7 @@
"Name[el]": "Προεπισκόπηση εγγράφου",
"Name[en_GB]": "Document Preview",
"Name[es]": "Vista previa del documento",
"Name[et]": "Dokumendi eelvaatlus",
"Name[eu]": "Dokumentua aurreikusi",
"Name[fi]": "Asiakirjan esikatselu",
"Name[fr]": "Aperçu de document",
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment