From e9c10c74cf61a35406212cf375eef16fa0b1e077 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 19 Feb 2019 06:39:33 +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 | 1 + cursors/Breeze/src/index.theme | 1 + cursors/Breeze_Snow/Breeze_Snow/index.theme | 1 + cursors/Breeze_Snow/src/index.theme | 1 + lookandfeel.dark/metadata.desktop | 1 + 5 files changed, 5 insertions(+) diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme index 71580590..28787982 100644 --- a/cursors/Breeze/Breeze/index.theme +++ b/cursors/Breeze/Breeze/index.theme @@ -45,6 +45,7 @@ Name[zh_CN]=微风 Name[zh_TW]=Breeze Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE +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 diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme index 71580590..28787982 100644 --- a/cursors/Breeze/src/index.theme +++ b/cursors/Breeze/src/index.theme @@ -45,6 +45,7 @@ Name[zh_CN]=微风 Name[zh_TW]=Breeze Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE +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 diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index 7fe66fa2..b1b2fa33 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -24,6 +24,7 @@ Name[zh_CN]=亮色微风 Name[zh_TW]=Breeze Light Comment=Breeze Light by the KDE VDG Comment[ca]=Brisa clara pel VDG del KDE +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 diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index 7fe66fa2..b1b2fa33 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -24,6 +24,7 @@ Name[zh_CN]=亮色微风 Name[zh_TW]=Breeze Light Comment=Breeze Light by the KDE VDG Comment[ca]=Brisa clara pel VDG del KDE +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 diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index b4786df5..9f00c6d3 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Comment=Breeze Dark by the KDE VDG Comment[ca]=Brisa fosca pel VDG del KDE +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