]> cloud.milkyroute.net Git - dolphin.git/commitdiff
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 13 Jul 2025 01:35:02 +0000 (01:35 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 13 Jul 2025 01:35:02 +0000 (01:35 +0000)
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

index 8eb1ce0c58e9432e46de053e18774a483349ba88..814ae8c9b161d5d82a49a45d68366301476c5edd 100644 (file)
@@ -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]": "הגדרת סמל תיקייה",