Commit f0607ac2 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 33e217bc
......@@ -8,7 +8,6 @@ Name=Find Files/Folders
Name[af]=Soek Lêers/Gidse
Name[ar]=إبحث عن ملفات/مجلّدات
Name[as]=নথিপত্ৰ/পঞ্জিকা বিচাৰক
Name[ast]=Guetar ficheros/carpetes
Name[be]=Пошук файлаў і тэчак
Name[be@latin]=Pošuk fajłaŭ i katalohaŭ
Name[bg]=Търсене на файлове
......
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