Commit ef06fa9c 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 f5670b3e
Pipeline #6580 passed with stage
in 7 minutes and 41 seconds
......@@ -9,6 +9,7 @@
"Name[ca]": "Compara/fusiona fitxers/directoris amb el KDiff3",
"Name[cs]": "Porovnávejte/slučujte soubory/adresáře pomocí KDiff3",
"Name[de]": "Dateien und Ordner vergleichen und zusammenführen mit KDiff3",
"Name[el]": "Σύγκριση/Συγχώνευση αρχείων/καταλόγων με το KDiff3",
"Name[en_GB]": "Compare/Merge Files/Directories with KDiff3",
"Name[es]": "Comparar o fusionar archivos o directorios con KDiff3",
"Name[fi]": "Vertaa ja yhdistä tiedostoja ja kansioita KDiff3:lla",
......
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