Conflicts.

1 files changed, 28 insertions, 12 deletions

diff --git a/po/gl.po b/po/gl.po
index 38bce55c..38398dd8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initscripts\n"
-"PO-Revision-Date: 2000-01-14 18:15+0100\n"
+"PO-Revision-Date: 2000-01-17 01:06+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
@@ -550,32 +550,48 @@ msgstr "init_cache_dir %s... "
 msgid "done\n"
 msgstr "feito\n"
 
-#: ../SOURCES/am-utils.init:92
-#, fuzzy, c-format
+#: am-utils.init:27
+msgid "Starting amd: "
+msgstr "Iniciando o amd: "
+
+#: am-utils.init:36
+msgid "Shutting down amd: "
+msgstr "Parando o amd: "
+
+#: am-utils.init:92
+#, c-format
 msgid "Usage: %s {start|stop|restart|reload|condrestart|status}\n"
-msgstr "Uso: %s {start|stop|restart|reload|status}\n"
+msgstr "Uso: %s {start|stop|restart|reload|condrestart|status}\n"
+
+#: httpd.init:39
+msgid "Starting httpd: "
+msgstr "Iniciando o httpd: "
+
+#: httpd.init:70
+msgid "Reloading httpd: "
+msgstr "Recargando o httpd: "
+
+#: httpd.init:47
+msgid "Shutting down http: "
+msgstr "Parando o httpd: "
 
 #: syslog.init:31
-#, fuzzy
 msgid "Starting system logger: "
-msgstr "Iniciando %s: "
+msgstr "Iniciando o xestor dos logs do sistema: "
 
 #: syslog.init:82
-#, fuzzy
 msgid "Usage: syslog {start|stop|status|restart|condrestart}"
-msgstr "Uso: %s {start|stop|status|reload|restart|condrestart}\n"
+msgstr "Uso: syslog {start|stop|status|restart|condrestart}"
 
 #: syslog.init:39
 msgid "Starting kernel logger: "
-msgstr ""
+msgstr "Iniciando o xestor dos logs do núcleo: "
 
 #: syslog.init:49
-#, fuzzy
 msgid "Shutting down system logger: "
-msgstr "Desactivando a interface %s: "
+msgstr "Parando o xestor de logs do sistema: "
 
 #: syslog.init:46
-#, fuzzy
 msgid "Shutting down kernel logger: "
 msgstr "Desactivando o dispositivo %s: "