sync with code and merge strings from mcc & drakxtools

1 files changed, 36 insertions, 15 deletions

diff --git a/po/nb.po b/po/nb.po
index cc161c8..07d069c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-17 16:58+0100\n"
+"POT-Creation-Date: 2007-03-13 13:35+0000\n"
 "PO-Revision-Date: 2004-08-16 01:40+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -155,7 +155,13 @@ msgstr "Brukere"
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../userdrake:154
+#. -PO: do not translate, this is already translated in mcc
+#: ../userdrake:142
+#, c-format
+msgid "Users and groups"
+msgstr "Brukere og grupper"
+
+#: ../userdrake:157
 #, c-format
 msgid "User Name"
 msgstr "Brukernavn"
@@ -620,17 +626,35 @@ msgstr "Du kan ikke fjern '%s' fra deres primære gruppe"
 msgid "Close"
 msgstr "Lukk"
 
-#: ../userdrake:1025
+#: ../userdrake:1033
 #, c-format
-msgid "Authors: "
-msgstr "Forfatter: "
+msgid "Copyright (C) %s by Mandriva"
+msgstr "Copyright (C) %s ved Mandriva"
 
-#: ../userdrake:1031
-#, c-format
-msgid "Users Management \n"
+#: ../userdrake:1036
+#, fuzzy, c-format
+msgid "Users Management."
 msgstr "Brukeradministrering \n"
 
-#: ../userdrake:1037
+#: ../userdrake:1038
+#, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1044
+#, c-format
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+"Per Øyvind Karlsen <pkarlsen@mandriva.com>, 2003-2006.\n"
+"Eskild Hustvedt <eskild@mandriva.org>, 2004-2005.\n"
+"Kenneth Rørvik <kenneth@rorvik.net>, 2003-2004.\n"
+"Olav Dahlum <datamannen@gmail.com>, 2006.\n"
+"Keld Simonsen <keld@dkuug.dk>, 2004.\n"
+"Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.\n"
+"Andreas Bergstrøm <abergstr@halden.net>, 2000.\n"
+
+#: ../userdrake:1051
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Navnfelt er tomt, vennligst gi et navn"
@@ -651,6 +675,9 @@ msgstr "Navnet er for langt"
 msgid "Error"
 msgstr "Feil"
 
+#~ msgid "Authors: "
+#~ msgstr "Forfatter: "
+
 #~ msgid "Choice"
 #~ msgstr "Valg"
 
@@ -669,9 +696,6 @@ msgstr "Feil"
 #~ msgid "Warning : Deleting Group"
 #~ msgstr "Advarsel : Sletter gruppe"
 
-#~ msgid "Copyright (C) 2003 Mandriva SA"
-#~ msgstr "Copyright © 2003 Mandriva SA"
-
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Generell hjelp om userdrake"
 
@@ -825,9 +849,6 @@ msgstr "Feil"
 #~ msgid "Identity"
 #~ msgstr "Identitet"
 
-#~ msgid "In groups"
-#~ msgstr "I grupper"
-
 #~ msgid "Available groups"
 #~ msgstr "Tilgjengelige grupper"