Merge remote-tracking branch 'origin/develop' into from/develop/tusooa/sw-cache-assets

src/i18n/en.json

@@ -117,6 +117,7 @@
     "flash_security": "Note that this can be potentially dangerous since Flash content is still arbitrary code.",
     "flash_fail": "Failed to load flash content, see console for details.",
     "scope_in_timeline": {
+      "local": "Non-federated",
       "direct": "Direct",
       "private": "Followers-only",
       "public": "Public",
@@ -171,6 +172,7 @@
     "interactions": "Interactions",
     "dms": "Direct messages",
     "public_tl": "Public timeline",
+    "bubble": "Bubble timeline",
     "timeline": "Timeline",
     "home_timeline": "Home timeline",
     "twkn": "Known Network",
@@ -231,8 +233,10 @@
     "single_choice": "Single choice",
     "multiple_choices": "Multiple choices",
     "expiry": "Poll age",
+    "expires_at": "Poll ends {0}",
     "expires_in": "Poll ends in {0}",
     "expired": "Poll ended {0} ago",
+    "expired_at": "Poll ended {0}",
     "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"
@@ -287,7 +291,8 @@
       "text/plain": "Plain text",
       "text/html": "HTML",
       "text/markdown": "Markdown",
-      "text/bbcode": "BBCode"
+      "text/bbcode": "BBCode",
+      "text/x.misskeymarkdown": "MFM"
     },
     "content_type_selection": "Post format",
     "content_warning": "Subject (optional)",
@@ -408,6 +413,41 @@
     "visual_tweaks": "Minor visual tweaks",
     "theme_debug": "Show what background theme engine assumes when dealing with transparancy (DEBUG)",
     "scale_and_layout": "Interface scale and layout",
+    "enabled": "Enabled",
+    "filter": {
+      "clutter": "Remove clutter",
+      "mute_filter": "Mute Filters",
+      "type": "Filter type",
+      "regexp": "RegExp",
+      "plain": "Simple",
+      "user": "User (Simple)",
+      "user_regexp": "User (RegExp)",
+      "hide": "Hide completely",
+      "name": "Name",
+      "value": "Value",
+      "expires": "Expires",
+      "expired": "Expired",
+      "copy": "Duplicate",
+      "save": "Save",
+      "delete": "Remove",
+      "new": "Create new",
+      "import": "Import",
+      "export": "Export",
+      "regexp_error": "Invalid Regular Expression",
+      "never_expires": "Never",
+      "total_count": "Total {count} custom filter|Total {count} custom filters",
+      "expired_count": "{count} expired filter|{count} expired filters",
+      "custom_filters": "Custom filters",
+      "purge_expired": "Remove expired filters",
+      "import_failure": "The selected file is not a supported Pleroma filter.",
+      "help": {
+        "word": "Simple and RegExp filters test against post's content and subject.",
+        "user": "User filter matches full user handle (user{'@'}domain) in the following: author, reply-to and mentions",
+        "regexp": "Regex variants are more advanced and use {link} to match instead of simple substring search.",
+        "regexp_link": "Regular Expressions",
+        "regexp_url": "https://en.wikipedia.org/wiki/Regular_expression"
+      }
+    },
     "mfa": {
       "otp": "OTP",
       "setup_otp": "Setup OTP",
@@ -573,6 +613,7 @@
     "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
     "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
     "hide_filtered_statuses": "Hide all filtered posts",
+    "hide_muted_statuses": "Completely hide all muted posts",
     "hide_wordfiltered_statuses": "Hide word-filtered statuses",
     "hide_muted_threads": "Hide muted threads",
     "import_blocks_from_a_csv_file": "Import blocks from a csv file",
@@ -709,6 +750,7 @@
     "column_sizes_sidebar": "Sidebar",
     "column_sizes_content": "Content",
     "column_sizes_notifs": "Notifications",
+    "theme_editor_min_width": "Minimum width of theme editor (0 for \"fit-content\")",
     "tree_advanced": "Allow more flexible navigation in tree view",
     "tree_fade_ancestors": "Display ancestors of the current status in faint text",
     "conversation_display_linear": "Linear-style",
@@ -1265,6 +1307,7 @@
     "copy_link": "Copy link to status",
     "external_source": "External source",
     "muted_words": "Wordfiltered: {word} | Wordfiltered: {word} and {numWordsMore} more words",
+    "muted_filters": "Filtered: {name} | Wordfiltered: {name} and {filtersMore} more words",
     "multi_reason_mute": "{main} + one more reason | {main} + {numReasonsMore} more reasons",
     "muted_user": "User muted",
     "thread_muted": "Thread muted",