The branch, master has been updated via 11192e847c68dab55e4924412e03d5004b9ef75b (commit) via 64bd569ab8c31316969cc237a1834640434fd0d5 (commit) via b4668d5dfcdc6a4ffb972bc0897bf39d03862c5f (commit) via e8406686cda30d09391ac3f1a3ba6e04d7b05a66 (commit) via 584cdd0337300df6fcceb3441e903bfc42f0b947 (commit) via cb8c9c75945449a1e35c322aa91e6a9fb7f2f88d (commit) via eaecc230633a050dd00dde79558cdc5e22930387 (commit) via 2dc9efb061bacf98d92813d294785236fa1efb8e (commit) via bb9164d1833506c846b855f48fd92ac7af738e55 (commit) via f1e6e79ec2bdceac267575fdee7cfd232171c64f (commit) from 5574307fd0c196663abdc405af5ddd05b180fb02 (commit)
- Log ----------------------------------------------------------------- commit 11192e847c68dab55e4924412e03d5004b9ef75b Merge: 64bd569ab8c31316969cc237a1834640434fd0d5 5574307fd0c196663abdc405af5ddd05b180fb02 Author: Michal Čihař mcihar@novell.com Date: Wed Sep 8 13:33:01 2010 +0200
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 64bd569ab8c31316969cc237a1834640434fd0d5 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:12:30 2010 +0200
Translation update done using Pootle.
commit b4668d5dfcdc6a4ffb972bc0897bf39d03862c5f Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:12:11 2010 +0200
Translation update done using Pootle.
commit e8406686cda30d09391ac3f1a3ba6e04d7b05a66 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:11:52 2010 +0200
Translation update done using Pootle.
commit 584cdd0337300df6fcceb3441e903bfc42f0b947 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:11:32 2010 +0200
Translation update done using Pootle.
commit cb8c9c75945449a1e35c322aa91e6a9fb7f2f88d Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:11:24 2010 +0200
Translation update done using Pootle.
commit eaecc230633a050dd00dde79558cdc5e22930387 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:11:08 2010 +0200
Translation update done using Pootle.
commit 2dc9efb061bacf98d92813d294785236fa1efb8e Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:10:55 2010 +0200
Translation update done using Pootle.
commit bb9164d1833506c846b855f48fd92ac7af738e55 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:10:29 2010 +0200
Translation update done using Pootle.
commit f1e6e79ec2bdceac267575fdee7cfd232171c64f Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Wed Sep 8 13:10:21 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/nb.po | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/po/nb.po b/po/nb.po index 8d3922e..1395649 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-07 15:21+0200\n" -"PO-Revision-Date: 2010-09-08 09:08+0200\n" +"PO-Revision-Date: 2010-09-08 13:12+0200\n" "Last-Translator: sven.erik.andersen@gmail.com\n" "Language-Team: norwegian no@li.org\n" "Language: nb\n" @@ -2039,15 +2039,14 @@ msgstr "struktur" #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "data"
#: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#, fuzzy #| msgid "Structure and data" msgid "structure and data" -msgstr "Struktur og data" +msgstr "struktur og data"
#: libraries/config.values.php:99 libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options to configure" @@ -2075,11 +2074,11 @@ msgstr "Utvidete innlegg"
#: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "begge ovenforstående"
#: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "ingen av de overstående"
#: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:416 @@ -2106,7 +2105,7 @@ msgstr "Ugyldig verdi" #: libraries/config/validate.lib.php:458 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Verdien må være lik eller mindre enn %s"
#: libraries/config/FormDisplay.class.php:535 #, php-format @@ -2115,10 +2114,9 @@ msgstr "Mangler data for %s"
#: libraries/config/FormDisplay.class.php:727 #: libraries/config/FormDisplay.class.php:731 -#, fuzzy #| msgid "Variable" msgid "unavailable" -msgstr "Variabler" +msgstr "ikke tilgjengelig"
#: libraries/config/FormDisplay.class.php:728 #: libraries/config/FormDisplay.class.php:732 @@ -2138,7 +2136,7 @@ msgstr ""
#: libraries/config/FormDisplay.class.php:757 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL Validator er avslått"
#: libraries/config/FormDisplay.class.php:764 #, fuzzy @@ -2147,10 +2145,10 @@ msgid "SOAP extension not found" msgstr "Bruk PHP modul"
#: libraries/config/FormDisplay.class.php:772 -#, fuzzy, php-format +#, php-format #| msgid "Maximum tables" msgid "maximum %s" -msgstr "Maks antall tabeller" +msgstr "maksimum %s"
#: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" @@ -2168,7 +2166,7 @@ msgstr "Gjennopprett standard verdi"
#: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Tillat brukere å endre denne verdien"
#: libraries/config/FormDisplay.tpl.php:332 #: libraries/schema/User_Schema.class.php:317
hooks/post-receive