Merge branch 'develop' into user_management
This commit is contained in:
commit
71cf3a52f2
115 changed files with 3080 additions and 2422 deletions
|
|
@ -390,13 +390,18 @@
|
|||
"actor_type": "This account is:",
|
||||
"actor_type_description": "Marking your account as a group will make it automatically repeat statuses that mention it.",
|
||||
"actor_type_Person": "a normal user",
|
||||
"actor_type_person_proper": "a person",
|
||||
"actor_type_Service": "a bot",
|
||||
"actor_type_Group": "a group",
|
||||
"mobile_center_dialog": "Vertically center dialogs on mobile",
|
||||
"app_name": "App name",
|
||||
"expert_mode": "Show advanced",
|
||||
"save": "Save changes",
|
||||
"reset": "Reset changes",
|
||||
"security": "Security",
|
||||
"toggle_edit": "Edit",
|
||||
"change_banner": "Change banner",
|
||||
"change_avatar": "Change avatar",
|
||||
"setting_changed": "Setting is different from default",
|
||||
"setting_server_side": "This setting is tied to your profile and affects all sessions and clients",
|
||||
"enter_current_password_to_confirm": "Enter your current password to confirm your identity",
|
||||
|
|
@ -491,6 +496,7 @@
|
|||
"avatarRadius": "Avatars",
|
||||
"background": "Background",
|
||||
"bio": "Bio",
|
||||
"profile_other": "Other",
|
||||
"email_language": "Language for receiving emails from the server",
|
||||
"block_export": "Block export",
|
||||
"block_export_button": "Export your blocks to a csv file",
|
||||
|
|
@ -566,7 +572,8 @@
|
|||
"move_account_error": "Error moving account: {error}",
|
||||
"discoverable": "Allow discovery of this account in search results and other services",
|
||||
"domain_mutes": "Domains",
|
||||
"avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
|
||||
"avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels. Recommended aspect ratio is 1:1",
|
||||
"banner_size_instruction": "The recommended minimum size for banner images is 450x150 pixels. Recommended aspect ratio is 3:1",
|
||||
"pad_emoji": "Pad emoji with spaces when adding from picker",
|
||||
"autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
|
||||
"unsaved_post_action": "When you try to close an unsaved posting form",
|
||||
|
|
@ -660,6 +667,7 @@
|
|||
"label": "Birthday",
|
||||
"show_birthday": "Show my birthday"
|
||||
},
|
||||
"account_profile_edit": "Edit Profile",
|
||||
"account_privacy": "Privacy",
|
||||
"use_contain_fit": "Don't crop the attachment in thumbnails",
|
||||
"name": "Name",
|
||||
|
|
@ -725,8 +733,10 @@
|
|||
"minimal_scopes_mode": "Minimize post scope selection options",
|
||||
"set_new_avatar": "Set new avatar",
|
||||
"set_new_profile_background": "Set new profile background",
|
||||
"set_new_background": "Set new background",
|
||||
"set_new_profile_banner": "Set new profile banner",
|
||||
"reset_avatar": "Reset avatar",
|
||||
"reset_banner": "Reset banner",
|
||||
"reset_profile_background": "Reset profile background",
|
||||
"reset_profile_banner": "Reset profile banner",
|
||||
"reset_avatar_confirm": "Do you really want to reset the avatar?",
|
||||
|
|
@ -779,6 +789,8 @@
|
|||
"tooltipRadius": "Tooltips/alerts",
|
||||
"type_domains_to_mute": "Search domains to mute",
|
||||
"upload_a_photo": "Upload a photo",
|
||||
"upload_picture": "Upload picture",
|
||||
"select_picture": "Select picture",
|
||||
"user_settings": "User Settings",
|
||||
"values": {
|
||||
"false": "no",
|
||||
|
|
@ -1277,6 +1289,8 @@
|
|||
"adding_new": "Adding new emoji",
|
||||
"shortcode": "Shortcode",
|
||||
"filename": "Filename",
|
||||
"emoji_source": "Emoji file source",
|
||||
"upload_url": "Upload from URL",
|
||||
"new_shortcode": "Shortcode, leave blank to infer",
|
||||
"new_filename": "Filename, leave blank to infer",
|
||||
"delete_confirm": "Are you sure you want to delete {0}?",
|
||||
|
|
@ -1287,10 +1301,14 @@
|
|||
"download_as_name_full": "New name, leave blank to reuse",
|
||||
"files": "Files",
|
||||
"editing": "Editing {0}",
|
||||
"copying": "Copying {0}",
|
||||
"copy_to": "Copy to",
|
||||
"copy_to_pack": "Copy to local pack",
|
||||
"delete_title": "Delete?",
|
||||
"metadata_changed": "Metadata different from saved",
|
||||
"emoji_changed": "Unsaved emoji file changes, check highlighted emoji",
|
||||
"replace_warning": "This will REPLACE the local pack of the same name"
|
||||
"replace_warning": "This will REPLACE the local pack of the same name",
|
||||
"copied_successfully": "Successfully copied emoji \"{0}\" to pack \"{1}\""
|
||||
},
|
||||
"temp_overrides": {
|
||||
":pleroma": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue