Commit 102332df 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 70700b86
......@@ -20,6 +20,7 @@ Name[ca]=Pantalla completa
Name[cs]=Celá obrazovka
Name[es]=Pantalla completa
Name[fr]=Plein écran
Name[ia]=Schermo plen
Name[it]=Schermo intero
Name[ko]=전체 화면
Name[nl]=Volledig scherm
......
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