Skip to content

Commit c3307ee

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 5deb07a + c1fa3fd commit c3307ee

File tree

68 files changed

+589
-484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+589
-484
lines changed
-1 Bytes
Binary file not shown.

django/conf/locale/az/LC_MESSAGES/django.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
# Emin Mastizada <[email protected]>, 2015-2016
66
# Metin Amiroff <[email protected]>, 2011
77
# Nicat Məmmədov <[email protected]>, 2022
8-
# Nijat Mammadov, 2024
8+
# Nijat Mammadov, 2024-2025
99
# Sevdimali <[email protected]>, 2024
1010
msgid ""
1111
msgstr ""
1212
"Project-Id-Version: django\n"
1313
"Report-Msgid-Bugs-To: \n"
1414
"POT-Creation-Date: 2024-05-22 11:46-0300\n"
15-
"PO-Revision-Date: 2024-08-07 06:49+0000\n"
16-
"Last-Translator: Sevdimali <[email protected]>, 2024\n"
15+
"PO-Revision-Date: 2025-03-19 11:30-0500\n"
16+
"Last-Translator: Nijat Mammadov, 2024-2025\n"
1717
"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/"
1818
"az/)\n"
1919
"MIME-Version: 1.0\n"
@@ -695,8 +695,8 @@ msgid "Value must be valid JSON."
695695
msgstr "Dəyər düzgün JSON olmalıdır."
696696

697697
#, python-format
698-
msgid "%(model)s instance with %(field)s %(value)r does not exist."
699-
msgstr "%(field)s dəyəri %(value)r olan %(model)s mövcud deyil."
698+
msgid "%(model)s instance with %(field)s %(value)r is not a valid choice."
699+
msgstr "%(field)s %(value)r ilə %(model)s dəyəri düzgün seçim deyil."
700700

701701
msgid "Foreign Key (type determined by related field)"
702702
msgstr "Xarici açar (bağlı olduğu sahəyə uyğun tipi alır)"
-275 Bytes
Binary file not shown.

django/conf/locale/de/LC_MESSAGES/django.po

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@
33
# Translators:
44
# André Hagenbruch, 2011-2012
55
# Florian Apolloner <[email protected]>, 2011
6-
# Daniel Roschka <[email protected]>, 2016
6+
# Daniel Roschka, 2016
77
# Florian Apolloner <[email protected]>, 2018,2020-2023
88
# jnns, 2011,2013
99
# Jannis Leidel <[email protected]>, 2013-2018,2020
1010
# jnns, 2016
1111
# Markus Holtermann <[email protected]>, 2023
1212
# Markus Holtermann <[email protected]>, 2013,2015
1313
# Raphael Michel <[email protected]>, 2021
14+
# Ronny Vedrilla, 2025
1415
msgid ""
1516
msgstr ""
1617
"Project-Id-Version: django\n"
1718
"Report-Msgid-Bugs-To: \n"
1819
"POT-Creation-Date: 2023-09-18 11:41-0300\n"
19-
"PO-Revision-Date: 2023-12-04 06:49+0000\n"
20-
"Last-Translator: Markus Holtermann <[email protected]>, 2023\n"
20+
"PO-Revision-Date: 2025-03-19 11:30-0500\n"
21+
"Last-Translator: Ronny Vedrilla, 2025\n"
2122
"Language-Team: German (http://app.transifex.com/django/django/language/de/)\n"
2223
"MIME-Version: 1.0\n"
2324
"Content-Type: text/plain; charset=UTF-8\n"
@@ -351,6 +352,9 @@ msgstr "Diese Seite enthält keine Ergebnisse"
351352
msgid "Enter a valid value."
352353
msgstr "Bitte einen gültigen Wert eingeben."
353354

355+
msgid "Enter a valid domain name."
356+
msgstr "Bitte eine gültige Domain eingeben."
357+
354358
msgid "Enter a valid URL."
355359
msgstr "Bitte eine gültige Adresse eingeben."
356360

@@ -374,14 +378,18 @@ msgstr ""
374378
"Bitte ein gültiges Kürzel eingeben, bestehend aus Buchstaben (Unicode), "
375379
"Ziffern, Unter- und Bindestrichen."
376380

377-
msgid "Enter a valid IPv4 address."
378-
msgstr "Bitte eine gültige IPv4-Adresse eingeben."
381+
#, python-format
382+
msgid "Enter a valid %(protocol)s address."
383+
msgstr ""
379384

380-
msgid "Enter a valid IPv6 address."
381-
msgstr "Bitte eine gültige IPv6-Adresse eingeben."
385+
msgid "IPv4"
386+
msgstr "IPv4"
382387

383-
msgid "Enter a valid IPv4 or IPv6 address."
384-
msgstr "Bitte eine gültige IPv4- oder IPv6-Adresse eingeben"
388+
msgid "IPv6"
389+
msgstr "IPv6"
390+
391+
msgid "IPv4 or IPv6"
392+
msgstr "IPv4 oder IPv6"
385393

386394
msgid "Enter only digits separated by commas."
387395
msgstr "Bitte nur durch Komma getrennte Ziffern eingeben."
@@ -696,8 +704,8 @@ msgid "Value must be valid JSON."
696704
msgstr "Wert muss gültiges JSON sein."
697705

