]> cloud.milkyroute.net Git - dolphin.git/commitdiff
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 3 Jul 2024 01:20:28 +0000 (01:20 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 3 Jul 2024 01:20:28 +0000 (01:20 +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/movetonewfolderitemaction.json

index 99fdbccd2f2354e962c780430164ecb875066d5c..730c03c816fc7c4b6fdfce5502ef4ff498f7c0ff 100644 (file)
@@ -17,6 +17,7 @@
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[ia]": "Move a nove dossier",
+        "Name[is]": "Færa í nýja möppu",
         "Name[it]": "Sposta in una nuova cartella",
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[lt]": "Perkelti į naują aplanką",