Commit 001a0296 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 d771660a
Pipeline #175132 skipped
......@@ -95,7 +95,7 @@ Description[sr@ijekavian]=Подразумијевана боја позадин
Description[sr@ijekavianlatin]=Podrazumijevana boja pozadine prozora
Description[sr@latin]=Podrazumevana boja pozadine prozora
Description[sv]=Använd förvald bakgrundsfärg.
Description[tr]=Öntanımlı pencere arkaplan rengini kullan.
Description[tr]=Öntanımlı pencere arka plan rengini kullan.
Description[uk]=Використовувати типовий колір тла вікна.
Description[x-test]=xxUse the default window background color.xx
Description[zh_CN]=使用默认窗口背景颜色。
......
......@@ -49,7 +49,7 @@ Name[sr@ijekavian]=Азбука
Name[sr@ijekavianlatin]=Azbuka
Name[sr@latin]=Azbuka
Name[sv]=Alfabet
Name[tr]=Alfabe
Name[tr]=Abece
Name[ug]=ئېلىپبە جەدۋىلى
Name[uk]=Абетка
Name[wa]=Alfabet
......
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