Commit dc523cd6 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 4d5cda8c
......@@ -3,6 +3,7 @@
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for GStreamer.",
"Description[az]": "GStreamer üçün Səs modulu.",
"Description[ca@valencia]": "Dorsal de so pel GStreamer.",
"Description[ca]": "Dorsal de so pel GStreamer.",
"Description[cs]": "Podpůrná vrstva zvuku pro GStreamer.",
......@@ -35,6 +36,7 @@
"Id": "artikulate_gstreamer_backend",
"License": "GPL",
"Name": "GStreamer Backend",
"Name[az]": "GStreamer Modulu",
"Name[ca@valencia]": "Dorsal GStreamer",
"Name[ca]": "Dorsal GStreamer",
"Name[cs]": "Podpůrná vrstva GStreamer",
......
......@@ -3,6 +3,7 @@
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for QtMultimedia.",
"Description[az]": "QtMultimedia üçün Səs modulu.",
"Description[ca@valencia]": "Dorsal de so pel QtMultimedia.",
"Description[ca]": "Dorsal de so pel QtMultimedia.",
"Description[cs]": "Podpůrná vrstva zvuku pro QtMultimedia.",
......@@ -35,6 +36,7 @@
"Id": "artikulate_qtmultimedia_backend",
"License": "GPL",
"Name": "QtMultimedia Backend",
"Name[az]": "QtMultimedia Modulu",
"Name[ca@valencia]": "Dorsal QtMultimedia",
"Name[ca]": "Dorsal QtMultimedia",
"Name[cs]": "Podpůrná vrstva QtMultimedia",
......
......@@ -8,6 +8,7 @@ Exec=artikulate -qwindowtitle "%c" %i
Icon=artikulate
X-DocPath=artikulate/index.html
GenericName=Artikulate Pronunciation Trainer
GenericName[az]=Artikulate Tələffüz Təlimi
GenericName[bs]=Artikulate vježba izgovora
GenericName[ca]=Entrenador de la pronunciació Artikulate
GenericName[ca@valencia]=Entrenador de la pronunciació Artikulate
......@@ -48,6 +49,7 @@ GenericName[zh_CN]=Artikulate 读音训练器
GenericName[zh_TW]=Artikulate 發音訓練師
Terminal=false
Name=Artikulate
Name[az]=Artikulate
Name[bs]=Artikulate
Name[ca]=Artikulate
Name[ca@valencia]=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