[SCM] vlc/master: Refresh patch

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Feb 14 18:10:54 UTC 2016


The following commit has been merged in the master branch:
commit b22ea4d59f8a7fab4a545bf1faf61d424bd0a526
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Feb 14 19:10:21 2016 +0100

    Refresh patch

diff --git a/debian/patches/fix-translation.patch b/debian/patches/fix-translation.patch
index c960c9f..e4ccb6e 100644
--- a/debian/patches/fix-translation.patch
+++ b/debian/patches/fix-translation.patch
@@ -2,11 +2,9 @@ Description: Revert invalid translations
 Bug: https://trac.videolan.org/vlc/ticket/16598
 Bug-Debian: https://bugs.debian.org/814258
 
-diff --git a/po/de.po b/po/de.po
-index b9b19aa..9b82fb0 100644
 --- a/po/de.po
 +++ b/po/de.po
-@@ -22012,7 +22012,7 @@ msgstr "&Wiedergabeliste"
+@@ -22012,7 +22012,7 @@
  
  #: modules/gui/qt4/menus.cpp:491
  msgid "Ctrl+L"
@@ -15,7 +13,7 @@ index b9b19aa..9b82fb0 100644
  
  #: modules/gui/qt4/menus.cpp:494
  msgid "Docked Playlist"
-@@ -22024,7 +22024,7 @@ msgstr "Mi&nimale Ansicht"
+@@ -22024,7 +22024,7 @@
  
  #: modules/gui/qt4/menus.cpp:506
  msgid "Ctrl+H"
@@ -24,7 +22,7 @@ index b9b19aa..9b82fb0 100644
  
  #: modules/gui/qt4/menus.cpp:515
  msgid "&Fullscreen Interface"
-@@ -22180,7 +22180,7 @@ msgstr "&Rückwärts springen"
+@@ -22180,7 +22180,7 @@
  
  #: modules/gui/qt4/menus.cpp:918
  msgid "Ctrl+T"
@@ -33,11 +31,18 @@ index b9b19aa..9b82fb0 100644
  
  #: modules/gui/qt4/menus.cpp:933
  msgid "Open &Network..."
-diff --git a/po/mr.po b/po/mr.po
-index 195fa3e..d9c5042 100644
 --- a/po/mr.po
 +++ b/po/mr.po
-@@ -21567,7 +21567,7 @@ msgstr "चालविण्याची यादी"
+@@ -13,7 +13,7 @@
+ "Project-Id-Version: VLC - Trans\n"
+ "Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
+ "POT-Creation-Date: 2016-01-18 22:17+0100\n"
+-"PO-Revision-Date: 2015-12-04 10:01+0000\n"
++"PO-Revision-Date: 2016-02-14 19:02+0100\n"
+ "Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
+ "Language-Team: Marathi (http://www.transifex.com/yaron/vlc-trans/language/"
+ "mr/)\n"
+@@ -21567,7 +21567,7 @@
  
  #: modules/gui/qt4/menus.cpp:491
  msgid "Ctrl+L"
@@ -46,16 +51,16 @@ index 195fa3e..d9c5042 100644
  
  #: modules/gui/qt4/menus.cpp:494
  msgid "Docked Playlist"
-@@ -21579,7 +21579,7 @@ msgstr "किमान आंतरपृष्ठ"
+@@ -21579,7 +21579,7 @@
  
  #: modules/gui/qt4/menus.cpp:506
  msgid "Ctrl+H"
 -msgstr "कंट्रोल + एच"
-+msgstr "Ctrl+H
++msgstr "Ctrl+H"
  
  #: modules/gui/qt4/menus.cpp:515
  msgid "&Fullscreen Interface"
-@@ -21735,7 +21735,7 @@ msgstr "मागे उडी मारा"
+@@ -21735,7 +21735,7 @@
  
  #: modules/gui/qt4/menus.cpp:918
  msgid "Ctrl+T"

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list