Skip to content

Commit 7fbee4d

Browse files
committed
Merge branch 'github-main' into release/1.0.7
2 parents 4c1c567 + 5e4633e commit 7fbee4d

File tree

13 files changed

+287
-98
lines changed

13 files changed

+287
-98
lines changed

i18n/de_DE.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ backend:
3434
other: E-Mail und Password stimmen nicht überein.
3535
error:
3636
admin:
37+
cannot_update_their_password:
38+
other: You cannot modify your password.
39+
cannot_modify_self_status:
40+
other: You cannot modify your status.
3741
email_or_password_wrong:
3842
other: E-Mail und Password stimmen nicht überein.
3943
answer:
@@ -80,6 +84,8 @@ backend:
8084
new_password_same_as_previous_setting:
8185
other: Das neue Passwort ist das gleiche wie das vorherige Passwort.
8286
question:
87+
already_deleted:
88+
other: This post has been deleted.
8389
not_found:
8490
other: Frage nicht gefunden.
8591
cannot_deleted:
@@ -782,6 +788,7 @@ ui:
782788
approve: Approve
783789
reject: Reject
784790
skip: Skip
791+
discard_draft: Discard draft
785792
search:
786793
title: Search Results
787794
keywords: Keywords
@@ -971,9 +978,11 @@ ui:
971978
answers: answers
972979
accepted: Accepted
973980
page_404:
981+
http_error: HTTP Error 404
974982
desc: "Unfortunately, this page doesn't exist."
975983
back_home: Back to homepage
976984
page_50X:
985+
http_error: HTTP Error 500
977986
desc: The server encountered an error and could not complete your request.
978987
back_home: Back to homepage
979988
page_maintenance:
@@ -1360,6 +1369,10 @@ ui:
13601369
reputation: reputation
13611370
votes: votes
13621371
prompt:
1363-
leave_page: "Are you sure you want to leave the page?"
1364-
changes_not_save: "Your changes may not be saved."
1372+
leave_page: Are you sure you want to leave the page?
1373+
changes_not_save: Your changes may not be saved.
1374+
draft:
1375+
discard_confirm: Are you sure you want to discard your draft?
1376+
messages:
1377+
post_deleted: This post has been deleted.
13651378

i18n/es_ES.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ backend:
3434
other: Contraseña o correo incorrecto.
3535
error:
3636
admin:
37+
cannot_update_their_password:
38+
other: You cannot modify your password.
39+
cannot_modify_self_status:
40+
other: You cannot modify your status.
3741
email_or_password_wrong:
3842
other: Contraseña o correo incorrecto.
3943
answer:
@@ -80,6 +84,8 @@ backend:
8084
new_password_same_as_previous_setting:
8185
other: La nueva contraseña es igual a la anterior.
8286
question:
87+
already_deleted:
88+
other: This post has been deleted.
8389
not_found:
8490
other: Pregunta no encontrada.
8591
cannot_deleted:
@@ -807,6 +813,7 @@ ui:
807813
approve: Aprobar
808814
reject: Rechazar
809815
skip: Omitir
816+
discard_draft: Discard draft
810817
search:
811818
title: Resultados de la búsqueda
812819
keywords: Palabras claves
@@ -996,9 +1003,11 @@ ui:
9961003
answers: answers
9971004
accepted: Accepted
9981005
page_404:
1006+
http_error: HTTP Error 404
9991007
desc: "Unfortunately, this page doesn't exist."
10001008
back_home: Back to homepage
10011009
page_50X:
1010+
http_error: HTTP Error 500
10021011
desc: The server encountered an error and could not complete your request.
10031012
back_home: Back to homepage
10041013
page_maintenance:
@@ -1385,6 +1394,10 @@ ui:
13851394
reputation: reputación
13861395
votes: votos
13871396
prompt:
1388-
leave_page: "Are you sure you want to leave the page?"
1389-
changes_not_save: "Your changes may not be saved."
1397+
leave_page: Are you sure you want to leave the page?
1398+
changes_not_save: Your changes may not be saved.
1399+
draft:
1400+
discard_confirm: Are you sure you want to discard your draft?
1401+
messages:
1402+
post_deleted: This post has been deleted.
13901403

i18n/fr_FR.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ backend:
3434
other: L'email et le mot de passe ne correspondent pas.
3535
error:
3636
admin:
37+
cannot_update_their_password:
38+
other: You cannot modify your password.
39+
cannot_modify_self_status:
40+
other: You cannot modify your status.
3741
email_or_password_wrong:
3842
other: L'email et le mot de passe ne correspondent pas.
3943
answer:
@@ -80,6 +84,8 @@ backend:
8084
new_password_same_as_previous_setting:
8185
other: Le nouveau mot de passe est le même que le précédent.
8286
question:
87+
already_deleted:
88+
other: This post has been deleted.
8389
not_found:
8490
other: Question non trouvée.
8591
cannot_deleted:
@@ -782,6 +788,7 @@ ui:
782788
approve: Approuver
783789
reject: Rejeter
784790
skip: Ignorer
791+
discard_draft: Discard draft
785792
search:
786793
title: Résultats de la recherche
787794
keywords: Mots-clés
@@ -971,9 +978,11 @@ ui:
971978
answers: réponses
972979
accepted: Accepté
973980
page_404:
981+
http_error: HTTP Error 404
974982
desc: "Nous sommes désolés, mais cette page n’existe pas."
975983
back_home: Retour à la page d'accueil
976984
page_50X:
985+
http_error: HTTP Error 500
977986
desc: Le serveur a rencontré une erreur et n'a pas pu répondre à votre requête.
978987
back_home: Retour à la page d'accueil
979988
page_maintenance:
@@ -1360,6 +1369,10 @@ ui:
13601369
reputation: réputation
13611370
votes: votes
13621371
prompt:
1363-
leave_page: "Voulez-vous vraiment quitter la page ?"
1364-
changes_not_save: "Impossible d'enregistrer vos modifications."
1372+
leave_page: Voulez-vous vraiment quitter la page ?
1373+
changes_not_save: Impossible d'enregistrer vos modifications.
1374+
draft:
1375+
discard_confirm: Are you sure you want to discard your draft?
1376+
messages:
1377+
post_deleted: This post has been deleted.
13651378

i18n/id_ID.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ backend:
3434
other: Email dan kata sandi tidak cocok.
3535
error:
3636
admin:
37+
cannot_update_their_password:
38+
other: You cannot modify your password.
39+
cannot_modify_self_status:
40+
other: You cannot modify your status.
3741
email_or_password_wrong:
3842
other: Email dan kata sandi tidak cocok.
3943
answer:
@@ -80,6 +84,8 @@ backend:
8084
new_password_same_as_previous_setting:
8185
other: Password baru sama dengan password yang sebelumnya.
8286
question:
87+
already_deleted:
88+
other: This post has been deleted.
8389
not_found:
8490
other: Pertanyaan tidak ditemukan.
8591
cannot_deleted:
@@ -782,6 +788,7 @@ ui:
782788
approve: Approve
783789
reject: Reject
784790
skip: Skip
791+
discard_draft: Discard draft
785792
search:
786793
title: Search Results
787794
keywords: Keywords
@@ -971,9 +978,11 @@ ui:
971978
answers: answers
972979
accepted: Accepted
973980
page_404:
981+
http_error: HTTP Error 404
974982
desc: "Sayangnya, halaman ini tidak ada."
975983
back_home: Kembali ke beranda
976984
page_50X:
985+
http_error: HTTP Error 500
977986
desc: Server mengalami kesalahan internal dan tidak dapat menyelesaikan permintaan Anda.
978987
back_home: Kembali ke beranda
979988
page_maintenance:
@@ -1360,6 +1369,10 @@ ui:
13601369
reputation: reputation
13611370
votes: votes
13621371
prompt:
1363-
leave_page: "Are you sure you want to leave the page?"
1364-
changes_not_save: "Your changes may not be saved."
1372+
leave_page: Are you sure you want to leave the page?
1373+
changes_not_save: Your changes may not be saved.
1374+
draft:
1375+
discard_confirm: Are you sure you want to discard your draft?
1376+
messages:
1377+
post_deleted: This post has been deleted.
13651378

i18n/it_IT.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ backend:
3434
other: Email o password errati
3535
error:
3636
admin:
37+
cannot_update_their_password:
38+
other: You cannot modify your password.
39+
cannot_modify_self_status:
40+
other: You cannot modify your status.
3741
email_or_password_wrong:
3842
other: Email o password errati
3943
answer:
@@ -80,6 +84,8 @@ backend:
8084
new_password_same_as_previous_setting:
8185
other: La nuova password è identica alla precedente
8286
question:
87+
already_deleted:
88+
other: This post has been deleted.
8389
not_found:
8490
other: domanda non trovata
8591
cannot_deleted:
@@ -782,6 +788,7 @@ ui:
782788
approve: Approve
783789
reject: Reject
784790
skip: Skip
791+
discard_draft: Discard draft
785792
search:
786793
title: Search Results
787794
keywords: Keywords
@@ -971,9 +978,11 @@ ui:
971978
answers: answers
972979
accepted: Accepted
973980
page_404:
981+
http_error: HTTP Error 404
974982
desc: "Unfortunately, this page doesn't exist."
975983
back_home: Back to homepage
976984
page_50X:
985+
http_error: HTTP Error 500
977986
desc: The server encountered an error and could not complete your request.
978987
back_home: Back to homepage
979988
page_maintenance:
@@ -1360,6 +1369,10 @@ ui:
13601369
reputation: reputation
13611370
votes: votes
13621371
prompt:
1363-
leave_page: "Are you sure you want to leave the page?"
1364-
changes_not_save: "Your changes may not be saved."
1372+
leave_page: Are you sure you want to leave the page?
1373+
changes_not_save: Your changes may not be saved.
1374+
draft:
1375+
discard_confirm: Are you sure you want to discard your draft?
1376+
messages:
1377+
post_deleted: This post has been deleted.
13651378

