r46685 - in /desktop/unstable/gnome-control-center/debian: changelog patches/08_fix_syntax_errors_in_sharing_panel_translations.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Oct 14 19:51:56 2015
New Revision: 46685

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46685
Log:
Cherry-pick patch from upstream which fixes syntax errors in
gnome-sharing-panel.desktop translations.

Added:
    desktop/unstable/gnome-control-center/debian/patches/08_fix_syntax_errors_in_sharing_panel_translations.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=46685&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog	[utf-8] Wed Oct 14 19:51:56 2015
@@ -7,6 +7,8 @@
     - Bump libgnome-bluetooth-dev to (>= 3.18.0).
   * Drop debian/patches/debian-uses-ssh-service.patch and instead set
     SSHD_SERVICE=ssh.service via CPPFLAGS in debian/rules.
+  * Cherry-pick patch from upstream which fixes syntax errors in
+    gnome-sharing-panel.desktop translations.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 14 Oct 2015 19:15:54 +0200
 

Added: desktop/unstable/gnome-control-center/debian/patches/08_fix_syntax_errors_in_sharing_panel_translations.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/08_fix_syntax_errors_in_sharing_panel_translations.patch?rev=46685&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/08_fix_syntax_errors_in_sharing_panel_translations.patch	(added)
+++ desktop/unstable/gnome-control-center/debian/patches/08_fix_syntax_errors_in_sharing_panel_translations.patch	[utf-8] Wed Oct 14 19:51:56 2015
@@ -0,0 +1,43 @@
+From 781e4b14a23fd070000fe322ec3b1791d62bc5c4 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember at redhat.com>
+Date: Mon, 12 Oct 2015 15:13:26 +0200
+Subject: [PATCH] Fix syntax errors in gnome-sharing-panel.desktop translations
+
+Remove erroneous linefeeds from gnome-sharing-panel.desktop translations
+that break desktop file syntax.
+
+---
+ po/sr.po       | 2 +-
+ po/sr at latin.po | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/po/sr.po b/po/sr.po
+index 6efaf6d..4120c56 100644
+--- a/po/sr.po
++++ b/po/sr.po
+@@ -5128,7 +5128,7 @@ msgid ""
+ "server;renderer;"
+ msgstr ""
+ "дели;дељење;ссх;безбедна шкољка;домаћин;назив;удаљено;радна површ;блутут;обекс;"
+-"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;\n"
++"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;"
+ "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;obeks;"
+ "medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;iscrtavač;"
+ 
+diff --git a/po/sr at latin.po b/po/sr at latin.po
+index 0947ba4..52e423c 100644
+--- a/po/sr at latin.po
++++ b/po/sr at latin.po
+@@ -5198,9 +5198,6 @@ msgid ""
+ msgstr ""
+ "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
+ "obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
+-"iscrtavač;\n"
+-"deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
+-"obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
+ "iscrtavač;"
+ 
+ #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+-- 
+2.6.1
+

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=46685&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] Wed Oct 14 19:51:56 2015
@@ -1,3 +1,4 @@
 01_menu_category.patch
 06_handle_passwd_with_ldap.patch
 07_polkit_wheel_sudo_group.patch
+08_fix_syntax_errors_in_sharing_panel_translations.patch