Commit 53798f56 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 0e14429e
......@@ -17,6 +17,7 @@ Name[lt]=Naudotojo grįžtamasis ryšys
Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários dos usuários
Name[ru]=Обратная связь
Name[uk]=Відгуки користувача
Name[x-test]=xxUser Feedbackxx
Comment=Configure user feedback settings
......@@ -26,6 +27,7 @@ Comment[lt]=Konfigūruoti naudotojo grįžtamojo ryšio nuostatas
Comment[nl]=Instellingen voor terugkoppeling van gebruikers configureren
Comment[pt]=Configurar as opções das reacções do utilizador
Comment[pt_BR]=Configure as definições dos comentários dos usuários
Comment[ru]=Настройка параметров обратной связи
Comment[uk]=Налаштовування системи відгуків користувача
Comment[x-test]=xxConfigure user feedback settingsxx
......@@ -6,6 +6,7 @@ Name[lt]=Grįžtamasis ryšys
Name[ru]=Обратная связь
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