From 1ff4820c707d9f4fdd7f6f9d8f7864edaf91e258 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 10 Oct 2016 12:25:30 +0000 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" --- akonadiconsole/src/org.kde.akonadiconsole.desktop | 2 -- 1 file changed, 2 deletions(-) diff --git a/akonadiconsole/src/org.kde.akonadiconsole.desktop b/akonadiconsole/src/org.kde.akonadiconsole.desktop index 6c7c33b409..1f6860daa6 100755 --- a/akonadiconsole/src/org.kde.akonadiconsole.desktop +++ b/akonadiconsole/src/org.kde.akonadiconsole.desktop @@ -18,7 +18,6 @@ Name[hr]=Akonadijeva konzola Name[hu]=Akonadi-konzol Name[ia]=Consol de Akonadi Name[it]=Console Akonadi -Name[ja]=Akonadi コンソール Name[kk]=Akonadi консолі Name[km]=កុងសូល​របស់ Akonadi Name[ko]=Akonadi 콘솔 @@ -68,7 +67,6 @@ Comment[gl]=Consola de xestión e depuración do Akonadi Comment[hu]=Kezelőprogram és hibakereső az Akonadihoz Comment[ia]=Consol de Akonadi pro gestion e cribrar Comment[it]=Console di gestione e debugging di Akonadi -Comment[ja]=Akonadi の管理とデバッグのためのコンソール Comment[kk]=Akonadi басқару және жөндеу консолі Comment[km]=ការ​គ្រប់គ្រង Akonadi និង​កុងសូល​បំបាត់​កំហុស Comment[ko]=Akonadi 관리 및 디버깅 콘솔 -- 2.11.4.GIT