From de1f728bdf6537b568f96fd4f3d584ab1236c8d7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Apr 2020 10:29:08 +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" --- agents/archivemailagent/akonadi_archivemail_agent.notifyrc | 2 +- agents/archivemailagent/archivemailagent.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/archivemailagent/akonadi_archivemail_agent.notifyrc b/agents/archivemailagent/akonadi_archivemail_agent.notifyrc index 9c9596d10..4e294afdd 100644 --- a/agents/archivemailagent/akonadi_archivemail_agent.notifyrc +++ b/agents/archivemailagent/akonadi_archivemail_agent.notifyrc @@ -29,7 +29,7 @@ Comment[nds]=Nettpost-Archiveerhölper Comment[nl]=E-mailagent voor archiveren Comment[pl]=Usługa archiwizacji poczty Comment[pt]=Agente de Arquivo de E-Mail -Comment[pt_BR]=Agente de Arquivamento de E-mails +Comment[pt_BR]=Agente de arquivamento de e-mails Comment[ro]=Agent de arhivare a poștei Comment[ru]=Агент архивирования почты Comment[sk]=Archivovať agenta pošty diff --git a/agents/archivemailagent/archivemailagent.desktop b/agents/archivemailagent/archivemailagent.desktop index f5c242fd8..5941c2e86 100644 --- a/agents/archivemailagent/archivemailagent.desktop +++ b/agents/archivemailagent/archivemailagent.desktop @@ -73,7 +73,7 @@ Comment[nds]=Nettpost-Archiveerhölper Comment[nl]=E-mailagent voor archiveren Comment[pl]=Usługa archiwizacji poczty Comment[pt]=Agente de Arquivo de E-Mail -Comment[pt_BR]=Agente de Arquivamento de E-mails +Comment[pt_BR]=Agente de arquivamento de e-mails Comment[ro]=Agent de arhivare a poștei Comment[ru]=Агент архивирования почты Comment[sk]=Archivovať agenta pošty