Conflicts.

1 files changed, 141 insertions, 106 deletions

diff --git a/po/da.po b/po/da.po
index 628143ba..9e96be61 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,141 +1,142 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n"
-"Last-Translator: \n"
-"Language-Team: <XX@li.org>\n"
+"Project-Id-Version: initscripts\n"
+"POT-Creation-Date: 2000-12-17 20:35-0500\n"
+"PO-Revision-Date: 2001-01-06 16:30+01:00\n"
+"Last-Translator: Kenneth <kenneth@gnu.org>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../rc.d/init.d/network:166
 #, c-format
 msgid "Adding internal IPX network %s %s: "
-msgstr ""
+msgstr "Tilføjer internt IPX-netværk %s %s:"
 
 #: ../rc.d/init.d/halt:80
 msgid "Unmounting file systems: "
-msgstr ""
+msgstr "Afmonterer filsystem: "
 
 #: ../rc.d/init.d/halt:69
 msgid "Turning off quotas: "
-msgstr ""
+msgstr "Nedlægger diskkvoter"
 
 #: ../rc.d/rc.sysinit:431
 msgid "*** An error occurred during the RAID startup\n"
-msgstr ""
+msgstr "*** Der skete en fejl under opstarten af RAID-systemet\n"
 
 #: ../rc.d/init.d/network:160
 #, c-format
 msgid "Bringing up route %s: "
-msgstr ""
+msgstr "Bringer ruten %s i drift: "
 
 #: ../rc.d/init.d/network:48
 #, c-format
 msgid "Bringing up interface %s: "
-msgstr ""
+msgstr "Bringer grænsefladen %s i drift: "
 
 #: ../rc.d/init.d/netfs:38 ../rc.d/init.d/netfs:40 ../rc.d/init.d/netfs:41
 #, c-format
 msgid "Mounting %s filesystems: "
-msgstr ""
+msgstr "Monterer %2 filsystemer: "
 
 #: ../rc.d/rc.sysinit:167
 msgid "Initializing USB HID interface: "
-msgstr ""
+msgstr "Initialiserer USA HID-grænseflade: "
 
 #: ../rc.d/init.d/single:29
 #, c-format
 msgid "Sending all processes the %s signal..\n"
-msgstr ""
+msgstr "Sender signalet %s til alle processer...\n"
 
 #: ../sysconfig/network-scripts/ifup-sl:33
 #, c-format
 msgid "%s does not exist or is not executable\n"
-msgstr ""
+msgstr "%s eksisterer ikke eller er ej eksikverbar\n"
 
 #: ../sysconfig/network-scripts/ifup-ppp:58
 #, c-format
 msgid "/etc/sysconfig/network-scripts/chat-%s does not exist for %s"
-msgstr ""
+msgstr "/etc/sysconfig/network-scripts/chat-%s eksisterer ikke for %s"
 
 #: ../rc.d/init.d/functions:291
 #, c-format
 msgid "%s dead but subsys locked\n"
-msgstr ""
+msgstr "%s er død med undersystemet er låst\n"
 
 #: ../rc.d/rc.sysinit:489
 msgid "Checking filesystem quotas: "
-msgstr ""
+msgstr "Kontrollerer kvoter for filsystem: "
 
 #: ../rc.d/init.d/network:165 ../rc.d/init.d/network:174
 msgid "Deleting internal IPX network: "
-msgstr ""
+msgstr "Borttager internt IPX-netværk: "
 
 #: ../rc.d/init.d/halt:57
 msgid "Saving mixer settings"
-msgstr ""
+msgstr "Gemmer indstillinger af mixer"
 
 #: ../rc.d/init.d/network:46
 msgid "Setting network parameters: "
-msgstr ""
+msgstr "Sætter netværksparameterer: "
 
 #: ../sysconfig/network-scripts/ifdown:12
 #: ../sysconfig/network-scripts/ifdown:18
 #, c-format
 msgid "usage: %s <device name>\n"
-msgstr ""
+msgstr "brug: %s <enhedsnavn>\n"
 
 #: ../rc.d/init.d/rawdevices:33 ../rc.d/init.d/rawdevices:40
 msgid "  If the command 'raw' still refers to /dev/raw as a file.\n"
-msgstr ""
+msgstr "  Hvis kommandoen 'raw' stadig refererer til /dev/raw som en fil.\n"
 
 #: ../rc.d/init.d/netfs:43
 msgid "Mounting other filesystems: "
-msgstr ""
+msgstr "Monterer andre filsystemer: "
 
 #: ../rc.d/init.d/rawdevices:68
 msgid "You need to be root to use this command!\n"
-msgstr ""
+msgstr "Du skal være 'root' for at bruge denne kommando!\n"
 
 #: ../rc.d/rc.sysinit:522
 msgid "Turning on user and group quotas for local filesystems: "
-msgstr ""
+msgstr "Aktiverer bruger- og gruppekvoter for lokale filsystemer: "
 
 #: ../sysconfig/network-scripts/ifup-ppp:48
 #, c-format
 msgid "ifup-ppp for %s exiting\n"
-msgstr ""
+msgstr "ifup-ppp før %s afslutter\n"
 
 #: ../rc.d/init.d/functions:294
 #, c-format
 msgid "%s is stopped\n"
-msgstr ""
+msgstr "%s er stoppet\n"
 
 #: ../rc.d/init.d/halt:65
 msgid "Turning off swap: "
-msgstr ""
+msgstr "Nedlægger swap: "
 
 #: ../rc.d/init.d/rawdevices:32 ../rc.d/init.d/rawdevices:39
 msgid "     rawdevices are now located in the directory /dev/raw/\n"
-msgstr ""
+msgstr "     råenheder er nu placeret i kataloget /dev/raw/\n"
 
 #: ../rc.d/init.d/network:129
 msgid "Devices that are down:\n"
-msgstr ""
+msgstr "Enheder som er nede:\n"
 
 #: ../rc.d/init.d/halt:78
 msgid "Unmounting file systems (retry): "
-msgstr ""
+msgstr "Afmonterer filsystemer (nyt forsøg): "
 
 #: ../rc.d/rc.sysinit:149
 #, c-format
 msgid "Setting hostname %s: "
-msgstr ""
+msgstr "Sætter værtsnavn %s: "
 
 #: ../rc.d/init.d/network:131
 msgid "Devices with modified configuration:\n"
-msgstr ""
+msgstr "Enheder med ændret konfiguration:\n"
 
 #: ../rc.d/init.d/single:26
 #, c-format
@@ -144,21 +145,21 @@ msgstr ""
 
 #: ../rc.d/init.d/functions:324
 msgid "PASSED"
-msgstr ""
+msgstr "BESTÅET"
 
 #: ../sysconfig/network-scripts/ifup:77
 #, c-format
 msgid "Delaying %s initialization.\n"
-msgstr ""
+msgstr "Udskyder %s initialisering.\n"
 
 #: ../sysconfig/network-scripts/ifup:118
 msgid " failed.\n"
-msgstr ""
+msgstr " fejlet.\n"
 
 #: ../rc.d/init.d/halt:39
 #, c-format
 msgid "%s: call me as 'halt' or 'reboot' please!"
-msgstr ""
+msgstr "%s: kald mig venligst som 'halt' eller 'reboot' tak!"
 
 #: ../rc.d/rc.sysinit:123
 #, c-format
@@ -171,11 +172,11 @@ msgstr ""
 
 #: ../rc.d/init.d/halt:67
 msgid "Turning off accounting: "
-msgstr ""
+msgstr "Nedlægger bogføring: "
 
 #: ../rc.d/rc.sysinit:225 ../rc.d/rc.sysinit:470
 msgid "(Repair filesystem) # "
-msgstr ""
+msgstr "(Reparerer filsystem) # "
 
 #: ../rc.d/init.d/random:26
 msgid "Initializing random number generator: "
@@ -184,7 +185,7 @@ msgstr ""
 #: ../rc.d/init.d/functions:399
 #, c-format
 msgid "Start service %s (Y)es/(N)o/(C)ontinue? [Y] "
-msgstr ""
+msgstr "Start tjeneste %s (J)a/(N)ej/(F)ortsæt [J] "
 
 #: ../rc.d/init.d/random:46
 msgid "The random data source is missing\n"
@@ -192,15 +193,15 @@ msgstr ""
 
 #: ../rc.d/init.d/halt:31
 msgid "The system is halted"
-msgstr ""
+msgstr "Systemet er lukket ned"
 
 #: ../rc.d/rc.sysinit:146
 msgid "Activating swap partitions: "
-msgstr ""
+msgstr "Aktiverer swappartitioner: "
 
 #: ../sysconfig/network-scripts/ifup:14 ../sysconfig/network-scripts/ifup:20
 msgid "usage: ifup <device name>\n"
-msgstr ""
+msgstr "brug: ifup <enhedsnavn>\n"
 
 #: ../rc.d/rc.sysinit:222 ../rc.d/rc.sysinit:432 ../rc.d/rc.sysinit:467
 msgid "*** Dropping you to a shell; the system will reboot\n"
@@ -208,15 +209,15 @@ msgstr ""
 
 #: ../rc.d/init.d/halt:61
 msgid "Syncing hardware clock to system time"
-msgstr ""
+msgstr "Synkroniserer maskinur til systemtid"
 
 #: ../rc.d/rc.sysinit:391
 msgid "Starting up RAID devices: "
-msgstr ""
+msgstr "Starter RAID-enheder: "
 
 #: ../rc.d/init.d/functions:270
 msgid "Usage: status {program}\n"
-msgstr ""
+msgstr "Brug: status {program}\n"
 
 #: ../rc.d/init.d/network:97
 #, c-format
@@ -233,46 +234,46 @@ msgstr ""
 
 #: ../rc.d/rc.sysinit:258
 msgid "Remounting root filesystem in read-write mode: "
-msgstr ""
+msgstr "Genmonterer root-filsystem i læse/skrive-tilstand: "
 
 #: ../rc.d/rc.sysinit:173
 msgid "Initializing USB mouse: "
-msgstr ""
+msgstr "Initialiserer USB-mus: "
 
 #: ../sysconfig/network-scripts/ifup-ppp:47
 msgid "/usr/sbin/pppd does not exist or is not executable\n"
-msgstr ""
+msgstr "/usr/sbin/pppd eksisterer ikke eller er ej eksekverbar\n"
 
 #: ../rc.d/init.d/rawdevices:77
 msgid "Usage: rawdevice {start|stop|status|restart}\n"
-msgstr ""
+msgstr "Brug: rawdevice {start|stop|status|restart}\n"
 
 #: ../rc.d/init.d/netfs:55 ../rc.d/init.d/netfs:66 ../rc.d/init.d/netfs:67
 #, c-format
 msgid "Unmounting %s filesystems: "
-msgstr ""
+msgstr "Afmonterer %s filsystemer: "
 
 #: ../rc.d/rc.sysinit:371
 msgid "Loading mixer settings: "
-msgstr ""
+msgstr "Indlæser indstillinger for mixer: "
 
 #: ../rc.d/init.d/functions:401
 msgid "nN"
-msgstr ""
+msgstr "nN"
 
 #: ../sysconfig/network-scripts/ifup-sl:45
 #, c-format
 msgid "%s does not exist\n"
-msgstr ""
+msgstr "%s eksisterer ikke\n"
 
 #: ../rc.d/init.d/single:56
 msgid "Telling INIT to go to single user mode.\n"
-msgstr ""
+msgstr "Fortæller INIT at gå til enbrugertilstand.\n"
 
 #: ../rc.d/init.d/random:56
 #, c-format
 msgid "Usage: %s {start|stop|status|restart|reload}\n"
-msgstr ""
+msgstr "Brug: %s {start|stop|status|restart|reload}\n"
 
 #: ../rc.d/init.d/netfs:73 ../rc.d/init.d/netfs:77 ../rc.d/init.d/netfs:81
 #, c-format
@@ -281,11 +282,11 @@ msgstr ""
 
 #: ../sysconfig/network-scripts/ifdown:28 ../sysconfig/network-scripts/ifup:30
 msgid "Users cannot control this device.\n"
-msgstr ""
+msgstr "Brugere kan ikke styre denne enhed.\n"
 
 #: ../rc.d/rc.sysinit:473
 msgid "Unmounting file systems"
-msgstr ""
+msgstr "Afmonterer filsystemer"
 
 #: ../sysconfig/network-scripts/ifup:86
 #, c-format
@@ -294,43 +295,43 @@ msgstr ""
 
 #: ../rc.d/init.d/functions:313
 msgid "FAILED"
-msgstr ""
+msgstr "FEJLET"
 
 #: ../rc.d/init.d/halt:35
 msgid "Please stand by while rebooting the system..."
-msgstr ""
+msgstr "Vent venligst mens systemet genstartes..."
 
 #: ../rc.d/rc.sysinit:319
 msgid "Checking root filesystem quotas: "
-msgstr ""
+msgstr "Kontrollerer root-filsystemskvoter: "
 
 #: ../rc.d/init.d/netfs:53
 #, c-format
 msgid "Unmounting %s filesystems (retry): "
-msgstr ""
+msgstr "AFmonterer %s filsystemer (nyt forsøg): "
 
 #: ../rc.d/init.d/rawdevices:55
 msgid "Assigning devices: "
-msgstr ""
+msgstr "Tildeler enheder: "
 
 #: ../rc.d/init.d/functions:302
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: ../sysconfig/network-scripts/ifup-aliases:65
 #: ../sysconfig/network-scripts/ifup-routes:9
 #, c-format
 msgid "usage: %s <net-device>\n"
-msgstr ""
+msgstr "brug: %s <netenhed>\n"
 
 #: ../rc.d/rc.sysinit:435
 msgid "(RAID Repair) # "
-msgstr ""
+msgstr "(RAID-reparering) # "
 
 #: ../rc.d/init.d/halt:49
 #, c-format
 msgid "Sending all processes the %s signal.."
-msgstr ""
+msgstr "Sender %s-signalet til alle processer..."
 
 #: ../rc.d/init.d/rawdevices:31 ../rc.d/init.d/rawdevices:38
 msgid "  Please correct your /etc/sysconfig/rawdevices:\n"
@@ -338,11 +339,11 @@ msgstr ""
 
 #: ../rc.d/rc.sysinit:170
 msgid "Initializing USB keyboard: "
-msgstr ""
+msgstr "Initialiserer USA-tastatur: "
 
 #: ../sysconfig/network-scripts/ifup:114 ../sysconfig/network-scripts/ifup:116
 msgid " done.\n"
-msgstr ""
+msgstr " færdig.\n"
 
 #: ../rc.d/rc.sysinit:251
 msgid "Skipping ISA PNP configuration at users request: "
@@ -351,7 +352,7 @@ msgstr ""
 #: ../rc.d/rc.sysinit:140
 #, c-format
 msgid "Setting default font (%s): "
-msgstr ""
+msgstr "Sætter standardskrifttype (%s): "
 
 #: ../rc.d/init.d/network:147 ../rc.d/init.d/network:154
 #, c-format
@@ -392,7 +393,7 @@ msgstr ""
 
 #: ../rc.d/rc.sysinit:203
 msgid "Checking root filesystem"
-msgstr ""
+msgstr "Undersøger root-filsystem"
 
 #: ../rc.d/init.d/network:134
 msgid "Currently active devices:\n"
@@ -405,24 +406,24 @@ msgstr ""
 #: ../rc.d/init.d/netfs:108
 #, c-format
 msgid "Usage: %s {start|stop|restart|reload|status}\n"
-msgstr ""
+msgstr "Brug: %s {start|stop|restart|reload|status}\n"
 
 #: ../rc.d/rc.sysinit:43
 msgid "\t\tPress 'I' to enter interactive startup.\n"
-msgstr ""
+msgstr "\t\rTryk 'I' for interaktiv opstart.\n"
 
 #: ../rc.d/rc.sysinit:103
 #, c-format
 msgid "Setting clock %s: %s"
-msgstr ""
+msgstr "Stiller ur %s: %s"
 
 #: ../rc.d/init.d/functions:400
 msgid "yY"
-msgstr ""
+msgstr "jJ"
 
 #: ../rc.d/init.d/functions:172
 msgid "Usage: killproc {program} [signal]\n"
-msgstr ""
+msgstr "Brug: killproc {program} [signal]\n"
 
 #: ../sysconfig/network-scripts/ifup-ppp:50
 #, c-format
@@ -430,33 +431,33 @@ msgid "/usr/sbin/pppd does not exist or is not executable for %s\n"
 msgstr ""
 
 #: ../rc.d/init.d/network:157
-#, c-format
+#, fuzzy, c-format
 msgid "Bringing up alias %s: "
-msgstr ""
+msgstr "Bringer grænsefladen %s i drift: "
 
 #: ../rc.d/rc.sysinit:486
 msgid "Mounting local filesystems: "
-msgstr ""
+msgstr "Monterer lokale filsystemer: "
 
 #: ../rc.d/init.d/functions:402
 msgid "cC"
-msgstr ""
+msgstr "fF"
 
 #: ../rc.d/rc.sysinit:228 ../rc.d/rc.sysinit:438
 msgid "Unmounting file systems\n"
-msgstr ""
+msgstr "Afmonterer filsystemer\n"
 
 #: ../rc.d/init.d/network:124
 msgid "Configured devices:\n"
-msgstr ""
+msgstr "Kofigurerer enheder:\n"
 
 #: ../rc.d/rc.sysinit:37
 msgid "\t\t\tWelcome to "
-msgstr ""
+msgstr "\t\t\tVelkommen til "
 
 #: ../rc.d/rc.sysinit:350 ../rc.d/rc.sysinit:352
 msgid "Finding module dependencies: "
-msgstr ""
+msgstr "Finder modulafhængigheder: "
 
 #: ../sysconfig/network-scripts/ifup:111
 #, c-format
@@ -465,37 +466,37 @@ msgstr ""
 
 #: ../rc.d/rc.sysinit:52
 msgid "Mounting proc filesystem: "
-msgstr ""
+msgstr "Monterer proc-filsystem: "
 
 #: ../rc.d/init.d/network:200
 #, c-format
 msgid "Usage: %s {start|stop|restart|reload|status|probe}\n"
-msgstr ""
+msgstr "Brug: %s {start|stop|restart|reload|status|probe}\n"
 
 #: ../rc.d/rc.sysinit:125
 msgid "Loading default keymap: "
-msgstr ""
+msgstr "Indlæser standard-tastatursæt: "
 
 #: ../rc.d/rc.sysinit:163
 msgid "Mounting USB filesystem: "
-msgstr ""
+msgstr "Monterer USA-filsystemer: "
 
 #: ../rc.d/init.d/network:150 ../rc.d/init.d/network:153
 #, c-format
 msgid "Shutting down device %s: "
-msgstr ""
+msgstr "Nedlægger enheden %s: "
 
 #: ../rc.d/init.d/random:37
 msgid "Saving random seed: "
-msgstr ""
+msgstr "Gemmer slumpfrø"
 
 #: ../rc.d/rc.sysinit:128
 msgid "Loading default keymap"
-msgstr ""
+msgstr "Indlæser standard-tastatursæt"
 
 #: ../rc.d/rc.sysinit:449
 msgid "Checking filesystems"
-msgstr ""
+msgstr "Undersøger filsystemer"
 
 #: ../rc.d/init.d/halt:106
 msgid "On the next boot fsck will be forced.\n"
@@ -508,7 +509,7 @@ msgstr ""
 
 #: ../rc.d/rc.sysinit:56
 msgid "Configuring kernel parameters: "
-msgstr ""
+msgstr "Konfigurerer kerne-parametre: "
 
 #: ../rc.d/rc.sysinit:221 ../rc.d/rc.sysinit:466
 msgid "*** An error occurred during the file system check.\n"
@@ -529,51 +530,84 @@ msgstr ""
 
 #: ../rc.d/init.d/halt:99
 msgid "Unmounting proc file system: "
-msgstr ""
+msgstr "Afmonterer proc-filsystem: "
 
 #: squid.init:62
 #, c-format
 msgid "Stopping %s: "
-msgstr ""
+msgstr "Stopper %s: "
 
 #: squid.init:130
 #, c-format
 msgid "Usage: %s {start|stop|status|reload|restart|condrestart}\n"
-msgstr ""
+msgstr "Brug: %s {start|stop|status|reload|restart|condrestart}\n"
 
 #: squid.init:50
 #, c-format
 msgid "init_cache_dir %s... "
-msgstr ""
+msgstr "init_cache_dir %s... "
+
+#: squid.init:47
+#, c-format
+msgid "Starting %s: "
+msgstr "Starter %s: "
 
 #: squid.init:71
 msgid "done\n"
-msgstr ""
+msgstr "færdig\n"
 
-#: ../SOURCES/am-utils.init:92
-#, c-format
+#: am-utils.init:27
+#, fuzzy
+msgid "Starting amd: "
+msgstr "Starter %s: "
+
+#: am-utils.init:36
+#, fuzzy
+msgid "Shutting down amd: "
+msgstr "Nedlægger enheden %s: "
+
+#: am-utils.init:92
+#, fuzzy, c-format
 msgid "Usage: %s {start|stop|restart|reload|condrestart|status}\n"
+msgstr "Brug: %s {start|stop|restart|reload|status}\n"
+
+#: httpd.init:39
+#, fuzzy
+msgid "Starting httpd: "
+msgstr "Starter %s: "
+
+#: httpd.init:70
+msgid "Reloading httpd: "
 msgstr ""
 
+#: httpd.init:47
+#, fuzzy
+msgid "Shutting down http: "
+msgstr "Nedlægger enheden %s: "
+
 #: syslog.init:31
+#, fuzzy
 msgid "Starting system logger: "
-msgstr ""
+msgstr "Starter %s: "
 
 #: syslog.init:82
+#, fuzzy
 msgid "Usage: syslog {start|stop|status|restart|condrestart}"
-msgstr ""
+msgstr "Brug: %s {start|stop|status|reload|restart|condrestart}\n"
 
 #: syslog.init:39
 msgid "Starting kernel logger: "
 msgstr ""
 
 #: syslog.init:49
+#, fuzzy
 msgid "Shutting down system logger: "
-msgstr ""
+msgstr "Nedlægger enheden %s: "
 
 #: syslog.init:46
+#, fuzzy
 msgid "Shutting down kernel logger: "
-msgstr ""
+msgstr "Nedlægger enheden %s: "
 
 #: am-utils.init:36 httpd.init:47 ldap.init:60 ldap.init:66
 #, c-format
@@ -672,3 +706,4 @@ msgstr ""
 #, c-format
 msgid " module directory %s not found.\n"
 msgstr ""
+>>>>>>> 1.3