Commit e2bcfae5 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 8204309b
......@@ -110,6 +110,7 @@ Comment[he]=עזרה עבור יישומים
Comment[hi]=अनुप्रयोगों के लिए मदद
Comment[hu]=Súgó alkalmazásokhoz
Comment[ia]=Adjuta pro applicationes
Comment[id]=Bantuan untuk aplikasi
Comment[is]=Hjálp fyrir forrit
Comment[it]=Guida per le applicazioni
Comment[ko]=프로그램 도움말
......
......@@ -118,6 +118,7 @@ GenericName[he]=מרכז העזרה
GenericName[hi]=मदद केंद्र
GenericName[hu]=Súgóközpont
GenericName[ia]=Centro de Adjuta
GenericName[id]=Pusat Bantuan
GenericName[is]=Hjálparmiðstöð
GenericName[it]=Centro documentazione
GenericName[ko]=도움말 센터
......@@ -158,6 +159,7 @@ Comment[he]=דפדפוף וחיפוש בתיעוד
Comment[hi]=दस्तावेज़ खोजें व देखें
Comment[hu]=Dokumentációk böngészése és keresése
Comment[ia]=Naviga e cerca in le documentation
Comment[id]=Telusuri dan cari dokumentasi
Comment[is]=Vafra um og leita að leiðbeiningum
Comment[it]=Sfoglia e cerca nella documentazione
Comment[ko]=문서 찾아보기
......
......@@ -20,6 +20,7 @@ Name[he]=יסודות
Name[hi]=मूल
Name[hu]=Kézikönyv
Name[ia]=Essentiales
Name[id]=Asasi
Name[is]=Grunnatriði
Name[it]=Fondamentali
Name[ko]=기초
......
Markdown is supported
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