Skip to content

Commit 9804362

Browse files
committed
Merge remote-tracking branch 'origin/i18n'
# Conflicts: # i18n/cs_CZ.yaml # i18n/cy_GB.yaml # i18n/da_DK.yaml # i18n/de_DE.yaml # i18n/es_ES.yaml # i18n/fa_IR.yaml # i18n/fr_FR.yaml # i18n/hi_IN.yaml # i18n/id_ID.yaml # i18n/it_IT.yaml # i18n/ja_JP.yaml # i18n/ko_KR.yaml # i18n/pl_PL.yaml # i18n/pt_PT.yaml # i18n/ro_RO.yaml # i18n/ru_RU.yaml # i18n/sk_SK.yaml # i18n/sv_SE.yaml # i18n/te_IN.yaml # i18n/tr_TR.yaml # i18n/uk_UA.yaml # i18n/vi_VN.yaml # i18n/zh_CN.yaml # i18n/zh_TW.yaml
2 parents 245b532 + 8a5956f commit 9804362

23 files changed

+1087
-134
lines changed

i18n/cs_CZ.yaml

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ backend:
137137
other: Heslo
138138
pass:
139139
other: Password
140+
original_text:
141+
other: This post
140142
email_or_password_wrong_error:
141143
other: Email and password do not match.
142144
error:
@@ -149,6 +151,8 @@ backend:
149151
admin:
150152
cannot_update_their_password:
151153
other: Nemůžete změnit své heslo.
154+
cannot_edit_their_profile:
155+
other: You cannot modify your profile.
152156
cannot_modify_self_status:
153157
other: Nemůžete změnit svůj stav.
154158
email_or_password_wrong:
@@ -200,6 +204,11 @@ backend:
200204
other: The old password verification failed
201205
new_password_same_as_previous_setting:
202206
other: The new password is the same as the previous one.
207+
already_deleted:
208+
other: This post has been deleted.
209+
meta:
210+
object_not_found:
211+
other: Meta object not found
203212
question:
204213
already_deleted:
205214
other: This post has been deleted.
@@ -312,7 +321,9 @@ backend:
312321
name:
313322
other: rude or abusive
314323
desc:
315-
other: A reasonable person would find this content inappropriate for respectful discourse.
324+
other:
325+
- A reasonable person would find this content inappropriate for respectful
326+
- discourse.
316327
a_duplicate:
317328
name:
318329
other: a duplicate
@@ -324,7 +335,10 @@ backend:
324335
name:
325336
other: not an answer
326337
desc:
327-
other: This was posted as an answer, but it does not attempt to answer the question. It should possibly be an edit, a comment, another question, or deleted altogether.
338+
other:
339+
- This was posted as an answer, but it does not attempt to answer the
340+
- question. It should possibly be an edit, a comment, another question,
341+
- or deleted altogether.
328342
no_longer_needed:
329343
name:
330344
other: no longer needed
@@ -383,7 +397,9 @@ backend:
383397
name:
384398
other: needs details or clarity
385399
desc:
386-
other: This question currently includes multiple questions in one. It should focus on one problem only.
400+
other:
401+
- This question currently includes multiple questions in one. It should
402+
- focus on one problem only.
387403
other:
388404
name:
389405
other: something else
@@ -499,6 +515,9 @@ backend:
499515
other: Flagged post
500516
suggested_post_edit:
501517
other: Suggested edits
518+
reaction:
519+
tooltip:
520+
other: "{{ .Names }} and {{ .Count }} more..."
502521
# The following fields are used for interface presentation(Front-end)
503522
ui:
504523
how_to_format:
@@ -747,6 +766,14 @@ ui:
747766
day: day
748767
hours: hours
749768
days: days
769+
reaction:
770+
heart: heart
771+
smile: smile
772+
frown: frown
773+
btn_label: add or remove reactions
774+
undo_emoji: undo {{ emoji }} reaction
775+
react_emoji: react with {{ emoji }}
776+
unreact_emoji: unreact with {{ emoji }}
750777
comment:
751778
btn_add_comment: Add comment
752779
reply_to: Reply to
@@ -1470,6 +1497,19 @@ ui:
14701497
msg: Password must be at 8-32 characters in length.
14711498
btn_cancel: Cancel
14721499
btn_submit: Submit
1500+
edit_profile_modal:
1501+
title: Edit profile
1502+
form:
1503+
fields:
1504+
username:
1505+
label: Username
1506+
msg_range: Username up to 30 characters.
1507+
email:
1508+
label: Email
1509+
msg_invalid: Invalid Email Address.
1510+
edit_success: Edited successfully
1511+
btn_cancel: Cancel
1512+
btn_submit: Submit
14731513
user_modal:
14741514
title: Add new user
14751515
form:
@@ -1515,6 +1555,7 @@ ui:
15151555
filter:
15161556
placeholder: "Filter by name, user:id"
15171557
set_new_password: Set new password
1558+
edit_profile: Edit profile
15181559
change_status: Change status
15191560
change_role: Change role
15201561
show_logs: Show logs
@@ -1610,6 +1651,7 @@ ui:
16101651
msg: Encryption cannot be empty.
16111652
text: For most servers SSL is the recommended option.
16121653
ssl: SSL
1654+
tls: TLS
16131655
none: None
16141656
smtp_port:
16151657
label: SMTP port

