Skip to content

Commit f724785

Browse files
committed
Merge branch 'feat/1.1.2/notification' into test
# Conflicts: # i18n/en_US.yaml
2 parents 4cc3efb + 2f8351b commit f724785

43 files changed

Lines changed: 238 additions & 240 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

i18n/af_ZA.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ ui:
960960
You appear to have already installed. To reinstall please clear your old database tables first.
961961
db_failed: Database connection failed
962962
db_failed_desc: >-
963-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
963+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
964964
counts:
965965
views: views
966966
votes: votes

i18n/ar_SA.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ ui:
960960
You appear to have already installed. To reinstall please clear your old database tables first.
961961
db_failed: Database connection failed
962962
db_failed_desc: >-
963-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
963+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
964964
counts:
965965
views: views
966966
votes: votes

i18n/az_AZ.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ backend:
146146
other: "Create table failed"
147147
install:
148148
create_config_failed:
149-
other: "Cant create the config.yaml file."
149+
other: "Can't create the config.yaml file."
150150
report:
151151
spam:
152152
name:
@@ -815,7 +815,7 @@ ui:
815815
unsubscribe:
816816
page_title: Unsubscribe
817817
success_title: Unsubscribe Successful
818-
success_desc: You have been successfully removed from this subscriber list and wont receive any further emails from us.
818+
success_desc: You have been successfully removed from this subscriber list and won't receive any further emails from us.
819819
link: Change settings
820820
question:
821821
following_tags: Following Tags
@@ -877,7 +877,7 @@ ui:
877877
title: Answer
878878
next: Next
879879
done: Done
880-
config_yaml_error: Cant create the config.yaml file.
880+
config_yaml_error: Can't create the config.yaml file.
881881
lang:
882882
label: Please Choose a Language
883883
db_type:
@@ -907,7 +907,7 @@ ui:
907907
label: The config.yaml file created.
908908
desc: >-
909909
You can create the <1>config.yaml</1> file manually in the <1>/var/wwww/xxx/</1> directory and paste the following text into it.
910-
info: "After youve done that, click “Next” button."
910+
info: "After you've done that, click “Next” button."
911911
site_information: Site Information
912912
admin_account: Admin Account
913913
site_name:
@@ -952,15 +952,15 @@ ui:
952952
You appear to have already installed. To reinstall please clear your old database tables first.
953953
db_failed: Database connection failed
954954
db_failed_desc: >-
955-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
955+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
956956
page_404:
957957
desc: "Unfortunately, this page doesn't exist."
958958
back_home: Back to homepage
959959
page_50X:
960960
desc: The server encountered an error and could not complete your request.
961961
back_home: Back to homepage
962962
page_maintenance:
963-
desc: "We are under maintenance, well be back soon."
963+
desc: "We are under maintenance, we'll be back soon."
964964
nav_menus:
965965
dashboard: Dashboard
966966
contents: Contents

i18n/bal_BA.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ backend:
146146
other: "Create table failed"
147147
install:
148148
create_config_failed:
149-
other: "Cant create the config.yaml file."
149+
other: "Can't create the config.yaml file."
150150
report:
151151
spam:
152152
name:
@@ -815,7 +815,7 @@ ui:
815815
unsubscribe:
816816
page_title: Unsubscribe
817817
success_title: Unsubscribe Successful
818-
success_desc: You have been successfully removed from this subscriber list and wont receive any further emails from us.
818+
success_desc: You have been successfully removed from this subscriber list and won't receive any further emails from us.
819819
link: Change settings
820820
question:
821821
following_tags: Following Tags
@@ -877,7 +877,7 @@ ui:
877877
title: Answer
878878
next: Next
879879
done: Done
880-
config_yaml_error: Cant create the config.yaml file.
880+
config_yaml_error: Can't create the config.yaml file.
881881
lang:
882882
label: Please Choose a Language
883883
db_type:
@@ -907,7 +907,7 @@ ui:
907907
label: The config.yaml file created.
908908
desc: >-
909909
You can create the <1>config.yaml</1> file manually in the <1>/var/wwww/xxx/</1> directory and paste the following text into it.
910-
info: "After youve done that, click “Next” button."
910+
info: "After you've done that, click “Next” button."
911911
site_information: Site Information
912912
admin_account: Admin Account
913913
site_name:
@@ -952,15 +952,15 @@ ui:
952952
You appear to have already installed. To reinstall please clear your old database tables first.
953953
db_failed: Database connection failed
954954
db_failed_desc: >-
955-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
955+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
956956
page_404:
957957
desc: "Unfortunately, this page doesn't exist."
958958
back_home: Back to homepage
959959
page_50X:
960960
desc: The server encountered an error and could not complete your request.
961961
back_home: Back to homepage
962962
page_maintenance:
963-
desc: "We are under maintenance, well be back soon."
963+
desc: "We are under maintenance, we'll be back soon."
964964
nav_menus:
965965
dashboard: Dashboard
966966
contents: Contents

