From 1d03b5d44bb849873962119c26fd0bc0b04f1c40 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 19 May 2018 08:02:14 +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" --- themes/windows/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index 46d9001e5..dcb7e3b0e 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -17,7 +17,7 @@ Name[pt]=Windows Name[sv]=Windows Name[uk]=Windows Name[x-test]=xxWindowsxx -Name[zh_CN]=窗口 +Name[zh_CN]=Windows Comment=Windows like theme based on Material design Comment[ca]=Tema semblant al Windows basat en el «Material design» Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design»