Hello community,

here is the log from the commit of package plasma5-pk-updates for 
openSUSE:Factory checked in at 2018-12-28 12:32:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-pk-updates (Old)
 and      /work/SRC/openSUSE:Factory/.plasma5-pk-updates.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "plasma5-pk-updates"

Fri Dec 28 12:32:42 2018 rev:16 rq:660075 version:0.3.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-pk-updates/plasma5-pk-updates.changes    
2018-06-22 13:15:47.358134301 +0200
+++ 
/work/SRC/openSUSE:Factory/.plasma5-pk-updates.new.28833/plasma5-pk-updates.changes
 2018-12-28 12:32:43.912071659 +0100
@@ -1,0 +2,13 @@
+Wed Dec 19 15:44:49 UTC 2018 - wba...@tmo.at
+
+- Add desktop.patch to also translate the plasmoid name to French
+  (boo#1086068)
+
+-------------------------------------------------------------------
+Wed Dec 19 14:23:02 UTC 2018 - wba...@tmo.at
+
+- Add plasma5-pk-updates-lang.tar.xz with updated French
+  translations, the included ones are rather incomplete
+  (boo#1086068)
+
+-------------------------------------------------------------------

New:
----
  desktop.patch
  plasma5-pk-updates-lang.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ plasma5-pk-updates.spec ++++++
--- /var/tmp/diff_new_pack.oG5Rhl/_old  2018-12-28 12:32:44.312071381 +0100
+++ /var/tmp/diff_new_pack.oG5Rhl/_new  2018-12-28 12:32:44.312071381 +0100
@@ -24,6 +24,10 @@
 Group:          System/Packages
 Url:            http://www.kde.org
 Source:         
https://download.kde.org/stable/plasma-pk-updates/%{version}/plasma-pk-updates-%{version}.tar.xz
+# Updated translations
+Source1:        plasma5-pk-updates-lang.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch:          desktop.patch
 # PATCH-FEATURE-OPENSUSE
 Patch100:       0001-Hide-option-to-install-updates-on-Tumbleweed.patch
 BuildRequires:  PackageKit-Qt5-devel
@@ -54,7 +58,7 @@
 
 %lang_package
 %prep
-%setup -q -n plasma-pk-updates-%{version}
+%setup -q -n plasma-pk-updates-%{version} -a 1
 %autopatch -p1
 
 %build

++++++ desktop.patch ++++++
>From 0152062cf5ea66b10f49c9ef7b32c8825c4bd9b8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scri...@kde.org>
Date: Thu, 14 Jun 2018 05:55:39 +0200
Subject: 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/plasma/metadata.desktop.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plasma/metadata.desktop.cmake 
b/src/plasma/metadata.desktop.cmake
index 2482736..5a729b6 100644
--- a/src/plasma/metadata.desktop.cmake
+++ b/src/plasma/metadata.desktop.cmake
@@ -9,6 +9,7 @@ Name[de]=Softwareaktualisierungen
 Name[en_GB]=Software Updates
 Name[es]=Actualizaciones de software
 Name[fi]=Ohjelmistopäivitykset
+Name[fr]=Mises à jour des logiciels
 Name[gl]=Actualizacións de software
 Name[it]=Aggiornamenti software
 Name[lt]=Programų atnaujinimai
@@ -35,6 +36,7 @@ Comment[de]=Softwareaktualisierungen beziehen
 Comment[en_GB]=Get software updates
 Comment[es]=Obtener actualizaciones de software
 Comment[fi]=Nouda ohjelmistopäivitykset
+Comment[fr]=Télécharger les mises à jour des logiciels
 Comment[gl]=Obteña actualizacións de software.
 Comment[it]=Scarica gli aggiornamenti del software
 Comment[lt]=Parsisiųsti programų atnaujinimus
-- 
cgit v1.1


Reply via email to