Commit 9cb4d158 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 2937ff3a
......@@ -103,6 +103,7 @@ Comment[sr@ijekavian]=Подешавање прикључака
Comment[sr@ijekavianlatin]=Podešavanje priključaka
Comment[sr@latin]=Podešavanje priključaka
Comment[sv]=Anpassa insticksprogram
Comment[tr]=Eklentileri Yapılandır
Comment[uk]=Налаштовування додатків
Comment[x-test]=xxConfigure Pluginsxx
Comment[zh_CN]=配置插件
......@@ -129,6 +130,7 @@ X-KDE-Keywords[sr@ijekavian]=akregator,configure,settings,webEngine,plugins,Ак
X-KDE-Keywords[sr@ijekavianlatin]=akregator,configure,settings,webEngine,plugins,Akregator,podešavanje,postavke,veb motor,priključci
X-KDE-Keywords[sr@latin]=akregator,configure,settings,webEngine,plugins,Akregator,podešavanje,postavke,veb motor,priključci
X-KDE-Keywords[sv]=akregator, anpassa, inställningar, webbgränssnitt, insticksprogram
X-KDE-Keywords[tr]=akregator, yapılandır, ayarlar, webmotoru, eklentiler
X-KDE-Keywords[uk]=akregator,configure,settings,webEngine,url interceptor,налаштувати,налаштування,параметри,вебрушій,додатки,плаґіни
X-KDE-Keywords[x-test]=xxakregatorxx,xx configurexx,xx settingsxx,xx webEnginexx,xx pluginsxx
X-KDE-Keywords[zh_CN]=akregator, configure, settings, webEngine, plugins, 配置, 设置, 网页引擎, 插件
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