Skip to content

Commit 71c7f82

Browse files
committed
Updated messages for registration
1 parent 815ff56 commit 71c7f82

File tree

7 files changed

+176
-153
lines changed

7 files changed

+176
-153
lines changed

resources/lang/de.mo

-387 Bytes
Binary file not shown.

resources/lang/de.po

Lines changed: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: OAuth2Client\n"
4-
"POT-Creation-Date: 2025-01-26 16:47+0100\n"
5-
"PO-Revision-Date: 2025-01-26 16:49+0100\n"
4+
"POT-Creation-Date: 2025-01-27 18:21+0100\n"
5+
"PO-Revision-Date: 2025-01-27 18:28+0100\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: de\n"
@@ -15,7 +15,7 @@ msgstr ""
1515
"X-Poedit-KeywordsList: translate\n"
1616
"X-Poedit-SearchPath-0: .\n"
1717

18-
#: src/Factories/AuthorizationProviderFactory.php:156
18+
#: src/Factories/AuthorizationProviderFactory.php:157
1919
#, php-format
2020
msgid ""
2121
"The configuration for the authorization provider \"%s\" does not include "
@@ -92,61 +92,64 @@ msgstr ""
9292

9393
#: src/LoginWithAuthorizationProviderAction.php:298
9494
msgid ""
95-
"Invalid user account data received from authorizaton provider. Email or "
96-
"username missing."
97-
msgstr ""
98-
"Vom Autorisierungsanbieter wurden keine validen Daten empfangen. Email oder "
99-
"Benutzernamen fehlt."
100-
101-
#: src/LoginWithAuthorizationProviderAction.php:309
102-
msgid ""
10395
"Currently, no webtrees user account is related to the user data received "
10496
"from the authorization provider."
10597
msgstr ""
10698
"Aktuell ist kein webtrees-Benutzer mit den vom Autorisierungsanbieter "
10799
"bereitgestellten Benutzerdaten verknüpft."
108100

109-
#: src/LoginWithAuthorizationProviderAction.php:310
110-
msgid ""
111-
"Please press \"continue\" to request the creation of a new webtrees user "
112-
"acccount based on the data from the authorization provider."
113-
msgstr ""
114-
"Klicken Sie bitte auf \"Weiter\", um die Erstellung eines neuen webtrees-"
115-
"Benutzerkontos auf Basis der Daten des Autorisierungsanbieters anzufordern."
101+
#: src/LoginWithAuthorizationProviderAction.php:303
102+
#, php-format
103+
msgid "It is not possible to request a webtrees account with %s."
104+
msgstr "Es ist nicht möglich, ein webtrees-Konto mit %s anzufordern."
116105

106+
#: src/LoginWithAuthorizationProviderAction.php:304
117107
#: src/LoginWithAuthorizationProviderAction.php:311
108+
#: src/LoginWithAuthorizationProviderAction.php:323
109+
#, php-format
118110
msgid ""
119-
"If you already have a webtrees user account, you might want to \"quit\" and "
120-
"choose to connect the existing webtrees account with the authorization "
121-
"provider. Please use to the related menu items."
111+
"To connect an existing user with %s, sign in and select: My pages / My "
112+
"account / Connect with"
113+
msgstr ""
114+
"Um einen bestehenden Benutzer mit %s zu verbinden, melden Sie sich an und "
115+
"wählen: Meine Seiten / Mein Konto / Verknüpfen mit"
116+
117+
#: src/LoginWithAuthorizationProviderAction.php:310
118+
#, php-format
119+
msgid "Invalid user data received from %s. Email or username missing."
120+
msgstr ""
121+
"Ungültige Benutzerdaten von %s empfangen. E-Mail oder Benutzername fehlt."
122+
123+
#: src/LoginWithAuthorizationProviderAction.php:317
124+
msgid "Requesting a new webtrees user account is currently not allowed."
125+
msgstr ""
126+
"Das Anfordern eines neuen webtrees-Benutzerkontos ist derzeit nicht erlaubt."
127+
128+
#: src/LoginWithAuthorizationProviderAction.php:322
129+
#, php-format
130+
msgid "Press \"continue\" to request a new webtrees user acccount with %s."
122131
msgstr ""
123-
"Wenn Sie bereits ein webtrees-Benutzerkonto haben, sollten Sie den Vorgang "
124-
"ggfs. „Abbrechen“ und das vorhandene webtrees-Konto mit dem "
125-
"Autorisierungsanbieter verbinden. Bitte nutzen Sie hierfür die "
126-
"entsprechenden Menüpunkte."
132+
"Klicken Sie auf „Weiter“, um ein neues webtrees-Benutzerkonto mit %s "
133+
"anzufordern."
127134

