[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b2faf4f566b687052d40c8a2c37ed633ed643cb8

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b2faf4f566b687052d40c8a2c37ed633ed643cb8

[git]

[-- Attachment #1: Type: text/plain, Size: 4281 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  b2faf4f566b687052d40c8a2c37ed633ed643cb8 (commit)
       via  5b93b50c6d91cf69d7716c6714808b6a5f87c224 (commit)
      from  bd767b27c85b2c6992cac38781b7bb78a03b694a (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 b2faf4f566b687052d40c8a2c37ed633ed643cb8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jun 4 18:17:33 2015 +0200

    core91: Add changed pppsetup.cgi and language files

commit 5b93b50c6d91cf69d7716c6714808b6a5f87c224
Author: Lars Schuhmacher <larsen007(a)web.de>
Date:   Tue Jun 2 21:49:24 2015 +0200

    Fix hardcoded strings in pppsetup.cgi
    
    Some strings for PPTP were hardcoded instead of using i18n features.
    
    Signed-off-by: Lars Schuhmacher <larsen007(a)web.de>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/91/filelists/files | 2 ++
 html/cgi-bin/pppsetup.cgi                | 6 +++---
 langs/de/cgi-bin/de.pl                   | 3 +++
 langs/en/cgi-bin/en.pl                   | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files
index 76eee39..7cc5aa2 100644
--- a/config/rootfiles/core/91/filelists/files
+++ b/config/rootfiles/core/91/filelists/files
@@ -3,3 +3,5 @@ etc/issue
 opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/pppsetup.cgi
+var/ipfire/langs
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 33f521e..59677a4 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -793,15 +793,15 @@ print <<END
         <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pptp settings'}</b></td>
 </tr>
 <tr>
-        <td width='25%'>Peer</td>
+        <td width='25%'>$Lang::tr{'pptp peer'}:</td>
         <td colspan='3'><input size=50 type='text' name='PPTP_PEER' value='$pppsettings{'PPTP_PEER'}' /></td>
 </tr>
 <tr>
-        <td width='25%'>My Netconfig</td>
+        <td width='25%'>$Lang::tr{'pptp netconfig'}:</td>
         <td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td>
 </tr>
 <tr>
-        <td width='25%'>PPTP Route&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td width='25%'>$Lang::tr{'pptp route'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
         <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td>
 </tr>
 
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 8adefdf..48ade28 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1822,6 +1822,9 @@
 'ppp setup' => 'PPP-Einstellungen',
 'pppoe' => 'PPPoE',
 'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:',
+'pptp netconfig' => 'Eigene Netzkonfiguration',
+'pptp peer' => 'Gegenstelle',
+'pptp route' => 'PPTP-Route',
 'pptp settings' => 'Zusätzliche PPTP-Einstellungen:',
 'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz',
 'prefered master' => 'Prefered Master',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 43601c8..7964644 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1852,6 +1852,9 @@
 'ppp setup' => 'PPP setup',
 'pppoe' => 'PPPoE',
 'pppoe settings' => 'Additional PPPoE settings:',
+'pptp netconfig' => 'My Net Config',
+'pptp peer' => 'Peer',
+'pptp route' => 'PPTP Route',
 'pptp settings' => 'Additional PPTP settings:',
 'pre-shared key is too short' => 'Pre-shared key is too short.',
 'prefered master' => 'Prefered Master',


hooks/post-receive
--
IPFire 2.x development tree