[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.5.0-2

Sun Apr 3 21:59:19 UTC 2011

The following commit has been merged in the master branch:
commit 5ea3d2a2bd4dd7cc930762fae9841fe352215b99
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Apr 4 00:44:00 2011 +0300

    Final version of package descriptions and phonon-backend-null.templates.
    
    Also rerun debconf-updatepo.
---
 debian/changelog                     |    2 ++
 debian/control                       |   16 ++++++++--------
 debian/phonon-backend-null.templates |   17 +++++++++--------
 debian/po/templates.pot              |   18 +++++++++---------
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e3fced..4616ad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 phonon (4:4.6.0really4.5.0-2) UNRELEASED; urgency=low
 
+  * Add final post-review version of package descriptions and
+    phonon-backend-null.templates.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 04 Apr 2011 00:42:13 +0300
 
diff --git a/debian/control b/debian/control
index d55b2c5..973cf29 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Depends: ${misc:Depends}, libphonon4 (>= ${source:Version}),
  ${phonon:Recommended-Backend} | phonon-backend
 Suggests: ${phonon:Recommended-Backend}, phonon-backend-gstreamer,
  phonon-backend-xine, phonon-backend-mplayer
-Description: Phonon multimedia framework - metapackage
+Description: multimedia framework from KDE - metapackage
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
  .
@@ -29,7 +29,7 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libphonon4 (= ${binary:Version}),
  ${sameVersionDep:libqt4-dev:libphonon4}, phonon-backend-null | phonon
-Description: Phonon multimedia framework - development files
+Description: multimedia framework from KDE - development files
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
  .
@@ -41,12 +41,12 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: phonon-backend-xine (<< 4:4.6.0really4.3.80)
-Description: Phonon multimedia framework - core library
+Description: multimedia framework from KDE - core library
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
  .
  This package contains the core library of the Phonon cross-platform multimedia
- framework for Qt 4. It is required to run applications that use Phonon.
+ framework from KDE. It is required to run applications that use Phonon.
 
 Package: libphononexperimental-dev
 Architecture: any
@@ -55,7 +55,7 @@ Depends: ${misc:Depends}, libphononexperimental4 (= ${binary:Version}),
  ${sameVersionDep:libqt4-dev:libphononexperimental4}
 Replaces: libphonon-dev (<< 4:4.6.0really4.4.4)
 Breaks: libphonon-dev (<< 4:4.6.0really4.4.4)
-Description: Phonon-Experimental multimedia framework - development files
+Description: multimedia framework from KDE - experimental development files
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
  .
@@ -71,7 +71,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: phononexperimental-abi-1
 Replaces: libphonon4 (<< 4:4.6.0really4.3.80)
 Breaks: libphonon4 (<< 4:4.6.0really4.3.80)
-Description: Phonon-Experimental multimedia framework - library (internal)
+Description: multimedia framework from KDE - experimental library (internal)
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
  .
@@ -85,7 +85,7 @@ Architecture: all
 Provides: phonon-backend
 Depends: libphonon4, ${misc:Depends}
 Conflicts: phonon-backend
-Description: Phonon multimedia framework - null back-end (no real back-end)
+Description: multimedia framework from KDE - null back-end (no real back-end)
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
  .
@@ -99,7 +99,7 @@ Architecture: any
 Section: debug
 Depends: ${misc:Depends}, libphonon4 (= ${binary:Version})
 Suggests: libphononexperimental4 (= ${binary:Version})
-Description: Phonon multimedia framework - debugging symbols
+Description: multimedia framework from KDE - debugging symbols
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
  .
diff --git a/debian/phonon-backend-null.templates b/debian/phonon-backend-null.templates
index cf7ff9b..fd36066 100644
--- a/debian/phonon-backend-null.templates
+++ b/debian/phonon-backend-null.templates
@@ -4,14 +4,15 @@ _Description: Warning: Phonon is not functional
 
 Template: phonon-backend-null/isnt_functional
 Type: note
-_Description: Phonon multimedia capabilities are disabled
- Phonon based (i.e. most KDE and some Qt) applications will produce no audio or
- video output because there is no real Phonon backend installed on your system.
- Typically, this is an undesirable configuration which you might have gotten to
- unintentionally.
+#flag:comment:4
+# Translators: do not translate variable names
+# only translate "(recommended)" (the one in parenthesis)
+_Description: Missing back-end for Phonon
+ Applications using Phonon (the Qt 4 multimedia framework) will produce
+ no audio or video output, because only a dummy Phonon back-end is
+ installed on this system. This is typically an unintended configuration.
  .
- If you wish to restore full Phonon multimedia capabilities, install a real
- Phonon backend with your favourite package manager. The following Phonon
- backend packages seem to be available for your system at the moment:
+ To restore full Phonon multimedia capabilities, install one of the real
+ Phonon back-end packages which are currently available for this system:
  .
  ${recommended_backend} (recommended)${other_backends}
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 34388ee..29f70a1 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: phonon at packages.debian.org\n"
-"POT-Creation-Date: 2011-02-27 01:42+0200\n"
+"POT-Creation-Date: 2011-04-04 00:51+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -26,30 +26,30 @@ msgstr ""
 #. Type: note
 #. Description
 #: ../phonon-backend-null.templates:2001
-msgid "Phonon multimedia capabilities are disabled"
+msgid "Missing back-end for Phonon"
 msgstr ""
 
 #. Type: note
 #. Description
 #: ../phonon-backend-null.templates:2001
 msgid ""
-"Phonon based (i.e. most KDE and some Qt) applications will produce no audio "
-"or video output because there is no real Phonon backend installed on your "
-"system. Typically, this is an undesirable configuration which you might have "
-"gotten to unintentionally."
+"Applications using Phonon (the Qt 4 multimedia framework) will produce no "
+"audio or video output, because only a dummy Phonon back-end is installed on "
+"this system. This is typically an unintended configuration."
 msgstr ""
 
 #. Type: note
 #. Description
 #: ../phonon-backend-null.templates:2001
 msgid ""
-"If you wish to restore full Phonon multimedia capabilities, install a real "
-"Phonon backend with your favourite package manager. The following Phonon "
-"backend packages seem to be available for your system at the moment:"
+"To restore full Phonon multimedia capabilities, install one of the real "
+"Phonon back-end packages which are currently available for this system:"
 msgstr ""
 
 #. Type: note
 #. Description
+#. Translators: do not translate variable names
+#. only translate "(recommended)" (the one in parenthesis)
 #: ../phonon-backend-null.templates:2001
 msgid "${recommended_backend} (recommended)${other_backends}"
 msgstr ""

-- 
Phonon Multimedia Framework packaging

