diff options
| author | l10n daemon script <[email protected]> | 2025-07-13 01:35:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-13 01:35:02 +0000 |
| commit | 43cc016f8b3ec48157a86815a050518a41b423b2 (patch) | |
| tree | aa110ed3280cda47ba5c3b471cea1518be6bbca2 | |
| parent | bdbbb1dcc15910c67b7b7c44cccb24f4f9eafd6d (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"
| -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 8eb1ce0c5..814ae8c9b 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -11,6 +11,7 @@ "Name[ca]": "Estableix la icona de carpeta", "Name[es]": "Definir icono de carpeta", "Name[eu]": "Ezarri karpetaren ikonoa", + "Name[fi]": "Aseta kansiokuvake", "Name[fr]": "Définir l'icône de dossiers", "Name[gl]": "Definir a icona do cartafol", "Name[he]": "הגדרת סמל תיקייה", |