[Python-modules-commits] [django-recurrence] 04/08: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository django-recurrence.

commit dbcf0d7fc6e9be131d68c70c78f6d4a6950857ef
Merge: 2d374ed 07322d7
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jul 13 13:53:26 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...f-Language-fields-for-django.po-and-djang.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 recurrence/locale/eu/LC_MESSAGES/djangojs.po       |  3 +-
 recurrence/locale/nl/LC_MESSAGES/django.po         |  2 +-
 recurrence/locale/nl/LC_MESSAGES/djangojs.po       |  2 +-
 6 files changed, 65 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index db361a9,0000000..d4aad4a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 4f7cc2500be558e5319769bb6d82cc6c14f74d44
- 4f7cc2500be558e5319769bb6d82cc6c14f74d44
++07322d7754de85aee11a607cd68d3ac0cd156d36
++07322d7754de85aee11a607cd68d3ac0cd156d36
 +bad58ef509df287bf4998dab69968750aaf2b4bd
 +bad58ef509df287bf4998dab69968750aaf2b4bd
 +django-recurrence_1.4.1.orig.tar.gz
 +bd6a2297eedee9a3c951808bc3c0a81fb11ab02d
 +99182
diff --cc debian/patches/0002-Fix-value-of-Language-fields-for-django.po-and-djang.patch
index 0000000,0000000..63e8883
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-value-of-Language-fields-for-django.po-and-djang.patch
@@@ -1,0 -1,0 +1,59 @@@
++From 07322d7754de85aee11a607cd68d3ac0cd156d36 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 13 Jul 2017 13:53:21 +0200
++Subject: Fix value of Language fields for django.po and djangojs.po files and
++ unfuzzy them.
++
++---
++ recurrence/locale/eu/LC_MESSAGES/djangojs.po | 3 +--
++ recurrence/locale/nl/LC_MESSAGES/django.po   | 2 +-
++ recurrence/locale/nl/LC_MESSAGES/djangojs.po | 2 +-
++ 3 files changed, 3 insertions(+), 4 deletions(-)
++
++diff --git a/recurrence/locale/eu/LC_MESSAGES/djangojs.po b/recurrence/locale/eu/LC_MESSAGES/djangojs.po
++index 0eb1953..6499f64 100644
++--- a/recurrence/locale/eu/LC_MESSAGES/djangojs.po
+++++ b/recurrence/locale/eu/LC_MESSAGES/djangojs.po
++@@ -3,7 +3,6 @@
++ # This file is distributed under the same license as the PACKAGE package.
++ # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
++ #
++-#, fuzzy
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: PACKAGE VERSION\n"
++@@ -12,7 +11,7 @@ msgstr ""
++ "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"
++-"Language: \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/recurrence/locale/nl/LC_MESSAGES/django.po b/recurrence/locale/nl/LC_MESSAGES/django.po
++index c48f3c1..8a295b6 100644
++--- a/recurrence/locale/nl/LC_MESSAGES/django.po
+++++ b/recurrence/locale/nl/LC_MESSAGES/django.po
++@@ -15,7 +15,7 @@ msgstr ""
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ "X-Generator: Poedit 1.5.7\n"
++-"Language: Dutch\n"
+++"Language: nl\n"
++ "X-Poedit-SourceCharset: UTF-8\n"
++ 
++ #: base.py:871
++diff --git a/recurrence/locale/nl/LC_MESSAGES/djangojs.po b/recurrence/locale/nl/LC_MESSAGES/djangojs.po
++index cacd94d..c0b5114 100644
++--- a/recurrence/locale/nl/LC_MESSAGES/djangojs.po
+++++ b/recurrence/locale/nl/LC_MESSAGES/djangojs.po
++@@ -14,7 +14,7 @@ msgstr ""
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++-"Language: Dutch\n"
+++"Language: nl\n"
++ "X-Generator: Poedit 1.5.7\n"
++ "X-Poedit-SourceCharset: UTF-8\n"
++ 
diff --cc debian/patches/series
index 298d420,0000000..7ff8ba4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch
++0002-Fix-value-of-Language-fields-for-django.po-and-djang.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-recurrence.git