From 3d730cbc9fe87ecf7746bc4378fd8fe4e82e4fa4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 22 Sep 2016 12:27:29 +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" --- wallpapers/color/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallpapers/color/metadata.desktop b/wallpapers/color/metadata.desktop index 07185398f..1b892ff89 100644 --- a/wallpapers/color/metadata.desktop +++ b/wallpapers/color/metadata.desktop @@ -46,7 +46,7 @@ Name[sr@ijekavianlatin]=prosta boja Name[sr@latin]=prosta boja Name[sv]=Enkel färg Name[tr]=Düz Renk -Name[uk]=Звичайні кольорові +Name[uk]=Звичайний колір Name[x-test]=xxPlain Colorxx Name[zh_CN]=纯色 Name[zh_TW]=普通顏色