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
dba9b3435d
commit
34eb94366e
|
@ -5,13 +5,16 @@
|
||||||
"application/octet-stream"
|
"application/octet-stream"
|
||||||
],
|
],
|
||||||
"Name": "Move to New Folder",
|
"Name": "Move to New Folder",
|
||||||
|
"Name[ar]": "انقل إلى مجلد جديد",
|
||||||
"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[es]": "Mover a una nueva carpeta",
|
"Name[es]": "Mover a una nueva carpeta",
|
||||||
"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[nl]": "Naar nieuwe map verplaatsen",
|
"Name[nl]": "Naar nieuwe map verplaatsen",
|
||||||
"Name[sl]": "Premakni v novo mapo",
|
"Name[sl]": "Premakni v novo mapo",
|
||||||
"Name[tr]": "Yeni Klasöre Taşı",
|
"Name[tr]": "Yeni Klasöre Taşı",
|
||||||
|
|
|
@ -153,7 +153,7 @@ Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Find
|
||||||
Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder;
|
Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder;
|
||||||
Keywords[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder;
|
Keywords[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder;
|
||||||
Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유;
|
Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유;
|
||||||
Keywords[lt]=failai;failų valdymas;failu valdymas;failų tvarkymas;failu tvarkymas;failų naršymas;failu narsymas;samba;tinklo viešiniai;tinklo viesiniai;Finder;Explorer
|
Keywords[lt]=failai;failų valdymas;failu valdymas;failų tvarkymas;failu tvarkymas;failų naršymas;failu narsymas;samba;tinklo viešiniai;tinklo viesiniai;Finder;Explorer;
|
||||||
Keywords[lv]=datnes;faili;datņu pārvaldnieks;datņu pārlūks;failu pārvaldnieks;failu pārlūks;samba;tīkls;Explorer;Finder;
|
Keywords[lv]=datnes;faili;datņu pārvaldnieks;datņu pārlūks;failu pārvaldnieks;failu pārlūks;samba;tīkls;Explorer;Finder;
|
||||||
Keywords[nb]=filer;filbehandling;filutforskning;samba;nettverksressurser;Explorer;Finder;
|
Keywords[nb]=filer;filbehandling;filutforskning;samba;nettverksressurser;Explorer;Finder;
|
||||||
Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
|
Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
|
||||||
|
|
Loading…
Reference in a new issue