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
efff6a5708
commit
3fad514921
|
@ -33,7 +33,7 @@
|
|||
"Name[is]": "Dolphin-yfirlit",
|
||||
"Name[it]": "Vista di Dolphin",
|
||||
"Name[ja]": "Dolphin ビュー",
|
||||
"Name[ka]": "Dolphin -ის ხედი",
|
||||
"Name[ka]": "Dolphin-ის ხედი",
|
||||
"Name[ko]": "Dolphin 보기",
|
||||
"Name[lt]": "Dolphin rodinys",
|
||||
"Name[lv]": "„Dolphin“ skats",
|
||||
|
|
|
@ -5,6 +5,18 @@
|
|||
"application/octet-stream"
|
||||
],
|
||||
"Name": "Move to New Folder",
|
||||
"Name[ca@valencia]": "Mou cap a una carpeta nova",
|
||||
"Name[ca]": "Mou a una carpeta nova",
|
||||
"Name[en_GB]": "Move to New Folder",
|
||||
"Name[es]": "Mover a una nueva carpeta",
|
||||
"Name[he]": "העברה לתיקייה חדשה",
|
||||
"Name[ia]": "Move a nove dossier",
|
||||
"Name[ka]": "გადატანა ახალ საქაღალდეში",
|
||||
"Name[nl]": "Naar nieuwe map verplaatsen",
|
||||
"Name[sl]": "Premakni v novo mapo",
|
||||
"Name[tr]": "Yeni Klasöre Taşı",
|
||||
"Name[uk]": "Пересунути до нової теки",
|
||||
"Name[x-test]": "xxMove to New Folderxx",
|
||||
"ServiceTypes": [
|
||||
"KFileItemAction/Plugin"
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue