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"

diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index bca39ac788621169c4b45bf20712e834a675a0a8..209c79ae7179e33edb8c04f13de707413985fda1 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -4,7 +4,20 @@
         "MimeTypes": [
             "inode/directory"
         ],
         "MimeTypes": [
             "inode/directory"
         ],

-        "Name": "Set Folder Icon"
+        "Name": "Set Folder Icon",
+        "Name[bg]": "Задаване на икона на папка",
+        "Name[ca@valencia]": "Establix la icona de carpeta",
+        "Name[ca]": "Estableix la icona de carpeta",
+        "Name[es]": "Definir icono de carpeta",
+        "Name[he]": "הגדרת סמל תיקייה",
+        "Name[ka]": "საქაღალდის ხატულას დაყენება",
+        "Name[ko]": "폴더 아이콘 설정",
+        "Name[nl]": "Mappictogram instellen",
+        "Name[sl]": "Nastavi ikono mape",
+        "Name[tr]": "Klasör Simgesi Ayarla",
+        "Name[uk]": "Встановити піктограму теки",
+        "Name[x-test]": "xxSet Folder Iconxx",
+        "Name[zh_TW]": "設定資料夾圖示"

     },
     "X-KDE-Require": "Write",
     "X-KDE-Show-In-Submenu": "true"
     },
     "X-KDE-Require": "Write",
     "X-KDE-Show-In-Submenu": "true"

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index c114295ec8fd72ad3b68478cac5bad3072ee475b..98c7cae26ad7d2a252b20241cf0781b23dae5eee 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -141,6 +141,7 @@ Comment[ia]=Gere tu files
 Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები

+Comment[ko]=내 파일 관리

 Comment[nl]=Uw bestanden beheren
 Comment[pl]=Zarządzaj swoimi plikami
 Comment[sl]=Upravlja vaše datoteke
 Comment[nl]=Uw bestanden beheren
 Comment[pl]=Zarządzaj swoimi plikami
 Comment[sl]=Upravlja vaše datoteke