From b36a7c87c17b2bcbc19cd853ae4b93d585e82060 Mon Sep 17 00:00:00 2001 From: Chris Wesseling Date: Wed, 7 Jul 2010 20:53:16 +0200 Subject: [PATCH 1/3] Small NL translation fixes --- cms/locale/nl/LC_MESSAGES/django.po | 75 ++++++++++++++++------------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/cms/locale/nl/LC_MESSAGES/django.po b/cms/locale/nl/LC_MESSAGES/django.po index 8ff430871f8..e8a17258d8c 100644 --- a/cms/locale/nl/LC_MESSAGES/django.po +++ b/cms/locale/nl/LC_MESSAGES/django.po @@ -2,19 +2,21 @@ # Copyright (C) 2009 Peter-Paul van Gemerden # This file is distributed under the same license as the django-cms-2.0 package. # Peter-Paul van Gemerden , 2009. -# +# Chris Wesseling , 2010. msgid "" msgstr "" "Project-Id-Version: django-cms-2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-09 01:54+0200\n" -"PO-Revision-Date: 2009-11-20 20:13+0100\n" -"Last-Translator: Peter-Paul van Gemerden \n" -"Language-Team: divio \n" +"POT-Creation-Date: 2010-07-06 14:09+0200\n" +"PO-Revision-Date: 2010-07-07 20:42+0200\n" +"Last-Translator: Chris Wesseling \n" +"Language-Team: \n" +"Language: nl\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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.6.1\n" #: plugin_base.py:100 msgid "Advanced options" @@ -284,7 +286,7 @@ msgstr "%(plugin_name)s-plugin toegevoegd aan %(placeholder)s" msgid "Language must be different than the copied language!" msgstr "De taal moet verschillend zijn van de gekopieerde taal!" -#: admin/pageadmin.py:1139 +#: admin/pageadmin.py:1138 #, python-format msgid "Copied %(language)s plugins to %(placeholder)s" msgstr "%(language)s plugins zijn gekopieerd naar %(placeholder)s" @@ -300,7 +302,7 @@ msgstr "" msgid "Plugins where moved" msgstr "Plugins zijn verplaatst" -#: admin/pageadmin.py:1293 admin/placeholderadmin.py:207 +#: admin/pageadmin.py:1293 admin/placeholderadmin.py:210 #, python-format msgid "" "%(plugin_name)s plugin at position %(position)s in %(placeholder)s was " @@ -482,12 +484,12 @@ msgstr "Je zoekopdracht heeft geen resultaten opgeleverd" #: forms/fields.py:18 msgid "Select a valid site" -msgstr "" +msgstr "Selecteer een geldige site" #: forms/fields.py:19 #, fuzzy msgid "Select a valid page" -msgstr "selecteer deze pagina" +msgstr "Selecteer een geldige pagina" #: forms/widgets.py:172 msgid "Add Another" @@ -497,18 +499,18 @@ msgstr "Nog een toevoegen" #: migrations/0001_initial.py:75 migrations/0003_remove_placeholder.py:18 #: migrations/0010_5char_language.py:12 migrations/0010_5char_language.py:15 #: migrations/0010_5char_language.py:22 migrations/0010_5char_language.py:25 -#: models/pluginmodel.py:44 models/titlemodels.py:11 +#: models/pluginmodel.py:48 models/titlemodels.py:11 #: plugins/inherit/models.py:11 msgid "language" msgstr "taal" #: migrations/0001_initial.py:14 migrations/0004_textobjects.py:12 -#: migrations/0004_textobjects.py:22 models/pluginmodel.py:43 +#: migrations/0004_textobjects.py:22 models/pluginmodel.py:47 msgid "position" msgstr "positie" #: migrations/0001_initial.py:15 migrations/0001_initial.py:29 -#: models/pluginmodel.py:46 models/titlemodels.py:23 +#: models/pluginmodel.py:50 models/titlemodels.py:23 msgid "creation date" msgstr "datum aangemaakt" @@ -517,7 +519,7 @@ msgstr "datum aangemaakt" msgid "slot" msgstr "plek" -#: migrations/0001_initial.py:18 models/pluginmodel.py:45 +#: migrations/0001_initial.py:18 models/pluginmodel.py:49 msgid "plugin_name" msgstr "plugin_naam" @@ -734,11 +736,11 @@ msgstr "ouders goedkeuren vereist" #: models/pagemodel.py:43 msgid "for logged in users only" -msgstr "" +msgstr "alleen voor aangemelde gebruikers" #: models/pagemodel.py:44 msgid "for anonymous users only" -msgstr "" +msgstr "alleen voor anonieme gebruikers" #: models/pagemodel.py:49 msgid "created by" @@ -775,7 +777,7 @@ msgstr "" #: models/pagemodel.py:58 #, fuzzy msgid "attached menu" -msgstr "flash menu" +msgstr "bevestigd menu" #: models/pagemodel.py:59 msgid "is published" @@ -799,12 +801,12 @@ msgstr "moderatie-toestand" #: models/pagemodel.py:72 msgid "menu visibility" -msgstr "" +msgstr "menu zichtbaarheid" #: models/pagemodel.py:72 #, fuzzy msgid "limit when this page is visible in the menu" -msgstr "Overschrijf wat wordt weergegeven in het menu" +msgstr "Beperk wanneer deze pagina zichtbaar is in het menu" #: models/pagemodel.py:83 msgid "pages" @@ -1194,9 +1196,8 @@ msgid "Twitter" msgstr "Twitter" #: plugins/twitter/cms_plugins.py:31 -#, fuzzy msgid "Twitter Search" -msgstr "twitter gebruiker" +msgstr "Twitter-zoekopdracht" #: plugins/twitter/models.py:7 msgid "twitter user" @@ -1223,7 +1224,7 @@ msgstr "" #: plugins/twitter/models.py:16 #, fuzzy msgid "query" -msgstr "gebruiker" +msgstr "zoekopdracht" #: plugins/twitter/models.py:16 msgid "" @@ -1231,6 +1232,9 @@ msgid "" "from the user \"umbrella\" to the user \"nemesis\" that contain the words " "\"brains\" and \"zombies\"" msgstr "" +"Voorbeeld: \"hersenen AND zombies AND from:umbrella AND to:nemesis\": tweets " +"van de gebruiker \"umbrella\" aan de gebruiker \"nemesis\" die de woorden " +"\"hersenen\" en \"zombies\" bevatten" #: plugins/video/cms_plugins.py:10 msgid "Video" @@ -1304,20 +1308,24 @@ msgid "seekbar bg color" msgstr "zoekbar achtergrondkleur" #: plugins/video/models.py:27 +#, fuzzy msgid "loadingbar color" -msgstr "" +msgstr "laadbalk kleur" #: plugins/video/models.py:28 +#, fuzzy msgid "button out color" -msgstr "" +msgstr "knop \"out\" kleur" #: plugins/video/models.py:29 +#, fuzzy msgid "button over color" -msgstr "" +msgstr "knop \"over\" kleur" #: plugins/video/models.py:30 +#, fuzzy msgid "button highlight color" -msgstr "" +msgstr "knop \"oplicht\" kleur" #: plugins/video/templates/cms/plugins/video.html:3 msgid "" @@ -1720,7 +1728,7 @@ msgstr "Kies kopiëer-opties" #: templates/admin/cms/page/widgets/installed_plugins_inc.html:7 msgid "Generic" -msgstr "" +msgstr "Algemeen" #: templates/admin/cms/page/widgets/installed_plugins_inc.html:15 #: templates/cms/toolbar/add_plugins.html:6 @@ -1748,7 +1756,6 @@ msgid "No Plugins present. Add a plugin to this placeholder-slot." msgstr "Geen plugins aanwezig. Voeg een plugin toe aan deze plaatshouder-plek." #: templates/cms/toolbar/add_plugins.html:10 -#, fuzzy msgid "Available plugins" msgstr "Beschikbare plugins" @@ -1798,12 +1805,14 @@ msgid "Add child page" msgstr "Sub-pagina toevoegen" #: templates/cms/toolbar/toolbar.html:104 +#, fuzzy msgid "add sibling" -msgstr "" +msgstr "voeg in op hetzelfde niveau" #: templates/cms/toolbar/toolbar.html:104 +#, fuzzy msgid "Add sibling page" -msgstr "" +msgstr "Voeg pagina in op hetzelfde niveau" #: templates/cms/toolbar/toolbar.html:106 msgid "Delete Page" @@ -1869,7 +1878,7 @@ msgstr "Afstammelingen-moderatie ontbinden" #: templatetags/cms_tags.py:69 #, fuzzy, python-format msgid "Page not found on %(domain)s" -msgstr "Omgekeerde kennaam niet gevonden op %(domain)s" +msgstr "Pagina niet gevonden op %(domain)s" #: templatetags/cms_tags.py:70 #, fuzzy, python-format @@ -1878,9 +1887,9 @@ msgid "" "s\n" "`. The URL of the request was: http://%(host)s%(path)s" msgstr "" -"Een page_id_url sjabloon-tag heeft de pagina met reverse_id %(reverse_id)s " +"Een sjabloon-tag heeft de pagina met opzoek argumenten `%(page_lookup)s` " "niet kunnen vinden\n" -"De URL van de pagina was: http://%(host)s%(path)s" +"De URL van het verzoek was: http://%(host)s%(path)s" #: utils/moderator.py:82 msgid "parent first" From 4edddf5a4714140ac182762ff793143c36d24f67 Mon Sep 17 00:00:00 2001 From: Chris Wesseling Date: Tue, 10 May 2011 20:59:22 +0200 Subject: [PATCH 2/3] Update Dutch locale (nl) --- cms/locale/nl/LC_MESSAGES/django.po | 82 +++++++++++++++------------ cms/locale/nl/LC_MESSAGES/djangojs.po | 20 ++++--- 2 files changed, 57 insertions(+), 45 deletions(-) diff --git a/cms/locale/nl/LC_MESSAGES/django.po b/cms/locale/nl/LC_MESSAGES/django.po index 926ef8af651..f728e9645d1 100644 --- a/cms/locale/nl/LC_MESSAGES/django.po +++ b/cms/locale/nl/LC_MESSAGES/django.po @@ -1,21 +1,21 @@ # 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 , YEAR. -# +# Chris Wesseling , 2011. msgid "" msgstr "" "Project-Id-Version: django-cms\n" "Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n" "POT-Creation-Date: 2011-02-07 07:20-0600\n" -"PO-Revision-Date: 2011-02-16 17:12+0000\n" -"Last-Translator: ojii \n" +"PO-Revision-Date: 2011-05-10 20:54+0200\n" +"Last-Translator: Chris Wesseling \n" "Language-Team: divio.ch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.6.1\n" "X-Poedit-Country: SWITZERLAND\n" "X-Poedit-Language: English\n" "X-Poedit-SourceCharset: utf-8\n" @@ -361,7 +361,7 @@ msgstr "Selecteer een geldige site" #: forms/fields.py:20 msgid "Select a valid page" -msgstr "" +msgstr "Selecteer een geldige pagina" #: forms/widgets.py:173 msgid "Add Another" @@ -648,8 +648,9 @@ msgstr "" "naar deze pagina te verwijzen." #: models/pagemodel.py:69 +#, fuzzy msgid "attached menu" -msgstr "" +msgstr "bevestigd menu" #: models/pagemodel.py:70 msgid "is published" @@ -676,8 +677,9 @@ msgid "menu visibility" msgstr "menu zichtbaarheid" #: models/pagemodel.py:83 +#, fuzzy msgid "limit when this page is visible in the menu" -msgstr "" +msgstr "limiteer wanneer deze pagina zichtbaar is in het menu" #: models/pagemodel.py:100 msgid "pages" @@ -774,7 +776,7 @@ msgstr "breedte" #: models/pluginmodel.py:122 msgid "" -msgstr "" +msgstr "" #: models/titlemodels.py:12 msgid "overwrite the title in the menu" @@ -874,7 +876,7 @@ msgstr "Kaart" #: plugins/googlemap/templates/cms/plugins/googlemap.html:11 msgid "Your address: " -msgstr "" +msgstr "Uw adres:" #: plugins/googlemap/templates/cms/plugins/googlemap.html:13 msgid "Calculate route" @@ -1076,7 +1078,7 @@ msgstr "Twitter" #: plugins/twitter/cms_plugins.py:31 msgid "Twitter Search" -msgstr "" +msgstr "Twitter-zoekopdracht" #: plugins/twitter/models.py:7 msgid "twitter user" @@ -1101,8 +1103,9 @@ msgstr "" "Twitter-profiel." #: plugins/twitter/models.py:16 +#, fuzzy msgid "query" -msgstr "" +msgstr "opdracht" #: plugins/twitter/models.py:16 msgid "" @@ -1256,7 +1259,7 @@ msgstr "Log hier in op de administratie." #: templates/admin/cms/mail/base.txt:8 #, python-format msgid "Login url: %(login_url)s" -msgstr "" +msgstr "Login url: %(login_url)s" #: templates/admin/cms/mail/page_user_change.html:7 #: templates/admin/cms/mail/page_user_change.txt:5 @@ -1642,7 +1645,7 @@ msgstr "Geen plugins aanwezig. Voeg een plugin toe aan deze plaatshouder-plek." #: templates/cms/toolbar/add_plugins.html:10 msgid "Available plugins" -msgstr "" +msgstr "Beschikbare plugins" #: templates/cms/toolbar/toolbar.html:33 #, python-format @@ -1672,7 +1675,7 @@ msgstr "inloggen" #: templates/cms/toolbar/toolbar.html:175 msgid "Request Approval" -msgstr "" +msgstr "Verzoek Goedkeuring" #: templates/cms/toolbar/toolbar.html:184 msgid "Template" @@ -1766,90 +1769,95 @@ msgstr "Afstammelingen-moderatie ontbinden" #: templatetags/cms_tags.py:78 #, python-format msgid "Page not found on %(domain)s" -msgstr "" +msgstr "Pagina niet gevonden in %(domain)s" #: templatetags/cms_tags.py:79 -#, python-format +#, fuzzy, python-format msgid "" "A template tag couldn't find the page with lookup arguments `%(page_lookup)s\n" "`. The URL of the request was: http://%(host)s%(path)s" msgstr "" +"Een sjabloon tag kon de pagina met zoekopdracht `%(page_lookup)s`. De URL " +"van het verzoek was: http://%(host)s%(path)s" #: test/run_tests.py:137 test/project/settings.py:116 msgid "English" -msgstr "" +msgstr "Engels" #: test/run_tests.py:138 test/project/settings.py:117 msgid "French" -msgstr "" +msgstr "Frans" #: test/run_tests.py:139 test/project/settings.py:118 msgid "German" -msgstr "" +msgstr "Duits" #: test/run_tests.py:140 test/project/settings.py:119 +#, fuzzy msgid "Brazil" -msgstr "" +msgstr "Brazilië" #: test/run_tests.py:141 test/project/settings.py:120 msgid "Dutch" -msgstr "" +msgstr "Nederlands" #: test/run_tests.py:158 test/project/settings.py:137 msgid "two columns" -msgstr "" +msgstr "twee kolommen" #: test/run_tests.py:159 test/project/settings.py:138 msgid "three columns" -msgstr "" +msgstr "drie kolommen" #: test/run_tests.py:160 test/project/settings.py:139 msgid "navigation examples" -msgstr "" +msgstr "navigatie voorbeelden" #: test/run_tests.py:167 test/project/settings.py:148 msgid "sidebar column" -msgstr "" +msgstr "zijbalk kolom" #: test/run_tests.py:173 test/project/settings.py:154 msgid "left column" -msgstr "" +msgstr "linker kolom" #: test/run_tests.py:179 test/project/settings.py:160 msgid "right column" -msgstr "" +msgstr "rechter kolom" #: test/apps/pluginapp/plugins/manytomany_rel/cms_plugins.py:13 msgid "Articles" -msgstr "" +msgstr "Artikelen" #: test/apps/sampleapp/cms_app.py:7 msgid "Sample App" -msgstr "" +msgstr "Voorbeeld App" #: test/apps/sampleapp/menu.py:17 +#, fuzzy msgid "sample root page" -msgstr "" +msgstr "voorbeeld root pagina" #: test/apps/sampleapp/menu.py:18 msgid "sample settings page" -msgstr "" +msgstr "voorbeeld instellingenpagina" #: test/apps/sampleapp/menu.py:19 +#, fuzzy msgid "sample account page" -msgstr "" +msgstr "voorbeeld account pagina" #: test/apps/sampleapp/menu.py:20 msgid "sample my profile page" -msgstr "" +msgstr "voorbeeld mijn profiel pagina" #: test/apps/sampleapp/menu.py:32 msgid "Static Menu" -msgstr "" +msgstr "Statisch Menu" #: test/apps/sampleapp/menu.py:48 msgid "Static Menu2" -msgstr "" +msgstr "Statisch Menu2" #: utils/moderator.py:83 msgid "parent first" diff --git a/cms/locale/nl/LC_MESSAGES/djangojs.po b/cms/locale/nl/LC_MESSAGES/djangojs.po index 761f738432e..bf7d535bdc0 100644 --- a/cms/locale/nl/LC_MESSAGES/djangojs.po +++ b/cms/locale/nl/LC_MESSAGES/djangojs.po @@ -1,35 +1,39 @@ # 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 , YEAR. -# +# Chris Wesseling , 2011. msgid "" msgstr "" "Project-Id-Version: django-cms\n" "Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n" "POT-Creation-Date: 2011-02-07 07:22-0600\n" -"PO-Revision-Date: 2011-02-16 17:11+0000\n" -"Last-Translator: ojii \n" +"PO-Revision-Date: 2011-05-10 20:58+0200\n" +"Last-Translator: Chris Wesseling \n" "Language-Team: LANGUAGE \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.6.1\n" #: media/cms/js/change_form.js:31 msgid "" "Are you sure you want to change the %(field_name)s without saving the " "page first?" msgstr "" -"Weet je zeker dat je het veld %(field_name)s wilt aanpassen zonder de " -"pagina eerst op te slaan?" +"Weet je zeker dat je het veld %(field_name)s wilt aanpassen zonder de pagina " +"eerst op te slaan?" #: media/cms/js/change_form.js:69 +#, fuzzy msgid "" "Not all plugins are saved. Are you sure you want to save the page?\n" "All unsaved plugin content will tried to save." msgstr "" +"Niet alle plugins zijn opgeslagen. Weet u zeker dat u de pagina wilt " +"opslaan?\n" +"Alle onopgeslagen plugin inhoud zal opgeslagen geprobeerd te worden." #: media/cms/js/change_form.js:127 msgid "Are you sure you want to change tabs without saving the page first?" From 4339d3f90b6ea42dede93aef38401b1adc34f91f Mon Sep 17 00:00:00 2001 From: Jonas Obrist Date: Fri, 20 May 2011 10:12:58 +0200 Subject: [PATCH 3/3] Fixed django-reversion version to 1.3.3 --- tests/buildout.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/buildout.cfg b/tests/buildout.cfg index 7934aaeb28a..32ecdf5f56a 100644 --- a/tests/buildout.cfg +++ b/tests/buildout.cfg @@ -33,3 +33,4 @@ eggs = ${buildout:eggs} [versions] coverage = 3.4 unittest-xml-reporting = 1.0.3 +django-reversion = 1.3.3