From c962d43f78f114220f3862a54f2a9fc411ea6ebc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Sep 2015 11:34:22 +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 + lookandfeel.dark/metadata.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/icons-dark/index.theme b/icons-dark/index.theme index c74c38a2..0bc4409f 100644 --- a/icons-dark/index.theme +++ b/icons-dark/index.theme @@ -39,6 +39,7 @@ Name[zh_TW]=Breeze Dark Comment=KDE Plasma 5 Icon Theme for Dark themes Comment[ca]=Tema d'icones del Plasma 5 pels temes foscos del KDE +Comment[cs]=Motiv ikon KDE Plasma 5 pro tmavé motivy vzhledu 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 diff --git a/icons/index.theme b/icons/index.theme index 1517477e..198a8244 100644 --- a/icons/index.theme +++ b/icons/index.theme @@ -42,6 +42,7 @@ Name[zh_TW]=Breeze Comment=KDE Plasma 5 Icon Theme Comment[ca]=Tema d'icones del Plasma 5 pel KDE +Comment[cs]=Motiv ikon KDE Plasma 5 Comment[es]=Tema de iconos de KDE Plasma 5 Comment[fi]=KDE Plasma 5:n kuvaketeema Comment[hu]=KDE Plasma 5 ikontéma diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 4003354a..3836582e 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Comment=Breeze Dark Desktop Design Language by the KDE VDG Comment[ca]=Llenguatge de disseny d'escriptori Brisa fosca pel VDG del KDE +Comment[cs]=Jazyk pro návrh pracovní plochy Breeze Dark od KDE VDG Comment[de]=Breeze-Dunkel-Arbeitsflächendesign der KDE VDG Comment[es]=Lenguaje de diseño del escritorio Breeze Dark, por el VDG de KDE Comment[fi]=Työpöydän design-kieli Breeze Dark KDE VDG:ltä