Adjust the new Norwegian translation for some of the easier message

changes between 7.3 and 7.4, for example quoting and function names.

src/bin/pg_controldata/po/nb.po

@@ -1,4 +1,4 @@
-# Norwegian bokmål translation of messages for PostgreSQL 7.3 (pg_controldata).
+# Norwegian bokmål translation of messages for PostgreSQL (pg_controldata).
 # Copyright (C) 2003 The PostgreSQL Global Development Group.
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
@@ -12,9 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.3\n"
+"Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2002-10-25 04:17-0400\n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2003-08-19 21:41+0200\n"
+"POT-Creation-Date: 2003-09-29 14:48+0200\n"
+"PO-Revision-Date: 2003-09-29 15:21+0200\n"
 "Last-Translator: Trond Endrestøl <trond@ramstind.gtf.ol.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -24,201 +25,207 @@ msgstr ""
 #: pg_controldata.c:28
 #, c-format
 msgid ""
-"%s displays PostgreSQL database cluster control information.\n"
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s viser kontrollinformasjon om PostgreSQL-databasehoper.\n"
 "\n"
-msgstr "%s viser kontrollinformasjon om PostgreSQL-databasehoper.\n\n"
 
-#: pg_controldata.c:29
+#: pg_controldata.c:32
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [DATADIR]\n"
+"  %s [OPTION]\n"
 "\n"
+"Options:\n"
+"  DATADIR        show cluster control information for DATADIR\n"
+"  --help         show this help, then exit\n"
+"  --version      output version information, then exit\n"
 msgstr ""
-"Bruksmåte:\n"
-"  %s [DATADIR]\n"
-"\n"
 
-#: pg_controldata.c:30
+#: pg_controldata.c:41
 msgid ""
-"If not data directory is specified, the environment variable PGDATA\n"
+"\n"
+"If no data directory is specified, the environment variable PGDATA\n"
 "is used.\n"
 "\n"
-msgstr "Dersom ingen datakatalog er angitt så blir miljøvariabelen PGDATA benyttet.\n\n"
+msgstr "\nDersom ingen datakatalog er angitt så blir miljøvariabelen PGDATA benyttet.\n\n"
 
-#: pg_controldata.c:31
+#: pg_controldata.c:42
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Rapporter bugs til <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_controldata.c:41
+#: pg_controldata.c:52
 msgid "starting up"
 msgstr "starter opp"
 
-#: pg_controldata.c:43
+#: pg_controldata.c:54
 msgid "shut down"
 msgstr "avsluttet"
 
-#: pg_controldata.c:45
+#: pg_controldata.c:56
 msgid "shutting down"
 msgstr "avslutter"
 
-#: pg_controldata.c:47
+#: pg_controldata.c:58
 msgid "in recovery"
 msgstr "i bergingsaksjon"
 
-#: pg_controldata.c:49
+#: pg_controldata.c:60
 msgid "in production"
 msgstr "i produksjon"
 
-#: pg_controldata.c:51
+#: pg_controldata.c:62
 msgid "unrecognized status code"
 msgstr "ugjenkjennelig statuskode"
 
-#: pg_controldata.c:99
+#: pg_controldata.c:107
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: ingen datakatalog angitt\n"
 
-#: pg_controldata.c:107
+#: pg_controldata.c:108
 #, c-format
-msgid "%s: could not open file \"%s\" for reading (%s)\n"
+msgid "Try \"%s --help\" for more information.\n"
-msgstr "%s: kunne ikke åpne filen «%s» for lesing (%s)\n"
+msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: pg_controldata.c:114
+#: pg_controldata.c:116
 #, c-format
-msgid "%s: could not read file \"%s\" (%s)\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: kunne ikke lese filen «%s» (%s)\n"
+msgstr "%s: kunne ikke åpne filen «%s» for lesing: %s\n"
 
-#: pg_controldata.c:128
+#: pg_controldata.c:123
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: kunne ikke lese filen «%s»: %s\n"
+
+#: pg_controldata.c:137
 msgid ""
 "WARNING: Calculated CRC checksum does not match value stored in file.\n"
 "Either the file is corrupt, or it has a different layout than this program\n"
 "is expecting.  The results below are untrustworthy.\n"
 "\n"
 msgstr ""
-"ADVARSEL: Beregnet CRC-kontrollsum passer ikke med verdien som er lagret i filen.\n"
+"ADVARSEL: Beregnet CRC-kontrollsum passer ikke med verdien som er lagret i "
+"filen.\n"
 "Enten er filen ødelagt, eller så har den en annen oppbygging enn hva dette\n"
 "programmet forventer. Resultatene nedenfor er ikke helt troverdige.\n"
 "\n"
 
-#: pg_controldata.c:141
+#: pg_controldata.c:150
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control versjonsnummer:            %u\n"
 
-#: pg_controldata.c:142
+#: pg_controldata.c:151
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalogversjonsnummer:                %u\n"
 
-#: pg_controldata.c:143
+#: pg_controldata.c:152
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "Databasens hoptilstand:               %s\n"
 
-#: pg_controldata.c:144
+#: pg_controldata.c:153
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control sist endret:               %s\n"
 
-#: pg_controldata.c:145
+#: pg_controldata.c:154
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "Nåværende loggfil-ID:                 %u\n"
 
-#: pg_controldata.c:146
+#: pg_controldata.c:155
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "Neste loggfilsegment:                 %u\n"
 
-#: pg_controldata.c:147
+#: pg_controldata.c:156
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Nyeste kontrollpunktsposisjon:        %X/%X\n"
 
-#: pg_controldata.c:149
+#: pg_controldata.c:158
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "Forrige kontrollpunktsposisjon:       %X/%X\n"
 
