mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +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
aa54a68e93
commit
13712a5065
|
@ -135,7 +135,7 @@ Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ;
|
|||
Keywords[hi]=फ़ाइलें;फ़ाइल प्रबंधन;फ़ाइल ब्राउज़िंग;सांबा;नेटवर्क शेयर;एक्सप्लोरर;खोजक;
|
||||
Keywords[hu]=fájlok;fájlkezelés;fájlböngészés;samba;hálózati megosztások;Explorer;Finder;
|
||||
Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Explorator;Trovator;
|
||||
Keywords[id]=files;file management;file browsing;samba;network shares;Explorer;Finder;manajer;
|
||||
Keywords[id]=file;berkas;pengelola file;peramban file;samba;pembagian jaringan;Explorer;Finder;
|
||||
Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;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;
|
||||
|
|
Loading…
Reference in a new issue