From 9b4912577605f29f948c8cc94d1902924de76e18 Mon Sep 17 00:00:00 2001 From: Josh O'Brien Date: Mon, 3 Feb 2020 14:22:00 +1100 Subject: [PATCH 1/4] English Language Updates Changes to provide consistency for English language. --- .DS_Store | Bin 0 -> 6148 bytes cps/.DS_Store | Bin 0 -> 6148 bytes cps/templates/admin.html | 72 ++++++++++++++-------------- cps/templates/book_edit.html | 28 +++++------ cps/templates/config_edit.html | 34 ++++++------- cps/templates/config_view_edit.html | 30 ++++++------ cps/templates/detail.html | 10 ++-- cps/templates/email_edit.html | 25 +++++----- cps/templates/http_error.html | 5 +- cps/templates/layout.html | 25 +++++----- cps/templates/listenmp3.html | 14 +++--- cps/templates/login.html | 8 ++-- cps/templates/logviewer.html | 6 +-- cps/templates/osd.xml | 2 +- cps/templates/read.html | 2 +- cps/templates/register.html | 4 +- cps/templates/remote_login.html | 13 ++--- cps/templates/search.html | 4 +- cps/templates/search_form.html | 10 ++-- cps/templates/shelf.html | 8 ++-- cps/templates/shelf_edit.html | 6 +-- cps/templates/shelf_order.html | 9 ++-- cps/templates/stats.html | 8 ++-- cps/templates/tasks.html | 6 +-- cps/templates/user_edit.html | 24 +++++----- cps/ub.py | 2 +- cps/web.py | 18 +++---- 27 files changed, 185 insertions(+), 188 deletions(-) create mode 100644 .DS_Store create mode 100644 cps/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c791f535f86ea29e44497d092c21baf26aa66529 GIT binary patch literal 6148 zcmeHK-A)rh6g~q*S`fSZR1jmbu`w}$i$XMbLs$z&i7`~#U@KtRZHKa9yVLA$skGMg z6}-_aAHZiY@zVGPUKt-jZ@u%(Px-6faA6GD)69Hl&YW|m=iBZ~2LMRAUY-Nc03eEu zV`K=sKM0@atw;KlWdM=z9DdDmn1!RyR;|Z7G=vO<4E%2l@OQT#N>BseYMgw39or95 zsjsB3KQeG>FdD6c`ucQH8@J5Te#PV8bD25JOFMPCS@G<0wq}-Ww~`O&%OGnvX;B+H(d~ALN64xxL@*^<7Aj`2R3sHTRt+r8qn&hyUTFJ17vuu z#;5!Z>iLL0G5Lb&d8S*T>BDWuw5YS@rdbfMYThm}SAO%jNQ=XaM|sNR(oe}@(s0~NS4SW@|3KT94V0Jq$Cscb)V^t?rIWA8BsmcgRJK|%&nk>dq*Gu3O)oE@^^ex z-I=N-E$8bM$I;>Qg@;ig10e$!m;t^&=-4-?8Hy-FiMnDC8IE>c`56j35@k3Lb@?D_Wuk5R-gkQnwM10e&a8R(Zo zji3Jy{(k>I9Tbj220{id6ayr(l3ht-N$PCvDUP4DI<_5bT)1CHq6ooG9mhi9NAVOk cAvmXV1<_F0k%$(Q@Q;9?A?!j1{wV{$0YwB2s{jB1 literal 0 HcmV?d00001 diff --git a/cps/.DS_Store b/cps/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f2b265cf510a6a2ebd990f27ca895a70ca0f74bf GIT binary patch literal 6148 zcmeHK-A)rh6g~q*S`b-&Du^-J*qE5WMIjozA*=oOnqF6Xa zhOjzEct0;a(x)r~h(zSDp=j0ps^u`N$2&BH41^5)YYgz;?j`Uc02531@AtD+b!Z?k!DtLWBhj7AKC5Q}GpP9~)7#>$v>EJMO3yOp9P6gFY14W^n_OXTVA?MA zM6g|==(7FHc1x_DVl}tqi#!?G!N-Xew0N_boYU_nTXTAIaRJqP3yZB*EIM^-eravD za@1(PYQ26dDJ6IU2^m$`fp@5M&G0bexejy7Xy-98oHvCERKXD(Q1DNkVHbykbLMFm z57k*sK6TdmyQUql_R#R$bui=B1n( z-70%_DN{9zwp-2x^ktB-8?>N}pK;xwr57ir>`@hcCQl3^-9wL3SL9pY+w*CVD`=yB z(PNI2X1*QR%*~(b&2Rg-1J?ptS#$Roj(CVWZoSIg{7vflh&}PSyy
-

{{_('User list')}}

+

{{_('Users')}}

- - - - + + + + - + @@ -35,20 +35,20 @@ {% endif %} {% endfor %}
{{_('Nickname')}}{{_('E-mail')}}{{_('Kindle')}}{{_('DLS')}}{{_('Username')}}{{_('E-mail Address')}}{{_('Send to Kindle E-mail Address')}}{{_('Downloads')}}
- +
-

{{_('SMTP e-mail server settings')}}

+

{{_('E-mail Server Settings')}}

- - - - - + + + + + @@ -67,11 +67,11 @@

{{_('Configuration')}}

-
{{_('Calibre DB dir')}}
+
{{_('Calibre Database Directory')}}
{{config.config_calibre_dir}}
-
{{_('Log level')}}
+
{{_('Log Level')}}
{{config.get_log_level()}}
@@ -81,27 +81,27 @@
-
{{_('Books per page')}}
+
{{_('Books per Page')}}
{{config.config_books_per_page}}
-
{{_('Uploading')}}
+
{{_('Uploads')}}
{{ display_bool_setting(config.config_uploading) }}
-
{{_('Anonymous browsing')}}
+
{{_('Anonymous Browsing')}}
{{ display_bool_setting(config.config_anonbrowse) }}
-
{{_('Public registration')}}
+
{{_('Public Registration')}}
{{ display_bool_setting(config.config_public_reg) }}
-
{{_('Remote login')}}
+
{{_('Magic Link Remote Login')}}
{{ display_bool_setting(config.config_remote_login) }}
-
{{_('Reverse proxy login')}}
+
{{_('Reverse Proxy Login')}}
{{ display_bool_setting(config.config_allow_reverse_proxy_header_login) }}
{% if config.config_allow_reverse_proxy_header_login %} @@ -111,18 +111,18 @@
{% endif %}
-
{{_('Basic Configuration')}}
-
{{_('UI Configuration')}}
+
{{_('Edit Basic Configuration')}}
+
{{_('Edit UI Configuration')}}

{{_('Administration')}}

-
{{_('View Logfiles')}}
-
{{_('Reconnect to Calibre DB')}}
-
{{_('Restart Calibre-Web')}}
-
{{_('Stop Calibre-Web')}}
+
{{_('View Logs')}}
+
{{_('Reconnect Calibre Database')}}
+
{{_('Restart')}}
+
{{_('Shutdown')}}
@@ -145,7 +145,7 @@
{{_('SMTP hostname')}}{{_('SMTP port')}}{{_('SSL')}}{{_('SMTP login')}}{{_('SMTP Hostname')}}{{_('SMTP Port')}}{{_('Encryption')}}{{_('SMTP Login')}}
{{email.mail_server}}
-
{{_('Check for update')}}
+
{{_('Check for Update')}}
@@ -158,13 +158,13 @@
-

{{_('Do you really want to restart Calibre-Web?')}}

+

{{_('Are you sure you want to restart?')}}

- - + +
@@ -176,9 +176,9 @@
-

{{_('Do you really want to stop Calibre-Web?')}}

- - +

{{_('Are you sure you want to shutdown?')}}

+ +
@@ -188,7 +188,7 @@
- {{_('Updating, please do not reload page')}} + {{_('Updating, please do not reload this page')}}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index e734698a..b577ca07 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -72,7 +72,7 @@
- +
@@ -80,16 +80,16 @@
- +
- +
- +
@@ -157,7 +157,7 @@ {% if g.user.role_upload() or g.user.role_admin()%} {% if g.allow_upload %}
- +
@@ -166,12 +166,12 @@
- {{_('Get metadata')}} - - {{_('Back')}} + {{_('Fetch Metadata')}} + + {{_('Cancel')}}
@@ -187,13 +187,13 @@ {{_('Are you really sure?')}}
- {{_('Book will be deleted from Calibre database')}} - {{_('and from hard disk')}} + {{_('This book will be permanently erased from database')}} + {{_('and hard disk')}}
{{_('Delete')}} - +
@@ -205,13 +205,13 @@
- + diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html index 0d28b8ea..91597372 100644 --- a/cps/templates/config_edit.html +++ b/cps/templates/config_edit.html @@ -16,7 +16,7 @@
- +
{% if feature_support['gdrive'] %} @@ -96,7 +96,7 @@
- + - +
- +
- +
- +
{% if feature_support['goodreads'] %}
- {{_('Obtain an API Key')}} + {{_('Create an API Key')}}
@@ -190,7 +190,7 @@
- +
- +
- +
- +
- +
@@ -244,7 +244,7 @@
- +
@@ -297,7 +297,7 @@
-
+
@@ -326,9 +326,9 @@
- + {% if show_back_button %} - {{_('Back')}} + {{_('Cancel')}} {% endif %} {% if show_login_button %} {{_('Login')}} diff --git a/cps/templates/config_view_edit.html b/cps/templates/config_view_edit.html index bc6defa4..d37826b5 100644 --- a/cps/templates/config_view_edit.html +++ b/cps/templates/config_view_edit.html @@ -20,15 +20,15 @@
- +
- +
- +
@@ -39,11 +39,11 @@
- +
- +
- +
@@ -70,7 +70,7 @@

- {{_('Default settings for new users')}} + {{_('Default Settings for New Users')}}

@@ -78,7 +78,7 @@
- +
@@ -86,7 +86,7 @@
- +
@@ -98,7 +98,7 @@
- +
@@ -116,7 +116,7 @@

- {{_('Default visibilities for new users')}} + {{_('Default Visibilities for New Users')}}

@@ -132,19 +132,19 @@ {% endfor %}
- +
- +
- - {{_('Back')}} + + {{_('Cancel')}}
diff --git a/cps/templates/detail.html b/cps/templates/detail.html index b76a8afa..d84dbe61 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -56,7 +56,7 @@ {% if reader_list and g.user.role_viewer() %}