Commit 7aa3f015 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 0395d029
......@@ -30,6 +30,7 @@
"Name[fi]": "GStreamer-taustajärjestelmä",
"Name[gl]": "Infraestrutura de GStreamer",
"Name[nl]": "GStreamer-backend",
"Name[nn]": "GStreamer-motor",
"Name[pl]": "Silnik GStreamer",
"Name[pt]": "Infra-Estrutura para o GStreamer",
"Name[pt_BR]": "Infraestrutura do GStreamer",
......
......@@ -24,6 +24,7 @@ GenericName[ko]=Artikulate 발음 타이머
GenericName[mr]=आर्टिक्युलेट उच्चारण प्रशिक्षक
GenericName[nds]=Artikulate - Utspraak öven
GenericName[nl]=Artikulate Trainingsprogramma voor uitspraak
GenericName[nn]=Artikulate uttaleøving
GenericName[pl]=Trener artykułowanej wymowy
GenericName[pt]=Treino de Pronúncia Artikulate
GenericName[pt_BR]=Treinador de Pronúncia Artikulate
......@@ -61,6 +62,7 @@ Name[ko]=Artikulate
Name[mr]=आर्टिक्युलेट
Name[nds]=Artikulate
Name[nl]=Artikulate
Name[nn]=Artikulate
Name[pl]=Artikulate
Name[pt]=Artikulate
Name[pt_BR]=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