From 7212513034b1181cc8efd439bb3ccde5481a3ecd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 11 Jun 2025 01:35:45 +0000 Subject: [PATCH] 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" --- src/itemactions/setfoldericonitemaction.json | 15 ++++++++++++++- src/org.kde.dolphin.desktop | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index bca39ac78..209c79ae7 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -4,7 +4,20 @@ "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" diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index c114295ec..98c7cae26 100755 --- 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[ko]=내 파일 관리 Comment[nl]=Uw bestanden beheren Comment[pl]=Zarządzaj swoimi plikami Comment[sl]=Upravlja vaše datoteke -- 2.47.3