Commit c1b1555a 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 ac3cf9cf
......@@ -11,6 +11,7 @@
"Name[el]": "Nicolas Fella",
"Name[en_GB]": "Nicolas Fella",
"Name[es]": "Nicolas Fella",
"Name[eu]": "Nicolas Fella",
"Name[fi]": "Nicolas Fella",
"Name[fr]": "Nicolas Fella",
"Name[gl]": "Nicolas Fella",
......@@ -42,6 +43,7 @@
"Description[el]": "Αλλαγή ετικετών σρχείων",
"Description[en_GB]": "Change file tags",
"Description[es]": "Cambiar etiquetas del archivo",
"Description[eu]": "Aldatu fitxategiko etiketak",
"Description[fi]": "Muuta tiedostotunnisteita",
"Description[fr]": "Modifier les étiquettes du fichier",
"Description[gl]": "Cambiar as etiquetas do ficheiro",
......@@ -77,6 +79,7 @@
"Name[el]": "Ετικέτες",
"Name[en_GB]": "Tags",
"Name[es]": "Etiquetas",
"Name[eu]": "Etiketak",
"Name[fi]": "Tunnisteet",
"Name[fr]": "Étiquettes",
"Name[gl]": "Etiquetas",
......
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