Revision: 5959
http://ipcop.svn.sourceforge.net/ipcop/?rev=5959&view=rev
Author: owes
Date: 2011-10-17 20:00:30 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
Some language text modifications.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/urlfilter.cgi
ipcop/trunk/langs/ipcop.new.en.pl
Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi 2011-10-16 15:29:33 UTC (rev
5958)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2011-10-17 20:00:30 UTC (rev
5959)
@@ -482,7 +482,7 @@
}
if ( ($tcsettings{'MODE'} eq 'TIMECONSTRAINT')
- && ($tcsettings{'ACTION'} eq $Lang::tr{'urlfilter copy rule'})
+ && ($tcsettings{'ACTION'} eq $Lang::tr{'copy rule'})
&& (!$errormessage))
{
$id = 0;
@@ -589,7 +589,7 @@
}
if ( (!$errormessage)
- && (!($tcsettings{'ACTION'} eq $Lang::tr{'urlfilter copy rule'}))
+ && (!($tcsettings{'ACTION'} eq $Lang::tr{'copy rule'}))
&& (!($tcsettings{'ACTION'} eq $Lang::tr{'edit'})))
{
$tcsettings{'ENABLERULE'} = 'on';
@@ -1028,7 +1028,7 @@
}
}
-if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter update now'}) {
+if ($filtersettings{'ACTION'} eq $Lang::tr{'instant update'}) {
if ($filtersettings{'UPDATE_SOURCE'} eq 'custom') {
if ($filtersettings{'CUSTOM_UPDATE_URL'} eq '') {
$errormessage = $Lang::tr{'urlfilter custom url required'};
@@ -1511,13 +1511,13 @@
<tr>
<td width='25%' class='base'>$Lang::tr{'urlfilter enable expression
lists'}:</td>
<td width='25%'><input type='checkbox' name='ENABLE_EXPR_LISTS'
$checked{'ENABLE_EXPR_LISTS'}{'on'} /></td>
- <td width='25%' class='base'>$Lang::tr{'urlfilter enable log'}:</td>
+ <td width='25%' class='base'>$Lang::tr{'log enabled'}:</td>
<td width='25%'><input type='checkbox' name='ENABLE_LOG'
$checked{'ENABLE_LOG'}{'on'} /></td>
</tr>
<tr>
<td class='base'>$Lang::tr{'urlfilter safesearch'}:</td>
<td><input type='checkbox' name='ENABLE_SAFESEARCH'
$checked{'ENABLE_SAFESEARCH'}{'on'} /></td>
- <td class='base'>$Lang::tr{'urlfilter username log'}:</td>
+ <td class='base'>$Lang::tr{'log username'}:</td>
<td><input type='checkbox' name='ENABLE_USERNAME_LOG'
$checked{'ENABLE_USERNAME_LOG'}{'on'} /></td>
</tr>
<tr>
@@ -1615,9 +1615,9 @@
<td class='base'>$Lang::tr{'urlfilter automatic update schedule'}:</td>
<td class='base'>
<select name='UPDATE_SCHEDULE'>
- <option value='daily'
$selected{'UPDATE_SCHEDULE'}{'daily'}>$Lang::tr{'urlfilter daily'}</option>
- <option value='weekly'
$selected{'UPDATE_SCHEDULE'}{'weekly'}>$Lang::tr{'urlfilter weekly'}</option>
- <option value='monthly'
$selected{'UPDATE_SCHEDULE'}{'monthly'}>$Lang::tr{'urlfilter monthly'}</option>
+ <option value='daily'
$selected{'UPDATE_SCHEDULE'}{'daily'}>$Lang::tr{'daily'}</option>
+ <option value='weekly'
$selected{'UPDATE_SCHEDULE'}{'weekly'}>$Lang::tr{'weekly'}</option>
+ <option value='monthly'
$selected{'UPDATE_SCHEDULE'}{'monthly'}>$Lang::tr{'monthly'}</option>
</select>
</td>
</tr>
@@ -1647,7 +1647,7 @@
</table>
<table width='100%'>
<tr>
- <td width='25%'><input type='submit' name='ACTION'
value='$Lang::tr{'urlfilter save schedule'}'> <input
type='submit' name='ACTION' value='$Lang::tr{'urlfilter update now'}'></td>
+ <td width='25%'><input type='submit' name='ACTION'
value='$Lang::tr{'urlfilter save schedule'}'> <input
type='submit' name='ACTION' value='$Lang::tr{'instant update'}'></td>
</tr>
</table>
@@ -1725,7 +1725,7 @@
<td><input type='file' name='UPLOADFILE' size='50' /> <input
type='submit' name='ACTION' value='$Lang::tr{'upload file'}' /></td>
</tr>
<tr>
- <td><br><b>$Lang::tr{'urlfilter upload file information 1'}:</b>
$Lang::tr{'urlfilter upload file information 2'}</td>
+ <td><br><b>$Lang::tr{'note'}:</b> $Lang::tr{'urlfilter upload file
information 2'}</td>
</tr>
</table>
<hr>
@@ -1752,8 +1752,8 @@
print <<END
<table width='100%'>
<tr>
- <td align='center'><b>$Lang::tr{'urlfilter filename'}</b></td>
- <td width='15%' align='center'><b>$Lang::tr{'urlfilter
filesize'}</b></td>
+ <td align='center'><b>$Lang::tr{'name'}</b></td>
+ <td width='15%' align='center'><b>$Lang::tr{'size'}</b></td>
<td width='10%'></td>
</tr>
END
@@ -1845,9 +1845,9 @@
<td width='2%' align='center'>$Lang::tr{'saturday short'}</td>
<td width='2%' align='center'>$Lang::tr{'sunday short'}</td>
<td width='1%'> </td>
- <td width='7%' colspan=3>$Lang::tr{'urlfilter from'}</td>
+ <td width='7%' colspan=3>$Lang::tr{'from'}</td>
<td width='1%'> </td>
- <td width='7%' colspan=3>$Lang::tr{'urlfilter to'}</td>
+ <td width='7%' colspan=3>$Lang::tr{'to'}</td>
<td> </td>
</tr>
<tr>
@@ -1923,7 +1923,7 @@
<tr>
<td width='5%'>$Lang::tr{'urlfilter source'}</td>
<td width='1%'> </td>
- <td width='5%'>$Lang::tr{'urlfilter dst'} <img
src='/blob.gif' alt='*'><img src='/blob.gif' alt='*'></td>
+ <td width='5%'>$Lang::tr{'destination'} <img
src='/blob.gif' alt='*'><img src='/blob.gif' alt='*'></td>
<td width='1%'> </td>
<td width='5%'>$Lang::tr{'access'}</td>
<td> </td>
@@ -1970,8 +1970,8 @@
<td> </td>
<td class='base' valign='top'>
<select name='ACCESS'>
- <option value='block'
$selected{'ACCESS'}{'block'}>$Lang::tr{'urlfilter mode block'}</option>
- <option value='allow'
$selected{'ACCESS'}{'allow'}>$Lang::tr{'urlfilter mode allow'}</option>
+ <option value='block'
$selected{'ACCESS'}{'block'}>$Lang::tr{'block'}</option>
+ <option value='allow'
$selected{'ACCESS'}{'allow'}>$Lang::tr{'allow'}</option>
</select>
</td>
<td> </td>
@@ -2002,7 +2002,7 @@
<table width='100%'>
<tr>
- <td class='base'>$Lang::tr{'urlfilter enabled'}<input
type='checkbox' name='ENABLERULE' $checked{'ENABLERULE'}{'on'} /></td>
+ <td class='base'>$Lang::tr{'enabled'}:<input type='checkbox'
name='ENABLERULE' $checked{'ENABLERULE'}{'on'} /></td>
</tr>
</table>
@@ -2024,7 +2024,7 @@
<input type='submit' name='SUBMIT' value='$buttontext' />
</td>
<td class='button2buttons'>
- <input type='reset' name='ACTION' value='$Lang::tr{'urlfilter reset'}'
/>
+ <input type='reset' name='ACTION' value='$Lang::tr{'reset'}' />
</td>
<td class='onlinehelp'>
<a href='${General::adminmanualurl}/system-email-settings.html'
target='_blank'><img src='/images/web-support.png' alt='$Lang::tr{'online help
en'}' title='$Lang::tr{'online help en'}' /></a>
@@ -2055,8 +2055,8 @@
<tr>
<td width='5%' class='boldbase'
align='center'><b>$Lang::tr{'urlfilter constraint definition'}</b></td>
<td width='10%' class='boldbase'
align='center'><b>$Lang::tr{'urlfilter time space'}</b></td>
- <td width='15%' class='boldbase'
align='center'><b>$Lang::tr{'urlfilter src'}</b></td>
- <td width='5%' class='boldbase'
align='center'><b>$Lang::tr{'urlfilter dst'}</b></td>
+ <td width='15%' class='boldbase'
align='center'><b>$Lang::tr{'source'}</b></td>
+ <td width='5%' class='boldbase'
align='center'><b>$Lang::tr{'destination'}</b></td>
<td width='10%' class='boldbase' colspan='5'
align='center'> </td>
</tr>
END
@@ -2135,10 +2135,10 @@
<td align='center'>
<form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' name='$Lang::tr{'urlfilter copy rule'}'
src='/images/urlfilter/copy.gif' title='$Lang::tr{'urlfilter copy rule'}'
alt='$Lang::tr{'urlfilter copy rule'}' />
+ <input type='image' name='$Lang::tr{'copy rule'}'
src='/images/urlfilter/copy.gif' title='$Lang::tr{'copy rule'}'
alt='$Lang::tr{'copy rule'}' />
<input type='hidden' name='MODE' value='TIMECONSTRAINT' />
<input type='hidden' name='ID' value='$id' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'urlfilter
copy rule'}' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'copy
rule'}' />
</form>
</td>
@@ -2183,17 +2183,17 @@
<tr>
<td class='boldbase'> <b>$Lang::tr{'legend'}:</b></td>
<td> <img src='/images/urlfilter/led-green.gif'
alt='$Lang::tr{'urlfilter allow access'}' /></td>
- <td class='base'>$Lang::tr{'urlfilter allow'}</td>
+ <td class='base'>$Lang::tr{'allow'}</td>
<td> <img src='/images/urlfilter/led-red.gif'
alt='$Lang::tr{'urlfilter block access'}' /></td>
- <td class='base'>$Lang::tr{'urlfilter block'}</td>
+ <td class='base'>$Lang::tr{'block'}</td>
<td> <img src='/images/on.gif' alt='$Lang::tr{'click to
disable'}' /></td>
<td class='base'>$Lang::tr{'click to disable'}</td>
<td> <img src='/images/off.gif'
alt='$Lang::tr{'click to enable'}' /></td>
<td class='base'>$Lang::tr{'click to enable'}</td>
<td> <img src='/images/edit.gif'
alt='$Lang::tr{'edit'}' /></td>
<td class='base'>$Lang::tr{'edit'}</td>
- <td> <img src='/images/urlfilter/copy.gif'
alt='$Lang::tr{'urlfilter copy rule'}' /></td>
- <td class='base'>$Lang::tr{'urlfilter copy rule'}</td>
+ <td> <img src='/images/urlfilter/copy.gif'
alt='$Lang::tr{'copy rule'}' /></td>
+ <td class='base'>$Lang::tr{'copy rule'}</td>
<td> <img src='/images/delete.gif'
alt='$Lang::tr{'remove'}' /></td>
<td class='base'>$Lang::tr{'remove'}</td>
</tr>
@@ -2258,21 +2258,21 @@
</tr><tr>
<td class='base'>$Lang::tr{'urlfilter activity detection'}:</td>
<td class='base'><select name='SPORADIC'>
- <option value='0'
$selected{'SPORADIC'}{'0'}>$Lang::tr{'urlfilter disabled'}</option>
- <option value='300' $selected{'SPORADIC'}{'300'}>5
$Lang::tr{'urlfilter minutes'}</option>
- <option value='900' $selected{'SPORADIC'}{'900'}>15
$Lang::tr{'urlfilter minutes'}</option>
+ <option value='0'
$selected{'SPORADIC'}{'0'}>$Lang::tr{'disabled'}</option>
+ <option value='300' $selected{'SPORADIC'}{'300'}>5
$Lang::tr{'minutes'}</option>
+ <option value='900' $selected{'SPORADIC'}{'900'}>15
$Lang::tr{'minutes'}</option>
</select></td>
</tr><tr>
<td class='base'>$Lang::tr{'urlfilter renewal period'}:</td>
<td class='base'><select name='RENEWAL'>
- <option value='hourly'
$selected{'RENEWAL'}{'hourly'}>$Lang::tr{'urlfilter hourly'}</option>
- <option value='daily'
$selected{'RENEWAL'}{'daily'}>$Lang::tr{'urlfilter daily'}</option>
- <option value='weekly'
$selected{'RENEWAL'}{'weekly'}>$Lang::tr{'urlfilter weekly'}</option>
+ <option value='hourly'
$selected{'RENEWAL'}{'hourly'}>$Lang::tr{'hourly'}</option>
+ <option value='daily'
$selected{'RENEWAL'}{'daily'}>$Lang::tr{'daily'}</option>
+ <option value='weekly'
$selected{'RENEWAL'}{'weekly'}>$Lang::tr{'weekly'}</option>
</select></td>
</tr><tr>
<td colspan='2'> </td>
</tr><tr>
- <td class='base'>$Lang::tr{'urlfilter enabled'}</td>
+ <td class='base'>$Lang::tr{'enabled'}:</td>
<td class='base'><input type='checkbox' name='ENABLEQUOTA'
$checked{'ENABLEQUOTA'}{'on'} /></td>
</tr>
</table>
@@ -2294,7 +2294,7 @@
<input type='submit' name='SUBMIT' value='$buttontext' />
</td>
<td class='button2buttons'>
- <input type='reset' name='ACTION' value='$Lang::tr{'urlfilter reset'}'
/>
+ <input type='reset' name='ACTION' value='$Lang::tr{'reset'}' />
</td>
<td class='onlinehelp'>
<a href='${General::adminmanualurl}/system-email-settings.html'
target='_blank'><img src='/images/web-support.png' alt='$Lang::tr{'online help
en'}' title='$Lang::tr{'online help en'}' /></a>
@@ -2356,15 +2356,15 @@
else { $gif = 'off.gif'; $toggle = 'on'; $gdesc =
$Lang::tr{'click to enable'}; }
$temp[5] = $temp[1];
- if ($temp[1] eq '0') { $temp[5] = $Lang::tr{'urlfilter disabled'} }
- else { $temp[5] = ($temp[5] / 60) . ' ' .
$Lang::tr{'urlfilter minutes'} }
+ if ($temp[1] eq '0') { $temp[5] = $Lang::tr{'disabled'} }
+ else { $temp[5] = ($temp[5] / 60) . ' ' .
$Lang::tr{'minutes'} }
$_ = $temp[3];
s/\|/, /g;
s/%5c/\\/g;
$temp[6] = $_;
print <<END
- <td align='center'>$temp[0] $Lang::tr{'urlfilter minutes'}</td>
+ <td align='center'>$temp[0] $Lang::tr{'minutes'}</td>
<td align='center'>$temp[5]</td>
<td align='center'>$Lang::tr{'urlfilter '.$temp[2]}</td>
<td align='center'>$temp[6]</td>
@@ -2569,7 +2569,7 @@
<table width='100%'>
<tr>
<td class='comment1button'> </td>
- <td class='button1button'><input type='reset' name='ACTION'
value='$Lang::tr{'urlfilter reset'}' /></td>
+ <td class='button1button'><input type='reset' name='ACTION'
value='$Lang::tr{'reset'}' /></td>
<td class='onlinehelp'>
<a href='${General::adminmanualurl}/services-webproxy.html'
target='_blank'>
<img src='/images/web-support.png' alt='$Lang::tr{'online help en'}'
title='$Lang::tr{'online help en'}' /></a></td>
Modified: ipcop/trunk/langs/ipcop.new.en.pl
===================================================================
--- ipcop/trunk/langs/ipcop.new.en.pl 2011-10-16 15:29:33 UTC (rev 5958)
+++ ipcop/trunk/langs/ipcop.new.en.pl 2011-10-17 20:00:30 UTC (rev 5959)
@@ -170,14 +170,12 @@
'urlfilter add new time constraint rule' => 'Add new time constraint rule',
'urlfilter add new user quota rule' => 'Add new user quota rule',
'urlfilter allow access' => 'Allow access',
-'urlfilter allow' => 'Allow',
'urlfilter allowed domains' => 'Allowed domains (one per line)',
'urlfilter allowed urls' => 'Allowed URLs (one per line)',
'urlfilter assigned quota users' => 'Assigned users (one per line)',
'urlfilter assigned users' => 'Assigned users',
'urlfilter automatic blacklist update' => 'Automatic blacklist update',
'urlfilter automatic update schedule' => 'Automatic update schedule',
-'urlfilter back to main page' => 'Back to main page',
'urlfilter background text' => 'To use a custom background image for the block
page upload the .jpg file below',
'urlfilter backup error' => 'Unable to create backup file',
'urlfilter backup settings' => 'Backup URL filter settings',
@@ -198,7 +196,6 @@
'urlfilter block executables' => 'Block executable files',
'urlfilter block ip' => 'Block sites accessed by it\'s IP address',
'urlfilter block settings' => 'Block page settings',
-'urlfilter block' => 'Block',
'urlfilter blocked domains' => 'Blocked domains (one per line)',
'urlfilter blocked expressions' => 'Blocked expressions (as regular
expressions)',
'urlfilter blocked urls' => 'Blocked URLs (one per line)',
@@ -208,24 +205,19 @@
'urlfilter category name error' => 'Blacklist category name required',
'urlfilter category' => 'Category',
'urlfilter children' => 'Number of filter processes',
-'urlfilter client' => 'Client',
'urlfilter configuration' => 'URL filter configuration',
'urlfilter constraint definition' => 'Definition',
'urlfilter constraint outside' => 'outside',
'urlfilter constraint within' => 'within',
-'urlfilter copy rule' => 'Copy',
'urlfilter current files' => 'Current files in local repository',
'urlfilter custom blacklist' => 'Custom blacklist',
'urlfilter custom expression list' => 'Custom expression list',
'urlfilter custom url required' => 'Custom source URL required',
'urlfilter custom url' => 'Custom source URL',
'urlfilter custom whitelist' => 'Custom whitelist',
-'urlfilter daily' => 'daily',
-'urlfilter disabled' => 'disabled',
'urlfilter domains' => 'Domains (one per line)',
'urlfilter dont restart urlfilter' => 'Do not restart URL filter',
'urlfilter dst error' => 'There must be at least one category selected',
-'urlfilter dst' => 'Destination',
'urlfilter edit domains urls expressions' => 'Edit domains, URLs and
expressions',
'urlfilter edit time constraint rule' => 'Edit an existing time constraint
rule',
'urlfilter edit user quota rule' => 'Edit an existing user quota rule',
@@ -238,19 +230,12 @@
'urlfilter enable expression lists' => 'Enable expression lists',
'urlfilter enable full backup' => 'Include complete blacklist',
'urlfilter enable jpeg' => 'Enable background image',
-'urlfilter enable log' => 'Enable log',
'urlfilter enable rewrite rules' => 'Enable local file redirection',
-'urlfilter enabled' => 'Enabled:',
'urlfilter export blacklist' => 'Export blacklist',
'urlfilter export error' => 'Unable to create export file',
'urlfilter expressions' => 'Expressions (one per line)',
'urlfilter file ext block' => 'File extension blocking',
-'urlfilter filename' => 'Name',
-'urlfilter filesize' => 'Size',
'urlfilter filter settings' => 'URL filter settings',
-'urlfilter friday' => 'Fri',
-'urlfilter from' => 'From',
-'urlfilter hourly' => 'hourly',
'urlfilter import blacklist' => 'Import blacklist',
'urlfilter import text' => 'To import a previously saved blacklist editor file
upload the .tar.gz file below',
'urlfilter install blacklist' => 'Install blacklist',
@@ -268,11 +253,6 @@
'urlfilter maintenance' => 'URL filter maintenance',
'urlfilter manage local file repository' => 'Manage local file repository',
'urlfilter manage repository' => 'Manage repository',
-'urlfilter minutes' => 'minutes',
-'urlfilter mode allow' => 'allow',
-'urlfilter mode block' => 'block',
-'urlfilter monday' => 'Mon',
-'urlfilter monthly' => 'monthly',
'urlfilter msg text 1' => 'Message line 1',
'urlfilter msg text 2' => 'Message line 2',
'urlfilter msg text 3' => 'Message line 3',
@@ -297,7 +277,6 @@
'urlfilter restore text' => 'To restore a previously saved configuration
upload the .tar.gz backup file below',
'urlfilter restore' => 'Import backup file',
'urlfilter safesearch' => 'Enable SafeSearch',
-'urlfilter saturday' => 'Sat',
'urlfilter save and restart' => 'Save and restart',
'urlfilter save schedule' => 'Save update settings',
'urlfilter select blacklist' => 'Select existing blacklist',
@@ -311,25 +290,17 @@
'urlfilter show url' => 'Show URL on block page',
'urlfilter source' => 'Source host(s) or network(s)',
'urlfilter src error' => 'Source cannot be empty',
-'urlfilter src' => 'Source',
-'urlfilter sunday' => 'Sun',
'urlfilter tar error' => 'Could not extract files from tar archive',
-'urlfilter thursday' => 'Thu',
'urlfilter time quota' => 'Time quota',
'urlfilter time space' => 'Time space',
-'urlfilter time' => 'Time',
'urlfilter timebased access control' => 'Time based access control',
'urlfilter timespace error' => 'Error in time space declaration',
-'urlfilter to' => 'To',
-'urlfilter tuesday' => 'Tue',
'urlfilter unfiltered clients' => 'Unfiltered IP addresses (one per line)',
'urlfilter update information' => 'There is an updated version available for
download. Visit <a href=\"http://www.urlfilter.net\";
target=\"_blank\">http://www.urlfilter.net</a> for more information.',
'urlfilter update notification' => 'Update notification!',
-'urlfilter update now' => 'Update now',
'urlfilter update results' => 'Blacklist update results',
'urlfilter upload background' => 'Upload image',
'urlfilter upload blacklist' => 'Upload blacklist',
-'urlfilter upload file information 1' => 'Note',
'urlfilter upload file information 2' => 'The URL filter needs to be restarted
to activate changes to the repository.',
'urlfilter upload file text' => 'To add a file to the local repository upload
the file below',
'urlfilter upload information' => 'The new blacklist will be automatically
compiled to prebuilt databases. Depending on the size of the blacklist, this
may take several minutes. Please wait for this task to be finished before
restarting the URL filter.',
@@ -338,12 +309,8 @@
'urlfilter urlfilter blacklist editor' => 'URL filter blacklist editor',
'urlfilter urls' => 'URLs (one per line)',
'urlfilter user time quota' => 'Time quota (in minutes)',
-'urlfilter username log' => 'Log username',
-'urlfilter username' => 'Username',
'urlfilter web proxy service required' => 'Web proxy service must be enabled
to use URL filter',
-'urlfilter wednesday' => 'Wed',
'urlfilter weekday error' => 'There must be at least one day selected',
-'urlfilter weekly' => 'weekly',
'urlfilter whitelist always allowed' => 'Allow custom whitelist for banned
clients',
'urlfilter wrong filetype' => 'File has not the extension .tar.gz',
######## Stop Edit above ##########
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
