Commit a8ef1866 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 795c4eee
......@@ -12,7 +12,7 @@ X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
Name=Search Bar
Name[ar]=شريط البحث
Name[ast]=Barra de gueta
Name[ast]=Barra de busca
Name[be]=Панель пошуку
Name[bg]=Лента за търсене
Name[bs]=Pretraživačka traka
......@@ -76,7 +76,7 @@ Name[zh_CN]=搜索栏
Name[zh_TW]=搜尋列
Comment=Provides a text box for easier access to search engines like Google.
Comment[ar]=تزود صندوق النص بنفاذ سريع لمحركات البحث مثل جوجل
Comment[ast]=Apurre una caxa de testu pa un accesu más fácil a los motores de gueta como Google.
Comment[ast]=Apurre una caxa de testu pa un accesu más fácil a los motores de busca como Google.
Comment[bg]=Текстово поле за лесен достъп до търсачки като Гугъл
Comment[bs]=Omogućava polje za unos teksta za lakši pristup pretraživačima poput Google-a.
Comment[ca]=Proporciona un quadre de text per a un accés més fàcil als motors de cerca com Google.
......
......@@ -71,7 +71,7 @@ Name[zh_CN]=UserAgent 变更器
Name[zh_TW]=使用者代理程式變更器
Comment=Allows the detected UserAgent to be modified
Comment[ar]=تسمح بتغير معرف المتصفح
Comment[ast]=Permite que se modifique l'axente d'usuariu deteutáu
Comment[ast]=Permite que se modifique l'axente d'usuariu detectáu
Comment[bg]=Позволява промяната на UserAgent, с който програмата се представя пред сървърите
Comment[bs]=Omogućava izmjenu odaslatog korisničkog agenta
Comment[ca]=Permet de modificar l'agent d'usuari (UserAgent) detectat
......
[Desktop Entry]
Type=Service
Name=Web Archives and HTML files
Name[ast]=Archivos web y ficheros HTML
Name[ca]=Arxius web i fitxers HTML
Name[ca@valencia]=Arxius web i fitxers HTML
Name[el]=Αρχειοθήκες ιστού και HTML αρχεία
......
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