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"

1 files changed, 0 insertions, 104 deletions

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index c4b2558e5..fbfa4156a 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -1,112 +1,8 @@
 {
     "KPlugin": {
         "Description": "Configure general file manager settings",
-        "Description[ar]": "اضبط إعدادات مدير الملفّات العامّة",
-        "Description[ast]": "Configura los axustes xenerales del xestor de ficheros",
-        "Description[az]": "Fayl menecerinin ayarları",
-        "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers",
-        "Description[ca]": "Configura les opcions generals del gestor de fitxers",
-        "Description[cs]": "Obecné nastavení správce souborů",
-        "Description[da]": "Konfiguration af generelle indstillinger for filhåndtering",
-        "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen",
-        "Description[el]": "Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων",
-        "Description[en_GB]": "Configure general file manager settings",
-        "Description[es]": "Configurar las preferencias generales del gestor de archivos",
-        "Description[et]": "Failihalduri üldine seadistamine",
-        "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak",
-        "Description[fi]": "Tiedostonhallinnan yleisasetukset",
-        "Description[fr]": "Configuration des paramètres généraux du gestionnaire de fichiers",
-        "Description[gl]": "Configurar opcións xerais de xestores de ficheiros.",
-        "Description[he]": "תצורת ההגדרות הכלליות של מנהל הקבצים",
-        "Description[hi]": "साधारण फ़ाइल प्रबंधक सेटिंग्स विन्यस्त करें",
-        "Description[hu]": "A fájlkezelő általános beállításainak módosítása",
-        "Description[ia]": "Configura preferentias del gerente general de file",
-        "Description[id]": "Konfigurasikan pengaturan pengelola file umum",
-        "Description[is]": "Sýsla með almennar stillingar skráastjóra",
-        "Description[it]": "Configura le impostazioni generali del gestore dei file",
-        "Description[ja]": "ファイルマネージャの全般的な設定を行います",
-        "Description[ko]": "일반 파일 관리자 설정 구성",
-        "Description[lt]": "Konfigūruoti bendras failų tvarkytuvės nuostatas",
-        "Description[lv]": "Konfigurēt vispārējā datņu pārvaldnieka iestatījumus",
-        "Description[ml]": "ഫയൽ മാനേജറിന്റെ പൊതുവായ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക",
-        "Description[my]": "ဖိုင်လ်မန်နေဂျာ ယေဘုယျဆက်တင် ပြင်ဆင်မည်",
-        "Description[nb]": "Sett opp generelle innstillinger for filbehandleren",
-        "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
-        "Description[nn]": "Set opp generelle innstillingar for filhandsamaren",
-        "Description[pa]": "ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰਚਨਾ",
-        "Description[pl]": "Ustawienia ogólne zarządzania plikami",
-        "Description[pt]": "Configurar as definições gerais do gestor de ficheiros",
-        "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
-        "Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere",
-        "Description[ru]": "Настройка диспетчера файлов",
-        "Description[sk]": "Všeobecné nastavenie správcu súborov",
-        "Description[sl]": "Splošne nastavitve upravljalnika datotek",
-        "Description[sr@ijekavian]": "Подешавање општих поставки менаџера фајлова",
-        "Description[sr@ijekavianlatin]": "Podešavanje opštih postavki menadžera fajlova",
-        "Description[sr@latin]": "Podešavanje opštih postavki menadžera fajlova",
-        "Description[sr]": "Подешавање општих поставки менаџера фајлова",
-        "Description[sv]": "Anpassa filhanterarens allmänna inställningar",
-        "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்",
-        "Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır",
-        "Description[uk]": "Налаштувати загальні параметри менеджера файлів",
-        "Description[vi]": "Cấu hình các thiết lập chung cho trình quản lí tệp",
-        "Description[x-test]": "xxConfigure general file manager settingsxx",
-        "Description[zh_CN]": "配置常规文件管理器设置",
-        "Description[zh_TW]": "設定一般檔案管理員",
         "Icon": "system-file-manager",
         "Name": "General",
-        "Name[ar]": "عامّ",
-        "Name[ast]": "Xeneral",
-        "Name[az]": "Əsas",
-        "Name[ca@valencia]": "General",
-        "Name[ca]": "General",
-        "Name[cs]": "Obecné",
-        "Name[da]": "Generelt",
-        "Name[de]": "Allgemein",
-        "Name[el]": "Γενικά",
-        "Name[en_GB]": "General",
-        "Name[es]": "General",
-        "Name[et]": "Üldine",
-        "Name[eu]": "Orokorra",
-        "Name[fi]": "Yleiset",
-        "Name[fr]": "Général",
-        "Name[gl]": "Xerais",
-        "Name[he]": "כללי",
-        "Name[hi]": "साधारण",
-        "Name[hu]": "Általános",
-        "Name[ia]": "General",
-        "Name[id]": "Umum",
-        "Name[is]": "Almennt",
-        "Name[it]": "Generale",
-        "Name[ja]": "全般",
-        "Name[ko]": "일반",
-        "Name[lt]": "Bendrosios",
-        "Name[lv]": "Vispārējs",
-        "Name[ml]": "പൊതുവായതു്",
-        "Name[my]": "ယေဘုယျ",
-        "Name[nb]": "Generelt",
-        "Name[nl]": "Algemeen",
-        "Name[nn]": "Generelt",
-        "Name[pa]": "ਆਮ",
-        "Name[pl]": "Ogólne",
-        "Name[pt]": "Geral",
-        "Name[pt_BR]": "Geral",
-        "Name[ro]": "Generale",
-        "Name[ru]": "Основное",
-        "Name[sk]": "Všeobecné",
-        "Name[sl]": "Splošno",
-        "Name[sr@ijekavian]": "Опште",
-        "Name[sr@ijekavianlatin]": "Opšte",
-        "Name[sr@latin]": "Opšte",
-        "Name[sr]": "Опште",
-        "Name[sv]": "Allmänt",
-        "Name[ta]": "பொது",
-        "Name[tr]": "Genel",
-        "Name[uk]": "Загальне",
-        "Name[vi]": "Chung",
-        "Name[x-test]": "xxGeneralxx",
-        "Name[zh_CN]": "常规",
-        "Name[zh_TW]": "一般",
         "ServiceTypes": [
             "KCModule"
         ]