From 17de56d096eaf2c940894c4e8ec43ecabbe2a7bc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 5 Sep 2015 11:18:25 +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 | 1 + icons/index.theme | 1 + 2 files changed, 2 insertions(+) diff --git a/icons-dark/index.theme b/icons-dark/index.theme index 914ac340..95d53af6 100644 --- a/icons-dark/index.theme +++ b/icons-dark/index.theme @@ -43,6 +43,7 @@ Comment[es]=Tema de iconos de KDE Plasma 5 para temas oscuros Comment[fi]=KDE Plasma 5:n kuvaketeema tummille teemoille Comment[hu]=KDE Plasma 5 ikontéma sötét témákhoz Comment[nl]=Pictogramthema voor donkere thema's voor KDE Plasma 5 +Comment[pl]=Zestaw ikon KDE Plazma 5 dla ciemnych wystrojów Comment[pt]=Tema de Ícones Escuro para o Plasma 5 do KDE Comment[pt_BR]=Tema de ícones do KDE Plasma 5 para temas escuros Comment[sv]=KDE Plasma 5 ikontema för mörka teman diff --git a/icons/index.theme b/icons/index.theme index 857d255e..85cb54a9 100644 --- a/icons/index.theme +++ b/icons/index.theme @@ -46,6 +46,7 @@ Comment[es]=Tema de iconos de KDE Plasma 5 Comment[fi]=KDE Plasma 5:n kuvaketeema Comment[hu]=KDE Plasma 5 ikontéma Comment[nl]=Pictogramthema voor KDE Plasma 5 +Comment[pl]=Zestaw ikon KDE Plazma 5 Comment[pt]=Tema de Ícones do Plasma 5 para KDE Comment[pt_BR]=Tema de ícones do KDE Plasma 5 Comment[sv]=KDE Plasma 5 ikontema