Merge remote branch 'pootle/master'

Conflicts:
	po/nb.po

po/nb.po

@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-05-04 10:37+0200\n"
-"PO-Revision-Date: 2010-05-03 10:12+0200\n"
+"PO-Revision-Date: 2010-05-04 10:59+0200\n"
 "Last-Translator:  <sven.erik.andersen@gmail.com>\n"
 "Language-Team: norwegian <no@li.org>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.1\n"
 
@@ -216,7 +216,6 @@ msgid "Status"
 msgstr "Status"
 
 #: db_operations.php:544
-#, fuzzy
 #| msgid "Enabled"
 msgctxt "BLOB repository"
 msgid "Enabled"
@@ -231,14 +230,12 @@ msgid "Damaged"
 msgstr "Skadet"
 
 #: db_operations.php:562
-#, fuzzy
 #| msgid "Repair"
 msgctxt "BLOB repository"
 msgid "Repair"
 msgstr "Reparer"
 
 #: db_operations.php:570
-#, fuzzy
 #| msgid "Disabled"
 msgctxt "BLOB repository"
 msgid "Disabled"
@@ -644,14 +641,12 @@ msgstr "Avbryt"
 
 #. l10n: Display text for calendar close link
 #: js/messages.php:74
-#, fuzzy
 #| msgid "Donate"
 msgid "Done"
-msgstr "Doner"
+msgstr "Utført"
 
 #. l10n: Display text for previous month link in calendar
 #: js/messages.php:76
-#, fuzzy
 #| msgid "Previous"
 msgid "Prev"
 msgstr "Forrige"
@@ -664,72 +659,64 @@ msgstr "Neste"
 
 #. l10n: Display text for current month link in calendar
 #: js/messages.php:80
-#, fuzzy
 #| msgid "Total"
 msgid "Today"
-msgstr "Totalt"
+msgstr "I dag"
 
 #: js/messages.php:83
-#, fuzzy
 #| msgid "Binary"
 msgid "January"
-msgstr " Binær "
+msgstr "Januar"
 
 #: js/messages.php:84
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
-#: js/messages.php:85
+#: js/messages.php:98
-#, fuzzy
 #| msgid "Mar"
 msgid "March"
-msgstr "Mar"
+msgstr "Mars"
 
 #: js/messages.php:86
-#, fuzzy
 #| msgid "Apr"
 msgid "April"
-msgstr "Apr"
+msgstr "April"
 
 #: js/messages.php:87 libraries/messages.inc.php:28
 msgid "May"
 msgstr "Mai"
 
 #: js/messages.php:88
-#, fuzzy
 #| msgid "Jun"
 msgid "June"
-msgstr "Jun"
+msgstr "Juni"
 
 #: js/messages.php:89
-#, fuzzy
 #| msgid "Jul"
 msgid "July"
-msgstr "Jul"
+msgstr "Juli"
 
 #: js/messages.php:90
-#, fuzzy
 #| msgid "Aug"
 msgid "August"
-msgstr "Aug"
+msgstr "August"
 
 #: js/messages.php:91
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #: js/messages.php:92
-#, fuzzy
 #| msgid "Oct"
 msgid "October"
-msgstr "Okt"
+msgstr "Oktober"
 
 #: js/messages.php:93
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #: js/messages.php:94
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #. l10n: Short month name
 #: js/messages.php:98 libraries/messages.inc.php:28
@@ -753,7 +740,6 @@ msgstr "Apr"
 
 #. l10n: Short month name
 #: js/messages.php:106
-#, fuzzy
 #| msgid "May"
 msgctxt "Short month name"
 msgid "May"
@@ -795,40 +781,36 @@ msgid "Dec"
 msgstr "Des"
 
 #: js/messages.php:123
-#, fuzzy
 #| msgid "Sun"
 msgid "Sunday"
-msgstr "Søn"
+msgstr "Søndag"
 
 #: js/messages.php:124
-#, fuzzy
 #| msgid "Mon"
 msgid "Monday"
-msgstr "Man"
+msgstr "Mandag"
 
 #: js/messages.php:125
-#, fuzzy
 #| msgid "Tue"
 msgid "Tuesday"
-msgstr "Tir"
+msgstr "Tirsdag"
 
 #: js/messages.php:126
 msgid "Wednesday"
-msgstr ""
+msgstr "Onsdag"
 
 #: js/messages.php:127
 msgid "Thursday"
-msgstr ""
+msgstr "Torsdag"
 
 #: js/messages.php:128
-#, fuzzy
 #| msgid "Fri"
 msgid "Friday"
-msgstr "Fre"
+msgstr "Fredag"
 
 #: js/messages.php:129
 msgid "Saturday"
-msgstr ""
+msgstr "Lørdag"
 
 #. l10n: Short week day name
 #: js/messages.php:133 libraries/messages.inc.php:27
@@ -867,75 +849,65 @@ msgstr "Lør"
 
 #. l10n: Minimal week day name
 #: js/messages.php:149
-#, fuzzy
 #| msgid "Sun"
 msgid "Su"
-msgstr "Søn"
+msgstr "Søndag"
 
 #. l10n: Minimal week day name
 #: js/messages.php:151
-#, fuzzy
 #| msgid "Mon"
 msgid "Mo"
 msgstr "Man"
 
 #. l10n: Minimal week day name
 #: js/messages.php:153
-#, fuzzy
 #| msgid "Tue"
 msgid "Tu"
 msgstr "Tir"
 
 #. l10n: Minimal week day name
 #: js/messages.php:155
-#, fuzzy
 #| msgid "Wed"
 msgid "We"
 msgstr "Ons"
 
 #. l10n: Minimal week day name
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Thu"
 msgid "Th"
 msgstr "Tor"
 
 #. l10n: Minimal week day name
 #: js/messages.php:159
-#, fuzzy
 #| msgid "Fri"
 msgid "Fr"
 msgstr "Fre"
 
 #. l10n: Minimal week day name
 #: js/messages.php:161
-#, fuzzy
 #| msgid "Sat"
 msgid "Sa"
 msgstr "Lør"
 
 #. l10n: Column header for week of the year in calendar
 #: js/messages.php:163
-#, fuzzy
 #| msgid "Wiki"
 msgid "Wk"
-msgstr "Wiki"
+msgstr "Uke"
 
 #: js/messages.php:165
 msgid "Hour"
-msgstr ""
+msgstr "Time"
 
 #: js/messages.php:166
-#, fuzzy
 #| msgid "in use"
 msgid "Minute"
-msgstr "i bruk"
+msgstr "Minutt"
 
 #: js/messages.php:167
-#, fuzzy
 #| msgid "per second"
 msgid "Second"
-msgstr "per sekund"
+msgstr "Sekund"
 
 #: libraries/auth/config.auth.lib.php:107
 #, php-format
@@ -959,7 +931,6 @@ msgstr ""
 "informasjonen du fikk fra MySQL-server administratoren."
 
 #: libraries/auth/cookie.auth.lib.php:39 libraries/auth/cookie.auth.lib.php:82
-#, fuzzy
 #| msgid ""
 #| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
 #| "extension. Please check your PHP configuration."
@@ -967,7 +938,8 @@ msgid ""
 "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
 "Please check your PHP configuration."
 msgstr ""
-"Kan ikke starte %s tillegget,<br />vennligst kontroller PHP-konfigurasjonen"
+"Kan ikke laste [a@http://php.net/%1@Documentation][em]%1[/em][/a] tillegget. "
+"Vennligst kontroller PHP-konfigurasjonen"
 
 #: libraries/common.inc.php:583 libraries/messages.inc.php:178
 msgid ""
@@ -985,10 +957,9 @@ msgstr ""
 "et semikolon et sted.<br />Hvis du får en blank side så er alt ok."
 
 #: libraries/common.inc.php:594
-#, fuzzy
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1"
-msgstr "Kunne ikke laste standard konfigurasjonsfil fra: \"%1$s\""
+msgstr "Kunne ikke laste standard konfigurasjon fra: %1"
 
 #: libraries/common.inc.php:599 libraries/messages.inc.php:668
 msgid ""
@@ -999,16 +970,15 @@ msgstr ""
 "konfigurasjonsfil!"
 
 #: libraries/common.inc.php:629
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Ugyldig tjenerindeks: \"%s\""
 
 #: libraries/common.inc.php:636
-#, fuzzy
 #| msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgid "Invalid hostname for server %1. Please review your configuration."
-msgstr "Ugyldig tjenernavn for tjener %1$s. Kontroller din konfigurasjon."
+msgstr "Ugyldig tjenernavn for tjener %1. Kontroller din konfigurasjon."
 
 #: libraries/common.inc.php:823 libraries/messages.inc.php:445
 msgid "Invalid authentication method set in configuration:"
@@ -1065,6 +1035,19 @@ msgstr "Rutiner"
 msgid "Return type"
 msgstr "Returtype"
 
+#: libraries/display_change_password.lib.php:66
+#| msgid "MySQL&nbsp;4.0 compatible"
+msgid "MySQL 4.0 compatible"
+msgstr "MySQL 4.0 kompatibel"
+
+#: libraries/display_change_password.lib.php:72 libraries/messages.inc.php:361
+msgid "Generate Password"
+msgstr "Generer passord"
+
+#: libraries/display_change_password.lib.php:75 libraries/messages.inc.php:360
+msgid "Generate"
+msgstr "Generer"
+
 #: libraries/display_create_database.lib.php:22
 #: libraries/display_create_database.lib.php:36 libraries/messages.inc.php:197
 msgid "Create new database"
@@ -1142,19 +1125,16 @@ msgid "None"
 msgstr "Ingen"
 
 #: libraries/display_export.lib.php:247
-#, fuzzy
 #| msgid "\"zipped\""
 msgid "zipped"
 msgstr "Komprimert (zip)"
 
 #: libraries/display_export.lib.php:253
-#, fuzzy
 #| msgid "\"gzipped\""
 msgid "gzipped"
 msgstr "Komprimert (gz)"
 
 #: libraries/display_export.lib.php:259
-#, fuzzy
 #| msgid "\"bzipped\""
 msgid "bzipped"
 msgstr "Komprimert (bz2)"
@@ -1163,20 +1143,6 @@ msgstr "Komprimert (bz2)"
 msgid "Password Hashing"
 msgstr "Passordnøkling"
 
-#: libraries/display_change_password.lib.php:66
-#, fuzzy
-#| msgid "MySQL&nbsp;4.0 compatible"
-msgid "MySQL 4.0 compatible"
-msgstr "MySQL&nbsp;4.0 kompatibel"
-
-#: libraries/display_change_password.lib.php:72 libraries/messages.inc.php:361
-msgid "Generate Password"
-msgstr "Generer passord"
-
-#: libraries/display_change_password.lib.php:75 libraries/messages.inc.php:360
-msgid "Generate"
-msgstr "Generer"
-
 #: libraries/display_import.lib.php:67 libraries/messages.inc.php:406
 msgid ""
 "The file being uploaded is probably larger than the maximum allowed size or "
@@ -6436,7 +6402,6 @@ msgid "\"zipped\""
 msgstr "Komprimert (zip)"
 
 #: libraries/tbl_properties.inc.php:393
-#, fuzzy
 #| msgid "None"
 msgctxt "for default"
 msgid "None"
@@ -6451,14 +6416,12 @@ msgid "Clear"
 msgstr "Fjern"
 
 #: navigation.php:350 navigation.php:351
-#, fuzzy
 #| msgid "Create table"
 msgctxt "short form"
 msgid "Create table"
 msgstr "Opprett tabell"
 
 #: server_databases.php:230
-#, fuzzy
 #| msgid "Go to database"
 msgid "Jump to database"
 msgstr "Gå til database"
@@ -6468,7 +6431,6 @@ msgid "Wildcards % and _ should be escaped with a \\ to use them literally"
 msgstr "Jokertegnene _ og % må beskyttes med en \\ for å bruke dem direkte"
 
 #: server_status.php:344
-#, fuzzy
 #| msgid "Reset"
 msgctxt "for Show status"
 msgid "Reset"
@@ -6495,7 +6457,6 @@ msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "Denne tjeneren er konfigurert som master i en replikasjonsprosess."
 
 #: server_status.php:366
-#, fuzzy
 #| msgid ""
 #| "This MySQL server works as %s in <b>replication</b> process. For further "
 #| "information about replication status on the server, please visit the <a "
@@ -6504,9 +6465,9 @@ msgid ""
 "For further information about replication status on the server, please visit "
 "the <a href=#replication>replication section</a>."
 msgstr ""
-"Denne MySQL tjeneren som %s i <b>replikasjon<b>sprosess. For mer informasjon "
+"For mer "
-"om replikasjonsstatusen for tjeneren, gå til <a href=\"#replication"
+"informasjon om replikasjonsstatusen for tjeneren, gå til <a "
-"\">replikasjonsseksjonen</a>."
+"href=\"#replication\">replikasjonsseksjonen</a>."
 
 #: server_synchronize.php:1117
 msgid "Enter manually"
@@ -8273,7 +8234,6 @@ msgid "ZIP"
 msgstr "ZIP"
 
 #: tbl_operations.php:634
-#, fuzzy
 #| msgid "Flush the table (\"FLUSH\")"
 msgid "Flush the table (FLUSH)"
 msgstr "Oppfrisk tabellen (\"FLUSH\")"
@@ -8287,13 +8247,12 @@ msgid "Foreign key constraint"
 msgstr "Fremmednøkkelbegrensning"
 
 #: tbl_structure.php:595
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create an index on&nbsp;%s&nbsp;columns"
 msgid "Create an index on &nbsp;%s&nbsp;columns"
 msgstr "Lag en indeks på&nbsp;%s&nbsp;kolonner"
 
 #: transformation_overview.php:48
-#, fuzzy
 #| msgid "Description"
 msgctxt "for MIME transformation"
 msgid "Description"