698706
#, python-format
699-
msgid "%(model)s instance with %(field)s %(value)r does not exist."
700-
msgstr "Objekt vom Typ %(model)s mit %(field)s %(value)r existiert nicht."
707+
msgid "%(model)s instance with %(field)s %(value)r is not a valid choice."
708+
msgstr ""
701709

702710
msgid "Foreign Key (type determined by related field)"
703711
msgstr "Fremdschlüssel (Typ definiert durch verknüpftes Feld)"
28 Bytes
Binary file not shown.

django/conf/locale/ja/LC_MESSAGES/django.po

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# Masashi SHIBATA <[email protected]>, 2017
1313
# Nikita K <[email protected]>, 2019
1414
# Shinichi Katsumata <[email protected]>, 2019
15-
# Shinya Okano <[email protected]>, 2012-2019,2021,2023-2024
15+
# Shinya Okano <[email protected]>, 2012-2019,2021,2023-2025
1616
# TANIGUCHI Taichi, 2022
1717
# Takuro Onoue <[email protected]>, 2020
1818
# Takuya N <[email protected]>, 2020
@@ -22,9 +22,9 @@ msgstr ""
2222
"Project-Id-Version: django\n"
2323
"Report-Msgid-Bugs-To: \n"
2424
"POT-Creation-Date: 2024-05-22 11:46-0300\n"
25-
"PO-Revision-Date: 2024-08-07 06:49+0000\n"
25+
"PO-Revision-Date: 2025-03-19 11:30-0500\n"
2626
"Last-Translator: Shinya Okano <[email protected]>, "
27-
"2012-2019,2021,2023-2024\n"
27+
"2012-2019,2021,2023-2025\n"
2828
"Language-Team: Japanese (http://app.transifex.com/django/django/language/"
2929
"ja/)\n"
3030
"MIME-Version: 1.0\n"
@@ -689,8 +689,10 @@ msgid "Value must be valid JSON."
689689
msgstr "JSONとして正しい値にしてください。"
690690

691691
#, python-format
692-
msgid "%(model)s instance with %(field)s %(value)r does not exist."
693-
msgstr "%(field)s が %(value)r である %(model)s のインスタンスは存在しません。"
692+
msgid "%(model)s instance with %(field)s %(value)r is not a valid choice."
693+
msgstr ""
694+
"%(field)s が %(value)r である %(model)s のインスタンスは有効な選択肢ではあり"
695+
"ません。"
694696

695697
msgid "Foreign Key (type determined by related field)"
696698
msgstr "外部キー(型は関連フィールドによって決まります)"
1 Byte
Binary file not shown.

django/conf/locale/lv/LC_MESSAGES/django.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ msgid "Forbidden"
12121212
msgstr "Aizliegts"
12131213

12141214
msgid "CSRF verification failed. Request aborted."
1215-
msgstr "CSRF pārbaude neizdevās. Pieprasījums pārtrauks."
1215+
msgstr "CSRF pārbaude neizdevās. Pieprasījums pārtraukts."
12161216

12171217
msgid ""
12181218
"You are seeing this message because this HTTPS site requires a “Referer "
30 Bytes
Binary file not shown.

django/conf/locale/pt_BR/LC_MESSAGES/django.po

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# Marssal Jr. <[email protected]>, 2022
3434
# Marcelo Moro Brondani <[email protected]>, 2018
3535
# Mariusz Felisiak <[email protected]>, 2021
36-
# Rafael Fontenelle <[email protected]>, 2021-2022
36+
# Rafael Fontenelle <[email protected]>, 2021-2022,2025
3737
# Samuel Nogueira Bacelar <[email protected]>, 2020
3838
# Sandro <[email protected]>, 2011
3939
# Sergio Garcia <[email protected]>, 2015
@@ -45,8 +45,8 @@ msgstr ""
4545
"Project-Id-Version: django\n"
4646
"Report-Msgid-Bugs-To: \n"
4747
"POT-Creation-Date: 2024-05-22 11:46-0300\n"
48-
"PO-Revision-Date: 2024-08-07 06:49+0000\n"
49-
"Last-Translator: Eduardo Felipe Castegnaro <[email protected]>, 2024\n"
48+
"PO-Revision-Date: 2025-03-19 11:30-0500\n"
49+
"Last-Translator: Rafael Fontenelle <[email protected]>, 2021-2022,2025\n"
5050
"Language-Team: Portuguese (Brazil) (http://app.transifex.com/django/django/"
5151
"language/pt_BR/)\n"
5252
"MIME-Version: 1.0\n"
@@ -738,8 +738,9 @@ msgid "Value must be valid JSON."
738738
msgstr "O valor deve ser um JSON válido."
739739

740740
#, python-format
741-
msgid "%(model)s instance with %(field)s %(value)r does not exist."
742-
msgstr "A instância de %(model)s com %(field)s %(value)r não existe."
741+
msgid "%(model)s instance with %(field)s %(value)r is not a valid choice."
742+
msgstr ""
743+
"A instância de %(model)s com %(field)s %(value)r não é uma escolha válida."
743744

744745
msgid "Foreign Key (type determined by related field)"
745746
msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)"

0 commit comments

Comments
 (0)