From 06ad76df24befe450211538c577d2588dd26b1dd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Feb 2019 06:28:24 +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 | 2 ++ src/desktoptheme/breeze-light/metadata.desktop | 2 ++ src/desktoptheme/breeze/metadata.desktop | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index f1a58eb61..5074b257c 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -47,9 +47,11 @@ 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[ru]=Тёмный вариант Breeze от 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 +Comment[zh_CN]=暗色微风，由 KDE VDG 创作 Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze Dark diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index 783ff209e..37b9d3217 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -44,9 +44,11 @@ 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[ru]=Светлый вариант Breeze от 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 +Comment[zh_CN]=亮色微风，由 KDE VDG 创作 Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze Light diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index ab11d412b..d9c5663f1 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -47,9 +47,11 @@ 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[ru]=Breeze от KDE VDG Comment[sv]=Breeze av KDE:s visuella designgrupp Comment[uk]=Breeze, автори — KDE VDG Comment[x-test]=xxBreeze by the KDE VDGxx +Comment[zh_CN]=微风，由 KDE VDG 创作 Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze