Commit 2e7248a8 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 c95c6899
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"Name[it]": "Avvia una presentazione", "Name[it]": "Avvia una presentazione",
"Name[nl]": "Een diavoorstelling starten", "Name[nl]": "Een diavoorstelling starten",
"Name[nn]": "Start ei lysbiletframvising", "Name[nn]": "Start ei lysbiletframvising",
"Name[pa]": "ਸਲਾਇਡ-ਸ਼ੋਅ ਸ਼ੁਰੂ ਕਰੋ",
"Name[pl]": "Rozpocznij pokaz slajdów", "Name[pl]": "Rozpocznij pokaz slajdów",
"Name[pt]": "Iniciar uma Apresentação", "Name[pt]": "Iniciar uma Apresentação",
"Name[pt_BR]": "Iniciar uma apresentação de slides", "Name[pt_BR]": "Iniciar uma apresentação de slides",
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