Merge branch 'master' into copy-stream-url

src/strings/en-us.json

@@ -640,6 +640,7 @@
     "LabelFailed": "Failed",
     "LabelFileOrUrl": "File or url:",
     "LabelFinish": "Finish",
+    "LabelFolder": "Folder:",
     "LabelFont": "Font:",
     "LabelForgotPasswordUsernameHelp": "Enter your username, if you remember it.",
     "LabelFormat": "Format:",
@@ -1348,7 +1349,7 @@
     "TabMyPlugins": "My Plugins",
     "TabNetworks": "Networks",
     "TabNetworking": "Networking",
-    "TabNfoSettings": "NFO settings",
+    "TabNfoSettings": "NFO Settings",
     "TabNotifications": "Notifications",
     "TabOther": "Other",
     "TabParentalControl": "Parental Control",