-#: pg_controldata.c:151
+#: pg_controldata.c:160
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "Nyeste kontrollpunkts REDO-posisjon:   %X/%X\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:162
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "Nyeste kontrollpunkts UNDO-posisjon:  %X/%X\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:164
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
 msgstr "Nyeste kontrollpunkts StartUpID:      %u\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:165
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "Nyeste kontrollpunkts NextXID:        %u\n"
 
-#: pg_controldata.c:157
+#: pg_controldata.c:166
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Nyeste kontrollpunkts NextOID:        %u\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:167
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Tidspunkt for nyeste kontrollpunkt:   %s\n"
 
-#: pg_controldata.c:159
+#: pg_controldata.c:168
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Databasens blokkstørrelse:            %u\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:169
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blokker pr segment i en stor relasjon: %u\n"
 
-#: pg_controldata.c:161
+#: pg_controldata.c:170
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maksimal lengde for identifikatorer:  %u\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:171
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Maksimalt antall funksjonsargumenter: %u\n"
 
-#: pg_controldata.c:163
+#: pg_controldata.c:172
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Dato/tid-representasjon:              %s\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:173
 msgid "64-bit integers"
 msgstr "64-bits heltall"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:173
-msgid "Floating point"
+msgid "floating-point numbers"
-msgstr "Flyttall"
+msgstr "flyttall"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:174
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "Maksimal lengde for localenavn:       %u\n"
 
-# There is currently no need to translate this string.
+#: pg_controldata.c:175
-# TE, 2003-08-19.
-#: pg_controldata.c:166
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
-msgstr ""
+msgstr "LC_COLLATE:                           %s\n"
 
-# There is currently no need to translate this string.
+#: pg_controldata.c:176
-# TE, 2003-08-19.
-#: pg_controldata.c:167
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
-msgstr ""
+msgstr "LC_CTYPE:                             %s\n"

src/bin/pg_resetxlog/po/nb.po

@@ -1,4 +1,4 @@
-# Norwegian bokmål translation of messages for PostgreSQL 7.3 (pg_resetxlog).
+# Norwegian bokmål translation of messages for PostgreSQL (pg_resetxlog).
 # Copyright (C) 2003 The PostgreSQL Global Development Group.
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
@@ -12,72 +12,75 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.3\n"
+"Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2002-10-25 04:17-0400\n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2003-08-19 23:12+0200\n"
+"POT-Creation-Date: 2003-09-29 15:49+0200\n"
+"PO-Revision-Date: 2003-09-29 15:55+0200\n"
 "Last-Translator: Trond Endrestøl <trond@ramstind.gtf.ol.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:144
+#: pg_resetxlog.c:142
 #, c-format
-msgid "%s: invalid argument for -x option\n"
+msgid "%s: invalid argument for option -x\n"
-msgstr "%s: ugyldig argument for -x-valget\n"
+msgstr "%s: ugyldig argument til valget -x\n"
 
-#: pg_resetxlog.c:145 pg_resetxlog.c:160 pg_resetxlog.c:175 pg_resetxlog.c:182
+#: pg_resetxlog.c:143 pg_resetxlog.c:158 pg_resetxlog.c:173 pg_resetxlog.c:180
-#: pg_resetxlog.c:188 pg_resetxlog.c:196
+#: pg_resetxlog.c:186 pg_resetxlog.c:194
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: pg_resetxlog.c:150
+#: pg_resetxlog.c:148
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: transaksjon-ID (-x) må ikke være 0\n"
 
-#: pg_resetxlog.c:159
+#: pg_resetxlog.c:157
 #, c-format
-msgid "%s: invalid argument for -o option\n"
+msgid "%s: invalid argument for option -o\n"
-msgstr "%s: ugyldig argument til -o-valget\n"
+msgstr "%s: ugyldig argument til valget -o\n"
 
-#: pg_resetxlog.c:165
+#: pg_resetxlog.c:163
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) må ikke være 0\n"
 
-#: pg_resetxlog.c:174 pg_resetxlog.c:181
+#: pg_resetxlog.c:172 pg_resetxlog.c:179
 #, c-format
-msgid "%s: invalid argument for -l option\n"
+msgid "%s: invalid argument for option -l\n"
-msgstr "%s: ugyldig argument til -l-valget\n"
+msgstr "%s: ugyldig argument til valget -l\n"
 
-#: pg_resetxlog.c:195
+#: pg_resetxlog.c:193
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: ingen datakatalog er oppgitt\n"
 
-#: pg_resetxlog.c:215 pg_resetxlog.c:311
+#: pg_resetxlog.c:213 pg_resetxlog.c:309
 #, c-format
-msgid "%s: could not open %s for reading: %s\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: kunne ikke åpne %s for lesing: %s\n"
+msgstr "%s: kunne ikke åpne filen «%s» for lesing: %s\n"
 
-#: pg_resetxlog.c:221
+#: pg_resetxlog.c:219
 #, c-format
 msgid ""
-"%s: lock file %s exists\n"
+"%s: lock file \"%s\" exists\n"
-"Is a server running? If not, delete the lock file and try again.\n"
+"Is a server running?  If not, delete the lock file and try again.\n"
 msgstr ""
-"%s: låsefilen %s eksisterer\n"
+"%s: låsefilen «%s» eksisterer\n"
 "Kjører en server allerede? Hvis ikke, slett låsefilen og prøv igjen.\n"
 
-#: pg_resetxlog.c:260
+#: pg_resetxlog.c:258
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
-msgstr "\nDersom disse verdiene er akseptable, bruk -f for tvungen nullstilling.\n"
+msgstr ""
+"\n"
+"Dersom disse verdiene er akseptable, bruk -f for tvungen nullstilling.\n"
 