i18n/cy_GB.yaml

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ backend:
137137
other: Cyfrinair
138138
pass:
139139
other: Password
140+
original_text:
141+
other: This post
140142
email_or_password_wrong_error:
141143
other: Nid yw e-bost a chyfrinair yn cyfateb.
142144
error:
@@ -149,6 +151,8 @@ backend:
149151
admin:
150152
cannot_update_their_password:
151153
other: Ni allwch addasu eich cyfrinair.
154+
cannot_edit_their_profile:
155+
other: You cannot modify your profile.
152156
cannot_modify_self_status:
153157
other: Ni allwch addasu eich statws.
154158
email_or_password_wrong:
@@ -200,6 +204,11 @@ backend:
200204
other: Methodd yr hen ddilysiad cyfrinair
201205
new_password_same_as_previous_setting:
202206
other: Mae'r cyfrinair newydd yr un fath â'r un blaenorol.
207+
already_deleted:
208+
other: This post has been deleted.
209+
meta:
210+
object_not_found:
211+
other: Meta object not found
203212
question:
204213
already_deleted:
205214
other: Mae'r postiad hwn wedi'i ddileu.
@@ -312,7 +321,9 @@ backend:
312321
name:
313322
other: rude or abusive
314323
desc:
315-
other: A reasonable person would find this content inappropriate for respectful discourse.
324+
other:
325+
- A reasonable person would find this content inappropriate for respectful
326+
- discourse.
316327
a_duplicate:
317328
name:
318329
other: a duplicate
@@ -324,7 +335,10 @@ backend:
324335
name:
325336
other: not an answer
326337
desc:
327-
other: This was posted as an answer, but it does not attempt to answer the question. It should possibly be an edit, a comment, another question, or deleted altogether.
338+
other:
339+
- This was posted as an answer, but it does not attempt to answer the
340+
- question. It should possibly be an edit, a comment, another question,
341+
- or deleted altogether.
328342
no_longer_needed:
329343
name:
330344
other: no longer needed
@@ -383,7 +397,9 @@ backend:
383397
name:
384398
other: angen manylion neu eglurder
385399
desc:
386-
other: Mae'r cwestiwn hwn ar hyn o bryd yn cynnwys cwestiynau lluosog mewn un. Dylai ganolbwyntio ar un broblem yn unig.
400+
other:
401+
- This question currently includes multiple questions in one. It should
402+
- focus on one problem only.
387403
other:
388404
name:
389405
other: rhywbeth arall
@@ -499,6 +515,9 @@ backend:
499515
other: Flagged post
500516
suggested_post_edit:
501517
other: Suggested edits
518+
reaction:
519+
tooltip:
520+
other: "{{ .Names }} and {{ .Count }} more..."
502521
# The following fields are used for interface presentation(Front-end)
503522
ui:
504523
how_to_format:
@@ -747,6 +766,14 @@ ui:
747766
day: day
748767
hours: hours
749768
days: days
769+
reaction:
770+
heart: heart
771+
smile: smile
772+
frown: frown
773+
btn_label: add or remove reactions
774+
undo_emoji: undo {{ emoji }} reaction
775+
react_emoji: react with {{ emoji }}
776+
unreact_emoji: unreact with {{ emoji }}
750777
comment:
751778
btn_add_comment: Add comment
752779
reply_to: Reply to
@@ -1470,6 +1497,19 @@ ui:
14701497
msg: Password must be at 8-32 characters in length.
14711498
btn_cancel: Cancel
14721499
btn_submit: Submit
1500+
edit_profile_modal:
1501+
title: Edit profile
1502+
form:
1503+
fields:
1504+
username:
1505+
label: Username
1506+
msg_range: Username up to 30 characters.
1507+
email:
1508+
label: Email
1509+
msg_invalid: Invalid Email Address.
1510+
edit_success: Edited successfully
1511+
btn_cancel: Cancel
1512+
btn_submit: Submit
14731513
user_modal:
14741514
title: Add new user
14751515
form:
@@ -1515,6 +1555,7 @@ ui:
15151555
filter:
15161556
placeholder: "Filter by name, user:id"
15171557
set_new_password: Set new password
1558+
edit_profile: Edit profile
15181559
change_status: Change status
15191560
change_role: Change role
15201561
show_logs: Show logs
@@ -1610,6 +1651,7 @@ ui:
16101651
msg: Encryption cannot be empty.
16111652
text: For most servers SSL is the recommended option.
16121653
ssl: SSL
1654+
tls: TLS
16131655
none: None
16141656
smtp_port:
16151657
label: SMTP port

