Changeset 4141

Timestamp:

11/29/06 14:11:43 (2 years ago)

Author:

jpellerin

Message:

[multi-db] Merge trunk to [3825]. Some tests still failing. (previous commit was from tests/ dir only)

Files:

• django/branches/multiple-db-support/AUTHORS (modified) (1 diff)
• django/branches/multiple-db-support/django/conf/global_settings.py (modified) (1 diff)
• django/branches/multiple-db-support/django/conf/locale/da/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/da/LC_MESSAGES/django.po (modified) (74 diffs)
• django/branches/multiple-db-support/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/de/LC_MESSAGES/django.po (modified) (55 diffs)
• django/branches/multiple-db-support/django/conf/locale/en/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/en/LC_MESSAGES/django.po (modified) (45 diffs)
• django/branches/multiple-db-support/django/conf/locale/tr (copied) (copied from django/trunk/django/conf/locale/tr)
• django/branches/multiple-db-support/django/conf/locale/tr/LC_MESSAGES (copied) (copied from django/trunk/django/conf/locale/tr/LC_MESSAGES)
• django/branches/multiple-db-support/django/conf/locale/tr/LC_MESSAGES/django.mo (copied) (copied from django/trunk/django/conf/locale/tr/LC_MESSAGES/django.mo)
• django/branches/multiple-db-support/django/conf/locale/tr/LC_MESSAGES/django.po (copied) (copied from django/trunk/django/conf/locale/tr/LC_MESSAGES/django.po)
• django/branches/multiple-db-support/django/core/handlers/modpython.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/handlers/wsgi.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/validators.py (modified) (3 diffs)
• django/branches/multiple-db-support/django/db/backends/ansi/sql.py (modified) (1 diff)
• django/branches/multiple-db-support/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/branches/multiple-db-support/django/forms/__init__.py (modified) (2 diffs)
• django/branches/multiple-db-support/django/test/doctest.py (modified) (2 diffs)
• django/branches/multiple-db-support/django/utils/simplejson/scanner.py (modified) (1 diff)
• django/branches/multiple-db-support/django/views/debug.py (modified) (1 diff)
• django/branches/multiple-db-support/setup.py (modified) (1 diff)

django/branches/multiple-db-support/AUTHORS

@@ -152 +152 @@
-    Dan Watson <http://theidioteque.net/>
-    Rachel Willmer <http://www.willmer.com/kb/>
+    Gary Wilson <gary.wilson@gmail.com>
-    wojtek
-    ye7cakf02@sneakemail.com
+    ymasuda@ethercube.com
-    Cheng Zhang
-

django/branches/multiple-db-support/django/conf/global_settings.py

@@ -65 +65 @@
-    ('sv', gettext_noop('Swedish')),
-    ('ta', gettext_noop('Tamil')),
+    ('tr', gettext_noop('Turkish')),
-    ('uk', gettext_noop('Ukrainian')),
-    ('zh-cn', gettext_noop('Simplified Chinese')),

django/branches/multiple-db-support/django/conf/locale/da/LC_MESSAGES/django.po

