IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7852 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a4de5755f5a5abf67f9ef9e1589860ce78937fb6
by git＠ipfire.org 25 Jul '11

25 Jul '11

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 3.x development tree". The branch, master has been updated via a4de5755f5a5abf67f9ef9e1589860ce78937fb6 (commit) from d3c8c883450a3731584f232dc37936bb981847a8 (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 a4de5755f5a5abf67f9ef9e1589860ce78937fb6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 16:10:12 2011 +0200 shadow: Add configuration to package. ----------------------------------------------------------------------- Summary of changes: pkgs/{pam => shadow}/login.defs | 26 +++++++++++++++++++++----- pkgs/shadow/shadow.nm | 5 ++++- pkgs/shadow/useradd.default | 9 +++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) copy pkgs/{pam => shadow}/login.defs (66%) create mode 100644 pkgs/shadow/useradd.default Difference in files: diff --git a/pkgs/shadow/login.defs b/pkgs/shadow/login.defs new file mode 100644 index 0000000..3f27f88 --- /dev/null +++ b/pkgs/shadow/login.defs @@ -0,0 +1,72 @@ +# +# Please note that the parameters in this configuration file control the +# behavior of the tools from the shadow-utils component. None of these +# tools uses the PAM mechanism, and the utilities that use PAM (such as the +# passwd command) should therefore be configured elsewhere. Refer to +# /etc/pam.d/system-auth for more information. +# + +# *REQUIRED* +# Directory where mailboxes reside, _or_ name of file, relative to the +# home directory. If you _do_ define both, MAIL_DIR takes precedence. +# QMAIL_DIR is for Qmail +# +#QMAIL_DIR Maildir +MAIL_DIR /var/spool/mail +#MAIL_FILE .mail + +# Password aging controls: +# +# PASS_MAX_DAYS Maximum number of days a password may be used. +# PASS_MIN_DAYS Minimum number of days allowed between password changes. +# PASS_MIN_LEN Minimum acceptable password length. +# PASS_WARN_AGE Number of days warning given before a password expires. +# +PASS_MAX_DAYS 99999 +PASS_MIN_DAYS 0 +PASS_MIN_LEN 5 +PASS_WARN_AGE 7 + +# +# Min/max values for automatic uid selection in useradd +# +UID_MIN 1000 +UID_MAX 60000 +# System accounts +SYS_UID_MIN 201 +SYS_UID_MAX 999 + +# +# Min/max values for automatic gid selection in groupadd +# +GID_MIN 1000 +GID_MAX 60000 +# System accounts +SYS_GID_MIN 201 +SYS_GID_MAX 999 + +# +# If defined, this command is run when removing a user. +# It should remove any at/cron/print jobs etc. owned by +# the user to be removed (passed as the first argument). +# +#USERDEL_CMD /usr/sbin/userdel_local + +# +# If useradd should create home directories for users by default +# On RH systems, we do. This option is overridden with the -m flag on +# useradd command line. +# +CREATE_HOME yes + +# The permission mask is initialized to this value. If not specified, +# the permission mask will be initialized to 022. +UMASK 077 + +# This enables userdel to remove user groups if no members exist. +# +USERGROUPS_ENAB yes + +# Use SHA512 to encrypt password. +ENCRYPT_METHOD SHA512 + diff --git a/pkgs/shadow/shadow.nm b/pkgs/shadow/shadow.nm index a68d1e6..401692b 100644 --- a/pkgs/shadow/shadow.nm +++ b/pkgs/shadow/shadow.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = shadow PKG_VER = 4.1.4.3 -PKG_REL = 4 +PKG_REL = 5 PKG_MAINTAINER = PKG_GROUPS = System/Base @@ -83,4 +83,7 @@ define STAGE_INSTALL_POST chmod u-s $(BUILDROOT)/usr/bin/newgrp setcap cap_dac_override,cap_setgid+ep $(BUILDROOT)/usr/bin/newgrp + + # Configuration + install -p -c -m 0644 $(DIR_SOURCE)/login.defs $(BUILDROOT)/etc/login.defs endef diff --git a/pkgs/shadow/useradd.default b/pkgs/shadow/useradd.default new file mode 100644 index 0000000..4e81146 --- /dev/null +++ b/pkgs/shadow/useradd.default @@ -0,0 +1,9 @@ +# useradd defaults file +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/bash +SKEL=/etc/skel +CREATE_MAIL_SPOOL=yes + hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d3c8c883450a3731584f232dc37936bb981847a8
by git＠ipfire.org 25 Jul '11

25 Jul '11

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 3.x development tree". The branch, master has been updated via d3c8c883450a3731584f232dc37936bb981847a8 (commit) via a4f26965376fb7f1d027f27743a01e3c6b1a4c86 (commit) via cc45716617f9d22e717dd2ce5a56fc53e69457e3 (commit) from 164c0d73e5858e7b9a791a954487a21cae51679e (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 d3c8c883450a3731584f232dc37936bb981847a8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 15:58:02 2011 +0200 help2man: New package. commit a4f26965376fb7f1d027f27743a01e3c6b1a4c86 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 15:57:26 2011 +0200 textinfo: Disable textsuite (which is currently broken). ...and I do not know why. commit cc45716617f9d22e717dd2ce5a56fc53e69457e3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 15:55:26 2011 +0200 kernel: ext4 module handles ext{2,3} filesystems. From now on, the ext4 kernel module handles ext2 and ext3 formatted filesystem as well. ext2 and ext3 filesystems remain in their format and are NOT converted to ext4. But we will be able to drop the ext2 and ext3 modules which will decrease the footprint size of the kernel, because ext4 code handles the legacy filesystems, too. ----------------------------------------------------------------------- Summary of changes: pkgs/{chrpath/chrpath.nm => help2man/help2man.nm} | 26 ++-- pkgs/kernel/config | 18 +-- pkgs/kernel/kernel.nm | 2 +- pkgs/texinfo/patches/texinfo-4.12-zlib.patch | 169 ++++++++++++++++++++ .../texinfo/patches/texinfo-4.13a-data_types.patch | 32 ++++ .../texinfo-4.13a-help-index-segfault.patch | 23 +++ .../texinfo-4.13a-makeinfo-sectioning.patch | 20 +++ .../patches/texinfo-4.13a-mosdo-crash.patch | 11 ++ pkgs/texinfo/patches/texinfo-4.13a-powerpc.patch | 12 ++ .../patches/texinfo-4.13a-texi2dvi-regexp.patch | 12 ++ pkgs/texinfo/texinfo.nm | 13 +- 11 files changed, 304 insertions(+), 34 deletions(-) copy pkgs/{chrpath/chrpath.nm => help2man/help2man.nm} (77%) create mode 100644 pkgs/texinfo/patches/texinfo-4.12-zlib.patch create mode 100644 pkgs/texinfo/patches/texinfo-4.13a-data_types.patch create mode 100644 pkgs/texinfo/patches/texinfo-4.13a-help-index-segfault.patch create mode 100644 pkgs/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch create mode 100644 pkgs/texinfo/patches/texinfo-4.13a-mosdo-crash.patch create mode 100644 pkgs/texinfo/patches/texinfo-4.13a-powerpc.patch create mode 100644 pkgs/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch Difference in files: diff --git a/pkgs/help2man/help2man.nm b/pkgs/help2man/help2man.nm new file mode 100644 index 0000000..a47e762 --- /dev/null +++ b/pkgs/help2man/help2man.nm @@ -0,0 +1,52 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = help2man +PKG_VER = 1.40.4 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = Development/Tools +PKG_URL = http://www.gnu.org/software/help2man +PKG_LICENSE = GPLv3+ +PKG_SUMMARY = Create simple man pages from --help output. + +define PKG_DESCRIPTION + help2man is a script to create simple man pages from the --help and + --version output of programs. + + Since most GNU documentation is now in info format, this provides a + way to generate a placeholder man page pointing to that resource while + still providing some useful information. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --disable-nls \ + --libdir=/usr/lib/help2man + +STAGE_INSTALL_TARGETS += install_l10n diff --git a/pkgs/kernel/config b/pkgs/kernel/config index 9070eff..fa179a9 100644 --- a/pkgs/kernel/config +++ b/pkgs/kernel/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.39 Kernel Configuration -# Wed May 25 20:12:13 2011 +# Mon Jul 25 13:53:09 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3776,24 +3776,14 @@ CONFIG_SIGMA=m # # File systems # -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT2_FS_XIP=y -CONFIG_EXT3_FS=m -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set -CONFIG_FS_XIP=y -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=m diff --git a/pkgs/kernel/kernel.nm b/pkgs/kernel/kernel.nm index 4f637c7..f1d3dcd 100644 --- a/pkgs/kernel/kernel.nm +++ b/pkgs/kernel/kernel.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = linux PKG_VER = 2.6.39 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUPS = System/Kernels diff --git a/pkgs/texinfo/patches/texinfo-4.12-zlib.patch b/pkgs/texinfo/patches/texinfo-4.12-zlib.patch new file mode 100644 index 0000000..3635b55 --- /dev/null +++ b/pkgs/texinfo/patches/texinfo-4.12-zlib.patch @@ -0,0 +1,169 @@ +diff -up texinfo-4.12/install-info/Makefile.in_old texinfo-4.12/install-info/Makefile.in +--- texinfo-4.12/install-info/Makefile.in_old 2008-05-13 13:33:55.000000000 +0200 ++++ texinfo-4.12/install-info/Makefile.in 2008-05-13 13:52:35.000000000 +0200 +@@ -114,7 +114,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + am_ginstall_info_OBJECTS = install-info.$(OBJEXT) + ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) +-ginstall_info_LDADD = $(LDADD) ++ginstall_info_LDADD = $(LDADD) -lz + am__DEPENDENCIES_1 = + ginstall_info_DEPENDENCIES = ../lib/libtxi.a \ + $(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1) +diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/install-info.c +--- texinfo-4.12/install-info/install-info.c_old 2008-05-13 13:52:44.000000000 +0200 ++++ texinfo-4.12/install-info/install-info.c 2008-05-14 10:30:53.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <getopt.h> + #include <regex.h> + #include <argz.h> ++#include <zlib.h> + + #define TAB_WIDTH 8 + +@@ -638,7 +639,7 @@ The first time you invoke Info you start + COMPRESSION_PROGRAM. The compression program is determined by the + magic number, not the filename. */ + +-FILE * ++void * + open_possibly_compressed_file (char *filename, + void (*create_callback) (char *), + char **opened_filename, char **compression_program, int *is_pipe) +@@ -646,7 +647,7 @@ open_possibly_compressed_file (char *fil + char *local_opened_filename, *local_compression_program; + int nread; + char data[13]; +- FILE *f; ++ gzFile *f; + + /* We let them pass NULL if they don't want this info, but it's easier + to always determine it. */ +@@ -654,22 +655,22 @@ open_possibly_compressed_file (char *fil + opened_filename = &local_opened_filename; + + *opened_filename = filename; +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + { + *opened_filename = concat (filename, ".gz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".bz2", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".lzma", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + + #ifdef __MSDOS__ +@@ -677,13 +678,13 @@ open_possibly_compressed_file (char *fil + { + free (*opened_filename); + *opened_filename = concat (filename, ".igz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".inz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + #endif + if (!f) +@@ -695,7 +696,7 @@ open_possibly_compressed_file (char *fil + /* And try opening it again. */ + free (*opened_filename); + *opened_filename = filename; +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + pfatal_with_name (filename); + } +@@ -706,12 +707,12 @@ open_possibly_compressed_file (char *fil + + /* Read first few bytes of file rather than relying on the filename. + If the file is shorter than this it can't be usable anyway. */ +- nread = fread (data, sizeof (data), 1, f); +- if (nread != 1) ++ nread = gzread (f, data, sizeof (data)); ++ if (nread != sizeof (data)) + { + /* Empty files don't set errno, so we get something like + "install-info: No error for foo", which is confusing. */ +- if (nread == 0) ++ if (nread >= 0) + fatal (_("%s: empty file"), *opened_filename, 0); + pfatal_with_name (*opened_filename); + } +@@ -758,20 +759,22 @@ open_possibly_compressed_file (char *fil + + if (*compression_program) + { /* It's compressed, so fclose the file and then open a pipe. */ ++ FILE *p; + char *command = concat (*compression_program," -cd <", *opened_filename); +- if (fclose (f) < 0) ++ if (gzclose (f) < 0) + pfatal_with_name (*opened_filename); +- f = popen (command, "r"); +- if (f) ++ p = popen (command, "r"); ++ if (p) + *is_pipe = 1; + else + pfatal_with_name (command); ++ return p; + } + else + { /* It's a plain file, seek back over the magic bytes. */ +- if (fseek (f, 0, 0) < 0) ++ if (gzseek (f, 0, SEEK_SET) < 0) + pfatal_with_name (*opened_filename); +-#if O_BINARY ++#if 0 && O_BINARY + /* Since this is a text file, and we opened it in binary mode, + switch back to text mode. */ + f = freopen (*opened_filename, "r", f); +@@ -796,7 +799,7 @@ readfile (char *filename, int *sizep, + char **compression_program) + { + char *real_name; +- FILE *f; ++ void *f; + int pipe_p; + int filled = 0; + int data_size = 8192; +@@ -810,7 +813,12 @@ readfile (char *filename, int *sizep, + + for (;;) + { +- int nread = fread (data + filled, 1, data_size - filled, f); ++ int nread; ++ ++ if (pipe_p) ++ nread = fread (data + filled, 1, data_size - filled, f); ++ else ++ nread = gzread (f, data + filled, data_size - filled); + if (nread < 0) + pfatal_with_name (real_name); + if (nread == 0) +@@ -832,7 +840,7 @@ readfile (char *filename, int *sizep, + if (pipe_p) + pclose (f); + else +- fclose (f); ++ gzclose (f); + + *sizep = filled; + return data; diff --git a/pkgs/texinfo/patches/texinfo-4.13a-data_types.patch b/pkgs/texinfo/patches/texinfo-4.13a-data_types.patch new file mode 100644 index 0000000..2a87c21 --- /dev/null +++ b/pkgs/texinfo/patches/texinfo-4.13a-data_types.patch @@ -0,0 +1,32 @@ +diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c +--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200 ++++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200 +@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st + const char *carried_over_ptr; + size_t carried_over_len, carried_over_count; + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + int delim = 0; + int rc; +@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + + if (cur_len == 1) + { +@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line, + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); +- int replen; ++ size_t cur_len = mb_len (mbi_cur (iter)); ++ size_t replen; + + if (cur_ptr >= endp) + break; diff --git a/pkgs/texinfo/patches/texinfo-4.13a-help-index-segfault.patch b/pkgs/texinfo/patches/texinfo-4.13a-help-index-segfault.patch new file mode 100644 index 0000000..6194176 --- /dev/null +++ b/pkgs/texinfo/patches/texinfo-4.13a-help-index-segfault.patch @@ -0,0 +1,23 @@ +diff -up texinfo-4.13/info/indices.c.orig texinfo-4.13/info/indices.c +--- texinfo-4.13/info/indices.c.orig 2010-08-31 12:04:38.317462471 +0200 ++++ texinfo-4.13/info/indices.c 2010-08-31 12:11:49.322624552 +0200 +@@ -192,6 +192,7 @@ do_info_index_search (WINDOW *window, in + index for, build and remember an index now. */ + fb = file_buffer_of_window (window); + if (!initial_index_filename || ++ !fb || + (FILENAME_CMP (initial_index_filename, fb->filename) != 0)) + { + info_free_references (index_index); +@@ -287,8 +288,9 @@ index_entry_exists (WINDOW *window, char + return 0; + + fb = file_buffer_of_window (window); +- if (!initial_index_filename +- || (FILENAME_CMP (initial_index_filename, fb->filename) != 0)) ++ if (!initial_index_filename || ++ !fb || ++ (FILENAME_CMP (initial_index_filename, fb->filename) != 0)) + { + info_free_references (index_index); + index_index = info_indices_of_file_buffer (fb); diff --git a/pkgs/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch b/pkgs/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch new file mode 100644 index 0000000..75a2986 --- /dev/null +++ b/pkgs/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch @@ -0,0 +1,20 @@ +diff -up texinfo-4.13/makeinfo/sectioning.c.orig texinfo-4.13/makeinfo/sectioning.c +--- texinfo-4.13/makeinfo/sectioning.c.orig 2010-11-10 11:24:53.000000000 +0100 ++++ texinfo-4.13/makeinfo/sectioning.c 2010-11-10 11:25:28.000000000 +0100 +@@ -256,14 +256,14 @@ current_chapter_number (void) + return xstrdup (""); + else if (enum_marker == APPENDIX_MAGIC) + { +- char s[1]; ++ char s[2]; + sprintf (s, "%c", numbers[0] + 64); + return xstrdup (s); + } + else + { + char s[5]; +- sprintf (s, "%d", numbers[0]); ++ sprintf (s, "%4d", numbers[0]); + return xstrdup (s); + } + } diff --git a/pkgs/texinfo/patches/texinfo-4.13a-mosdo-crash.patch b/pkgs/texinfo/patches/texinfo-4.13a-mosdo-crash.patch new file mode 100644 index 0000000..77e3a76 --- /dev/null +++ b/pkgs/texinfo/patches/texinfo-4.13a-mosdo-crash.patch @@ -0,0 +1,11 @@ +--- texinfo-4.13/install-info/install-info.c.mosdo-crash 2009-09-02 20:18:44.000000000 -0400 ++++ texinfo-4.13/install-info/install-info.c 2009-09-02 20:19:53.000000000 -0400 +@@ -1765,7 +1765,7 @@ + err = argz_add (&argz, &argz_len, opt); + free (opt); opt = NULL; + +- opt = xmalloc (strlen (regex) + sizeof ("--section=")); ++ opt = xmalloc (strlen (title) + sizeof ("--section=")); + if (sprintf (opt, "--section=%s", title) == -1) + err = 1; + if (!err) diff --git a/pkgs/texinfo/patches/texinfo-4.13a-powerpc.patch b/pkgs/texinfo/patches/texinfo-4.13a-powerpc.patch new file mode 100644 index 0000000..b6c046e --- /dev/null +++ b/pkgs/texinfo/patches/texinfo-4.13a-powerpc.patch @@ -0,0 +1,12 @@ +diff -up texinfo-4.13/install-info/install-info.c.patch texinfo-4.13/install-info/install-info.c +--- texinfo-4.13/install-info/install-info.c.patch 2010-01-11 14:46:32.000000000 +0100 ++++ texinfo-4.13/install-info/install-info.c 2010-01-11 14:48:47.162152695 +0100 +@@ -772,7 +772,7 @@ open_possibly_compressed_file (char *fil + } + else + { /* It's a plain file, seek back over the magic bytes. */ +- if (gzseek (f, 0, SEEK_SET) < 0) ++ if (gzseek (f, 0, SEEK_SET) == -1) + pfatal_with_name (*opened_filename); + #if 0 && O_BINARY + /* Since this is a text file, and we opened it in binary mode, diff --git a/pkgs/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch b/pkgs/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch new file mode 100644 index 0000000..54dabac --- /dev/null +++ b/pkgs/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch @@ -0,0 +1,12 @@ +diff -up texinfo-4.13/util/texi2dvi.orig texinfo-4.13/util/texi2dvi +--- texinfo-4.13/util/texi2dvi.orig 2010-10-11 14:08:21.340831908 +0200 ++++ texinfo-4.13/util/texi2dvi 2010-10-11 14:12:14.235841752 +0200 +@@ -1683,7 +1683,7 @@ input_file_name_decode () + + # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex), + # prepend `./' in order to avoid that the tools take it as an option. +- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \ ++ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \ + || command_line_filename="./$command_line_filename" + + # See if the file exists. If it doesn't we're in trouble since, even diff --git a/pkgs/texinfo/texinfo.nm b/pkgs/texinfo/texinfo.nm index 3bc2a33..99cea53 100644 --- a/pkgs/texinfo/texinfo.nm +++ b/pkgs/texinfo/texinfo.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = texinfo PKG_VER = 4.13a -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Applications/Publishing @@ -34,7 +34,7 @@ PKG_URL = http://www.gnu.org/software/texinfo/ PKG_LICENSE = GPLv3 PKG_SUMMARY = Tools needed to create Texinfo format documentation files. -PKG_BUILD_DEPS+= ncurses-devel +PKG_BUILD_DEPS+= help2man ncurses-devel zlib-devel define PKG_DESCRIPTION Texinfo is a documentation system that can produce both online \ @@ -46,8 +46,7 @@ PKG_TARBALL = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(PKG_NAME)-4.13 -export LDFLAGS = -lncursesw - -define STAGE_TEST - cd $(DIR_APP) && make check -endef +# XXX testsuite fails and needs to be fixed. +#define STAGE_TEST +# cd $(DIR_APP) && make check +#endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 164c0d73e5858e7b9a791a954487a21cae51679e
by git＠ipfire.org 25 Jul '11

25 Jul '11

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 3.x development tree". The branch, master has been updated via 164c0d73e5858e7b9a791a954487a21cae51679e (commit) via 062f14b2a1b45969c0434d0601dd515447cd078c (commit) via 5feccd1492c0fb22ffb52d14b0e70989ad101247 (commit) via 3b95b236ddc9d12f5ab925f06351c0dc569d660b (commit) via b5fa6389f08a862d77492e76438a0b4a9a451a58 (commit) from fe7131a4276be30502ebcc39c22d2a40ca5e12cf (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 164c0d73e5858e7b9a791a954487a21cae51679e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 14:22:35 2011 +0200 chrony: New package. This package replaces ntp, because chrony is claimed to be more robust on buggy internet connections and does not make the CPU wake up too often. commit 062f14b2a1b45969c0434d0601dd515447cd078c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 14:22:14 2011 +0200 ntp: Remove package. commit 5feccd1492c0fb22ffb52d14b0e70989ad101247 Merge: 3b95b23 b5fa638 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 11:46:08 2011 +0200 Merge remote-tracking branch 'stevee/hostapd' commit 3b95b236ddc9d12f5ab925f06351c0dc569d660b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 24 18:18:48 2011 +0200 build-essentials: Add support for prerequires. commit b5fa6389f08a862d77492e76438a0b4a9a451a58 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 17 14:56:14 2011 +0200 hostapd: Process will be monitored by systemd. ----------------------------------------------------------------------- Summary of changes: pkgs/build-essentials/build-essentials.nm | 6 +- .../buildsystem-tools/dependency-tracker | 6 ++- pkgs/build-essentials/buildsystem/Constants | 5 ++ pkgs/chrony/chrony-helper | 68 ++++++++++++++++++++ pkgs/chrony/chrony.conf | 39 +++++++++++ pkgs/chrony/chrony.dhclient | 24 +++++++ pkgs/chrony/chrony.keys | 1 + pkgs/chrony/chrony.logrotate | 8 ++ pkgs/{sqlite/sqlite.nm => chrony/chrony.nm} | 62 ++++++++++-------- pkgs/chrony/systemd/chrony-wait.service | 16 +++++ pkgs/chrony/systemd/chronyd.service | 13 ++++ pkgs/hostapd/hostapd.nm | 2 +- pkgs/hostapd/systemd/hostapd@.service | 18 +++++ pkgs/ntp/ntp.conf | 4 - pkgs/ntp/ntp.nm | 57 ---------------- pkgs/ntp/systemd/ntp.service | 10 --- 16 files changed, 236 insertions(+), 103 deletions(-) create mode 100644 pkgs/chrony/chrony-helper create mode 100644 pkgs/chrony/chrony.conf create mode 100644 pkgs/chrony/chrony.dhclient create mode 100644 pkgs/chrony/chrony.keys create mode 100644 pkgs/chrony/chrony.logrotate copy pkgs/{sqlite/sqlite.nm => chrony/chrony.nm} (58%) create mode 100644 pkgs/chrony/systemd/chrony-wait.service create mode 100644 pkgs/chrony/systemd/chronyd.service create mode 100644 pkgs/hostapd/systemd/hostapd@.service delete mode 100644 pkgs/ntp/ntp.conf delete mode 100644 pkgs/ntp/ntp.nm delete mode 100644 pkgs/ntp/systemd/ntp.service Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index c708204..e29fa42 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -25,9 +25,9 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials -PKG_VER = $(DISTRO_VERSION) -PKG_REL = 20 -PKG_EPOCH = 1 +PKG_VER = 1.0 +PKG_REL = 1 +PKG_EPOCH = 2 PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> diff --git a/pkgs/build-essentials/buildsystem-tools/dependency-tracker b/pkgs/build-essentials/buildsystem-tools/dependency-tracker index 887b7f4..1c29025 100755 --- a/pkgs/build-essentials/buildsystem-tools/dependency-tracker +++ b/pkgs/build-essentials/buildsystem-tools/dependency-tracker @@ -16,8 +16,12 @@ for require in $(find_requires ${args}); do listmatch ${require} ${provides} || requires="${requires} ${require}" done -echo "provides=\"${provides}\"" +if [ -n "${PKG_PREREQUIRES}" ]; then + echo "prerequires=\"/bin/sh ${PKG_PREREQUIRES}\"" +fi echo "requires=\"${requires}\"" +echo "provides=\"${provides}\"" +echo "provides=\"${PKG_CONFLICTS}\"" echo "obsoletes=\"${PKG_OBSOLETES}\"" exit 0 diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index 19a5e8a..d46d5f3 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -61,8 +61,12 @@ SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d PKG_VARIABLES = \ CONTROL_PREIN \ CONTROL_PREUN \ + CONTROL_PREUP \ CONTROL_POSTIN \ CONTROL_POSTUN \ + CONTROL_POSTUP \ + CONTROL_POSTTRANSIN \ + CONTROL_POSTTRANSUN \ \ PKG_ARCH \ PKG_BUILD_DEPS \ @@ -80,6 +84,7 @@ PKG_VARIABLES = \ PKG_URL \ PKG_VER \ \ + PKG_PREREQUIRES \ PKG_PROVIDES_FILTER \ PKG_REQUIRES_FILTER diff --git a/pkgs/chrony/chrony-helper b/pkgs/chrony/chrony-helper new file mode 100644 index 0000000..a5bbf84 --- /dev/null +++ b/pkgs/chrony/chrony-helper @@ -0,0 +1,68 @@ +#!/bin/bash + +config=/etc/chrony.conf +keyfile=/etc/chrony.keys +chronyc=/usr/bin/chronyc +dhclient_servers=/var/lib/dhclient/chrony.servers.* +service_name=chronyd.service + +get_key() { + awk '/^[ \t]*'$1'\>/ { print $2; exit }' < $keyfile +} + +get_commandkeyid() { + awk '/^[ \t]*commandkey\>/ { keyid=$2 } END { print keyid }' < $config +} + +chrony_command() { + commandkeyid=$(get_commandkeyid) + [ -z "$commandkeyid" ] && return 1 + commandkey=$(get_key $commandkeyid) + [ -z "$commandkey" ] && return 2 + + $chronyc <<EOF +password $commandkey +$1 +EOF +} + +generate_commandkey() { + commandkeyid=$(get_commandkeyid) + [ -z "$commandkeyid" ] && return 1 + commandkey=$(get_key $commandkeyid) + [ -z "$commandkey" ] || return 0 + + commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 8) + [ -n "$commandkey" ] && echo "$commandkeyid $commandkey" >> $keyfile +} + +add_dhclient_servers() { + command=$(cat $dhclient_servers 2> /dev/null | + while read server serverargs; do + echo "add server $server $serverargs" + done) + if [ -n "$command" ]; then + chrony_command "$command" &> /dev/null + fi +} + +is_running() { + systemctl status chronyd.service &> /dev/null +} + +case "$1" in + generate-commandkey) + generate_commandkey + ;; + add-dhclient-servers) + add_dhclient_servers + ;; + command) + is_running && chrony_command "$2" + ;; + *) + echo $"Usage: $0 {generate-commandkey|add-dhclient-servers|command}" + exit 2 +esac +exit $? + diff --git a/pkgs/chrony/chrony.conf b/pkgs/chrony/chrony.conf new file mode 100644 index 0000000..7e3690b --- /dev/null +++ b/pkgs/chrony/chrony.conf @@ -0,0 +1,39 @@ +# Use public servers from the pool.ntp.org project. +# Please consider joining the pool (http://www.pool.ntp.org/join.html). +server 0.fedora.pool.ntp.org iburst +server 1.fedora.pool.ntp.org iburst +server 2.fedora.pool.ntp.org iburst +server 3.fedora.pool.ntp.org iburst + +# Ignore stratum in source selection. +stratumweight 0 + +# Record the rate at which the system clock gains/losses time. +driftfile /var/lib/chrony/drift + +# Enable kernel RTC synchronization. +rtcsync + +# In first three updates step the system clock instead of slew +# if the adjustment is larger than 100 seconds. +makestep 100 3 + +# Allow client access from local network. +#allow 192.168/16 + +# Serve time even if not synchronized to any NTP server. +#local stratum 10 + +keyfile /etc/chrony.keys + +# Specify the key used as password for chronyc. +commandkey 1 + +# Disable logging of client accesses. +noclientlog + +# Send a message to syslog if a clock adjustment is larger than 0.5 seconds. +logchange 0.5 + +logdir /var/log/chrony +#log measurements statistics tracking diff --git a/pkgs/chrony/chrony.dhclient b/pkgs/chrony/chrony.dhclient new file mode 100644 index 0000000..73fa893 --- /dev/null +++ b/pkgs/chrony/chrony.dhclient @@ -0,0 +1,24 @@ +#!/bin/bash + +SERVERFILE=$SAVEDIR/chrony.servers.$interface + +chrony_config() { + rm -f $SERVERFILE + if [ "$PEERNTP" != "no" ]; then + /usr/libexec/chrony-helper command "$( + for server in $new_ntp_servers; do + echo "add server $server $NTPSERVERARGS" + echo "$server $NTPSERVERARGS" >> $SERVERFILE + done)" &> /dev/null + fi +} + +chrony_restore() { + if [ -f $SERVERFILE ]; then + /usr/libexec/chrony-helper command "$( + while read server serverargs; do + echo "delete $server" + done < $SERVERFILE)" &> /dev/null + rm -f $SERVERFILE + fi +} diff --git a/pkgs/chrony/chrony.keys b/pkgs/chrony/chrony.keys new file mode 100644 index 0000000..6bed03a --- /dev/null +++ b/pkgs/chrony/chrony.keys @@ -0,0 +1 @@ +#1 a_key diff --git a/pkgs/chrony/chrony.logrotate b/pkgs/chrony/chrony.logrotate new file mode 100644 index 0000000..4bb83b2 --- /dev/null +++ b/pkgs/chrony/chrony.logrotate @@ -0,0 +1,8 @@ +/var/log/chrony/*.log { + missingok + nocreate + sharedscripts + postrotate + /usr/libexec/chrony-helper command cyclelogs > /dev/null 2>&1 || true + endscript +} diff --git a/pkgs/chrony/chrony.nm b/pkgs/chrony/chrony.nm new file mode 100644 index 0000000..d5d4e63 --- /dev/null +++ b/pkgs/chrony/chrony.nm @@ -0,0 +1,75 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = chrony +PKG_VER = 1.26 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = System/Daemons +PKG_URL = http://chrony.tuxfamily.org +PKG_LICENSE = GPLv2 +PKG_SUMMARY = An NTP client/server. + +PKG_BUILD_DEPS+= bison libcap-devel readline-devel texinfo + +define PKG_DESCRIPTION + A client/server for the Network Time Protocol, this program keeps your + computer's clock accurate. It was specially designed to support + systems with intermittent internet connections, but it also works well + in permanently connected environments. It can use also hardware reference + clocks, system real-time clock or manual input as time references. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME)-devel + +CONFIGURE_OPTIONS += \ + --with-sendmail=/usr/sbin/sendmail + +STAGE_BUILD_TARGETS += getdate all docs +STAGE_INSTALL_TARGETS += install-docs + +define STAGE_INSTALL_CMDS + -mkdir -pv $(BUILDROOT)/var/{lib,log}/chrony + touch $(BUILDROOT)/var/lib/chrony/{drift,rtc} + + -mkdir -pv $(BUILDROOT)/etc + install -m 644 -p $(DIR_SOURCE)/chrony.conf $(BUILDROOT)/etc/chrony.conf + install -m 640 -p $(DIR_SOURCE)/chrony.keys $(BUILDROOT)/etc/chrony.keys + + -mkdir -pv $(BUILDROOT)/etc/dhcp/dhclient.d + install -m 755 -p $(DIR_SOURCE)/chrony.dhclient \ + $(BUILDROOT)/etc/dhcp/dhclient.d/chrony.sh + + -mkdir -pv $(BUILDROOT)/etc/logrotate.d + install -m 644 -p $(DIR_SOURCE)/chrony.logrotate \ + $(BUILDROOT)/etc/logrotate.d/chrony + + -mkdir -pv $(BUILDROOT)/usr/lib/chrony + install -m 755 -p $(DIR_SOURCE)/chrony-helper $(BUILDROOT)/usr/lib/chrony-helper +endef diff --git a/pkgs/chrony/systemd/chrony-wait.service b/pkgs/chrony/systemd/chrony-wait.service new file mode 100644 index 0000000..3958160 --- /dev/null +++ b/pkgs/chrony/systemd/chrony-wait.service @@ -0,0 +1,16 @@ +[Unit] +Description=Wait for chrony to synchronize system clock +After=chronyd.service +Requires=chronyd.service +Before=time-sync.target +Wants=time-sync.target + +[Service] +Type=oneshot +# Wait up to ~10 minutes for chronyd to synchronize and the remaining +# clock correction to be less than 0.1 seconds +ExecStart=/usr/bin/chronyc waitsync 60 0.1 +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/chrony/systemd/chronyd.service b/pkgs/chrony/systemd/chronyd.service new file mode 100644 index 0000000..bcff9cb --- /dev/null +++ b/pkgs/chrony/systemd/chronyd.service @@ -0,0 +1,13 @@ +[Unit] +Description=NTP client/server +After=syslog.target ntpdate.service +Conflicts=ntpd.service + +[Service] +EnvironmentFile=-/etc/sysconfig/chronyd +ExecStartPre=/usr/libexec/chrony-helper generate-commandkey +ExecStart=/usr/sbin/chronyd -n -u chrony $OPTIONS +ExecStartPost=/usr/libexec/chrony-helper add-dhclient-servers + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/hostapd/hostapd.nm b/pkgs/hostapd/hostapd.nm index 1188bfa..fdcd248 100644 --- a/pkgs/hostapd/hostapd.nm +++ b/pkgs/hostapd/hostapd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = hostapd PKG_VER = 0.6.9 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Networking/Tools diff --git a/pkgs/hostapd/systemd/hostapd@.service b/pkgs/hostapd/systemd/hostapd@.service new file mode 100644 index 0000000..2cff6d9 --- /dev/null +++ b/pkgs/hostapd/systemd/hostapd@.service @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=WLAN AP on %I +BindTo=dev-%I.device +After=dev-%I.device network.service +Requires=network.service + +[Service] +ExecStart=/usr/bin/hostapd -dd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config +#Restart=always +UtmpIdentifier=%I +KillMode=process diff --git a/pkgs/ntp/ntp.conf b/pkgs/ntp/ntp.conf deleted file mode 100644 index 4b89e83..0000000 --- a/pkgs/ntp/ntp.conf +++ /dev/null @@ -1,4 +0,0 @@ -restrict default nomodify noquery -restrict 127.0.0.1 -server pool.ntp.org -driftfile /etc/ntp/drift diff --git a/pkgs/ntp/ntp.nm b/pkgs/ntp/ntp.nm deleted file mode 100644 index 3fb3e92..0000000 --- a/pkgs/ntp/ntp.nm +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = ntp -PKG_VER = 4.2.6p1 -PKG_REL = 2 - -PKG_MAINTAINER = -PKG_GROUPS = Base System/Daemons -PKG_URL = http://www.ntp.org/ -PKG_LICENSE = MIT, BSD and GPLv2 -PKG_SUMMARY = The NTP daemon and utilities. - -PKG_BUILD_DEPS+= openssl-devel readline-devel - -define PKG_DESCRIPTION - The Network Time Protocol (NTP) is used to synchronize a computer's \ - time with another reference time source. This package includes ntpd \ - and utilities used to query and configure the ntpd daemon. -endef - -PKG_TARBALL = $(THISAPP).tar.gz - -CFLAGS += -DMOD_NANO - -CONFIGURE_OPTIONS += \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --with-binsubdir=sbin - -define STAGE_INSTALL_CMDS - -mkdir -pv $(BUILDROOT)/etc - cp -vf $(DIR_SOURCE)/ntp.conf $(BUILDROOT)/etc/ntp.conf -endef diff --git a/pkgs/ntp/systemd/ntp.service b/pkgs/ntp/systemd/ntp.service deleted file mode 100644 index f2cc060..0000000 --- a/pkgs/ntp/systemd/ntp.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Network Time Protocol Daemon -After=network.target - -[Service] -ExecStart=/usr/sbin/ntpd -4 -n -c /etc/ntp.conf - -[Install] -WantedBy=multi-user.target - hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 44ab6faa5f235d4547d9d183fde39b4ba9638cc4
by git＠ipfire.org 24 Jul '11

24 Jul '11

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 44ab6faa5f235d4547d9d183fde39b4ba9638cc4 (commit) via e21677b139d691cc15c0865646e3a91000076aef (commit) via f6f44bb0a7a58c5c758e6498756ef5b3e2f437de (commit) from 5c2d9a6106b9fd1a5b5928657500152c27180fdd (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 44ab6faa5f235d4547d9d183fde39b4ba9638cc4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 00:17:59 2011 +0200 updated language documentations. commit e21677b139d691cc15c0865646e3a91000076aef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 00:15:56 2011 +0200 langs_checker: fix sort_strings. commit f6f44bb0a7a58c5c758e6498756ef5b3e2f437de Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 00:14:56 2011 +0200 langs: reimport polish language file because there are encoding issues. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 1 - doc/language_issues.en | 1 - doc/language_issues.es | 2 +- doc/language_issues.fr | 2 +- doc/language_issues.pl | 2 +- doc/language_missings | 282 +----------- langs/pl/cgi-bin/pl.pl | 1280 ++++++++++++++++++++++++------------------------ tools/sort_strings.pl | 7 - 8 files changed, 646 insertions(+), 931 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 6c204b1..d59f1f3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -235,7 +235,6 @@ WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size -WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modem on com1 diff --git a/doc/language_issues.en b/doc/language_issues.en index 63eda2c..3df8ad2 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -262,7 +262,6 @@ WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size -WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modem on com1 diff --git a/doc/language_issues.es b/doc/language_issues.es index 376ee6e..ae69c6f 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -262,7 +262,6 @@ WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size -WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modem on com1 @@ -513,6 +512,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 98c6a69..cb58f42 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -263,7 +263,6 @@ WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size -WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modem on com1 @@ -515,6 +514,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 376ee6e..ae69c6f 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -262,7 +262,6 @@ WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size -WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modem on com1 @@ -513,6 +512,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group diff --git a/doc/language_missings b/doc/language_missings index 46bfe68..0ddcb95 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -29,6 +29,7 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< minute < ntp common settings < ntp sync < snort working @@ -80,6 +81,7 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< minute < outgoing firewall add ip group < outgoing firewall add mac group < outgoing firewall edit ip group @@ -99,285 +101,7 @@ ############################################################################ # Checking install/setup translations for language: pl # ############################################################################ -< TR_ISDN -< TR_ERROR_PROBING_ISDN -< TR_PROBING_ISDN -< TR_MISSING_GREEN_IP -< TR_CHOOSE_FILESYSTEM -< TR_NOT_ENOUGH_INTERFACES -< TR_INTERFACE_CHANGE -< TR_NETCARD_COLOR -< TR_REMOVE -< TR_MISSING_DNS -< TR_MISSING_DEFAULT -< TR_JOURNAL_EXT3 -< TR_CHOOSE_NETCARD -< TR_NETCARDMENU2 -< TR_ERROR_INTERFACES -< TR_REMOVE_CARD -< TR_JOURNAL_ERROR -< TR_FILESYSTEM -< TR_ADDRESS_SETTINGS -< TR_ADMIN_PASSWORD -< TR_AGAIN_PROMPT -< TR_ALL_CARDS_SUCCESSFULLY_ALLOCATED -< TR_AUTODETECT -< TR_BUILDING_INITRD -< TR_CANCEL -< TR_CARD_ASSIGNMENT -< TR_CHECKING -< TR_CHECKING_FOR -< TR_CHOOSE_THE_ISDN_CARD_INSTALLED -< TR_CHOOSE_THE_ISDN_PROTOCOL -< TR_CONFIGURE_DHCP -< TR_CONFIGURE_NETWORKING -< TR_CONFIGURE_NETWORKING_LONG -< TR_CONFIGURE_NETWORK_DRIVERS -< TR_CONFIGURE_THE_CDROM -< TR_CONGRATULATIONS -< TR_CONGRATULATIONS_LONG -< TR_CONTINUE_NO_SWAP -< TR_CURRENT_CONFIG -< TR_DEFAULT_GATEWAY -< TR_DEFAULT_GATEWAY_CR -< TR_DEFAULT_LEASE -< TR_DEFAULT_LEASE_CR -< TR_DETECTED -< TR_DHCP_HOSTNAME -< TR_DHCP_HOSTNAME_CR -< TR_DHCP_SERVER_CONFIGURATION -< TR_DISABLED -< TR_DISABLE_ISDN -< TR_DISK_TOO_SMALL -< TR_DNS_AND_GATEWAY_SETTINGS -< TR_DNS_AND_GATEWAY_SETTINGS_LONG -< TR_DNS_GATEWAY_WITH_GREEN -< TR_DOMAINNAME -< TR_DOMAINNAME_CANNOT_BE_EMPTY -< TR_DOMAINNAME_CANNOT_CONTAIN_SPACES -< TR_DOMAINNAME_NOT_VALID_CHARS -< TR_DOMAIN_NAME_SUFFIX -< TR_DOMAIN_NAME_SUFFIX_CR -< TR_DONE -< TR_DO_YOU_WISH_TO_CHANGE_THESE_SETTINGS -< TR_DRIVERS_AND_CARD_ASSIGNMENTS -< TR_ENABLED -< TR_ENABLE_ISDN -< TR_END_ADDRESS -< TR_END_ADDRESS_CR -< TR_ENTER_ADDITIONAL_MODULE_PARAMS -< TR_ENTER_ADMIN_PASSWORD -< TR_ENTER_DOMAINNAME -< TR_ENTER_HOSTNAME -< TR_ENTER_IP_ADDRESS_INFO -< TR_ENTER_NETWORK_DRIVER -< TR_ENTER_ROOT_PASSWORD -< TR_ENTER_SETUP_PASSWORD -< TR_ENTER_THE_IP_ADDRESS_INFORMATION -< TR_ENTER_THE_LOCAL_MSN -< TR_ENTER_URL -< TR_ERROR -< TR_ERROR_PROBING_CDROM -< TR_ERROR_WRITING_CONFIG -< TR_EURO_EDSS1 -< TR_EXTRACTING_MODULES -< TR_FAILED_TO_FIND -< TR_FOUND_NIC -< TR_GERMAN_1TR6 -< TR_HELPLINE -< TR_HOSTNAME -< TR_HOSTNAME_CANNOT_BE_EMPTY -< TR_HOSTNAME_CANNOT_CONTAIN_SPACES -< TR_HOSTNAME_NOT_VALID_CHARS -< TR_INITIALISING_ISDN -< TR_INSERT_CDROM -< TR_INSERT_FLOPPY -< TR_INSTALLATION_CANCELED -< TR_INSTALLING_FILES -< TR_INSTALLING_GRUB -< TR_INSTALLING_LANG_CACHE -< TR_INTERFACE -< TR_INTERFACE_FAILED_TO_COME_UP -< TR_INVALID_FIELDS -< TR_INVALID_IO -< TR_INVALID_IRQ -< TR_IP_ADDRESS_CR -< TR_IP_ADDRESS_PROMPT -< TR_ISDN_CARD -< TR_ISDN_CARD_NOT_DETECTED -< TR_ISDN_CARD_SELECTION -< TR_ISDN_CONFIGURATION -< TR_ISDN_CONFIGURATION_MENU -< TR_ISDN_NOT_SETUP -< TR_ISDN_NOT_YET_CONFIGURED -< TR_ISDN_PROTOCOL_SELECTION -< TR_ISDN_STATUS -< TR_KEYBOARD_MAPPING -< TR_KEYBOARD_MAPPING_LONG -< TR_LEASED_LINE -< TR_LOADING_MODULE -< TR_LOADING_PCMCIA -< TR_LOOKING_FOR_NIC -< TR_MAKING_BOOT_FILESYSTEM -< TR_MAKING_LOG_FILESYSTEM -< TR_MAKING_ROOT_FILESYSTEM -< TR_MAKING_SWAPSPACE -< TR_MANUAL -< TR_MAX_LEASE -< TR_MAX_LEASE_CR -< TR_MISSING_BLUE_IP -< TR_MISSING_ORANGE_IP -< TR_MISSING_RED_IP -< TR_MODULE_NAME_CANNOT_BE_BLANK -< TR_MODULE_PARAMETERS -< TR_MOUNTING_BOOT_FILESYSTEM -< TR_MOUNTING_LOG_FILESYSTEM -< TR_MOUNTING_ROOT_FILESYSTEM -< TR_MOUNTING_SWAP_PARTITION -< TR_MSN_CONFIGURATION -< TR_NETMASK_PROMPT -< TR_NETWORKING -< TR_NETWORK_ADDRESS_CR -< TR_NETWORK_ADDRESS_PROMPT -< TR_NETWORK_CONFIGURATION_MENU -< TR_NETWORK_CONFIGURATION_TYPE -< TR_NETWORK_CONFIGURATION_TYPE_LONG -< TR_NETWORK_MASK_CR -< TR_NETWORK_SETUP_FAILED -< TR_NOT_ENOUGH_CARDS_WERE_ALLOCATED -< TR_NO_BLUE_INTERFACE -< TR_NO_CDROM -< TR_NO_GREEN_INTERFACE -< TR_NO_HARDDISK -< TR_NO_IPCOP_TARBALL_FOUND -< TR_NO_ORANGE_INTERFACE -< TR_NO_RED_INTERFACE -< TR_NO_SCSI_IMAGE_FOUND -< TR_NO_UNALLOCATED_CARDS -< TR_OK -< TR_PARTITIONING_DISK -< TR_PASSWORDS_DO_NOT_MATCH -< TR_PASSWORD_CANNOT_BE_BLANK -< TR_PASSWORD_CANNOT_CONTAIN_SPACES -< TR_PASSWORD_PROMPT -< TR_PHONENUMBER_CANNOT_BE_EMPTY -< TR_PREPARE_HARDDISK -< TR_PRESS_OK_TO_REBOOT -< TR_PRIMARY_DNS -< TR_PRIMARY_DNS_CR -< TR_PROBE -< TR_PROBE_FAILED -< TR_PROBING_HARDWARE -< TR_PROBING_FOR_NICS -< TR_PROBLEM_SETTING_ADMIN_PASSWORD -< TR_PROBLEM_SETTING_ROOT_PASSWORD -< TR_PROBLEM_SETTING_SETUP_PASSWORD -< TR_PROTOCOL_COUNTRY -< TR_PULLING_NETWORK_UP -< TR_PUSHING_NETWORK_DOWN -< TR_PUSHING_NON_LOCAL_NETWORK_DOWN -< TR_QUIT -< TR_RED_IN_USE -< TR_RESTART_REQUIRED -< TR_RESTORE -< TR_RESTORE_CONFIGURATION -< TR_ROOT_PASSWORD -< TR_SECONDARY_DNS -< TR_SECONDARY_DNS_CR -< TR_SECONDARY_WITHOUT_PRIMARY_DNS -< TR_SECTION_MENU -< TR_SELECT -< TR_SELECT_CDROM_TYPE -< TR_SELECT_CDROM_TYPE_LONG -< TR_SELECT_INSTALLATION_MEDIA -< TR_SELECT_INSTALLATION_MEDIA_LONG -< TR_SELECT_NETWORK_DRIVER -< TR_SELECT_NETWORK_DRIVER_LONG -< TR_SELECT_THE_INTERFACE_YOU_WISH_TO_RECONFIGURE -< TR_SELECT_THE_ITEM -< TR_SETTING_ADMIN_PASSWORD -< TR_SETTING_ROOT_PASSWORD -< TR_SETTING_SETUP_PASSWORD -< TR_SETUP_FINISHED -< TR_SETUP_NOT_COMPLETE -< TR_SETUP_PASSWORD -< TR_SET_ADDITIONAL_MODULE_PARAMETERS -< TR_SINGLE_GREEN -< TR_SKIP -< TR_START_ADDRESS -< TR_START_ADDRESS_CR -< TR_STATIC -< TR_SUGGEST_IO -< TR_SUGGEST_IRQ -< TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED -< TR_TIMEZONE -< TR_TIMEZONE_LONG -< TR_UNABLE_TO_EJECT_CDROM -< TR_UNABLE_TO_EXTRACT_MODULES -< TR_UNABLE_TO_FIND_ANY_ADDITIONAL_DRIVERS -< TR_UNABLE_TO_FIND_AN_ISDN_CARD -< TR_UNABLE_TO_INITIALISE_ISDN -< TR_UNABLE_TO_INSTALL_FILES -< TR_UNABLE_TO_INSTALL_LANG_CACHE -< TR_UNABLE_TO_INSTALL_GRUB -< TR_UNABLE_TO_LOAD_DRIVER_MODULE -< TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM -< TR_UNABLE_TO_MAKE_LOG_FILESYSTEM -< TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM -< TR_UNABLE_TO_MAKE_SWAPSPACE -< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK -< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK1 -< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK2 -< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK3 -< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK4 -< TR_UNABLE_TO_MAKE_SYMLINK_DEV_ROOT -< TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM -< TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM -< TR_UNABLE_TO_MOUNT_PROC_FILESYSTEM -< TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM -< TR_UNABLE_TO_MOUNT_SWAP_PARTITION -< TR_UNABLE_TO_OPEN_HOSTS_FILE -< TR_UNABLE_TO_OPEN_SETTINGS_FILE -< TR_UNABLE_TO_PARTITION -< TR_UNABLE_TO_REMOVE_TEMP_FILES -< TR_UNABLE_TO_SET_HOSTNAME -< TR_UNABLE_TO_UNMOUNT_CDROM -< TR_UNABLE_TO_UNMOUNT_HARDDISK -< TR_UNABLE_TO_WRITE_ETC_FSTAB -< TR_UNABLE_TO_WRITE_ETC_HOSTNAME -< TR_UNABLE_TO_WRITE_ETC_HOSTS -< TR_UNABLE_TO_WRITE_ETC_HOSTS_ALLOW -< TR_UNABLE_TO_WRITE_ETC_HOSTS_DENY -< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_ETHERNET_SETTINGS -< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_HOSTNAMECONF -< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_SETTINGS -< TR_UNCLAIMED_DRIVER -< TR_UNKNOWN -< TR_UNSET -< TR_USB_KEY_VFAT_ERR -< TR_US_NI1 -< TR_WARNING -< TR_WARNING_LONG -< TR_WELCOME -< TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER -< TR_YES -< TR_NO -< TR_AS -< TR_IGNORE -< TR_PPP_DIALUP -< TR_DHCP -< TR_DHCP_STARTSERVER -< TR_DHCP_STOPSERVER -< TR_LICENSE_ACCEPT -< TR_LICENSE_NOT_ACCEPTED -< TR_EXT2FS_DESCR -< TR_EXT3FS_DESCR -< TR_EXT4FS_DESCR -< TR_REISERFS_DESCR -< TR_NO_LOCAL_SOURCE -< TR_DOWNLOADING_ISO -< TR_DOWNLOAD_ERROR -< TR_DHCP_FORCE_MTU ############################################################################ # Checking cgi-bin translations for language: pl # ############################################################################ +< minute diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 8283fa3..4359984 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -2,13 +2,13 @@ %tr, 'Act as' => 'Act as:', -'Add Level7 rule' => 'Dodaj reguÅÃ L7', -'Add Port Rule' => 'Dodaj reguÅÃ portu', -'Add Rule' => 'Dodaj reguÅÃ', -'Async logging enabled' => 'WÅÃcz asynchroniczny zapis do pliku syslog', -'Choose Rule' => 'Wybierz <u>jednÃ</u> z poniÅŒszych reguÅ.', +'Add Level7 rule' => 'Dodaj reguÅÄ L7', +'Add Port Rule' => 'Dodaj reguÅÄ portu', +'Add Rule' => 'Dodaj reguÅÄ', +'Async logging enabled' => 'WÅÄcz asynchroniczny zapis do pliku syslog', +'Choose Rule' => 'Wybierz <u>jednÄ</u> z poniÅŒszych reguÅ.', 'Class' => 'Klasa', -'Class was deleted' => 'wraz z ewentualnymi podklasami zostaÅa usuniÃta', +'Class was deleted' => 'wraz z ewentualnymi podklasami zostaÅa usuniÄta', 'Client status and controlc' => 'Client status and control:', 'ConnSched action' => 'Zadanie:', 'ConnSched add action' => 'Dodaj zadanie', @@ -17,20 +17,20 @@ 'ConnSched down' => 'NiÅŒej', 'ConnSched ipsecstart' => '(Re)start IPSec', 'ConnSched ipsecstop' => 'Zatrzymanie IPSec', -'ConnSched reconnect' => 'Ponowne poÅÃczenie', +'ConnSched reconnect' => 'Ponowne poÅÄczenie', 'ConnSched scheduled actions' => 'Zaplanowane zadania', 'ConnSched scheduler' => 'Harmonogram', 'ConnSched select profile' => 'Wybierz profil', 'ConnSched time' => 'Czas:', 'ConnSched up' => 'WyÅŒej', 'ConnSched weekdays' => 'Dni tygodnia:', -'Enter TOS' => 'Aktywuj lub deaktywuj bity TOS <br /> a nastÃpnie kliknij <i>Zapisz</i>.', +'Enter TOS' => 'Aktywuj lub deaktywuj bity TOS <br /> a nastÄpnie kliknij <i>Zapisz</i>.', 'Existing Files' => 'PlikÃ³w w bazie', 'HDD temperature' => 'Temperatura HDD', 'Level7 Protocol' => 'ProtokÃ³Å-L7', 'Level7 Rule' => 'ReguÅa-L7', 'Level7 rule' => 'ReguÅa L7 ', -'Local VPN IP' => 'SieÃ wewnÃtrzna (GREEN):', +'Local VPN IP' => 'SieÄ wewnÄtrzna (GREEN):', 'MTU' => 'Rozmiar MTU:', 'Number of IPs for the pie chart' => 'Liczba numerÃ³w IP na wykresie koÅowym', 'Number of Ports for the pie chart' => 'Liczba portÃ³w na wykresie koÅowym', @@ -39,10 +39,10 @@ 'Pages' => 'Stron', 'Ping' => 'Ping :', 'Port Rule' => 'ReguÅa portu', -'QoS not enabled' => 'QoS nie jest wÅÃczony!', -'Queuelenght' => 'DÅugoÅÃ kolejki', +'QoS not enabled' => 'QoS nie jest wÅÄczony!', +'Queuelenght' => 'DÅugoÅÄ kolejki', 'Remote IP' => 'Zdalny IP / Nazwa hosta (DynDNS):', -'Remote VPN IP' => 'PodsieÃ VPN (np. 10.0.10.0/255.255.255.0):', +'Remote VPN IP' => 'PodsieÄ VPN (np. 10.0.10.0/255.255.255.0):', 'Resolv' => 'Resolv-Retry:', 'Scan for Files' => 'Scan for files', 'Scan from Directory' => 'Scan from directory', @@ -57,12 +57,12 @@ 'Utilization on' => 'Utilization on', 'Verbose' => 'Verbose:', 'WakeOnLan' => 'Wake On Lan', -'a ca certificate with this name already exists' => 'Certyfikat CA z tÃ nazwÃ juÅŒ istnieje.', -'a connection with this common name already exists' => 'PoÅÃczenie z tÃ nazwÃ pospolitÃ (common name) juÅŒ istnieje.', -'a connection with this name already exists' => 'PoÅÃczenie z tÃ nazwÃ juÅŒ istnieje.', +'a ca certificate with this name already exists' => 'Certyfikat CA z tÄ nazwÄ juÅŒ istnieje.', +'a connection with this common name already exists' => 'PoÅÄczenie z tÄ nazwÄ pospolitÄ (common name) juÅŒ istnieje.', +'a connection with this name already exists' => 'PoÅÄczenie z tÄ nazwÄ juÅŒ istnieje.', 'abort' => 'przerwij', -'access allowed' => 'DostÃp dozwolony z:', -'access refused with this oinkcode' => 'DostÃp odrzucony dla tego Oink Code', +'access allowed' => 'DostÄp dozwolony z:', +'access refused with this oinkcode' => 'DostÄp odrzucony dla tego Oink Code', 'accounting' => 'Accounting', 'accounting user nonpdc' => 'Accounting - none PDC Mode', 'accounting user pdc' => 'Accounting - PDC Mode', @@ -72,19 +72,19 @@ 'active' => 'Aktywne', 'add' => 'Dodaj', 'add a host' => 'Dodaj hosta:', -'add a new rule' => 'Dodaj nowÃ reguÅÃ:', +'add a new rule' => 'Dodaj nowÄ reguÅÄ:', 'add cron' => 'dodaj zadanie crona', -'add device' => 'Dodaj urzÃdzenie', -'add network' => 'Dodaj sieÃ', +'add device' => 'Dodaj urzÄdzenie', +'add network' => 'Dodaj sieÄ', 'add new alias' => 'Dodaj nowy alias:', -'add new lease' => 'Dodaj statyczne powiÃzanie DHCP', +'add new lease' => 'Dodaj statyczne powiÄzanie DHCP', 'add new ovpn' => 'Ustawienia OpenVPN:', -'add printer' => 'Dodaj drukarkÃ', -'add service' => 'Dodaj usÅugÃ', +'add printer' => 'Dodaj drukarkÄ', +'add service' => 'Dodaj usÅugÄ', 'add share' => 'Dodaj zasÃ³b', -'add subclass' => 'Dodaj podklasÃ', +'add subclass' => 'Dodaj podklasÄ', 'add user' => 'Dodaj uÅŒytkownika', -'add xtaccess' => 'Dodaj dostÃp z zewnÃtrz', +'add xtaccess' => 'Dodaj dostÄp z zewnÄtrz', 'add-route' => 'Dodatkowe rutingi wypychane', 'added from dhcp lease list' => 'Dodany z listy DHCP', 'admin user password has been changed' => 'HasÅo administratora zostaÅo zmienione.', @@ -105,7 +105,7 @@ 'advproxy AUTH method ntlm' => 'Windows', 'advproxy AUTH method radius' => 'RADIUS', 'advproxy AUTH no auth' => 'Domeny bez autoryzacji (jedna w linii)', -'advproxy AUTH number of auth processes' => 'Liczba procesÃ³w autoryzujÃcych', +'advproxy AUTH number of auth processes' => 'Liczba procesÃ³w autoryzujÄcych', 'advproxy AUTH realm' => 'Authentication realm prompt', 'advproxy AUTH user IP cache TTL' => 'TTL uÅŒytkownika/IP (w minutach)', 'advproxy IDENT authorized users' => 'Uprawnieni uÅŒytkownicy (jeden w linii)', @@ -114,8 +114,8 @@ 'advproxy IDENT required' => 'Wymagaj autoryzacji identd', 'advproxy IDENT timeout' => 'Czas oczekiwania Ident (w sekundach)', 'advproxy IDENT unauthorized users' => 'Unauthorized users (one per line)', -'advproxy IDENT use negative access list' => 'UÅŒywaj negatywnej kontroli dostÃpu', -'advproxy IDENT use positive access list' => 'UÅŒywaj pozytywnej kontroli dostÃpu', +'advproxy IDENT use negative access list' => 'UÅŒywaj negatywnej kontroli dostÄpu', +'advproxy IDENT use positive access list' => 'UÅŒywaj pozytywnej kontroli dostÄpu', 'advproxy IDENT user based access restrictions' => 'User based access restrictions', 'advproxy LDAP ADS' => 'Active Directory', 'advproxy LDAP NDS' => 'Novell eDirectory', @@ -127,7 +127,7 @@ 'advproxy LDAP binddn settings' => 'Ustawienia Bind DN', 'advproxy LDAP binddn username' => 'UÅŒytkownik Bind DN', 'advproxy LDAP common settings' => 'Podstawowe ustawienia LDAP', -'advproxy LDAP group access control' => 'Kontrola dostÃpu wedÅug grup', +'advproxy LDAP group access control' => 'Kontrola dostÄpu wedÅug grup', 'advproxy LDAP group required' => 'Wymagana grupa', 'advproxy LDAP port' => 'Port', 'advproxy LDAP server' => 'Serwer LDAP', @@ -138,17 +138,17 @@ 'advproxy NCSA create user' => 'UtwÃ³rz uÅŒytkownika', 'advproxy NCSA group' => 'Grupa', 'advproxy NCSA group membership' => 'CzÅonkowie grupy', -'advproxy NCSA grp disabled' => 'WyÅÃczony', +'advproxy NCSA grp disabled' => 'WyÅÄczony', 'advproxy NCSA grp extended' => 'Rozszerzony', 'advproxy NCSA grp standard' => 'Podstawowy', -'advproxy NCSA min password length' => 'Minimalna dÅugoÅÃ hasÅa', -'advproxy NCSA no accounts' => 'Brak dostÃpnych kont uÅŒytkownikÃ³w', +'advproxy NCSA min password length' => 'Minimalna dÅugoÅÄ hasÅa', +'advproxy NCSA no accounts' => 'Brak dostÄpnych kont uÅŒytkownikÃ³w', 'advproxy NCSA password' => 'HasÅo', 'advproxy NCSA password confirm' => 'HasÅo (potwierdÅº)', 'advproxy NCSA redirector bypass' => 'Bypass redirection for members of the group', 'advproxy NCSA update user' => 'Aktualizuj uÅŒytkownika', 'advproxy NCSA user accounts' => 'Konta uÅŒytkownikÃ³w', -'advproxy NCSA user management' => 'ZarzÃdzanie uÅŒytkownikami', +'advproxy NCSA user management' => 'ZarzÄdzanie uÅŒytkownikami', 'advproxy NCSA username' => 'Nazwa uÅŒytkownika', 'advproxy NTLM BDC hostname' => 'Host BDC', 'advproxy NTLM PDC hostname' => 'Host PDC', @@ -158,10 +158,10 @@ 'advproxy NTLM domain' => 'Domena', 'advproxy NTLM domain settings' => 'Podstawowe ustawienia domeny', 'advproxy NTLM unauthorized users' => 'Nieuprawnieni uÅŒytkownicy domeny (jeden w linii)', -'advproxy NTLM use integrated auth' => 'WÅÃcz zintegrowanÃ autoryzacjÃ Windows', -'advproxy NTLM use negative access list' => 'UÅŒywaj negatywnej kontroli dostÃpu', -'advproxy NTLM use positive access list' => 'UÅŒywaj pozytywnej kontroli dostÃpu', -'advproxy NTLM user based access restrictions' => 'Ograniczenia dostÃpu uÅŒytkownikÃ³w', +'advproxy NTLM use integrated auth' => 'WÅÄcz zintegrowanÄ autoryzacjÄ Windows', +'advproxy NTLM use negative access list' => 'UÅŒywaj negatywnej kontroli dostÄpu', +'advproxy NTLM use positive access list' => 'UÅŒywaj pozytywnej kontroli dostÄpu', +'advproxy NTLM user based access restrictions' => 'Ograniczenia dostÄpu uÅŒytkownikÃ³w', 'advproxy RADIUS authorized users' => 'Uprawnieni uÅŒytkownicy (jeden w linii)', 'advproxy RADIUS identifier' => 'Identyfikator', 'advproxy RADIUS port' => 'Port', @@ -169,11 +169,11 @@ 'advproxy RADIUS secret' => 'WspÃ³Ådzielone hasÅo (secret)', 'advproxy RADIUS server' => 'Serwer RADIUS', 'advproxy RADIUS unauthorized users' => 'Nieuprawnieni uÅŒytkownicy (jeden w linii)', -'advproxy RADIUS use negative access list' => 'UÅŒywaj negatywnej kontroli dostÃpu', -'advproxy RADIUS use positive access list' => 'UÅŒywaj pozytywnej kontroli dostÃpu', -'advproxy RADIUS user based access restrictions' => 'Ograniczenia dostÃpu uÅŒytkownikÃ³w', -'advproxy UA enable filter' => 'WÅÃcz sprawdzanie przeglÃdarki', -'advproxy access' => 'DostÃp', +'advproxy RADIUS use negative access list' => 'UÅŒywaj negatywnej kontroli dostÄpu', +'advproxy RADIUS use positive access list' => 'UÅŒywaj pozytywnej kontroli dostÄpu', +'advproxy RADIUS user based access restrictions' => 'Ograniczenia dostÄpu uÅŒytkownikÃ³w', +'advproxy UA enable filter' => 'WÅÄcz sprawdzanie przeglÄdarki', +'advproxy access' => 'DostÄp', 'advproxy admin mail' => 'E-Mail administratora serwera proxy', 'advproxy advanced proxy' => 'Advanced Proxy', 'advproxy advanced web proxy' => 'Advanced Web Proxy', @@ -183,36 +183,36 @@ 'advproxy back to main page' => 'PowrÃ³t do strony gÅÃ³wnej', 'advproxy banned ip clients' => 'Zablokowane adresy IP (jeden w linii)', 'advproxy banned mac clients' => 'Zablokowane adresy MAC (jeden w linii)', -'advproxy cache management' => 'ZarzÃdzanie pamiÃciÃ Cache', -'advproxy cache replacement policy' => 'Polityka zatÃpowania cache', -'advproxy chgwebpwd ERROR' => 'B Å Ã D :', +'advproxy cache management' => 'ZarzÄdzanie pamiÄciÄ Cache', +'advproxy cache replacement policy' => 'Polityka zatÄpowania cache', +'advproxy chgwebpwd ERROR' => 'B Å Ä D :', 'advproxy chgwebpwd SUCCESS' => 'S U K C E S :', 'advproxy chgwebpwd change password' => 'ZmieÅ hasÅo', -'advproxy chgwebpwd change web password' => 'Z m i Å  h a s Å o   d o s t Ã p u   d o   s i e c i   w e b', +'advproxy chgwebpwd change web password' => 'Z m i Å  h a s Å o   d o s t Ä p u   d o   s i e c i   w e b', 'advproxy chgwebpwd new password' => 'Nowe hasÅo', 'advproxy chgwebpwd new password confirm' => 'Nowe hasÅo (powtÃ³rz)', 'advproxy chgwebpwd old password' => 'Aktualne hasÅo', 'advproxy chgwebpwd username' => 'UÅŒytkownik', 'advproxy classroom extensions' => 'Classroom extensions', -'advproxy clear cache' => 'WyczyÅÃ Cache', +'advproxy clear cache' => 'WyczyÅÄ Cache', 'advproxy client IP forwarding' => 'Przekazywanie adresu IP klienta', 'advproxy common settings' => 'Ustawienia podstawowe', -'advproxy content based throttling' => 'WÅÃcz ograniczenia przepustowoÅÃ wg. zawartoÅci', -'advproxy cre disabled' => 'Interferjs zarzÃdzajÃcy zostaÅ wyÅÃczony przez administratora', +'advproxy content based throttling' => 'WÅÄcz ograniczenia przepustowoÅÄ wg. zawartoÅci', +'advproxy cre disabled' => 'Interferjs zarzÄdzajÄcy zostaÅ wyÅÄczony przez administratora', 'advproxy cre group definitions' => 'Classroom group definitions', 'advproxy cre supervisors' => 'Supervisor IP addresses (one per line)', 'advproxy destination ports' => 'Porty docelowe', 'advproxy download throttling' => 'Ograniczenia przepustowoÅci', -'advproxy enabled' => 'WÅÃczone', -'advproxy enabled on' => 'WÅÃczone na', -'advproxy errmsg acl cannot be empty' => 'Lista kontroli dostÃpu nie moÅŒe byÃ pusta', -'advproxy errmsg auth cache ttl' => 'NieprawidÅowa wartoÅÃ dla TTL autoryzacji', +'advproxy enabled' => 'WÅÄczone', +'advproxy enabled on' => 'WÅÄczone na', +'advproxy errmsg acl cannot be empty' => 'Lista kontroli dostÄpu nie moÅŒe byÄ pusta', +'advproxy errmsg auth cache ttl' => 'NieprawidÅowa wartoÅÄ dla TTL autoryzacji', 'advproxy errmsg auth children' => 'NieprawidÅowa liczba procesÃ³w autoryzacji', -'advproxy errmsg auth ipcache may not be null' => 'TTL autoryzacji nie moÅŒe wynosiÃ 0 kiedy wykorzystaywane sÃ ograniczenia IP', -'advproxy errmsg auth ipcache ttl' => 'NieprawidÅowa watoÅÃ TTL uÅŒytkownika/IP', -'advproxy errmsg change fail' => 'HasÅo nie moÅŒe byÃ zmienione', -'advproxy errmsg change success' => 'HasÅo dostÃpu do sieci web zostaÅo zmienione', -'advproxy errmsg hdd cache size' => 'NieprawidÅowa wartoÅÃ rozmiaru cache na dysku (wymagane min 10 MB)', +'advproxy errmsg auth ipcache may not be null' => 'TTL autoryzacji nie moÅŒe wynosiÄ 0 kiedy wykorzystaywane sÄ ograniczenia IP', +'advproxy errmsg auth ipcache ttl' => 'NieprawidÅowa watoÅÄ TTL uÅŒytkownika/IP', +'advproxy errmsg change fail' => 'HasÅo nie moÅŒe byÄ zmienione', +'advproxy errmsg change success' => 'HasÅo dostÄpu do sieci web zostaÅo zmienione', +'advproxy errmsg hdd cache size' => 'NieprawidÅowa wartoÅÄ rozmiaru cache na dysku (wymagane min 10 MB)', 'advproxy errmsg ident timeout' => 'NieprawidÅowy czas oczekiwania ident', 'advproxy errmsg invalid bdc' => 'NieprawidÅowa nazwa hosta dla zapasowego kontrolera domeny', 'advproxy errmsg invalid destination port' => 'NieprawodÅowy port docelowy', @@ -228,30 +228,30 @@ 'advproxy errmsg ldap server' => 'NieprawidÅowy adres IP serwera LDAP', 'advproxy errmsg max userip' => 'NieprawidÅowa liczba adresÃ³w IP na uÅŒytkownika', 'advproxy errmsg mem cache size' => 'Invalid value for memory cache size', -'advproxy errmsg no browser' => 'Conajmniej 1 przeglÃdarka lub klient musi mieÃ przyznany dostÃp do sieci WEB', -'advproxy errmsg no password' => 'HasÅo nie moÅŒe byÃ puste', -'advproxy errmsg no username' => 'Nazwa uÅŒytkownika nie moÅŒe byÃ pusta', -'advproxy errmsg non-transparent proxy required' => 'Serwer proxy nie moÅŒe byÃ uruchomiony w trybie transparentym jeÅŒeli chcesz uÅŒywaÃ autoryzacji', +'advproxy errmsg no browser' => 'Conajmniej 1 przeglÄdarka lub klient musi mieÄ przyznany dostÄp do sieci WEB', +'advproxy errmsg no password' => 'HasÅo nie moÅŒe byÄ puste', +'advproxy errmsg no username' => 'Nazwa uÅŒytkownika nie moÅŒe byÄ pusta', +'advproxy errmsg non-transparent proxy required' => 'Serwer proxy nie moÅŒe byÄ uruchomiony w trybie transparentym jeÅŒeli chcesz uÅŒywaÄ autoryzacji', 'advproxy errmsg ntlm domain' => 'Wymagana nazwa domeny Windows', 'advproxy errmsg ntlm pdc' => 'Wymagana nazwa hosta podstawowego kontrolera domeny', 'advproxy errmsg password incorrect' => 'NieprawidÅowe hasÅo', -'advproxy errmsg password length' => 'NieprawidÅowa wartoÅÃ dÅugoÅci hasÅa', -'advproxy errmsg password length 1' => 'HasÅo musi mieÃ conajmniej ', +'advproxy errmsg password length' => 'NieprawidÅowa wartoÅÄ dÅugoÅci hasÅa', +'advproxy errmsg password length 1' => 'HasÅo musi mieÄ conajmniej ', 'advproxy errmsg password length 2' => ' znakÃ³w', -'advproxy errmsg passwords different' => 'HasÅa nie pasujÃ do siebie', +'advproxy errmsg passwords different' => 'HasÅa nie pasujÄ do siebie', 'advproxy errmsg radius port' => 'NieprawidÅowy numer portu RADIUS', 'advproxy errmsg radius secret' => 'Wymagane wspÃ³Ådzielone hasÅo RADIUS', 'advproxy errmsg radius server' => 'NieprawidÅowy adres IP serwera RADIUS', 'advproxy errmsg time restriction' => 'Niepoprawne ograniczenia czase', -'advproxy error design' => 'Styl komunikatÃ³w o bÅÃdach', -'advproxy error language' => 'JÃzyk komunikatÃ³w o bÅÃdach', +'advproxy error design' => 'Styl komunikatÃ³w o bÅÄdach', +'advproxy error language' => 'JÄzyk komunikatÃ³w o bÅÄdach', 'advproxy fake referer' => 'Fake referer submitted to external sites', 'advproxy fake useragent' => 'Fake useragent submitted to external sites', -'advproxy friday' => 'PiÃ', +'advproxy friday' => 'PiÄ', 'advproxy from' => 'Od', 'advproxy hdd cache size' => 'Rozmiar cache na dysku (MB)', -'advproxy invalid num of children' => 'Niepoprawna liczba procesÃ³w filtrujÃcych', -'advproxy log enabled' => 'Logi wÅÃczone', +'advproxy invalid num of children' => 'Niepoprawna liczba procesÃ³w filtrujÄcych', +'advproxy log enabled' => 'Logi wÅÄczone', 'advproxy log query' => 'Log query terms', 'advproxy log settings' => 'Ustawienia logowania', 'advproxy log useragent' => 'Log useragents', @@ -263,21 +263,21 @@ 'advproxy mode allow' => 'zezwÃ³l', 'advproxy mode deny' => 'odmÃ³w', 'advproxy monday' => 'Pon', -'advproxy network based access' => 'Kontrola dostÃpu oparta na sieciach', -'advproxy no cache sites' => 'WyÅÃcz buforowanie dla tych domen (jedna w linii)', +'advproxy network based access' => 'Kontrola dostÄpu oparta na sieciach', +'advproxy no cache sites' => 'WyÅÄcz buforowanie dla tych domen (jedna w linii)', 'advproxy no clients defined' => 'Nie zdefiniowano klientÃ³w', 'advproxy no connection auth' => 'No connection oriented authentication forwarding', -'advproxy no cre groups' => 'Brak dostÃpnych grup dostÃpu', -'advproxy no internal proxy on blue' => 'WyÅÃcz wewnÃtrzny dostÃp z sieci BLUE do pozostaÅych podsieci', -'advproxy no internal proxy on green' => 'WyÅÃcz wewnÃtrzny dostÃp do sieci GREEN z innych podsieci', +'advproxy no cre groups' => 'Brak dostÄpnych grup dostÄpu', +'advproxy no internal proxy on blue' => 'WyÅÄcz wewnÄtrzny dostÄp z sieci BLUE do pozostaÅych podsieci', +'advproxy no internal proxy on green' => 'WyÅÄcz wewnÄtrzny dostÄp do sieci GREEN z innych podsieci', 'advproxy number of L1 dirs' => 'Liczba podkatalogÃ³w pierwszego poziomu', -'advproxy off' => 'Proxy wyÅÃczone', -'advproxy offline mode' => 'WÅÃcz tryb offline', +'advproxy off' => 'Proxy wyÅÄczone', +'advproxy offline mode' => 'WÅÄcz tryb offline', 'advproxy on' => 'Proxy wÅ', -'advproxy privacy' => 'PrywatnoÅÃ', +'advproxy privacy' => 'PrywatnoÅÄ', 'advproxy proxy port' => 'Port proxy', 'advproxy ram cache size' => 'Rozmiar RAM cache (MB)', -'advproxy redirector children' => 'Liczba procesÃ³w filtrujÃcych', +'advproxy redirector children' => 'Liczba procesÃ³w filtrujÄcych', 'advproxy reset' => 'Reset', 'advproxy saturday' => 'Sob', 'advproxy save and restart' => 'Zapis i restart', @@ -306,8 +306,8 @@ 'advproxy unrestricted ip clients' => 'Adresy IP bez ograniczeÅ (jeden w linii)', 'advproxy unrestricted mac clients' => 'Adresy MAC bez ograniczeÅ (jeden w linii)', 'advproxy update accelerator' => 'Update accelerator', -'advproxy update information' => 'DostÃpna jest nowsza wersja do pobrania. OdwiedÅº <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> aby uzyskaÃ dodatkowe informacje.', -'advproxy update notification' => 'Aktualizacja dostÃpna!', +'advproxy update information' => 'DostÄpna jest nowsza wersja do pobrania. OdwiedÅº <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> aby uzyskaÄ dodatkowe informacje.', +'advproxy update notification' => 'Aktualizacja dostÄpna!', 'advproxy upstream password' => 'Upstream password', 'advproxy upstream proxy' => 'Upstream proxy', 'advproxy upstream proxy host:port' => 'Upstream proxy (host:port)', @@ -316,16 +316,16 @@ 'advproxy username forwarding' => 'Username forwarding', 'advproxy via forwarding' => 'Proxy address forwarding', 'advproxy visible hostname' => 'Widoczna nazwa hosta', -'advproxy web browser' => 'PrzeglÃdarka WWW', +'advproxy web browser' => 'PrzeglÄdarka WWW', 'advproxy wednesday' => 'År', 'again' => 'Ponownie:', 'aktiv' => 'Aktywny', 'album' => 'Album', -'alcatelusb help' => 'Aby uÅŒywaÃ modemu Speedtouch 330 lub Speedtouch USB naleÅŒy wgraÃ na do systemu IPFire odpowiedni firmware. Pobierz pakiet <b>Embedded Firmware</b> dla SpeedTouch 330 ze strony speedtouch.com, rozpakuj pobrany plik a nastÃpnie wgraj za pomocÃ poniÅŒszego formularza odpowiedni dla Twojego modemu plik : KQD6_3.xxx jeÅŒeli Rev<4 lub ZZZL_3.xxx dla Rev=4.', +'alcatelusb help' => 'Aby uÅŒywaÄ modemu Speedtouch 330 lub Speedtouch USB naleÅŒy wgraÄ na do systemu IPFire odpowiedni firmware. Pobierz pakiet <b>Embedded Firmware</b> dla SpeedTouch 330 ze strony speedtouch.com, rozpakuj pobrany plik a nastÄpnie wgraj za pomocÄ poniÅŒszego formularza odpowiedni dla Twojego modemu plik : KQD6_3.xxx jeÅŒeli Rev<4 lub ZZZL_3.xxx dla Rev=4.', 'alcatelusb upload' => 'Wgraj firmware Speedtouch USB', 'alias ip' => 'Alias IP', 'aliases' => 'Aliasy', -'aliases not active' => 'Aliasy nie bÃdÃ aktywne jeÅŒeli interferjs RED nie jest statyczny', +'aliases not active' => 'Aliasy nie bÄdÄ aktywne jeÅŒeli interferjs RED nie jest statyczny', 'all' => 'Wszystko', 'all interfaces' => 'Wszystkie interfejsy', 'all services' => 'Wszystkie usÅugi', @@ -353,21 +353,21 @@ 'august' => 'SierpieÅ', 'authentication' => 'Uwierzytelnianie:', 'automatic' => 'Automatycznie', -'available updates' => 'DostÃpne aktualizacje:', +'available updates' => 'DostÄpne aktualizacje:', 'average' => 'Srednia', -'avoid dod' => 'Nie uÅŒywaj tej opcji jeÅŒeli wykorzystujesz wdzanianie na ÅŒÃdanie! Zazwyczaj wykorzystywane jeÅŒeli IPFire jest za routerem. Interfejs RED musi byÃ w jednej z 3 sieci np. 10/8, 172.16/12, 192.168/16', -'back' => 'WRÃÃ', +'avoid dod' => 'Nie uÅŒywaj tej opcji jeÅŒeli wykorzystujesz wdzanianie na ÅŒÄdanie! Zazwyczaj wykorzystywane jeÅŒeli IPFire jest za routerem. Interfejs RED musi byÄ w jednej z 3 sieci np. 10/8, 172.16/12, 192.168/16', +'back' => 'WRÃÄ', 'backup' => 'Backup', 'backup archive' => 'Plik backupu (.dat)', -'backup clear archive' => 'WyczyÅÃ plik backupu (.gz)', +'backup clear archive' => 'WyczyÅÄ plik backupu (.gz)', 'backup config floppy' => 'Backup konfiguracji - dyskietka', 'backup configuration' => 'Konfiguracja backupu:', 'backup erase key' => 'UsuÅ klucz', -'backup explain key' => 'Kopie zapasowe sÃ szyfrowane z uÅŒyciem tego klucza. W celu zapewnienia bezpieczeÅstwa IPFire pozwala na odtwarzanie WYÅÃCZNIE kopii zapasowych zaszyfrowanych przy uÅŒyciu tego klucza. Masz 3 opcje do wyboru:', +'backup explain key' => 'Kopie zapasowe sÄ szyfrowane z uÅŒyciem tego klucza. W celu zapewnienia bezpieczeÅstwa IPFire pozwala na odtwarzanie WYÅÄCZNIE kopii zapasowych zaszyfrowanych przy uÅŒyciu tego klucza. Masz 3 opcje do wyboru:', 'backup explain key li1' => 'pozwÃ³l IPFire na wygenerowanie klucza dla Ciebie.', 'backup explain key li2' => 'zaimportuj klucz (moÅŒliwe zabezpieczenie hasÅem).', 'backup explain key li3' => 'wypakuj klucz z nieszyfrowanej kopii z wersji 1.4.10.', -'backup explain key no1' => 'powinieneÅ zachowaÃ ten klucz jeÅŒeli planujesz odtworzenie na nowych urzÃdzeniach. IPFire pozwala tylko raz utworzyÃ/importowaÃ klucz.', +'backup explain key no1' => 'powinieneÅ zachowaÄ ten klucz jeÅŒeli planujesz odtworzenie na nowych urzÄdzeniach. IPFire pozwala tylko raz utworzyÄ/importowaÄ klucz.', 'backup explain key no2' => 'legacy floppy backups are not concerned with this key.', 'backup export key' => 'Eksportuj klucz', 'backup extract key' => 'Wypakuj klucz', @@ -375,39 +375,39 @@ 'backup generate key' => 'Generuj klucz', 'backup import dat file' => 'Importuj plik backupu (.dat)', 'backup import key' => 'Import klucza', -'backup key' => 'Klucz szyfrujÃcy kopii', +'backup key' => 'Klucz szyfrujÄcy kopii', 'backup key file' => 'Backup key file', 'backup key info' => 'IPFire restricts access to the backup key, thus you must know root password. You have possibility to protect this key outside of IPFire with a password.', -'backup media info' => 'Dyskietki i/lub niesformatowane urzÃdzenia mogÃ powodowaÃ wyÅwietlanie nieprawidÅowych rozmiarÃ³w. W takim przypadku wybierz caÅe urzÃdzenie. PamiÃtaj o zamontowaniu dysku twardego przed usuniÃciem urzÃdzenia. UWAGA: dyskietka utworzona w tym miejscu nie jest wykorzystywana w procesie instalacji!!!', +'backup media info' => 'Dyskietki i/lub niesformatowane urzÄdzenia mogÄ powodowaÄ wyÅwietlanie nieprawidÅowych rozmiarÃ³w. W takim przypadku wybierz caÅe urzÄdzenie. PamiÄtaj o zamontowaniu dysku twardego przed usuniÄciem urzÄdzenia. UWAGA: dyskietka utworzona w tym miejscu nie jest wykorzystywana w procesie instalacji!!!', 'backup missing key' => 'Need the backup key to restore a set', 'backup password' => 'HasÅo do kopii', 'backup protect key password' => 'Backup key password', 'backup sets' => 'Backup sets', -'backup to floppy' => 'Kopia na dyskietkiÃ', +'backup to floppy' => 'Kopia na dyskietkiÄ', 'backupaddon' => 'Kopia dodatkÃ³w', -'backupprofile' => 'JeÅŒeli ponowne poÅÃczenie nie powiedzie siÃ przeÅÃcz na profil', +'backupprofile' => 'JeÅŒeli ponowne poÅÄczenie nie powiedzie siÄ przeÅÄcz na profil', 'backups' => 'kopie', -'backupwarning' => 'Najpierw naleÅŒy przywrÃ³ciÃ kopiÃ podstawowÃ, a nastÃpnie kopiÃ dodatkÃ³w. ProszÃ nie zmieniaÃ nazwy pobranych plikÃ³w z kopiami.', +'backupwarning' => 'Najpierw naleÅŒy przywrÃ³ciÄ kopiÄ podstawowÄ, a nastÄpnie kopiÄ dodatkÃ³w. ProszÄ nie zmieniaÄ nazwy pobranych plikÃ³w z kopiami.', 'bad characters in' => 'Niepoprawny znak w ', 'bad characters in script field' => 'Niepoprawny znak w polu skryptu', 'bad characters in the telephone number field' => 'Niepoprawny znak w polu z numerem telefonu.', -'bad destination range' => 'Zakres portÃ³w docelowych posiada wartoÅÃ poczÃtkowÃ ktÃ³ra jest wiÃksza lub rÃ³wna wartoÅci koÅcowej.', +'bad destination range' => 'Zakres portÃ³w docelowych posiada wartoÅÄ poczÄtkowÄ ktÃ³ra jest wiÄksza lub rÃ³wna wartoÅci koÅcowej.', 'bad ignore filter' => 'Bad ignore filter:', -'bad return code' => 'Program pomocniczy zwrÃ³ciÅ kod bÅÃdu', +'bad return code' => 'Program pomocniczy zwrÃ³ciÅ kod bÅÄdu', 'bad source range' => 'The Source port range has a first value that is greater than or equal to the second value.', 'bandwidth usage' => 'wykorzystanie pasma (wyjÅcie)', -'bandwitherror' => 'Nie moÅŒesz zmieniÃ ustawieÅ przepustawoÅci kiedy Qos jest wÅÃczony. Najpierw wyÅÃcz Qos.<p>', +'bandwitherror' => 'Nie moÅŒesz zmieniÄ ustawieÅ przepustawoÅci kiedy Qos jest wÅÄczony. Najpierw wyÅÄcz Qos.<p>', 'bandwithsettings' => 'Ustawienia przepustowoÅci', 'basic options' => 'Podstawowe opcje', -'beep when ppp connects or disconnects' => 'DÅºwiÃk przy poÅÃczeniu/rozÅÃczeniu IPFire', +'beep when ppp connects or disconnects' => 'DÅºwiÄk przy poÅÄczeniu/rozÅÄczeniu IPFire', 'behind a proxy' => 'Za proxy:', 'bewan adsl pci st' => 'TO BE REMOVED', 'bewan adsl usb' => 'TO BE REMOVED', 'bitrate' => 'Bitrate', 'bleeding rules' => 'Bleeding Edge Snort Rules', 'blue' => 'BLUE', -'blue access' => 'DostÃp Blue', -'blue access use hint' => 'NaleÅŒy wprowadziÃ adres IP lub MAC urzÃdzenia. MoÅŒliwe jest takÅŒe wprowadzenie oby adresÃ³w', +'blue access' => 'DostÄp Blue', +'blue access use hint' => 'NaleÅŒy wprowadziÄ adres IP lub MAC urzÄdzenia. MoÅŒliwe jest takÅŒe wprowadzenie oby adresÃ³w', 'blue interface' => 'Interfejs Blue', 'broadcast' => 'Broadcast', 'broken pipe' => 'Broken pipe', @@ -418,33 +418,33 @@ 'bytes sent' => 'BajtÃ³w wysÅanych', 'ca certificate' => 'Certyfikat CA', 'ca name' => 'Nazwa CA', -'cache management' => 'ZarzÃdzanie pam. podrÃcznÃ', -'cache size' => 'Rozmiar pam. podrÃcznej (MB):', +'cache management' => 'ZarzÄdzanie pam. podrÄcznÄ', +'cache size' => 'Rozmiar pam. podrÄcznej (MB):', 'cached' => 'cached', 'cached memory' => 'Cached Memory ', 'cached swap' => 'Cached Swap', -'calamaris available reports' => 'DostÃpne raporty', +'calamaris available reports' => 'DostÄpne raporty', 'calamaris byte unit' => 'Byte unit', 'calamaris create report' => 'UtwÃ³rz raport', -'calamaris enable content report' => 'WÅÃcz raport zawartoÅci', -'calamaris enable distribution histogram' => 'WÅÃcz histogram rozkÅadu', -'calamaris enable domain report' => 'WÅÃcz raport domen', -'calamaris enable performance report' => 'WÅÃcz raport wydajnoÅci', -'calamaris enable requester report' => 'WÅÃcz raport wg. wywoÅujÃcych', -'calamaris enable verbose reporting' => 'WÅÃcz szczegÃ³Åowy raport', +'calamaris enable content report' => 'WÅÄcz raport zawartoÅci', +'calamaris enable distribution histogram' => 'WÅÄcz histogram rozkÅadu', +'calamaris enable domain report' => 'WÅÄcz raport domen', +'calamaris enable performance report' => 'WÅÄcz raport wydajnoÅci', +'calamaris enable requester report' => 'WÅÄcz raport wg. wywoÅujÄcych', +'calamaris enable verbose reporting' => 'WÅÄcz szczegÃ³Åowy raport', 'calamaris high' => 'duÅŒa', -'calamaris histogram resolution' => 'RozdzielczoÅÃ histogramu', +'calamaris histogram resolution' => 'RozdzielczoÅÄ histogramu', 'calamaris low' => 'niska', 'calamaris medium' => 'Årednia', -'calamaris no reports available' => 'Brak dostÃpnych raportÃ³w', +'calamaris no reports available' => 'Brak dostÄpnych raportÃ³w', 'calamaris none' => 'brak', 'calamaris number of content types' => 'Liczba typÃ³w zawartoÅci', 'calamaris number of domains' => 'Liczba domen', 'calamaris number of requested urls' => 'Liczba wywoÅywanych URLi', -'calamaris number of requesting hosts' => 'Liczba wywoÅujÃcych hostÃ³w', -'calamaris performance options' => 'Opcje wpÅywajÃce na wydajnoÅÃ', +'calamaris number of requesting hosts' => 'Liczba wywoÅujÄcych hostÃ³w', +'calamaris performance options' => 'Opcje wpÅywajÄce na wydajnoÅÄ', 'calamaris proxy reports' => 'Raporty Proxy', -'calamaris refresh list' => 'OdÅwieÅŒ listÃ', +'calamaris refresh list' => 'OdÅwieÅŒ listÄ', 'calamaris report interval (in minutes)' => 'InterwaÅ raportÃ³w (w minutach)', 'calamaris report options' => 'Opcje raportu', 'calamaris report period' => 'PrzedziaÅ czasowy raportu', @@ -457,18 +457,18 @@ 'calc traffic all x minutes' => 'Calculate traffic all x minutes', 'cancel' => 'Anuluj', 'cancel-adv-options' => 'Anuluj', -'cannot enable both nat traversal and compression' => 'Nie moÅŒna jednoczeÅnie uruchomiÃ opcji NAT traversal i kompresja.', -'cannot enable ntp without specifying primary' => 'Nie moÅŒna uruchomiÃ NTP bez podania podstawowego.', -'cannot specify secondary dns without specifying primary' => 'Nie moÅŒna wprowadziÃ zapasowego DNS bez podania podstawowego.', -'cannot specify secondary ntp without specifying primary' => 'Nie moÅŒna wprowadziÃ zapasowego NTP bez podania podstawowego', -'cannot specify secondary wins without specifying primary' => 'Nie moÅŒna wprowadziÃ zapasowego WINS bez podania podstawowego.', -'cant change certificates' => 'Nie moÅŒna zmieniÃ certyfikatÃ³w', -'cant enable xtaccess' => 'PowiÃzana reguÅa przekierowania portu jest wyÅÃczona w zwiÃzku z czym nie moÅŒna wÅÃczyÃ zewnÃtrznego dostÃpu dla tej reguÅy.', -'cant start openssl' => 'Nie moÅŒna uruchomiÃ OpenSSL', +'cannot enable both nat traversal and compression' => 'Nie moÅŒna jednoczeÅnie uruchomiÄ opcji NAT traversal i kompresja.', +'cannot enable ntp without specifying primary' => 'Nie moÅŒna uruchomiÄ NTP bez podania podstawowego.', +'cannot specify secondary dns without specifying primary' => 'Nie moÅŒna wprowadziÄ zapasowego DNS bez podania podstawowego.', +'cannot specify secondary ntp without specifying primary' => 'Nie moÅŒna wprowadziÄ zapasowego NTP bez podania podstawowego', +'cannot specify secondary wins without specifying primary' => 'Nie moÅŒna wprowadziÄ zapasowego WINS bez podania podstawowego.', +'cant change certificates' => 'Nie moÅŒna zmieniÄ certyfikatÃ³w', +'cant enable xtaccess' => 'PowiÄzana reguÅa przekierowania portu jest wyÅÄczona w zwiÄzku z czym nie moÅŒna wÅÄczyÄ zewnÄtrznego dostÄpu dla tej reguÅy.', +'cant start openssl' => 'Nie moÅŒna uruchomiÄ OpenSSL', 'caps all' => 'Wszystko', -'capsclosed' => 'ROZÅÃCZONE', +'capsclosed' => 'ROZÅÄCZONE', 'capsinactive' => 'NIEAKTYWNE', -'capsopen' => 'POÅÃCZONE', +'capsopen' => 'POÅÄCZONE', 'capswarning' => 'OSTRZEÅ»ENIE', 'caption' => 'Caption', 'cert' => 'Certyfikat', @@ -487,11 +487,11 @@ 'cipher' => 'Szyfrowanie:', 'city' => 'Miasto', 'class in use' => 'Klasa jest aktualnie w uÅŒyciu.', -'clear cache' => 'WyczyÅÃ pam. podrÃcznÃ', -'clear playlist' => 'WyczyÅÃ listÃ odtwarzania playlist', -'clenabled' => 'UdostÃpnij czas w sieci lokalnej', -'click to disable' => 'WÅÃczone (kliknij aby wyÅ.)', -'click to enable' => 'WyÅÃczone (kliknij aby wÅ)', +'clear cache' => 'WyczyÅÄ pam. podrÄcznÄ', +'clear playlist' => 'WyczyÅÄ listÄ odtwarzania playlist', +'clenabled' => 'UdostÄpnij czas w sieci lokalnej', +'click to disable' => 'WÅÄczone (kliknij aby wyÅ.)', +'click to enable' => 'WyÅÄczone (kliknij aby wÅ)', 'client' => 'Nazwa komputera', 'clock has not been synchronized' => 'Zegar nie zostaÅ zsynchonizowany', 'clock last synchronized at' => 'Ostatnia synchronizacja zegara: ', @@ -500,39 +500,39 @@ 'community rules' => 'Emergingthreats.net Community Rules', 'comp-lzo' => 'Kompresja LZO:', 'compression' => 'Kompresja:', -'computer to modem rate' => 'SzybkoÅÃ poÅÃczenia z komputerem:', +'computer to modem rate' => 'SzybkoÅÄ poÅÄczenia z komputerem:', 'concentrator name' => 'Nazwa koncentratora:', 'confirmation' => 'potwierdzenie', -'connect' => 'OVPN Start / PoÅÃcz', -'connect the modem' => 'PoÅÃcz z modemem', -'connect timeout' => 'Czas oczekiwania poÅÃczenia:', -'connected' => 'PoÅÃczony', -'connecting' => 'ÅÃczenie...', -'connection' => 'PoÅÃczenie', -'connection closed' => 'Brak poÅÃczenia...', -'connection debugging' => 'Debugowanie poÅÃczenia', -'connection status and controlc' => 'Stan i kontrola poÅÃczenia:', -'connection tracking' => 'Åledzenie poÅÃczeÅ IPTables', -'connection type' => 'Rodzaj poÅÃczenia', -'connection type is invalid' => 'NieprawidÅowy rodzaj poÅÃczenia.', -'connections' => 'PoÅÃczenia', -'connections are associated with this ca. deleting the ca will delete these connections as well.' => 'istniejÃ poÅÃczenia powiÃzane z tym CA. UsuniÃcie tego CA spowoduje takÅŒe usuniÃcie powiÃzanych poÅÃczeÅ.', -'connscheduler' => 'Harmonogram poÅÃczeÅ', -'core notice 1' => '<strong>Uwaga:</strong> DostÃpna jest aktualizacja (core-update) z', +'connect' => 'OVPN Start / PoÅÄcz', +'connect the modem' => 'PoÅÄcz z modemem', +'connect timeout' => 'Czas oczekiwania poÅÄczenia:', +'connected' => 'PoÅÄczony', +'connecting' => 'ÅÄczenie...', +'connection' => 'PoÅÄczenie', +'connection closed' => 'Brak poÅÄczenia...', +'connection debugging' => 'Debugowanie poÅÄczenia', +'connection status and controlc' => 'Stan i kontrola poÅÄczenia:', +'connection tracking' => 'Åledzenie poÅÄczeÅ IPTables', +'connection type' => 'Rodzaj poÅÄczenia', +'connection type is invalid' => 'NieprawidÅowy rodzaj poÅÄczenia.', +'connections' => 'PoÅÄczenia', +'connections are associated with this ca. deleting the ca will delete these connections as well.' => 'istniejÄ poÅÄczenia powiÄzane z tym CA. UsuniÄcie tego CA spowoduje takÅŒe usuniÄcie powiÄzanych poÅÄczeÅ.', +'connscheduler' => 'Harmonogram poÅÄczeÅ', +'core notice 1' => '<strong>Uwaga:</strong> DostÄpna jest aktualizacja (core-update) z', 'core notice 2' => 'do', 'core notice 3' => '.', -'could not be opened' => 'nie moÅŒe byÃ otwarty.', -'could not connect to' => 'Nie moÅŒna poÅÃczyÃ z', -'could not connect to www ipcop org' => 'Nie moÅŒna poÅÃczyÃ z www.ipfire.org', -'could not connect to www ipfire org' => 'Nie moÅŒna poÅÃczyÃ z to www.ipfire.org', -'could not create directory' => 'Nie moÅŒna utworzyÃ katalogu.', -'could not download latest patch list' => 'Nie moÅŒna pobraÃ najnowszej listy poprawek (brak poÅÃczenia).', -'could not download latest updates' => 'Nie moÅŒna pobraÃ najnowszej listy aktualizacji.', -'could not download the available updates list' => 'Nie moÅŒna pobraÃ listy dostÃpnych aktualizacji.', -'could not open available updates file' => 'Nie moÅŒna otworzyÃ pliku z dostÃpnymi aktualizacjami.', -'could not open installed updates file' => 'Nie moÅŒna otworzyÃ pliku z zainstalowanymi aktualizacjami', +'could not be opened' => 'nie moÅŒe byÄ otwarty.', +'could not connect to' => 'Nie moÅŒna poÅÄczyÄ z', +'could not connect to www ipcop org' => 'Nie moÅŒna poÅÄczyÄ z www.ipfire.org', +'could not connect to www ipfire org' => 'Nie moÅŒna poÅÄczyÄ z to www.ipfire.org', +'could not create directory' => 'Nie moÅŒna utworzyÄ katalogu.', +'could not download latest patch list' => 'Nie moÅŒna pobraÄ najnowszej listy poprawek (brak poÅÄczenia).', +'could not download latest updates' => 'Nie moÅŒna pobraÄ najnowszej listy aktualizacji.', +'could not download the available updates list' => 'Nie moÅŒna pobraÄ listy dostÄpnych aktualizacji.', +'could not open available updates file' => 'Nie moÅŒna otworzyÄ pliku z dostÄpnymi aktualizacjami.', +'could not open installed updates file' => 'Nie moÅŒna otworzyÄ pliku z zainstalowanymi aktualizacjami', 'could not open update information file' => 'Could not open update information file. The update file is corrupt.', -'could not retrieve common name from certificate' => 'Nie moÅŒna odzyskaÃ nazwy serwera (common name) z certyfikatu.', +'could not retrieve common name from certificate' => 'Nie moÅŒna odzyskaÄ nazwy serwera (common name) z certyfikatu.', 'country' => 'Kraj', 'cpu frequency per' => 'Czestotliwosc procesora na', 'cpu idle usage' => 'Bezczynnosc CPU', @@ -553,34 +553,34 @@ 'current' => 'Aktualne', 'current aliases' => 'Aktualne alias:', 'current class' => 'Aktualna klasa', -'current devices' => 'Aktualne urzÃdzenia', +'current devices' => 'Aktualne urzÄdzenia', 'current dhcp leases on blue' => 'PrzydziaÅy DHCP na interfejsie BLUE', 'current dynamic leases' => 'Aktualne przydziaÅy dynamiczne', 'current fixed leases' => 'Aktualne przydziaÅy statyczne', 'current hosts' => 'Aktualne hosty:', 'current media' => 'Aktualne media', -'current ovpn' => 'Aktywne poÅÃczenia OVPN:', +'current ovpn' => 'Aktywne poÅÄczenia OVPN:', 'current playlist' => 'Aktualna lista odtw.', 'current profile' => 'Aktualny profil:', 'current rules' => 'Aktualne reguÅy:', 'custom networks' => 'WÅasne sieci', 'custom services' => 'WÅasne usÅugi', 'daily firewallhits' => 'daily firewallhits', -'dat without key' => 'Zaszyfrowane archiwa nie mogÃ byÃ odzyskane bez podania klucza.', +'dat without key' => 'Zaszyfrowane archiwa nie mogÄ byÄ odzyskane bez podania klucza.', 'date' => 'Data', -'date not in logs' => 'Brak (lub tylko czÃÅÃ) logÃ³w dla podanej daty', +'date not in logs' => 'Brak (lub tylko czÄÅÄ) logÃ³w dla podanej daty', 'day' => 'Dzien', 'day after' => 'DzieÅ po', 'day before' => 'DzieÅ przed', 'days' => 'dni.', 'dbfile' => 'Dbfile', -'ddns help dnsmadeeasy' => 'W polu nazwa hosta wprowadÅº twoje ID (lub listÃ ID oddzielanych Årednikami)', +'ddns help dnsmadeeasy' => 'W polu nazwa hosta wprowadÅº twoje ID (lub listÄ ID oddzielanych Årednikami)', 'ddns help freedns' => 'W polu uÅŒytkownik wprowadÅº connect string', 'ddns help plus' => '<b>+</b> marks a mandatory field', 'ddns hostname added' => 'Dynamiczny host DNS dodany', 'ddns hostname modified' => 'Dynamiczny host DNS zmodyfikowany', -'ddns hostname removed' => 'Dynamiczny host DNS usuniÃty', -'ddns minimize updates' => 'Ograniczaj aktualizacjÃ: przed aktualizacjÃ porÃ³wnaj IP dla hosta "[host.]domain" z IP interfejsu RED.', +'ddns hostname removed' => 'Dynamiczny host DNS usuniÄty', +'ddns minimize updates' => 'Ograniczaj aktualizacjÄ: przed aktualizacjÄ porÃ³wnaj IP dla hosta "[host.]domain" z IP interfejsu RED.', 'ddns noip prefix' => 'To use no-ip in group mode, prefix hostname with <b>%</b>', 'deactivate' => 'deaktywuj', 'deactivate user' => 'deaktywuj uÅŒytkownika', @@ -592,7 +592,7 @@ 'default networks' => 'DomyÅlne sieci', 'default renewal time' => 'DomyÅlny czas odnawiania', 'default services' => 'DomyÅlne usÅugi', -'defaultwarning' => 'UWAGA - Twoje ustawienia zostanÃ utracone i zastÃpione przez ustawienia domyÅlne.', +'defaultwarning' => 'UWAGA - Twoje ustawienia zostanÄ utracone i zastÄpione przez ustawienia domyÅlne.', 'delete' => 'UsuÅ', 'delete cron' => 'UsuÅ zadanie crona', 'delete pc' => 'UsuÅ komputer', @@ -604,78 +604,78 @@ 'destination' => 'Cel', 'destination ip' => 'Docelowe IP', 'destination ip bad' => 'Niepoprawne docelowe IP', -'destination ip or net' => 'Docelowe IP lub sieÃ', -'destination net' => 'SieÃ docelowa', +'destination ip or net' => 'Docelowe IP lub sieÄ', +'destination net' => 'SieÄ docelowa', 'destination port' => 'Port docelowy', -'destination port numbers' => 'Port docelowy musi byÃ prawidÅowym numerem portu lub zakresem portÃ³w.', -'destination port overlaps' => 'Zakres portÃ³w docelowych pokrywa siÃ z istniejÃcym.', +'destination port numbers' => 'Port docelowy musi byÄ prawidÅowym numerem portu lub zakresem portÃ³w.', +'destination port overlaps' => 'Zakres portÃ³w docelowych pokrywa siÄ z istniejÄcym.', 'detail level' => 'SzczegÃ³Åy', -'device' => 'UrzÃdzenie', -'devices on blue' => 'UrzÃdzenia na BLUE', -'dhcp advopt add' => 'Dodaj opcjÃ DHCP', +'device' => 'UrzÄdzenie', +'devices on blue' => 'UrzÄdzenia na BLUE', +'dhcp advopt add' => 'Dodaj opcjÄ DHCP', 'dhcp advopt added' => 'Opcja DHCP dodana', -'dhcp advopt blank value' => 'WartoÅÃ opcji DHCP nie moÅŒe byÃ pusta.', +'dhcp advopt blank value' => 'WartoÅÄ opcji DHCP nie moÅŒe byÄ pusta.', 'dhcp advopt custom definition' => 'WÅasne definicje opcji', 'dhcp advopt definition' => 'Definicja', -'dhcp advopt definition exists' => 'Definicja opcji istnieje. MoÅŒesz jÃ zmodyfikowaÃ lub usunÃÃ.', -'dhcp advopt edit' => 'Edydutj opcjÃ DHCP', +'dhcp advopt definition exists' => 'Definicja opcji istnieje. MoÅŒesz jÄ zmodyfikowaÄ lub usunÄÄ.', +'dhcp advopt edit' => 'Edydutj opcjÄ DHCP', 'dhcp advopt help' => 'Lista opcji', 'dhcp advopt list' => 'Dodatkowe opcje DHCP', -'dhcp advopt modified' => 'Zmodyfikowano opcjÃ DHCP', +'dhcp advopt modified' => 'Zmodyfikowano opcjÄ DHCP', 'dhcp advopt name' => 'Nazwa opcji', -'dhcp advopt removed' => 'UsuniÃto opcjÃ DHCP', +'dhcp advopt removed' => 'UsuniÄto opcjÄ DHCP', 'dhcp advopt scope' => 'Zakres opcji', 'dhcp advopt scope global' => 'Globalna', 'dhcp advopt scope help' => 'Zakres globalny lub ograniczony do wybranych interfejsÃ³w.', 'dhcp advopt unknown' => 'NieprawidÅowa nazwa opcji DHCP', -'dhcp advopt value' => 'WartoÅÃ opcji', +'dhcp advopt value' => 'WartoÅÄ opcji', 'dhcp allow bootp' => 'Zazwalaj na klientÃ³w bootp', -'dhcp base ip fixed lease' => 'CzÃÅÃ IP do tworzenia powiÃzaÅ statycznych', -'dhcp bootp pxe data' => 'Dodatkowe dane bootp pxe dla tego powiÃzania statycznego', +'dhcp base ip fixed lease' => 'CzÄÅÄ IP do tworzenia powiÄzaÅ statycznych', +'dhcp bootp pxe data' => 'Dodatkowe dane bootp pxe dla tego powiÄzania statycznego', 'dhcp configuration' => 'Konfiguracja DHCP', -'dhcp create fixed leases' => 'StwÃ³rz powiÃzanie statyczne', -'dhcp fixed lease err1' => 'Aby utworzyÃ powiÃzanie statyczne naleÅŒy podaÃ adres MAC i/lub nazwÃ hosta.', +'dhcp create fixed leases' => 'StwÃ³rz powiÄzanie statyczne', +'dhcp fixed lease err1' => 'Aby utworzyÄ powiÄzanie statyczne naleÅŒy podaÄ adres MAC i/lub nazwÄ hosta.', 'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN', 'dhcp mode' => 'DHCP', 'dhcp server' => 'Serwer DHCP', -'dhcp server disabled' => 'Serwer DHCP wyÅÃczony. Zatrzymano.', -'dhcp server disabled on blue interface' => 'Serwer DHCP wyÅÃczony na interfejsie BLUE', -'dhcp server enabled' => 'Serwer DHCP wÅÃczony. Ponowne uruchamianie.', -'dhcp server enabled on blue interface' => 'Serwer DHCP wÅÃczony na interfejsie BLUE', +'dhcp server disabled' => 'Serwer DHCP wyÅÄczony. Zatrzymano.', +'dhcp server disabled on blue interface' => 'Serwer DHCP wyÅÄczony na interfejsie BLUE', +'dhcp server enabled' => 'Serwer DHCP wÅÄczony. Ponowne uruchamianie.', +'dhcp server enabled on blue interface' => 'Serwer DHCP wÅÄczony na interfejsie BLUE', 'dhcp-options' => 'DHCP push options', -'dial' => 'PoÅÃcz', -'dial profile' => 'PoÅÃcz z profilem', +'dial' => 'PoÅÄcz', +'dial profile' => 'PoÅÄcz z profilem', 'dial user password' => 'Dial user password:', 'dial user password has been changed' => 'Dial user password has been changed.', 'dialing mode' => 'Dialing mode:', -'dialup red not ppp' => 'Profile poÅÃczeÅ wdzwanianych mogÃ byÃ uÅŒywane tylko kiedy interfejs <b>RED</b> jest ustawiony jako <b>PPP Dialup</b><BR>SprawdÅº ustawienia sieci.', +'dialup red not ppp' => 'Profile poÅÄczeÅ wdzwanianych mogÄ byÄ uÅŒywane tylko kiedy interfejs <b>RED</b> jest ustawiony jako <b>PPP Dialup</b><BR>SprawdÅº ustawienia sieci.', 'dialup settings' => 'Ustawienia wdzwaniania', 'directory mask' => 'Prawa UNIX do katalogu', 'directory writeable' => 'katalog ma prawo zapisu', -'disabled' => 'wyÅÃczony', -'disconnect' => 'OVPN Zatrz./RozÅÃczenie', -'disconnects' => 'RozÅÃczeÅ', +'disabled' => 'wyÅÄczony', +'disconnect' => 'OVPN Zatrz./RozÅÄczenie', +'disconnects' => 'RozÅÄczeÅ', 'disk access per' => 'Dostepow do dysku na', 'disk usage' => 'Wykorzystanie dysku', 'display' => 'WyÅwietl', 'display charset' => 'Display Charset', -'display hostname in window title' => 'WyÅwietlaj nazwÃ hosta w tytule okna', +'display hostname in window title' => 'WyÅwietlaj nazwÄ hosta w tytule okna', 'display traffic at home' => 'WyÅwietlaj dane o ruchu na stronie startowej', 'display webinterface effects' => 'Aktywuj efekty interfejsu', 'dl client arch' => 'Pobierz pakiet klienta (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'Konfigracja DMZ pinhole', 'dmz pinhole rule added' => 'ReguÅa DMZ pinhole dodana; restartowanie DMZ pinhole', -'dmz pinhole rule removed' => 'ReguÅa DMZ pinhole usuniÃta; restartowanie DMZ pinhole', -'dmzpinholes for same net not necessary' => 'DMZ Pinhole jest niepotrzebny pomiÃdzy tymi samymi sieciami. Wybierz rÃ³ÅŒne sieci ÅºrÃ³dÅowe i docelowe.', -'dns address deleted' => 'PomyÅlnie usuniÃto!', -'dns address deleted txt' => 'Adres serwera DNS zostaÅ pomyÅlnie usuniÃty.<br />NaleÅŒy wykonaÃ restart lub nawiÃzaÃ ponownie poÅÃczenie!!!', +'dmz pinhole rule removed' => 'ReguÅa DMZ pinhole usuniÄta; restartowanie DMZ pinhole', +'dmzpinholes for same net not necessary' => 'DMZ Pinhole jest niepotrzebny pomiÄdzy tymi samymi sieciami. Wybierz rÃ³ÅŒne sieci ÅºrÃ³dÅowe i docelowe.', +'dns address deleted' => 'PomyÅlnie usuniÄto!', +'dns address deleted txt' => 'Adres serwera DNS zostaÅ pomyÅlnie usuniÄty.<br />NaleÅŒy wykonaÄ restart lub nawiÄzaÄ ponownie poÅÄczenie!!!', 'dns address done' => 'Zapisywanie ustawieÅ serwerÃ³w DNS.', -'dns address recon' => 'Ponowne ÅÃczenie!', +'dns address recon' => 'Ponowne ÅÄczenie!', 'dns check failed' => 'DNS check failed', -'dns desc' => 'JeÅŒeli adres IP przydzielany jest z serwera DHCP dostawcy informacje o DNS zostanÃ wprowadzone automatycznie. W tym miejscu moÅŒesz wprowadziÃ wÅasne adresy serwerÃ³w DNS.', +'dns desc' => 'JeÅŒeli adres IP przydzielany jest z serwera DHCP dostawcy informacje o DNS zostanÄ wprowadzone automatycznie. W tym miejscu moÅŒesz wprowadziÄ wÅasne adresy serwerÃ³w DNS.', 'dns error 0' => 'Adres IP <strong>podstawowego</strong> DNS jest niepoprawny. SprawdÅº ustawienia!<br />Wprowadzony adres<strong>zapasowego</strong> DNS jest prawidÅowy.', -'dns error 01' => 'Podane adresy serwerÃ³w DNS <strong>podstawowego</strong> i <strong>zapasowego</strong> sÃ nieporawne. SprawdÅº ustawienia!', +'dns error 01' => 'Podane adresy serwerÃ³w DNS <strong>podstawowego</strong> i <strong>zapasowego</strong> sÄ nieporawne. SprawdÅº ustawienia!', 'dns error 1' => 'Adres IP <strong>zapasowego</strong> DNS jest niepoprawny. SprawdÅº ustawienia!<br />Wprowadzony adres <strong>podstawowego</strong> DNS jest prawidÅowy.', 'dns header' => 'Assign DNS server addresses only for DHCP on red0', 'dns list' => 'Lista darmowych publicznych serwerÃ³w DNS', @@ -684,14 +684,14 @@ 'dns new 1' => 'Nowy adres IP <strong>zapasowego</strong> DNS:', 'dns proxy server' => 'Serwer Proxy DNS', 'dns saved' => 'Zapisano poprawnie!', -'dns saved txt' => 'Podane adresy serwerÃ³w DNS zostaÅy poprawnie zapisane. <br />NaleÅŒy wykonaÃ restart lub wykonaÃ ponowne ÅÃczenie, aby zmiany zostaÅy zastosowane!', +'dns saved txt' => 'Podane adresy serwerÃ³w DNS zostaÅy poprawnie zapisane. <br />NaleÅŒy wykonaÄ restart lub wykonaÄ ponowne ÅÄczenie, aby zmiany zostaÅy zastosowane!', 'dns server' => 'Serwer DNS', 'dns title' => 'Domain Name System', -'do not log this port list' => 'Odrzucaj tÃ listÃ portÃ³w zanim zostanÃ zapisane do logu (zmniejsza rozmiar logÃ³w)', -'dod' => 'ÅÃcz na ÅŒÃdanie', -'dod for dns' => 'ÅÃcz na ÅŒadnie DNS:', -'dod not compatible with ddns' => 'ÅÃczenie na ÅŒÃdanie nie jest kompatybilne z usÅugÃ dynamicznego dns (dyndns)', -'dod waiting' => 'ÅÃczenie na ÅŒÃdanie - oczekiwanie', +'do not log this port list' => 'Odrzucaj tÄ listÄ portÃ³w zanim zostanÄ zapisane do logu (zmniejsza rozmiar logÃ³w)', +'dod' => 'ÅÄcz na ÅŒÄdanie', +'dod for dns' => 'ÅÄcz na ÅŒadnie DNS:', +'dod not compatible with ddns' => 'ÅÄczenie na ÅŒÄdanie nie jest kompatybilne z usÅugÄ dynamicznego dns (dyndns)', +'dod waiting' => 'ÅÄczenie na ÅŒÄdanie - oczekiwanie', 'domain' => 'Domena', 'domain master' => 'Domain Master', 'domain name' => 'Nazwa domeny', @@ -699,11 +699,11 @@ 'domain not set' => 'Domena nie ustawiona.', 'donation' => 'Donation', 'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif', -'donation-text' => '<strong>IPFire</strong> jest tworzony przez wolontariuszy w ich wolnym czasie. JeÅŒeli chcesz pomÃ³c w dalszym rozwoju projektu moÅŒesz nas wspomÃ³c dowolnÃ kwotÃ. ', +'donation-text' => '<strong>IPFire</strong> jest tworzony przez wolontariuszy w ich wolnym czasie. JeÅŒeli chcesz pomÃ³c w dalszym rozwoju projektu moÅŒesz nas wspomÃ³c dowolnÄ kwotÄ. ', 'done' => 'Do it', 'dos charset' => 'Kodowanie DOS', -'down and up speed' => 'WprowadÅº parametry Twojego ÅÃcza - prÃdkoÅÃ pobierania i wysyÅania danych <br /> i naciÅnij <i>Zapisz</i>.', -'downlink speed' => 'PrÃdkoÅÃ pobierania (kbit/sec)', +'down and up speed' => 'WprowadÅº parametry Twojego ÅÄcza - prÄdkoÅÄ pobierania i wysyÅania danych <br /> i naciÅnij <i>Zapisz</i>.', +'downlink speed' => 'PrÄdkoÅÄ pobierania (kbit/sec)', 'downlink std class' => 'standardowa klasa pobierania', 'download' => 'pobierz', 'download ca certificate' => 'Pobierz certyfikat CA', @@ -724,24 +724,24 @@ 'drop wirelessinput' => 'Loguj odrzucone pakiety wejÅciowe wireless', 'dst port' => 'Dst Port', 'dstprt range overlaps' => 'Zakres portÃ³w zachodzi na jeden z aktualnie zdefiniowanych portÃ³w.', -'dstprt within existing' => 'Port docelowy zawiera siÃ w aktualnie zdefiniowanym zakresie portÃ³w.', +'dstprt within existing' => 'Port docelowy zawiera siÄ w aktualnie zdefiniowanym zakresie portÃ³w.', 'duplicate ip' => 'Wprowadzono duplikat adresu IP', 'duplicate ip bold' => 'Zduplikowany adresy zostaÅy <b>pogrubiony</b>', 'duplicate mac' => 'Wprowadzono duplikat adresu MAC', -'duplicate name' => 'Taka nazwa juÅŒ istnieje, proszÃ podaÃ innÃ.', -'dyn dns source choice' => 'IPFire bÃdzie dostarczaÅ adres IP dla usÅugodawcÃ³w Dynamic DNS z:', +'duplicate name' => 'Taka nazwa juÅŒ istnieje, proszÄ podaÄ innÄ.', +'dyn dns source choice' => 'IPFire bÄdzie dostarczaÅ adres IP dla usÅugodawcÃ³w Dynamic DNS z:', 'dynamic dns' => 'Dynamiczny DNS', 'dynamic dns client' => 'Klient dynamicznego DNS', -'e-mail address too long' => 'Adres E-mail jest zbyt dÅugi; nie powinien byÃ dÅuÅŒszy niÅŒ 40 znakÃ³w.', -'eciadsl help' => 'Aby korzystaÃ z modemu ECI ADSL naleÅŒy wgraÃ plik synch.bin na serwer IPFire. NaleÅŒy pobraÃ ten plik ze strony ECIADSL a nastÃpnie wgraÃ plik <b>synch.bin</b> wykorzystujÃc poniÅŒszy formularz.', +'e-mail address too long' => 'Adres E-mail jest zbyt dÅugi; nie powinien byÄ dÅuÅŒszy niÅŒ 40 znakÃ³w.', +'eciadsl help' => 'Aby korzystaÄ z modemu ECI ADSL naleÅŒy wgraÄ plik synch.bin na serwer IPFire. NaleÅŒy pobraÄ ten plik ze strony ECIADSL a nastÄpnie wgraÄ plik <b>synch.bin</b> wykorzystujÄc poniÅŒszy formularz.', 'eciadsl upload' => 'Wgraj plik ECI ADSL synch.bin', 'edit' => 'Edycja', -'edit a rule' => 'Edytuj istniejÃcÃ reguÅÃ:', +'edit a rule' => 'Edytuj istniejÄcÄ reguÅÄ:', 'edit advanced settings when done' => 'Edytuj zaawansowane opcje kiedy zakoÅczone.', -'edit an existing alias' => 'Edytuj istniejÃcy alias', -'edit an existing host' => 'Edytuj istniejÃcego hosta', -'edit an existing lease' => 'Edytuj istniejÃcy wpis statyczny', -'edit device' => 'Edycja urzÃdzenia', +'edit an existing alias' => 'Edytuj istniejÄcy alias', +'edit an existing host' => 'Edytuj istniejÄcego hosta', +'edit an existing lease' => 'Edytuj istniejÄcy wpis statyczny', +'edit device' => 'Edycja urzÄdzenia', 'edit hosts' => 'Edycja hosta', 'edit network' => 'Edycja sieci', 'edit printer' => 'edycja drukarki', @@ -749,39 +749,39 @@ 'edit share' => 'Edycja zasobu', 'editor' => 'Edytor', 'eg' => 'np.:', -'email server can not be empty' => 'Serwer E-mail nie moÅŒe byÃ pusty', +'email server can not be empty' => 'Serwer E-mail nie moÅŒe byÄ pusty', 'emailreportlevel' => 'E-mailreportlevel', -'empty' => 'To pole moÅŒe zostaÃ puste', +'empty' => 'To pole moÅŒe zostaÄ puste', 'empty profile' => 'pusty', 'enable ignore filter' => 'Enable ignore filter', -'enable javascript' => 'WÅÃcz javascript', +'enable javascript' => 'WÅÄcz javascript', 'enable wildcards' => 'Enable wildcards:', -'enabled' => 'WÅÃczony:', -'enabled on' => 'WÅÃczony na', -'enabledtitle' => 'WÅÃczony', +'enabled' => 'WÅÄczony:', +'enabled on' => 'WÅÄczony na', +'enabledtitle' => 'WÅÄczony', 'encapsulation' => 'Encapsulacja', 'encrypted' => 'Encrypted', 'end address' => 'Adres koÅcowy:', -'enter ack class' => 'WprowadÅº klasÃ dla ACK <br /> i naciÅnij <i>Zapisz</i>.', -'enter data' => 'WprowadÅº ustawienia <br /> a nastÃpnie naciÅnij <i>Zapisz</i>.', -'err bk 1' => 'BÅÃd tworzenia archiwum', +'enter ack class' => 'WprowadÅº klasÄ dla ACK <br /> i naciÅnij <i>Zapisz</i>.', +'enter data' => 'WprowadÅº ustawienia <br /> a nastÄpnie naciÅnij <i>Zapisz</i>.', +'err bk 1' => 'BÅÄd tworzenia archiwum', 'err bk 10 password' => 'Error with backup password', -'err bk 2 key' => 'BÅÃd tworzenia pliku klucza', -'err bk 3 tar' => 'BÅÃd dodawania plikÃ³w do archiwum', -'err bk 4 gz' => 'BÅÃd kompresji archiwum', -'err bk 5 encrypt' => 'BÅÃd szyfrowania archiwum', -'err rs 1' => 'BÅÃd przywracania archiwum', -'err rs 6 decrypt' => 'BÅÃd odszyfrowywania archiwum', +'err bk 2 key' => 'BÅÄd tworzenia pliku klucza', +'err bk 3 tar' => 'BÅÄd dodawania plikÃ³w do archiwum', +'err bk 4 gz' => 'BÅÄd kompresji archiwum', +'err bk 5 encrypt' => 'BÅÄd szyfrowania archiwum', +'err rs 1' => 'BÅÄd przywracania archiwum', +'err rs 6 decrypt' => 'BÅÄd odszyfrowywania archiwum', 'err rs 7 untartst' => 'Niepoprawne odszyfrowane archiwum', -'err rs 8 untar' => 'BÅÃd wypakowywania archiwum (untar)', -'error config' => 'Nie moÅŒna otworzyÃ /var/ipfire/ovpn/config/ZERINA.ovpn !', -'error external access' => 'Nie moÅŒna otworzyÃ /var/ipfire/xtaccess/config (dostÃp zewnÃtrzny moÅŒe nie dziaÅaÃ)!', -'error messages' => 'WiadomoÅci o bÅÃdach:', +'err rs 8 untar' => 'BÅÄd wypakowywania archiwum (untar)', +'error config' => 'Nie moÅŒna otworzyÄ /var/ipfire/ovpn/config/ZERINA.ovpn !', +'error external access' => 'Nie moÅŒna otworzyÄ /var/ipfire/xtaccess/config (dostÄp zewnÄtrzny moÅŒe nie dziaÅaÄ)!', +'error messages' => 'WiadomoÅci o bÅÄdach:', 'esp encryption' => 'Szyfrowanie ESP:', 'esp grouptype' => 'Grupa ESP:', 'esp integrity' => 'ESP Integrity:', 'esp keylife' => 'Czas waÅŒnoÅci klucza ESP:', -'esp keylife should be between 1 and 24 hours' => 'Czas waÅŒnoÅci klucza ESP powinien byÃ pomiÃcy 1 a 24 godzinami', +'esp keylife should be between 1 and 24 hours' => 'Czas waÅŒnoÅci klucza ESP powinien byÄ pomiÄcy 1 a 24 godzinami', 'every' => 'KaÅŒdy', 'exampel' => 'przykÅad', 'exclude logfiles' => 'Wyklucz pliki z logami', @@ -791,37 +791,37 @@ 'expires' => 'Wygasa', 'export' => 'Export', 'exportkey' => 'Export PSK', -'external access' => 'DostÃp zewnÃtrzny', -'external access configuration' => 'Konfiguracja dostÃpu zewnÃtrznego', -'external access rule added' => ' Dodano reguÅÃ dostÃpu zewnÃtrznego; ponowne uruchamianie kontroli dostÃpu', -'external access rule changed' => ' Zmieniono reguÅÃ dostÃpu zewnÃtrznego; ponowne uruchamianie kontroli dostÃpu', -'external access rule removed' => ' UsuniÃto reguÅÃ dostÃpu zewnÃtrznego; ponowne uruchamianie kontroli dostÃpu', -'external aliases configuration' => 'Konfiguracja aliasÃ³w zewnÃtrznych', +'external access' => 'DostÄp zewnÄtrzny', +'external access configuration' => 'Konfiguracja dostÄpu zewnÄtrznego', +'external access rule added' => ' Dodano reguÅÄ dostÄpu zewnÄtrznego; ponowne uruchamianie kontroli dostÄpu', +'external access rule changed' => ' Zmieniono reguÅÄ dostÄpu zewnÄtrznego; ponowne uruchamianie kontroli dostÄpu', +'external access rule removed' => ' UsuniÄto reguÅÄ dostÄpu zewnÄtrznego; ponowne uruchamianie kontroli dostÄpu', +'external aliases configuration' => 'Konfiguracja aliasÃ³w zewnÄtrznych', 'extrahd' => 'ExtraHD', -'extrahd detected drives' => 'wykryte napÃdy', +'extrahd detected drives' => 'wykryte napÄdy', 'false classnumber' => 'Numer klasy nie pasuje do interfejsu.', 'false max bandwith' => 'NieprawidÅowe maksymalne pasmo (false).', 'false min bandwith' => 'NieprawidÅowe minimalne pasmo (false).', 'february' => 'Luty', -'fetch ip from' => 'PrÃ³buj uzyskaÃ publiczne IP za pomocÃ zewnÃtrznego serwera', +'fetch ip from' => 'PrÃ³buj uzyskaÄ publiczne IP za pomocÄ zewnÄtrznego serwera', 'filename' => 'Nazwa pliku', 'filesystem full' => 'PeÅny system plikÃ³w', 'fireinfo ipfire version' => 'Wersja IPFire', -'fireinfo is disabled' => 'Fireinfo jest wyÅÃczony', -'fireinfo is enabled' => 'Fireinfo jest wÅÃczony', +'fireinfo is disabled' => 'Fireinfo jest wyÅÄczony', +'fireinfo is enabled' => 'Fireinfo jest wÅÄczony', 'fireinfo is submitted' => 'TwÃ³j profil jest przesyÅany do serwisu fireinfo.', -'fireinfo is submitted button' => 'Nie, nie chcÃ wiÃcej przesyÅaÃ mojego profilu', -'fireinfo kernel version' => 'Wersja jÃdra', +'fireinfo is submitted button' => 'Nie, nie chcÄ wiÄcej przesyÅaÄ mojego profilu', +'fireinfo kernel version' => 'Wersja jÄdra', 'fireinfo not submitted' => 'TwÃ³j profil nie jest przesyÅany do serwisu fireinfo.', -'fireinfo not submitted button' => 'Tak, chcÃ przesÅaÃ mÃ³j profil', +'fireinfo not submitted button' => 'Tak, chcÄ przesÅaÄ mÃ³j profil', 'fireinfo pakfire version' => 'Wersja pakfire', -'fireinfo please enable' => 'ProszÃ wÅÃczyÃ usÅugÃ fireinfo.', +'fireinfo please enable' => 'ProszÄ wÅÄczyÄ usÅugÄ fireinfo.', 'fireinfo settings' => 'Ustawienia Fireinfo', 'fireinfo system version' => 'Wersja systemu', -'fireinfo why descr1' => 'Dla rozwoju IPFire bardzo waÅŒne jest wÅÃczenie tej usÅugi', +'fireinfo why descr1' => 'Dla rozwoju IPFire bardzo waÅŒne jest wÅÄczenie tej usÅugi', 'fireinfo why descr2' => 'usÅuga. ', -'fireinfo why enable' => 'Dlaczego powinienem wÅÃczyÃ fireinfo?', -'fireinfo why read more' => 'Czytaj wiÃcej o powodach.', +'fireinfo why enable' => 'Dlaczego powinienem wÅÄczyÄ fireinfo?', +'fireinfo why read more' => 'Czytaj wiÄcej o powodach.', 'fireinfo your profile id' => 'ID Twojego profilu', 'firewall' => 'Zapora', 'firewall graphs' => 'Zapora - Wykresy', @@ -837,18 +837,18 @@ 'firmware upload' => 'Wgraj Firmware/Sterowniki', 'fixed ip lease added' => 'Dodano statyczny wpis IP', 'fixed ip lease modified' => 'Zmodyfikowano statyczny wpis IP', -'fixed ip lease removed' => 'UsuniÃto statyczny wpis IP', -'force update' => 'WymuÅ aktualizacjÃ', +'fixed ip lease removed' => 'UsuniÄto statyczny wpis IP', +'force update' => 'WymuÅ aktualizacjÄ', 'force user' => 'force all new file to user', -'forwarding rule added' => 'Dodano reguÅÃ przekierowania; ponowne uruchamianie przekierowaÅ', -'forwarding rule removed' => 'UsuniÃto reguÅÃ przekierowania; ponowne uruchamianie przekierowaÅ', -'forwarding rule updated' => 'Zmieniono reguÅÃ przekierowania; ponowne uruchamianie przekierowaÅ', +'forwarding rule added' => 'Dodano reguÅÄ przekierowania; ponowne uruchamianie przekierowaÅ', +'forwarding rule removed' => 'UsuniÄto reguÅÄ przekierowania; ponowne uruchamianie przekierowaÅ', +'forwarding rule updated' => 'Zmieniono reguÅÄ przekierowania; ponowne uruchamianie przekierowaÅ', 'free' => 'Wolne', 'free memory' => 'Wolna pamiec ', 'free swap' => 'Wolny SWAP', 'frequency' => 'Czestotliwosc', -'friday' => 'PiÃtek', -'fritzdsl help' => 'Aby uÅŒywaÃ modemÃ³w Fritz Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb , naleÅŒy wgraÃ odpowiedni pakiet na serwer IPFire. W tym celu naleÅŒy pobraÃ pakiet tar odpowiadajÃcy twojej wersji ze strony IPFire, a nastÃpnie wgraÃ plik <b>fcdsl-(your_version).tgz</b> na TwÃ³j serwer IPFire wykorzystujÃc poniÅŒszy formularz.', +'friday' => 'PiÄtek', +'fritzdsl help' => 'Aby uÅŒywaÄ modemÃ³w Fritz Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb , naleÅŒy wgraÄ odpowiedni pakiet na serwer IPFire. W tym celu naleÅŒy pobraÄ pakiet tar odpowiadajÄcy twojej wersji ze strony IPFire, a nastÄpnie wgraÄ plik <b>fcdsl-(your_version).tgz</b> na TwÃ³j serwer IPFire wykorzystujÄc poniÅŒszy formularz.', 'fritzdsl upload' => 'Wgraj sterownik Fritz!DSL', 'from' => 'Od', 'from email adr' => 'Adres nadawcy e-mail', @@ -869,15 +869,15 @@ 'generate root/host certificates' => 'Generuj certyfikaty root/host', 'generate tripwire keys and init' => 'generuj klucze tripwire i inicjuj', 'generatekeys' => 'Generuj klucze', -'generatepolicy' => 'Generuj nowÃ politykÃ', +'generatepolicy' => 'Generuj nowÄ politykÄ', 'generatereport' => 'Generuj nowy raport', -'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generowanie certyfikatÃ³w root i host moÅŒe zajÃc dÅuÅŒszÃ chwilÃ. Na starszym sprzÃcie moÅŒe trwaÃ kilka minut. Zachowaj cierpliwoÅÃ', +'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generowanie certyfikatÃ³w root i host moÅŒe zajÄc dÅuÅŒszÄ chwilÄ. Na starszym sprzÄcie moÅŒe trwaÄ kilka minut. Zachowaj cierpliwoÅÄ', 'genkey' => 'Generuj PSK', 'genre' => 'Genre', 'global settings' => 'Ustawienia globalne', -'gpl i accept these terms and conditions' => 'AkceptujÃ te warunki', +'gpl i accept these terms and conditions' => 'AkceptujÄ te warunki', 'gpl license agreement' => 'Akceptacja licencji', -'gpl please read carefully the general public license and accept it below' => 'ProszÃ uwaÅŒnie przeczytaÃ licencjÃ General Public License i zaakceptowaÃ jej warunki', +'gpl please read carefully the general public license and accept it below' => 'ProszÄ uwaÅŒnie przeczytaÄ licencjÄ General Public License i zaakceptowaÄ jej warunki', 'gpl unofficial translation of the general public license v3' => 'Nieoficjalne tÅumaczenie General Public License v3', 'graph' => 'Wykres', 'graph per' => 'na', @@ -890,14 +890,14 @@ 'guardian interface' => 'Interfejs', 'guardian logfile' => 'Plik Log', 'guardian timelimit' => 'Ograniczenie czasowe', -'guest ok' => 'zezwÃ³l na dostÃp dla goÅci', +'guest ok' => 'zezwÃ³l na dostÄp dla goÅci', 'gui settings' => 'Ustawienia GUI', -'gz with key' => 'Tylko zaszyfrowane archiwum moÅŒe byÃ odtworzone na tej maszynie.', -'hangup' => 'RozÅÃcz', +'gz with key' => 'Tylko zaszyfrowane archiwum moÅŒe byÄ odtworzone na tej maszynie.', +'hangup' => 'RozÅÄcz', 'hangup string' => 'Hangup:', 'harddisk temperature' => 'Temperatura dysku', 'harddisk temperature graphs' => 'wykresy temperatury hdd', -'hardware graphs' => 'Wykresy sprzÃtu', +'hardware graphs' => 'Wykresy sprzÄtu', 'hdd temperature in' => 'Temperatura dysku w ', 'help' => 'Pomoc', 'high' => 'Wysoki', @@ -912,8 +912,8 @@ 'host ip' => 'Adres IP hosta', 'host to net vpn' => 'Host-to-Net Virtual Private Network (RoadWarrior)', 'hostname' => 'Nazwa hosta', -'hostname and domain already in use' => 'Nazwa hosta i domena sÃ juÅŒ w uÅŒyciu.', -'hostname cant be empty' => 'Nazwa hosta nie moÅŒe byÃ pusta.', +'hostname and domain already in use' => 'Nazwa hosta i domena sÄ juÅŒ w uÅŒyciu.', +'hostname cant be empty' => 'Nazwa hosta nie moÅŒe byÄ pusta.', 'hostname not set' => 'Nazwa hosta nie ustawiona.', 'hosts config added' => 'Dodana konfiguracja hostÃ³w', 'hosts config changed' => 'Zmieniona konfiguracja hostÃ³w', @@ -925,37 +925,37 @@ 'icmp type' => 'Typ ICMP', 'id' => 'ID', 'idle' => 'Bezczynne', -'idle timeout' => 'Czas bezczynnoÅci (min; 0 aby wyÅÃczyÃ):', +'idle timeout' => 'Czas bezczynnoÅci (min; 0 aby wyÅÄczyÄ):', 'idle timeout not set' => 'Nie okreÅlono czasu bezczynnoÅci.', -'ids log viewer' => 'PrzeglÃd logÃ³w IDS', +'ids log viewer' => 'PrzeglÄd logÃ³w IDS', 'ids logs' => 'Logi IDS', 'ids preprocessor' => 'Preprocessor IDS ', -'ids rules license' => 'Aby uÅŒywaÃ certyfikowanych reguÅ Sourcefire VRT, musisz zarejestrowaÃ siÃ na', +'ids rules license' => 'Aby uÅŒywaÄ certyfikowanych reguÅ Sourcefire VRT, musisz zarejestrowaÄ siÄ na', 'ids rules license1' => '.', -'ids rules license2' => 'Zaakceptuj licencje, aktywuj swoje konto przez klikniÃcie linku otrzymanego mailem. NastÃpnie przejdÅº do', +'ids rules license2' => 'Zaakceptuj licencje, aktywuj swoje konto przez klikniÄcie linku otrzymanego mailem. NastÄpnie przejdÅº do', 'ids rules license3' => 'naciÅnij przycis "Generate code"-i skopiuj 40-to znakowy Oinkcode do pola poniÅŒej.', 'ids rules update' => 'Aktualizacja reguÅ Snorta', 'iface' => 'Iface', 'ignore filter' => 'Ignore filter', 'ike encryption' => 'Szyfrowanie IKE:', 'ike grouptype' => 'Typ grupy IKE:', -'ike integrity' => 'SpÃ³jnoÅÃ IKE:', +'ike integrity' => 'SpÃ³jnoÅÄ IKE:', 'ike lifetime' => 'Czas waÅŒnoÅci IKE:', -'ike lifetime should be between 1 and 8 hours' => 'Czas waÅŒnoÅci IKE powinien wynosiÃ od 1 do 8 godzin.', +'ike lifetime should be between 1 and 8 hours' => 'Czas waÅŒnoÅci IKE powinien wynosiÄ od 1 do 8 godzin.', 'import' => 'Import', 'importkey' => 'Import PSK', 'in' => 'W', 'inactive' => 'nieaktywne/y', -'include logfiles' => 'DoÅÃcz pliki z logami', -'incoming' => 'przychodzÃce/y', +'include logfiles' => 'DoÅÄcz pliki z logami', +'incoming' => 'przychodzÄce/y', 'incoming traffic in bytes per second' => 'Ruch przychodzacy', 'incorrect password' => 'Niepoprawne hasÅo', 'info' => 'Info', 'init string' => 'Inicjuj:', -'insert floppy' => 'Aby wykonaÃ kopiÃ na dyskietkÃ wÅÃ³ÅŒ sformatowany noÅnik do napÃdu w serwerze IPFire i naciÅnij <i>kopia na dyskietÃ</i> aby zapisaÃ konfiguracjÃ systemu. NaleÅŒy uwaÅŒnie sprawdziÃ wynik tej operacji. Wykonywania kopii moÅŒe zajÃc dÅuÅŒszÃ chwilÃ, zachowaj cierpliwoÅÃ.<p>', +'insert floppy' => 'Aby wykonaÄ kopiÄ na dyskietkÄ wÅÃ³ÅŒ sformatowany noÅnik do napÄdu w serwerze IPFire i naciÅnij <i>kopia na dyskietÄ</i> aby zapisaÄ konfiguracjÄ systemu. NaleÅŒy uwaÅŒnie sprawdziÄ wynik tej operacji. Wykonywania kopii moÅŒe zajÄc dÅuÅŒszÄ chwilÄ, zachowaj cierpliwoÅÄ.<p>', 'insert removable device' => 'WÅÃ³ÅŒ wymienny noÅnik', 'install' => 'Instaluj', -'install new update' => 'Instaluj nowÃ aktualizacjÃ:', +'install new update' => 'Instaluj nowÄ aktualizacjÄ:', 'installed' => 'Zainstalowane', 'installed updates' => 'Zainstalowane aktualizacje:', 'instant update' => 'Instant Update', @@ -964,80 +964,80 @@ 'internet' => 'INTERNET', 'intrusion detection' => 'Wykrywanie intruzÃ³w', 'intrusion detection system' => 'System wykrywania intruzÃ³w', -'intrusion detection system log viewer' => 'PrzeglÃd logÃ³w systemu wykrywania intruzÃ³w', +'intrusion detection system log viewer' => 'PrzeglÄd logÃ³w systemu wykrywania intruzÃ³w', 'intrusion detection system rules' => 'reguÅy systemu wykrywania intruzÃ³w', 'intrusion detection system2' => 'System wykrywania intruzÃ³w:', 'invalid broadcast ip' => 'Niepoprawny broadcast IP', 'invalid cache size' => 'Niepoprawny rozmiar cache.', 'invalid characters found in pre-shared key' => 'Nieporawny znak w polu klucza wspÃ³Ådzielonego.', -'invalid date entered' => 'Wprowadzono niepoprawnÃ datÃ.', +'invalid date entered' => 'Wprowadzono niepoprawnÄ datÄ.', 'invalid default lease time' => 'Niepoprawny domyÅlny czas dzierÅŒawy.', 'invalid domain name' => 'Niepoprawna nazwa domeny.', -'invalid downlink speed' => 'Niepoprawna szybkoÅÃ pobierania.', +'invalid downlink speed' => 'Niepoprawna szybkoÅÄ pobierania.', 'invalid end address' => 'Niepoprawny adres koÅcowy.', 'invalid fixed ip address' => 'Niepoprawny adres IP wpisu statycznego', 'invalid fixed mac address' => 'Niepoprawny adres MAC wpisu statycznego', 'invalid hostname' => 'Niepoprawna nazwa hosta.', -'invalid input' => 'Niepoprawna wartoÅÃ', -'invalid input for authentication method' => 'Niepoprawna wartoÅÃ metody uwierzytelniana.', -'invalid input for city' => 'Niepoprawna wartoÅÃ w polu miasto.', -'invalid input for country' => 'Niepoprawna wartoÅÃ w polu kraj.', -'invalid input for department' => 'Niepoprawna wartoÅÃ w polu oddziaÅ.', -'invalid input for dhcp dns' => 'Niepoprawna wartoÅÃ w polu DHCP DNS', -'invalid input for dhcp domain' => 'Niepoprawna wartoÅÃ w polu domena DHCP', -'invalid input for dhcp wins' => 'Niepoprawna wartoÅÃ w polu DHCP WINS', -'invalid input for e-mail address' => 'Niepoprawna wartoÅÃ w polu adres e-mail.', -'invalid input for esp keylife' => 'Niepoprawna wartoÅÃ w polu czas waÅŒnoÅci ESP', -'invalid input for hostname' => 'Niepoprawna wartoÅÃ w polu nazwa hosta.', -'invalid input for ike lifetime' => 'Niepoprawna wartoÅÃ w polu czas waÅŒnoÅci IKE', -'invalid input for keepalive 1' => 'Niepoprawna wartoÅÃ w polu Keepalive ping', -'invalid input for keepalive 1:2' => 'Niepoprawna wartoÅÃ w polu Keepalive. UÅŒywaj min. wspÃ³Åczynnika 1:2', -'invalid input for keepalive 2' => 'Niepoprawna wartoÅÃ w polu Keepalive ping-restart', -'invalid input for max clients' => 'Niepoprawna wartoÅÃ w polu Max KlientÃ³w', -'invalid input for name' => 'Niepoprawna wartoÅÃ w polu peÅna nazwa uÅŒytkownika lub nazwa hosta systemu', +'invalid input' => 'Niepoprawna wartoÅÄ', +'invalid input for authentication method' => 'Niepoprawna wartoÅÄ metody uwierzytelniana.', +'invalid input for city' => 'Niepoprawna wartoÅÄ w polu miasto.', +'invalid input for country' => 'Niepoprawna wartoÅÄ w polu kraj.', +'invalid input for department' => 'Niepoprawna wartoÅÄ w polu oddziaÅ.', +'invalid input for dhcp dns' => 'Niepoprawna wartoÅÄ w polu DHCP DNS', +'invalid input for dhcp domain' => 'Niepoprawna wartoÅÄ w polu domena DHCP', +'invalid input for dhcp wins' => 'Niepoprawna wartoÅÄ w polu DHCP WINS', +'invalid input for e-mail address' => 'Niepoprawna wartoÅÄ w polu adres e-mail.', +'invalid input for esp keylife' => 'Niepoprawna wartoÅÄ w polu czas waÅŒnoÅci ESP', +'invalid input for hostname' => 'Niepoprawna wartoÅÄ w polu nazwa hosta.', +'invalid input for ike lifetime' => 'Niepoprawna wartoÅÄ w polu czas waÅŒnoÅci IKE', +'invalid input for keepalive 1' => 'Niepoprawna wartoÅÄ w polu Keepalive ping', +'invalid input for keepalive 1:2' => 'Niepoprawna wartoÅÄ w polu Keepalive. UÅŒywaj min. wspÃ³Åczynnika 1:2', +'invalid input for keepalive 2' => 'Niepoprawna wartoÅÄ w polu Keepalive ping-restart', +'invalid input for max clients' => 'Niepoprawna wartoÅÄ w polu Max KlientÃ³w', +'invalid input for name' => 'Niepoprawna wartoÅÄ w polu peÅna nazwa uÅŒytkownika lub nazwa hosta systemu', 'invalid input for oink code' => 'Niepoprawny OINKCODE', -'invalid input for organization' => 'Niepoprawna wartoÅÃ w polu organizacja', -'invalid input for remote host/ip' => 'Niepoprawna wartoÅÃ w polu zdalny host/ip.', -'invalid input for state or province' => 'Niepoprawna wartoÅÃ w polu stan lub prowincja.', +'invalid input for organization' => 'Niepoprawna wartoÅÄ w polu organizacja', +'invalid input for remote host/ip' => 'Niepoprawna wartoÅÄ w polu zdalny host/ip.', +'invalid input for state or province' => 'Niepoprawna wartoÅÄ w polu stan lub prowincja.', 'invalid ip' => 'Niepoprawny adres IP', -'invalid keep time' => 'Czas podtrzymywania musi byÃ prawidÅowÃ liczbÃ', +'invalid keep time' => 'Czas podtrzymywania musi byÄ prawidÅowÄ liczbÄ', 'invalid key' => 'Niepoprawny klucz.', 'invalid loaded file' => 'Wczytano niepoprawny plik', -'invalid local-remote id' => 'lokalny i zdalny id nie mogÃ byÃ takie same i muszÃ rozpoczynaÃ siÃ od znaku "@" sign. SÃ to tak zwane leftid i rightid w terminologii strongswan.', +'invalid local-remote id' => 'lokalny i zdalny id nie mogÄ byÄ takie same i muszÄ rozpoczynaÄ siÄ od znaku "@" sign. SÄ to tak zwane leftid i rightid w terminologii strongswan.', 'invalid logserver address' => 'Nieporawny adres serwera syslogd server', 'invalid mac address' => 'Niepoprawny adres MAC', 'invalid max lease time' => 'Niepoprawny maksymalny czas dzierÅŒawy.', -'invalid maximum incoming size' => 'Niepoprawny maksymalny rozmiar przychodzÃcy (incoming size).', +'invalid maximum incoming size' => 'Niepoprawny maksymalny rozmiar przychodzÄcy (incoming size).', 'invalid maximum object size' => 'Niepoprawny maksymalny rozmiar obiektu.', -'invalid maximum outgoing size' => 'Niepoprawny maksymalny rozmiar wychodzÃcy (outgoing size).', +'invalid maximum outgoing size' => 'Niepoprawny maksymalny rozmiar wychodzÄcy (outgoing size).', 'invalid md5sum' => 'Niepoprawna suma MD5.', 'invalid minimum object size' => 'Niepoprawny minimalny rozmiar obiektu.', 'invalid mtu input' => 'Niepoprawne MTU', 'invalid netmask' => 'Niepoprawna maska sieci', -'invalid port' => 'Niepoprawny port. Musi to byÃ prawidÅowy numer portu..', -'invalid port list' => 'Lista portÃ³w powinna wyglÃdaÃ nastÃpujÃco: port[,port]... gdzie port jest liczbÃ lub wpisem z /etc/services', +'invalid port' => 'Niepoprawny port. Musi to byÄ prawidÅowy numer portu..', +'invalid port list' => 'Lista portÃ³w powinna wyglÄdaÄ nastÄpujÄco: port[,port]... gdzie port jest liczbÄ lub wpisem z /etc/services', 'invalid primary dns' => 'Niepoprawny podstawowy DNS.', 'invalid primary ntp' => 'Niepoprawny adres podstawowego serwera NTP', 'invalid secondary dns' => 'Niepoprawny zapasowy DNS.', 'invalid secondary ntp' => 'Niepoprawny adres drugiego serwera NTP', -'invalid start address' => 'Niepoprawny adres poczÃtkowy.', +'invalid start address' => 'Niepoprawny adres poczÄtkowy.', 'invalid time entered' => 'Wprowadzono niepoprawny czas.', 'invalid time period' => 'NieprawidÅowy okres czasu', -'invalid uplink speed' => 'NieprawidÅowa szybkoÅÃ wysyÅania.', +'invalid uplink speed' => 'NieprawidÅowa szybkoÅÄ wysyÅania.', 'invalid upstream proxy username or password setting' => 'NieprawidÅowy uÅŒytkownik lub hasÅo dla upstream proxy.', -'invalid users' => 'lista uÅŒytkownikÃ³w z zabronionym dostÃpem', +'invalid users' => 'lista uÅŒytkownikÃ³w z zabronionym dostÄpem', 'invalid vpi vpci' => 'NieprawidÅowe ustawienia VPI/VPCI', 'invalid wins address' => 'NieprawidÅowy adres serwera WINS.', -'invert' => 'OdwrÃ³Ã', +'invert' => 'OdwrÃ³Ä', 'ip address' => 'Adres IP', 'ip address in use' => 'Adres IP jest juÅŒ w uÅŒyciu', 'ip address outside subnets' => 'Adres IP poza podsieciami', -'ip alias added' => 'Dodano zewnÃtrzny alias IP', -'ip alias changed' => 'Zmieniono zewnÃtrzny alias IP', -'ip alias removed' => 'UsuniÃto zewnÃtrzny alias IP', +'ip alias added' => 'Dodano zewnÄtrzny alias IP', +'ip alias changed' => 'Zmieniono zewnÄtrzny alias IP', +'ip alias removed' => 'UsuniÄto zewnÄtrzny alias IP', 'ip info' => 'Informacje IP', -'ipfire has now rebooted' => 'Serwer IPFire uruchamia siÃ ponownie.', -'ipfire has now shutdown' => 'WyÅÃczanie serwera IPFire.', +'ipfire has now rebooted' => 'Serwer IPFire uruchamia siÄ ponownie.', +'ipfire has now shutdown' => 'WyÅÄczanie serwera IPFire.', 'ipfire side' => 'IPFire side:', 'ipfire side is invalid' => 'IPFire side is invalid.', 'ipfires hostname' => 'Nazwa hosta IPFire\'s', @@ -1051,7 +1051,7 @@ 'isdn1' => 'Pojedynczy ISDN', 'isdn2' => 'PodwÃ³jny ISDN', 'january' => 'StyczeÅ', -'javascript menu error1' => 'JeÅŒeli rozwijane menu nie dziaÅajÃ poprawnie wyÅÃcz javascript na', +'javascript menu error1' => 'JeÅŒeli rozwijane menu nie dziaÅajÄ poprawnie wyÅÄcz javascript na', 'javascript menu error2' => 'stronie.', 'july' => 'Lipiec', 'june' => 'Czerwiec', @@ -1063,36 +1063,36 @@ 'keys' => 'klucze', 'lan' => 'LAN', 'lang' => 'en', -'languagepurpose' => 'Wybierz jÃzyk interfejsu IPFire ktÃ³rego chcesz uÅŒywaÃ:', -'last activity' => 'Ostatnia aktywnoÅÃ', +'languagepurpose' => 'Wybierz jÄzyk interfejsu IPFire ktÃ³rego chcesz uÅŒywaÄ:', +'last activity' => 'Ostatnia aktywnoÅÄ', 'lateprompting' => 'Lateprompting', 'lease expires' => 'DzierÅŒawa upÅywa', 'legend' => 'Legenda', -'length' => 'DÅugoÅÃ', +'length' => 'DÅugoÅÄ', 'line' => 'Linia', 'linkq' => 'Jakosc polaczenia', -'load printer' => 'ZaÅaduj drukarkÃ', +'load printer' => 'ZaÅaduj drukarkÄ', 'loaded modules' => 'ZaÅadowane moduÅy:', 'local hard disk' => 'Dysk twardy', 'local master' => 'Local Master', -'local ntp server specified but not enabled' => 'Wprowadzono lokoalny serwer NTP, jednak nie wÅÃczono go', -'local subnet' => 'PodsieÃ lokalna:', -'local subnet is invalid' => 'Niepoprawna podsieÃ lokalna.', +'local ntp server specified but not enabled' => 'Wprowadzono lokoalny serwer NTP, jednak nie wÅÄczono go', +'local subnet' => 'PodsieÄ lokalna:', +'local subnet is invalid' => 'Niepoprawna podsieÄ lokalna.', 'local vpn hostname/ip' => 'Lokalna nazwa VPN/IP', 'localkey' => 'Klucz lokalny', 'localkeyfile' => 'Plik klucza lokalnego', 'log' => 'Log:', -'log enabled' => 'Log WÅÃczony', +'log enabled' => 'Log WÅÄczony', 'log level' => 'Poziom logÃ³w', -'log lines per page' => 'Linii na stronÃ', +'log lines per page' => 'Linii na stronÄ', 'log server address' => 'Serwer syslog:', 'log settings' => 'Ustawienia logÃ³w', 'log summaries' => 'Podsumowania logÃ³w', 'log summary' => 'Podsumowanie logÃ³w', 'log var messages' => 'Ustawienia dla /var/log/messages:', -'log view' => 'PrzeglÃd logÃ³w', -'log viewer' => 'PrzeglÃdarka logÃ³w', -'log viewing options' => 'Opcje przeglÃdarki logÃ³w', +'log view' => 'PrzeglÄd logÃ³w', +'log viewer' => 'PrzeglÄdarka logÃ³w', +'log viewing options' => 'Opcje przeglÄdarki logÃ³w', 'log-options' => 'Opcje pliku logÃ³w', 'loged in at' => 'Logged in at', 'logging' => 'Logowanie', @@ -1113,19 +1113,19 @@ 'ls_sshd' => 'Logowania uÅŒytkownikÃ³w zdalnych:', 'ls_syslogd' => 'Syslogd:', 'mac address' => 'Adres MAC', -'mac address deleted' => 'Poprawnie usuniÃto!', -'mac address deleted txt' => 'Adres MAC zostaÅ poprawnie usuniÃty, jednak zmiany zostanÃ zastosowane dopiero po <strong>ponownym uruchomieniu</strong>.', -'mac address done' => 'Ustawienia adresu MAC sÃ zapisywane.', -'mac address error not 00' => 'Adres MAC musi rozpoczynaÃ siÃ od 00!', +'mac address deleted' => 'Poprawnie usuniÄto!', +'mac address deleted txt' => 'Adres MAC zostaÅ poprawnie usuniÄty, jednak zmiany zostanÄ zastosowane dopiero po <strong>ponownym uruchomieniu</strong>.', +'mac address done' => 'Ustawienia adresu MAC sÄ zapisywane.', +'mac address error not 00' => 'Adres MAC musi rozpoczynaÄ siÄ od 00!', 'mac address error not valid' => 'NieprawidÅowy adres MAC !', 'mac address header' => 'Adres MAC na interfejsie red0', 'mac address in use' => 'Adres MAC jest juÅŒ w uÅŒyciu', 'mac address menu' => 'Przypisz adres MAC', -'mac address recon' => 'PrÃ³ba ponownego ÅÃczenia!', +'mac address recon' => 'PrÃ³ba ponownego ÅÄczenia!', 'mac address saved' => 'Zapisano poprawnie!', -'mac address saved txt' => 'Adres MAC zostaÅ poprawnie zapisany, jednak zmiany zostanÃ zastosowane dopiero po <strong>ponownym uruchomieniu</strong>.', +'mac address saved txt' => 'Adres MAC zostaÅ poprawnie zapisany, jednak zmiany zostanÄ zastosowane dopiero po <strong>ponownym uruchomieniu</strong>.', 'mac address title' => 'Medium Access Control Address', -'mac desc' => 'W tym miejscu masz moÅŒliwoÅÃ ustawienia adresu MAC dla interfejsu red0. Adres naleÅŒy wpisaÃ w postaci szesnastkowej (0-9,a-f). PrzykÅady poprawnych wpisÃ³w <br /> 00-01-02-0e-b8-d6 lub 00:01:02:0e:b8:d6.', +'mac desc' => 'W tym miejscu masz moÅŒliwoÅÄ ustawienia adresu MAC dla interfejsu red0. Adres naleÅŒy wpisaÄ w postaci szesnastkowej (0-9,a-f). PrzykÅady poprawnych wpisÃ³w <br /> 00-01-02-0e-b8-d6 lub 00:01:02:0e:b8:d6.', 'mac new' => 'nowy adres MAC:', 'mac1 new' => 'nowy adres MAC 1 (vdsl-inet):', 'mac2 new' => 'nowy adres MAC 2 (vdsl-iptv):', @@ -1133,24 +1133,24 @@ 'mailmethod' => 'Mailmethod', 'mailprogramm' => 'Mailprogram', 'main page' => 'Strona gÅÃ³wna', -'manage ovpn' => '5. ZarzÃdzanie tunelami:', -'manage printers' => 'ZarzÃdzanie drukarkami', -'manage shares' => 'ZarzÃdzanie udost. zasobami', +'manage ovpn' => '5. ZarzÄdzanie tunelami:', +'manage printers' => 'ZarzÄdzanie drukarkami', +'manage shares' => 'ZarzÄdzanie udost. zasobami', 'manual' => 'Manual', -'manual control and status' => 'RÃczna kontrola i stan:', -'manually' => 'RÃcznie', +'manual control and status' => 'RÄczna kontrola i stan:', +'manually' => 'RÄcznie', 'map to guest' => 'Map to Guest', 'march' => 'Marzec', 'marked' => 'Zaznaczone', 'max bandwith' => 'Maksymalne pasmo', -'max incoming size' => 'Maks rozmiar przychodzÃcy (KB):', +'max incoming size' => 'Maks rozmiar przychodzÄcy (KB):', 'max lease time' => 'Maks czas dzierÅŒawy (min):', -'max outgoing size' => 'Maks rozmiar wychodzÃcy (KB):', -'max reliability' => 'Maksymalna niezawodnoÅÃ', +'max outgoing size' => 'Maks rozmiar wychodzÄcy (KB):', +'max reliability' => 'Maksymalna niezawodnoÅÄ', 'max renewal time' => 'Maks czas odnowy', 'max retries not set' => 'Maks l. powtÃ³rzeÅ nie ustawiona.', 'max size' => 'Maks rozmiar obiektu (KB):', -'max throughput' => 'Maksymalna przepustowoÅÃ', +'max throughput' => 'Maksymalna przepustowoÅÄ', 'maximal' => 'Maksymalny', 'maximum retries' => 'Maksymalna l. powtÃ³rzeÅ:', 'may' => 'Maj', @@ -1189,24 +1189,24 @@ 'modem on com3' => 'Modem na COM3', 'modem on com4' => 'Modem na COM4', 'modem on com5' => 'Modem na COM5', -'modem settings have errors' => 'Ustawienia modemu posiadajÃ bÅÃdu', +'modem settings have errors' => 'Ustawienia modemu posiadajÄ bÅÄdu', 'modem speaker on' => 'Modem speaker on:', 'modify' => 'Modyfikuj', 'modulation' => 'Modulacja', 'monday' => 'PoniedziaÅek', 'month' => 'Miesiac', -'monthly firewallhits' => 'miesiÃczne zdarzenia zapory', -'monthly start day bad' => 'PoczÃtek okresu miesiÃcznego jest niepoprawny', +'monthly firewallhits' => 'miesiÄczne zdarzenia zapory', +'monthly start day bad' => 'PoczÄtek okresu miesiÄcznego jest niepoprawny', 'monthly traffic bad' => 'Monthly volume is not correct', 'monthly volume' => 'Monthly volume', -'monthly volume start day' => 'Pierwszy dzieÅ okresu miesiÃcznego', +'monthly volume start day' => 'Pierwszy dzieÅ okresu miesiÄcznego', 'monthly volume start day short' => 'Pierwszy dzieÅ', -'months' => 'miesiÃce', -'more' => 'wiÃcej', +'months' => 'miesiÄce', +'more' => 'wiÄcej', 'mount' => 'Montuj', 'mounted on' => 'Zamontowany w', -'mpfire' => 'OdtwarzaÃ mediÃ³w dla IPFire', -'mpfire controls' => 'ZarzÃdzanie MPFire', +'mpfire' => 'OdtwarzaÄ mediÃ³w dla IPFire', +'mpfire controls' => 'ZarzÄdzanie MPFire', 'mpfire playlist' => 'Playlist\'a MPFire ', 'mpfire scanning' => 'Skanuj w poszukiwaniu nowych plikÃ³w', 'mpfire search' => 'MPFire Szukaj', @@ -1216,49 +1216,49 @@ 'my new share' => 'MÃ³j nowy zasÃ³b', 'name' => 'Nazwa', 'name is invalid' => 'Nazwa jest nieprawidÅowa', -'name must only contain characters' => 'Nazwa moÅŒe zawieraÃ jedynie litery.', -'name too long' => 'PeÅna nazwa uÅŒytkownika lub nazwa hosta sÃ zbyt dÅugie', +'name must only contain characters' => 'Nazwa moÅŒe zawieraÄ jedynie litery.', +'name too long' => 'PeÅna nazwa uÅŒytkownika lub nazwa hosta sÄ zbyt dÅugie', 'nat-traversal' => 'Nat Traversal:', 'needreboot' => 'Aktualizacja wymaga ponownego uruchomienia', -'net' => 'SieÃ', +'net' => 'SieÄ', 'net address' => 'adres sieci', 'net config' => 'Konfiguracja sieci', 'net config type' => 'rodzaj konfiguracji sieci', -'net config type help' => 'GREEN - sieÃ lokalna, RED - internet, BLUE - WLAN, ORANGE - DMZ.', +'net config type help' => 'GREEN - sieÄ lokalna, RED - internet, BLUE - WLAN, ORANGE - DMZ.', 'net to net vpn' => 'Net-to-Net Virtual Private Network', -'net traffic newversion' => 'DostÃpna nowa wersja Net-Traffic:', +'net traffic newversion' => 'DostÄpna nowa wersja Net-Traffic:', 'net-traffic configuration' => 'Konfiguracja Net-Traffic', 'netbios name' => 'Nazwa Netbios', 'netmask' => 'Maska sieci', -'network' => 'SieÃ', +'network' => 'SieÄ', 'network added' => 'Custom network added', 'network configuration' => 'Konfiguracja sieci', -'network internal' => 'SieÃ (wewnÃtrzna)', +'network internal' => 'SieÄ (wewnÄtrzna)', 'network options' => 'Opcje sieci', -'network other' => 'SieÃ (inne)', -'network red' => 'SieÃ (zewnÃtrzna)', +'network other' => 'SieÄ (inne)', +'network red' => 'SieÄ (zewnÄtrzna)', 'network removed' => 'Custom network removed', 'network status information' => 'Informacje o stanie sieci', 'network time' => 'UÅŒywaj sieciowego serwera czasu:', 'network time from' => 'Uzyskaj czas z sieciowego serwera czasu', 'network traffic graphs' => 'Wykresy ruchu sieciowego', -'network traffic graphs external' => 'Wykresy Net-Traffic (sieÃ zewn.)', -'network traffic graphs internal' => 'Net-Traffic graphs (sieÃ wewn.)', -'network traffic graphs others' => 'SieÃ (inne)', +'network traffic graphs external' => 'Wykresy Net-Traffic (sieÄ zewn.)', +'network traffic graphs internal' => 'Net-Traffic graphs (sieÄ wewn.)', +'network traffic graphs others' => 'SieÄ (inne)', 'network updated' => 'Custom Network updated', 'networks settings' => 'Zapora - ustawienia sieci', -'new optionsfw later' => 'Twoja zmiany bÃdÃ aktywne po ponownym uruchomieniu', -'new optionsfw must boot' => 'Musisz ponownie uruchomiÃ serwer IPFire', +'new optionsfw later' => 'Twoja zmiany bÄdÄ aktywne po ponownym uruchomieniu', +'new optionsfw must boot' => 'Musisz ponownie uruchomiÄ serwer IPFire', 'newer' => 'Nowsze', -'next' => 'nastÃpny', +'next' => 'nastÄpny', 'no' => 'Nie', -'no alcatelusb firmware' => 'Brak firmware dla Alcatel USB. ProszÃ o jego wgranie.', +'no alcatelusb firmware' => 'Brak firmware dla Alcatel USB. ProszÄ o jego wgranie.', 'no cfg upload' => 'Brak danych do wgrania', 'no dhcp lease' => 'Brak przydzielonych dzierÅŒaw DHCP', -'no eciadsl synch.bin file' => 'Brak pliku ECI ADSL synch.bin. ProszÃ o jego wgranie.', -'no filter pass' => 'ProszÃ wprowadziÃ standardowÃ klasÃ dla pakietÃ³w niefiltrowanych.', -'no fritzdsl driver' => 'Brak sterownika Fritz!DSL. ProszÃ o jego wgranie.', -'no information available' => 'Brak dostÃpnych informacji.', +'no eciadsl synch.bin file' => 'Brak pliku ECI ADSL synch.bin. ProszÄ o jego wgranie.', +'no filter pass' => 'ProszÄ wprowadziÄ standardowÄ klasÄ dla pakietÃ³w niefiltrowanych.', +'no fritzdsl driver' => 'Brak sterownika Fritz!DSL. ProszÄ o jego wgranie.', +'no information available' => 'Brak dostÄpnych informacji.', 'no log selected' => 'Nie wybrano logu', 'no modem selected' => 'Nie wybrano modemu', 'no set selected' => 'Nie wybrano ustawienia', @@ -1268,7 +1268,7 @@ 'noservicename' => 'Nie podano nazwy usÅugi', 'not a valid ca certificate' => 'Brak poprawnego certyfikatu CA.', 'not enough disk space' => 'Brak miejsca na dysku', -'not present' => '<b>Nie</b> wystÃpuje', +'not present' => '<b>Nie</b> wystÄpuje', 'not running' => 'nie uruchomiony', 'not set' => 'nie ustawiono', 'notes' => 'Uwagi', @@ -1278,8 +1278,8 @@ 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.', 'ntp server' => 'Serwer NTP', 'ntp sync' => 'Synchronizacja', -'ntp syncro disabled' => 'Synchronizacja NTP wyÅÃczona', -'ntp syncro enabled' => 'Synchronizacja NTP wÅÃczona', +'ntp syncro disabled' => 'Synchronizacja NTP wyÅÄczona', +'ntp syncro enabled' => 'Synchronizacja NTP wÅÄczona', 'ntpd restarted' => 'ntpd zrestartowany', 'number' => 'Numer:', 'o-no' => 'Nieaktywny', @@ -1291,11 +1291,11 @@ 'on' => 'wÅ', 'online help en' => 'Pomoc online (po angielsku)', 'only digits allowed in holdoff field' => 'Only digits allowed in holdoff field', -'only digits allowed in max retries field' => 'W polu maksymalna liczba powtÃ³rzeÅ mogÃ byÃ tylko cyfry.', -'only digits allowed in the idle timeout' => 'W polu czas bezczynnoÅci mogÃ byÃ tylko cyfry.', +'only digits allowed in max retries field' => 'W polu maksymalna liczba powtÃ³rzeÅ mogÄ byÄ tylko cyfry.', +'only digits allowed in the idle timeout' => 'W polu czas bezczynnoÅci mogÄ byÄ tylko cyfry.', 'only red' => 'Tylko RED', -'open to all' => 'Nadpisz dostÃp zewnÃtrzny do wszystkich', -'openssl produced an error' => 'OpenSSL spowodowaÅ bÅÃd', +'open to all' => 'Nadpisz dostÄp zewnÄtrzny do wszystkich', +'openssl produced an error' => 'OpenSSL spowodowaÅ bÅÄd', 'openvpn client' => 'Klient OpenVPN', 'openvpn log' => 'Log OpenVPN', 'openvpn server' => 'Serwer OpenVPN', @@ -1303,13 +1303,13 @@ 'optional data' => '3. Dodatkowe ustawienia:', 'options' => 'Opcje', 'options fw' => 'Opcje zapory', -'optionsfw portlist hint' => 'Lista portÃ³w powinna byÃ oddzielana przecinkami (np. 137,138). MoÅŒna zdefiniowaÃ maksymalnie 15 portÃ³w dla protokoÅu.', +'optionsfw portlist hint' => 'Lista portÃ³w powinna byÄ oddzielana przecinkami (np. 137,138). MoÅŒna zdefiniowaÄ maksymalnie 15 portÃ³w dla protokoÅu.', 'optionsfw warning' => 'Zmiana tych opcji oznacza ponowne uruchomienie zapory', 'or' => 'lub', 'orange' => 'ORANGE', -'organization cant be empty' => 'Pole organizacji nie moÅŒe byÃ puste', +'organization cant be empty' => 'Pole organizacji nie moÅŒe byÄ puste', 'organization name' => 'Nazwa organizacji', -'organization too long' => 'Nazwa organizacji jest zbyt dÅuga; nie powinna byÃ dÅuÅŒsza niÅŒ 60 znakÃ³w.', +'organization too long' => 'Nazwa organizacji jest zbyt dÅuga; nie powinna byÄ dÅuÅŒsza niÅŒ 60 znakÃ³w.', 'original' => 'Original', 'os level' => 'OS Level', 'other countries' => 'PozostaÅe kraje', @@ -1319,41 +1319,41 @@ 'out' => 'Wyj', 'outgoing' => 'wyjÅciowy', 'outgoing firewall' => 'Zapora wyjÅciowa', -'outgoing firewall add ip group' => 'Dodaj grupÃ adresÃ³w IP', -'outgoing firewall add mac group' => 'Dodaj grupÃ adresÃ³w MAC', -'outgoing firewall edit ip group' => 'Edytuj grupÃ adresÃ³w IP', -'outgoing firewall edit mac group' => 'Edytuj grupÃ adresÃ³w MAC', +'outgoing firewall add ip group' => 'Dodaj grupÄ adresÃ³w IP', +'outgoing firewall add mac group' => 'Dodaj grupÄ adresÃ³w MAC', +'outgoing firewall edit ip group' => 'Edytuj grupÄ adresÃ³w IP', +'outgoing firewall edit mac group' => 'Edytuj grupÄ adresÃ³w MAC', 'outgoing firewall group error' => 'Grupa o takiej nazwie juÅŒ istnieje.', 'outgoing firewall groups' => 'Grupy zapory', 'outgoing firewall ip groups' => 'Grupy adresÃ³w IP zapory wyjÅciowej', 'outgoing firewall mac groups' => 'Grupy adresÃ³w MAC zapory wyjÅciowej', -'outgoing firewall mode0' => 'W tym trybie wszyscy klienci majÃ dostÃp do internetu bez ÅŒadnych restrykcji.', -'outgoing firewall mode1' => 'W tym trybie tylko poÅÃczenia okreÅlone w reguÅach sÃ dozwolone.', -'outgoing firewall mode2' => 'W tym trybie wszystkie poÅÃczenia sÃ dozwolone z wyjÃtkiem tych okreÅlonych w reguÅach.', -'outgoing firewall outgoing firewall reserved groupname' => 'ProszÃ uÅŒyÃ innej nazwy grupy-ta jest zarezerwowana.', -'outgoing firewall p2p allow' => 'protokoÅy p2p sÃ dozwolone', -'outgoing firewall p2p deny' => 'protokoÅy p2p sÃ zabronione', +'outgoing firewall mode0' => 'W tym trybie wszyscy klienci majÄ dostÄp do internetu bez ÅŒadnych restrykcji.', +'outgoing firewall mode1' => 'W tym trybie tylko poÅÄczenia okreÅlone w reguÅach sÄ dozwolone.', +'outgoing firewall mode2' => 'W tym trybie wszystkie poÅÄczenia sÄ dozwolone z wyjÄtkiem tych okreÅlonych w reguÅach.', +'outgoing firewall outgoing firewall reserved groupname' => 'ProszÄ uÅŒyÄ innej nazwy grupy-ta jest zarezerwowana.', +'outgoing firewall p2p allow' => 'protokoÅy p2p sÄ dozwolone', +'outgoing firewall p2p deny' => 'protokoÅy p2p sÄ zabronione', 'outgoing firewall p2p description 1' => 'Przycisk', -'outgoing firewall p2p description 2' => 'oznacza, ÅŒe protokoÅy p2p sÃ dozwolone lub', -'outgoing firewall p2p description 3' => ' ÅŒe protokoÅy p2p sÃ zabronione.', +'outgoing firewall p2p description 2' => 'oznacza, ÅŒe protokoÅy p2p sÄ dozwolone lub', +'outgoing firewall p2p description 3' => ' ÅŒe protokoÅy p2p sÄ zabronione.', 'outgoing firewall reset' => 'Resetuj wszystko', -'outgoing firewall view group' => 'Zobacz grupÃ', +'outgoing firewall view group' => 'Zobacz grupÄ', 'outgoing firewall warning' => 'Nie wybranie ip lub mac powoduje ich ignorowanie', -'outgoing traffic in bytes per second' => 'Ruch wychodzÃcy', +'outgoing traffic in bytes per second' => 'Ruch wychodzÄcy', 'override mtu' => 'Nadpisz domyÅlne MTU', 'ovpn' => 'OpenVPN', -'ovpn con stat' => 'Statystyki poÅÃczeÅ OpenVPN', +'ovpn con stat' => 'Statystyki poÅÄczeÅ OpenVPN', 'ovpn config' => 'OVPN-Konfig', -'ovpn device' => 'UrzÃdzenie OpenVPN:', +'ovpn device' => 'UrzÄdzenie OpenVPN:', 'ovpn dl' => 'Pobierz konfig OVPN', 'ovpn log' => 'Log OVPN', 'ovpn on blue' => 'OpenVPN na int. BLUE', 'ovpn on orange' => 'OpenVPN na int. ORANGE', 'ovpn on red' => 'OpenVPN na int. RED', 'ovpn server status' => 'Stan serwera OpenVPN:', -'ovpn subnet' => 'PodsieÃ OpenVPN (np. 10.0.10.0/255.255.255.0)', -'ovpn subnet is invalid' => 'PodsieÃ OpenVPN jest niepoprawna.', -'ovpn subnet overlap' => 'PodsieÃ OpenVPN zachodzi na : ', +'ovpn subnet' => 'PodsieÄ OpenVPN (np. 10.0.10.0/255.255.255.0)', +'ovpn subnet is invalid' => 'PodsieÄ OpenVPN jest niepoprawna.', +'ovpn subnet overlap' => 'PodsieÄ OpenVPN zachodzi na : ', 'ovpn_fastio' => 'Fast-IO', 'ovpn_fragment' => 'Rozmiar fragmentu', 'ovpn_mssfix' => 'MSSFIX Size', @@ -1370,50 +1370,50 @@ 'ovpn_processprioVH' => 'Bardzo wysoki', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'package failed to install' => 'BÅÃd instalacji pakietu.', -'pagerefresh' => 'Strona jest odÅwieÅŒana, proszÃ czekaÃ.', -'pakfire accept all' => 'Czy chcesz zainstalowaÃ wszystkie pakiety?', +'package failed to install' => 'BÅÄd instalacji pakietu.', +'pagerefresh' => 'Strona jest odÅwieÅŒana, proszÄ czekaÄ.', +'pakfire accept all' => 'Czy chcesz zainstalowaÄ wszystkie pakiety?', 'pakfire ago' => 'temu.', -'pakfire available addons' => 'DostÃpne dodatki:', +'pakfire available addons' => 'DostÄpne dodatki:', 'pakfire configuration' => 'Konfiguracja Pakfire', -'pakfire core update auto' => 'Instaluj aktualizacje jÃdra automatycznie:', -'pakfire core update level' => 'Aktualizacja jÃdra', -'pakfire health check' => 'SprawdÅº czy mirror jest dostÃpny (ping):', -'pakfire install description' => 'ProszÃ wybraÃ jednÃ lub kilka pozycji z poniÅŒszej listy, <br /> a nastÃpnie kliknÃÃ plus aby zainstalowaÃ.', -'pakfire install package' => 'Zamierzasz zainstalowaÃ nastÃpujÃce pakiety: ', +'pakfire core update auto' => 'Instaluj aktualizacje jÄdra automatycznie:', +'pakfire core update level' => 'Aktualizacja jÄdra', +'pakfire health check' => 'SprawdÅº czy mirror jest dostÄpny (ping):', +'pakfire install description' => 'ProszÄ wybraÄ jednÄ lub kilka pozycji z poniÅŒszej listy, <br /> a nastÄpnie kliknÄÄ plus aby zainstalowaÄ.', +'pakfire install package' => 'Zamierzasz zainstalowaÄ nastÄpujÄce pakiety: ', 'pakfire installed addons' => 'Zainstalowane dodatki:', -'pakfire last core list update' => 'Sprawdzenie aktualizacja jÃdra:', +'pakfire last core list update' => 'Sprawdzenie aktualizacja jÄdra:', 'pakfire last package update' => 'Ostatnia aktualizacja listy pakietÃ³w:', 'pakfire last serverlist update' => 'Ostatnia aktualizacja listy serwerÃ³w:', 'pakfire last update' => 'Ostatnia aktualizacja:', -'pakfire possible dependency' => ' Pewne pakiety mogÃ wymagaÃ zaleÅŒnoÅci. Oto lista pakietÃ³w ktÃ³re muszÃ zostaÃ zainstalowane.', +'pakfire possible dependency' => ' Pewne pakiety mogÄ wymagaÄ zaleÅŒnoÅci. Oto lista pakietÃ³w ktÃ³re muszÄ zostaÄ zainstalowane.', 'pakfire register' => 'Register at pakfire-server:', 'pakfire system state' => 'Status systemu', -'pakfire uninstall description' => 'ProszÃ wybraÃ jednÃ lub kilka pozycji z poniÅŒszej listy, <br /> a nastÃpnie kliknÃÃ minus aby odinstalowaÃ.', -'pakfire uninstall package' => 'Zamierzasz odinstalowaÃ nastÃpujÃce pakiety: ', +'pakfire uninstall description' => 'ProszÄ wybraÄ jednÄ lub kilka pozycji z poniÅŒszej listy, <br /> a nastÄpnie kliknÄÄ minus aby odinstalowaÄ.', +'pakfire uninstall package' => 'Zamierzasz odinstalowaÄ nastÄpujÄce pakiety: ', 'pakfire update daily' => 'Szukaj aktualizacje codziennie:', -'pakfire updates' => 'DostÃpne aktualizacje:', -'pakfire working' => 'Pakfire pracuje ... ProszÃ poczekaÃ na zakoÅczenie wszystkich operacji.', +'pakfire updates' => 'DostÄpne aktualizacje:', +'pakfire working' => 'Pakfire pracuje ... ProszÄ poczekaÄ na zakoÅczenie wszystkich operacji.', 'pap or chap' => 'PAP lub CHAP', -'parentclass' => 'Klasa nadrzÃdna', -'parentclass add' => 'Dodaj klasÃ nadrzÃdnÃ', +'parentclass' => 'Klasa nadrzÄdna', +'parentclass add' => 'Dodaj klasÄ nadrzÄdnÄ', 'password' => 'HasÅo:', 'password contains illegal characters' => 'HasÅo zawiera niepoprawne znaki.', -'password crypting key' => 'HasÅo chroniÃce klucz', +'password crypting key' => 'HasÅo chroniÄce klucz', 'password not set' => 'Nie ustawiono hasÅa.', 'password too short' => 'HasÅo jest za krÃ³tkie.', -'passwords do not match' => 'HasÅa nie pasujÃ do siebie.', -'passwords must be at least 6 characters in length' => 'HasÅa muszÃ mieÃ dÅugoÅÃ minumum 6 znakÃ³w', +'passwords do not match' => 'HasÅa nie pasujÄ do siebie.', +'passwords must be at least 6 characters in length' => 'HasÅa muszÄ mieÄ dÅugoÅÄ minumum 6 znakÃ³w', 'path to directory' => 'ÅcieÅŒka do zasobu', 'pc' => 'Stacja robocza', -'pc add' => 'Dodaj stacjÃ roboczÃ', +'pc add' => 'Dodaj stacjÄ roboczÄ', 'pdc options' => 'Opcje PDC', 'percentage' => 'Procentowo', 'persistent' => 'Persistent', 'pfs yes no' => 'Perfect Forward Secrecy (PFS)', 'phase1 group' => 'Grupa fazy 1', -'phonebook entry' => 'Wpis ksiÃzki tel:', -'ping disabled' => 'WyÅÃcz odpowiadanie na ping', +'phonebook entry' => 'Wpis ksiÄzki tel:', +'ping disabled' => 'WyÅÄcz odpowiadanie na ping', 'pkcs12 file password' => 'HasÅo pliku PKCS12', 'play' => 'Graj', 'polfile' => 'Polfile', @@ -1442,8 +1442,8 @@ 'priority' => 'Priorytet', 'processes' => 'Procesy', 'profile' => 'Profil', -'profile deleted' => 'UsuniÃto profil: ', -'profile has errors' => 'Profil posiada bÅÃdy', +'profile deleted' => 'UsuniÄto profil: ', +'profile has errors' => 'Profil posiada bÅÄdy', 'profile made current' => 'Ustawiono aktualny profil: ', 'profile name' => 'Nazwa profilu:', 'profile name not given' => 'Nie wprowadzono nazwy profilu.', @@ -1452,23 +1452,23 @@ 'proto' => 'Proto', 'protocol' => 'ProtokÃ³Å:', 'proxy' => 'Proxy', -'proxy access graphs' => 'Wykresy dostÃpu do Proxy', +'proxy access graphs' => 'Wykresy dostÄpu do Proxy', 'proxy admin password' => 'HasÅo administratora Cache', 'proxy cachemgr' => 'Aktywuj cachemanager', -'proxy errmsg filedescriptors' => 'Niepoprawna wartoÅÃ w polu filedescriptors', -'proxy filedescriptors' => 'IloÅÃ fildescriptors', -'proxy log viewer' => 'PrzeglÃdanie logÃ³w Proxy', +'proxy errmsg filedescriptors' => 'Niepoprawna wartoÅÄ w polu filedescriptors', +'proxy filedescriptors' => 'IloÅÄ fildescriptors', +'proxy log viewer' => 'PrzeglÄdanie logÃ³w Proxy', 'proxy logs' => 'Logi Proxy', -'proxy no proxy extend' => 'lub wprowadÅº listÃ celÃ³w, ktÃ³re bÃdÃ pomijane przez proxy', +'proxy no proxy extend' => 'lub wprowadÅº listÄ celÃ³w, ktÃ³re bÄdÄ pomijane przez proxy', 'proxy no proxy local' => 'Zabraniaj na lokalny proxy cache dla sieci BLUE/GREEN', 'proxy port' => 'Port Proxy', 'proxy reconfigure' => 'Zapisz i zÅaduj', 'psk' => 'PSK', 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', -'qos add subclass' => 'Dodaj podklasÃ', +'qos add subclass' => 'Dodaj podklasÄ', 'qos graphs' => 'Wykresy Qos', -'qos warning' => 'ReguÅa <strong>musi</strong> byÃ zapisana, w przeciwnym razie bÃdzie odrzucona!', +'qos warning' => 'ReguÅa <strong>musi</strong> byÄ zapisana, w przeciwnym razie bÄdzie odrzucona!', 'quick control' => 'Quick Control', 'quick playlist' => 'Szybka lista', 'ram' => 'RAM', @@ -1477,54 +1477,54 @@ 'real address' => 'Prawdziwy adres', 'reboot' => 'Reboot', 'reboot ask' => 'Restart?', -'reboot question' => 'Dodatkowe zapytanie dla restartu i wyÅÃczenia', +'reboot question' => 'Dodatkowe zapytanie dla restartu i wyÅÄczenia', 'reboot schedule' => 'Planowanie ponownego uruchamiania IPFire', -'reboot sure' => 'Czy na pewno uruchomiÃ ponownie system?', +'reboot sure' => 'Czy na pewno uruchomiÄ ponownie system?', 'rebooting' => 'Ponowne uruchamianie', 'rebooting ipfire' => 'Ponowne uruchamianie IPFire', -'reconnect' => 'PoÅÃcz ponownie', -'reconnection' => 'Ponowne ÅÃczenie', +'reconnect' => 'PoÅÄcz ponownie', +'reconnection' => 'Ponowne ÅÄczenie', 'red' => 'Internet', 'references' => 'Referencje', 'refresh' => 'OdÅwieÅŒ', -'refresh index page while connected' => 'OdÅwieÅŒ stronÃ index.cgi po poÅÃczeniu', -'refresh update list' => 'OdÅwieÅŒ listÃ aktualizacji', +'refresh index page while connected' => 'OdÅwieÅŒ stronÄ index.cgi po poÅÄczeniu', +'refresh update list' => 'OdÅwieÅŒ listÄ aktualizacji', 'registered user rules' => 'ReguÅy Sourcefire VRT dla zarejestrowanych uÅŒytkownikÃ³w', 'released' => 'Opublikowany', 'reload' => 'wczytaj', 'remark' => 'Komentarz', 'remark title' => 'Komentarz:', -'remote access' => 'Zdalny dostÃp', +'remote access' => 'Zdalny dostÄp', 'remote announce' => 'Remote Announce', 'remote browse sync' => 'Remote Browse Sync', 'remote host/ip' => 'Zdalny host/IP', 'remote logging' => 'Zdalne logowanie', -'remote subnet' => 'Zdalna podsieÃ:', -'remote subnet is invalid' => 'Zdalne podsieÃ jest nieprawidÅowa.', -'removable device advice' => 'PodÅÃcz urzÃdzenie, odÅwieÅŒ, a nastÃpnie wciÅnij montuj. Odmontuj zanim usuniesz urzÃdzenie.', +'remote subnet' => 'Zdalna podsieÄ:', +'remote subnet is invalid' => 'Zdalne podsieÄ jest nieprawidÅowa.', +'removable device advice' => 'PodÅÄcz urzÄdzenie, odÅwieÅŒ, a nastÄpnie wciÅnij montuj. Odmontuj zanim usuniesz urzÄdzenie.', 'remove' => 'UsuÅ', 'remove ca certificate' => 'UsuÅ certyfikat CA', 'remove x509' => 'UsuÅ x509', 'repeat' => 'PowtÃ³rz', 'reportfile' => 'Plik raportu', 'reportlevel' => 'Poziom szczegÃ³ÅÃ³w', -'request' => 'Å»Ãdanie', -'requested data' => '1. Ustawienia poÅÃczenia:', +'request' => 'Å»Ädanie', +'requested data' => '1. Ustawienia poÅÄczenia:', 'reserved dst port' => 'Port docelowy jest zarezerwowany przez IPFire. UÅŒywaj tylko:', 'reserved src port' => 'Port ÅºrÃ³dÅowy jest zarezerwowany przez IPFire. UÅŒywaj tylko:', 'reset' => 'Reset', 'reset shares' => 'Resetuj zasÃ³b', 'resetglobals' => 'Resetuj globalne ustawienia ', -'resetpolicy' => 'Resetuj politykÃ do domyÅlnej', +'resetpolicy' => 'Resetuj politykÄ do domyÅlnej', 'resetshares' => 'ResetowaÅŒ zasoby?', -'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Reset ustawieÅ VPN spowoduje usuniÃcie certyfikatu root CA, certyfikatu hosta oraz wszystkich poÅÃczeÅ opartych na certyfikatach', +'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Reset ustawieÅ VPN spowoduje usuniÄcie certyfikatu root CA, certyfikatu hosta oraz wszystkich poÅÄczeÅ opartych na certyfikatach', 'restart' => 'Restart', 'restart ovpn server' => 'Restart serwera OpenVPN', -'restore' => 'PrzywrÃ³Ã', -'restore defaults' => 'PrzywrÃ³Ã domyÅlne', -'restore hardware settings' => 'PrzywrÃ³Ã ustawienia sprzÃtu', +'restore' => 'PrzywrÃ³Ä', +'restore defaults' => 'PrzywrÃ³Ä domyÅlne', +'restore hardware settings' => 'PrzywrÃ³Ä ustawienia sprzÄtu', 'restore settings' => 'Reset ustawieÅ', -'reverse sort' => 'Sortuj w odwrotnym porzÃdku chronologicznym', +'reverse sort' => 'Sortuj w odwrotnym porzÄdku chronologicznym', 'root' => 'Root', 'root certificate' => 'Certyfikat Root', 'root path' => 'ÅcieÅŒka Root', @@ -1534,15 +1534,15 @@ 'routing table entries' => 'Wpisy tablicy routingu:', 'rsvd dst port overlap' => 'Zakres portÃ³w docelowych zachodzi na zarezerwowany dla IPFire port:', 'rsvd src port overlap' => 'Zakres portÃ³w ÅºrÃ³dÅowych zachodzi na zarezerwowany dla IPFire port:', -'rules already up to date' => 'ReguÅy sÃ aktualne', +'rules already up to date' => 'ReguÅy sÄ aktualne', 'running' => 'URUCHOMIONE', -'safe removal of umounted device' => 'MoÅŒesz bezpiecznie usunÃÃ odmontowane urzÃdzenie', +'safe removal of umounted device' => 'MoÅŒesz bezpiecznie usunÄÄ odmontowane urzÄdzenie', 'samba' => 'Samba', 'samba status' => 'Status Samby', 'saturday' => 'Sobota', 'save' => 'Zapisz', 'save config' => 'zapisz ustawienia', -'save error' => 'Nie moÅŒna zapisaÃ konfiguracji do pliku archiwum', +'save error' => 'Nie moÅŒna zapisaÄ konfiguracji do pliku archiwum', 'save settings' => 'Zapisz ustawienia', 'save-adv-options' => 'Zapisz zaawansowane ustawienia', 'script name' => 'Nazwa skryptu:', @@ -1555,30 +1555,30 @@ 'security' => 'BezpieczeÅstwo', 'security options' => 'Opcje zabezpieczeÅ', 'select' => 'Wybierz', -'select dest net' => 'Wybierz sieÃ docelowÃ.', +'select dest net' => 'Wybierz sieÄ docelowÄ.', 'select media' => 'Wybierz noÅnik <br />(wspierany jest tylko FAT dla noÅnikÃ³w wymiennych)', -'select source net' => 'Wybierz sieÃ ÅºrÃ³dÅowÃ. JeÅŒeli nie posiadasz skonfigurowanych sieci ORAGNE lub BLUE DMZ Pinholes nie sÃ wymagane.', +'select source net' => 'Wybierz sieÄ ÅºrÃ³dÅowÄ. JeÅŒeli nie posiadasz skonfigurowanych sieci ORAGNE lub BLUE DMZ Pinholes nie sÄ wymagane.', 'selecttraffic' => 'Select utilization-overview:', 'send cr' => 'ISP requires Carriage Return:', -'send email notification' => 'WÅÃcz informowania przez e-mail', +'send email notification' => 'WÅÄcz informowania przez e-mail', 'send test mail' => 'WyÅlij testowego maila', 'september' => 'WrzesieÅ', 'serial' => 'Serial', -'server reserved' => 'Nazwa serwera poÅÃczenia jest zastrzeÅŒona i niedozwolona', +'server reserved' => 'Nazwa serwera poÅÄczenia jest zastrzeÅŒona i niedozwolona', 'server string' => 'Server String', 'service' => 'UsÅuga', -'service added' => 'Dodano niestandardowÃ usÅugÃ sieciowÃ', +'service added' => 'Dodano niestandardowÄ usÅugÄ sieciowÄ', 'service name' => 'Nazwa usÅugi:', -'service removed' => 'UsuniÃto niestandardowÃ usÅugÃ sieciowÃ', -'service updated' => 'Zmieniono niestandardowÃ usÅugÃ sieciowÃ', +'service removed' => 'UsuniÄto niestandardowÄ usÅugÄ sieciowÄ', +'service updated' => 'Zmieniono niestandardowÄ usÅugÄ sieciowÄ', 'servicename' => 'Nazwa usÅugi', 'services' => 'UsÅugi', 'services settings' => 'Zapora - ustawienia usÅug', 'set' => 'ustaw', 'set time now' => 'Ustaw czas teraz', -'set time now help' => 'Aby wykonaÃ synchronizacjÃ w dowolnym czasie, naciÅnij przycisk<i>Ustaw czas teraz</i>. NaleÅŒy zwrÃ³ciÃ uwagÃ, ÅŒe proces synchronizacji moÅŒe zajÃÃ kilka minut.', +'set time now help' => 'Aby wykonaÄ synchronizacjÄ w dowolnym czasie, naciÅnij przycisk<i>Ustaw czas teraz</i>. NaleÅŒy zwrÃ³ciÄ uwagÄ, ÅŒe proces synchronizacji moÅŒe zajÄÄ kilka minut.', 'settings' => 'Ustawienia', -'shaping add options' => 'Dodaj usÅugÃ', +'shaping add options' => 'Dodaj usÅugÄ', 'shaping list options' => 'KsztaÅtowanie ruchu - usÅugi', 'shared' => 'wspÃ³Ådzielona', 'sharename' => 'Nazwa zasobu', @@ -1587,27 +1587,27 @@ 'show areas' => 'show areas', 'show ca certificate' => 'PokaÅŒ certyfikat CA', 'show certificate' => 'PokaÅŒ certyfikat', -'show crl' => 'PokaÅŒ listÃ odwoÅaÅ certyfikatÃ³w', +'show crl' => 'PokaÅŒ listÄ odwoÅaÅ certyfikatÃ³w', 'show host certificate' => 'PokaÅŒ certyfikat hosta', 'show last x lines' => 'PokaÅŒ ostatnie x linii', 'show lines' => 'PokaÅŒ linie', 'show root certificate' => 'PokaÅŒ certyfikat root', 'show share options' => 'PokaÅŒ opcje zasobu', 'shuffle' => 'Losowo', -'shutdown' => 'WyÅÃcz', -'shutdown ask' => 'WyÅÃczyÃ?', -'shutdown control' => 'Kontrola wyÅÃczenia', -'shutdown sure' => 'Czy jesteÅ pewien, ÅŒe chcesz wyÅÃczyÃ?', -'shutdown2' => 'WyÅÃcz:', -'shutting down' => 'WyÅÃczanie', -'shutting down ipfire' => 'WyÅÃczanie IPFire', +'shutdown' => 'WyÅÄcz', +'shutdown ask' => 'WyÅÄczyÄ?', +'shutdown control' => 'Kontrola wyÅÄczenia', +'shutdown sure' => 'Czy jesteÅ pewien, ÅŒe chcesz wyÅÄczyÄ?', +'shutdown2' => 'WyÅÄcz:', +'shutting down' => 'WyÅÄczanie', +'shutting down ipfire' => 'WyÅÄczanie IPFire', 'since' => 'od', 'sitekey' => 'Sitekey', 'sitekeyfile' => 'Sitekeyfile', 'size' => 'Rozmiar', 'smart information' => 'Informacje S.M.A.R.T.', -'smartwarn1' => 'UrzÃdzenie:', -'smartwarn2' => 'raportuje bÅÃd S.M.A.R.T.', +'smartwarn1' => 'UrzÄdzenie:', +'smartwarn2' => 'raportuje bÅÄd S.M.A.R.T.', 'smbreload' => 'Reload samba', 'smbrestart' => 'Restart samby', 'smbstart' => 'Start samba', @@ -1615,50 +1615,50 @@ 'smtphost' => 'Host SMTP', 'smtpport' => 'Port SMTP', 'snort hits' => 'CaÅkowita liczba aktuwnych reguÅ dla', -'snort working' => 'Snort pracuje.... ProszÃ poczekaÃ na zakoÅczenie wszystkich operacji.', +'snort working' => 'Snort pracuje.... ProszÄ poczekaÄ na zakoÅczenie wszystkich operacji.', 'socket options' => 'Socket options', -'sort ascending' => 'Sortuj rosnÃco', -'sort descending' => 'Sortuj malejÃco', -'sound' => 'DÅºwiÃk', +'sort ascending' => 'Sortuj rosnÄco', +'sort descending' => 'Sortuj malejÄco', +'sound' => 'DÅºwiÄk', 'source' => 'Å¹rÃ³dÅo', 'source ip' => 'Å¹rÃ³dÅowe IP', 'source ip and port' => 'Å¹rÃ³dÅowe IP: Port', 'source ip bad' => 'Niepoprawny adres IP lub adres sieci.', 'source ip in use' => 'Å¹rÃ³dÅowe IP w uÅŒyciu:', -'source ip or net' => 'Å¹rÃ³dÅowe IP lub sieÃ', -'source net' => 'SieÃ ÅºrÃ³dÅowa', -'source network' => 'Å¹rÃ³dÅowe IP lub sieÃ (puste oznacza wszystkie):', +'source ip or net' => 'Å¹rÃ³dÅowe IP lub sieÄ', +'source net' => 'SieÄ ÅºrÃ³dÅowa', +'source network' => 'Å¹rÃ³dÅowe IP lub sieÄ (puste oznacza wszystkie):', 'source port' => 'Port ÅºrÃ³dÅowy', 'source port in use' => 'Port ÅºrÃ³dÅowy w uÅŒyciu:', -'source port numbers' => 'Port ÅºrÃ³dÅowy musi byÃ prawidÅowym numerem portu lub zakresem portÃ³w.', -'source port overlaps' => 'Port ÅºrÃ³dÅowy zachodzi na istniejÃcy zakres portÃ³w.', +'source port numbers' => 'Port ÅºrÃ³dÅowy musi byÄ prawidÅowym numerem portu lub zakresem portÃ³w.', +'source port overlaps' => 'Port ÅºrÃ³dÅowy zachodzi na istniejÄcy zakres portÃ³w.', 'speaker off' => 'GÅoÅnik wyÅ:', 'speaker on' => 'GÅoÅnik wÅ:', 'squid extension methods' => 'Twoja lista <tt>extension_methods</tt>', -'squid extension methods invalid' => 'Twoja lista \'extension_methods\' moÅŒe zawieraÃ wyrazy (litery i cyfry) pisane duÅŒymi literami i oddzielone spacjami. ', +'squid extension methods invalid' => 'Twoja lista \'extension_methods\' moÅŒe zawieraÄ wyrazy (litery i cyfry) pisane duÅŒymi literami i oddzielone spacjami. ', 'squid fix cache' => 'Napraw cache', 'src port' => 'Port Åºr.', -'srcprt range overlaps' => 'Zakres portÃ³w ÅºrÃ³dÅowych zachodzi na istniejÃcÃ numer portu.', -'srcprt within existing' => 'Port ÅºrÃ³dÅowy zawiera siÃ w aktualnie zdefiniowanym zakresie portÃ³w.', +'srcprt range overlaps' => 'Zakres portÃ³w ÅºrÃ³dÅowych zachodzi na istniejÄcÄ numer portu.', +'srcprt within existing' => 'Port ÅºrÃ³dÅowy zawiera siÄ w aktualnie zdefiniowanym zakresie portÃ³w.', 'ssdmz pinholes' => 'DMZ Pinholes', -'ssh access' => 'DostÃp SSH', +'ssh access' => 'DostÄp SSH', 'ssh access tip' => 'SSH nie wykorzystuje domyÅlnego dla IPFire portu 222!', 'ssh fingerprint' => 'Odcisk palca', 'ssh host keys' => 'Klucze hosta SSH', -'ssh is disabled' => 'SSH jest wyÅÃczony. Zatrzymywanie.', -'ssh is enabled' => 'SSH jest wÅÃczony. Ponowne uruchamianie.', +'ssh is disabled' => 'SSH jest wyÅÄczony. Zatrzymywanie.', +'ssh is enabled' => 'SSH jest wÅÄczony. Ponowne uruchamianie.', 'ssh key' => 'Klucz', -'ssh key size' => 'DÅugoÅÃ (bitÃ³w)', -'ssh keys' => 'Zezwalaj na autentykacjÃ kluczem publicznym', +'ssh key size' => 'DÅugoÅÄ (bitÃ³w)', +'ssh keys' => 'Zezwalaj na autentykacjÄ kluczem publicznym', 'ssh no auth' => 'Nie dopuszczono ÅŒadnej metody autentykacji. UniemoÅŒliwi to zalogowanie do systemu', -'ssh passwords' => 'Zezwalaj na autentykacjÃ hasÅem', +'ssh passwords' => 'Zezwalaj na autentykacjÄ hasÅem', 'ssh port' => 'Ustaw port SSH na 22 (domyÅlny dla IPFire to 222)', 'ssh portfw' => 'Zezwalaj na przekierowania TCP', 'ssh tempstart15' => 'Zatrzymaj serwer SSH za 15 minut', 'ssh tempstart30' => 'Zatrzymaj serwer SSH za 30 minut', -'ssh1 disabled' => 'SSHv1 jest wyÅÃczony, od klientÃ³w wymagana bÃdzie wersja 2.', -'ssh1 enabled' => 'SSHv1 jest wÅÃczona, starsze programy klienckie bÃdÃ wspierane.', -'ssh1 support' => 'Wspieraj wersjÃ pierwszÃ protokoÅu SSH (wymagane tylko dla starych klientÃ³w)', +'ssh1 disabled' => 'SSHv1 jest wyÅÄczony, od klientÃ³w wymagana bÄdzie wersja 2.', +'ssh1 enabled' => 'SSHv1 jest wÅÄczona, starsze programy klienckie bÄdÄ wspierane.', +'ssh1 support' => 'Wspieraj wersjÄ pierwszÄ protokoÅu SSH (wymagane tylko dla starych klientÃ³w)', 'ssnetwork status' => 'Stan sieci', 'sspasswords' => 'HasÅa', 'ssport forwarding' => 'Przekierowanie portÃ³w', @@ -1668,7 +1668,7 @@ 'sstraffic graphs' => 'Wykresy ruchu', 'standard login script' => 'Standardowy skrypt logowania', 'start' => 'Start', -'start address' => 'Adres poczÃtku:', +'start address' => 'Adres poczÄtku:', 'start ovpn server' => 'Uruchom serwer OpenVPN', 'state or province' => 'Stan lub prowincja', 'static ip' => 'Statyczne IP', @@ -1681,11 +1681,11 @@ 'stopped' => 'ZATRZYMANE', 'subject' => 'Temat', 'subject test' => 'E-mail testowy', -'subject warn' => 'OstrzeÅŒenie - osiÃgniÃto poziom ostrzeÅŒenia', -'subnet' => 'PodsieÃ', +'subject warn' => 'OstrzeÅŒenie - osiÄgniÄto poziom ostrzeÅŒenia', +'subnet' => 'PodsieÄ', 'subnet is invalid' => 'Maska sieci jest niepoprawna', -'subscripted user rules' => 'ReguÅy Sourcefire VRT z subskrypcjÃ', -'successfully refreshed updates list' => 'PomyÅlnie odÅwieÅŒono listÃ aktualizacji.', +'subscripted user rules' => 'ReguÅy Sourcefire VRT z subskrypcjÄ', +'successfully refreshed updates list' => 'PomyÅlnie odÅwieÅŒono listÄ aktualizacji.', 'summaries kept' => 'Przechowuj podsumowania przez', 'sunday' => 'Niedziela', 'swap' => 'Swap', @@ -1693,46 +1693,46 @@ 'system' => 'System', 'system graphs' => 'Wykresy Systemu', 'system information' => 'Informacje o systemie', -'system log viewer' => 'PrzeglÃd logÃ³w systemu', +'system log viewer' => 'PrzeglÄd logÃ³w systemu', 'system logs' => 'Logi systemu', 'system status information' => 'Informacje o stanie systemu', 'telephone not set' => 'Telephone not set.', 'template' => 'Schemat', -'template warning' => 'Masz 2 moÅŒliwoÅci skonfigurowania QoS. Pierwsza to naciÅniÃcie przycisku zapisz i skonfigurowanie klas i reguÅ samodzielnie. Druga to wciÅniÃcie przycisku schemat aby utworzyÃ klasy i reguÅy ze schematu.', +'template warning' => 'Masz 2 moÅŒliwoÅci skonfigurowania QoS. Pierwsza to naciÅniÄcie przycisku zapisz i skonfigurowanie klas i reguÅ samodzielnie. Druga to wciÅniÄcie przycisku schemat aby utworzyÄ klasy i reguÅy ze schematu.', 'test' => 'test', -'test email could not be sent' => 'Nie moÅŒna wysÅaÃ maila testowego', +'test email could not be sent' => 'Nie moÅŒna wysÅaÄ maila testowego', 'test email was sent' => 'Mail testowy zostaÅ wysÅany poprawnie', -'the following update was successfully installed' => 'NastÃpujÃca aktualizacja zostaÅa prawidÅowo zainstalowana', +'the following update was successfully installed' => 'NastÄpujÄca aktualizacja zostaÅa prawidÅowo zainstalowana', 'the statistics were last updated at' => 'Ostatnia aktualizacja statystyk: ', 'theme' => 'Schemat', -'there are updates' => 'DostÃpne sÃ nowe aktualizacje dla twojego systemu. ProszÃ przejÅÃ do sekcji aktualizacje aby uzyskaÃ wiÃcej informacji.', -'there are updates available' => 'DostÃpne sÃ nowe aktualizacje dla twojego systemu. Zalecane jest wykonanie aktualizacji tak szybko jak to moÅŒliwe', +'there are updates' => 'DostÄpne sÄ nowe aktualizacje dla twojego systemu. ProszÄ przejÅÄ do sekcji aktualizacje aby uzyskaÄ wiÄcej informacji.', +'there are updates available' => 'DostÄpne sÄ nowe aktualizacje dla twojego systemu. Zalecane jest wykonanie aktualizacji tak szybko jak to moÅŒliwe', 'there was no file upload' => 'Nie wgrano ÅŒadnego pliku.', -'this feature has been sponsored by' => 'Ta funkcjonalnoÅÃ jest sponsorowana przez', -'this field may be blank' => 'To pole moÅŒe byÃ puste.', +'this feature has been sponsored by' => 'Ta funkcjonalnoÅÄ jest sponsorowana przez', +'this field may be blank' => 'To pole moÅŒe byÄ puste.', 'this is not a valid archive' => 'Nie odnaleziono poprawnego archiwum.', 'this is not an authorised update' => 'To nie jest autoryzowana aktualizacja.', -'this months volume' => 'IloÅÃ w tym miesiÃcu', +'this months volume' => 'IloÅÄ w tym miesiÄcu', 'this update is already installed' => 'Ta aktualizacja jest juÅŒ zainstalowana.', -'this weeks volume' => 'IloÅÃ w tym tygodniu', +'this weeks volume' => 'IloÅÄ w tym tygodniu', 'thursday' => 'Czwartek', 'time' => 'Czas', -'time date manually reset' => 'RÃczny reset czasu/daty.', +'time date manually reset' => 'RÄczny reset czasu/daty.', 'time server' => 'Serwer czasu', -'timeout must be a number' => 'Czas oczekiwania musi byÃ liczbÃ.', +'timeout must be a number' => 'Czas oczekiwania musi byÄ liczbÄ.', 'title' => 'TytuÅ', 'to' => 'Do', 'to email adr' => 'Adres e-mail do', -'to install an update' => 'Aby zainstalowaÃ aktualizacjÃ wgraj plik tgz.gpg:', +'to install an update' => 'Aby zainstalowaÄ aktualizacjÄ wgraj plik tgz.gpg:', 'to warn email bad' => 'Niepoprawny adres e-mail do', 'toggle' => 'pause/resume', -'toggle enable disable' => 'WÅÃcz lub wyÅÃcz', +'toggle enable disable' => 'WÅÄcz lub wyÅÄcz', 'tone' => 'Tonowo', 'tone dial' => 'Dzwonienie tonowe:', 'too long 80 char max' => ' jest zbyt dÅugi - maksymalnie 80 znakÃ³w', -'total connection time' => 'CaÅkowity czas poÅÃczenia', +'total connection time' => 'CaÅkowity czas poÅÄczenia', 'total hits for log section' => 'Liczba zdarzeÅ dla sekcji logÃ³w', -'traffic back' => 'WrÃ³Ã', +'traffic back' => 'WrÃ³Ä', 'traffic calc time' => 'Czas obliczeÅ', 'traffic calc time bad' => 'Czas obliczeÅ jest nieprawidÅowy', 'traffic info messages' => 'Informacje', @@ -1744,7 +1744,7 @@ 'trafficblue' => 'WLAN', 'trafficdate' => 'Data', 'trafficfrom' => 'Od', -'trafficgreen' => 'SieÃ wewnÃtrzna', +'trafficgreen' => 'SieÄ wewnÄtrzna', 'trafficin' => 'WejÅcie', 'trafficorange' => 'DMZ', 'trafficout' => 'WyjÅcie', @@ -1758,16 +1758,16 @@ 'tripwire cronjob' => 'tripwire cronjob', 'tripwire functions' => 'funkcje tripwire', 'tripwire reports' => 'raporty tripwire', -'tripwireoperating' => 'Proces zostaÅ uruchomiony. Zadanie moÅŒe zajÃÃ kilka minut. ProszÃ poczekaÃ na automatyczne odÅwieÅŒenie okna po zakoÅczeniu operacji.', -'tripwirewarningdatabase' => 'UWAGA - Twoja baza danych zostanie zaktualizowana przez dane z raportu. ProszÃ upewniÃ siÃ, ÅŒe nie sÃ raportowane ÅŒadne nieautoryzowane zmiany. W tym celu niezbÃdny jest klucz lokalny.', -'tripwirewarningkeys' => 'UWAGA - ta operacja spowoduje usuniÃcie aktualnych kluczy, konfiguracji i bazy danych i wygenerowanie nowych.', -'tripwirewarningpolicy' => 'UWAGA - nastÃpi przebudowanie twojej reguÅy oraz ponownÃ inicjalizacjÃ bazy danych. W zwiÃzku z tym wymagane jest klucz strony i klucz lokalny.', +'tripwireoperating' => 'Proces zostaÅ uruchomiony. Zadanie moÅŒe zajÄÄ kilka minut. ProszÄ poczekaÄ na automatyczne odÅwieÅŒenie okna po zakoÅczeniu operacji.', +'tripwirewarningdatabase' => 'UWAGA - Twoja baza danych zostanie zaktualizowana przez dane z raportu. ProszÄ upewniÄ siÄ, ÅŒe nie sÄ raportowane ÅŒadne nieautoryzowane zmiany. W tym celu niezbÄdny jest klucz lokalny.', +'tripwirewarningkeys' => 'UWAGA - ta operacja spowoduje usuniÄcie aktualnych kluczy, konfiguracji i bazy danych i wygenerowanie nowych.', +'tripwirewarningpolicy' => 'UWAGA - nastÄpi przebudowanie twojej reguÅy oraz ponownÄ inicjalizacjÄ bazy danych. W zwiÄzku z tym wymagane jest klucz strony i klucz lokalny.', 'tuesday' => 'Wtorek', 'type' => 'Typ', 'umount' => 'Odmontuj', -'umount removable media before to unplug' => 'Odmontuj noÅnik wymienny przed odÅÃczeniem urzÃdzenia', -'unable to alter profiles while red is active' => 'Nie moÅŒna zastÃpiÃ profili kiedy interfejs RED jest aktywny.', -'unable to contact' => 'Nie moÅŒna poÅÃczyÃ', +'umount removable media before to unplug' => 'Odmontuj noÅnik wymienny przed odÅÄczeniem urzÄdzenia', +'unable to alter profiles while red is active' => 'Nie moÅŒna zastÄpiÄ profili kiedy interfejs RED jest aktywny.', +'unable to contact' => 'Nie moÅŒna poÅÄczyÄ', 'unencrypted' => 'Nieszyfrowane', 'uninstall' => 'Odinstaluj', 'unix charset' => 'Kodowanie UNIX', @@ -1780,13 +1780,13 @@ 'update accelerator' => 'Update Accelerator', 'update time' => 'Aktualizuj czas:', 'update transcript' => 'Update transcript', -'updatedatabase' => 'Aktualizuj bazÃ danych z ostatniego raportu', +'updatedatabase' => 'Aktualizuj bazÄ danych z ostatniego raportu', 'updates' => 'Aktualizacje', -'updates installed' => 'Zainstalowano aktualizacjÃ', +'updates installed' => 'Zainstalowano aktualizacjÄ', 'updates is old1' => 'TwÃ³j plik aktualizacji jest sprzed ', -'updates is old2' => 'dni. Zalecamy jego aktualizacjÃ w zakÅadce <b>System>Aktualizacje/b>.', -'updxlrtr 3 months' => 'trzech miesiÃcy', -'updxlrtr 6 months' => 'szeÅciu miesiÃcy', +'updates is old2' => 'dni. Zalecamy jego aktualizacjÄ w zakÅadce <b>System>Aktualizacje/b>.', +'updxlrtr 3 months' => 'trzech miesiÄcy', +'updxlrtr 6 months' => 'szeÅciu miesiÄcy', 'updxlrtr all files' => 'wszystkie pliki ...', 'updxlrtr cache dir' => 'Katalog Cache', 'updxlrtr cache maintenance' => 'Utrzymanie Cache', @@ -1802,39 +1802,39 @@ 'updxlrtr condition suspended' => 'Wstrzymany', 'updxlrtr condition unknown' => 'Nieznany', 'updxlrtr configuration' => 'Konfiguracja Update accelerator', -'updxlrtr current downloads' => 'Pliki pobrane do lokalnej pamiÃci cache', -'updxlrtr current files' => 'Pliki znajdujÃce siÃ w lokalnej pamiÃci cache', +'updxlrtr current downloads' => 'Pliki pobrane do lokalnej pamiÄci cache', +'updxlrtr current files' => 'Pliki znajdujÄce siÄ w lokalnej pamiÄci cache', 'updxlrtr daily' => 'dziennie', -'updxlrtr data from cache' => 'Danych z pamiÃci cache (w bajtach)', +'updxlrtr data from cache' => 'Danych z pamiÄci cache (w bajtach)', 'updxlrtr disk usage' => 'Wykorzystanie dysku', 'updxlrtr efficiency index' => 'Indeks efektywnoÅci cache', -'updxlrtr empty repository' => 'PamiÃÃ cache jest pusta', -'updxlrtr enable autocheck' => 'WÅÃcz automatyczÃ kontrolÃ ÅºrÃ³dÅa', -'updxlrtr enable log' => 'WÅÃcz logi', +'updxlrtr empty repository' => 'PamiÄÄ cache jest pusta', +'updxlrtr enable autocheck' => 'WÅÄcz automatyczÄ kontrolÄ ÅºrÃ³dÅa', +'updxlrtr enable log' => 'WÅÄcz logi', 'updxlrtr filename' => 'Nazwa', 'updxlrtr files' => 'Pliki', 'updxlrtr filesize' => 'Rozmiar', -'updxlrtr full autosync' => 'ZastÃp nieaktualne pliki podczas sprawdzania', -'updxlrtr invalid disk usage' => 'NieprawidÅowa wartoÅÃ w polu maks. wykorzystanie dysku', -'updxlrtr invalid download rate' => 'NieprawidÅowa wartoÅÃ w polu maks. pr. pobierania', +'updxlrtr full autosync' => 'ZastÄp nieaktualne pliki podczas sprawdzania', +'updxlrtr invalid disk usage' => 'NieprawidÅowa wartoÅÄ w polu maks. wykorzystanie dysku', +'updxlrtr invalid download rate' => 'NieprawidÅowa wartoÅÄ w polu maks. pr. pobierania', 'updxlrtr invalid num of children' => 'NieprawidÅowa liczba procesÃ³w akceleratora', -'updxlrtr last access' => 'Ost. ÅŒÃdanie', +'updxlrtr last access' => 'Ost. ÅŒÄdanie', 'updxlrtr last checkup' => 'Ost. sprawdzenie ÅºrÃ³dÅa', 'updxlrtr low download priority' => 'ObniÅŒ priorytet CPU dla pobierania', 'updxlrtr maintenance' => 'Konserwacja', 'updxlrtr marked as' => 'oznaczone jako', 'updxlrtr max disk usage' => 'Maks. wykorzystanie dysku', -'updxlrtr max download rate' => 'Maks. prÃdkoÅÃ pobierania (kBit/s)', -'updxlrtr month' => 'miesiÃca', -'updxlrtr monthly' => 'miesiÃcznie', -'updxlrtr not accessed' => 'bez ÅŒÃdania od', -'updxlrtr not enabled' => 'Update Accelerator nie jest wÅÃczony w zakÅadce web proxy', +'updxlrtr max download rate' => 'Maks. prÄdkoÅÄ pobierania (kBit/s)', +'updxlrtr month' => 'miesiÄca', +'updxlrtr monthly' => 'miesiÄcznie', +'updxlrtr not accessed' => 'bez ÅŒÄdania od', +'updxlrtr not enabled' => 'Update Accelerator nie jest wÅÄczony w zakÅadce web proxy', 'updxlrtr other' => 'Inne', -'updxlrtr passive mode' => 'WÅÃcz tryb pasywny', +'updxlrtr passive mode' => 'WÅÄcz tryb pasywny', 'updxlrtr pending downloads' => 'Aktualnie pobierane', 'updxlrtr performance options' => 'Opcje wydajnoÅci', -'updxlrtr progress' => 'PostÃp', -'updxlrtr purge' => 'OczyÅÃ', +'updxlrtr progress' => 'PostÄp', +'updxlrtr purge' => 'OczyÅÄ', 'updxlrtr remove file' => 'UsuÅ z cache', 'updxlrtr save and restart' => 'Zapis i restart', 'updxlrtr source' => 'Å¹rÃ³dÅo', @@ -1848,18 +1848,18 @@ 'updxlrtr total files' => 'Liczba plikÃ³w w cache', 'updxlrtr unknown' => 'Nieznany', 'updxlrtr update accelerator' => 'Update Accelerator', -'updxlrtr update information' => 'DostÃpna jest nowsza wersja do pobrania. WejdÅº na stronÃ <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> aby uzyskaÃ wiÃcej informacji.', +'updxlrtr update information' => 'DostÄpna jest nowsza wersja do pobrania. WejdÅº na stronÄ <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> aby uzyskaÄ wiÄcej informacji.', 'updxlrtr update notification' => 'Informacja o aktualizacji!', -'updxlrtr web proxy service required' => 'UsÅuga Web proxy musi byÃ wÅÃczona aby uÅŒywaÃ Update Accelerator', +'updxlrtr web proxy service required' => 'UsÅuga Web proxy musi byÄ wÅÄczona aby uÅŒywaÄ Update Accelerator', 'updxlrtr week' => 'tygodnia', 'updxlrtr weekly' => 'tygodniowo', 'updxlrtr year' => 'roku', 'upgrade' => 'upgrade', -'uplink speed' => 'SzybskoÅÃ wysyÅania (kbit/sec)', +'uplink speed' => 'SzybskoÅÄ wysyÅania (kbit/sec)', 'uplink std class' => 'standardowa klasa wysyÅania', 'upload' => 'WyÅlij', 'upload a certificate' => 'WyÅlij certyfikat:', -'upload a certificate request' => 'WyÅlij ÅŒÃdanie certyfikatu:', +'upload a certificate request' => 'WyÅlij ÅŒÄdanie certyfikatu:', 'upload ca certificate' => 'WyÅlij certyfikat CA', 'upload fcdsl.o' => 'TO BE REMOVED', 'upload file' => 'WyÅlij plik', @@ -1874,14 +1874,14 @@ 'upstream username' => 'Upstream username:', 'uptime and users' => 'Uptime and users:', 'url filter' => 'Filtr treÅci', -'urlfilter access' => 'DostÃp', +'urlfilter access' => 'DostÄp', 'urlfilter activity detection' => 'Wykrywanie aktywnoÅci', -'urlfilter add new time constraint rule' => 'Dodaj reguÅÃ ograniczeÅ w czasie', -'urlfilter add new user quota rule' => 'Dodaj reguÅÃ ograniczenia czasowego (quota)', +'urlfilter add new time constraint rule' => 'Dodaj reguÅÄ ograniczeÅ w czasie', +'urlfilter add new user quota rule' => 'Dodaj reguÅÄ ograniczenia czasowego (quota)', 'urlfilter add rule' => 'Dodaj', 'urlfilter advanced settings' => 'Ustawienia zaawansowane', 'urlfilter allow' => 'ZezwÃ³l', -'urlfilter allow access' => 'ZezwÃ³l na dostÃp', +'urlfilter allow access' => 'ZezwÃ³l na dostÄp', 'urlfilter allowed domains' => 'Dozwolone domeny (jedna w linii)', 'urlfilter allowed urls' => 'Dozwolone URL\'e (jeden w linii)', 'urlfilter assigned quota users' => 'Przypisani uÅŒytkownicy (jeden w linii)', @@ -1890,21 +1890,21 @@ 'urlfilter automatic update schedule' => 'Zaplanuj automatyczne aktualizacje', 'urlfilter back to main page' => 'PowrÃ³t do gÅÃ³wnej strony', 'urlfilter background image' => 'obraz tÅa filtru treÅci', -'urlfilter background text' => 'Aby uÅŒywaÃ wÅasnego obrazu tÅa na stronie blokady wyÅlij plik jpg przez poniÅŒszy formularz', +'urlfilter background text' => 'Aby uÅŒywaÄ wÅasnego obrazu tÅa na stronie blokady wyÅlij plik jpg przez poniÅŒszy formularz', 'urlfilter backup' => 'UtwÃ³rz plik kopii', -'urlfilter backup error' => 'Nie moÅŒna utworzyÃ pliku kopii', +'urlfilter backup error' => 'Nie moÅŒna utworzyÄ pliku kopii', 'urlfilter backup settings' => 'Kopia ustawieÅ filtra treÅci', 'urlfilter banned clients' => 'Zablokowane adresy IP', 'urlfilter blacklist age 1' => 'Ostatnia poprawna aktualizacja czarnej listy:', 'urlfilter blacklist age 2' => 'dni temu', 'urlfilter blacklist category name' => 'Nazwa kategorii czarnej listy', 'urlfilter blacklist editor' => 'Edytor czarnej listy', -'urlfilter blacklist editor info' => 'UtwÃ³rz i edytuj wÅasnÃ czarnÃ listÃ', +'urlfilter blacklist editor info' => 'UtwÃ³rz i edytuj wÅasnÄ czarnÄ listÄ', 'urlfilter blacklist name' => 'Nazwa czarnej listy', 'urlfilter blacklist update' => 'Aktualizacja czarnej listy', 'urlfilter block' => 'Blokuj', 'urlfilter block access' => 'Block access', -'urlfilter block all' => 'Blokuj wszystkie URL\'e z wyjÃtkiem zezwolonych', +'urlfilter block all' => 'Blokuj wszystkie URL\'e z wyjÄtkiem zezwolonych', 'urlfilter block archives' => 'Blokuj skompresowane archiwa', 'urlfilter block audio-video' => 'Blokuj pliki audio/wideo', 'urlfilter block categories' => 'Kategorie czarnej listy', @@ -1932,30 +1932,30 @@ 'urlfilter custom url required' => 'Wymagane wÅasne ÅºrÃ³dÅowe URL\'e', 'urlfilter custom whitelist' => 'WÅasna biaÅa lista', 'urlfilter daily' => 'codziennie', -'urlfilter disabled' => 'wyÅÃczony', +'urlfilter disabled' => 'wyÅÄczony', 'urlfilter domains' => 'Domeny (jedna w linii)', 'urlfilter dont restart urlfilter' => 'Nie uruchamiaj ponownie filtra URL', 'urlfilter dst' => 'Cel', -'urlfilter dst error' => 'Przynajmniej 1 kategoria musi byÃ wybrana', +'urlfilter dst error' => 'Przynajmniej 1 kategoria musi byÄ wybrana', 'urlfilter edit domains urls expressions' => 'Edycja domen, URL\'i oraz wyraÅŒeÅ', -'urlfilter edit time constraint rule' => 'Edytuj istniejÃcÃ reguÅÃ czasowÃ', -'urlfilter edit user quota rule' => 'Edytuj istniejÃcÃ reguÅÃ limitu czasowego', +'urlfilter edit time constraint rule' => 'Edytuj istniejÄcÄ reguÅÄ czasowÄ', +'urlfilter edit user quota rule' => 'Edytuj istniejÄcÄ reguÅÄ limitu czasowego', 'urlfilter empty ads' => 'Blokowanie reklam pustym oknem', 'urlfilter empty repository' => 'Lokalne repozytorium plikÃ³w jest puste', -'urlfilter enable automatic blacklist update' => 'WÅÃcz automatyczne aktualizacje', -'urlfilter enable custom blacklist' => 'WÅÃcz wÅasnÃ czarnÃ listÃ', -'urlfilter enable custom expression list' => 'WÅÃcz wÅasnÃ listÃ wyraÅŒeÅ', -'urlfilter enable custom whitelist' => 'WÅÃcz wÅasnÃ biaÅÃ listÃ', -'urlfilter enable expression lists' => 'WÅÃcz listÃ wyraÅŒeÅ', -'urlfilter enable full backup' => 'DoÅÃcz kompletnÃ czarnÃ listÃ', -'urlfilter enable jpeg' => 'WÅÃcz obraz tÅa', -'urlfilter enable log' => 'WÅÃcz logi', -'urlfilter enable rewrite rules' => 'WÅÃcz lokalne przekierowania plikÃ³w', -'urlfilter enabled' => 'WÅÃczone:', +'urlfilter enable automatic blacklist update' => 'WÅÄcz automatyczne aktualizacje', +'urlfilter enable custom blacklist' => 'WÅÄcz wÅasnÄ czarnÄ listÄ', +'urlfilter enable custom expression list' => 'WÅÄcz wÅasnÄ listÄ wyraÅŒeÅ', +'urlfilter enable custom whitelist' => 'WÅÄcz wÅasnÄ biaÅÄ listÄ', +'urlfilter enable expression lists' => 'WÅÄcz listÄ wyraÅŒeÅ', +'urlfilter enable full backup' => 'DoÅÄcz kompletnÄ czarnÄ listÄ', +'urlfilter enable jpeg' => 'WÅÄcz obraz tÅa', +'urlfilter enable log' => 'WÅÄcz logi', +'urlfilter enable rewrite rules' => 'WÅÄcz lokalne przekierowania plikÃ³w', +'urlfilter enabled' => 'WÅÄczone:', 'urlfilter example' => 'PrzykÅad: www.domain.com', 'urlfilter example ads' => 'PrzykÅad: www.domain.com/ads/', -'urlfilter export blacklist' => 'Esportuj czarnÃ listÃ', -'urlfilter export error' => 'Nie moÅŒna utworzyÃ pliku eksportu', +'urlfilter export blacklist' => 'Esportuj czarnÄ listÄ', +'urlfilter export error' => 'Nie moÅŒna utworzyÄ pliku eksportu', 'urlfilter expressions' => 'WyraÅŒenia (jedno w linii)', 'urlfilter file ext block' => 'Blokowanie rozszerzeÅ plikÃ³w', 'urlfilter filename' => 'Nazwa', @@ -1964,111 +1964,111 @@ 'urlfilter fri' => 'P', 'urlfilter friday' => 'Pt', 'urlfilter from' => 'Od', -'urlfilter hourly' => 'co godzinÃ', -'urlfilter import blacklist' => 'Importuj czarnÃ listÃ', -'urlfilter import text' => 'Aby zaimportowaÃ wczeÅniej zapisane czarne listy proszÃ wysÅaÃ plik .tar.gz przez poniÅŒszy formularz', -'urlfilter install blacklist' => 'Instaluj czarnÃ listÃ', -'urlfilter install information' => 'Nowa lista zostanie automatycznie skompilowana do odpowiedniego formatu. W przypadku duÅŒej czarnej listy moÅŒe to potrwaÃ kilka minut.', -'urlfilter invalid content' => 'Plik nie jest kompatybilny z czarnÃ listÃ squidGuard', +'urlfilter hourly' => 'co godzinÄ', +'urlfilter import blacklist' => 'Importuj czarnÄ listÄ', +'urlfilter import text' => 'Aby zaimportowaÄ wczeÅniej zapisane czarne listy proszÄ wysÅaÄ plik .tar.gz przez poniÅŒszy formularz', +'urlfilter install blacklist' => 'Instaluj czarnÄ listÄ', +'urlfilter install information' => 'Nowa lista zostanie automatycznie skompilowana do odpowiedniego formatu. W przypadku duÅŒej czarnej listy moÅŒe to potrwaÄ kilka minut.', +'urlfilter invalid content' => 'Plik nie jest kompatybilny z czarnÄ listÄ squidGuard', 'urlfilter invalid import file' => 'Plik nie jest prawidÅowym plikiem edytora czarnej listy', 'urlfilter invalid ip or mask error' => 'Niepoprawny adres IP lub maska sieci', 'urlfilter invalid restore file' => 'Plik nie jest prawidÅowym plikiem kopii filtra URL', 'urlfilter invalid user error' => 'Niepoprawna nazwa uÅŒytkownika', -'urlfilter load blacklist' => 'Wczytaj czarnÃ listÃ', +'urlfilter load blacklist' => 'Wczytaj czarnÄ listÄ', 'urlfilter local file redirection' => 'Lokalne przekierowania plikÃ³w', 'urlfilter log' => 'logi filtra treÅci', 'urlfilter log summary' => 'Liczba zdarzeÅ filtra URL w dniu', -'urlfilter log viewer' => 'PrzeglÃd logÃ³w filtra URL', +'urlfilter log viewer' => 'PrzeglÄd logÃ³w filtra URL', 'urlfilter logs' => 'Logi filtra URL', 'urlfilter maintenance' => 'Konserwacja filtra URL', -'urlfilter manage local file repository' => 'ZarzÃdzaj lokalnym repozytorium plikÃ³w', -'urlfilter manage repository' => 'ZarzÃdzanie repozytorium', +'urlfilter manage local file repository' => 'ZarzÄdzaj lokalnym repozytorium plikÃ³w', +'urlfilter manage repository' => 'ZarzÄdzanie repozytorium', 'urlfilter minutes' => 'minut', 'urlfilter mode allow' => 'zezwÃ³l', 'urlfilter mode block' => 'blokuj', 'urlfilter mon' => 'P', 'urlfilter monday' => 'Pon', -'urlfilter monthly' => 'co miesiÃc', +'urlfilter monthly' => 'co miesiÄc', 'urlfilter msg text 1' => 'Linia 1 komunikatu', 'urlfilter msg text 2' => 'Linia 2 komunikatu', 'urlfilter msg text 3' => 'Linia 3 komunikatu', -'urlfilter network access control' => 'Kontrola dostÃpu wedÅug sieci', -'urlfilter no categories' => 'Brak dostÃpnych kategorii', -'urlfilter not enabled' => 'Filtr URL nie jest wÅÃczony w zakÅadce Web proxy', -'urlfilter quota restart message' => 'UWAGA: Liczniki dla wszystkich uÅŒytkownikÃ³w zostanÃ zresetowane po ponownym uruchomieniu filtra URL', +'urlfilter network access control' => 'Kontrola dostÄpu wedÅug sieci', +'urlfilter no categories' => 'Brak dostÄpnych kategorii', +'urlfilter not enabled' => 'Filtr URL nie jest wÅÄczony w zakÅadce Web proxy', +'urlfilter quota restart message' => 'UWAGA: Liczniki dla wszystkich uÅŒytkownikÃ³w zostanÄ zresetowane po ponownym uruchomieniu filtra URL', 'urlfilter quota time error' => 'NieprawidÅowy limit czasowy', 'urlfilter quota user error' => 'Przynajmniej 1 nazwa uÅŒytkownika jest wymagana', 'urlfilter redirectpage' => 'Przekieruj do tego URL', 'urlfilter remove file' => 'UsuÅ z repozytorium', 'urlfilter renewal' => 'Odnowianie', 'urlfilter renewal period' => 'Czas odnawiania', -'urlfilter repository information' => 'Å»Ãdania pobierania dla tych plikÃ³w zostanÃ przekierowane z oryginalnego ÅºrÃ³dÅa do lokalnego repozytorium.', +'urlfilter repository information' => 'Å»Ädania pobierania dla tych plikÃ³w zostanÄ przekierowane z oryginalnego ÅºrÃ³dÅa do lokalnego repozytorium.', 'urlfilter reset' => 'Reset', 'urlfilter restart' => 'Ponownie uruchom filtr URL', -'urlfilter restart message' => 'Filtr URL musi byÃ ponownie uruchomiony aby wprowadzone zmiany zostaÅy zastosowane', +'urlfilter restart message' => 'Filtr URL musi byÄ ponownie uruchomiony aby wprowadzone zmiany zostaÅy zastosowane', 'urlfilter restart notification' => 'Aktywuj zmienione reguÅy', 'urlfilter restore' => 'Importuj plik kopii', 'urlfilter restore results' => 'Wynik przywracania', -'urlfilter restore settings' => 'PrzywrÃ³Ã ustawienia filtra URL', -'urlfilter restore success' => 'Konfiguracja filtra URL zostaÅa przywrÃ³cona. Filtr powinien zostaÃ ponownie uruchomiony aby zastosowaÃ zmiany.', -'urlfilter restore text' => 'Aby przywrÃ³ciÃ zapisanÃ konfiguracjÃ wgraj plik .tar.gz przez poniÅŒszy formularz', -'urlfilter safesearch' => 'WÅÃcz SafeSearch', +'urlfilter restore settings' => 'PrzywrÃ³Ä ustawienia filtra URL', +'urlfilter restore success' => 'Konfiguracja filtra URL zostaÅa przywrÃ³cona. Filtr powinien zostaÄ ponownie uruchomiony aby zastosowaÄ zmiany.', +'urlfilter restore text' => 'Aby przywrÃ³ciÄ zapisanÄ konfiguracjÄ wgraj plik .tar.gz przez poniÅŒszy formularz', +'urlfilter safesearch' => 'WÅÄcz SafeSearch', 'urlfilter sat' => 'S', 'urlfilter saturday' => 'Sob', 'urlfilter save and restart' => 'Zapis i Restart', 'urlfilter save schedule' => 'Zapisz ustawienia aktualizacji', -'urlfilter select blacklist' => 'Wybierz istniejÃcÃ czarnÃ listÃ', -'urlfilter select multi' => 'Przytrzymaj ctrl aby zaznaczyÃ wiele kategorii', +'urlfilter select blacklist' => 'Wybierz istniejÄcÄ czarnÄ listÄ', +'urlfilter select multi' => 'Przytrzymaj ctrl aby zaznaczyÄ wiele kategorii', 'urlfilter select source' => 'Wybierz ÅºrÃ³dÅo pobierania', 'urlfilter set time constraints' => 'Ustaw ograniczenia w czasie', 'urlfilter set user quota' => 'Ustaw limity czasowe', -'urlfilter show category' => 'PokaÅŒ kategoriÃ na stonie blokady', -'urlfilter show dnserror' => 'UÅŒywaj bÅÃdy DNS aby blokowaÃ URL', +'urlfilter show category' => 'PokaÅŒ kategoriÄ na stonie blokady', +'urlfilter show dnserror' => 'UÅŒywaj bÅÄdy DNS aby blokowaÄ URL', 'urlfilter show ip' => 'PokaÅŒ IP na stronie blokady', 'urlfilter show url' => 'PokaÅŒ URL na stronie blokady', -'urlfilter source' => 'Host(y) lub sieÃ(i) ÅºrÃ³dÅowe', +'urlfilter source' => 'Host(y) lub sieÄ(i) ÅºrÃ³dÅowe', 'urlfilter src' => 'Å¹rÃ³dÅo', -'urlfilter src error' => 'Å¹rÃ³dÅo nie moÅŒe byÃ puste', +'urlfilter src error' => 'Å¹rÃ³dÅo nie moÅŒe byÄ puste', 'urlfilter sun' => 'N', 'urlfilter sunday' => 'Nie', -'urlfilter tar error' => 'Nie moÅŒna wypakowaÃ plikÃ³w z archiwum tar', +'urlfilter tar error' => 'Nie moÅŒna wypakowaÄ plikÃ³w z archiwum tar', 'urlfilter thu' => 'C', 'urlfilter thursday' => 'Czw', 'urlfilter time' => 'Czas', 'urlfilter time quota' => 'Limit czasowy', 'urlfilter time space' => 'PrzedziaÅ czasowy', -'urlfilter timebased access control' => 'Kontrola dostÃpu wedÅug czasu', -'urlfilter timespace error' => 'BÅÃd w deklaracji przedziaÅu czasowego', +'urlfilter timebased access control' => 'Kontrola dostÄpu wedÅug czasu', +'urlfilter timespace error' => 'BÅÄd w deklaracji przedziaÅu czasowego', 'urlfilter to' => 'Do', 'urlfilter tue' => 'W', 'urlfilter tuesday' => 'Wto', 'urlfilter unfiltered clients' => 'Niefiltrowane adresy IP', -'urlfilter update information' => 'DostÃpna jest nowsza wersja do pobrania. WejdÅº na stronÃ <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> aby uzyskaÃ wiÃcej informacji.', +'urlfilter update information' => 'DostÄpna jest nowsza wersja do pobrania. WejdÅº na stronÄ <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> aby uzyskaÄ wiÄcej informacji.', 'urlfilter update notification' => 'Informacja o aktualizacji!', 'urlfilter update now' => 'Aktualizuj teraz', 'urlfilter update results' => 'Wyniki aktualizacja czarnej listy', 'urlfilter update rule' => 'Aktualizuj', 'urlfilter upload background' => 'Wgraj obraz', -'urlfilter upload blacklist' => 'Wgraj czarnÃ listÃ', +'urlfilter upload blacklist' => 'Wgraj czarnÄ listÄ', 'urlfilter upload file' => 'Wgraj plik', 'urlfilter upload file information 1' => 'Info', -'urlfilter upload file information 2' => 'Filtr URL powinien zostaÃ uruchomiony ponownie aby aktywowaÃ zmiany w repozytorium.', -'urlfilter upload file text' => 'Aby dodaÃ plik do repozytorium wgraj go przez poniÅŒszy formularz', -'urlfilter upload information' => 'Nowa czarna lista zostanie automatycznie skompilowana do odpowiedniego formatu. W przypadku duÅŒej listy moÅŒe to potrwaÃ kilka minut. ProszÃ poczekaÃ na zakoÅczenie tego procesu przed restartem filtra URL.', +'urlfilter upload file information 2' => 'Filtr URL powinien zostaÄ uruchomiony ponownie aby aktywowaÄ zmiany w repozytorium.', +'urlfilter upload file text' => 'Aby dodaÄ plik do repozytorium wgraj go przez poniÅŒszy formularz', +'urlfilter upload information' => 'Nowa czarna lista zostanie automatycznie skompilowana do odpowiedniego formatu. W przypadku duÅŒej listy moÅŒe to potrwaÄ kilka minut. ProszÄ poczekaÄ na zakoÅczenie tego procesu przed restartem filtra URL.', 'urlfilter upload success' => 'Czarna lista zostaÅa poprawnie wgrana.', -'urlfilter upload text' => 'Aby zainstalowaÃ zaktualizowanÃ listÃ wgraj plik .tar.gz poniÅŒej', +'urlfilter upload text' => 'Aby zainstalowaÄ zaktualizowanÄ listÄ wgraj plik .tar.gz poniÅŒej', 'urlfilter url filter' => 'Filtr URL', 'urlfilter urlfilter blacklist editor' => 'Edytor czarnej listy filtra URL', 'urlfilter urls' => 'URL\'e (jeden w linii)', 'urlfilter user time quota' => 'Limit czasowy (w minutach)', 'urlfilter username' => 'Nazwa uÅŒytkownika', 'urlfilter username log' => 'Loguj nazwy uÅŒytkownikÃ³w', -'urlfilter web proxy service required' => 'UsÅuga Web proxy musi byÃ wÅÃczona aby uÅŒywaÃ filtr URL', +'urlfilter web proxy service required' => 'UsÅuga Web proxy musi byÄ wÅÄczona aby uÅŒywaÄ filtr URL', 'urlfilter wed' => 'Å', 'urlfilter wednesday' => 'Åro', -'urlfilter weekday error' => 'Musi byÃ wybrany przynajmniej 1 dzieÅ', +'urlfilter weekday error' => 'Musi byÄ wybrany przynajmniej 1 dzieÅ', 'urlfilter weekly' => 'co tydzieÅ', -'urlfilter whitelist always allowed' => 'Zezwolenie na biaÅÃ listÃ dla zablokowanych klientÃ³w', +'urlfilter whitelist always allowed' => 'Zezwolenie na biaÅÄ listÄ dla zablokowanych klientÃ³w', 'urlfilter wrong filetype' => 'Plik nie posiada rozszerzenia .tar.gz', 'usb modem on acm0' => 'Modem USB na ACM0', 'usb modem on acm1' => 'Modem USB na ACM1', @@ -2077,7 +2077,7 @@ 'use' => 'UÅŒyj', 'use a pre-shared key' => 'UÅŒyj klucza wspÃ³Ådzielonego:', 'use dov' => 'Use data over voice (DOV):', -'use ibod' => 'UÅŒyj pasma na ÅŒÃdanie (iBOD):', +'use ibod' => 'UÅŒyj pasma na ÅŒÄdanie (iBOD):', 'use ipfire red ip' => 'UÅŒyj IP czerwonego interfejsu IPFire', 'use only proposed settings' => 'Use only proposed settings.', 'used' => 'UÅŒyte', @@ -2104,16 +2104,16 @@ 'volup5' => 'GÅoÅniej 5', 'vpi number' => 'Numer VPI:', 'vpn' => 'VPN', -'vpn aggrmode' => 'ZezwÃ³l na agresywny tryb IKE. UnikaÃ jeÅli moÅŒliwe (klucz wspÃ³Ådzielony przesyÅany otwartym tekstem)!', +'vpn aggrmode' => 'ZezwÃ³l na agresywny tryb IKE. UnikaÄ jeÅli moÅŒliwe (klucz wspÃ³Ådzielony przesyÅany otwartym tekstem)!', 'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire(a)foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something', -'vpn auth-dn' => 'Klien jest identyfikowany przez jeden z ciÃgÃ³w: IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN w zdalnym polu ID', +'vpn auth-dn' => 'Klien jest identyfikowany przez jeden z ciÄgÃ³w: IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN w zdalnym polu ID', 'vpn configuration main' => 'Konfiguracja VPN ', 'vpn delayed start' => 'OpÃ³Åºnienie przed uruchomieniem VPN (w sekundach)', -'vpn delayed start help' => 'OpÃ³Åºnienie pozwala na aktualizacjÃ dynamicznego DNS przez uruchomienie. 60 jest domyÅlnÃ wartoÅciÃ kiedy interfejs RED posiada dynamiczne IP.', +'vpn delayed start help' => 'OpÃ³Åºnienie pozwala na aktualizacjÄ dynamicznego DNS przez uruchomienie. 60 jest domyÅlnÄ wartoÅciÄ kiedy interfejs RED posiada dynamiczne IP.', 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed', 'vpn local id' => 'Lokalne ID', 'vpn missing remote id' => 'You must specify a correct Distinguished Name (DN) for this authentication.', -'vpn mtu invalid' => 'MTU musi byÃ liczbowÃ wartoÅciÃ!', +'vpn mtu invalid' => 'MTU musi byÄ liczbowÄ wartoÅciÄ!', 'vpn no full pki' => 'brak klucza lokalnego do wygenerowania certyfikatu', 'vpn on blue' => 'VPN na BLUE', 'vpn on green' => 'VPN na GREEN', @@ -2123,12 +2123,12 @@ 'vpn remote id' => 'Zdalne ID', 'vpn subjectaltname' => 'Subject Alt Name', 'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)', -'vpn watch' => 'Uruchom ponownie vpn net-to-net kiedy zmieni siÃ IP zdalnej koÅcÃ³wki (dyndns).', -'waiting to synchronize clock' => 'Oczekiwanie na synchronizacjÃ zegara', -'warn when traffic reaches' => 'Ostrzegaj kiedy ruch osiÃgnie x %', +'vpn watch' => 'Uruchom ponownie vpn net-to-net kiedy zmieni siÄ IP zdalnej koÅcÃ³wki (dyndns).', +'waiting to synchronize clock' => 'Oczekiwanie na synchronizacjÄ zegara', +'warn when traffic reaches' => 'Ostrzegaj kiedy ruch osiÄgnie x %', 'warning messages' => 'OstrzeÅŒenia', -'was deleted' => 'zostaÅ usuniÃty', -'web hits' => 'Liczba stron pasujÃcych do kryterium ', +'was deleted' => 'zostaÅ usuniÄty', +'web hits' => 'Liczba stron pasujÄcych do kryterium ', 'web proxy' => 'Proxy WWW', 'web proxy configuration' => 'Konfiguracja proxy WWW', 'web server' => 'Serwer stron WWW', @@ -2141,24 +2141,24 @@ 'wildcards' => 'Maski', 'wins server' => 'Serwer Wins', 'wins support' => 'Wsparcie Wins', -'wireless' => 'SieÃ bezprzewodowa', -'wireless config added' => 'Dodano konfiguracjÃ sieci bezprzewodowej', -'wireless config changed' => 'Zmieniono konfiguracjÃ sieci bezprzewodowej', +'wireless' => 'SieÄ bezprzewodowa', +'wireless config added' => 'Dodano konfiguracjÄ sieci bezprzewodowej', +'wireless config changed' => 'Zmieniono konfiguracjÄ sieci bezprzewodowej', 'wireless configuration' => 'Konfiguracja sieci bezprzewodowej', 'wlanap access point' => 'Access Point', 'wlanap channel' => 'KanaÅ', 'wlanap debugging' => 'Debugowanie', -'wlanap del interface' => 'UsunÃÃ wybrany interfejs?', +'wlanap del interface' => 'UsunÄÄ wybrany interfejs?', 'wlanap encryption' => 'Szyfrowanie', 'wlanap informations' => 'Informacje', 'wlanap interface' => 'Wybierz interfejs', -'wlanap invalid wpa' => 'Niepoprawna dÅugoÅÃ klucza WPA. Klucz musi zawieraÃ od 8 do 63 znakÃ³w.', +'wlanap invalid wpa' => 'Niepoprawna dÅugoÅÄ klucza WPA. Klucz musi zawieraÄ od 8 do 63 znakÃ³w.', 'wlanap link dhcp' => 'Konfiguracja DHCP dla sieci bezprzewodowej', 'wlanap link wireless' => 'Aktywuj klientÃ³w sieci bezprzewodowej', -'wlanap no interface' => 'Wybrany interfejs nie jest kartÃ bezprzewodowÃ!', +'wlanap no interface' => 'Wybrany interfejs nie jest kartÄ bezprzewodowÄ!', 'wlanap none' => 'brak', 'wlanap notifications' => 'Notifications', -'wlanap select interface' => 'ProszÃ wybraÃ interfejs bezprzewodowy.', +'wlanap select interface' => 'ProszÄ wybraÄ interfejs bezprzewodowy.', 'wlanap verbose' => 'Verbose', 'wlanap warnings' => 'OstrzeÅŒenia', 'wlanap wlan card' => 'Karta WLan', @@ -2168,12 +2168,12 @@ 'wol wakeup' => 'WakeUp', 'workgroup' => 'Grupa robocza', 'written bytes' => 'Zapisanych bajtÃ³w', -'xtaccess all error' => 'Nie moÅŒesz ustawiÃ zdalnego dostÃpu dla wszystkich - to robi wpis przekierowujÃcy porty.', -'xtaccess bad transfert' => 'JeÅŒeli okreÅlisz zakres portÃ³w docelowy musisz ustawiÃ identyczny zakres portÃ³w ÅºrÃ³dÅowych !', +'xtaccess all error' => 'Nie moÅŒesz ustawiÄ zdalnego dostÄpu dla wszystkich - to robi wpis przekierowujÄcy porty.', +'xtaccess bad transfert' => 'JeÅŒeli okreÅlisz zakres portÃ³w docelowy musisz ustawiÄ identyczny zakres portÃ³w ÅºrÃ³dÅowych !', 'year' => 'Rok', 'yearly firewallhits' => 'zdarzeÅ zapory w toku', 'yes' => 'Tak', -'you can only define one roadwarrior connection when using pre-shared key authentication' => 'MoÅŒesz zdefiniowaÃ tylko jedno poÅÃczenie typu Roadwarrior jeÅŒeli uÅŒywasz autentykacji kluczem wspÃ³Ådzielony (pre-shared key).<br />Albo poÅÃczenie typu Roadwarrior uwierzytelniane kluczem wspÃ³Ådzielonym juÅŒ istnieje, albo prÃ³bujesz dodaÃ je teraz.', +'you can only define one roadwarrior connection when using pre-shared key authentication' => 'MoÅŒesz zdefiniowaÄ tylko jedno poÅÄczenie typu Roadwarrior jeÅŒeli uÅŒywasz autentykacji kluczem wspÃ³Ådzielony (pre-shared key).<br />Albo poÅÄczenie typu Roadwarrior uwierzytelniane kluczem wspÃ³Ådzielonym juÅŒ istnieje, albo prÃ³bujesz dodaÄ je teraz.', 'your department' => 'Twoje oddziaÅy', 'your e-mail' => 'TwÃ³j adres email', ); diff --git a/tools/sort_strings.pl b/tools/sort_strings.pl index 64ee423..494f1f6 100755 --- a/tools/sort_strings.pl +++ b/tools/sort_strings.pl @@ -40,13 +40,6 @@ EOF for my $key ( sort (keys %tr) ) { my $value = $tr{$key}; - $value =~ s/ä/Ã€/g; - $value =~ s/ö/Ã¶/g; - $value =~ s/ü/ÃŒ/g; - $value =~ s/Ä/Ã/g; - $value =~ s/Ö/Ã/g; - $value =~ s/Ü/Ã/g; - $value =~ s/ß/Ã/g; $value =~ s/\'/\\\'/g; print FILE "\'$key\' => \'$value\',\n"; } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fe7131a4276be30502ebcc39c22d2a40ca5e12cf
by git＠ipfire.org 23 Jul '11

23 Jul '11

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 3.x development tree". The branch, master has been updated via fe7131a4276be30502ebcc39c22d2a40ca5e12cf (commit) via 250e941e519cd54a2fa34806120801b9487e7773 (commit) via 368c674af561e53c15e2cdf853bcfe05126dd43c (commit) from afc6dda7a75a276d714b164b67c380776585c06f (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 fe7131a4276be30502ebcc39c22d2a40ca5e12cf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 23 10:55:02 2011 +0200 pdns: Update to 3.0. commit 250e941e519cd54a2fa34806120801b9487e7773 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 23 10:54:46 2011 +0200 chrpath: New package. commit 368c674af561e53c15e2cdf853bcfe05126dd43c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 21 12:20:05 2011 +0200 nss-myhostname: New package. ----------------------------------------------------------------------- Summary of changes: pkgs/{htop/htop.nm => chrpath/chrpath.nm} | 21 +++++----- pkgs/chrpath/patches/chrpath-0.13-NULL-entry.patch | 16 ++++++++ .../nss-myhostname.nm} | 41 ++++++++++--------- pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch | 11 ----- pkgs/pdns/patches/pdns-fix-lua-detection.patch | 12 ++++++ pkgs/pdns/pdns.nm | 21 ++++++++-- pkgs/pdns/systemd/pdns.service | 13 ++++++ 7 files changed, 90 insertions(+), 45 deletions(-) copy pkgs/{htop/htop.nm => chrpath/chrpath.nm} (82%) create mode 100644 pkgs/chrpath/patches/chrpath-0.13-NULL-entry.patch copy pkgs/{libusb-compat/libusb-compat.nm => nss-myhostname/nss-myhostname.nm} (61%) delete mode 100644 pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch create mode 100644 pkgs/pdns/patches/pdns-fix-lua-detection.patch create mode 100644 pkgs/pdns/systemd/pdns.service Difference in files: diff --git a/pkgs/chrpath/chrpath.nm b/pkgs/chrpath/chrpath.nm new file mode 100644 index 0000000..22c3816 --- /dev/null +++ b/pkgs/chrpath/chrpath.nm @@ -0,0 +1,50 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = chrpath +PKG_VER = 0.13 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = Development/Tools +PKG_URL = ftp://ftp.hungry.com/pub/hungry/chrpath/ +PKG_LICENSE = GPL+ +PKG_SUMMARY = Modify rpath of compiled programs. + +define PKG_DESCRIPTION + chrpath allows you to modify the dynamic library load path (rpath) of + compiled programs. Currently, only removing and modifying the rpath + is supported. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --mandir=/usr/share/man + +define STAGE_INSTALL_CMDS + rm -rfv $(BUILDROOT)/usr/doc +endef diff --git a/pkgs/chrpath/patches/chrpath-0.13-NULL-entry.patch b/pkgs/chrpath/patches/chrpath-0.13-NULL-entry.patch new file mode 100644 index 0000000..27275d2 --- /dev/null +++ b/pkgs/chrpath/patches/chrpath-0.13-NULL-entry.patch @@ -0,0 +1,16 @@ +diff -uNr chrpath-0.13.old/killrpath.c chrpath-0.13/killrpath.c +--- chrpath-0.13.old/killrpath.c 2003-06-24 00:46:15.000000000 +0200 ++++ chrpath-0.13/killrpath.c 2009-07-19 23:05:11.000000000 +0200 +@@ -73,8 +73,11 @@ + if ( ! elf_dynpath_tag(dyns[i].d_tag) ) + dynpos++; + } +- for (; dynpos < i; dynpos++) ++ for (; dynpos < i; dynpos++) { + dyns[dynpos].d_tag = DT_NULL; ++ dyns[dynpos].d_un.d_val = 0x0; ++ } ++ + + if (lseek(fd, phdr.p_offset, SEEK_SET) == -1 + || write(fd, dyns, phdr.p_filesz) != (int)phdr.p_filesz) diff --git a/pkgs/nss-myhostname/nss-myhostname.nm b/pkgs/nss-myhostname/nss-myhostname.nm new file mode 100644 index 0000000..b130e6e --- /dev/null +++ b/pkgs/nss-myhostname/nss-myhostname.nm @@ -0,0 +1,64 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = nss-myhostname +PKG_VER = 0.3 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = System/Libraries +PKG_URL = http://0pointer.de/lennart/projects/nss-myhostname/ +PKG_LICENSE = LGPLv2+ +PKG_SUMMARY = glibc plugin for local system host name resolution. + +define PKG_DESCRIPTION + nss-myhostname is a plugin for the GNU Name Service Switch (NSS) + functionality of the GNU C Library (glibc) providing host name + resolution for the locally configured system hostname as returned by + gethostname(2). Various software relies on an always resolvable local + host name. When using dynamic hostnames this is usually achieved by + patching /etc/hosts at the same time as changing the host name. This + however is not ideal since it requires a writable /etc file system and + is fragile because the file might be edited by the administrator at + the same time. nss-myhostname simply returns all locally configure + public IP addresses, or -- if none are configured -- the IPv4 address + 127.0.0.2 (wich is on the local loopback) and the IPv6 address ::1 + (which is the local host) for whatever system hostname is configured + locally. Patching /etc/hosts is thus no longer necessary. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --libdir=/lib + +define STAGE_INSTALL_CMDS + -mkdir -pv $(BUILDROOT)/usr/lib + ln -svf ../../lib/libnss_myhostname.so.2 \ + $(BUILDROOT)/usr/lib/libnss_myhostname.so + + rm -rf $(BUILDROOT)/usr/share/doc/nss-myhostname +endef diff --git a/pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch b/pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch deleted file mode 100644 index cba5412..0000000 --- a/pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up pdns-2.9.22/pdns/misc.hh.orig pdns-2.9.22/pdns/misc.hh ---- pdns-2.9.22/pdns/misc.hh.orig 2009-02-26 17:09:41.000000000 +0100 -+++ pdns-2.9.22/pdns/misc.hh 2009-02-26 17:09:54.000000000 +0100 -@@ -20,6 +20,7 @@ - #define MISC_HH - #include <stdint.h> - #include <cstring> -+#include <cstdio> - - #if 0 - #include <iostream> diff --git a/pkgs/pdns/patches/pdns-fix-lua-detection.patch b/pkgs/pdns/patches/pdns-fix-lua-detection.patch new file mode 100644 index 0000000..29b352a --- /dev/null +++ b/pkgs/pdns/patches/pdns-fix-lua-detection.patch @@ -0,0 +1,12 @@ +diff -up pdns-3.0-rc3/configure.orig pdns-3.0-rc3/configure +--- pdns-3.0-rc3/configure.orig 2011-07-20 14:09:39.960000514 +0200 ++++ pdns-3.0-rc3/configure 2011-07-20 14:09:46.288007162 +0200 +@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >& + + # Check whether --with-lua was given. + if test "${with_lua+set}" = set; then : +- withval=$with_lua; WITH_LUA=$withval] ++ withval=$with_lua; WITH_LUA=$withval + else + WITH_LUA=yes + fi diff --git a/pkgs/pdns/pdns.nm b/pkgs/pdns/pdns.nm index b259d56..4e57285 100644 --- a/pkgs/pdns/pdns.nm +++ b/pkgs/pdns/pdns.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = pdns -PKG_VER = 2.9.22 -PKG_REL = 0 +PKG_VER = 3.0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Networking/DNS @@ -34,7 +34,8 @@ PKG_URL = http://powerdns.com/ PKG_LICENSE = GPLv2 PKG_SUMMARY = A modern, advanced and high performance authoritative-only nameserver. -PKG_BUILD_DEPS+= boost-devel gcc-c++ openldap-devel sqlite-devel zlib-devel +PKG_BUILD_DEPS+= boost-devel chrpath gcc-c++ lua-devel openldap-devel \ + sqlite-devel zlib-devel define PKG_DESCRIPTION The PowerDNS Nameserver is a modern, advanced and high performance \ @@ -53,4 +54,16 @@ CONFIGURE_OPTIONS += \ --sysconfdir=/etc/pdns \ --libdir=/usr/lib/powerdns \ --with-modules="" \ - --with-dynmodules="pipe geo ldap gsqlite3" + --with-dynmodules="pipe geo ldap gsqlite3" \ + --with-lua \ + --disable-static + +define STAGE_INSTALL_CMDS + chrpath --delete $(BUILDROOT)/usr/bin/pdns_control + chrpath --delete $(BUILDROOT)/usr/bin/zone2ldap + chrpath --delete $(BUILDROOT)/usr/bin/zone2sql + chrpath --delete $(BUILDROOT)/usr/sbin/pdns_server + chrpath --delete $(BUILDROOT)/usr/lib/powerdns/*.so + chrpath --delete $(BUILDROOT)/usr/bin/dnsreplay + chrpath --delete $(BUILDROOT)//usr/bin/pdnssec +endef diff --git a/pkgs/pdns/systemd/pdns.service b/pkgs/pdns/systemd/pdns.service new file mode 100644 index 0000000..d9877ad --- /dev/null +++ b/pkgs/pdns/systemd/pdns.service @@ -0,0 +1,13 @@ +[Unit] +Description=PDNS DNS Server +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/pdns_server --daemon --guardian=yes +ExecReload=/usr/bin/pdns_control cycle +ExecStop=/usr/bin/pdns_control quit + +[Install] +WantedBy=multi-user.target + hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5c2d9a6106b9fd1a5b5928657500152c27180fdd
by git＠ipfire.org 23 Jul '11

23 Jul '11

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 5c2d9a6106b9fd1a5b5928657500152c27180fdd (commit) from c882707abe265b825831770c6c6f8061f42092ca (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 5c2d9a6106b9fd1a5b5928657500152c27180fdd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 23 12:16:16 2011 +0200 ipfireseeder: seed core50. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index f103232..4a6ca2a 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core49.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core50.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index e08e51e..a4e120b 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core49.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core50.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 25 +PAK_VER = 26 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0da274af552f5de5b0f65102b17631f1 +$(DL_FILE)_MD5 = 07d3b03c3042f67464a33319207d2795 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. 81a789d9315219cca58160ea2dbd005287ae4bd3
by git＠ipfire.org 19 Jul '11

19 Jul '11

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, openvpn-n2n has been updated via 81a789d9315219cca58160ea2dbd005287ae4bd3 (commit) from cdc2be25f1b63a906f2209ae9d7ac4bdd4b14feb (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 81a789d9315219cca58160ea2dbd005287ae4bd3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 19 11:42:53 2011 +0200 openvpnctrl: Force 'modprobe tun' before starting the openvpn daemon. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/openvpnctrl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 9112f1f..758800d 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -439,7 +439,9 @@ void startNet2Net(char *name) { setFirewallRules(); char command[STRING_SIZE]; - sprintf(command, "/usr/sbin/openvpn --config %s", configfile); + snprintf(command, STRING_SIZE-1, "/sbin/modprobe tun"); + executeCommand(command); + snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config %s", configfile); executeCommand(command); } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. afc6dda7a75a276d714b164b67c380776585c06f
by git＠ipfire.org 18 Jul '11

18 Jul '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. cdc2be25f1b63a906f2209ae9d7ac4bdd4b14feb
by git＠ipfire.org 18 Jul '11

18 Jul '11

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, openvpn-n2n has been updated via cdc2be25f1b63a906f2209ae9d7ac4bdd4b14feb (commit) from ce9abb6627a085706077c1a11da1569fc3c7f244 (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 cdc2be25f1b63a906f2209ae9d7ac4bdd4b14feb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 18 17:35:24 2011 +0200 openvpn: Update to 2.2.1. ----------------------------------------------------------------------- Summary of changes: lfs/openvpn | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/openvpn b/lfs/openvpn index 925c2ad..0937930 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -24,7 +24,7 @@ include Config -VER = 2.1.2 +VER = 2.2.1 THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 543a30dafcdefe1d67c0e47b80741755 +$(DL_FILE)_MD5 = 500bee5449b29906150569aaf2eb2730 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. ce9abb6627a085706077c1a11da1569fc3c7f244
by git＠ipfire.org 18 Jul '11

18 Jul '11

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, openvpn-n2n has been updated via ce9abb6627a085706077c1a11da1569fc3c7f244 (commit) from c894a342345ca6b55edc75f0ced6ab7ffa7b7a42 (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 ce9abb6627a085706077c1a11da1569fc3c7f244 Author: Alfred Haas <alfred.haas(a)ipfire.org> Date: Mon Jul 18 12:28:33 2011 +0200 Import ovpnmain.cgi with N2N support. This is currently in development! ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 872 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 792 insertions(+), 80 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index c99e7be..850555c 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -22,6 +22,7 @@ use CGI; use CGI qw/:standard/; use Net::DNS; +use Net::Ping; use File::Copy; use File::Temp qw/ tempfile tempdir /; use strict; @@ -32,8 +33,8 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl"; # enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; +use warnings; +use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourgreen} ); undef (@dummy); @@ -72,6 +73,7 @@ $cgiparams{'DHCP_WINS'} = ''; $cgiparams{'DCOMPLZO'} = 'off'; $cgiparams{'MSSFIX'} = ''; + &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); # prepare openvpn config file @@ -514,12 +516,166 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { &writeserverconf();#hier ok } +### +# m.a.d Save net2net server config +### + +if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'server') +{ +my @remsubnet = split(/\//,$cgiparams{'REMOTE_SUBNET'}); +my @ovsubnettemp = split(/\./,$cgiparams{'OVPN_SUBNET'}); +my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; +my $tunmtu = $cgiparams{'MTU'}; +if ($tunmtu eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; + + if ( !-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") { + mkdir("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770); } + + open(SERVERCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; + + flock SERVERCONF, 2; + print SERVERCONF "# n2n Open VPN Server Config by ummeegge und m.a.d\n"; + print SERVERCONF "\n"; + print SERVERCONF "# User Sicherheit\n"; + print SERVERCONF "user nobody\n"; + print SERVERCONF "group nobody\n"; + print SERVERCONF "persist-tun\n"; + print SERVERCONF "persist-key\n"; + print SERVERCONF "\n"; + print SERVERCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; + print SERVERCONF "\n"; + print SERVERCONF "# IP Adressen des VPN Tunnels\n"; + print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; + print SERVERCONF "\n"; + print SERVERCONF "# Netzwerk auf dem Client Gateway\n"; + print SERVERCONF "route @remsubnet[0] @remsubnet[1]\n"; + print SERVERCONF "# Device fuer den Tunnel\n"; + print SERVERCONF "dev tun\n"; + print SERVERCONF "\n"; + print SERVERCONF "#Port und Protokoll\n"; + print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; + print SERVERCONF "proto $cgiparams{'PROTOCOL'}\n"; + print SERVERCONF "\n"; + print SERVERCONF "# Paketgroessen\n"; + print SERVERCONF "tun-mtu $tunmtu\n"; + print SERVERCONF "fragment 1300\n"; + print SERVERCONF "mssfix\n"; + print SERVERCONF "\n"; + print SERVERCONF "# Auth Server\n"; + print SERVERCONF "tls-server\n"; + print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; + print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; + print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n"; + print SERVERCONF "dh ${General::swroot}/ovpn/ca/dh1024.pem\n"; + print SERVERCONF "\n"; + print SERVERCONF "# Verschluesselung\n"; + print SERVERCONF "cipher AES-256-CBC\n"; + if ($cgiparams{'COMPLZO'} eq 'on') { + print SERVERCONF "# Kompression einschalten\n"; + print SERVERCONF "comp-lzo\r\n"; + print SERVERCONF "#\n"; + } + print SERVERCONF "# Debug Level setzen\n"; + print SERVERCONF "verb 3\n"; + print SERVERCONF "\n"; + print SERVERCONF "# Tunnel Ueberwachung\n"; + print SERVERCONF "keepalive 10 60\n"; + print SERVERCONF "\n"; + print SERVERCONF "# Als Daemon starten mit Namen ovpnn2n\n"; + print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; + print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; + print SERVERCONF "\n"; + print SERVERCONF "# Management Interface aktivieren\n"; + print SERVERCONF "#management localhost 4711\n"; + close(SERVERCONF); + +} + +### +# m.a.d Save net2net client config +### +if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'client') +{ + my @ovsubnettemp = split(/\./,$cgiparams{'OVPN_SUBNET'}); + my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; + my @remsubnet = split(/\//,$cgiparams{'REMOTE_SUBNET'}); + my $tunmtu = $cgiparams{'MTU'}; + if ($tunmtu eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; + + if ( !-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") { + mkdir("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770); } + + open(CLIENTCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; + + flock CLIENTCONF, 2; + print CLIENTCONF "# rewritten n2n Open VPN Client Config by ummeegge und m.a.d\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# User Sicherheit\n"; + print CLIENTCONF "user nobody\n"; + print CLIENTCONF "group nobody\n"; + print CLIENTCONF "persist-tun\n"; + print CLIENTCONF "persist-key\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# IP Adressen des VPN Tunnels\n"; + print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; + print CLIENTCONF "route @remsubnet[0]/@remsubnet[1]\n"; + print CLIENTCONF "# Device fuer den Tunnel\n"; + print CLIENTCONF "dev tun\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "#Port und Protokoll\n"; + print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; + print CLIENTCONF "proto $cgiparams{'PROTOCOL'}\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Paketgroessen\n"; + print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "fragment 1300\n"; + print CLIENTCONF "mssfix\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Auth. Client\n"; + print CLIENTCONF "tls-client\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Verschluesselung\n"; + print CLIENTCONF "cipher AES-256-CBC\n"; + print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12\r\n"; + print CLIENTCONF "#\n"; + if ($cgiparams{'COMPLZO'} eq 'on') { + print CLIENTCONF "# Kompression einschalten\n"; + print CLIENTCONF "comp-lzo\r\n"; + print CLIENTCONF "#\n"; + } + print CLIENTCONF "#\n"; + print CLIENTCONF "# Debug Level\n"; + print CLIENTCONF "verb 3\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Tunnel Ueberwachung\n"; + print CLIENTCONF "keepalive 10 60\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Als Daemon starten\n"; + print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n"; + print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Management Interface aktivieren\n"; + print CLIENTCONF "# management localhost 4711\n"; + close(CLIENTCONF); +} + +### +# m.a.d Save net2net config end +### ### ### Save main settings ### + + if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cgiparams{'KEY'} eq '') { &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); #DAN do we really need (to to check) this value? Besides if we listen on blue and orange too, @@ -1314,36 +1470,50 @@ END ### ### Enable/Disable connection ### + +### +# m.a.d net2net Anpassung +### + }elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - +# my $n2nactive = ''; + my $n2nactive = `/bin/ps ax|grep $confighash{$cgiparams{'KEY'}}[1]|grep -v grep|awk \'{print \$1}\'`; + if ($confighash{$cgiparams{'KEY'}}) { - if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { + + + if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { $confighash{$cgiparams{'KEY'}}[0] = 'on'; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - #&writeserverconf(); -# if ($vpnsettings{'ENABLED'} eq 'on' || -# $vpnsettings{'ENABLED_BLUE'} eq 'on') { -# system('/usr/local/bin/ipsecctrl', 'S', $cgiparams{'KEY'}); -# } - } else { + + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + system('/usr/local/bin/openvpnctrl', '-sn2n', $confighash{$cgiparams{'KEY'}}[1]); + } + + } else { + $confighash{$cgiparams{'KEY'}}[0] = 'off'; -# if ($vpnsettings{'ENABLED'} eq 'on' || -# $vpnsettings{'ENABLED_BLUE'} eq 'on') { -# system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}); -# } - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - #&writeserverconf(); - } - } else { - $errormessage = $Lang::tr{'invalid key'}; - } + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + if ($n2nactive ne ''){ + system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); + } + + } else { + $errormessage = $Lang::tr{'invalid key'}; + } + } + } ### ### Download OpenVPN client package ### + + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'dl client arch'}) { &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -1352,9 +1522,105 @@ END my @fileholder; my $tempdir = tempdir( CLEANUP => 1 ); my $zippath = "$tempdir/"; - my $zipname = "$confighash{$cgiparams{'KEY'}}[1]-TO-IPFire.zip"; - my $zippathname = "$zippath$zipname"; - $clientovpn = "$confighash{$cgiparams{'KEY'}}[1]-TO-IPFire.ovpn"; + +### +# m.a.d net2net DL Client Package +### + +if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + + my $zipname = "$confighash{$cgiparams{'KEY'}}[1]-Client.zip"; + my $zippathname = "$zippath$zipname"; + $clientovpn = "$confighash{$cgiparams{'KEY'}}[1].conf"; + my @ovsubnettemp = split(/\./,$confighash{$cgiparams{'KEY'}}[27]); + my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; + my $tunmtu = ''; + + open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; + flock CLIENTCONF, 2; + + my $zip = Archive::Zip->new(); + print CLIENTCONF "# n2n Open VPN Client Config by ummeegge und m.a.d\n"; + print CLIENTCONF "# \n"; + print CLIENTCONF "# User Sicherheit\n"; + print CLIENTCONF "user nobody\n"; + print CLIENTCONF "group nobody\n"; + print CLIENTCONF "persist-tun\n"; + print CLIENTCONF "persist-key\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print CLIENTCONF "remote $netsettings{'RED_ADDRESS'}\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# IP Adressen des VPN Tunnels\n"; + print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; + print CLIENTCONF "route $confighash{$cgiparams{'KEY'}}[8]\n"; + print CLIENTCONF "# Device fuer den Tunnel\n"; + print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "#Port und Protokoll\n"; + print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; + print CLIENTCONF "proto $confighash{$cgiparams{'KEY'}}[28]\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Paketgroessen\n"; + if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1500'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; + print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "fragment 1300\n"; + print CLIENTCONF "mssfix\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Auth. Client\n"; + print CLIENTCONF "tls-client\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Verschluesselung\n"; + print CLIENTCONF "cipher AES-256-CBC\n"; + if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { + print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12\r\n"; + $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", "$confighash{$cgiparams{'KEY'}}[1].p12") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1].p12\n"; + } + print CLIENTCONF "#\n"; + if ($confighash{$cgiparams{'KEY'}}[30] eq 'on') { + print CLIENTCONF "# Kompression einschalten\n"; + print CLIENTCONF "comp-lzo\r\n"; + print CLIENTCONF "#\n"; + } + print CLIENTCONF "# Debug Level\n"; + print CLIENTCONF "verb 3\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Tunnel Ueberwachung\n"; + print CLIENTCONF "keepalive 10 60\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Als Daemon starten\n"; + print CLIENTCONF "daemon $confighash{$cgiparams{'KEY'}}[1]n2n\n"; + print CLIENTCONF "writepid /var/run/$confighash{$cgiparams{'KEY'}}[1]n2n.pid\n"; + print CLIENTCONF "#\n"; + print CLIENTCONF "# Management Interface aktivieren\n"; + print CLIENTCONF "# management localhost 4711\n"; + print CLIENTCONF "# remsub $confighash{$cgiparams{'KEY'}}[11]\n"; + + + close(CLIENTCONF); + + $zip->addFile( "$tempdir/$clientovpn", $clientovpn) or die "Can't add file $clientovpn\n"; + my $status = $zip->writeToFileNamed($zippathname); + + open(DLFILE, "<$zippathname") or die "Unable to open $zippathname: $!"; + @fileholder = <DLFILE>; + print "Content-Type:application/x-download\n"; + print "Content-Disposition:attachment;filename=$zipname\n\n"; + print @fileholder; + exit (0); +} +else +{ + my $zipname = "$confighash{$cgiparams{'KEY'}}[1]-TO-IPFire.zip"; + my $zippathname = "$zippath$zipname"; + $clientovpn = "$confighash{$cgiparams{'KEY'}}[1]-TO-IPFire.ovpn"; + +### +# m.a.d net2net DL Client Package end +### + open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; flock CLIENTCONF, 2; @@ -1410,6 +1676,7 @@ END print CLIENTCONF "fragment $vpnsettings{'FRAGMENT'}\r\n"; } close(CLIENTCONF); + $zip->addFile( "$tempdir/$clientovpn", $clientovpn) or die "Can't add file $clientovpn\n"; my $status = $zip->writeToFileNamed($zippathname); @@ -1419,10 +1686,15 @@ END print "Content-Disposition:attachment;filename=$zipname\n\n"; print @fileholder; exit (0); - + } + + + ### ### Remove connection ### + + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) { &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -1434,7 +1706,24 @@ END # } # my $temp = `/usr/bin/openssl ca -revoke ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; - unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); + +### +# m.a.d net2net Anpassung +### + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { + + my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); + my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + unlink ($certfile) or die "Removing $certfile fail: $!"; + unlink ($conffile) or die "Removing $conffile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; + +} +### +# m.a.d net2net Anpassung end +### + + unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); delete $confighash{$cgiparams{'KEY'}}; my $temp2 = `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; @@ -1443,6 +1732,8 @@ END } else { $errormessage = $Lang::tr{'invalid key'}; } + + ### ### Download PKCS12 file ### @@ -1799,13 +2090,14 @@ END ### ### Enable/Disable connection ### + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($confighash{$cgiparams{'KEY'}}) { - if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { + if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { $confighash{$cgiparams{'KEY'}}[0] = 'on'; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); #&writeserverconf(); @@ -1862,6 +2154,303 @@ END } else { $errormessage = $Lang::tr{'invalid key'}; } +#test33 + +### +### Choose between adding a host-net or net-net connection +### + +### +# m.a.d Anpassung wegen upload n2n Package +### + +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') { + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); + &Header::showhttpheaders(); + &Header::openpage($Lang::tr{'vpn configuration main'}, 1, ''); + &Header::openbigbox('100%', 'LEFT', '', ''); + &Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'}); + print <<END + <b>$Lang::tr{'connection type'}:</b><br /> + <table><form method='post' ENCTYPE="multipart/form-data"> + <tr><td><input type='radio' name='TYPE' value='host' checked /></td> + <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> + <tr><td><input type='radio' name='TYPE' value='net' /></td> + <td class='base'>$Lang::tr{'net to net vpn'}</td></tr> + <tr><td><input type='radio' name='TYPE' value='net2net' /></td> + <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr> + <tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr> + <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + </form></table> +END + ; + + &Header::closebox(); + &Header::closebigbox(); + &Header::closepage(); + exit (0); + +### +# m.a.d uploading a IPFire n2n Client package +### + +} elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) && ($cgiparams{'TYPE'} eq 'net2net')){ + + my @firen2nconf; + my @confdetails; + my $uplconffilename =''; + my $uplp12name = ''; + my $complzoactive =''; + my @rem_subnet; + my @rem_subnet2; + my @tmposupnet3; + my $key; + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + +# Check if a file is uploaded + + if (ref ($cgiparams{'FH'}) ne 'Fh') { + $errormessage = $Lang::tr{'there was no file upload'}; + goto N2N_ERROR; + } + +# Move uploaded IPfire n2n package to temporary file + + (my $fh, my $filename) = tempfile( ); + if (copy ($cgiparams{'FH'}, $fh) != 1) { + $errormessage = $!; + goto N2N_ERROR; + } + + my $zip = Archive::Zip->new(); + my $zipName = $filename; + my $status = $zip->read( $zipName ); + if ($status != AZ_OK) { + $errormessage = "Read of $zipName failed\n"; + goto N2N_ERROR; + } + + my $tempdir = tempdir( CLEANUP => 1 ); + my @files = $zip->memberNames(); + for(@files) { + $zip->extractMemberWithoutPaths($_,"$tempdir/$_"); + } + my $countfiles = @files; + +# Check if we have not more then 2 files + + if ( $countfiles == 2){ + foreach (@files){ + if ( $_ =~ /.conf$/){ + $uplconffilename = $_; + } + if ( $_ =~ /.p12$/){ + $uplp12name = $_; + } + } + if (($uplconffilename eq '') || ($uplp12name eq '')){ + $errormessage = "Either no *.conf or no *.p12 file found\n"; + goto N2N_ERROR; + } + + open(FILE, "$tempdir/$uplconffilename") or die 'Unable to open*.conf file'; + @firen2nconf = <FILE>; + close (FILE); + chomp(@firen2nconf); + + } else { + + $errormessage = "Filecount does not match only 2 files are allowed\n"; + goto N2N_ERROR; + } + +### +# m.a.d prepare imported ipfire net2net data +### + + my @n2nname = split(/\./,$uplconffilename); + $n2nname[0] =~ s/\n|\r//g; + + if ( !-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]") { + mkdir("${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770); } + + move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename"); + + if ($? ne 0) { + $errormessage = "*.conf move failed: $!"; + unlink ($filename); + goto N2N_ERROR; + } + + move("$tempdir/$uplp12name", "${General::swroot}/ovpn/certs/$uplp12name"); + if ($? ne 0) { + $errormessage = "$Lang::tr{'certificate file move failed'}: $!"; + unlink ($filename); + goto N2N_ERROR; + } + +my $complzoactive; +#my @n2nroute = split(/ /, (grep { /^route/ } @firen2nconf)[0]); +my @n2nproto = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); +my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]); +my @n2ntunmtu = split(/ /, (grep { /^tun-mtu/ } @firen2nconf)[0]); +my @n2ncomplzo = grep { /^comp-lzo/ } @firen2nconf; +if ($n2ncomplzo[0] =~ /comp-lzo/){$complzoactive = "on";} else {$complzoactive = "off";} +my @n2nremote = split(/ /, (grep { /^remote/ } @firen2nconf)[0]); +my @n2novpnsuball = split(/ /, (grep { /^ifconfig/ } @firen2nconf)[0]); +my @n2novpnsub = split(/\./,$n2novpnsuball[1]); +my @n2nremsub = split(/ /, (grep { /^route/ } @firen2nconf)[0]); +my @n2nlocalsub = split(/ /, (grep { /^# remsub/ } @firen2nconf)[0]); + +# $errormessage = &Ovpnfunc::ovelapplausi("$tmposupnet3[0].$tmposupnet3[1].$tmposupnet3[2].0","255.255.255.0"); +# if ($errormessage ne ''){ +# goto N2N_ERROR; +# } + +### +# m.a.d delete CR and LF from arrays for this chomp doesnt work +### + +#$n2nroute[1] =~ s/\n|\r//g; +$n2nremote[1] =~ s/\n|\r//g; +#$n2nroute[1] =~ s/\n|\r//g; +#$n2nroute[2] =~ s/\n|\r//g; +$n2novpnsub[0] =~ s/\n|\r//g; +$n2novpnsub[1] =~ s/\n|\r//g; +$n2novpnsub[2] =~ s/\n|\r//g; +$n2nproto[1] =~ s/\n|\r//g; +$n2nport[1] =~ s/\n|\r//g; +$n2ntunmtu[1] =~ s/\n|\r//g; +$n2nremsub[1] =~ s/\n|\r//g; +$n2nlocalsub[2] =~ s/\n|\r//g; +chomp ($complzoactive); + +### +# m.a.d Write n2n config +### + +### +# Check if there is no other entry with this name +### + + foreach my $dkey (keys %confighash) { + if ($confighash{$dkey}[1] eq $n2nname[0]) { + $errormessage = $Lang::tr{'a connection with this name already exists'}; + goto N2N_ERROR; + } + } + + $key = &General::findhasharraykey (\%confighash); + + foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} + $confighash{$key}[0] = 'off'; + $confighash{$key}[1] = $n2nname[0]; + $confighash{$key}[2] = $n2nname[0]; + $confighash{$key}[3] = 'net'; + $confighash{$key}[4] = 'cert'; + $confighash{$key}[6] = 'client'; + $confighash{$key}[8] = $n2nlocalsub[2]; + $confighash{$key}[10] = $n2nremote[1]; + $confighash{$key}[11] = $n2nremsub[1]; + $confighash{$key}[25] = 'IPFire n2n Client'; + $confighash{$key}[26] = 'red'; + $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; + $confighash{$key}[28] = $n2nproto[1]; + $confighash{$key}[29] = $n2nport[1]; + $confighash{$key}[30] = $complzoactive; + $confighash{$key}[31] = $n2ntunmtu[1]; + + + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + N2N_ERROR: + + &Header::showhttpheaders(); + &Header::openpage('Validate imported configuration', 1, ''); + &Header::openbigbox('100%', 'LEFT', '', $errormessage); + if ($errormessage) { + &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); + print "<class name='base'>$errormessage"; + print " </class>"; + &Header::closebox(); + + } else + { + &Header::openbox('100%', 'LEFT', 'import ipfire net2net config'); + } + if ($errormessage eq ''){ + print <<END +  + <table width='100%'> + <tr><td width='25%'> </td><td width='25%'> </td></tr> + <tr><td class='boldbase'>$Lang::tr{'name'}:</td><td><b>$n2nname[0]</b></td></tr> + <tr><td> </td><td> </td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td><td><b>$confighash{$key}[6]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>Remote Host </td><td><b>$confighash{$key}[10]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td><td><b>$confighash{$key}[8]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td><td><b>$confighash{$key}[11]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}</td><td><b>$confighash{$key}[27]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td><td><b>$confighash{$key}[28]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'destination port'}:</td><td><b>$confighash{$key}[29]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td><td><b>$confighash{$key}[30]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}</td><td><b>$confighash{$key}[31]</b></td></tr> + <tr><td> </td><td> </td></tr> + </table> +END +; + &Header::closebox(); + } + + if ($errormessage) { + print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; + } else { + print "<div align='center'><form method='post' ENCTYPE='multipart/form-data'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' />"; + print "<input type='hidden' name='TYPE' value='net2netakn' />"; + print "<input type='hidden' name='KEY' value='$key' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></div></form>"; + } + &Header::closebigbox(); + &Header::closepage(); + exit(0); + + +## +### Accept IPFire n2n Package Settings +### + + } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) && ($cgiparams{'TYPE'} eq 'net2netakn')){ + +### +### Discard and Rollback IPFire n2n Package Settings +### + + } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'cancel'}) && ($cgiparams{'TYPE'} eq 'net2netakn')){ + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + +if ($confighash{$cgiparams{'KEY'}}) { + + my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); + my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + unlink ($certfile) or die "Removing $certfile fail: $!"; + unlink ($conffile) or die "Removing $conffile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; + delete $confighash{$cgiparams{'KEY'}}; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + + } else { + $errormessage = $Lang::tr{'invalid key'}; + } + + +### +# m.a.d end uploading a IPFire n2n Client package +### + + +### +### Adding a new connection +### } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) { @@ -1875,10 +2464,9 @@ END $errormessage = $Lang::tr{'invalid key'}; goto VPNCONF_END; } - $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; - $cgiparams{'TYPE'} = 'host'; + $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; @@ -1918,6 +2506,11 @@ END goto VPNCONF_ERROR; } +# if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) { +# $errormessage = $Lang::tr{'ipfire side is invalid'}; +# goto VPNCONF_ERROR; +# } + # Check if there is no other entry with this name if (! $cgiparams{'KEY'}) { foreach my $key (keys %confighash) { @@ -1928,6 +2521,11 @@ END } } + if (($cgiparams{'TYPE'} eq 'net') && (! $cgiparams{'REMOTE'})) { + $errormessage = $Lang::tr{'invalid input for remote host/ip'}; + goto VPNCONF_ERROR; + } + if ($cgiparams{'REMOTE'}) { if (! &General::validip($cgiparams{'REMOTE'})) { if (! &General::validfqdn ($cgiparams{'REMOTE'})) { @@ -1956,6 +2554,10 @@ END } } } + if (($cgiparams{'TYPE'} eq 'net') && (! &General::validipandmask($cgiparams{'REMOTE_SUBNET'}))) { + $errormessage = $Lang::tr{'remote subnet is invalid'}; + goto VPNCONF_ERROR; + } if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) { $errormessage = $Lang::tr{'invalid input'}; @@ -2079,9 +2681,6 @@ END goto VPNCONF_ERROR; } } elsif ($cgiparams{'AUTH'} eq 'certgen') { - - $cgiparams{'CERT_NAME'} =~ s/ //g; - if ($cgiparams{'KEY'}) { $errormessage = $Lang::tr{'cant change certificates'}; goto VPNCONF_ERROR; @@ -2240,13 +2839,17 @@ END if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') { $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; } - $confighash{$key}[3] = 'host'; + $confighash{$key}[3] = $cgiparams{'TYPE'}; if ($cgiparams{'AUTH'} eq 'psk') { $confighash{$key}[4] = 'psk'; $confighash{$key}[5] = $cgiparams{'PSK'}; } else { $confighash{$key}[4] = 'cert'; } + if ($cgiparams{'TYPE'} eq 'net') { + $confighash{$key}[6] = $cgiparams{'SIDE'}; + $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; + } $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; $confighash{$key}[10] = $cgiparams{'REMOTE'}; $confighash{$key}[25] = $cgiparams{'REMARK'}; @@ -2333,7 +2936,7 @@ END } print "<form method='post' enctype='multipart/form-data'>"; - print "<input type='hidden' name='TYPE' value='host' />"; + print "<input type='hidden' name='TYPE' value='$cgiparams{'TYPE'}' />"; if ($cgiparams{'KEY'}) { print "<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />"; @@ -2343,6 +2946,7 @@ END &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:"); print "<table width='100%'>\n"; print "<tr><td width='25%' class='boldbase'>$Lang::tr{'name'}:</td>"; + if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>\n"; } else { @@ -2358,12 +2962,49 @@ END # print "<option value='ORANGE' $selected{'INTERFACE'}{'ORANGE'}>ORANGE</option>"; # print "</select></td></tr>"; # print <<END + } else { + print "<input type='hidden' name='INTERFACE' value='red' />"; + if ($cgiparams{'KEY'}) { + print "<td width='25%' class='base' nowrap='nowrap'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>"; + } else { + print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' /></td>"; + } + print <<END + <td width='25%'> </td> + <td width='25%'> </td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td> + <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>OpenVPN Server</option> + <option value='client' $selected{'SIDE'}{'client'}>OpenVPN Client</option></select></td> + <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td> + <td><input type='TEXT' name='REMOTE' value='$cgiparams{'REMOTE'}' /></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td> + <td><input type='TEXT' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' /></td> + <td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td> + <td><input type='text' name='REMOTE_SUBNET' value='$cgiparams{'REMOTE_SUBNET'}' /></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}</td> + <td><input type='TEXT' name='OVPN_SUBNET' value='$cgiparams{'OVPN_SUBNET'}' /></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td> + <td><select name='PROTOCOL'><option value='udp' $selected{'PROTOCOL'}{'udp'}>UDP</option> + <option value='tcp' $selected{'PROTOCOL'}{'tcp'}>TCP</option></select></td> + <td class='boldbase'>$Lang::tr{'destination port'}:</td> + <td><input type='TEXT' name='DEST_PORT' value='$cgiparams{'DEST_PORT'}' size='5' /></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td> + <td><input type='checkbox' name='COMPLZO' $checked{'COMPLZO'}{'on'} /></td> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} <img src='/blob.gif' /></td> + <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></TD> + + +END + ; + } print "<tr><td class='boldbase'>$Lang::tr{'remark title'} <img src='/blob.gif' /></td>"; print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr>"; -# if ($cgiparams{'TYPE'} eq 'net') { - print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>\n"; - + if ($cgiparams{'TYPE'} eq 'host') { + + print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>\n"; + } + # if ($cgiparams{'KEY'}) { # print "<td colspan='3'> </td></tr></table>"; # } else { @@ -2394,41 +3035,54 @@ END if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cakeydisabled = "disabled='disabled'" } else { $cakeydisabled = "" }; if ( ! -f "${General::swroot}/ovpn/ca/cacert.pem" ) { $cacrtdisabled = "disabled='disabled'" } else { $cacrtdisabled = "" }; &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'}); - print <<END + + + if ($cgiparams{'TYPE'} eq 'host') { + +print <<END <table width='100%' cellpadding='0' cellspacing='5' border='0'> <tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' border='0' /></td></tr> - <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td> - <td class='base'>$Lang::tr{'upload a certificate request'}</td> - <td class='base' rowspan='2'><input type='file' name='FH' size='30' $cacrtdisabled></td></tr> - <tr><td><input type='radio' name='AUTH' value='certfile' $checked{'AUTH'}{'certfile'} $cacrtdisabled /></td> - <td class='base'>$Lang::tr{'upload a certificate'}</td></tr> + <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td><td class='base'>$Lang::tr{'upload a certificate request'}</td><td class='base' rowspan='2'><input type='file' name='FH' size='30' $cacrtdisabled></td></tr> + <tr><td><input type='radio' name='AUTH' value='certfile' $checked{'AUTH'}{'certfile'} $cacrtdisabled /></td><td class='base'>$Lang::tr{'upload a certificate'}</td></tr> <tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' BORDER='0' /></td></tr> - <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td> - <td class='base'>$Lang::tr{'generate a certificate'}</td><td> </td></tr> - <tr><td> </td> - <td class='base'>$Lang::tr{'users fullname or system hostname'}:</td> - <td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled /></td></tr> - <tr><td> </td> - <td class='base'>$Lang::tr{'users email'}: <img src='/blob.gif' /></td> - <td class='base' nowrap='nowrap'><input type='text' name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled /></td></tr> - <tr><td> </td> - <td class='base'>$Lang::tr{'users department'}: <img src='/blob.gif' /></td> - <td class='base' nowrap='nowrap'><input type='text' name='CERT_OU' value='$cgiparams{'CERT_OU'}' SIZE='32' $cakeydisabled /></td></tr> - <tr><td> </td> - <td class='base'>$Lang::tr{'organization name'}: <img src='/blob.gif' /></td> - <td class='base' nowrap='nowrap'><input type='text' name='CERT_ORGANIZATION' value='$cgiparams{'CERT_ORGANIZATION'}' SIZE='32' $cakeydisabled /></td></tr> - <tr><td> </td> - <td class='base'>$Lang::tr{'city'}: <img src='/blob.gif'></td> - <td class='base' nowrap='nowrap'><input type='text' name='CERT_CITY' value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled /></td></tr> - <tr><td> </td> - <td class='base'>$Lang::tr{'state or province'}: <img src='/blob.gif' /></td> - <td class='base' nowrap='nowrap'><input type='text' name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled /></td></tr> - <tr><td> </td> - <td class='base'>$Lang::tr{'country'}:</td> - <td class='base'><select name='CERT_COUNTRY' $cakeydisabled> + <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td><td class='base'>$Lang::tr{'generate a certificate'}</td><td> </td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'users fullname or system hostname'}:</td><td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'users email'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'users department'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_OU' value='$cgiparams{'CERT_OU'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'organization name'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_ORGANIZATION' value='$cgiparams{'CERT_ORGANIZATION'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'city'}: <img src='/blob.gif'></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_CITY' value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'state or province'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'country'}:</td><td class='base'><select name='CERT_COUNTRY' $cakeydisabled> END +; + +### +# m.a.d Disbale upload cert for n2n connections +### + +} else { + +print <<END + <table width='100%' cellpadding='0' cellspacing='5' border='0'> + + <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td><td class='base'>$Lang::tr{'generate a certificate'}</td><td> </td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'users fullname or system hostname'}:</td><td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'users email'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'users department'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_OU' value='$cgiparams{'CERT_OU'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'organization name'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_ORGANIZATION' value='$cgiparams{'CERT_ORGANIZATION'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'city'}: <img src='/blob.gif'></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_CITY' value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'state or province'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled /></td></tr> + <tr><td> </td><td class='base'>$Lang::tr{'country'}:</td><td class='base'><select name='CERT_COUNTRY' $cakeydisabled> + +END +; + +} + +### +# m.a.d Disbale upload cert for n2n connections end +### - ; foreach my $country (sort keys %{Countries::countries}) { print "<option value='$Countries::countries{$country}'"; if ( $Countries::countries{$country} eq $cgiparams{'CERT_COUNTRY'} ) { @@ -2436,20 +3090,36 @@ END } print ">$country</option>"; } +### +# m.a.d Disbale pkcs-password for n2n connections +### + +if ($cgiparams{'TYPE'} eq 'host') { print <<END </select></td></tr> - <tr><td> </td> - - <td class='base'>$Lang::tr{'valid till'} (days):</td> - <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr> - - <tr><td> </td> + + <td class='base'>$Lang::tr{'valid till'} (days):</td> + <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr> + <tr><td> </td> <td class='base'>$Lang::tr{'pkcs12 file password'}:</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr> <tr><td> </td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr> - </table> + </table> +END +}else{ + print <<END + </select></td></tr> + <tr><td> </td><td> </td><td> </td></tr> + <tr><td> </td><td> </td><td> </td></tr> + </table> + END +} + +### +# m.a.d Disbale pkcs-password for n2n connections end +### ; &Header::closebox(); } @@ -2517,9 +3187,6 @@ END $checked{'ENABLED_ORANGE'}{'off'} = ''; $checked{'ENABLED_ORANGE'}{'on'} = ''; $checked{'ENABLED_ORANGE'}{$cgiparams{'ENABLED_ORANGE'}} = 'CHECKED'; - - -#new settings $selected{'DDEVICE'}{'tun'} = ''; $selected{'DDEVICE'}{'tap'} = ''; $selected{'DDEVICE'}{$cgiparams{'DDEVICE'}} = 'SELECTED'; @@ -2791,8 +3458,15 @@ END print "<div align='center'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'reset'}' /></div></form>\n"; } if ( -f "${General::swroot}/ovpn/ca/cacert.pem" ) { + +### +# m.a.d Client Status Table +### + &Header::openbox('100%', 'LEFT', $Lang::tr{'Client status and controlc' }); print <<END + + <table width='100%' border='0' cellspacing='1' cellpadding='0'> <tr> <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></td> @@ -2827,13 +3501,23 @@ END $cavalid = $1; print "<td align='center'>$cavalid</td>"; print "<td align='center'>$confighash{$key}[25]</td>"; + my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; + if ($confighash{$key}[0] eq 'off') { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; } else { + +### +# m.a.d net2net Status +### + + if ($confighash{$cgiparams{'KEY'}}[3] eq 'host'){ + my $cn; - my @match = (); + my @match = (); foreach my $line (@status) { + chomp($line); if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); @@ -2842,11 +3526,36 @@ END } $cn =~ s/[_]/ /g; if ($cn eq "$confighash{$key}[2]") { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; } - } - } + } + } + } else { + my @tempovpnsubnet = split("\/",$confighash{$key}[27]); + my @ovpnip = split /\./,$tempovpnsubnet[0]; + my $pingip = ""; + + if ($confighash{$key}[6] eq 'server') { + $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].2"; + } else { + $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].1"; + } + + my $p = Net::Ping->new("udp",1); + + if ($p->ping($pingip)) { + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; + } + $p->close(); + + } } + +### +# m.a.d net2net Status end +### + + my $disable_clientdl = "disabled='disabled'"; if (( $cgiparams{'ENABLED'} eq 'on') || ( $cgiparams{'ENABLED_BLUE'} eq 'on') || @@ -2958,3 +3667,6 @@ END &Header::closebox(); } &Header::closepage(); + + + hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM