From 397f191c41461a3d1a64ce0aa4a0188969131bc9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 20 Feb 2019 05:52:17 +0100 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" --- src/desktoptheme/breeze-dark/metadata.desktop | 1 + src/desktoptheme/breeze-light/metadata.desktop | 1 + src/desktoptheme/breeze/metadata.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index d97c827f5..f1a58eb61 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -46,6 +46,7 @@ Comment[es]=Brisa oscuro por KDE VDG Comment[gl]=Breeze escuro de KDE VDG Comment[nl]=Breeze Dark door de KDE VDG Comment[pt]=Brisa Escuro da VDG do KDE +Comment[pt_BR]=Breeze Dark pelo KDE VDG Comment[sv]=Breeze mörk av KDE:s visuella designgrupp Comment[uk]=Темна Breeze, автори — KDE VDG Comment[x-test]=xxBreeze Dark by the KDE VDGxx diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index e25c70aad..783ff209e 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -43,6 +43,7 @@ Comment[es]=Brisa claro por KDE VDG Comment[gl]=Breeze claro de KDE VDG Comment[nl]=Breeze Light door de KDE VDG Comment[pt]=Brisa Claro da VDG do KDE +Comment[pt_BR]=Breeze Light pelo KDE VDG Comment[sv]=Breeze ljus av KDE:s visuella designgrupp Comment[uk]=Світла Breeze, автори — KDE VDG Comment[x-test]=xxBreeze Light by the KDE VDGxx diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index e9b41c25a..ab11d412b 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -46,6 +46,7 @@ Comment[es]=Brisa por KDE VDG Comment[gl]=Breeze de KDE VDG Comment[nl]=Breeze door de KDE VDG Comment[pt]=Brisa da VDG do KDE +Comment[pt_BR]=Breeze pelo KDE VDG Comment[sv]=Breeze av KDE:s visuella designgrupp Comment[uk]=Breeze, автори — KDE VDG Comment[x-test]=xxBreeze by the KDE VDGxx