@@ -1 @@
-
+
+
-# Copyright (C) 2005 and beyond
-# This file is distributed under the same license as the PACKAGE package.
-# Morten Bagai <m@bagai.com>, Nov 2005.
-
-
-
-
-
+
+
+
+
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:12+0200\n"
-YEAR-MO-DA HO:MI+ZONE
-Morten Bagai <m@bagai.com
-ish
+2006-09-24 10:34+0200
+Rune RÞnde Laursen <runerl@skjoldhoej.dk
+sk <dansk@klid.dk>
-"MIME-Version: 1.0\n"
-utf
+UTF
-"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
-
-#: contrib/comments/models.py:67 contrib/comments/models.py:166
-#, fuzzy
-msgid "object ID"
-id
+ID
-
-#: contrib/comments/models.py:68
-msgid "headline"
-
+overskrift
-
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:167
-#, fuzzy
-msgid "comment"
-indhold
+kommentar
-
-#: contrib/comments/models.py:70
-msgid "rating #1"
-
+rangering # 1
-
-#: contrib/comments/models.py:71
-msgid "rating #2"
-
+rangering # 2
-
-#: contrib/comments/models.py:72
-msgid "rating #3"
-
+rangering # 3
-
-#: contrib/comments/models.py:73
-msgid "rating #4"
-
+rangering # 4
-
-#: contrib/comments/models.py:74
-msgid "rating #5"
-
+rangering # 5
-
-#: contrib/comments/models.py:75
-msgid "rating #6"
-
+rangering # 6
-
-#: contrib/comments/models.py:76
-msgid "rating #7"
-
+rangering # 7
-
-#: contrib/comments/models.py:77
-msgid "rating #8"
-
+rangering # 8
-
-#: contrib/comments/models.py:82
-msgid "is valid rating"
-
+er gyldig rangering
-
-#: contrib/comments/models.py:83 contrib/comments/models.py:169
-msgid "date/time submitted"
-
+dato/tidspunkt oprettet
-
-#: contrib/comments/models.py:84 contrib/comments/models.py:170
-msgid "is public"
-
+er offentlig
-
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289
-#, fuzzy
-msgid "IP address"
-e-mail 
+IP-
-
-#: contrib/comments/models.py:86
-msgid "is removed"
-
+er fjernet
-
-#: contrib/comments/models.py:86
@@ -89 +87 @@
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-
+Afkryds denne boks hvis kommentaren er upassende. Beskeden \"Denne kommentar er blevet fjernet\" vil blive vist istedet.
-
-#: contrib/comments/models.py:91
-#, fuzzy
-msgid "comments"
-indhold
+kommentarer
-
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
-#, fuzzy
-msgid "Content object"
-indholdstype
+Indholdsobjekt
-
-#: contrib/comments/models.py:159
@@ -110 +106 @@
-"http://%(domain)s%(url)s"
-msgstr ""
+"Indsendt af %(user)s den %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
-
-#: contrib/comments/models.py:168
-#, fuzzy
-msgid "person's name"
-for
+personens 
-
-#: contrib/comments/models.py:171
-#, fuzzy
-msgid "ip address"
-e-mail 
+IP-
-
-#: contrib/comments/models.py:173
-msgid "approved by staff"
-
+godkendt af personale
-
-#: contrib/comments/models.py:176
-#, fuzzy
-msgid "free comment"
-tillad kommentare
+fri kommenta
-
-#: contrib/comments/models.py:177
-#, fuzzy
-msgid "free comments"
-tillad
+frie
-
-#: contrib/comments/models.py:233
-msgid "score"
-
+score
-
-#: contrib/comments/models.py:234
-#, fuzzy
-msgid "score date"
-udlÞb
+scoring
-
-#: contrib/comments/models.py:237
-msgid "karma score"
-
+karma score
-
-#: contrib/comments/models.py:238
-msgid "karma scores"
-
+karma score
-
-#: contrib/comments/models.py:242
-#, python-format
-msgid "%(score)d rating by %(user)s"
-
+%(score)d rangering efter %(user)s
-
-#: contrib/comments/models.py:258
@@ -164 +160 @@
-"%(text)s"
-msgstr ""
+"Denne kommentar blev markeret af %(user)s:\n"
+"\n"
+"%(text)s"
-
-#: contrib/comments/models.py:265
-#, fuzzy
-msgid "flag date"
-flad side
+mÊrkedato
-
-#: contrib/comments/models.py:268
-#, fuzzy
-msgid "user flag"
-Bruger
+bruger-mÊrke
-
-#: contrib/comments/models.py:269
-#, fuzzy
-msgid "user flags"
-Brugere
+bruger-mÊrker
-
-#: contrib/comments/models.py:273
-#, python-format
-msgid "Flag by %r"
-
+MÊrket af %r
-
-#: contrib/comments/models.py:278
-#, fuzzy
-msgid "deletion date"
-essionsdata
+letningsdato
-
-#: contrib/comments/models.py:280
-msgid "moderator deletion"
-
+moderator-sletning
-
-#: contrib/comments/models.py:281
-msgid "moderator deletions"
-
+moderator-sletninger
-
-#: contrib/comments/models.py:285
-#, python-format
-msgid "Moderator deletion by %r"
-
+Moderator-sletning af %r
-
-#: contrib/comments/views/karma.py:19
-msgid "Anonymous users cannot vote"
-
+Anonyme brugere kan ikke stemme
-
-#: contrib/comments/views/karma.py:23
-#, fuzzy
-msgid "Invalid comment ID"
-tillad kommentarer
+Ugyldigt kommentar-ID
-
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
-
+Du kan ikke selv stemme
-
-#: contrib/comments/views/comments.py:28
-
-
-
+
+
-
-#: contrib/comments/views/comments.py:112
@@ -234 +227 @@
-"%(text)s"
-msgstr[0] ""
+"Denne kommentar blev indsendt af en bruger som har indsendt fÊrre end %(count)s kommentar:\n"
+"\n"
+"%(text)s"
-msgstr[1] ""
+"Denne kommentar blev indsendt af en bruger som har indsendt fÊrre end %(count)s kommentarer:\n"
+"\n"
+"%(text)s"
-
-#: contrib/comments/views/comments.py:117
@@ -243 +242 @@
-"%(text)s"
-msgstr ""
+"Denne kommentar blev indsendt af en overfladisk bruger:\n"
+"\n"
+"%(text)s"
-
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
-
+Kun POST er tilladt
-
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-
+En eller flere af de påkrÊvede felter blev ikke indsendt
-
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:286
-msgid "Somebody tampered with the comment form (security violation)"
-
+Nogen har misbrugt kommentarformularen (sikkerhedsovertrÊdelse)
-
-#: contrib/comments/views/comments.py:207
@@ -264 +266 @@
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
-
+Kommentarformularen havde en ugyldigt 'target'-parameter -- objekt-ID'var ugyldigt
-
-#: contrib/comments/views/comments.py:257
-#: contrib/comments/views/comments.py:321
-msgid "The comment form didn't provide either 'preview' or 'post'"
-
+Kommentarformularen tilbÞd ikke hverken 'forhåndsvis' eller 'indsend'
-
-#: contrib/comments/templates/comments/form.html:6
@@ -283 +285 @@
-
-#: contrib/comments/templates/comments/form.html:6
-#, fuzzy
-msgid "Forgotten your password?"
-Ændre adgangskode
+Har du glemt dit kodeord?
-
-#: contrib/comments/templates/comments/form.html:8
@@ -310 +311 @@
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-
+Rangeringer
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-
+PåkrÊvet
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-
+Valgfri
-
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-
+Indsend et foto
-
-#: contrib/comments/templates/comments/form.html:27
-#: contrib/comments/templates/comments/freeform.html:5
-#, fuzzy
-msgid "Comment:"
-tillad kommentarer
+Kommentar:
-
-#: contrib/comments/templates/comments/form.html:32
-#: contrib/comments/templates/comments/freeform.html:9
-#, fuzzy
-msgid "Preview comment"
-tillad kommentare
+Forhåndsvis kommenta
-
-#: contrib/comments/templates/comments/freeform.html:4
-#, fuzzy
-msgid "Your name:"
-brugernavn
+Dit navn:
-
-#: contrib/admin/filterspecs.py:40
@@ -349 +347 @@
-"<ul>\n"
-msgstr ""
+"<h3>Af %s:</h3>\n"
+"<ul>\n"
-
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143
-msgid "All"
-
+Alle
-
-#: contrib/admin/filterspecs.py:109
-msgid "Any date"
-
+NÃ¥r som helst
-
-#: contrib/admin/filterspecs.py:110
-#, fuzzy
-msgid "Today"
-Man
+I
-
-#: contrib/admin/filterspecs.py:113
-msgid "Past 7 days"
-
+De sidste 7 dage
-
-#: contrib/admin/filterspecs.py:115
-msgid "This month"
-
+Denne måned
-
-#: contrib/admin/filterspecs.py:117
-msgid "This year"
-
+Dette år
-
-#: contrib/admin/filterspecs.py:143
-msgid "Yes"
-
+Ja
-
-#: contrib/admin/filterspecs.py:143
-#, fuzzy
-msgid "No"
-ov.
+ej
-
-#: contrib/admin/filterspecs.py:150
-msgid "Unknown"
-
+Ukendt
-
-#: contrib/admin/models.py:16
@@ -395 +393 @@
-#: contrib/admin/models.py:19
-msgid "object id"
- id
+-ID
-
-#: contrib/admin/models.py:20
@@ -419 +417 @@
-#: contrib/admin/templatetags/admin_list.py:228
-msgid "All dates"
-
+Alle datoer
-
-#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36
@@ -426 +424 @@
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-
+Indtast venligst et korrekt brugernavn og kodeord. LÊg mÊrke til at begge felter er versalfÞlsomme.
-
-#: contrib/admin/views/decorators.py:23
@@ -437 +435 @@
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-
+Log venligst ind igen, da din session er udlÞbet. Der er ingen grund til bekymring, informationen du indsendte er blevet gemt.
-
-#: contrib/admin/views/decorators.py:68
@@ -443 +441 @@
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-
+Det ser ud til din browser ikke er indstillet til at acceptere cookier. Slå venligst cookier til, genindlÊs denne side og prÞv igen.
-
-#: contrib/admin/views/decorators.py:82
-msgid "Usernames cannot contain the '@' character."
-
+Brugernavne kan ikke indeholde tegnet '@'.
-
-#: contrib/admin/views/decorators.py:84
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-
+Din e-mail-adresse er ikke dit brugernavn. PrÞv '%s' i stedet.
-
-#: contrib/admin/views/main.py:226
-#, fuzzy
-msgid "Site administration"
-Django 
+Website-
-
-#: contrib/admin/views/main.py:260
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-
+%(name)s \"%(obj)s\" blev tilfÞjet i databasen.
-
-#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
-msgid "You may edit it again below."
-
+Du kan redigere det igen herunder.
-
-#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
-#, python-format
-msgid "You may add another %s below."
-
+Du kan tilfÞje endnu en %s herunder.
-
-#: contrib/admin/views/main.py:290
-fuzzy, 
+
-msgid "Add %s"
-
+ %s
-
-#: contrib/admin/views/main.py:336
-#, python-format
-msgid "Added %s."
-
+TilfÞjede %s.
-
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
-#: contrib/admin/views/main.py:340
-msgid "and"
-
+og
-
-#: contrib/admin/views/main.py:338
-fuzzy, 
+
-msgid "Changed %s."
-
+de %s.
-
-#: contrib/admin/views/main.py:340
-#, python-format
-msgid "Deleted %s."
-
+Slettede %s.
-
-#: contrib/admin/views/main.py:343
-msgid "No fields changed."
-
+Ingen filer Êndret.
-
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-
+%(name)s \"%(obj)s\" blev Êndret.
-
-#: contrib/admin/views/main.py:354
-#, python-format
-
-
-
+
+
-
-#: contrib/admin/views/main.py:392
-fuzzy, 
+
-msgid "Change %s"
-e
+ %s
-
-#: contrib/admin/views/main.py:470
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-
+Et eller flere %(fieldname)s i %(name)s: %(obj)s
-
-#: contrib/admin/views/main.py:475
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-
+Et eller flere %(fieldname)s i %(name)s:
-
-#: contrib/admin/views/main.py:508
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-
+%(name)s \"%(obj)s\" blev slettet.
-
-#: contrib/admin/views/main.py:511
-msgid "Are you sure?"
-
+Er du sikker?
-
-#: contrib/admin/views/main.py:533
-fuzzy, 
+
-msgid "Change history: %s"
-e adgangskode
+ingshistorik: %s
-
-#: contrib/admin/views/main.py:565
-#, python-format
-msgid "Select %s"
-
+VÊlg %s
-
-#: contrib/admin/views/main.py:565
-#, python-format
-msgid "Select %s to change"
-
+VÊlg %s for at Êndre
-
-#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286
@@ -556 +552 @@
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297
-msgid "Integer"
-
+Heltal
-
-#: contrib/admin/views/doc.py:278
-msgid "Boolean (Either True or False)"
-
+Boolsk (enten \"true\" eller \"false\")
-
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296
-#, python-format
-msgid "String (up to %(maxlength)s)"
-
+Tekst (op til %(maxlength)s)
-
-#: contrib/admin/views/doc.py:280
-msgid "Comma-separated integers"
-
+Kommaadskilte heltal
-
-#: contrib/admin/views/doc.py:281
-#, fuzzy
-msgid "Date (without time)"
-handlingstid
+Dato (uden tid)
-
-#: contrib/admin/views/doc.py:282
-#, fuzzy
-msgid "Date (with time)"
-/tid
+ (med tid)
-
-#: contrib/admin/views/doc.py:283
-#, fuzzy
-msgid "E-mail address"
- adresse:
+-adresse
-
-#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287
-msgid "File path"
-
+Filsti
-
-#: contrib/admin/views/doc.py:285
-#, fuzzy
-msgid "Decimal number"
-ember
+imaltal
-
-#: contrib/admin/views/doc.py:291
-msgid "Boolean (Either True, False or None)"
-
+Boolsk (enten \"true\", \"false\", eller \"none\")
-
-#: contrib/admin/views/doc.py:292
-msgid "Relation to parent model"
-
+Relation-til-forÊlder-model
-
-#: contrib/admin/views/doc.py:293
-#, fuzzy
-msgid "Phone number"
-Indtast et heltal.
+Telefonnummer
-
-#: contrib/admin/views/doc.py:298
-msgid "Text"
-
+Tekst
-
-#: contrib/admin/views/doc.py:299
-msgid "Time"
-
+Tid
-
-#: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7
-msgid "URL"
-Internetadresse
+URL
-
-#: contrib/admin/views/doc.py:301
-msgid "U.S. state (two uppercase letters)"
-
+Stat (i USA, to store bogstaver)
-
-#: contrib/admin/views/doc.py:302
-msgid "XML text"
-
+XML tekst
-
-#: contrib/admin/templates/admin/object_history.html:3
@@ -637 +628 @@
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Documentation"
-
+Dokumentation
-
-#: contrib/admin/templates/admin/object_history.html:3
@@ -705 +696 @@
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-site 
+website-
-
-#: contrib/admin/templates/admin/base_site.html:7
@@ -727 +718 @@
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-
-
-
+
-
-#: contrib/admin/templates/admin/404.html:4
@@ -738 +727 @@
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-B
+b
-
-#: contrib/admin/templates/admin/index.html:17
-#, python-format
-msgid "Models available in the %(name)s application."
-
+Modeller til rådighed i %(name)s applikationen.
-
-#: contrib/admin/templates/admin/index.html:28
@@ -752 +741 @@
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
-e
+
-
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
-ehed til at foretage Êndringer
+heder til at foretage Êndringer.
-
-#: contrib/admin/templates/admin/index.html:52
@@ -773 +762 @@
-#, python-format
-msgid "Add %(name)s"
-
+TilfÞj %(name)s
-
-#: contrib/admin/templates/admin/login.html:22
@@ -781 +770 @@
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-
+,
-
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-
+Slet
-
-#: contrib/admin/templates/admin/delete_confirmation.html:14
@@ -796 +785 @@
-msgstr ""
-"Hvis du sletter %(object_name)s '%(object)s' vil du også slette relaterede "
-lg. typer objekt
+Þlgende objekttyp
-
-#: contrib/admin/templates/admin/delete_confirmation.html:21
@@ -803 +792 @@
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-
-
-
+
-
-#: contrib/admin/templates/admin/delete_confirmation.html:26
@@ -814 +801 @@
-#, python-format
-msgid " By %(title)s "
-
+ Efter %(title)s 
-
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-
+KÞr
-
-#: contrib/admin/templates/admin/change_form.html:21
-msgid "View on site"
-
+Se på website
-
-#: contrib/admin/templates/admin/change_form.html:30
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-
-
+Ret venligst fejlen herunder.
+Ret venligst fejlene herunder.
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Ordering"
-
+RÊkkefÞlge
-
-#: contrib/admin/templates/admin/change_form.html:51
-msgid "Order:"
-
+RÊkkefÞlge:
-
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-
+Gem som ny
-
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-
+Gem og tilfÞj endnu en
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-
+Gem og fortsÊt med at redigere
-
-#: contrib/admin/templates/admin/submit_line.html:7
-#, fuzzy
-msgid "Save"
-aktiv
+Gem
-
-#: contrib/admin/templates/registration/password_change_done.html:4
@@ -860 +846 @@
-#: contrib/admin/templates/registration/password_change_form.html:10
-msgid "Password change"
-e passord
+ adgangskode
-
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-er
+blev
-
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-er Êndret
+blev Êndret.
-
-#: contrib/admin/templates/registration/password_reset_form.html:4
@@ -882 +868 @@
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-
-
-
+
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
- 
+-
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
@@ -896 +880 @@
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-tid du brugte på sitet idag
+kvalitetstid du brugte på websitet idag.
-
-#: contrib/admin/templates/registration/logged_out.html:10
@@ -911 +895 @@
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-
-
-
+
-
-#: contrib/admin/templates/registration/password_change_form.html:12
@@ -920 +902 @@
-"password twice so we can verify you typed it in correctly."
-msgstr ""
- af sikkerhedsgrunde,
-t nye password to gange, så vi kan vÊre sikre på, at det
-
+, for en sikkerheds skyld
+n nye adgangskode to gange, så vi kan vÊre sikre på, at den
+.
-
-#: contrib/admin/templates/registration/password_change_form.html:17
@@ -938 +920 @@
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-e
+ min
-
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-
-
+
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
-#, python-format
-msgid "for your user account at %(site_name)s"
-for din konto hos
+til din brugerkonto ved
-
-#: contrib/admin/templates/registration/password_reset_email.html:5
@@ -957 +938 @@
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-
+:
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
-,
+
-
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-, fordi du brugte vores 
+ fordi du brugte vores web
-
-#: contrib/admin/templates/registration/password_reset_email.html:15
@@ -974 +955 @@
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-
+Bookmarklets
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-
+Documentation bookmarklets
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
@@ -990 +971 @@
-"your computer is \"internal\").</p>\n"
-msgstr ""
+"\n"
+"<p class=\"help\">For at installere bookmarklets, trÊk linket til din bogmÊrkelinje\n, eller hÞjreklik på linket og tilfÞj det til dine bogmÊrker. Du kan nu\n"
+"markere bookmarkletten fra enhver side på websitet. Bid mÊrke i at nogle af disse \n"
+"bookmarkletter krÊver at du ser på websitet fra en computer der opfattes \n"
+"som \"intern\" (tal med din systemadministrator, hvis du ikke er sikker på om\n"
+"din computer er \"intern\").</p>\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-
+Dokumentation for denne side