mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-02 14:45:04 +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
c14de67536
commit
5d2b495c44
|
@ -21,6 +21,7 @@
|
||||||
"Name[lt]": "Perkelti į naują aplanką",
|
"Name[lt]": "Perkelti į naują aplanką",
|
||||||
"Name[nl]": "Naar nieuwe map verplaatsen",
|
"Name[nl]": "Naar nieuwe map verplaatsen",
|
||||||
"Name[pl]": "Przenieś do nowego katalogu",
|
"Name[pl]": "Przenieś do nowego katalogu",
|
||||||
|
"Name[ro]": "Mută în dosar nou",
|
||||||
"Name[sl]": "Premakni v novo mapo",
|
"Name[sl]": "Premakni v novo mapo",
|
||||||
"Name[tr]": "Yeni Klasöre Taşı",
|
"Name[tr]": "Yeni Klasöre Taşı",
|
||||||
"Name[uk]": "Пересунути до нової теки",
|
"Name[uk]": "Пересунути до нової теки",
|
||||||
|
|
Loading…
Reference in a new issue