Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
This commit is contained in:
commit
e21dd584a9
169 changed files with 3933 additions and 1616 deletions
|
@ -113,7 +113,6 @@
|
|||
"about": "About",
|
||||
"administration": "Administration",
|
||||
"back": "Back",
|
||||
"chat": "Local Chat",
|
||||
"friend_requests": "Follow Requests",
|
||||
"mentions": "Mentions",
|
||||
"interactions": "Interactions",
|
||||
|
@ -276,6 +275,12 @@
|
|||
"block_import": "Block import",
|
||||
"block_import_error": "Error importing blocks",
|
||||
"blocks_imported": "Blocks imported! Processing them will take a while.",
|
||||
"mute_export": "Mute export",
|
||||
"mute_export_button": "Export your mutes to a csv file",
|
||||
"mute_import": "Mute import",
|
||||
"mute_import_error": "Error importing mutes",
|
||||
"mutes_imported": "Mutes imported! Processing them will take a while.",
|
||||
"import_mutes_from_a_csv_file": "Import mutes from a csv file",
|
||||
"blocks_tab": "Blocks",
|
||||
"bot": "This is a bot account",
|
||||
"btnRadius": "Buttons",
|
||||
|
@ -434,6 +439,7 @@
|
|||
"false": "no",
|
||||
"true": "yes"
|
||||
},
|
||||
"virtual_scrolling": "Optimize timeline rendering",
|
||||
"fun": "Fun",
|
||||
"greentext": "Meme arrows",
|
||||
"notifications": "Notifications",
|
||||
|
@ -663,7 +669,8 @@
|
|||
"show_full_subject": "Show full subject",
|
||||
"hide_full_subject": "Hide full subject",
|
||||
"show_content": "Show content",
|
||||
"hide_content": "Hide content"
|
||||
"hide_content": "Hide content",
|
||||
"status_deleted": "This post was deleted"
|
||||
},
|
||||
"user_card": {
|
||||
"approve": "Approve",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue