diff options
| author | l10n daemon script <[email protected]> | 2025-06-12 01:33:48 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-12 01:33:48 +0000 |
| commit | d4e8b06b0ff824e3e3bb3a397b9379eee1bea929 (patch) | |
| tree | b1716b729f1b1143382038f47b2bcdff4b8eef60 /src | |
| parent | 5a6168fec145064c14d6e95c6626a28bd481df43 (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')
| -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 209c79ae7..15e953d60 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -10,6 +10,7 @@ "Name[ca]": "Estableix la icona de carpeta", "Name[es]": "Definir icono de carpeta", "Name[he]": "הגדרת סמל תיקייה", + "Name[it]": "Imposta icona della cartella", "Name[ka]": "საქაღალდის ხატულას დაყენება", "Name[ko]": "폴더 아이콘 설정", "Name[nl]": "Mappictogram instellen", |