The branch, master has been updated via b275e7fb1e80d31886f583672ecc71bb57686f7b (commit) via 0ec8c0b7ac0e1bab51fbb884c0325cc38d7e1faa (commit) via 2f1f401e3c59b864158e4f98cf9bc707ed706e3f (commit) via 1aa34af60ffca52a472093aa26dd5b2776f41053 (commit) via 14978b2902365a10a9827c55f6b08e1ccbeb6045 (commit) via 009062738d768dc35115a543f9caa29aae1af135 (commit) via 40f21a1dbb0b4bcb169b1c5b6e2b6635a4ffab19 (commit) via a62d987a4baf71978d8186e06e189b25a720ff32 (commit) via 9e71c3c5aaca0673d2cf6e5dc0145716b6fadc55 (commit) from a727fd587d4b4bf800247129517b6bbb47232c24 (commit)

- Log ----------------------------------------------------------------- commit b275e7fb1e80d31886f583672ecc71bb57686f7b Merge: a727fd587d4b4bf800247129517b6bbb47232c24 0ec8c0b7ac0e1bab51fbb884c0325cc38d7e1faa Author: Michal Čihař mcihar@novell.com Date: Tue Sep 7 15:20:44 2010 +0200

Merge remote branch 'pootle/master'

Conflicts: po/nb.po

commit 0ec8c0b7ac0e1bab51fbb884c0325cc38d7e1faa Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Tue Sep 7 14:07:13 2010 +0200

Translation update done using Pootle.

commit 2f1f401e3c59b864158e4f98cf9bc707ed706e3f Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Tue Sep 7 14:07:00 2010 +0200

Translation update done using Pootle.

commit 1aa34af60ffca52a472093aa26dd5b2776f41053 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Tue Sep 7 14:06:51 2010 +0200

Translation update done using Pootle.

commit 14978b2902365a10a9827c55f6b08e1ccbeb6045 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Tue Sep 7 14:06:32 2010 +0200

Translation update done using Pootle.

commit 009062738d768dc35115a543f9caa29aae1af135 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Tue Sep 7 14:06:20 2010 +0200

Translation update done using Pootle.

commit 40f21a1dbb0b4bcb169b1c5b6e2b6635a4ffab19 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Tue Sep 7 14:06:12 2010 +0200

Translation update done using Pootle.

commit a62d987a4baf71978d8186e06e189b25a720ff32 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Tue Sep 7 14:06:07 2010 +0200

Translation update done using Pootle.

commit 9e71c3c5aaca0673d2cf6e5dc0145716b6fadc55 Author: sven.erik.andersen sven.erik.andersen@gmail.com Date: Tue Sep 7 14:05:53 2010 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: po/nb.po | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/po/nb.po b/po/nb.po index e8e3171..811f257 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 10:53+0200\n" -"PO-Revision-Date: 2010-09-07 09:16+0200\n" +"PO-Revision-Date: 2010-09-07 14:07+0200\n" "Last-Translator: sven.erik.andersen@gmail.com\n" "Language-Team: norwegian no@li.org\n" "Language: nb\n" @@ -1056,10 +1056,9 @@ msgid "Renaming Databases" msgstr "Endrer databasenes navn"

#: js/messages.php:72 -#, fuzzy #| msgid "Rename database to" msgid "Reload Database" -msgstr "Endre databasens navn til" +msgstr "Gjennlast database"

#: js/messages.php:73 msgid "Copying Database" @@ -1159,16 +1158,14 @@ msgid "Generate" msgstr "Generer"

#: js/messages.php:107 -#, fuzzy #| msgid "Change password" msgid "Change Password" msgstr "Endre passord"

#: js/messages.php:110 -#, fuzzy #| msgid "Mo" msgid "More" -msgstr "Man" +msgstr "Mer"

#. l10n: Display text for calendar close link #: js/messages.php:120 @@ -1732,13 +1729,12 @@ msgstr "Autentiserer..."

#: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS feil"

#: libraries/blobstreaming.lib.php:267 -#, fuzzy #| msgid "Page creation failed" msgid "PBMS connection failed:" -msgstr "Sideopprettelsen feilet" +msgstr "PBMS tilkoblingen feilet:"

#: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" @@ -1767,23 +1763,21 @@ msgstr "Last ned fil" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Kunne ikke åpne fil: %s"

#: libraries/chart.lib.php:40 -#, fuzzy #| msgid "Show statistics" msgid "Query statistics" -msgstr "Vis statistikk" +msgstr "Spørringsstatistikk"

#: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" msgstr ""

#: libraries/chart.lib.php:83 -#, fuzzy #| msgid "Query results operations" msgid "Query results" -msgstr "Spørringsresultatshandlinger" +msgstr "Spørringsresultater"

#: libraries/chart.lib.php:109 msgid "No data found for the chart."

hooks/post-receive