Commit 3bae1281 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 4d2f98cb
......@@ -24,6 +24,7 @@
"Name[pl]": "Rozpocznij pokaz slajdów",
"Name[pt]": "Iniciar uma Apresentação",
"Name[pt_BR]": "Iniciar uma apresentação de slides",
"Name[ro]": "Pornește o prezentare",
"Name[ru]": "Запустить слайд-шоу",
"Name[sk]": "Spustiť prezentáciu",
"Name[sl]": "Začni predstavitev",
......
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