128-
#: src/LoginWithAuthorizationProviderAction.php:319
135+
#: src/LoginWithAuthorizationProviderAction.php:332
129136
msgid "Request a new user account with an authorization provider"
130137
msgstr ""
131138
"Beantragen Sie ein neues Benutzerkonto mit einem Autorisierungsanbieter"
132139

133-
#: src/LoginWithAuthorizationProviderAction.php:341
140+
#: src/LoginWithAuthorizationProviderAction.php:354
134141
#, php-format
135142
msgid "The email address for user %s was updated to: %s"
136143
msgstr "Die Email-Adresse für Benutzer %s wurde aktualisiert zu: %s"
137144

138-
#: src/LoginWithAuthorizationProviderAction.php:410
145+
#: src/LoginWithAuthorizationProviderAction.php:423
139146
msgid ""
140-
"Login with the provided user credentials denied. The username or email "
141-
"provided from the authorization provider might already exist in webtrees. If "
142-
"you want to connect an existing webtrees user to an authorization provider, "
143-
"select: My pages / My account / Connect with"
147+
"Login denied. The email address or username already exists. To connect an "
148+
"existing user, select: My pages / My account / Connect with"
144149
msgstr ""
145-
"Anmeldung mit den angegebenen Benutzerdaten abgelehnt. Der vom "
146-
"Autorisierungsanbieter angegebene Benutzername oder die angegebene E-Mail-"
147-
"Adresse ist möglicherweise bereits in webtrees vorhanden. Wenn Sie einen "
148-
"vorhandenen webtrees-Benutzer mit einem Autorisierungsanbieter verbinden "
149-
"möchten, wählen Sie: Meine Seiten / Mein Konto / Verknüpfen mit"
150+
"Anmeldung verweigert. Die E-Mail-Adresse oder der Benutzername existiert "
151+
"bereits. Um einen bestehenden Benutzer zu verbinden, wählen Sie: Meine "
152+
"Seiten / Mein Konto / Verknüpfen mit"
150153

151154
#: src/OAuth2Client.php:223
152155
msgid "OAuth2 Client"
@@ -535,6 +538,16 @@ msgstr ""
535538
"den Protokollfluss zwischen webtrees und dem Autorisierungsanbieter in den "
536539
"Website-Logs von webtrees protokolliert."
537540

541+
#~ msgid ""
542+
#~ "If you already have a webtrees user account, you might want to \"quit\" "
543+
#~ "and choose to connect the existing webtrees account with the "
544+
#~ "authorization provider. Please use to the related menu items."
545+
#~ msgstr ""
546+
#~ "Wenn Sie bereits ein webtrees-Benutzerkonto haben, sollten Sie den "
547+
#~ "Vorgang ggfs. „Abbrechen“ und das vorhandene webtrees-Konto mit dem "
548+
#~ "Autorisierungsanbieter verbinden. Bitte nutzen Sie hierfür die "
549+
#~ "entsprechenden Menüpunkte."
550+
538551
#, fuzzy, php-format
539552
#~| msgid ""
540553
#~| "The length of the \"%s\" exceeded the maximum length of %s and was "

resources/lang/en-AU.mo

-2.35 KB
Binary file not shown.

resources/lang/en-AU.po

Lines changed: 39 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: OAuth2Client\n"
4-
"POT-Creation-Date: 2025-01-26 16:47+0100\n"
5-
"PO-Revision-Date: 2025-01-26 16:48+0100\n"
4+
"POT-Creation-Date: 2025-01-27 18:28+0100\n"
5+
"PO-Revision-Date: 2025-01-27 18:33+0100\n"
66
"Last-Translator: Rick Malkin <[email protected]>\n"
77
"Language-Team: \n"
88
"Language: en_AU\n"
@@ -15,7 +15,7 @@ msgstr ""
1515
"X-Poedit-KeywordsList: translate\n"
1616
"X-Poedit-SearchPath-0: .\n"
1717

18-
#: src/Factories/AuthorizationProviderFactory.php:156
18+
#: src/Factories/AuthorizationProviderFactory.php:157
1919
#, php-format
2020
msgid ""
2121
"The configuration for the authorization provider \"%s\" does not include "
@@ -86,63 +86,62 @@ msgstr ""
8686

8787
#: src/LoginWithAuthorizationProviderAction.php:298
8888
msgid ""
89-
"Invalid user account data received from authorizaton provider. Email or "
90-
"username missing."
91-
msgstr ""
92-
"Invalid user account data received from authorisaton provider. Email or "
93-
"username missing."
94-
95-
#: src/LoginWithAuthorizationProviderAction.php:309
96-
msgid ""
9789
"Currently, no webtrees user account is related to the user data received "
9890
"from the authorization provider."
9991
msgstr ""
10092
"Currently, no webtrees user account is related to the user data received "
10193
"from the authorisation provider."
10294

103-
#: src/LoginWithAuthorizationProviderAction.php:310
104-
msgid ""
105-
"Please press \"continue\" to request the creation of a new webtrees user "
106-
"acccount based on the data from the authorization provider."
95+
#: src/LoginWithAuthorizationProviderAction.php:303
96+
#, php-format
97+
msgid "It is not possible to request a webtrees account with %s."
10798
msgstr ""
108-
"Please press \"continue\" to request the creation of a new webtrees user "
109-
"acccount based on the data from the authorisation provider."
11099

100+
#: src/LoginWithAuthorizationProviderAction.php:304
111101
#: src/LoginWithAuthorizationProviderAction.php:311
102+
#: src/LoginWithAuthorizationProviderAction.php:323
103+
#, php-format
112104
msgid ""
113-
"If you already have a webtrees user account, you might want to \"quit\" and "
114-
"choose to connect the existing webtrees account with the authorization "
115-
"provider. Please use to the related menu items."
105+
"To connect an existing user with %s, sign in and select: My pages / My "
106+
"account / Connect with"
107+
msgstr ""
108+
109+
#: src/LoginWithAuthorizationProviderAction.php:310
110+
#, php-format
111+
msgid "Invalid user data received from %s. Email or username missing."
112+
msgstr ""
113+
114+
#: src/LoginWithAuthorizationProviderAction.php:317
115+
msgid "Requesting a new webtrees user account is currently not allowed."
116+
msgstr ""
117+
118+
#: src/LoginWithAuthorizationProviderAction.php:322
119+
#, php-format
120+
msgid "Press \"continue\" to request a new webtrees user acccount with %s."
116121
msgstr ""
117122

118-
#: src/LoginWithAuthorizationProviderAction.php:319
123+
#: src/LoginWithAuthorizationProviderAction.php:332
119124
msgid "Request a new user account with an authorization provider"
120125
msgstr "Request a new user account with an authorisation provider"
121126

122-
#: src/LoginWithAuthorizationProviderAction.php:341
127+
#: src/LoginWithAuthorizationProviderAction.php:354
123128
#, php-format
124129
msgid "The email address for user %s was updated to: %s"
125130
msgstr ""
126131

127-
#: src/LoginWithAuthorizationProviderAction.php:410
132+
#: src/LoginWithAuthorizationProviderAction.php:423
128133
msgid ""
129-
"Login with the provided user credentials denied. The username or email "
130-
"provided from the authorization provider might already exist in webtrees. If "
131-
"you want to connect an existing webtrees user to an authorization provider, "
132-
"select: My pages / My account / Connect with"
134+
"Login denied. The email address or username already exists. To connect an "
135+
"existing user, select: My pages / My account / Connect with"
133136
msgstr ""
134-
"Login with the provided user credentials denied. The username or email "
135-
"provided from the authorisation provider might already exist in webtrees. If "
136-
"you want to connect an existing webtrees user to an authorisation provider, "
137-
"select: My pages / My account / Connect with"
138137

139138
#: src/OAuth2Client.php:223
140139
msgid "OAuth2 Client"
141140
msgstr ""
142141

