Commit 0ce5aa89 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 f9355ee6
......@@ -22,6 +22,7 @@ Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários dos usuários
Name[ru]=Обратная связь
Name[sv]=Användaråterkoppling
Name[uk]=Відгуки користувача
Name[x-test]=xxUser Feedbackxx
Name[zh_CN]=用户反馈
......@@ -38,6 +39,7 @@ 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[sv]=Anpassa inställningar av användaråterkoppling
Comment[uk]=Налаштовування системи відгуків користувача
Comment[x-test]=xxConfigure user feedback settingsxx
Comment[zh_CN]=配置用户反馈设置
......
......@@ -11,6 +11,7 @@ Name[nl]=Terugkoppeling
Name[pt]=Reacções
Name[pt_BR]=Comentários
Name[ru]=Обратная связь
Name[sv]=Återkoppling
Name[uk]=Відгуки
Name[x-test]=xxFeedbackxx
Name[zh_CN]=反馈
......
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