Merge branch 'master' into master

locales/en-US.json

@@ -60,40 +60,40 @@
     "E-mail": "E-mail",
     "Google verification code": "Google verification code",
     "Preferences": "Preferences",
-    "Player preferences": "Player preferences",
-    "Always loop: ": "Always loop: ",
-    "Autoplay: ": "Autoplay: ",
-    "Play next by default: ": "Play next by default: ",
-    "Autoplay next video: ": "Autoplay next video: ",
-    "Listen by default: ": "Listen by default: ",
-    "Proxy videos: ": "Proxy videos: ",
-    "Default speed: ": "Default speed: ",
-    "Preferred video quality: ": "Preferred video quality: ",
-    "Player volume: ": "Player volume: ",
-    "Default comments: ": "Default comments: ",
+    "preferences_category_player": "Player preferences",
+    "preferences_video_loop_label": "Always loop: ",
+    "preferences_autoplay_label": "Autoplay: ",
+    "preferences_continue_label": "Play next by default: ",
+    "preferences_continue_autoplay_label": "Autoplay next video: ",
+    "preferences_listen_label": "Listen by default: ",
+    "preferences_local_label": "Proxy videos: ",
+    "preferences_speed_label": "Default speed: ",
+    "preferences_quality_label": "Preferred video quality: ",
+    "preferences_volume_label": "Player volume: ",
+    "preferences_comments_label": "Default comments: ",
     "youtube": "YouTube",
     "reddit": "Reddit",
-    "Default captions: ": "Default captions: ",
+    "preferences_captions_label": "Default captions: ",
     "Fallback captions: ": "Fallback captions: ",
-    "Show related videos: ": "Show related videos: ",
-    "Show annotations by default: ": "Show annotations by default: ",
-    "Automatically extend video description: ": "Automatically extend video description: ",
-    "Interactive 360 degree videos: ": "Interactive 360 degree videos: ",
-    "Visual preferences": "Visual preferences",
-    "Content country: ": "Content country: ",
-    "Player style: ": "Player style: ",
+    "preferences_related_videos_label": "Show related videos: ",
+    "preferences_annotations_label": "Show annotations by default: ",
+    "preferences_extend_desc_label": "Automatically extend video description: ",
+    "preferences_vr_mode_label": "Interactive 360 degree videos: ",
+    "preferences_category_visual": "Visual preferences",
+    "preferences_region_label": "Content country: ",
+    "preferences_player_style_label": "Player style: ",
     "Dark mode: ": "Dark mode: ",
-    "Theme: ": "Theme: ",
+    "preferences_dark_mode_label": "Theme: ",
     "dark": "dark",
     "light": "light",
-    "Thin mode: ": "Thin mode: ",
-    "Miscellaneous preferences": "Miscellaneous preferences",
-    "Automaticatic instance redirection (fallback to redirect.invidious.io): ": "Automaticatic instance redirection (fallback to redirect.invidious.io): ",
-    "Subscription preferences": "Subscription preferences",
-    "Show annotations by default for subscribed channels: ": "Show annotations by default for subscribed channels? ",
+    "preferences_thin_mode_label": "Thin mode: ",
+    "preferences_category_misc": "Miscellaneous preferences",
+    "preferences_automatic_instance_redirect_label": "Automaticatic instance redirection (fallback to redirect.invidious.io): ",
+    "preferences_category_subscription": "Subscription preferences",
+    "preferences_annotations_subscribed_label": "Show annotations by default for subscribed channels? ",
     "Redirect homepage to feed: ": "Redirect homepage to feed: ",
-    "Number of videos shown in feed: ": "Number of videos shown in feed: ",
-    "Sort videos by: ": "Sort videos by: ",
+    "preferences_max_results_label": "Number of videos shown in feed: ",
+    "preferences_sort_label": "Sort videos by: ",
     "published": "published",
     "published - reverse": "published - reverse",
     "alphabetically": "alphabetically",
@@ -102,12 +102,12 @@
     "channel name - reverse": "channel name - reverse",
     "Only show latest video from channel: ": "Only show latest video from channel: ",
     "Only show latest unwatched video from channel: ": "Only show latest unwatched video from channel: ",
-    "Only show unwatched: ": "Only show unwatched: ",
-    "Only show notifications (if there are any): ": "Only show notifications (if there are any): ",
+    "preferences_unseen_only_label": "Only show unwatched: ",
+    "preferences_notifications_only_label": "Only show notifications (if there are any): ",
     "Enable web notifications": "Enable web notifications",
     "`x` uploaded a video": "`x` uploaded a video",
     "`x` is live": "`x` is live",
-    "Data preferences": "Data preferences",
+    "preferences_category_data": "Data preferences",
     "Clear watch history": "Clear watch history",
     "Import/export data": "Import/export data",
     "Change password": "Change password",
@@ -115,10 +115,10 @@
     "Manage tokens": "Manage tokens",
     "Watch history": "Watch history",
     "Delete account": "Delete account",
-    "Administrator preferences": "Administrator preferences",
-    "Default homepage: ": "Default homepage: ",
-    "Feed menu: ": "Feed menu: ",
-    "Show nickname on top: ": "Show nickname on top: ",
+    "preferences_category_admin": "Administrator preferences",
+    "preferences_default_home_label": "Default homepage: ",
+    "preferences_feed_menu_label": "Feed menu: ",
+    "preferences_show_nick_label": "Show nickname on top: ",
     "Top enabled: ": "Top enabled: ",
     "CAPTCHA enabled: ": "CAPTCHA enabled: ",
     "Login enabled: ": "Login enabled: ",
@@ -375,7 +375,7 @@
     "Top": "Top",
     "About": "About",
     "Rating: ": "Rating: ",
-    "Language: ": "Language: ",
+    "preferences_locale_label": "Language: ",
     "View as playlist": "View as playlist",
     "Default": "Default",
     "Music": "Music",