From 621349d2fe638aa28dbf1315411111d48bab7f5d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 19 Nov 2015 12:13:49 +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 ++ icons/index.theme | 2 ++ 2 files changed, 4 insertions(+) diff --git a/icons-dark/index.theme b/icons-dark/index.theme index 0c2f7c4b..6724264b 100644 --- a/icons-dark/index.theme +++ b/icons-dark/index.theme @@ -1,6 +1,7 @@ [Icon Theme] Name=Breeze Dark Name[ca]=Brisa fosca +Name[ca@valencia]=Brisa fosca Name[en_GB]=Breeze Dark Name[es]=Brisa oscura Name[fi]=Breeze Dark @@ -19,6 +20,7 @@ Name[x-test]=xxBreeze Darkxx Comment=Default Plasma 5 Theme for Dark themes Comment[ca]=Tema del Plasma 5 per defecte per temes foscos +Comment[ca@valencia]=Tema del Plasma 5 per defecte per temes foscos Comment[en_GB]=Default Plasma 5 Theme for Dark themes Comment[es]=Tema por omisión de Plasma 5 para temas oscuros Comment[fi]=Plasma 5:n oletusteema tummille teemoille diff --git a/icons/index.theme b/icons/index.theme index c977e685..25bab1bd 100644 --- a/icons/index.theme +++ b/icons/index.theme @@ -2,6 +2,7 @@ Name=Breeze Name[ast]=Breeze Name[ca]=Brisa +Name[ca@valencia]=Brisa Name[en_GB]=Breeze Name[es]=Brisa Name[fi]=Breeze @@ -20,6 +21,7 @@ Name[x-test]=xxBreezexx Comment=Default Plasma 5 Theme Comment[ca]=Tema del Plasma 5 per defecte +Comment[ca@valencia]=Tema del Plasma 5 per defecte Comment[en_GB]=Default Plasma 5 Theme Comment[es]=Tema por omisión de Plasma 5 Comment[fi]=Plasma 5:n oletusteema