Skip to content

Commit

Permalink
Item13294: Fix string quality issues
Browse files Browse the repository at this point in the history
Strings unclear, missing punctuation, or not translatable
due to sentence fragments.
  • Loading branch information
gac410 committed Mar 9, 2015
1 parent 370aa9f commit acd5a7d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions NatEditPlugin/templates/editdialog.natedit.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
<form>
<table class="foswikiLayoutTable">
<tr>
<th>%MAKETEXT{"Headings"}%</th>
<th>%MAKETEXT{"Heading rows"}%</th>
<td><input type="text" id="natEditInsertTableHeads" size="20" name="heads" class="foswikiInputField" value="1" /></td>
</tr>
<tr>
<th>%MAKETEXT{"Rows"}%</th>
<th>%MAKETEXT{"Data rows"}%</th>
<td><input type="text" id="natEditInsertTableRows" size="20" name="rows" class="foswikiInputField" value="4" /></td>
</tr>
<tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ text="<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/DefaultUserRe
Required field wiki name
-->
%STARTSECTION{"requiredField_wikiName"}%<li><label class="desc" for="Fwk1WikiName"><span class="required">*</span>%MAKETEXT{"Wiki name:"}%</label>
<div><input type="text" id="Fwk1WikiName" name="Fwk1WikiName" size="40" class="foswikiInputField" value="" tabindex="3" /><label class="expl">%MAKETEXT{"Your name as displayed online. This must be a unique [_1]." args="%POPUPWINDOW{"%SYSTEMWEB%.WikiName" label="%MAKETEXT{"Wiki name"}%"}%"}%</label></div></li>%JQREQUIRE{"popupwindow"}%%ENDSECTION{"requiredField_wikiName"}%
<div><input type="text" id="Fwk1WikiName" name="Fwk1WikiName" size="40" class="foswikiInputField" value="" tabindex="3" /><label class="expl">%MAKETEXT{"Your name as displayed online. [_1]" args="%POPUPWINDOW{"%SYSTEMWEB%.WikiName" label="%MAKETEXT{"This must be a unique Wiki name."}%"}%"}%</label></div></li>%JQREQUIRE{"popupwindow"}%%ENDSECTION{"requiredField_wikiName"}%


<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ sub addUser {
unless ( $this->{passwords}->checkPassword( $login, $password ) ) {
throw Error::Simple(
$this->{session}->i18n->maketext(
'New password did not match existing password for this user'
'User exists in the Password Manager, and the password you provided is different from the users current password. You cannot add a user and change the password at the same time.'
)
);
}
Expand Down
6 changes: 3 additions & 3 deletions core/data/System/CompleteDocumentation.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
%META:TOPICINFO{author="ProjectContributor" date="1423445948" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1425928477" format="1.1" version="1"}%
---+!! Reference Manual (%WIKIVERSION%)

This page contains all documentation topics as one long, complete reference sheet.

*Related Topics:* UserDocumentationCategory, AdminDocumentationCategory

%BUTTON{
"%MAKETEXT{"Click here"}%"
"%MAKETEXT{"Load content"}%"
icon="book"
onclick="window.location.href='%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?section=content';"
}% %MAKETEXT{"to load the content. *Caution* the content is very large and loading it will put a high load on your browser. Only load the content if you are going to print it - otherwise use the [[ReferenceManual][online reference manual]]."}%
}% %MAKETEXT{"Use this button to load the content.%BR% *Caution* the content is very large and loading it will put a high load on your browser. Only load the content if you are going to print it - otherwise use the [[ReferenceManual][online reference manual]]."}%

<verbatim class="foswikiHidden">
%STARTSECTION{"content"}%
Expand Down
6 changes: 3 additions & 3 deletions core/data/System/SiteChanges.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1421090223" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1425928477" format="1.1" version="1"}%
%META:TOPICPARENT{name="SiteTools"}%
---+ %TOPIC%
%IF{"context isadmin" then='<div class="foswikiHelp">%T% This topic can be resource intensive on a large site with a large public web.
Expand All @@ -7,10 +7,10 @@ consider installing the Solr serverlet and indexing system to improve
performance.</div>'}%

%BUTTON{
"%MAKETEXT{"Click here"}%"
"%MAKETEXT{"Load content"}%"
icon="book"
onclick="window.location.href='%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?section=content';"
}% %MAKETEXT{"to load the content. *Caution* the search on this page can be very resource intensive. Only request the content if you really need it, otherwise review the WebChanges topic from each web."}%
}% %MAKETEXT{"Use this botton to load the content.%BR% *Caution* the search on this topic can be very resource intensive. Only load the content if you really need it, otherwise review the WebChanges topic from each web."}%

<verbatim class="foswikiHidden">
%STARTSECTION{"content"}%
Expand Down
12 changes: 6 additions & 6 deletions core/templates/registermessages.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@
%TMPL:DEF{"approve"}%
---+++ %MAKETEXT{"Thank you for registering"}%

%MAKETEXT{"Your registration is pending approval by the system administrators"}%
%MAKETEXT{"Your registration is pending approval by the system administrators."}%

%MAKETEXT{"You will receive an e-mail when your registration has been approved"}%
%MAKETEXT{"You will receive an e-mail when your registration has been approved."}%
%TMPL:END%
%{==============================================================================}%
%TMPL:DEF{"no_users_to_reset"}%
Expand All @@ -168,7 +168,7 @@
%TMPL:END%
%{==============================================================================}%
%TMPL:DEF{"reset_bad"}%
---+++ %MAKETEXT{"Password reset failed"}%
---+++ %MAKETEXT{"Password reset failed."}%
%PARAM1%
%TMPL:END%
%{==============================================================================}%
Expand All @@ -190,7 +190,7 @@
%TMPL:END%
%{==============================================================================}%
%TMPL:DEF{"already_exists"}%
---+++ %MAKETEXT{"You are already registered"}%
---+++ %MAKETEXT{"You are already registered."}%
%MAKETEXT{"You cannot register twice, the name [_1] is already registered." args="'%PARAM1%'"}%

%MAKETEXT{"Did you want to ~[~[[_1]~]~[reset [_2]'s password~]~]?" args="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%.ResetPassword?username=%PARAM1%,%PARAM1%"}%
Expand All @@ -201,8 +201,8 @@
%TMPL:END%
%{==============================================================================}%
%TMPL:DEF{"unsupport_loginname"}%
---+++ %MAKETEXT{"Unsupported [_1]" args="%SYSTEMWEB%.LoginName"}%
%MAKETEXT{"The [_1] ([_2]) is not allowed for this installation. Registration rejected." args="%SYSTEMWEB%.LoginName,%PARAM1%"}%
---+++ %MAKETEXT{"Unsupported [[[_1]][Login Name]]" args="%SYSTEMWEB%.LoginName"}%
%MAKETEXT{"The [[[_1]][Login Name]] ([_2]) is not allowed for this installation. Registration rejected." args="%SYSTEMWEB%.LoginName,%PARAM1%"}%

%MAKETEXT{"Please go back in your browser and try again."}%
%TMPL:END%
Expand Down

0 comments on commit acd5a7d

Please sign in to comment.