Merge branch 'master'

public/locales/en.json

@@ -10,35 +10,6 @@
             "LangUpdateMsg": "{0} Language has been updated on the translation site",
             "LangUpdateMsg2": "Please go to Language option and select '{0}'"
         },
-        "Settings": {
-            "Return": "Return",
-            "Global": {
-                "Info": "The global settings are devided into the following:",
-                "ttLibmap": "Define mapped/mounted drives towards your Plex Media Server Libraries",
-                "ttPMS": "General settings for accessing a Plex Media Server",
-                "ttExport": "Define format for an exported file",
-                "ttGeneral": "Define general settings for @:Common.AppName"
-            },
-            "General": {
-                "Name": "General Settings",
-                "Description": "@:Common.Settings.General.Name allows you set general preferences for @:Common.AppName"
-            },
-            "LibMapping": {
-                "Name": "Library Mapping",
-                "Description": "@:Common.Settings.LibMapping.Name allows you map the defined Library folders path to match a path for this workstation",
-                "ClickToDefine": "Click to define",
-                "SelectMapDirPath": "Select mapped path",
-                "ttSelectLibrary": "Here you select the library to map"
-            },
-            "PMS": {
-                "Name": "PMS Settings",
-                "Description": "@:Common.Settings.PMS.Name allows you set preferences for accessing a Plex Media Server"
-            },
-            "Export": {
-                "Name": "Export Settings",
-                "Description": "@:Common.Settings.Export.Name allows you set preferences for exporting a file"
-            }
-        },
         "Language": {
             "Description": "@:Common.Language.Name allows you to change language of the app",
             "Name": "Language",
@@ -194,6 +165,35 @@
             "Long": "long",
             "Medium": "medium",
             "Short": "short"
+        },
+        "Settings": {
+            "Return": "Return to main Settings",
+            "Global": {
+                "Info": "The global settings are devided into the following:",
+                "ttLibmap": "Define mapped/mounted drives towards your Plex Media Server Libraries",
+                "ttPMS": "General settings for accessing a Plex Media Server",
+                "ttExport": "Define format for an exported file",
+                "ttGeneral": "Define general settings for @:Common.AppName"
+            },
+            "General": {
+                "Name": "General Settings",
+                "Description": "@:Common.Settings.General.Name allows you set general preferences for @:Common.AppName"
+            },
+            "LibMapping": {
+                "Name": "Library Mapping",
+                "Description": "@:Common.Settings.LibMapping.Name allows you map the defined Library folders path to match a path for this workstation",
+                "ClickToDefine": "Click to define",
+                "SelectMapDirPath": "Select mapped path",
+                "ttSelectLibrary": "Here you select the library to map"
+            },
+            "PMS": {
+                "Name": "PMS Settings",
+                "Description": "@:Common.Settings.PMS.Name allows you set preferences for accessing a Plex Media Server"
+            },
+            "Export": {
+                "Name": "Export Settings",
+                "Description": "@:Common.Settings.Export.Name allows you set preferences for exporting a file"
+            }
         }
     },
     "Modules": {
@@ -201,12 +201,9 @@
             "Description": "@:Modules.ET.Name allows you to export detail information about the media in your libraries",
             "Name": "ExportTools",
             "ErrorServer": "No server",
-            "ttSettings": "Settings for @:Modules.ET.Name module",
             "Settings": {
-                "Name": "@:Modules.ET.Name Settings",
+                "Settings": "Settings",
                 "Description": "Here you can define the settings for @:Modules.ET.Name",
-                "Note": "Note: * Click here for general settings regarding export *",
-                "Return": "Return to @:Modules.ET.Name",
                 "ArraySep": "Delimiter for multiple info in same field",
                 "ColumnSep": "Delimiter between columns in CSV file (Use 9 for TAB)",
                 "TimeOut": "Timeout when requesting info from PMS in sec (Global setting)",
@@ -231,7 +228,10 @@
                 "MoviesUseId": "Default Id for suggested folder and filename for movies",
                 "ttMoviesUseId": "If exporting Suggested Filename or Folder for movies, default to selected naming if available. Fallback to IMDB if not",
                 "ShowsUseId": "Default Id for suggested folder and filename for shows",
-                "ttShowsUseId": "If exporting Suggested Filename or Folder for shows, default to selected naming if available. Fallback to TMDB if not"
+                "ttShowsUseId": "If exporting Suggested Filename or Folder for shows, default to selected naming if available. Fallback to TMDB if not",
+                "Name": "@:Modules.ET.Name Settings",
+                "Note": "Note: * Click here for general settings regarding export *",
+                "Return": "Return to @:Modules.ET.Name"
             },
             "LevelInfo": "Export level determines which data are going to be exported.",
             "SelectLevel": "Select level",
@@ -306,7 +306,7 @@
                 "lblExportLevel": "Export Level",
                 "lblMainExp": "Select Export Type",
                 "lblSecExp": "Select Sub Type",
-                "lblSelectSelection": "Select Media Libary",
+                "lblSelectSelection": "Select Media Library",
                 "MainMovie": "Movie",
                 "MainTV": "TV",
                 "MainAudio": "Audio",
@@ -342,7 +342,8 @@
             "ErrorNoOutputFormatTitle": "No output format selected",
             "ErrorNoOutputFormatMsg": "You need to select an output format in the @:Modules.ET.Name settings, like csv or xlsx",
             "FolderNameOK": "** Folder named correctly **",
-            "FileNameOK": "** File named correctly **"
+            "FileNameOK": "** File named correctly **",
+            "ttSettings": "Settings for @:Modules.ET.Name module"
         },
         "About": {
             "Description": "@:Modules.About.Name",