Commit 0996cdd6 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 9869ab09
......@@ -8,6 +8,7 @@ Name[es]=Mover a directorio
Name[fi]=Siirrä kansioon
Name[fr]=Déplacer dans le dossier
Name[gl]=Mover ao cartafol
Name[it]=Sposta nella cartella
Name[nb]=Flytt til mappe
Name[nl]=Naar map verplaatsen
Name[pl]=Przenieś do katalogu
......
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