-#: pg_resetxlog.c:272
+#: pg_resetxlog.c:270
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -87,14 +90,14 @@ msgstr ""
 "Nullstilling av transaksjonsloggen kan føre til at data går tapt.\n"
 "Dersom du likevel vil fortsette, bruk -f for tvungen nullstilling.\n"
 
-#: pg_resetxlog.c:285
+#: pg_resetxlog.c:283
 msgid "Transaction log reset\n"
 msgstr "Nullstilte transaksjonsloggen\n"
 
-#: pg_resetxlog.c:314
+#: pg_resetxlog.c:312
 #, c-format
 msgid ""
-"If you are sure the data directory path is correct, do\n"
+"If you are sure the data directory path is correct, execute\n"
 "  touch %s\n"
 "and try again.\n"
 msgstr ""
@@ -102,184 +105,190 @@ msgstr ""
 "  touch %s\n"
 "og prøv igjen.\n"
 
-#: pg_resetxlog.c:327
+#: pg_resetxlog.c:325
 #, c-format
-msgid "%s: could not read %s: %s\n"
+msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: kunne ikke lese %s: %s\n"
+msgstr "%s: kunne ikke lese filen «%s»: %s\n"
 
-#: pg_resetxlog.c:350
+#: pg_resetxlog.c:348
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
-msgstr "%s: pg_control eksisterer, men har ugyldig CRC; fortsett med forsiktighet\n"
+msgstr ""
+"%s: pg_control eksisterer, men har ugyldig CRC; fortsett med forsiktighet\n"
 
-#: pg_resetxlog.c:359
+#: pg_resetxlog.c:357
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control eksisterer, men er b0rken eller har ukjent versjon; ignorer den\n"
+msgstr ""
+"%s: pg_control eksisterer, men er b0rken eller har ukjent versjon; ignorer "
+"den\n"
 
-#: pg_resetxlog.c:410
+#: pg_resetxlog.c:408
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
 msgstr "%s: ugyldig innstilling for LC_COLLATE\n"
 
-#: pg_resetxlog.c:417
+#: pg_resetxlog.c:415
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
 msgstr "%s: ugyldig innstilling for LC_CTYPE\n"
 
-#: pg_resetxlog.c:439
+#: pg_resetxlog.c:437
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
-msgstr "Gjettede pg_control-verdier:\n\n"
+msgstr ""
+"Gjettede pg_control-verdier:\n"
+"\n"
 
-#: pg_resetxlog.c:441
+#: pg_resetxlog.c:439
 msgid ""
 "pg_control values:\n"
 "\n"
-msgstr "pg_control-verdier:\n\n"
+msgstr ""
+"pg_control-verdier:\n"
+"\n"
 
-#: pg_resetxlog.c:443
+#: pg_resetxlog.c:441
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control versjonsnummer:             %u\n"
 
-#: pg_resetxlog.c:444
+#: pg_resetxlog.c:442
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalogversjonsnummer:                 %u\n"
 
-#: pg_resetxlog.c:445
+#: pg_resetxlog.c:443
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "Nåværende loggfil-ID:                  %u\n"
 
-#: pg_resetxlog.c:446
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "Neste loggfilsegment:                  %u\n"
 
-#: pg_resetxlog.c:447
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
 msgstr "Nyeste kontrollpunkts StartUpID:       %u\n"
 
-#: pg_resetxlog.c:448
+#: pg_resetxlog.c:446
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "Nyeste kontrollpunkts NextXID:         %u\n"
 
-#: pg_resetxlog.c:449
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Nyeste kontrollpunkts NextOID:         %u\n"
 
-#: pg_resetxlog.c:450
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Databasens blokkstørrelse:             %u\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blokker pr segment i en stor relasjon: %u\n"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maksimal lengde på identifikatorer:    %u\n"
 
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Maksimalt antall funksjonsargumenter:  %u\n"
 
-#: pg_resetxlog.c:454
+#: pg_resetxlog.c:452
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Lagringstype for dato/tid:             %s\n"
 
-#: pg_resetxlog.c:455
+#: pg_resetxlog.c:453
 msgid "64-bit integers"
 msgstr "64-bits heltall"
 
-#: pg_resetxlog.c:455
+#: pg_resetxlog.c:453
-msgid "Floating point"
+msgid "floating-point numbers"
-msgstr "Flyttall"
+msgstr "flyttall"
 
-#: pg_resetxlog.c:456
+#: pg_resetxlog.c:454
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "Maksimal lengdre på localenavn:       %u\n"
 
-# There is currently no need to translate this string.
+#: pg_resetxlog.c:455
-# TE, 2003-08-19.
-#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
-msgstr ""
+msgstr "LC_COLLATE:                           %s\n"
 
-# There is currently no need to translate this string.
+#: pg_resetxlog.c:456
-# TE, 2003-08-19.
-#: pg_resetxlog.c:458
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
-msgstr ""
+msgstr "LC_CTYPE:                             %s\n"
 
-#: pg_resetxlog.c:511
+#: pg_resetxlog.c:509
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
-msgstr "%s: intern feil -- sizeof(ControlFileData) er for stor ... korriger xlog.c\n"
+msgstr ""
+"%s: intern feil -- sizeof(ControlFileData) er for stor ... korriger xlog.c\n"
 
-#: pg_resetxlog.c:524
+#: pg_resetxlog.c:522
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: kunne ikke opprette pg_control-fil: %s\n"
 
-#: pg_resetxlog.c:535
+#: pg_resetxlog.c:533
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: kunne ikke skrive pg_control-fil: %s\n"
 
-#: pg_resetxlog.c:542 pg_resetxlog.c:683
+#: pg_resetxlog.c:540 pg_resetxlog.c:681
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync-feil: %s\n"
 
-#: pg_resetxlog.c:563
+#: pg_resetxlog.c:561
 #, c-format