i18n/ja_JP.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ backend:
3434
other: Email and password do not match.
3535
error:
3636
admin:
37+
cannot_update_their_password:
38+
other: You cannot modify your password.
39+
cannot_modify_self_status:
40+
other: You cannot modify your status.
3741
email_or_password_wrong:
3842
other: Email and password do not match.
3943
answer:
@@ -80,6 +84,8 @@ backend:
8084
new_password_same_as_previous_setting:
8185
other: The new password is the same as the previous one.
8286
question:
87+
already_deleted:
88+
other: This post has been deleted.
8389
not_found:
8490
other: Question not found.
8591
cannot_deleted:
@@ -782,6 +788,7 @@ ui:
782788
approve: Approve
783789
reject: Reject
784790
skip: Skip
791+
discard_draft: Discard draft
785792
search:
786793
title: Search Results
787794
keywords: Keywords
@@ -971,9 +978,11 @@ ui:
971978
answers: answers
972979
accepted: Accepted
973980
page_404:
981+
http_error: HTTP Error 404
974982
desc: "Unfortunately, this page doesn't exist."
975983
back_home: Back to homepage
976984
page_50X:
985+
http_error: HTTP Error 500
977986
desc: The server encountered an error and could not complete your request.
978987
back_home: Back to homepage
979988
page_maintenance:
@@ -1360,6 +1369,10 @@ ui:
13601369
reputation: reputation
13611370
votes: votes
13621371
prompt:
1363-
leave_page: "Are you sure you want to leave the page?"
1364-
changes_not_save: "Your changes may not be saved."
1372+
leave_page: Are you sure you want to leave the page?
1373+
changes_not_save: Your changes may not be saved.
1374+
draft:
1375+
discard_confirm: Are you sure you want to discard your draft?
1376+
messages:
1377+
post_deleted: This post has been deleted.
13651378

i18n/ko_KR.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ backend:
3434
other: Email and password do not match.
3535
error:
3636
admin:
37+
cannot_update_their_password:
38+
other: You cannot modify your password.
39+
cannot_modify_self_status:
40+
other: You cannot modify your status.
3741
email_or_password_wrong:
3842
other: Email and password do not match.
3943
answer:
@@ -80,6 +84,8 @@ backend:
8084
new_password_same_as_previous_setting:
8185
other: The new password is the same as the previous one.
8286
question:
87+
already_deleted:
88+
other: This post has been deleted.
8389
not_found:
8490
other: Question not found.
8591
cannot_deleted:
@@ -782,6 +788,7 @@ ui:
782788
approve: Approve
783789
reject: Reject
784790
skip: Skip
791+
discard_draft: Discard draft
785792
search:
786793
title: Search Results
787794
keywords: Keywords
@@ -971,9 +978,11 @@ ui:
971978
answers: answers
972979
accepted: Accepted
973980
page_404:
981+
http_error: HTTP Error 404
974982
desc: "Unfortunately, this page doesn't exist."
975983
back_home: Back to homepage
976984
page_50X:
985+
http_error: HTTP Error 500
977986
desc: The server encountered an error and could not complete your request.
978987
back_home: Back to homepage
979988
page_maintenance:
@@ -1360,6 +1369,10 @@ ui:
13601369
reputation: reputation
13611370
votes: votes
13621371
prompt:
1363-
leave_page: "Are you sure you want to leave the page?"
1364-
changes_not_save: "Your changes may not be saved."
1372+
leave_page: Are you sure you want to leave the page?
1373+
changes_not_save: Your changes may not be saved.
1374+
draft:
1375+
discard_confirm: Are you sure you want to discard your draft?
1376+
messages:
1377+
post_deleted: This post has been deleted.
13651378

0 commit comments

Comments
 (0)