1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-02 16:31:23 +00:00

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"
This commit is contained in:
l10n daemon script 2024-06-30 01:20:00 +00:00
parent 44b05452c3
commit 5eb3240e16

View File

@ -13,6 +13,7 @@
"Name[cs]": "Přesunout do nové složky",
"Name[eo]": "Movi al Nova Dosierujo",
"Name[es]": "Mover a una nueva carpeta",
"Name[eu]": "Eraman karpeta berrira",
"Name[fr]": "Déplacer vers le nouveau dossier",
"Name[he]": "העברה לתיקייה חדשה",
"Name[ia]": "Move a nove dossier",