From 03a210fd5ef74c28efb82aa7cde2f79372c8daf2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Feb 2019 05:52:00 +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" --- cursors/Breeze/Breeze/index.theme | 2 ++ cursors/Breeze/src/index.theme | 2 ++ cursors/Breeze_Snow/Breeze_Snow/index.theme | 2 ++ cursors/Breeze_Snow/src/index.theme | 2 ++ lookandfeel.dark/metadata.desktop | 2 ++ 5 files changed, 10 insertions(+) diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme index db008a8d..7ecbc62b 100644 --- a/cursors/Breeze/Breeze/index.theme +++ b/cursors/Breeze/Breeze/index.theme @@ -45,6 +45,8 @@ Name[zh_CN]=微风 Name[zh_TW]=Breeze Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE +Comment[ca@valencia]=Brisa pel VDG del KDE +Comment[de]=Breeze von der KDE VDG Comment[es]=Brisa por KDE VDG Comment[fi]=Breeze KDE VDG:ltä Comment[gl]=Breeze de KDE VDG diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme index db008a8d..7ecbc62b 100644 --- a/cursors/Breeze/src/index.theme +++ b/cursors/Breeze/src/index.theme @@ -45,6 +45,8 @@ Name[zh_CN]=微风 Name[zh_TW]=Breeze Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE +Comment[ca@valencia]=Brisa pel VDG del KDE +Comment[de]=Breeze von der KDE VDG Comment[es]=Brisa por KDE VDG Comment[fi]=Breeze KDE VDG:ltä Comment[gl]=Breeze de KDE VDG diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index 53e839aa..da45027e 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -24,6 +24,8 @@ Name[zh_CN]=亮色微风 Name[zh_TW]=Breeze Light Comment=Breeze Light by the KDE VDG Comment[ca]=Brisa clara pel VDG del KDE +Comment[ca@valencia]=Brisa clara pel VDG del KDE +Comment[de]=Breeze-Hell von der KDE VDG Comment[es]=Brisa claro por KDE VDG Comment[fi]=Breeze Light KDE VDG:ltä Comment[gl]=Breeze claro de KDE VDG diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index 53e839aa..da45027e 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -24,6 +24,8 @@ Name[zh_CN]=亮色微风 Name[zh_TW]=Breeze Light Comment=Breeze Light by the KDE VDG Comment[ca]=Brisa clara pel VDG del KDE +Comment[ca@valencia]=Brisa clara pel VDG del KDE +Comment[de]=Breeze-Hell von der KDE VDG Comment[es]=Brisa claro por KDE VDG Comment[fi]=Breeze Light KDE VDG:ltä Comment[gl]=Breeze claro de KDE VDG diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index d19d7f06..698b9188 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -1,6 +1,8 @@ [Desktop Entry] Comment=Breeze Dark by the KDE VDG Comment[ca]=Brisa fosca pel VDG del KDE +Comment[ca@valencia]=Brisa fosca pel VDG del KDE +Comment[de]=Breeze-Dunkel von der KDE VDG Comment[es]=Brisa oscuro por KDE VDG Comment[fi]=Breeze Dark KDE VDG:ltä Comment[gl]=Breeze escuro de KDE VDG