From 12a02451df1588927e60cfe61c42a1b9291d0168 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 17 Mar 2017 03:50:12 +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" --- effects/logout/package/metadata.desktop | 6 ++++++ .../aurorae/kwin-packagestructure-aurorae.desktop | 6 ++++++ .../decoration/kwin-packagestructure-decoration.desktop | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 449b8602d6..d3b29aec2f 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -1,5 +1,11 @@ [Desktop Entry] Name=logout +Name[ca]=sortida +Name[nl]=afmelden +Name[pt]=encerramento +Name[sv]=utloggning +Name[uk]=вихід +Name[x-test]=xxlogoutxx Icon=preferences-system-windows-effect-logout Comment=Smoothly fade to the desktop when logging in Comment[ar]=اظهار سطح المكتب بنعومة عند الولوج diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index 3f1065ec19..5ca100bf32 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -1,5 +1,11 @@ [Desktop Entry] Name=KWin Aurorae +Name[ca]=Aurorae del KWin +Name[nl]=KWin Aurorae +Name[pt]=Aurora do KWin +Name[sv]=Kwin-aurora +Name[uk]=KWin Aurorae +Name[x-test]=xxKWin Auroraexx Type=Service X-KDE-ServiceTypes=KPackage/PackageStructure X-KDE-Library=kwin_packagestructure_aurorae diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop index 2e362d4896..97edb6c72a 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -1,5 +1,11 @@ [Desktop Entry] Name=KWin Decoration +Name[ca]=Decoració del KWin +Name[nl]=KWin-decoraties +Name[pt]=Decorações do KWin +Name[sv]=Kwin-dekoration +Name[uk]=Обрамлення вікон KWin +Name[x-test]=xxKWin Decorationxx Type=Service X-KDE-ServiceTypes=KPackage/PackageStructure X-KDE-Library=kwin_packagestructure_decoration