Skip to content

Commit

Permalink
Item13294: Typo in string, and broken unit test
Browse files Browse the repository at this point in the history 
And xgettext run
  • Loading branch information
@gac410
gac410 committed Mar 14, 2015
1 parent c519566 commit b00efe3
Show file tree
Hide file tree
Showing 25 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions UnitTestContrib/test/unit/ManageDotPmTests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ EOM
if ( $Foswiki::cfg{Register}{AllowLoginName} ) {
push @expected, qw(TestBulkUser1 TestBulkUser3);
$this->assert_matches(
qr/The System.LoginName is a required parameter. Registration rejected./,
qr/\QThe [[System.UserName][login username]]\E is a required parameter. Registration rejected./,
$topicText
);
$this->assert_matches(
Expand All @@ -919,7 +919,7 @@ qr/You cannot register twice, the name 'tbu3' is already registered\./,
else {
push @expected, qw(TestBulkUser2 TestBulkUser4);
$this->assert_matches(
qr/The \[\[System.LoginName\]\[Login Name\]\] \(tbu3\) is not allowed for this installation/,
qr/\QThe [[System.UserName][login username]] (tbu3)\E is not allowed for this installation./,
$topicText
);
$this->assert_matches(
Expand Down
2 changes: 1 addition & 1 deletion core/locale/Foswiki.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3296,7 +3296,7 @@ msgid "Return to %1"
msgstr ""

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/bg.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3591,7 +3591,7 @@ msgid "Return to %1"
msgstr "Върнете се към %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/cs.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3546,7 +3546,7 @@ msgid "Return to %1"
msgstr "Návrat do %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/da.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3538,7 +3538,7 @@ msgstr "Tilbage til %1"

#: core/templates/registermessages.tmpl:342
#, fuzzy
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr "Tilbage til [_0] og angiv et WikiNavn eller brugernavn"

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/de.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3570,7 +3570,7 @@ msgstr "Zurück zu %1"

#: core/templates/registermessages.tmpl:342
#, fuzzy
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr "Zurück zu [_0] und einen WikiName oder Anmeldenamen angeben"

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/el.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3636,7 +3636,7 @@ msgid "Return to %1"
msgstr "Επιστροφή στο %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3628,7 +3628,7 @@ msgid "Return to %1"
msgstr "Volver a %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/fi.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3608,7 +3608,7 @@ msgid "Return to %1"
msgstr "Palaa %1"

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
8 changes: 4 additions & 4 deletions core/locale/fr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: foswiki-svn@lists.sourceforge.net\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2015-03-14 02:32+0200\n"
"Last-Translator: Raul F Rodriguez <raulfrodriguez10@gmail.com>\n"
"Language-Team: French <http://translate.foswiki.org/projects/foswiki"
"/distribution-master/fr/>\n"
"Language-Team: French <http://translate.foswiki.org/projects/foswiki/"
"distribution-master/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -3545,7 +3545,7 @@ msgstr "Retourner à %1"

#: core/templates/registermessages.tmpl:342
#, fuzzy
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr "Retournez à %1 and supply a [[%2][WikiName or [[%3][username]]."

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/it.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3584,7 +3584,7 @@ msgid "Return to %1"
msgstr "Ritorna a %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/ja.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3607,7 +3607,7 @@ msgid "Return to %1"
msgstr "%1に戻る"

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/ko.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3469,7 +3469,7 @@ msgid "Return to %1"
msgstr "%1 로 돌아가기."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/nl.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3648,7 +3648,7 @@ msgid "Return to %1"
msgstr "Ga terug naar %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/no.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3571,7 +3571,7 @@ msgid "Return to %1"
msgstr "Tilbake til %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/pl.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3619,7 +3619,7 @@ msgid "Return to %1"
msgstr "Powrót do: %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/pt-br.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3579,7 +3579,7 @@ msgid "Return to %1"
msgstr "Voltar para %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/pt.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3640,7 +3640,7 @@ msgid "Return to %1"
msgstr "Voltar para %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/ru.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3657,7 +3657,7 @@ msgid "Return to %1"
msgstr "Вернуться к %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/sv.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3608,7 +3608,7 @@ msgid "Return to %1"
msgstr "Åter till %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/tr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3417,7 +3417,7 @@ msgid "Return to %1"
msgstr ""

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/uk.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3653,7 +3653,7 @@ msgid "Return to %1"
msgstr "Повернутися до %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/zh-cn.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3536,7 +3536,7 @@ msgid "Return to %1"
msgstr "回到 %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/locale/zh-tw.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3424,7 +3424,7 @@ msgid "Return to %1"
msgstr "回到 %1."

#: core/templates/registermessages.tmpl:342
msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
msgid "Return to %1 and supply a [[%2][WikiName]] or [[%3][username]]."
msgstr ""

#: core/templates/registermessages.tmpl:296
Expand Down
2 changes: 1 addition & 1 deletion core/templates/registermessages.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
%{==============================================================================}%
%TMPL:DEF{"user_param_required"}%
---+++ %MAKETEXT{"User Account was not supplied"}%
%MAKETEXT{"Return to [_1] and supply a [[[_2]][WikiName or [[[_3]][username]]." args="[[%WEB%.%TOPIC%]], %SYSTEMWEB%.WikiName, %SYSTEMWEB%.UserName"}%
%MAKETEXT{"Return to [_1] and supply a [[[_2]][WikiName]] or [[[_3]][username]]." args="[[%WEB%.%TOPIC%]], %SYSTEMWEB%.WikiName, %SYSTEMWEB%.UserName"}%
%TMPL:END%
%{==============================================================================}%
%TMPL:DEF{"not_self"}%
Expand Down

0 comments on commit b00efe3

Please sign in to comment.