┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/itemactions
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2025-06-15 01:33:49 +0000
committerl10n daemon script <[email protected]>2025-06-15 01:33:49 +0000
commit5c71e6189488ca3e3f28c45e274f67f77c7cdfed (patch)
treee3c3bd10c83860a6c68e52a3ecfbc8f65318d1ab /src/itemactions
parent245ae05f8016c2cbf8cd877ca9ddf5d57ed236d9 (diff)
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"
Diffstat (limited to 'src/itemactions')
-rw-r--r--src/itemactions/setfoldericonitemaction.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index b74773e5b..f5bad45a9 100644
--- 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",