Commit 13712a50 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent aa54a68e
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment