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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 5145 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  c4791488a2c1e22a48baede5d7332a2467568a16 (commit)
       via  5bb906f7a96c946a5bfcca744ec19caef4b74825 (commit)
       via  d3790c6a0b1f9b52339604f5c4a95ebf4b7b3cd8 (commit)
      from  b76d0433be26c005f159aebf1fb19c579e8bd329 (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 c4791488a2c1e22a48baede5d7332a2467568a16
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Sep 20 22:23:53 2017 +0100

    hostapd: Bump package version for updated wlanap.cgi
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5bb906f7a96c946a5bfcca744ec19caef4b74825
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sun Sep 17 20:32:56 2017 +0200

    Typo in en.pl
    
    Fixes typo in
    http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=15f19ed85ea3e6944c5fea623eca8ef215eae39e
    
    Best,
    Matthias
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d3790c6a0b1f9b52339604f5c4a95ebf4b7b3cd8
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sun Sep 17 09:12:05 2017 +0200

    wlanap.cgi: Some cosmetics...
    
    - Added missing box heading ('Access Point Configuration') in 'wlanap.cgi'.
    - For this to work, added missing string 'wlanap configuration' in translations.
    - Changed existing translation strings in 'de.pl' and 'en.pl': 'wlanap' means 'wlan access point', so why is it called
    'wlan*ap* access point'?
    
    Best,
    Matthias
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 html/cgi-bin/wlanap.cgi | 4 ++--
 langs/de/cgi-bin/de.pl  | 3 ++-
 langs/en/cgi-bin/en.pl  | 3 ++-
 lfs/hostapd             | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 844c395..bb40021 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -154,7 +154,7 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
 	$memory=0;
 }
 
-&Header::openpage('', 1, '', '');
+&Header::openpage($Lang::tr{'wlanap configuration'}, 1, '', '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ( $errormessage ){
@@ -323,7 +323,7 @@ if ( $wlan_card_status ne '' ){
 	print "<tr><td class='base'>$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})</td>";
 	print $wlan_card_status eq 'up' ? $status_started : $status_stopped;
 	print"<td colspan='4'></td></tr>";
-	print "<tr><td class='base' bgcolor='$color{'color22'}'>$Lang::tr{'wlanap access point'}</td>";
+	print "<tr><td class='base' bgcolor='$color{'color22'}'>$Lang::tr{'wlanap'}</td>";
 	print $wlan_ap_status eq 'up' ? $status_started : $status_stopped;
 	if ( ($memory != 0) && (@pid[0] ne "///") ){
 		print "<td bgcolor='$color{'color22'}' align='center'>@pid[0]</td>";
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 0138cbc..7bc1c49 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2703,8 +2703,9 @@
 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP',
 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
 'wlan clients' => 'WLAN-Clients',
-'wlanap access point' => 'Access Point',
+'wlanap' => 'Access Point',
 'wlanap channel' => 'Kanal',
+'wlanap configuration' => 'Access Point Konfiguration',
 'wlanap country' => 'Ländercode',
 'wlanap debugging' => 'Debugging',
 'wlanap del interface' => 'Ausgewähltes Interface zurücksetzen?',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b3aee5a..ab1f401 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2748,8 +2748,9 @@
 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP',
 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
 'wlan clients' => 'Wireless clients',
-'wlanap access point' => 'Access Point',
+'wlanap' => 'Access Point',
 'wlanap channel' => 'Channel',
+'wlanap configuration' => 'Access Point Configuration',
 'wlanap country' => 'Country Code',
 'wlanap debugging' => 'Debugging',
 'wlanap del interface' => 'Remove selected interface?',
diff --git a/lfs/hostapd b/lfs/hostapd
index d94c0e7..11b4d1c 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 38
+PAK_VER    = 39
 
 DEPS       = ""
 


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