i18n/ban_ID.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ backend:
146146
other: "Create table failed"
147147
install:
148148
create_config_failed:
149-
other: "Cant create the config.yaml file."
149+
other: "Can't create the config.yaml file."
150150
report:
151151
spam:
152152
name:
@@ -815,7 +815,7 @@ ui:
815815
unsubscribe:
816816
page_title: Unsubscribe
817817
success_title: Unsubscribe Successful
818-
success_desc: You have been successfully removed from this subscriber list and wont receive any further emails from us.
818+
success_desc: You have been successfully removed from this subscriber list and won't receive any further emails from us.
819819
link: Change settings
820820
question:
821821
following_tags: Following Tags
@@ -877,7 +877,7 @@ ui:
877877
title: Answer
878878
next: Next
879879
done: Done
880-
config_yaml_error: Cant create the config.yaml file.
880+
config_yaml_error: Can't create the config.yaml file.
881881
lang:
882882
label: Please Choose a Language
883883
db_type:
@@ -907,7 +907,7 @@ ui:
907907
label: The config.yaml file created.
908908
desc: >-
909909
You can create the <1>config.yaml</1> file manually in the <1>/var/wwww/xxx/</1> directory and paste the following text into it.
910-
info: "After youve done that, click “Next” button."
910+
info: "After you've done that, click “Next” button."
911911
site_information: Site Information
912912
admin_account: Admin Account
913913
site_name:
@@ -952,15 +952,15 @@ ui:
952952
You appear to have already installed. To reinstall please clear your old database tables first.
953953
db_failed: Database connection failed
954954
db_failed_desc: >-
955-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
955+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
956956
page_404:
957957
desc: "Unfortunately, this page doesn't exist."
958958
back_home: Back to homepage
959959
page_50X:
960960
desc: The server encountered an error and could not complete your request.
961961
back_home: Back to homepage
962962
page_maintenance:
963-
desc: "We are under maintenance, well be back soon."
963+
desc: "We are under maintenance, we'll be back soon."
964964
nav_menus:
965965
dashboard: Dashboard
966966
contents: Contents

i18n/bn_BD.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ backend:
146146
other: "Create table failed"
147147
install:
148148
create_config_failed:
149-
other: "Cant create the config.yaml file."
149+
other: "Can't create the config.yaml file."
150150
report:
151151
spam:
152152
name:
@@ -815,7 +815,7 @@ ui:
815815
unsubscribe:
816816
page_title: Unsubscribe
817817
success_title: Unsubscribe Successful
818-
success_desc: You have been successfully removed from this subscriber list and wont receive any further emails from us.
818+
success_desc: You have been successfully removed from this subscriber list and won't receive any further emails from us.
819819
link: Change settings
820820
question:
821821
following_tags: Following Tags
@@ -877,7 +877,7 @@ ui:
877877
title: Answer
878878
next: Next
879879
done: Done
880-
config_yaml_error: Cant create the config.yaml file.
880+
config_yaml_error: Can't create the config.yaml file.
881881
lang:
882882
label: Please Choose a Language
883883
db_type:
@@ -907,7 +907,7 @@ ui:
907907
label: The config.yaml file created.
908908
desc: >-
909909
You can create the <1>config.yaml</1> file manually in the <1>/var/wwww/xxx/</1> directory and paste the following text into it.
910-
info: "After youve done that, click “Next” button."
910+
info: "After you've done that, click “Next” button."
911911
site_information: Site Information
912912
admin_account: Admin Account
913913
site_name:
@@ -952,15 +952,15 @@ ui:
952952
You appear to have already installed. To reinstall please clear your old database tables first.
953953
db_failed: Database connection failed
954954
db_failed_desc: >-
955-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
955+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
956956
page_404:
957957
desc: "Unfortunately, this page doesn't exist."
958958
back_home: Back to homepage
959959
page_50X:
960960
desc: The server encountered an error and could not complete your request.
961961
back_home: Back to homepage
962962
page_maintenance:
963-
desc: "We are under maintenance, well be back soon."
963+
desc: "We are under maintenance, we'll be back soon."
964964
nav_menus:
965965
dashboard: Dashboard
966966
contents: Contents

i18n/bs_BA.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ backend:
146146
other: "Create table failed"
147147
install:
148148
create_config_failed:
149-
other: "Cant create the config.yaml file."
149+
other: "Can't create the config.yaml file."
150150
report:
151151
spam:
152152
name:
@@ -815,7 +815,7 @@ ui:
815815
unsubscribe:
816816
page_title: Unsubscribe
817817
success_title: Unsubscribe Successful
818-
success_desc: You have been successfully removed from this subscriber list and wont receive any further emails from us.
818+
success_desc: You have been successfully removed from this subscriber list and won't receive any further emails from us.
819819
link: Change settings
820820
question:
821821
following_tags: Following Tags
@@ -877,7 +877,7 @@ ui:
877877
title: Answer
878878
next: Next
879879
done: Done
880-
config_yaml_error: Cant create the config.yaml file.
880+
config_yaml_error: Can't create the config.yaml file.
881881
lang:
882882
label: Please Choose a Language
883883
db_type:
@@ -907,7 +907,7 @@ ui:
907907
label: The config.yaml file created.
908908
desc: >-
909909
You can create the <1>config.yaml</1> file manually in the <1>/var/wwww/xxx/</1> directory and paste the following text into it.
910-
info: "After youve done that, click “Next” button."
910+
info: "After you've done that, click “Next” button."
911911
site_information: Site Information
912912
admin_account: Admin Account
913913
site_name:
@@ -952,15 +952,15 @@ ui:
952952
You appear to have already installed. To reinstall please clear your old database tables first.
953953
db_failed: Database connection failed
954954
db_failed_desc: >-
955-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
955+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
956956
page_404:
957957
desc: "Unfortunately, this page doesn't exist."
958958
back_home: Back to homepage
959959
page_50X:
960960
desc: The server encountered an error and could not complete your request.
961961
back_home: Back to homepage
962962
page_maintenance:
963-
desc: "We are under maintenance, well be back soon."
963+
desc: "We are under maintenance, we'll be back soon."
964964
nav_menus:
965965
dashboard: Dashboard
966966
contents: Contents

i18n/ca_ES.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ ui:
960960
You appear to have already installed. To reinstall please clear your old database tables first.
961961
db_failed: Database connection failed
962962
db_failed_desc: >-
963-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
963+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
964964
counts:
965965
views: views
966966
votes: votes

i18n/cs_CZ.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ backend:
306306
name:
307307
other: a community-specific reason
308308
desc:
309-
other: This question doesnt meet a community guideline.
309+
other: This question doesn't meet a community guideline.
310310
not_clarity:
311311
name:
312312
other: needs details or clarity
@@ -326,7 +326,7 @@ backend:
326326
name:
327327
other: needs close
328328
desc:
329-
other: A closed question cant answer, but still can edit, vote and comment.
329+
other: A closed question can't answer, but still can edit, vote and comment.
330330
needs_delete:
331331
name:
332332
other: needs delete
@@ -1248,15 +1248,15 @@ ui:
12481248
You appear to have already installed. To reinstall please clear your old database tables first.
12491249
db_failed: Database connection failed
12501250
db_failed_desc: >-
1251-
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your hosts database server is down.
1251+
This either means that the database information in your <1>config.yaml</1> file is incorrect or that contact with the database server could not be established. This could mean your host's database server is down.
12521252
counts:
12531253
views: views
12541254
votes: votes
12551255
answers: answers
12561256
accepted: Accepted
12571257
page_error:
12581258
http_error: HTTP Error {{ code }}
1259-
desc_403: You dont have permission to access this page.
1259+
desc_403: You don't have permission to access this page.
12601260
desc_404: Unfortunately, this page doesn't exist.
12611261
desc_50X: The server encountered an error and could not complete your request.
12621262
back_home: Back to homepage
@@ -1636,7 +1636,7 @@ ui:
16361636
text: For users without a custom avatar of their own.
16371637
gravatar_base_url:
16381638
label: Gravatar Base URL
1639-
text: URL of the Gravatar providers API base. Ignored when empty.
1639+
text: URL of the Gravatar provider's API base. Ignored when empty.
16401640
profile_editable:
16411641
title: Profile Editable
16421642
allow_update_display_name:

0 commit comments

Comments
 (0)