From 1ebe7dbb7acf8577e76f568560f7d23a5d781875 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 20 Dec 2017 07:06:18 +0100 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" --- applets/clock/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop index 53bc0f78..dac7e071 100644 --- a/applets/clock/metadata.desktop +++ b/applets/clock/metadata.desktop @@ -14,6 +14,7 @@ Name[nl]=Klok Name[nn]=Klokke Name[pl]=Zegar Name[pt]=Relógio +Name[ru]=Часы Name[sv]=Klocka Name[tr]=Saat Name[uk]=Годинник