-msgid "%s: could not open directory %s: %s\n"
+msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: kunne ikke åpne katalogen %s: %s\n"
+msgstr "%s: kunne ikke åpne katalogen «%s»: %s\n"
 
-#: pg_resetxlog.c:577
+#: pg_resetxlog.c:575
 #, c-format
-msgid "%s: could not delete file %s: %s\n"
+msgid "%s: could not delete file \"%s\": %s\n"
-msgstr "%s: kunne ikke slette filen %s: %s\n"
+msgstr "%s: kunne ikke slette filen «%s»: %s\n"
 
-#: pg_resetxlog.c:587
+#: pg_resetxlog.c:585
 #, c-format
-msgid "%s: could not read from directory %s: %s\n"
+msgid "%s: could not read from directory \"%s\": %s\n"
-msgstr "%s: kunne ikke lese fra katalogen %s: %s\n"
+msgstr "%s: kunne ikke lese fra katalogen «%s»: %s\n"
 
-#: pg_resetxlog.c:650
+#: pg_resetxlog.c:648
 #, c-format
-msgid "%s: could not open %s: %s\n"
+msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: kunne ikke åpne %s: %s\n"
+msgstr "%s: kunne ikke åpne filen «%s»: %s\n"
 
-#: pg_resetxlog.c:661 pg_resetxlog.c:675
+#: pg_resetxlog.c:659 pg_resetxlog.c:673
 #, c-format
-msgid "%s: could not write %s: %s\n"
+msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: kunne ikke skrive %s: %s\n"
+msgstr "%s: kunne ikke skrive filen «%s»: %s\n"
 
-#: pg_resetxlog.c:694
+#: pg_resetxlog.c:692
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
 "\n"
-msgstr "%s nullstiller PostgreSQLs transaksjonslogg.\n\n"
+msgstr ""
+"%s nullstiller PostgreSQLs transaksjonslogg.\n"
+"\n"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -290,44 +299,49 @@ msgstr ""
 "  %s [VALG]... DATAKATALOG\n"
 "\n"
 
-#: pg_resetxlog.c:696
+#: pg_resetxlog.c:694
 msgid "Options:\n"
 msgstr "Valg:\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:695
 msgid "  -f              force update to be done\n"
 msgstr "  -f              tvungen nullstilling\n"
 
-#: pg_resetxlog.c:698
+#: pg_resetxlog.c:696
 msgid ""
 "  -l FILEID,SEG   force minimum WAL starting location for new transaction "
 "log\n"
-msgstr "  -l FILID,SEG    angi minste WAL-startposisjon for ny transaksjonslogg\n"
+msgstr ""
+"  -l FILID,SEG    angi minste WAL-startposisjon for ny transaksjonslogg\n"
 
-#: pg_resetxlog.c:699
+#: pg_resetxlog.c:697
 msgid ""
 "  -n              no update, just show extracted control values (for "
 "testing)\n"
-msgstr "  -n              ingen oppdatering, bare vise kontrollverdier (for testing)\n"
+msgstr ""
+"  -n              ingen oppdatering, bare vise kontrollverdier (for "
+"testing)\n"
 
-#: pg_resetxlog.c:700
+#: pg_resetxlog.c:698
 msgid "  -o OID          set next OID\n"
 msgstr "  -o OID          sette neste OID\n"
 
-#: pg_resetxlog.c:701
+#: pg_resetxlog.c:699
 msgid "  -x XID          set next transaction ID\n"
 msgstr "  -x XID          sette neste transaksjons-ID\n"
 
-#: pg_resetxlog.c:702
+#: pg_resetxlog.c:700
 msgid "  --help          show this help, then exit\n"
 msgstr "  --help          vise denne hjelpen, deretter avslutte\n"
 
-#: pg_resetxlog.c:703
+#: pg_resetxlog.c:701
 msgid "  --version       output version information, then exit\n"
 msgstr "  --version       vise programversjon, deretter avslutte\n"
 
-#: pg_resetxlog.c:704
+#: pg_resetxlog.c:702
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "\nRapporter bugs til <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Rapporter bugs til <pgsql-bugs@postgresql.org>.\n"

src/interfaces/libpq/po/nb.po

@@ -1,4 +1,4 @@
-# Norwegian bokmål translation of messages for PostgreSQL 7.3 (libpq).
+# Norwegian bokmål translation of messages for PostgreSQL (libpq).
 # Copyright (C) 2003 The PostgreSQL Global Development Group.
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
@@ -12,9 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.3\n"
+"Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2002-10-25 04:17-0400\n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2003-08-20 18:13+0200\n"
+"POT-Creation-Date: 2003-09-29 14:29+0200\n"
+"PO-Revision-Date: 2003-09-29 15:21+0200\n"
 "Last-Translator: Trond Endrestøl <trond@ramstind.gtf.ol.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -26,73 +27,81 @@ msgstr ""
 msgid "Kerberos 4 error: %s\n"
 msgstr "Kerberos-4-feil: %s\n"
 
-#: fe-auth.c:395
+#: fe-auth.c:394
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "kunne ikke stille socket i blokkerende tilstand: %s\n"
 
-#: fe-auth.c:412 fe-auth.c:416
+#: fe-auth.c:411 fe-auth.c:415
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "Kerberos-5-autentiseringskontroll ble avvist: %*s\n"
 
-#: fe-auth.c:440
+#: fe-auth.c:441
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "kunne ikke tilbakestille ikke-blokkerende tilstand for socket: %s\n"
 
-#: fe-auth.c:503
+#: fe-auth.c:509
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "autentiseringsmetoden SCM_CRED støttes ikke\n"
 
-#: fe-auth.c:589
+#: fe-auth.c:600
 msgid "Kerberos 4 authentication failed\n"
 msgstr "Mislykket Kerberos-4-autentisering\n"
 
-#: fe-auth.c:595
+#: fe-auth.c:606
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Kerberos-4-autentisering støttes ikke\n"
 
-#: fe-auth.c:606
+#: fe-auth.c:616
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Mislykket Kerberos-5-autentisering\n"
 
-#: fe-auth.c:612
+#: fe-auth.c:622
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Kerberos-5-autentisering støttes ikke\n"
 
-#: fe-auth.c:640
+#: fe-auth.c:650
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "autentiseringsmetoden %u støttes ikke\n"
 
-#: fe-auth.c:677
+#: fe-auth.c:687
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "ugyldig navn for autentiseringstjenesten «%s», ignorert\n"
 
-#: fe-auth.c:734
+#: fe-auth.c:758
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ugyldig autentiseringssystem: %d\n"
 
-#: fe-connect.c:483
+#: fe-connect.c:452
-msgid "could not determine the PostgreSQL user name to use\n"
+#, c-format
-msgstr "kan ikke avgjøre hvilket PostgreSQL-brukernavn som skal brukes\n"
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr ""
 
-#: fe-connect.c:710
+#: fe-connect.c:472
+#, c-format
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr ""
+
+#: fe-connect.c:783
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "kunne ikke sette socket til ikke-blokkerende modus: %s\n"
 
-#: fe-connect.c:734
+#: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "kunne ikke sette socket i TCP-ingen-forsinkelse-modus (TCP no delay mode): %s\n"
+msgstr ""
+"kunne ikke sette socket i TCP-ingen-forsinkelse-modus (TCP no delay mode): %"
+"s\n"
 
 # The term Unix domain socket was renamed to local domain socket some
 # years ago. TE, 2003-08-20.
-#: fe-connect.c:754
+#: fe-connect.c:841
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -103,123 +112,108 @@ msgstr ""
 "\tKjører serveren lokalt og aksepterer den forbindelser\n"
 "\tpå local domain socket «%s»?\n"
 
-#: fe-connect.c:763
+#: fe-connect.c:853
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
-"\tIs the server running on host %s and accepting\n"
+"\tIs the server running on host \"%s\" and accepting\n"
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "kunne ikke kopble til serveren: %s\n"
-"\tKjører serveren på verten %s og aksepterer den\n"
+"\tKjører serveren på verten «%s» og aksepterer den\n"
 "\tTCP/IP-oppkopplinger på porten %s?\n"
 
-#: fe-connect.c:827
+#: fe-connect.c:937
 #, c-format
-msgid "invalid host address: %s\n"
+msgid "could not translate host name \"%s\" to address: %s\n"
-msgstr "ugyldig vertsadresse: %s\n"
+msgstr ""
 
-#: fe-connect.c:846
+#: fe-connect.c:941
 #, c-format
-msgid "unknown host name: %s\n"
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
-msgstr "ukjent vertsnavn: %s\n"
+msgstr ""
 
-#: fe-connect.c:893
+#: fe-connect.c:1144
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr "ugyldig forbindelsestilstand, indikerer antakelig korrupt minne\n"
+
+#: fe-connect.c:1187
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "kan ikke opprette socket: %s\n"
 
-#: fe-connect.c:961
+#: fe-connect.c:1298
-#, c-format
-msgid "could not send SSL negotiation packet: %s\n"
-msgstr "kunne ikke sende SSL-pakke for oppkoblingsforhandling: %s\n"
-
-#: fe-connect.c:974
-#, c-format
-msgid "could not receive server response to SSL negotiation packet: %s\n"
-msgstr "kunne ikke ta imot serversvar for SSL-oppkoblingsforhandling: %s\n"
-
-#: fe-connect.c:1003
-#, c-format
-msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "tok imot ugyldig svar for SSL-oppkoblingsforhandling: %c\n"
-
-#: fe-connect.c:1012
-msgid "server does not support SSL, but SSL was required\n"
-msgstr "SSL støttes ikke av serveren, men SSL var påkrevet\n"
-
-#: fe-connect.c:1198
-msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "ugyldig forbindelsestilstand, indikerer antakelig korrupt minne\n"
-
-#: fe-connect.c:1229
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "kunne ikke hente feilstatus for socket: %s\n"
 
-#: fe-connect.c:1249
+#: fe-connect.c:1337
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "kunne ikke få tak i klientadressen fra socket: %s\n"
 
-#: fe-connect.c:1288
+#: fe-connect.c:1382
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "kunne ikke sende SSL-pakke for oppkoblingsforhandling: %s\n"
+
+#: fe-connect.c:1404 fe-connect.c:2511 fe-connect.c:2520 fe-connect.c:3087
+#: fe-lobj.c:540
+msgid "out of memory\n"
+msgstr "tomt for minne\n"
+
+#: fe-connect.c:1417
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "kan ikke sende oppstartspakke: %s\n"
 
-#: fe-connect.c:1344
+#: fe-connect.c:1457
+#, c-format
+msgid "could not receive server response to SSL negotiation packet: %s\n"
+msgstr "kunne ikke ta imot serversvar for SSL-oppkoblingsforhandling: %s\n"
+
+#: fe-connect.c:1476 fe-connect.c:1493
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "SSL støttes ikke av serveren, men SSL var påkrevet\n"
+
+#: fe-connect.c:1509
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "tok imot ugyldig svar for SSL-oppkoblingsforhandling: %c\n"
+
+#: fe-connect.c:1566 fe-connect.c:1598
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "forventet autentiseringsforespørsel fra serveren, men fikk %c\n"
 
-#: fe-connect.c:1456
+#: fe-connect.c:1834
 msgid "unexpected message from server during startup\n"
 msgstr "uventet melding fra serveren under oppstart\n"
 
