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
ae8ca31f42
commit
c0b6048af4
|
@ -6,20 +6,25 @@
|
||||||
],
|
],
|
||||||
"Name": "Move to New Folder",
|
"Name": "Move to New Folder",
|
||||||
"Name[ar]": "انقل إلى مجلد جديد",
|
"Name[ar]": "انقل إلى مجلد جديد",
|
||||||
|
"Name[bg]": "Преместване в нова папка",
|
||||||
"Name[ca@valencia]": "Mou cap a una carpeta nova",
|
"Name[ca@valencia]": "Mou cap a una carpeta nova",
|
||||||
"Name[ca]": "Mou a una carpeta nova",
|
"Name[ca]": "Mou a una carpeta nova",
|
||||||
"Name[en_GB]": "Move to New Folder",
|
"Name[en_GB]": "Move to New Folder",
|
||||||
"Name[eo]": "Movi al Nova Dosierujo",
|
"Name[eo]": "Movi al Nova Dosierujo",
|
||||||
"Name[es]": "Mover a una nueva carpeta",
|
"Name[es]": "Mover a una nueva carpeta",
|
||||||
|
"Name[fr]": "Déplacer vers le nouveau dossier",
|
||||||
"Name[he]": "העברה לתיקייה חדשה",
|
"Name[he]": "העברה לתיקייה חדשה",
|
||||||
"Name[ia]": "Move a nove dossier",
|
"Name[ia]": "Move a nove dossier",
|
||||||
"Name[ka]": "გადატანა ახალ საქაღალდეში",
|
"Name[ka]": "გადატანა ახალ საქაღალდეში",
|
||||||
"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[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]": "Пересунути до нової теки",
|
||||||
"Name[x-test]": "xxMove to New Folderxx",
|
"Name[x-test]": "xxMove to New Folderxx",
|
||||||
|
"Name[zh_CN]": "移动到新建文件夹",
|
||||||
|
"Name[zh_TW]": "移動到新資料夾",
|
||||||
"ServiceTypes": [
|
"ServiceTypes": [
|
||||||
"KFileItemAction/Plugin"
|
"KFileItemAction/Plugin"
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user