Commit 7a7b489b 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 1cd32b61
......@@ -126,7 +126,7 @@ Comment[ja]=アプリケーション、コントロールパネル、サービ
Comment[kk]=Қолданбаларды табу, панельдер мен қызметтерді басқару
Comment[km]=រក​កម្មវិធី បន្ទះ​ត្រួតពិនិត្យ និង​សេវា
Comment[kn]=ಅನ್ವಯಗಳು, ನಿಯಂತ್ರಣಾ ಪುಟೀಪುಗಳು (ಕಂಟ್ರೋಲ್ ಪಾನಲ್ಸ್) ಹಾಗೂ ಸೇವೆಗಳನ್ನು ಹುಡುಕು
Comment[ko]=프로그램; 제어판; 서비스 찾기
Comment[ko]=프로그램, 제어판, 서비스 찾기
Comment[ku]=Sepanan, panelên kontrolê û servîsan bibîne
Comment[lt]=Rasti programas, valdyti skydelius ir tarnybas
Comment[lv]=Meklēt lietotnes, kontroles paneļus un servisus
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