-#: fe-connect.c:1515
+#: fe-connect.c:1904
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "ugyldig forbindelsetilstand %c, indikerer antakelig korrupt minne\n"
 
-#: fe-connect.c:1601
+#: fe-connect.c:2559
-#, c-format
-msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "ugyldig setenv-tilstand %c, indikerer antakelig korrupt minne\n"
-
-#: fe-connect.c:1638
-#, c-format
-msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
-msgstr "ugyldig kodingsnavn i PGCLIENTENCODING: %s\n"
-
-#: fe-connect.c:1757
-#, c-format
-msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr "ugyldig tilstand %c, indikerer antakelig korrupt minne\n"
-
-#: fe-connect.c:2385 fe-connect.c:2394 fe-connect.c:2891 fe-exec.c:1284
-#: fe-lobj.c:536
-msgid "out of memory\n"
-msgstr "tomt for minne\n"
-
-#: fe-connect.c:2433
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "manglende «=» etter «%s» i forbindelsesinfostreng\n"
 
-#: fe-connect.c:2482
+#: fe-connect.c:2608
 msgid "unterminated quoted string in connection info string\n"
 msgstr "uterminert streng i oppkoblingsinformasjon\n"
 
-#: fe-connect.c:2516
+#: fe-connect.c:2642
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "ugyldig forbindelsesvalg «%s»\n"
 
-#: fe-connect.c:2702
+#: fe-connect.c:2854
 msgid "connection pointer is NULL\n"
 msgstr "tilkoblingspeker er NULL\n"
 
-#: fe-connect.c:2912
+#: fe-connect.c:3105
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -228,181 +222,156 @@ msgstr ""
 "ADVARSEL: Passordfilen %s har leserettigheter for verden eller gruppe;\n"
 "          rettighetene skal være u=rw (0600)\n"
 
-#: fe-exec.c:737
+#: fe-exec.c:484
+msgid "NOTICE"
+msgstr "BEMERKNING"
+
+#: fe-exec.c:637 fe-exec.c:689
 msgid "command string is a null pointer\n"
 msgstr "kommandostrengen er en nullpeker\n"
 
-#: fe-exec.c:745
+#: fe-exec.c:724
+msgid "statement name is a null pointer\n"
+msgstr ""
+
+#: fe-exec.c:755
 msgid "no connection to the server\n"
 msgstr "ingen forbindelse til serveren\n"
 
-#: fe-exec.c:752
+#: fe-exec.c:762
 msgid "another command is already in progress\n"
 msgstr "en annen kommando pågår allerede\n"
 
-#: fe-exec.c:950
+#: fe-exec.c:798 fe-exec.c:1432
-#, c-format
+msgid "function requires at least protocol version 3.0\n"
-msgid "message type 0x%02x arrived from server while idle\n"
+msgstr ""
-msgstr "melding av typen 0x%02x kom fra serveren mens jeg var i hviletilstand\n"
 
-#: fe-exec.c:992
+#: fe-exec.c:1100
-#, c-format
-msgid ""
-"unexpected character %c following empty query response (\"I\" message)\n"
-msgstr "uventet tegn %c følger etter tomt spørreresultat («I»-melding)\n"
-
-#: fe-exec.c:1049
-msgid ""
-"server sent data (\"D\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr "serveren sendte data («D»-melding) uten foregående radbeskrivelse («T»-melding)\n"
-
-#: fe-exec.c:1066
-msgid ""
-"server sent binary data (\"B\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr "serveren sendte binær data («B»-melding) uten foregående radbeskrivelse («T»-melding)\n"
-
-#: fe-exec.c:1082
-#, c-format
-msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr "uventet svar fra server; det første mottatte tegnet var «%c»\n"
-
-#: fe-exec.c:1371
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "uventet asyncStatus: %d\n"
 
-#: fe-exec.c:1421
+#: fe-exec.c:1205
-msgid "COPY state must be terminated first\n"
+msgid "COPY terminated by new PQexec"
-msgstr "COPY-tilstand må avsluttes først\n"
+msgstr ""
 
-#: fe-exec.c:1780
+#: fe-exec.c:1213
+msgid "COPY IN state must be terminated first\n"
+msgstr "COPY-IN-tilstand må avsluttes først\n"
+
+#: fe-exec.c:1233
+msgid "COPY OUT state must be terminated first\n"
+msgstr "COPY-OUT-tilstand må avsluttes først\n"
+
+#: fe-exec.c:1336 fe-exec.c:1390 fe-exec.c:1474
 msgid "no COPY in progress\n"
 msgstr "ingen COPY pågår\n"
 
-#: fe-exec.c:1819
+#: fe-exec.c:1666
-msgid "lost synchronization with server, resetting connection\n"
-msgstr "mistet synkronisering med serveren, resetter forbindelsen\n"
-
-#: fe-exec.c:1884
 msgid "connection in wrong state\n"
 msgstr "forbindelse i feil tilstand\n"
 
-#: fe-exec.c:1986 fe-exec.c:2020
+#: fe-exec.c:1697
-#, c-format
-msgid "protocol error: id=0x%x\n"
-msgstr "protokollfeil: id=0x%x\n"
-
-#: fe-exec.c:2055
 msgid "invalid ExecStatusType code"
 msgstr "ugyldig ExecStatusType-kode"
 
-#: fe-exec.c:2108 fe-exec.c:2141
+#: fe-exec.c:1761 fe-exec.c:1784
 #, c-format
-msgid "column number %d is out of range 0..%d\n"
+msgid "column number %d is out of range 0..%d"
-msgstr "kolonnenummer %d er utenfor gyldig intervall 0..%d\n"
+msgstr "kolonnenummer %d er utenfor gyldig intervall 0..%d"
 
-#: fe-exec.c:2130
+#: fe-exec.c:1777
 #, c-format
-msgid "row number %d is out of range 0..%d\n"
+msgid "row number %d is out of range 0..%d"
-msgstr "radnummer %d er utenfor gyldig intervall 0..%d\n"
+msgstr "radnummer %d er utenfor gyldig intervall 0..%d"
 
-#: fe-exec.c:2325
+#: fe-exec.c:2014
 #, c-format
-msgid "could not interpret result from server: %s\n"
+msgid "could not interpret result from server: %s"
-msgstr "kunne ikke tolke svaret fra serveren: %s\n"
+msgstr "kunne ikke tolke svaret fra serveren: %s"
 
-#: fe-exec.c:2341
+#: fe-lobj.c:402 fe-lobj.c:487
-msgid "no row count available\n"
-msgstr "antal rader er ikke tilgjengelig\n"
-
-#: fe-lobj.c:400 fe-lobj.c:483
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "kan ikke åpne filen «%s»: %s\n"
 
-#: fe-lobj.c:412
+#: fe-lobj.c:414
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "kan ikke opprette stort objekt for filen «%s»\n"
 
-#: fe-lobj.c:422 fe-lobj.c:472
+#: fe-lobj.c:424 fe-lobj.c:474
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "kunne ikke åpne stort objekt %u\n"
 
-#: fe-lobj.c:437
+#: fe-lobj.c:439
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "feil ved lesing av filen «%s»\n"
 
-#: fe-lobj.c:498
+#: fe-lobj.c:502
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "feil ved skriving til filen «%s»\n"
 
-#: fe-lobj.c:564
+#: fe-lobj.c:568
 msgid "query to initialize large object functions did not return data\n"
-msgstr "spørring for å initialisere store objektfunksjoner returnerte ingen data\n"
+msgstr ""
+"spørring for å initialisere store objektfunksjoner returnerte ingen data\n"
 
-#: fe-lobj.c:602
+#: fe-lobj.c:606
 msgid "cannot determine OID of function lo_open\n"
 msgstr "kan ikke bestemme OID for funksjonen lo_open\n"
 
-#: fe-lobj.c:609
+#: fe-lobj.c:613
 msgid "cannot determine OID of function lo_close\n"
 msgstr "kan ikke bestemme OID for funksjonen lo_close\n"
 
-#: fe-lobj.c:616
+#: fe-lobj.c:620
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "kan ikke bestemme OID for funksjonen lo_create\n"
 
-#: fe-lobj.c:623
+#: fe-lobj.c:627
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "kan ikke bestemme OID for funksjonen lo_unlink\n"
 
-#: fe-lobj.c:630
+#: fe-lobj.c:634
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "kan ikke bestemme OID for funksjonen lo_lseek\n"
 
-#: fe-lobj.c:637
+#: fe-lobj.c:641
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "kan ikke bestemme OID for funksjonen lo_tell\n"
 
-#: fe-lobj.c:644
+#: fe-lobj.c:648
 msgid "cannot determine OID of function loread\n"
 msgstr "kan ikke bestemme OID for funksjonen loread\n"
 
-#: fe-lobj.c:651
+#: fe-lobj.c:655
 msgid "cannot determine OID of function lowrite\n"
 msgstr "kan ikke bestemme OID for funksjonen lowrite\n"
 
-#: fe-misc.c:303
+#: fe-misc.c:228
 #, c-format
-msgid "integer of size %lu not supported by pqGetInt\n"
+msgid "integer of size %lu not supported by pqGetInt"
-msgstr "heltall med størrelse %lu støttes ikke av pqGetInt\n"
+msgstr "heltall med størrelse %lu støttes ikke av pqGetInt"
 
-#: fe-misc.c:341
+#: fe-misc.c:264
 #, c-format
-msgid "integer of size %lu not supported by pqPutInt\n"
+msgid "integer of size %lu not supported by pqPutInt"
-msgstr "heltall med størrelse %lu støttes ikke av pqPutInt\n"
+msgstr "heltall med størrelse %lu støttes ikke av pqPutInt"
 
-#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:856
+#: fe-misc.c:544 fe-misc.c:748
-#, c-format
-msgid "select() failed: %s\n"
-msgstr "select() mislyktes: %s\n"
-
-#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:807
 msgid "connection not open\n"
 msgstr "forbindelsen er ikke åpen\n"
 
-#: fe-misc.c:515 fe-misc.c:595
+#: fe-misc.c:610 fe-misc.c:701
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "kunne ikke ta imot data fra serveren: %s\n"
 
-#: fe-misc.c:612 fe-misc.c:686
+#: fe-misc.c:718 fe-misc.c:786
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -412,114 +381,134 @@ msgstr ""
 "\tDette betyr muligens at serveren avsluttet unaturlig\n"
 "\tfør eller under behandling av forespørselen.\n"
 
-#: fe-misc.c:702
+#: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "kunne ikke sende data til serveren: %s\n"
 
-#: fe-misc.c:863
+#: fe-misc.c:905
 msgid "timeout expired\n"
 msgstr "timeout ble utløst\n"
 
-#: fe-secure.c:275 fe-secure.c:321
+#: fe-misc.c:950
+msgid "socket not open\n"
+msgstr ""
+
+#: fe-misc.c:973
 #, c-format
-msgid "SSL SYSCALL error: %s\n"
+msgid "select() failed: %s\n"
-msgstr "SSL SYSCALL-feil: %s\n"
+msgstr "select() mislyktes: %s\n"
 
