Merge branch 'develop' into 'tusooa/save-draft'
# Conflicts: # src/boot/routes.js # src/i18n/en.json # src/main.js # src/modules/config.js # src/modules/instance.js
This commit is contained in:
commit
3cda070507
282 changed files with 8443 additions and 1913 deletions
118
src/i18n/en.json
118
src/i18n/en.json
|
|
@ -174,6 +174,8 @@
|
|||
"home_timeline": "Home timeline",
|
||||
"twkn": "Known Network",
|
||||
"bookmarks": "Bookmarks",
|
||||
"all_bookmarks": "All bookmarks",
|
||||
"bookmark_folders": "Bookmark folders",
|
||||
"user_search": "User Search",
|
||||
"search": "Search",
|
||||
"search_close": "Close search bar",
|
||||
|
|
@ -230,7 +232,9 @@
|
|||
"expiry": "Poll age",
|
||||
"expires_in": "Poll ends in {0}",
|
||||
"expired": "Poll ended {0} ago",
|
||||
"not_enough_options": "Too few unique options in poll"
|
||||
"not_enough_options": "Too few unique options in poll",
|
||||
"non_anonymous": "Public poll",
|
||||
"non_anonymous_title": "Other instances may display the options you voted for"
|
||||
},
|
||||
"emoji": {
|
||||
"stickers": "Stickers",
|
||||
|
|
@ -521,6 +525,8 @@
|
|||
"auto_save_draft": "Save drafts as you compose",
|
||||
"emoji_reactions_on_timeline": "Show emoji reactions on timeline",
|
||||
"emoji_reactions_scale": "Reactions scale factor",
|
||||
"absolute_time_format": "Use absolute time format",
|
||||
"absolute_time_format_min_age": "Only use for time older than this amount of time",
|
||||
"export_theme": "Save preset",
|
||||
"filtering": "Filtering",
|
||||
"wordfilter": "Wordfilter",
|
||||
|
|
@ -710,6 +716,7 @@
|
|||
"use_websockets": "Use websockets (Realtime updates)",
|
||||
"text": "Text",
|
||||
"theme": "Theme",
|
||||
"theme_old": "Theme editor (old)",
|
||||
"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.",
|
||||
|
|
@ -759,11 +766,81 @@
|
|||
"more_settings": "More settings",
|
||||
"style": {
|
||||
"custom_theme_used": "(Custom theme)",
|
||||
"custom_style_used": "(Custom style)",
|
||||
"stock_theme_used": "(Stock theme)",
|
||||
"themes2_outdated": "Editor for Themes V2 is being phased out and will eventually be replaced with a new one that takes advantage of new Themes V3 engine. It should still work but experience might be degraded and inconsistent.",
|
||||
"appearance_tab_note": "Changes on this tab do not affect the theme used, so exported theme will be different from what seen in the UI",
|
||||
"update_preview": "Update preview",
|
||||
"themes3": {
|
||||
"define": "Override",
|
||||
"palette": {
|
||||
"label": "Color schemes",
|
||||
"name_label": "Color scheme name",
|
||||
"import": "Import palette",
|
||||
"export": "Export palette",
|
||||
"apply": "Apply palette",
|
||||
"bg": "Panel background",
|
||||
"fg": "Buttons etc.",
|
||||
"text": "Text",
|
||||
"link": "Links",
|
||||
"accent": "Accent color",
|
||||
"cRed": "Red color",
|
||||
"cBlue": "Blue color",
|
||||
"cGreen": "Green color",
|
||||
"cOrange": "Orange color",
|
||||
"wallpaper": "Wallpaper",
|
||||
"v2_unsupported": "Older v2 themes don't support palettes. Switch to v3 theme to make use of palettes",
|
||||
"bundled": "Bundled palettes",
|
||||
"style": "Palettes provided by selected style",
|
||||
"user": "Custom palette",
|
||||
"imported": "Imported"
|
||||
},
|
||||
"editor": {
|
||||
"title": "Style editor",
|
||||
"reset_style": "Reset",
|
||||
"load_style": "Open from file",
|
||||
"save_style": "Save",
|
||||
"style_name": "Stylesheet name",
|
||||
"style_author": "Made by",
|
||||
"style_license": "License",
|
||||
"style_website": "Website",
|
||||
"component_selector": "Component",
|
||||
"variant_selector": "Variant",
|
||||
"states_selector": "States",
|
||||
"main_tab": "Main",
|
||||
"shadows_tab": "Shadows",
|
||||
"background": "Background color",
|
||||
"text_color": "Text color",
|
||||
"icon_color": "Icon color",
|
||||
"link_color": "Link color",
|
||||
"contrast": "Text contrast",
|
||||
"roundness": "Roundness",
|
||||
"opacity": "Opacity",
|
||||
"border_color": "Border color",
|
||||
"include_in_rule": "Add to rule",
|
||||
"test_string": "TEST",
|
||||
"invalid": "Invalid",
|
||||
"refresh_preview": "Refresh preview",
|
||||
"apply_preview": "Apply",
|
||||
"text_auto": {
|
||||
"label": "Auto-contrast",
|
||||
"no-preserve": "Black or White",
|
||||
"preserve": "Keep color",
|
||||
"no-auto": "Disabled"
|
||||
},
|
||||
"component_tab": "Components style",
|
||||
"palette_tab": "Color schemes",
|
||||
"variables_tab": "Variables (Advanced)",
|
||||
"variables": {
|
||||
"label": "Variables",
|
||||
"name_label": "Name:",
|
||||
"type_label": "Type:",
|
||||
"type_shadow": "Shadow",
|
||||
"type_color": "Color",
|
||||
"type_generic": "Generic",
|
||||
"virtual_color": "Variable color value"
|
||||
}
|
||||
},
|
||||
"hacks": {
|
||||
"underlay_overrides": "Change underlay",
|
||||
"underlay_override_mode_none": "Theme default",
|
||||
|
|
@ -885,13 +962,24 @@
|
|||
"component": "Component",
|
||||
"override": "Override",
|
||||
"shadow_id": "Shadow #{value}",
|
||||
"offset": "Shadow offset",
|
||||
"zoom": "Zoom",
|
||||
"offset-x": "x:",
|
||||
"offset-y": "y:",
|
||||
"light_grid": "Use light checkerboard",
|
||||
"color_override": "Use different color",
|
||||
"name": "Name",
|
||||
"blur": "Blur",
|
||||
"spread": "Spread",
|
||||
"inset": "Inset",
|
||||
"raw": "Plain shadow",
|
||||
"expression": "Expression (advanced)",
|
||||
"empty_expression": "Empty expression",
|
||||
"hintV3": "For shadows you can also use the {0} notation to use other color slot.",
|
||||
"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_short": "Separate inset shadow",
|
||||
"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}"
|
||||
|
|
@ -1145,6 +1233,8 @@
|
|||
"delete_confirm_accept_button": "Delete",
|
||||
"delete_confirm_cancel_button": "Keep",
|
||||
"reply_to": "Reply to",
|
||||
"reply_to_with_icon": "{icon} {replyTo}",
|
||||
"reply_to_with_arg": "{replyToWithIcon} {user}",
|
||||
"mentions": "Mentions",
|
||||
"replies_list": "Replies:",
|
||||
"replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
|
||||
|
|
@ -1156,6 +1246,7 @@
|
|||
"thread_muted": "Thread muted",
|
||||
"thread_muted_and_words": ", has words:",
|
||||
"sensitive_muted": "Muting sensitive content",
|
||||
"bot_muted": "Muting bot content",
|
||||
"show_full_subject": "Show full subject",
|
||||
"hide_full_subject": "Hide full subject",
|
||||
"show_content": "Show content",
|
||||
|
|
@ -1375,6 +1466,9 @@
|
|||
"error_sending_message": "Something went wrong when sending the message.",
|
||||
"empty_chat_list_placeholder": "You don't have any chats yet. Start a new chat!"
|
||||
},
|
||||
"bookmarks": {
|
||||
"manage_bookmark_folders": "Manage bookmark folders"
|
||||
},
|
||||
"lists": {
|
||||
"lists": "Lists",
|
||||
"new": "New List",
|
||||
|
|
@ -1428,5 +1522,27 @@
|
|||
"replying": "Replying to {statusLink}",
|
||||
"editing": "Editing {statusLink}",
|
||||
"unavailable": "(unavailable)"
|
||||
},
|
||||
"splash": {
|
||||
"loading": "Loading...",
|
||||
"theme": "Applying theme, please wait warmly...",
|
||||
"fun_1": "Drink more water",
|
||||
"fun_2": "Take it easy!",
|
||||
"fun_3": "Suya...",
|
||||
"fun_4": "My Pleroma machine is full power!",
|
||||
"error": "Something went wrong"
|
||||
},
|
||||
"bookmark_folders": {
|
||||
"select_folder": "Select bookmark folder",
|
||||
"creating_folder": "Creating bookmark folder",
|
||||
"editing_folder": "Editing folder {folderName}",
|
||||
"emoji": "Emoji",
|
||||
"name": "Folder name",
|
||||
"new": "New Folder",
|
||||
"create": "Create folder",
|
||||
"delete": "Delete folder",
|
||||
"update_folder": "Save changes",
|
||||
"really_delete": "Do you really want to delete the folder?",
|
||||
"error": "Error manipulating bookmark folders: {0}"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue