From fcfdc340ac4c53d3571d40dd1368abdff0f8fbf4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 16 Oct 2019 05:24:08 +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 822ee94d6..b5429055e 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -40,7 +40,7 @@ Comment[id]=Tema seperti Windows berdasarkan pada desain Material Comment[it]=Tema di tipo Windows, basato sul design Material Comment[ko]=머티리얼 디자인 기반 Windows 형태 테마 Comment[lt]=Į Windows panašus apipavidalinimas, pagrįstas Material dizainu -Comment[nl]=Op Windows lijkend thema gebaseerd op Material ontwerp +Comment[nl]=Op Windows lijkend thema gebaseerd op Materiaalontwerp Comment[nn]=Windows-liknande tema, basert på Material-stilen Comment[pl]=Wygląd przypominający Windowsa dla Falkona oparty na wyglądzie Material Comment[pt]=Tema semelhante ao Windows, baseado no 'material design'