From: Radek Czajka <rczajka@rczajka.pl>
Date: Sat, 20 Sep 2014 20:49:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'gstrat/elep' into elep
X-Git-Tag: 22.4~10^2~5
X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/288b97cb037b17ccab0c9c11ec987ad124e350d1?hp=18abc4fde3d7a7d9195dfc43239e482d2a4671ce

Merge remote-tracking branch 'gstrat/elep' into elep

Conflicts:
	cas_provider_examples/simple/urls.py
---

diff --git a/cas_provider/locale/el/LC_MESSAGES/django.mo b/cas_provider/locale/el/LC_MESSAGES/django.mo
new file mode 100644
index 0000000..d63198b
Binary files /dev/null and b/cas_provider/locale/el/LC_MESSAGES/django.mo differ
diff --git a/cas_provider/locale/el/LC_MESSAGES/django.po b/cas_provider/locale/el/LC_MESSAGES/django.po
new file mode 100644
index 0000000..91df766
--- /dev/null
+++ b/cas_provider/locale/el/LC_MESSAGES/django.po
@@ -0,0 +1,90 @@
+# 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@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-01 13:57+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: models.py:18
+msgid "ticket"
+msgstr ""
+
+#: models.py:19
+msgid "created"
+msgstr ""
+
+#: models.py:38
+msgid "user"
+msgstr ""
+
+#: models.py:39
+msgid "service"
+msgstr ""
+
+#: models.py:44
+msgid "Service Ticket"
+msgstr ""
+
+#: models.py:45
+msgid "Service Tickets"
+msgstr ""
+
+#: models.py:62
+msgid "Login Ticket"
+msgstr ""
+
+#: models.py:63
+msgid "Login Tickets"
+msgstr ""
+
+#: models.py:68
+msgid "PGTiou"
+msgstr ""
+
+#: models.py:77 models.py:82 models.py:92
+msgid "Proxy Granting Ticket"
+msgstr ""
+
+#: models.py:78
+msgid "Proxy Granting Tickets"
+msgstr ""
+
+#: models.py:87
+msgid "Proxy Ticket"
+msgstr ""
+
+#: models.py:88
+msgid "Proxy Tickets"
+msgstr ""
+
+#: models.py:97
+msgid "Proxy Granting Ticket IOU"
+msgstr ""
+
+#: models.py:98
+msgid "Proxy Granting Tickets IOU"
+msgstr ""
+
+#: views.py:128
+msgid "Incorrect username and/or password."
+msgstr "Λάθος όνομα χρήστη και/ή κωδικός πρόσβασης."
+
+#: views.py:142
+msgid ""
+"This account is disabled. Please contact us if you feel it should be enabled "
+"again."
+msgstr "Ο λογαριασμός σας έχει απενεργοποιηθεί. Παρακαλώ επικοινωνήστε μαζί μας, "
+"εάν επιθυμείτε να τον ενεργοποιήσετε ξανά."
diff --git a/cas_provider/management/.svn/all-wcprops b/cas_provider/management/.svn/all-wcprops
deleted file mode 100644
index 1ea1964..0000000
--- a/cas_provider/management/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 47
-/svn/!svn/ver/170/trunk/registration/management
-END
-__init__.py
-K 25
-svn:wc:ra_dav:version-url
-V 59
-/svn/!svn/ver/170/trunk/registration/management/__init__.py
-END
diff --git a/cas_provider/management/.svn/entries b/cas_provider/management/.svn/entries
deleted file mode 100644
index 30ca011..0000000
--- a/cas_provider/management/.svn/entries
+++ /dev/null
@@ -1,65 +0,0 @@
-9
-
-dir
-170
-http://django-registration.googlecode.com/svn/trunk/registration/management
-http://django-registration.googlecode.com/svn
-
-
-
-2008-09-22T10:00:14.397881Z
-170
-ubernostrum
-
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-b970a8a1-db28-0410-9b79-8b7e580363d3
-
-commands
-dir
-
-__init__.py
-file
-
-
-
-
-2009-02-18T02:12:14.000000Z
-d41d8cd98f00b204e9800998ecf8427e
-2008-09-22T10:00:14.397881Z
-170
-ubernostrum
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-0
-
diff --git a/cas_provider/management/.svn/format b/cas_provider/management/.svn/format
deleted file mode 100644
index ec63514..0000000
--- a/cas_provider/management/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/cas_provider/management/.svn/text-base/__init__.py.svn-base b/cas_provider/management/.svn/text-base/__init__.py.svn-base
deleted file mode 100644
index e69de29..0000000
diff --git a/cas_provider/views.py b/cas_provider/views.py
index 8ae10fa..0f53d38 100644
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -26,6 +26,7 @@ from django.utils.translation import ugettext as _
 from django.template import RequestContext
 from django.contrib.auth import authenticate
 from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
 
 from lxml import etree
 from cas_provider.attribute_formatters import NSMAP, CAS