From 937f2ccc156b5401851afd6adcdc097f3b345e9b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 17 Feb 2019 05:32: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 | 8 ++++++++ src/desktoptheme/breeze-light/metadata.desktop | 8 ++++++++ src/desktoptheme/breeze/metadata.desktop | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index 7f5f69001..e26b6dc12 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -41,6 +41,14 @@ Name[x-test]=xxBreeze Darkxx Name[zh_CN]=暗色微风 Name[zh_TW]=Breeze Dark Comment=Breeze Dark by the KDE VDG +Comment[ca]=Brisa fosca pel VDG del KDE +Comment[gl]=Breeze escuro de KDE VDG +Comment[nl]=Breeze Dark door de KDE VDG +Comment[pt]=Brisa Escuro da VDG do KDE +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_TW]=由 KDE VDG 團隊製作的 Breeze Dark X-KDE-PluginInfo-Author=KDE Visual Design Group diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index 565cb634d..86ece970f 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -38,6 +38,14 @@ Name[x-test]=xxBreeze Lightxx Name[zh_CN]=亮色微风 Name[zh_TW]=Breeze Light Comment=Breeze Light by the KDE VDG +Comment[ca]=Brisa clara pel VDG del KDE +Comment[gl]=Breeze claro de KDE VDG +Comment[nl]=Breeze Light door de KDE VDG +Comment[pt]=Brisa Claro da VDG do KDE +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_TW]=由 KDE VDG 團隊製作的 Breeze Light X-KDE-PluginInfo-Author=KDE Visual Design Group diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index 28d01e569..d6a9bc96c 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -41,6 +41,14 @@ Name[x-test]=xxBreezexx Name[zh_CN]=微风 Name[zh_TW]=Breeze Comment=Breeze by the KDE VDG +Comment[ca]=Brisa pel VDG del KDE +Comment[gl]=Breeze de KDE VDG +Comment[nl]=Breeze door de KDE VDG +Comment[pt]=Brisa da VDG do KDE +Comment[sv]=Breeze av KDE:s visuella designgrupp +Comment[uk]=Breeze, автори — KDE VDG +Comment[x-test]=xxBreeze by the KDE VDGxx +Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze X-KDE-PluginInfo-Author=KDE Visual Design Group