Commit d08dc9de authored by Script Kiddy's avatar Script Kiddy

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 f5358a0b
......@@ -28,7 +28,6 @@
"Description[sv]": "Ljudgränssnitt för Gstreamer.",
"Description[tr]": "GStreamer için ses arka yüzü.",
"Description[uk]": "Звуковий модуль для GStreamer.",
"Description[x-test]": "xxSound backend for GStreamer.xx",
"Description[zh_CN]": "GStreamer 声音后端",
"Description[zh_TW]": "GStreamer 音效後端介面。",
"Id": "artikulate_gstreamer_backend",
......@@ -59,7 +58,6 @@
"Name[sv]": "Gstreamer-gränssnitt",
"Name[tr]": "GStreamer Arka Yüzü",
"Name[uk]": "Модуль GStreamer",
"Name[x-test]": "xxGStreamer Backendxx",
"Name[zh_CN]": "GStreamer 后端",
"Name[zh_TW]": "GStreamer 後端介面",
"ServiceTypes": [
......
......@@ -28,7 +28,6 @@
"Description[sv]": "Ljudgränssnitt för QtMultimedia.",
"Description[tr]": "QtMultimedia için ses arka yüzü.",
"Description[uk]": "Звуковий модуль для QtMultimedia.",
"Description[x-test]": "xxSound backend for QtMultimedia.xx",
"Description[zh_CN]": "QtMultimedia 声音后端",
"Description[zh_TW]": "QtMultimedia 音效後端介面。",
"Id": "artikulate_qtmultimedia_backend",
......@@ -59,7 +58,6 @@
"Name[sv]": "QtMultimedia-gränssnitt",
"Name[tr]": "QtMultimedia Arka Yüzü",
"Name[uk]": "Модуль QtMultimedia",
"Name[x-test]": "xxQtMultimedia Backendxx",
"Name[zh_CN]": "QtMultimedia 后端",
"Name[zh_TW]": "QtMultimedia 後端介面",
"ServiceTypes": [
......
......@@ -43,7 +43,6 @@ GenericName[sv]=Artikulate uttalsövning
GenericName[te]=అర్టీక్యులెట్ ఉచ్చారణ శిక్షకీ
GenericName[tr]=Artikulate Telaffuz Eğitici
GenericName[uk]=Навчання вимові Artikulate
GenericName[x-test]=xxArtikulate Pronunciation Trainerxx
GenericName[zh_CN]=Artikulate 读音训练器
GenericName[zh_TW]=Artikulate 發音訓練師
Terminal=false
......@@ -83,7 +82,6 @@ Name[sv]=Artikulate
Name[te]=అర్టీక్యులెట్
Name[tr]=Artikulate
Name[uk]=Artikulate
Name[x-test]=xxArtikulatexx
Name[zh_CN]=Artikulate
Name[zh_TW]=Artikulate
Categories=Qt;KDE;Education;Languages;
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