From d879b8106c0ce999d612c60a5e1c72612807215d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Sun, 23 Oct 2016 12:32:02 +0200 Subject: [PATCH] Revert "Bug 16687 - Translatability: Fix issues in Administration preferences" This reverts commit 41e12f0af2149c2b858dc63fd6242854f2da444d. --- .../en/modules/admin/preferences/admin.pref | 168 +++++++++--------- 1 file changed, 88 insertions(+), 80 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 5d8091ca6d..6674db0641 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -2,36 +2,38 @@ Administration: # Only used internally, omitted: FrameworksLoaded, Version Interface options: - - - "Email address for the administrator of Koha: " + - Use - pref: KohaAdminEmailAddress class: email - - "(This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)" + - "as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)" - - - "Email address to be set as the replyto in emails: " - - pref: ReplytoDefault - class: email + - Use + - pref: ReplytoDefault + class: email + - "as the email address that will be set as the replyto in emails" - - - "Return path or bounce address for undeliverable mail messages: " - - pref: ReturnpathDefault - class: email - - "If you leave this empty, the From address will be used (often defaulting to the admin address)." + - Use + - pref: ReturnpathDefault + class: email + - "as the return path or bounce address for undeliverable mail messages. If you leave this empty, the From address will be used (often defaulting to the admin address)." - - - "How much debugging information to show in the browser when an internal error occurs: " + - Show - pref: DebugLevel default: 0 choices: - 0: None - 1: Some - 2: All + 0: "no" + 1: some + 2: lots of + - debugging information in the browser when an internal error occurs. - - - "Show itemtype icons in the catalog: " - pref: noItemTypeImages default: 0 choices: - yes: "No" - no: "Yes" + yes: "Don't show" + no: Show + - itemtype icons in the catalog. - - - "Default separator for columns in an exported CSV file: " + - Separate columns in an exported CSV file with - pref: delimiter default: "," choices: @@ -41,145 +43,148 @@ Administration: '/': slashes '\': backslashes '#': "#'s" + - by default. - - - "Allow staff and patrons to create and view saved lists of books: " - pref: virtualshelves choices: - yes: "Yes" - no: "No" + yes: Allow + no: "Don't allow" + - staff and patrons to create and view saved lists of books. - - - "Default view when editing circulation rules: " + - When editing circulation rules show the - pref: DefaultToLoggedInLibraryCircRules choices: - yes: "The logged-in library" - no: "All libraries" + yes: "logged in library's" + no: "all libraries" + - rules by default. - - - "Default view when editing notices and slips: " + - When editing notices and slips show the - pref: DefaultToLoggedInLibraryNoticesSlips choices: - yes: "The logged-in library" - no: "All libraries" + yes: "logged in library's" + no: "all libraries" + - notices and slips by default. - - - "Default view when editing overdue notice/status triggers: " + - When editing overdue notice/status triggers show the - pref: DefaultToLoggedInLibraryOverdueTriggers choices: - yes: "The logged-in library" - no: "All libraries" + yes: "logged in library's" + no: "all libraries" + - rules by default. Login options: - - - "Inactivity timeout in seconds to automatically log out users: " + - Automatically log out users after - pref: timeout class: integer - - Adding d will specify it in days, e.g. 1d is timeout of one day. + - seconds of inactivity. Adding d will specify it in days, e.g. 1d is timeout of one day. - - - "Require staff to log in from a computer in the IP address range specified by their library (if any): " - pref: AutoLocation default: 0 choices: - yes: "Yes" - no: "No" - - Link to library administration + yes: Require + no: "Don't require" + - staff to log in from a computer in the IP address range specified by their library (if any). - - - "Enable check for change in remote IP address for session security: " - pref: SessionRestrictionByIP default: 1 choices: - yes: "Yes" - no: "No" - - (Disable only when remote IP address changes frequently.) + yes: Enable + no: "Disable" + - check for change in remote IP address for session security. Disable only when remote IP address changes frequently. # PostgreSQL is supported by CGI::Session but not by Koha. - - - "Storage of login session information: " + - Store login session information - pref: SessionStorage default: mysql choices: - mysql: MySQL database - Pg: PostgreSQL database (not supported) - tmp: Temporary files - memcached: Memcached server + mysql: in the MySQL database. + Pg: in the PostgreSQL database (not supported). + tmp: as temporary files. + memcached: in a memcached server. - - - "Prevent staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries: " - pref: IndependentBranches default: 0 choices: - yes: "Yes" - no: "No" + yes: Prevent + no: "Don't prevent" + - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries. - - - Prevent staff (but not superlibrarians) from viewing and approving/denying patron modification requests for patrons belonging to other libraries. - pref: IndependentBranchesPatronModifications default: 0 choices: - yes: "Yes" - no: "No" + yes: Prevent + no: "Don't prevent" + - staff (but not superlibrarians) from viewing and approving/denying patron modification requests for patrons belonging to other libraries. CAS authentication: - - - "Use CAS for login authentication: " - pref: casAuthentication default: 0 choices: - yes: "Yes" - no: "No" + yes: Use + no: "Don't use" + - CAS for login authentication. - - - "Logout of CAS when logging out of Koha: " - pref: casLogout default: 0 choices: - yes: "Yes" - no: "No" + yes: Logout + no: "Don't Logout" + - of CAS when logging out of Koha. - - - "URL of the CAS Authentication Server: " + - The CAS Authentication Server can be found at - pref: casServerUrl SSL client certificate authentication: - - - "Field to use for SSL client certificate authentication: " + - Use - pref: AllowPKIAuth default: None choices: - None: "None" - Common Name: Common Name - emailAddress: emailAddress + None: "no" + Common Name: the Common Name + emailAddress: the emailAddress + - field for SSL client certificate authentication Google OpenID Connect: - - - "Use Google OpenID Connect login: " - pref: GoogleOpenIDConnect choices: - yes: "Yes" - no: "No" + yes: Use + no: "Don't Use" + - Google OpenID Connect login. - You will need to select OAuth2 when creating an app in the google cloud console, and set the web origin to your_opac_url and the redirect url to your_opac_url/cgi-bin/koha/svc/auth/googleopenidconnect . - - - "Google OAuth2 Client ID: " + - Google OAuth2 Client ID - pref: GoogleOAuth2ClientID - - - "Google OAuth2 Client Secret: " + - Google OAuth2 Client Secret - pref: GoogleOAuth2ClientSecret - - - "Google OpenID Connect Restrict to domain (or subdomain of this domain): " + - Google OpenID Connect Restrict to domain (or subdomain of this domain) - pref: GoogleOpenIDConnectDomain - - Leave blank for all google domains + - . Leave blank for all google domains Mozilla Persona: - - - "Allow Mozilla persona for login: " - pref: Persona default: 0 choices: - yes: "Yes" - no: "No" + yes: Allow + no: "Don't Allow" + - Mozilla persona for login Share anonymous usage statistics: - - - "Share anonymous Koha usage data with the Koha community: " - pref: UsageStats default: 0 choices: - yes: "Yes" - no: "No" - - "You have to run misc/cronjobs/share_usage_with_koha_community.pl in a cronjob. Note that the other \"UsageStats\" preferences have no effect if this preference is set to \"No\". Website where usage statistics are published: Hea Koha community website." + yes: Share + no: "Don't share" + - anonymous Koha usage data with the Koha community. You can see the data on the Hea Koha community website. You have to run misc/cronjobs/share_usage_with_koha_community.pl in a cronjob. - - - "Use the following library name to be shown on the Hea Community website: " + - The library name - pref: UsageStatsLibraryName + - will be shown on the Hea Koha community website. - If this field is empty data will be sent anonymously. - Note that this value has no effect if the UsageStats system preference is set to "Don't share" - - - "The country where your library is located to be shown on the Hea Community website: " + - "The country where your library is located:" - pref: UsageStatsCountry default: "" choices: @@ -382,11 +387,13 @@ Administration: - This will be shown on the Hea Koha community website. - Note that this value has no effect if the UsageStats system preference is set to "Don't share" - - - "The library URL to be shown on the Hea Community website: " + - The library URL - pref: UsageStatsLibraryUrl + - will be shown on the Hea Koha community website. - Note that this value has no effect if the UsageStats system preference is set to "Don't share" + - - - "The library type to be shown on the Hea Community website: " + - The library type - pref: UsageStatsLibraryType default: "" choices: @@ -401,12 +408,13 @@ Administration: government : "government" religiousOrg: "religious organization" subscription: "subscription" + - will be shown on the Hea Koha community website. - Note that this value has no effect if the UsageStats system preference is set to "Don't share" Search Engine: - - - "Use following search engine: " - pref: SearchEngine default: Zebra choices: Zebra: Zebra Elasticsearch: Elasticsearch + - is the search engine used. -- 2.39.5