From ca191b087ea7d7cfa8e91505310fd84010e0938d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 24 Oct 2019 05:32:36 +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" --- src/kteatime.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/kteatime.notifyrc b/src/kteatime.notifyrc index 5e0cffd..8b8eab8 100644 --- a/src/kteatime.notifyrc +++ b/src/kteatime.notifyrc @@ -327,6 +327,7 @@ Name[fr]=La théière Name[gl]=Quece-tés Name[it]=La teiera Name[ko]=차 끓이기 도구 +Name[lt]=Arbatos virėjas Name[nl]=De Theezetter Name[nn]=Tekokaren Name[pl]=Program do parzenia herbaty @@ -350,6 +351,7 @@ Comment[fr]=La théière Comment[gl]=Quece-tés Comment[it]=La teiera Comment[ko]=차 끓이기 도구 +Comment[lt]=Arbatos virėjas Comment[nl]=De Theezetter Comment[nn]=Tekokaren Comment[pl]=Program do parzenia herbaty -- GitLab