mirror of
https://invent.kde.org/system/dolphin
synced 2024-07-04 17:30:55 +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
6af359f2c7
commit
af7e37139d
|
@ -22,6 +22,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[pt_BR]": "Mover para pasta",
|
||||||
"Name[ro]": "Mută în dosar nou",
|
"Name[ro]": "Mută în dosar nou",
|
||||||
"Name[ru]": "Переместить в новую папку",
|
"Name[ru]": "Переместить в новую папку",
|
||||||
"Name[sl]": "Premakni v novo mapo",
|
"Name[sl]": "Premakni v novo mapo",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user