Changeset 5580 for django/branches/unicode/django/conf

Timestamp:

07/01/07 00:55:01 (2 years ago)

Author:

mtredinnick

Message:

unicode: Merged changes from trunk up to [5579].

Files:

• django/branches/unicode (modified) (1 prop)
• django/branches/unicode/django/conf/locale/bn/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/bn/LC_MESSAGES/djangojs.mo)
• django/branches/unicode/django/conf/locale/bn/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/bn/LC_MESSAGES/djangojs.po)
• django/branches/unicode/django/conf/locale/ca/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/ca/LC_MESSAGES/djangojs.po (modified) (2 diffs)
• django/branches/unicode/django/conf/locale/ca/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/ca/LC_MESSAGES/django.po (modified) (22 diffs)
• django/branches/unicode/django/conf/locale/da/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/da/LC_MESSAGES/djangojs.mo)
• django/branches/unicode/django/conf/locale/da/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/da/LC_MESSAGES/djangojs.po)
• django/branches/unicode/django/conf/locale/ja/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/ja/LC_MESSAGES/django.po (modified) (38 diffs)
• django/branches/unicode/django/conf/locale/ro/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/ro/LC_MESSAGES/djangojs.mo)
• django/branches/unicode/django/conf/locale/ro/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/ro/LC_MESSAGES/djangojs.po)
• django/branches/unicode/django/conf/locale/ro/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/ro/LC_MESSAGES/django.po (modified) (42 diffs)
• django/branches/unicode/django/conf/locale/uk/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/uk/LC_MESSAGES/djangojs.mo)
• django/branches/unicode/django/conf/locale/uk/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/uk/LC_MESSAGES/djangojs.po)
• django/branches/unicode/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo)
• django/branches/unicode/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.po)
• django/branches/unicode/django/conf/project_template/settings.py (modified) (1 diff)

django/branches/unicode/django/conf/locale/ca/LC_MESSAGES/djangojs.po

@@ -1 +1 @@
-# translation of djangojs.po to
-
-
-
+
+
-#
-msgid ""
@@ -9 +8 @@
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-20 18:25+0200\n"
-5-20 18:24
-marc@fargas
+6-25 17:47
+telenieko@telenieko
-"Language-Team:  <es@li.org>\n"
-"MIME-Version: 1.0\n"

django/branches/unicode/django/conf/locale/ca/LC_MESSAGES/django.po