-#: fe-secure.c:280 fe-secure.c:326
+#: fe-secure.c:246
-#, c-format
-msgid "SSL error: %s\n"
-msgstr "SSL-feil: %s\n"
-
-#: fe-secure.c:387
-#, c-format
-msgid "error querying socket: %s\n"
-msgstr "feil under spørring av socket: %s\n"
-
-#: fe-secure.c:400
-#, c-format
-msgid "could not get information about host (%s): %s\n"
-msgstr "kunne ikke få informasjon om verten (%s): %s\n"
-
-#: fe-secure.c:419
-msgid "unsupported protocol\n"
-msgstr "protokollen støttes ikke\n"
-
-#: fe-secure.c:441
-#, c-format
-msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
-msgstr "vertens vanlige navn «%s» løses ikke (does not resolve) til %ld.%ld.%ld.%ld\n"
-
-#: fe-secure.c:448
-#, c-format
-msgid "server common name \"%s\" does not resolve to peer address\n"
-msgstr "vertens vanlige navn «%s» løses ikke (does not resolve) til motpartens adresse\n"
-
-#: fe-secure.c:617
-msgid "could not get user information\n"
-msgstr "kunne ikke få tak i brukerinformasjon\n"
-
-#: fe-secure.c:629
-#, c-format
-msgid "could not open certificate (%s): %s\n"
-msgstr "kunne ikke åpne sertifikatet (%s): %s\n"
-
-#: fe-secure.c:636
-#, c-format
-msgid "could not read certificate (%s): %s\n"
-msgstr "kunne ikke lese sertifikatet (%s): %s\n"
-
-#: fe-secure.c:649
-#, c-format
-msgid "certificate present, but not private key (%s)\n"
-msgstr "sertifikat tilgjenglig, men ikke den private nøkkelen (%s)\n"
-
-#: fe-secure.c:658
-#, c-format
-msgid "private key (%s) has wrong permissions\n"
-msgstr "den private nøkkelen (%s) har feil rettigheter\n"
-
-#: fe-secure.c:665
-#, c-format
-msgid "could not open private key file (%s): %s\n"
-msgstr "kan ikke åpne privat nøkkelfil (%s): %s\n"
-
-#: fe-secure.c:674
-#, c-format
-msgid "private key (%s) changed during execution\n"
-msgstr "privat nøkkel (%s) endret seg under kjøring\n"
-
-#: fe-secure.c:681
-#, c-format
-msgid "could not read private key (%s): %s\n"
-msgstr "kunne ikke lese privat nøkkel (%s): %s\n"
-
-#: fe-secure.c:693
-#, c-format
-msgid "certificate/private key mismatch (%s): %s\n"
-msgstr "sertifikat/privat nøkkel stemmer ikke (%s): %s\n"
-
-#: fe-secure.c:721
-#, c-format
-msgid "could not create SSL context: %s\n"
-msgstr "kan ikke opprette SSL-sammenheng: %s\n"
-
-#: fe-secure.c:737 fe-secure.c:745
-#, c-format
-msgid "could not read root certificate list (%s): %s\n"
-msgstr "kunne ikke lese root-sertifikatlisten (%s): %s\n"
-
-#: fe-secure.c:794
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "kunne ikke etablere SSL-forbindelse: %s\n"
 
-#: fe-secure.c:812
+#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:913
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "SSL SYSCALL-feil: %s\n"
+
+#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:917
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr ""
+
+#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:923
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "SSL-feil: %s\n"
+
+#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:929
+msgid "Unknown SSL error code\n"
+msgstr ""
+
+#: fe-secure.c:459
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "feil under spørring av socket: %s\n"
+
+#: fe-secure.c:487
+#, c-format
+msgid "could not get information about host (%s): %s\n"
+msgstr "kunne ikke få informasjon om verten (%s): %s\n"
+
+#: fe-secure.c:506
+msgid "unsupported protocol\n"
+msgstr "protokollen støttes ikke\n"
+
+#: fe-secure.c:528
+#, c-format
+msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+msgstr ""
+"vertens vanlige navn «%s» løses ikke (does not resolve) til %ld.%ld.%ld.%ld\n"
+
+#: fe-secure.c:535
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr ""
+"vertens vanlige navn «%s» løses ikke (does not resolve) til motpartens "
+"adresse\n"
+
+#: fe-secure.c:718
+msgid "could not get user information\n"
+msgstr "kunne ikke få tak i brukerinformasjon\n"
+
+#: fe-secure.c:730
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "kunne ikke åpne sertifikatet (%s): %s\n"
+
+#: fe-secure.c:737
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "kunne ikke lese sertifikatet (%s): %s\n"
+
+#: fe-secure.c:750
+#, c-format
+msgid "certificate present, but not private key (%s)\n"
+msgstr "sertifikat tilgjenglig, men ikke den private nøkkelen (%s)\n"
+
+#: fe-secure.c:759
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr "den private nøkkelen (%s) har feil rettigheter\n"
+
+#: fe-secure.c:766
+#, c-format
+msgid "could not open private key file (%s): %s\n"
+msgstr "kan ikke åpne privat nøkkelfil (%s): %s\n"
+
+#: fe-secure.c:775
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr "privat nøkkel (%s) endret seg under kjøring\n"
+
+#: fe-secure.c:782
+#, c-format
+msgid "could not read private key (%s): %s\n"
+msgstr "kunne ikke lese privat nøkkel (%s): %s\n"
+
+#: fe-secure.c:794
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr "sertifikat/privat nøkkel stemmer ikke (%s): %s\n"
+
+#: fe-secure.c:827
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "kan ikke opprette SSL-sammenheng: %s\n"
+
+#: fe-secure.c:846 fe-secure.c:854
+#, c-format
+msgid "could not read root certificate list (%s): %s\n"
+msgstr "kunne ikke lese root-sertifikatlisten (%s): %s\n"
+
+#: fe-secure.c:948
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "sertifikatet kunne ikke bekreftes: %s\n"
 
-#: fe-secure.c:824
+#: fe-secure.c:960
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "sertifikatet kunne ikke hentes: %s\n"