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 b74773e5b2ad561ff3e2669d959ebed831cd4e65..f5bad45a94506b36ac2105fcf52a53f4d39a3b8a 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -16,11 +16,13 @@
         "Name[ka]": "საქაღალდის ხატულას დაყენება",
         "Name[ko]": "폴더 아이콘 설정",
         "Name[nl]": "Mappictogram instellen",
+        "Name[pl]": "Ustaw ikonę katalogu",
         "Name[sl]": "Nastavi ikono mape",
         "Name[sv]": "Ange katalogikon",
         "Name[tr]": "Klasör Simgesi Ayarla",
         "Name[uk]": "Встановити піктограму теки",
         "Name[x-test]": "xxSet Folder Iconxx",
+        "Name[zh_CN]": "设置文件夹图标",
         "Name[zh_TW]": "設定資料夾圖示"
     },
     "X-KDE-Require": "Write",