Commit 08544b58 authored by Script Kiddy's avatar Script Kiddy

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 da8e5a1a
......@@ -64,7 +64,7 @@ Name[sr@latin]=Filter fascikli
Name[sv]=Katalogfilter
Name[tg]=Филтри феҳраст
Name[th]=กรองไดเรกทอรี
Name[tr]=Dizin Filtreleyici
Name[tr]=Dizin Süzgeci
Name[ug]=مۇندەرىجە سۈزگۈچ
Name[uk]=Фільтр каталогів
Name[wa]=Passete des ridants
......
......@@ -91,7 +91,7 @@ Name[ta]=AdBlocK Filters
Name[te]=AdBlocK ఫిల్టర్స్‍
Name[tg]=Филтрҳои эълонҳои AdBlocK
Name[th]=ตัวกรองของ AdBlocK
Name[tr]=AdBlocK Filtreleri
Name[tr]=AdBlocK Süzgeçleri
Name[ug]=ئېلان توسقۇچ سۈزگۈچى
Name[uk]=Фільтри AdBlocK
Name[uz]=AdBlocK filterlari
......@@ -181,7 +181,7 @@ Comment[ta]=Configure Konqueror AdBlocK filters
Comment[te]=Konqueror AdBlocK ఫిల్టర్‍స్‌ను ఆకృతీకరించుము
Comment[tg]=Танзимоти эълонҳои Konqueror AdBlocK
Comment[th]=ปรับแต่งตัวกรอง AdBlocK ของ Konqueror
Comment[tr]=Konqueror'ın AdBlocK Filtrelerini yapılandır
Comment[tr]=Konqueror'ın AdBlocK Süzgeçlerini yapılandır
Comment[ug]=Konqueror ئېلان توسقۇچ سۈزگۈچ سەپلىمىسى
Comment[uk]=Налаштування фільтрів блокування реклами для Konqueror
Comment[uz]=Konqueror uchun AdBlocK filterlarini moslash
......
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