diff options
| author | l10n daemon script <[email protected]> | 2025-07-18 01:33:39 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-18 01:33:39 +0000 |
| commit | d955a72c0ccbae65a629d5f86db4fdb305ccfef4 (patch) | |
| tree | 1518ee47603d66b6d6f5152a0b72740d8dc39722 /src/itemactions | |
| parent | e36976633ca9c6fa60255174b1f4035c092ef309 (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.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 814ae8c9b..5d02aeb06 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -15,6 +15,7 @@ "Name[fr]": "Définir l'icône de dossiers", "Name[gl]": "Definir a icona do cartafol", "Name[he]": "הגדרת סמל תיקייה", + "Name[is]": "Velja möpputákn", "Name[it]": "Imposta icona della cartella", "Name[ka]": "საქაღალდის ხატულას დაყენება", "Name[ko]": "폴더 아이콘 설정", |