Merge remote-tracking branch 'upstream/develop' into mobile-back
* upstream/develop: (142 commits) fix timeago font added hide_network option, fixed properties naming Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link. improve notification subscription Fix typo that prevented scope copy from working. added check for activatePanel is function or not addressed PR comments activate panel on user screen click added not preload check so hidden toggles asap removed counters from left panel added router-links to all relavent links added activatePanel onclick for timeago button added PR comments add checkbox to disable web push removed brackets from condition resolved lint issue renamed config to preload images and add ident to config added config for preload and made attachment responsive to it preload nsfw image fix ...
This commit is contained in:
Henry Jameson
commit
610724ffcd
87 changed files with 4988 additions and 1871 deletions
130
src/i18n/en.json
130
src/i18n/en.json
|
|
@ -73,7 +73,15 @@
|
|||
"fullname": "Display name",
|
||||
"password_confirm": "Password confirmation",
|
||||
"registration": "Registration",
|
||||
"token": "Invite token"
|
||||
"token": "Invite token",
|
||||
"validations": {
|
||||
"username_required": "cannot be left blank",
|
||||
"fullname_required": "cannot be left blank",
|
||||
"email_required": "cannot be left blank",
|
||||
"password_required": "cannot be left blank",
|
||||
"password_confirmation_required": "cannot be left blank",
|
||||
"password_confirmation_match": "should be the same as password"
|
||||
}
|
||||
},
|
||||
"settings": {
|
||||
"attachmentRadius": "Attachments",
|
||||
|
|
@ -117,13 +125,17 @@
|
|||
"general": "General",
|
||||
"hide_attachments_in_convo": "Hide attachments in conversations",
|
||||
"hide_attachments_in_tl": "Hide attachments in timeline",
|
||||
"hide_isp": "Hide instance-specific panel",
|
||||
"preload_images": "Preload images",
|
||||
"hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
|
||||
"hide_user_stats": "Hide user statistics (e.g. the number of followers)",
|
||||
"import_followers_from_a_csv_file": "Import follows from a csv file",
|
||||
"import_theme": "Load preset",
|
||||
"inputRadius": "Input fields",
|
||||
"checkboxRadius": "Checkboxes",
|
||||
"instance_default": "(default: {value})",
|
||||
"instance_default_simple" : "(default)",
|
||||
"instance_default_simple": "(default)",
|
||||
"interface": "Interface",
|
||||
"interfaceLanguage": "Interface language",
|
||||
"invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
|
||||
"limited_availability": "Unavailable in your browser",
|
||||
|
|
@ -140,6 +152,7 @@
|
|||
"notification_visibility_mentions": "Mentions",
|
||||
"notification_visibility_repeats": "Repeats",
|
||||
"no_rich_text_description": "Strip rich text formatting from all posts",
|
||||
"hide_network_description": "Don't show who I'm following and who's following me",
|
||||
"nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
|
||||
"panelRadius": "Panels",
|
||||
"pause_on_unfocused": "Pause streaming when tab is not focused",
|
||||
|
|
@ -171,11 +184,124 @@
|
|||
"text": "Text",
|
||||
"theme": "Theme",
|
||||
"theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
|
||||
"theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
|
||||
"theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
|
||||
"tooltipRadius": "Tooltips/alerts",
|
||||
"user_settings": "User Settings",
|
||||
"values": {
|
||||
"false": "no",
|
||||
"true": "yes"
|
||||
},
|
||||
"notifications": "Notifications",
|
||||
"enable_web_push_notifications": "Enable web push notifications",
|
||||
"style": {
|
||||
"switcher": {
|
||||
"keep_color": "Keep colors",
|
||||
"keep_shadows": "Keep shadows",
|
||||
"keep_opacity": "Keep opacity",
|
||||
"keep_roundness": "Keep roundness",
|
||||
"keep_fonts": "Keep fonts",
|
||||
"save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
|
||||
"reset": "Reset",
|
||||
"clear_all": "Clear all",
|
||||
"clear_opacity": "Clear opacity"
|
||||
},
|
||||
"common": {
|
||||
"color": "Color",
|
||||
"opacity": "Opacity",
|
||||
"contrast": {
|
||||
"hint": "Contrast ratio is {ratio}, it {level} {context}",
|
||||
"level": {
|
||||
"aa": "meets Level AA guideline (minimal)",
|
||||
"aaa": "meets Level AAA guideline (recommended)",
|
||||
"bad": "doesn't meet any accessibility guidelines"
|
||||
},
|
||||
"context": {
|
||||
"18pt": "for large (18pt+) text",
|
||||
"text": "for text"
|
||||
}
|
||||
}
|
||||
},
|
||||
"common_colors": {
|
||||
"_tab_label": "Common",
|
||||
"main": "Common colors",
|
||||
"foreground_hint": "See \"Advanced\" tab for more detailed control",
|
||||
"rgbo": "Icons, accents, badges"
|
||||
},
|
||||
"advanced_colors": {
|
||||
"_tab_label": "Advanced",
|
||||
"alert": "Alert background",
|
||||
"alert_error": "Error",
|
||||
"badge": "Badge background",
|
||||
"badge_notification": "Notification",
|
||||
"panel_header": "Panel header",
|
||||
"top_bar": "Top bar",
|
||||
"borders": "Borders",
|
||||
"buttons": "Buttons",
|
||||
"inputs": "Input fields",
|
||||
"faint_text": "Faded text"
|
||||
},
|
||||
"radii": {
|
||||
"_tab_label": "Roundness"
|
||||
},
|
||||
"shadows": {
|
||||
"_tab_label": "Shadow and lighting",
|
||||
"component": "Component",
|
||||
"override": "Override",
|
||||
"shadow_id": "Shadow #{value}",
|
||||
"blur": "Blur",
|
||||
"spread": "Spread",
|
||||
"inset": "Inset",
|
||||
"hint": "For shadows you can also use --variable as a color value to use CSS3 variables. Please note that setting opacity won't work in this case.",
|
||||
"filter_hint": {
|
||||
"always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
|
||||
"drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
|
||||
"avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
|
||||
"spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
|
||||
"inset_classic": "Inset shadows will be using {0}"
|
||||
},
|
||||
"components": {
|
||||
"panel": "Panel",
|
||||
"panelHeader": "Panel header",
|
||||
"topBar": "Top bar",
|
||||
"avatar": "User avatar (in profile view)",
|
||||
"avatarStatus": "User avatar (in post display)",
|
||||
"popup": "Popups and tooltips",
|
||||
"button": "Button",
|
||||
"buttonHover": "Button (hover)",
|
||||
"buttonPressed": "Button (pressed)",
|
||||
"buttonPressedHover": "Button (pressed+hover)",
|
||||
"input": "Input field"
|
||||
}
|
||||
},
|
||||
"fonts": {
|
||||
"_tab_label": "Fonts",
|
||||
"help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
|
||||
"components": {
|
||||
"interface": "Interface",
|
||||
"input": "Input fields",
|
||||
"post": "Post text",
|
||||
"postCode": "Monospaced text in a post (rich text)"
|
||||
},
|
||||
"family": "Font name",
|
||||
"size": "Size (in px)",
|
||||
"weight": "Weight (boldness)",
|
||||
"custom": "Custom"
|
||||
},
|
||||
"preview": {
|
||||
"header": "Preview",
|
||||
"content": "Content",
|
||||
"error": "Example error",
|
||||
"button": "Button",
|
||||
"text": "A bunch of more {0} and {1}",
|
||||
"mono": "content",
|
||||
"input": "Just landed in L.A.",
|
||||
"faint_link": "helpful manual",
|
||||
"fine_print": "Read our {0} to learn nothing useful!",
|
||||
"header_faint": "This is fine",
|
||||
"checkbox": "I have skimmed over terms and conditions",
|
||||
"link": "a nice lil' link"
|
||||
}
|
||||
}
|
||||
},
|
||||
"timeline": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue