Merge remote-tracking branch 'origin/master'

# Conflicts:
#	resources/settings.xml

resources/language/English/strings.po

@@ -76,15 +76,15 @@ msgid "Password"
 msgstr ""
 
 msgctxt "#30017"
-msgid "Download path"
+msgid "Download path*"
 msgstr ""
 
 msgctxt "#30018"
-msgid "Download list path"
+msgid "Download list path*"
 msgstr ""
 
 msgctxt "#30019"
-msgid "Filter channels by language"
+msgid "Channels language"
 msgstr ""
 
 msgctxt "#30020"
@@ -204,7 +204,7 @@ msgid "Unsopported Server"
 msgstr ""
 
 msgctxt "#30067"
-msgid "Path"
+msgid "Path*"
 msgstr ""
 
 msgctxt "#30068"
@@ -1561,7 +1561,7 @@ msgid "Information"
 msgstr ""
 
 msgctxt "#60349"
-msgid "Go to the Main Menu"
+msgid "Go to the main menu"
 msgstr ""
 
 msgctxt "#60350"
@@ -1581,7 +1581,7 @@ msgid "Add movie to video library"
 msgstr ""
 
 msgctxt "#60354"
-msgid "Download Movie"
+msgid "Download movie"
 msgstr ""
 
 msgctxt "#60355"
@@ -1589,19 +1589,19 @@ msgid "Download TV show"
 msgstr ""
 
 msgctxt "#60356"
-msgid "Download Episode"
+msgid "Download episode"
 msgstr ""
 
 msgctxt "#60357"
-msgid "Download Season"
+msgid "Download season"
 msgstr ""
 
 msgctxt "#60358"
-msgid "Open Configuration"
+msgid "Open configuration"
 msgstr ""
 
 msgctxt "#60359"
-msgid "Search Trailer"
+msgid "Search trailer"
 msgstr ""
 
 msgctxt "#60360"
@@ -1609,7 +1609,7 @@ msgid "Show quick menu"
 msgstr ""
 
 msgctxt "#60361"
-msgid "Super Favourites Menu"
+msgid "Super favourites menu"
 msgstr ""
 
 msgctxt "#60362"
@@ -1817,8 +1817,8 @@ msgid "Channels included in the global search "
 msgstr ""
 
 msgctxt "#60422"
-msgid "Search "
-msgstr ""
+msgid "Channels search"
+msgstr "Ricerca canali"
 
 msgctxt "#60423"
 msgid "Search"
@@ -2849,7 +2849,7 @@ msgid "Reload"
 msgstr ""
 
 msgctxt "#70009"
-msgid "Classic Menu"
+msgid "Main menu"
 msgstr ""
 
 msgctxt "#70010"
@@ -2925,7 +2925,7 @@ msgid "Search engine settings"
 msgstr ""
 
 msgctxt "#70028"
-msgid "Most Popular"
+msgid "Most popular"
 msgstr ""
 
 msgctxt "#70029"
@@ -3213,7 +3213,7 @@ msgid "Video library %s configured"
 msgstr ""
 
 msgctxt "#70104"
-msgid "The Kodi video library has been configured correctly"
+msgid "The Kodi video library has been successfully configured"
 msgstr ""
 
 msgctxt "#70105"
@@ -3269,15 +3269,15 @@ msgid "Confirm new password"
 msgstr ""
 
 msgctxt "#70118"
-msgid "TV shows folder"
+msgid "TV shows folder*"
 msgstr ""
 
 msgctxt "#70119"
-msgid "Movies folder"
+msgid "Movies folder*"
 msgstr ""
 
 msgctxt "#70120"
-msgid "Add KoD content to Kodi video library"
+msgid "Add KoD content to Kodi video library*"
 msgstr ""
 
 msgctxt "#70121"
@@ -3405,11 +3405,11 @@ msgid "Show ExtendedInfo"
 msgstr ""
 
 msgctxt "#70153"
-msgid "KoD shortcut"
+msgid "Shortcut"
 msgstr ""
 
 msgctxt "#70154"
-msgid "TMDB search options"
+msgid "TMDB search"
 msgstr ""
 
 msgctxt "#70155"
@@ -5001,15 +5001,15 @@ msgid "Select color:"
 msgstr ""
 
 msgctxt "#70559"
-msgid "Now in Theatres "
+msgid "Now in theatres "
 msgstr ""
 
 msgctxt "#70560"
-msgid "Movies by Genre"
+msgid "Movies by genre"
 msgstr ""
 
 msgctxt "#70561"
-msgid "Search Similar"
+msgid "Search similar"
 msgstr ""
 
 msgctxt "#70562"
@@ -5081,7 +5081,7 @@ msgid "Torrents"
 msgstr ""
 
 msgctxt "#70579"
-msgid "KoD update"
+msgid "Updates"
 msgstr ""
 
 msgctxt "#70580"
@@ -5476,7 +5476,7 @@ msgid "KoD updates"
 msgstr ""
 
 msgctxt "#70675"
-msgid "Error checking updates"
+msgid "Impossible to check the updates"
 msgstr ""
 
 msgctxt "#70676"
@@ -5628,11 +5628,11 @@ msgid "Modify "
 msgstr " "
 
 msgctxt "#70715"
-msgid "Customized homepage"
+msgid "Customized main menu"
 msgstr ""
 
 msgctxt "#70716"
-msgid "Homepage categories"
+msgid "Main menu items"
 msgstr ""
 
 msgctxt "#70717"
@@ -5784,7 +5784,7 @@ msgid "Playback"
 msgstr ""
 
 msgctxt "#70754"
-msgid "Display mode"
+msgid "View types"
 msgstr ""
 
 msgctxt "#70755"
@@ -5911,14 +5911,30 @@ msgctxt "#70785"
 msgid "Install Quasar"
 msgstr ""
 
+msgctxt "#70786"
+msgid "Autostart"
+msgstr ""
+
+msgctxt "#70787"
+msgid "Network"
+msgstr ""
+
+msgctxt "#70788"
+msgid "Logging"
+msgstr ""
+
+msgctxt "#70789"
+msgid "* Change by opening the settings from the main menu of KoD"
+msgstr ""
+
 
 # DNS start [ settings and declaration ]
 msgctxt "#707401"
-msgid "Enable DNS Check Alert"
+msgid "Enable DNS check alert"
 msgstr ""
 
 msgctxt "#707402"
-msgid "Connection or DNS problems"
+msgid "Connection or DNS problem"
 msgstr ""
 
 msgctxt "#707403"
@@ -6159,4 +6175,8 @@ msgstr ""
 
 msgctxt "#80027"
 msgid "You will be asked to configure The Movie Database for movies and The TVDB for TV shows"
+msgstr ""
+
+msgctxt "#80028"
+msgid "The path and/or the folders you selected are already used by the Kodi library. Please select other ones"
 msgstr ""