Skip to content

Commit 300935e

Browse files
committed
Merge branch 'master' into UE/4.20
2 parents 8148af1 + 7e86ad8 commit 300935e

21 files changed

+1314
-976
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,3 +246,4 @@ Intermediate/
246246
Saved/
247247
*.sln
248248
stomt.VC.opendb
249+
.vs
-665 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.

Content/Maps/StomtExampleMap.umap

0 Bytes
Binary file not shown.

Resources/languages.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"SDK_HEADER_TARGET_STOMTS": "STOMTS",
1616
"SDK_HEADER_YOUR_STOMTS": "DEINE",
1717

18-
"SDK_SUBSCRIBE_GET_NOTIFIED": "Abonniere STOMT um Antworten zu erhalten.",
18+
"SDK_SUBSCRIBE_GET_NOTIFIED": "Abonniere STOMT um über Antworten auf Deinen Wunsch informiert zu werden.",
1919
"SDK_SUBSCRIBE_TOGGLE_EMAIL": "E-Mail",
2020
"SDK_SUBSCRIBE_TOGGLE_PHONE": "SMS",
2121
"SDK_SUBSCRIBE_EMAIL_QUESTION": "Wie lautet deine E-Mail-Adresse?",
@@ -44,7 +44,12 @@
4444
"SDK_LOGIN_LOGOUT": "Ausloggen",
4545
"SDK_LOGIN_FORGOT_PW": "Passwort vergessen?",
4646
"SDK_LOGIN_SUCCESS": "Du bist eingeloggt!",
47-
"SDK_LOGIN_WENT_WRONG": "Ups, da lief was schief."
47+
"SDK_LOGIN_WENT_WRONG": "Ups, da lief was schief.",
48+
49+
"SDK_TERMS_LOGS_OPT_IN": "Dürfen wir Log-Dateien mitsenden?",
50+
"SDK_TERMS_LOGS_OPT_IN_DIS": "Nein, bitte nicht.",
51+
"SDK_TERMS_LOGS_OPT_OUT": "Wir werden Log-Dateien anhängen.",
52+
"SDK_TERMS_LOGS_OPT_OUT_DIS": "Keine Log-Dateien anhängen."
4853
},
4954
"en":
5055
{
@@ -60,7 +65,7 @@
6065
"SDK_HEADER_TARGET_STOMTS": "STOMTS",
6166
"SDK_HEADER_YOUR_STOMTS": "YOURS",
6267

63-
"SDK_SUBSCRIBE_GET_NOTIFIED": "Subscribe to STOMT to get responses to your wish.",
68+
"SDK_SUBSCRIBE_GET_NOTIFIED": "Subscribe to STOMT to get notified about responses to your wish.",
6469
"SDK_SUBSCRIBE_TOGGLE_EMAIL": "E-Mail",
6570
"SDK_SUBSCRIBE_TOGGLE_PHONE": "SMS",
6671
"SDK_SUBSCRIBE_EMAIL_QUESTION": "What's your email address?",
@@ -89,7 +94,12 @@
8994
"SDK_LOGIN_LOGOUT": "Logout",
9095
"SDK_LOGIN_FORGOT_PW": "Forgot password?",
9196
"SDK_LOGIN_SUCCESS": "You're now logged in!",
92-
"SDK_LOGIN_WENT_WRONG": "Ups something went wrong."
97+
"SDK_LOGIN_WENT_WRONG": "Ups something went wrong.",
98+
99+
"SDK_TERMS_LOGS_OPT_IN": "May we attach log files?",
100+
"SDK_TERMS_LOGS_OPT_IN_DIS": "No, please don't.",
101+
"SDK_TERMS_LOGS_OPT_OUT": "We will attach log files to your stomt.",
102+
"SDK_TERMS_LOGS_OPT_OUT_DIS": "Do not attach log files."
93103
},
94104
"es":
95105
{

0 commit comments

Comments
 (0)