From 53798f56313e4845d615fcfadc8a7b3d68fc2a0d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Oct 2019 05:29:41 +0200 Subject: [PATCH] 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" --- kcms/feedback/kcm_feedback.desktop | 2 ++ kcms/feedback/package/metadata.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/kcms/feedback/kcm_feedback.desktop b/kcms/feedback/kcm_feedback.desktop index 11e8c27c4..408053045 100644 --- a/kcms/feedback/kcm_feedback.desktop +++ b/kcms/feedback/kcm_feedback.desktop @@ -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 diff --git a/kcms/feedback/package/metadata.desktop b/kcms/feedback/package/metadata.desktop index ed98e432a..a05827733 100644 --- a/kcms/feedback/package/metadata.desktop +++ b/kcms/feedback/package/metadata.desktop @@ -6,6 +6,7 @@ Name[lt]=Grįžtamasis ryšys Name[nl]=Terugkoppeling Name[pt]=Reacções Name[pt_BR]=Comentários +Name[ru]=Обратная связь Name[uk]=Відгуки Name[x-test]=xxFeedbackxx