From b9f90668800c3384b6176f94948f128872d628b0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Jun 2022 02:21:44 +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" --- containments/panel/package/metadata.desktop | 2 +- containments/taskpanel/package/metadata.desktop | 2 +- kcms/mobileshell/package/metadata.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containments/panel/package/metadata.desktop b/containments/panel/package/metadata.desktop index fd9b7bc4..d0fbd4ab 100644 --- a/containments/panel/package/metadata.desktop +++ b/containments/panel/package/metadata.desktop @@ -8,7 +8,7 @@ Name=Phone Panel Name[ast]=Panel del teléfonu Name[az]=Telefon paneli Name[ca]=Plafó del telèfon -Name[ca@valencia]=Quadre del teléfon +Name[ca@valencia]=Quadro del teléfon Name[cs]=Panel telefonu Name[da]=Panel til telefon Name[en_GB]=Phone Panel diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop index 60231456..56f92690 100644 --- a/containments/taskpanel/package/metadata.desktop +++ b/containments/taskpanel/package/metadata.desktop @@ -8,7 +8,7 @@ Name=Phone Task panel Name[ast]=Panel de xeres del teléfonu Name[az]=Telefon tapşırıq paneli Name[ca]=Plafó de tasques del telèfon -Name[ca@valencia]=Quadre de tasques del teléfon +Name[ca@valencia]=Quadro de tasques del teléfon Name[da]=Opgavepanel til telefon Name[en_GB]=Phone Task panel Name[es]=Panel de tareas del teléfono diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop index 8e19ccf4..6ede31ff 100644 --- a/kcms/mobileshell/package/metadata.desktop +++ b/kcms/mobileshell/package/metadata.desktop @@ -79,7 +79,7 @@ X-KDE-PluginInfo-EnabledByDefault=true X-KDE-Keywords=system,shell,panel X-KDE-Keywords[az]=sistem,örtük,panel X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó -X-KDE-Keywords[ca@valencia]=sistema,intérpret d'ordres,quadre +X-KDE-Keywords[ca@valencia]=sistema,intérpret d'ordres,quadro X-KDE-Keywords[en_GB]=system,shell,panel X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel X-KDE-Keywords[eu]=sistema,shell,oskola,panela