Commit 3337c56a authored by chibaguy's avatar chibaguy

[FIX] Improve language strings, including spelling, grammar, natural...

[FIX] Improve language strings, including spelling, grammar, natural expressions, consistency, and gender neutrality.
parent 6834a309
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -17,7 +17,7 @@ lang = {
"Valid User Name" : "Nome de usuário válido",
"Passwords match" : "Senhas iguais",
"Passwords don't match" : "As senhas não são iguais",
"Valid Email" : "E-mail válido",
"Valid Email" : "Email válido",
"Close" : "Fechar",
"Submit" : "Enviar",
"Insert" : "Adicionar",
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -35,7 +35,7 @@ function prefs_metatag_list()
'default' => 'n',
),
'metatag_imagetitle' => array(
'name' => tra('Use image title instead'),
'name' => tra('Use the image title instead'),
'description' => tra('Use the image title in the meta title tag'),
'type' => 'flag',
'dependencies' => array(
......
......@@ -132,7 +132,7 @@ class AcceptanceTests_MultilingualTest extends TikiSeleniumTestCase
$this->select("language_list", "label=English British (en-uk)");
$this->type("translation_name", "Multilingual Test Page 1");
$this->clickAndWait("//input[@value='Create translation']");
$this->assertTrue($this->isTextPresent("Page already exists. Go back and choose a different name."));
$this->assertTrue($this->isTextPresent("That page already exists. Go back and choose a different name."));
}
......@@ -151,7 +151,7 @@ class AcceptanceTests_MultilingualTest extends TikiSeleniumTestCase
$this->select("language_list", "label=English British (en-uk)");
$this->type("translation_name", "Multilingual Test Page 1");
$this->clickAndWait("//input[@value='Create translation']");
$this->assertTrue($this->isTextPresent("Page already exists. Go back and choose a different name."));
$this->assertTrue($this->isTextPresent("That page already exists. Go back and choose a different name."));
$this->clickAndWait("link=Go back");
$this->clickAndWait("link=View Page");
//A bug: instead of English it shows English British although the page was not created
......
......@@ -47,7 +47,7 @@ class XmlLib extends TikiLib
$this->zip = new ZipArchive;
if (!$this->zip->open($zipFile, ZIPARCHIVE::OVERWRITE)) {
$this->errors[] = 'Can not open the file';
$this->errors[] = 'The file cannot be opened';
$this->errorsArgs[] = $zipFile;
return false;
}
......@@ -258,7 +258,7 @@ class XmlLib extends TikiLib
}
if (!$this->zip->open($zipFile)) {
$this->errors[] = 'Can not open the file';
$this->errors[] = 'The file cannot be opened';
$this->errorsArgs[] = $zipFile;
return false;
}
......
......@@ -19,7 +19,7 @@
{preference name=wikiplugin_wysiwyg}
</fieldset>
<fieldset>
<legend>{tr}Wysiwyg Editor Features{/tr}</legend>
<legend>{tr}WYSIWYG Editor Features{/tr}</legend>
{preference name=wysiwyg_optional}
<div class="adminoptionboxchild" id="wysiwyg_optional_childcontainer">
{preference name=wysiwyg_default}
......
......@@ -61,7 +61,7 @@ if (jqueryTiki.no_cookie) {
<label for="login-switchuser_{$module_logo_instance}">{tr}Username{/tr} {if $prefs.login_allow_email eq 'y'} {tr}or e-mail address{/tr}{/if}:</label>
<input type="hidden" name="su" value="1" class="form-control" />
{if $prefs.feature_help eq 'y'}
{help url="Switch+User" desc="{tr}Help{/tr}" desc="{tr}Switch User:{/tr}{tr}Enter user name and click 'Switch'.<br>Useful for testing permissions.{/tr}"}
{help url="Switch+User" desc="{tr}Help{/tr}" desc="{tr}Switch User:{/tr}{tr}Enter a username and click 'Switch'.<br>Useful for testing permissions.{/tr}"}
{/if}
<input type="text" name="username" class="form-control" id="login-switchuser_{$module_logo_instance}" {* size="{if empty($module_params.input_size)}15{else}{$module_params.input_size}{/if}" *} />
</div>
......@@ -247,8 +247,8 @@ if (jqueryTiki.no_cookie) {
{/if}
{if $prefs.feature_switch_ssl_mode eq 'y' && ($prefs.https_login eq 'allowed' || $prefs.https_login eq 'encouraged')}
<div>
<a class="linkmodule" href="{$base_url_http|escape}{$prefs.login_url|escape}" title="{tr}Click here to login using the default security protocol{/tr}">{tr}Standard{/tr}</a>
<a class="linkmodule" href="{$base_url_https|escape}{$prefs.login_url|escape}" title="{tr}Click here to login using a secure protocol{/tr}">{tr}Secure{/tr}</a>
<a class="linkmodule" href="{$base_url_http|escape}{$prefs.login_url|escape}" title="{tr}Click here to log in using the default security protocol{/tr}">{tr}Standard{/tr}</a>
<a class="linkmodule" href="{$base_url_https|escape}{$prefs.login_url|escape}" title="{tr}Click here to log in using a secure protocol{/tr}">{tr}Secure{/tr}</a>
</div>
{/if}
{if $prefs.feature_show_stay_in_ssl_mode eq 'y' && $show_stay_in_ssl_mode eq 'y'}
......
......@@ -10,7 +10,7 @@
<div class="col-sm-8">
<input class="form-control" type="text" name="name" id="name" value="{if !empty($smarty.post.name)}{$smarty.post.name}{/if}">
{if $prefs.login_is_email eq 'y'}
<div class="help-block">{tr}Use your email as login{/tr}</div>
<div class="help-block">{tr}Use your email address as your log-in name{/tr}</div>
{else}
{if $prefs.min_username_length > 1}
<div class="highlight">
......
......@@ -74,7 +74,7 @@
<div class="col-sm-9">
<input type="text" id="femail" name="email" class="form-control" placeholder="{tr}Email{/tr}...">
<div class="help-block">
{tr}Note that a user is not notified for his own action{/tr}
{tr}Note that a user is not notified for his or her own action{/tr}
</div>
</div>
</div>
......
......@@ -48,7 +48,7 @@
</option>
{if $prefs.feature_wysiwyg eq 'y'}
<option value="wysiwyg"{if $view_mode eq "wysiwyg"} selected{/if}>
{tr}WYSIWYG (html mode){/tr}
{tr}WYSIWYG (HTML mode){/tr}
</option>
{/if}
{if $prefs.feature_wysiwyg eq 'y' and $prefs.wysiwyg_htmltowiki eq 'y'}
......
......@@ -360,7 +360,7 @@
<div class="checkbox">
<label>
<input type="checkbox" name="userChoice"{if $userChoice eq 'y'} checked="checked"{/if}>
{tr}User can assign to the group himself{/tr}
{tr}User can assign himself or herself to the group{/tr}
</label>
</div>
</div>
......
......@@ -431,10 +431,10 @@
{if isset($userinfo.userId) && $userinfo.userId}
<p>
{icon name='warning' alt="{tr}Warning{/tr}" style="vertical-align:middle"}
<em>{tr}Warning: changing the username could require the user to change his password (for user registered with an old Tiki&lt;=1.8){/tr}</em>
<em>{tr}Warning: changing the username could require the user to change his or her password (for user registered with an old Tiki&lt;=1.8){/tr}</em>
{if $prefs.feature_intertiki_server eq 'y'}
<br>
<i>{tr}Warning: it will mess with slave intertiki sites that use this one as master{/tr}</i>
<i>{tr}Warning: it will create a problem with Intertiki slave sites that use this one as master{/tr}</i>
{/if}
</p>
{/if}
......@@ -524,7 +524,7 @@
<div class="checkbox">
<label>
<input type="checkbox" name="need_email_validation" {if ($userinfo.login eq '' and ($prefs.validateUsers eq 'y' or $prefs.validateRegistration eq 'y')) or $userinfo.provpass neq '' or $userinfo.valid neq ''}checked="checked"{/if}>
{tr}Send an email to the user in order to allow him to validate his account.{/tr}
{tr}Send an email to the user to enable him or her to validate their account.{/tr}
</label>
{if empty($prefs.sender_email)}
<div class="help-block"><span class="highlight">{tr}You need to set <a href="tiki-admin.php?page=general">Sender Email</a>{/tr}</span></div>
......@@ -681,7 +681,7 @@
<div class="checkbox">
<label>
<input type="checkbox" name="forcePasswordChange">
{tr}User must change password at first login{/tr}
{tr}The user must change his or her password the first time they log in{/tr}
</label>
</div>
</div>
......@@ -692,7 +692,7 @@
<div class="checkbox">
<label>
<input type="checkbox" name="notification">
{tr}Send an email to the user in order to allow him to validate his account.{/tr}
{tr}Send an email to the user to enable him or her to validate their account.{/tr}
</label>
</div>
</div>
......
......@@ -813,9 +813,9 @@ $(".end.time select, #end").change(function () {
0: {tr}chair{/tr} ({tr}default role{/tr})<br>
1: {tr}required participant{/tr}<br>
2: {tr}optional participant{/tr}<br>
3: {tr}non participant{/tr}<br>
3: {tr}non-participant{/tr}<br>
<br>
{tr}Give participant list separated by commas. Roles have to be given in a prefix separated by a column like in:{/tr}&nbsp;
{tr}Input list of participants, separated by commas. Roles must be indicated by a prefix separated by a colon as in:{/tr}&nbsp;
<code>
{tr}role:login_or_email,login_or_email{/tr}
</code>
......
......@@ -75,9 +75,9 @@
</div>
{if empty($email)}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="email">{tr}E-mail{/tr}</label>
<label class="col-sm-3 col-md-2 control-label" for="email">{tr}Email{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="email" class="form-control" name="email" id="email" placeholder="E-mail" value="{if not empty($email)}{$email|escape}{/if}">
<input type="email" class="form-control" name="email" id="email" placeholder="Email" value="{if not empty($email)}{$email|escape}{/if}">
</div>
</div>
{/if}
......
......@@ -52,7 +52,7 @@
</table>
</div>
<h2>{tr}Test sending e-mails{/tr}</h2>
<h2>{tr}Test sending emails{/tr}</h2>
{tr}To test if your installation is capable of sending emails please visit the <a href="tiki-install.php">Tiki Installer</a>{/tr}.
<h2>{tr}Server Information{/tr}</h2>
......
......@@ -49,7 +49,7 @@
{/if}
{* Display a form to add or edit a site *}
<h2>{if $siteId}{tr}Edit a site{/tr}{else}{tr}Add a Site{/tr}{/if}</h2>
<h2>{if $siteId}{tr}Edit a site{/tr}{else}{tr}Add a site{/tr}{/if}</h2>
<form action="tiki-directory_add_site.php" method="post" class="form-horizontal">
<input type="hidden" name="parent" value="{$parent|escape}">
<input type="hidden" name="siteId" value="{$siteId|escape}">
......
......@@ -53,17 +53,17 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Children type{/tr}</label>
<label class="col-sm-3 control-label">{tr}Child type{/tr}</label>
<div class="col-sm-7">
<select name="childrenType" class="form-control">
<option value='c' {if $info.childrenType eq 'c'}selected="selected"{/if}>{tr}Most visited directory sub-categories{/tr}</option>
<option value='d' {if $info.childrenType eq 'd'}selected="selected"{/if}>{tr}Directory Category description{/tr}</option>
<option value='d' {if $info.childrenType eq 'd'}selected="selected"{/if}>{tr}Directory category description{/tr}</option>
<option value='r' {if $info.childrenType eq 'r'}selected="selected"{/if}>{tr}Random directory sub-categories{/tr}</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Maximum number of children to show{/tr}</label>
<label class="col-sm-3 control-label">{tr}Maximum number of child directory categories to show{/tr}</label>
<div class="col-sm-7">
<select name="viewableChildren" class="form-control">
<option value="0" {if $info.viewableChildren eq 0}selected="selected"{/if}>{tr}none{/tr}</option>
......
......@@ -28,7 +28,7 @@
</form>
{* Dislay a form to add or edit a site *}
<h2>{if $siteId}{tr}Edit a site{/tr}{else}{tr}Add a Site{/tr}{/if}</h2>
<h2>{if $siteId}{tr}Edit a site{/tr}{else}{tr}Add a site{/tr}{/if}</h2>
<form action="tiki-directory_admin_sites.php" method="post" class="form-horizontal">
<input type="hidden" name="parent" value="{$parent|escape}">
<input type="hidden" name="siteId" value="{$siteId|escape}">
......
......@@ -11,14 +11,14 @@
{button href="tiki-directory_ranking.php?sort_mode=created_desc" class="btn btn-default" _icon_name="star" _text="{tr}New Sites{/tr}"}
{if $prefs.directory_cool_sites eq "y"}
{button href="tiki-directory_ranking.php?sort_mode=hits_desc" class="btn btn-default" _icon_name="ok" _text="{tr}Cool Sites{/tr}"}
{button href="tiki-directory_ranking.php?sort_mode=hits_desc" class="btn btn-default" _icon_name="ok" _text="{tr}Popular Sites{/tr}"}
{/if}
{if $tiki_p_submit_link eq 'y' or $tiki_p_autosubmit_link eq 'y'}
{if isset($addtocat)}
{button href="tiki-directory_add_site.php?addtocat=$addtocat" class="btn btn-default" _icon_name="add" _text="{tr}Add a Site{/tr}"}
{button href="tiki-directory_add_site.php?addtocat=$addtocat" class="btn btn-default" _icon_name="add" _text="{tr}Add a site{/tr}"}
{else}
{button href="tiki-directory_add_site.php" class="btn btn-default" _icon_name="add" _text="{tr}Add a Site{/tr}"}
{button href="tiki-directory_add_site.php" class="btn btn-default" _icon_name="add" _text="{tr}Add a site{/tr}"}
{/if}
{if $tiki_p_admin_directory_cats eq 'y'}
......
......@@ -100,11 +100,11 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Max time the discount can be used in the first phase of payment{/tr}</label>
<label class="col-sm-3 control-label">{tr}Maximum time the discount can be used in the first phase of payment{/tr}</label>
<div class="col-sm-7">
<input type="text" id="max" name="max" {if !empty($info.max)} value="{$info.max|escape}"{/if} class="form-control">
<div class="help-block">
{tr}-1 for illimited{/tr}
{tr}-1 for unlimited{/tr}
</div>
</div>
</div>
......
......@@ -23,7 +23,7 @@
{if !empty($errors)}
<div class="alert-warning">
{tr}One of the email addresses you typed is invalid{/tr}
{tr}One of the email addresses that was input is invalid{/tr}
<br>
{foreach from=$errors item=m name=errors}
{$m}
......@@ -375,7 +375,7 @@
<label for="emails" class="col-sm-3">{tr}Email{/tr}</label>
<div class="col-sm-9">
<input type="text" name="emails" value="{$emails|escape}" class="form-control">
<span class="help-block">{tr}Emails to be notified (separated with commas){/tr}</span>
<span class="help-block">{tr}Email addresses to be sent notifications (comma-separated){/tr}</span>
{if !empty($userEmail) and $userEmail neq $prefs.sender_email}
{tr}From:{/tr}
<label>
......@@ -410,7 +410,7 @@
<div class="form-group clearfix text-center">
<input type="submit" class="wikiaction btn btn-default" name="preview" value="{tr}Preview{/tr}" onclick="needToConfirm=false;">
<input type="submit" class="wikiaction btn btn-primary" name="save" value="{tr}Save{/tr}" onclick="this.form.saving=true;needToConfirm=false;">
{if $articleId}<input type="submit" class="wikiaction tips btn btn-default" title="{tr}Cancel{/tr}|{tr}Cancel the edit, you will lose your changes.{/tr}" name="cancel_edit" value="{tr}Cancel Edit{/tr}" onclick="needToConfirm=false;">{/if}
{if $articleId}<input type="submit" class="wikiaction tips btn btn-default" title="{tr}Cancel{/tr}|{tr}Cancel the edit (changes will be lost).{/tr}" name="cancel_edit" value="{tr}Cancel Edit{/tr}" onclick="needToConfirm=false;">{/if}
</div>
{if $smarty.session.wysiwyg neq 'y'}
{jq}
......
......@@ -22,7 +22,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Max impressions{/tr}</label>
<label class="col-sm-3 control-label">{tr}Maximum impressions{/tr}</label>
<div class="col-sm-7">
<input type="text" name="maxImpressions" value="{$maxImpressions|escape}" maxlength="7" class="form-control">
<div class="help-block">
......@@ -31,7 +31,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Max impressions for a user{/tr}</label>
<label class="col-sm-3 control-label">{tr}Maximum number of impressions for a user{/tr}</label>
<div class="col-sm-7">
<input type="text" name="maxUserImpressions" value="{$maxUserImpressions|escape}" maxlength="7" class="form-control">
<div class="help-block">
......@@ -40,7 +40,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Max clicks{/tr}</label>
<label class="col-sm-3 control-label">{tr}Maximum clicks{/tr}</label>
<div class="col-sm-7">
<input type="text" name="maxClicks" value="{$maxClicks|escape}" maxlength="7" class="form-control">
<div class="help-block">
......@@ -257,7 +257,7 @@
{if $zones}
<div align="left" class="panel panel-default">
<div class="panel-body">
<h2>{tr}Remove Zones (you lose entered info for the banner){/tr}</h2>
<h2>{tr}Remove zones (info entered for any banner in the zones will be lost){/tr}</h2>
<div class="table-responsive">
<table class="table table-striped table-hover">
<tr>
......
This diff is collapsed.
......@@ -10,8 +10,8 @@
{remarksbox title="{tr}Move objects between categories{/tr}"}
<ol>
<li>{tr}Click on the category name you want to list. The list of objects in that category will become visible.{/tr}</li>
<li>{tr}Select the objects you want to affect. Controls will appear in the category browser.{/tr}</li>
<li>{tr}Click on the category name to display the list of objects in that category.{/tr}</li>
<li>{tr}Select the objects to affect. Controls will appear in the category browser.{/tr}</li>
<li>{tr}Use the plus and minus signs to add or remove the categories on selected objects.{/tr}</li>
</ol>
{/remarksbox}
......@@ -31,7 +31,7 @@
{/foreach}
</ol>
{if $result->hasMore()}
<p>{tr}More results available. Please refine the search criterias.{/tr}</p>
<p>{tr}More results are available. Please refine the search criteria.{/tr}</p>
{/if}
<p>
<a class="select-all" href="#selectall">{tr}Select all{/tr}</a>
......
......@@ -32,7 +32,7 @@
{else}
{if $try_active}
{remarksbox type="tip" title="{tr}Currently trying{/tr}: {$try_theme}{if $try_theme_option}/{$try_theme_option}{/if}" close="n"}
<input type="submit" class="btn btn-default btn-sm" name="cancel_try" value="{tr}Cancel Try{/tr}">
<input type="submit" class="btn btn-default btn-sm" name="cancel_try" value="{tr}Cancel{/tr}">
{/remarksbox}
{/if}
<div class="form-group clearfix">
......
......@@ -154,7 +154,7 @@
</tr>
<tr>
<td>
<strong>{tr}Non parsed sections{/tr}</strong> <br/> ~np~ {tr}data{/tr} ~/np~ {tr}Prevents wiki parsing of the enclosed data.{/tr}
<strong>{tr}Non-parsed sections{/tr}</strong> <br/> ~np~ {tr}data{/tr} ~/np~ {tr}Prevents wiki parsing of the enclosed data.{/tr}
</td>
</tr>
<tr>
......@@ -170,13 +170,13 @@
{if $prefs.feature_wiki_monosp eq 'y'}
<tr>
<td>
<strong>{tr}Block Preformatting{/tr}</strong> <br/> {tr}Indent text with any number of spaces to turn it into a monospaced block that still follows other Wiki formatting instructions. It will be indended with the same number of spaces that you used. Note that this mode does not preserve exact spacing and line breaks; use ~pp~...~/pp~ for that.{/tr}
<strong>{tr}Block Preformatting{/tr}</strong> <br/> {tr}Indent text with any number of spaces to change it to a monospaced block that still follows other Wiki formatting instructions. It will be indented with the same number of spaces that are used. Note that this mode does not preserve exact spacing and line breaks; use ~pp~...~/pp~ for that.{/tr}
</td>
</tr>
{/if}
<tr>
<td>
<strong>{tr}Direction{/tr}</strong> <br/>{literal}{r2l}{/literal}, {literal}{l2r}{/literal}, {literal}{rm}{/literal}, {literal}{lm}{/literal}{tr}Insert resp. right-to-left and left-to-right text direction DIV (up to end of text) and markers for langages as arabic or hebrew.{/tr}
<strong>{tr}Direction{/tr}</strong> <br/>{literal}{r2l}{/literal}, {literal}{l2r}{/literal}, {literal}{rm}{/literal}, {literal}{lm}{/literal}{tr}Insert with respect to right-to-left and left-to-right text direction DIV (up to end of text) and markers for langages as Arabic and Hebrew.{/tr}
</td>
</tr>
<tr>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment