Skip to content

Commit 33409b3

Browse files
author
Till Brehm
committed
Merge branch 'patch-misc' into 'develop'
Collected minor correction/ translation fixes See merge request ispconfig/ispconfig3!1646
2 parents e256b26 + 1cae036 commit 33409b3

40 files changed

+56
-55
lines changed

‎interface/web/client/client_edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function onShowNew() {
6161
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
6262
$client = $app->db->queryOneRecord("SELECT limit_client FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
6363

64-
// Check if the user may add another website.
64+
// Check if the user may add another.
6565
if($client["limit_client"] >= 0) {
6666
$tmp = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE sys_groupid = ?", $client_group_id);
6767
if($tmp["number"] >= $client["limit_client"]) {
@@ -84,7 +84,7 @@ function onSubmit() {
8484
$client_group_id = $_SESSION["s"]["user"]["default_group"];
8585
$client = $app->db->queryOneRecord("SELECT limit_client FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
8686

87-
// Check if the user may add another website.
87+
// Check if the user may add another.
8888
if($client["limit_client"] >= 0) {
8989
$tmp = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE sys_groupid = ?", $client_group_id);
9090
if($tmp["number"] >= $client["limit_client"]) {

‎interface/web/client/reseller_edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function onShowNew() {
6363
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
6464
$client = $app->db->queryOneRecord("SELECT limit_client FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
6565

66-
// Check if the user may add another website.
66+
// Check if the user may add another.
6767
if($client["limit_client"] >= 0) {
6868
$tmp = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE sys_groupid = ?", $client_group_id);
6969
if($tmp["number"] >= $client["limit_client"]) {
@@ -86,7 +86,7 @@ function onSubmit() {
8686
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
8787
$client = $app->db->queryOneRecord("SELECT limit_client FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
8888

89-
// Check if the user may add another website.
89+
// Check if the user may add another.
9090
if($client["limit_client"] >= 0) {
9191
$tmp = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE sys_groupid = ?", $client_group_id);
9292
if($tmp["number"] >= $client["limit_client"]) {

‎interface/web/dns/lib/lang/nl_dns_slave.lng‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ $wb['server_id_txt'] = 'Server';
33
$wb['origin_txt'] = 'DNS Zone';
44
$wb['ns_txt'] = 'NS';
55
$wb['active_txt'] = 'Actief';
6-
$wb['limit_dns_slave_zone_txt'] = 'Het max. aan secundary DNS records voor uw account is bereikt.';
6+
$wb['limit_dns_slave_zone_txt'] = 'Het max. aan secundary DNS zones voor uw account is bereikt.';
77
$wb['client_txt'] = 'Klant';
88
$wb['xfer_txt'] = 'Sta zone transfers toe naar <br />deze IPs (komma gescheiden waarden)';
99
$wb['server_id_error_empty'] = 'Geen server geselecteerd';
1010
$wb['origin_error_empty'] = 'Zone is niet ingvuld.';
1111
$wb['origin_error_unique'] = 'Er is al een record for deze zone.';
1212
$wb['origin_error_regex'] = 'Zone heeft een ongeldig formaat.';
1313
$wb['ns_error_regex'] = 'NS heeft een ongeldig formaat.';
14-
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
15-
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
14+
$wb['eg_domain_tld'] = 'bijvoorbeeld domein.tld.';
15+
$wb['ipv4_form_txt'] = 'Scheid meerdere IPs met een komma';
1616
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
1717
?>

‎interface/web/login/lib/lang/nl.lng‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $wb['pass_reset_txt'] = 'Een nieuw wachtwoord zal worden gegenereerd en per e-ma
77
$wb['pw_reset'] = 'Het wachtwoord is gereset en is verzonden naar uw e-mailadres.';
88
$wb['pw_error'] = 'Gebruikersnaam of e-mailadres komt niet overeen.';
99
$wb['pw_error_noinput'] = 'Voer a.u.b. een e-mailadres en gebruikersnaam in.';
10-
$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.';
10+
$wb['pw_reset_error_smtp_connection'] = 'Het versturen van een email met uw nieuwe wachtwoord is mislukt.';
1111
$wb['pw_reset_mail_msg'] = 'Het wachtwoord dat toegang biedt tot uw ISPConfig 3 control panel account is gereset. Het nieuwe wachtwoord is: ';
1212
$wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel wachtwoord is gereset.';
1313
$wb['user_regex_error'] = 'Gebruikersnaam bevat karakters die niet zijn toegestaan of is langer dan 64 karakters.';
@@ -21,17 +21,17 @@ $wb['login_txt'] = 'Inloggen';
2121
$wb['pw_reset_txt'] = 'Wachtwoord herstellen';
2222
$wb['pw_button_txt'] = 'Wachtwoord versturen';
2323
$wb['email_txt'] = 'Email';
24-
$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
25-
$wb['back_txt'] = 'Back';
26-
$wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
27-
$wb['stay_logged_in_txt'] = 'Keep me logged in';
28-
$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
29-
$wb['pw_reset_act'] = 'You have been sent an activation link. Please visit the link to confirm your password request.';
30-
$wb['pw_reset_act_mail_title'] = 'Confirm ISPConfig 3 Control panel password reset';
31-
$wb['pw_reset_act_mail_msg'] = 'Please confirm that your want to reset your ISPConfig 3 control panel account password by visiting the following activation link: ';
32-
$wb['lost_password_function_wait_txt'] = 'You cannot request a new password, yet. Please wait a few minutes.';
33-
$wb['lost_password_function_expired_txt'] = 'This activation link has expired. Please request a new one.';
34-
$wb['lost_password_function_denied_txt'] = 'This activation link is not valid.';
24+
$wb['theme_not_compatible'] = 'De gekozen vormgeving is niet geschikt voor de huidige ISPConfig versie. Controleer of er een update beschikbaar is.<br />De standaard vormgeving is automatisch geactiveerd.';
25+
$wb['back_txt'] = 'Terug';
26+
$wb['email_error'] = 'Email bevat ongeldige tekens of heeft een vereerde opbouw.';
27+
$wb['stay_logged_in_txt'] = 'Blijf ingelogd';
28+
$wb['lost_password_function_disabled_txt'] = 'De Wachtwoord vergeten functie is niet beschikbaar voor deze gebruiker.';
29+
$wb['pw_reset_act'] = 'Er is een wachtwoord reset link verstuurd. Volg de link in die mail om uw verzoek te bevestigen.';
30+
$wb['pw_reset_act_mail_title'] = 'ISPConfig 3 Control panel wachtwoord herstel';
31+
$wb['pw_reset_act_mail_msg'] = 'Er is een nieuw wachtwoord aangevraag voor uw account. Bevestig via de volgende link dat dit de bedoeling is. Als u dit niet was kunt u dit beter niet doen. ';
32+
$wb['lost_password_function_wait_txt'] = 'U kunt op dit moment geen nieuw wachtwoord aanvragen, probeer het later nog eens.';
33+
$wb['lost_password_function_expired_txt'] = 'De wachtwoordherstel link is verlopen. U kunt een nieuwe aanvragen.';
34+
$wb['lost_password_function_denied_txt'] = 'Deze link is niet (meer) geldig.';
3535
$wb['otp_code_txt'] = 'Twee-factor authenticatie';
3636
$wb['otp_code_desc_txt'] = 'Enter the code you got from your authenticator app or via email.';
3737
$wb['otp_code_placeholder_txt'] = 'OTP code';
@@ -41,4 +41,5 @@ $wb['otp_code_email_template_txt'] = 'Uw eenmalige login code is %s' . PHP_EOL .
4141
$wb['otp_code_resend_txt'] = 'Aanvragen nieuwe code';
4242
$wb['otp_code_email_sent_failed_txt'] = 'Verzenden van email naar %s is mislukt.';
4343
$wb['otp_code_email_sent_wait_txt'] = 'Please wait, re-sending the code is only possible after %s seconds.';
44+
4445
?>

‎remoting_client/API-docs/dns_a_add.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
<div style="padding:40px">
15-
<h1>dns_a_add(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$params</span>);</h1>
15+
<h1>dns_a_add(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$params</span>, <span class="var">$update_serial=false</span>);</h1>
1616
<br>
1717
<p class="headgrp">Description: </p>
1818
<p class="margin"> Adds a dns IPv4 record if <em>type</em> is <em>a</em>.</p><br>

‎remoting_client/API-docs/dns_a_delete.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
<div style="padding:40px">
15-
<h1>dns_a_delete(<span class="var">$session_id</span>, <span class="var">$primary_id</span>);</h1>
15+
<h1>dns_a_delete(<span class="var">$session_id</span>, <span class="var">$primary_id</span>, <span class="var">$update_serial=false</span>);</h1>
1616
<br>
1717
<p class="headgrp">Description: </p>
1818
<p class="margin"> Deletes target dns IPv4 resource record.</p><br>

‎remoting_client/API-docs/dns_a_update.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
<div style="padding:40px">
15-
<h1>dns_a_update(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$primary_id</span>, <span class="var">$params</span>);</h1>
15+
<h1>dns_a_update(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$primary_id</span>, <span class="var">$params</span>, <span class="var">$update_serial=false</span>);</h1>
1616
<br>
1717
<b>Description: </b>
1818
<p class="margin"> Updates an IPv4 record if <em>type</em> is <em>a</em>.</p><br>

‎remoting_client/API-docs/dns_aaaa_add.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
<div style="padding:40px">
15-
<h1>dns_aaaa_add(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$params</span>);</h1>
15+
<h1>dns_aaaa_add(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$params</span>, <span class="var">$update_serial=false</span>);</h1>
1616
<br>
1717
<p class="headgrp">Description: </p>
1818
<p class="margin"> Adds a dns IPv6 resource record if <em>type</em> is <em>aaaa</em>.</p><br>

‎remoting_client/API-docs/dns_aaaa_delete.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
<div style="padding:40px">
15-
<h1>dns_aaaa_delete(<span class="var">$session_id</span>, <span class="var">$primary_id</span>);</h1>
15+
<h1>dns_aaaa_delete(<span class="var">$session_id</span>, <span class="var">$primary_id</span>, <span class="var">$update_serial=false</span>);</h1>
1616
<br>
1717
<p class="headgrp">Description: </p>
1818
<p class="margin"> Deletes target dns IPv6 resource record.</p><br>

‎remoting_client/API-docs/dns_aaaa_update.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
<div style="padding:40px">
15-
<h1>dns_aaaa_update(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$primary_id</span>, <span class="var">$params</span>);</h1>
15+
<h1>dns_aaaa_update(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$primary_id</span>, <span class="var">$params</span>, <span class="var">$update_serial=false</span>);</h1>
1616
<br>
1717
<b>Description: </b>
1818
<p class="margin"> Updates a dns IPv6 resource record if <em>type</em> is <em>aaaa</em>.</p><br>

0 commit comments

Comments
 (0)