From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 88d73bef9143b7c11718aca7709eb57b29049f90
Date: Mon, 18 Jun 2012 21:19:08 +0200 [thread overview]
Message-ID: <20120618191908.BF80F200AD@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4356 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 88d73bef9143b7c11718aca7709eb57b29049f90 (commit)
via cb6ecee7993ac75f117ec5599aab1b2db492ad3e (commit)
from df106d88e5a7eeafb9298b0febbe02e9a349728f (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 88d73bef9143b7c11718aca7709eb57b29049f90
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Mon Jun 18 19:59:15 2012 +0200
redirect_wrapper: fix logfile path in log output.
fixes #10126.
commit cb6ecee7993ac75f117ec5599aab1b2db492ad3e
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Mon Jun 18 19:42:20 2012 +0200
lang.de: Fix pakfire updated string.
fixes #10112.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/61/filelists/files | 1 +
config/urlfilter/redirect_wrapper | 4 ++--
langs/de/cgi-bin/de.pl | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files
index 78765a6..11316eb 100644
--- a/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@ -5,3 +5,4 @@ srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
+usr/sbin/redirect_wrapper
diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper
index c3bbf7c..ceae12b 100644
--- a/config/urlfilter/redirect_wrapper
+++ b/config/urlfilter/redirect_wrapper
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -115,7 +115,7 @@ while($line = <>) {
exit 0;
sub writetolog {
- open(DATEI, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/redirector_debug";
+ open(DATEI, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/squid/redirector_debug";
my $log = shift;
print DATEI $log."\n";
close(DATEI);
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b576d3e..9bd2c72 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1383,10 +1383,10 @@
'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus Symbol.',
'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
'pakfire installed addons' => 'Installierte Addons:',
-'pakfire last core list update' => 'Letztes Corelisten Update vor',
-'pakfire last package update' => 'Letztes Paketlisten Update vor',
-'pakfire last serverlist update' => 'Letztes Serverlisten Update vor',
-'pakfire last update' => 'Letzes Update vor',
+'pakfire last core list update' => 'Letztes Corelisten Update ist',
+'pakfire last package update' => 'Letztes Paketlisten Update ist',
+'pakfire last serverlist update' => 'Letztes Serverlisten Update ist',
+'pakfire last update' => 'Letzes Update ist',
'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen sie unten eine Liste.',
'pakfire register' => 'Registrierung am Pakfire-Server:',
'pakfire system state' => 'System Status',
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-06-18 19:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120618191908.BF80F200AD@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox