Skip to content

Commit

Permalink
Merge pull request #350 from divio/feature/translations
Browse files Browse the repository at this point in the history
Synchronise translations with transifex
  • Loading branch information
FinalAngel authored Jun 22, 2016
2 parents 183a270 + a11f4a3 commit d12adcd
Show file tree
Hide file tree
Showing 18 changed files with 194 additions and 103 deletions.
4 changes: 3 additions & 1 deletion .tx/config
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[main]
host = https://www.transifex.com

[djangocms-admin-style.core]
[djangocms-admin-style.djangocms_admin_style]
file_filter = djangocms_admin_style/locale/<lang>/LC_MESSAGES/django.po
source_file = djangocms_admin_style/locale/en/LC_MESSAGES/django.po
source_lang = en
type = PO

3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ Unreleased
* Fixed an issue with datetime fields being displayed incorrectly (#347)
* Fixed a bug with related-widget add/change buttons inside changelist (#348)
* Fixed an issue with login screen on Django 1.9
* Fixed inline grouped field with
* Fixed an issue with calendar display in Django 1.9
* Fixed inline grouped field with
* Synced translations with Transifex

1.2.2 (2016-05-25)
------------------
Expand Down
Binary file modified djangocms_admin_style/locale/de/LC_MESSAGES/django.mo
Binary file not shown.
26 changes: 18 additions & 8 deletions djangocms_admin_style/locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
# Angelo Dini <finalangeljp@hotmail.com>, 2016
# Diana Dünki <diana.duenki@divio.ch>, 2015
# Loriana Indelicato <loriana.indelicato@divio.ch>, 2015
msgid ""
msgstr ""
"Project-Id-Version: djangocms-admin-style\n"
"Project-Id-Version: django CMS Admin Style\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-01 14:52-0500\n"
"PO-Revision-Date: 2015-12-03 08:22+0000\n"
"Last-Translator: Loriana Indelicato <loriana.indelicato@divio.ch>\n"
"POT-Creation-Date: 2016-06-20 15:12+0200\n"
"PO-Revision-Date: 2016-06-20 13:12+0000\n"
"Last-Translator: Angelo Dini <finalangeljp@hotmail.com>\n"
"Language-Team: German (http://www.transifex.com/divio/djangocms-admin-style/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -55,6 +57,10 @@ msgstr "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" lösche
msgid "Yes, I'm sure"
msgstr "Ja, ich bin sicher."

#: templates/admin/delete_confirmation.html:42
msgid "No, take me back"
msgstr "Nein, zurück gehen"

#: templates/admin/delete_selected_confirmation.html:12
msgid "Delete multiple objects"
msgstr "Mehrere Objekte löschen"
Expand Down Expand Up @@ -85,19 +91,23 @@ msgstr "Sind Sie sicher, dass Sie das selektierte %(objects_name)s löschen möc
msgid "Django Administration"
msgstr "Django Administration"

#: templates/admin/inc/branding.html:13
#: templates/admin/inc/branding.html:15
msgid "Documentation"
msgstr "Dokumentation"

#: templates/admin/inc/branding.html:22
msgid "Change password"
msgstr "Passwort ändern"

#: templates/admin/inc/branding.html:19
#: templates/admin/inc/branding.html:28
msgid "Log out"
msgstr "Ausloggen"

#: templates/admin/inc/branding.html:27
#: templates/admin/inc/branding.html:36
msgid "Open"
msgstr "Öffne"

#: templates/admin/inc/branding.html:27
#: templates/admin/inc/branding.html:36
msgid "my site"
msgstr "meine Seite"

Expand Down
Binary file modified djangocms_admin_style/locale/en/LC_MESSAGES/django.mo
Binary file not shown.
63 changes: 43 additions & 20 deletions djangocms_admin_style/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
# 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
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Project-Id-Version: django CMS Admin Style\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-01 14:52-0500\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"
"POT-Creation-Date: 2016-06-20 15:12+0200\n"
"PO-Revision-Date: 2016-04-26 12:17+0000\n"
"Last-Translator: Stefan Foulis <stefan.foulis@gmail.com>\n"
"Language-Team: English (http://www.transifex.com/divio/djangocms-admin-style/"
"language/en/)\n"
"Language: en\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"

#: templates/admin/delete_confirmation.html:9
#: templates/admin/delete_selected_confirmation.html:9
msgid "Home"
msgstr ""
msgstr "Home"

#: templates/admin/delete_confirmation.html:13
msgid "Delete"
msgstr ""
msgstr "Delete"

#: templates/admin/delete_confirmation.html:20
#, python-format
Expand All @@ -33,29 +34,40 @@ msgid ""
"related objects, but your account doesn't have permission to delete the "
"following types of objects:"
msgstr ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
"related objects, but your account doesn't have permission to delete the "
"following types of objects:"

#: templates/admin/delete_confirmation.html:28
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
"following protected related objects:"
msgstr ""
"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
"following protected related objects:"

#: templates/admin/delete_confirmation.html:36
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
"All of the following related items will be deleted:"
msgstr ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
"All of the following related items will be deleted:"

#: templates/admin/delete_confirmation.html:41
#: templates/admin/delete_selected_confirmation.html:46
msgid "Yes, I'm sure"
msgstr "Yes, I'm sure"

#: templates/admin/delete_confirmation.html:42
msgid "No, take me back"
msgstr ""

#: templates/admin/delete_selected_confirmation.html:12
msgid "Delete multiple objects"
msgstr ""
msgstr "Delete multiple objects"

#: templates/admin/delete_selected_confirmation.html:19
#, python-format
Expand All @@ -64,41 +76,52 @@ msgid ""
"objects, but your account doesn't have permission to delete the following "
"types of objects:"
msgstr ""
"Deleting the selected %(objects_name)s would result in deleting related "
"objects, but your account doesn't have permission to delete the following "
"types of objects:"

#: templates/admin/delete_selected_confirmation.html:27
#, python-format
msgid ""
"Deleting the selected %(objects_name)s would require deleting the following "
"protected related objects:"
msgstr ""
"Deleting the selected %(objects_name)s would require deleting the following "
"protected related objects:"

#: templates/admin/delete_selected_confirmation.html:35
#, python-format
msgid ""
"Are you sure you want to delete the selected %(objects_name)s? All of the "
"following objects and their related items will be deleted:"
msgstr ""
"Are you sure you want to delete the selected %(objects_name)s? All of the "
"following objects and their related items will be deleted:"

#: templates/admin/inc/branding.html:6 templates/admin/inc/branding.html:9
msgid "Django Administration"
msgstr "Django Administration"

#: templates/admin/inc/branding.html:15
msgid "Documentation"
msgstr ""

#: templates/admin/inc/branding.html:13
#: templates/admin/inc/branding.html:22
msgid "Change password"
msgstr ""
msgstr "Change password"

#: templates/admin/inc/branding.html:19
#: templates/admin/inc/branding.html:28
msgid "Log out"
msgstr ""
msgstr "Log out"

#: templates/admin/inc/branding.html:27
#: templates/admin/inc/branding.html:36
msgid "Open"
msgstr ""
msgstr "Open"

#: templates/admin/inc/branding.html:27
#: templates/admin/inc/branding.html:36
msgid "my site"
msgstr ""
msgstr "my site"

#: templates/admin/inc/title.html:2
msgid "Django site admin"
msgstr ""
msgstr "Django site admin"
Binary file modified djangocms_admin_style/locale/es/LC_MESSAGES/django.mo
Binary file not shown.
25 changes: 17 additions & 8 deletions djangocms_admin_style/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
# Paulo <paulo.alvarado@divio.ch>, 2015
msgid ""
msgstr ""
"Project-Id-Version: djangocms-admin-style\n"
"Project-Id-Version: django CMS Admin Style\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-01 14:52-0500\n"
"PO-Revision-Date: 2015-12-03 15:32+0000\n"
"Last-Translator: Paulo <paulo.alvarado@divio.ch>\n"
"POT-Creation-Date: 2016-06-20 15:12+0200\n"
"PO-Revision-Date: 2016-06-20 13:12+0000\n"
"Last-Translator: Angelo Dini <finalangeljp@hotmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/divio/djangocms-admin-style/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -54,6 +55,10 @@ msgstr "¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_obje
msgid "Yes, I'm sure"
msgstr "Sí, estoy seguro"

#: templates/admin/delete_confirmation.html:42
msgid "No, take me back"
msgstr ""

#: templates/admin/delete_selected_confirmation.html:12
msgid "Delete multiple objects"
msgstr "Eliminar múltiples objetos."
Expand Down Expand Up @@ -84,19 +89,23 @@ msgstr "¿Está usted seguro que quiere eliminar el %(objects_name)s seleccionad
msgid "Django Administration"
msgstr "Administración de Django"

#: templates/admin/inc/branding.html:13
#: templates/admin/inc/branding.html:15
msgid "Documentation"
msgstr ""

#: templates/admin/inc/branding.html:22
msgid "Change password"
msgstr "Cambiar contraseña"

#: templates/admin/inc/branding.html:19
#: templates/admin/inc/branding.html:28
msgid "Log out"
msgstr "Terminar sesión"

#: templates/admin/inc/branding.html:27
#: templates/admin/inc/branding.html:36
msgid "Open"
msgstr "Abrir"

#: templates/admin/inc/branding.html:27
#: templates/admin/inc/branding.html:36
msgid "my site"
msgstr "mi sitio"

Expand Down
Binary file modified djangocms_admin_style/locale/fr/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit d12adcd

Please sign in to comment.