[debian-edu-commits] debian-edu/ 165/183: Integrate non-maintainer uploads 1.4.15+nmu1 and 1.4.15+nmu2.

Alexander Alemayhu ccscanf-guest at moszumanska.debian.org
Wed Jun 11 16:48:43 UTC 2014 

This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.

commit 95a955f9a11bd503af133019bcd78c1f17b5ea3d
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Aug 17 11:49:03 2013 +0000

    Integrate non-maintainer uploads 1.4.15+nmu1 and 1.4.15+nmu2.
---
 debian/changelog        | 27 +++++++++++++++++++++++++--
 debian/po/ca.po         | 15 +++++++--------
 debian/po/cs.po         |  1 +
 debian/po/de.po         |  1 +
 debian/po/es.po         |  1 +
 debian/po/eu.po         |  1 +
 debian/po/fr.po         |  5 +++--
 debian/po/gl.po         |  1 +
 debian/po/ja.po         | 18 +++++++++---------
 debian/po/nl.po         |  1 +
 debian/po/pt.po         |  5 +++--
 debian/po/pt_BR.po      |  1 +
 debian/po/ru.po         | 17 +++++++++--------
 debian/po/sv.po         |  5 +++--
 debian/po/templates.pot | 16 ++++++++++++----
 debian/po/tr.po         | 27 ++++++++++++++++++---------
 debian/po/vi.po         |  3 ++-
 debian/templates        |  2 +-
 18 files changed, 99 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ee474f..3e96ba2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,34 @@
-desktop-profiles (1.4.16) unstable; urgency=low
-
+desktop-profiles (1.4.16) UNRELEASED; urgency=low
+ 
+  [ Bart Cornelis (cobaco) ]
   *  Added Japanese translation by "Hideki Yamane (Closes: #510725) 
   *  don't forget tot 'set -e' in config and postinst scripts, avoids lintian
      warning
 
+  [ Petter Reinholdtsen ]
+  * Integrate non-maintainer uploads 1.4.15+nmu1 and 1.4.15+nmu2.
+
  -- Bart Cornelis (cobaco) <cobaco at linux.be>  Sun, 11 Jan 2009 03:25:25 +0100
 
