Make merge

1 files changed, 34 insertions, 34 deletions

diff --git a/po/eo.pom b/po/eo.pom
index 621ecc89..a7c8fb23 100644
--- a/po/eo.pom
+++ b/po/eo.pom
@@ -15,9 +15,9 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:25
-#, fuzzy, c-format
+#, c-format
 msgid "Office Workstation"
-msgstr "Laborstacio"
+msgstr "Oficeja laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:27
@@ -37,9 +37,9 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:33
-#, fuzzy, c-format
+#, c-format
 msgid "Game station"
-msgstr "Dokumentaro"
+msgstr "Ludstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:34
@@ -49,9 +49,9 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:37
-#, fuzzy, c-format
+#, c-format
 msgid "Multimedia station"
-msgstr "Plurmedia - Sono"
+msgstr "Plurmediaj stacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:38
@@ -61,9 +61,9 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:43
-#, fuzzy, c-format
+#, c-format
 msgid "Internet station"
-msgstr "Interreta Konfigurado"
+msgstr "Interreta stacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:44
@@ -75,9 +75,9 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:49
-#, fuzzy, c-format
+#, c-format
 msgid "Network Computer (client)"
-msgstr "Reta Printilo (ingo)"
+msgstr "Reta computilo (kliento)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:50
@@ -95,7 +95,7 @@ msgstr "Ĉu vi deziras provi la konfiguraĵon?"
 #: share/compssUsers.pl:59
 #, c-format
 msgid "Console Tools"
-msgstr ""
+msgstr "Konsoliloj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:60
@@ -125,7 +125,7 @@ msgstr ""
 #: share/compssUsers.pl:74 share/compssUsers.pl:173
 #, c-format
 msgid "LSB"
-msgstr ""
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:75 share/compssUsers.pl:174
@@ -137,7 +137,7 @@ msgstr ""
 #: share/compssUsers.pl:85
 #, c-format
 msgid "Apache"
-msgstr ""
+msgstr "Apache"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:88
@@ -159,21 +159,21 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:93 share/compssUsers.pl:134
-#, fuzzy, c-format
+#, c-format
 msgid "Internet gateway"
-msgstr "Interreto"
+msgstr "Interreta kluzo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:96
-#, fuzzy, c-format
+#, c-format
 msgid "Mail/News"
-msgstr "/Dosiero/_Nova"
+msgstr "Poŝto/Novaĵoj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:97
-#, fuzzy, c-format
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Datumbazoj"
+msgstr "Postfix poŝta servilo, Inn novaĵaj servilo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:100
@@ -191,7 +191,7 @@ msgstr "FTP Servilo"
 #: share/compssUsers.pl:105
 #, c-format
 msgid "ProFTPd"
-msgstr ""
+msgstr "ProFTPd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:108
@@ -207,19 +207,19 @@ msgstr "Domajn-nom-servilo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:112
-#, fuzzy, c-format
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Printservilo"
+msgstr "Dosier- kaj printil-kundivida servilo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:113
-#, fuzzy, c-format
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "NIS Servilo"
+msgstr "NFS servilo, Samba servilo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:116 share/compssUsers.pl:129
-#, fuzzy, c-format
+#, c-format
 msgid "Database"
 msgstr "Datumbazoj"
 
@@ -239,13 +239,13 @@ msgstr "TTT/FTP"
 #: share/compssUsers.pl:122
 #, c-format
 msgid "Apache, Pro-ftpd"
-msgstr ""
+msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:126
-#, fuzzy, c-format
+#, c-format
 msgid "Postfix mail server"
-msgstr "Datumbazoj"
+msgstr "Postfix poŝta servilo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:130
@@ -255,9 +255,9 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:137
-#, fuzzy, c-format
+#, c-format
 msgid "Network Computer server"
-msgstr "Reta Printilo (ingo)"
+msgstr "Reta computilo (servilo)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:138
@@ -307,15 +307,15 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:179
-#, fuzzy, c-format
+#, c-format
 msgid "Utilities"
-msgstr "Filipinoj"
+msgstr "Iloj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
-#, fuzzy, c-format
+#, c-format
 msgid "SSH Server"
-msgstr "NIS Servilo"
+msgstr "SSH servilo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:186