1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-06-30 23:46:46 +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-05-31 01:20:40 +00:00
parent 0a8f84a52d
commit 035d5b64e1

View File

@ -9,12 +9,14 @@
"Name[bg]": "Преместване в нова папка",
"Name[ca@valencia]": "Mou cap a una carpeta nova",
"Name[ca]": "Mou a una carpeta nova",
"Name[cs]": "Přesunout do nové složky",
"Name[en_GB]": "Move to New Folder",
"Name[eo]": "Movi al Nova Dosierujo",
"Name[es]": "Mover a una nueva carpeta",
"Name[fr]": "Déplacer vers le nouveau dossier",
"Name[he]": "העברה לתיקייה חדשה",
"Name[ia]": "Move a nove dossier",
"Name[it]": "Sposta in una nuova cartella",
"Name[ka]": "გადატანა ახალ საქაღალდეში",
"Name[lt]": "Perkelti į naują aplanką",
"Name[nl]": "Naar nieuwe map verplaatsen",