Skip to content

Commit d12adcd

Browse files
authored
Merge pull request #350 from divio/feature/translations
Synchronise translations with transifex
2 parents 183a270 + a11f4a3 commit d12adcd

File tree

18 files changed

+194
-103
lines changed

18 files changed

+194
-103
lines changed

.tx/config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[djangocms-admin-style.core]
4+
[djangocms-admin-style.djangocms_admin_style]
55
file_filter = djangocms_admin_style/locale/<lang>/LC_MESSAGES/django.po
66
source_file = djangocms_admin_style/locale/en/LC_MESSAGES/django.po
77
source_lang = en
8+
type = PO
9+

CHANGELOG.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ Unreleased
88
* Fixed an issue with datetime fields being displayed incorrectly (#347)
99
* Fixed a bug with related-widget add/change buttons inside changelist (#348)
1010
* Fixed an issue with login screen on Django 1.9
11-
* Fixed inline grouped field with
1211
* Fixed an issue with calendar display in Django 1.9
12+
* Fixed inline grouped field with
13+
* Synced translations with Transifex
1314

1415
1.2.2 (2016-05-25)
1516
------------------
112 Bytes
Binary file not shown.

djangocms_admin_style/locale/de/LC_MESSAGES/django.po

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
#
55
# Translators:
6+
# Translators:
7+
# Angelo Dini <[email protected]>, 2016
68
# Diana Dünki <[email protected]>, 2015
79
# Loriana Indelicato <[email protected]>, 2015
810
msgid ""
911
msgstr ""
10-
"Project-Id-Version: djangocms-admin-style\n"
12+
"Project-Id-Version: django CMS Admin Style\n"
1113
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2015-12-01 14:52-0500\n"
13-
"PO-Revision-Date: 2015-12-03 08:22+0000\n"
14-
"Last-Translator: Loriana Indelicato <[email protected]>\n"
14+
"POT-Creation-Date: 2016-06-20 15:12+0200\n"
15+
"PO-Revision-Date: 2016-06-20 13:12+0000\n"
16+
"Last-Translator: Angelo Dini <[email protected]>\n"
1517
"Language-Team: German (http://www.transifex.com/divio/djangocms-admin-style/language/de/)\n"
1618
"MIME-Version: 1.0\n"
1719
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,6 +57,10 @@ msgstr "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" lösche
5557
msgid "Yes, I'm sure"
5658
msgstr "Ja, ich bin sicher."
5759

60+
#: templates/admin/delete_confirmation.html:42
61+
msgid "No, take me back"
62+
msgstr "Nein, zurück gehen"
63+
5864
#: templates/admin/delete_selected_confirmation.html:12
5965
msgid "Delete multiple objects"
6066
msgstr "Mehrere Objekte löschen"
@@ -85,19 +91,23 @@ msgstr "Sind Sie sicher, dass Sie das selektierte %(objects_name)s löschen möc
8591
msgid "Django Administration"
8692
msgstr "Django Administration"
8793

88-
#: templates/admin/inc/branding.html:13
94+
#: templates/admin/inc/branding.html:15
95+
msgid "Documentation"
96+
msgstr "Dokumentation"
97+
98+
#: templates/admin/inc/branding.html:22
8999
msgid "Change password"
90100
msgstr "Passwort ändern"
91101

92-
#: templates/admin/inc/branding.html:19
102+
#: templates/admin/inc/branding.html:28
93103
msgid "Log out"
94104
msgstr "Ausloggen"
95105

96-
#: templates/admin/inc/branding.html:27
106+
#: templates/admin/inc/branding.html:36
97107
msgid "Open"
98108
msgstr "Öffne"
99109

100-
#: templates/admin/inc/branding.html:27
110+
#: templates/admin/inc/branding.html:36
101111
msgid "my site"
102112
msgstr "meine Seite"
103113

2.29 KB
Binary file not shown.
Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
# SOME DESCRIPTIVE TITLE.
22
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
33
# This file is distributed under the same license as the PACKAGE package.
4-
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
54
#
6-
#, fuzzy
5+
# Translators:
76
msgid ""
87
msgstr ""
9-
"Project-Id-Version: PACKAGE VERSION\n"
8+
"Project-Id-Version: django CMS Admin Style\n"
109
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2015-12-01 14:52-0500\n"
12-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13-
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14-
"Language-Team: LANGUAGE <[email protected]>\n"
15-
"Language: \n"
10+
"POT-Creation-Date: 2016-06-20 15:12+0200\n"
11+
"PO-Revision-Date: 2016-04-26 12:17+0000\n"
12+
"Last-Translator: Stefan Foulis <[email protected]>\n"
13+
"Language-Team: English (http://www.transifex.com/divio/djangocms-admin-style/"
14+
"language/en/)\n"
15+
"Language: en\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
19+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
1920

2021
#: templates/admin/delete_confirmation.html:9
2122
#: templates/admin/delete_selected_confirmation.html:9
2223
msgid "Home"
23-
msgstr ""
24+
msgstr "Home"
2425

2526
#: templates/admin/delete_confirmation.html:13
2627
msgid "Delete"
27-
msgstr ""
28+
msgstr "Delete"
2829

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

3741
#: templates/admin/delete_confirmation.html:28
3842
#, python-format
3943
msgid ""
4044
"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
4145
"following protected related objects:"
4246
msgstr ""
47+
"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
48+
"following protected related objects:"
4349

4450
#: templates/admin/delete_confirmation.html:36
4551
#, python-format
4652
msgid ""
4753
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
4854
"All of the following related items will be deleted:"
4955
msgstr ""
56+
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
57+
"All of the following related items will be deleted:"
5058

5159
#: templates/admin/delete_confirmation.html:41
5260
#: templates/admin/delete_selected_confirmation.html:46
5361
msgid "Yes, I'm sure"
62+
msgstr "Yes, I'm sure"
63+
64+
#: templates/admin/delete_confirmation.html:42
65+
msgid "No, take me back"
5466
msgstr ""
5567

5668
#: templates/admin/delete_selected_confirmation.html:12
5769
msgid "Delete multiple objects"
58-
msgstr ""
70+
msgstr "Delete multiple objects"
5971

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

6883
#: templates/admin/delete_selected_confirmation.html:27
6984
#, python-format
7085
msgid ""
7186
"Deleting the selected %(objects_name)s would require deleting the following "
7287
"protected related objects:"
7388
msgstr ""
89+
"Deleting the selected %(objects_name)s would require deleting the following "
90+
"protected related objects:"
7491

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

82101
#: templates/admin/inc/branding.html:6 templates/admin/inc/branding.html:9
83102
msgid "Django Administration"
103+
msgstr "Django Administration"
104+
105+
#: templates/admin/inc/branding.html:15
106+
msgid "Documentation"
84107
msgstr ""
85108

86-
#: templates/admin/inc/branding.html:13
109+
#: templates/admin/inc/branding.html:22
87110
msgid "Change password"
88-
msgstr ""
111+
msgstr "Change password"
89112

90-
#: templates/admin/inc/branding.html:19
113+
#: templates/admin/inc/branding.html:28
91114
msgid "Log out"
92-
msgstr ""
115+
msgstr "Log out"
93116

94-
#: templates/admin/inc/branding.html:27
117+
#: templates/admin/inc/branding.html:36
95118
msgid "Open"
96-
msgstr ""
119+
msgstr "Open"
97120

98-
#: templates/admin/inc/branding.html:27
121+
#: templates/admin/inc/branding.html:36
99122
msgid "my site"
100-
msgstr ""
123+
msgstr "my site"
101124

102125
#: templates/admin/inc/title.html:2
103126
msgid "Django site admin"
104-
msgstr ""
127+
msgstr "Django site admin"
8 Bytes
Binary file not shown.

djangocms_admin_style/locale/es/LC_MESSAGES/django.po

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
#
55
# Translators:
6+
# Translators:
67
# Paulo <[email protected]>, 2015
78
msgid ""
89
msgstr ""
9-
"Project-Id-Version: djangocms-admin-style\n"
10+
"Project-Id-Version: django CMS Admin Style\n"
1011
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2015-12-01 14:52-0500\n"
12-
"PO-Revision-Date: 2015-12-03 15:32+0000\n"
13-
"Last-Translator: Paulo <[email protected]>\n"
12+
"POT-Creation-Date: 2016-06-20 15:12+0200\n"
13+
"PO-Revision-Date: 2016-06-20 13:12+0000\n"
14+
"Last-Translator: Angelo Dini <[email protected]>\n"
1415
"Language-Team: Spanish (http://www.transifex.com/divio/djangocms-admin-style/language/es/)\n"
1516
"MIME-Version: 1.0\n"
1617
"Content-Type: text/plain; charset=UTF-8\n"
@@ -54,6 +55,10 @@ msgstr "¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_obje
5455
msgid "Yes, I'm sure"
5556
msgstr "Sí, estoy seguro"
5657

58+
#: templates/admin/delete_confirmation.html:42
59+
msgid "No, take me back"
60+
msgstr ""
61+
5762
#: templates/admin/delete_selected_confirmation.html:12
5863
msgid "Delete multiple objects"
5964
msgstr "Eliminar múltiples objetos."
@@ -84,19 +89,23 @@ msgstr "¿Está usted seguro que quiere eliminar el %(objects_name)s seleccionad
8489
msgid "Django Administration"
8590
msgstr "Administración de Django"
8691

87-
#: templates/admin/inc/branding.html:13
92+
#: templates/admin/inc/branding.html:15
93+
msgid "Documentation"
94+
msgstr ""
95+
96+
#: templates/admin/inc/branding.html:22
8897
msgid "Change password"
8998
msgstr "Cambiar contraseña"
9099

91-
#: templates/admin/inc/branding.html:19
100+
#: templates/admin/inc/branding.html:28
92101
msgid "Log out"
93102
msgstr "Terminar sesión"
94103

95-
#: templates/admin/inc/branding.html:27
104+
#: templates/admin/inc/branding.html:36
96105
msgid "Open"
97106
msgstr "Abrir"
98107

99-
#: templates/admin/inc/branding.html:27
108+
#: templates/admin/inc/branding.html:36
100109
msgid "my site"
101110
msgstr "mi sitio"
102111

-7 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)