i18n/da_DK.yaml

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ backend:
137137
other: Password
138138
pass:
139139
other: Password
140+
original_text:
141+
other: This post
140142
email_or_password_wrong_error:
141143
other: Email and password do not match.
142144
error:
@@ -149,6 +151,8 @@ backend:
149151
admin:
150152
cannot_update_their_password:
151153
other: You cannot modify your password.
154+
cannot_edit_their_profile:
155+
other: You cannot modify your profile.
152156
cannot_modify_self_status:
153157
other: You cannot modify your status.
154158
email_or_password_wrong:
@@ -200,6 +204,11 @@ backend:
200204
other: The old password verification failed
201205
new_password_same_as_previous_setting:
202206
other: The new password is the same as the previous one.
207+
already_deleted:
208+
other: This post has been deleted.
209+
meta:
210+
object_not_found:
211+
other: Meta object not found
203212
question:
204213
already_deleted:
205214
other: This post has been deleted.
@@ -312,7 +321,9 @@ backend:
312321
name:
313322
other: rude or abusive
314323
desc:
315-
other: A reasonable person would find this content inappropriate for respectful discourse.
324+
other:
325+
- A reasonable person would find this content inappropriate for respectful
326+
- discourse.
316327
a_duplicate:
317328
name:
318329
other: a duplicate
@@ -324,7 +335,10 @@ backend:
324335
name:
325336
other: not an answer
326337
desc:
327-
other: This was posted as an answer, but it does not attempt to answer the question. It should possibly be an edit, a comment, another question, or deleted altogether.
338+
other:
339+
- This was posted as an answer, but it does not attempt to answer the
340+
- question. It should possibly be an edit, a comment, another question,
341+
- or deleted altogether.
328342
no_longer_needed:
329343
name:
330344
other: no longer needed
@@ -383,7 +397,9 @@ backend:
383397
name:
384398
other: needs details or clarity
385399
desc:
386-
other: This question currently includes multiple questions in one. It should focus on one problem only.
400+
other:
401+
- This question currently includes multiple questions in one. It should
402+
- focus on one problem only.
387403
other:
388404
name:
389405
other: something else
@@ -499,6 +515,9 @@ backend:
499515
other: Flagged post
500516
suggested_post_edit:
501517
other: Suggested edits
518+
reaction:
519+
tooltip:
520+
other: "{{ .Names }} and {{ .Count }} more..."
502521
# The following fields are used for interface presentation(Front-end)
503522
ui:
504523
how_to_format:
@@ -747,6 +766,14 @@ ui:
747766
day: day
748767
hours: hours
749768
days: days
769+
reaction:
770+
heart: heart
771+
smile: smile
772+
frown: frown
773+
btn_label: add or remove reactions
774+
undo_emoji: undo {{ emoji }} reaction
775+
react_emoji: react with {{ emoji }}
776+
unreact_emoji: unreact with {{ emoji }}
750777
comment:
751778
btn_add_comment: Add comment
752779
reply_to: Reply to
@@ -1470,6 +1497,19 @@ ui:
14701497
msg: Password must be at 8-32 characters in length.
14711498
btn_cancel: Cancel
14721499
btn_submit: Submit
1500+
edit_profile_modal:
1501+
title: Edit profile
1502+
form:
1503+
fields:
1504+
username:
1505+
label: Username
1506+
msg_range: Username up to 30 characters.
1507+
email:
1508+
label: Email
1509+
msg_invalid: Invalid Email Address.
1510+
edit_success: Edited successfully
1511+
btn_cancel: Cancel
1512+
btn_submit: Submit
14731513
user_modal:
14741514
title: Add new user
14751515
form:
@@ -1515,6 +1555,7 @@ ui:
15151555
filter:
15161556
placeholder: "Filter by name, user:id"
15171557
set_new_password: Set new password
1558+
edit_profile: Edit profile
15181559
change_status: Change status
15191560
change_role: Change role
15201561
show_logs: Show logs
@@ -1610,6 +1651,7 @@ ui:
16101651
msg: Encryption cannot be empty.
16111652
text: For most servers SSL is the recommended option.
16121653
ssl: SSL
1654+
tls: TLS
16131655
none: None
16141656
smtp_port:
16151657
label: SMTP port

0 commit comments

Comments
 (0)