+desktop-profiles (1.4.15+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Drop extra spaces at the end of the debconf templates file.
+  * Fix pending l10n issues. Debconf translations:
+    - Italian (Vincenzo Campanella).  Closes: #560365
+    - Danish (Joe Hansen).  Closes: #656654
+    - Polish (Michał Kułach).  Closes: #666778
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 10 Apr 2012 07:36:05 +0200
+
+desktop-profiles (1.4.15+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Japanese (Hideki Yamane (Debian-JP)).  Closes: #510725
+
+ -- Christian Perrier <bubulle at debian.org>  Thu, 03 Dec 2009 22:13:43 +0100
+
 desktop-profiles (1.4.15) unstable; urgency=low
 
   [ Guillem Jover ]
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 9c785ec..768bd6e 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-04-28 23:08+0300\n"
 "Last-Translator: Guillem Jover <guillem at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,9 +31,9 @@ msgid ""
 "version 1.4.6 of this package for details)."
 msgstr ""
 "Les directives «include» emprades per desktop-profiles han canviat (com a "
-"solució a l'informe d'error 309978, per a més detalls vegeu l'informe i "
-"les corresponents entrades al registre de canvis de la versió 1.4.6 "
-"d'aquest paquet."
+"solució a l'informe d'error 309978, per a més detalls vegeu l'informe i les "
+"corresponents entrades al registre de canvis de la versió 1.4.6 d'aquest "
+"paquet."
 
 #. Type: note
 #. Description
@@ -44,9 +45,7 @@ msgid ""
 "profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
 "Per a reactivar els perfils de gconf haureu de canviar «/etc/gconf/2/path» "
-"de la següent forma:\\n"
-" - «include /var/cache/desktop-profiles/\\$(USER)_mandatory.path» ha de ser "
-"«include \\$(ENV_MANDATORY_PATH)» i\\n"
-" - «include /var/cache/desktop-profiles/\\$(USER)_defaults.path» ha de ser "
+"de la següent forma:\\n - «include /var/cache/desktop-profiles/\\$(USER)"
+"_mandatory.path» ha de ser «include \\$(ENV_MANDATORY_PATH)» i\\n - "
+"«include /var/cache/desktop-profiles/\\$(USER)_defaults.path» ha de ser "
 "«include \\$(ENV_DEFAULTS_PATH)»"
-
diff --git a/debian/po/cs.po b/debian/po/cs.po
index e02d50c..e3ec6b4 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2005-10-02 17:25+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/de.po b/debian/po/de.po
index d7dd834..d13f7b2 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-02-04 09:31-0500\n"
 "Last-Translator: Matthias Julius <mdeb at julius-net.net>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/es.po b/debian/po/es.po
index 85506d5..9d88908 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -31,6 +31,7 @@ msgstr ""
 "PO-Revision-Date: 2005-10-31 17:00+0100\n"
 "Last-Translator: César Gómez Martín <cesar.gomez at gmail.com>\n"
 "Language-Team: Debian l10n spanish <debian-l10n-spanish at lists.debian.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 7c78062..795af3a 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2005-10-03 10:34+0100\n"
 "Last-Translator: Piarres Beobide Egaa <pi at beobide.net>\n"
 "Language-Team: Basque\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 814e321..7b339a5 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -8,8 +8,8 @@
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files
 # Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles\n"
@@ -18,6 +18,7 @@ msgstr ""
 "PO-Revision-Date: 2006-09-11 13:38+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.or>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 0a2b7d9..a4487fe 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2008-06-17 22:34+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index c5db2c3..2da89f4 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -1,7 +1,7 @@
-# Copyright (C) 2008 Bart Cornelis (cobaco) <cobaco at linux.be>
-# This file is distributed under the same license as the desktop-profiles package.
-# Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2008.
-#
+# Copyright (C) 2008 Bart Cornelis (cobaco) <cobaco at linux.be>
+# This file is distributed under the same license as the desktop-profiles package.
+# Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2008.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles 1.4.15\n"
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2008-12-28 22:26+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,8 +43,7 @@ msgid ""
 "profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
 "gconf プロファイルを再度有効にするには /etc/gconf/2/path を以下の様に変更する"
-"必要があります:\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory."
-"path' を 'include \\$(ENV_MANDATORY_PATH)' に変更、そして\\n - 'include /var/"
-"cache/desktop-profiles/\\$(USER)_defaults.path' は 'include "
-"\\$(ENV_DEFAULTS_PATH)' に変更"
-
+"必要があります:\\n - 'include /var/cache/desktop-profiles/\\$(USER)"
+"_mandatory.path' を 'include \\$(ENV_MANDATORY_PATH)' に変更、そして\\n - "
+"'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' は 'include \\"
+"$(ENV_DEFAULTS_PATH)' に変更"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index f2c1fd9..d1578a6 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2006-10-06 11:47+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 59a03a5..184e968 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,8 +1,8 @@
 # Portuguese translation of desktop-profiles's debconf messages.
 # 2005, Rui Branco <ruipb at netcabo.pt>>
-# 
+#
 # 2005-10-05 - Rui Branco <ruipb at netcabo.pt>
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles 1.4.5\n"
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2005-10-05 12:54+0100\n"
 "Last-Translator: Rui Branco <ruipb at netcabo.pt>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 853ed0a..8087656 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,6 +14,7 @@ msgstr ""
 "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe at cathedrallabs."
 "org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 1e505c0..b5d2cd1 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -11,11 +11,13 @@ msgstr ""
 "PO-Revision-Date: 2007-12-05 21:25+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: note
 #. Description
@@ -31,9 +33,9 @@ msgid ""
 "bug 309978, see the bug report and corresponding entry in the changelog of "
 "version 1.4.6 of this package for details)."
 msgstr ""
-"Директивы include, используемые desktop-profiles, были изменены (как следствие "
-"ошибки 309978; детали смотрите в сообщении об ошибке и соответствующей "
-"записи в changelog версии 1.4.6 этого пакета)."
+"Директивы include, используемые desktop-profiles, были изменены (как "
+"следствие ошибки 309978; детали смотрите в сообщении об ошибке и "
+"соответствующей записи в changelog версии 1.4.6 этого пакета)."
 
 #. Type: note
 #. Description
@@ -45,7 +47,6 @@ msgid ""
 "profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
 "Чтобы реактивировать профили gconf вам нужно изменить /etc/gconf/2/path так:"
-"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' заменить на "
-"'include \\$(ENV_MANDATORY_PATH)' и\\n - 'include /var/cache/desktop-"
-"profiles/\\$(USER)_defaults.path' заменить на \\$(ENV_DEFAULTS_PATH)'"
-
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' "
+"заменить на 'include \\$(ENV_MANDATORY_PATH)' и\\n - 'include /var/cache/"
+"desktop-profiles/\\$(USER)_defaults.path' заменить на \\$(ENV_DEFAULTS_PATH)'"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index e14f3e3..35f7aa6 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -8,8 +8,8 @@
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
 # , fuzzy
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles 1.4.5\n"
@@ -18,6 +18,7 @@ msgstr ""
 "PO-Revision-Date: 2005-10-14 16:51+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 607f7b9..b0998dd 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,7 +1,15 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
 #
 #, fuzzy
 msgid ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 4c2d678..c5e8dfd 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-06-17 17:23+0200\n"
 "Last-Translator: Mert Dirik <mertdirik at gmail.com>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,18 +27,26 @@ msgstr "Genel gconf yol dosyası değiştirilmeli!"
 #. Type: note
 #. Description
 #: ../templates:1001
-msgid "The include directives used by desktop-profiles have changed (in response to bug 309978, see the bug report and corresponding entry in the changelog of version 1.4.6 of this package for details)."
-msgstr "desktop-profiles'ın kullandığı include yönergeleri 309978 numaralı hatayı gidermek için değiştirildi. Ayrıntılar için bu paketin 1.4.6 sürümünün değişiklik günlüğüne ve hata raporuna bakabilirsiniz."
+msgid ""
+"The include directives used by desktop-profiles have changed (in response to "
+"bug 309978, see the bug report and corresponding entry in the changelog of "
+"version 1.4.6 of this package for details)."
+msgstr ""
+"desktop-profiles'ın kullandığı include yönergeleri 309978 numaralı hatayı "
+"gidermek için değiştirildi. Ayrıntılar için bu paketin 1.4.6 sürümünün "
+"değişiklik günlüğüne ve hata raporuna bakabilirsiniz."
 
 #. Type: note
 #. Description
 #: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be 'include \\$(ENV_MANDATORY_PATH)' and\\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
-"gconf profillerini yeniden etkinleştirmek için /etc/gconf/2/path dosyasını aşağıdaki gibi değiştirmelisiniz:\\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' 'include \\$(ENV_MANDATORY_PATH)' olmalı; ve\\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' 'include \\$(ENV_DEFAULTS_PATH)' olmalı."
-
+"gconf profillerini yeniden etkinleştirmek için /etc/gconf/2/path dosyasını "
+"aşağıdaki gibi değiştirmelisiniz:\\n - 'include /var/cache/desktop-profiles/"
+"\\$(USER)_mandatory.path' 'include \\$(ENV_MANDATORY_PATH)' olmalı; ve\\n - "
+"'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' 'include \\"
+"$(ENV_DEFAULTS_PATH)' olmalı."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index f64c94c..d844c25 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,7 +1,7 @@
 # Vietnamese translation for Desktop Profiles.
 # Copyright © 2005 Free Software Foundation, Inc.
 # Clytie Siddall <clytie at riverland.net.au>, 2005.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles\n"
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2005-12-22 22:09+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/templates b/debian/templates
index 1d4a144..40f065b 100644
--- a/debian/templates
+++ b/debian/templates
@@ -10,4 +10,4 @@ _Description: Global gconf path file needs to be changed!
  'include \$(ENV_MANDATORY_PATH)' and\n
  - 'include /var/cache/desktop-profiles/\$(USER)_defaults.path' should be
  'include \$(ENV_DEFAULTS_PATH)'
-   
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git

More information about the debian-edu-commits mailing list