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:
parent
e843589057
commit
ba8026df82
|
@ -6,6 +6,7 @@
|
|||
],
|
||||
"Name": "Move to New Folder",
|
||||
"Name[ar]": "انقل إلى مجلد جديد",
|
||||
"Name[be]": "Перамясціць у новы каталог",
|
||||
"Name[bg]": "Преместване в нова папка",
|
||||
"Name[ca@valencia]": "Mou cap a una carpeta nova",
|
||||
"Name[ca]": "Mou a una carpeta nova",
|
||||
|
@ -24,6 +25,8 @@
|
|||
"Name[ro]": "Mută în dosar nou",
|
||||
"Name[ru]": "Переместить в новую папку",
|
||||
"Name[sl]": "Premakni v novo mapo",
|
||||
"Name[sv]": "Flytta till ny katalog",
|
||||
"Name[ta]": "புதிய அடைவிற்கு நகர்த்து",
|
||||
"Name[tr]": "Yeni Klasöre Taşı",
|
||||
"Name[uk]": "Пересунути до нової теки",
|
||||
"Name[x-test]": "xxMove to New Folderxx",
|
||||
|
|
Loading…
Reference in New Issue
Block a user