143142
#: src/OAuth2Client.php:236
144143
msgid "A custom module to implement a OAuth2 client for webtrees."
145-
msgstr "A custom module to implement a OAuth2 client for WebTrees."
144+
msgstr ""
146145

147146
#: src/OAuth2Client.php:419 resources/views/login-with-provider.phtml:41
148147
msgid "Sign in with"
@@ -207,11 +206,6 @@ msgid ""
207206
"strongly recommended to deactivate one of the modules. The path of the "
208207
"parallel view is: %s"
209208
msgstr ""
210-
"The custom module view \"%s\" is not registered as replacement for the "
211-
"standard WebTrees view. There might be another module installed, which "
212-
"registered the same custom view. This can lead to unintended behavior. It is "
213-
"strongly recommended to deactivate one of the modules. The path of the "
214-
"parallel view is: %s"
215209

216210
#: src/Provider/AbstractAuthorizationProvider.php:134
217211
msgid ""
@@ -348,11 +342,11 @@ msgid ""
348342
"the webtrees \"config.ini.php\" file. Currently, \"base_url\" does not start "
349343
"with \"https://\"."
350344
msgstr ""
351-
"Currently, WebTrees does not use the HTTPS protocol. If signing in with "
345+
"Currently, webtrees does not use the HTTPS protocol. If signing in with "
352346
"authorisation providers, it is urgently recommended to use HTTPS in order to "
353347
"encrypt the communication with the authorisation provider. If your server "
354348
"supports the protocol, HTTPS can be activated by changing \"base_url\" in "
355-
"the WebTrees \"config.ini.php\" file. Currently, \"base_url\" does not start "
349+
"the webtrees \"config.ini.php\" file. Currently, \"base_url\" does not start "
356350
"with \"https://\"."
357351

358352
#: resources/views/settings.phtml:62
@@ -368,11 +362,11 @@ msgid ""
368362
"more. Hint: You can still access the original webtrees login page by typing "
369363
"the login route into the browser line, e.g.:"
370364
msgstr ""
371-
"Currently, all menus to directly sign in with WebTrees are deactivated. "
365+
"Currently, all menus to directly sign in with webtrees are deactivated. "
372366
"Therefore, only sign in with authorisation providers is possible. Please be "
373-
"sure that you establish a WebTrees administrator account with an "
367+
"sure that you establish a webtrees administrator account with an "
374368
"authorisation provider. Otherwise, administrator sign in is not possible any "
375-
"more. Hint: You can still access the original WebTrees login page by typing "
369+
"more. Hint: You can still access the original webtrees login page by typing "
376370
"the login route into the browser line, e.g.:"
377371

378372
#: resources/views/settings.phtml:71
@@ -386,7 +380,7 @@ msgstr ""
386380

387381
#: resources/views/settings.phtml:78
388382
msgid "Show original webtrees sign in as menu item"
389-
msgstr "Show a custom module specific sign in menu"
383+
msgstr ""
390384

391385
#: resources/views/settings.phtml:83
392386
msgid ""
@@ -395,12 +389,12 @@ msgid ""
395389
"entries for authorization providers might be shown."
396390
msgstr ""
397391
"By selecting/unselecting this option, it is possible to activate/deactivate "
398-
"the sign in menu entry for WebTrees. If deactivated, only sign in menu "
392+
"the sign in menu entry for webtrees. If deactivated, only sign in menu "
399393
"entries for authorisation providers might be shown."
400394

401395
#: resources/views/settings.phtml:92
402396
msgid "Hide the webtrees sign in menu"
403-
msgstr "Hide the WebTrees sign in menu"
397+
msgstr ""
404398

405399
#: resources/views/settings.phtml:95
406400
msgid "Hide"
@@ -412,9 +406,6 @@ msgid ""
412406
"in menu. This might be helpful if the custom module specific top menu for "
413407
"sign in is used instead."
414408
msgstr ""
415-
"By selecting this option, it is possible to hide the original WebTrees sign "
416-
"in menu. This might be helpful if the custom module specific top menu for "
417-
"sign in is used instead."
418409

419410
#: resources/views/settings.phtml:104
420411
msgid "Settings for Password, Email, and Connection Management"

resources/lang/en-GB.mo

-2.23 KB
Binary file not shown.

0 commit comments

Comments
 (0)