Skip to content

Commit

Permalink
fix(lang): edit setting label strings for verb tense consistency (#1214)
Browse files Browse the repository at this point in the history 
* fix(lang): edit setting label strings for verb tense consistency

* fix(lang): remove 'requires and'
  • Loading branch information
@TheCatLady
TheCatLady committed Mar 18, 2021
1 parent 0ca3d43 commit 6d7671d
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 39 deletions.
33 changes: 18 additions & 15 deletions src/components/PermissionEdit/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,50 @@ export const messages = defineMessages({
'Full administrator access. Bypasses all other permission checks.',
users: 'Manage Users',
usersDescription:
'Grants permission to manage Overseerr users. Users with this permission cannot modify users with or grant the Admin privilege.',
'Grant permission to manage Overseerr users.\
Users with this permission cannot modify users with or grant the Admin privilege.',
settings: 'Manage Settings',
settingsDescription:
'Grants permission to modify all Overseerr settings. A user must have this permission to grant it to others.',
'Grant permission to modify all Overseerr settings.\
A user must have this permission to grant it to others.',
managerequests: 'Manage Requests',
managerequestsDescription:
'Grants permission to manage Overseerr requests. This includes approving and denying requests. All requests made by a user with this permission will be automatically approved regardless of whether or not they have Auto-Approve permissions.',
'Grant permission to manage Overseerr requests (includes approving and denying requests).\
All requests made by a user with this permission will be automatically approved.',
request: 'Request',
requestDescription: 'Grants permission to request movies and series.',
vote: 'Vote',
voteDescription:
'Grants permission to vote on requests (voting not yet implemented).',
'Grant permission to vote on requests (voting not yet implemented).',
autoapprove: 'Auto-Approve',
autoapproveDescription:
'Grants automatic approval for all non-4K requests made by this user.',
'Grant automatic approval for all non-4K requests made by this user.',
autoapproveMovies: 'Auto-Approve Movies',
autoapproveMoviesDescription:
'Grants automatic approval for non-4K movie requests made by this user.',
'Grant automatic approval for non-4K movie requests made by this user.',
autoapproveSeries: 'Auto-Approve Series',
autoapproveSeriesDescription:
'Grants automatic approval for non-4K series requests made by this user.',
'Grant automatic approval for non-4K series requests made by this user.',
autoapprove4k: 'Auto-Approve 4K',
autoapprove4kDescription:
'Grants automatic approval for all 4K requests made by this user.',
'Grant automatic approval for all 4K requests made by this user.',
autoapprove4kMovies: 'Auto-Approve 4K Movies',
autoapprove4kMoviesDescription:
'Grants automatic approval for 4K movie requests made by this user.',
'Grant automatic approval for 4K movie requests made by this user.',
autoapprove4kSeries: 'Auto-Approve 4K Series',
autoapprove4kSeriesDescription:
'Grants automatic approval for 4K series requests made by this user.',
'Grant automatic approval for 4K series requests made by this user.',
request4k: 'Request 4K',
request4kDescription: 'Grants permission to request 4K movies and series.',
request4kDescription: 'Grant permission to request 4K movies and series.',
request4kMovies: 'Request 4K Movies',
request4kMoviesDescription: 'Grants permission to request 4K movies.',
request4kMoviesDescription: 'Grant permission to request 4K movies.',
request4kTv: 'Request 4K Series',
request4kTvDescription: 'Grants permission to request 4K Series.',
request4kTvDescription: 'Grant permission to request 4K Series.',
advancedrequest: 'Advanced Requests',
advancedrequestDescription:
'Grants permission to use advanced request options (e.g., changing servers, profiles, or paths).',
'Grant permission to use advanced request options (e.g., changing servers, profiles, or paths).',
viewrequests: 'View Requests',
viewrequestsDescription: "Grants permission to view other users' requests.",
viewrequestsDescription: "Grant permission to view other users' requests.",
});

interface PermissionEditProps {
Expand Down
10 changes: 6 additions & 4 deletions src/components/Settings/SettingsMain.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,17 @@ const messages = defineMessages({
hideAvailable: 'Hide Available Media',
csrfProtection: 'Enable CSRF Protection',
csrfProtectionTip:
'Sets external API access to read-only (requires HTTPS, and Overseerr must be reloaded for changes to take effect)',
'Set external API access to read-only\
(requires HTTPS, and Overseerr must be reloaded for changes to take effect)',
csrfProtectionHoverTip:
'Do NOT enable this setting unless you understand what you are doing!',
cacheImages: 'Cache & Optimize Images Locally',
cacheImages: 'Enable Image Caching',
cacheImagesTip:
'Enabling this option will cause all images to be optimized and stored locally. This uses a significant amount of disk space.',
'Optimize and store all images locally (consumes a significant amount of disk space)',
trustProxy: 'Enable Proxy Support',
trustProxyTip:
'Allows Overseerr to correctly register client IP addresses behind a proxy (Overseerr must be reloaded for changes to take effect)',
'Allow Overseerr to correctly register client IP addresses behind a proxy\
(Overseerr must be reloaded for changes to take effect)',
validationApplicationTitle: 'You must provide an application title',
validationApplicationUrl: 'You must provide a valid URL',
validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
Expand Down
40 changes: 20 additions & 20 deletions src/i18n/locale/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,37 +112,37 @@
"components.PermissionEdit.admin": "Admin",
"components.PermissionEdit.adminDescription": "Full administrator access. Bypasses all other permission checks.",
"components.PermissionEdit.advancedrequest": "Advanced Requests",
"components.PermissionEdit.advancedrequestDescription": "Grants permission to use advanced request options (e.g., changing servers, profiles, or paths).",
"components.PermissionEdit.advancedrequestDescription": "Grant permission to use advanced request options (e.g., changing servers, profiles, or paths).",
"components.PermissionEdit.autoapprove": "Auto-Approve",
"components.PermissionEdit.autoapprove4k": "Auto-Approve 4K",
"components.PermissionEdit.autoapprove4kDescription": "Grants automatic approval for all 4K requests made by this user.",
"components.PermissionEdit.autoapprove4kDescription": "Grant automatic approval for all 4K requests made by this user.",
"components.PermissionEdit.autoapprove4kMovies": "Auto-Approve 4K Movies",
"components.PermissionEdit.autoapprove4kMoviesDescription": "Grants automatic approval for 4K movie requests made by this user.",
"components.PermissionEdit.autoapprove4kMoviesDescription": "Grant automatic approval for 4K movie requests made by this user.",
"components.PermissionEdit.autoapprove4kSeries": "Auto-Approve 4K Series",
"components.PermissionEdit.autoapprove4kSeriesDescription": "Grants automatic approval for 4K series requests made by this user.",
"components.PermissionEdit.autoapproveDescription": "Grants automatic approval for all non-4K requests made by this user.",
"components.PermissionEdit.autoapprove4kSeriesDescription": "Grant automatic approval for 4K series requests made by this user.",
"components.PermissionEdit.autoapproveDescription": "Grant automatic approval for all non-4K requests made by this user.",
"components.PermissionEdit.autoapproveMovies": "Auto-Approve Movies",
"components.PermissionEdit.autoapproveMoviesDescription": "Grants automatic approval for non-4K movie requests made by this user.",
"components.PermissionEdit.autoapproveMoviesDescription": "Grant automatic approval for non-4K movie requests made by this user.",
"components.PermissionEdit.autoapproveSeries": "Auto-Approve Series",
"components.PermissionEdit.autoapproveSeriesDescription": "Grants automatic approval for non-4K series requests made by this user.",
"components.PermissionEdit.autoapproveSeriesDescription": "Grant automatic approval for non-4K series requests made by this user.",
"components.PermissionEdit.managerequests": "Manage Requests",
"components.PermissionEdit.managerequestsDescription": "Grants permission to manage Overseerr requests. This includes approving and denying requests. All requests made by a user with this permission will be automatically approved regardless of whether or not they have Auto-Approve permissions.",
"components.PermissionEdit.managerequestsDescription": "Grant permission to manage Overseerr requests (includes approving and denying requests). All requests made by a user with this permission will be automatically approved.",
"components.PermissionEdit.request": "Request",
"components.PermissionEdit.request4k": "Request 4K",
"components.PermissionEdit.request4kDescription": "Grants permission to request 4K movies and series.",
"components.PermissionEdit.request4kDescription": "Grant permission to request 4K movies and series.",
"components.PermissionEdit.request4kMovies": "Request 4K Movies",
"components.PermissionEdit.request4kMoviesDescription": "Grants permission to request 4K movies.",
"components.PermissionEdit.request4kMoviesDescription": "Grant permission to request 4K movies.",
"components.PermissionEdit.request4kTv": "Request 4K Series",
"components.PermissionEdit.request4kTvDescription": "Grants permission to request 4K Series.",
"components.PermissionEdit.requestDescription": "Grants permission to request movies and series.",
"components.PermissionEdit.request4kTvDescription": "Grant permission to request 4K Series.",
"components.PermissionEdit.requestDescription": "Grant permission to request movies and series.",
"components.PermissionEdit.settings": "Manage Settings",
"components.PermissionEdit.settingsDescription": "Grants permission to modify all Overseerr settings. A user must have this permission to grant it to others.",
"components.PermissionEdit.settingsDescription": "Grant permission to modify all Overseerr settings. A user must have this permission to grant it to others.",
"components.PermissionEdit.users": "Manage Users",
"components.PermissionEdit.usersDescription": "Grants permission to manage Overseerr users. Users with this permission cannot modify users with or grant the Admin privilege.",
"components.PermissionEdit.usersDescription": "Grant permission to manage Overseerr users. Users with this permission cannot modify users with or grant the Admin privilege.",
"components.PermissionEdit.viewrequests": "View Requests",
"components.PermissionEdit.viewrequestsDescription": "Grants permission to view other users' requests.",
"components.PermissionEdit.viewrequestsDescription": "Grant permission to view other users' requests.",
"components.PermissionEdit.vote": "Vote",
"components.PermissionEdit.voteDescription": "Grants permission to vote on requests (voting not yet implemented).",
"components.PermissionEdit.voteDescription": "Grant permission to vote on requests (voting not yet implemented).",
"components.PersonDetails.appearsin": "Appearances",
"components.PersonDetails.ascharacter": "as {character}",
"components.PersonDetails.crewmember": "Crew",
Expand Down Expand Up @@ -536,13 +536,13 @@
"components.Settings.apikey": "API Key",
"components.Settings.applicationTitle": "Application Title",
"components.Settings.applicationurl": "Application URL",
"components.Settings.cacheImages": "Cache & Optimize Images Locally",
"components.Settings.cacheImagesTip": "Enabling this option will cause all images to be optimized and stored locally. This uses a significant amount of disk space.",
"components.Settings.cacheImages": "Enable Image Caching",
"components.Settings.cacheImagesTip": "Optimize and store all images locally (requires and consumes a significant amount of disk space)",
"components.Settings.cancelscan": "Cancel Scan",
"components.Settings.copied": "Copied API key to clipboard.",
"components.Settings.csrfProtection": "Enable CSRF Protection",
"components.Settings.csrfProtectionHoverTip": "Do NOT enable this setting unless you understand what you are doing!",
"components.Settings.csrfProtectionTip": "Sets external API access to read-only (requires HTTPS, and Overseerr must be reloaded for changes to take effect)",
"components.Settings.csrfProtectionTip": "Set external API access to read-only (requires HTTPS, and Overseerr must be reloaded for changes to take effect)",
"components.Settings.currentlibrary": "Current Library: {name}",
"components.Settings.default": "Default",
"components.Settings.default4k": "Default 4K",
Expand Down Expand Up @@ -625,7 +625,7 @@
"components.Settings.toastSettingsFailure": "Something went wrong while saving settings.",
"components.Settings.toastSettingsSuccess": "Settings saved successfully!",
"components.Settings.trustProxy": "Enable Proxy Support",
"components.Settings.trustProxyTip": "Allows Overseerr to correctly register client IP addresses behind a proxy (Overseerr must be reloaded for changes to take effect)",
"components.Settings.trustProxyTip": "Allow Overseerr to correctly register client IP addresses behind a proxy (Overseerr must be reloaded for changes to take effect)",
"components.Settings.validationApplicationTitle": "You must provide an application title",
"components.Settings.validationApplicationUrl": "You must provide a valid URL",
"components.Settings.validationApplicationUrlTrailingSlash": "URL must not end in a trailing slash",
Expand Down

0 comments on commit 6d7671d

Please sign in to comment.