Commit 1222b988 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 0798ef9c
......@@ -19,6 +19,7 @@
"Name[fr]": "Démarrer un diaporama",
"Name[ia]": "Starta un presentation (slideshow)",
"Name[it]": "Avvia una presentazione",
"Name[ko]": "슬라이드 쇼 시작",
"Name[nl]": "Een diavoorstelling starten",
"Name[nn]": "Start ei lysbiletframvising",
"Name[pa]": "ਸਲਾਇਡ-ਸ਼ੋਅ ਸ਼ੁਰੂ ਕਰੋ",
......
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