From befd324a2ef5f487e788bc6ed6c5de0dd7a9d751 Mon Sep 17 00:00:00 2001
From: Mageia SVN-Git Migration <svn-git-migration@mageia.org>
Date: Sun, 6 Feb 2011 02:16:32 +0000
Subject: Synthesized commit during git-svn import combining previous Mandriva
 history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r433 | dmorgan | 2011-02-06 02:16:32 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned control-center
------------------------------------------------------------------------
---
 po/nn.po | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'po/nn.po')

diff --git a/po/nn.po b/po/nn.po
index 6f563485..5404a8f2 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
-"POT-Creation-Date: 2010-05-26 17:42+0200\n"
+"POT-Creation-Date: 2011-02-06 01:19+0100\n"
 "PO-Revision-Date: 2010-02-07 16:40+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,8 +89,8 @@ msgid ""
 "\"deep and broad\" kernel work (many new patches before integration in "
 "official kernel)"
 msgstr ""
-"«djupt og breitt» kjernearbeid (mange nye oppdateringar før integrering i den "
-"offisielle kjernen)"
+"«djupt og breitt» kjernearbeid (mange nye oppdateringar før integrering i "
+"den offisielle kjernen)"
 
 #: ../contributors.pl:18
 #, c-format
@@ -541,8 +542,8 @@ msgstr ""
 
 #: ../control-center:90
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr ""
 
 #: ../control-center:100 ../control-center:105
 #, c-format
@@ -1166,8 +1167,8 @@ msgstr "<karl@huftis.org>"
 msgid "Translator: "
 msgstr "Omsetjar: "
 
-#. -PO: Here, first %s will be replaced by 'Mandriva Linux'
-#. -PO: second %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
+#. -PO: Here, first %s will be replaced by 'Mageia'
+#. -PO: second %s will be replaced by the version (eg: "Mageia 1 (Free) Control Center")
 #: ../control-center:1483
 #, c-format
 msgid "%s %s (%s) Control Center"
@@ -1179,14 +1180,19 @@ msgstr "%s %s (%s) kontrollsenter"
 msgid "Copyright (C) %s Mandriva SA"
 msgstr "Copyright © %s Mandriva SA"
 
+#: ../control-center:1488
+#, fuzzy, c-format
+msgid "Copyright (C) %s Mageia"
+msgstr "Copyright © %s Mandriva SA"
+
 #: ../control-center:1494
 #, c-format
 msgid "Authors"
 msgstr "Forfattarar"
 
 #: ../control-center:1495
-#, c-format
-msgid "Mandriva Linux Contributors"
+#, fuzzy, c-format
+msgid "Mageia Contributors"
 msgstr "Mandriva Linux-bidragsytarar"
 
 #: ../drakconsole:27
@@ -1485,14 +1491,14 @@ msgid "Manage installed software packages on a group of computers"
 msgstr "Handter installerte programpakkar på ei gruppe av maskiner"
 
 #: ../lib/MDV/Control_Center.pm:349
-#, c-format
-msgid "Configure authentication for Mandriva tools"
+#, fuzzy, c-format
+msgid "Configure authentication for Mageia tools"
 msgstr "Set opp autentisering for Mandriva-verktøya"
 
 #: ../lib/MDV/Control_Center.pm:350
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Define authentication required to access individual Mandriva configuration "
+"Define authentication required to access individual Mageia configuration "
 "tools "
 msgstr ""
 "Definer kva autentisering som er nødvendig for dei ulike oppsettverktøya i "
@@ -1932,6 +1938,9 @@ msgstr "Skjermoppløysing"
 msgid "Configure Your Computer"
 msgstr "Set opp maskina"
 
+#~ msgid "Mandriva Linux"
+#~ msgstr "Mandriva Linux"
+
 #~ msgid "Set up security level and audit"
 #~ msgstr "Set opp tryggleiksnivå og systemkontrollar"
 
-- 
cgit v1.2.1