From 0778b805cd823172f179809f535048c41bccef8d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Sep 2025 01:35:17 +0000 Subject: 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 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/itemactions/setfoldericonitemaction.json') diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 85febdccf..6868e0e85 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -17,8 +17,10 @@ "Name[gl]": "Definir a icona do cartafol", "Name[he]": "הגדרת סמל תיקייה", "Name[hu]": "Mappaikon beállítása", + "Name[ia]": "Assigna icone de dossier", "Name[is]": "Velja möpputákn", "Name[it]": "Imposta icona della cartella", + "Name[ja]": "フォルダのアイコンをセットする", "Name[ka]": "საქაღალდის ხატულას დაყენება", "Name[ko]": "폴더 아이콘 설정", "Name[lv]": "Norādīt datnes ikonu", -- cgit v1.3.1