mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +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:
parent
aeb2b11fe4
commit
98ff038416
|
@ -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ą",
|
||||
|
|
Loading…
Reference in a new issue