Skip to content

Commit e845b8e

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' into 'stable-3.1'
Added missing translating functions and fixed the language editor See merge request ispconfig/ispconfig3!994
2 parents bbb8e0b + 3cd63a2 commit e845b8e

File tree

114 files changed

+190
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+190
-42
lines changed

interface/web/admin/form/server_ip.tform.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
6565
*/
6666

67-
$form["title"] = "IP Addresses";
68-
$form["description"] = "Form to edit system IP Addresses";
67+
$form["title"] = "server_ip_edit_title";
68+
$form["description"] = "server_ip_edit_desc";
6969
$form["name"] = "server_ip";
7070
$form["action"] = "server_ip_edit.php";
7171
$form["db_table"] = "server_ip";

interface/web/admin/form/server_ip_map.tform.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
3030

31-
$form["title"] = "IPv4 Address mapping";
32-
$form["description"] = "Form to map IPv4-addresses for Web-Server";
31+
$form["title"] = "server_ip_map_title";
32+
$form["description"] = "server_ip_map_desc";
3333
$form["name"] = "server_ip_map";
3434
$form["action"] = "server_ip_map_edit.php";
3535
$form["db_table"] = "server_ip_map";
@@ -46,7 +46,7 @@
4646
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
4747

4848
$form["tabs"]['server_ip_map'] = array (
49-
'title' => "IP Address Mapping",
49+
'title' => "server_ip_map_title",
5050
'width' => 80,
5151
'template' => "templates/server_ip_map_edit.htm",
5252
'fields' => array (

interface/web/admin/form/system_config.tform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3434
*/
3535

36-
$form["title"] = "System Config";
36+
$form["title"] = "system_config_title";
3737
$form["description"] = "system_config_desc_txt";
3838
$form["name"] = "system_config";
3939
$form["action"] = "system_config_edit.php";

interface/web/admin/lib/lang/ar_server_ip.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
$wb['server_ip_edit_title'] = 'IP Adresses';
3+
$wb['server_ip_edit_desc'] = 'Form to edit system IP adresses';
24
$wb['server_id_txt'] = 'Server';
35
$wb['ip_address_txt'] = 'IP Address';
46
$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';

interface/web/admin/lib/lang/ar_server_ip_map.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
$wb['server_ip_map_title'] = 'IPv4 Address mapping';
3+
$wb['server_ip_map_desc'] = 'Form to map IPv4-addresses for Web-Server';
24
$wb['server_id_txt'] = 'Rewrite on Server';
35
$wb['source_txt'] = 'Source IP';
46
$wb['destination_txt'] = 'Destination IP';

interface/web/admin/lib/lang/ar_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
$wb['system_config_title'] = 'System Config';
23
$wb['system_config_desc_txt'] = '';
34
$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
45
$wb['dbname_prefix_txt'] = 'Database name prefix';

interface/web/admin/lib/lang/bg_server_ip.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
$wb['server_ip_edit_title'] = 'IP Adresses';
3+
$wb['server_ip_edit_desc'] = 'Form to edit system IP adresses';
24
$wb['server_id_txt'] = 'Сървър';
35
$wb['ip_address_txt'] = 'IP адрес';
46
$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';

interface/web/admin/lib/lang/bg_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
$wb['system_config_title'] = 'System Config';
23
$wb['warning'] = 'Редактирай тези променливи внимателно! Не премахвай префиксите на системата.';
34
$wb['dbname_prefix_txt'] = 'Име на префикса в базата данни';
45
$wb['dbuser_prefix_txt'] = 'Потребителски префикс в базата данни';

interface/web/admin/lib/lang/br_server_ip.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
$wb['server_ip_edit_title'] = 'IP Adresses';
3+
$wb['server_ip_edit_desc'] = 'Form to edit system IP adresses';
24
$wb['server_id_txt'] = 'Servidor';
35
$wb['client_id_txt'] = 'Cliente';
46
$wb['ip_type_txt'] = 'Tipo';

interface/web/admin/lib/lang/br_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
$wb['system_config_title'] = 'System Config';
23
$wb['system_config_desc_txt'] = 'Configurações do Sistema';
34
$wb['smtp_missing_admin_mail_txt'] = 'Por favor, insira um nome e e-mail do administrador se você usar smtp para envio dos e-mails do sistema.';
45
$wb['dashboard_atom_url_admin_txt'] = 'URL do Dashboard atom (admin)';

0 commit comments

Comments
 (0)