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, 53 deletions

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 3d9bbb55a..ca4b6b8f5 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -1,59 +1,6 @@
 {
     "KPlugin": {
         "Description": "Configure file manager navigation",
-        "Description[ar]": "اضبط التّنقّل في مدير الملفّات",
-        "Description[ast]": "Configura la navegación del xestor de ficheros",
-        "Description[az]": "Fayl meneceri naviqasiyasını tənzimləmək",
-        "Description[ca@valencia]": "Configura la navegació del gestor de fitxers",
-        "Description[ca]": "Configura la navegació del gestor de fitxers",
-        "Description[cs]": "Nastavení navigace správce souborů",
-        "Description[da]": "Indstil navigation i filhåndtering",
-        "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung",
-        "Description[el]": "Διαμόρφωση πλοήγησης του διαχειριστή αρχείων",
-        "Description[en_GB]": "Configure file manager navigation",
-        "Description[es]": "Configurar la navegación del gestor de archivos",
-        "Description[et]": "Failihalduris liikumise seadistamine",
-        "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea",
-        "Description[fi]": "Tiedostonhallinnan selausasetukset",
-        "Description[fr]": "Configuration la navigation avec le gestionnaire de fichiers",
-        "Description[gl]": "Configurar a navegación do xestor de ficheiros.",
-        "Description[he]": "הגדרת הניווט במנהל הקבצים",
-        "Description[hi]": "फ़ाइल प्रबंधक संचालन विन्यस्त करें",
-        "Description[hu]": "A fájlkezelő navigálásának beállítása",
-        "Description[ia]": "Configura navigation del gerente de file",
-        "Description[id]": "Konfigurasikan navigasi pengelola file",
-        "Description[is]": "Stilla flakkstýringu í skráastjóra",
-        "Description[it]": "Configura la navigazione col gestore dei file",
-        "Description[ja]": "ファイルマネージャでのナビゲーションを設定します",
-        "Description[ko]": "파일 관리자 탐색 설정",
-        "Description[lt]": "Konfigūruoti failų tvarkytuvės naršymą",
-        "Description[lv]": "Konfigurēt datņu pārvaldnieka navigāciju",
-        "Description[ml]": "ഫയല്‍ മാനേജർ നാവിഗേഷൻ ക്രമീകരിയ്ക്കുക",
-        "Description[my]": "ဖိုင်လ်မန်နေဂျာ လမ်းညွှန် ပြင်ဆင်မည်",
-        "Description[nb]": "Sett opp navigasjon i filbehandleren",
-        "Description[nl]": "Bestandsbeheerdernavigatie configureren",
-        "Description[nn]": "Set opp navigasjonen i filhandsamaren",
-        "Description[pa]": "ਫਾਇਲ ਮੈਨੇਜਰ ਨੇਵੀਗੇਸ਼ਨ ਸੰਰਚਨਾ",
-        "Description[pl]": "Ustawienia nawigacji w zarządzaniu plikami",
-        "Description[pt]": "Configurar a navegação do gestor de ficheiros",
-        "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
-        "Description[ro]": "Configurează navigarea cu gestionarul de fișiere",
-        "Description[ru]": "Настройка навигации в диспетчере файлов",
-        "Description[se]": "Heivet fiilagieđahallannavigašuvdna",
-        "Description[sk]": "Nastavenie navigácie správcu súborov",
-        "Description[sl]": "Nastavitve krmarjenja v upravljalniku datotek",
-        "Description[sr@ijekavian]": "Подешавање навигације у менаџеру фајлова",
-        "Description[sr@ijekavianlatin]": "Podešavanje navigacije u menadžeru fajlova",
-        "Description[sr@latin]": "Podešavanje navigacije u menadžeru fajlova",
-        "Description[sr]": "Подешавање навигације у менаџеру фајлова",
-        "Description[sv]": "Anpassa filhanterarens navigering",
-        "Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்",
-        "Description[tr]": "Dosya yöneticisi gezintisini yapılandır",
-        "Description[uk]": "Налаштувати навігацію у менеджері файлів",
-        "Description[vi]": "Cấu hình điều hướng trình quản lí tệp",
-        "Description[x-test]": "xxConfigure file manager navigationxx",
-        "Description[zh_CN]": "配置文件管理器导航功能",
-        "Description[zh_TW]": "設定檔案管理員導覽",
         "Icon": "preferences-desktop-navigation",
         "Name": "Navigation",
         "Name[ar]": "التّنقّل",