IPFire-SCM February 2015

ipfire-scm@lists.ipfire.org

1 participants
46 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 60620d3d4385628f9c5c7725d042b742940bbb28
by git＠ipfire.org 03 Feb '15

03 Feb '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 60620d3d4385628f9c5c7725d042b742940bbb28 (commit) via 2c9c92f4651fccdb18daa4da8adef5d1d4d9a716 (commit) via 8516edcc485a986f8be6b4483f7993456a5e75af (commit) via 8451f21315e9ccb4ffe2060c871b9eafa0823004 (commit) from db2e0a5baecda01fe22a7bb17010dcb1a73b372b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 60620d3d4385628f9c5c7725d042b742940bbb28 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Feb 3 12:19:51 2015 +0100 BUG10730: delete creation of ovpnserver.log from lfs file commit 2c9c92f4651fccdb18daa4da8adef5d1d4d9a716 Merge: 8516edc db2e0a5 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Feb 3 07:27:03 2015 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into BUG10730 commit 8516edcc485a986f8be6b4483f7993456a5e75af Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Feb 3 07:26:34 2015 +0100 BUG10730: fix permissions of ovpnserver.log commit 8451f21315e9ccb4ffe2060c871b9eafa0823004 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Jan 28 09:41:52 2015 +0100 BUG10730: Change permission of /var/run/ovpnserver.log ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/sysklogd | 1 - lfs/openvpn | 2 -- lfs/sysklogd | 6 +++--- src/misc-progs/openvpnctrl.c | 4 ++++ 4 files changed, 7 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/common/sysklogd b/config/rootfiles/common/sysklogd index 14320a6..9792097 100644 --- a/config/rootfiles/common/sysklogd +++ b/config/rootfiles/common/sysklogd @@ -4,4 +4,3 @@ usr/sbin/syslogd #usr/share/man/man8/sysklogd.8 var/log/dhcpcd.log var/log/messages -var/log/ovpnserver.log diff --git a/lfs/openvpn b/lfs/openvpn index 487b6ca..a19ac1f 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -93,8 +93,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod 700 /var/ipfire/ovpn/ovpn-leases.db chown -R root:root /var/ipfire/ovpn/scripts chown -R nobody:nobody /var/ipfire/ovpn - chown root.nobody /var/log/ovpnserver.log - chmod 660 /var/log/ovpnserver.log chmod 700 /var/ipfire/ovpn/certs mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify chown root:root /usr/lib/openvpn/verify diff --git a/lfs/sysklogd b/lfs/sysklogd index 9c9dd0d..ca6110a 100644 --- a/lfs/sysklogd +++ b/lfs/sysklogd @@ -75,8 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - touch /var/log/{dhcpcd.log,messages,ovpnserver.log} - chmod 664 /var/log/{dhcpcd.log,messages,ovpnserver.log} - chown 0:105 /var/log/{dhcpcd.log,messages,ovpnserver.log} + touch /var/log/{dhcpcd.log,messages} + chmod 664 /var/log/{dhcpcd.log,messages} + chown 0:105 /var/log/{dhcpcd.log,messages} @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index da5ee23..d20cced 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -469,6 +469,10 @@ void startDaemon(void) { executeCommand(command); snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config /var/ipfire/ovpn/server.conf"); executeCommand(command); + snprintf(command, STRING_SIZE-1, "/bin/chown root.nobody /var/run/ovpnserver.log"); + executeCommand(command); + snprintf(command, STRING_SIZE-1, "/bin/chmod 644 /var/run/ovpnserver.log"); + executeCommand(command); } } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. db2e0a5baecda01fe22a7bb17010dcb1a73b372b
by git＠ipfire.org 02 Feb '15

02 Feb '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via db2e0a5baecda01fe22a7bb17010dcb1a73b372b (commit) via 2056dd3033ff6fb5a3ac709c63e7c9696741f2a1 (commit) via 44526b2debe4fdc27f5385d579abc5895eb7211e (commit) from 32e321b248ae4501ad17d7edc50bb23aaa4b5c6e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit db2e0a5baecda01fe22a7bb17010dcb1a73b372b Merge: 32e321b 2056dd3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 2 23:56:18 2015 +0100 Merge remote-tracking branch 'amarx/collectd4' into next commit 2056dd3033ff6fb5a3ac709c63e7c9696741f2a1 Author: Alexander Marx <amarx(a)ipfire.org> Date: Fri Sep 26 12:45:47 2014 +0200 collectd: added 22 patches from Michael commit 44526b2debe4fdc27f5385d579abc5895eb7211e Author: Alexander Marx <amarx(a)ipfire.org> Date: Wed Sep 17 11:58:36 2014 +0200 collectd-4.10.7: Fix openvpn.c to be useable with IPFire ----------------------------------------------------------------------- Summary of changes: lfs/collectd | 26 +++- .../0001-src-utils_mount.h-Add-stdio.h.patch | 28 ++++ ...y-continuously-when-MySQL-slave-SQL-threa.patch | 27 ++++ ...avoid-using-uninitalized-variable-in-erro.patch | 34 +++++ .../0004-interface.c-FreeBSD-10-support.patch | 52 +++++++ ..._xml.c-avoid-using-uninitalized-variable-.patch | 40 ++++++ ..._thread_cbs-so-we-initialize-the-right-th.patch | 28 ++++ ...in-Call-curl_global_init-from-the-init-fu.patch | 40 ++++++ ...k-comment-libgcrypt-initalization-process.patch | 33 +++++ ...lobal_init-in-_init-of-plugins-using-curl.patch | 99 +++++++++++++ ...nit-to-be-consistent-with-the-rest-of-the.patch | 32 +++++ ...r-when-we-alocate-an-empty-list-we-also-n.patch | 41 ++++++ .../0012-don-t-assume-pkg-config-is-in-PATH.patch | 86 +++++++++++ ...d-missing-backticks-which-broke-the-build.patch | 40 ++++++ ...nmp_pdu-struct-allocated-by-snmp_pdu_crea.patch | 29 ++++ ...ugin-Fixed-tautological-pointer-compariso.patch | 28 ++++ ...dd-support-for-OpenVPN-2.3.0-status-files.patch | 160 +++++++++++++++++++++ ...gin-Don-t-signal-an-error-when-no-clients.patch | 56 ++++++++ ...openvpn-Remove-boguous-file-handler-check.patch | 26 ++++ ...-Ignore-not-fully-established-connections.patch | 59 ++++++++ ...e-read-functions-robust-like-in-8516f9abb.patch | 102 +++++++++++++ .../0021-openvpn-Fix-copy-and-paste-error.patch | 25 ++++ ...n-Change-data-type-from-COUNTER-to-DERIVE.patch | 107 ++++++++++++++ 23 files changed, 1196 insertions(+), 2 deletions(-) create mode 100644 src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch create mode 100644 src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch create mode 100644 src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch create mode 100644 src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch create mode 100644 src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch create mode 100644 src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch create mode 100644 src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch create mode 100644 src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch create mode 100644 src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch create mode 100644 src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch create mode 100644 src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch create mode 100644 src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch create mode 100644 src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch create mode 100644 src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch create mode 100644 src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch create mode 100644 src/patches/collectd/0016-Add-support-for-OpenVPN-2.3.0-status-files.patch create mode 100644 src/patches/collectd/0017-openvpn-plugin-Don-t-signal-an-error-when-no-clients.patch create mode 100644 src/patches/collectd/0018-openvpn-Remove-boguous-file-handler-check.patch create mode 100644 src/patches/collectd/0019-openvpn-Ignore-not-fully-established-connections.patch create mode 100644 src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch create mode 100644 src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch create mode 100644 src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch Difference in files: diff --git a/lfs/collectd b/lfs/collectd index d4ea661..f01c92a 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -25,7 +25,7 @@ include Config PKG_NAME = collectd -VER = 4.10.7 +VER = 4.10.9 THISAPP = collectd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f4193fdb5002ddac8159c88032a726bc +$(DL_FILE)_MD5 = 980dd3387508f9ad209df04a6f7a126c install : $(TARGET) @@ -79,6 +79,28 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0016-Add-support-for-OpenVPN-2.3.0-status-files.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0017-openvpn-plugin-Don-t-signal-an-error-when-no-clients.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0018-openvpn-Remove-boguous-file-handler-check.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0019-openvpn-Ignore-not-fully-established-connections.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \ --disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \ --disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \ diff --git a/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch b/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch new file mode 100644 index 0000000..7391fbf --- /dev/null +++ b/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch @@ -0,0 +1,28 @@ +From 4bbfb2b9f391f273744163cfda7bec96671e9d9c Mon Sep 17 00:00:00 2001 +From: Florian Forster <octo(a)collectd.org> +Date: Thu, 18 Apr 2013 06:25:58 +0200 +Subject: [PATCH 01/22] src/utils_mount.h: Add <stdio.h>. + +This is required on Solaris 10. Thanks to dannypoo@ for reporting this +problem. + +Github: #306 +--- + src/utils_mount.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/utils_mount.h b/src/utils_mount.h +index 1f2403c..83f789b 100644 +--- a/src/utils_mount.h ++++ b/src/utils_mount.h +@@ -26,6 +26,7 @@ + #ifndef COLLECTD_UTILS_MOUNT_H + #define COLLECTD_UTILS_MOUNT_H 1 + ++#include <stdio.h> + #if HAVE_FS_INFO_H + # include <fs_info.h> + #endif +-- +1.9.3 + diff --git a/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch b/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch new file mode 100644 index 0000000..f0beb39 --- /dev/null +++ b/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch @@ -0,0 +1,27 @@ +From f2391b9da6127e4acd5b54b7ae6c2d585df0e2a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Joaqu=C3=ADn=20Cuenca=20Abela?= <e98cuenc(a)gmail.com> +Date: Wed, 29 May 2013 16:22:09 +0200 +Subject: [PATCH 02/22] Don't notify continuously when MySQL slave SQL thread + is running + +Signed-off-by: Florian Forster <octo(a)collectd.org> +--- + src/mysql.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mysql.c b/src/mysql.c +index 8b3cd21..f93a442 100644 +--- a/src/mysql.c ++++ b/src/mysql.c +@@ -689,7 +689,7 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) + ssnprintf (n.message, sizeof (n.message), + "slave SQL thread started"); + plugin_dispatch_notification (&n); +- db->slave_sql_running = 0; ++ db->slave_sql_running = 1; + } + } + +-- +1.9.3 + diff --git a/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch b/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch new file mode 100644 index 0000000..4011dd8 --- /dev/null +++ b/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch @@ -0,0 +1,34 @@ +From bbbf37d55a3959951604c4be482e9a705a0f86d9 Mon Sep 17 00:00:00 2001 +From: Marc Fournier <marc.fournier(a)camptocamp.com> +Date: Tue, 7 Jan 2014 11:30:59 +0100 +Subject: [PATCH 03/22] curl_xml.c: avoid using uninitalized variable in error + message + +Thanks to @trtrmitya for reporting this. Fixes GH#507 +--- + src/curl_xml.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/curl_xml.c b/src/curl_xml.c +index 75f5cc3..77aee60 100644 +--- a/src/curl_xml.c ++++ b/src/curl_xml.c +@@ -551,12 +551,12 @@ static int cx_curl_perform (cx_t *db, CURL *curl) /* {{{ */ + char *ptr; + char *url; + +- db->buffer_fill = 0; ++ db->buffer_fill = 0; + status = curl_easy_perform (curl); + if (status != CURLE_OK) + { +- ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s (%s)", +- status, db->curl_errbuf, url); ++ ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s", ++ status, db->curl_errbuf); + return (-1); + } + +-- +1.9.3 + diff --git a/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch b/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch new file mode 100644 index 0000000..cc7067d --- /dev/null +++ b/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch @@ -0,0 +1,52 @@ +From 645dadb3fcc466e8880fda4eb23b21ad433631fc Mon Sep 17 00:00:00 2001 +From: Marc Fournier <marc.fournier(a)camptocamp.com> +Date: Tue, 7 Jan 2014 16:06:10 +0100 +Subject: [PATCH 04/22] interface.c: FreeBSD-10 support + +Quoting @trtrmitya in github issue #506 : "[...] it is broken on +FreeBSD-10, in which getifaddrs() returns not only link level stats for +a particular interface, but also entries for each IP configured on that +interface. As a result if_submit() is called several times for each +interface, which results in incorrect data being logged. + +I am attaching a patch which fixes a problem on FreeBSD (9/10), but it +should work for every *BSD because [...] the getifaddrs implementation +first appeared in BSDi BSD/OS." + +Many thanks to @trtrmitya for providing the patch ! +--- + src/interface.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/interface.c b/src/interface.c +index db998a3..9b566ea 100644 +--- a/src/interface.c ++++ b/src/interface.c +@@ -213,18 +213,19 @@ static int interface_read (void) + + for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next) + { +- if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL) +- continue; ++ if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) { ++ if_data = (struct IFA_DATA *) if_ptr->ifa_data; + +- if_submit (if_ptr->ifa_name, "if_octets", ++ if_submit (if_ptr->ifa_name, "if_octets", + if_data->IFA_RX_BYTES, + if_data->IFA_TX_BYTES); +- if_submit (if_ptr->ifa_name, "if_packets", ++ if_submit (if_ptr->ifa_name, "if_packets", + if_data->IFA_RX_PACKT, + if_data->IFA_TX_PACKT); +- if_submit (if_ptr->ifa_name, "if_errors", ++ if_submit (if_ptr->ifa_name, "if_errors", + if_data->IFA_RX_ERROR, + if_data->IFA_TX_ERROR); ++ } + } + + freeifaddrs (if_list); +-- +1.9.3 + diff --git a/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch b/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch new file mode 100644 index 0000000..3534cde --- /dev/null +++ b/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch @@ -0,0 +1,40 @@ +From cde09b547abbeb7595d91259fcc628504d0f55a9 Mon Sep 17 00:00:00 2001 +From: Marc Fournier <marc.fournier(a)camptocamp.com> +Date: Wed, 8 Jan 2014 18:05:40 +0100 +Subject: [PATCH 05/22] Revert "curl_xml.c: avoid using uninitalized variable + in error message" + +This reverts commit bbbf37d55a3959951604c4be482e9a705a0f86d9. + +A different fix for this problem was commited to the collectd-5.4 branch +(8327ee64) and conflicts with this patch. Also, initializing url the +same way as 8327ee64 does it, to avoid a merge conflict. +--- + src/curl_xml.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/curl_xml.c b/src/curl_xml.c +index 77aee60..b941f02 100644 +--- a/src/curl_xml.c ++++ b/src/curl_xml.c +@@ -550,13 +550,14 @@ static int cx_curl_perform (cx_t *db, CURL *curl) /* {{{ */ + long rc; + char *ptr; + char *url; ++ url = db->url; + +- db->buffer_fill = 0; ++ db->buffer_fill = 0; + status = curl_easy_perform (curl); + if (status != CURLE_OK) + { +- ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s", +- status, db->curl_errbuf); ++ ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s (%s)", ++ status, db->curl_errbuf, url); + return (-1); + } + +-- +1.9.3 + diff --git a/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch b/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch new file mode 100644 index 0000000..460f4b5 --- /dev/null +++ b/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch @@ -0,0 +1,28 @@ +From ddffda7a150cd3abdb6ec392b514a250e91e0c19 Mon Sep 17 00:00:00 2001 +From: Chris Lundquist <chris.lundquist(a)github.com> +Date: Tue, 14 Jan 2014 18:33:13 -0800 +Subject: [PATCH 06/22] [network] set_thread_cbs so we initialize the right + threading mode in gcry_check_version + +Signed-off-by: Florian Forster <octo(a)collectd.org> +--- + src/network.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network.c b/src/network.c +index d0ff6bc..be82c6f 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -500,8 +500,8 @@ static void network_init_gcrypt (void) /* {{{ */ + if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P)) + return; + +- gcry_check_version (NULL); /* before calling any other functions */ + gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); ++ gcry_check_version (NULL); /* before calling *almost* any other functions */ + gcry_control (GCRYCTL_INIT_SECMEM, 32768); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED); + } /* }}} void network_init_gcrypt */ +-- +1.9.3 + diff --git a/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch b/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch new file mode 100644 index 0000000..8408337 --- /dev/null +++ b/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch @@ -0,0 +1,40 @@ +From 5f2f969335757f31f42cd8bb7e38eb8c5fe5e56e Mon Sep 17 00:00:00 2001 +From: Florian Forster <octo(a)collectd.org> +Date: Wed, 15 Jan 2014 23:47:33 +0100 +Subject: [PATCH 07/22] apache plugin: Call curl_global_init() from the init + function. + +This is a shot in the dark in trying to address #513. By calling this +from an init() callback, I hope to be initializing the curl and gcrypt +libraries before collectd becomes multi-threaded, avoiding the problems +described in the issue. +--- + src/apache.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/apache.c b/src/apache.c +index 899c21e..23bba3e 100644 +--- a/src/apache.c ++++ b/src/apache.c +@@ -702,9 +702,18 @@ static int apache_read_host (user_data_t *user_data) /* {{{ */ + return (0); + } /* }}} int apache_read_host */ + ++static int apache_init (void) /* {{{ */ ++{ ++ /* Call this while collectd is still single-threaded to avoid ++ * initialization issues in libgcrypt. */ ++ curl_global_init (CURL_GLOBAL_SSL); ++ return (0); ++} /* }}} int apache_init */ ++ + void module_register (void) + { + plugin_register_complex_config ("apache", config); ++ plugin_register_init ("apache", apache_init); + } /* void module_register */ + + /* vim: set sw=8 noet fdm=marker : */ +-- +1.9.3 + diff --git a/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch b/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch new file mode 100644 index 0000000..9499328 --- /dev/null +++ b/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch @@ -0,0 +1,33 @@ +From 793c2046de1ac04689d541a5e83513fe8e62578c Mon Sep 17 00:00:00 2001 +From: Marc Fournier <marc.fournier(a)camptocamp.com> +Date: Thu, 16 Jan 2014 00:30:42 +0100 +Subject: [PATCH 08/22] network: comment libgcrypt initalization process + +--- + src/network.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/network.c b/src/network.c +index be82c6f..f379a5c 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -500,8 +500,15 @@ static void network_init_gcrypt (void) /* {{{ */ + if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P)) + return; + ++ /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html ++ * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS ++ * *before* initalizing Libgcrypt with gcry_check_version(), which itself must ++ * be called before any other gcry_* function. GCRYCTL_ANY_INITIALIZATION_P ++ * above doesn't count, as it doesn't implicitly initalize Libgcrypt. ++ * ++ * tl;dr: keep all these gry_* statements in this exact order please. */ + gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); +- gcry_check_version (NULL); /* before calling *almost* any other functions */ ++ gcry_check_version (NULL); + gcry_control (GCRYCTL_INIT_SECMEM, 32768); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED); + } /* }}} void network_init_gcrypt */ +-- +1.9.3 + diff --git a/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch b/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch new file mode 100644 index 0000000..a2c3ef5 --- /dev/null +++ b/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch @@ -0,0 +1,99 @@ +From 66b400ab01b8133e450bb002e175117a1ab6f9ae Mon Sep 17 00:00:00 2001 +From: Jeremy Katz <jeremy(a)katzbox.net> +Date: Sun, 26 Jan 2014 20:43:19 -0500 +Subject: [PATCH 09/22] Call curl_global_init() in _init of plugins using curl + +Need to call curl_global_init() or curl_easy_init() during init +for plugins when we're still running single threaded. This +updates the remaining ones +--- + src/curl.c | 1 + + src/curl_json.c | 9 +++++++++ + src/curl_xml.c | 9 +++++++++ + src/write_http.c | 9 +++++++++ + 4 files changed, 28 insertions(+) + +diff --git a/src/curl.c b/src/curl.c +index 3899aaa..8d2893f 100644 +--- a/src/curl.c ++++ b/src/curl.c +@@ -566,6 +566,7 @@ static int cc_init (void) /* {{{ */ + INFO ("curl plugin: No pages have been defined."); + return (-1); + } ++ curl_global_init (CURL_GLOBAL_SSL); + return (0); + } /* }}} int cc_init */ + +diff --git a/src/curl_json.c b/src/curl_json.c +index 24e1df1..0948962 100644 +--- a/src/curl_json.c ++++ b/src/curl_json.c +@@ -882,9 +882,18 @@ static int cj_read (user_data_t *ud) /* {{{ */ + return cj_curl_perform (db, db->curl); + } /* }}} int cj_read */ + ++static int cj_init (void) /* {{{ */ ++{ ++ /* Call this while collectd is still single-threaded to avoid ++ * initialization issues in libgcrypt. */ ++ curl_global_init (CURL_GLOBAL_SSL); ++ return (0); ++} /* }}} int cj_init */ ++ + void module_register (void) + { + plugin_register_complex_config ("curl_json", cj_config); ++ plugin_register_init ("curl_json", cj_init); + } /* void module_register */ + + /* vim: set sw=2 sts=2 et fdm=marker : */ +diff --git a/src/curl_xml.c b/src/curl_xml.c +index b941f02..e31e73d 100644 +--- a/src/curl_xml.c ++++ b/src/curl_xml.c +@@ -926,9 +926,18 @@ static int cx_config (oconfig_item_t *ci) /* {{{ */ + return (0); + } /* }}} int cx_config */ + ++static int cx_init (void) /* {{{ */ ++{ ++ /* Call this while collectd is still single-threaded to avoid ++ * initialization issues in libgcrypt. */ ++ curl_global_init (CURL_GLOBAL_SSL); ++ return (0); ++} /* }}} int cx_init */ ++ + void module_register (void) + { + plugin_register_complex_config ("curl_xml", cx_config); ++ plugin_register_init ("curl_xml", cx_init); + } /* void module_register */ + + /* vim: set sw=2 sts=2 et fdm=marker : */ +diff --git a/src/write_http.c b/src/write_http.c +index 62c73b0..04c637b 100644 +--- a/src/write_http.c ++++ b/src/write_http.c +@@ -656,9 +656,18 @@ static int wh_config (oconfig_item_t *ci) /* {{{ */ + return (0); + } /* }}} int wh_config */ + ++static int wh_init (void) /* {{{ */ ++{ ++ /* Call this while collectd is still single-threaded to avoid ++ * initialization issues in libgcrypt. */ ++ curl_global_init (CURL_GLOBAL_SSL); ++ return (0); ++} /* }}} int wh_init */ ++ + void module_register (void) /* {{{ */ + { + plugin_register_complex_config ("write_http", wh_config); ++ plugin_register_init ("write_http", wh_init); + } /* }}} void module_register */ + + /* vim: set fdm=marker sw=8 ts=8 tw=78 et : */ +-- +1.9.3 + diff --git a/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch b/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch new file mode 100644 index 0000000..81f2d84 --- /dev/null +++ b/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch @@ -0,0 +1,32 @@ +From 6bd48f2346c5072dc22da58c7b7cd8e8ceb83fc5 Mon Sep 17 00:00:00 2001 +From: Marc Fournier <marc.fournier(a)camptocamp.com> +Date: Sat, 29 Mar 2014 13:37:36 +0100 +Subject: [PATCH 10/22] indent wh_init() to be consistent with the rest of the + file + +--- + src/write_http.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/write_http.c b/src/write_http.c +index 04c637b..0a13444 100644 +--- a/src/write_http.c ++++ b/src/write_http.c +@@ -658,10 +658,10 @@ static int wh_config (oconfig_item_t *ci) /* {{{ */ + + static int wh_init (void) /* {{{ */ + { +- /* Call this while collectd is still single-threaded to avoid +- * initialization issues in libgcrypt. */ +- curl_global_init (CURL_GLOBAL_SSL); +- return (0); ++ /* Call this while collectd is still single-threaded to avoid ++ * initialization issues in libgcrypt. */ ++ curl_global_init (CURL_GLOBAL_SSL); ++ return (0); + } /* }}} int wh_init */ + + void module_register (void) /* {{{ */ +-- +1.9.3 + diff --git a/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch b/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch new file mode 100644 index 0000000..b3e6f78 --- /dev/null +++ b/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch @@ -0,0 +1,41 @@ +From 6207fce91a0933e852ec76fc31ca81ec00ffa04b Mon Sep 17 00:00:00 2001 +From: Wilfried Goesgens <dothebart(a)citadel.org> +Date: Thu, 5 Jun 2014 20:04:13 +0200 +Subject: [PATCH 11/22] Configparser: when we alocate an empty list, we also + need to reset the counter; else we will trip over this later. This fixes + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750440 + +--- + src/configfile.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/configfile.c b/src/configfile.c +index 0b7786f..983d995 100644 +--- a/src/configfile.c ++++ b/src/configfile.c +@@ -414,6 +414,12 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src, + + /* Resize the memory containing the children to be big enough to hold + * all children. */ ++ if (dst->children_num + src->children_num - 1 == 0) ++ { ++ dst->children_num = 0; ++ return (0); ++ } ++ + temp = (oconfig_item_t *) realloc (dst->children, + sizeof (oconfig_item_t) + * (dst->children_num + src->children_num - 1)); +@@ -514,7 +520,8 @@ static int cf_include_all (oconfig_item_t *root, int depth) + continue; + + /* Now replace the i'th child in `root' with `new'. */ +- cf_ci_replace_child (root, new, i); ++ if (cf_ci_replace_child (root, new, i) < 0) ++ return (-1); + + /* ... and go back to the new i'th child. */ + --i; +-- +1.9.3 + diff --git a/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch b/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch new file mode 100644 index 0000000..5bb5c85 --- /dev/null +++ b/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch @@ -0,0 +1,86 @@ +From c2ca2a46e617878dcff69de0b8940ea91d3401cc Mon Sep 17 00:00:00 2001 +From: Lauri Tirkkonen <lotheac(a)iki.fi> +Date: Thu, 22 May 2014 14:05:40 +0300 +Subject: [PATCH 12/22] don't assume pkg-config is in PATH + +--- + configure.in | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/configure.in b/configure.in +index 0b12630..7086800 100644 +--- a/configure.in ++++ b/configure.in +@@ -1136,8 +1136,8 @@ AC_CHECK_LIB(hal,libhal_device_property_exists, + [with_libhal="no"]) + if test "x$with_libhal" = "xyes"; then + if test "x$PKG_CONFIG" != "x"; then +- BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`" +- BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`" ++ BUILD_WITH_LIBHAL_CFLAGS="`$PKG_CONFIG --cflags hal`" ++ BUILD_WITH_LIBHAL_LIBS="`$PKG_CONFIG --libs hal`" + AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS) + AC_SUBST(BUILD_WITH_LIBHAL_LIBS) + fi +@@ -3434,8 +3434,8 @@ then + if $PKG_CONFIG --exists tokyotyrant + then + with_libtokyotyrant_cppflags="$with_libtokyotyrant_cppflags `$PKG_CONFIG --cflags tokyotyrant`" +- with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `pkg-config --libs-only-L tokyotyrant`" +- with_libtokyotyrant_libs="$with_libtokyotyrant_libs `pkg-config --libs-only-l tokyotyrant`" ++ with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `$PKG_CONFIG --libs-only-L tokyotyrant`" ++ with_libtokyotyrant_libs="$with_libtokyotyrant_libs `$PKG_CONFIG --libs-only-l tokyotyrant`" + fi + fi + +@@ -3743,7 +3743,7 @@ with_libvirt_cflags="" + with_libvirt_ldflags="" + if test "x$PKG_CONFIG" != "x" + then +- pkg-config --exists 'libxml-2.0' 2>/dev/null ++ $PKG_CONFIG --exists 'libxml-2.0' 2>/dev/null + if test "$?" = "0" + then + with_libxml2="yes" +@@ -3751,7 +3751,7 @@ then + with_libxml2="no (pkg-config doesn't know library)" + fi + +- pkg-config --exists libvirt 2>/dev/null ++ $PKG_CONFIG --exists libvirt 2>/dev/null + if test "$?" = "0" + then + with_libvirt="yes" +@@ -3761,12 +3761,12 @@ then + fi + if test "x$with_libxml2" = "xyes" + then +- with_libxml2_cflags="`pkg-config --cflags libxml-2.0`" ++ with_libxml2_cflags="`$PKG_CONFIG --cflags libxml-2.0`" + if test $? -ne 0 + then + with_libxml2="no" + fi +- with_libxml2_ldflags="`pkg-config --libs libxml-2.0`" ++ with_libxml2_ldflags="$PKG_CONFIG --libs libxml-2.0`" + if test $? -ne 0 + then + with_libxml2="no" +@@ -3806,12 +3806,12 @@ if test "x$with_libxml2" = "xyes"; then + fi + if test "x$with_libvirt" = "xyes" + then +- with_libvirt_cflags="`pkg-config --cflags libvirt`" ++ with_libvirt_cflags="$PKG_CONFIG --cflags libvirt`" + if test $? -ne 0 + then + with_libvirt="no" + fi +- with_libvirt_ldflags="`pkg-config --libs libvirt`" ++ with_libvirt_ldflags="$PKG_CONFIG --libs libvirt`" + if test $? -ne 0 + then + with_libvirt="no" +-- +1.9.3 + diff --git a/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch b/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch new file mode 100644 index 0000000..d7f2264 --- /dev/null +++ b/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch @@ -0,0 +1,40 @@ +From 497f5785e8b385f03b5fb5b15bdff8ba39e4699e Mon Sep 17 00:00:00 2001 +From: Marc Fournier <marc.fournier(a)camptocamp.com> +Date: Mon, 23 Jun 2014 18:00:01 +0200 +Subject: [PATCH 13/22] add missing backticks which broke the build + +--- + configure.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 7086800..5dac543 100644 +--- a/configure.in ++++ b/configure.in +@@ -3766,7 +3766,7 @@ then + then + with_libxml2="no" + fi +- with_libxml2_ldflags="$PKG_CONFIG --libs libxml-2.0`" ++ with_libxml2_ldflags="`$PKG_CONFIG --libs libxml-2.0`" + if test $? -ne 0 + then + with_libxml2="no" +@@ -3806,12 +3806,12 @@ if test "x$with_libxml2" = "xyes"; then + fi + if test "x$with_libvirt" = "xyes" + then +- with_libvirt_cflags="$PKG_CONFIG --cflags libvirt`" ++ with_libvirt_cflags="`$PKG_CONFIG --cflags libvirt`" + if test $? -ne 0 + then + with_libvirt="no" + fi +- with_libvirt_ldflags="$PKG_CONFIG --libs libvirt`" ++ with_libvirt_ldflags="`$PKG_CONFIG --libs libvirt`" + if test $? -ne 0 + then + with_libvirt="no" +-- +1.9.3 + diff --git a/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch b/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch new file mode 100644 index 0000000..945c28b --- /dev/null +++ b/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch @@ -0,0 +1,29 @@ +From 0da910fb1bf2bd4982ca6541458c795ec296f398 Mon Sep 17 00:00:00 2001 +From: Marc Fournier <marc.fournier(a)camptocamp.com> +Date: Fri, 8 Aug 2014 15:55:10 +0200 +Subject: [PATCH 14/22] snmp: free snmp_pdu struct allocated by + snmp_pdu_create() + +This should fix the leak reported in issue #610. +--- + src/snmp.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/snmp.c b/src/snmp.c +index d440f7f..dacdede 100644 +--- a/src/snmp.c ++++ b/src/snmp.c +@@ -1503,6 +1503,10 @@ static int csnmp_read_table (host_definition_t *host, data_definition_t *data) + snmp_free_pdu (res); + res = NULL; + ++ if (req != NULL) ++ snmp_free_pdu (req); ++ req = NULL; ++ + if (status == 0) + csnmp_dispatch_table (host, data, instance_list_head, value_list_head); + +-- +1.9.3 + diff --git a/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch b/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch new file mode 100644 index 0000000..30e1a08 --- /dev/null +++ b/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch @@ -0,0 +1,28 @@ +From 0afea60611f115a28b8ec331aba610e3038c1ef2 Mon Sep 17 00:00:00 2001 +From: Arthur Marble <arthur(a)info9.net> +Date: Sun, 17 Aug 2014 17:34:04 -0500 +Subject: [PATCH 15/22] curl_xml plugin: Fixed tautological pointer comparison + error. + +Fixes: http://bugs.debian.org/758481 +Signed-off-by: Florian Forster <octo(a)collectd.org> +--- + src/curl_xml.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/curl_xml.c b/src/curl_xml.c +index e31e73d..28b2ded 100644 +--- a/src/curl_xml.c ++++ b/src/curl_xml.c +@@ -344,7 +344,7 @@ static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */ + /* If the base xpath returns more than one block, the result is assumed to be + * a table. The `Instnce' option is not optional in this case. Check for the + * condition and inform the user. */ +- if (is_table && (vl->type_instance == NULL)) ++ if (is_table) + { + WARNING ("curl_xml plugin: " + "Base-XPath %s is a table (more than one result was returned), " +-- +1.9.3 + diff --git a/src/patches/collectd/0016-Add-support-for-OpenVPN-2.3.0-status-files.patch b/src/patches/collectd/0016-Add-support-for-OpenVPN-2.3.0-status-files.patch new file mode 100644 index 0000000..ca5b407 --- /dev/null +++ b/src/patches/collectd/0016-Add-support-for-OpenVPN-2.3.0-status-files.patch @@ -0,0 +1,160 @@ +From 9d065b401c2c393bef5a6e58b5deeda7d59d4f39 Mon Sep 17 00:00:00 2001 +From: Ed Okerson <ed(a)okerson.com> +Date: Mon, 11 Feb 2013 15:46:10 -0600 +Subject: [PATCH 16/22] Add support for OpenVPN 2.3.0 status files. + +Fix a bug that breaks this module if a server is running multiple instances of OpenVPN and one instance does not have any clients connected. +--- + src/openvpn.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 84 insertions(+), 6 deletions(-) + +diff --git a/src/openvpn.c b/src/openvpn.c +index 2aca414..d2b6f17 100644 +--- a/src/openvpn.c ++++ b/src/openvpn.c +@@ -32,6 +32,7 @@ + #define V1STRING "Common Name,Real Address,Bytes Received,Bytes Sent,Connected Since\n" + #define V2STRING "HEADER,CLIENT_LIST,Common Name,Real Address,Virtual Address,Bytes Received,Bytes Sent,Connected Since,Connected Since (time_t)\n" + #define V3STRING "HEADER CLIENT_LIST Common Name Real Address Virtual Address Bytes Received Bytes Sent Connected Since Connected Since (time_t)\n" ++#define V4STRING "HEADER,CLIENT_LIST,Common Name,Real Address,Virtual Address,Bytes Received,Bytes Sent,Connected Since,Connected Since (time_t),Username\n" + #define VSSTRING "OpenVPN STATISTICS\n" + + +@@ -43,6 +44,7 @@ struct vpn_status_s + MULTI1 = 1, /* status-version 1 */ + MULTI2, /* status-version 2 */ + MULTI3, /* status-version 3 */ ++ MULTI4, /* status-version 4 */ + SINGLE = 10 /* currently no versions for single mode, maybe in the future */ + } version; + char *name; +@@ -452,13 +454,77 @@ static int multi3_read (char *name, FILE *fh) + return (read); + } /* int multi3_read */ + ++/* for reading status version 4 */ ++static int multi4_read (char *name, FILE *fh) ++{ ++ char buffer[1024]; ++ char *fields[11]; ++ const int max_fields = STATIC_ARRAY_SIZE (fields); ++ int fields_num, read = 0; ++ long long sum_users = 0; ++ ++ while (fgets (buffer, sizeof (buffer), fh) != NULL) ++ { ++ fields_num = openvpn_strsplit (buffer, fields, max_fields); ++ ++ /* status file is generated by openvpn/multi.c:multi_print_status() ++ * http://svn.openvpn.net/projects/openvpn/trunk/openvpn/multi.c ++ * ++ * The line we're expecting has 9 fields. We ignore all lines ++ * with more or less fields. ++ */ ++ if (fields_num != 9) ++ continue; ++ ++ ++ if (strcmp (fields[0], "CLIENT_LIST") != 0) ++ continue; ++ ++ ++ if (collect_user_count) ++ /* If so, sum all users, ignore the individuals*/ ++ { ++ sum_users += 1; ++ } ++ if (collect_individual_users) ++ { ++ if (new_naming_schema) ++ { ++ /* plugin inst = file name, type inst = fields[1] */ ++ iostats_submit (name, /* vpn instance */ ++ fields[1], /* "Common Name" */ ++ atoll (fields[4]), /* "Bytes Received" */ ++ atoll (fields[5])); /* "Bytes Sent" */ ++ } ++ else ++ { ++ /* plugin inst = fields[1], type inst = "" */ ++ iostats_submit (fields[1], /* "Common Name" */ ++ NULL, /* unused when in multimode */ ++ atoll (fields[4]), /* "Bytes Received" */ ++ atoll (fields[5])); /* "Bytes Sent" */ ++ } ++ } ++ ++ read = 1; ++ } ++ ++ if (collect_user_count) ++ { ++ numusers_submit(name, name, sum_users); ++ read = 1; ++ } ++ ++ return (read); ++} /* int multi4_read */ ++ + /* read callback */ + static int openvpn_read (void) + { + FILE *fh; +- int i, read; ++ int i, vpn_read, read; + +- read = 0; ++ vpn_read = read = 0; + + /* call the right read function for every status entry in the list */ + for (i = 0; i < vpn_num; i++) +@@ -476,23 +542,28 @@ static int openvpn_read (void) + switch (vpn_list[i]->version) + { + case SINGLE: +- read = single_read(vpn_list[i]->name, fh); ++ vpn_read = single_read(vpn_list[i]->name, fh); + break; + + case MULTI1: +- read = multi1_read(vpn_list[i]->name, fh); ++ vpn_read = multi1_read(vpn_list[i]->name, fh); + break; + + case MULTI2: +- read = multi2_read(vpn_list[i]->name, fh); ++ vpn_read = multi2_read(vpn_list[i]->name, fh); + break; + + case MULTI3: +- read = multi3_read(vpn_list[i]->name, fh); ++ vpn_read = multi3_read(vpn_list[i]->name, fh); ++ break; ++ ++ case MULTI4: ++ vpn_read = multi4_read(vpn_list[i]->name, fh); + break; + } + + fclose (fh); ++ read += vpn_read; + } + + return (read ? 0 : -1); +@@ -549,6 +620,13 @@ static int version_detect (const char *filename) + version = MULTI3; + break; + } ++ /* searching for multi version 4 */ ++ else if (strcmp (buffer, V4STRING) == 0) ++ { ++ DEBUG ("openvpn plugin: found status file version MULTI4"); ++ version = MULTI4; ++ break; ++ } + } + + if (version == 0) +-- +1.9.3 + diff --git a/src/patches/collectd/0017-openvpn-plugin-Don-t-signal-an-error-when-no-clients.patch b/src/patches/collectd/0017-openvpn-plugin-Don-t-signal-an-error-when-no-clients.patch new file mode 100644 index 0000000..0d5b319 --- /dev/null +++ b/src/patches/collectd/0017-openvpn-plugin-Don-t-signal-an-error-when-no-clients.patch @@ -0,0 +1,56 @@ +From 8516f9abb625fa7b9321e62307305aa6499be4e8 Mon Sep 17 00:00:00 2001 +From: Florian Forster <octo(a)collectd.org> +Date: Sun, 14 Sep 2014 19:28:05 +0200 +Subject: [PATCH 17/22] openvpn plugin: Don't signal an error when no clients + are connected. + +In the multi1_read() function, an error (zero) was returned when no +clients were currently connected to the OpenVPN server, because the +"read" variable was initialized to zero and the while loop exited before +it was set to one. This is not the intended behavior. + +Thanks to @srix for reporting this issue! + +Fixes: #731 +--- + src/openvpn.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/openvpn.c b/src/openvpn.c +index d2b6f17..7d4e4a0 100644 +--- a/src/openvpn.c ++++ b/src/openvpn.c +@@ -267,7 +267,7 @@ static int multi1_read (char *name, FILE *fh) + { + char buffer[1024]; + char *fields[10]; +- int fields_num, read = 0, found_header = 0; ++ int fields_num, found_header = 0; + long long sum_users = 0; + + /* read the file until the "ROUTING TABLE" line is found (no more info after) */ +@@ -314,17 +314,15 @@ static int multi1_read (char *name, FILE *fh) + atoll (fields[3])); /* "Bytes Sent" */ + } + } +- +- read = 1; + } + ++ if (ferror (fh)) ++ return (0); ++ + if (collect_user_count) +- { + numusers_submit(name, name, sum_users); +- read = 1; +- } + +- return (read); ++ return (1); + } /* int multi1_read */ + + /* for reading status version 2 */ +-- +1.9.3 + diff --git a/src/patches/collectd/0018-openvpn-Remove-boguous-file-handler-check.patch b/src/patches/collectd/0018-openvpn-Remove-boguous-file-handler-check.patch new file mode 100644 index 0000000..850e4fb --- /dev/null +++ b/src/patches/collectd/0018-openvpn-Remove-boguous-file-handler-check.patch @@ -0,0 +1,26 @@ +From 5dbc1cfb4baff831f950b3c9de8c332bc9aa2b6e Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 17 Sep 2014 11:25:17 +0200 +Subject: [PATCH 18/22] openvpn: Remove boguous file handler check + +--- + src/openvpn.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/openvpn.c b/src/openvpn.c +index 7d4e4a0..9598abc 100644 +--- a/src/openvpn.c ++++ b/src/openvpn.c +@@ -316,9 +316,6 @@ static int multi1_read (char *name, FILE *fh) + } + } + +- if (ferror (fh)) +- return (0); +- + if (collect_user_count) + numusers_submit(name, name, sum_users); + +-- +1.9.3 + diff --git a/src/patches/collectd/0019-openvpn-Ignore-not-fully-established-connections.patch b/src/patches/collectd/0019-openvpn-Ignore-not-fully-established-connections.patch new file mode 100644 index 0000000..4dde610 --- /dev/null +++ b/src/patches/collectd/0019-openvpn-Ignore-not-fully-established-connections.patch @@ -0,0 +1,59 @@ +From a45710a5a887d25ab0e04ce1553bb268013ef780 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Tue, 16 Sep 2014 14:44:42 +0200 +Subject: [PATCH 19/22] openvpn: Ignore not fully established connections + +--- + src/openvpn.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/openvpn.c b/src/openvpn.c +index 9598abc..6a0ffbd 100644 +--- a/src/openvpn.c ++++ b/src/openvpn.c +@@ -292,6 +292,10 @@ static int multi1_read (char *name, FILE *fh) + if (fields_num < 4) + continue; + ++ // Ignore not yet fully established connections ++ if (strcmp(fields[1], "UNDEF") == 0) ++ continue; ++ + if (collect_user_count) + /* If so, sum all users, ignore the individuals*/ + { +@@ -347,6 +351,10 @@ static int multi2_read (char *name, FILE *fh) + if (strcmp (fields[0], "CLIENT_LIST") != 0) + continue; + ++ // Ignore not yet fully established connections ++ if (strcmp(fields[0], "UNDEF") == 0) ++ continue; ++ + if (collect_user_count) + /* If so, sum all users, ignore the individuals*/ + { +@@ -412,6 +420,10 @@ static int multi3_read (char *name, FILE *fh) + if (strcmp (fields[0], "CLIENT_LIST") != 0) + continue; + ++ // Ignore not yet fully established connections ++ if (strcmp(fields[0], "UNDEF") == 0) ++ continue; ++ + if (collect_user_count) + /* If so, sum all users, ignore the individuals*/ + { +@@ -475,6 +487,9 @@ static int multi4_read (char *name, FILE *fh) + if (strcmp (fields[0], "CLIENT_LIST") != 0) + continue; + ++ // Ignore not yet fully established connections ++ if (strcmp(fields[0], "UNDEF") == 0) ++ continue; + + if (collect_user_count) + /* If so, sum all users, ignore the individuals*/ +-- +1.9.3 + diff --git a/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch b/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch new file mode 100644 index 0000000..79f6742 --- /dev/null +++ b/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch @@ -0,0 +1,102 @@ +From 46e716ee8d4208924d10f57f9ed97c99674a6ef4 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 17 Sep 2014 11:31:13 +0200 +Subject: [PATCH 20/22] openvpn: Make read functions robust like in + 8516f9abb625fa7b9321e62307305aa6499be4e8 + +--- + src/openvpn.c | 21 ++++++--------------- + 1 file changed, 6 insertions(+), 15 deletions(-) + +diff --git a/src/openvpn.c b/src/openvpn.c +index 6a0ffbd..f686721 100644 +--- a/src/openvpn.c ++++ b/src/openvpn.c +@@ -332,7 +332,7 @@ static int multi2_read (char *name, FILE *fh) + char buffer[1024]; + char *fields[10]; + const int max_fields = STATIC_ARRAY_SIZE (fields); +- int fields_num, read = 0; ++ int fields_num; + long long sum_users = 0; + + while (fgets (buffer, sizeof (buffer), fh) != NULL) +@@ -379,17 +379,14 @@ static int multi2_read (char *name, FILE *fh) + atoll (fields[5])); /* "Bytes Sent" */ + } + } +- +- read = 1; + } + + if (collect_user_count) + { + numusers_submit(name, name, sum_users); +- read = 1; + } + +- return (read); ++ return (1); + } /* int multi2_read */ + + /* for reading status version 3 */ +@@ -398,7 +395,7 @@ static int multi3_read (char *name, FILE *fh) + char buffer[1024]; + char *fields[15]; + const int max_fields = STATIC_ARRAY_SIZE (fields); +- int fields_num, read = 0; ++ int fields_num; + long long sum_users = 0; + + while (fgets (buffer, sizeof (buffer), fh) != NULL) +@@ -447,18 +444,15 @@ static int multi3_read (char *name, FILE *fh) + atoll (fields[5])); /* "Bytes Sent" */ + } + } +- +- read = 1; + } + } + + if (collect_user_count) + { + numusers_submit(name, name, sum_users); +- read = 1; + } + +- return (read); ++ return (1); + } /* int multi3_read */ + + /* for reading status version 4 */ +@@ -467,7 +461,7 @@ static int multi4_read (char *name, FILE *fh) + char buffer[1024]; + char *fields[11]; + const int max_fields = STATIC_ARRAY_SIZE (fields); +- int fields_num, read = 0; ++ int fields_num; + long long sum_users = 0; + + while (fgets (buffer, sizeof (buffer), fh) != NULL) +@@ -515,17 +509,14 @@ static int multi4_read (char *name, FILE *fh) + atoll (fields[5])); /* "Bytes Sent" */ + } + } +- +- read = 1; + } + + if (collect_user_count) + { + numusers_submit(name, name, sum_users); +- read = 1; + } + +- return (read); ++ return (1); + } /* int multi4_read */ + + /* read callback */ +-- +1.9.3 + diff --git a/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch b/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch new file mode 100644 index 0000000..65c293d --- /dev/null +++ b/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch @@ -0,0 +1,25 @@ +From 41253b68808deade2a1866f0c24f4bbc029a92c2 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 24 Sep 2014 14:38:04 +0200 +Subject: [PATCH 21/22] openvpn: Fix copy-and-paste error + +--- + src/openvpn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/openvpn.c b/src/openvpn.c +index f686721..2db3677 100644 +--- a/src/openvpn.c ++++ b/src/openvpn.c +@@ -293,7 +293,7 @@ static int multi1_read (char *name, FILE *fh) + continue; + + // Ignore not yet fully established connections +- if (strcmp(fields[1], "UNDEF") == 0) ++ if (strcmp(fields[0], "UNDEF") == 0) + continue; + + if (collect_user_count) +-- +1.9.3 + diff --git a/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch b/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch new file mode 100644 index 0000000..ec6819c --- /dev/null +++ b/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch @@ -0,0 +1,107 @@ +From 3458d610e8b99eb88c2f06ad576b4f46e0169877 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Fri, 26 Sep 2014 12:02:27 +0200 +Subject: [PATCH 22/22] openvpn: Change data type from COUNTER to DERIVE + +COUNTER is not what we want here, so we will use DERIVE. +--- + src/openvpn.c | 26 +++++++++++++------------- + src/types.db | 2 ++ + 2 files changed, 15 insertions(+), 13 deletions(-) + +diff --git a/src/openvpn.c b/src/openvpn.c +index 2db3677..d446e99 100644 +--- a/src/openvpn.c ++++ b/src/openvpn.c +@@ -116,13 +116,13 @@ static void numusers_submit (char *pinst, char *tinst, gauge_t value) + } /* void numusers_submit */ + + /* dispatches stats about traffic (TCP or UDP) generated by the tunnel per single endpoint */ +-static void iostats_submit (char *pinst, char *tinst, counter_t rx, counter_t tx) ++static void iostats_submit (char *pinst, char *tinst, derive_t rx, derive_t tx) + { + value_t values[2]; + value_list_t vl = VALUE_LIST_INIT; + +- values[0].counter = rx; +- values[1].counter = tx; ++ values[0].derive = rx; ++ values[1].derive = tx; + + /* NOTE ON THE NEW NAMING SCHEMA: + * using plugin_instance to identify each vpn config (and +@@ -137,7 +137,7 @@ static void iostats_submit (char *pinst, char *tinst, counter_t rx, counter_t tx + if (pinst != NULL) + sstrncpy (vl.plugin_instance, pinst, + sizeof (vl.plugin_instance)); +- sstrncpy (vl.type, "if_octets", sizeof (vl.type)); ++ sstrncpy (vl.type, "if_octets_derive", sizeof (vl.type)); + if (tinst != NULL) + sstrncpy (vl.type_instance, tinst, sizeof (vl.type_instance)); + +@@ -146,13 +146,13 @@ static void iostats_submit (char *pinst, char *tinst, counter_t rx, counter_t tx + + /* dispatches stats about data compression shown when in single mode */ + static void compression_submit (char *pinst, char *tinst, +- counter_t uncompressed, counter_t compressed) ++ derive_t uncompressed, derive_t compressed) + { + value_t values[2]; + value_list_t vl = VALUE_LIST_INIT; + +- values[0].counter = uncompressed; +- values[1].counter = compressed; ++ values[0].derive = uncompressed; ++ values[1].derive = compressed; + + vl.values = values; + vl.values_len = STATIC_ARRAY_SIZE (values); +@@ -161,7 +161,7 @@ static void compression_submit (char *pinst, char *tinst, + if (pinst != NULL) + sstrncpy (vl.plugin_instance, pinst, + sizeof (vl.plugin_instance)); +- sstrncpy (vl.type, "compression", sizeof (vl.type)); ++ sstrncpy (vl.type, "compression_dervice", sizeof (vl.type)); + if (tinst != NULL) + sstrncpy (vl.type_instance, tinst, sizeof (vl.type_instance)); + +@@ -175,11 +175,11 @@ static int single_read (char *name, FILE *fh) + const int max_fields = STATIC_ARRAY_SIZE (fields); + int fields_num, read = 0; + +- counter_t link_rx, link_tx; +- counter_t tun_rx, tun_tx; +- counter_t pre_compress, post_compress; +- counter_t pre_decompress, post_decompress; +- counter_t overhead_rx, overhead_tx; ++ derive_t link_rx, link_tx; ++ derive_t tun_rx, tun_tx; ++ derive_t pre_compress, post_compress; ++ derive_t pre_decompress, post_decompress; ++ derive_t overhead_rx, overhead_tx; + + link_rx = 0; + link_tx = 0; +diff --git a/src/types.db b/src/types.db +index ad54240..03ec75b 100644 +--- a/src/types.db ++++ b/src/types.db +@@ -18,6 +18,7 @@ cache_result value:COUNTER:0:4294967295 + cache_size value:GAUGE:0:4294967295 + charge value:GAUGE:0:U + compression uncompressed:COUNTER:0:U, compressed:COUNTER:0:U ++compression_derive uncompressed:DERIVE:0:U, compressed:DERIVE:0:U + compression_ratio value:GAUGE:0:2 + connections value:COUNTER:0:U + conntrack entropy:GAUGE:0:4294967295 +@@ -74,6 +75,7 @@ if_dropped rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295 + if_errors rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295 + if_multicast value:COUNTER:0:4294967295 + if_octets rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295 ++if_octets_derive rx:DERIVE:0:U, tx:DERIVE:0:U + if_packets rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295 + if_rx_errors value:COUNTER:0:4294967295 + if_tx_errors value:COUNTER:0:4294967295 +-- +1.9.3 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 93cad66b4e1c28f9642f64bdc9600d89ec1b9555
by git＠ipfire.org 02 Feb '15

02 Feb '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. db5b0f969331bcc3945b32a4595b8484da1dc8fb
by git＠ipfire.org 02 Feb '15

02 Feb '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 32e321b248ae4501ad17d7edc50bb23aaa4b5c6e
by git＠ipfire.org 01 Feb '15

01 Feb '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 976a7b26bfbb556d947444d53933feb9cf0febee
by git＠ipfire.org 01 Feb '15

01 Feb '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 976a7b26bfbb556d947444d53933feb9cf0febee (commit) from 49ecf41801b38269fa46b69893126c9c94791eb0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 976a7b26bfbb556d947444d53933feb9cf0febee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 1 12:57:05 2015 +0100 installer+setup: Update translations ----------------------------------------------------------------------- Summary of changes: src/installer/po/es.po | 136 +++++++++--------- src/installer/po/fa.po | 22 +-- src/installer/po/hr.po | 44 +++--- src/installer/po/{ja_JP.po => jv.po} | 6 +- src/installer/po/nl.po | 135 +++++++++--------- src/installer/po/pl.po | 49 +++---- src/installer/po/{sr.po => ru_RU.po} | 4 +- src/installer/po/{ja_JP.po => su.po} | 4 +- src/setup/po/es.po | 264 ++++++++++++++++++----------------- src/setup/po/fa.po | 12 +- src/setup/po/nl.po | 159 ++++++++++----------- src/setup/po/pt_BR.po | 159 ++++++++++----------- src/setup/po/ro_RO.po | 97 ++++++------- src/setup/po/zh.po | 31 ++-- 14 files changed, 566 insertions(+), 556 deletions(-) copy src/installer/po/{ja_JP.po => jv.po} (97%) copy src/installer/po/{sr.po => ru_RU.po} (98%) copy src/installer/po/{ja_JP.po => su.po} (98%) Difference in files: diff --git a/src/installer/po/es.po b/src/installer/po/es.po index d58cee8..725ebef 100644 --- a/src/installer/po/es.po +++ b/src/installer/po/es.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Roberto Peña <roberto.pena(a)northsecure.es>, 2015 +# Roberto Peña <roberto.pena(a)northsecure.es>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-05 01:29+0000\n" -"PO-Revision-Date: 2014-11-05 01:33+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-02-01 09:23+0000\n" +"Last-Translator: Roberto Peña <roberto.pena(a)northsecure.es>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/ipfire/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,36 +21,36 @@ msgstr "" #: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893 msgid "OK" -msgstr "" +msgstr "Ok" #: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670 #: main.c:702 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #: main.c:176 msgid "I accept this license" -msgstr "" +msgstr "Acepto esta licencia" #: main.c:384 msgid "Warning: Unattended installation will start in 10 seconds..." -msgstr "" +msgstr "Advertencia: La instalación desatendida comenzará en 10 segundos..." #: main.c:403 msgid "Language selection" -msgstr "" +msgstr "Selección de idioma" #: main.c:403 msgid "Select the language you wish to use for the installation." -msgstr "" +msgstr "Seleccione el idioma que quiere que se use durante la instalación." #: main.c:418 msgid "Unattended mode" -msgstr "" +msgstr "Modo desatendido" #: main.c:420 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" -msgstr "" +msgstr "<Tab>/<Alt-Tab> entre elementos | <Space> seleccionar | <F12> siguiente pantalla" #: main.c:426 #, c-format @@ -56,16 +58,16 @@ msgid "" "Welcome to the %s installation program.\n" "\n" "Selecting Cancel on any of the following screens will reboot the computer." -msgstr "" +msgstr "Bienvenido al programa de instalación %s.\n\nAl seleccionar Cancelar en cualquiera de las siguientes pantallas se reiniciará el equipo." #: main.c:428 msgid "Start installation" -msgstr "" +msgstr "Comenzar la instalación" #: main.c:449 #, c-format msgid "The installer will now try downloading the installation image." -msgstr "" +msgstr "El instalador no ha podido descargar la imagen de instalación." #: main.c:452 #, c-format @@ -73,41 +75,41 @@ msgid "" "No source drive could be found.\n" "\n" "You can try downloading the required installation image." -msgstr "" +msgstr "No se puede encontrar unidad de origen.\n\nPuede intentar descargar la imagen de instalación requerida." #: main.c:456 msgid "" "Please make sure to connect your machine to a network and the installer will" " try connect to acquire an IP address." -msgstr "" +msgstr "Por favor, asegúrese de conectar el equipo a una red y el instalador intentará conectarse adquiriendo una dirección IP." #: main.c:460 msgid "Download installation image" -msgstr "" +msgstr "Descargando la imagen de instalación" #: main.c:473 msgid "Trying to start networking (DHCP)..." -msgstr "" +msgstr "Intentando iniciar la red (DHCP)..." #: main.c:484 msgid "" "Networking could not be started but is required to go on with the installation.\n" "\n" "Please connect your machine to a network with a DHCP server and retry." -msgstr "" +msgstr "La red no se pudo iniciar, pero es necesaria para continuar con la instalación.\n\nPor favor, conecte el equipo a una red con un servidor DHCP y vuelva a intentarlo." #: main.c:487 main.c:516 msgid "Retry" -msgstr "" +msgstr "Reintentar" #: main.c:501 msgid "Downloading installation image..." -msgstr "" +msgstr "Descargando la imagen de instalación..." #: main.c:510 #, c-format msgid "MD5 checksum mismatch" -msgstr "" +msgstr "Discordancia suma de verificación MD5 " #: main.c:513 #, c-format @@ -116,44 +118,44 @@ msgid "" " Reason: %s\n" "\n" "%s" -msgstr "" +msgstr "La imagen de instalación no puede ser descargada.\nRazón: %s\n\n%s" #: main.c:528 #, c-format msgid "" "Could not mount %s to %s:\n" " %s\n" -msgstr "" +msgstr "No se pudo montar %s to %s:\n%s\n" #: main.c:543 msgid "License Agreement" -msgstr "" +msgstr "Contrato de licencia" #: main.c:544 msgid "License not accepted!" -msgstr "" +msgstr "Licencia no aceptada!" #: main.c:566 msgid "No hard disk found." -msgstr "" +msgstr "Disco duro no encontrado." #: main.c:587 msgid "Disk Selection" -msgstr "" +msgstr "Selección de disco" #: main.c:588 msgid "" "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n" "\n" "ALL DATA ON THE DISK WILL BE DESTROYED." -msgstr "" +msgstr "Seleccione el disco(s) donde quiere instalar IPFire. Primero deberán ser particionados y cuando tengan particiones, se les pondrá un sistema de archivos.\n\nTODOS LOS DATOS DEL DISCO SERÁN DESTRUIDOS." #: main.c:599 msgid "" "No disk has been selected.\n" "\n" "Please select one or more disks you want to install IPFire on." -msgstr "" +msgstr "No se ha seleccionado un disco.\n\nPor favor, seleccione uno o más discos donde quiere que se instale IPFire." #: main.c:617 #, c-format @@ -163,15 +165,15 @@ msgid "" " %s\n" "\n" "Do you agree to continue?" -msgstr "" +msgstr "El programa de instalación preparará ahora los discos elegidos:\n\n%s\n\nQuiere continuar?" #: main.c:619 msgid "Disk Setup" -msgstr "" +msgstr "Disco de instalación" #: main.c:620 main.c:630 msgid "Delete all data" -msgstr "" +msgstr "Borrar todos los datos" #: main.c:627 #, c-format @@ -182,131 +184,131 @@ msgid "" " %s\n" "\n" "Do you agree to continue?" -msgstr "" +msgstr "El programa de instalación establecerá ahora una configuración RAID en los discos duros seleccionados:\n\n%s\n%s\n\nEstá de acuerdo con continuar?" #: main.c:629 msgid "RAID Setup" -msgstr "" +msgstr "Configuración RAID" #: main.c:640 msgid "Your disk configuration is currently not supported." -msgstr "" +msgstr "Su configuración del disco no es compatible actualmente." #: main.c:655 msgid "Your harddisk is too small." -msgstr "" +msgstr "Su disco duro es demasiado pequeño." #: main.c:671 msgid "" "Your harddisk is very small, but you can continue without a swap partition." -msgstr "" +msgstr "Su disco duro es muy pequeño, pero se puede continuar sin una partición de intercambio." #: main.c:684 msgid "ext4 Filesystem" -msgstr "" +msgstr "Sistema de archivos ext4" #: main.c:685 msgid "ext4 Filesystem without journal" -msgstr "" +msgstr "Sistema de archivos ext4 sin diario" #: main.c:686 msgid "XFS Filesystem" -msgstr "" +msgstr "Sistema de archivos XFS" #: main.c:687 msgid "ReiserFS Filesystem" -msgstr "" +msgstr "Sistema de archivos ReiserFS" #: main.c:701 msgid "Filesystem Selection" -msgstr "" +msgstr "Selección del sistema de archivos" #: main.c:701 msgid "Please choose your filesystem:" -msgstr "" +msgstr "Por favor, seleccione su sistema de archivos:" #: main.c:712 msgid "Building RAID..." -msgstr "" +msgstr "Construyendo RAID." #: main.c:716 msgid "Unable to build the RAID." -msgstr "" +msgstr "No se ha podido construir el RAID." #: main.c:728 msgid "Partitioning disk..." -msgstr "" +msgstr "Particionando disco..." #: main.c:732 msgid "Unable to partition the disk." -msgstr "" +msgstr "No se ha podido particionar el disco." #: main.c:739 msgid "Creating filesystems..." -msgstr "" +msgstr "Creando el sistema de archivos..." #: main.c:743 msgid "Unable to create filesystems." -msgstr "" +msgstr "No se ha podido crear el sistema de archivos." #: main.c:749 msgid "Unable to mount filesystems." -msgstr "" +msgstr "No se ha podido montar el sistema de archivos." #: main.c:760 msgid "Installing the system..." -msgstr "" +msgstr "Instalando el sistema..." #: main.c:761 msgid "Unable to install the system." -msgstr "" +msgstr "No se ha podido instalar el sistema." #: main.c:777 msgid "Installing the language cache..." -msgstr "" +msgstr "Instalando la caché del idioma..." #: main.c:778 msgid "Unable to install the language cache." -msgstr "" +msgstr "No se ha podido instalar la caché del idioma." #: main.c:783 msgid "Installing the bootloader..." -msgstr "" +msgstr "Instalando el bootloader..." #: main.c:790 msgid "Unable to open /etc/default/grub for writing." -msgstr "" +msgstr "No se ha podido abrir /etc/default/grub para escritura." #: main.c:812 msgid "Unable to install the bootloader." -msgstr "" +msgstr "No se ha podido instalar el bootloader." #: main.c:826 msgid "" "A backup file has been found on the installation image.\n" "\n" "Do you want to restore the backup?" -msgstr "" +msgstr "La imagen de instalación ha encontrado una copia de seguridad.\n\n¿Quiere restaurar la copia de seguridad?" #: main.c:827 msgid "Yes" -msgstr "" +msgstr "Sí" #: main.c:827 msgid "No" -msgstr "" +msgstr "No" #: main.c:834 msgid "An error occured when the backup file was restored." -msgstr "" +msgstr "Se produjo un error cuando se restauró el archivo de copia de seguridad." #: main.c:869 msgid "Running post-install script..." -msgstr "" +msgstr "Ejecutando post-script de instalación..." #: main.c:870 msgid "Post-install script failed." -msgstr "" +msgstr "Ha fallado el Post-script de instalación." #: main.c:877 #, c-format @@ -314,16 +316,16 @@ msgid "" "%s was successfully installed!\n" "\n" "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console." -msgstr "" +msgstr "%s fue instalado con éxito!\n\nPor favor, quite cualquier medio de instalación de este sistema y pulse el botón de reinicio. Una vez reiniciado el sistema, se le pedirá configurar la red y el sistema de contraseñas. Después de eso, para acceder a la consola de configuración, deberá introducir en su navegador web https://%s:444 (o cual sea el nombre de su %s)." #: main.c:882 msgid "Congratulations!" -msgstr "" +msgstr "¡Enhorabuena!" #: main.c:882 msgid "Reboot" -msgstr "" +msgstr "Reiniciar" #: main.c:893 msgid "Setup has failed. Press Ok to reboot." -msgstr "" +msgstr "La instalación ha fallado. Pulse Aceptar para reiniciar." diff --git a/src/installer/po/fa.po b/src/installer/po/fa.po index 67d4d26..231adf4 100644 --- a/src/installer/po/fa.po +++ b/src/installer/po/fa.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Khalil Delavaran <khalil.delavaran(a)gmail.com>, 2014 +# Khalil Delavaran <khalil.delavaran(a)gmail.com>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-05 01:29+0000\n" -"PO-Revision-Date: 2014-11-12 18:37+0000\n" +"PO-Revision-Date: 2015-01-26 07:48+0000\n" "Last-Translator: Khalil Delavaran <khalil.delavaran(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/ipfire/language/fa/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgid "" "No source drive could be found.\n" "\n" "You can try downloading the required installation image." -msgstr "" +msgstr "درایو منبع پیدا نشد.\n\nشما می توانید ایمیج مورد نیاز نصب را دانلود کنید. " #: main.c:456 msgid "" @@ -88,14 +88,14 @@ msgstr "دانلود ایمیج برپاسازی" #: main.c:473 msgid "Trying to start networking (DHCP)..." -msgstr "" +msgstr "تلاش برای شروع شبکه (DHCP)..." #: main.c:484 msgid "" "Networking could not be started but is required to go on with the installation.\n" "\n" "Please connect your machine to a network with a DHCP server and retry." -msgstr "" +msgstr "شبکه نمی تواند شروع کند، و رفتن به نصب ضروری می باشد.\n\nخواهشمند است سیستم را به یک شبکه با DHCP سرور وصل کرده و دوباره تلاش کنید." #: main.c:487 main.c:516 msgid "Retry" @@ -108,7 +108,7 @@ msgstr "در حال دانلود ایمیج برای برپا سازی..." #: main.c:510 #, c-format msgid "MD5 checksum mismatch" -msgstr "" +msgstr "ناهماهنگی در کنرل جمعی MD5" #: main.c:513 #, c-format @@ -191,7 +191,7 @@ msgstr "پیکربندی RAID" #: main.c:640 msgid "Your disk configuration is currently not supported." -msgstr "" +msgstr "پیکربندی دیسک شما پشتیبانی نمی شود." #: main.c:655 msgid "Your harddisk is too small." @@ -287,7 +287,7 @@ msgid "" "A backup file has been found on the installation image.\n" "\n" "Do you want to restore the backup?" -msgstr "" +msgstr "یک فایل بک آپ در ایمیج نصب پیدا شد.\n\nآیا می خواهید بک آپ را بازیابی کنید؟" #: main.c:827 msgid "Yes" @@ -299,15 +299,15 @@ msgstr "خیر" #: main.c:834 msgid "An error occured when the backup file was restored." -msgstr "" +msgstr "در هنگامه بازیابی فایل بک آپ شکستی رخ داده است." #: main.c:869 msgid "Running post-install script..." -msgstr "" +msgstr "اجرای اسکریپت پس از نصب ..." #: main.c:870 msgid "Post-install script failed." -msgstr "" +msgstr "اسکریپت پس از نصب شکست خورد." #: main.c:877 #, c-format diff --git a/src/installer/po/hr.po b/src/installer/po/hr.po index 3b67c36..3638f10 100644 --- a/src/installer/po/hr.po +++ b/src/installer/po/hr.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-05 01:29+0000\n" -"PO-Revision-Date: 2014-11-05 01:33+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-01-26 12:07+0000\n" +"Last-Translator: Blago Culjak <blago.culjak(a)hotmail.com>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/ipfire/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +32,7 @@ msgstr "Prihvaćam ovu licencu" #: main.c:384 msgid "Warning: Unattended installation will start in 10 seconds..." -msgstr "" +msgstr "Upozoranje: Nenadgledana instalacija će započeti za 10 sekundi..." #: main.c:403 msgid "Language selection" @@ -44,7 +44,7 @@ msgstr "Odaberite jezik koji želite koristiti za instalaciju." #: main.c:418 msgid "Unattended mode" -msgstr "" +msgstr "Nenadgledana instalacija" #: main.c:420 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" @@ -65,7 +65,7 @@ msgstr "Pokrenite instalaciju" #: main.c:449 #, c-format msgid "The installer will now try downloading the installation image." -msgstr "" +msgstr "Instalacija će pokušati preuzeti instalacijsku sliku." #: main.c:452 #, c-format @@ -73,41 +73,41 @@ msgid "" "No source drive could be found.\n" "\n" "You can try downloading the required installation image." -msgstr "" +msgstr "Izvorišni pogon nije pronađen.\n\nMožete pokušati preuzeti instalacijsku sliku." #: main.c:456 msgid "" "Please make sure to connect your machine to a network and the installer will" " try connect to acquire an IP address." -msgstr "" +msgstr "Provjerite da li ste priključeni na mrežu, instalacija će pokušati dobiti IP adresu." #: main.c:460 msgid "Download installation image" -msgstr "" +msgstr "Preuzimanje instalacijske slike" #: main.c:473 msgid "Trying to start networking (DHCP)..." -msgstr "" +msgstr "Pokušaj starta mreže (DHCP)..." #: main.c:484 msgid "" "Networking could not be started but is required to go on with the installation.\n" "\n" "Please connect your machine to a network with a DHCP server and retry." -msgstr "" +msgstr "Mreža nije mogla biti pokrenuta a obvezna je za nastavak instalacije. \n\nPriključite se na mrežu s omogućenim DHCPom i pokušajte ponovno." #: main.c:487 main.c:516 msgid "Retry" -msgstr "" +msgstr "Ponovno" #: main.c:501 msgid "Downloading installation image..." -msgstr "" +msgstr "Preuzimanje instalacijske slike" #: main.c:510 #, c-format msgid "MD5 checksum mismatch" -msgstr "" +msgstr "MD5 checksum se ne podudara" #: main.c:513 #, c-format @@ -116,14 +116,14 @@ msgid "" " Reason: %s\n" "\n" "%s" -msgstr "" +msgstr "Instalacijska slika nije preuzeta.\n Razlog: %s\n\n%s" #: main.c:528 #, c-format msgid "" "Could not mount %s to %s:\n" " %s\n" -msgstr "" +msgstr "Nemogu monitari %s na %s:\n %s\n" #: main.c:543 msgid "License Agreement" @@ -190,7 +190,7 @@ msgstr "Postavljanje RAIDa" #: main.c:640 msgid "Your disk configuration is currently not supported." -msgstr "" +msgstr "Vaša diskovna konfiguracija nije podržana." #: main.c:655 msgid "Your harddisk is too small." @@ -286,27 +286,27 @@ msgid "" "A backup file has been found on the installation image.\n" "\n" "Do you want to restore the backup?" -msgstr "" +msgstr "Pričuvna kopija je pronađena na instalacijskoj slici.\n\nDa li želite povratiti kopiju?" #: main.c:827 msgid "Yes" -msgstr "" +msgstr "Da" #: main.c:827 msgid "No" -msgstr "" +msgstr "Ne" #: main.c:834 msgid "An error occured when the backup file was restored." -msgstr "" +msgstr "Greška pri povratu pričuvne kopije." #: main.c:869 msgid "Running post-install script..." -msgstr "" +msgstr "Izvodim post-instalacijske skripte." #: main.c:870 msgid "Post-install script failed." -msgstr "" +msgstr "Post-instalacijske skripte nisu uspješno izvršene." #: main.c:877 #, c-format diff --git a/src/installer/po/jv.po b/src/installer/po/jv.po new file mode 100644 index 0000000..333dea3 --- /dev/null +++ b/src/installer/po/jv.po @@ -0,0 +1,329 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR The IPFire Project (www.ipfire.org) +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: IPFire Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-11-05 01:29+0000\n" +"PO-Revision-Date: 2014-07-31 09:39+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Javanese (http://www.transifex.com/projects/p/ipfire/language/jv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: jv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893 +msgid "OK" +msgstr "" + +#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670 +#: main.c:702 +msgid "Cancel" +msgstr "" + +#: main.c:176 +msgid "I accept this license" +msgstr "" + +#: main.c:384 +msgid "Warning: Unattended installation will start in 10 seconds..." +msgstr "" + +#: main.c:403 +msgid "Language selection" +msgstr "" + +#: main.c:403 +msgid "Select the language you wish to use for the installation." +msgstr "" + +#: main.c:418 +msgid "Unattended mode" +msgstr "" + +#: main.c:420 +msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" +msgstr "" + +#: main.c:426 +#, c-format +msgid "" +"Welcome to the %s installation program.\n" +"\n" +"Selecting Cancel on any of the following screens will reboot the computer." +msgstr "" + +#: main.c:428 +msgid "Start installation" +msgstr "" + +#: main.c:449 +#, c-format +msgid "The installer will now try downloading the installation image." +msgstr "" + +#: main.c:452 +#, c-format +msgid "" +"No source drive could be found.\n" +"\n" +"You can try downloading the required installation image." +msgstr "" + +#: main.c:456 +msgid "" +"Please make sure to connect your machine to a network and the installer will" +" try connect to acquire an IP address." +msgstr "" + +#: main.c:460 +msgid "Download installation image" +msgstr "" + +#: main.c:473 +msgid "Trying to start networking (DHCP)..." +msgstr "" + +#: main.c:484 +msgid "" +"Networking could not be started but is required to go on with the installation.\n" +"\n" +"Please connect your machine to a network with a DHCP server and retry." +msgstr "" + +#: main.c:487 main.c:516 +msgid "Retry" +msgstr "" + +#: main.c:501 +msgid "Downloading installation image..." +msgstr "" + +#: main.c:510 +#, c-format +msgid "MD5 checksum mismatch" +msgstr "" + +#: main.c:513 +#, c-format +msgid "" +"The installation image could not be downloaded.\n" +" Reason: %s\n" +"\n" +"%s" +msgstr "" + +#: main.c:528 +#, c-format +msgid "" +"Could not mount %s to %s:\n" +" %s\n" +msgstr "" + +#: main.c:543 +msgid "License Agreement" +msgstr "" + +#: main.c:544 +msgid "License not accepted!" +msgstr "" + +#: main.c:566 +msgid "No hard disk found." +msgstr "" + +#: main.c:587 +msgid "Disk Selection" +msgstr "" + +#: main.c:588 +msgid "" +"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n" +"\n" +"ALL DATA ON THE DISK WILL BE DESTROYED." +msgstr "" + +#: main.c:599 +msgid "" +"No disk has been selected.\n" +"\n" +"Please select one or more disks you want to install IPFire on." +msgstr "" + +#: main.c:617 +#, c-format +msgid "" +"The installation program will now prepare the chosen harddisk:\n" +"\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:619 +msgid "Disk Setup" +msgstr "" + +#: main.c:620 main.c:630 +msgid "Delete all data" +msgstr "" + +#: main.c:627 +#, c-format +msgid "" +"The installation program will now set up a RAID configuration on the selected harddisks:\n" +"\n" +" %s\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:629 +msgid "RAID Setup" +msgstr "" + +#: main.c:640 +msgid "Your disk configuration is currently not supported." +msgstr "" + +#: main.c:655 +msgid "Your harddisk is too small." +msgstr "" + +#: main.c:671 +msgid "" +"Your harddisk is very small, but you can continue without a swap partition." +msgstr "" + +#: main.c:684 +msgid "ext4 Filesystem" +msgstr "" + +#: main.c:685 +msgid "ext4 Filesystem without journal" +msgstr "" + +#: main.c:686 +msgid "XFS Filesystem" +msgstr "" + +#: main.c:687 +msgid "ReiserFS Filesystem" +msgstr "" + +#: main.c:701 +msgid "Filesystem Selection" +msgstr "" + +#: main.c:701 +msgid "Please choose your filesystem:" +msgstr "" + +#: main.c:712 +msgid "Building RAID..." +msgstr "" + +#: main.c:716 +msgid "Unable to build the RAID." +msgstr "" + +#: main.c:728 +msgid "Partitioning disk..." +msgstr "" + +#: main.c:732 +msgid "Unable to partition the disk." +msgstr "" + +#: main.c:739 +msgid "Creating filesystems..." +msgstr "" + +#: main.c:743 +msgid "Unable to create filesystems." +msgstr "" + +#: main.c:749 +msgid "Unable to mount filesystems." +msgstr "" + +#: main.c:760 +msgid "Installing the system..." +msgstr "" + +#: main.c:761 +msgid "Unable to install the system." +msgstr "" + +#: main.c:777 +msgid "Installing the language cache..." +msgstr "" + +#: main.c:778 +msgid "Unable to install the language cache." +msgstr "" + +#: main.c:783 +msgid "Installing the bootloader..." +msgstr "" + +#: main.c:790 +msgid "Unable to open /etc/default/grub for writing." +msgstr "" + +#: main.c:812 +msgid "Unable to install the bootloader." +msgstr "" + +#: main.c:826 +msgid "" +"A backup file has been found on the installation image.\n" +"\n" +"Do you want to restore the backup?" +msgstr "" + +#: main.c:827 +msgid "Yes" +msgstr "" + +#: main.c:827 +msgid "No" +msgstr "" + +#: main.c:834 +msgid "An error occured when the backup file was restored." +msgstr "" + +#: main.c:869 +msgid "Running post-install script..." +msgstr "" + +#: main.c:870 +msgid "Post-install script failed." +msgstr "" + +#: main.c:877 +#, c-format +msgid "" +"%s was successfully installed!\n" +"\n" +"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console." +msgstr "" + +#: main.c:882 +msgid "Congratulations!" +msgstr "" + +#: main.c:882 +msgid "Reboot" +msgstr "" + +#: main.c:893 +msgid "Setup has failed. Press Ok to reboot." +msgstr "" diff --git a/src/installer/po/nl.po b/src/installer/po/nl.po index 41908ac..009e9c4 100644 --- a/src/installer/po/nl.po +++ b/src/installer/po/nl.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jacques Hylkema <j.hylkema(a)intronics.nl>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-05 01:29+0000\n" -"PO-Revision-Date: 2014-11-05 01:33+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-01-26 07:37+0000\n" +"Last-Translator: Jacques Hylkema <j.hylkema(a)intronics.nl>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/ipfire/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,36 +20,36 @@ msgstr "" #: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893 msgid "OK" -msgstr "" +msgstr "Oke" #: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670 #: main.c:702 msgid "Cancel" -msgstr "" +msgstr "Annuleren" #: main.c:176 msgid "I accept this license" -msgstr "" +msgstr "Ik accepteer deze licentie" #: main.c:384 msgid "Warning: Unattended installation will start in 10 seconds..." -msgstr "" +msgstr "Waarschuwing: Installatie zonder toezicht zal binnen 10 seconden starten..." #: main.c:403 msgid "Language selection" -msgstr "" +msgstr "Taal selectie" #: main.c:403 msgid "Select the language you wish to use for the installation." -msgstr "" +msgstr "Selecteer de taal die je wil gebruiken voor de installatie." #: main.c:418 msgid "Unattended mode" -msgstr "" +msgstr "Zonder toezicht modus" #: main.c:420 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" -msgstr "" +msgstr "<Tab>/<Alt-Tab> tussen onderdelen | <Space> selecteer | <F12> volgend scherm" #: main.c:426 #, c-format @@ -56,16 +57,16 @@ msgid "" "Welcome to the %s installation program.\n" "\n" "Selecting Cancel on any of the following screens will reboot the computer." -msgstr "" +msgstr "Welkom bij het %s installatie programma.\n\nKiezen van Annuleren op een van de volgende schermen zal de computer opnieuw laten starten." #: main.c:428 msgid "Start installation" -msgstr "" +msgstr "Start installatie" #: main.c:449 #, c-format msgid "The installer will now try downloading the installation image." -msgstr "" +msgstr "Het installatie programma zal nu proberen het installatiebestand te downloaden." #: main.c:452 #, c-format @@ -73,41 +74,41 @@ msgid "" "No source drive could be found.\n" "\n" "You can try downloading the required installation image." -msgstr "" +msgstr "Er kon geen bron-schijf worden gevonden.\n\nJe kan proberen het benodigde installatie bestand te downloaden." #: main.c:456 msgid "" "Please make sure to connect your machine to a network and the installer will" " try connect to acquire an IP address." -msgstr "" +msgstr "Verbindt uw machine aan een netwerk en het installatie programma zal proberen een IP adres te verkrijgen." #: main.c:460 msgid "Download installation image" -msgstr "" +msgstr "Download installatie bestand" #: main.c:473 msgid "Trying to start networking (DHCP)..." -msgstr "" +msgstr "Bezig met starten van het netwerk (DHCP)..." #: main.c:484 msgid "" "Networking could not be started but is required to go on with the installation.\n" "\n" "Please connect your machine to a network with a DHCP server and retry." -msgstr "" +msgstr "Netwerk kon niet worden gestart, maar is vereist om door te kunnen gaan met de installatie.\n\nKoppel je machine aan een netwerk met een DHCP server en probeer opnieuw." #: main.c:487 main.c:516 msgid "Retry" -msgstr "" +msgstr "Opnieuw" #: main.c:501 msgid "Downloading installation image..." -msgstr "" +msgstr "Bezig met downloaden van het installatie bestand..." #: main.c:510 #, c-format msgid "MD5 checksum mismatch" -msgstr "" +msgstr "MD5 checksum verschil" #: main.c:513 #, c-format @@ -116,44 +117,44 @@ msgid "" " Reason: %s\n" "\n" "%s" -msgstr "" +msgstr "Het installatie bestand kon niet worden ge-download.\nReden: %s\n\n%s" #: main.c:528 #, c-format msgid "" "Could not mount %s to %s:\n" " %s\n" -msgstr "" +msgstr "Kon %s niet aankoppelen naar %s:\n%s\n" #: main.c:543 msgid "License Agreement" -msgstr "" +msgstr "Licentie overeenkomst" #: main.c:544 msgid "License not accepted!" -msgstr "" +msgstr "Licentie niet geaccepteerd!" #: main.c:566 msgid "No hard disk found." -msgstr "" +msgstr "Geen harde schijf gevonden." #: main.c:587 msgid "Disk Selection" -msgstr "" +msgstr "Schijf selectie" #: main.c:588 msgid "" "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n" "\n" "ALL DATA ON THE DISK WILL BE DESTROYED." -msgstr "" +msgstr "Selecteer de schijf/schijven waarop je IPFire op wil installeren. Deze zullen eerst worden gepartitioneerd, waarna er een bestandssysteem op zal worden gezet.\n\nALLE HUIDIGE GEGEVENS OP DE SCHIJF ZULLEN WORDEN VERNIETIGD. " #: main.c:599 msgid "" "No disk has been selected.\n" "\n" "Please select one or more disks you want to install IPFire on." -msgstr "" +msgstr "Er is geen schijf geselecteerd.\n\nSelecteer een of meerdere schijven waarop je IPFire op wil installeren." #: main.c:617 #, c-format @@ -163,15 +164,15 @@ msgid "" " %s\n" "\n" "Do you agree to continue?" -msgstr "" +msgstr "Het installatie programma zal nu de geselecteerde harde schijf voorbereiden:\n\n%s\n\nGa je ermee accoord om door te gaan?" #: main.c:619 msgid "Disk Setup" -msgstr "" +msgstr "Schijf configuratie" #: main.c:620 main.c:630 msgid "Delete all data" -msgstr "" +msgstr "Verwijder alle gegevens" #: main.c:627 #, c-format @@ -182,131 +183,131 @@ msgid "" " %s\n" "\n" "Do you agree to continue?" -msgstr "" +msgstr "Het installatie programma zal nu een RAID configureren op de geselecteerde harde schijven:\n\n%s\n%s\n\nGa je ermee accoord om door te gaan?" #: main.c:629 msgid "RAID Setup" -msgstr "" +msgstr "RAID configuratie" #: main.c:640 msgid "Your disk configuration is currently not supported." -msgstr "" +msgstr "Je schijf configuratie wordt momenteel niet ondersteund." #: main.c:655 msgid "Your harddisk is too small." -msgstr "" +msgstr "Je harde schijf is te klein." #: main.c:671 msgid "" "Your harddisk is very small, but you can continue without a swap partition." -msgstr "" +msgstr "Je harde schijf is erg klein, maar je kan doorgaan zonder een swap partitie." #: main.c:684 msgid "ext4 Filesystem" -msgstr "" +msgstr "ext4 bestandssysteem" #: main.c:685 msgid "ext4 Filesystem without journal" -msgstr "" +msgstr "ext4 bestandssysteem zonder journaal" #: main.c:686 msgid "XFS Filesystem" -msgstr "" +msgstr "XFS bestandssysteem" #: main.c:687 msgid "ReiserFS Filesystem" -msgstr "" +msgstr "ReiserFS bestandssysteem" #: main.c:701 msgid "Filesystem Selection" -msgstr "" +msgstr "Bestandssysteem selectie" #: main.c:701 msgid "Please choose your filesystem:" -msgstr "" +msgstr "Kies uw bestandssysteem:" #: main.c:712 msgid "Building RAID..." -msgstr "" +msgstr "Opbouwen RAID..." #: main.c:716 msgid "Unable to build the RAID." -msgstr "" +msgstr "Kon RAID niet opbouwen." #: main.c:728 msgid "Partitioning disk..." -msgstr "" +msgstr "Bezig met partitioneren van de schijf" #: main.c:732 msgid "Unable to partition the disk." -msgstr "" +msgstr "Kon schijf niet partitioneren." #: main.c:739 msgid "Creating filesystems..." -msgstr "" +msgstr "Bezig met creëren bestandssystemen" #: main.c:743 msgid "Unable to create filesystems." -msgstr "" +msgstr "Kon bestandssystemen niet creëren." #: main.c:749 msgid "Unable to mount filesystems." -msgstr "" +msgstr "Kon bestandssystemen niet aankoppelen." #: main.c:760 msgid "Installing the system..." -msgstr "" +msgstr "Bezig met de installatie van het systeem..." #: main.c:761 msgid "Unable to install the system." -msgstr "" +msgstr "Kon het systeem niet installeren." #: main.c:777 msgid "Installing the language cache..." -msgstr "" +msgstr "Bezig met installeren van de taal-cache..." #: main.c:778 msgid "Unable to install the language cache." -msgstr "" +msgstr "Kon de taal-cache niet installeren." #: main.c:783 msgid "Installing the bootloader..." -msgstr "" +msgstr "Bezig met installeren van de bootloader" #: main.c:790 msgid "Unable to open /etc/default/grub for writing." -msgstr "" +msgstr "Kan /etc/default/grub niet openen met schrijfrechten" #: main.c:812 msgid "Unable to install the bootloader." -msgstr "" +msgstr "Kon de bootloader niet installeren." #: main.c:826 msgid "" "A backup file has been found on the installation image.\n" "\n" "Do you want to restore the backup?" -msgstr "" +msgstr "Er is een backup bestand gevonden op de installatie disk.\n\nWil je deze backup terugzetten?" #: main.c:827 msgid "Yes" -msgstr "" +msgstr "Ja" #: main.c:827 msgid "No" -msgstr "" +msgstr "Nee" #: main.c:834 msgid "An error occured when the backup file was restored." -msgstr "" +msgstr "Er is een fout opgetreden bij het terugzetten van de backup." #: main.c:869 msgid "Running post-install script..." -msgstr "" +msgstr "Uitvoeren post-install script..." #: main.c:870 msgid "Post-install script failed." -msgstr "" +msgstr "Fout bij uitvoeren van Post-install script" #: main.c:877 #, c-format @@ -314,16 +315,16 @@ msgid "" "%s was successfully installed!\n" "\n" "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console." -msgstr "" +msgstr "%s was met succes geïnstalleerd!\n\nVerwijder de installatie disk en druk op de reboot knop. Nadat het systeem is herstart zal je worden gevraagd om het netwerk en systeem wachtwoorden in te stellen. Daarna moet je in je webbrowser navigeren naar https://%s:444 (of hoe je %s hebt genoemd) voor de web configuratie console." #: main.c:882 msgid "Congratulations!" -msgstr "" +msgstr "Gefeliciteerd!" #: main.c:882 msgid "Reboot" -msgstr "" +msgstr "Herstarten" #: main.c:893 msgid "Setup has failed. Press Ok to reboot." -msgstr "" +msgstr "Installatie is mislukt. Druk op OK om te herstarten." diff --git a/src/installer/po/pl.po b/src/installer/po/pl.po index 4abe195..056eea1 100644 --- a/src/installer/po/pl.po +++ b/src/installer/po/pl.po @@ -5,13 +5,14 @@ # Translators: # btelega <btelega(a)gmail.com>, 2014 # Przemysław Karpeta <przemyslaw.karpeta(a)gmail.com>, 2014 +# Przemyslaw Zdroik <zdroyer(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-05 01:29+0000\n" -"PO-Revision-Date: 2014-11-05 01:33+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-01-26 10:41+0000\n" +"Last-Translator: Przemyslaw Zdroik <zdroyer(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/ipfire/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "Akceptuje licencje" #: main.c:384 msgid "Warning: Unattended installation will start in 10 seconds..." -msgstr "" +msgstr "Ostrzeżenie: Zautomatyzowana instalacja zacznie się za 10 sekund..." #: main.c:403 msgid "Language selection" @@ -46,7 +47,7 @@ msgstr "Wybierz język jaki chcesz użyć do tej instalacji." #: main.c:418 msgid "Unattended mode" -msgstr "" +msgstr "Tryb zautomatyzowany" #: main.c:420 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" @@ -67,7 +68,7 @@ msgstr "Rozpoczynam instalację" #: main.c:449 #, c-format msgid "The installer will now try downloading the installation image." -msgstr "" +msgstr "Instalator spróbuje teraz pobrać plik obrazu instalacji." #: main.c:452 #, c-format @@ -75,41 +76,41 @@ msgid "" "No source drive could be found.\n" "\n" "You can try downloading the required installation image." -msgstr "" +msgstr "Medium źródłowe nie zostało znalezione.\n\nMożesz spróbować pobrać wymagany plik obrazu instalacji." #: main.c:456 msgid "" "Please make sure to connect your machine to a network and the installer will" " try connect to acquire an IP address." -msgstr "" +msgstr "Podłącz twój komputer do sieci a instalator spróbuje połączyć się by pobrać adres IP." #: main.c:460 msgid "Download installation image" -msgstr "" +msgstr "Pobierz pliku obrazu instalacji" #: main.c:473 msgid "Trying to start networking (DHCP)..." -msgstr "" +msgstr "Próba uruchomienia sieci (DHCP)..." #: main.c:484 msgid "" "Networking could not be started but is required to go on with the installation.\n" "\n" "Please connect your machine to a network with a DHCP server and retry." -msgstr "" +msgstr "Obsługa sieci, która jest wymagana do kontynuowania instalacji, nie mogła zostać uruchomiona \n\nPodłącz proszę twój komputer do sieci z działającym serwerem DHCP i Spróbuj ponownie." #: main.c:487 main.c:516 msgid "Retry" -msgstr "" +msgstr "Spróbuj ponownie" #: main.c:501 msgid "Downloading installation image..." -msgstr "" +msgstr "Pobieranie pliku obrazu instalacji..." #: main.c:510 #, c-format msgid "MD5 checksum mismatch" -msgstr "" +msgstr "Niezgodność sumy kontrolnej MD5" #: main.c:513 #, c-format @@ -118,14 +119,14 @@ msgid "" " Reason: %s\n" "\n" "%s" -msgstr "" +msgstr "Plik obrazu instalacji nie został pobrany\nPrzyczyna: %s\n\n%s" #: main.c:528 #, c-format msgid "" "Could not mount %s to %s:\n" " %s\n" -msgstr "" +msgstr "Nie można zamontować %s w %s:\n%s \n" #: main.c:543 msgid "License Agreement" @@ -192,7 +193,7 @@ msgstr "Konfiguracja RAID" #: main.c:640 msgid "Your disk configuration is currently not supported." -msgstr "" +msgstr "Twoja konfiguracja dysku nie jest aktualnie obsługiwana. " #: main.c:655 msgid "Your harddisk is too small." @@ -205,11 +206,11 @@ msgstr "Dysk twardy jest bardzo mały, ale można kontynuować bez partycji swap #: main.c:684 msgid "ext4 Filesystem" -msgstr "ext4 Filesystem" +msgstr "system plików ext4 " #: main.c:685 msgid "ext4 Filesystem without journal" -msgstr "ext4 Filesystem bez dziennika" +msgstr "system plików ext4 bez dziennika" #: main.c:686 msgid "XFS Filesystem" @@ -288,27 +289,27 @@ msgid "" "A backup file has been found on the installation image.\n" "\n" "Do you want to restore the backup?" -msgstr "" +msgstr "Plik kopii zapasowej został odnaleziony w obrazie instalacji.\n\nCzy chcesz przywrócić informację ze znalezionej kopii zapasowej? " #: main.c:827 msgid "Yes" -msgstr "" +msgstr "Tak" #: main.c:827 msgid "No" -msgstr "" +msgstr "Nie" #: main.c:834 msgid "An error occured when the backup file was restored." -msgstr "" +msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej." #: main.c:869 msgid "Running post-install script..." -msgstr "" +msgstr "Działanie skryptu post-instalacyjnego..." #: main.c:870 msgid "Post-install script failed." -msgstr "" +msgstr "Skrypt post-instalacyjny zawiódł." #: main.c:877 #, c-format diff --git a/src/installer/po/ru_RU.po b/src/installer/po/ru_RU.po new file mode 100644 index 0000000..83ee576 --- /dev/null +++ b/src/installer/po/ru_RU.po @@ -0,0 +1,329 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR The IPFire Project (www.ipfire.org) +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: IPFire Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-11-05 01:29+0000\n" +"PO-Revision-Date: 2014-07-31 09:39+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/ipfire/language/ru_RU/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru_RU\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893 +msgid "OK" +msgstr "" + +#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670 +#: main.c:702 +msgid "Cancel" +msgstr "" + +#: main.c:176 +msgid "I accept this license" +msgstr "" + +#: main.c:384 +msgid "Warning: Unattended installation will start in 10 seconds..." +msgstr "" + +#: main.c:403 +msgid "Language selection" +msgstr "" + +#: main.c:403 +msgid "Select the language you wish to use for the installation." +msgstr "" + +#: main.c:418 +msgid "Unattended mode" +msgstr "" + +#: main.c:420 +msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" +msgstr "" + +#: main.c:426 +#, c-format +msgid "" +"Welcome to the %s installation program.\n" +"\n" +"Selecting Cancel on any of the following screens will reboot the computer." +msgstr "" + +#: main.c:428 +msgid "Start installation" +msgstr "" + +#: main.c:449 +#, c-format +msgid "The installer will now try downloading the installation image." +msgstr "" + +#: main.c:452 +#, c-format +msgid "" +"No source drive could be found.\n" +"\n" +"You can try downloading the required installation image." +msgstr "" + +#: main.c:456 +msgid "" +"Please make sure to connect your machine to a network and the installer will" +" try connect to acquire an IP address." +msgstr "" + +#: main.c:460 +msgid "Download installation image" +msgstr "" + +#: main.c:473 +msgid "Trying to start networking (DHCP)..." +msgstr "" + +#: main.c:484 +msgid "" +"Networking could not be started but is required to go on with the installation.\n" +"\n" +"Please connect your machine to a network with a DHCP server and retry." +msgstr "" + +#: main.c:487 main.c:516 +msgid "Retry" +msgstr "" + +#: main.c:501 +msgid "Downloading installation image..." +msgstr "" + +#: main.c:510 +#, c-format +msgid "MD5 checksum mismatch" +msgstr "" + +#: main.c:513 +#, c-format +msgid "" +"The installation image could not be downloaded.\n" +" Reason: %s\n" +"\n" +"%s" +msgstr "" + +#: main.c:528 +#, c-format +msgid "" +"Could not mount %s to %s:\n" +" %s\n" +msgstr "" + +#: main.c:543 +msgid "License Agreement" +msgstr "" + +#: main.c:544 +msgid "License not accepted!" +msgstr "" + +#: main.c:566 +msgid "No hard disk found." +msgstr "" + +#: main.c:587 +msgid "Disk Selection" +msgstr "" + +#: main.c:588 +msgid "" +"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n" +"\n" +"ALL DATA ON THE DISK WILL BE DESTROYED." +msgstr "" + +#: main.c:599 +msgid "" +"No disk has been selected.\n" +"\n" +"Please select one or more disks you want to install IPFire on." +msgstr "" + +#: main.c:617 +#, c-format +msgid "" +"The installation program will now prepare the chosen harddisk:\n" +"\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:619 +msgid "Disk Setup" +msgstr "" + +#: main.c:620 main.c:630 +msgid "Delete all data" +msgstr "" + +#: main.c:627 +#, c-format +msgid "" +"The installation program will now set up a RAID configuration on the selected harddisks:\n" +"\n" +" %s\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:629 +msgid "RAID Setup" +msgstr "" + +#: main.c:640 +msgid "Your disk configuration is currently not supported." +msgstr "" + +#: main.c:655 +msgid "Your harddisk is too small." +msgstr "" + +#: main.c:671 +msgid "" +"Your harddisk is very small, but you can continue without a swap partition." +msgstr "" + +#: main.c:684 +msgid "ext4 Filesystem" +msgstr "" + +#: main.c:685 +msgid "ext4 Filesystem without journal" +msgstr "" + +#: main.c:686 +msgid "XFS Filesystem" +msgstr "" + +#: main.c:687 +msgid "ReiserFS Filesystem" +msgstr "" + +#: main.c:701 +msgid "Filesystem Selection" +msgstr "" + +#: main.c:701 +msgid "Please choose your filesystem:" +msgstr "" + +#: main.c:712 +msgid "Building RAID..." +msgstr "" + +#: main.c:716 +msgid "Unable to build the RAID." +msgstr "" + +#: main.c:728 +msgid "Partitioning disk..." +msgstr "" + +#: main.c:732 +msgid "Unable to partition the disk." +msgstr "" + +#: main.c:739 +msgid "Creating filesystems..." +msgstr "" + +#: main.c:743 +msgid "Unable to create filesystems." +msgstr "" + +#: main.c:749 +msgid "Unable to mount filesystems." +msgstr "" + +#: main.c:760 +msgid "Installing the system..." +msgstr "" + +#: main.c:761 +msgid "Unable to install the system." +msgstr "" + +#: main.c:777 +msgid "Installing the language cache..." +msgstr "" + +#: main.c:778 +msgid "Unable to install the language cache." +msgstr "" + +#: main.c:783 +msgid "Installing the bootloader..." +msgstr "" + +#: main.c:790 +msgid "Unable to open /etc/default/grub for writing." +msgstr "" + +#: main.c:812 +msgid "Unable to install the bootloader." +msgstr "" + +#: main.c:826 +msgid "" +"A backup file has been found on the installation image.\n" +"\n" +"Do you want to restore the backup?" +msgstr "" + +#: main.c:827 +msgid "Yes" +msgstr "" + +#: main.c:827 +msgid "No" +msgstr "" + +#: main.c:834 +msgid "An error occured when the backup file was restored." +msgstr "" + +#: main.c:869 +msgid "Running post-install script..." +msgstr "" + +#: main.c:870 +msgid "Post-install script failed." +msgstr "" + +#: main.c:877 +#, c-format +msgid "" +"%s was successfully installed!\n" +"\n" +"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console." +msgstr "" + +#: main.c:882 +msgid "Congratulations!" +msgstr "" + +#: main.c:882 +msgid "Reboot" +msgstr "" + +#: main.c:893 +msgid "Setup has failed. Press Ok to reboot." +msgstr "" diff --git a/src/installer/po/su.po b/src/installer/po/su.po new file mode 100644 index 0000000..758c337 --- /dev/null +++ b/src/installer/po/su.po @@ -0,0 +1,329 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR The IPFire Project (www.ipfire.org) +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: IPFire Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-11-05 01:29+0000\n" +"PO-Revision-Date: 2014-07-31 09:39+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Sundanese (http://www.transifex.com/projects/p/ipfire/language/su/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: su\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893 +msgid "OK" +msgstr "" + +#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670 +#: main.c:702 +msgid "Cancel" +msgstr "" + +#: main.c:176 +msgid "I accept this license" +msgstr "" + +#: main.c:384 +msgid "Warning: Unattended installation will start in 10 seconds..." +msgstr "" + +#: main.c:403 +msgid "Language selection" +msgstr "" + +#: main.c:403 +msgid "Select the language you wish to use for the installation." +msgstr "" + +#: main.c:418 +msgid "Unattended mode" +msgstr "" + +#: main.c:420 +msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" +msgstr "" + +#: main.c:426 +#, c-format +msgid "" +"Welcome to the %s installation program.\n" +"\n" +"Selecting Cancel on any of the following screens will reboot the computer." +msgstr "" + +#: main.c:428 +msgid "Start installation" +msgstr "" + +#: main.c:449 +#, c-format +msgid "The installer will now try downloading the installation image." +msgstr "" + +#: main.c:452 +#, c-format +msgid "" +"No source drive could be found.\n" +"\n" +"You can try downloading the required installation image." +msgstr "" + +#: main.c:456 +msgid "" +"Please make sure to connect your machine to a network and the installer will" +" try connect to acquire an IP address." +msgstr "" + +#: main.c:460 +msgid "Download installation image" +msgstr "" + +#: main.c:473 +msgid "Trying to start networking (DHCP)..." +msgstr "" + +#: main.c:484 +msgid "" +"Networking could not be started but is required to go on with the installation.\n" +"\n" +"Please connect your machine to a network with a DHCP server and retry." +msgstr "" + +#: main.c:487 main.c:516 +msgid "Retry" +msgstr "" + +#: main.c:501 +msgid "Downloading installation image..." +msgstr "" + +#: main.c:510 +#, c-format +msgid "MD5 checksum mismatch" +msgstr "" + +#: main.c:513 +#, c-format +msgid "" +"The installation image could not be downloaded.\n" +" Reason: %s\n" +"\n" +"%s" +msgstr "" + +#: main.c:528 +#, c-format +msgid "" +"Could not mount %s to %s:\n" +" %s\n" +msgstr "" + +#: main.c:543 +msgid "License Agreement" +msgstr "" + +#: main.c:544 +msgid "License not accepted!" +msgstr "" + +#: main.c:566 +msgid "No hard disk found." +msgstr "" + +#: main.c:587 +msgid "Disk Selection" +msgstr "" + +#: main.c:588 +msgid "" +"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n" +"\n" +"ALL DATA ON THE DISK WILL BE DESTROYED." +msgstr "" + +#: main.c:599 +msgid "" +"No disk has been selected.\n" +"\n" +"Please select one or more disks you want to install IPFire on." +msgstr "" + +#: main.c:617 +#, c-format +msgid "" +"The installation program will now prepare the chosen harddisk:\n" +"\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:619 +msgid "Disk Setup" +msgstr "" + +#: main.c:620 main.c:630 +msgid "Delete all data" +msgstr "" + +#: main.c:627 +#, c-format +msgid "" +"The installation program will now set up a RAID configuration on the selected harddisks:\n" +"\n" +" %s\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:629 +msgid "RAID Setup" +msgstr "" + +#: main.c:640 +msgid "Your disk configuration is currently not supported." +msgstr "" + +#: main.c:655 +msgid "Your harddisk is too small." +msgstr "" + +#: main.c:671 +msgid "" +"Your harddisk is very small, but you can continue without a swap partition." +msgstr "" + +#: main.c:684 +msgid "ext4 Filesystem" +msgstr "" + +#: main.c:685 +msgid "ext4 Filesystem without journal" +msgstr "" + +#: main.c:686 +msgid "XFS Filesystem" +msgstr "" + +#: main.c:687 +msgid "ReiserFS Filesystem" +msgstr "" + +#: main.c:701 +msgid "Filesystem Selection" +msgstr "" + +#: main.c:701 +msgid "Please choose your filesystem:" +msgstr "" + +#: main.c:712 +msgid "Building RAID..." +msgstr "" + +#: main.c:716 +msgid "Unable to build the RAID." +msgstr "" + +#: main.c:728 +msgid "Partitioning disk..." +msgstr "" + +#: main.c:732 +msgid "Unable to partition the disk." +msgstr "" + +#: main.c:739 +msgid "Creating filesystems..." +msgstr "" + +#: main.c:743 +msgid "Unable to create filesystems." +msgstr "" + +#: main.c:749 +msgid "Unable to mount filesystems." +msgstr "" + +#: main.c:760 +msgid "Installing the system..." +msgstr "" + +#: main.c:761 +msgid "Unable to install the system." +msgstr "" + +#: main.c:777 +msgid "Installing the language cache..." +msgstr "" + +#: main.c:778 +msgid "Unable to install the language cache." +msgstr "" + +#: main.c:783 +msgid "Installing the bootloader..." +msgstr "" + +#: main.c:790 +msgid "Unable to open /etc/default/grub for writing." +msgstr "" + +#: main.c:812 +msgid "Unable to install the bootloader." +msgstr "" + +#: main.c:826 +msgid "" +"A backup file has been found on the installation image.\n" +"\n" +"Do you want to restore the backup?" +msgstr "" + +#: main.c:827 +msgid "Yes" +msgstr "" + +#: main.c:827 +msgid "No" +msgstr "" + +#: main.c:834 +msgid "An error occured when the backup file was restored." +msgstr "" + +#: main.c:869 +msgid "Running post-install script..." +msgstr "" + +#: main.c:870 +msgid "Post-install script failed." +msgstr "" + +#: main.c:877 +#, c-format +msgid "" +"%s was successfully installed!\n" +"\n" +"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console." +msgstr "" + +#: main.c:882 +msgid "Congratulations!" +msgstr "" + +#: main.c:882 +msgid "Reboot" +msgstr "" + +#: main.c:893 +msgid "Setup has failed. Press Ok to reboot." +msgstr "" diff --git a/src/setup/po/es.po b/src/setup/po/es.po index 53fa0b3..060dd2d 100644 --- a/src/setup/po/es.po +++ b/src/setup/po/es.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Roberto Peña <roberto.pena(a)northsecure.es>, 2015 +# Roberto Peña <roberto.pena(a)northsecure.es>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2014-08-21 15:13+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-02-01 09:37+0000\n" +"Last-Translator: Roberto Peña <roberto.pena(a)northsecure.es>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/ipfire/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,31 +21,31 @@ msgstr "" #: dhcp.c:50 msgid "Start address:" -msgstr "" +msgstr "Dirección inicial:" #: dhcp.c:51 msgid "End address:" -msgstr "" +msgstr "Dirección final:" #: dhcp.c:52 networking.c:717 msgid "Primary DNS:" -msgstr "" +msgstr "DNS primario:" #: dhcp.c:53 networking.c:723 msgid "Secondary DNS:" -msgstr "" +msgstr "DNS secundario:" #: dhcp.c:54 msgid "Default lease (mins):" -msgstr "" +msgstr "Concesión por defecto (mins):" #: dhcp.c:55 msgid "Max lease (mins):" -msgstr "" +msgstr "Concesión máxima (mins):" #: dhcp.c:56 msgid "Domain name suffix:" -msgstr "" +msgstr "Sufijo del nombre de dominio:" #: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70 #: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704 @@ -51,19 +53,19 @@ msgstr "" #: networking.c:442 networking.c:552 networking.c:603 networking.c:610 #: networking.c:713 timezone.c:63 msgid "Unable to open settings file" -msgstr "" +msgstr "No se puede abrir archivo de configuración" #: dhcp.c:111 msgid "DHCP server configuration" -msgstr "" +msgstr "Configuración del servidor DHCP" #: dhcp.c:116 msgid "Configure the DHCP server by entering the settings information." -msgstr "" +msgstr "Configurar el servidor DHCP mediante la introducción de la información de configuración." #: dhcp.c:125 msgid "Enabled" -msgstr "" +msgstr "Habilitado" #: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172 #: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163 @@ -71,367 +73,367 @@ msgstr "" #: networking.c:642 networking.c:653 networking.c:746 passwords.c:89 #: timezone.c:78 msgid "OK" -msgstr "" +msgstr "Ok" #: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158 #: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305 #: networking.c:410 networking.c:560 networking.c:653 networking.c:746 #: passwords.c:89 timezone.c:78 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #: dhcp.c:156 msgid "" "The following fields are invalid:\n" "\n" -msgstr "" +msgstr "Los siguientes campos son inválidos:\n\n" #: dhcp.c:159 msgid "Start address" -msgstr "" +msgstr "Dirección de inicio" #: dhcp.c:165 msgid "End address" -msgstr "" +msgstr "Dirección final" #: dhcp.c:173 networking.c:755 msgid "Primary DNS" -msgstr "" +msgstr "DNS primario" #: dhcp.c:182 networking.c:764 msgid "Secondary DNS" -msgstr "" +msgstr "DNS secundario" #: dhcp.c:189 msgid "Default lease time" -msgstr "" +msgstr "Tiempo de concesión por defecto" #: dhcp.c:195 msgid "Max. lease time" -msgstr "" +msgstr "Concesión máx. de tiempo" #: domainname.c:42 main.c:70 msgid "Domain name" -msgstr "" +msgstr "Nombre de dominio" #: domainname.c:42 msgid "Enter Domain name" -msgstr "" +msgstr "Introduzca el nombre de dominio" #: domainname.c:48 msgid "Domain name cannot be empty." -msgstr "" +msgstr "El nombre de dominio no puede estar vacio." #: domainname.c:50 msgid "Domain name cannot contain spaces." -msgstr "" +msgstr "El nombre de dominio no puede contener espacios." #: domainname.c:53 msgid "Domain name may only contain letters, numbers, hyphens and periods." -msgstr "" +msgstr "El nombre de dominio sólo puede contener letras, números, guiones y puntos." #: hostname.c:46 main.c:69 msgid "Hostname" -msgstr "" +msgstr "Nombre de host" #: hostname.c:46 msgid "Enter the machine's hostname." -msgstr "" +msgstr "Introduzca el nombre de host de la máquina." #: hostname.c:53 msgid "Hostname cannot be empty." -msgstr "" +msgstr "El nombre de host no puede estar vacio." #: hostname.c:55 msgid "Hostname cannot contain spaces." -msgstr "" +msgstr "El nombre de host no puede contener espacios." #: hostname.c:58 msgid "Hostname may only contain letters, numbers and hyphens." -msgstr "" +msgstr "El nombre de host sólo puede contener letras, números y guiones." #: keymap.c:84 main.c:67 msgid "Keyboard mapping" -msgstr "" +msgstr "Mapa del teclado" #: keymap.c:85 msgid "Choose the type of keyboard you are using from the list below." -msgstr "" +msgstr "Elija el tipo de teclado que está utilizando de la lista de abajo." #: main.c:68 timezone.c:77 msgid "Timezone" -msgstr "" +msgstr "Zona horaria" #: main.c:71 networking.c:110 networking.c:115 networking.c:447 msgid "Networking" -msgstr "" +msgstr "Networking" #: main.c:72 misc.c:147 msgid "ISDN" -msgstr "" +msgstr "RDSI" #: main.c:73 msgid "'root' password" -msgstr "" +msgstr "Contraseña de 'root'" #: main.c:74 msgid "'admin' password" -msgstr "" +msgstr "Contraseña de 'admin'" #: main.c:90 msgid " <Tab>/<Alt-Tab> between elements | <Space> selects" -msgstr "" +msgstr "<Tab>/<Alt-Tab> entre elementos | <Space> seleccionar" #: main.c:97 msgid "Section menu" -msgstr "" +msgstr "Menú de las secciones" #: main.c:98 msgid "Select the item you wish to configure." -msgstr "" +msgstr "Seleccione el elemento que desea configurar." #: main.c:99 msgid "Quit" -msgstr "" +msgstr "Salir" #: main.c:172 msgid "Setup is complete." -msgstr "" +msgstr "La instalación está completa." #: main.c:174 netstuff.c:733 networking.c:560 networking.c:653 msgid "Warning" -msgstr "" +msgstr "Advertencia" #: main.c:175 msgid "" "Initial setup was not entirely complete. You must ensure that Setup is " "properly finished by running setup again at the shell." -msgstr "" +msgstr "La instalación inicial no ha sido completada enteramente. Debe asegurarse que está correctamente finalizada ejecutando la instalación en el shell." #: misc.c:62 #, c-format msgid "Unable to write %s/main/hostname.conf" -msgstr "" +msgstr "No se puede escribir %s/main/hostname.conf" #: misc.c:71 msgid "Unable to open main hosts file." -msgstr "" +msgstr "No se puede abrir archivo principal host." #: misc.c:76 msgid "Unable to write /etc/hosts." -msgstr "" +msgstr "No se puede escribir /etc/hosts." #: misc.c:117 msgid "Unable to write /etc/hosts.deny." -msgstr "" +msgstr "No se puede escribir /etc/hosts.deny." #: misc.c:125 msgid "Unable to write /etc/hosts.allow." -msgstr "" +msgstr "No se puede escribir /etc/hosts.allow." #: misc.c:136 msgid "Unable to set hostname." -msgstr "" +msgstr "No se puede establecer el nombre del host." #: misc.c:147 msgid "Scanning and configuring ISDN devices." -msgstr "" +msgstr "Escaneando y configurando los dispositivos RDSI." #: misc.c:148 msgid "Unable to scan for ISDN devices." -msgstr "" +msgstr "Incapaz de buscar los dispositivos RDSI." #: netstuff.c:86 #, c-format msgid "Interface - %s" -msgstr "" +msgstr "Interfaz - %s" #: netstuff.c:91 #, c-format msgid "Enter the IP address information for the %s interface." -msgstr "" +msgstr "Introduzca la información de la dirección IP para la interfaz %s." #: netstuff.c:103 msgid "Static" -msgstr "" +msgstr "Estático" #: netstuff.c:104 msgid "DHCP" -msgstr "" +msgstr "DHCP" #: netstuff.c:105 msgid "PPP DIALUP (PPPoE, modem, ATM ...)" -msgstr "" +msgstr "PPP DIALUP (PPPoE, modem, ATM ...)" #: netstuff.c:113 msgid "DHCP Hostname:" -msgstr "" +msgstr "Nombre del host DHCP:" #: netstuff.c:115 msgid "Force DHCP MTU:" -msgstr "" +msgstr "Forzar DHCP MTU:" #: netstuff.c:134 msgid "IP address:" -msgstr "" +msgstr "Dirección IP:" #: netstuff.c:146 msgid "Network mask:" -msgstr "" +msgstr "Máscara de red:" #: netstuff.c:173 networking.c:749 msgid "The following fields are invalid:" -msgstr "" +msgstr "Los siguientes campos son inválidos:" #: netstuff.c:183 msgid "IP address" -msgstr "" +msgstr "Dirección IP" #: netstuff.c:189 msgid "Network mask" -msgstr "" +msgstr "Máscara de red" #: netstuff.c:198 msgid "DHCP hostname" -msgstr "" +msgstr "Nombre del host DHCP" #: netstuff.c:396 netstuff.c:709 msgid "Unset" -msgstr "" +msgstr "No definido" #: netstuff.c:669 #, c-format msgid "Please choose a networkcard for the following interface - %s." -msgstr "" +msgstr "Por favor elija una tarjeta de red para la siguiente interfaz - %s." #: netstuff.c:672 msgid "Extended Network Menu" -msgstr "" +msgstr "Menú Extendido de Red" #: netstuff.c:673 networking.c:520 msgid "Select" -msgstr "" +msgstr "Seleccionar" #: netstuff.c:673 msgid "Identify" -msgstr "" +msgstr "Identificar" #: netstuff.c:678 msgid "Device Identification" -msgstr "" +msgstr "Identificación del dispositivo" #: netstuff.c:678 msgid "The lights on the selected port should flash now for 10 seconds..." -msgstr "" +msgstr "Las luces en el puerto seleccionado deben parpadear ahora durante 10 segundos ..." #: netstuff.c:679 msgid "Identification is not supported by this interface." -msgstr "" +msgstr "La identificación no es compatible con esta interfaz." #: netstuff.c:691 msgid "There are no unassigned interfaces on your system." -msgstr "" +msgstr "No hay interfaces no asignadas en el sistema." #: netstuff.c:732 #, c-format msgid "Do you really want to remove the assigned %s interface?" -msgstr "" +msgstr "¿Realmente desea eliminar la interfaz asignada %s?" #: netstuff.c:755 msgid "Select network driver" -msgstr "" +msgstr "Seleccionar controlador de red" #: netstuff.c:755 msgid "Set additional module parameters" -msgstr "" +msgstr "Establecer parámetros de los módulos adicionales" #: netstuff.c:762 msgid "Loading module..." -msgstr "" +msgstr "Leyendo módulo..." #: netstuff.c:777 msgid "Unable to load driver module." -msgstr "" +msgstr "No se puede cargar el módulo controlador." #: netstuff.c:780 msgid "Module name cannot be blank." -msgstr "" +msgstr "Nombre del módulo no puede estar en blanco." #: networking.c:110 msgid "Stopping network..." -msgstr "" +msgstr "Deteniendo la red..." #: networking.c:115 msgid "Restarting network..." -msgstr "" +msgstr "Reiniciando la red..." #: networking.c:146 msgid "No GREEN interface assigned." -msgstr "" +msgstr "No asignada la interfaz GREEN." #: networking.c:152 msgid "Missing an IP address on GREEN." -msgstr "" +msgstr "Falta la dirección IP en GREEN." #: networking.c:163 msgid "Error" -msgstr "" +msgstr "Error" #: networking.c:163 msgid "Ignore" -msgstr "" +msgstr "Ignorar" #: networking.c:164 msgid "No RED interface assigned." -msgstr "" +msgstr "No asignada la interfaz RED." #: networking.c:173 msgid "Missing an IP address on RED." -msgstr "" +msgstr "Falta la dirección IP en RED." #: networking.c:183 msgid "No ORANGE interface assigned." -msgstr "" +msgstr "No asignada la interfaz ORANGE." #: networking.c:189 msgid "Missing an IP address on ORANGE." -msgstr "" +msgstr "Falta la dirección IP en ORANGE." #: networking.c:199 msgid "No BLUE interface assigned." -msgstr "" +msgstr "No asignada la interfaz BLUE." #: networking.c:205 msgid "Missing an IP address on BLUE." -msgstr "" +msgstr "Falta la dirección IP en BLUE." #: networking.c:217 msgid "Misssing DNS." -msgstr "" +msgstr "Falta DNS." #: networking.c:224 msgid "Missing Default Gateway." -msgstr "" +msgstr "Falta Puerta de Enlace predeterminada." #: networking.c:237 networking.c:304 msgid "Network configuration type" -msgstr "" +msgstr "Tipo de configuración de red" #: networking.c:238 networking.c:409 msgid "Drivers and card assignments" -msgstr "" +msgstr "Asignación de controladores y tarjetas" #: networking.c:239 networking.c:640 msgid "Address settings" -msgstr "" +msgstr "Configuración de dirección" #: networking.c:240 networking.c:743 msgid "DNS and Gateway settings" -msgstr "" +msgstr "Configuración de DNS y Puerta de Enlace" #: networking.c:260 msgid "When configuration is complete, a network restart will be required." -msgstr "" +msgstr "Cuando haya finalizado la configuración, será necesario el reinicio de la red." #: networking.c:267 #, c-format @@ -439,15 +441,15 @@ msgid "" "Current config: %s\n" "\n" "%s" -msgstr "" +msgstr "Configuración actual: %s\n\n%s" #: networking.c:268 msgid "Network configuration menu" -msgstr "" +msgstr "Menú de la configuración de red" #: networking.c:269 networking.c:520 networking.c:642 msgid "Done" -msgstr "" +msgstr "Hecho" #: networking.c:300 #, c-format @@ -456,7 +458,7 @@ msgid "" "list those interfaces which have ethernet attached. If you change this " "setting, a network restart will be required, and you will have to " "reconfigure the network driver assignments." -msgstr "" +msgstr "Seleccione la configuración de la red para %s. La lista de los siguientes tipos de configuración tienen que tener una conexión ethernet. Si cambia esta configuración, se requiere un reinicio de la red, y tendrá que volver a configurar las asignaciones de controlador de red." #: networking.c:307 #, c-format @@ -464,35 +466,35 @@ msgid "" "Not enough netcards for your choice.\n" "\n" "Needed: %d - Available: %d\n" -msgstr "" +msgstr "No hay suficientes tarjetas de red para su elección.\n\nNecesarias: %d - Disponibles: %d\n" #: networking.c:359 msgid "" "Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n" "\n" -msgstr "" +msgstr "Configurar los controladores de red y la interfaz que se ha asignado a cada tarjeta. La configuración actual es la siguiente:\n\n" #: networking.c:408 msgid "Do you wish to change these settings?" -msgstr "" +msgstr "¿Desea cambiar esta configuración?" #: networking.c:447 msgid "Restarting non-local network..." -msgstr "" +msgstr "Reiniciando redes no locales..." #: networking.c:464 msgid "" "Please choose the interface you wish to change.\n" "\n" -msgstr "" +msgstr "Por favor, elija la interfaz que desea cambiar.\n\n" #: networking.c:519 msgid "Assigned Cards" -msgstr "" +msgstr "Tarjetas asignadas" #: networking.c:520 msgid "Remove" -msgstr "" +msgstr "Quitar" #: networking.c:556 networking.c:649 #, c-format @@ -501,84 +503,84 @@ msgid "" "connection to the %s machine will be broken, and you will have to reconnect " "on the new IP. This is a risky operation, and should only be attempted if " "you have physical access to the machine, should something go wrong." -msgstr "" +msgstr "Si cambia esta dirección IP y tiene iniciada una sesión en el sistema de forma remota, la conexión a la máquina %s será cortada y tendrá que volver a conectar en la nueva IP. Esta es una operación arriesgada, y sólo debe intentarse si tiene acceso físico a la máquina, por si algo sale mal." #: networking.c:641 msgid "Select the interface you wish to reconfigure." -msgstr "" +msgstr "Seleccione la interfaz que desea reconfigurar." #: networking.c:729 msgid "Default gateway:" -msgstr "" +msgstr "Puerta de Enlace predeterminada:" #: networking.c:744 msgid "" "Enter the DNS and gateway information. These settings are used only with " "Static IP (and DHCP if DNS set) on the RED interface." -msgstr "" +msgstr "Introduzca la información del DNS y la Puerta de Enlace. Estos ajustes se utilizan sólo con IP estática (y DHCP si está configurado DNS) en la interfaz de RED." #: networking.c:773 msgid "Default gateway" -msgstr "" +msgstr "Puerta de Enlace predeterminada" #: networking.c:780 msgid "Secondary DNS specified without a Primary DNS" -msgstr "" +msgstr "DNS secundario especificado sin DNS primario" #: passwords.c:33 msgid "" "Enter the 'root' user password. Login as this user for commandline access." -msgstr "" +msgstr "Introduzca la contraseña de 'root'. Iniciar la sesión como este usuario para el acceso de linea de comandos." #: passwords.c:38 passwords.c:61 msgid "Setting password" -msgstr "" +msgstr "Configuración de la contraseña" #: passwords.c:38 msgid "Setting 'root' password...." -msgstr "" +msgstr "Configuración de la contraseña de 'root'..." #: passwords.c:39 msgid "Problem setting 'root' password." -msgstr "" +msgstr "Problema en la configuración de la contraseña de 'root'." #: passwords.c:53 #, c-format msgid "" "Enter %s 'admin' user password. This is the user to use for logging into the" " %s web administration pages." -msgstr "" +msgstr "Introduzca contraseña de usuario %s 'admin'. Este es el usuario que se utiliza para iniciar sesión en las páginas de administración web de %s." #: passwords.c:60 #, c-format msgid "Setting %s 'admin' user password..." -msgstr "" +msgstr "Configuración de la contraseña del usuario %s 'admin'..." #: passwords.c:62 #, c-format msgid "Problem setting %s 'admin' user password." -msgstr "" +msgstr "Problemas al configurar la contraseña del usuario %s 'admin'." #: passwords.c:76 msgid "Password:" -msgstr "" +msgstr "Contraseña:" #: passwords.c:77 msgid "Again:" -msgstr "" +msgstr "De nuevo:" #: passwords.c:95 msgid "Password cannot be blank." -msgstr "" +msgstr "La contraseña no puede estar en blanco." #: passwords.c:102 msgid "Passwords do not match." -msgstr "" +msgstr "Las contraseñas no coinciden." #: passwords.c:109 msgid "Password cannot contain spaces." -msgstr "" +msgstr "La contraseña no puede contener espacios." #: timezone.c:77 msgid "Choose the timezone you are in from the list below." -msgstr "" +msgstr "Seleccione la zona horaria de donde se encuentra en la lista de abajo." diff --git a/src/setup/po/fa.po b/src/setup/po/fa.po index 58a2008..a825ca8 100644 --- a/src/setup/po/fa.po +++ b/src/setup/po/fa.po @@ -4,13 +4,13 @@ # # Translators: # hashem ghavami <hashem.wolf(a)gmail.com>, 2014 -# Khalil Delavaran <khalil.delavaran(a)gmail.com>, 2014 +# Khalil Delavaran <khalil.delavaran(a)gmail.com>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2014-11-12 18:28+0000\n" +"PO-Revision-Date: 2015-01-26 06:42+0000\n" "Last-Translator: Khalil Delavaran <khalil.delavaran(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/ipfire/language/fa/)\n" "MIME-Version: 1.0\n" @@ -472,7 +472,7 @@ msgstr "کارتهای شبکه برای گزینش شما کافی نیست.\n\ msgid "" "Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n" "\n" -msgstr "" +msgstr "پیکربندی راه اندازهای شبکه، که به اینترفیس هر کارت اختصاص داده شده است. پیکربندی کنونی در زیر آمده است:\n\n" #: networking.c:408 msgid "Do you wish to change these settings?" @@ -503,7 +503,7 @@ msgid "" "connection to the %s machine will be broken, and you will have to reconnect " "on the new IP. This is a risky operation, and should only be attempted if " "you have physical access to the machine, should something go wrong." -msgstr "" +msgstr "اگر شما این IP را تغییر دهید، و شما از راه ریموت وارد شده باشید، اتصال شما به سیستم %s شکسته می شود، و شما با IP جدید دوباره وصل شوید. این کار شما، ریسک دارد، و فقط باید دسترسی فیزیکی به سیستم داشته باشید، این کار شما اشتباه است." #: networking.c:641 msgid "Select the interface you wish to reconfigure." @@ -517,7 +517,7 @@ msgstr "Gateway پیش پندار:" msgid "" "Enter the DNS and gateway information. These settings are used only with " "Static IP (and DHCP if DNS set) on the RED interface." -msgstr "" +msgstr "اطلاعات gateway و DNS را بنویسید. این پیکربندی ها فقط با IP استاتیک (و DHCP اگر DNS نوشته شده باشد) بر روی اینترفیس قرمز بکار می روند." #: networking.c:773 msgid "Default gateway" @@ -549,7 +549,7 @@ msgstr "ایراد در پیکربندی گذواژه 'root'." msgid "" "Enter %s 'admin' user password. This is the user to use for logging into the" " %s web administration pages." -msgstr "" +msgstr "گذرواژه کاربر 'admin' %s را بنویسید. این کاربر برای ورود به برگه مدیریت وب %s می باشد." #: passwords.c:60 #, c-format diff --git a/src/setup/po/nl.po b/src/setup/po/nl.po index 18d9512..1ee9093 100644 --- a/src/setup/po/nl.po +++ b/src/setup/po/nl.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jacques Hylkema <j.hylkema(a)intronics.nl>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2014-08-21 15:13+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-01-26 08:29+0000\n" +"Last-Translator: Jacques Hylkema <j.hylkema(a)intronics.nl>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/ipfire/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,31 +20,31 @@ msgstr "" #: dhcp.c:50 msgid "Start address:" -msgstr "" +msgstr "Start adres:" #: dhcp.c:51 msgid "End address:" -msgstr "" +msgstr "Eind adres:" #: dhcp.c:52 networking.c:717 msgid "Primary DNS:" -msgstr "" +msgstr "Primaire DNS:" #: dhcp.c:53 networking.c:723 msgid "Secondary DNS:" -msgstr "" +msgstr "Secundaire DNS:" #: dhcp.c:54 msgid "Default lease (mins):" -msgstr "" +msgstr "Standaard lease (minuten):" #: dhcp.c:55 msgid "Max lease (mins):" -msgstr "" +msgstr "Maximum lease (minuten):" #: dhcp.c:56 msgid "Domain name suffix:" -msgstr "" +msgstr "Domein naam achtervoegsel:" #: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70 #: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704 @@ -51,19 +52,19 @@ msgstr "" #: networking.c:442 networking.c:552 networking.c:603 networking.c:610 #: networking.c:713 timezone.c:63 msgid "Unable to open settings file" -msgstr "" +msgstr "Kon instellingen bestand niet openen" #: dhcp.c:111 msgid "DHCP server configuration" -msgstr "" +msgstr "DHCP server configuratie" #: dhcp.c:116 msgid "Configure the DHCP server by entering the settings information." -msgstr "" +msgstr "Configureer de DHCP server door de instellingen in te voeren." #: dhcp.c:125 msgid "Enabled" -msgstr "" +msgstr "Ingeschakeld" #: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172 #: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163 @@ -71,229 +72,229 @@ msgstr "" #: networking.c:642 networking.c:653 networking.c:746 passwords.c:89 #: timezone.c:78 msgid "OK" -msgstr "" +msgstr "Oke" #: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158 #: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305 #: networking.c:410 networking.c:560 networking.c:653 networking.c:746 #: passwords.c:89 timezone.c:78 msgid "Cancel" -msgstr "" +msgstr "Annuleren" #: dhcp.c:156 msgid "" "The following fields are invalid:\n" "\n" -msgstr "" +msgstr "De volgende velden zijn ongeldig:\n\n" #: dhcp.c:159 msgid "Start address" -msgstr "" +msgstr "Start adres" #: dhcp.c:165 msgid "End address" -msgstr "" +msgstr "Eind adres" #: dhcp.c:173 networking.c:755 msgid "Primary DNS" -msgstr "" +msgstr "Primaire DNS" #: dhcp.c:182 networking.c:764 msgid "Secondary DNS" -msgstr "" +msgstr "Secundaire DNS" #: dhcp.c:189 msgid "Default lease time" -msgstr "" +msgstr "Standaard lease tijd" #: dhcp.c:195 msgid "Max. lease time" -msgstr "" +msgstr "Maximum lease tijd" #: domainname.c:42 main.c:70 msgid "Domain name" -msgstr "" +msgstr "Domein naam" #: domainname.c:42 msgid "Enter Domain name" -msgstr "" +msgstr "Voer domein naam in" #: domainname.c:48 msgid "Domain name cannot be empty." -msgstr "" +msgstr "Domein naam kan niet leeg zijn." #: domainname.c:50 msgid "Domain name cannot contain spaces." -msgstr "" +msgstr "Domein naam kan geen spaties bevatten." #: domainname.c:53 msgid "Domain name may only contain letters, numbers, hyphens and periods." -msgstr "" +msgstr "Domein naam mag uitsluitend letters, nummers, koppeltekens en punten bevatten." #: hostname.c:46 main.c:69 msgid "Hostname" -msgstr "" +msgstr "hostnaam" #: hostname.c:46 msgid "Enter the machine's hostname." -msgstr "" +msgstr "Voer de hostnaam voor deze machine in." #: hostname.c:53 msgid "Hostname cannot be empty." -msgstr "" +msgstr "Hostnaam kan niet leeg zijn." #: hostname.c:55 msgid "Hostname cannot contain spaces." -msgstr "" +msgstr "Hostnaam kan geen spaties bevatten." #: hostname.c:58 msgid "Hostname may only contain letters, numbers and hyphens." -msgstr "" +msgstr " Hostnaam mag uitsluitend letters, nummers en koppeltekens bevatten." #: keymap.c:84 main.c:67 msgid "Keyboard mapping" -msgstr "" +msgstr "Toetsenbord indeling" #: keymap.c:85 msgid "Choose the type of keyboard you are using from the list below." -msgstr "" +msgstr "Kies het toetsenbord type dat je gebruikt uit onderstaande lijst." #: main.c:68 timezone.c:77 msgid "Timezone" -msgstr "" +msgstr "Tijdzone" #: main.c:71 networking.c:110 networking.c:115 networking.c:447 msgid "Networking" -msgstr "" +msgstr "Netwerken" #: main.c:72 misc.c:147 msgid "ISDN" -msgstr "" +msgstr "ISDN" #: main.c:73 msgid "'root' password" -msgstr "" +msgstr "'root' wachtwoord" #: main.c:74 msgid "'admin' password" -msgstr "" +msgstr "'admin' wachtwoord" #: main.c:90 msgid " <Tab>/<Alt-Tab> between elements | <Space> selects" -msgstr "" +msgstr "<Tab>/<Alt-Tab> tussen onderdelen | <Space> selecteer" #: main.c:97 msgid "Section menu" -msgstr "" +msgstr "Sectie menu" #: main.c:98 msgid "Select the item you wish to configure." -msgstr "" +msgstr "Selecteer het onderdeel dat je wil configureren." #: main.c:99 msgid "Quit" -msgstr "" +msgstr "Stoppen" #: main.c:172 msgid "Setup is complete." -msgstr "" +msgstr "Installatie is gereed." #: main.c:174 netstuff.c:733 networking.c:560 networking.c:653 msgid "Warning" -msgstr "" +msgstr "Waarschuwing" #: main.c:175 msgid "" "Initial setup was not entirely complete. You must ensure that Setup is " "properly finished by running setup again at the shell." -msgstr "" +msgstr "Initiële configuratie was niet voltooid. Je moet ervoor zorgen dat de installatie wordt voltooid door 'setup' opnieuw uit te voeren vanaf de shell." #: misc.c:62 #, c-format msgid "Unable to write %s/main/hostname.conf" -msgstr "" +msgstr "Kon %s/main/hostname.conf niet wegschrijven" #: misc.c:71 msgid "Unable to open main hosts file." -msgstr "" +msgstr "Kon het hosts bestand niet openen." #: misc.c:76 msgid "Unable to write /etc/hosts." -msgstr "" +msgstr "Kon /etc/hosts niet wegschrijven." #: misc.c:117 msgid "Unable to write /etc/hosts.deny." -msgstr "" +msgstr "Kon /etc/hosts.deny niet wegschrijven." #: misc.c:125 msgid "Unable to write /etc/hosts.allow." -msgstr "" +msgstr "Kon /etc/hosts.allow niet wegschrijven." #: misc.c:136 msgid "Unable to set hostname." -msgstr "" +msgstr "Kon de hostnaam niet instellen." #: misc.c:147 msgid "Scanning and configuring ISDN devices." -msgstr "" +msgstr "Scannen en configureren van ISDN apparaten." #: misc.c:148 msgid "Unable to scan for ISDN devices." -msgstr "" +msgstr "Kon ISDN apparaten niet scannen." #: netstuff.c:86 #, c-format msgid "Interface - %s" -msgstr "" +msgstr "Interface - %s" #: netstuff.c:91 #, c-format msgid "Enter the IP address information for the %s interface." -msgstr "" +msgstr "Voer de IP adres gegevens in voor de %s interface." #: netstuff.c:103 msgid "Static" -msgstr "" +msgstr "Statisch" #: netstuff.c:104 msgid "DHCP" -msgstr "" +msgstr "DHCP" #: netstuff.c:105 msgid "PPP DIALUP (PPPoE, modem, ATM ...)" -msgstr "" +msgstr "PPP DIALUP (PPPoE, modem, ATM ...)" #: netstuff.c:113 msgid "DHCP Hostname:" -msgstr "" +msgstr "DHCP Hostnaam:" #: netstuff.c:115 msgid "Force DHCP MTU:" -msgstr "" +msgstr "Forceer DHCP MTU:" #: netstuff.c:134 msgid "IP address:" -msgstr "" +msgstr "IP adres:" #: netstuff.c:146 msgid "Network mask:" -msgstr "" +msgstr "Netwerk masker:" #: netstuff.c:173 networking.c:749 msgid "The following fields are invalid:" -msgstr "" +msgstr "De volgende velden zijn ongeldig:" #: netstuff.c:183 msgid "IP address" -msgstr "" +msgstr "IP adres" #: netstuff.c:189 msgid "Network mask" -msgstr "" +msgstr "Netwerk masker" #: netstuff.c:198 msgid "DHCP hostname" -msgstr "" +msgstr "DHCP hostnaam" #: netstuff.c:396 netstuff.c:709 msgid "Unset" @@ -302,52 +303,52 @@ msgstr "" #: netstuff.c:669 #, c-format msgid "Please choose a networkcard for the following interface - %s." -msgstr "" +msgstr "Kies een netwerkkaart voor de volgende interface - %s." #: netstuff.c:672 msgid "Extended Network Menu" -msgstr "" +msgstr "Uitgebreid Netwerk Menu" #: netstuff.c:673 networking.c:520 msgid "Select" -msgstr "" +msgstr "Selecteer" #: netstuff.c:673 msgid "Identify" -msgstr "" +msgstr "Identificeer" #: netstuff.c:678 msgid "Device Identification" -msgstr "" +msgstr "Apparaat identificatie" #: netstuff.c:678 msgid "The lights on the selected port should flash now for 10 seconds..." -msgstr "" +msgstr "De lampjes op de geselecteerde netwerkkaart zouden nu 10 seconden moeten flikkeren..." #: netstuff.c:679 msgid "Identification is not supported by this interface." -msgstr "" +msgstr "Identificatie wordt niet ondersteund door deze netwerkkaart." #: netstuff.c:691 msgid "There are no unassigned interfaces on your system." -msgstr "" +msgstr "Er zijn geen niet-toegewezen netwerkkaarten in je systeem" #: netstuff.c:732 #, c-format msgid "Do you really want to remove the assigned %s interface?" -msgstr "" +msgstr "Wil je de toegewezen %s interface echt verwijderen?" #: netstuff.c:755 msgid "Select network driver" -msgstr "" +msgstr "Selecteer netwerk stuurprogramma" #: netstuff.c:755 msgid "Set additional module parameters" -msgstr "" +msgstr "Stel additionele module parameters in" #: netstuff.c:762 msgid "Loading module..." -msgstr "" +msgstr "Bezig met laden van module..." #: netstuff.c:777 msgid "Unable to load driver module." diff --git a/src/setup/po/pt_BR.po b/src/setup/po/pt_BR.po index a16955b..1cb5bc6 100644 --- a/src/setup/po/pt_BR.po +++ b/src/setup/po/pt_BR.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Rafael Tavares <rafael(a)ibinetwork.com.br>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2014-08-21 15:13+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-01-22 20:19+0000\n" +"Last-Translator: Rafael Tavares <rafael(a)ibinetwork.com.br>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/ipfire/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,27 +20,27 @@ msgstr "" #: dhcp.c:50 msgid "Start address:" -msgstr "" +msgstr "Endereço de Inicial:" #: dhcp.c:51 msgid "End address:" -msgstr "" +msgstr "Endereço final:" #: dhcp.c:52 networking.c:717 msgid "Primary DNS:" -msgstr "" +msgstr "DNS Primário:" #: dhcp.c:53 networking.c:723 msgid "Secondary DNS:" -msgstr "" +msgstr "DNS Secundário:" #: dhcp.c:54 msgid "Default lease (mins):" -msgstr "" +msgstr "Tempo padrão (mins):" #: dhcp.c:55 msgid "Max lease (mins):" -msgstr "" +msgstr "Tempo máximo (mins)" #: dhcp.c:56 msgid "Domain name suffix:" @@ -51,19 +52,19 @@ msgstr "" #: networking.c:442 networking.c:552 networking.c:603 networking.c:610 #: networking.c:713 timezone.c:63 msgid "Unable to open settings file" -msgstr "" +msgstr "Não foi possível abrir o arquivo de configurações" #: dhcp.c:111 msgid "DHCP server configuration" -msgstr "" +msgstr "Configurar servidor DHCP" #: dhcp.c:116 msgid "Configure the DHCP server by entering the settings information." -msgstr "" +msgstr "Configurar servidor DHCP digitando as informações de configuração" #: dhcp.c:125 msgid "Enabled" -msgstr "" +msgstr "Habilitado" #: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172 #: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163 @@ -71,14 +72,14 @@ msgstr "" #: networking.c:642 networking.c:653 networking.c:746 passwords.c:89 #: timezone.c:78 msgid "OK" -msgstr "" +msgstr "Ok" #: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158 #: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305 #: networking.c:410 networking.c:560 networking.c:653 networking.c:746 #: passwords.c:89 timezone.c:78 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #: dhcp.c:156 msgid "" @@ -88,31 +89,31 @@ msgstr "" #: dhcp.c:159 msgid "Start address" -msgstr "" +msgstr "Endereço de Inicial" #: dhcp.c:165 msgid "End address" -msgstr "" +msgstr "Endereço final" #: dhcp.c:173 networking.c:755 msgid "Primary DNS" -msgstr "" +msgstr "DNS Primário" #: dhcp.c:182 networking.c:764 msgid "Secondary DNS" -msgstr "" +msgstr "DNS Secundário" #: dhcp.c:189 msgid "Default lease time" -msgstr "" +msgstr "Tempo padrão" #: dhcp.c:195 msgid "Max. lease time" -msgstr "" +msgstr "Tempo máximo padrão" #: domainname.c:42 main.c:70 msgid "Domain name" -msgstr "" +msgstr "Domínio " #: domainname.c:42 msgid "Enter Domain name" @@ -132,7 +133,7 @@ msgstr "" #: hostname.c:46 main.c:69 msgid "Hostname" -msgstr "" +msgstr "Hostname" #: hostname.c:46 msgid "Enter the machine's hostname." @@ -152,7 +153,7 @@ msgstr "" #: keymap.c:84 main.c:67 msgid "Keyboard mapping" -msgstr "" +msgstr "Selecione seu teclado" #: keymap.c:85 msgid "Choose the type of keyboard you are using from the list below." @@ -160,7 +161,7 @@ msgstr "" #: main.c:68 timezone.c:77 msgid "Timezone" -msgstr "" +msgstr "Fuso horário " #: main.c:71 networking.c:110 networking.c:115 networking.c:447 msgid "Networking" @@ -168,15 +169,15 @@ msgstr "" #: main.c:72 misc.c:147 msgid "ISDN" -msgstr "" +msgstr "ISDN" #: main.c:73 msgid "'root' password" -msgstr "" +msgstr "senha ´'root'" #: main.c:74 msgid "'admin' password" -msgstr "" +msgstr "senha 'admin'" #: main.c:90 msgid " <Tab>/<Alt-Tab> between elements | <Space> selects" @@ -188,19 +189,19 @@ msgstr "" #: main.c:98 msgid "Select the item you wish to configure." -msgstr "" +msgstr "Selecione um item para configurar." #: main.c:99 msgid "Quit" -msgstr "" +msgstr "Sair" #: main.c:172 msgid "Setup is complete." -msgstr "" +msgstr "Configuração completa." #: main.c:174 netstuff.c:733 networking.c:560 networking.c:653 msgid "Warning" -msgstr "" +msgstr "Atenção" #: main.c:175 msgid "" @@ -211,7 +212,7 @@ msgstr "" #: misc.c:62 #, c-format msgid "Unable to write %s/main/hostname.conf" -msgstr "" +msgstr "Não foi possível salvar %s/main/hostname.conf" #: misc.c:71 msgid "Unable to open main hosts file." @@ -219,15 +220,15 @@ msgstr "" #: misc.c:76 msgid "Unable to write /etc/hosts." -msgstr "" +msgstr "Não foi possível salvar /etc/hosts." #: misc.c:117 msgid "Unable to write /etc/hosts.deny." -msgstr "" +msgstr "Não foi possível salvar /etc/hosts.deny." #: misc.c:125 msgid "Unable to write /etc/hosts.allow." -msgstr "" +msgstr "Não foi possível salvar /etc/hosts.allow." #: misc.c:136 msgid "Unable to set hostname." @@ -244,7 +245,7 @@ msgstr "" #: netstuff.c:86 #, c-format msgid "Interface - %s" -msgstr "" +msgstr "Interface - %s" #: netstuff.c:91 #, c-format @@ -253,15 +254,15 @@ msgstr "" #: netstuff.c:103 msgid "Static" -msgstr "" +msgstr "Estático " #: netstuff.c:104 msgid "DHCP" -msgstr "" +msgstr "Automático " #: netstuff.c:105 msgid "PPP DIALUP (PPPoE, modem, ATM ...)" -msgstr "" +msgstr "Discador PPP (PPPoE, modem, ATM ...)" #: netstuff.c:113 msgid "DHCP Hostname:" @@ -273,11 +274,11 @@ msgstr "" #: netstuff.c:134 msgid "IP address:" -msgstr "" +msgstr "Endereço IP:" #: netstuff.c:146 msgid "Network mask:" -msgstr "" +msgstr "Mascara de rede:" #: netstuff.c:173 networking.c:749 msgid "The following fields are invalid:" @@ -285,11 +286,11 @@ msgstr "" #: netstuff.c:183 msgid "IP address" -msgstr "" +msgstr "Endereço IP" #: netstuff.c:189 msgid "Network mask" -msgstr "" +msgstr "Marcara de rede" #: netstuff.c:198 msgid "DHCP hostname" @@ -310,11 +311,11 @@ msgstr "" #: netstuff.c:673 networking.c:520 msgid "Select" -msgstr "" +msgstr "Selecione" #: netstuff.c:673 msgid "Identify" -msgstr "" +msgstr "Identifique" #: netstuff.c:678 msgid "Device Identification" @@ -347,7 +348,7 @@ msgstr "" #: netstuff.c:762 msgid "Loading module..." -msgstr "" +msgstr "Carregando modulo..." #: netstuff.c:777 msgid "Unable to load driver module." @@ -359,75 +360,75 @@ msgstr "" #: networking.c:110 msgid "Stopping network..." -msgstr "" +msgstr "Parando a rede..." #: networking.c:115 msgid "Restarting network..." -msgstr "" +msgstr "Reiniciando a rede..." #: networking.c:146 msgid "No GREEN interface assigned." -msgstr "" +msgstr "Nenhuma interface VERDE definida." #: networking.c:152 msgid "Missing an IP address on GREEN." -msgstr "" +msgstr "Faltando endereço IP na interface VERDE." #: networking.c:163 msgid "Error" -msgstr "" +msgstr "Erro" #: networking.c:163 msgid "Ignore" -msgstr "" +msgstr "Ignorar" #: networking.c:164 msgid "No RED interface assigned." -msgstr "" +msgstr "Nenhuma interface VERMELHA definida." #: networking.c:173 msgid "Missing an IP address on RED." -msgstr "" +msgstr "Faltando endereço IP na interface VERMELHA." #: networking.c:183 msgid "No ORANGE interface assigned." -msgstr "" +msgstr "Nenhuma interface LARANJA definida." #: networking.c:189 msgid "Missing an IP address on ORANGE." -msgstr "" +msgstr "Faltando endereço IP na interface LARANJA." #: networking.c:199 msgid "No BLUE interface assigned." -msgstr "" +msgstr "Nenhuma interface AZUL definida." #: networking.c:205 msgid "Missing an IP address on BLUE." -msgstr "" +msgstr "Faltando endereço IP na interface AZUL." #: networking.c:217 msgid "Misssing DNS." -msgstr "" +msgstr "Faltando DNS." #: networking.c:224 msgid "Missing Default Gateway." -msgstr "" +msgstr "Faltando Gateway Padrão." #: networking.c:237 networking.c:304 msgid "Network configuration type" -msgstr "" +msgstr "Tipo de configuração de rede" #: networking.c:238 networking.c:409 msgid "Drivers and card assignments" -msgstr "" +msgstr "Definir Drivers e Placas" #: networking.c:239 networking.c:640 msgid "Address settings" -msgstr "" +msgstr "Configurar endereços" #: networking.c:240 networking.c:743 msgid "DNS and Gateway settings" -msgstr "" +msgstr "Configurar Gateway e DNS" #: networking.c:260 msgid "When configuration is complete, a network restart will be required." @@ -439,7 +440,7 @@ msgid "" "Current config: %s\n" "\n" "%s" -msgstr "" +msgstr "Configuração atual: %s\n\n%s" #: networking.c:268 msgid "Network configuration menu" @@ -447,7 +448,7 @@ msgstr "" #: networking.c:269 networking.c:520 networking.c:642 msgid "Done" -msgstr "" +msgstr "Pronto" #: networking.c:300 #, c-format @@ -488,11 +489,11 @@ msgstr "" #: networking.c:519 msgid "Assigned Cards" -msgstr "" +msgstr "Placas Definidas" #: networking.c:520 msgid "Remove" -msgstr "" +msgstr "Remover" #: networking.c:556 networking.c:649 #, c-format @@ -509,7 +510,7 @@ msgstr "" #: networking.c:729 msgid "Default gateway:" -msgstr "" +msgstr "Gateway padrão:" #: networking.c:744 msgid "" @@ -519,7 +520,7 @@ msgstr "" #: networking.c:773 msgid "Default gateway" -msgstr "" +msgstr "Gateway padrão" #: networking.c:780 msgid "Secondary DNS specified without a Primary DNS" @@ -532,15 +533,15 @@ msgstr "" #: passwords.c:38 passwords.c:61 msgid "Setting password" -msgstr "" +msgstr "Configurar senha" #: passwords.c:38 msgid "Setting 'root' password...." -msgstr "" +msgstr "Configurar senha 'root'" #: passwords.c:39 msgid "Problem setting 'root' password." -msgstr "" +msgstr "Problema ao configurar senha 'root'" #: passwords.c:53 #, c-format @@ -561,24 +562,24 @@ msgstr "" #: passwords.c:76 msgid "Password:" -msgstr "" +msgstr "Senha:" #: passwords.c:77 msgid "Again:" -msgstr "" +msgstr "Novamente:" #: passwords.c:95 msgid "Password cannot be blank." -msgstr "" +msgstr "A senha não pode estar em branco." #: passwords.c:102 msgid "Passwords do not match." -msgstr "" +msgstr "As senhas não coincidem." #: passwords.c:109 msgid "Password cannot contain spaces." -msgstr "" +msgstr "A senha não pode conter espaços." #: timezone.c:77 msgid "Choose the timezone you are in from the list below." -msgstr "" +msgstr "Selecione seu fuso horário na lista abaixo." diff --git a/src/setup/po/ro_RO.po b/src/setup/po/ro_RO.po index e85d2f7..9bf182c 100644 --- a/src/setup/po/ro_RO.po +++ b/src/setup/po/ro_RO.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Andrei Burdea <ragulka(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2014-08-21 15:13+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-01-20 09:08+0000\n" +"Last-Translator: Andrei Burdea <ragulka(a)gmail.com>\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/ipfire/language/ro_RO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,31 +20,31 @@ msgstr "" #: dhcp.c:50 msgid "Start address:" -msgstr "" +msgstr "Adresa de Inceput" #: dhcp.c:51 msgid "End address:" -msgstr "" +msgstr "Adresa de Final" #: dhcp.c:52 networking.c:717 msgid "Primary DNS:" -msgstr "" +msgstr "Primul Server de Nume - NS1" #: dhcp.c:53 networking.c:723 msgid "Secondary DNS:" -msgstr "" +msgstr "Al Doilea Server de Nume - NS2" #: dhcp.c:54 msgid "Default lease (mins):" -msgstr "" +msgstr "Alocarea de baza (minute)" #: dhcp.c:55 msgid "Max lease (mins):" -msgstr "" +msgstr "Alocare Maxima (minute)" #: dhcp.c:56 msgid "Domain name suffix:" -msgstr "" +msgstr "Sufix Nume Domeniu" #: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70 #: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704 @@ -51,19 +52,19 @@ msgstr "" #: networking.c:442 networking.c:552 networking.c:603 networking.c:610 #: networking.c:713 timezone.c:63 msgid "Unable to open settings file" -msgstr "" +msgstr "Fisier de setari imposibil de deschis" #: dhcp.c:111 msgid "DHCP server configuration" -msgstr "" +msgstr "Conficurearea serverului DHCP" #: dhcp.c:116 msgid "Configure the DHCP server by entering the settings information." -msgstr "" +msgstr "Configureaza serverul DHCP introducand informatiile de setare" #: dhcp.c:125 msgid "Enabled" -msgstr "" +msgstr "Activat" #: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172 #: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163 @@ -71,151 +72,151 @@ msgstr "" #: networking.c:642 networking.c:653 networking.c:746 passwords.c:89 #: timezone.c:78 msgid "OK" -msgstr "" +msgstr "OK" #: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158 #: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305 #: networking.c:410 networking.c:560 networking.c:653 networking.c:746 #: passwords.c:89 timezone.c:78 msgid "Cancel" -msgstr "" +msgstr "Renunta" #: dhcp.c:156 msgid "" "The following fields are invalid:\n" "\n" -msgstr "" +msgstr "Urmatoarele campuri sunt incorecte\n\n" #: dhcp.c:159 msgid "Start address" -msgstr "" +msgstr "Adresa de Inceput" #: dhcp.c:165 msgid "End address" -msgstr "" +msgstr "Adresa de Final" #: dhcp.c:173 networking.c:755 msgid "Primary DNS" -msgstr "" +msgstr "Primul Server de Nume - NS1" #: dhcp.c:182 networking.c:764 msgid "Secondary DNS" -msgstr "" +msgstr "Al Doilea Server de Nume - NS2" #: dhcp.c:189 msgid "Default lease time" -msgstr "" +msgstr "Timpul pentru alocarea de baza" #: dhcp.c:195 msgid "Max. lease time" -msgstr "" +msgstr "Timpul maxim pentru alocare" #: domainname.c:42 main.c:70 msgid "Domain name" -msgstr "" +msgstr "Nume Domeniu" #: domainname.c:42 msgid "Enter Domain name" -msgstr "" +msgstr "Introduceti Nume Domeniu" #: domainname.c:48 msgid "Domain name cannot be empty." -msgstr "" +msgstr "Nume Domeniu nu poate fi gol" #: domainname.c:50 msgid "Domain name cannot contain spaces." -msgstr "" +msgstr "Nume Domeniu nu poate contine spatii" #: domainname.c:53 msgid "Domain name may only contain letters, numbers, hyphens and periods." -msgstr "" +msgstr "Nume Domeniu poate contine doar litere, numere, cratime sau paranteze" #: hostname.c:46 main.c:69 msgid "Hostname" -msgstr "" +msgstr "Nume Gazda - HOST" #: hostname.c:46 msgid "Enter the machine's hostname." -msgstr "" +msgstr "Introduceti Nume Gazda - HOST" #: hostname.c:53 msgid "Hostname cannot be empty." -msgstr "" +msgstr "Nume Gazda - HOST - nu poate fi gol" #: hostname.c:55 msgid "Hostname cannot contain spaces." -msgstr "" +msgstr "Nume Gazda - HOST - nu poate contine spatii" #: hostname.c:58 msgid "Hostname may only contain letters, numbers and hyphens." -msgstr "" +msgstr "Nume Gazda - HOST - poate contine doar litere, numere si cratime" #: keymap.c:84 main.c:67 msgid "Keyboard mapping" -msgstr "" +msgstr "Cartografiere Tastatura - tipul de tastatura" #: keymap.c:85 msgid "Choose the type of keyboard you are using from the list below." -msgstr "" +msgstr "Alegeti tipul de tastatura pe care o folositi din lista urmatoare" #: main.c:68 timezone.c:77 msgid "Timezone" -msgstr "" +msgstr "Fus Orar" #: main.c:71 networking.c:110 networking.c:115 networking.c:447 msgid "Networking" -msgstr "" +msgstr "Retea" #: main.c:72 misc.c:147 msgid "ISDN" -msgstr "" +msgstr "ISDN" #: main.c:73 msgid "'root' password" -msgstr "" +msgstr "Parola pentru utilizator 'root'" #: main.c:74 msgid "'admin' password" -msgstr "" +msgstr "Parola pentru utilizator 'admin'" #: main.c:90 msgid " <Tab>/<Alt-Tab> between elements | <Space> selects" -msgstr "" +msgstr "<Tab>/<Alt-Tab> pentru comutare intre elemente | <Space> selecteaza" #: main.c:97 msgid "Section menu" -msgstr "" +msgstr "Meniu Sectiuni" #: main.c:98 msgid "Select the item you wish to configure." -msgstr "" +msgstr "Selectati articolul pe care doriti sa-l configurati" #: main.c:99 msgid "Quit" -msgstr "" +msgstr "Iesire" #: main.c:172 msgid "Setup is complete." -msgstr "" +msgstr "Setup-ul s-a incheiat" #: main.c:174 netstuff.c:733 networking.c:560 networking.c:653 msgid "Warning" -msgstr "" +msgstr "Atentie" #: main.c:175 msgid "" "Initial setup was not entirely complete. You must ensure that Setup is " "properly finished by running setup again at the shell." -msgstr "" +msgstr "Setup-ul initial nu s-a finalizat. Trebuie sa va asigurati ca Setup-ul s-a incheiat corect ruland din nou operatiunea din shell." #: misc.c:62 #, c-format msgid "Unable to write %s/main/hostname.conf" -msgstr "" +msgstr "%s/main/hostname.conf nu a putut fi scris" #: misc.c:71 msgid "Unable to open main hosts file." -msgstr "" +msgstr "fisierul principal de hosts nu a putut fi deschis" #: misc.c:76 msgid "Unable to write /etc/hosts." diff --git a/src/setup/po/zh.po b/src/setup/po/zh.po index 8b7faba..70b0a0e 100644 --- a/src/setup/po/zh.po +++ b/src/setup/po/zh.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ipfire <qiwenqiu(a)yahoo.com.hk>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2014-08-21 15:13+0000\n" -"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n" +"PO-Revision-Date: 2015-01-31 09:57+0000\n" +"Last-Translator: ipfire <qiwenqiu(a)yahoo.com.hk>\n" "Language-Team: Chinese (http://www.transifex.com/projects/p/ipfire/language/zh/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,31 +20,31 @@ msgstr "" #: dhcp.c:50 msgid "Start address:" -msgstr "" +msgstr "起始地址" #: dhcp.c:51 msgid "End address:" -msgstr "" +msgstr "结束地址" #: dhcp.c:52 networking.c:717 msgid "Primary DNS:" -msgstr "" +msgstr "首选DNS服务器" #: dhcp.c:53 networking.c:723 msgid "Secondary DNS:" -msgstr "" +msgstr "备用DNS服务器" #: dhcp.c:54 msgid "Default lease (mins):" -msgstr "" +msgstr "默认租约(分钟)" #: dhcp.c:55 msgid "Max lease (mins):" -msgstr "" +msgstr "最大租约(分钟)" #: dhcp.c:56 msgid "Domain name suffix:" -msgstr "" +msgstr "域名后缀" #: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70 #: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704 @@ -51,19 +52,19 @@ msgstr "" #: networking.c:442 networking.c:552 networking.c:603 networking.c:610 #: networking.c:713 timezone.c:63 msgid "Unable to open settings file" -msgstr "" +msgstr "无法打开配置文件" #: dhcp.c:111 msgid "DHCP server configuration" -msgstr "" +msgstr "DHCP服务器配置" #: dhcp.c:116 msgid "Configure the DHCP server by entering the settings information." -msgstr "" +msgstr "DHCP服务器配置信息" #: dhcp.c:125 msgid "Enabled" -msgstr "" +msgstr "应用" #: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172 #: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163 @@ -71,14 +72,14 @@ msgstr "" #: networking.c:642 networking.c:653 networking.c:746 passwords.c:89 #: timezone.c:78 msgid "OK" -msgstr "" +msgstr "确定" #: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158 #: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305 #: networking.c:410 networking.c:560 networking.c:653 networking.c:746 #: passwords.c:89 timezone.c:78 msgid "Cancel" -msgstr "" +msgstr "取消" #: dhcp.c:156 msgid "" hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2015