From f324bce24dacabfdfc0eedf62750a92c57bcc2e0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 15 Sep 2015 12:49:04 +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" --- icons-dark/index.theme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/icons-dark/index.theme b/icons-dark/index.theme index 7384829f..42a25841 100644 --- a/icons-dark/index.theme +++ b/icons-dark/index.theme @@ -38,6 +38,8 @@ Name[zh_CN]=暗色微风 Name[zh_TW]=Breeze Dark Comment=Default Plasma 5 Theme for Dark themes +Comment[de]=Dunkles Standard-Arbeitsflächendesign für Plasma 5 +Comment[es]=Tema por omisión de Plasma 5 para temas oscuros Comment[nl]=Standaard Plasma 5 thema voor donkere thema's Comment[pt]=Tema Escuro por Omissão para o Plasma 5 Comment[pt_BR]=Tema padrão do Plasma 5 para temas escuros