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
3a25f7628c
commit
18cd42837f
|
@ -37,7 +37,7 @@
|
|||
"Name[ka]": "Dolphin -ის ხედი",
|
||||
"Name[ko]": "Dolphin 보기",
|
||||
"Name[lt]": "Dolphin rodinys",
|
||||
"Name[lv]": "Dolphin skats",
|
||||
"Name[lv]": "„Dolphin“ skats",
|
||||
"Name[ml]": "ഡോള്ഫിന് അവതരണരീതി",
|
||||
"Name[my]": "လင်းပိုင် မြင်ကွင်း",
|
||||
"Name[nb]": "Dolphin-visning",
|
||||
|
|
|
@ -164,7 +164,7 @@ Name[ja]=詳細
|
|||
Name[ka]=დეტალები
|
||||
Name[ko]=자세히
|
||||
Name[lt]=Išsamus
|
||||
Name[lv]=Detaļas
|
||||
Name[lv]=Informācija
|
||||
Name[ml]=വിശദമായി
|
||||
Name[my]=အသေးစိတ်
|
||||
Name[nb]=Detaljer
|
||||
|
|
|
@ -154,6 +154,7 @@ Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di r
|
|||
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[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[nb]=filer;filbehandling;filutforskning;samba;nettverksressurser;Explorer;Finder;
|
||||
Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
|
||||
Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder;
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
"Name[ka]": "მთავარი",
|
||||
"Name[ko]": "일반",
|
||||
"Name[lt]": "Bendrosios",
|
||||
"Name[lv]": "Vispārīgi",
|
||||
"Name[nb]": "Generelt",
|
||||
"Name[nl]": "Algemeen",
|
||||
"Name[nn]": "Generelt",
|
||||
|
|
Loading…
Reference in New Issue
Block a user