Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

This commit is contained in:
Arne Fitzenreiter
2013-09-07 14:46:45 +02:00
10 changed files with 13 additions and 4 deletions

View File

@@ -603,4 +603,3 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: wlanap country

View File

@@ -712,6 +712,7 @@ WARNING: untranslated string: fwhost deleted
WARNING: untranslated string: fwhost empty
WARNING: untranslated string: fwhost err addr
WARNING: untranslated string: fwhost err empty
WARNING: untranslated string: fwhost err emptytable
WARNING: untranslated string: fwhost err groupempty
WARNING: untranslated string: fwhost err grpexist
WARNING: untranslated string: fwhost err hostexist

View File

@@ -715,6 +715,7 @@ WARNING: untranslated string: fwhost deleted
WARNING: untranslated string: fwhost empty
WARNING: untranslated string: fwhost err addr
WARNING: untranslated string: fwhost err empty
WARNING: untranslated string: fwhost err emptytable
WARNING: untranslated string: fwhost err groupempty
WARNING: untranslated string: fwhost err grpexist
WARNING: untranslated string: fwhost err hostexist

View File

@@ -661,6 +661,7 @@ WARNING: untranslated string: fwhost deleted
WARNING: untranslated string: fwhost empty
WARNING: untranslated string: fwhost err addr
WARNING: untranslated string: fwhost err empty
WARNING: untranslated string: fwhost err emptytable
WARNING: untranslated string: fwhost err groupempty
WARNING: untranslated string: fwhost err grpexist
WARNING: untranslated string: fwhost err hostexist

View File

@@ -712,6 +712,7 @@ WARNING: untranslated string: fwhost deleted
WARNING: untranslated string: fwhost empty
WARNING: untranslated string: fwhost err addr
WARNING: untranslated string: fwhost err empty
WARNING: untranslated string: fwhost err emptytable
WARNING: untranslated string: fwhost err groupempty
WARNING: untranslated string: fwhost err grpexist
WARNING: untranslated string: fwhost err hostexist

View File

@@ -698,6 +698,7 @@ WARNING: untranslated string: fwhost deleted
WARNING: untranslated string: fwhost empty
WARNING: untranslated string: fwhost err addr
WARNING: untranslated string: fwhost err empty
WARNING: untranslated string: fwhost err emptytable
WARNING: untranslated string: fwhost err groupempty
WARNING: untranslated string: fwhost err grpexist
WARNING: untranslated string: fwhost err hostexist

View File

@@ -658,6 +658,7 @@ WARNING: untranslated string: fwhost deleted
WARNING: untranslated string: fwhost empty
WARNING: untranslated string: fwhost err addr
WARNING: untranslated string: fwhost err empty
WARNING: untranslated string: fwhost err emptytable
WARNING: untranslated string: fwhost err groupempty
WARNING: untranslated string: fwhost err grpexist
WARNING: untranslated string: fwhost err hostexist

View File

@@ -5,7 +5,6 @@
# Checking cgi-bin translations for language: en #
############################################################################
< ccd maxclients
< wlanap country
############################################################################
# Checking install/setup translations for language: fr #
############################################################################
@@ -200,6 +199,7 @@
< fwhost err addr
< fwhost err addrgrp
< fwhost err empty
< fwhost err emptytable
< fwhost err groupempty
< fwhost err grpexist
< fwhost err hostexist
@@ -595,6 +595,7 @@
< fwhost err addr
< fwhost err addrgrp
< fwhost err empty
< fwhost err emptytable
< fwhost err groupempty
< fwhost err grpexist
< fwhost err hostexist
@@ -974,6 +975,7 @@
< fwhost err addr
< fwhost err addrgrp
< fwhost err empty
< fwhost err emptytable
< fwhost err groupempty
< fwhost err grpexist
< fwhost err hostexist
@@ -1342,6 +1344,7 @@
< fwhost err addr
< fwhost err addrgrp
< fwhost err empty
< fwhost err emptytable
< fwhost err groupempty
< fwhost err grpexist
< fwhost err hostexist

View File

@@ -1,4 +1,4 @@
%tr = (
%tr = (
%tr,
'Act as' => 'Konfiguriert als',

View File

@@ -1,4 +1,4 @@
%tr = (
%tr = (
%tr,
'Act as' => 'Act as:',
@@ -2512,6 +2512,7 @@
'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
'wlanap access point' => 'Access Point',
'wlanap channel' => 'Channel',
'wlanap country' => 'Country Code',
'wlanap debugging' => 'Debugging',
'wlanap del interface' => 'Remove selected interface?',
'wlanap encryption' => 'Encryption',