@@ -1 +1 @@
-# translation of django.po to
-
-
+
-#
-msgid ""
@@ -7 +6 @@
-"Project-Id-Version: django\n"
-"Report-Msgid-Bugs-To: \n"
-5-25 13:04
-5-25 13:04
-marc@fargas
+6-25 17:31
+6-25 17:47
+telenieko@telenieko
-"Language-Team:  <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-
+
-
-#: template/defaultfilters.py:491
@@ -43 +41 @@
-msgstr "%.1f GB"
-
-3
+2
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-"Esculli una opció vàlida; Aquesta opció no és una de les opcions disponibles."
-
-6
-0 newforms/fields.py:531
-1 db/models/fields/__init__.py:278
-75 db/models/fields/__init__.py:686
+5
+2 newforms/fields.py:533
+6 db/models/fields/__init__.py:283
+80 db/models/fields/__init__.py:691
-msgid "This field is required."
-msgstr "Aquest camp és obligatori."
-
-90 newforms/fields.py:448 newforms/fields.py:524
+89 newforms/fields.py:448 newforms/fields.py:526
-msgid "Enter a list of values."
-msgstr "Introdueixi una llista de valors."
-
-6
+5
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Esculli una opció vàlida; %s' no és una de les opcions vàlides."
-
-2
+1
-#: oldforms/__init__.py:577
-msgid "Unknown"
-msgstr "Desconegut"
-
-2
+1
-#: oldforms/__init__.py:577
-msgid "Yes"
-msgstr "Si"
-
-2
+1
-#: oldforms/__init__.py:577
-msgid "No"
@@ -122 +120 @@
-msgstr "Asseguris de que no hia ha més de %s dígits decimals."
-
-
+ newforms/fields.py:566
-msgid "Enter a valid date."
-msgstr "Introdueixi una data vàlida."
-
-
+ newforms/fields.py:568
-msgid "Enter a valid time."
-msgstr "Introdueixi una hora vàlida."
@@ -199 +197 @@
-
-#: conf/global_settings.py:51
+msgid "Persian"
+msgstr "Persa"
+
+#: conf/global_settings.py:52
-msgid "Finnish"
-msgstr "Finlandès"
-
-2
+3
-msgid "French"
-msgstr "Francès"
-
-3
+4
-msgid "Galician"
-msgstr "Galleg"
-
-4
+5
-msgid "Hungarian"
-msgstr "Húngar"
-
-5
+6
-msgid "Hebrew"
-msgstr "Hebreu"
-
-6
+7
-msgid "Icelandic"
-msgstr "Islandès"
-
-7
+8
-msgid "Italian"
-msgstr "Italià"
-
-8
+9
-msgid "Japanese"
-msgstr "Japonès"
-
-59
+60
-msgid "Korean"
-msgstr "Coreà"
-
-0
+1
-msgid "Kannada"
-msgstr ""
-
-1
+2
-msgid "Latvian"
-
-
-2
+Letó
+
+3
-msgid "Macedonian"
-msgstr "Macedoni"
-
-3
+4
-msgid "Dutch"
-msgstr "Holandès"
-
-4
+5
-msgid "Norwegian"
-msgstr "Norueg"
-
-5
+6
-msgid "Polish"
-msgstr "Polac"
-
-6
+7
-msgid "Portugese"
-msgstr "Portuguès"
-
-7
+8
-msgid "Brazilian"
-msgstr "Brasileny"
-
-8
+9
-msgid "Romanian"
-msgstr "Rumanès"
-
-69
+70
-msgid "Russian"
-msgstr "Rús"
-
-0
+1
-msgid "Slovak"
-msgstr "Eslovac"
-
-1
+2
-msgid "Slovenian"
-msgstr "Esloveni"
-
-2
+3
-msgid "Serbian"
-msgstr "Serbi"
-
-3
+4
-msgid "Swedish"
-msgstr "Suec"
-
-4
+5
-msgid "Tamil"
-
-
-5
+Tàmil
+
+6
-msgid "Telugu"
-
-
-6
+Telugu
+
+7
-msgid "Turkish"
-msgstr "Turc"
-
-7
+8
-msgid "Ukrainian"
-msgstr "Ucranià"
-
-8
+9
-msgid "Simplified Chinese"
-msgstr "Xinés simplificat"
-
-79
+80
-msgid "Traditional Chinese"
-msgstr "Xinés tradicional"
@@ -577 +579 @@
-"\n"
-"%(text)s"
-msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comments:\n"
-"\n"
-"%(text)s"
-[0]
+
-"Aquest comentari el va enviar un usuari que ha enviat menys de %(count)s "
-"comentari:\n"
-"\n"
-"%(text)s"
-msgstr[1] ""
-"Aquest comentari el va enviar un usuari que ha enviat menys de %(count)s "
-"comentaris:\n"
@@ -1219 +1219 @@
-msgstr "Com abans, però obre la pàgina d'administració en una nova finestra."
-
-57
+62
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "El/la %(name)s \"%(obj)s\".ha estat agregat/da amb èxit."
-
-1
-47
+6
+52
-msgid "You may edit it again below."
-msgstr "Pot editar-lo de nou abaix."
@@ -1242 +1242 @@
-msgstr "Canviar clau: %s"
-
-3
+8
-msgid "Site administration"
-msgstr "Lloc administratiu"
-
-1 contrib/admin/views/main.py:356
+6 contrib/admin/views/main.py:361
-#, python-format
-msgid "You may add another %s below."
-msgstr "Pot agregar un altre %s abaix."
-
-89
+94
-#, python-format
-msgid "Add %s"
-msgstr "Agregar %s"
-
-35
+40
-#, python-format
-msgid "Added %s."
-msgstr "Agregat %s."
-
-35 contrib/admin/views/main.py:337
-39
+40 contrib/admin/views/main.py:342
+44
-msgid "and"
-msgstr "i"
-
-37
+42
-#, python-format
-msgid "Changed %s."
-msgstr "Modificat %s."
-
-39
+44
-#, python-format
-msgid "Deleted %s."
-msgstr "Eliminat %s."
-
-2
+7
-msgid "No fields changed."
-msgstr "Cap camp canviat."
-
-45
+50
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "S'ha modificat amb èxist el/la %(name)s \"%(obj)s."
-
-3
+8
-#, python-format
-msgid ""
@@ -1292 +1292 @@
-"S'ha agregat amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou abaix."
-
-1
+6
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-76
+81
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s"
-
-1
+6
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Un o més %(fieldname)s en %(name)s:"
-
-4
+8
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "El/la %(name)s \"%(obj)s\".ha estat eliminat amb èxit."
-
-17
+21
-msgid "Are you sure?"
-msgstr "Està segur?"
-
-39
+43
-#, python-format
-msgid "Change history: %s"
-msgstr "Modificar històric: %s"
-
-3
+7
-#, python-format
-msgid "Select %s"
-msgstr "Seleccioni %s"
-
-3
+7
-#, python-format
-msgid "Select %s to change"
-msgstr "Seleccioni %s per modificar"
-
-68
+72
-msgid "Database error"
-msgstr "Error de/en la base de dades"
@@ -1698 +1698 @@
-msgstr "Sessió finalitzada"
-
-4 contrib/auth/models.py:64
+9 contrib/auth/models.py:69
-msgid "name"
-msgstr "nom"
-
-46
+51
-msgid "codename"
-msgstr "nom en clau"
-
-49
+54
-msgid "permission"
-msgstr "permís"
-
-0 contrib/auth/models.py:65
+5 contrib/auth/models.py:70
-msgid "permissions"
-msgstr "permissos"
-
-68
+73
-msgid "group"
-msgstr "grup"
-
-69 contrib/auth/models.py:109
+74 contrib/auth/models.py:114
-msgid "groups"
-msgstr "grups"
-
-99
+104
-msgid "username"
-msgstr "nom d'usuari"
-
-99
+104
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
@@ -1734 +1734 @@
-"dígits i guions baixos)."
-
-0
+5
-msgid "first name"
-msgstr "nom propi"
-
-1
+6
-msgid "last name"
-msgstr "cognoms"
-
-2
+7
-msgid "e-mail address"
-msgstr "adreça de correu electrònic"
-
-3
+8
-msgid "password"
-msgstr "contrasenya"
-
-3
+8
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
@@ -1758 +1758 @@
-"canvi de contrasenya</a>."
-
-4
+9
-msgid "staff status"
-msgstr "és membre del personal"
-
-4
+9
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si l'usuari pot entrar en el lloc administratiu."
-
-05
+10
-msgid "active"
-msgstr "actiu"
-
-05
+10
-msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
@@ -1778 +1778 @@
-"Djano. Deselecciona-ho enlloc de esborrar comptes d'usuari."
-
-06
+11
-msgid "superuser status"
-msgstr "estat de superusuari"
-
-06
+11
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
@@ -1790 +1790 @@
-"explícitament."
-
-07
+12
-msgid "last login"
-msgstr "últim inici de sessió"
-
-08
+13
-msgid "date joined"
-msgstr "data de creació"
-
-0
+5
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
@@ -1806 +1806 @@
-"permissos dels grups dels que sigui membre."
-
-1
+6
-msgid "user permissions"
-msgstr "permissos de l'usuari"
-
-15
+20
-msgid "user"
-msgstr "usuari"
-
-16
+21
-msgid "users"
-msgstr "usuaris"
-
-2
+7
-msgid "Personal info"
-msgstr "Informaciò personal"
-
-3
+8
-msgid "Permissions"
-msgstr "permissos"
-
-4
+9
-msgid "Important dates"
-msgstr "Dates importants"
-
-25
+30
-msgid "Groups"
-msgstr "Grups"
-
-69
+73
-msgid "message"
-msgstr "missatge"
-
-2
+6
-msgid "AnonymousUser"
-msgstr "AnonymousUser"
@@ -1862 +1862 @@
-msgstr "Aquest compte està inactiu"
-
-5
+4
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
@@ -2424 +2424 @@
-msgstr "Data invàlida: %s"
-
-3
+8
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introdueixi una data vàlida en el forma AAAA-MM-DD."
@@ -2432 +2432 @@
-msgstr "Introdueixi una hora vàlida en el format HH:MM."
-
-2
+7
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Introdueixi un data/hora vàlida en format YYYY-MM-DD HH:MM."
@@ -2559 +2559 @@
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
-[0]
+
-"Si us plau, introdueixi un número decimal vàlid amb no més de %s digit."
-msgstr[1] ""
-"Si us plau, introdueixi un número decimal vàlid amb no més de %s digits."
-
@@ -2570 +2568 @@
-msgid ""
-"Please enter a valid decimal number with a whole part of at most %s digit."
-msgid_plural ""
-"Please enter a valid decimal number with a whole part of at most %s digits."
-[0]
+
-"Si us plau, introdueixi un número decimal vàlid amb la part entera amb com a "
-"màxim %s dígit."
-msgstr[1] ""
-"Si us plau, introdueixi un número decimal vàlid amb la part entera amb com a "
-"màxim %s dígits."
@@ -2582 +2578 @@
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s decimal places."
-[0]
+
-"Si us plau, introdueixi un número decimal vàlid amb no més de %s dígit en la "
-"part decimal."
-msgstr[1] ""
-"Si us plau, introdueixi un número decimal vàlid amb no més de %s dígits en "
-"la part decimal."
@@ -2984 +2978 @@
-msgstr "Ja existeix  %(optname)s amb auqest %(fieldname)s."
-
-3
+8
-msgid "This value must be an integer."
-msgstr "Aquest valor ha de ser  un enter."
-
-08
+13
-msgid "This value must be either True or False."
-msgstr "Aquest valor ha de ser True (Veritat) o False (Fals)"
-
-29
+34
-msgid "This field cannot be null."
-msgstr "Aquest camp no pot ser null (estar buit)."
-
-2
+7
-msgid "This value must be a decimal number."
-msgstr "Aquest valor ha de ser un número decimal."
-
-695
+700
-msgid "Enter a valid filename."
-msgstr "Introdueixi un nom de fitxer vàlid."
-
-18
+24
-msgid "This value must be either None, True or False."
-msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
-
-3
+4
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Si us plau, introdueixi un %s vàlid."
-
-2
+0
-msgid "Separate multiple IDs with commas."
-msgstr "Separi múltiples IDs amb comes."
-
-4
+2
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Premi \"Control\" o \"Command\" en un Mac per escollir més d'un."
-
-91
+89
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural ""
-"Please enter valid %(self)s IDs. The values %(value)r are invalid."
-[0]
+
-"Si us plau, introdueixi IDs de %(self)s vàlids. El valor %(value)r és "
-"invàlid."
-msgstr[1] ""
-"Si us plau, introdueixi IDs de %(self)s vàlids. Els valors %(value)r són "
-"invàlids."
+

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

