Commit fd8510db 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 0a9efc16
...@@ -5,6 +5,7 @@ Exec=artikulate -caption %c %i ...@@ -5,6 +5,7 @@ Exec=artikulate -caption %c %i
Icon=artikulate Icon=artikulate
X-DocPath=artikulate/index.html X-DocPath=artikulate/index.html
GenericName=Artikulate Pronunciation Trainer GenericName=Artikulate Pronunciation Trainer
GenericName[ast]=Entrenador de pronunciación d'Artikulate
GenericName[bs]=Artikulate vježba izgovora GenericName[bs]=Artikulate vježba izgovora
GenericName[ca]=Entrenador de la pronunciació Artikulate GenericName[ca]=Entrenador de la pronunciació Artikulate
GenericName[ca@valencia]=Entrenador de la pronunciació Artikulate GenericName[ca@valencia]=Entrenador de la pronunciació Artikulate
......
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