[SCM] vlc/master: Add grammar patch from upstream

[edwardw-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 21b7d1d60f1b7428048774cf4b059fae8f168ac7
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Sun Oct 6 18:17:41 2013 -0400

    Add grammar patch from upstream

diff --git a/debian/patches/pnap-grammar.patch b/debian/patches/pnap-grammar.patch
new file mode 100644
index 0000000..f0da5d8
--- /dev/null
+++ b/debian/patches/pnap-grammar.patch
@@ -0,0 +1,30 @@
+From: Edward Wang <edward.c.wang at compdigitec.com>
+Date: Sat, 13 Jul 2013 15:38:49 -0400
+Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commitdiff;h=69d75edde2c5b7f70f238d7f7546cc418c3f18ea
+
+--- a/modules/gui/qt4/dialogs/firstrun.cpp
++++ b/modules/gui/qt4/dialogs/firstrun.cpp
+@@ -69,16 +69,16 @@ void FirstRun::buildPrivDialog()
+     QGroupBox *blabla = new QGroupBox( qtr( "Privacy and Network Access Policy" ) );
+     QGridLayout *blablaLayout = new QGridLayout( blabla );
+     QLabel *text = new QLabel( qtr(
+-        "<p>In order to protect your privacy, the <i>VLC media player</i> "
++        "<p>In order to protect your privacy, <i>VLC media player</i> "
+         "does <b>not</b> collect personal data or transmit them, "
+         "not even in anonymized form, to anyone."
+         "</p>\n"
+         "<p>Nevertheless, <i>VLC</i> is able to automatically retrieve "
+         "information about the media in your playlist from third party "
+-        "Internet-based services. That includes covert arts, track names, "
+-        "authoring and other meta-data."
++        "Internet-based services. This includes cover art, track names, "
++        "artist names and other meta-data."
+         "</p>\n"
+-        "That may entail identifying some of your media files to third party "
++        "Consequently, this may entail identifying some of your media files to third party "
+         "entities. Therefore the <i>VLC</i> developers require your express "
+         "consent for the media player to access the Internet automatically."
+         "</p>\n"
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 0a1c726..50e6358 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 link-binaries-with-c++.patch
+pnap-grammar.patch

-- 
VLC media player packaging