@@ -2 +2 @@
-# Copyright (C) 2005,2006,2007 makoto tsuyuki
-# This file is distributed under the same license as the PACKAGE package.
-
-
+
-msgid ""
-msgstr ""
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-3-26 22:51
+6-26 11:33
-"PO-Revision-Date: 2006-05-18 00:28+0900\n"
-"Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
@@ -25 +24 @@
-
-#: conf/global_settings.py:41
+msgid "Bulgarian"
+msgstr "ブルガリア語"
+
+#: conf/global_settings.py:42
-msgid "Catalan"
-msgstr "カタロニア語"
-
-2
+3
-msgid "Czech"
-msgstr "チェコ語"
-
-3
+4
-msgid "Welsh"
-msgstr "ウェールズ語"
-
-4
+5
-msgid "Danish"
-msgstr "デンマーク語"
-
-5
+6
-msgid "German"
-msgstr "ドイツ語"
-
-6
+7
-msgid "Greek"
-msgstr "ギリシャ語"
-
-7
+8
-msgid "English"
-msgstr "英語"
-
-8
+9
-msgid "Spanish"
-msgstr "スペイン語"
-
-49
+50
-msgid "Argentinean Spanish"
-msgstr "アルゼンチンスペイン語"
-
-
+
+
+
+
+
-msgid "Finnish"
-msgstr "フィンランド語"
-
-1
+3
-msgid "French"
-msgstr "フランス語"
-
-2
+4
-msgid "Galician"
-msgstr "ガリシア語"
-
-3
+5
-msgid "Hungarian"
-msgstr "ハンガリー語"
-
-4
+6
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
-5
+7
-msgid "Icelandic"
-msgstr "アイスランド語"
-
-6
+8
-msgid "Italian"
-msgstr "イタリア語"
-
-7
+9
-msgid "Japanese"
-msgstr "日本語"
-
-
+
+
+
+
+
-msgid "Kannada"
-msgstr "カンナダ語"
-
-59
+62
-msgid "Latvian"
-msgstr "ラトビア語"
-
-0
+3
-msgid "Macedonian"
-msgstr "マケドニア語"
-
-1
+4
-msgid "Dutch"
-msgstr "オランダ語"
-
-2
+5
-msgid "Norwegian"
-msgstr "ノルウェー語"
-
-3
+6
-msgid "Polish"
-msgstr "ポーランド語"
-
-4
+7
-msgid "Portugese"
-msgstr "ポルトガル語"
-
-5
+8
-msgid "Brazilian"
-msgstr "ブラジル語"
-
-6
+9
-msgid "Romanian"
-msgstr "ルーマニア語"
-
-67
+70
-msgid "Russian"
-msgstr "ロシア語"
-
-68
+71
-msgid "Slovak"
-msgstr "スロバキア語"
-
-69
+72
-msgid "Slovenian"
-msgstr "スロヴェニア語"
-
-0
+3
-msgid "Serbian"
-msgstr "セルビア語"
-
-1
+4
-msgid "Swedish"
-msgstr "スウェーデン語"
-
-2
+5
-msgid "Tamil"
-msgstr "タミル語"
-
-3
+6
-msgid "Telugu"
-msgstr "テルグ語"
-
-4
+7
-msgid "Turkish"
-msgstr "トルコ語"
-
-5
+8
-msgid "Ukrainian"
-msgstr "ウクライナ語"
-
-6
+9
-msgid "Simplified Chinese"
-msgstr "簡体字中国語"
-
-77
+80
-msgid "Traditional Chinese"
-msgstr "繁体字中国語"
@@ -206 +217 @@
-msgstr "今年"
-
-70
+81
-#: oldforms/__init__.py:577
-msgid "Yes"
-msgstr "はい"
-
-70
+81
-#: oldforms/__init__.py:577
-msgid "No"
-msgstr "いいえ"
-
-70
+81
-#: oldforms/__init__.py:577
-msgid "Unknown"
@@ -782 +793 @@
-msgstr "変更:"
-
-7
+9
-msgid "All dates"
-msgstr "いつでも"
-
-57
+62
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" を追加しました。"
-
-1
-47
+6
+52
-msgid "You may edit it again below."
-msgstr "続けて編集できます。"
@@ -896 +907 @@
-msgstr "%s のフィールド"
-
-1
-3 contrib/admin/views/doc.py:309
-0 contrib/admin/views/doc.py:312
+2
+4 contrib/admin/views/doc.py:310
+1 contrib/admin/views/doc.py:313
-msgid "Integer"
-msgstr "整数"
@@ -906 +917 @@
-msgstr "ブール値 (真: True または偽: False)"
-
-1
+2
-#, python-format
-msgid "String (up to %(maxlength)s)"
@@ -924 +935 @@
-
-#: contrib/admin/views/doc.py:297
+msgid "Decimal number"
+msgstr "10 進数 (小数可)"
+
+#: contrib/admin/views/doc.py:298
-msgid "E-mail address"
-msgstr "メールアドレス"
-
-8 contrib/admin/views/doc.py:299
-2
+9 contrib/admin/views/doc.py:300
+3
-msgid "File path"
-msgstr "ファイルの場所"
-
-0
-Decimal
-10 進数 (小数可)