[Python-modules-commits] [django-allauth] 06/07: merge patched into master

[Pierre-Elliott Bécue]

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

peb-guest pushed a commit to branch master
in repository django-allauth.

commit 7bdf4dc74bf47fd0d2c86d08d3892038e95a82dc
Merge: 2ec6cf1 16c4b76
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Wed Dec 13 17:00:59 2017 +0100

    merge patched into master

 debian/.git-dpm                                                       | 4 ++--
 .../0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 08f663d,0000000..4120e39
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
- 72868671fbec84c377d6b63557759e54a5dc8a27
- 72868671fbec84c377d6b63557759e54a5dc8a27
++16c4b76a9af1993aa110a894388cd80a9780b1e0
++16c4b76a9af1993aa110a894388cd80a9780b1e0
 +80ce46c3075fcaea6dbfdf110cf4364ac0f881b0
 +80ce46c3075fcaea6dbfdf110cf4364ac0f881b0
 +django-allauth_0.34.0.orig.tar.gz
 +d603ef7dcfdbf739252ed598b795225ce6344fcb
 +475030
diff --cc debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch
index df4c9f8,0000000..46c7a16
mode 100644,000000..100644
--- a/debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch
+++ b/debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch
@@@ -1,64 -1,0 +1,64 @@@
- From 72868671fbec84c377d6b63557759e54a5dc8a27 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
++From 16c4b76a9af1993aa110a894388cd80a9780b1e0 Mon Sep 17 00:00:00 2001
++From: Laura Arjona Reina <larjona at debian.org>
 +Date: Wed, 13 Dec 2017 16:47:51 +0100
 +Subject: Fixes wrongly encoded characters in some .po files.
 +
 +---
 + allauth/locale/es/LC_MESSAGES/django.po    | 2 +-
 + allauth/locale/pt_PT/LC_MESSAGES/django.po | 2 +-
 + allauth/locale/sv/LC_MESSAGES/django.po    | 2 +-
 + allauth/locale/tr/LC_MESSAGES/django.po    | 2 +-
 + 4 files changed, 4 insertions(+), 4 deletions(-)
 +
 +diff --git a/allauth/locale/es/LC_MESSAGES/django.po b/allauth/locale/es/LC_MESSAGES/django.po
 +index a33bbcf..bdb8a9a 100644
 +--- a/allauth/locale/es/LC_MESSAGES/django.po
 ++++ b/allauth/locale/es/LC_MESSAGES/django.po
 +@@ -9,7 +9,7 @@ msgstr ""
 + "Report-Msgid-Bugs-To: \n"
 + "POT-Creation-Date: 2017-10-29 09:56-0500\n"
 + "PO-Revision-Date: 2014-08-12 00:30+0200\n"
 +-"Last-Translator: Jannis Š\n"
 ++"Last-Translator: Jannis Š\n"
 + "Language-Team: Spanish (http://www.transifex.com/projects/p/django-allauth/"
 + "language/es/)\n"
 + "Language: es\n"
 +diff --git a/allauth/locale/pt_PT/LC_MESSAGES/django.po b/allauth/locale/pt_PT/LC_MESSAGES/django.po
 +index a25859d..88ab9b3 100644
 +--- a/allauth/locale/pt_PT/LC_MESSAGES/django.po
 ++++ b/allauth/locale/pt_PT/LC_MESSAGES/django.po
 +@@ -9,7 +9,7 @@ msgstr ""
 + "Report-Msgid-Bugs-To: \n"
 + "POT-Creation-Date: 2017-10-29 09:56-0500\n"
 + "PO-Revision-Date: 2014-08-12 00:33+0200\n"
 +-"Last-Translator: Jannis Š\n"
 ++"Last-Translator: Jannis Š\n"
 + "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/"
 + "django-allauth/language/pt_PT/)\n"
 + "Language: pt_PT\n"
 +diff --git a/allauth/locale/sv/LC_MESSAGES/django.po b/allauth/locale/sv/LC_MESSAGES/django.po
 +index 86861f0..34cad4c 100644
 +--- a/allauth/locale/sv/LC_MESSAGES/django.po
 ++++ b/allauth/locale/sv/LC_MESSAGES/django.po
 +@@ -9,7 +9,7 @@ msgstr ""
 + "Report-Msgid-Bugs-To: \n"
 + "POT-Creation-Date: 2017-10-29 09:56-0500\n"
 + "PO-Revision-Date: 2014-08-12 00:35+0200\n"
 +-"Last-Translator: Jannis Š\n"
 ++"Last-Translator: Jannis Š\n"
 + "Language-Team: Swedish (http://www.transifex.com/projects/p/django-allauth/"
 + "language/sv/)\n"
 + "Language: sv\n"
 +diff --git a/allauth/locale/tr/LC_MESSAGES/django.po b/allauth/locale/tr/LC_MESSAGES/django.po
 +index c6b54ae..6814f18 100644
 +--- a/allauth/locale/tr/LC_MESSAGES/django.po
 ++++ b/allauth/locale/tr/LC_MESSAGES/django.po
 +@@ -10,7 +10,7 @@ msgstr ""
 + "Report-Msgid-Bugs-To: \n"
 + "POT-Creation-Date: 2017-10-29 09:56-0500\n"
 + "PO-Revision-Date: 2014-08-12 00:35+0200\n"
 +-"Last-Translator: Jannis Š\n"
 ++"Last-Translator: Jannis Š\n"
 + "Language-Team: Turkish (http://www.transifex.com/projects/p/django-allauth/"
 + "language/tr/)\n"
 + "Language: tr\n"

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