84 files changed, 4507 insertions, 16073 deletions
diff --git a/addons/skin.confluence/language/Armenian/strings.po b/addons/skin.confluence/language/Armenian/strings.po
deleted file mode 100644
index 475d1b3735..0000000000
--- a/addons/skin.confluence/language/Armenian/strings.po
+++ /dev/null
@@ -1,529 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/xbmc-main/language/hy/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Փոփոխել"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Անջատման տարբերակներ"
-
-msgctxt "#31004"
-msgid "Working..."
-msgstr "Ընթացքում է ..."
-
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Թաքցնել տեղեկությունը"
-
-msgctxt "#31006"
-msgid "View Options"
-msgstr "Տարբերակներ"
-
-msgctxt "#31008"
-msgid "Full screen"
-msgstr "Ամբողջ էկրանով"
-
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Տևողություն"
-
-msgctxt "#31022"
-msgid "Music - Files"
-msgstr "Երաժշտական ֆայլեր"
-
-msgctxt "#31023"
-msgid "Playing"
-msgstr "Նվագարկում է"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "Էջ"
-
-msgctxt "#31025"
-msgid "Items"
-msgstr "Պիտույք"
-
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Այլ տարբերակներ"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "Տեղը"
-
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Աֆիշ"
-
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Նկարների նմուշներ"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Նկարապատել"
-
-msgctxt "#31033"
-msgid "Info"
-msgstr "Ինֆո"
-
-msgctxt "#31039"
-msgid "Actions"
-msgstr "Գործողություններ"
-
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Այժմ նվագարկում է"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "ՆՎԱԳԱՐԿԵԼ"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "ԴԱԴԱՐ"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "ԱՌԱՋ"
-
-msgctxt "#31045"
-msgid "REWIND"
-msgstr "ՀԵՏԴԱՐՁ"
-
-msgctxt "#31046"
-msgid "SEEKING"
-msgstr "ՓՆՏՐԵԼ"
-
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Տեսաձևավորումների ընտրանի"
-
-msgctxt "#31049"
-msgid "End Time"
-msgstr "Վերջ"
-
-msgctxt "#31050"
-msgid "Sort: Ascending"
-msgstr "Աճողական"
-
-msgctxt "#31051"
-msgid "Sort: Descending"
-msgstr "Նվազող"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "Բացել նվագացանկը"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "Հիշել նվագացանկը"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "Փակել նվագացանկը"
-
-msgctxt "#31058"
-msgid "System music files"
-msgstr "Համակարգի երաժշտական ֆայլեր"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "Ընթացիկ նվագացանկ"
-
-msgctxt "#31060"
-msgid "This file is stacked, select the part you want to play from."
-msgstr "Այս ֆայլը կտրատված է: Ընտրեք հատված՝ նվագարկելու համար:"
-
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Ընթացիկ նշված"
-
-msgctxt "#31101"
-msgid "Home screen options"
-msgstr "Հիմնական էկրանի տարբերակներ"
-
-msgctxt "#31102"
-msgid "Background"
-msgstr "Ֆոն"
-
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Ցույց տալ ''Դադար'' նկարների շարանում"
-
-msgctxt "#31106"
-msgid "Miscellaneous options"
-msgstr "Այլ տարբերակներ"
-
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Թաքցնել տեսաֆայլերի անուններից կարդացած նշումները [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Թաքցնել գլխավոր ցանկի կոճակները"
-
-msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Միացնել ընտրյալ ֆոն"
-
-msgctxt "#31110"
-msgid "Background path:"
-msgstr "Ֆոնի տեղակայում."
-
-msgctxt "#31111"
-msgid "Hide"
-msgstr "Թաքցնել"
-
-msgctxt "#31112"
-msgid "Options"
-msgstr "Տարբերակներ"
-
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Ցույց տալ վերջին ավելացված ալբոմները"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Ցույց տալ վերջին ավելացված տեսանյութերը"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Հիմնական էջի ''Ծրագրեր'' բաժնի ենթամենյու"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Թաքցնել Ֆոնի fanart"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Ցույց տալ ''Նվագարկվում է'' տեսանյութի ֆոն"
-
-msgctxt "#31126"
-msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Նվագարկել TV թեմայի երգերը տեսադարանում (TvTunes add-on)"
-
-msgctxt "#31127"
-msgid "TvTunes"
-msgstr "TV-Որոնում"
-
-msgctxt "#31128"
-msgid "Lyrics"
-msgstr "Երգի բառեր"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Երգի բառերի ավելացումներ"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Հիմնական էջի ''Տեսանյութեր'' բաժնի ենթամենյու"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Հիմնական էջի ''Երգ-երաժշտություն'' բաժնի ենթամենյու"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Հիմնական էջի ''Նկարներ'' բաժնի ենթամենյու"
-
-msgctxt "#31140"
-msgid "Music OSD"
-msgstr "Երգերի OSD"
-
-msgctxt "#31141"
-msgid "Video OSD"
-msgstr "Տեսանյութի OSD"
-
-msgctxt "#31142"
-msgid "Settings level"
-msgstr "Կարգավորումների խորություն"
-
-msgctxt "#31200"
-msgid "Shortcuts"
-msgstr "Հղումներ"
-
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Ընտրեք երգը"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Երգի բառերի աղբյուր"
-
-msgctxt "#31206"
-msgid "Found"
-msgstr "Գտնվեց"
-
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Գտնել ավելին"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Առաջիկա դրվագներ"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Ընթացիկ ջերմաստիճան"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Վերջին թարմացումներ"
-
-msgctxt "#31303"
-msgid "Data provider"
-msgstr "Տվյալների մատակարար"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Ֆիլմի մանրամասներ"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Օգտագործված է հիշողություն:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Երգի համարը"
-
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Նշիչ"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Ընտրել նշիչ"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Բովանդակության զննման տարբերակներ"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Ընտրված պրոֆիլ"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Վերջին այցելությունը"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Կարաոկե երգի նշիչ"
-
-msgctxt "#31322"
-msgid "Aired"
-msgstr "Եթերում է"
-
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Նվագացանկի տարբերակներ"
-
-msgctxt "#31326"
-msgid "Created"
-msgstr "Ստեղծված"
-
-msgctxt "#31327"
-msgid "Resolution"
-msgstr "Թույլատվություն"
-
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Վերջերս ավելացված"
-
-msgctxt "#31329"
-msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]Ժամանակացույցը մեկնարկվեց![/B] [COLOR=grey2] - Համակարգը ավտոմատ կանջատվի[/COLOR]"
-
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Սեղմել կոճակը[CR][CR]Ֆիլմի ակնարկը դիտելու համար"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Ալբոմի մանրամասներ"
-
-msgctxt "#31351"
-msgid "Pause"
-msgstr "Դադար"
-
-msgctxt "#31352"
-msgid "Stop"
-msgstr "Կանգ"
-
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Առաջ"
-
-msgctxt "#31354"
-msgid "Rewind"
-msgstr "Հետդարձ"
-
-msgctxt "#31355"
-msgid "Movie menu"
-msgstr "Ֆիլմերի ցանկ"
-
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Ներբեռնել ենթավերնագրերը"
-
-msgctxt "#31360"
-msgid "Watch as 2D"
-msgstr "Դիտել որպես 2D"
-
-msgctxt "#31361"
-msgid "Change mode"
-msgstr "Փոխել ռեժիմը"
-
-msgctxt "#31362"
-msgid "Enabled"
-msgstr "Միացված"
-
-msgctxt "#31390"
-msgid "Skin default"
-msgstr "Հիմնական տեսք"
-
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Հիմնական տեսք առանց մեծատառերի"
-
-msgctxt "#31392"
-msgid "Arial based"
-msgstr "Arial-հիմքով"
-
-msgctxt "#31400"
-msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
-msgstr "[B]ՁԵՎԱՎՈՐՄԱՆ ԿԱՐԳԱՎՈՐՈՒՄՆԵՐ[/B][CR][CR]Փոխել տեսքը · Ընտրել լեզուն և տեղայնքը · Փոխել ֆայլերի թերթման հատկությունները[CR]Ընտրել դադարի էկրան"
-
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Օգնություն առաջին մեկնարկի համար ..."
-
-msgctxt "#31420"
-msgid "Login"
-msgstr "Մուտք"
-
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Ընտրել Kodi-ի օգտատիրոջ պրոֆիլը[CR]՝մուտք գործելու և շարունակելու համար"
-
-msgctxt "#31422"
-msgid "Show or hide the login screen at startup."
-msgstr "Միանալու ժամանակ ցուցադրել կամ թաքցնել մուտքի պատուհանը"
-
-msgctxt "#31423"
-msgid "Select the profile that will be used at startup when the login screen is disabled."
-msgstr "Եթե թաքցված է մուտքի պատուհանը, նշել այն պրոֆիլը, որը կկիրառվի միանալիս"
-
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Նշված ժամանակահատված"
-
-msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV հիմա"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Ավելացնել խումբ"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Վերանվանել խումբը"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Ջնջել խումբը"
-
-msgctxt "#31506"
-msgid "Available[CR]Groups"
-msgstr "Հասանելի[CR]խումբ"
-
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Ալիքների խումբ"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Ժամանակաչափ"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Ալիքի տարբերակներ"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36-ժամյա տեսություն"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Ժամային տեսություն"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Հանգստյան օրերի տեսություն"
-
-msgctxt "#31905"
-msgid "Forecast"
-msgstr "Տեսություն"
-
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Սպասվող տեղումներ"
-
-msgctxt "#31909"
-msgid "Fetching forecast info..."
-msgstr "Եղանակի տեսություն"
-
-msgctxt "#31950"
-msgid "WEATHER"
-msgstr "ԵՂԱՆԱԿ"
-
-msgctxt "#31951"
-msgid "PICTURES"
-msgstr "ՆԿԱՐՆԵՐ"
-
-msgctxt "#31953"
-msgid "VIDEOS"
-msgstr "ՏԵՍԱՆՅՈՒԹ"
-
-msgctxt "#31954"
-msgid "MOVIES"
-msgstr "ՖԻԼՄԵՐ"
-
-msgctxt "#31955"
-msgid "TV SHOWS"
-msgstr "TV ԾՐԱԳՐԵՐ"
-
-msgctxt "#31956"
-msgid "MUSIC"
-msgstr "ԵՐԳ-ԵՐԱԺՇՏՈՒԹՅՈՒՆ"
-
-msgctxt "#31957"
-msgid "PROGRAMS"
-msgstr "ԾՐԱԳՐԵՐ"
-
-msgctxt "#31958"
-msgid "PLAY DISC"
-msgstr "ՆՎԱԳԱՐԿԵԼ"
-
-msgctxt "#31959"
-msgid "SYSTEM"
-msgstr "ՀԱՄԱԿԱՐԳ"
diff --git a/addons/skin.confluence/language/Burmese/strings.po b/addons/skin.confluence/language/Burmese/strings.po
deleted file mode 100644
index f0cd7eb7c6..0000000000
--- a/addons/skin.confluence/language/Burmese/strings.po
+++ /dev/null
@@ -1,301 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Burmese (http://www.transifex.com/projects/p/xbmc-main/language/my/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: my\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgctxt "#31004"
-msgid "Working..."
-msgstr "အလုပ်လုပ်နေသည်"
-
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "အချက်အလက်များကိုဖျောက်ထားမည်"
-
-msgctxt "#31008"
-msgid "Full screen"
-msgstr "မျက်နှာပြင်အပြည့် "
-
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "စုစုပေါင်းကြာချိန်"
-
-msgctxt "#31022"
-msgid "Music - Files"
-msgstr "ဂီတ-ဖိုင်များ"
-
-msgctxt "#31023"
-msgid "Playing"
-msgstr "ဖွင့်နေပါသည်။"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "စာမျက်နှာ"
-
-msgctxt "#31025"
-msgid "Items"
-msgstr "အမျိုးအစားများ"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "တည်နေရာ"
-
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "ပိုစတာ"
-
-msgctxt "#31029"
-msgid "Fanart"
-msgstr "Fanart"
-
-msgctxt "#31033"
-msgid "Info"
-msgstr "အချက်အလက်များ"
-
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "ယခုဖွင့်နေပါသည်။"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "ဖွင့်ထားပါသည်။"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "ခဏရပ်မည်"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "အရှေ့သို့အနည်းငယ်ရစ်မည်"
-
-msgctxt "#31049"
-msgid "End Time"
-msgstr "အဆုံးသတ်ချိန်"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "သီချင်းစာရင်းကိုဖွင့်မည်"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "သီချင်းစာရင်းကိုသိမ်းမည်"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "သီချင်းစာရင်းကိုပိတ်မည်"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "ယခုသီချင်းစာရင်း"
-
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "ယခုရွေးထားသော"
-
-msgctxt "#31102"
-msgid "Background"
-msgstr "နောက်ခံ"
-
-msgctxt "#31111"
-msgid "Hide"
-msgstr "ဖျောက်ထားမည်"
-
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "မကြာသေးခင်ကထည့်ခဲ့သော အယ်ဘမ် ကိုပြမည်"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "မကြာသေးခင်ကထည့်ခဲ့သော ဗွီဒီယိုများ ကိုပြမည်"
-
-msgctxt "#31128"
-msgid "Lyrics"
-msgstr "စာသား"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "စာသား Add-on"
-
-msgctxt "#31140"
-msgid "Music OSD"
-msgstr "Music OSD"
-
-msgctxt "#31200"
-msgid "Shortcuts"
-msgstr "အမြန်ခလုတ်များ"
-
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "သင်၏သီချင်းကိုရွေးပါ"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "စာသားရင်းမြစ်"
-
-msgctxt "#31206"
-msgid "Found"
-msgstr "တွေ့ရှိသည်"
-
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "နောက်ထပ်အမျိုးအစားများကိုရှာမည်"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "နောက်လာမည့်အပိုင်းများ"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "နောက်ဆုံး Update ဖြစ်ခဲ့စဉ်"
-
-msgctxt "#31303"
-msgid "Data provider"
-msgstr "အချက်အလက်များထောက်ပံ့သူ"
-
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Fanart ကိုဖျောက်ထားမည်"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "ရုပ်ရှင်အချက်အလက်များ"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "အသုံးပြုထားသော Memory -"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "အပုဒ်ရေနံပါတ်"
-
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Current Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr " Scraper တစ်ခုကိုရွေးမည်"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "ရွေးချယ်ထားသော Profile"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "နောက်ဆုံးဝင်ခဲ့ချိန်"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "ကာရာအိုကေ သီချင်းရွေးချယ်ခြင်း"
-
-msgctxt "#31326"
-msgid "Created"
-msgstr "ဖန်တီးခဲ့သည်"
-
-msgctxt "#31327"
-msgid "Resolution"
-msgstr "Resolution"
-
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "မကြာသေးခင်ကပေါင်းထည့်ခဲ့သော"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "အယ်ဘမ် အချက်အလက်များ"
-
-msgctxt "#31351"
-msgid "Pause"
-msgstr "ခဏရပ်မည်"
-
-msgctxt "#31352"
-msgid "Stop"
-msgstr "လုံး၀ရပ်မည်"
-
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "အရှေ့သို့အနည်းငယ်ရစ်မည်"
-
-msgctxt "#31354"
-msgid "Rewind"
-msgstr "နောက်သို့အနည်းငယ်ရစ်မည်"
-
-msgctxt "#31355"
-msgid "Movie menu"
-msgstr "ရုပ်ရှင်မီနူး"
-
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "စာတန်းထိုးများကို ဒေါင်းလုတ်ဆွဲမည်"
-
-msgctxt "#31362"
-msgid "Enabled"
-msgstr "ဖွင့်ထားမည်"
-
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]ADD-ONS ပြုပြင်ခြင်း[/B][CR][CR] သွင်းထားသည့် Add-on များကို ထိန်းညှိခြင်း ။ kodi.tv မှ Add-on များကို သွင်းရန် ကြည့်ရှုခြင်း[CR]Add-on များကို ပြုပြင် ပြောင်းလဲခြင်း"
-
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "အကူအညီကိုကြိုတင်ဖွင့်ပါ"
-
-msgctxt "#31413"
-msgid "Local subtitle available"
-msgstr "Local စာတန်းထိုး များရနိုင်ပါသည်။"
-
-msgctxt "#31420"
-msgid "Login"
-msgstr "ဝင်ရန်"
-
-msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "အုပ်စုပေါင်းထည့်မည်"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "အုပ်စုအမည်ပြောင်းမည်"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "အုပ်စုဖျက်မည်"
-
-msgctxt "#31506"
-msgid "Available[CR]Groups"
-msgstr "ရရှိနိုင်သော [CR]Groups"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "၃၆ နာရီ အကြိုခန့်မှန်းခြင်း"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "နာရီနှင့်အမျှ ခန့်မှန်းခြင်း"
-
-msgctxt "#31905"
-msgid "Forecast"
-msgstr "ခန့်မှန်းခြင်း"
-
-msgctxt "#31910"
-msgid "Maps"
-msgstr "မြေပုံများ"
-
-msgctxt "#31952"
-msgid "TV"
-msgstr "TV"
diff --git a/addons/skin.confluence/language/Filipino/strings.po b/addons/skin.confluence/language/Filipino/strings.po
deleted file mode 100644
index 8edd7be08a..0000000000
--- a/addons/skin.confluence/language/Filipino/strings.po
+++ /dev/null
@@ -1,173 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Filipino (http://www.transifex.com/projects/p/xbmc-main/language/fil/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fil\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Itago ang Inpormasyon"
-
-msgctxt "#31006"
-msgid "View Options"
-msgstr "Tingnan ang Options"
-
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Kabuuang Haba"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "Pahina"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "Lokasyon"
-
-msgctxt "#31029"
-msgid "Fanart"
-msgstr "Fanart"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "PLAYING"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "Pause"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "FAST FORWARD"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "Buksan ang Playlist"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "I-Save ang Playlist"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "Isara ang Playlist"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "Kasalukuyang Playlist"
-
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Kasalukuyang Napili"
-
-msgctxt "#31111"
-msgid "Hide"
-msgstr "Itago"
-
-msgctxt "#31127"
-msgid "TvTunes"
-msgstr "TvTunes"
-
-msgctxt "#31128"
-msgid "Lyrics"
-msgstr "Liriko"
-
-msgctxt "#31206"
-msgid "Found"
-msgstr "Natagpuan"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Kasalukuyang Temperatura"
-
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Itago ang Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detalye ng pelikula"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Gamit na Memory"
-
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Kasalukuyang Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Pumili ng Scraper"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Napiling Profile"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Huling Logged In"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke Song Selector"
-
-msgctxt "#31322"
-msgid "Aired"
-msgstr "Pinalabas"
-
-msgctxt "#31326"
-msgid "Created"
-msgstr "Ginawa"
-
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Huling Dinagdag"
-
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "i-Click ang button para i-play[CR][CR]Movie trailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalye ng Album"
-
-msgctxt "#31351"
-msgid "Pause"
-msgstr "Pause"
-
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Fast Forward"
-
-msgctxt "#31354"
-msgid "Rewind"
-msgstr "Rewind"
-
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Mag-download ng Subtitle"
-
-msgctxt "#31390"
-msgid "Skin default"
-msgstr "Default ng Skin"
-
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Default ng Skin ng walang Caps"
-
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Pumili ng Kodi user Profile[CR]pag mag-login at magpatuloy"
diff --git a/addons/skin.confluence/language/Georgian/strings.po b/addons/skin.confluence/language/Georgian/strings.po
deleted file mode 100644
index 5996c64205..0000000000
--- a/addons/skin.confluence/language/Georgian/strings.po
+++ /dev/null
@@ -1,165 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Georgian (http://www.transifex.com/projects/p/xbmc-main/language/ka/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ka\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "შეცვალეთ თქვენი"
-
-msgctxt "#31004"
-msgid "Working..."
-msgstr "დამუშავება..."
-
-msgctxt "#31022"
-msgid "Music - Files"
-msgstr "მუსიკალური ფაილები"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "გვერდი"
-
-msgctxt "#31025"
-msgid "Items"
-msgstr "ელემენტები"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "მდებარეობა"
-
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "ახლა უკრავს"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "უკრავს"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "პაუზა"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "წინ გადახვევა"
-
-msgctxt "#31045"
-msgid "REWIND"
-msgstr "უკან გადახვევა"
-
-msgctxt "#31049"
-msgid "End Time"
-msgstr "დასრულების დრო"
-
-msgctxt "#31050"
-msgid "Sort: Ascending"
-msgstr "სორტირება: ზრდადობით"
-
-msgctxt "#31051"
-msgid "Sort: Descending"
-msgstr "სორტირება: კლებადობით"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "ფლეილისტის გახსნა"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "ფლეილისტის შენახვა"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "ფლეილისტის დახურვა"
-
-msgctxt "#31058"
-msgid "System music files"
-msgstr "სისტემის მუსიკალური ფაილები"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "მიმდინარე ფლეილისტი"
-
-msgctxt "#31060"
-msgid "This file is stacked, select the part you want to play from."
-msgstr "ეს ფაილი შეიცავს დასტებს, შეარჩიეთ ის ნაწილი რომლის დაკვრაც გინდათ."
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "მიმდინარე ტემპი"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "ბოლო განახლება"
-
-msgctxt "#31303"
-msgid "Data provider"
-msgstr "მონაცემების მომწოდებელი"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "გამოყენებული მეხსიერება:"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "შიგთავსის სკანირების პარამეტრები"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "ბოლოს შემოსული"
-
-msgctxt "#31322"
-msgid "Aired"
-msgstr "ეთერში გავიდა"
-
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "ფლეილისტის პარამეტრები"
-
-msgctxt "#31327"
-msgid "Resolution"
-msgstr "გარჩევადობა"
-
-msgctxt "#31351"
-msgid "Pause"
-msgstr "პაუზა"
-
-msgctxt "#31352"
-msgid "Stop"
-msgstr "შეჩერება"
-
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "წინ გადახვევა"
-
-msgctxt "#31354"
-msgid "Rewind"
-msgstr "უკან გადახვევა"
-
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "სუბტიტრების გადმოწერა"
-
-msgctxt "#31362"
-msgid "Enabled"
-msgstr "ჩართულია"
-
-msgctxt "#31390"
-msgid "Skin default"
-msgstr "თემაში ნაგულისხმევი"
-
-msgctxt "#31905"
-msgid "Forecast"
-msgstr "პროგნოზი"
diff --git a/addons/skin.confluence/language/German/strings.po b/addons/skin.confluence/language/German/strings.po
deleted file mode 100644
index 8eccf603b8..0000000000
--- a/addons/skin.confluence/language/German/strings.po
+++ /dev/null
@@ -1,613 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: German (http://www.transifex.com/projects/p/xbmc-main/language/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Ändern der"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Energieeinstellungen"
-
-msgctxt "#31004"
-msgid "Working..."
-msgstr "Arbeitet..."
-
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Details ausblenden"
-
-msgctxt "#31006"
-msgid "View Options"
-msgstr "Anzeigeoptionen"
-
-msgctxt "#31008"
-msgid "Full screen"
-msgstr "Vollbild"
-
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Gesamte Dauer"
-
-msgctxt "#31022"
-msgid "Music - Files"
-msgstr "Musik-Dateien"
-
-msgctxt "#31023"
-msgid "Playing"
-msgstr "Es läuft"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "Seite"
-
-msgctxt "#31025"
-msgid "Items"
-msgstr "Einträge"
-
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Allgemeine Optionen"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "Standort"
-
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poster"
-
-msgctxt "#31029"
-msgid "Fanart"
-msgstr "Fanart"
-
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Bildvorschau"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Bild Wrap"
-
-msgctxt "#31033"
-msgid "Info"
-msgstr "Info"
-
-msgctxt "#31039"
-msgid "Actions"
-msgstr "Aktionen"
-
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Jetzt läuft"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "ES LÄUFT"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "PAUSE"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "SCHNELLES VORSPULEN"
-
-msgctxt "#31045"
-msgid "REWIND"
-msgstr "RÜCKLAUF"
-
-msgctxt "#31046"
-msgid "SEEKING"
-msgstr "SUCHLAUF"
-
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualisierungspresets"
-
-msgctxt "#31049"
-msgid "End Time"
-msgstr "Endzeit"
-
-msgctxt "#31050"
-msgid "Sort: Ascending"
-msgstr "Sortieren: Aufsteigend"
-
-msgctxt "#31051"
-msgid "Sort: Descending"
-msgstr "Sortieren: Absteigend"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "Wiedergabeliste öffnen"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "Wiedergabeliste speichern"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "Wiedergabeliste schließen"
-
-msgctxt "#31058"
-msgid "System music files"
-msgstr "System-Musikdateien"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "Aktuelle Wiedergabeliste"
-
-msgctxt "#31060"
-msgid "This file is stacked, select the part you want to play from."
-msgstr "Diese Datei ist gestapelt. Wähle den abzuspielenden Teil aus."
-
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Aktuell ausgewählt"
-
-msgctxt "#31101"
-msgid "Home screen options"
-msgstr "Hauptmenü-Optionen"
-
-msgctxt "#31102"
-msgid "Background"
-msgstr "Hintergrund"
-
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Zeige \"Pause\" in Bilder-Diaschau"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Trailer im Fenster wiedergeben [COLOR=grey3](Nur im Videoinformationsdialog)[/COLOR]"
-
-msgctxt "#31106"
-msgid "Miscellaneous options"
-msgstr "Sonstige Optionen"
-
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Flags von Dateinamen ausblenden [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Hauptmenü-Buttons ausblenden"
-
-msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Standard-Hintergrund aktivieren"
-
-msgctxt "#31110"
-msgid "Background path:"
-msgstr "Hintergrund-Pfad:"
-
-msgctxt "#31111"
-msgid "Hide"
-msgstr "Verstecke"
-
-msgctxt "#31112"
-msgid "Options"
-msgstr "Optionen"
-
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Zeige kürzlich hinzugefügte Alben"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Zeige kürzlich hinzugefügte Videos"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Hauptmenü Programme-Untermenü"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Hintergrund-Fanart ausblenden"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Zeige aktuell abgespieltes Video im Hintergrund"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Zeige aktuelle Visualisierung im Hintergrund"
-
-msgctxt "#31126"
-msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Spiele TV-Titelmusik in der Video-Bibliothek (TvTunes Addon)"
-
-msgctxt "#31127"
-msgid "TvTunes"
-msgstr "TvTunes"
-
-msgctxt "#31128"
-msgid "Lyrics"
-msgstr "Songtexte"
-
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Fanart in Vollbild-Visualisierung ausblenden"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Songtext-Addon"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Hauptmenü Videos-Untermenü"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Hauptmenü Musik-Untermenü"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Hauptmenü Bilder-Untermenü"
-
-msgctxt "#31140"
-msgid "Music OSD"
-msgstr "Musik-OSD"
-
-msgctxt "#31141"
-msgid "Video OSD"
-msgstr "Video-OSD"
-
-msgctxt "#31142"
-msgid "Settings level"
-msgstr "Einstellungsebene"
-
-msgctxt "#31200"
-msgid "Shortcuts"
-msgstr "Verknüpfungen"
-
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Wähle Deinen Song"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Songtext-Quelle"
-
-msgctxt "#31206"
-msgid "Found"
-msgstr "Gefunden"
-
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Finde mehr"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Zukünftige Episoden"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Aktuelle Temperatur"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Zuletzt aktualisiert"
-
-msgctxt "#31303"
-msgid "Data provider"
-msgstr "Quelle"
-
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Fanart ausblenden"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Film-Details"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Speicher-Auslastung:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Titelnummer"
-
-msgctxt "#31311"
-msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "FANART BILD[CR][CR]NICHT VORHANDEN[CR][CR] KLICKE BUTTON ZUM FESTLEGEN"
-
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Aktueller Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Wähle einen Scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Inhalt-Scanning-Optionen"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Fanart-Pfad setzen"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Ausgewähltes Profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Letzte Anmeldung"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke-Songauswahl"
-
-msgctxt "#31322"
-msgid "Aired"
-msgstr "Ausgestrahlt"
-
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Wiedergabeliste-Optionen"
-
-msgctxt "#31326"
-msgid "Created"
-msgstr "Erstellt"
-
-msgctxt "#31327"
-msgid "Resolution"
-msgstr "Auflösung"
-
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Kürzlich hinzugefügt"
-
-msgctxt "#31329"
-msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]Ausschalt-Timer gestellt![/B] [COLOR=grey2] - Zeit bis zum Herunterfahren:[/COLOR]"
-
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Button klicken zum Abspielen[CR][CR]Filmtrailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Album-Details"
-
-msgctxt "#31351"
-msgid "Pause"
-msgstr "Pause"
-
-msgctxt "#31352"
-msgid "Stop"
-msgstr "Stopp"
-
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Vorspulen"
-
-msgctxt "#31354"
-msgid "Rewind"
-msgstr "Zurückspulen"
-
-msgctxt "#31355"
-msgid "Movie menu"
-msgstr "Filmmenü"
-
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Untertitel herunterladen"
-
-msgctxt "#31360"
-msgid "Watch as 2D"
-msgstr "In 2D ansehen"
-
-msgctxt "#31361"
-msgid "Change mode"
-msgstr "Modus ändern"
-
-msgctxt "#31362"
-msgid "Enabled"
-msgstr "Aktiviert"
-
-msgctxt "#31390"
-msgid "Skin default"
-msgstr "Skin-Standard"
-
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skin-Standard ohne Großbuchstaben"
-
-msgctxt "#31392"
-msgid "Arial based"
-msgstr "Arial-basiert"
-
-msgctxt "#31400"
-msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
-msgstr "[B]KONFIGURIERE DARSTELLUNGSEINSTELLUNGEN[/B][CR][CR]Ändere den Skin · Wähle Sprache und Region · Ändere Dateilistenoptionen[CR]Setze Bildschirmschoner"
-
-msgctxt "#31401"
-msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
-msgstr "[B]KONFIGURIERE VIDEO-EINSTELLUNGEN[/B][CR][CR]Organisiere die Video-Bibliothek · Setze die Videoabspieloptionen · Ändere die Videoauflistungsoptionen[CR]Setze Untertitel-Schriftart"
-
-msgctxt "#31402"
-msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
-msgstr "[B]KONFIGURIERE MUSIK-EINSTELLUNGEN[/B][CR][CR]Organisiere die Musik-Bibliothek · Setze die Musikabspieloptionen · Ändere die Musikauflistungsoptionen[CR]Konfiguriere die Musikübertragung · Setze Karaoke-Optionen"
-
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGURIERE BILDER-EINSTELLUNGEN[/B][CR][CR]Setze Bildauflistungsoptionen · Konfiguriere Diashow"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGURIERE WETTER-EINSTELLUNGEN[/B][CR][CR]Wähle bis zu drei Städte zum Sammeln der Wetter-Informationen"
-
-msgctxt "#31406"
-msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
-msgstr "[B]KONFIGURIERE SYSTEM-EINSTELLUNGEN[/B][CR][CR]Konfiguriere und kalibriere Bildschirme · Konfiguriere Audioausgabe · Setze Fernbedienungseinstellungen[CR]Setze Energiespar-Optionen · Aktiviere Debugging · Richte die Master-Sperre ein"
-
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGURIERE ADDONS[/B][CR][CR]Organisiere die installierten Addons · Installiere Addons[CR]Passe Addon-Einstellungen an"
-
-msgctxt "#31409"
-msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
-msgstr "[B]KONFIGURIERE TV-EINSTELLUNGEN[/B][CR][CR]Ändere die Vollbildinformationen - Verwalte EPG-Daten-Einstellungen"
-
-msgctxt "#31410"
-msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]KONFIGURIERE DIENSTE[/B][CR][CR]Richte Zugriff auf Kodi via UPnP und HTTP ein · Konfiguriere die Dateifreigabe[CR]Aktiviere Zeroconf · Konfiguriere AirPlay"
-
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Hilfe beim ersten Start..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Dieses Symbol zeigt an, dass ein Menü an der Seite des Fensters versteckt ist, das weitere Optionen beinhaltet. Um es aufzurufen, navigiere nach links oder zeige mit der Maus darauf.[CR][CR]Klicke auf \"Ok\" um diesen Dialog zu schließen. Er wird nicht wieder angezeigt werden."
-
-msgctxt "#31413"
-msgid "Local subtitle available"
-msgstr "Lokaler Untertitel verfügbar"
-
-msgctxt "#31420"
-msgid "Login"
-msgstr "Anmeldung"
-
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Wähle Dein Kodi-Benutzerprofil[CR]zum Anmelden und Fortfahren"
-
-msgctxt "#31422"
-msgid "Show or hide the login screen at startup."
-msgstr "Den Anmeldebildschirm beim Start anzeigen oder ausblenden"
-
-msgctxt "#31423"
-msgid "Select the profile that will be used at startup when the login screen is disabled."
-msgstr "Profil, das beim Start verwendet werden soll, wenn der Anmeldebildschirm deaktiviert ist."
-
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Geplante Zeit"
-
-msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Gruppe hinzufügen"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Gruppe umbenennen"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Gruppe löschen"
-
-msgctxt "#31506"
-msgid "Available[CR]Groups"
-msgstr "Verfügbare[CR]Gruppen"
-
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanalgruppe"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Timer gesetzt"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanaloptionen"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36-Stunden-Prognose"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Stündliche Prognose"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Wochenend-Prognose"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Tägliche Prognose"
-
-msgctxt "#31905"
-msgid "Forecast"
-msgstr "Prognose"
-
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Niederschlagswahrscheinlichkeit"
-
-msgctxt "#31909"
-msgid "Fetching forecast info..."
-msgstr "Prognoseinformationen werden abgerufen..."
-
-msgctxt "#31910"
-msgid "Maps"
-msgstr "Karten"
-
-msgctxt "#31950"
-msgid "WEATHER"
-msgstr "WETTER"
-
-msgctxt "#31951"
-msgid "PICTURES"
-msgstr "BILDER"
-
-msgctxt "#31952"
-msgid "TV"
-msgstr "TV"
-
-msgctxt "#31953"
-msgid "VIDEOS"
-msgstr "VIDEOS"
-
-msgctxt "#31954"
-msgid "MOVIES"
-msgstr "FILME"
-
-msgctxt "#31955"
-msgid "TV SHOWS"
-msgstr "SERIEN"
-
-msgctxt "#31956"
-msgid "MUSIC"
-msgstr "MUSIK"
-
-msgctxt "#31957"
-msgid "PROGRAMS"
-msgstr "PROGRAMME"
-
-msgctxt "#31958"
-msgid "PLAY DISC"
-msgstr "DISC ABSPIELEN"
-
-msgctxt "#31959"
-msgid "SYSTEM"
-msgstr "OPTIONEN"
-
-msgctxt "#31960"
-msgid "RADIO"
-msgstr "RADIO"
diff --git a/addons/skin.confluence/language/Ossetic/strings.po b/addons/skin.confluence/language/Ossetic/strings.po
deleted file mode 100644
index ab80ed8308..0000000000
--- a/addons/skin.confluence/language/Ossetic/strings.po
+++ /dev/null
@@ -1,21 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Ossetic (http://www.transifex.com/projects/p/xbmc-main/language/os/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: os\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "#31200"
-msgid "Shortcuts"
-msgstr "Цыбыргӕнӕнтӕ"
diff --git a/addons/skin.confluence/language/Persian (Iran)/strings.po b/addons/skin.confluence/language/Persian (Iran)/strings.po
deleted file mode 100644
index 74b19f2bda..0000000000
--- a/addons/skin.confluence/language/Persian (Iran)/strings.po
+++ /dev/null
@@ -1,517 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/xbmc-main/language/fa_IR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "گزینه های صرفه جویی در مصرف انرژی"
-
-msgctxt "#31004"
-msgid "Working..."
-msgstr "در حال کار..."
-
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "مخفی کردن اطلاعات"
-
-msgctxt "#31006"
-msgid "View Options"
-msgstr "نمایش انتخاب ها"
-
-msgctxt "#31008"
-msgid "Full screen"
-msgstr "تمام صفحه"
-
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "مدت"
-
-msgctxt "#31022"
-msgid "Music - Files"
-msgstr "موسیقی - فایل ها"
-
-msgctxt "#31023"
-msgid "Playing"
-msgstr "در حال پخش"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "صفحه"
-
-msgctxt "#31025"
-msgid "Items"
-msgstr "موضوعات"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "مکان"
-
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "پوستر"
-
-msgctxt "#31029"
-msgid "Fanart"
-msgstr "فن آرت"
-
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "تصویر کوچک"
-
-msgctxt "#31033"
-msgid "Info"
-msgstr "اطلاعات"
-
-msgctxt "#31039"
-msgid "Actions"
-msgstr "عملیات"
-
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "در حال پخش"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "در حال پخش"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "مکث شده"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "حرکت سریع به جلو"
-
-msgctxt "#31045"
-msgid "REWIND"
-msgstr "حرکت سریع به عقب"
-
-msgctxt "#31046"
-msgid "SEEKING"
-msgstr "جستجو"
-
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "پیش فرض های بصری"
-
-msgctxt "#31049"
-msgid "End Time"
-msgstr "زمان اتمام"
-
-msgctxt "#31050"
-msgid "Sort: Ascending"
-msgstr "مرتب سازی صعودی"
-
-msgctxt "#31051"
-msgid "Sort: Descending"
-msgstr "مرتب سازی نزولی"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "باز کردن لیست پخش"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "ذخیره لیست پخش"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "بستن لیست پخش"
-
-msgctxt "#31058"
-msgid "System music files"
-msgstr "سیستم فایل های موسیقی"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "لیست پخش فعلی"
-
-msgctxt "#31060"
-msgid "This file is stacked, select the part you want to play from."
-msgstr "این فایل چند بخشی است, قسمت مورد نظر را برای پخش انتخاب کنید."
-
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "انتخاب های فعلی"
-
-msgctxt "#31101"
-msgid "Home screen options"
-msgstr "تنظیمات صفحه ی خانگی"
-
-msgctxt "#31102"
-msgid "Background"
-msgstr "پس زمینه"
-
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "نشانن دادن \"مکث شده\" در نمایش اسلایدی تصاویر"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "نمایش پیش نمایش در یک پنجره  [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-
-msgctxt "#31106"
-msgid "Miscellaneous options"
-msgstr "تنظیمات متفرقه"
-
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "مخفی کردن علامت خوانده شده از نام ویدئوها  [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "مخفی کردن کلید منوی اصلی"
-
-msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "فعال کردن پس زمینه سفارشی"
-
-msgctxt "#31110"
-msgid "Background path:"
-msgstr "مسیر پس زمینه"
-
-msgctxt "#31111"
-msgid "Hide"
-msgstr "مخفی کردن"
-
-msgctxt "#31112"
-msgid "Options"
-msgstr "گزینه ها"
-
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "نمایش آلبوم هایی که اخیراً افزوده شده اند"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "نمایش ویدئو هایی که اخیراً افزوده شده اند"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "منو اصلی نرم افزار در صفحه اصلی"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "مخفی کردن پس زمینه های ویئویی"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "نمایش ویدئو در حال پخش بعنوان پس زمینه"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "نمایش نمایه های تصویری موسیقی در حال پخش به عنوان پس زمینه"
-
-msgctxt "#31128"
-msgid "Lyrics"
-msgstr "اشعار"
-
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "مخفی کردن پس زمینه ی ویدئویی در حالت تمام صفحه"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "منو اصلی ویدئو ها در صفحه اصلی"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "منو اصلی موزیک در صفحه اصلی"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "منو اصلی تصاویر در منو اصلی"
-
-msgctxt "#31140"
-msgid "Music OSD"
-msgstr "موسیقی"
-
-msgctxt "#31141"
-msgid "Video OSD"
-msgstr "ویدیو"
-
-msgctxt "#31142"
-msgid "Settings level"
-msgstr "سطح تنظیمات"
-
-msgctxt "#31200"
-msgid "Shortcuts"
-msgstr "میانبرها"
-
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "آهننگ مورد نظر خود را انتخاب کنید"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "منبع اشعار"
-
-msgctxt "#31206"
-msgid "Found"
-msgstr "پیدا شده"
-
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "یافتن آیتم های بیشتر"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "قسمت های آینده"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "آخرین بروزرسانی"
-
-msgctxt "#31303"
-msgid "Data provider"
-msgstr "ارائه دهنده اطلاعات"
-
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "مخفی کردن Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "مشخصات فیلم"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "میزان استفاده حافظه:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "شماره تراک"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "انتخاب های جستجوی اجزاء"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "انتخاب مسیر Fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "پروفایل انتخابی"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "آخرین ورود"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "انتخاب آهنگ کاراوکه"
-
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "گزینه های لیست پخش"
-
-msgctxt "#31326"
-msgid "Created"
-msgstr "ایجاد شده"
-
-msgctxt "#31327"
-msgid "Resolution"
-msgstr "رزولیشن"
-
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "اخیراً افزوده شده"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "جزئیات آلبوم"
-
-msgctxt "#31351"
-msgid "Pause"
-msgstr "مکث"
-
-msgctxt "#31352"
-msgid "Stop"
-msgstr "توقف"
-
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "جلو رفتن سریع"
-
-msgctxt "#31354"
-msgid "Rewind"
-msgstr "بازکشت"
-
-msgctxt "#31355"
-msgid "Movie menu"
-msgstr "منو فیلم"
-
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "دانلود زیر نویس ها"
-
-msgctxt "#31360"
-msgid "Watch as 2D"
-msgstr "تماشا بصورت دو بعدی"
-
-msgctxt "#31361"
-msgid "Change mode"
-msgstr "تغییر حالت"
-
-msgctxt "#31362"
-msgid "Enabled"
-msgstr "فعال شده"
-
-msgctxt "#31390"
-msgid "Skin default"
-msgstr "پیش فرض پوسته"
-
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "پوسته پیش فرض"
-
-msgctxt "#31392"
-msgid "Arial based"
-msgstr "بر اساس فونت Arial"
-
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "راهنمای اولین استفاده"
-
-msgctxt "#31413"
-msgid "Local subtitle available"
-msgstr "زیر نویس محلی موجود"
-
-msgctxt "#31420"
-msgid "Login"
-msgstr "ورود"
-
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "جهت ورود و ادامه کار، کاربر kodi را انتخاب نمایید."
-
-msgctxt "#31422"
-msgid "Show or hide the login screen at startup."
-msgstr "نمایش/عدم نمایش صفحه ورود در ابتدا"
-
-msgctxt "#31423"
-msgid "Select the profile that will be used at startup when the login screen is disabled."
-msgstr "انتخاب کابری که در زمان غیر فعال بودن صفحه ورود مورد استفاده قرار گیرد."
-
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "زمان بندی"
-
-msgctxt "#31502"
-msgid "Live TV"
-msgstr "تلویزیون زنده"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "افزودن گروه جدید"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "تغییر نام گروه"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "حذف گروه"
-
-msgctxt "#31506"
-msgid "Available[CR]Groups"
-msgstr "گروه های [CR]موجود"
-
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "گروه کانال ها"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "تنظیم تایمر"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "گزینه های کانال"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "پیش بینی 36 ساعته"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "پیش بینی یک ساعته"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "پیش بینی هفتگی"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "پیش بینی روزانه"
-
-msgctxt "#31905"
-msgid "Forecast"
-msgstr "پیش بینی"
-
-msgctxt "#31909"
-msgid "Fetching forecast info..."
-msgstr "دریافت اطلاعات پیش بینی..."
-
-msgctxt "#31910"
-msgid "Maps"
-msgstr "نقشه ها"
-
-msgctxt "#31950"
-msgid "WEATHER"
-msgstr "آب و هوا"
-
-msgctxt "#31951"
-msgid "PICTURES"
-msgstr "تصاویر"
-
-msgctxt "#31952"
-msgid "TV"
-msgstr "تلویزیون"
-
-msgctxt "#31953"
-msgid "VIDEOS"
-msgstr "ویدیوها"
-
-msgctxt "#31954"
-msgid "MOVIES"
-msgstr "فیلم ها"
-
-msgctxt "#31955"
-msgid "TV SHOWS"
-msgstr "برنامه های تلویزیونی"
-
-msgctxt "#31956"
-msgid "MUSIC"
-msgstr "موسیقی"
-
-msgctxt "#31957"
-msgid "PROGRAMS"
-msgstr "برنامه ها"
-
-msgctxt "#31958"
-msgid "PLAY DISC"
-msgstr "اجرای CD/DVD"
-
-msgctxt "#31959"
-msgid "SYSTEM"
-msgstr "سیستم"
-
-msgctxt "#31960"
-msgid "RADIO"
-msgstr "رادیو"
diff --git a/addons/skin.confluence/language/Portuguese/strings.po b/addons/skin.confluence/language/Portuguese/strings.po
deleted file mode 100644
index 47de384e57..0000000000
--- a/addons/skin.confluence/language/Portuguese/strings.po
+++ /dev/null
@@ -1,613 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/xbmc-main/language/pt/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Altere as Suas"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opções de Energia"
-
-msgctxt "#31004"
-msgid "Working..."
-msgstr "A processar ..."
-
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Ocultar Info"
-
-msgctxt "#31006"
-msgid "View Options"
-msgstr "Opções da vista"
-
-msgctxt "#31008"
-msgid "Full screen"
-msgstr "Ecrã cheio"
-
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Duração Total"
-
-msgctxt "#31022"
-msgid "Music - Files"
-msgstr "Música - Ficheiros"
-
-msgctxt "#31023"
-msgid "Playing"
-msgstr "A reproduzir"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "Página"
-
-msgctxt "#31025"
-msgid "Items"
-msgstr "Itens"
-
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opções Diversas"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "Localização"
-
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Posters"
-
-msgctxt "#31029"
-msgid "Fanart"
-msgstr "Fanart"
-
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Miniatura/Imagem"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Imagens"
-
-msgctxt "#31033"
-msgid "Info"
-msgstr "Info"
-
-msgctxt "#31039"
-msgid "Actions"
-msgstr "Acções"
-
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "A Reproduzir"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "A REPRODUZIR"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "EM PAUSA"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "AVANÇAR"
-
-msgctxt "#31045"
-msgid "REWIND"
-msgstr "RETROCEDER "
-
-msgctxt "#31046"
-msgid "SEEKING"
-msgstr "A PROCURAR"
-
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Pré-selecções de Visualização"
-
-msgctxt "#31049"
-msgid "End Time"
-msgstr "Fim às"
-
-msgctxt "#31050"
-msgid "Sort: Ascending"
-msgstr "Orientar: Ascendente"
-
-msgctxt "#31051"
-msgid "Sort: Descending"
-msgstr "Orientar: Descendente"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "Abrir Lista Reprodução"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "Guardar Lista Reprodução"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "Fechar Lista Reprodução"
-
-msgctxt "#31058"
-msgid "System music files"
-msgstr "Ficheiros de música do sistema"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "Lista de Reprodução Actual"
-
-msgctxt "#31060"
-msgid "This file is stacked, select the part you want to play from."
-msgstr "Este ficheiro está dividido por partes. Escolha a parte que quer reproduzir."
-
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Seleccionado neste momento"
-
-msgctxt "#31101"
-msgid "Home screen options"
-msgstr "Opções do menu inicial"
-
-msgctxt "#31102"
-msgid "Background"
-msgstr "Ecrã de Fundo"
-
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Mostrar \"Pausado\" ao Apresentar Slides"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Reproduzir trailers numa janela [COLOR=grey3](só na janela de info de vídeo)[/COLOR]"
-
-msgctxt "#31106"
-msgid "Miscellaneous options"
-msgstr "Várias opções"
-
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ocultar leitura de flags dos ficheiros de vídeo [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ocultar botões do Menu Principal"
-
-msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Activar ecrã de fundo personalizado."
-
-msgctxt "#31110"
-msgid "Background path:"
-msgstr "Localização do ecrã de fundo:"
-
-msgctxt "#31111"
-msgid "Hide"
-msgstr "Ocultar"
-
-msgctxt "#31112"
-msgid "Options"
-msgstr "Opções"
-
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Mostrar Álbuns Recentes"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Mostrar Vídeos Recentes"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Submenu de Programas da Página Inicial"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Ocultar Fanart de Fundo"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Mostrar vídeo \"A reproduzir\" em fundo"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Mostrar visualização \"A reproduzir\" em fundo"
-
-msgctxt "#31126"
-msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Tocar música de genérico na biblioteca de vídeo (Add-on TvTunes)"
-
-msgctxt "#31127"
-msgid "TvTunes"
-msgstr "TvTunes"
-
-msgctxt "#31128"
-msgid "Lyrics"
-msgstr "Letras"
-
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Ocultar Fanart na visualização de ecrã inteiro"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Add-on de Letras de música"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Submenu de Vídeos da Página Inicial"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Submenu de Música da Página Inicial"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Submenu de Imagens da Página Inicial"
-
-msgctxt "#31140"
-msgid "Music OSD"
-msgstr "Controlos de Música"
-
-msgctxt "#31141"
-msgid "Video OSD"
-msgstr "Controlos de Vídeo"
-
-msgctxt "#31142"
-msgid "Settings level"
-msgstr "Nível das Definições"
-
-msgctxt "#31200"
-msgid "Shortcuts"
-msgstr "Atalhos"
-
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Escolha a sua música"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Fonte das letras"
-
-msgctxt "#31206"
-msgid "Found"
-msgstr "Encontrado"
-
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Encontrar mais itens"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Proximos episódios"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura actual"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Última Actualização"
-
-msgctxt "#31303"
-msgid "Data provider"
-msgstr "Fornecedor de dados"
-
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Ocultar Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detalhes do filme"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memória Usada:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Número da Faixa"
-
-msgctxt "#31311"
-msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "Imagem de Fanart[CR][CR]Indisponível[CR][CR] Clique no botão para seleccionar"
-
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Colector Actual"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Escolha um Colector"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opções da busca de conteúdos"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Localização Fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Perfil Seleccionado"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Última Vez Ligado"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Selecção de música de karaoke"
-
-msgctxt "#31322"
-msgid "Aired"
-msgstr "Transmitido a"
-
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opções da Lista Reprodução"
-
-msgctxt "#31326"
-msgid "Created"
-msgstr "Criado a"
-
-msgctxt "#31327"
-msgid "Resolution"
-msgstr "Resolução"
-
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Recentes"
-
-msgctxt "#31329"
-msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]Temporizador activado![/B] [COLOR=grey2] - Sistema vai desligar-se em[/COLOR]"
-
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Clique no botão para reproduzir [CR][CR]o trailer do filme"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalhes do álbum"
-
-msgctxt "#31351"
-msgid "Pause"
-msgstr "Pausar"
-
-msgctxt "#31352"
-msgid "Stop"
-msgstr "Parar"
-
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Avançar"
-
-msgctxt "#31354"
-msgid "Rewind"
-msgstr "Retroceder"
-
-msgctxt "#31355"
-msgid "Movie menu"
-msgstr "Menu do filme"
-
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Transferir Legendas"
-
-msgctxt "#31360"
-msgid "Watch as 2D"
-msgstr "Ver em 2D"
-
-msgctxt "#31361"
-msgid "Change mode"
-msgstr "Modo de Alteração"
-
-msgctxt "#31362"
-msgid "Enabled"
-msgstr "Activado"
-
-msgctxt "#31390"
-msgid "Skin default"
-msgstr "Padrão do tema"
-
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Padrão do tema sem Caps"
-
-msgctxt "#31392"
-msgid "Arial based"
-msgstr "Baseada em Arial"
-
-msgctxt "#31400"
-msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
-msgstr "[B]CONFIGURAR DEFINIÇÕES DE APARÊNCIA[/B][CR][CR]Mudar de tema · Definir o idioma e a região · Opções de listagem de ficheiros[CR]Definir um protector de ecrã"
-
-msgctxt "#31401"
-msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
-msgstr "[B]CONFIGURAR DEFINIÇÕES DE VÍDEO[/B][CR][CR]Gerir Biblioteca de Vídeo · Opções de reprodução de vídeo · Opções de listagem de vídeo[CR]Definir tipo de letra das legendas"
-
-msgctxt "#31402"
-msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
-msgstr "[B]CONFIGURAR DEFINIÇÕES DE MÚSICA[/B][CR][CR]Gerir Biblioteca de Música · Opções de reprodução · Opções de listagem[CR]Definir envio de músicas · Opções de karaoke"
-
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURAR DEFINIÇÕES DE IMAGENS[/B][CR][CR]Opções de listagem de imagens · Configurar apresentação de slides"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURAR DEFINIÇÕES METEOROLÓGICAS[/B][CR][CR]Definir três locais para informação meteorológica"
-
-msgctxt "#31406"
-msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
-msgstr "[B]CONFIGURAR DEFINIÇÕES DO SISTEMA[/B][CR][CR]Configurar e calibrar ecrãs · Configurar saída de áudio · Configurar controlo remoto[CR]Configurar poupança de energia · Activar depuração · Configurar bloqueio geral"
-
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURAR ADD-ONS[/B][CR][CR]Gerir os seus Add-ons instalados · Procurar e instalar os Add-ons a partir de kodi.tv[CR]Modificar as definições dos Add-ons"
-
-msgctxt "#31409"
-msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
-msgstr "[B]CONFIGURAR DEFINIÇÕES DE TV[/B][CR][CR]Definir informação em ecrã cheio · Gerir definições de dados do EPG"
-
-msgctxt "#31410"
-msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]CONFIGURAR DEFINIÇÕES DE SERVIÇOS[/B][CR][CR]Configurar controlo do Kodi via UPnP e HTTP · Configurar partilha de ficheiros[CR]Activar ZeroConf · Configurar AirPlay"
-
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Ajuda de primeira inicialização..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Este separador significa que existe um menu lateral nesta janela, que contém mais opções para esta secção. Para aceder ao menu, navegue para a esquerda com o controlo remoto ou teclado, ou então coloque o rato sobre o separador. [CR][CR]Clique em \"OK\" para fechar esta janela. Esta não irá aparecer novamente."
-
-msgctxt "#31413"
-msgid "Local subtitle available"
-msgstr "Legenda local disponível"
-
-msgctxt "#31420"
-msgid "Login"
-msgstr "Início de Sessão"
-
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Escolha o seu perfil de utilizador do Kodi[CR]para iniciar sessão e prosseguir"
-
-msgctxt "#31422"
-msgid "Show or hide the login screen at startup."
-msgstr "Exibir ou ocultar o ecrã de início de sessão ao iniciar o Kodi"
-
-msgctxt "#31423"
-msgid "Select the profile that will be used at startup when the login screen is disabled."
-msgstr "Seleccionar o perfil que será usado inicialmente quando o ecrã de início de sessão não é exibido"
-
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Tempo Agendado"
-
-msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV ao Vivo"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Adicionar Grupo"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Renomear Grupo"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Eliminar Grupo"
-
-msgctxt "#31506"
-msgid "Available[CR]Groups"
-msgstr "Grupos[CR] Disponiveis"
-
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Canal de Grupo"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Temporizador Definido"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opções do canal"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Previsão de 36 Horas"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Previsão Horária"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Previsão fim de semana"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Previsão Diária"
-
-msgctxt "#31905"
-msgid "Forecast"
-msgstr "Previsão"
-
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Possibilidade de Chuva"
-
-msgctxt "#31909"
-msgid "Fetching forecast info..."
-msgstr "Recebendo previsões meteorológicas..."
-
-msgctxt "#31910"
-msgid "Maps"
-msgstr "Mapas"
-
-msgctxt "#31950"
-msgid "WEATHER"
-msgstr "TEMPO"
-
-msgctxt "#31951"
-msgid "PICTURES"
-msgstr "IMAGENS"
-
-msgctxt "#31952"
-msgid "TV"
-msgstr "TV"
-
-msgctxt "#31953"
-msgid "VIDEOS"
-msgstr "VÍDEOS"
-
-msgctxt "#31954"
-msgid "MOVIES"
-msgstr "FILMES"
-
-msgctxt "#31955"
-msgid "TV SHOWS"
-msgstr "SÉRIES TV"
-
-msgctxt "#31956"
-msgid "MUSIC"
-msgstr "MÚSICA"
-
-msgctxt "#31957"
-msgid "PROGRAMS"
-msgstr "PROGRAMAS"
-
-msgctxt "#31958"
-msgid "PLAY DISC"
-msgstr "INICIAR DISCO"
-
-msgctxt "#31959"
-msgid "SYSTEM"
-msgstr "SISTEMA"
-
-msgctxt "#31960"
-msgid "RADIO"
-msgstr "RÁDIO"
diff --git a/addons/skin.confluence/language/Romanian/strings.po b/addons/skin.confluence/language/Romanian/strings.po
deleted file mode 100644
index 51ccbd9ed9..0000000000
--- a/addons/skin.confluence/language/Romanian/strings.po
+++ /dev/null
@@ -1,553 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/xbmc-main/language/ro/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Modificare"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opțiuni de alimentare"
-
-msgctxt "#31004"
-msgid "Working..."
-msgstr "Procesare..."
-
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Ascunde detalii"
-
-msgctxt "#31006"
-msgid "View Options"
-msgstr "Opțiuni vizualizare"
-
-msgctxt "#31008"
-msgid "Full screen"
-msgstr "Ecran complet"
-
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Durata Totală"
-
-msgctxt "#31022"
-msgid "Music - Files"
-msgstr "Fișiere audio"
-
-msgctxt "#31023"
-msgid "Playing"
-msgstr "Redare"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "Pagina"
-
-msgctxt "#31025"
-msgid "Items"
-msgstr "Elemente"
-
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opțiuni diverse"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "Locație"
-
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Afișe"
-
-msgctxt "#31029"
-msgid "Fanart"
-msgstr "Fanart"
-
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Detalii"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Ciclu imagini"
-
-msgctxt "#31033"
-msgid "Info"
-msgstr "Informații"
-
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "În redare"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "ÎN REDARE"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "ÎN PAUZĂ"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "DERULARE ÎNAINTE"
-
-msgctxt "#31045"
-msgid "REWIND"
-msgstr "DERULARE ÎNAPOI"
-
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Vizualizări predefinite"
-
-msgctxt "#31049"
-msgid "End Time"
-msgstr "Se termină la"
-
-msgctxt "#31050"
-msgid "Sort: Ascending"
-msgstr "Sort.: Ascendent"
-
-msgctxt "#31051"
-msgid "Sort: Descending"
-msgstr "Sort.: Descendent"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "Deschide listă de redare"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "Salvează lista de redare"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "Închide lista de redare"
-
-msgctxt "#31058"
-msgid "System music files"
-msgstr "Fișiere de muzică în sistem"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "Listă de redare curentă"
-
-msgctxt "#31060"
-msgid "This file is stacked, select the part you want to play from."
-msgstr "Acest fișier este în stivă, selectați partea din care doriți să redați."
-
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Selectat curent"
-
-msgctxt "#31101"
-msgid "Home screen options"
-msgstr "Opțiuni ecran principal"
-
-msgctxt "#31102"
-msgid "Background"
-msgstr "Fundal"
-
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Arată „În pauză” la prezentare diapozitive"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Redare trailer într-o fereastră [COLOR=grey3](Doar în dialogul de informații video)[/COLOR]"
-
-msgctxt "#31106"
-msgid "Miscellaneous options"
-msgstr "Opțiuni diverse"
-
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ascunde marcare citită din numele fișierelor video [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ascundere butoane meniu principal"
-
-msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Activați Fundalul Propriu"
-
-msgctxt "#31110"
-msgid "Background path:"
-msgstr "Calea către fundalul ales"
-
-msgctxt "#31111"
-msgid "Hide"
-msgstr "Ascunde"
-
-msgctxt "#31112"
-msgid "Options"
-msgstr "Opțiuni"
-
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Arată Albumele adăugate Recent"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Arată filme și episoade adăugate recent"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Submeniu Programe în Pagina inițială"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Ascunde fundal (Fanart)"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Arată video „Acum în redare” pe fundal"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Arată vizualizare „Acum în redare” pe fundal"
-
-msgctxt "#31126"
-msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Redă cântece temă TV în mediateca video (supliment TvTunes)"
-
-msgctxt "#31127"
-msgid "TvTunes"
-msgstr "TvTunes"
-
-msgctxt "#31128"
-msgid "Lyrics"
-msgstr "Versuri"
-
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Ascunde Fanart în modul de vizualizare full screen"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Supliment versuri"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Submeniu Video în pagina inițială"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Submeniu Muzică în pagina inițială"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Submeniu Imagini în pagina inițială"
-
-msgctxt "#31140"
-msgid "Music OSD"
-msgstr "Meniu audio"
-
-msgctxt "#31141"
-msgid "Video OSD"
-msgstr "Meniu video"
-
-msgctxt "#31142"
-msgid "Settings level"
-msgstr "Nivel setări"
-
-msgctxt "#31200"
-msgid "Shortcuts"
-msgstr "Scurtături"
-
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Alegeți-vă cântecul"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Sursă versuri"
-
-msgctxt "#31206"
-msgid "Found"
-msgstr "Găsite"
-
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Găsește Mai Multe Articole"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Episoade Viitoare"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatură curentă"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Ultima actualizare"
-
-msgctxt "#31303"
-msgid "Data provider"
-msgstr "Furnizor informații"
-
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Ascunde Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detalii film"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Utilizare memorie:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Număr pistă"
-
-msgctxt "#31311"
-msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "Imagine Fanart indisponibilă[CR][CR]Clic pe buton pentru setare"
-
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Catalog curent"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Alegeți un catalog (scraper)"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opțiuni de scanare conținut"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Setează cale Fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Profil selectat"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Ultima intrare"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Selector cântec karaoke"
-
-msgctxt "#31322"
-msgid "Aired"
-msgstr "Difuzat pe"
-
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opțiuni listă de redare"
-
-msgctxt "#31326"
-msgid "Created"
-msgstr "Creat"
-
-msgctxt "#31327"
-msgid "Resolution"
-msgstr "Rezoluție"
-
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Adăugate recent"
-
-msgctxt "#31329"
-msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]Planificare închidere activată![/B] [COLOR=grey2] Închidere sistem în[/COLOR]"
-
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Clic pe buton pentru redare[CR][CR]secvențe din film (trailer)"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalii album"
-
-msgctxt "#31351"
-msgid "Pause"
-msgstr "Pauză"
-
-msgctxt "#31352"
-msgid "Stop"
-msgstr "Stop"
-
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Derulează înainte"
-
-msgctxt "#31354"
-msgid "Rewind"
-msgstr "Derulează înapoi"
-
-msgctxt "#31355"
-msgid "Movie menu"
-msgstr "Meniu film"
-
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Descărcare subtitrare"
-
-msgctxt "#31362"
-msgid "Enabled"
-msgstr "Activat"
-
-msgctxt "#31390"
-msgid "Skin default"
-msgstr "Standard pentru costum"
-
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Standard pentru costum fără majuscule"
-
-msgctxt "#31392"
-msgid "Arial based"
-msgstr "Cu Arial la bază"
-
-msgctxt "#31400"
-msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
-msgstr "[B]CONFIGURAȚI SETĂRI ASPECT[/B][CR][CR]Schimbați costumul · Alegeți limbă și regiune · Modificați opțiuni de listare fișiere[CR]Alegeți protector ecran"
-
-msgctxt "#31401"
-msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
-msgstr "[B]CONFIGURAȚI SETĂRI VIDEO[/B][CR][CR]Administrați videoteca · Setați opțiuni redare video · Modificați opțiuni de listare video[CR]Alegeți font subtitrare"
-
-msgctxt "#31402"
-msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
-msgstr "[B]CONFIGURAȚI SETĂRI MUZICĂ[/B][CR][CR]Administrați fonoteca · Setați opțiuni redare muzică · Modificați opțiuni de listare muzică[CR]Pregătiți trimitere cântec · Setați opțiuni karaoke"
-
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURAȚI SETĂRI IMAGINE[/B][CR][CR]Modificați opțiuni de listare imagini · Configurați prezentare diapozitive"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURAȚI SETĂRI VREME[/B][CR][CR]Alegeți trei orașe pentru care se obțin informații meteo"
-
-msgctxt "#31406"
-msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
-msgstr "[B]CONFIGURAȚI SETĂRI SISTEM[/B][CR][CR]Configurați și calibrați afișaje · Configurați ieșire audio · Instalați telecomenzi[CR]Alegeți opțiuni de economisire energie · Activați depanare · Configurați blocarea principală"
-
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURAȚI SUPLIMENTE[/B][CR][CR]Administrați suplimentele instalate · Căutați și instalați suplimente de la kodi.tv[CR]Modificați setări suplimente"
-
-msgctxt "#31409"
-msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
-msgstr "[B]CONFIGUREAZĂ SETĂRILE TV[/B][CR][CR]Schimbă informațiile afișate pe ecran în modul full screen · Gestionare setări date de tip EPG"
-
-msgctxt "#31410"
-msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]CONFIGURAREA SETĂRILOR SERVICIULUI[/B][CR][CR]Stabilirea controului Kodi prin UPnP și HTTP · Configurarea partajării de fișiere[CR]Enable Zeroconf · Configurarea AirPlay"
-
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Ajutor la prima execuție...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Acestă filă indică prezența unui meniu în partea stângă a ferestrei care oferă opțiuni suplimentare pentru această secțiune. Pentru a accesa meniul, apasați la stânga cu telecomanda sau tastatura sau poziționați săgeata mouse-ului deasupra acestei file.[CR][CR]Apasați \"Ok\" pentru a închide acest dialog. Nu va mai apărea ulterior."
-
-msgctxt "#31413"
-msgid "Local subtitle available"
-msgstr "Este disponibilă o subtitrare locală"
-
-msgctxt "#31420"
-msgid "Login"
-msgstr "Autentificare"
-
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Selectați profilul dumneavoastră de utilizator Kodi[CR]pentru a vă autentifica și a continua"
-
-msgctxt "#31422"
-msgid "Show or hide the login screen at startup."
-msgstr "Arată sau ascunde ecranul de autentificare la pornire."
-
-msgctxt "#31423"
-msgid "Select the profile that will be used at startup when the login screen is disabled."
-msgstr "Selectați profilul care va fi folosit la pornire când ecranul de autentificare este dezactivat."
-
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Timpul Programat"
-
-msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV Live"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Adaugă Grup"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Redenumește Grup"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Șterge Grup"
-
-msgctxt "#31506"
-msgid "Available[CR]Groups"
-msgstr "[CR]Grupuri Disponibile"
-
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Canalul Grupului"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Setările Timpului"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opțiunile Canalului"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Previziune pe 36 de ore"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Previziune la o oră"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Previziune weekend"
-
-msgctxt "#31905"
-msgid "Forecast"
-msgstr "Previziune"
-
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Șansă de precipitații"
-
-msgctxt "#31909"
-msgid "Fetching forecast info..."
-msgstr "Preluare informații previziune..."
-
-msgctxt "#31910"
-msgid "Maps"
-msgstr "Hărți"
-
-msgctxt "#31952"
-msgid "TV"
-msgstr "TV"
diff --git a/addons/skin.confluence/language/Romansh/strings.po b/addons/skin.confluence/language/Romansh/strings.po
deleted file mode 100644
index 1f8c56b437..0000000000
--- a/addons/skin.confluence/language/Romansh/strings.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Romansh (http://www.transifex.com/projects/p/xbmc-main/language/rm/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: rm\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "Pagina"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "Liug"
-
-msgctxt "#31033"
-msgid "Info"
-msgstr "Info"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "PAUSA"
-
-msgctxt "#31112"
-msgid "Options"
-msgstr "Opziuns"
diff --git a/addons/skin.confluence/language/Tamil (India)/strings.po b/addons/skin.confluence/language/Tamil (India)/strings.po
deleted file mode 100644
index a216063618..0000000000
--- a/addons/skin.confluence/language/Tamil (India)/strings.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: Confluence
-# Addon id: skin.confluence
-# Addon Provider: Jezz_X, Team Kodi
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/xbmc-main/language/ta_IN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ta_IN\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "#31008"
-msgid "Full screen"
-msgstr "முழுத்திரை"
-
-msgctxt "#31027"
-msgid "Location"
-msgstr "இருப்பிடம்"
-
-msgctxt "#31029"
-msgid "Fanart"
-msgstr "விசிறிபடம்"
-
-msgctxt "#31033"
-msgid "Info"
-msgstr "தகவல்"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "தற்போதைய பட்டியல்"
-
-msgctxt "#31060"
-msgid "This file is stacked, select the part you want to play from."
-msgstr "கோப்பு அடுக்கப்பட்டுள்ளது - வாசிக்கப்பட வேண்டியதை தேர்வு செய்க"
-
-msgctxt "#31102"
-msgid "Background"
-msgstr "பின்னணி"
-
-msgctxt "#31112"
-msgid "Options"
-msgstr "விருப்பங்கள்"
-
-msgctxt "#31128"
-msgid "Lyrics"
-msgstr "பாடல்வரிகள்"
-
-msgctxt "#31200"
-msgid "Shortcuts"
-msgstr "குறுக்குவழிகள்"
-
-msgctxt "#31327"
-msgid "Resolution"
-msgstr "திரைத்திறன்"
-
-msgctxt "#31362"
-msgid "Enabled"
-msgstr "செயல்படுத்தபட்டுள்ளது"
-
-msgctxt "#31390"
-msgid "Skin default"
-msgstr "இயல்புநிலை அலங்கார அமைப்பு"
-
-msgctxt "#31910"
-msgid "Maps"
-msgstr "வரைபடங்கள்"
-
-msgctxt "#31952"
-msgid "TV"
-msgstr "தொலைக்காட்சி"
diff --git a/addons/skin.confluence/language/Afrikaans/strings.po b/addons/skin.confluence/language/resource.language.af_za/strings.po
index 2da5688ee7..ac87074fc9 100644
--- a/addons/skin.confluence/language/Afrikaans/strings.po
+++ b/addons/skin.confluence/language/resource.language.af_za/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Afrikaans (http://www.transifex.com/projects/p/xbmc-main/language/af/)\n"
+"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/kodi-main/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: af\n"
+"Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Verander Jou"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Krag Opsies"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Besig..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Versteek Informasie"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Besigtig Opsies"
+msgid "View options"
+msgstr "Aansig opsies"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Volskerm"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Totale Tydsduur"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musiek - Lêers"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Voorwerpe"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Diverse Opsies"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Ligging"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Plakkaat Omvouing"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Aanhanger Kuns"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Prent Naeldruk"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Prent Omvouing"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Aksies"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Speel Nou"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "SPEEL"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "SOEK"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualisering Voorkeure"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Eind Tyd"
+msgid "End time"
+msgstr "End tyd"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Hierdie lêer is gestapel, selekteer die deel van waar jy wil speel."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Huidiglik Geselekteer"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Tuis skerm opsies"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Agtergrond"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Wys \"Pouseer\" in prentjie skyfievertoning"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Speel Rolprent Uittreksels in 'n venster [COLOR=grey3](Video Informasie Dialoog Aleenlik)[/COLOR] "
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Diverse Opsies"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Versteek Vlae gelees van video lêername [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Versteek Hoof Kieslys Knoppies"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Stel Pasgemaakte Agtergrond in staat"
+msgid "Enable custom background"
+msgstr "Stel verpersoonlikte agtergrond in staat"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opsies"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Wys onlangs bygevoegde Albums"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Wys onlangs bygevoegde Videos"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Tuis Bladsy Programme Subkieslys"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Versteek Agtergrond Aanhanger Kuns"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Wys agtergrond \"Speel Nou\" video"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Wys Agtergrond \"Speel Nou\" Visualisering"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Speel TV tema musiek in video lys (TvTunes byvoegsel)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lirieke"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Versteek Aanhanger Kuns in vol skerm visualisering "
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Lirieke Byvoegsel"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Tuis Bladsy Video Subkieslys"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Tuis Bladsy Musiek Subkieslys"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Tuis Bladsy Prente Subkieslys"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Musiek OSV"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Kortpaaie"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Kies Jou Liedjie"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Lirieke Bron"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Gevind"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Soek Meer Items"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Opkomende Episodes"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Huidige Tydelike Gids"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Laas Opgedateer"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Data verskaffer"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Versteek Aanhanger Kuns"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Rolprent Besonderhede"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Geheue Gebruik:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Snit Nommer"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Aanhanger kuns prentjie[CR][CR]Nie beskikbaar[CR][CR] Kliek knoppie om te stel"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Huidige Skraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Kies 'n Skraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Inhoud Deursoek Opsies"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Stel Aanhanger Kuns Soeklys"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Geselekteerde Profiel"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Laas Ingeteken"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Kareoke Liedjie Selekteerder"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Uitgesaai"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Speellys Opsies"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Geskep"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolusie"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Onlangs Bygevoeg"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Tydhouer gestel![/B] [COLOR=grey2] - Stelsel automatiese afskakeling in[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Kliek knoppie om[CR][CR]Rolprent uittreksel  te speel"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Album Besonderhede"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pouseer"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stop"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Speel Vinnig Vorentoe"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Speel Agteruit"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Rolprent kieslys"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Laai Onderskrifte Af"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Kyk in 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Standaard tema"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Standaard tema met geen hoofletters"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Antenna gebasseer"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGUREER MUSIEK VERSTELLINGS[/B][CR][CR]Beheer jou musiek lys · Stel musiek speel opsies · Verander musiek lys opsies[CR]Stel liedjie voorlegging op · Stel kareoke opsies"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGUREER PRENTJIE VERSTELLINGS[/B][CR][CR]Stel prentjie lys opsies · Konfigureer skyfievertonings"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGUREER WEER VERSTELLINGS[/B][CR][CR]Stel drie stede op om weer inligting te versamel"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGUREER STELSEL VERSTELLINGS[/B][CR][CR]Stel op en kalibreer skerms · Konfigureer klank uitvoer · Stel afstandbeheerders op[CR]Stel krag bespaar opsies · Stel ontfouting in staat · Stel hoof slot op"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGUREER BYVOEGSELS[/B][CR][CR]Beheer jou geïnstalleerde Byvoegsels · Soek en installeer Byvoegsels vanaf kodi.tv[CR]Verander Byvoeging verstellings"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]VERANDER TV VERSTELLINGS[/B][CR][CR]Verander vol skerm inligting - Beheer EPG data verstellings"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGUREER DIENS VERSTELLINGS[/B][CR][CR]Stel beheer van Kodi via UPnP en HTTP op · Konfigureer lêer deling[CR]Stel Zeroconf in staat · Konfigureer AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Eerste begin hulp..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Hierdie skouerlussie dui aan dat daar 'n kieslys aan die kant van die venster is wat extra opsies vir die keuse bevat. Om die keuselys te aktifeer, beweeg na die linker kant met jou afstandbeheer of sleutel drukker, anders beweeg jou muis aanwyser oor die skouerlussie. [CR][CR]Klik \"Ok\" om die dialoog toe te maak. Hy sal nie weer verskyn nie."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Lokale onderskrif beskikbaar"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Teken In"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Selekteer jou Kodi verbruiker Profiel[CR]om in te teken en voort te gaan"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Wys of versteek die in teken bladsy wanneer die program begin"
@@ -500,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Kies die profiel wat gebriuk moet word wanneer die program begin as die in teken bladsy onaktief is."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Geskeduleerde Tyd"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Lewendige TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Voeg Groep by"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Verander Groep naam"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Wis Groep uit"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Beskikbare[CR]Groepe"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanaal Groep"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Tydhouer Gestel"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanaal Opsies"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 Uur Voorspelling"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Uurlikse Voorspelling"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Naweek Voorspelling"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Voorspelling"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Kans op Neerslag"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Gaan haal voorspelling info..."
diff --git a/addons/skin.confluence/language/Amharic/strings.po b/addons/skin.confluence/language/resource.language.am_et/strings.po
index 98aa72c16f..e588caf94c 100644
--- a/addons/skin.confluence/language/Amharic/strings.po
+++ b/addons/skin.confluence/language/resource.language.am_et/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Amharic (http://www.transifex.com/projects/p/xbmc-main/language/am/)\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/kodi-main/language/am_ET/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: am\n"
+"Language: am_ET\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "መቀየሪያ የእርስዎን"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "የሀይል ምርጫዎች"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "በመስራት ላይ... "
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "መረጃውን መደበቂያ"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "ምርጫዎችን መመልከቻ"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "በሙል መመልከቻ ዘዴ "
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "ጠቅላላ የሚፈጀው ጊዜ"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "የሙዚቃ ፋይሎች"
@@ -60,22 +44,10 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "እቃዎች"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "የተለያዩ ምርጫዎች"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "አካባቢ "
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "ስእሎች በአውራ ጣት ጥፍር ልክ "
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "ምስል መጠቅልቅያ"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "መረጃ"
@@ -84,10 +56,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "ተግባሮች"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "አሁን የሚጫወተው"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "የሚጫወተው"
@@ -109,8 +77,8 @@ msgid "SEEKING"
 msgstr "በ መፈለግ ላይ"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "መጨረሻው ጊዜ"
+msgid "End time"
+msgstr "መጨረሻ ሰአት"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -144,10 +112,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "ይህ ፋይል በጣም ትልቅ ነው ማጫወት የሚፈልጉትን ክፍል ይምረጡ"
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "አሁን የተመረጠው"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "የቤት መመልከቻ ምርጫዎች"
@@ -156,18 +120,10 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "መደብ"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "ማሳያ \"ማስቆሚያ\" በተንሸራታች ስእል ማሳያ "
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "የተለያዩ ምርጫዎች"
 
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "የዋናውን ዝርዝር ቁልፎች መደበቂያ"
-
 msgctxt "#31110"
 msgid "Background path:"
 msgstr "የ መደብ መንገድ:"
@@ -180,26 +136,10 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "ምርጫዎች"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "በቅርብ ጊዜ የተጨመሩ አልበሞችን ማሳያ"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "በቅርብ ጊዜ የተጨመሩ ቪዲዮዎችን ማሳያ"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "መደቡን ማሳያ \"አሁን የሚታየውን\" ቪዲዩ "
-
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "ግጥም"
 
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "ግጥም መጨ - መሪያ "
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "ሙዚቃ OSD"
@@ -216,74 +156,18 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "አቋራጮች"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "ዘፈን ይምረጡ"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "የግጥም ምንጭ"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "ተገኝቷል"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "ተጨማሪ እቃዎች ያግኙ"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "ወደ ፊት የሚመጡ "
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "የአሁኑ የአየር ንብረት "
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "መጨረሻ የተሻሻለው"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "ዳታ አቅራቢ "
 
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "የሙቪ ዝርዝር "
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "የተጠቀሙት Memory:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "ተራ ቁጥር"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "ይዞታዎችን ማሰሻ ምርጫዎች "
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "የተመረጠው ገጽታ"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "መጨረሻ የገባው"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "ካሪዮኪ ዘፈን መራጭ"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "የተላለፈ"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "የሚያጫውቱት ምርጫዎች "
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "የተፈጠረው"
@@ -292,18 +176,6 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolution"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "በቅርብ ጊዜ የተጨመር"
-
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "ለማጫወት ቁልፉን ይጫኑ [CR][CR]Movie trailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "የአልበም ዝርዝሮች"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "ማቆሚያ"
@@ -312,10 +184,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "ማቆሚያ"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "ወደ ፊት ማሳለፊያ"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "ወደ ኋላ ማሳለፊያ"
@@ -324,10 +192,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "የሙቪ ዝርዝር"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "ንዑስ አርእስቶች ማውረጃ "
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "እንደ 2ዲ መመልከቻ"
@@ -348,10 +212,6 @@ msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial based"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "እርዳታ መጀመሪያ ጊዜ ሲያስኬዱ...."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "የ አካባቢ ንዑስ አርእስት ዝግጁ ነው"
@@ -360,66 +220,22 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "መግቢያ"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "ይምረጡ የ እርስዎን  Kodi ተጠቃሚ ገጽታ[CR]ለ መግባት እና ለመቀጠል"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "የመግቢያ መመልከቻውን በሚጀምር ጊዜ ማሳያ ወይንም መደበቂያ"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "ቲቪ በቀጥታ "
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "ቡድን መጨመሪያ"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "ቡድን እንደገና መሰየሚያ"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "ቡድን ማጥፊያ"
+msgid "TV"
+msgstr "ቲቪ "
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "ዝግጁ[CR]ቡድኖች"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "የ ጣቢያ ቡድን"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "ሰአት ማሰናጃ"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "የጣቢያ ምርጫዎች "
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "የ 36 ሰአት ግምት "
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "የሰአት ግምት "
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "የሳምንቱ መጨረሻ ግምት "
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "ግምት "
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "የ መዝነብ እድል "
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "ግምት በመፈለግ ላይ..."
diff --git a/addons/skin.confluence/language/Arabic/strings.po b/addons/skin.confluence/language/resource.language.ar_sa/strings.po
index 8d89fa7f42..fb9cf27604 100644
--- a/addons/skin.confluence/language/Arabic/strings.po
+++ b/addons/skin.confluence/language/resource.language.ar_sa/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/xbmc-main/language/ar/)\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/kodi-main/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
+"Language: ar_SA\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "تغيير"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "إعدادات الطاقه"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "يعمل..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "إخفاء المعلومات"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "خيارات العرض"
+msgid "View options"
+msgstr "عرض الخيارات"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "ملئ الشاشه"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "إجمالي المدة"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "الموسيقى - ملفات"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "العناصر"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "خيارات متنوعه"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "الموقع"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "ملصق التفاف"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "مصغرات الصورة"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "صورة التفاف"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "معلومات"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "الإجراءات"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "المُشَغَل اﻷن"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "المُشَغَل"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "يَطلُب"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "الإعدادات المسبقة للتصور"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "وقت اﻹنتهاء"
+msgid "End time"
+msgstr "وقت الانتهاء"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "هذا الملف مُكدَس، حدد الجزء الذى تريد تشغيله منه"
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "المُختاره حالياً"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "إعدادات الصفحه الرئيسيه"
@@ -168,25 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "الخلفية"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "إظهار \"إيقاف مؤقت\" في عرض شرائح الصور"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "إعدادات متنوعه"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "[COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]إخفاء وضع علامة القراءة من أسماء الفيديو"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "إخف ازرار القائمة الرئيسية"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "تمكين تخصيص الخلفيه"
+msgid "Enable custom background"
+msgstr "تمكين خلفية مخصصة"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -200,26 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "إعدادات"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "إظهر اﻷلبومات المُضافه مؤخراً"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "إظهر المقاطع المرئيه المُضافه مؤخراً"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "القائمة الفرعية لقائمة البرامج الرئيسية"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Fanart إخفاء خلفية"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "إظهار خلفية \"التشغيل الآن\" للفيديو"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "(TvTunes ملحق) تشغيل أغاني سمة التلفزيون في مكتبة الفيديو"
@@ -232,10 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "كلمات الأغاني"
 
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "ملحق كلمات الأغاني"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "عرض الموسيقى على الشاشة"
@@ -252,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "اﻹختصارات"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "إختر اغنيتك"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "مصدر كلمات الأغنية"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "وجِدَ"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "جِد المزيد من العناصر"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "الحلقات القادمة"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "درجة الحرارة الحالية"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "اخر تحديث"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "مزود البيانات"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Fanart إخفاء"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "تفاصيل الفيلم"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "الذاكرة المستخدمة:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "رقم المسار"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "انقر الزر للتعيين[CR][CR]غير متوفرة[CR][CR]Fanart صورة"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Current Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Choose a Scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "إعدادات فحص المحتوى"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Fanart تعيين مسار"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "الملف الشخصي المُحدد"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "آخر تسجيل دخول كان فى"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "مُحَدِد أغاني الكاريوكي"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "المَبَت"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "إعدادات قائمه التشغيل"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "اُنشَئ"
@@ -348,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "اﻷبعاد"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "أضيف مؤخراً"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[COLOR=grey2] إغلاق النظام تلقائيا في - [/COLOR][B]!تعيين مؤقت[B]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "مقطع الفلم [CR][CR] انقر على الزر لتشغيل"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "تفاصبل الألبوم"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "اوقف مؤقتاً"
@@ -372,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "اوقف"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "تقديم سريع"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "إرجاع"
@@ -384,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "قائمة الفلم"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "تنزيل ترجمات"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "شاهد كـ ثنائى الابعاد"
@@ -404,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "الجلد المبدأى"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skin default with no Caps"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial based"
@@ -424,30 +248,14 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]ضبط إعدادات الموسيقى[/B][CR][CR]ضبط مكتبات الموسيقى · ضبط إعدادات تشغيل الموسيقى · ضبط إعدادات قائمه الموسيقى[CR]ضبط إعدادات إذاعه الموسيقى - ضبط إعدادات الكارويوكي"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]ضبط إعدادات الصور[/B][CR][CR]ضبط إعدادات قائمه الصور - ضبط العروض التقديميه"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]ضبط إعدادات الطقس[/B][CR][CR]إختيار ثلاث مدن لتجميع بيانات الطقس الخاصه بها"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]ضبط إعدادات النظام[/B][CR][CR]ضبط ومعايره طُرُق العرض - ضبط مخارج الصوت - ضبط التحكم عن بعد[CR]ضبط إعدادات توفير الطاقه - ضبط وضع المعالجه - ضبط القفل الرئيسى"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]ضبط إعدادات الملحقات[/B][CR][CR]ضبط الملحقات المُثبته - تصفح وتثبيت الملحقات عبر موقع إكس بى إم سى الرسمى[CR]ضبط إعدادات مُلحق معين"
-
 msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "تكوين إعدادات الخدمة [B/][CR][CR] إعداد التحكم بـKodi عبر UPnP و HTTP. نكوين مشاركة ملف [CR] تمكن  Zeroconf. تكوين التشغيل الحي "
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "مساعده المبتدئين...."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "تتوفر ترجمات محليه"
@@ -456,10 +264,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "تسجيل الدخول"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "حدد الملف الشخصى المُراد[CR] لتسجيل الدخول به"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "اظهار أو اخفاء شاشة تسجيل الدخول عند بدء التشغيل"
@@ -468,62 +272,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "اختر الحساب الذي سوف يتم استخدامه عند تعطيل شاشة تسجيل الدخول"
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "جدول الزمن"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "تلفاز مباشر"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "أضف مجموعه"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "أعد تسميه مجموعه"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "إحذف مجموعه"
+msgid "TV"
+msgstr "تلفزيون"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "المجموعات[CR]المتوفره"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "مجموعة القناة"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "خصائص المؤقت"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "خيارات القناة"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "توقعات الطقس للـ 36 ساعه القادمه"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "توقعات الطقس لكل ساعه"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "توقعات طقس نهايه الاسبوع"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "توقعات الطقس"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "فرصه تساقط امطار"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "يَجِلِب توقعات الطقس..."
diff --git a/addons/skin.confluence/language/Azerbaijani/strings.po b/addons/skin.confluence/language/resource.language.az_az/strings.po
index c561f463c3..d8ca805a6e 100644
--- a/addons/skin.confluence/language/Azerbaijani/strings.po
+++ b/addons/skin.confluence/language/resource.language.az_az/strings.po
@@ -4,16 +4,16 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/xbmc-main/language/az/)\n"
+"Language-Team: Azerbaijani (Azerbaijan) (http://www.transifex.com/projects/p/kodi-main/language/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: az\n"
+"Language: az_AZ\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31008"
@@ -29,7 +29,7 @@ msgid "Resolution"
 msgstr "Əksetmə qabiliyyəti"
 
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "TV"
 
 msgctxt "#31952"
diff --git a/addons/skin.confluence/language/Belarusian/strings.po b/addons/skin.confluence/language/resource.language.be_by/strings.po
index c567ad2bb4..5f9815b6b7 100644
--- a/addons/skin.confluence/language/Belarusian/strings.po
+++ b/addons/skin.confluence/language/resource.language.be_by/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Belarusian (http://www.transifex.com/projects/p/xbmc-main/language/be/)\n"
+"Language-Team: Belarusian (Belarus) (http://www.transifex.com/projects/p/kodi-main/language/be_BY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
+"Language: be_BY\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Зьмяняе вашыя"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Power Options"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Ідзе праца..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Hide Information"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Налады выгляду"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Увесь экран"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Агульная працягласьць"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Музыка - Файлы"
@@ -60,38 +44,18 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "складнікаў"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Іншыя налады"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Месца"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poster Wrap"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Pic Thumbs"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Image Wrap"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Зьвесткі"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Зараз прайграецца"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "ПРАЙГРАЕЦЦА"
@@ -113,8 +77,8 @@ msgid "SEEKING"
 msgstr "SEEKING"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "End Time"
+msgid "End time"
+msgstr "End time"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -148,10 +112,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "This file is stacked, select the part you want to play from."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Current Selected"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Home screen options"
@@ -160,25 +120,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Background"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Show \"Paused\" in picture slide show"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Hide Main Menu Buttons"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Enable Custom Background"
+msgid "Enable custom background"
+msgstr "Enable custom background"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -192,22 +140,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Options"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Show Recently added Albums"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Show Recently added Videos"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Hide Background Fanart"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Show Background \"Now Playing\" Video"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Play TV theme songs in video library (TvTunes add-on)"
@@ -220,10 +152,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lyrics"
 
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Lyrics Add-on"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Music OSD"
@@ -236,94 +164,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Choose Your Song"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Lyrics Source"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Found"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Find More Items"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Upcoming Episodes"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Дзейная тэмпэратура"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Апошняе абнаўленьне"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Зьвесткі ад"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Схаваць ФанАрт"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Movie Details"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Занята памяці:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Нумар трэку"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Дзейны скрэпэр"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Абраць скрэпэр"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Налады сканаваньня зьмесьціва"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Шлях да ФанАрт'у"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Абраны профіль"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Апошні ўваход"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke Song Selector"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Aired"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Налады сьпісу прайграваньня"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Created"
@@ -332,22 +188,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolution"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Recently Added"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Click button to play[CR][CR]Movie trailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Album Details"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pause"
@@ -356,10 +200,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stop"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Fast Forward"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Rewind"
@@ -368,10 +208,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Movie menu"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Download Subtitles"
-
 msgctxt "#31362"
 msgid "Enabled"
 msgstr "Уключаны"
@@ -380,10 +216,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Перадвызначана"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Перадвызначаны аздабленьнем без вялікіх літараў"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Падобны на Arial"
@@ -400,30 +232,14 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]ЗЬМЯНІЦЬ НАЛАДЫ МУЗЫКІ[/B][CR][CR]Кіраваць бібліятэкай музыкі · Наставіць налады прайграваньня музыкі · Зьмяніць налады сьпісу музыкі[CR]Наладзіць перадачу музыкі · Наставіць налады караоке"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]ЗЬМЯНІЦЬ НАЛАДЫ МАЛЮНКАЎ[/B][CR][CR]Наставіць налады сьпісу відарысаў · Наладзіць слайдшоў"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]ЗЬМЯНІЦЬ НАЛАДЫ НАДВОР'Я[/B][CR][CR]Вызначыць тры гарады каб зьбіраць зьвесткі пра надвор'е"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]ЗЬМЯНІЦЬ НАЛАДЫ СЫСТЭМЫ[/B][CR][CR]Наладзіць і калібраваць адлюстраваньне · Наставіць аўдыё вывад · Наладзіць адлеглае кіраваньне[CR]Наставіць захоўваньне энэргіі · Дазволіць дэбаг · Наставіць агульны замок"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]ЗЬМЯНІЦЬ НАЛАДЫ ДАДАТКАЎ[/B][CR][CR]Кіраваць усталяванымі дадаткамі · Абраць і ўсталяваць дадаткі з kodi.tv[CR]Зьмяніць налады дадаткаў"
-
 msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]ЗЬМЯНІЦЬ НАЛАДЫ СЭРВІСАЎ[/B][CR][CR]Наставіць кіраваньне Kodi праз UPnP ды HTTP · Наладзіць даступнасьць файлаў[CR]Дазволіць Zeroconf · Наставіць AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "First run help...."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Даступныя лакальныя субтытры"
@@ -432,66 +248,18 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Login"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Select your Kodi user Profile[CR]to login and continue"
-
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Scheduled Time"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Жывое ТВ"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Add Group"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Rename Group"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Delete Group"
+msgid "TV"
+msgstr "ТВ"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Available[CR]Groups"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Channel Group"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Timer Set"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Channel Options"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Прагноз на 36 гадзінаў"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Пагадзінны прагноз"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Прагноз на выходныя"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Прагноз"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Верагоднасьць"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Атрымоўваем прагноз..."
diff --git a/addons/skin.confluence/language/Bulgarian/strings.po b/addons/skin.confluence/language/resource.language.bg_bg/strings.po
index cda9859e53..10658634ec 100644
--- a/addons/skin.confluence/language/Bulgarian/strings.po
+++ b/addons/skin.confluence/language/resource.language.bg_bg/strings.po
@@ -4,44 +4,32 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/xbmc-main/language/bg/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kodi-main/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
+"Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Променете вашите"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Изключи..."
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Работи..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Без информация"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Визуални настройки"
+msgid "View options"
+msgstr "Преглед на настройките"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Цял екран"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Общо времетраене"
 
 msgctxt "#31022"
@@ -61,7 +49,7 @@ msgid "Items"
 msgstr "Елемента"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "Разни настройки"
 
 msgctxt "#31027"
@@ -69,19 +57,19 @@ msgid "Location"
 msgstr "Място"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
+msgid "Poster wrap"
 msgstr "Плакати"
 
 msgctxt "#31029"
 msgid "Fanart"
-msgstr "Фанарт"
+msgstr "Фен-арт"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "Снимка и миниатюри"
 
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "Картини-поредица"
 
 msgctxt "#31033"
@@ -93,7 +81,7 @@ msgid "Actions"
 msgstr "Действия"
 
 msgctxt "#31040"
-msgid "Now Playing"
+msgid "Now playing"
 msgstr "Сега се възпроизвежда"
 
 msgctxt "#31042"
@@ -117,12 +105,12 @@ msgid "SEEKING"
 msgstr "Преход"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr "Шаблони за визуализацията"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Ще свърши в:"
+msgid "End time"
+msgstr "Време на приключване"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -157,7 +145,7 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Файлът е в група. Моля, изберете частта, която да бъде възпроизведена."
 
 msgctxt "#31061"
-msgid "Current Selected"
+msgid "Current selected"
 msgstr "Избрано"
 
 msgctxt "#31101"
@@ -168,28 +156,20 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Фон"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Показвай \"На Пауза\" индикация при слайдшоу от снимки"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Възпроизвеждай трейлърите в прозореца [COLOR=grey3]\"Информация за видеото\"[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Възпроизвеждай трейлърите в прозореца [COLOR=grey3]Информация за видеото[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Разни настройки"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Скривай флаговете от имената на файловете [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
+msgid "Hide main menu buttons"
 msgstr "Скриване на бутони от главното меню"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Персонален фон"
 
 msgctxt "#31110"
@@ -205,28 +185,20 @@ msgid "Options"
 msgstr "Настройки"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "Показвай последно добавените албуми"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
+msgid "Show recently added videos"
 msgstr "Показвай последно добавените видео файлове"
 
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Подменю на елемента \"Програми\", от началния екран"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Скривай фоновия фанарт"
-
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Ползвай за фон възпроизвежданото в момента видео"
+msgid "Show background \"Now playing\" video"
+msgstr "Ползвай за фон възпроизвеждания видео файл"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Ползвай за фон възпроизвежданата в момента визуализация"
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Ползвай за фон възпроизвежданата визуализация"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -241,32 +213,20 @@ msgid "Lyrics"
 msgstr "Лирики"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Без фанарт при визуализация на цял екран"
+msgid "Hide fanart in full screen visualisation"
+msgstr "Без фен-арт при визуализация на цял екран"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
+msgid "Lyrics add-on"
 msgstr "Добавка за лирики"
 
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Подменю на елемента \"Видео\", от началния екран"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Подменю на елемента \"Музика\", от началния екран"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Подменю на елемента \"Снимки\", от началния екран"
-
 msgctxt "#31140"
 msgid "Music OSD"
-msgstr "Музика OSD"
+msgstr "Екранно меню за музика"
 
 msgctxt "#31141"
 msgid "Video OSD"
-msgstr "Видео OSD"
+msgstr "Екранно меню за видео"
 
 msgctxt "#31142"
 msgid "Settings level"
@@ -277,11 +237,11 @@ msgid "Shortcuts"
 msgstr "Преки пътища"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
+msgid "Choose your song"
 msgstr "Изберете вашата песен"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
+msgid "Lyrics source"
 msgstr "Източник на лирики"
 
 msgctxt "#31206"
@@ -289,19 +249,15 @@ msgid "Found"
 msgstr "Резултат:"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Търси още елементи"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "Предстоящи епизоди"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Текуща температура"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Последно обновяване"
 
 msgctxt "#31303"
@@ -309,51 +265,51 @@ msgid "Data provider"
 msgstr "Доставчик на данни"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Скрий фанарта"
+msgid "Hide fanart"
+msgstr "Скрий фен-арта"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Подробности за филма"
 
 msgctxt "#31309"
-msgid "Memory Used:"
+msgid "Memory used:"
 msgstr "Памет в употреба:"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "Аудио запис №"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "Не е зададено[CR][CR]фанарт изображение[CR][CR]Натиснете бутона, за да изберете"
+msgstr "Няма налично[CR][CR]фен-арт изображение[CR][CR]Натиснете бутона, за да изберете"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "Текущ източник на инф."
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "Изберете източник на инф."
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
+msgid "Content scanning options"
 msgstr "Настройки за сканиране на съдържанието"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Задай път до фанарта"
+msgid "Set fanart path"
+msgstr "Задайте път до фен-арта"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "Избран профил"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Последно влизане"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
+msgid "Karaoke song selector"
 msgstr "Прозорец за избор на караоке песен"
 
 msgctxt "#31322"
@@ -361,7 +317,7 @@ msgid "Aired"
 msgstr "Излъчен"
 
 msgctxt "#31325"
-msgid "Playlist Options"
+msgid "Playlist options"
 msgstr "Настройки на елементите в плейлиста"
 
 msgctxt "#31326"
@@ -373,7 +329,7 @@ msgid "Resolution"
 msgstr "Резолюция"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Последно добавени"
 
 msgctxt "#31329"
@@ -381,11 +337,11 @@ msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]БРОЯЧЪТ Е НАСТРОЕН![/B] [COLOR=grey2]Изключване след[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
 msgstr "Натиснете бутона, за да започне[CR][CR]възпроизвеждането на трейлъра"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "Подробности за албума"
 
 msgctxt "#31351"
@@ -397,7 +353,7 @@ msgid "Stop"
 msgstr "Спри"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "Превърти напред"
 
 msgctxt "#31354"
@@ -409,7 +365,7 @@ msgid "Movie menu"
 msgstr "Меню на филма"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
+msgid "Download subtitles"
 msgstr "Сваляне на субтитри"
 
 msgctxt "#31360"
@@ -429,7 +385,7 @@ msgid "Skin default"
 msgstr "Стандартните (за облика)"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
+msgid "Skin default with no caps"
 msgstr "Стандартните, но без главни букви"
 
 msgctxt "#31392"
@@ -448,21 +404,13 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]КОНФИГУРИРАЙТЕ МУЗИКАТА[/B][CR][CR]Управлявайте музикалната си библиотеката · Настройте възпроизвеждането на музика[CR]Променете настройките на списъците с аудио файлове · Настройте караоке плеъра"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]КОНФИГУРИРАЙТЕ СНИМКИТЕ[/B][CR][CR]Променете настройките на списъците със снимки · Конфигурирайте слайдшоу"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]КОНФИГУРИРАЙТЕ ПРОГНОЗАТА ЗА ВРЕМЕТО[/B][CR][CR]Изберете до три града, за които желаете да следите прогнозата"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]КОНФИГУРИРАЙТЕ СИСТЕМАТА[/B][CR][CR]Настройте и калибрирайте екраните · Настройте компютъра да пести енергия[CR]Настройте дистанционните · Конфигурирайте аудио изхода · Включете режима \"дебъг\" · Задайте код за заключване"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]КОНФИГУРИРАЙТЕ ДОБАВКИТЕ[/B][CR][CR]Управлявайте инсталираните добавки · Променяйте настройките на добавките[CR]Разглеждайте/Инсталирайте добавки от kodi.tv"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]КОНФИГУРИРАЙТЕ ДОБАВКИТЕ[/B][CR][CR]Управлявайте инсталираните добавки · Разглеждайте/Инсталирайте добавки от kodi.tv[CR]Променяйте настройките на добавките"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -473,13 +421,9 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]КОНФИГУРИРАЙТЕ УСЛУГИТЕ[/B][CR][CR]Настройте контрола над Kodi чрез UPnP и HTTP · Настройте споделянето на файлове[CR]Включете Zeroconf · Настройте AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
+msgid "First run help..."
 msgstr "Помощ при първо стартиране"
 
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Табът отляво обозначава наличието на меню, което е извън видимия екран, съдържащо опции за текущата секция. За достъп до него е необходим да се придвижите наляво, с помощта на дистанционното, клавиатурата или да поставите курсора на мишката над таба. [CR][CR]Кликнете върху \"Добре\" за да затворите този прозорец, който няма да се появи повече."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Локално са налични субтитри"
@@ -489,7 +433,7 @@ msgid "Login"
 msgstr "Влизане"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
+msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Изберете потребителски профил,[CR]за да продължите"
 
 msgctxt "#31422"
@@ -500,56 +444,24 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Изберете кой профил да се ползва за влизане, когато екрана за вписване е изключен"
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "График"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Телевизия"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Добави група"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Преименувай групата"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Изтрий групата"
+msgid "TV"
+msgstr "ТЕЛЕВИЗИЯ"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Налични[CR]групи"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Група канали"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Настройка на брояча"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Настройки на канала"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 часова прогноза"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "Почасова прогноза"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "Прогноза за уикенда"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "Прогноза"
 
 msgctxt "#31905"
@@ -557,7 +469,7 @@ msgid "Forecast"
 msgstr "Прогноза"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "Вероятност за преваляване"
 
 msgctxt "#31909"
diff --git a/addons/skin.confluence/language/Bosnian/strings.po b/addons/skin.confluence/language/resource.language.bs_ba/strings.po
index 13a7be8827..ec490fffac 100644
--- a/addons/skin.confluence/language/Bosnian/strings.po
+++ b/addons/skin.confluence/language/resource.language.bs_ba/strings.po
@@ -4,18 +4,22 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Bosnian (http://www.transifex.com/projects/p/xbmc-main/language/bs/)\n"
+"Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/projects/p/kodi-main/language/bs_BA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bs\n"
+"Language: bs_BA\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+msgctxt "#31006"
+msgid "View options"
+msgstr "Prikaži opcije"
+
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Puni ekran"
@@ -24,6 +28,10 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Zanimljiva slika"
 
+msgctxt "#31049"
+msgid "End time"
+msgstr "Krajnje vrijeme"
+
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Ova datoteka je složena, izaberite koji dio želite da reprodukujete iz nje."
@@ -32,6 +40,10 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Pozadina"
 
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "Omogući prilagođenu pozadinu"
+
 msgctxt "#31112"
 msgid "Options"
 msgstr "Opcije"
@@ -53,7 +65,7 @@ msgid "Skin default"
 msgstr "Podrazumjevana maska"
 
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "TV"
 
 msgctxt "#31910"
diff --git a/addons/skin.confluence/language/Catalan/strings.po b/addons/skin.confluence/language/resource.language.ca_es/strings.po
index f84cde1feb..b2b5d7e714 100644
--- a/addons/skin.confluence/language/Catalan/strings.po
+++ b/addons/skin.confluence/language/resource.language.ca_es/strings.po
@@ -4,46 +4,34 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/xbmc-main/language/ca/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kodi-main/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
+"Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Canvia la"
-
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "Opcions d'energia"
 
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Carregant..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Amaga la informació"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Opcions de la vista"
+msgid "View options"
+msgstr "Mostra les opcions"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Duració total"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Música - Fitxers"
@@ -60,30 +48,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Elements"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opcions vàries"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Ubicació"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Tapa de cartell"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Miniatures"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Tapa d'imatge"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +64,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Accions"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "S'està reproduint"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "REPRODUINT"
@@ -116,13 +84,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "S'ESTÀ CERCANT"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualitzacions preestablertes"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Hora de finalització"
+msgid "End time"
+msgstr "Hora de fi"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +120,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Aquest fitxer està agrupat, seleccioneu la part que desitgeu reproduir."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Selecció actual"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opcions de la pantalla principal"
@@ -168,28 +128,12 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Fons"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Mostra \"Pausa\" a la presentació d'imatges"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Reprodueix els tràilers en una finestra [COLOR=grey3](Només al diàleg d'informació de vídeo)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Opcions vàries"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Amaga les marques de lectura dels fitxers de vídeo [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Amaga els botons del menú principal"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Habilita el fons personalitzat"
 
 msgctxt "#31110"
@@ -204,30 +148,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opcions"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Mostra els àlbums afegits recentment"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Mostra els vídeos afegits recentment"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Submenú de programes de la pantalla principal"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Amaga el fanart del fons"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Mostra el vídeo en reproducció en el fons"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Mostra la visualització en reproducció en el fons"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Reprodueix les cançons de la temàtica TV a la llibreria de vídeo (complement TvTunes)"
@@ -240,26 +160,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lletres"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Amaga el fanart a la visualització de pantalla completa"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Complement de lletres"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Submenú de vídeos de la pantalla principal"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Submenú de música de la pantalla principal"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Submenú d'imatges de la pantalla principal"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD de música"
@@ -276,94 +176,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Dreceres de teclat"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Trieu la vostra cançó"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Origen de les lletres"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Trobat"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Troba més elements"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Propers episodis"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura actual"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Última actualització"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Proveïdor de dades"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Amaga el fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detalls de la pel·lícula"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memòria utilitzada:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Número de pista"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Imatge de fanart[CR][CR]No disponible[CR][CR] Feu clic per definir-la"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Scraper actual"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Trieu un scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opcions d'escaneig de continguts"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Estableix el camí del fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Perfil seleccionat"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Últim accés el"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Selector de cançons del karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Emès"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opcions de la llista de reproducció"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Creat"
@@ -372,22 +200,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolució"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Afegits recentment"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Temporitzador activat[/B] [COLOR=grey2] - El sistema s'apagarà automàticament en[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Feu clic per reproduir[CR][CR]Trailer de la pel·lícula"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalls de l'àlbum"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pausa"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Atura"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Avanç ràpid"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Rebobina"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menú de la pel·lícula"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Baixar-se els subtítols"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Veure en 2D"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Aparença per defecte"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Aparença per defecte sense majúscules"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Basat en Arial"
@@ -448,37 +252,17 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]CONFIGUREU ELS PARÀMETRES DE LA MÚSICA[/B][CR][CR]Gestioneu la biblioteca de música · Establiu les opcions de reproducció de la música[CR]Canvieu les opcions del llistat de música · Configureu l'enviament de cançons[CR]Establiu les opcions del karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGUREU ELS PARÀMETRES D'IMATGE[/B][CR][CR]Establiu les opcions del llistat d'imatges · Configureu les presentacions de diapositives"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGUREU ELS PARÀMETRES DEL TEMPS[/B][CR][CR]Indiqueu tres ciutats per recollir informació del temps"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]CONFIGUREU ELS PARÀMETRES DEL SISTEMA[/B][CR][CR]Configureu i calibreu les pantalles · Configureu la sortida d'àudio[CR]Configureu els comandaments a distància · Establiu les opcions d'estalvi d'energia[CR]Habiliteu la depuració · Configureu el bloqueig mestre"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGUREU ELS COMPLEMENTS[/B][CR][CR]Gestioneu els complements instal·lats · Cerqueu i instal·leu complements des de kodi.tv[CR]Modifiqueu els paràmetres dels complements"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]CONFIGUREU ELS PARÀMETRES DE TV[/B][CR][CR]Canvia la informació de pantalla completa · Gestiona els paràmetres de les dades EPG"
 
 msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]CONFIGUREU ELS PARÀMETRES DE SERVEI[/B][CR][CR]Configureu el control de l'Kodi a través de UPnP i HTTP[CR]Configureu l'ús compartit de fitxers · Habiliteu el Zeroconf · Configureu l'AirPlay"
-
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Ajuda inicial...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Aquesta pestanya indica que hi ha un menú al costat d'aquesta finestra que conté opcions addicionals a les d'aquesta secció. Per accedir a aquest menú, navegau a l'esquerra amb el comandament a distància o teclat, o posau el punter del ratolí a sobre de la pestanya. [CR] [CR]Feu clic a \"D'acord\" per tancar aquest diàlog. No es tornarà a mostrar."
+msgstr "[B]CONFIGUREU ELS PARÀMETRES DE SERVEI[/B][CR][CR]Configureu el control del Kodi a través de UPnP i HTTP[CR]Configureu l'ús compartit de fitxers · Habiliteu el Zeroconf · Configureu l'AirPlay"
 
 msgctxt "#31413"
 msgid "Local subtitle available"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Inicia sessió"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Seleccioneu el vostre perfil d'usuari de l'Kodi[CR]per iniciar la sessió i continuar"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Mostra o amaga la pantalla d'inici de sessió a l'inici."
@@ -500,66 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Seleccioneu el perfil que serà utilitzat a l'inici quan la pantalla d'entrada d'usuari està deshabilitada."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Horari programat"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV en directe"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Afegeix un grup"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Canvia el nom del grup"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Elimina el grup"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grups[CR]disponibles"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grup del canal"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Temporitzador establert"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opcions del canal"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Predicció a 36 hores"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Predicció per hores"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Predicció del cap de setmana"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Predicció diaria"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Predicció"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Possibilitat de precipitació"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "S'està obtenint la informació de la predicció..."
diff --git a/addons/skin.confluence/language/Czech/strings.po b/addons/skin.confluence/language/resource.language.cs_cz/strings.po
index 58d73eba6f..222a3deb39 100644
--- a/addons/skin.confluence/language/Czech/strings.po
+++ b/addons/skin.confluence/language/resource.language.cs_cz/strings.po
@@ -4,24 +4,24 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/xbmc-main/language/cs/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/kodi-main/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
+"Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 msgctxt "#31000"
-msgid "Change Your"
-msgstr "Změnit"
+msgid "Change your"
+msgstr "Změňte Vaše"
 
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "Možnosti napájení"
 
 msgctxt "#31004"
@@ -29,20 +29,20 @@ msgid "Working..."
 msgstr "Pracuji..."
 
 msgctxt "#31005"
-msgid "Hide Information"
+msgid "Hide information"
 msgstr "Skrýt informace"
 
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Zobrazit možnosti"
+msgid "View options"
+msgstr "Možnosti zobrazení"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
 msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Celková doba trvání"
+msgid "Total duration"
+msgstr "Celková délka"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -61,7 +61,7 @@ msgid "Items"
 msgstr "Položek"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "Další možnosti"
 
 msgctxt "#31027"
@@ -69,20 +69,20 @@ msgid "Location"
 msgstr "Umístění"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Obaly"
+msgid "Poster wrap"
+msgstr "Plakát"
 
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "Náhledy obrázků"
 
 msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Obrázky"
+msgid "Image wrap"
+msgstr "Obrázkový obal"
 
 msgctxt "#31033"
 msgid "Info"
@@ -93,8 +93,8 @@ msgid "Actions"
 msgstr "Činnosti"
 
 msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Nyní přehrávám"
+msgid "Now playing"
+msgstr "Přehrává se"
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -117,11 +117,11 @@ msgid "SEEKING"
 msgstr "VYHLEDÁVÁM"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Předvolby vizualizace"
+msgid "Visualisation presets"
+msgstr "Předvolby vizualizací"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Čas ukončení"
 
 msgctxt "#31050"
@@ -157,8 +157,8 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Tento soubor se skládá z více částí. Vyberte od které si přejete spustit přehrávání."
 
 msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Aktuálně vybraný"
+msgid "Current selected"
+msgstr "Aktuálně vybráno"
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -168,29 +168,21 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Pozadí"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Zobrazovat \"Pozastaveno\" při promítání obrázků"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Přehrávat upoutávky v okně [COLOR=grey3](pouze z okna Informace o videu)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Přehrát trailery v okně [COLOR=grey3](Pouze dialog informací o videu)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Různá nastavení"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Nezobrazovat ikony přečtené z názvu videa [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Skrýt tlačítka hlavní nabídky"
+msgid "Hide main menu buttons"
+msgstr "Skrýt tlačítka hlavního menu"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Povolit vlastní obrázek na pozadí"
+msgid "Enable custom background"
+msgstr "Povolit vlastní pozadí"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,28 +197,24 @@ msgid "Options"
 msgstr "Možnosti"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "Zobrazit nedávno přidaná alba"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Zobrazovat nedávno přidaná videa"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Úvodní obrazovka, podnabídka programů"
+msgid "Show recently added videos"
+msgstr "Zobrazit nedávno přidaná videa"
 
 msgctxt "#31119"
-msgid "Hide Background Fanart"
+msgid "Hide background fanart"
 msgstr "Skrýt Fanart na pozadí"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Zobrazovat na pozadí právě přehrávané video"
+msgid "Show background \"Now playing\" video"
+msgstr "Zobrazit právě přehrávané video na pozadí"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Zobrazovat právě přehrávanou vizualizaci na pozadí"
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Zobrazit právě přehrávanou vizualizaci na pozadí"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -241,25 +229,13 @@ msgid "Lyrics"
 msgstr "Texty písní"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Skrýt fanart při vizualizaci v režimu celé obrazovky"
+msgid "Hide fanart in full screen visualisation"
+msgstr "Skrýt fanart v celoobrazovkové vizualizaci"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
+msgid "Lyrics add-on"
 msgstr "Doplněk textů písní"
 
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Úvodní obrazovka, podnabídka videí"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Úvodní obrazovka, podnabídka hudby"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Úvodní obrazovka, podmenu obrázků"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD hudby"
@@ -277,11 +253,11 @@ msgid "Shortcuts"
 msgstr "Zkratky"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Vyberte vaši skladbu"
+msgid "Choose your song"
+msgstr "Vyberte Vaši skladbu"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
+msgid "Lyrics source"
 msgstr "Zdroj textu písní"
 
 msgctxt "#31206"
@@ -289,19 +265,15 @@ msgid "Found"
 msgstr "Nalezeno"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Hledat další položky"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "Nadcházející epizody"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Aktuální teplota"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Naposledy aktualizováno"
 
 msgctxt "#31303"
@@ -309,19 +281,19 @@ msgid "Data provider"
 msgstr "Poskytovatel dat"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
+msgid "Hide fanart"
 msgstr "Skrýt Fanart"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Podrobnosti filmu"
 
 msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Využitá paměť:"
+msgid "Memory used:"
+msgstr "Použitá paměť:"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "Číslo stopy"
 
 msgctxt "#31311"
@@ -329,31 +301,31 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart[CR][CR]není k dispozici[CR][CR] Nastavte jej kliknutím tlačítka"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "Současný stahovač"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "Vyberte stahovač"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
+msgid "Content scanning options"
 msgstr "Možnosti vyhledávání obsahu"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Umístění Fanartu"
+msgid "Set fanart path"
+msgstr "Nastavit cestu k Fanartu"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "Vybraný profil"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Naposledy přihlášen"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
+msgid "Karaoke song selector"
 msgstr "Výběr karaoke skladby"
 
 msgctxt "#31322"
@@ -361,7 +333,7 @@ msgid "Aired"
 msgstr "Odvysíláno"
 
 msgctxt "#31325"
-msgid "Playlist Options"
+msgid "Playlist options"
 msgstr "Možnosti seznamu skladeb"
 
 msgctxt "#31326"
@@ -373,7 +345,7 @@ msgid "Resolution"
 msgstr "Rozlišení"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Nedávno přidané"
 
 msgctxt "#31329"
@@ -381,11 +353,11 @@ msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Časovač byl nastaven![/B] [COLOR=grey2] - Systém se automaticky vypne za[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
 msgstr "Pro přehrání upoutávky[CR][CR]stiskněte tlačítko"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "Podrobnosti alba"
 
 msgctxt "#31351"
@@ -397,7 +369,7 @@ msgid "Stop"
 msgstr "Zastavit"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "Rychle vpřed"
 
 msgctxt "#31354"
@@ -409,7 +381,7 @@ msgid "Movie menu"
 msgstr "Nabídka filmu"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
+msgid "Download subtitles"
 msgstr "Stáhnout titulky"
 
 msgctxt "#31360"
@@ -426,11 +398,11 @@ msgstr "Povoleno"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "Výchozí vzhled"
+msgstr "Výchozí písmo vzhledu"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Výchozí vzhled bez velkých písmen"
+msgid "Skin default with no caps"
+msgstr "Výchozí písmo bez Kapitálek"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -448,21 +420,13 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]NASTAVENÍ MOŽNOSTÍ HUDBY[/B][CR][CR]Správa knihovny hudby · Možnosti přehrávání hudby · Možnosti zobrazení hudebních souborů[CR] Nastavení služby odesílání informací o přehrávaných skladbách · Nastavení karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]NASTAVENÍ MOŽNOSTÍ OBRÁZKŮ[/B][CR][CR]Možnosti zobrazení obrázků · Nastavení prezentace"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]NASTAVENÍ MOŽNOSTÍ POČASÍ[/B][CR][CR]Nastavení tří měst pro sběr předpovědi počasí"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]NASTAVENÍ MOŽNOSTÍ SYSTÉMU[/B][CR][CR]Nastavení a kalibrace obrazovky · Konfigurace výstupu zvuku · Nastavení dálkového ovládání[CR]Nastavení úsporného režimu · Povolení informací o ladění · Rodičovský zámek"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]NASTAVENÍ DOPLŇKŮ[/B][CR][CR]Správa nainstalovaných doplňků · Procházení a instalace doplňků z kodi.tv[CR]Změna nastavení doplňků"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]KONFIGURACE DOPLŇKŮ[/B][CR][CR]Spravujte Vaše instalované doplňky. Prohlížejte a instalujte doplňky z kodi.tv[CR]Upravujte nastavení doplňků"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -473,13 +437,9 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]NASTAVENÍ MOŽNOSTÍ SLUŽEB[/B][CR][CR]Nastavení ovládání Kodi skrze UPnP a HTTP · Nastavení sdílení souborů[CR]Povolení zeroconf · Nastavení AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
+msgid "First run help..."
 msgstr "Nejprve spusťte nápovědu..."
 
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Tato záložka zdůrazňuje, že se na boční straně okna nachází skryté menu s dalšími vlastnostmi.\nPro přístup k tomuto menu se přesuňte doleva dálkovým ovladačem, či klávesnicí, nebo přesuňte myš nad tuto kartu.[CR][CR]Kliknutím na tlačítko OK zavřete tento dialog, který se již znovu nezobrazí."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Místní titulky k dispozici"
@@ -489,8 +449,8 @@ msgid "Login"
 msgstr "Přihlášení"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Vyberte profil Kodi[CR]pro přihlášení a pokračování"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Vyberte Váš Kodi uživatelský profil[CR]pro přihlášení a pokračování"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,23 +461,23 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Vyberte výchozí profil po spuštění, pokud je prihlašovací obrazovka zakázána."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
+msgid "Scheduled time"
 msgstr "Naplánovaný čas"
 
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "Televize"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "Přidat skupinu"
 
 msgctxt "#31504"
-msgid "Rename Group"
+msgid "Rename group"
 msgstr "Přejmenovat skupinu"
 
 msgctxt "#31505"
-msgid "Delete Group"
+msgid "Delete group"
 msgstr "Smazat skupinu"
 
 msgctxt "#31506"
@@ -525,31 +485,27 @@ msgid "Available[CR]Groups"
 msgstr "Dostupné[CR]skupiny"
 
 msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Skupina programů"
+msgid "Channel group"
+msgstr "Skupina kanálů"
 
 msgctxt "#31510"
-msgid "Timer Set"
+msgid "Timer set"
 msgstr "Časovač nastaven"
 
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "Možnosti kanálů"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Předpověď na 36 hodin"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "Hodinová předpověď"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "Předpověď na víkend"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "Denní předpověď"
 
 msgctxt "#31905"
@@ -557,7 +513,7 @@ msgid "Forecast"
 msgstr "Předpověď"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "Pravděpodobnost srážek"
 
 msgctxt "#31909"
diff --git a/addons/skin.confluence/language/Welsh/strings.po b/addons/skin.confluence/language/resource.language.cy_gb/strings.po
index a979b12323..6367a11db9 100644
--- a/addons/skin.confluence/language/Welsh/strings.po
+++ b/addons/skin.confluence/language/resource.language.cy_gb/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Welsh (http://www.transifex.com/projects/p/xbmc-main/language/cy/)\n"
+"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/kodi-main/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cy\n"
+"Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Newid eich"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Dewisiadau pŵer"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Gweithio..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Cuddio gwybodaeth"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Gweld Dewisiadau"
+msgid "View options"
+msgstr "Gweld y dewisiadau"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Sgrin Lawn"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Cyfanswm Hyd"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Cerddoriaeth - Ffeiliau"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Eitem"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Dewisiadau Amrwiol"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Lleoliad"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Amlapio Posteri"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Celf Selogion"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Llun Bach"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Amlapio Delwedd"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Gwybodaeth"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Gweithredoedd"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Nawr yn Chwarae"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "CHWARAE"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "CHWILIO"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Rhagosodiadau Delweddu"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Amser Gorffen"
+msgid "End time"
+msgstr "Amser gorffen"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Mae'r ffeil wedi ei stacio, dewiswch y darn i'w chwarae"
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Dewis Cyfredol"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Dewisiadau sgrin Cartref"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Cefndir"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Dangos \"Oedwyd\" yn y sioe sleidiau"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Chwarae Rhagflas mewn ffenestr [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Dewisiadau amrywiol"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Cuddio Darllen Baneru o enwau ffeiliau fideo [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Cuddio Botymau'r Prif Ddewislen "
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Galluogu Cefndir Cyfaddas"
+msgid "Enable custom background"
+msgstr "Galluogi cefndir cyfaddas"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Dewisiadau"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Dangos Albymau Ychwanegwyd yn Ddiweddar"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Dangos Fideos Ychwanegwyd yn Ddiweddar"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Is-ddewislen Rhaglenni'r Tudalen Cartref"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Cuddio Celf Cefndir Selogion "
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Dangos Cefndir Fideo \"Nawr yn Chwarae\""
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Dangos Delweddu Cefndir \"Nawr yn Chwarae\""
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Chwarae caneuon thema teledu yn y llyfrgell fideo (ychwanegyn TvTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Geiriau Caneuon"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Cuddio Celf Selogion mewn delweddu sgrin llawn"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Ychwanegyn Geiriau Caneuon"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Is-ddewislen Tudalen Cartref Fideo"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Is-ddewislen Tudalen Cartref Cerddoriaeth"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Is-ddewislen Tudalen Cartref Lluniau"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD Cerddoriaeth"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Llwybrau Byr"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Dewis eich Cân"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Ffynhonnell Geiriau Caneuon"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Canfod"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Canfod Rhagor"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Rhifynnau'r Dyfodol"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Tymheredd Presennol"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Diweddarwyd Diwethaf"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Darparwr data"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Cuddio Celf Selogion"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Manylion Ffilmiau"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Defnydd Cof:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Rhif Trac"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Delwedd Celf Selogion[CR][CR]Ddim ar gael[CR][CR] Clicio botwm i'w osod"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Crafwr Cyfredol"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Dewis Crafwr"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Dewisiadau Sganio Cyfredol"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Gosod Llwybr Celf Selogion"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Proffil Dewiswyd"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Mewngofnodwyd Ddiwethaf"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Dewis Can Kareoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Darlledwyd"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Dewisiadau Rhestr Chwarae"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Crëwyd"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Cydraniad"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Ychwanegwyd yn Ddiweddar"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Gosodwyd yr amserydd![/B] [COLOR=grey2] - Cau'r system yn awtomatig ymhen[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Clicio botwm i chwarae[CR][CR]Hysbysiad ffilm"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Manylion Albwm"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Oedi"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Atal"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Ymlaen Cyflym"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Nôl"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Dewislen Ffilm"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Llwytho Isdeitlau i Lawr"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Gwylio mewn 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Croen rhagosodedig"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Croen rhagosodedig heb Brif Lythrennau"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Seileidig ar Ariel"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]FFURFWEDDU GOSODIADAU CERDDORIAETH[/B][CR][CR]Rheoli eich llyfrgell cerddoriaeth · Gosod dewisiadau chwarae cerddoriaeth · Newid dewisiadau rhestru cerddoriaeth [CR]Gosod cyflwyno caneuon · Gosod dewisiadau karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]FFURFWEDDU GOSODIADAU LLUNIAU[/B][CR][CR]Gosod dewisiadau rhestru lluniau · Ffurfweddu sioeau sleidiau"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]FFURFWEDDU GOSODIADAU TYWYDD[/B][CR][CR]Gosod tair dinas i gasglu gwybodaeth tywydd"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]FFURFWEDDU GOSODIADAU'R SYSTEM[/B][CR][CR]Gosod a chalibro dangosyddion · Ffurfweddu allbwn sain · Gosod rheolyddion pell[CR]Gosod dewisiadau pŵer · Galluogi dadfygio · Gosod prif glo"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]FFURFWEDDU YCHWANEGION[/B][CR][CR]Rheoli eich Ychwanegion · Pori a gosod ychwanegion o kodi.tv[CR]Newid gosodiadau Ychwanegion"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]FFURFWEDDU GOSODIADAU TELEDU[/B][CR][CR]Newid gwybodaeth sgrin lawn · Rheoli gosodiadau data'r Amserlenydd Rhaglenni Electronig"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]FFURFWEDDU GOSODIADAU GWASANAETHAU[/B][CR][CR]Gosod rheoli Kodi drwy UPnP a HTTP · Ffurfweddu rhannu ffeiliau[CR]Galluogi Zeroconf · Ffurfweddu AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Cymorth defnydd cyntaf..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Mae'r tab yma'n amlygu fod yna ddewislen ar ochr y ffenestr sy'n cynnwys dewisiadau ychwanegol ar gyfer yr adran hon. I gael at y ddewislen, ewch i'r chwith gyda'ch rheolwr pell neu fysellfwrdd neu osod eich pwyntydd llygaden dros y tab. [CR][CR]Cliciwch \"Iawn\" i gau'r ddeialog. Ni fydd yn ymddangos eto."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Is deitlau lleol ar gael"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Mewngofnodi"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Dewiswch eich Proffil[CR] defnyddiwr Kodi i fewngofnodi a pharhau"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Dangos neu guddio'r sgrin mewngofnodi wrth gychwyn."
@@ -500,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Dewiswch y proffil fydd yn cael ei ddefnyddio wrth gychwyn pan fydd y sgrin mewngofnodi wedi ei anablu."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Amser Amserydd"
-
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "Teledu"
 
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Pob Grŵp"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Ailenwi Grŵp"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Dileu Grŵp"
-
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grwpiau[CR]ar Gael"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grŵp Sianel"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Gosod Amserydd"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Dewisiadau Sianel"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Rhagolygon 36 Awr"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Rhoagolygon Fesul Awr"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Rhagolygon Penwythnos"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Rhagolygon"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Posibilrwydd o Dyodiad"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Estyn gwybodaeth rhagolygon..."
diff --git a/addons/skin.confluence/language/Danish/strings.po b/addons/skin.confluence/language/resource.language.da_dk/strings.po
index c825e32754..52ff03a57b 100644
--- a/addons/skin.confluence/language/Danish/strings.po
+++ b/addons/skin.confluence/language/resource.language.da_dk/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/xbmc-main/language/da/)\n"
+"Language-Team: Danish (Denmark) (http://www.transifex.com/projects/p/kodi-main/language/da_DK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
+"Language: da_DK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Tilpas dine"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Strømstyring"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Arbejder..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Skjul Information"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Visningsindstillinger"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Fuld skærm"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Samlet varighed"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musik - Filer"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Emner"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Div. Indstillinger"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Lokalitet"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Plakatvæg"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fankunst"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Blandet"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Billedvæg"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Handlinger"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Spiller nu"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "AFSPILLER"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "SØGER"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualiserings-forudindstillinger"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Sluttid"
+msgid "End time"
+msgstr "Sluttidspunkt"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Denne fil er kombineret. Vælg den del du vil afspille fra."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Nuværende valgte"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Indstillinger til hjemmeskærmen"
@@ -168,28 +124,12 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Baggrund"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Vis \"PAUSE\" i  billeddiasshow"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Afspil trailere i et vindue [COLOR=grey3](Kun videoinformationsdialog)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Diverse indstillinger"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Skjul læsning af mærker fra videoers filnavne [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Skjul knapper i Hovedmenu"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Aktiver brugerdefineret baggrund"
 
 msgctxt "#31110"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Indstillinger"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Vis nyligt tilføjede Albummer"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Vis nyligt tilføjede Videoer"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Undermenu til programmer på startskærmen"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Skjul baggrundsfankunst"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Vis \"Spiller nu\" i baggrunden for videoer"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Vis \"Spiller nu\" visualisering i baggrunden"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Afspil kendingsmelodier til TV-serier i videobiblioteket (TvTunes add-on)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Sangtekster"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Skjul Fanart i fuldskærmsvisning"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Add-on til Sangtekster"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Undermenu til Videoer på Hjemmeskærmen"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Undermenu til Musik på Hjemmeskærmen"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Undermenu til Billeder på Hjemmeskærmen"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Musik OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Genveje"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Vælg din sang"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Kilde til Sangtekster"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Fundet"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Find flere Emner"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Kommende Episoder"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatur Nu"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Sidst Opdateret"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Dataleverandør"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Skjul Fankunst"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Filmdetaljer"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Hukommelse i brug:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Spornummer"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fankunstbillede[CR][CR]ikke tilgængeligt[CR][CR] Tryk på knap for at vælge"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Nuværende Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Vælg en Scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Indstillinger for indholdsskanning"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Vælg sti til Fankunst"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Valgt Profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Sidst logget ind"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Sangvalg til Karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Sendt"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Indstillinger for Afspilningsliste"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Oprettet"
@@ -373,21 +197,13 @@ msgid "Resolution"
 msgstr "Opløsning"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Nyligt tilføjede"
+msgid "Recently added"
+msgstr "Nyligt tilføjet"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Optagelse indstillet![/B] [COLOR=grey2] - Systemet lukker ned om[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Klik på en knap for at afspille[CR][CR]Filmtrailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Albumdetaljer"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pause"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stop"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Spol Frem"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Spol Tilbage"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Filmmenu"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Hent Undertekster"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Se i 2D"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Skinnets standard"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skinnets standard uden store bogstaver"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Baseret på Arial"
@@ -448,22 +252,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGURER MUSIKINDSTILLINGER[/B][CR][CR]Administrer dit musikbibliotek · Vælg indstillinger for musikafspilning · Skift indstillinger for musikoversigt[CR]Opsæt sangindsendelse · Vælg karaoke-indstillinger"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGURER BILLEDEINDSTILLINGER[/B][CR][CR]Vælg indstillinger for billedeoversigt · Konfigurer diasshow"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGURER VEJRINDSTILLINGER[/B][CR][CR]Du kan vælge tre byer, der skal hentes vejrudsigter for"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGURER SYSTEMINDSTILLINGER[/B][CR][CR]Indstil og kalibrer skærme · Konfigurer lydudgang · Opsæt fjernbetjeninger[CR]Opsæt strømstyring · Aktiver fejllogning · Opret hovedlås"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGURER ADD-ONS[/B][CR][CR]Administrer dine installerede Add-ons · Gennemse og installer Add-ons fra kodi.tv[CR]Tilpas indstillinger til Add-ons"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]KONFIGURER TV-INDSTILLINGER[/B][CR][CR]Skift fuldskærmsinfo · Administrer indstillinger for EPG"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGURER TJENESTER[/B][CR][CR]Opsæt styring af Kodi ved hjælp af UPnP og HTTP · Konfigurer fildeling[CR]Aktiver Zeroconf · Konfigurer AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Prøv først hjælp..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Dette faneblad indikerer, at der er en menu i siden af dette vindue, som indeholder ekstra indstillinger til denne sektion.\nFor at få adgang til denne menu, skal du navigere til venstre  med din fjernbetjening eller dit tastatur. Du kan også placere din musemarkør over fanebladet. [CR][CR]Tryk \"Ok\" for at lukke denne dialog. Den dukker ikke op igen."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Undertekster på lokalt sprog tilgængelig"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Login"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Vælg din Kodi brugerprofil[CR]for at logge ind og fortsætte"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Vise eller skjule login-skærmen ved opstart."
@@ -500,66 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Vælg den profil, der skal bruges ved opstart, når login-skærmen er deaktiveret."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Planlagt tid"
-
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "TV"
 
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Tilføj Gruppe"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Omdøb Gruppe"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Slet Gruppe"
-
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Tilgængelige[CR]Grupper"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanalgruppe"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Indstil Optagelse"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanalindstillinger"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 timers vejrudsigt"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Vejrudsigt de næste timer"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Vejrudsigt for weekenden"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Vejrudsigten for i dag"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Vejrudsigt"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Risiko for nedbør"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Henter vejrudsigt..."
diff --git a/addons/skin.confluence/language/resource.language.de_de/strings.po b/addons/skin.confluence/language/resource.language.de_de/strings.po
new file mode 100644
index 0000000000..3925e7454d
--- /dev/null
+++ b/addons/skin.confluence/language/resource.language.de_de/strings.po
@@ -0,0 +1,537 @@
+# Kodi Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon Provider: Jezz_X, Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: German (Germany) (http://www.transifex.com/projects/p/kodi-main/language/de_DE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#31003"
+msgid "Power options"
+msgstr "Energieeinstellungen"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "Beschäftigt..."
+
+msgctxt "#31005"
+msgid "Hide information"
+msgstr "Informationen verstecken"
+
+msgctxt "#31006"
+msgid "View options"
+msgstr "Ansichts-Optionen"
+
+msgctxt "#31008"
+msgid "Full screen"
+msgstr "Vollbild"
+
+msgctxt "#31009"
+msgid "Total duration"
+msgstr "Gesamtdauer"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Musik - Dateien"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "Es läuft"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Seite"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "Einträge"
+
+msgctxt "#31026"
+msgid "Misc options"
+msgstr "Sonstige Optionen"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "Standort"
+
+msgctxt "#31029"
+msgid "Fanart"
+msgstr "Fanart"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "#31039"
+msgid "Actions"
+msgstr "Aktionen"
+
+msgctxt "#31040"
+msgid "Now playing"
+msgstr "Es läuft"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "ES LÄUFT"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "PAUSE"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "SCHNELLER VORLAUF"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "RÜCKLAUF"
+
+msgctxt "#31046"
+msgid "SEEKING"
+msgstr "SUCHLAUF"
+
+msgctxt "#31048"
+msgid "Visualisation presets"
+msgstr "Visualisierungs-Voreinstellungen"
+
+msgctxt "#31049"
+msgid "End time"
+msgstr "Endzeit"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Sortieren: Aufsteigend"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Sortieren: Absteigend"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Wiedergabeliste öffnen"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "Wiedergabeliste speichern"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Wiedergabeliste schließen"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "System-Musikdateien"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Aktuelle Wiedergabeliste"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "Diese Datei besteht aus mehreren Teilen. Bitte den abzuspielenden Teil auswählen."
+
+msgctxt "#31061"
+msgid "Current selected"
+msgstr "Aktuell ausgewählt"
+
+msgctxt "#31101"
+msgid "Home screen options"
+msgstr "Hauptmenü-Optionen"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "Hintergrund"
+
+msgctxt "#31104"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Film-Trailer im Fenster abspielen [COLOR=grey3](gilt nur für Video-Informationsdialog)[/COLOR]"
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr "Sonstige Optionen"
+
+msgctxt "#31108"
+msgid "Hide main menu buttons"
+msgstr "Hauptmenü-Buttons verstecken"
+
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "Benutzerdefinierten Hintergrund aktivieren"
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr "Hintergrundbilder-Dateipfad:"
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Verstecken"
+
+msgctxt "#31112"
+msgid "Options"
+msgstr "Optionen"
+
+msgctxt "#31116"
+msgid "Show recently added albums"
+msgstr "Zeige zuletzt hinzugefügte Alben"
+
+msgctxt "#31117"
+msgid "Show recently added videos"
+msgstr "Zeige zuletzt hinzugefügte Videos"
+
+msgctxt "#31119"
+msgid "Hide background fanart"
+msgstr "Hintergrund-Fanart verstecken"
+
+msgctxt "#31124"
+msgid "Show background \"Now playing\" video"
+msgstr "Das \"Es läuft\" Hintergrund-Video anzeigen"
+
+msgctxt "#31125"
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Die \"Es läuft\" Hintergrund-Visualisierung anzeigen"
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "TV-Titelmusikstücke beim Navigieren in der Video-Bibliothek abspielen (TvTunes Addon)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvTunes"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "Liedtexte"
+
+msgctxt "#31129"
+msgid "Hide fanart in full screen visualisation"
+msgstr "Fanart verstecken, wenn Vollbild-Visualiserung aktiv ist"
+
+msgctxt "#31132"
+msgid "Lyrics add-on"
+msgstr "Liedtexte-Addon"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "Musik-OSD"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "Video-OSD"
+
+msgctxt "#31142"
+msgid "Settings level"
+msgstr "Einstellungsebene"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "Verknüpfungen"
+
+msgctxt "#31203"
+msgid "Choose your song"
+msgstr "Lied auswählen"
+
+msgctxt "#31205"
+msgid "Lyrics source"
+msgstr "Liedtexte-Quelle"
+
+msgctxt "#31206"
+msgid "Found"
+msgstr "Gefunden"
+
+msgctxt "#31208"
+msgid "Upcoming episodes"
+msgstr "Zukünftige Folgen"
+
+msgctxt "#31301"
+msgid "Last updated"
+msgstr "Zuletzt aktualisieret"
+
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "Quelle"
+
+msgctxt "#31307"
+msgid "Hide fanart"
+msgstr "Fanart verstecken"
+
+msgctxt "#31308"
+msgid "Movie details"
+msgstr "Film Details"
+
+msgctxt "#31309"
+msgid "Memory used:"
+msgstr "Speicherverbrauch:"
+
+msgctxt "#31310"
+msgid "Track number"
+msgstr "Titelnummer"
+
+msgctxt "#31311"
+msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
+msgstr "FANART-BILD[CR][CR]NICHT VORHANDEN[CR][CR] BUTTON KLICKEN ZUM FESTLEGEN"
+
+msgctxt "#31312"
+msgid "Current scraper"
+msgstr "Aktueller Scraper"
+
+msgctxt "#31313"
+msgid "Choose a scraper"
+msgstr "Wähle einen Scraper"
+
+msgctxt "#31317"
+msgid "Set fanart path"
+msgstr "Fanart-Dateipfad festlegen"
+
+msgctxt "#31319"
+msgid "Selected profile"
+msgstr "Profil auswählen"
+
+msgctxt "#31320"
+msgid "Last logged in"
+msgstr "Zuletzt angemeldet"
+
+msgctxt "#31322"
+msgid "Aired"
+msgstr "Ausgestrahlt"
+
+msgctxt "#31325"
+msgid "Playlist options"
+msgstr "Wiedergabelisten-Optionen"
+
+msgctxt "#31326"
+msgid "Created"
+msgstr "Erstellt"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "Auflösung"
+
+msgctxt "#31328"
+msgid "Recently added"
+msgstr "Kürzlich hinzugefügt"
+
+msgctxt "#31329"
+msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
+msgstr "[B]Ausschalt-Timer aktiv![/B] [COLOR=grey2] - Zeit bis zum Herunterfahren:[/COLOR]"
+
+msgctxt "#31330"
+msgid "Click button to play[CR][CR]movie trailer"
+msgstr "Button klicken, um[CR][CR]Film-Trailer abzuspielen"
+
+msgctxt "#31331"
+msgid "Album details"
+msgstr "Album-Details"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "Pause"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Stopp"
+
+msgctxt "#31353"
+msgid "Fast forward"
+msgstr "Schneller Vorlauf"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Rücklauf"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "Filmmenü"
+
+msgctxt "#31356"
+msgid "Download subtitles"
+msgstr "Untertitel herunterladen"
+
+msgctxt "#31360"
+msgid "Watch as 2D"
+msgstr "In 2D ansehen"
+
+msgctxt "#31361"
+msgid "Change mode"
+msgstr "Modus ändern"
+
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "Aktiviert"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "Skin-Standard"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Arial-basiert"
+
+msgctxt "#31400"
+msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
+msgstr "[B]ERSCHEINUNGSBILD KONFIGURIEREN[/B][CR][CR]Skin auswählen · Sprache und Region einstellen · Dateilistenoptionen ändern[CR]Bildschirmschoner festlegen"
+
+msgctxt "#31401"
+msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
+msgstr "[B]VIDEO-EINSTELLUNGEN KONFIGURIEREN[/B][CR][CR]Die Video-Bibliothek verwalten · Videoabspieloptionen vornehmen · Videoauflistungsoptionen ändern[CR]Untertitel-Schriftarten einstellen"
+
+msgctxt "#31402"
+msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
+msgstr "[B]MUSIK-EINSTELLUNGEN KONFIGURIEREN[/B][CR][CR]Die Musik-Bibliothek verwalten· Musikabspieloptionen einstellen · Musikauflistungsoptionen ändern[CR]Musikübertragung einrichten · Karaoke-Optionen"
+
+msgctxt "#31406"
+msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
+msgstr "[B]SYSTEM-EINSTELLUNGEN KONFIGURIEREN[/B][CR][CR]Bildschirme konfigurieren und kalibrieren · Audioausgabe konfigurieren · Fernbedienungseinstellungen[CR]Energiespar-Einstellungen vornehmen· Debugging aktivieren· Master-Sperre einrichten"
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]ADDONS KONFIGURIEREN[/B][CR][CR]Installierte Addons verwalten · Addons aus verschiedenen Repositories auswählen und installieren[CR]Addon-Einstellungen verändern"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
+msgstr "[B]TV-EINSTELLUNGEN KONFIGURIEREN[/B][CR][CR]Vollbildinformationen ändern · TV-Guide-Dateneinstellungen verwalten "
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr "[B]DIENSTE KONFIGURIEREN[/B][CR][CR]Zugriff auf Kodi via UPnP und HTTP einrichten · Dateifreigaben konfigurieren[CR]Zeroconf aktivieren · AirPlay konfigurieren"
+
+msgctxt "#31411"
+msgid "First run help..."
+msgstr "Hilfe für ersten Start..."
+
+msgctxt "#31413"
+msgid "Local subtitle available"
+msgstr "Lokaler Untertitel verfügbar"
+
+msgctxt "#31420"
+msgid "Login"
+msgstr "Anmeldung"
+
+msgctxt "#31421"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Bitte Kodi-Benutzerprofil auswählen[CR]um fortzufahren"
+
+msgctxt "#31422"
+msgid "Show or hide the login screen at startup."
+msgstr "Den Anmeldebildschirm beim Start anzeigen oder ausblenden"
+
+msgctxt "#31423"
+msgid "Select the profile that will be used at startup when the login screen is disabled."
+msgstr "Profil, das beim Start verwendet werden soll, wenn der Anmeldebildschirm deaktiviert ist."
+
+msgctxt "#31501"
+msgid "Scheduled time"
+msgstr "Eingestellte Zeit"
+
+msgctxt "#31502"
+msgid "TV"
+msgstr "TV"
+
+msgctxt "#31503"
+msgid "Add group"
+msgstr "Gruppe hinzufügen"
+
+msgctxt "#31504"
+msgid "Rename group"
+msgstr "Gruppe umbenennen"
+
+msgctxt "#31505"
+msgid "Delete group"
+msgstr "Gruppe löschen"
+
+msgctxt "#31506"
+msgid "Available[CR]Groups"
+msgstr "Verfügbare[CR]Gruppen"
+
+msgctxt "#31509"
+msgid "Channel group"
+msgstr "Kanal-Gruppe"
+
+msgctxt "#31510"
+msgid "Timer set"
+msgstr "Timer aktiviert"
+
+msgctxt "#31511"
+msgid "Channel options"
+msgstr "Kanal-Einstellungen"
+
+msgctxt "#31902"
+msgid "Hourly forecast"
+msgstr "Stündliche Vorhersage"
+
+msgctxt "#31903"
+msgid "Weekend forecast"
+msgstr "Wochenend-Vorhersage"
+
+msgctxt "#31904"
+msgid "Daily forecast"
+msgstr "Tägliche Vorhersage"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Vorhersage"
+
+msgctxt "#31908"
+msgid "Chance of precipitation"
+msgstr "Niederschlagswahrscheinlichkeit"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "Vorhersagedaten werden abgerufen..."
+
+msgctxt "#31910"
+msgid "Maps"
+msgstr "Karten"
+
+msgctxt "#31950"
+msgid "WEATHER"
+msgstr "WETTER"
+
+msgctxt "#31951"
+msgid "PICTURES"
+msgstr "BILDER"
+
+msgctxt "#31952"
+msgid "TV"
+msgstr "TV"
+
+msgctxt "#31953"
+msgid "VIDEOS"
+msgstr "VIDEOS"
+
+msgctxt "#31954"
+msgid "MOVIES"
+msgstr "FILME"
+
+msgctxt "#31955"
+msgid "TV SHOWS"
+msgstr "SERIEN"
+
+msgctxt "#31956"
+msgid "MUSIC"
+msgstr "MUSIK"
+
+msgctxt "#31957"
+msgid "PROGRAMS"
+msgstr "PROGRAMME"
+
+msgctxt "#31958"
+msgid "PLAY DISC"
+msgstr "DISC ABSPIELEN"
+
+msgctxt "#31959"
+msgid "SYSTEM"
+msgstr "OPTIONEN"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "RADIO"
diff --git a/addons/skin.confluence/language/Greek/strings.po b/addons/skin.confluence/language/resource.language.el_gr/strings.po
index 261e1fea1b..d61d30cda2 100644
--- a/addons/skin.confluence/language/Greek/strings.po
+++ b/addons/skin.confluence/language/resource.language.el_gr/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/xbmc-main/language/el/)\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/kodi-main/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
+"Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Αλλαγή"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Επιλογές Ενέργειας"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Απασχολημένο..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Απόκρυψη Πληροφοριών"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Επιλογές Προβολής"
+msgid "View options"
+msgstr "Επιλογές προβολής"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Πλήρης οθόνη"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Συνολική Διάρκεια"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Μουσική - Αρχεία"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Αντικείμενα"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Διάφορες Επιλογές"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Τοποθεσία"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Αφίσες"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Μικρογραφίες"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Εικόνες"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Πληροφορίες"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Ενέργειες"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Τώρα Εκτελείται"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "ΑΝΑΠΑΡΑΓΩΓΗ"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "ΑΝΑΖΗΤΗΣΗ"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Προρυθμίσεις Οπτικοποιήσεων"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Χρόνος Λήξης"
+msgid "End time"
+msgstr "Έως ώρα"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Αυτό το αρχείο είναι στοιβαγμένο, επιλέξτε από που να γίνει αναπαραγωγή."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Τρέχουσα Επιλογή"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Επιλογές Αρχικής Οθόνης"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Υπόβαθρο"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Εμφάνιση 'Παύσης' σε παρουσίαση διαφανειών"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Αναπαραγωγή Διαφημιστικών σε παράθυρο [COLOR=grey3](Παράθυρο Πληροφοριών Βίντεο Μόνο)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Διάφορες επιλογές"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Απόκρυψη των αναγνώσιμων σημαιών από τα ονόματα αρχείων βίντεο [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Απόκρυψη πλήκτρων του Κεντρικού Μενού"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Ενεργοποίηση Προσωπικού Υποβάθρου"
+msgid "Enable custom background"
+msgstr "Ενεργοποίηση προσαρμοσμένου υποβάθρου"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Επιλογές"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Εμφάνιση Άλμπουμ που Προστέθηκαν Πρόσφατα"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Εμφάνιση Βίντεο που Προστέθηκαν Πρόσφατα"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Υπομενού Εφαρμογών Αρχ. Οθόνης"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Απόκρυψη Fanart Υποβάθρου"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Υπόβαθρο το βίντεο που \"Τώρα Εκτελείται\""
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Υπόβαθρο η οπτικοποίηση που 'Τώρα Εκτελείται'"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Αναπαραγωγή μουσικής σειρών στη συλλογή (πρόσθετο TvTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Στίχοι"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Απόκρυψη Fanart κατά τις οπτικοποιήσεις πλήρους οθόνης"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Πρόσθετο στίχων"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Υπομενού Βίντεο Αρχ. Οθόνης"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Υπομενού Μουσικής Αρχ. Οθόνης"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Υπομενού Εικόνων Αρχ. Οθόνης"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Aπεικονίσεις οθόνης (OSD) Μουσικής"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Συντομεύσεις"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Επιλογή Τραγουδιού"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Πηγή Στίχων"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Βρέθηκαν"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Εύρεση Περισσότερων"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Επερχόμενα Επεισόδια"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Τρέχουσα Θερμοκρασία"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Τελευταία Ενημέρωση"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Πηγή δεδομένων"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Απόκρυψη Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Λεπτομέρειες Ταινίας"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Χρήση Μνήμης:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Αριθμός Κομματιού"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Εικόνα Fanart[CR][CR]Μη διαθέσιμη[CR][CR] Πιέστε το πλήκτρο για να ορίσετε"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Τρέχον Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Επιλογή Scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Επιλογές Σάρωσης Περιεχομένου"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Ορισμός Διαδρομής Fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Επιλεγμένο Προφίλ"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Τελευταία Είσοδος"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Επιλογή Τραγουδιού Karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Πρώτη Προβολή"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Επιλογές λίστας αναπ/γής"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Δημιουργήθηκε"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Ανάλυση"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Προστέθηκαν Πρόσφατα"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Ορίστηκε χρονοδιακόπτης![/B] [COLOR=grey2] - Τερματισμός συστήματος σε[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Πιέστε το πλήκτρο για αναπαραγωγή[CR][CR]του διαφημιστικού"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Λεπτομέρειες Άλμπουμ"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Παύση"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Διακοπή"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Μπροστά"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Πίσω"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Μενού Ταινιών"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Λήψη Υποτίτλων"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Προβολή ως 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Προεπιλογή"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Προεπιλογή χωρίς Κεφαλαία"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Βασισμένη σε Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]ΡΥΘΜΙΣΕΙΣ ΜΟΥΣΙΚΗΣ[/B][CR][CR]Διαχείριση της μουσικής συλλογής · Ρύθμιση αναπαραγωγής μουσικής · Επιλογές καταλόγου μουσικής[CR]Ρύθμιση υποβολής τραγουδιού · Επιλογές karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]ΡΥΘΜΙΣΕΙΣ ΕΙΚΟΝΩΝ[/B][CR][CR]Επιλογές καταλόγου εικόνων · Ρύθμιση παρουσίασης διαφανειών"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]ΡΥΘΜΙΣΕΙΣ ΚΑΙΡΟΥ[/B][CR][CR]Ορισμός τριών πόλεων για τις οποίες θα γίνεται πρόγνωση καιρού"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]ΡΥΘΜΙΣΕΙΣ ΣΥΣΤΗΜΑΤΟΣ[/B][CR][CR]Διαμόρφωση και βαθμονόμηση οθονών · Ρύθμιση εξόδου ήχου · Τηλεχειριστήρια · Εξοικονόμηση ενέργειας · Εντοπισμός σφαλμάτων (debug) · Κεντρικό κλείδωμα"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]ΡΥΘΜΙΣΕΙΣ ΠΡΟΣΘΕΤΩΝ[/B][CR][CR]Διαχείριση εγκατεστημένων πρόσθετων · Αναζήτηση και εγκατάσταση πρόσθετων από το kodi.tv[CR]Τροποποίηση ρυθμίσεων των πρόσθετων"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]ΡΥΘΜΙΣΗ ΤΗΛΕΟΡΑΣΗΣ[/B][CR][CR]Αλλαγή πληροφοριών πλήρους οθόνης · Διαχείριση των ρυθμίσεων δεδομένων EPG"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]ΡΥΘΜΙΣΕΙΣ ΥΠΗΡΕΣΙΩΝ[/B][CR][CR]Χειρισμός του Kodi μέσω UPnP και HTTP · Ρύθμιση κοινής χρήσης αρχείων[CR]Ενεργοποίηση Zeroconf · Ρύθμιση AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Αρχική βοήθεια...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Υπάρχει ένα μενού στο πλάι του παραθύρου, με επιπλέον επιλογές. Για να το ανοίξετε πιέστε το αντίστοιχο πλήκτρο κατεύθυνσης ή μεταφέρετε εκεί το ποντίκι σας.[CR][CR]Πιέστε 'Επιλογή' για να κλείσει αυτό το παράθυρο. Δε θα εμφανιστεί ξανά."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Διαθέσιμος υπότιτλος τοπικά"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Σύνδεση"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Επιλέξτε προφίλ χρήστη για το Kodi[CR]για να συνδεθείτε και να συνεχίσετε"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Εμφάνιση ή απόκρυψη της οθόνης σύνδεσης κατά την εκκίνηση."
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Επιλογή του προφίλ που θα χρησιμοποιηθεί κατά την εκκίνηση αν έχει απενεργοποιηθεί η οθόνη σύνδεσης."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Προγραμματισμένη Ώρα"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Προσθήκη Γκρουπ"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Μετονομασία Γκρουπ"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Διαγραφή Γκρουπ"
+msgid "TV"
+msgstr "Τηλεόραση"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Διαθέσιμα[CR]Γκρουπ"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Γκρουπ Καναλιών"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Ορίστηκε Χρονοδιακόπτης"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Επιλογές Καναλιού"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36ωρη Πρόγνωση"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Ωριαία Πρόγνωση"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Πρόγνωση Σαββατοκύριακου"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Ημερήσια Πρόγνωση"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Πρόγνωση"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Πιθανότητα Υετού"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Ανάκτηση πρόγνωσης καιρού..."
diff --git a/addons/skin.confluence/language/English (Australia)/strings.po b/addons/skin.confluence/language/resource.language.en_au/strings.po
index 44b113ea0e..db93193c19 100644
--- a/addons/skin.confluence/language/English (Australia)/strings.po
+++ b/addons/skin.confluence/language/resource.language.en_au/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xbmc-main/language/en_AU/)\n"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/kodi-main/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Change Your"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Power Options"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Working..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Hide Information"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "View Options"
+msgid "View options"
+msgstr "View options"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Full screen"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Total Duration"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Music - Files"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Items"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Misc Options"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Location"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poster Wrap"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Pic Thumbs"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Image Wrap"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Actions"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Now Playing"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "PLAYING"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "SEEKING"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualisation Presets"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "End Time"
+msgid "End time"
+msgstr "End time"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "This file is stacked, select the part you want to play from."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Current Selected"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Home screen options"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Background"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Show \"Paused\" in picture slide show"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Hide Main Menu Buttons"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Enable Custom Background"
+msgid "Enable custom background"
+msgstr "Enable custom background"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Options"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Show Recently added Albums"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Show Recently added Videos"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Home Page Programs Sub-menu"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Hide Background Fanart"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Show Background \"Now Playing\" Video"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Show Background \"Now Playing\" Visualisation"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Play TV theme songs in video library (TvTunes add-on)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lyrics"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Hide Fanart in full screen visualisation"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Lyrics Add-on"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Home Page Videos Sub-menu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Home Page Music Sub-menu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Home Page Pictures Sub-menu"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Music OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Choose Your Song"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Lyrics Source"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Found"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Find More Items"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Upcoming Episodes"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Current Temp"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Last Updated"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Data provider"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Hide Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Movie Details"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memory Used:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Track Number"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Current Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Choose a Scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Content Scanning Options"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Set Fanart Path"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Selected Profile"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Last Logged In"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke Song Selector"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Aired"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Playlist Options"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Created"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolution"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Recently Added"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Click button to play[CR][CR]Movie trailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Album Details"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pause"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stop"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Fast Forward"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Rewind"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Movie menu"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Download Subtitles"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Watch as 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Skin default"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skin default with no Caps"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial based"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "First run help...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Local subtitle available"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Login"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Select your Kodi user Profile[CR]to login and continue"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Show or hide the login screen at startup."
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Select the profile that will be used at startup when the login screen is disabled."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Scheduled Time"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Add Group"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Rename Group"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Delete Group"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Available[CR]Groups"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Channel Group"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Timer Set"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Channel Options"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 Hour Forecast"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Hourly Forecast"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Weekend Forecast"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Daily Forecast"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Forecast"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Chance of Precipitation"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Fetching forecast info..."
diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/resource.language.en_gb/strings.po
index a1ac6f7252..66020c58a5 100644
--- a/addons/skin.confluence/language/English/strings.po
+++ b/addons/skin.confluence/language/resource.language.en_gb/strings.po
@@ -1,30 +1,28 @@
-#[Consistency] Make terms, settings names, brands and other minutiae, consistent throughout file.
-#[Capitalization] Avoid capitalizing every second word. See http://grammarist.com/capitalization/
-#For example, prefer wording as "This new string" instead of "This New String".
-#[Referencing] If a suitable string already exists, reuse it, making a note of where it's used!
-#[Description / location] For example, "#. Description of some setting" used on "#: xbmc/addons/guidialogaddoninfo.cpp"
-#When writing a description or setting, refer to a setting name in quotes. See existing entries for guidance.
-#For example, "Press \"OK\" for \"All seasons\"" instead of "Press OK for All seasons" after first word.
-
 # Kodi Media Center language file
 # Addon Name: Confluence
 # Addon id: skin.confluence
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: English (http://www.transifex.com/projects/p/xbmc-main/language/en/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/kodi-main/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#Misc labels
+#[Consistency] Make terms, settings names, brands and other minutiae, consistent throughout file.
+#[Capitalization] Avoid capitalizing every second word. See http://grammarist.com/capitalization/
+#For example, prefer wording as "This new string" instead of "This New String".
+#[Referencing] If a suitable string already exists, reuse it, making a note of where it's used!
+#[Description / location] For example, "#. Description of some setting" used on "#: xbmc/addons/guidialogaddoninfo.cpp"
+#When writing a description or setting, refer to a setting name in quotes. See existing entries for guidance.
+#For example, "Press \"OK\" for \"All seasons\"" instead of "Press OK for All seasons" after first word.
 
 msgctxt "#31000"
 msgid "Change your"
diff --git a/addons/skin.confluence/language/English (New Zealand)/strings.po b/addons/skin.confluence/language/resource.language.en_nz/strings.po
index d28e4f18c3..856b0b0d81 100644
--- a/addons/skin.confluence/language/English (New Zealand)/strings.po
+++ b/addons/skin.confluence/language/resource.language.en_nz/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/xbmc-main/language/en_NZ/)\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/kodi-main/language/en_NZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_NZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Change Your"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Power Options"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Working..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Hide Information"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "View Options"
+msgid "View options"
+msgstr "View options"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Full screen"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Total Duration"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Music - Files"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Items"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Misc Options"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Location"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poster Wrap"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Pic Thumbs"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Image Wrap"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Actions"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Now Playing"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "PLAYING"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "SEEKING"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualisation Presets"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "End Time"
+msgid "End time"
+msgstr "End time"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "This file is stacked, select the part you want to play from."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Current Selected"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Home screen options"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Background"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Show \"Paused\" in picture slide show"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Hide Main Menu Buttons"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Enable Custom Background"
+msgid "Enable custom background"
+msgstr "Enable custom background"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Options"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Show Recently added Albums"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Show Recently added Videos"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Home Page Programs Sub-menu"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Hide Background Fanart"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Show Background \"Now Playing\" Video"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Show Background \"Now Playing\" Visualisation"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Play TV theme songs in video library (TvTunes add-on)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lyrics"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Hide Fanart in full screen visualisation"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Lyrics Add-on"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Home Page Videos Sub-menu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Home Page Music Sub-menu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Home Page Pictures Sub-menu"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Music OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Choose Your Song"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Lyrics Source"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Found"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Find More Items"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Upcoming Episodes"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Current Temp"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Last Updated"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Data provider"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Hide Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Movie Details"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memory Used:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Track Number"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Current Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Choose a Scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Content Scanning Options"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Set Fanart Path"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Selected Profile"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Last Logged In"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke Song Selector"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Aired"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Playlist Options"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Created"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolution"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Recently Added"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Click button to play[CR][CR]Movie trailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Album Details"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pause"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stop"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Fast Forward"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Rewind"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Movie menu"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Download Subtitles"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Watch as 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Skin default"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skin default with no Caps"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial based"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "First run help...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Local subtitle available"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Login"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Select your Kodi user Profile[CR]to login and continue"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Show or hide the login screen at startup."
@@ -500,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Select the profile that will be used at startup when the login screen is disabled."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Scheduled Time"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Add Group"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Rename Group"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Delete Group"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Available[CR]Groups"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Channel Group"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Timer Set"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Channel Options"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 Hour Forecast"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Hourly Forecast"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Weekend Forecast"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Forecast"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Chance of Precipitation"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Fetching forecast info..."
diff --git a/addons/skin.confluence/language/English (US)/strings.po b/addons/skin.confluence/language/resource.language.en_us/strings.po
index 3bb7067710..5d9bfae0a8 100644
--- a/addons/skin.confluence/language/English (US)/strings.po
+++ b/addons/skin.confluence/language/resource.language.en_us/strings.po
@@ -4,12 +4,12 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: English (US) (http://www.transifex.com/projects/p/xbmc-main/language/en_US/)\n"
+"Language-Team: English (United States) (http://www.transifex.com/projects/p/kodi-main/language/en_US/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,32 +17,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
-msgstr "Change Your"
+msgid "Change your"
+msgstr "Change your"
 
 msgctxt "#31003"
-msgid "Power Options"
-msgstr "Power Options"
+msgid "Power options"
+msgstr "Power options"
 
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Working..."
 
 msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Hide Information"
+msgid "Hide information"
+msgstr "Hide information"
 
 msgctxt "#31006"
-msgid "View Options"
-msgstr "View Options"
+msgid "View options"
+msgstr "View options"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Full screen"
 
 msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Total Duration"
+msgid "Total duration"
+msgstr "Total duration"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -61,28 +61,28 @@ msgid "Items"
 msgstr "Items"
 
 msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Misc Options"
+msgid "Misc options"
+msgstr "Misc options"
 
 msgctxt "#31027"
 msgid "Location"
 msgstr "Location"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poster Wrap"
+msgid "Poster wrap"
+msgstr "Poster wrap"
 
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Pic Thumbs"
+msgid "Pic thumbs"
+msgstr "Pic thumbs"
 
 msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Image Wrap"
+msgid "Image wrap"
+msgstr "Image wrap"
 
 msgctxt "#31033"
 msgid "Info"
@@ -93,8 +93,8 @@ msgid "Actions"
 msgstr "Actions"
 
 msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Now Playing"
+msgid "Now playing"
+msgstr "Now playing"
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -117,12 +117,12 @@ msgid "SEEKING"
 msgstr "SEEKING"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualization Presets"
+msgid "Visualisation presets"
+msgstr "Visualization presets"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "End Time"
+msgid "End time"
+msgstr "End time"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -157,8 +157,8 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "This file is stacked, select the part you want to play from."
 
 msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Current Selected"
+msgid "Current selected"
+msgstr "Current selected"
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -168,29 +168,21 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Background"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Show \"Paused\" in picture slide show"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Play trailers in a window [COLOR=grey3](Video information dialog only)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Hide Main Menu Buttons"
+msgid "Hide main menu buttons"
+msgstr "Hide main menu buttons"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Enable Custom Background"
+msgid "Enable custom background"
+msgstr "Enable custom background"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,28 +197,24 @@ msgid "Options"
 msgstr "Options"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Show Recently added Albums"
+msgid "Show recently added albums"
+msgstr "Show recently added albums"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Show Recently added Videos"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Home Page Programs Sub-menu"
+msgid "Show recently added videos"
+msgstr "Show recently added videos"
 
 msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Hide Background Fanart"
+msgid "Hide background fanart"
+msgstr "Hide background fanart"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Show Background \"Now Playing\" Video"
+msgid "Show background \"Now playing\" video"
+msgstr "Show background \"Now playing\" video"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Show Background \"Now Playing\" Visualization"
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Show background \"Now playing\" visualization"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -241,24 +229,12 @@ msgid "Lyrics"
 msgstr "Lyrics"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Hide Fanart in full screen visualization"
+msgid "Hide fanart in full screen visualisation"
+msgstr "Hide fanart in full screen visualization"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Lyrics Add-on"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Home Page Videos Sub-menu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Home Page Music Sub-menu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Home Page Pictures Sub-menu"
+msgid "Lyrics add-on"
+msgstr "Lyrics add-on"
 
 msgctxt "#31140"
 msgid "Music OSD"
@@ -277,92 +253,88 @@ msgid "Shortcuts"
 msgstr "Shortcuts"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Choose Your Song"
+msgid "Choose your song"
+msgstr "Choose your song"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Lyrics Source"
+msgid "Lyrics source"
+msgstr "Lyrics source"
 
 msgctxt "#31206"
 msgid "Found"
 msgstr "Found"
 
 msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Find More Items"
+msgid "Find more items"
+msgstr "Find more items"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Upcoming Episodes"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Current Temp"
+msgid "Upcoming episodes"
+msgstr "Upcoming episodes"
 
 msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Last Updated"
+msgid "Last updated"
+msgstr "Last updated"
 
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Data provider"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Hide Fanart"
+msgid "Hide fanart"
+msgstr "Hide fanart"
 
 msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Movie Details"
+msgid "Movie details"
+msgstr "Movie details"
 
 msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memory Used:"
+msgid "Memory used:"
+msgstr "Memory used:"
 
 msgctxt "#31310"
-msgid "Track Number"
-msgstr "Track Number"
+msgid "Track number"
+msgstr "Track number"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 
 msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Current Scraper"
+msgid "Current scraper"
+msgstr "Current scraper"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Choose a Scraper"
+msgid "Choose a scraper"
+msgstr "Choose a scraper"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Content Scanning Options"
+msgid "Content scanning options"
+msgstr "Content scanning options"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Set Fanart Path"
+msgid "Set fanart path"
+msgstr "Set fanart path"
 
 msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Selected Profile"
+msgid "Selected profile"
+msgstr "Selected profile"
 
 msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Last Logged In"
+msgid "Last logged in"
+msgstr "Last logged in"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke Song Selector"
+msgid "Karaoke song selector"
+msgstr "Karaoke song selector"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Aired"
 
 msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Playlist Options"
+msgid "Playlist options"
+msgstr "Playlist options"
 
 msgctxt "#31326"
 msgid "Created"
@@ -373,20 +345,20 @@ msgid "Resolution"
 msgstr "Resolution"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Recently Added"
+msgid "Recently added"
+msgstr "Recently added"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
+msgstr "Click button to play[CR][CR]movie trailer"
 
 msgctxt "#31331"
-msgid "Album Details"
-msgstr "Album Details"
+msgid "Album details"
+msgstr "Album details"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -397,8 +369,8 @@ msgid "Stop"
 msgstr "Stop"
 
 msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Fast Forward"
+msgid "Fast forward"
+msgstr "Fast forward"
 
 msgctxt "#31354"
 msgid "Rewind"
@@ -409,8 +381,8 @@ msgid "Movie menu"
 msgstr "Movie menu"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Download Subtitles"
+msgid "Download subtitles"
+msgstr "Download subtitles"
 
 msgctxt "#31360"
 msgid "Watch as 2D"
@@ -429,8 +401,8 @@ msgid "Skin default"
 msgstr "Skin default"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skin default with no Caps"
+msgid "Skin default with no caps"
+msgstr "Skin default with no caps"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -448,21 +420,13 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -473,12 +437,8 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
-msgstr "First run help...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialog. It will not appear again."
+msgid "First run help..."
+msgstr "First run help..."
 
 msgctxt "#31413"
 msgid "Local subtitle available"
@@ -489,8 +449,8 @@ msgid "Login"
 msgstr "Login"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Select your Kodi user Profile[CR]to login and continue"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Select your Kodi user profile[CR]to login and continue"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,64 +461,60 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Select the profile that will be used at startup when the login screen is disabled."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Scheduled Time"
+msgid "Scheduled time"
+msgstr "Scheduled time"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31503"
-msgid "Add Group"
-msgstr "Add Group"
+msgid "Add group"
+msgstr "Add group"
 
 msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Rename Group"
+msgid "Rename group"
+msgstr "Rename group"
 
 msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Delete Group"
+msgid "Delete group"
+msgstr "Delete group"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Available[CR]Groups"
 
 msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Channel Group"
+msgid "Channel group"
+msgstr "Channel group"
 
 msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Timer Set"
+msgid "Timer set"
+msgstr "Timer set"
 
 msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Channel Options"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 Hour Forecast"
+msgid "Channel options"
+msgstr "Channel options"
 
 msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Hourly Forecast"
+msgid "Hourly forecast"
+msgstr "Hourly forecast"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Weekend Forecast"
+msgid "Weekend forecast"
+msgstr "Weekend forecast"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Daily Forecast"
+msgid "Daily forecast"
+msgstr "Daily forecast"
 
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Forecast"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Chance of Precipitation"
+msgid "Chance of precipitation"
+msgstr "Chance of precipitation"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
diff --git a/addons/skin.confluence/language/Esperanto/strings.po b/addons/skin.confluence/language/resource.language.eo/strings.po
index 5f94228b38..1d4db2c493 100644
--- a/addons/skin.confluence/language/Esperanto/strings.po
+++ b/addons/skin.confluence/language/resource.language.eo/strings.po
@@ -4,18 +4,22 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Esperanto (http://www.transifex.com/projects/p/xbmc-main/language/eo/)\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/kodi-main/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgctxt "#31006"
+msgid "View options"
+msgstr "Vido Options"
+
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Tutekrane"
diff --git a/addons/skin.confluence/language/Spanish (Argentina)/strings.po b/addons/skin.confluence/language/resource.language.es_ar/strings.po
index 628080dc90..da6145df30 100644
--- a/addons/skin.confluence/language/Spanish (Argentina)/strings.po
+++ b/addons/skin.confluence/language/resource.language.es_ar/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/xbmc-main/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kodi-main/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Cambiar su"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opciones de energía"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Cargando..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Ocultar información"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Opciones de vista"
+msgid "View options"
+msgstr "Vista"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Duración total"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Archivos - música"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Elementos"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opciones varias"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Ubicación"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Flujo de póster"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Miniaturas"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Flujo de imagen"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Acciones"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Reproduciendo"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "REPRODUCIENDO"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "BUSCANDO"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualizaciones preestablecidas"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Hora de finalización"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Este archivo está agrupado, selecciona la parte desde la que desea reproducir."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Seleccionado"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opciones de la pantalla principal"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Fondo"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Mostrar \"Pausa\" en modo presentación de imágenes"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Reproducir avances en ventana [COLOR=grey3](Sólo diálogo de información de video)[/COLOR] "
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Otras opciones"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ocultar marcas de lectura de archivos de video [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ocultar botones del menú principal"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Activar Fondo Personalizado"
+msgid "Enable custom background"
+msgstr "Habilitar fondo personalizado"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opciones"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Mostrar últimos discos añadidos"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Mostrar últimos videos añadidos"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Submenú de programas de la pantalla principal"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Ocultar el Fanart del fondo"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Mostrar video en reproducción en el fondo"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Mostrar visualización \"Reproduciendo ahora\" en el fondo"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Reproducir canciones de series en la colección de video (complemento TvTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Letras"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Ocultar Fanart con visualizaciones a pantalla completa"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Add-on para letras"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Submenú de videos de la pantalla principal"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Submenú de música de la pantalla principal"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Submenú de fotos de la pantalla principal"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD de música"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Accesos directos"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Elija su canción"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Fuente para letras"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Encontrados"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Encuentra más elementos"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Próximos episodios"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Última actualización"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Proveedor de datos"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Ocultar fanarts"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detalles de la película"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memoria usada:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Número de pista"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Imagen fanart[CR][CR]no disponible[CR][CR]Click para elegir"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Scraper actual"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Elige un scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opciones de escanéo de contenido"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Selecciona ruta del fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Perfil seleccionado"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Último ingreso de sesión"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Selector de canción de karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Estrenado"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opciones de lista de reproducción"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Creado"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolución"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Adiciones recientes"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Temporizador activado[/B] [COLOR=grey2] - El sistema se apagará en[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Click para reproducir[CR][CR]trailer de película"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalles del disco"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pausar"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Detener"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Avance rápido"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Retroceder"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menú película"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Descargar subtítulos"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Mirar como 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Por defecto"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Por defecto sin Mayúsculas"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Basada en Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]Configura las opciones de MÚSICA[/B][CR][CR]Administre su colección de música · Ajusta reproducción de música · Cambia opciones de listas de música[CR]Configura envío de canciones · Configura el karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]Configura las opciones de IMAGEN[/B][CR][CR]Cambia opciones de listas de imágenes - Configura presentación de diapositivas"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]Configura las opciones de EL TIEMPO[/B][CR][CR]Establece tres ciudades para información meteorológica"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]Configura las opciones de SISTEMA[/B][CR][CR]Configura y calibra la pantalla - Configura salida de audio - Configura mandos a distancia[CR]Establece las opciones de ahorro de energía - Habilita depuración de errores - Configura bloqueo maestro"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]Configura los ADD-ONS[/B][CR][CR]Administre addons instalados · Busca e instala addons desde kodi.tv[CR]Modifica la configuración de los addons"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]CONFIGURAR OPCIONES DE TV[/B][CR][CR]Cambiar info pantalla completa ·  Especificar datos de guía GEP"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]AJUSTES DE SERVICIOS[/B][CR][CR]Ajustes para controlar Kodi por UPnP y HTTP - Ajustes de archivos compartidos[CR]Activar Zeroconf - Ajustes de AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Ayuda para la primera vez..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Esta pestaña significa que hay un menú oculto a un lado de esta ventana que contiene opciones adicionales para esta sección. Para acceder al menú, desplácese a la izquierda con el mando a distancia o el teclado o sitúe el puntero del ratón sobre la pestaña. [CR][CR] Haga clic en \"Aceptar\" para cerrar este cuadro de diálogo. Este no volverá a aparecer."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Subtitulo local disponible"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Ingresar"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Seleccione su perfil de usuario de Kodi[CR]para ingresar y continuar"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Mostrar u ocultar la pantalla de ingreso al iniciar."
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Seleccionar el perfil que se usará en el inicio cuando la pantalla de ingreso esta deshabilitada."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Hora programada"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV en directo"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Añdadir Grupo"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Renombrar Grupo"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Borrar Grupo"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grupos[CR]disponibles"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grupo de canales"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Programar grabación"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opciones de canal"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Pronóstico de 36 hs"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Pronóstico por hora"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Pronóstico semanal"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Pronóstico diario"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Pronóstico"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Probabilidad de precipitación"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Obteniendo información meteorológica..."
@@ -586,7 +314,7 @@ msgstr "VIDEOS"
 
 msgctxt "#31954"
 msgid "MOVIES"
-msgstr "PELICULAS"
+msgstr "PELÍCULAS"
 
 msgctxt "#31955"
 msgid "TV SHOWS"
@@ -594,7 +322,7 @@ msgstr "SERIES DE TV"
 
 msgctxt "#31956"
 msgid "MUSIC"
-msgstr "MUSICA"
+msgstr "MÚSICA"
 
 msgctxt "#31957"
 msgid "PROGRAMS"
diff --git a/addons/skin.confluence/language/Spanish/strings.po b/addons/skin.confluence/language/resource.language.es_es/strings.po
index ba14f38186..aa6759a20e 100644
--- a/addons/skin.confluence/language/Spanish/strings.po
+++ b/addons/skin.confluence/language/resource.language.es_es/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/xbmc-main/language/es/)\n"
+"Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/kodi-main/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
+"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Cambiar tus"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opciones de energía"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Cargando..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Ocultar información"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Opciones de vista"
+msgid "View options"
+msgstr "Vista"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Duración total"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Archivos - música"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Elementos"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opciones varias"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Ubicación"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Flujo de póster"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Miniaturas"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Flujo de imagen"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Acciones"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Reproduciendo ahora"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "REPRODUCIENDO"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "BUSCANDO"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualizaciones preestablecidas"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Hora de finalización"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Este archivo está agrupado, seleccione la parte desde la que desea reproducir."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Seleccionado"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opciones de la pantalla principal"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Fondo"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Mostrar \"Pausa\" en modo presentación de imágenes"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Reproducir trailers en ventana [COLOR=grey3](Sólo diálogo de información de vídeo)[/COLOR] "
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Opciones varias"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ocultar marcas de lectura de archivos de vídeo [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ocultar botones del menú principal"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Activar Fondo Personalizado"
+msgid "Enable custom background"
+msgstr "Habilitar fondo personalizado"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opciones"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Mostrar últimos discos añadidos"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Mostrar últimos vídeos añadidos"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Submenú de programas de la pantalla principal"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Ocultar el Fanart del fondo"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Mostrar vídeo en reproducción en el fondo"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Mostrar vídeo en reproducción en el fondo"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Reproducir sintonías en la colección de vídeo (complemento TvTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Letras"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Ocultar Fanart con visualizaciones a pantalla completa"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Add-on para letras"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Submenú de vídeos de la pantalla principal"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Submenú de música de la pantalla principal"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Submenú de imágenes de la pantalla principal"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD de música"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Accesos directos"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Elige tu canción"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Fuente para letras"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Encontrados"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Encuentra más elementos"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Próximos episodios"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Última actualización"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Proveedor de Datos"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Ocultar Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detalles de la película"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memoria usada:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Pista número"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Imagen fanart[CR][CR]no disponible[CR][CR] Click para elegir"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Scraper actual"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Elige un scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opciones de escaneo de contenido"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Seleccionar ruta del fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Perfil seleccionado"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Última sesión el"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Selector de canción de karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Emitido"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opciones de lista de reproducción"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Creado"
@@ -373,21 +197,13 @@ msgid "Resolution"
 msgstr "Resolución"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Añadido recientemente"
+msgid "Recently added"
+msgstr "Recientemente añadidos"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Temporizador activado[/B] [COLOR=grey2] - El sistema se apagará en[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Click para reproducir[CR][CR]trailer de película"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalles del disco"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pausar"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Detener"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Avance rápido"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Retroceder"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menú película"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Descargar subtítulos"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Ver en 2D"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Por defecto"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Por defecto sin Mayúsculas"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Basada en Arial"
@@ -448,22 +252,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]Configura las opciones de MÚSICA[/B][CR][CR]Administra tu colección de música · Ajusta reproducción de música · Cambia opciones de listas de música[CR]Configura sumisión de canciones · Configura el karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]Configura las opciones de IMAGEN[/B][CR][CR]Cambia opciones de listas de imágenes - Configura presentación de diapositivas"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]Configura las opciones de EL TIEMPO[/B][CR][CR]Establece tres ciudades para información metereológica"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]Configura las opciones de SISTEMA[/B][CR][CR]Configura y calibra la pantalla - Configura salida de audio - Configura mandos a distancia[CR]Establece las opciones de ahorro de energía - Habilita depuración de errores - Configura bloqueo maestro"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]Configura los ADD-ONS[/B][CR][CR]Administra tus addons instalados · Busca e instala addons desde kodi.tv[CR]Modifica la configuración de los addons"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]Configura las opciones de TV[/B][CR][CR]Cambiar info pantalla completa ·  Especificar datos de guía EPG"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]Ajustes del SERVICIO[/B][CR][CR]Ajustes para controlar Kodi por UPnP y HTTP - Ajustes de compartición de archivos[CR]Activar Zeroconf - Ajustes de AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Ayuda para la primera vez..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Esta pestaña significa que hay un menú a un lado de esta ventana que contiene opciones adicionales para esta sección. Para acceder al menú, desplácese a la izquierda con el mando a distancia o el teclado, o sitúe el puntero del ratón sobre la pestaña. [CR][CR]Haga clic en \"Aceptar\" para cerrar este cuadro de diálogo. No volverá a aparecer."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Subtítulo local disponible"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Inicio de sesión"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Seleccione su perfil de usuario de Kodi[CR]para ingresar y continuar"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Mostrar u ocultar la pantalla de inicio de sesión al inicio."
@@ -500,66 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Seleccionar el perfil que será usado en el inicio cuando no se muestra la pantalla de inicio de sesión."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Hora programada"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV en directo"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Añadir Grupo"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Renombrar Grupo"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Borrar Grupo"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grupos[CR]disponibles"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grupo de canales"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Programar grabación"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opciones de canal"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Pronóstico de 36 hs"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Pronóstico por hora"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Pronóstico semanal"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Pronóstico Diario"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Pronóstico"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Probabilidad de precipitación"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Obteniendo información meteorológica..."
diff --git a/addons/skin.confluence/language/Spanish (Mexico)/strings.po b/addons/skin.confluence/language/resource.language.es_mx/strings.po
index 1e9228d0c9..23825f0094 100644
--- a/addons/skin.confluence/language/Spanish (Mexico)/strings.po
+++ b/addons/skin.confluence/language/resource.language.es_mx/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/xbmc-main/language/es_MX/)\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/kodi-main/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Cambiar tu"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opciones de Energía"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Trabajando..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Esconder Información"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Opciones de Vista"
+msgid "View options"
+msgstr "Vista"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Pant. Completa"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Duración Total"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Música - Archivos"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Elementos"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opciones Variadas"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Ubicación"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Envoltura de Póster"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Imágenes Miniatura"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Envoltura de Imágen"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Acciones"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Reproduciendo Ahora"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "REPRODUCIENDO"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "BUSQUEDA"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Preajustes de Visualización"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Hora de Finalización"
+msgid "End time"
+msgstr "Tiempo de término"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Este archivo esta apilado, seleccion la parte desde la que desea reproducir."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Acualmente Seleccionado"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opciones de pantalla principal"
@@ -168,25 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Background"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Mostrar \"Pausa\" en presentacion de imágenes"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Opciones variadas"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ocultar las marcas leídas de nombres de archivo de vídeo [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Esconder Botones del Menú Principal"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Activar Fondo Personalizado"
+msgid "Enable custom background"
+msgstr "Habilitar Fondo Personalizado"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -200,22 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opciones"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Mostrar Álbumes añadidos Recientemente"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Mostrar Videos añadidos Recientemente"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Esconder Fanart de Fondo"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Mostrar Video de Fondo \"Reproduciendo Ahora\""
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Reproducir canciones temáticas de TV en la biblioteca de Video (TvTunes add-on)"
@@ -228,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Letras"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Ocultar Fanart en visualización de pantalla completa"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Add-on de Liricas"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Submenú de Videos de Pantalla Principal"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Submenú de Música de Pantalla Principal"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Submenú de Imágenes de Pantalla Principal"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD de Música"
@@ -264,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Atajos"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Elige tu canción"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Fuente de Liricas"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Encontrado"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Encontrar más elementos"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Próximos Episodios"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura Actual"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Última Actualización"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Proveedor de datos"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Esconder Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detalles de la Película"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memoria Usada:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Número de Pista"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Imágen fanart[CR][CR]No disponible[CR][CR] Hacer Click en el botón para establecer"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Scraper Actual"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Elegir un Scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opciones de Escaneo de Contenido"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Establecer ruta de Fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Perfil seleccionado"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Último Inicio de Sesión en"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Seleccionador de Canción Karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Transmitido"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opciones de Lista de Reproducción"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Creado"
@@ -360,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolución"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Añadidos Recientemente"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Temporizador ajustado![/B] [COLOR=grey2] - Apagado automático de sistema en[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Hacer Click en el botón para Reproducir[CR][CR]el trailer de la Película"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalles del Álbum"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pausa"
@@ -384,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Detener"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Avanzar"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Rebobinar"
@@ -396,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menú de Película"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Descargar Subtítulos"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Ver en 2D"
@@ -416,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Según skin"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Según skin sin Caps"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Basado en Arial"
@@ -436,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]CONFIGURAR AJUSTES DE MÚSICA[/B][CR][CR]Administrar tu biblioteca de música · Configurar las opciones de reproducción de música · Cambiar las opciones de listado de música [CR]Configurar el envío de canciones · Ajustar opciones de karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURAR AJUSTES DE IMAGEN[/B][CR][CR]Cambiar las opciones de listado de imágenes · Configurar presentaciones"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURAR AJUSTES DE CLIMA[/B][CR][CR]Establecer tres ciudades para recopilar información sobre el clima"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]CONFIGURAR AJUSTES DE SISTEMA[/B][CR][CR]Configurar y calibrar las pantallas · Configurar salida de audio · Configurar controles remotos[CR]Configurar opciones de ahorro de energía · Habilitar depuración · Configurar Bloqueo Maestro"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURAR ADD-ONS[/B][CR][CR]Administrar tus Add-ons instalados · Buscar e instalar add-ons desde kodi.tv[CR]Modificar la configuración de Add-ons"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]CONFIGURAR AJUSTES DE TV[/B][CR][CR]Cambiar información de pantalla completa · Administrar ajustes de datos EPG"
@@ -460,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]CONFIGURAR AJUSTES DE SERVICIO[/B][CR][CR]Configuración de control de Kodi a través de UPnP y HTTP · Configurar el uso compartido de archivos[CR]HabilitarZeroconf · Configurar AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Ayuda de primera vez..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Esta pestaña significa que existe un menú al lado de esta ventana que contiene opciones extra para esta sección. Para acceder al menú, navegue a la izquierda con su control remoto o teclado, o posicione el puntero del ratón sobre la pestaña. [CR][CR] Presione \"Aceptar\" para cerrar este diálogo. No aparecerá nuevamente."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Subtítulo local disponible"
@@ -476,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Iniciar sesión"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Selecciona tu Perfil Kodi[CR]para iniciar sesión y continuar"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Mostrar u ocultar pantalla de inicio al inciar."
@@ -488,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Seleccionar el perfil que será usado al iniciar cuando la pantalla de inicio esta deshabilitada"
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Horario Programado"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV en Vivo"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Agregar Grupo"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Renombrar Grupo"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Borrar Grupo"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grupos[CR]Disponibles"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grupo de Canales"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Fijar Temporizador"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opciones de Canal"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Pronóstico de 36 Horas"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Pronóstico por Hora"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Pronóstico del Fin de Semana"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Pronóstico"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Cambio de Precipitación"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Obteniendo información de pronóstico"
diff --git a/addons/skin.confluence/language/Estonian/strings.po b/addons/skin.confluence/language/resource.language.et_ee/strings.po
index 41978216d6..9ff3b00669 100644
--- a/addons/skin.confluence/language/Estonian/strings.po
+++ b/addons/skin.confluence/language/resource.language.et_ee/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/xbmc-main/language/et/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kodi-main/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
+"Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Määra"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Energia valikud"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Toimetamine..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Peida informatsioon"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Vaate valikud"
+msgid "View options"
+msgstr "Vaate seaded"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Täisekraan"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Kogukestvus"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Muusika - Failid"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Nimetused"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Muud valikud"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Asukoht"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poster ääreni"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fännipildid"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Pisipildid"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Pilt ääreni"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Tegevused"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Hetkel mängib"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "MÄNGIB"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "OTSIMINE"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualiseeringute eelseadistused"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Lõpu aeg"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "See fail on järjehoidjaga. Vali koht, millest soovid taasesitust jätkata."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Hetkel valitud"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Avalehe valikud"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Taust"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Näita piltide slaidiesitusel teksti \"peatatud\""
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Esita treilereid aknas [COLOR=grey3](ainult Video dialoogiaken)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Muud valikud"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Peida lugemise märgistus videofailide nimedest [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Peida peamenüü nupud"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Kasuta kohandatud taustapilti"
+msgid "Enable custom background"
+msgstr "Luba kohandatud taust"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Valikud"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Näita viimati lisatud albumeid"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Näita viimati lisatud videoid"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Peamenüü Programmide alammenüü"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Peida fännipiltide taust"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Näita taustal \"Hetkel mängib\" videot"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Näita taustal \"Hetkel mängib\" visuaali"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Esita videoteegis sarjade tunnusmuusikat (TvTunes lisamoodul)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Laulutekst"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Peida fännikunst täisekraanivaates"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Laulutekstide lisamoodul"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Peamenüü Videote alammenüü"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Peamenüü Muusika alammenüü"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Peamenüü Piltide alammenüü"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Muusika OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Otseteed"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Vali laul"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Laulutekstide allikas"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Leitud"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Otsi lisa"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Tulevased osad"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Ilm praegu"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Viimati uuendatud"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Teenusepakkuja"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Peida fännipildid"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Filmi andmed"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Mälukasutus:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Loo number"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fännipilt[CR][CR]ei ole saadaval[CR][CR]Määramiseks vajuta nuppu"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Käibiv kaabits"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Vali kaabits"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Sisu skaneerimise valikud"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Määra fännipiltide asukoht"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Valitud profiil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Viimane sisselogimine"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke lauluvalija"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Eetris"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Esitusloendi valikud"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Loodud"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolutsioon"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Viimati lisatud"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Taimer seatud![/B] [COLOR=grey2] - Süsteemi automaatne seiskamine[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Esitamiseks vajuta nuppu[CR][CR]Filmi treiler"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Albumi andmed"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Paus"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stopp"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Kiirelt edasi"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Tagasi"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Filmi menüü"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Lae subtiitrid alla"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Vaata 2Dna"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Rüü vaikeväärtus"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Rüü vaikeväärtus ilma suurtähtedeta"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial-il põhinev"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGUREERI MUUSIKA SEADEID[/B][CR][CR]Halda enda muusikateeki · Määra muusika esitamise seaded · Muuda muusikaloendi valikuid[CR]Seadista loo esitamine · Seadista karaoke valikud"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGUREERI PILDI SEADEID[/B][CR][CR]Määra pildiloendi seaded · Konfigureeri slaidiesitlusi"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGUREERI ILMA SEADEID[/B][CR][CR]Vali ilmaprognooside koostamiseks kolm linna"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGUREERI SÜSTEEMI SEADEID[/B][CR][CR]Seadista ja kalibreeri ekraane · Konfigureeri heliväljundit · Seadista kaugjuhtimine[CR]Määra energiasäästu valikud· Luba silumine · Seadista pealukk"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGUREERI LISAMOODULEID[/B][CR][CR]Halda enda lisamooduleid · Sirvi ja paigalda lisamooduleid aadressilt kodi.tv[CR]Muuda lisamoodulite seadeid"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]SEADISTA TV SEADEID[/B][CR][CR]Muuda täisekraani infot · Halda elektroonilise saatekava seadeid"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGUREERI TEENUSE SEADEID[/B][CR][CR]Seadista Kodi juhtimine UPnP ja HTTP kaudu · Seadista failide jagamine[CR]Luba Zeroconf · Konfigureeri AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Esmakasutuse abi...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "See märge näitab, et selle akna taga on peidus lisaseadete menüü.  Menüü nägemiseks vajutage puldil või klaviatuuril vasakut noolt või suunake hiir selle märke kohale. [CR][CR]Vajutage dialoogi sulgemiseks \"Ok\". See ei avane uuesti."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Lokaalsed subtiitrid on saadaval"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Logi sisse"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Vali enda Kodi profiil[CR]ja jätka"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Käivitumisel näita või peida sisselogimiseekraan."
@@ -500,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Vali profiil, mida kasutada käivitumisel, kui sisselogimise ekraan on keelatud."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Plaanitud aeg"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Lisa grupp"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Nimeta grupp ümber"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Kustuta grupp"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Olemasolevad[CR]grupid"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanalite grupp"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Taimer määratud"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanalite valikud"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 tunni prognoos"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Igatunnine prognoos"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Nädalalõpu prognoos"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Ilmateade"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Võimalus sademeteks"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Ilmateate andmete hankimine..."
diff --git a/addons/skin.confluence/language/Basque/strings.po b/addons/skin.confluence/language/resource.language.eu_es/strings.po
index 0767752ff9..256414bdb5 100644
--- a/addons/skin.confluence/language/Basque/strings.po
+++ b/addons/skin.confluence/language/resource.language.eu_es/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/xbmc-main/language/eu/)\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/kodi-main/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
+"Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Aldatu zure"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Indar aukerak"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Lanean..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Ezkutatu informazioa"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Ikusi aukerak"
+msgid "View options"
+msgstr "Ikusteko aukerak"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Pantaila osoa"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Iraupen osoa"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musika - Fitxategiak"
@@ -60,10 +44,6 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Elementuak"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Bestelako aukerak"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Kokalekua"
@@ -80,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Akzioak"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Orain erreproduzitzen"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "ERREPRODUZITZEN"
@@ -101,7 +77,7 @@ msgid "REWIND"
 msgstr "ATZERA"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Amaiera ordua"
 
 msgctxt "#31050"
@@ -136,10 +112,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Fitxategi hau pilatuta dago, hautatu erreproduzitzea nahi duzun zatia."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Unean hautatutakoak"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Etxe pantaila aukerak"
@@ -152,13 +124,9 @@ msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Bestelako aukerak"
 
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ezkutatu menu nagusi botoiak"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Gaitu atzealde pertsonalizatua"
+msgid "Enable custom background"
+msgstr "Gaitu atzeko irudi pertsonalizatua"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -172,18 +140,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Aukera"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Ikusi azkenaldian igotako albumak"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Ikusi azkenaldian igotako bideoak"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Ezkutatu Atzealdeko Fanarta"
-
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Letrak"
@@ -192,70 +148,14 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Lasterbideak"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Hautatu zure kanta"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Aurkitua"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Bilatu elementu gehiago"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Hurrengo atalak"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Uneko tenperatura"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Azken eguneraketa"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Datu hornitzailea"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Ezkutatu Fanart-a"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Pelikula xehetasunak"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Erabilitako memoria:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Pista zenbakia"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Eduki arakatze aukerak"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Hautatutako profila"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Azken saioa : "
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke kanta antzemalea"
-
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Erreprodukzio-zerrenda aukerak"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Sortua"
@@ -264,14 +164,6 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Bereizmena"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Azkenaldiak gehituak"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Album xehetasunak"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pausatu"
@@ -280,10 +172,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Gelditu"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Azkar aurrera"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Atzera"
@@ -292,10 +180,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Pelikula menua"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Deskargatu azpitituluak"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Ikusi 2D bezala"
@@ -308,10 +192,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Skin lehenetsia"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Lehen exekuzio laguntza..."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Azpititulu lokala erabilgarri"
@@ -320,54 +200,14 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Sartu"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Hautatu zure Kodi profila[CR] saio hasi eta jarraitzeko"
-
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "TB"
 
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Gehitu taldea"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Berrizendatu taldea"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Ezabatu taldea"
-
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kate taldea"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kate aukerak"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 orduko iragarpena"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Orduroko iragarpena"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Astebukaerako iragarpena"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Iragarpena"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Euri aukera"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Iragarpen argibideak eskuratzen"
diff --git a/addons/skin.confluence/language/Persian/strings.po b/addons/skin.confluence/language/resource.language.fa_af/strings.po
index 4ff45052a0..986fab2e02 100644
--- a/addons/skin.confluence/language/Persian/strings.po
+++ b/addons/skin.confluence/language/resource.language.fa_af/strings.po
@@ -4,22 +4,18 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/xbmc-main/language/fa/)\n"
+"Language-Team: Persian (Afghanistan) (http://www.transifex.com/projects/p/kodi-main/language/fa_AF/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
+"Language: fa_AF\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgctxt "#31006"
-msgid "View Options"
-msgstr "نمایش تنظیمات"
-
 msgctxt "#31023"
 msgid "Playing"
 msgstr "در حال پخش"
@@ -49,7 +45,7 @@ msgid "Skin default"
 msgstr "استاندارد"
 
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "تلوزیون"
 
 msgctxt "#31952"
diff --git a/addons/skin.confluence/language/resource.language.fa_ir/strings.po b/addons/skin.confluence/language/resource.language.fa_ir/strings.po
new file mode 100644
index 0000000000..db58094917
--- /dev/null
+++ b/addons/skin.confluence/language/resource.language.fa_ir/strings.po
@@ -0,0 +1,337 @@
+# Kodi Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon Provider: Jezz_X, Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/kodi-main/language/fa_IR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa_IR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "در حال کار..."
+
+msgctxt "#31006"
+msgid "View options"
+msgstr "مشاهده تنظیمات"
+
+msgctxt "#31008"
+msgid "Full screen"
+msgstr "تمام صفحه"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "موسیقی - فایل ها"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "در حال پخش"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "صفحه"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "موضوعات"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "مکان"
+
+msgctxt "#31029"
+msgid "Fanart"
+msgstr "فن آرت"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "اطلاعات"
+
+msgctxt "#31039"
+msgid "Actions"
+msgstr "عملیات"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "در حال پخش"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "مکث شده"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "حرکت سریع به جلو"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "حرکت سریع به عقب"
+
+msgctxt "#31046"
+msgid "SEEKING"
+msgstr "جستجو"
+
+msgctxt "#31049"
+msgid "End time"
+msgstr "زمان پایان"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "مرتب سازی صعودی"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "مرتب سازی نزولی"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "باز کردن لیست پخش"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "ذخیره لیست پخش"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "بستن لیست پخش"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "سیستم فایل های موسیقی"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "لیست پخش فعلی"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "این فایل چند بخشی است, قسمت مورد نظر را برای پخش انتخاب کنید."
+
+msgctxt "#31101"
+msgid "Home screen options"
+msgstr "تنظیمات صفحه ی اصلی"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "پس زمینه"
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr "تنظیمات متفرقه"
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr "مسیر پس زمینه"
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "مخفی کردن"
+
+msgctxt "#31112"
+msgid "Options"
+msgstr "گزینه ها"
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "پخش موسیقی تیتر تلویزیون در کتابخانه ویدئویی (افزونه TvTunes)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvTunes"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "اشعار"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "موسیقی"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "ویدیو"
+
+msgctxt "#31142"
+msgid "Settings level"
+msgstr "سطح تنظیمات"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "میانبرها"
+
+msgctxt "#31206"
+msgid "Found"
+msgstr "پیدا شده"
+
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "ارائه دهنده اطلاعات"
+
+msgctxt "#31311"
+msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
+msgstr "تصویر فن آرت [CR][CR] در دسترس نیست. [CR][CR] برای تعیین آن دکمه را فشار دهید."
+
+msgctxt "#31322"
+msgid "Aired"
+msgstr "پخش شده"
+
+msgctxt "#31326"
+msgid "Created"
+msgstr "ایجاد شده"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "رزولیشن"
+
+msgctxt "#31329"
+msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
+msgstr "[B] تایمر تنظیم شد! [/B] [COLOR=grey2] زمان مانده تا خاموشی سیستم: [/COLOR]"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "مکث"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "توقف"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "بازکشت"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "منو فیلم"
+
+msgctxt "#31360"
+msgid "Watch as 2D"
+msgstr "تماشا بصورت دو بعدی"
+
+msgctxt "#31361"
+msgid "Change mode"
+msgstr "تغییر حالت"
+
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "فعال شده"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "پیش فرض پوسته"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "بر اساس قلم Arial"
+
+msgctxt "#31400"
+msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
+msgstr "[B] تنظیمات ظاهر برنامه [/B]  [CR][CR] تعویض پوسته - انتخاب زبان و منطقه - تنظیمات لیست های پخش [CR] راه اندازی محافظ صفحه نمایش."
+
+msgctxt "#31401"
+msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
+msgstr "[B] تنظیمات ویدئو[/B] [CR][CR] مرتب سازی کتابخانه ویدئویی. تنظیمات پخش ویدئو. انتخاب گزینه های مرتب سازی ویدئو. [CR] انتخاب قلم زیرنویس ها."
+
+msgctxt "#31402"
+msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
+msgstr "[B] تنظیمات موسیقی[/B] [CR][CR] مرتب سازی کتابخانه موسیقی. تنظیمات پخش موسیقی. انتخاب گزینه های مرتب سازی موسیقی . [CR] انتخاب گزینه های همخوانی."
+
+msgctxt "#31406"
+msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
+msgstr "[B] تنظیمات سیستم [/B] [CR][CR] راه اندازی و کالیبره کردن نمایشگر ها. تنظیم پخش صدا. تنظیم کنترل از راه دور. [CR] انتخاب گزینه های صرفه جویی در انرژی - فعال کردن خطا یابی. تنظیم قفل اصلی."
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
+msgstr "[B] تنظیمات تلویزیون[/B] [CR][CR] تغییر اطلاعات نمایش تمام صفحه - مدیریت تنظیمات اطلاعات راهنمای الکترونیکی برنامه ها."
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr "[B] تنظیمات خدمات [/B] [CR][CR] تنظیم امکان دسترسی به Kodi از طریق UPnP و HTTP. تنظیم اشتراک گذاری فایل ها. [CR] تنظیمات Zeroconf و AirPlay ."
+
+msgctxt "#31413"
+msgid "Local subtitle available"
+msgstr "زیر نویس محلی موجود"
+
+msgctxt "#31420"
+msgid "Login"
+msgstr "ورود"
+
+msgctxt "#31422"
+msgid "Show or hide the login screen at startup."
+msgstr "نمایش/عدم نمایش صفحه ورود در ابتدا"
+
+msgctxt "#31423"
+msgid "Select the profile that will be used at startup when the login screen is disabled."
+msgstr "انتخاب کابری که در زمان غیر فعال بودن صفحه ورود مورد استفاده قرار گیرد."
+
+msgctxt "#31502"
+msgid "TV"
+msgstr "تلویزیون"
+
+msgctxt "#31506"
+msgid "Available[CR]Groups"
+msgstr "گروه های [CR]موجود"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "پیش بینی"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "دریافت اطلاعات پیش بینی..."
+
+msgctxt "#31910"
+msgid "Maps"
+msgstr "نقشه ها"
+
+msgctxt "#31950"
+msgid "WEATHER"
+msgstr "آب و هوا"
+
+msgctxt "#31951"
+msgid "PICTURES"
+msgstr "تصاویر"
+
+msgctxt "#31952"
+msgid "TV"
+msgstr "تلویزیون"
+
+msgctxt "#31953"
+msgid "VIDEOS"
+msgstr "ویدیوها"
+
+msgctxt "#31954"
+msgid "MOVIES"
+msgstr "فیلم ها"
+
+msgctxt "#31955"
+msgid "TV SHOWS"
+msgstr "برنامه های تلویزیونی"
+
+msgctxt "#31956"
+msgid "MUSIC"
+msgstr "موسیقی"
+
+msgctxt "#31957"
+msgid "PROGRAMS"
+msgstr "برنامه ها"
+
+msgctxt "#31958"
+msgid "PLAY DISC"
+msgstr "اجرای CD/DVD"
+
+msgctxt "#31959"
+msgid "SYSTEM"
+msgstr "سیستم"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "رادیو"
diff --git a/addons/skin.confluence/language/Finnish/strings.po b/addons/skin.confluence/language/resource.language.fi_fi/strings.po
index 8c31c49aed..324950cd28 100644
--- a/addons/skin.confluence/language/Finnish/strings.po
+++ b/addons/skin.confluence/language/resource.language.fi_fi/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/xbmc-main/language/fi/)\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/kodi-main/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
+"Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Määritä"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Virta-asetukset"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Suoritetaan..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Piilota tiedot"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Näkymän asetukset"
+msgid "View options"
+msgstr "Näkymä valinnat"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Kokoruutu"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Kokonaiskesto"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musiikki - Tiedostot"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Kohdetta"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Muut asetukset"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Paikkakunta"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Julistekierto"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanitaide"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Kuva kuvake"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Kuvakierto"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Tiedot"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Toiminnot"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Nyt toistetaan"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "TOISTETAAN"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "HAKEE"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualisoinnin esiasetukset"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Päättymisaika"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Tämä tiedosto on pinottu, valitse osa jonka haluat toistaa."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Nyt valittuna"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Päävalikon asetukset"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Tausta"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Näytä \"Tauko\" kuvaesityksessä"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Toista trailerit ikkunassa [COLOR=grey3](Vain videon informaatiodialogi)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Yleiset asetukset"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Piilota tiedostojen nimistä luetut merkinnät [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Piilota päävalikon painikkeet"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Aktivoi mukautettu tausta"
+msgid "Enable custom background"
+msgstr "Valinnainen taustakuva käytössä"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Asetukset"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Näytä viimeksi lisätyt albumit"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Näytä viimeksi lisätyt videot"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Kotisivu Ohjelmat Alavalikko"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Piilota taustan fanitaide"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Näytä taustalla \"Nyt katsellaan\"-video"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Näytä taustalla \"Nyt soi\"-visualisaatio"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Toista TV-tunnusmusiikit videokirjastossa (TvTunes-lisäosa)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Sanoitukset"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Piilot fanitaide kun visualisointi toistetaan koko ruudussa"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Sanoitukset-lisäosa"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Kotisivu Videot Alavalikko"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Kotisivu Musiikki Alavalikko"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Kotisivu Kuvat Alavalikko"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Musiikki-OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Valitse kappale"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Sanoitusten lähde"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Löytyi"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Etsi lisää kohteita"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Tulevat jaksot"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Tämänhetkinen säätila"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Viimeksi päivitetty"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Tietojen tarjoaja"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Piilota fanitaide"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Elokuvan tiedot"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Käytetty muisti:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Kappalenumero"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanitaide kuvaa[CR][CR]ei ole saatavilla[CR][CR]Klikkaa asettaaksesi"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Nykyinen hakupaikka"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Valitse hakupaikka"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Sisällön hakuasetukset"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Polku"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Valittu profiili"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Viimeksi kirjauduttu"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke kappaleen valinta"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Esitetty"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Toistolistan asetukset"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Luotu"
@@ -373,21 +197,13 @@ msgid "Resolution"
 msgstr "Resoluutio"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Viimeksi lisätty"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Ajastus[/B] [COLOR=grey2] - Aikaa järjestelmän sammuttamiseen[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Paina painiketta katsoaksesi[CR][CR]elokuvaesittelyn"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Albumin tiedot"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Tauko"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Pysäytä"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Kelaa eteenpäin"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Kelaa taaksepäin"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Elokuvavalikko"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Lataa tekstitykset"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Katso 2D:nä"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Ulkoasun oletus"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Ulkoasun oletus ilman isoja kirjaimia"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial pohjainen"
@@ -448,22 +252,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]Muokkaa musiikki-asetuksia[/B][CR][CR]Hallitse musiikkikirjastoa · Aseta musiikkitoiston asetukset · Vaihda musiikkilistauksen[CR]asetuksia · Aseta kappaleen lähetysasetuksia · Aseta karaoke-asetukset"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]Muokkaa kuva-asetuksia[/B][CR][CR]Aseta kuvalistauksen asetukset · Määritä kuvaesityksiä"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]Muokkaa sää-asetuksia[/B][CR][CR]Aseta kolme kaupunkia joista noudetaan säätiedot"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]Muokkaa järjestelmän asetuksia[/B][CR][CR]Aseta ja kalibroi näyttö · Määritä äänilähtö · Aseta kauko-ohjaus[CR]Aseta sähkönsäästöasetukset · Ota debuggaus käyttöön · Muokkaa pääkäyttäjän lukituksia"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]Muokkaa lisäosia[/B][CR][CR]Hallitse asennettuja lisäosia · Valitse ja asenna lisäosia kodi.tv:sta[CR]Muokkaa lisäosien asetuksia"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]MÄÄRITÄ TV-ASETUKSET[/B][CR][CR]Vaihda koko ruudun infoa · Hallitse EPG-tietojen asetuksia"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Määritä Kodi:n kauko ohjaus käyttäen UPnP:tä ja HTTP:tä · Määritä tiedostonjako[CR]Kytke päälle Zeroconf · Määritä AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Ensimmäisen käynnistyksen apu..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Tämä välilehti merkitsee ikkunan sivussa olevan tämän osaston ekstravalikon. Käyttääksesi valikkoa, siirry vasemmalle kaukosäädintä, näppäimistöä tai hiiren kursoria käyttäen välilehdessä. [CR][CR]Paina \"Ok\" sulkeaksesi tämän ikkunan. Se ei ilmesty tämän jälkeen."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Paikallinen tekstitys saatavilla"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Kirjaudu"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Valitse Kodi-käyttäjäprofiili[CR]kirjautuaksesi sisään"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Näytä tai piilota kirjautumisruutu käynnistyksessä."
@@ -500,62 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Valitse se profiili, jota käytetään käynnistyksessä, kun kirjautumisruutu on poiskytketty."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Kellonaika"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV-lähetys"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Lisää ryhmä"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Muuta ryhmän nimeä"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Poista ryhmä"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Saatavilla olevat[CR]ryhmät"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanavaryhmä"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Ajastettu"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanavan valinnat"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 tunnin ennuste"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Tunneittainen ennuste"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Viikonlopun ennuste"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Ennuste"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Sateen mahdollisuus"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Noudetaan ennusteen tietoja..."
diff --git a/addons/skin.confluence/language/Faroese/strings.po b/addons/skin.confluence/language/resource.language.fo_fo/strings.po
index 91f9a8f1fd..ca05f23095 100644
--- a/addons/skin.confluence/language/Faroese/strings.po
+++ b/addons/skin.confluence/language/resource.language.fo_fo/strings.po
@@ -4,46 +4,26 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Faroese (http://www.transifex.com/projects/p/xbmc-main/language/fo/)\n"
+"Language-Team: Faroese (Faroe Islands) (http://www.transifex.com/projects/p/kodi-main/language/fo_FO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fo\n"
+"Language: fo_FO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Broyta tína"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Streym stillingar"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Arbeiði..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Goym upplýsing"
-
-msgctxt "#31006"
-msgid "View Options"
-msgstr "Vísimøguleikar"
-
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Fullan skerm"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Samla spælitíð"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Tónleikur - Fílir"
@@ -60,10 +40,6 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Lutir"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Ymiskar stillingar"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Stað"
@@ -72,18 +48,10 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fjepparatilfar"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Lítlar myndir"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Upplýsing"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Spæli nú"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "SPÆLI"
@@ -101,8 +69,8 @@ msgid "REWIND"
 msgstr "AFTUR"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Liðugt"
+msgid "End time"
+msgstr "Enda tíð"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -144,20 +112,12 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Bakgrund"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Vís \"Steðgur\" í myndarøð"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Ymiskar stillingar"
 
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Goym snarvegir á høvuðsmynd"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Tendra serliga bakgrund"
 
 msgctxt "#31110"
@@ -172,30 +132,10 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Stillingar"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Vís nýggjar tónleikaútgávur"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Vís nýggjar video"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Goym bakgrund av fjepparatilfari"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Vís bakgrund \"Spæli nú\" video"
-
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Sangtekstir"
 
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Víðkan til sangtekstir"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Tónleika OSD"
@@ -208,94 +148,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Snarvegir"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Vel títt lag"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Kelda til sangtekstir"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Fann"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Finn fleiri lutir"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Komandi brot"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Verðandi hiti"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Seinast dagført"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Veitari av upplýsing"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Goym fjepparatilfar"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Upplýsing um filmin"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Brúkt minni:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Lag nummar"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fjepparamynd [CR][CR]Ikki tøk[CR][CR] Trýst á knøtt at stilla"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Verðandi Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Vel ein Scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Stilling til lesing av tilfari"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Áset stíggja til fjepparatilfar"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Verðandi uppseting"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Seinasta innritan"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Val av Karaoke lag "
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Víst"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Stilling av spælilista"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Framleitt"
@@ -304,22 +172,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Skermstødd"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Nýggjar útgávur"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Tíðarstilling![/B] [COLOR=grey2] - Skipanin sløkkir um[/COLOR"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Trýst á knøtt fyri at spæla[CR][CR]Filmbrot"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Upplýsing um útgávu"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Steðga"
@@ -328,10 +184,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Gevst"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Skjótt framm"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Aftur"
@@ -340,10 +192,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Film valmynd"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Heinta undirtekstir"
-
 msgctxt "#31362"
 msgid "Enabled"
 msgstr "Virkin"
@@ -352,10 +200,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Vanlig útsjónd"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Vanlig útsjónd uttan Caps"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Bygt á Arial"
@@ -372,90 +216,26 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]STILLINGAR FYRI TÓNLEIK[/B][CR][CR]Umsit títt tónleikasavn · Áset stillingar fyri spæling av tónleiki · Broyt stilling til vísing av tónleiki[CR]Áset skráseting av lagi · Áset stillingar fyri karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]STILLINGAR FYRI MYNDIR[/B][CR][CR]Áset stilling fyri vísing av myndum · Stilla myndarøð"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]STILLINGAR FYRI VEÐURLÍKINDI[/B][CR][CR]Áset tríggjar býir til heintan av veðurlíkindi"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]STILLINGAR FYRI SKIPAN[/B][CR][CR]Set upp og stilla skermar · Stilla ljóð · Stilla fjarstýringar[CR]Stilla streymsparing · Tendra debugging · Áset høvuðslás"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]STILLA VÍÐKANIR[/B][CR][CR]Umsit innlagdar víðkanir · Leita eftir og innlegg víðkanir frá kodi.tv[CR]Tillaga víðkanir"
-
 msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]STILLA TÆNASTUR[/B][CR][CR]Áset stýring av Kodi umvegis UPnP ella HTTP · Stilla fíludeiling[CR]Tendra Zeroconf · Stilla AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Hjálp til fyrstu koyring..."
-
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Vel eina Kodi uppseting[CR]fyri at innrita og halda áfram"
-
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Tíðarætlan"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Beinleiðis sjónvarp"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Stovna bólk"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Broyt bólk"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Strika bólk"
+msgid "TV"
+msgstr "Sjónvarp"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Tøkir[CR]bólkar"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Rás bólkur"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Tíðarstýring ásett"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Rás stillingar"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 tíma forsøgn"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Tíma forsøgn"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Vikuskiftis forsøgn"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Forsøgn"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Útlit fyri regni"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Heinti upplýsing til forsøgn..."
diff --git a/addons/skin.confluence/language/French (Canada)/strings.po b/addons/skin.confluence/language/resource.language.fr_ca/strings.po
index 9f6247520a..000525a8c0 100644
--- a/addons/skin.confluence/language/French (Canada)/strings.po
+++ b/addons/skin.confluence/language/resource.language.fr_ca/strings.po
@@ -4,12 +4,12 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: French (Canada) (http://www.transifex.com/projects/p/xbmc-main/language/fr_CA/)\n"
+"Language-Team: French (Canada) (http://www.transifex.com/projects/p/kodi-main/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
+msgid "Change your"
 msgstr "Changer vos"
 
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "Options d'alimentation"
 
 msgctxt "#31004"
@@ -29,19 +29,19 @@ msgid "Working..."
 msgstr "En cours…"
 
 msgctxt "#31005"
-msgid "Hide Information"
+msgid "Hide information"
 msgstr "Masquer les informations"
 
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Options d'affichage"
+msgid "View options"
+msgstr "Options de visualisation"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Plein écran"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Durée totale"
 
 msgctxt "#31022"
@@ -61,7 +61,7 @@ msgid "Items"
 msgstr "Éléments"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "Options diverses"
 
 msgctxt "#31027"
@@ -69,7 +69,7 @@ msgid "Location"
 msgstr "Emplacement"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
+msgid "Poster wrap"
 msgstr "Défilement d'affiches"
 
 msgctxt "#31029"
@@ -77,11 +77,11 @@ msgid "Fanart"
 msgstr "Fanart"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "Imagettes"
 
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "Défilement d'images"
 
 msgctxt "#31033"
@@ -93,7 +93,7 @@ msgid "Actions"
 msgstr "Actions"
 
 msgctxt "#31040"
-msgid "Now Playing"
+msgid "Now playing"
 msgstr "Lecture en cours"
 
 msgctxt "#31042"
@@ -117,11 +117,11 @@ msgid "SEEKING"
 msgstr "RECHERCHE"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr "Préréglages de visualisation"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Heure de fin"
 
 msgctxt "#31050"
@@ -157,7 +157,7 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Ce fichier est empilé, sélectionnez le point à partir duquel vous souhaitez lire."
 
 msgctxt "#31061"
-msgid "Current Selected"
+msgid "Current selected"
 msgstr "Sélection actuelle"
 
 msgctxt "#31101"
@@ -168,28 +168,20 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Arrière-plan"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Afficher « En pause » dans le diaporama d'images"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
 msgstr "Lire les bandes-annonces dans une fenêtre [COLOR=grey3]Boîte d'informations sur la vidéo uniquement)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Options diverses"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Masquer l'indicateur déjà vu des noms de fichiers des vidéos [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
+msgid "Hide main menu buttons"
 msgstr "Masquer les boutons du menu principal"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Activer l'arrière-plan personnalisé"
 
 msgctxt "#31110"
@@ -205,27 +197,23 @@ msgid "Options"
 msgstr "Options"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "Afficher les albums ajoutés récemment"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
+msgid "Show recently added videos"
 msgstr "Afficher les vidéos ajoutées récemment"
 
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Page d'accueil - Sous-menu Programmes"
-
 msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Masquer le Fanart d’arrière-plan"
+msgid "Hide background fanart"
+msgstr "Masquer le fanart d’arrière-plan"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Afficher la vidéo en cours de lecture en arrière-plan"
+msgid "Show background \"Now playing\" video"
+msgstr "Afficher la vidéo d'arrière-plan « Lecture en cours »"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
+msgid "Show background \"Now playing\" visualisation"
 msgstr "Afficher la visualisation d'arrière-plan « Lecture en cours »"
 
 msgctxt "#31126"
@@ -241,25 +229,13 @@ msgid "Lyrics"
 msgstr "Paroles"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Cacher le Fanart en mode plein écran"
+msgid "Hide fanart in full screen visualisation"
+msgstr "Cacher le fanart en visualisation plein écran"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
+msgid "Lyrics add-on"
 msgstr "Addiciel de paroles"
 
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Page d'accueil - Sous-menu Vidéos"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Page d'accueil - Sous-menu Musique"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Page d'accueil - Sous-menu Images"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Affichage à l'écran Musique"
@@ -277,11 +253,11 @@ msgid "Shortcuts"
 msgstr "Raccourcis"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
+msgid "Choose your song"
 msgstr "Choisissez votre morceau"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
+msgid "Lyrics source"
 msgstr "Source des paroles"
 
 msgctxt "#31206"
@@ -289,19 +265,15 @@ msgid "Found"
 msgstr "Trouvé"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Trouver plus d'éléments"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "Épisodes à venir"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Température actuelle"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Dernière mise à jour"
 
 msgctxt "#31303"
@@ -309,51 +281,51 @@ msgid "Data provider"
 msgstr "Fournisseur de données"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
+msgid "Hide fanart"
 msgstr "Masquer le fanart"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Détails du film"
 
 msgctxt "#31309"
-msgid "Memory Used:"
+msgid "Memory used:"
 msgstr "Mémoire utilisée :"
 
 msgctxt "#31310"
-msgid "Track Number"
-msgstr "Numéro de la piste"
+msgid "Track number"
+msgstr "Numéro de piste"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "Image Fanart[CR][CR]Indisponible[CR][CR] Cliquer sur le bouton pour définir"
+msgstr "Image Fanart[CR][CR]non disponible[CR][CR] Cliquer sur le bouton pour définir"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "Extracteur de contenu actuel"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "Choisir un extracteur de contenu"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Options de balayage de contenu"
+msgid "Content scanning options"
+msgstr "Options de balayage du contenu"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
+msgid "Set fanart path"
 msgstr "Définir le chemin du fanart"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "Profil sélectionné"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Dernière connexion"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
+msgid "Karaoke song selector"
 msgstr "Sélecteur de chanson karaoké"
 
 msgctxt "#31322"
@@ -361,7 +333,7 @@ msgid "Aired"
 msgstr "Diffusé"
 
 msgctxt "#31325"
-msgid "Playlist Options"
+msgid "Playlist options"
 msgstr "Options de liste de lecture"
 
 msgctxt "#31326"
@@ -373,7 +345,7 @@ msgid "Resolution"
 msgstr "Résolution"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Ajouté récemment"
 
 msgctxt "#31329"
@@ -381,11 +353,11 @@ msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Minuterie réglée ![/B] [COLOR=grey2] - Arrêt automatique du système dans[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
 msgstr "Cliquer sur le bouton pour lire[CR][CR]la bande-annonce du film"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "Détails de l'album"
 
 msgctxt "#31351"
@@ -397,7 +369,7 @@ msgid "Stop"
 msgstr "Arrêt"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "Avance rapide"
 
 msgctxt "#31354"
@@ -409,7 +381,7 @@ msgid "Movie menu"
 msgstr "Menu du film"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
+msgid "Download subtitles"
 msgstr "Télécharger les sous-titres"
 
 msgctxt "#31360"
@@ -429,7 +401,7 @@ msgid "Skin default"
 msgstr "Valeur par défaut de l'habillage"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
+msgid "Skin default with no caps"
 msgstr "Valeur par défaut de l'habillage sans majuscule"
 
 msgctxt "#31392"
@@ -448,20 +420,12 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]CONFIGURER LES  PARAMÈTRES DE LA MUSIQUE[/B][CR][CR]Gérer la musithèque · Définir les options de lecture · Changer les options de listage de la musique[CR]Paramétrer les envois de chansons · Définir les options de karaoké"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURER LES PARAMÈTRES DES IMAGES[/B][CR][CR]Définir les options de listage des images · Configurer les diaporamas"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURER LES PARAMÈTRES DE LA MÉTÉO[/B][CR][CR]Définir trois villes pour lesquelles recueillir des informations météorologiques"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]CONFIGURER LES PARAMÈTRES DU SYSTÈME[/B][CR][CR]Configurer et calibrer les écrans · Configurer les sorties audio · Configurer les télécommandes[CR]Régler les options de gestion d'énergie · Activer le débogage · Configurer le verrou maître"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
 msgstr "[B]CONFIGURER LES ADDICIELS[/B][CR][CR]Gérer les addiciels installés - Parcourir et installer des addiciels à partir de kodi.tv[CR]Modifier les paramètres des addiciels"
 
 msgctxt "#31409"
@@ -473,13 +437,9 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]CONFIGURER LES PARAMÈTRES DES SERVICES[/B][CR][CR]Configurer le contrôle de Kodi par UPnP et HTTP · Configurer le partage de fichiers[CR]Activer Zéroconf · Configurer AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
+msgid "First run help..."
 msgstr "Aide au premier démarrage..."
 
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Cet onglet signale qu'il y a un menu sur le côté de cette fenêtre contenant des options supplémentaires pour cette section.  Pour accéder au menu, naviguez vers la gauche avec votre télécommande ou votre clavier ou placez le pointeur de votre souris sur l'onglet. [CR][CR]Cliquez sur Ok pour fermer cette boîte de dialogue. Elle n’apparaîtra plus."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Sous-titres locaux disponibles"
@@ -489,7 +449,7 @@ msgid "Login"
 msgstr "Connexion"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
+msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Choisissez votre profil d'utilisateur Kodi[CR]pour vous connecter et continuer"
 
 msgctxt "#31422"
@@ -501,23 +461,23 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Choisir le profil qui sera utilisé lors du démarrage quand l'écran de connexion est désactivé"
 
 msgctxt "#31501"
-msgid "Scheduled Time"
+msgid "Scheduled time"
 msgstr "Heure planifiée"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Télé en direct"
+msgid "TV"
+msgstr "Télé"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "Ajouter un groupe"
 
 msgctxt "#31504"
-msgid "Rename Group"
+msgid "Rename group"
 msgstr "Renommer le groupe"
 
 msgctxt "#31505"
-msgid "Delete Group"
+msgid "Delete group"
 msgstr "Supprimer le groupe"
 
 msgctxt "#31506"
@@ -525,31 +485,27 @@ msgid "Available[CR]Groups"
 msgstr "Groupes[CR]disponibles"
 
 msgctxt "#31509"
-msgid "Channel Group"
+msgid "Channel group"
 msgstr "Groupe de chaînes"
 
 msgctxt "#31510"
-msgid "Timer Set"
+msgid "Timer set"
 msgstr "Réglage de la minuterie"
 
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "Options des chaînes"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Prévisions sur 36 heures"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "Prévisions heure par heure"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "Prévisions pour la fin de semaine"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "Prévisions quotidiennes"
 
 msgctxt "#31905"
@@ -557,7 +513,7 @@ msgid "Forecast"
 msgstr "Prévisions"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "Risque de précipitations"
 
 msgctxt "#31909"
diff --git a/addons/skin.confluence/language/French/strings.po b/addons/skin.confluence/language/resource.language.fr_fr/strings.po
index 1e5490f166..899dccab88 100644
--- a/addons/skin.confluence/language/French/strings.po
+++ b/addons/skin.confluence/language/resource.language.fr_fr/strings.po
@@ -4,24 +4,24 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: French (http://www.transifex.com/projects/p/xbmc-main/language/fr/)\n"
+"Language-Team: French (France) (http://www.transifex.com/projects/p/kodi-main/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
+"Language: fr_FR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
-msgstr "Changement des"
+msgid "Change your"
+msgstr "Changer votre"
 
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "Options d'alimentation"
 
 msgctxt "#31004"
@@ -29,11 +29,11 @@ msgid "Working..."
 msgstr "En cours…"
 
 msgctxt "#31005"
-msgid "Hide Information"
+msgid "Hide information"
 msgstr "Masquer les informations"
 
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Options d'affichage"
 
 msgctxt "#31008"
@@ -41,7 +41,7 @@ msgid "Full screen"
 msgstr "Plein écran"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Durée totale"
 
 msgctxt "#31022"
@@ -58,31 +58,23 @@ msgstr "Page"
 
 msgctxt "#31025"
 msgid "Items"
-msgstr "Objets"
+msgstr "Eléments"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "Options diverses"
 
 msgctxt "#31027"
 msgid "Location"
 msgstr "Emplacement"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Galerie d'affiches"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Vignettes"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Galerie d'images"
+msgid "Pic thumbs"
+msgstr "Miniatures"
 
 msgctxt "#31033"
 msgid "Info"
@@ -93,8 +85,8 @@ msgid "Actions"
 msgstr "Actions"
 
 msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Lecture en cours"
+msgid "Now playing"
+msgstr "En lecture"
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -117,12 +109,12 @@ msgid "SEEKING"
 msgstr "RECHERCHE"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr "Préréglages de visualisation"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Échéance"
+msgid "End time"
+msgstr "Heure de fin"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -134,15 +126,15 @@ msgstr "Tri : descendant"
 
 msgctxt "#31055"
 msgid "Open playlist"
-msgstr "Ouvrir une playliste"
+msgstr "Ouvrir une liste de lecture"
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "Sauvegarder la playliste"
+msgstr "Sauvegarder la liste de lecture"
 
 msgctxt "#31057"
 msgid "Close playlist"
-msgstr "Fermer la playliste"
+msgstr "Fermer la liste de lecture"
 
 msgctxt "#31058"
 msgid "System music files"
@@ -150,14 +142,14 @@ msgstr "Fichiers musique du système"
 
 msgctxt "#31059"
 msgid "Current playlist"
-msgstr "Playliste actuelle"
+msgstr "Liste de lecture actuelle"
 
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Ce fichier est empilé, sélectionnez le point à partir duquel vous souhaitez lire."
 
 msgctxt "#31061"
-msgid "Current Selected"
+msgid "Current selected"
 msgstr "Sélection actuelle"
 
 msgctxt "#31101"
@@ -168,28 +160,20 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Arrière-plan"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Afficher « Pause » dans le diaporama d'images"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Lire les bandes annonces dans une fenêtre [COLOR=grey3](Écran d'information sur la vidéo uniquement)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Lire les bandes-annonces dans une fenêtre [COLOR=grey3](Juste l'information de la vidéo)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Options diverses"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Masquer l'indicateur de fichiers vidéo déjà vus [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
+msgid "Hide main menu buttons"
 msgstr "Masquer les boutons du menu principal"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Activer l'arrière-plan personnalisé"
 
 msgctxt "#31110"
@@ -205,32 +189,20 @@ msgid "Options"
 msgstr "Options"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Afficher les albums récemment ajoutés"
+msgid "Show recently added albums"
+msgstr "Montrer les albums ajoutés récemment"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Afficher les vidéos récemment ajoutées"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Page d'accueil du sous-menu Programmes"
+msgid "Show recently added videos"
+msgstr "Montrer les vidéos ajoutées récemment"
 
 msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Masquer le Fanart d’arrière-plan"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Afficher la vidéo en cours de lecture en arrière-plan"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Afficher la visualisation en cours de lecture en arrière-plan"
+msgid "Hide background fanart"
+msgstr "Masquer le fanart d'arrière-plan"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Jouer les génériques TV dans la vidéothèque (extension TvTunes)"
+msgstr "Lire les génériques TV dans la vidéothèque (extension TvTunes)"
 
 msgctxt "#31127"
 msgid "TvTunes"
@@ -241,24 +213,12 @@ msgid "Lyrics"
 msgstr "Paroles"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Cacher Fanart en mode plein écran"
+msgid "Hide fanart in full screen visualisation"
+msgstr "Masquer le fanart en visualisation plein écran"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Extension gérant les paroles"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Page d'accueil du sous-menu Vidéos"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Page d'accueil du sous-menu Musique"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Page d'accueil du sous-menu Images"
+msgid "Lyrics add-on"
+msgstr "Extensions de paroles"
 
 msgctxt "#31140"
 msgid "Music OSD"
@@ -277,31 +237,27 @@ msgid "Shortcuts"
 msgstr "Raccourcis"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Choisissez votre chanson"
+msgid "Choose your song"
+msgstr "Choisir votre morceau"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Source pour les paroles"
+msgid "Lyrics source"
+msgstr "Source des paroles"
 
 msgctxt "#31206"
 msgid "Found"
 msgstr "Trouvé"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Trouver plus d'éléments"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "Prochains épisodes"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Température actuelle"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Dernière mise à jour"
 
 msgctxt "#31303"
@@ -309,19 +265,19 @@ msgid "Data provider"
 msgstr "Fournisseur de données"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Sans Fanart"
+msgid "Hide fanart"
+msgstr "Masquer le fanart"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Détails du film"
 
 msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Mémoire utilisée :"
+msgid "Memory used:"
+msgstr "Mémoire utilisée :"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "Numéro de la piste"
 
 msgctxt "#31311"
@@ -329,40 +285,40 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Image Fanart[CR][CR]Indisponible[CR][CR] Cliquer sur le bouton pour définir"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "Scraper actuel"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Choisissez un Scraper"
+msgid "Choose a scraper"
+msgstr "Choisir un scraper"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Options de scan de contenu"
+msgid "Content scanning options"
+msgstr "Options des contenus scannés"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Définir le chemin du Fanart"
+msgid "Set fanart path"
+msgstr "Définir le chemin du fanart"
 
 msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Profil sélectionné"
+msgid "Selected profile"
+msgstr "Profil sélectioné"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Dernière connexion"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Sélecteur chanson karaoké"
+msgid "Karaoke song selector"
+msgstr "Sélecteur de chanson Karaoke"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Diffusé"
 
 msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Options de playliste"
+msgid "Playlist options"
+msgstr "Options des playlistes"
 
 msgctxt "#31326"
 msgid "Created"
@@ -373,19 +329,19 @@ msgid "Resolution"
 msgstr "Résolution"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Récemment ajouté"
+msgid "Recently added"
+msgstr "Ajouté récemment"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Minuterie réglée ![/B] [COLOR=grey2] - Arrêt automatique du système dans[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Cliquer sur le bouton pour lire[CR][CR]la bande-annonce du film"
+msgid "Click button to play[CR][CR]movie trailer"
+msgstr "Cliquer le bouton pour lire[CR][CR]la bande-annonce"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "Détails de l'album"
 
 msgctxt "#31351"
@@ -397,7 +353,7 @@ msgid "Stop"
 msgstr "Stop"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "Avance rapide"
 
 msgctxt "#31354"
@@ -409,8 +365,8 @@ msgid "Movie menu"
 msgstr "Menu Film"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Télécharger les sous-titres"
+msgid "Download subtitles"
+msgstr "Téléchargement de sous-titres"
 
 msgctxt "#31360"
 msgid "Watch as 2D"
@@ -426,11 +382,7 @@ msgstr "Activé"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "Par défaut"
-
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Par défaut sans majuscule"
+msgstr "Prédéfini par l'habillage"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -438,7 +390,7 @@ msgstr "Basé sur Arial"
 
 msgctxt "#31400"
 msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
-msgstr "[B]CONFIGURATION DES PARAMÈTRES APPARENCE[/B][CR][CR]Changer le thème · Définir la langue et la région · Changer les options de liste de fichiers[CR]Paramétrer l'économiseur d'écran"
+msgstr "[B]CONFIGURATION DES PARAMÈTRES D'APPARENCE[/B][CR][CR]Changer l'habillage · Définir la langue et la région · Changer les options de liste de fichiers[CR]Configurer un économiseur d'écran"
 
 msgctxt "#31401"
 msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
@@ -446,23 +398,15 @@ msgstr "[B]CONFIGURATION DES PARAMÈTRES VIDÉO[/B][CR][CR]Gérer votre médiath
 
 msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
-msgstr "[B]CONFIGURATION DES PARAMÈTRES MUSIQUE[/B][CR][CR]Gérer votre médiathèque musique · Définir les options de lecture · Changer les options des listes de musique[CR]Paramétrer les soumissions de chansons · Définir les options karaoké"
-
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURATION DES PARAMÈTRES IMAGE[/B][CR][CR]Définir les options de lecture · Configurer les diaporamas"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURATION DES PARAMÈTRES MÉTÉO[/B][CR][CR]Choisir trois villes pour lesquelles recueillir les informations météorologiques"
+msgstr "[B]CONFIGURATION DES PARAMÈTRES MUSIQUE[/B][CR][CR]Gérer votre médiathèque musicale · Définir les options de lecture · Changer les options des listes de musique[CR]Paramétrer les soumissions de chansons · Définir les options karaoké"
 
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
-msgstr "[B]CONFIGURATION DES PARAMÈTRES SYSTÈME[/B][CR][CR]Configurer et calibrer les écrans · Configurer les sorties audio · Configurer les périphériques de contrôle[CR]Définir les options de gestion d'énergie · Activer le débogage · Configurer la sécurité"
+msgstr "[B]CONFIGURATION DES PARAMÈTRES SYSTÈME[/B][CR][CR]Configurer et calibrer les écrans · Configurer les sorties audio · Configurer les périphériques de contrôle[CR]Définir les options de gestion d'énergie · Activer le débogage · Configurer le verrouillage administrateur"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURATION DES EXTENSIONS[/B][CR][CR]Gérer les extensions installées · Recherche et installation d'extensions depuis kodi.tv[CR]Modifier les paramètres des extensions"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]CONFIGURATION DES EXTENSIONS[/B][CR][CR]Gérer vos extensions installées · Parcourir et installer les extensions depuis  kodi.tv[CR]Modifier les paramètres des externsions"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -473,24 +417,20 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]CONFIGURATION DES PARAMÈTRES DE SERVICE[/B][CR][CR]Configurer le contrôle de Kodi en UPnP et HTTP · Configurer le partage de fichiers[CR]Activer Zeroconf · Configurer AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
-msgstr "Aide au démarrage"
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Cet onglet signale un menu en côté de fenêtre contenant des options supplémentaires pour cette section.  Pour accéder à ce menu, appuyez sur la flèche de gauche sur votre télécommande ou votre clavier ou placez votre souris au dessus de l'onglet. [CR][CR]Cliquez sur \"Ok\" pour fermer cette fenêtre. Elle n’apparaîtra plus."
+msgid "First run help..."
+msgstr "Lancer l'aide d'abord..."
 
 msgctxt "#31413"
 msgid "Local subtitle available"
-msgstr "Sous-titres locaux disponibles"
+msgstr "Sous-titres disponibles en local"
 
 msgctxt "#31420"
 msgid "Login"
 msgstr "Connexion"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Sélectionnez le profil d'utilisateur[CR]auquel vous connecter et continuer"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Choisir votre profil utilisateur Kodi[CR]pour s'identifier et poursuivre"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,64 +441,56 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Sélectionner le profil utilisé au démarrage lorsque l'écran de connexion est désactivée."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Heure prévue"
+msgid "Scheduled time"
+msgstr "Heure planifiée"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV Direct"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "Ajouter un groupe"
 
 msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Renommer le groupe"
+msgid "Rename group"
+msgstr "Renommer un groupe"
 
 msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Supprimer le groupe"
+msgid "Delete group"
+msgstr "Supprimer un groupe"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Groupes[CR]disponibles"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Groupe des chaînes"
-
 msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Réglage de la minuterie"
+msgid "Timer set"
+msgstr "Minuterie définie"
 
 msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Options des chaînes"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Prévisions sur 36 heures"
+msgid "Channel options"
+msgstr "Options du canal"
 
 msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Prévisions heure par heure"
+msgid "Hourly forecast"
+msgstr "Prévision heure par heure"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Prévisions pour le weekend"
+msgid "Weekend forecast"
+msgstr "Prévisions de fin de semaine"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Prévisions Quotidiennes"
+msgid "Daily forecast"
+msgstr "Prévisions journalières"
 
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Prévisions"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Risque de pluie"
+msgid "Chance of precipitation"
+msgstr "Risques de précipitations"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
diff --git a/addons/skin.confluence/language/Galician/strings.po b/addons/skin.confluence/language/resource.language.gl_es/strings.po
index 3fc95c4fcc..feff7f768e 100644
--- a/addons/skin.confluence/language/Galician/strings.po
+++ b/addons/skin.confluence/language/resource.language.gl_es/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/xbmc-main/language/gl/)\n"
+"Language-Team: Galician (Spain) (http://www.transifex.com/projects/p/kodi-main/language/gl_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
+"Language: gl_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Troca o teu"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opcións de enerxía"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Traballando..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Agochar información"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Ver opcións"
+msgid "View options"
+msgstr "Opcións da vista"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Duración total"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Música - Ficheiros"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Elementos"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Outras opcións"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Localización"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Envoltorio de cartel"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Cartel"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Miniaturas"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Envoltorio de imaxe"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Accións"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Reproducindo"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "REPRODUCINDO"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "BUSCANDO"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Preconfiguracións de visualizacións"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Tempo final"
+msgid "End time"
+msgstr "Hora de fin"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Este ficheiro esta amontoado, selecione a parte que quere reproducir."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Seleccionado actualmente"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opcións da pantalla de inicio"
@@ -168,28 +124,12 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Fondo"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Mostrar \"Pausado\" nunha diapositiva"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Reproducir avances nunha xanela [COLOR=grey3](Só diálogo de información de vídeo)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Outras opcións"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Agochar a lectura da marcaxe dende os nomes dos videos [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ocultar botóns do menú principal"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Activar fondo personalizado"
 
 msgctxt "#31110"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opcións"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Amosar albumes engadidos recentemente"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Amosar vídeos engadidos recentemente"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Submenú de Aplicacións da Páxina de Inicio"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Agochar o fondo do cartel"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Amosar o vídeo reproducíndose actualmente no fondo"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Amosar a visualización 'En Reprodución' no fondo"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Reproducir as cancións das series de TV na bibloteca de video (Engadido TVTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Letras"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Agochar Fanart na visualización de pantalla completa"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Complemento de letras"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Submenú de Vídeos da Páxina de Inicio"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Submenú de Música da Páxina de Inicio"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Submenú de Imaxes da Páxina de Inicio"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD de Música"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Atallos"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Escolle a túa canción"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Fonte das letras"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Atopado"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Atopar máis elementos"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Vindeiros episodios"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura actual"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Última actualización"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Provedor de datos"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Agochar Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detalles do Filme"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memoria empregada:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Número de seguimento"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Imaxe de cartel[CR][CR]Non dispoñible[CR][CR] Preme o botón para estabrecer"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Scraper actual"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Escoller scraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opcións de escaneado de contidos"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Estabelecer ruta dos Fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Selecionar perfíl"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Último ingreso"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Selecionador de cancións do Karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Emitido"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opcións da listaxe de reprodución"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Creado"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Resolución"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Engadido recentemente"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Temporizador estabrecido![/B] [COLOR=grey2] - Apagado automático de sistema en[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Prema o botón para reproducir[CR][CR]Avance do filme"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalles do Álbum"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pausa"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Parar"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Axiña Adiante"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Atrás"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menú do filme"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Descargar Subtítulos"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Ver como 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Pel predefinida"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Pel predefinida sen Maiúsculas"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Baseado en Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]CONFIGURAR PARÁMETROS DE MÚSICA[/B][CR][CR]Xestionar a bibloteca de música · Estabrecer as opcións de reprodución de música · Trocar opcións do listado da música[CR]Estabrecer o envío de cancións · Estabrecer as opcións do karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURAR PARÁMETROS DE IMAXES[/B][CR][CR]Estabrecer opcións do listado de imaxes · Configurar presentacións"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURAR PARÁMETROS DA METEOROLOXÍA[/B][CR][CR]Estabrecer tres cidades para obter información meteorolóxica"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]CONFIGURAR PARÁMETROS DO SISTEMA[/B][CR][CR]Configurar as pantallas · Configurar a saída de audio · Estabrecer mandos remotos[CR]Estabrecer opcións de aforro enerxético · Activar depuración · Estabrecer bloque mestre"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURAR COMPLEMENTOS[/B][CR][CR]Xestionar Complementos instalados · Buscar e instalar Complementos de kodi.tv[CR]Modificar a configuración dos Complementos"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]CONFIGURAR OS AXUSTES DE TV[/B][CR][CR]Trocar info. a pantalla completa · Xestionar a configuración dos datos da Guía"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]CONFIGURAR PARÁMETROS DO SERVIZO[/B][CR][CR]Configurar o control de Kodi vía UPnP e HTTP · Configurar compartición de ficheiros[CR]Activar Zeroconf · Configurar AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Axuda na primeira execución..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Esta lapela significa que existe un menú desactivado nesta xanela que contén máis opcións para esta sección. Para acceder ó menú, ir a esquerda co control remoto o teclado ou move o punteiro do rato até a lapela. [CR][CR]Preme en \"Feito\" para pechar a caixa de diálogo. Non aparecerá máis."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Subtítulo local dispoñíbel"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Inicio de sesión"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Selecione o seu perfíl de usuario de Kodi[CR]para ingresar e continuar"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Amosar ou agochar a pantalla de inicio de sesión ao iniciar."
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Usar o perfil a usar no inicio cando a pantalla de inicio de sesión estea desactivada."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Hora programada"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV en Directo"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Engadir Grupo"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Renomear Grupo"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Eliminar Grupo"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grupos[CR]Dispoñíbeis"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Canle do Grupo"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Axuste do Temporizador"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opcións da Canle"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Predición para 36 horas"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Predición de hora en hora"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Predición para a fin de semana"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Predición Diaria"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Predición"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Probabilidade de Chuvia"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Obtendo información da predición..."
diff --git a/addons/skin.confluence/language/Hebrew/strings.po b/addons/skin.confluence/language/resource.language.he_il/strings.po
index b0497e973d..82a4e5d9be 100644
--- a/addons/skin.confluence/language/Hebrew/strings.po
+++ b/addons/skin.confluence/language/resource.language.he_il/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/xbmc-main/language/he/)\n"
+"Language-Team: Hebrew (Israel) (http://www.transifex.com/projects/p/kodi-main/language/he_IL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
+"Language: he_IL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "שינוי"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "אפשרויות חשמל"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "עסוק..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "הסתרת פרטים"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "אפשרויות תצוגה"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "מסך מלא"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "אורך כולל"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "מוזיקה - קבצים"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "פריטים"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "אפשרויות שונות"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "מיקום"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "רצועת פוסטרים"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "פאנארט"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "תמונות ממוזערות"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "רצועת תמונות"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "פרטים"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "פעולות"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "מנגן כעת"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "מנגן"
@@ -117,11 +81,11 @@ msgid "SEEKING"
 msgstr "מעביר"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr "קביעוני חיזוי"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "זמן סיום"
 
 msgctxt "#31050"
@@ -156,10 +120,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "קובץ זה שייך לערימה. יש לבחור חלק ממנו יתחיל הניגון."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "כרגע מסומנים"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "אפשרויות מסך הבית"
@@ -168,28 +128,12 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "רקע"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "הצג \"מושהה\" במצגת תמונות"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "נגן קדימונים בחלון [COLOR=grey3](דיאלוג פרטי וידאו בלבד)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "אפשרויות שונות"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "הסתר סימון \"נצפה\" משמות קבצי וידאו [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "הסתר כפתורי תפריט ראשי"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "אפשר רקע מותאם אישית"
 
 msgctxt "#31110"
@@ -204,30 +148,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "אפשרויות"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "הצג אלבומים שנוספו לאחרונה"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "הצג וידאו שנוסף לאחרונה"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "תת תפריט תוכנות במסך הבית"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "נטרל הצגת פאנארט כרקע"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "הצג וידאו \"מנגן כעת\" כרקע"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "הצג חיזוי \"מנגן כעת\" כרקע"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "נגן נעימת סדרה בספריית הוידאו (הרחבת TvTunes)"
@@ -240,26 +160,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "מילות שיר"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "הסתר פאנארט כאשר חיזוי מוצג במסך מלא"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "הרחבת מילות שירים"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "תת תפריט וידאו במסך הבית"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "תת תפריט מוסיקה במסך הבית"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "תת תפריט תמונות במסך הבית"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "מוזיקה - תפריט צף (OSD)"
@@ -276,94 +176,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "קיצורי דרך"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "בחירת השיר"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "מקור מילות שיר"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "נמצא"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "מציאת פריטים נוספים"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "הפרקים הקרובים"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "טמפ' נוכחית"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "עודכן לאחרונה"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "ספק מידע"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "הסתרת פאנארט"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "פרטי סרט"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "זכרון בשימוש:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "מספר רצועה"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "תמונת פאנארט[CR][CR]לא זמינה[CR][CR]יש ללחוץ לבחירה בתמונה"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "סקרייפר נוכחי"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "בחירת סקרייפר"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "הגדרות סריקת תוכן"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "קביעת נתיב פאנארט"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "משתמש נבחר"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "חובר לאחרונה"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "בוחר שיר קריוקי"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "שודר"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "אפשרויות רשימת ניגון"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "נוצר"
@@ -372,22 +200,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "אבחנה"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "נוסף לאחרונה"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]התזמון נקבע![/B] [COLOR=grey2] - כיבוי מערכת אוטומטי בעוד[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "יש ללחוץ הכפתור ע\"מ לנגן[CR][CR]את הקדימון"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "פרטי אלבום"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "השהיה"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "עצירה"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "הרצה קדימה"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "הרצה אחורה"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "תפריט סרט"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "הורדת כתוביות"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "צפיה כ־2D"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "ברירת מחדל של המעטפת"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "ברירת מחדל של המעטפת ללא רישיות"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "מבוסס Arial"
@@ -446,24 +250,12 @@ msgstr "[B]שינוי הגדרות וידאו[/B][CR][CR]ניהול ספריית
 
 msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
-msgstr "[B]שינוי הגדרות מוסיקה[/B][CR][CR]ניהול ספריית המוסיקה · קביעת העדפות ניגון מוזיקה · שינוי אפשרויות תצוגת קבצי מוסיקה[CR]הגדרת אפשרויות קריוקי"
-
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]שינוי הגדרות תמונות[/B][CR][CR]הגדרת אפשרויות תצוגת קבצי תמונה · הגדרת אפשרויות מצגת תמונה"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]שינוי הגדרות מזג אוויר[/B][CR][CR]בחירת עד שלוש ערים עבורן תוצג תחזית מזג אוויר"
+msgstr "[B]שינוי הגדרות מוזיקה[/B][CR][CR]ניהול ספריית המוזיקה · קביעת העדפות ניגון מוזיקה · שינוי אפשרויות תצוגת קבצי מוזיקה[CR]הגדרת אפשרויות קריוקי"
 
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]שינוי הגדרות מערכת[/B][CR][CR]הגדרת וכיול התקני תצוגה · הגדרת התקן פלט שמע · הגדרת שלט רחוק[CR]קביעת העדפות חיסכון בחשמל · הפעלת יומן רישום מורחב · הגדרת קוד נעילה ראשי"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]הגדרת הרחבות[/B][CR][CR]ניהול הרחבות מותקנות · עיון בהרחבות מ־kodi.tv והתקנתן[CR]שינוי הגדרות הרחבה"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]שינוי הגדרות טלוויזיה[/B][CR][CR]שינוי המידע המוצג במסך מלא · ניהול הגדרות נתוני לוח השידורים"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]שינוי הגדרות שירותים[/B][CR][CR]הגדרות שליטה על Kodi דרך UPnP ו־HTTP · הגדרות שיתוף קבצים[CR]הפעלת Zeroconf · הגדרות AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "סיוע היכרות...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "לשונית זו מציינת שיש תפריט נוסף לצד חלון זה המכיל הגדרות נוספות עבור מדור זה. לשם גישה לתפריט, יש לנווט שמאלה בעזרת השלט או המקלדת או הצבת סמן העכבר מעל הלשונית . [CR][CR] יש ללחוץ על \"אישור\" לשם סגירת דיאלוג זה. הודעה זו לא תוצג שנית."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "כתובית מקומית זמינה"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "כניסה"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "יש לבחור חשבון משתמש Kodi[CR]להתחברות והמשך"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "הצג או הסתר מסך כניסה בעת ההפעלה."
@@ -500,66 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "יש לבחור משתמש שיחובר כברירת מחדל בעת ההפעלה כאשר מסך כניסה מנוטרל."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "זמן מתוכנן"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "טלוויזיה חיה"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "הוספת קבוצה"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "שינוי שם קבוצה"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "מחיקת קבוצה"
+msgid "TV"
+msgstr "טלוויזיה"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "קבוצות[CR]זמינות"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "קבוצת ערוצים"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "תזמון נקבע"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "אפשרויות ערוץ"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "תחזית ל־36 שעות"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "תחזית לפי שעה"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "תחזית לסופ\"ש"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "תחזית יומית"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "תחזית"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "סיכוי למשקעים"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "משיג פרטי תחזית..."
diff --git a/addons/skin.confluence/language/Hindi (Devanagiri)/strings.po b/addons/skin.confluence/language/resource.language.hi_in/strings.po
index 37858f8b77..db1522e369 100644
--- a/addons/skin.confluence/language/Hindi (Devanagiri)/strings.po
+++ b/addons/skin.confluence/language/resource.language.hi_in/strings.po
@@ -4,38 +4,22 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Hindi (Devanagiri) (http://www.transifex.com/projects/p/xbmc-main/language/hi/)\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/kodi-main/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
+"Language: hi_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "बिजली विकल्प"
-
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "जानकरी छिपाये"
-
-msgctxt "#31006"
-msgid "View Options"
-msgstr "विकल्प देखे"
-
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "पूर्ण स्क्रीन "
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "पूर्ण अवधि"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "संगीत - फाइलें"
@@ -52,10 +36,18 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "वस्तुए"
 
+msgctxt "#31027"
+msgid "Location"
+msgstr "स्थान"
+
 msgctxt "#31102"
 msgid "Background"
 msgstr "पृष्ठभूमि"
 
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "कस्टम पृष्ठभूमि सक्षम"
+
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "गीत"
diff --git a/addons/skin.confluence/language/Croatian/strings.po b/addons/skin.confluence/language/resource.language.hr_hr/strings.po
index 1da5aabe18..ebd50b5582 100644
--- a/addons/skin.confluence/language/Croatian/strings.po
+++ b/addons/skin.confluence/language/resource.language.hr_hr/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/xbmc-main/language/hr/)\n"
+"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/kodi-main/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
+"Language: hr_HR\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Promijenite vaše"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Mogućnosti energije"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Reprodukcija..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Sakrij informacije"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Mogućnosti prikaza"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Cijeli zaslon"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Ukupno trajanje"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Glazba - Datoteke"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Stavaka"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Razne mogućnosti"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Lokacija"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Omot postera"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Slika omota"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Minijature"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Slika omota"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Informacije"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Radnje"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Trenutno se reproducira"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "REPRODUKCIJA"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "PREMOTAVANJE"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Predlošci vizualizacije"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Vrijeme završetka"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Ova datoteka je složena, odaberite dio od kojeg želite pokrenuti reprodukciju."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Trenutno odabrano"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Mogućnosti početnog zaslona"
@@ -168,28 +124,12 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Pozadina"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Prikaži \"Pauzirano\" u slikovnoj prezentaciji"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Reproduciraj najave u prozoru [COLOR=grey3](Samo dijalog video informacija)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Ostale mogućnosti"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Sakrij oznake pročitane iz naziva video datoteka [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Prilagodi prikaz glavnog izbornika"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Omogući prilagođenu pozadinu"
 
 msgctxt "#31110"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Mogućnosti"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Prikaži nedavno dodane albume"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Prikaži nedavno dodane video snimke"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Početna stranica podizbornika programa "
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Sakrij pozadinu slike omota"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Prikaži pozadinu \"Trenutno se reproducira\" videa"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Prikaži pozadinu \"Trenutno se reproducira\" vizualizacije"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Reproduciraj pjesme TV tema iz videoteke (TvTunes dodatak)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Tekstovi pjesama"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Sakrij sliku omota u vizualizaciji cijelog zaslona"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Dodatak za tekstove pjesama"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Početna stranica video podizbornika"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Početna stranica glazbenog podizbornika"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Početna stranica podizbornika slika"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD glazbe"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Prečaci"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Odaberite svoju pjesmu"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Izvor tekstova pjesama"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Pronađeno"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Potraži više stavki"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Nadolazeće epizode"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Trenutna temperatura"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Posljednje ažurirano"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Pružatelj podataka"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Sakrij sliku omota"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Pojedinosti filma"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Korištenje memorije:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Broj pjesme"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Slika za omot[CR][CR]je nedostupna[CR][CR] Kliknite tipku za postavljanje"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Trenutni sakupljač"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Odaberite sakupljača"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Mogućnosti pretraživanja sadržaja"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Postavite putanju slike omota"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Odabrani profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Posljednji prijavljen"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Izbornik karaoke pjesama"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Emitirano"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Mogućnosti popisa izvođenja"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Napravljeno"
@@ -373,21 +197,13 @@ msgid "Resolution"
 msgstr "Razlučivost"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Nedavno dodano"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Vrijeme isključivanja![/B][COLOR=grey2] - Sustav se automatski isključuje za[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Kliknite tipku za reprodukciju[CR][CR]filmskih najava"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Pojedinosti albuma"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pauza"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Zaustavi"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Premotavanje unaprijed"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Premotavanje unazad"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Filmski izbornik"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Preuzmanje podnaslova"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Gledaj kao 2D"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Uobičajena presvlaka"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Uobičajena presvlaka bez velikih slova"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Temeljen na Arialu "
@@ -448,22 +252,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]PRILAGODITE POSTAVKE GLAZBE[/B][CR][CR]Upravljajte svojm fonotekom · Postavite mogućnosti reprodukcije glazbe[CR]Promjenite mogućnosti popisivanja glazbenoga sadržaja · Postavite slanje pjesama · Postavite mogućnosti karaoka"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]PRILAGODITE POSTAVKE SLIKA[/B][CR][CR]Postavljanje mogućnosti popsivanja slika · Postavke slikovne prezentacije"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]PRILAGODITE POSTAVKE VREMENSKE PROGNOZE[/B][CR][CR]Postavite tri grada za prikupljanje informacije o vremenskoj prognozi"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]PRILAGODITE POSTAVKE SUSTAVA[/B][CR][CR]Prilagodite i kalibrirajte zaslon · Prilagodite izlaz zvuka · Postavite daljinsko upravljanje[CR]Postavite mogućnosti uštede energije  · Omogućite zapise otklanjanja grešaka · Postavite glavno zaključavanje"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]PRILAGODITE DODATKE[/B][CR][CR]Upravljajte svojim instaliranim dodacima · Pregledavajte i instalirajte dodatake iz kodi.tv[CR]Mijenjajte postavke dodataka"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]PRILAGODITE TV POSTAVKE[/B][CR][CR]Promjenite informacije cijelog zaslona · Upravljajte postavkama podataka elektronskog programskog vodiča (EPG)"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]PRILAGODITE POSTAVKE USLUGA[/B][CR][CR]Postavite upravljanje Kodijem putem UPnP-a i HTTP-a · Prilagodite dijeljenje datoteka[CR]Omogućite Zeroconf · Prilagodite AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Pomoć kod prvog pokretanja..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Ova kartica označava da postoji izbornik sa strane ovog prozora koji sadrži dodatne mogućnosti ovog odjeljka. Za pristup izborniku, idite lijevo daljinskim upravljačem ili tipkovnicom ili postavite pokazivač miša iznad kartice. [CR] [CR] Kliknite na \"U redu\" za zatvaranje ovog dijaloga. Neće se ponovno pojaviti."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Lokalni podnaslovi dostupni"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Prijava"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Odaberite svoj Kodi korisnički profil[CR]za prijavu i nastavak"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Prikaži ili sakrij zaslon prijave pri pokretanju."
@@ -500,66 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Odaberite profil koji će se koristiti pri pokretanju kada je zaslon prijave onemogućen."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Planirano vrijeme"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Televizija"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Dodaj grupu"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Preimenuj grupu"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Obriši grupu"
+msgid "TV"
+msgstr "TELEVIZIJA"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Dostupne[CR]grupe"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grupa programa"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Postavljanje zakazanog snimanja"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Mogućnosti programa"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Prognoza za 36 sati"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Prognoza za svaki sat"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Prognoza za vikend"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Dnevna prognoza"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Prognoza"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Moguće padaline"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Nabavljanje informacija prognoze..."
diff --git a/addons/skin.confluence/language/Hungarian/strings.po b/addons/skin.confluence/language/resource.language.hu_hu/strings.po
index 2f6fe211c7..26ff377cbf 100644
--- a/addons/skin.confluence/language/Hungarian/strings.po
+++ b/addons/skin.confluence/language/resource.language.hu_hu/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/xbmc-main/language/hu/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kodi-main/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
+"Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Választható"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Kikapcsolási lehetőségek"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Dolgozom..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Információ elrejtése"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Nézet lehetőségek"
+msgid "View options"
+msgstr "Nézet beállítások"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Teljes időtartam"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Zene - Fájlmód"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Elem"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Egyéb beállítások"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Fekvés"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poszter"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Kép ikonok"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Képborító"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Infó"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Műveletek"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Most játszva"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "LEJÁTSZÁS"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "KERESŐ"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Vizualizáció beállításai"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Befejezés időpontja"
+msgid "End time"
+msgstr "Befejezési időpont"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Ez a fájl egyesített. Válaszd azt a részt, ahonnan a lejátszást szeretnéd kezdeni."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Jelenleg kiválasztott"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Sajátképernyő lehetőségei"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Háttér"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "\"Megállítva\" mutatása a diavetítés közben"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Filmelőzetesek lejátszása ablakban [COLOR=grey3](csak a videóinfó ablakban)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Egyéb beállítások"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Fájlnevekből olvasott filmjellemzők elrejtése [COLOR=grey3](BR, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Főmenü gombok láthatósága"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Saját háttér engedélyezése"
+msgid "Enable custom background"
+msgstr "Saját háttér"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Lehetőségek"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Nemrég hozzáadott albumok mutatása"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Nemrég hozzáadott videók mutatása"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Főképernyő Programok almenü"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Fanart-háttér elrejtése"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "A háttérben az éppen játszott videó megjelenítése"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "A háttérben az éppen futó vizualizáció megjelenítése"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "TV főtéma dalok játszása a videó médiatárban (TvTunes kiegészítő)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Dalszöveg"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Fanart elrejtése teljes képernyős vizualizációnál"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Dalszöveg kiegészítő"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Főképernyő Videó almenü"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Főképernyő Zene almenü"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Főképernyő Képek almenü"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Zene tálca"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Parancsikonok"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Válaszd a dalodat"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Dalszövegforrás"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Található"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "További elemek keresése"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Következő epizódok"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Hőmérséklet most"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Utoljára frissítve"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Adatszolgáltató"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Fanart elrejtése"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Film részletek"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memória használat:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Zeneszám"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart kép[CR][CR]Elérhetetlen[CR][CR] Nyomj a gombra a beállításhoz"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Jelenlegi leolvasó"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Válassz leolvasót"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Tartalomkeresési lehetőségek"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Fanart elérési helye"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Választott profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Utoljára bejelentkezve"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke dalválasztó"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Játszva"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Játszáslista lehetőségek"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Létrehozva"
@@ -373,21 +197,13 @@ msgid "Resolution"
 msgstr "Felbontás"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Nemrég hozzáadva"
+msgid "Recently added"
+msgstr "Nemrég bekerült"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Időzítő beállítva![/B] [COLOR=grey2] - Automatikus leállítás ennyi idő múlva:[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Nyomd a gombot a filmelőzetes[CR][CR]Lejátszásához"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Album részletek"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pillanat állj"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Leállítás"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Előretekerés"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Visszatekerés"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Film menü"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Felirat letöltése"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Megnézés 2D-ként"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Felszín alapértelmezése"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Alapértelmezett, nagybetűsítés nélkül"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial betűkészlet"
@@ -448,22 +252,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]ZENE BEÁLLÍTÁSOK[/B][CR][CR]Zene médiatár kezelése · Zenelejátszás beállítása · Zenelistázás módjának beállítása[CR]Zene lejátszási szabályok felállítása · Karaoke lehetőségek"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KÉP BEÁLLÍTÁSOK[/B][CR][CR]Képek listázási módjának beállítása · Diavetítés beállítása"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]IDŐJÁRÁS BEÁLLÍTÁSOK[/B][CR][CR]Három város megadása, melyekről időjárás információk fognak megjelenni"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]RENDSZERBEÁLLÍTÁSOK[/B][CR][CR]Kijelzők beállítása, kalibrálása · Hangkimenet konfigurálása · Távirányító beállítása[CR]Energiagazdálkodási lehetőségek beállítása · Hibakeresés bekapcsolása[CR]Mesterzár felállítása"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KIEGÉSZÍTŐK BEÁLLÍTÁSA[/B][CR][CR]A telepített kiegészítők kezelése · Kiegészítők böngészése és telepítése a kodi.tv[CR]webhelyről · Kiegészítők beállításainak módosítása"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]TV BEÁLLÍTÁSOK[/B][CR][CR]Teljesképernyős infó · Elektronikus Programújság \"EPG\" beállítások"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]SZOLGÁLTATÁSOK BEÁLLÍTÁSA[/B][CR][CR]Kodi UPNP-n és HTTP-n keresztüli vezérlésének beállításai · Fájlmegosztás beállításai[CR]Zeroconf engedélyezése · AirPlay beállításai"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Segítség első indításkor..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Ez a fül azt jelzi hogy oldalt van egy menü, extra opciókkal az adott tartalomhoz.  A menühöz hozzáférhetsz ha az egérmutatót a fül fölé viszed, vagy a bal nyilat megnyomod a távirányítón. [CR][CR]Nyomj \"OK\" gombot a szöveg bezárásához. Nem fog még egyszer megjelenni."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Helyi felirat elérhető"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Bejelentkezés"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Válaszd ki a Kodi felhasználói profilod[CR]a belépéshez"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Bejelentkezési képernyő mutatása vagy elrejtése indításkor"
@@ -500,66 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Profil kiválasztása amely használatra kerül ha a bejelentkező képernyő ki van kapcsolva."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Ütemezett időzítés"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Élő TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Csoport hozzáadása"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Csoport átnevezése"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Csoport törlése"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Elérhető[CR]Csoportok"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Csatorna csoportok"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Időzítő beállítás"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Csatorna opciók"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 órás előrejelzés"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Előrejelzés óránként"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Hétvégi előrejelzés"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Napi Előrejezés"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Előrejelzés"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Csapadék esélye"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Előrejelzési információ letöltése..."
diff --git a/addons/skin.confluence/language/resource.language.hy_am/strings.po b/addons/skin.confluence/language/resource.language.hy_am/strings.po
new file mode 100644
index 0000000000..985d9a3e32
--- /dev/null
+++ b/addons/skin.confluence/language/resource.language.hy_am/strings.po
@@ -0,0 +1,281 @@
+# Kodi Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon Provider: Jezz_X, Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/kodi-main/language/hy_AM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy_AM\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "Ընթացքում է ..."
+
+msgctxt "#31008"
+msgid "Full screen"
+msgstr "Ամբողջ էկրանով"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Երաժշտական ֆայլեր"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "Նվագարկում է"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Էջ"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "Պիտույք"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "Տեղը"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "Ինֆո"
+
+msgctxt "#31039"
+msgid "Actions"
+msgstr "Գործողություններ"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "ՆՎԱԳԱՐԿԵԼ"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "ԴԱԴԱՐ"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "ԱՌԱՋ"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "ՀԵՏԴԱՐՁ"
+
+msgctxt "#31046"
+msgid "SEEKING"
+msgstr "ՓՆՏՐԵԼ"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Աճողական"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Նվազող"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Բացել նվագացանկը"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "Հիշել նվագացանկը"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Փակել նվագացանկը"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "Համակարգի երաժշտական ֆայլեր"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Ընթացիկ նվագացանկ"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "Այս ֆայլը կտրատված է: Ընտրեք հատված՝ նվագարկելու համար:"
+
+msgctxt "#31101"
+msgid "Home screen options"
+msgstr "Հիմնական էկրանի տարբերակներ"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "Ֆոն"
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr "Այլ տարբերակներ"
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr "Ֆոնի տեղակայում."
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Թաքցնել"
+
+msgctxt "#31112"
+msgid "Options"
+msgstr "Տարբերակներ"
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "Նվագարկել TV թեմայի երգերը տեսադարանում (TvTunes add-on)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TV-Որոնում"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "Երգի բառեր"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "Երգերի OSD"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "Տեսանյութի OSD"
+
+msgctxt "#31142"
+msgid "Settings level"
+msgstr "Կարգավորումների խորություն"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "Հղումներ"
+
+msgctxt "#31206"
+msgid "Found"
+msgstr "Գտնվեց"
+
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "Տվյալների մատակարար"
+
+msgctxt "#31322"
+msgid "Aired"
+msgstr "Եթերում է"
+
+msgctxt "#31326"
+msgid "Created"
+msgstr "Ստեղծված"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "Թույլատվություն"
+
+msgctxt "#31329"
+msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
+msgstr "[B]Ժամանակացույցը մեկնարկվեց![/B] [COLOR=grey2] - Համակարգը ավտոմատ կանջատվի[/COLOR]"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "Դադար"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Կանգ"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Հետդարձ"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "Ֆիլմերի ցանկ"
+
+msgctxt "#31360"
+msgid "Watch as 2D"
+msgstr "Դիտել որպես 2D"
+
+msgctxt "#31361"
+msgid "Change mode"
+msgstr "Փոխել ռեժիմը"
+
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "Միացված"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "Հիմնական տեսք"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Arial-հիմքով"
+
+msgctxt "#31400"
+msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
+msgstr "[B]ՁԵՎԱՎՈՐՄԱՆ ԿԱՐԳԱՎՈՐՈՒՄՆԵՐ[/B][CR][CR]Փոխել տեսքը · Ընտրել լեզուն և տեղայնքը · Փոխել ֆայլերի թերթման հատկությունները[CR]Ընտրել դադարի էկրան"
+
+msgctxt "#31420"
+msgid "Login"
+msgstr "Մուտք"
+
+msgctxt "#31422"
+msgid "Show or hide the login screen at startup."
+msgstr "Միանալու ժամանակ ցուցադրել կամ թաքցնել մուտքի պատուհանը"
+
+msgctxt "#31423"
+msgid "Select the profile that will be used at startup when the login screen is disabled."
+msgstr "Եթե թաքցված է մուտքի պատուհանը, նշել այն պրոֆիլը, որը կկիրառվի միանալիս"
+
+msgctxt "#31506"
+msgid "Available[CR]Groups"
+msgstr "Հասանելի[CR]խումբ"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Տեսություն"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "Եղանակի տեսություն"
+
+msgctxt "#31950"
+msgid "WEATHER"
+msgstr "ԵՂԱՆԱԿ"
+
+msgctxt "#31951"
+msgid "PICTURES"
+msgstr "ՆԿԱՐՆԵՐ"
+
+msgctxt "#31953"
+msgid "VIDEOS"
+msgstr "ՏԵՍԱՆՅՈՒԹ"
+
+msgctxt "#31954"
+msgid "MOVIES"
+msgstr "ՖԻԼՄԵՐ"
+
+msgctxt "#31955"
+msgid "TV SHOWS"
+msgstr "TV ԾՐԱԳՐԵՐ"
+
+msgctxt "#31956"
+msgid "MUSIC"
+msgstr "ԵՐԳ-ԵՐԱԺՇՏՈՒԹՅՈՒՆ"
+
+msgctxt "#31957"
+msgid "PROGRAMS"
+msgstr "ԾՐԱԳՐԵՐ"
+
+msgctxt "#31958"
+msgid "PLAY DISC"
+msgstr "ՆՎԱԳԱՐԿԵԼ"
+
+msgctxt "#31959"
+msgid "SYSTEM"
+msgstr "ՀԱՄԱԿԱՐԳ"
diff --git a/addons/skin.confluence/language/Indonesian/strings.po b/addons/skin.confluence/language/resource.language.id_id/strings.po
index 140984d853..a7cb618ae6 100644
--- a/addons/skin.confluence/language/Indonesian/strings.po
+++ b/addons/skin.confluence/language/resource.language.id_id/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/xbmc-main/language/id/)\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/kodi-main/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
+"Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Ganti"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Pilihan Batere"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Mengerjakan..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Sembunyikan Informasi"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Lihat Pilihan"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Video Mainkan Secara Otomatis"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Durasi Total"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Berkas - Musik"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Item"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opsi Lainnya"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Lokasi"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Wrap Poster"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Thumb Citra"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Wrap Citra"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Aksi"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Sedang Memainkan"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "Mainkan"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "MENCARI"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Preset visualisasi"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Waktu Selesai"
+msgid "End time"
+msgstr "Waktu selesai"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Berkas ini sudah ditumpuk, pilih bagian yang ingin anda mainkan"
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Pilihan saat ini"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opsi Home Screen"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Latar belakang"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Tampilkan \"jead\" pada slideshow citra"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Putar Trailer dalam sebuah jendela [COLOR=grey3](Hanya dialog informasi video Saja)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Opsi Lainnya"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Sembunyikan penandaan baca dari nama berkas video [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Sembunyikan Tombol Menu Utama"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Aktifkan latar belakang suai"
+msgid "Enable custom background"
+msgstr "Fungsikan background custom"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opsi"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Tampilkan Album yang ditambahkan baru saja"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Tampilkan Video yang ditambahkan baru baru ini"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Laman Program Submenu"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Sembunyikan Background Fanart"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Tampilkan Video latar belakang \"Sedang dimainkan\""
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Tampilkan latar belakang visualisasi \"Sedang Memainkan\""
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Putar lagu tema TV dalam pustaka video (Pengaya TvTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lirik"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Sembunyikan Fanart pada visualisasi layar penuh"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Pengaya Lirik"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Laman Video Submenu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Laman Musik Submenu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Laman Gambar submenu"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD Musik"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Bookmark"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Pilih lagu Anda"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Sumber lirik"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Ditemukan"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Cari butir lebih banyak"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Episode mendatang"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temp saat ini"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Terakhir diperbarui"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Penyedia data"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Sembunyikan Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detil Film"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memori Digunakan:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Nomor Trek"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Gambar Fanart[CR][CR]Tidak tersedia[CR][CR] Klik tombol untuk mengatur"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Pengais saat ini"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Pilih pengais"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Pilih opsi pemindaian"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Atur path Fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Profile terpilih"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Login terakhir"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Pemilih lagu karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Disiarkan"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opsi Daftar Main"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Dibuat"
@@ -373,21 +197,13 @@ msgid "Resolution"
 msgstr "Resolusi"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "yang baru saja ditambahkan"
+msgid "Recently added"
+msgstr "Baru ditambahkan"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Atur Timer![/B] [COLOR=grey2] - Sistem dimatikan secara otomatis dalam[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Klik tombol untuk memutar[CR][CR]Trailer Film"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detil album"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pause"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Berhenti"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Majukan"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Mundurkan"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menu film"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Unduh subtitle"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Tonton sebagai 2D"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Kulit Standar"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skin standar tanpa Caps"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "berbasis Arial"
@@ -448,22 +252,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGURASIKAN SETELAN MUSIK[/B][CR][CR]Kelola pustaka musik Anda · Atur opsi pemutaran musik · Rubah opsi daftar musik[CR]Setel submisi lagu · Setel opsi karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGURASIKAN SETELAN GAMBAR[/B][CR][CR]Atur opsi daftar gambar · Konfigurasikan slideshow"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGURASIKAN SETELAN CUACA[/B][CR][CR]Atur tiga kota untuk mengumpulkan informasi cuaca"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGURASIKAN SETELAN SISTEM[/B][CR][CR]Setel dan kalibrasi tampilan · Konfigurasi keluaran audio · Setel remote control[CR]Atur opsi hemat daya · Aktifkan debugging · Setel kunci master"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGURASIKAN PENGAYA[/B][CR][CR]Kelola Pengaya terpasang · Jelajah dan pasang Pengaya dari kodi.tv[CR]Rubah setelan Pengaya"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]KONFIGURASIKAN SETELAN TV[/B][CR][CR]Rubah info layar penuh · Kelola setelan data EPG"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGURASIKAN SETELAN LAYANAN[/B][CR][CR]Setel kontrol Kodi melalui UPnP dan HTTP · Konfigurasikan layanan berbagi berkas[CR]Aktifkan Zeroconf · Konfigurasikan AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Bantuan pertama kali"
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Tab ini menunjukkan bahwa ada menu di sisi jendela yang berisi opsi tambahan untuk seksi tersebut. Untuk mengakses, navigasikan ke kiri dengan remote kontrol atau keyboard atau taruh pointer mouse di atasnya.  [CR][CR]Klik \"Ok\" untuk menutup dialog ini. Ini tidak akan muncul lagi."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Subtitle lokal tersedia"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Login"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Pilih profil pengguna Kodi Anda [CR]untuk login dan meneruskan"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Tampilkan atau sembunyikan layar login pada startup."
@@ -500,62 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Pilih profil akan digunakan ketika startup apabila layar login dinonaktifkan."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Waktu terjadwal"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Siaran TV Langsung"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Tambahkan grup"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Namai ulang Grup"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Hapus Grup"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grup[CR]Tersedia"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grup Kanal"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Atur Timer"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opsi Kanal"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Ramalan 36 Jam"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Ramalan Perjam"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Ramalan Akhir Minggu"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Ramalan"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Kemungkinan Presipitasi"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Mengambil info ramalan..."
diff --git a/addons/skin.confluence/language/Icelandic/strings.po b/addons/skin.confluence/language/resource.language.is_is/strings.po
index 869ad640d2..6ab16470af 100644
--- a/addons/skin.confluence/language/Icelandic/strings.po
+++ b/addons/skin.confluence/language/resource.language.is_is/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Icelandic (http://www.transifex.com/projects/p/xbmc-main/language/is/)\n"
+"Language-Team: Icelandic (Iceland) (http://www.transifex.com/projects/p/kodi-main/language/is_IS/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
+"Language: is_IS\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Breyta þínu"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Orkukostir"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Vinnsla..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Fela upplýsingar"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Stillingar sýnar"
+msgid "View options"
+msgstr "Stillingar sjónarhorns"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Fylla skjá"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Heildar tímalengd"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Tónlist - Skrár"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Hlutir"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Ýmsir valkostir"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Staðsetning"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Veggspjaldafletting"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Aðdáendamyndir"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Smámyndir"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Myndafletting"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Upplýsingar"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Aðgerðir"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Í spilun"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "SPILA"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "LEITA"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Forstillingar myndskreytinga"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Lokatími"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Þessi skrá er stöfluð, veldu þann part sem þú vilt byrja að spila frá."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Núverandi val"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Stillingar heimaskjás"
@@ -168,28 +124,12 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Bakgrunnur"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Sýna \"Í bið\" í myndasýningu"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Spila kvikmyndasýnishorn í glugga [COLOR=grey3](Aðeins myndbandaupplýsingarglugga)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Ýmsir valkostir"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Fela flagg lesið frá skráarnöfnum [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Fela hnapp í aðalvalmynd"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Virkja sérsniðinn bakgrunn"
 
 msgctxt "#31110"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Valkostir"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Sýna hljómplötur sem hefur nýlega verið bætt við"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Sýna myndbönd sem var nýlega bætt við"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Undirvalmynd heimasíðu"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Fela aðdáendamyndir í bakgrunni"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Sýna \"Í spilun\" myndband í bakgrunni"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Sýna \"Í spilun\" myndskreytingu í bakgrunni"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Spila þema lög í myndbandasafni (TvTunes viðbót)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lagatextar"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Fela "
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Viðbót fyrir lagatexta"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Undirvalmynd myndbandasíðu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Undirvalmynd tónlistarsíðu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Undirvalmynd ljósmyndaasíðu"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Tónlistarskjár"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Flýtileiðir"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Veldu þitt lag"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Frumkóði lagatexta"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Fann"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Finna fleiri atriði"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Næstu þættir"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Núverandi hiti"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Síðast uppfært"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Gagnaveita"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Fela aðdáendamyndir"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Kvikmyndaupplýsingar"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Minni notað:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Númer lags"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Aðdáendamynd[CR][CR]Ekki fáanleg[CR][CR] Smelltu til að breyta"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Núverandi skafa"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Veldu sköfu"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Stillingar fyrir skönnun innihalds"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Breyta slóð fyrir aðdáendamyndir"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Veldu notanda"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Seinast skráður inn"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke lagaveljari"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Sýnt"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Valkostir lagalista"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Búið til"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Upplausn"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Nýlega bætt við"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Tímamælir virkur![/B] [COLOR=grey2] - Sjálfvirkt Slökkt eftir[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Smelltu á takka til að spila[CR][CR]Kvikmyndasýnishorn"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Hljómplötuupplýsingar"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Bið"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stöðva"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Hratt áfram"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Til baka"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Kvikmyndavalmynd"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Niðurhala þýðingartextum"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Horfa á í 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Sjálfgildi útlits"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Sjálfgildi útlits með engum hástöfum"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Byggt á Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]BREYTA TÓNLISTARSTILLINGUM[/B][CR][CR]Sýsla með tónlistarsafn · Breyta stillingum tónlistarspilara · Breyta stillingum tónlistarlista[CR]Skilgreina laga upphal · Breyta karaoke stillingum"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]BREYTA LJÓSMYNDASTILLINGUM[/B][CR][CR]Breyta stillingum ljósmyndalista · Stilla myndasýningar"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]BREYTA VEÐURSTILLINGUM[/B][CR][CR]Skilgreindu þrjár borgir til að ná í veðurupplýsingar fyrir"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]BREYTA KERFISSTILLINGUM[/B][CR][CR]Breyta og stilla skjái · Breyta hljóðúttaki · Skilgreina fjarstýringar[CR]Breyta orkukostum · Virkja aflúsun · Skilgreina aðallykilorð"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]BREYTA VIÐBÓTUM[/B][CR][CR]Breyttu uppsettum viðbótum · Leitaðu að og settu upp viðbætur frá kodi.tv[CR]Breyta stillingum viðbóta"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]SJÓNVARPSSTILLINGAR[/B][CR][CR]Breyta upplýsingum á fullum skjá · Halda utan um EPG gagnastillingar"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Uppsetning á stjórnun  Kodi með UPnP og HTTP · Setja upp skráardeilingu[CR]Virkja  Zeroconf · Stilla AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Keyrið hjálp fyrst..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Þessi flipi þýðir að það er valblað við hliðina á þessum glugga, sem er með aukastillingum fyrir þennan hluta. Til að komast í valblaðið skaltu fara til vinstri með fjarstýringunni eða lyklaborðinu eða setja músabendilinn á flipann. [CR][CR]Smelltu á \"Í lagi\" til að loka þessum texta. Hann birtist ekki aftur."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Staðvær þýðingartexti tiltækur"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Innskrá"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Veldu Kodi notanda[CR]til að skrá þig inn og halda áfram"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Sýna eða fela innskráningarskjá við ræsingu."
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Veldu uppsetninguna sem verður notuð í ræsingu þegar innskráningarglugginn hefur verið gerður óvirkur."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Uppsettur Tími"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Sjónvarp bein útsending"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Bæta við hóp"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Endurnefna hóp"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Eyða hóp"
+msgid "TV"
+msgstr "Sjónvarp"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Tiltækir[CR]Hópar"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Rásarhópur"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Stilling teljara"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Valkostir rásar"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 klst veðurspá"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Klukkustunda veðurspá"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Veðurspá helgarinnar"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Dagleg veðurspá"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Veðurspá"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Líkur á úrkomu"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Næ í veðurspá..."
diff --git a/addons/skin.confluence/language/Italian/strings.po b/addons/skin.confluence/language/resource.language.it_it/strings.po
index 0952cbc794..8ecaabeed4 100644
--- a/addons/skin.confluence/language/Italian/strings.po
+++ b/addons/skin.confluence/language/resource.language.it_it/strings.po
@@ -4,45 +4,45 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/xbmc-main/language/it/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kodi-main/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
+"Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
-msgstr "Cambia il tuo"
+msgid "Change your"
+msgstr "Cambia Il Tuo"
 
 msgctxt "#31003"
-msgid "Power Options"
-msgstr "Impostazioni Avanzate"
+msgid "Power options"
+msgstr "Opzioni Alimentazione"
 
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Attendere..."
 
 msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Nascondi informazioni"
+msgid "Hide information"
+msgstr "Nascondi Informazioni"
 
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Opzioni vista"
+msgid "View options"
+msgstr "Opzioni di visione"
 
 msgctxt "#31008"
 msgid "Full screen"
-msgstr "Schermo intero"
+msgstr "Schermo Intero"
 
 msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Durata totale"
+msgid "Total duration"
+msgstr "Durata Totale"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -50,7 +50,7 @@ msgstr "Musica - File"
 
 msgctxt "#31023"
 msgid "Playing"
-msgstr "In riproduzione"
+msgstr "In Riproduzione"
 
 msgctxt "#31024"
 msgid "Page"
@@ -61,15 +61,15 @@ msgid "Items"
 msgstr "Oggetti"
 
 msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opzioni varie"
+msgid "Misc options"
+msgstr "Opzioni Varie"
 
 msgctxt "#31027"
 msgid "Location"
 msgstr "Località"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
+msgid "Poster wrap"
 msgstr "Poster"
 
 msgctxt "#31029"
@@ -77,11 +77,11 @@ msgid "Fanart"
 msgstr "Fanart"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Miniature immagini"
+msgid "Pic thumbs"
+msgstr "Miniature Immagini"
 
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "Immagine"
 
 msgctxt "#31033"
@@ -93,8 +93,8 @@ msgid "Actions"
 msgstr "Azioni"
 
 msgctxt "#31040"
-msgid "Now Playing"
-msgstr "In riproduzione"
+msgid "Now playing"
+msgstr "In Riproduzione"
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -117,80 +117,72 @@ msgid "SEEKING"
 msgstr "RICERCA"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Preimpostazione di visualizzazione"
+msgid "Visualisation presets"
+msgstr "Stili Predefiniti di Visualizzazione"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Orario fine riproduzione"
+msgid "End time"
+msgstr "Ora fine"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr "Ordina: crescente"
+msgstr "Ordina: Crescente"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr "Ordina: decrescente"
+msgstr "Ordina: Decrescente"
 
 msgctxt "#31055"
 msgid "Open playlist"
-msgstr "Apri playlist"
+msgstr "Apri Playlist"
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "Salva playlist"
+msgstr "Salva Playlist"
 
 msgctxt "#31057"
 msgid "Close playlist"
-msgstr "Chiudi playlist"
+msgstr "Chiudi Playlist"
 
 msgctxt "#31058"
 msgid "System music files"
-msgstr "Suoni di sistema"
+msgstr "Suoni di Sistema"
 
 msgctxt "#31059"
 msgid "Current playlist"
-msgstr "Playlist corrente"
+msgstr "Playlist Attuale"
 
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Questo file è stato accorpato, scegli la parte da cui vuoi iniziare."
 
 msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Correntemente selezionato"
+msgid "Current selected"
+msgstr "Attualmente Selezionato"
 
 msgctxt "#31101"
 msgid "Home screen options"
-msgstr "Opzioni pagina principale"
+msgstr "Opzioni Pagina Iniziale"
 
 msgctxt "#31102"
 msgid "Background"
 msgstr "Sfondo"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Mostra \"In pausa\" durante la visualizzazione delle immagini"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Riproduci i trailer in una finestra [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Mostra trailer in finestra [COLOR=grey3](Solo finestra dialogo informazioni Video)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Opzioni varie"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Nascondi la spunta letto dai nomi dei file video [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Nascondi i bottoni del menù principale"
+msgid "Hide main menu buttons"
+msgstr "Nascondi i pulsanti del Menù Principale"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Abilita sfondo personalizzato"
+msgid "Enable custom background"
+msgstr "Attiva gli sfondi personalizzati"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,32 +197,28 @@ msgid "Options"
 msgstr "Opzioni"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Mostra gli album aggiunti di recente"
+msgid "Show recently added albums"
+msgstr "Mostra Album aggiunti di recente"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Mostra i Video Aggiunti di Recente"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Sottomenù Programmi nella home page"
+msgid "Show recently added videos"
+msgstr "Mostra Video aggiunti di recente"
 
 msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Nascondi i fanart sullo sfondo"
+msgid "Hide background fanart"
+msgstr "Nascondi Sfondo Fanart"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Mostra nello Sfondo il nome del Video \"In riproduzione\" "
+msgid "Show background \"Now playing\" video"
+msgstr "Mostra Sfondo Video \"In Riproduzione\""
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Mostra la visualizzazione nello sfondo \"In riproduzione\""
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Mostra Sfondo Visualizzazione \"In Riproduzione\""
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Riproduci le sigle TV nell'archivio video (addon TvTunes)"
+msgstr "Riproduci le Sigle TV nella Libreria Video (Add-on TvTunes)"
 
 msgctxt "#31127"
 msgid "TvTunes"
@@ -241,24 +229,12 @@ msgid "Lyrics"
 msgstr "Testi canzoni"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Nascondi fanart nella visualizzazione full screen"
+msgid "Hide fanart in full screen visualisation"
+msgstr "Nascondi Fanart nella visualizzazione a schermo intero"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Add-on testi"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Sottomenù Video nella home page"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Sottomenù Musica nella home page"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Sottomenù Immagini nella home page"
+msgid "Lyrics add-on"
+msgstr "Add-on Testi"
 
 msgctxt "#31140"
 msgid "Music OSD"
@@ -277,92 +253,88 @@ msgid "Shortcuts"
 msgstr "Collegamenti"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Scegli la canzone"
+msgid "Choose your song"
+msgstr "Scegli la tua canzone"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Sorgente testi"
+msgid "Lyrics source"
+msgstr "Sorgente Testi"
 
 msgctxt "#31206"
 msgid "Found"
 msgstr "Trovato"
 
 msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Cerca altri elementi"
+msgid "Find more items"
+msgstr "Trova altri elementi"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Prossimi episodi"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura corrente"
+msgid "Upcoming episodes"
+msgstr "Prossimi Episodi"
 
 msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Ultimo aggiornamento"
+msgid "Last updated"
+msgstr "Ultimo Aggiornamento"
 
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Fornitore dei dati"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Nascondi fanart"
+msgid "Hide fanart"
+msgstr "Nascondi Fanart"
 
 msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Dettagli film"
+msgid "Movie details"
+msgstr "Dettagli Film"
 
 msgctxt "#31309"
-msgid "Memory Used:"
+msgid "Memory used:"
 msgstr "Memoria usata:"
 
 msgctxt "#31310"
-msgid "Track Number"
-msgstr "Numero traccia"
+msgid "Track number"
+msgstr "Numero Traccia"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Immagine fanart[CR][CR]Non disponibile[CR][CR] Premi il bottone per impostarla"
 
 msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Scraper corrente"
+msgid "Current scraper"
+msgstr "Scraper attuale"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "Scegli uno scraper"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opzioni scansione contenuti"
+msgid "Content scanning options"
+msgstr "Opzioni Scansione Contenuto"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Imposta il percorso per le fanart"
+msgid "Set fanart path"
+msgstr "Imposta percorso Fanart"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "Profilo selezionato"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Ultimo login"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke Song Selector"
+msgid "Karaoke song selector"
+msgstr "Selettore Canzoni Karaoke"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Trasmessa"
 
 msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opzioni playlist"
+msgid "Playlist options"
+msgstr "Opzioni Playlist"
 
 msgctxt "#31326"
 msgid "Created"
@@ -373,7 +345,7 @@ msgid "Resolution"
 msgstr "Risoluzione"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Aggiunti di recente"
 
 msgctxt "#31329"
@@ -381,12 +353,12 @@ msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Timer impostato![/B] [COLOR=grey2] - Il sistema verrà spento in[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Premi il bottone per riprodurre[CR][CR]il trailer del film"
+msgid "Click button to play[CR][CR]movie trailer"
+msgstr "Premi per riprodurre[CR][CR]il trailer del film"
 
 msgctxt "#31331"
-msgid "Album Details"
-msgstr "Dettagli album"
+msgid "Album details"
+msgstr "Dettagli Album"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -397,7 +369,7 @@ msgid "Stop"
 msgstr "Stop"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "Avanti veloce"
 
 msgctxt "#31354"
@@ -409,8 +381,8 @@ msgid "Movie menu"
 msgstr "Menù Filmato"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Scarica sottotitoli"
+msgid "Download subtitles"
+msgstr "Scarica Sottotitoli"
 
 msgctxt "#31360"
 msgid "Watch as 2D"
@@ -426,11 +398,11 @@ msgstr "Abilitato"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "Predefinito della skin"
+msgstr "Predefinito Skin"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Predefinito della skin senza maiuscole"
+msgid "Skin default with no caps"
+msgstr "Predefinito Skin senza maiuscole"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -438,7 +410,7 @@ msgstr "Basato su Arial"
 
 msgctxt "#31400"
 msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
-msgstr "[B]CONFIGURA LE IMPOSTAZIONI PER L'ASPETTO[/B][CR][CR]Cambia la skin · Imposta lingua e regione · Cambia le impostazioni di elenco dei file[CR]Imposta uno screensaver"
+msgstr "[B]CONFIGURA LE IMPOSTAZIONI PER L'ASPETTO[/B][CR][CR]Cambia la Skin · Imposta Lingua e Regione · Cambia le impostazioni di elenco dei file[CR]Imposta uno Screensaver"
 
 msgctxt "#31401"
 msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
@@ -448,21 +420,13 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]CONFIGURA IMPOSTAZIONI MUSICA[/B][CR][CR]Gestisci la tua libreria musicale · Imposta le opzioni di riproduzione della musica · Cambia le impostazioni per le liste audio[CR]Imposta invio canzone · Imposta le opzioni per il karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]CONFIGURA IMPOSTAZIONI IMMAGINI[/B][CR][CR]Cambia le opzioni per le liste delle immagini· Configura le slideshow"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]CONFIGURA IMPOSTAZIONI METEO[/B][CR][CR]Imposta tre città su cui avere le informazioni meteo"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]CONFIGURA IMPOSTAZIONI DI SISTEMA[/B][CR][CR]Imposta e calibra il video · Configura l'uscita audio · Imposta i controlli remoti[CR]Imposta le opzioni di risparmio energetico · Abilita il debug · Imposta il master lock"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURA GLI ADDON[/B][CR][CR]Gestisci i tuoi addon installati · Cerca ed installa gli addon da kodi.tv[CR]Modifica le impostazioni degli Addon"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]CONFIGURA ADD-ON[/B][CR][CR]Gestisci i tuoi Add-on installati · Sfoglia e installa Add-on da kodi.tv[CR]Modifica impostazioni Add-on"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -473,13 +437,9 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]CONFIGURA IMPOSTAZIONI DI RETE[/B][CR][CR]Imposta il controllo di Kodi via UPnP e HTTP · Configura la condivisione dei file[CR]Abilita Zeroconf · Configura AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
+msgid "First run help..."
 msgstr "Aiuto primo avvio...."
 
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Questa linguetta significa che c'è un menù off a lato di questa finestra che contiene ulteriori opzioni per questa sezione. Per accedere al menù, naviga a sinistra con il tuo telecomando o tastiera, o posiziona il mouse sulla linguetta. [CR][CR]Clicca \"Ok\" per chiudere questa informazione. Non apparirà nuovamente."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Sottotitolo locale disponibile"
@@ -489,8 +449,8 @@ msgid "Login"
 msgstr "Login"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Scegli il tuo profilo utente di Kodi[CR]per fare il login e continuare"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Scegli il tuo profilo utente Kodi[CR]per fare login e continuare"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,23 +461,23 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Seleziona il profilo che sarà usato all'avvio quando la schermata di login è disabilitata."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Timer programmati"
+msgid "Scheduled time"
+msgstr "Ora programmata"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "Aggiungi gruppo"
 
 msgctxt "#31504"
-msgid "Rename Group"
+msgid "Rename group"
 msgstr "Rinomina gruppo"
 
 msgctxt "#31505"
-msgid "Delete Group"
+msgid "Delete group"
 msgstr "Cancella gruppo"
 
 msgctxt "#31506"
@@ -525,31 +485,27 @@ msgid "Available[CR]Groups"
 msgstr "Gruppi[CR]disponibili"
 
 msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Gruppo canali"
+msgid "Channel group"
+msgstr "Gruppo Canali"
 
 msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Imposta Timer"
+msgid "Timer set"
+msgstr "Timer impostato"
 
 msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opzioni canale"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Previsioni a 36 ore"
+msgid "Channel options"
+msgstr "Opzioni Canali"
 
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "Previsioni orarie"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "Previsioni per il weekend"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "Previsioni giornaliere"
 
 msgctxt "#31905"
@@ -557,8 +513,8 @@ msgid "Forecast"
 msgstr "Previsioni"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Percentuale di precipitazioni"
+msgid "Chance of precipitation"
+msgstr "Possibilità di precipitazioni"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
diff --git a/addons/skin.confluence/language/Japanese/strings.po b/addons/skin.confluence/language/resource.language.ja_jp/strings.po
index 8c80e8294e..cc38a3651a 100644
--- a/addons/skin.confluence/language/Japanese/strings.po
+++ b/addons/skin.confluence/language/resource.language.ja_jp/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/xbmc-main/language/ja/)\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/kodi-main/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
+"Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr " "
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "電源オプション"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "処理中..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "情報を隠す"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "表示オプション"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "フルスクリーン"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "総時間"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "ミュージック - ファイル"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "アイテム"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "その他のオプション"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "地域"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "ポスターラップ"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "ファンアート"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "サムネール"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "イメージラップ"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "情報"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "アクション"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "現在再生中"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "再生中"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "スキャン中"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "視覚化プリセット"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "終了時間"
+msgid "End time"
+msgstr "終了時刻"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "このファイル内から再生したいパートを選択してください。"
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "現在選択中"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "ホーム画面オプション"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "背景"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "ピクチャスライドショーで「静止中」と表示"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "ウィンドウ内で予告を再生 [COLOR=grey3](ビデオ情報ダイアログのみ)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "その他の設定"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "「メインメニュー」ボタンを隠す"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "カスタムの背景を有効にする"
+msgid "Enable custom background"
+msgstr "Enable Custom Background"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "オプション"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "最近追加されたアルバムを表示"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "最近追加されたビデオを表示"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "ホーム画面「プログラム」のサブメニュー"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "背景のファンアートを隠す"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "背景に「現在再生中」ビデオを表示"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "背景に「現在再生中」の視覚化を表示"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "ビデオライブラリで TV テーマ曲を再生 (TvTunes アドオン)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "歌詞"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "フルスクリーン視覚化ではファンアートを非表示に"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "歌詞アドオン"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "ホーム画面「ビデオ』のサブメニュー"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "ホーム画面「ミュージック』のサブメニュー"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "ホーム画面「ピクチャ』のサブメニュー"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "ミュージック OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "曲を選択"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "歌詞の情報源"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "見つかりました"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "もっと見つける"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "今後のエピソード"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "現在の気温"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "最終更新時刻"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "気象データ提供元"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "ファンアートを隠す"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "ムービーの詳細"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "メモリ使用量:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "トラック番号"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "ファンアート画像[CR][CR]使用不可[CR][CR] ボタンを押して設定"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "現在のメタデータスクレーパー"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "メタデータスクレーパーを選択"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "コンテントスキャンオプション"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "ファンアートのパスを設定"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "選択されたプロファイル"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "最終ログイン"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "カラオケソングセレクター"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "放映日"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "プレイリストオプション"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "制作日"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "解像度"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "最近追加"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]タイマーセット完了![/B] [COLOR=grey2] - システムがシャットダウンします[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "ボタンを押して再生[CR][CR]ムービー予告編"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "アルバム詳細"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "一時停止"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "停止"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "早送り"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "巻き戻し"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "ムービーメニュー"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "字幕をダウンロード"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "2D で観る"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "スキンのデフォルト"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "スキンのデフォルト (小文字のみ)"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial ベース"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]ミュージック設定[/B][CR][CR]ミュージックライブラリ管理 - ミュージック再生設定 - ミュージック一覧設定変更[CR]楽曲送信設定 - カラオケ設定"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]ピクチャ設定[/B][CR][CR]ピクチャ一覧設定変更[CR]スライドショー設定"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]天気予報設定[/B][CR][CR]天気情報取得都市選択[CR]天気予報プラグイン選択"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]システム設定[/B][CR][CR]画面の設定・調整 - オーディオ出力設定 - リモートコントローラー設定[CR]省電力設定 - デバッグの有効化 - マスターロック設定"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]アドオン設定[/B][CR][CR]インストール済みアドオン管理 - kodi.tvからアドオンを検索・インストール[CR]アドオン設定変更"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]TV設定[/B][CR][CR]フルスクリーン情報の変更 · EPGデータ設定"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]サービス設定[/B][CR][CR]UPnP や HTTP 経由による Kodi 操作設定 · ファイル共有設定[CR]Zeroconf を有効に · AirPlay 設定"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "初回起動時のヘルプ..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "このタブは、このウィンドウの端にこのセクションの追加オプションが含まれているメニューがある事を示しています。このメニューにアクセスするには、リモコンやキーボードで左端に移動するか、またはマウスポインターをタブの上にのせます。[CR][CR]このダイアログを閉じるのには、「OK」をクリックしてください。このメッセージは再び表示されません。"
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "ローカルの字幕を利用できます"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "ログイン"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Kodi ユーザープロファイルを選択して[CR]ログインしてください"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "起動時にログイン画面を表示または非表示する"
@@ -500,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "ログイン画面が無効になっている状態の時、起動時に使用されるプロファイルを選択してください。"
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "タイマー予約時間"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "ライブTV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "グループの追加"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "グループの名称変更"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "グループの削除"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "利用可能な[CR]グループ"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "チャンネルグループ"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "タイマーセット完了"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "チャンネルオプション"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36時間予報"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "1時間ごとの予報"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "週末の予報"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "予報"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "降水確率"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "天気予報データ取得中..."
diff --git a/addons/skin.confluence/language/Korean/strings.po b/addons/skin.confluence/language/resource.language.ko_kr/strings.po
index eb01df1663..5a5f95c611 100644
--- a/addons/skin.confluence/language/Korean/strings.po
+++ b/addons/skin.confluence/language/resource.language.ko_kr/strings.po
@@ -4,24 +4,24 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Korean (http://www.transifex.com/projects/p/xbmc-main/language/ko/)\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/kodi-main/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
+"Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31000"
-msgid "Change Your"
-msgstr "변경"
+msgid "Change your"
+msgstr "선택하세요"
 
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "전원 옵션"
 
 msgctxt "#31004"
@@ -29,11 +29,11 @@ msgid "Working..."
 msgstr "작업 중..."
 
 msgctxt "#31005"
-msgid "Hide Information"
-msgstr "정보 숨기기"
+msgid "Hide information"
+msgstr "정보 숨김"
 
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "보기 옵션"
 
 msgctxt "#31008"
@@ -41,7 +41,7 @@ msgid "Full screen"
 msgstr "전체 화면"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "총 재생시간"
 
 msgctxt "#31022"
@@ -50,7 +50,7 @@ msgstr "음악 - 파일"
 
 msgctxt "#31023"
 msgid "Playing"
-msgstr "재생중"
+msgstr "재생 중"
 
 msgctxt "#31024"
 msgid "Page"
@@ -61,7 +61,7 @@ msgid "Items"
 msgstr "항목"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "기타 옵션"
 
 msgctxt "#31027"
@@ -69,7 +69,7 @@ msgid "Location"
 msgstr "위치"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
+msgid "Poster wrap"
 msgstr "포스터 나열"
 
 msgctxt "#31029"
@@ -77,11 +77,11 @@ msgid "Fanart"
 msgstr "팬아트"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "사진 썸네일"
 
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "이미지 나열"
 
 msgctxt "#31033"
@@ -93,20 +93,20 @@ msgid "Actions"
 msgstr "동작"
 
 msgctxt "#31040"
-msgid "Now Playing"
+msgid "Now playing"
 msgstr "지금 재생 중"
 
 msgctxt "#31042"
 msgid "PLAYING"
-msgstr "재생중"
+msgstr "재생 중"
 
 msgctxt "#31043"
 msgid "PAUSED"
-msgstr "일시정지"
+msgstr "일시 중지"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
-msgstr "빨리감기"
+msgstr "빨리 감기"
 
 msgctxt "#31045"
 msgid "REWIND"
@@ -117,11 +117,11 @@ msgid "SEEKING"
 msgstr "찾는 중"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "시각화 사전설정"
+msgid "Visualisation presets"
+msgstr "시각화 프리셋"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "종료 시각"
 
 msgctxt "#31050"
@@ -157,7 +157,7 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "이 파일은 연결되었습니다, 재생하고 싶은 부분을 선택하세요."
 
 msgctxt "#31061"
-msgid "Current Selected"
+msgid "Current selected"
 msgstr "현재 선택됨"
 
 msgctxt "#31101"
@@ -168,29 +168,21 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "배경"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "사진 슬라이드쇼에 \"일시정지됨\" 보기"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "윈도우에 예고편 재생 [COLOR=grey3](비디오 정보 대화창만)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "창에 예고편 재생 [COLOR=grey3](비디오 정보 대화창만)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "기타 옵션"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "비디오 파일 이름에서 읽은 플래그 숨기기 [COLOR=grey3](블루레이, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "메인 메뉴 버튼 숨기기"
+msgid "Hide main menu buttons"
+msgstr "메인 메뉴 버튼 숨김"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "사용자 배경화면 사용"
+msgid "Enable custom background"
+msgstr "사용자 지정 배경 사용"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -198,34 +190,30 @@ msgstr "배경화면 경로:"
 
 msgctxt "#31111"
 msgid "Hide"
-msgstr "숨기기"
+msgstr "숨김"
 
 msgctxt "#31112"
 msgid "Options"
 msgstr "옵션"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "최근 추가한 앨범 보기"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
+msgid "Show recently added videos"
 msgstr "최근 추가한 비디오 보기"
 
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "홈 페이지 프로그램 하위 메뉴"
-
 msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "배경 팬아트 숨기기"
+msgid "Hide background fanart"
+msgstr "배경 팬아트 숨김"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
+msgid "Show background \"Now playing\" video"
 msgstr "배경에 \"지금 재생 중\" 비디오 보기"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
+msgid "Show background \"Now playing\" visualisation"
 msgstr "배경에 \"지금 재생 중\" 시각화 보기"
 
 msgctxt "#31126"
@@ -241,25 +229,13 @@ msgid "Lyrics"
 msgstr "가사"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "전체 화면 시각화에서 팬아트 숨기기"
+msgid "Hide fanart in full screen visualisation"
+msgstr "전체 화면 시각화에서 팬아트 숨김"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
+msgid "Lyrics add-on"
 msgstr "가사 애드온"
 
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "홈 페이지 비디오 하위 메뉴"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "홈 페이지 음악 하위 메뉴"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "홈 페이지 사진 하위 메뉴"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "음악 OSD"
@@ -277,11 +253,11 @@ msgid "Shortcuts"
 msgstr "바로가기"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
+msgid "Choose your song"
 msgstr "노래 선택"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
+msgid "Lyrics source"
 msgstr "가사 소스"
 
 msgctxt "#31206"
@@ -289,19 +265,15 @@ msgid "Found"
 msgstr "찾음"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "더 찾아보기"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "방송 예정 에피소드"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "현재 온도"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "마지막 업데이트"
 
 msgctxt "#31303"
@@ -309,19 +281,19 @@ msgid "Data provider"
 msgstr "날씨 정보 제공"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "팬아트 숨기기"
+msgid "Hide fanart"
+msgstr "팬아트 숨김"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "영화 상세정보"
 
 msgctxt "#31309"
-msgid "Memory Used:"
+msgid "Memory used:"
 msgstr "사용 메모리:"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "트랙 번호"
 
 msgctxt "#31311"
@@ -329,31 +301,31 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "팬아트 이미지[CR][CR]사용할 수 없음[CR][CR] 설정하려면 버튼을 누르세요"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "현재 정보수집기"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "정보수집기를 선택하세요"
+msgid "Choose a scraper"
+msgstr "정보수집기 선택"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "콘텐츠 검색 옵션"
+msgid "Content scanning options"
+msgstr "콘텐츠 탐색 옵션"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
+msgid "Set fanart path"
 msgstr "팬아트 경로 설정"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "선택된 프로파일"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "마지막 로그인"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
+msgid "Karaoke song selector"
 msgstr "노래방 노래 선택기"
 
 msgctxt "#31322"
@@ -361,7 +333,7 @@ msgid "Aired"
 msgstr "방영"
 
 msgctxt "#31325"
-msgid "Playlist Options"
+msgid "Playlist options"
 msgstr "재생목록 옵션"
 
 msgctxt "#31326"
@@ -373,7 +345,7 @@ msgid "Resolution"
 msgstr "해상도"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "최근 추가"
 
 msgctxt "#31329"
@@ -381,23 +353,23 @@ msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]타이머 설정![/B] [COLOR=grey2] - 시스템 자동 종료[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
 msgstr "영화 예고편을[CR][CR]재생하려면 누르세요"
 
 msgctxt "#31331"
-msgid "Album Details"
-msgstr "앨범 정보"
+msgid "Album details"
+msgstr "앨범 상세정보"
 
 msgctxt "#31351"
 msgid "Pause"
-msgstr "일시정지"
+msgstr "일시 중지"
 
 msgctxt "#31352"
 msgid "Stop"
-msgstr "정지"
+msgstr "중지"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "빨리감기"
 
 msgctxt "#31354"
@@ -409,7 +381,7 @@ msgid "Movie menu"
 msgstr "자막 애드온"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
+msgid "Download subtitles"
 msgstr "자막 다운로드"
 
 msgctxt "#31360"
@@ -429,16 +401,16 @@ msgid "Skin default"
 msgstr "스킨 기본값"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
+msgid "Skin default with no caps"
 msgstr "대문자 없는 스킨 기본값"
 
 msgctxt "#31392"
 msgid "Arial based"
-msgstr "Arial 기본값"
+msgstr "Arial based"
 
 msgctxt "#31400"
 msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
-msgstr "[B]모양새 설정[/B][CR][CR]스킨 변경 · 언어 및 지역 설정 · 파일 목록 옵션 변경[CR]화면보호기 설정"
+msgstr "[B]모양새 설정[/B][CR][CR]스킨 변경 · 언어 및 지역 설정 · 파일 목록 옵션 변경[CR]화면 보호기 설정"
 
 msgctxt "#31401"
 msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
@@ -448,20 +420,12 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]음악 설정[/B][CR][CR]음악 라이브러리 관리 · 음악 재생 옵션 변경 · 음악 목록 옵션 변경[CR]노래 전송 설정 · 노래방 옵션 설정"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]사진 설정[/B][CR][CR]사진 목록 옵션 변경 · 슬라이드쇼 설정"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]날씨 설정[/B][CR][CR]날씨 정보를 수집할 세 도시 설정"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]시스템 설정[/B][CR][CR]화면 설정 및 조정 · 오디오 출력 설정 · 원격 제어 설정[CR]전원 절약 옵션 설정 · 디버깅 사용 · 마스터 잠금 설정"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
 msgstr "[B]애드온 설정[/B][CR][CR]설치된 애드온 관리 · kodi.tv에서 애드온 탐색 및 설치[CR]애드온 설정"
 
 msgctxt "#31409"
@@ -473,12 +437,8 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]서비스 설정[/B][CR][CR]UPnP 및 HTTP를 통한 Kodi 제어 설정 · 파일 공유 설정[CR]Zeroconf 활성화 · AirPlay 설정"
 
 msgctxt "#31411"
-msgid "First run help...."
-msgstr "처음 실행 도움말...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "이 탭은 현재 섹션의 추가 옵션메뉴가 화면 가장자리에 숨어 있다는 것을 의미합니다.  메뉴에 접근하려면 리모컨 또는 키보드로 왼쪽으로 이동하거나 탭 위로 마우스를 가져가세요. [CR] [CR]\"확인\"을 누르면 대화상자가 닫히고 다시 표시되지 않습니다."
+msgid "First run help..."
+msgstr "처음 실행 도움말..."
 
 msgctxt "#31413"
 msgid "Local subtitle available"
@@ -489,7 +449,7 @@ msgid "Login"
 msgstr "로그인"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
+msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "로그인할 Kodi 사용자 프로파일을[CR]선택하고 계속하세요"
 
 msgctxt "#31422"
@@ -501,23 +461,23 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "시작시 로그인 화면을 표시하지 않을 때 사용할 프로파일을 선택합니다."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "예약 시간"
+msgid "Scheduled time"
+msgstr "예약 시각"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV 시청"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "그룹 추가"
 
 msgctxt "#31504"
-msgid "Rename Group"
-msgstr "그룹명 변경"
+msgid "Rename group"
+msgstr "그룸 이름 변경"
 
 msgctxt "#31505"
-msgid "Delete Group"
+msgid "Delete group"
 msgstr "그룹 삭제"
 
 msgctxt "#31506"
@@ -525,31 +485,27 @@ msgid "Available[CR]Groups"
 msgstr "사용가능한[CR]그룹"
 
 msgctxt "#31509"
-msgid "Channel Group"
+msgid "Channel group"
 msgstr "채널 그룹"
 
 msgctxt "#31510"
-msgid "Timer Set"
+msgid "Timer set"
 msgstr "예약 설정"
 
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "채널 옵션"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 시간 예보"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "시간대별 예보"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "주말 예보"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "일일 예보"
 
 msgctxt "#31905"
@@ -557,7 +513,7 @@ msgid "Forecast"
 msgstr "예보"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "강수확률"
 
 msgctxt "#31909"
diff --git a/addons/skin.confluence/language/Lithuanian/strings.po b/addons/skin.confluence/language/resource.language.lt_lt/strings.po
index 87d45ccd15..b525caa460 100644
--- a/addons/skin.confluence/language/Lithuanian/strings.po
+++ b/addons/skin.confluence/language/resource.language.lt_lt/strings.po
@@ -4,24 +4,24 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Lithuanian (http://www.transifex.com/projects/p/xbmc-main/language/lt/)\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/kodi-main/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
+"Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
-msgstr "Pakeiskite savo"
+msgid "Change your"
+msgstr "Kodi"
 
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "Maitinimo parinktys"
 
 msgctxt "#31004"
@@ -29,19 +29,19 @@ msgid "Working..."
 msgstr "Veikia..."
 
 msgctxt "#31005"
-msgid "Hide Information"
+msgid "Hide information"
 msgstr "Slėpti informaciją"
 
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Rodinio parinktys"
+msgid "View options"
+msgstr "Rodinio parinkys"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Visas ekranas"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Bendra trukmė"
 
 msgctxt "#31022"
@@ -61,7 +61,7 @@ msgid "Items"
 msgstr "Elementai"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "Įvairios parinktys"
 
 msgctxt "#31027"
@@ -69,20 +69,20 @@ msgid "Location"
 msgstr "Vieta"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Plakatų karuselė"
+msgid "Poster wrap"
+msgstr "Plakatų karusėlė"
 
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "FanArt"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "Miniatiūros"
 
 msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Atvaizdų karuselė"
+msgid "Image wrap"
+msgstr "Atvaizdų karusėlė"
 
 msgctxt "#31033"
 msgid "Info"
@@ -93,7 +93,7 @@ msgid "Actions"
 msgstr "Veiksmai"
 
 msgctxt "#31040"
-msgid "Now Playing"
+msgid "Now playing"
 msgstr "Dabar atkuriama"
 
 msgctxt "#31042"
@@ -117,11 +117,11 @@ msgid "SEEKING"
 msgstr "PAIEŠKA"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Išankstinės vizualizacijos parinktys"
+msgid "Visualisation presets"
+msgstr "Vizualizacijų išankstinės parinktys"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Pabaigos laikas"
 
 msgctxt "#31050"
@@ -157,8 +157,8 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Šis failais yra sugrupuotas, pasirinkite dalį kurią norite atkurti."
 
 msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Dabartinis pasirinkimas"
+msgid "Current selected"
+msgstr "Dabartinis pasirinktas"
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -168,29 +168,21 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Fonas"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Rodyti \"Pauzė\" nuotraukų skaidrių peržiūroje"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Atkurti anonsus lange [COLOR=grey3](Vaizdo dialogo lange)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Atkurti anonsus lange [COLOR=grey3](Tik vaizdo informacijos lange)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Įvairios parinktys"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Slėpti žymes vaizdo failų varduose [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
+msgid "Hide main menu buttons"
 msgstr "Slėpti pagrindinio meniu mygtukus"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Įjungti individualų foną"
+msgid "Enable custom background"
+msgstr "Įjungti savą foną"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,28 +197,24 @@ msgid "Options"
 msgstr "Parinktys"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "Rodyti neseniai pridėtus albumus"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
+msgid "Show recently added videos"
 msgstr "Rodyti neseniai pridėtus vaizdo įrašus"
 
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Pradinio puslapio programų submeniu"
-
 msgctxt "#31119"
-msgid "Hide Background Fanart"
+msgid "Hide background fanart"
 msgstr "Slėpti fono Fanart"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Rodyti fone \"Dabar atkuriamą\" vaizdo įrašą"
+msgid "Show background \"Now playing\" video"
+msgstr "Rodyti \"Dabar atkuriamą\" vaizdo įrašą fone"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Rodyti fone \"Dabar atkuriama\" vizualizaciją"
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Rodyti \"Dabar atkuriamos\" muzikos vizualizaciją fone"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -241,24 +229,12 @@ msgid "Lyrics"
 msgstr "Dainų žodžiai"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
+msgid "Hide fanart in full screen visualisation"
 msgstr "Slėpti Fanart viso ekrano vizualizacijoje"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Dainų žodžių priedas"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Pradinio puslapio vaizdo įrašų submeniu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Pradinio puslapio muzikos submeniu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Pradinio puslapio nuotraukų submeniu"
+msgid "Lyrics add-on"
+msgstr "Dainos žodžių priedas"
 
 msgctxt "#31140"
 msgid "Music OSD"
@@ -277,31 +253,27 @@ msgid "Shortcuts"
 msgstr "Nuorodos"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Pasirinkite savo dainą"
+msgid "Choose your song"
+msgstr "Pasirinkite dainą"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Dainų žodžių šaltinis"
+msgid "Lyrics source"
+msgstr "Dainos žodžių šaltinis"
 
 msgctxt "#31206"
 msgid "Found"
 msgstr "Rasta"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Rasti daugiau elementų"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "Artimiausi epizodai"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Dabartinė temperatūra"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Paskutinis atnaujinimas"
 
 msgctxt "#31303"
@@ -309,19 +281,19 @@ msgid "Data provider"
 msgstr "Duomenų tiekėjas"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
+msgid "Hide fanart"
 msgstr "Slėpti Fanart"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Filmo duomenys"
 
 msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Išnaudota atminties:"
+msgid "Memory used:"
+msgstr "Naudojama atminties:"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "Takelio numeris"
 
 msgctxt "#31311"
@@ -329,31 +301,31 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart atvaizdas[CR][CR]nepasiekiamas[CR][CR] Spauskite mygtuką, norėdami nustatyti"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "Dabartinis skreperis"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "Pasirinkite skreperį"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
+msgid "Content scanning options"
 msgstr "Turinio nuskaitymo parinktys"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
+msgid "Set fanart path"
 msgstr "Nustatyti Fanart kelią"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "Pasirinktas profilis"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Paskutinis prisijungimas"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
+msgid "Karaoke song selector"
 msgstr "Karaoke dainos pasirinkimas"
 
 msgctxt "#31322"
@@ -361,7 +333,7 @@ msgid "Aired"
 msgstr "Transliuotas"
 
 msgctxt "#31325"
-msgid "Playlist Options"
+msgid "Playlist options"
 msgstr "Grojaraščio parinktys"
 
 msgctxt "#31326"
@@ -373,19 +345,19 @@ msgid "Resolution"
 msgstr "Raiška"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Neseniai pridėti"
+msgid "Recently added"
+msgstr "Neseniai pridėta"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Laikmatis nustatytas![/B] [COLOR=grey2] - Sistemos automatinis išjungimas po[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
 msgstr "Spauskite mygtuką, norėdami atkurti[CR][CR]filmo anonsą"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "Albumo informacija"
 
 msgctxt "#31351"
@@ -397,7 +369,7 @@ msgid "Stop"
 msgstr "Stabdyti"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "Prasukti pirmyn"
 
 msgctxt "#31354"
@@ -409,7 +381,7 @@ msgid "Movie menu"
 msgstr "Filmo meniu"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
+msgid "Download subtitles"
 msgstr "Atsisiųsti subtitrus"
 
 msgctxt "#31360"
@@ -429,8 +401,8 @@ msgid "Skin default"
 msgstr "Dabartinė teminė išvaizda"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Dabartinė teminė išvaizda be didžiųjų raidžių"
+msgid "Skin default with no caps"
+msgstr "Kaip numatyta, tik be didžiųjų"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -448,21 +420,13 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGŪRUOTI MUZIKOS NUSTATYMUS[/B][CR][CR]Tvarkyti muzikos biblioteką · Nustatyti dainų įkėlimą · Nustatyti karaoke parinktis[CR]Keisti muzikos sąrašo atvaizdavimo parinktis · Nustatyti muzikos atkūrimo parinktis"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGŪRUOTI NUOTRAUKŲ NUSTATYMUS[/B][CR][CR]Nustatyti nuotraukų sąrašo atvaizdavimo parinktis · Konfigūruoti skaidrių peržiūras"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGŪRUOTI ORŲ NUSTATYMUS[/B][CR][CR]Nustatykite tris miestus gauti orų informacijai"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGŪRUOTI SISTEMOS NUSTATYMUS[/B][CR][CR]Nustatyti ir kalibruoti ekranus · Nustatyti garso išvestį · Nustatyti nuotolinį valdymą[CR]Nustatyti energijos taupymo parinktis · Įjungti derinimą · Nustatyti valdytojo užraktą"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGŪRUOTI PRIEDUS[/B][CR][CR]Tvarkyti įdiegtus priedus · Naršyti ir įdiegti priedus iš kodi.tv[CR]Modifikuoti priedų nustatymus"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]KONFIGŪRUOTI PRIEDUS[/B][CR][CR]Tvarkyti įdiegtus priedus · naršyti ir įdiegti priedus iš kodi.tv[CR]Keisti priedų nustatymus"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -473,13 +437,9 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]KONFIGŪRUOTI PASLAUGŲ NUSTATYMUS[/B][CR][CR]Nustatyti Kodi valdymą per UPnP ir HTTP · Konfigūruoti failų bendrinimą[CR]Įjungti Zeroconf · Konfigūruoti AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
+msgid "First run help..."
 msgstr "Pirmo paleidimo pagalba..."
 
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Šis skirtukas reiškia, kad šio lango krašte yra meniu, kuriame yra papildomų parinkčių šiam skyriui. Norėdami atidaryti meniu, pereikite į kairę, naudojant nuotolinio valdymo pultą arba klaviatūrą arba užeikite pelės žymekliu virš skirtuko.[CR][CR]Norėdami uždaryti šį langą spauskite \"OK\",  ir jis daugiau nebus rodomas."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Prieinami vietiniai subtitrai"
@@ -489,8 +449,8 @@ msgid "Login"
 msgstr "Prisijungti"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Pasirinkite Kodi vartotojo profilį[CR]prisijungimui ir tęskite"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Pasirinkite savi Kodi profilį,[CR]norėdami prisijungti ir tęsti"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,23 +461,23 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Pasirinkite profilį, kuris bus naudojamas paleidimo metu, kai prisijungimo langas išjungtas."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Suplanuotas laikas"
+msgid "Scheduled time"
+msgstr "Suplanuotas laiaks"
 
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "Televizija"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "Pridėti grupę"
 
 msgctxt "#31504"
-msgid "Rename Group"
+msgid "Rename group"
 msgstr "Pervadinti grupę"
 
 msgctxt "#31505"
-msgid "Delete Group"
+msgid "Delete group"
 msgstr "Pašalinti grupę"
 
 msgctxt "#31506"
@@ -525,31 +485,27 @@ msgid "Available[CR]Groups"
 msgstr "Galimos[CR]grupės"
 
 msgctxt "#31509"
-msgid "Channel Group"
+msgid "Channel group"
 msgstr "Kanalo grupė"
 
 msgctxt "#31510"
-msgid "Timer Set"
+msgid "Timer set"
 msgstr "Laikmatis nustatytas"
 
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "Kanalo parinktys"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 valandų prognozė"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Valandos prognozė"
+msgid "Hourly forecast"
+msgstr "Valandinė prognozė"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "Savaitgalio prognozė"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "Dienos prognozė"
 
 msgctxt "#31905"
@@ -557,7 +513,7 @@ msgid "Forecast"
 msgstr "Prognozė"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "Kritulių tikimybė"
 
 msgctxt "#31909"
@@ -578,7 +534,7 @@ msgstr "NUOTRAUKOS"
 
 msgctxt "#31952"
 msgid "TV"
-msgstr "TV"
+msgstr "TELEVIZIJA"
 
 msgctxt "#31953"
 msgid "VIDEOS"
@@ -610,4 +566,4 @@ msgstr "SISTEMA"
 
 msgctxt "#31960"
 msgid "RADIO"
-msgstr "RADIJA"
+msgstr "RADIJAS"
diff --git a/addons/skin.confluence/language/Latvian/strings.po b/addons/skin.confluence/language/resource.language.lv_lv/strings.po
index 9101db8f0f..3e69ca7971 100644
--- a/addons/skin.confluence/language/Latvian/strings.po
+++ b/addons/skin.confluence/language/resource.language.lv_lv/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/xbmc-main/language/lv/)\n"
+"Language-Team: Latvian (Latvia) (http://www.transifex.com/projects/p/kodi-main/language/lv_LV/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
+"Language: lv_LV\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Maini savu"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Enerģijas opcijas"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Darbojas..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Slēpt informāciju"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Skata opcijas"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Pilnekrāns"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Kopējais ilgums"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Mūzika - Faili"
@@ -60,28 +44,20 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Ieraksti"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Dažādas opcijas"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Atrašanās vieta"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
+msgid "Poster wrap"
 msgstr "Plakāta ietvars"
 
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanumāksla"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Att. sīktēli"
-
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "Attēla ietvars"
 
 msgctxt "#31033"
@@ -92,10 +68,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Darbības"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Pašreiz atskaņo"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "ATSKAŅO"
@@ -116,12 +88,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "NOVIETOŠANA"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Vizualizācijas sagataves"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Beigu laiks"
 
 msgctxt "#31050"
@@ -156,10 +124,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Fails ir ielādēts, atlasiet daļu, no kuras atskaņot."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Pašreiz atlasīts"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Mājas ekrāna opcijas"
@@ -168,29 +132,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Fons"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Rādīt \"Iepauzēts\" attēlu slīdītē"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Atskaņot rullīšus logā [COLOR=grey3](Tikai video informācijas dialogs)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Dažādas opcijas"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Paslēpt karogus, kas nolasīti no video failu nosaukumiem [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Slēpt galvenās izvēlnes pogas"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Ieslēgt pielāgotus fonus"
+msgid "Enable custom background"
+msgstr "Ieslēgt pielāgotu fonu"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +152,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opcijas"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Rādīt nesen pievienotos albumus"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Rādīt nesen pievienotos video"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Programmu mājas lapas apakšizvēlne"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Slēpt fona fanumākslu"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Rādīt fonā \"Pašreiz atskaņo\" video"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Rādīt fonā \"Pašreiz atskaņo\" vizualizāciju"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Atskaņot TV tēmu dziesmas video bibiliotēkā (TvTunes pielikums)"
@@ -240,26 +164,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Dziesmu vārdi"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Slēpt fanumākslu pilnekrāna vizualizācijā"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Dziesmu vārdu pielikums"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr " Video mājaslapas apakšizvēlne"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Mūzikas mājaslapas apakšizvēlne"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Attēlu mājaslapas apakšizvēlne"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Mūzikas OSD"
@@ -276,94 +180,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Saīsnes"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Izvēlieties savu dziesmu"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Dziesmu vārdu avots"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Atrada"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Atrast vairāk ierakstu"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Gaidāmās sērijas"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Pašreizējā temperatūra"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Pēdējie atjaunotie"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Datu piegādātājs"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Slēpt fanumākslu"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Filmas detaļas"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Izmantotā atmiņa:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Celiņa numurs"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanumākslas attēls[CR][CR]Nav pieejams[CR][CR] Klišķis uz pogas, lai iestatītu"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Pašreizējais skrāpis"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Izvēlieties skrāpi"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Satura skenēšanas opcijas"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Iestatīt fanumākslas ceļu"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Atlasītais profils"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Pēdējoreiz pieslēdzies"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke dziesmu atlasītājs"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Ēterā"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Spēļsaraksta opcijas"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Izveidots"
@@ -372,22 +204,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Izšķirtspēja"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Nesen pievienots"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Taimeris iestatīts![/B] [COLOR=grey2] - Sistēmas auto izslēgšana pēc[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Spiediet pogu, lai atskaņotu[CR][CR]filmas rullīti"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Albuma detaļas"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pauze"
@@ -396,10 +216,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Apturēt"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Patīt uz priekšu"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Attīt atpakaļ"
@@ -408,10 +224,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Filmas izvēlne"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Lejupielādēt subtitrus"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Skatīties 2D"
@@ -428,10 +240,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Apvalka noklusējums"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Apvalka noklusējums ar maziem burtiem"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Balstīts uz Arial"
@@ -448,20 +256,12 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGURĒT MŪZIKAS IESTATĪJUMUS[/B][CR][CR]Pārvaldīt savu mūzikas bibiliotēku · Iestatīt mūzikas atskaņošanas opcijas · Mainīt mūzikas saraksta opcijas[CR]Uzstādīt dziesmas iesniegšanu · Iestatīt karaoke opcijas"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGURĒT ATTĒLA IESTATĪJUMUS[/B][CR][CR]Iestatīt attēlu saraksta opcijas · Konfigurēt slīdītes"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGURĒT LAIKAPSTĀKĻU IESTATĪJUMUS[/B][CR][CR]Iestatīt trīs pilsētas, par kurām savākt laikapstākļu informāciju"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGURĒT SISTĒMAS IESTATĪJUMUS[/B][CR][CR]Uzstādīt un kalibrēt displejus · Konfigurēt audio izvadi · Uzstādīt tālvadības pulti[CR]Iestatīt enerģijas taupīšanas opcijas · Ieslēgt atkļūdošanu · Uzstādīt galveno slēdzeni"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
 msgstr "[B]KONFIGURĒT PIELIKUMUS[/B][CR][CR]Pārvaldīt savus instalētos pielikumus · Pārlūkot un instalēt pielikumus no kodi.tv[CR]Mainīt pielikuma iestatījumus"
 
 msgctxt "#31409"
@@ -472,14 +272,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGURĒT PAKALPOJUMA IESTATĪJUMUS[/B][CR][CR]Uzstādīt Kodi kontroli no UPnP un HTTP · Konfigurēt failu koplietošanu[CR]Ieslēgt Zeroconf · Konfigurēt AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Palīdzība pirmajā reizē..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Šī cilne nozīmē, ka aiz loga malas ir izvēlne, kas satur sekcijas papildus opcijas. Lai piekļūtu izvēlnei, navigējiet ar tālvadības pulti vai tastatūru pa kreisi, vai novietojiet peles kursoru virs cilnes. [CR][CR]Spiediet \"Ok\", lai aizvērtu šo dialogu. Tas vairs neparādīsies."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Pieejami lokālie subtitri"
@@ -488,10 +280,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Pieteikšanās"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Atlasiet savu Kodi lietotāja profilu,[CR]lai pieslēgtos un turpinātu"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Uzsākot rādīt vai paslēpt pieteikšanās logu."
@@ -500,62 +288,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Atlasīt profilu, ko izmantot uzsākot, ja pieteikšanās logs ir izslēgts. "
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Ieplānotais laiks"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Tiešraides TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Pievienot grupu"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Pārsaukt grupu"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Dzēst grupu"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Pieejamās[CR]grupas"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanāla grupa"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Taimeris iestatīts"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanāla opcijas"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 stundu prognoze"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Prognoze ik stundu"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Prognoze nedēļas nogalei"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Prognoze"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Nokrišņu iespējamība"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Uzmeklēju laikaprognozi..."
diff --git a/addons/skin.confluence/language/Maori/strings.po b/addons/skin.confluence/language/resource.language.mi/strings.po
index 744a13ff7f..260e374c87 100644
--- a/addons/skin.confluence/language/Maori/strings.po
+++ b/addons/skin.confluence/language/resource.language.mi/strings.po
@@ -4,18 +4,22 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Maori (http://www.transifex.com/projects/p/xbmc-main/language/mi/)\n"
+"Language-Team: Maori (http://www.transifex.com/projects/p/kodi-main/language/mi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mi\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgctxt "#31006"
+msgid "View options"
+msgstr "Tirohia ngā kōwhiringa"
+
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Mata katoa"
@@ -28,6 +32,10 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
+msgctxt "#31049"
+msgid "End time"
+msgstr "Wā mutunga"
+
 msgctxt "#31059"
 msgid "Current playlist"
 msgstr "Rārangi ō naianei"
@@ -40,6 +48,10 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "He Whakamārama"
 
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "Whakahohe i muri ritenga"
+
 msgctxt "#31111"
 msgid "Hide"
 msgstr "Huna"
@@ -69,7 +81,7 @@ msgid "Skin default"
 msgstr "Kiri taunoa"
 
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "TV"
 
 msgctxt "#31910"
diff --git a/addons/skin.confluence/language/Macedonian/strings.po b/addons/skin.confluence/language/resource.language.mk_mk/strings.po
index 05efa64562..51cfc62218 100644
--- a/addons/skin.confluence/language/Macedonian/strings.po
+++ b/addons/skin.confluence/language/resource.language.mk_mk/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Macedonian (http://www.transifex.com/projects/p/xbmc-main/language/mk/)\n"
+"Language-Team: Macedonian (Macedonia) (http://www.transifex.com/projects/p/kodi-main/language/mk_MK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
+"Language: mk_MK\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Изменете ваше"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Опции за напојување"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Обработка..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Сокриј инфо"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Погледни опции"
+msgid "View options"
+msgstr "Прикажи опции"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Цел екран"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Вкупно времетраење"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Музика - Датотеки"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Предмети"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Други опции"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Локација"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Обвиткување на постерот"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fan-арт"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Сликички"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Обвиткување на сликата"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Информации"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Дела"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Сега се изведува"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "ИЗВЕДБА"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "ПРЕБАРУВАЊЕ"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Предефирнирани визуелизации"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Време на завршување"
+msgid "End time"
+msgstr "Време на крај"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Оваа датотека е сложена, изберете дел кој сакате да го пуштите."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Сегашен избор"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Опции на почетен екран"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Позадина"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Прикажи „Паузирано“ за време на репродукција на слика"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Пушти трејлери во прозорче [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Разни опции"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Сoкриј ги копчињата од главното мени"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Овозможи персонализирана позадина"
+msgid "Enable custom background"
+msgstr "Овозможи сопствени позадини"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Опции"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Прикажи неодамна додадени албуми"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Прикажи неодамна додадени видеа"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Под-мени за програми од поч. страна"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Сокриј позадина"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Прикажи сегашен филм во позадина"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Прикажи сегашна визуализација во позадина"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Пуштај TV-theme-songs во видео библиотеката (TvTunes add-on)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Стихови на песни"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Сокриј ги постерите со визуелизацијата на цел екран"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Lyrics Add-on"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Видео подмени на почетната страна"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Музичко подмени на почетната страна"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Подмени за Албуми на почетната страна"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Музички OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Кратенки"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Изберете ја вашата песна"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Извор за стихови"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Најдено"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Најди повеќе"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Следни епизоди"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Моментална температура"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Последно ажурирање"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Провајдер на податоци"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Сокриј слика"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Податоци за филмот"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Искористеност на меморијата"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Број на нумера"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Посебна слика[CR]не  е доделена.[CR][CR]Кликнете на копчето за да[CR]ја доделите."
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Сегашен снабдувач"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Изберете снабдувач"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Опции за анализирање на содржина"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Пост. пат. до слики"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Одбран профил"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Последна пријава"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Бирач на караоке песни"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Емитирано"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Опција на список за репродукција"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Креирано"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Резолуција"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Неодамна додадено"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Одбројувањето е поставено![/B] [COLOR=grey2] - Системот ќе се искучи за[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Кликнете на тастер за репродукција[CR][CR]на најава за филм"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Детали на албумот"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Паузирај"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Сопри"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Премотај нанапред"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Премотај наназад"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Филмско мени"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Превземи превод"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Гледај во 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Основен изглед"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Основен изглед со мали букви"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Базирано на Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]КОНФИГУРИРАЊЕ ПОСТАВКИ ЗА МУЗИКА[/B][CR][CR]Управувајте со вашата музичка библиотека · Поставете опции за изведба на музика[CR]Променете опции за прикажување на музика · Поставете праќање на песни · Поставете караоке опции"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]КОНФИГУРИРАЊЕ ПОСТАВКИ ЗА СЛИКИ[/B][CR][CR]Поставете опции за прикажување на слики · Конфигурирајте изведба на слајдови"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]КОНФИГУРИРАЊЕ ПОСТАВКИ ЗА ВРЕМЕНСКА ПРОГНОЗА[/B][CR][CR]Поставете три градови за собирање на информации за временската состојба"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]КОНФИГУРИРАЊЕ СИСТЕМСКИ ПОСТАВКИ[/B][CR][CR]Подесете и калибрирајте екрани · Конфигурирајте звучен излез · Подесете далечинско управување · Поставете опции за заштеда на енергија[CR]Овозможете евиденција на грешки · Подесете главна лозинка"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]КОНФИГУРИРАЊЕ ЗА ADD-ON-и[/B][CR][CR]Управувајте ги вашите add-on-и · Побарајте и инсталирајте add-on од kodi.tv[CR]Прилагодете ги подесувањата за add-on-и"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]КОНФИГУРИРАЈ ТВ ПОСТАВКИ[/B][CR][CR]Промени инфо на цел екран · Подесување на EPG податоци"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]КОНФИГУРИРАЈ СЕРВИСНИ ПОДЕСУВАЊА[/B][CR][CR]Подеси контрола врз Kodi преку UPnP и HTTP · Конфигурирај споделување папки[CR]Овозможи Zeroconf ·Конфигурирај AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Помош при прво пуштање..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Овој таб покажува дека постои исклучено мени на левата страна на прозорот кое содржи дополнителни опции за оваа секција. За пристап кон менито, притиснете лево на далечинското или тастатурата или со маусот поминете преку табот. [CR][CR]Кликни \"Ok\" за да се затвори овој дијалог. Нема повторно да се појави."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Локален превод е достапен"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Најави се"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Одберете ваш Kodi кориснички[CR]профил за најава, а потоа продолжете понатаму"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Прикажи го или сокриј го екранот за најава при стартување"
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Избери го профилот кој ќе биде користен при стартување кога екранот за најава е исклучен"
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Закажано време"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Додади група"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Преименувај група"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Избриши група"
+msgid "TV"
+msgstr "ТВ"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Достапни[CR]Групи"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Група на канали"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Поставување тајмер"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Подесување на канали"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 Часовна Прогноза"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Часовна Прогноза"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Викенд Прогноза"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Дневна Прогноза"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Прогноза"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Можност за врнежи"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Превземање на прогноза..."
diff --git a/addons/skin.confluence/language/Malayalam/strings.po b/addons/skin.confluence/language/resource.language.ml_in/strings.po
index 2ca9276c35..f78b9f4a28 100644
--- a/addons/skin.confluence/language/Malayalam/strings.po
+++ b/addons/skin.confluence/language/resource.language.ml_in/strings.po
@@ -4,16 +4,16 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Malayalam (http://www.transifex.com/projects/p/xbmc-main/language/ml/)\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/kodi-main/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ml\n"
+"Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31200"
diff --git a/addons/skin.confluence/language/Mongolian (Mongolia)/strings.po b/addons/skin.confluence/language/resource.language.mn_mn/strings.po
index e7970f4e36..4dd5622b8e 100644
--- a/addons/skin.confluence/language/Mongolian (Mongolia)/strings.po
+++ b/addons/skin.confluence/language/resource.language.mn_mn/strings.po
@@ -4,12 +4,12 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Mongolian (Mongolia) (http://www.transifex.com/projects/p/xbmc-main/language/mn_MN/)\n"
+"Language-Team: Mongolian (Mongolia) (http://www.transifex.com/projects/p/kodi-main/language/mn_MN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,6 +24,10 @@ msgctxt "#31027"
 msgid "Location"
 msgstr "Байрлал"
 
+msgctxt "#31049"
+msgid "End time"
+msgstr "Дуусах цаг"
+
 msgctxt "#31102"
 msgid "Background"
 msgstr "Арын хэсэг"
@@ -36,8 +40,12 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Нягтаршил"
 
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "Идэвхижүүлэх"
+
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "ТВ"
 
 msgctxt "#31952"
diff --git a/addons/skin.confluence/language/Malay/strings.po b/addons/skin.confluence/language/resource.language.ms_my/strings.po
index 0c6080c4cc..1c0a1dcd6b 100644
--- a/addons/skin.confluence/language/Malay/strings.po
+++ b/addons/skin.confluence/language/resource.language.ms_my/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Malay (http://www.transifex.com/projects/p/xbmc-main/language/ms/)\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/kodi-main/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ms\n"
+"Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Ubah "
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opsyen Kuasa"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Bekerja..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Sembunyikan maklumat"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Lihat Opsyen"
+msgid "View options"
+msgstr "Pilihan paparan"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Skrin Penuh"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Tempoh keseluruhan"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Muzik - Fail"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Item"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opsyen-opsyen Lain"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Kedudukan"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Balutan Poster"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Hasil Seni Peminat"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Thumbnail Gambar"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Balutan Imej"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Maklumat"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Tindakan"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Kini Bermain"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "BERMAIN"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "MENCARI"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Praset Pengvisualan"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Masa Tamat"
+msgid "End time"
+msgstr "Masa tamat"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Fail ini disusun tindan. Pilih bahagian yang anda ingin mainkan."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Pilihan Semasa"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opsyen skrin utama"
@@ -168,30 +124,10 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Latar Belakang"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Papar \"Henti Sejenak\" pada persembahan slaid gambar"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Main Treler dalam tetingkap [COLOR=grey3](Dialog Maklumat Video Sahaja)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Pelbagai opsyen"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Sembunyi penanda bacaan daripada nama fail video [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Sembunyi Punat Menu Utama"
-
-msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Benarkan Latar Belakang Tersuai"
-
 msgctxt "#31110"
 msgid "Background path:"
 msgstr "Laluan Latar Belakang:"
@@ -204,30 +140,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opsyen"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Papar Album baru tambah"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Papar Video baru tambah"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Sub-menu Program Laman Rumah"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Sembunyi Latar Hasil Seni Peminat "
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Papar Latar VIdeo \"Kini Bermain\""
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Tunjuk Latar Belakang Pengvisualan \"Kini Dimainkan\""
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Mainkan lagu-lagu tema TV dalam perpustakaan video (perisian tambahan TVTunes)"
@@ -240,26 +152,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lirik"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Sembunyi Seni Peminat dalam pengvisualan skrin penuh"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Perisisan tambahan Lirik"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Sub-menu Video Laman Rumah"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Sub-mwnu Muzik Laman Rumah"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Sub-menu Gambar Laman Rumah"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD Muzik"
@@ -276,94 +168,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Pintasan"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Pilih Lagu Anda"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Sumber Lirik"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Dijumpai"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Cari Lagi Item"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Episod Akan Datang"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Suhu Semasa"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Kemaskini Terakhir"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Penyedia data"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Sembunyi Seni Peminat"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Perincian Cereka"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memori Digunakan:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Nombor Trek"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Imej seni peminat[CR][CR]Tidak Tersedia[CR][CR] Klik butang untuk tetapkan"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Pengikis Semasa"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Pilih Pengikis"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Pilihan Pengimbasan Kandungan"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Tetapkan Laluan Seni Peminat"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Pilihan Profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Log Masuk Terakhir"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Pemilih Lagu Karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Disiarkan"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Pilihan Senarai Main"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Dicipta"
@@ -373,21 +193,13 @@ msgid "Resolution"
 msgstr "Resolusi"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Ditambah Baru-baru Ini"
+msgid "Recently added"
+msgstr "Ditambah baru-baru ini"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Pemasa ditetapkan![/B] [COLOR=grey2] - Sistem dimatikan sendiri dalam tempoh[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Klik butang untuk main[CR][CR]treler Cereka"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Perincian Album"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Jeda"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Henti"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Maju Pantas"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Undur"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menu cereka"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Muat turun Sari kata"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Tonton menggunakan 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Lalai Kulit"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Lalai kulit tanpa Penutup"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Berasaskan Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGUR TETAPAN MUZIK[/B][CR][CR]Urus pustaka muzik anda · Tetapkan pilihan main balik muzik · Ubah pilihan penyenaraian muzik[CR] Pasang penyerahan lagu · Tetapkan pilihan karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGUR TETAPAN GAMBAR[/B][CR][CR]Tetapkan pilihan penyenaraian gambar · Konfigur paparan slaid"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGUR TETAPAN CUACA[/B][CR][CR]Tetapkan tiga bandar untuk kutip maklumat cuaca"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGUR TETAPAN SISTEM[/B][CR][CR]Sedia dan tentukur paparan · Konfigur output audio · Persediaan kawalan jauh[CR]Tetapkan pilihan penjimatan kuasa · Benarkan penyahpepijatan · Persediaan kunci master"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGUR TAMBAHAN[/B][CR][CR]Urus Tambahan terpasang anda · Layar dan pasang Tambahan dari kodi.tv[CR]Ubahsuai tetapan Tambahan"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]KONFIGUR TETAPAN TV[/B][CR][CR]Ubah maklumat skrin penuh · Urus tetapan data EPG"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGUR TETAPAN PERKHIDMATAN[/B][CR][CR]Persediaan kawalan Kodi melalui UPnP dan HTTP · Konfigur perkongsian fail[CR]Benarkan Zeroconf · Konfigur AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Bantuan kali pertama..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Tab ini menjelaskan terdapat menu diluar sisi tetingkap ini yang mengandungi pilihan tambahan untuk seksyen. Untuk mencapai menu, navigasi ke kiri dengan kawalan jauh atau papan kekunci atau letak penuding tetikus anda diatas tab. [CR][CR]Klik \"Ok\" untuk tutup dialog ini. Ia tidak akan muncul lagi."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Sarikata tempatan tersedia"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Daftar Masuk"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Pilih Profil pengguna Kodi anda[CR]untuk daftar masuk dan teruskan"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Tunjuk atau sembunyi skrin daftar masuk ketika permulaan."
@@ -500,66 +276,26 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Pilih profil yang akan digunakan ketika permulaan bila skrin daftar masuk dilumpuhkan."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Masa Terjadual"
-
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "TV"
 
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Tambah Kumpulan"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Namakan Semula Kumpulan"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Padam Kumpulan"
-
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Kumpulan[CR]Tersedia"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kumpulan Saluran"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Pemasa Ditetapkan"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Pilihan Saluran"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Ramalan 36 Jam"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Ramalan Sejam"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Ramalan Mingguan"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Ramalan"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Ubah Pemendakan"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Mendapatkan maklumat ramalan..."
 
+msgctxt "#31910"
+msgid "Maps"
+msgstr "Peta"
+
 msgctxt "#31950"
 msgid "WEATHER"
 msgstr "CUACA"
@@ -599,3 +335,7 @@ msgstr "MAIN CAKERA"
 msgctxt "#31959"
 msgid "SYSTEM"
 msgstr "Sistem"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "RADIO"
diff --git a/addons/skin.confluence/language/Maltese/strings.po b/addons/skin.confluence/language/resource.language.mt_mt/strings.po
index 73516bdbec..7f51b8f838 100644
--- a/addons/skin.confluence/language/Maltese/strings.po
+++ b/addons/skin.confluence/language/resource.language.mt_mt/strings.po
@@ -4,22 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Maltese (http://www.transifex.com/projects/p/xbmc-main/language/mt/)\n"
+"Language-Team: Maltese (Malta) (http://www.transifex.com/projects/p/kodi-main/language/mt_MT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mt\n"
+"Language: mt_MT\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);\n"
 
+msgctxt "#31006"
+msgid "View options"
+msgstr "View Options"
+
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Daħħal u Ara Filmati"
 
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "Attiva Bakgrawnd Preferut"
+
 msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Shortcuts"
diff --git a/addons/skin.confluence/language/resource.language.my_mm/strings.po b/addons/skin.confluence/language/resource.language.my_mm/strings.po
new file mode 100644
index 0000000000..4694c0e03d
--- /dev/null
+++ b/addons/skin.confluence/language/resource.language.my_mm/strings.po
@@ -0,0 +1,169 @@
+# Kodi Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon Provider: Jezz_X, Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/kodi-main/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "အလုပ်လုပ်နေသည်"
+
+msgctxt "#31008"
+msgid "Full screen"
+msgstr "မျက်နှာပြင်အပြည့် "
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "ဂီတ-ဖိုင်များ"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "ဖွင့်နေပါသည်။"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "စာမျက်နှာ"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "အမျိုးအစားများ"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "တည်နေရာ"
+
+msgctxt "#31029"
+msgid "Fanart"
+msgstr "Fanart"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "အချက်အလက်များ"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "ဖွင့်ထားပါသည်။"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "ခဏရပ်မည်"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "အရှေ့သို့အနည်းငယ်ရစ်မည်"
+
+msgctxt "#31049"
+msgid "End time"
+msgstr "ဆုံးမည့်အချိန်"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "သီချင်းစာရင်းကိုဖွင့်မည်"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "သီချင်းစာရင်းကိုသိမ်းမည်"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "သီချင်းစာရင်းကိုပိတ်မည်"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "ယခုသီချင်းစာရင်း"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "နောက်ခံ"
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "ဖျောက်ထားမည်"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "စာသား"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "Music OSD"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "အမြန်ခလုတ်များ"
+
+msgctxt "#31206"
+msgid "Found"
+msgstr "တွေ့ရှိသည်"
+
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "အချက်အလက်များထောက်ပံ့သူ"
+
+msgctxt "#31326"
+msgid "Created"
+msgstr "ဖန်တီးခဲ့သည်"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "Resolution"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "ခဏရပ်မည်"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "လုံး၀ရပ်မည်"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "နောက်သို့အနည်းငယ်ရစ်မည်"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "ရုပ်ရှင်မီနူး"
+
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "ဖွင့်ထားမည်"
+
+msgctxt "#31413"
+msgid "Local subtitle available"
+msgstr "Local စာတန်းထိုး များရနိုင်ပါသည်။"
+
+msgctxt "#31420"
+msgid "Login"
+msgstr "ဝင်ရန်"
+
+msgctxt "#31502"
+msgid "TV"
+msgstr "TV"
+
+msgctxt "#31506"
+msgid "Available[CR]Groups"
+msgstr "ရရှိနိုင်သော [CR]Groups"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "ခန့်မှန်းခြင်း"
+
+msgctxt "#31910"
+msgid "Maps"
+msgstr "မြေပုံများ"
+
+msgctxt "#31952"
+msgid "TV"
+msgstr "TV"
diff --git a/addons/skin.confluence/language/Norwegian/strings.po b/addons/skin.confluence/language/resource.language.nb_no/strings.po
index 3dd6996e13..8a4201683a 100644
--- a/addons/skin.confluence/language/Norwegian/strings.po
+++ b/addons/skin.confluence/language/resource.language.nb_no/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Norwegian (http://www.transifex.com/projects/p/xbmc-main/language/no/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/kodi-main/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: no\n"
+"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Endre dine"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Strømalternativer"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Arbeider..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Skjul informasjon"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Visningsalternativer"
+msgid "View options"
+msgstr "Visningsalt."
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Fullskjerm"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Total varighet"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musikk - Filer"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Elementer"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Øvrige alternativer"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Sted"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Plakatsvøpe"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Bildeminiatyrer"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Bildesvøpe"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Informasjon"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Handlinger"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Spilles nå"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "SPILLER"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "SØKER"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualiseringsforvalg"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Ferdig klokken"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Denne filen er stablet, velg den delen du vil spille fra."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Nåværende valgt"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Alternativer for hovedvindu"
@@ -168,28 +124,12 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Bakgrunn"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Vis «Pause» under lysbildefremvisning"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Spill trailere i et vindu[COLOR=grey3](Kun videoinformasjonsdialog)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Øvrige alternativer"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Gjem «sett»-flagg fra videofilnavn [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Skjul hovedmenyknapper"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "Aktiver egendefinert bakgrunn"
 
 msgctxt "#31110"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Alternativer"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Vis nylig tilføyde albumer"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Vis nylig tilføyde videoer"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Programundermeny i hovedmeny"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Skjul fanart-bakgrunn"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Vis videoer i bakgrunnen"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Vis «spilles nå» bakgrunnen i visualisering"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Spill av kjenningsmelodier i videobiblioteket (TvTunes-utvidelse)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Sangtekster"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Gjem Fanart i fullskjermsvisualisering"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Sangtekst-utvidelse"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Hjemmeskjerm video-undermeny"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Hjemmeskjerm musikk-undermeny"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Hjemmeskjerm bilder-undermeny"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Musikk OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Velg din låt"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Sangtekstskilde"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Funnet"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Finn flere elementer"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Kommende episoder"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Været nå"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Sist oppdatert"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Datatilbyder"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Skjul fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Filmdetaljer"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Benyttet minne:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Spornummer"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart-bilde[CR][CR]ikke tilgjengelig[CR][CR]Klikk på knappen for å oppgi"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Nåværende skraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Velg en skraper"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Alternativer for innholdsskraper"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Oppgi søkesti for fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Valgt profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Sist innlogget"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Låtvelger for karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Sendt"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Alternativer for spilleliste"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Laget"
@@ -373,21 +197,13 @@ msgid "Resolution"
 msgstr "Oppløsning"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Nylig lagt til"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Tidsur fastsatt![/B] [COLOR=grey2] - Systemet avsluttes automatisk om[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Klikk for å spille[CR][CR]filmtrailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Albumdetaljer"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pause"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stopp"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Spol framover"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Spol bakover"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Filmmeny"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Hent undertekster"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Se som 2D"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Standard for skall"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skallstandard uten store bokstaver"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial-basert"
@@ -448,22 +252,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]ENDRE DINE MUSIKKINNSTILLINGER:[/B][CR][CR]Håndter ditt musikkbibliotek · Oppgi musikkavspillingsalternativer · Endre lyttealternativer[CR]Oppgi din Last.FM konto · Endre karaokealternativer"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]ENDRE DINE BILDEINNSTILLINGER[/B][CR][CR] Oppgi bildelistealternativer · Konfigurer lysbildefremvisninger"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]ENDRE DINE VÆRINNSTILLINGER:[/B][CR][CR]Oppgi opptil tre steder som vises på værskjermen"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]ENDRE SYSTEMVALG[/B][CR][CR]Oppsett og kalibrering av skjerm · Konfigurer lydmaskinvare · Still inn fjernkontroller[CR]Endre strømsparingsalternativer · Aktiver feilsøking · Sett opp systemlås"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]ENDRE DINE UTVIDELSER[/B][CR][CR]Håndter installerte utvidelser · Bla etter og installer utvidelser fra kodi.tv[CR]Endre utvidelsesinnstillinger"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]KONFIGURER TV-INNSTILLINGER[/B][CR][CR]Skift fullskjermsinfo · Administrer datainnstillinger for EPG"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]ENDRE DINE TJENESTEINNSTILLINGER[/B][CR][CR]Konfigurer kontroll av Kodi via UPnP og HTTP · Konfigurer fildeling[CR]Aktiver Zeroconf · Konfigurer AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Førstegangsintroduksjon..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Denne fanen indikerer at det er en meny ved siden av dette vinduet som inneholder ekstra innstillinger til denne seksjonen. For å få tilgang til menyen,  navigerer du til venstre med fjernkontrollen eller tastaturet. Du kan også flytte musmarkøren over fanen. [CR][CR]Trykk \"Ok\" for å lukke dette dialogvinduet. Det kommer ikke opp igjen senere."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Lokal tekst tilgjengelig"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Logg inn"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Velg din Kodi brukerprofil[CR]for å logge inn og fortsette"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Vis eller skjul innloggingsskjermen ved oppstart"
@@ -500,66 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Velg profil som vil bli brukt ved oppstart når innloggingsskjermen er deaktivert ."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Planlagt tid"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Legg til gruppe"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Gi nytt navn til gruppe"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Slett gruppe"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Ledige[CR]grupper"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanalgruppe"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Tidsur fastsatt"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanal instillinger"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36-timersvarsel"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Time for time"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Helgevarsel"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Langtidsvarsel"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Værvarsel"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Mulighet for nedbør"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Henter værvarsel..."
diff --git a/addons/skin.confluence/language/Dutch/strings.po b/addons/skin.confluence/language/resource.language.nl_nl/strings.po
index 62e0406f3b..ef41950e7f 100644
--- a/addons/skin.confluence/language/Dutch/strings.po
+++ b/addons/skin.confluence/language/resource.language.nl_nl/strings.po
@@ -4,44 +4,44 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/xbmc-main/language/nl/)\n"
+"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/kodi-main/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
+"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
-msgstr "Verander jouw"
+msgid "Change your"
+msgstr "Verander je"
 
 msgctxt "#31003"
-msgid "Power Options"
-msgstr "Energiebeheer"
+msgid "Power options"
+msgstr "vermogen opties"
 
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Bezig..."
 
 msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Info verbergen"
+msgid "Hide information"
+msgstr "Verberg informatie"
 
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Weergave opties"
+msgid "View options"
+msgstr "Weergaveopties"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Volledig scherm"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Totale duur"
 
 msgctxt "#31022"
@@ -61,28 +61,28 @@ msgid "Items"
 msgstr "Items"
 
 msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Diverse opties"
+msgid "Misc options"
+msgstr "Diverse Opties"
 
 msgctxt "#31027"
 msgid "Location"
 msgstr "Locatie"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poster Wrap"
+msgid "Poster wrap"
+msgstr "Poster wrap"
 
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "Afbeelding miniaturen"
 
 msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Afbeelding Wrap"
+msgid "Image wrap"
+msgstr "Afbeelding wrap"
 
 msgctxt "#31033"
 msgid "Info"
@@ -93,8 +93,8 @@ msgid "Actions"
 msgstr "Acties"
 
 msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Huidig spelende"
+msgid "Now playing"
+msgstr "Nu afspelend"
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -117,11 +117,11 @@ msgid "SEEKING"
 msgstr "ZOEKEN"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualisatie voorinstellingen"
+msgid "Visualisation presets"
+msgstr "Visualisatie voor-instellingen"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Eindtijd"
 
 msgctxt "#31050"
@@ -157,8 +157,8 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Dit bestand bestaat uit meerdere delen, selecteer het deel dat u wilt afspelen."
 
 msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Huidig geselecteerde"
+msgid "Current selected"
+msgstr "Huidige geselecteerde"
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -168,29 +168,21 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Achtergrond"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Laat \"PAUZE\" zien in diavoorstelling"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Trailers afspelen in een venster [COLOR=grey3](Alleen Video Informatiescherm)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Speel trailers in een venster [COLOR=grey3](Alleen video informatie dialoog)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Diverse opties"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Verberg markeringen uit bestandennaam [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Verberg knoppen in het hoofdmenu"
+msgid "Hide main menu buttons"
+msgstr "Verberg hoofd menu knoppen"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Aangepaste achtergrond toepassen"
+msgid "Enable custom background"
+msgstr "Gebruik achtergrond naar keuze"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,28 +197,24 @@ msgid "Options"
 msgstr "Opties"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "Toon recent toegevoegde albums"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Toon recent toegevoegde video's"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Beginscherm Programma's submenu"
+msgid "Show recently added videos"
+msgstr "Toon recent toegevoegde video`s"
 
 msgctxt "#31119"
-msgid "Hide Background Fanart"
+msgid "Hide background fanart"
 msgstr "Fanart achtergronden verbergen"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Toon achtergrond bij \"Huidig spelende\" video"
+msgid "Show background \"Now playing\" video"
+msgstr "Toon achtergrond \"nu afspelend\" video"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Laat achtergrond \"Nu Afspelen\" zien voor visualisatie"
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Toon achtergrond \"Nu afspelend\" visualisatie"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -241,24 +229,12 @@ msgid "Lyrics"
 msgstr "Songteksten"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
+msgid "Hide fanart in full screen visualisation"
 msgstr "Verberg fanart in volledig scherm visualisatie"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Songtekst Add-on"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Beginscherm Video's submenu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Beginscherm Muziek submenu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Beginscherm Afbeeldingen submenu"
+msgid "Lyrics add-on"
+msgstr "Songtekst add-on"
 
 msgctxt "#31140"
 msgid "Music OSD"
@@ -270,18 +246,18 @@ msgstr "Video-OSD"
 
 msgctxt "#31142"
 msgid "Settings level"
-msgstr "Instellingen niveau"
+msgstr "Instellingsniveau"
 
 msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Snelkoppelingen"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Kies uw nummer"
+msgid "Choose your song"
+msgstr "Kies je lied"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
+msgid "Lyrics source"
 msgstr "Liedtekst bron"
 
 msgctxt "#31206"
@@ -289,19 +265,15 @@ msgid "Found"
 msgstr "Gevonden"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Vind meer items"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "Aankomende afleveringen"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Huidige temperatuur"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Laatst bijgewerkt"
 
 msgctxt "#31303"
@@ -309,19 +281,19 @@ msgid "Data provider"
 msgstr "Data provider"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
+msgid "Hide fanart"
 msgstr "Fanart verbergen"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Filmdetails"
 
 msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Geheugengebruik:"
+msgid "Memory used:"
+msgstr "Gebruikt geheugen:"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "Tracknummer"
 
 msgctxt "#31311"
@@ -329,40 +301,40 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart afbeelding[CR][CR]niet beschikbaar[CR][CR] klik hier om in te stellen"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "Huidige scanner"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "Scanner kiezen"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opties inhoudsscanner"
+msgid "Content scanning options"
+msgstr "Bevat scan opties"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Fanartpad opgeven"
+msgid "Set fanart path"
+msgstr "Instellen Fanart locatie"
 
 msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Profiel selecteren"
+msgid "Selected profile"
+msgstr "Geselecteerd profiel"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Laatst ingelogd op"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Nummerkeuze karaoke"
+msgid "Karaoke song selector"
+msgstr "Karaoke lied keuzeschakelaar"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Uitgezonden"
 
 msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Afspeellijstopties"
+msgid "Playlist options"
+msgstr "Afspeellijst opties"
 
 msgctxt "#31326"
 msgid "Created"
@@ -373,7 +345,7 @@ msgid "Resolution"
 msgstr "Resolutie"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Onlangs toegevoegd"
 
 msgctxt "#31329"
@@ -381,11 +353,11 @@ msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Timer geconfigureerd![/B] [COLOR=grey2] - Systeem schakelt automatisch uit over[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
 msgstr "Klik op de knop om af te spelen[CR][CR]Filmtrailer"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "Album details"
 
 msgctxt "#31351"
@@ -397,8 +369,8 @@ msgid "Stop"
 msgstr "Stop"
 
 msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Vooruitspoelen"
+msgid "Fast forward"
+msgstr "snel vooruitspoelen"
 
 msgctxt "#31354"
 msgid "Rewind"
@@ -409,8 +381,8 @@ msgid "Movie menu"
 msgstr "Filmmenu"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Ondertitels downloaden"
+msgid "Download subtitles"
+msgstr "Download ondertitels"
 
 msgctxt "#31360"
 msgid "Watch as 2D"
@@ -429,8 +401,8 @@ msgid "Skin default"
 msgstr "Skinstandaard"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skinstandaard zonder hoofdletters"
+msgid "Skin default with no caps"
+msgstr "Skin standaard zonder hoofdletters"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -448,21 +420,13 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]MUZIEKINSTELLINGEN CONFIGUREREN[/B][CR][CR]Beheer uw muziekbibliotheek · Configureer muziekafspeelopties en -bestandslijstopties · Configureer nummer indienen · Configureer karaokeopties"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]FOTO-INSTELLINGEN CONFIGUREREN[/B][CR][CR]Configureer fotobestandslijstopties en diavoorstelling."
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]WEER INSTELLINGEN CONFIGUREREN[/B][CR][CR]Geef drie locaties op voor weersverwachtingen."
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]SYSTEEMINSTELLINGEN CONFIGUREREN[/B][CR][CR]Configureer en kalibreer schermen · Configureer geluidsuitgang · Configureer invoerapparaten en energiebeheeropties · Schakel debugging in · Configureer vergrendelingsopties"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]ADD-ONS CONFIGUREREN[/B][CR][CR]Beheer uw geïnstalleerde Add-ons · Zoek en installeer Add-ons via kodi.tv.[CR]Wijzig Add-oninstellingen"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]CONFIGUREER ADD-ONS[/B][CR][CR]Beheer jouw geïnstalleerde add-ons · Zoek naar en installeer add-ons van Kodi.tv[CR]verander add-on instellingen"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -473,13 +437,9 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]CONFIGUREER SERVICE-INSTELLINGEN[/B][CR][CR]Stel Kodi-beheer in via UPnP en HTTP · Configureer bestandsdeling[CR]Schakel Zeroconf in · Configureer AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
+msgid "First run help..."
 msgstr "Eerste sessie hulp..."
 
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Deze tab betekent dat er een menu met extra opties voor deze sectie aan de zijkant van het scherm beschikbaar is. Voor toegang tot het menu, navigeer naar links met de afstandsbediening of toetsenbord of ga met de muisaanwijzer naar de tab. [CR][CR]Klik \"Ok\" om het dialoogscherm te sluiten. Deze zal niet meer worden getoond. "
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Lokale ondertitel beschikbaar"
@@ -489,8 +449,8 @@ msgid "Login"
 msgstr "Log-in"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Selecteer uw Kodi-gebruikersprofiel[CR]om in te loggen"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Selecteer jouw Kodi Gebruikersprofiel[CR]om in te loggen en door te gaan"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,63 +461,59 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Selecteer het profiel dat moet worden gebruikt bij opstarten wanneer het log-in scherm is gedeactiveerd."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Opname starttijd"
+msgid "Scheduled time"
+msgstr "Geschematiseerde tijd"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31503"
-msgid "Add Group"
-msgstr "Groep toevoegen"
+msgid "Add group"
+msgstr "Voeg groep toe"
 
 msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Groep hernoemen"
+msgid "Rename group"
+msgstr "Hernoem groep"
 
 msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Groep verwijderen"
+msgid "Delete group"
+msgstr "Verwijder Groep"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Beschikbare[CR]Groepen"
 
 msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanaal groep"
+msgid "Channel group"
+msgstr "Kanaliseer groep"
 
 msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Geplande opname ingesteld"
+msgid "Timer set"
+msgstr "Timer instellen"
 
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "Kanaal opties"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 Uurs Voorspelling"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Uur voorspelling"
+msgid "Hourly forecast"
+msgstr "Uur vooruitzicht"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Weekend voorspelling"
+msgid "Weekend forecast"
+msgstr "Weekend vooruitzicht"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Dagelijkse voorspelling"
+msgid "Daily forecast"
+msgstr "Dagelijkse vooruitzicht"
 
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Voorspelling"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "Kans op neerslag"
 
 msgctxt "#31909"
diff --git a/addons/skin.confluence/language/Polish/strings.po b/addons/skin.confluence/language/resource.language.pl_pl/strings.po
index 526b749974..35991a7aca 100644
--- a/addons/skin.confluence/language/Polish/strings.po
+++ b/addons/skin.confluence/language/resource.language.pl_pl/strings.po
@@ -4,36 +4,32 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/xbmc-main/language/pl/)\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kodi-main/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
+"Language: pl_PL\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Kodi -"
-
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "Opcje zasilania"
 
 msgctxt "#31004"
 msgid "Working..."
-msgstr "Uruchamianie"
+msgstr "Proszę czekać..."
 
 msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Ukrywaj informacje"
+msgid "Hide information"
+msgstr "Ukryj informacje"
 
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Opcje widoku"
 
 msgctxt "#31008"
@@ -41,7 +37,7 @@ msgid "Full screen"
 msgstr "Pełny ekran"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Całkowity czas trwania"
 
 msgctxt "#31022"
@@ -61,27 +57,23 @@ msgid "Items"
 msgstr "Pozycje"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "Opcje dodatkowe"
 
 msgctxt "#31027"
 msgid "Location"
 msgstr "Lokalizacja"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Kolejka plakatów"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Tapeta"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "Miniatury"
 
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "Kolejka obrazów"
 
 msgctxt "#31033"
@@ -90,10 +82,10 @@ msgstr "Informacje"
 
 msgctxt "#31039"
 msgid "Actions"
-msgstr "Akcje"
+msgstr "Operacje"
 
 msgctxt "#31040"
-msgid "Now Playing"
+msgid "Now playing"
 msgstr "Teraz odtwarzane"
 
 msgctxt "#31042"
@@ -114,15 +106,11 @@ msgstr "DO TYŁU"
 
 msgctxt "#31046"
 msgid "SEEKING"
-msgstr "PRZESZUKIWANIE"
-
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Zestaw ustawień wizualizacji"
+msgstr "PRZEWIJANIE"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Koniec o godzinie"
+msgid "End time"
+msgstr "Koniec"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -157,7 +145,7 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Plik jest wynikiem scalania, wybierz część do odtwarzania."
 
 msgctxt "#31061"
-msgid "Current Selected"
+msgid "Current selected"
 msgstr "Aktualnie wybrany"
 
 msgctxt "#31101"
@@ -168,29 +156,17 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Tło"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Pokazuj \"Pauza\" podczas pokazu slajdów"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Odtwarzaj zwiastuny w oknie [COLOR=grey3](tylko w oknie informacji)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Opcje dodatkowe"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ukrywaj etykiety mediów wczytane z nazw pliku [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ukrywanie przycisków menu"
+msgid "Hide main menu buttons"
+msgstr "Ukryj przyciski menu"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Używaj niestandardowego tła"
+msgid "Enable custom background"
+msgstr "Pokazuj niestandardowe tło"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,29 +181,13 @@ msgid "Options"
 msgstr "Opcje"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "Pokazuj ostatnio dodane albumy"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
+msgid "Show recently added videos"
 msgstr "Pokazuj ostatnio dodane wideo"
 
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Podmenu Programy ekranu Start"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Nie używaj tapet w roli tła"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Używaj odtwarzane wideo w roli tła"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Używaj wizualizacji muzyki w roli tła"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Odtwarzaj motywy muzyczne w bibliotece wideo (dodatek TvTunes)"
@@ -240,26 +200,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Tekst utworu"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Ukrywaj tapety podczas pełnoekranowej wizualizacji"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Dodatek Tekst utworu"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Podmenu Wideo ekranu start"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Podmenu Muzyka ekranu Start"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Podmenu Obrazy ekranu Start"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Menu ekranowe muzyki"
@@ -276,94 +216,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Skróty"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Wybierz swój utwór"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Źródło tekstów utworów"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Odnaleziono"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Znajdź więcej pozycji"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Nadchodzące odcinki"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Ostatnia aktualizacja"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Dostawca danych"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Ukrywaj tapety"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "O filmie"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Użycie pamięci:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Numer ścieżki"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "Tapeta[CR][CR]niedostępna[CR][CR] Wciśnij przycisk, aby dodać"
-
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Aktualny ekstraktor"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Wybierz ekstraktor"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opcje skanowania zawartości"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Ustaw ścieżkę do folderu tapet"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Wybrany profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Ostatnio zalogowany"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Selektor utworów Karaoke"
+msgstr "Tapeta[CR][CR]niedostępna[CR][CR] Naciśnij przycisk, aby dodać"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Premiera"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opcje listy odtwarzania"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Utworzony"
@@ -373,21 +241,13 @@ msgid "Resolution"
 msgstr "Rozdzielczość"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Ostatnio dodane"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Zamknięcie wg harmonogramu![/B] [COLOR=grey2] - Zamknięcie systemu za[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Wciśnij przycisk, aby[CR][CR]odtwarzać zwiastun"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "O albumie"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pauza"
@@ -396,10 +256,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stop"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Przewiń"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Cofnij"
@@ -408,10 +264,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menu filmu"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Pobierz napisy"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Odtwarzaj w trybie 2D"
@@ -428,10 +280,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Domyślne dla skóry"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Domyślne dla skóry bez wielkich liter"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Bazujące na Arialu"
@@ -448,38 +296,18 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGURACJA MUZYKI[/B][CR][CR]Biblioteka muzyki · Odtwarzanie · Listy utworów · CD-Audio · Karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGURACJA OBRAZÓW[/B][CR][CR]Listy obrazów · Pokaz slajdów"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGURACJA POGODY[/B][CR][CR]Wybór dodatku · Wybór lokalizacji dla informacji pogodowych"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
-msgstr "[B]KONFIGURACJA SYSTEMU[/B][CR][CR]Wyświetlanie obrazu · Odtwarzanie dźwięku · Urządzenia wejściowe · Internet[CR]Oszczędzanie energii · Diagnozowanie błędów · Blokady"
-
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGURACJA DODATKÓW[/B][CR][CR]Zarządzanie zainstalowanymi dodatkami · Przeglądanie i instalowanie dodatków[CR]Ustawienia dodatków"
+msgstr "[B]KONFIGURACJA SYSTEMU[/B][CR][CR]Wyświetlanie obrazu · Odtwarzanie dźwięku · Urządzenia wejściowe · Internet[CR]Oszczędzanie energii · Diagnostyka · Kontrola dostępu"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
-msgstr "[B]KONFIGURACJA TELEWIZJI[/B][CR][CR]Menu ekranowe · Przewodnik programów · Nagrywanie"
+msgstr "[B]KONFIGURACJA TELEWIZJI[/B][CR][CR]Menu ekranowe · Przewodnik · Nagrywanie · Kontrola rodzicielska"
 
 msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGURACJA USŁUG[/B][CR][CR]Zdalne sterowanie przez uPnP i HTTP · Współdzielenie plików[CR]Aktywacja Zeroconf · Ustawienia AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Wskazówki na początek..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Ta zakładka oznacza iż za krawędzią tego okna jest menu, które zawiera dodatkowe opcje dla tej sekcji. Aby dostać się do tego menu, skieruj się w lewo przy pomocy pilota, klawiszy lub umieść myszkę nad zakładką.[CR][CR]Wciśnij \"OK\" by zamknąć okno. Nie pojawi się ono ponownie."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Dostępne lokalne napisy"
@@ -488,10 +316,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Logowanie"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Wybierz profil użytkownika[CR]do zalogowania, aby kontynuować"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Określa widoczność ekranu logowania podczas uruchomienia."
@@ -500,56 +324,32 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Wybierz profil, który będzie używany w przypadku wyłączenia ekranu logowania."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Zaplanowany czas"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Telewizja"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Dodaj grupę"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Przemianuj grupę"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Usuń grupę"
+msgid "TV"
+msgstr "TELEWIZJA"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Dostępne[CR]grupy"
 
 msgctxt "#31509"
-msgid "Channel Group"
+msgid "Channel group"
 msgstr "Grupa kanałów"
 
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Zamknięcie wg harmonogramu"
-
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "Opcje kanału"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Prognoza 36 godzinna"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Prognoza godzinna"
+msgid "Hourly forecast"
+msgstr "Prognoza godzinowa"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "Prognoza na weekend"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "Prognoza dzienna"
 
 msgctxt "#31905"
@@ -557,8 +357,8 @@ msgid "Forecast"
 msgstr "Prognoza"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Możliwość opadów"
+msgid "Chance of precipitation"
+msgstr "Możliwe opady"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
diff --git a/addons/skin.confluence/language/Portuguese (Brazil)/strings.po b/addons/skin.confluence/language/resource.language.pt_br/strings.po
index 8883d84227..ee00208107 100644
--- a/addons/skin.confluence/language/Portuguese (Brazil)/strings.po
+++ b/addons/skin.confluence/language/resource.language.pt_br/strings.po
@@ -4,12 +4,12 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xbmc-main/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kodi-main/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
+msgid "Change your"
 msgstr "Altere suas"
 
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "Opções de energia"
 
 msgctxt "#31004"
@@ -29,19 +29,19 @@ msgid "Working..."
 msgstr "Executando..."
 
 msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Esconder INFO"
+msgid "Hide information"
+msgstr "Ocultar informação"
 
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Opções de Visualização"
+msgid "View options"
+msgstr "Visualização"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Tela Cheia"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Duração Total"
 
 msgctxt "#31022"
@@ -61,28 +61,28 @@ msgid "Items"
 msgstr "Itens"
 
 msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opções Diversas"
+msgid "Misc options"
+msgstr "Opções diversas"
 
 msgctxt "#31027"
 msgid "Location"
 msgstr "Localização"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Vitrine Poster"
+msgid "Poster wrap"
+msgstr "Vitrine poster"
 
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Ícones de Imagens"
+msgid "Pic thumbs"
+msgstr "Ícones de imagens"
 
 msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Vitrine de Imagens"
+msgid "Image wrap"
+msgstr "Vitrine de imagens"
 
 msgctxt "#31033"
 msgid "Info"
@@ -93,8 +93,8 @@ msgid "Actions"
 msgstr "Ações"
 
 msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Reproduzindo Agora"
+msgid "Now playing"
+msgstr "Reproduzindo agora"
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -117,12 +117,12 @@ msgid "SEEKING"
 msgstr "PROCURANDO"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualização das Pré-definições"
+msgid "Visualisation presets"
+msgstr "Visualização das pré-definições"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Tempo de término"
+msgid "End time"
+msgstr "Hora fim"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -157,8 +157,8 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Este arquivo está empilhado, selecione a parte de onde executar."
 
 msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Selecionado"
+msgid "Current selected"
+msgstr "Selecionado "
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -168,29 +168,21 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Fundo"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Exibir \"Pausado\" em exibição de imagens (slideshow)"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Reproduzir Trailers na janela [COLOR=grey3](Somente Caixa de Diálogo de Informação de Vídeo)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Reproduzir trailers na janela [COLOR=grey3](Somente caixa de diálogo de Informação de vídeo)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Opções diversas"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ocultar marcadores lidos do arquivo de vídeo [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ocultar botões do Menu Principal"
+msgid "Hide main menu buttons"
+msgstr "Ocultar botões do menu principal"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Ativar imagem de fundo personalizada"
+msgid "Enable custom background"
+msgstr "Ativar papel de parede"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,28 +197,24 @@ msgid "Options"
 msgstr "Opções"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Mostrar Álbuns Adicionados Recentemente"
+msgid "Show recently added albums"
+msgstr "Mostrar álbuns adicionados recentemente"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Exibir vídeos adicionados recentemente"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Home Page Programas Sub-menu"
+msgid "Show recently added videos"
+msgstr "Mostrar vídeos adicionados recentemente"
 
 msgctxt "#31119"
-msgid "Hide Background Fanart"
+msgid "Hide background fanart"
 msgstr "Ocultar fanart fundo da visualização"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Exibir Vídeo \"Reproduzindo Agora\" no Fundo"
+msgid "Show background \"Now playing\" video"
+msgstr "Exibir vídeo \\\"reproduzindo agora\\\" ao fundo"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Apresentar Visualização de Fundo em \"Agora Reproduzindo\""
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Apresentar visualização de fundo em \\\"Agora reproduzindo\\\""
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -241,24 +229,12 @@ msgid "Lyrics"
 msgstr "Letras"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Ocultar Fanart em visualização tela cheia"
+msgid "Hide fanart in full screen visualisation"
+msgstr "Ocultar fanart em visualização tela cheia"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Add-on de Letras"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Home Page Vídeos Sub-Menu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Home Page Música Sub-menu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Home Page Imagens Sub-menu"
+msgid "Lyrics add-on"
+msgstr "Add-on de letras"
 
 msgctxt "#31140"
 msgid "Music OSD"
@@ -277,31 +253,27 @@ msgid "Shortcuts"
 msgstr "Atalhos"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
+msgid "Choose your song"
 msgstr "Escolha sua música"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Origem das Letras"
+msgid "Lyrics source"
+msgstr "Origem das letras"
 
 msgctxt "#31206"
 msgid "Found"
 msgstr "Encontrado"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Procurar mais itens"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Próximos Episódios"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temp. Atual"
+msgid "Upcoming episodes"
+msgstr "Próximos episódios"
 
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Última atualização"
 
 msgctxt "#31303"
@@ -309,19 +281,19 @@ msgid "Data provider"
 msgstr "Provedor de Dados"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Ocultar Fanart"
+msgid "Hide fanart"
+msgstr "Ocultar fanart"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Detalhes do vídeo"
 
 msgctxt "#31309"
-msgid "Memory Used:"
+msgid "Memory used:"
 msgstr "Memória usada:"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "Número da faixa"
 
 msgctxt "#31311"
@@ -329,40 +301,40 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Imagem de Fanart[CR][CR]Indisponível[CR][CR] Clique no botão para definir"
 
 msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Scraper Atual"
+msgid "Current scraper"
+msgstr "Scraper atual"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Escolha um Scraper"
+msgid "Choose a scraper"
+msgstr "Escolha um scraper"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
+msgid "Content scanning options"
 msgstr "Opções de busca de conteúdo"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Definir caminho do Fanart"
+msgid "Set fanart path"
+msgstr "Definir caminho para o fanart"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "Perfil selecionado"
 
 msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Última conexão"
+msgid "Last logged in"
+msgstr "última conexão"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Selecionador de Música Karaoke"
+msgid "Karaoke song selector"
+msgstr "Selecionador de música karaoke"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Transmitido"
 
 msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opções da Lista de Reprodução"
+msgid "Playlist options"
+msgstr "Opções da lista de reprodução"
 
 msgctxt "#31326"
 msgid "Created"
@@ -373,20 +345,20 @@ msgid "Resolution"
 msgstr "Resolução"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Adicionado Recentemente"
+msgid "Recently added"
+msgstr "Mais recentes"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Timer definido![/B] [COLOR=grey2] - Sistema se desligará em[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Clique no botão para tocar o[CR][CR]trailer"
+msgid "Click button to play[CR][CR]movie trailer"
+msgstr "Clique no botão para reproduzir o[CR][CR]trailer do filme"
 
 msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalhes do Álbum"
+msgid "Album details"
+msgstr "Detalhes do álbum"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -397,7 +369,7 @@ msgid "Stop"
 msgstr "Parar"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "Avançar"
 
 msgctxt "#31354"
@@ -409,8 +381,8 @@ msgid "Movie menu"
 msgstr "Menu do Filme"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Download de Legendas"
+msgid "Download subtitles"
+msgstr "Download legendas"
 
 msgctxt "#31360"
 msgid "Watch as 2D"
@@ -429,7 +401,7 @@ msgid "Skin default"
 msgstr "Padrão da skin"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
+msgid "Skin default with no caps"
 msgstr "Padrão da skin sem capslock"
 
 msgctxt "#31392"
@@ -448,21 +420,13 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]AJUSTES DE MÚSICAS[/B][CR][CR]Gerencie sua coleção de músicas · Defina opções de execução de música[CR]Altere opções de listagem de música · Configure submissão de música · Defina opções de karaokê"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]AJUSTES DE IMAGENS[/B][CR][CR]Defina opções de listagem de imagens · Configure apresentação de slides"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]AJUSTES DE CLIMA[/B][CR][CR]Defina três cidades para coletar informações sobre o tempo"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]AJUSTES DE SISTEMA[/B][CR][CR]Configure e calibre telas · Configure saída de áudio · Configure controles remotos[CR]Defina opções para economia de energia · Habilite a depuração · Configure o bloqueio mestre"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURAR ADD-ONS[/B][CR][CR]Administre seus addons instalados · Procure por e instale Add-ons de kodi.tv[CR]Modifique os ajustes dos Add-ons"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]CONFIGURAR ADD-ONS[/B][CR][CR]Administre seus addons instalados · Procure por e instale add-ons de kodi.tv[CR]Modifique os ajustes dos add-ons\""
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -473,12 +437,8 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]AJUSTES DE SERVIÇOS[/B][CR][CR]Configure o controle do Kodi via UPnP e HTTP · Configure o compartilhamento de arquivos[CR]Habilite Zeroconf · Configure o AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
-msgstr "Executar ajuda primeiro..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Esta guia significa que existe um menu lateral que contém opções adicionais para esta seção. Para acessar o menu, navegue para a esquerda com o controle remoto ou teclado ou coloque o ponteiro do mouse sobre a aba. [CR][CR]Clique em \"Ok\" para fechar este diálogo. Ele não vai aparecer novamente."
+msgid "First run help..."
+msgstr "Executar ajudar primeiramente..."
 
 msgctxt "#31413"
 msgid "Local subtitle available"
@@ -489,8 +449,8 @@ msgid "Login"
 msgstr "Login"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Selecione seu Perfil de usuário Kodi[CR]para conectar e continue"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Selecione seu perfil de usuário no Kodi[CR]para conectar e continue"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,63 +461,59 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Selecione o perfil que será utilizado na inicialização quando a tela de login estiver desativada."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
+msgid "Scheduled time"
 msgstr "Agendamento"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV ao Vivo"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31503"
-msgid "Add Group"
-msgstr "Adicionar Grupo"
+msgid "Add group"
+msgstr "Adicionar grupo"
 
 msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Renomear Grupo"
+msgid "Rename group"
+msgstr "Renomear grupo"
 
 msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Excluir grupo"
+msgid "Delete group"
+msgstr "Deletar gurpo"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grupos [CR] Disponíveis"
 
 msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grupo Canais"
+msgid "Channel group"
+msgstr "Grupo de Canais"
 
 msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Configurar Agendamento"
+msgid "Timer set"
+msgstr "Configurar agendamento"
 
 msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opções Canal"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Previsão 36 Horas"
+msgid "Channel options"
+msgstr "Opções do Canal"
 
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "Previsão por hora"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Previsão fim de semana"
+msgid "Weekend forecast"
+msgstr "Previsão final de semana"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Previsão Diária"
+msgid "Daily forecast"
+msgstr "Previsão diária"
 
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Previsão"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "Chance de precipitação"
 
 msgctxt "#31909"
diff --git a/addons/skin.confluence/language/resource.language.pt_pt/strings.po b/addons/skin.confluence/language/resource.language.pt_pt/strings.po
new file mode 100644
index 0000000000..8ed5f37139
--- /dev/null
+++ b/addons/skin.confluence/language/resource.language.pt_pt/strings.po
@@ -0,0 +1,341 @@
+# Kodi Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon Provider: Jezz_X, Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/kodi-main/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "A processar..."
+
+msgctxt "#31006"
+msgid "View options"
+msgstr "Opções da vista"
+
+msgctxt "#31008"
+msgid "Full screen"
+msgstr "Ecrã cheio"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Música - Ficheiros"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "A reproduzir"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Página"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "Itens"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "Localização"
+
+msgctxt "#31029"
+msgid "Fanart"
+msgstr "Fanart"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "Informações"
+
+msgctxt "#31039"
+msgid "Actions"
+msgstr "Ações"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "A REPRODUZIR"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "EM PAUSA"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "AVANÇAR"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "RETROCEDER "
+
+msgctxt "#31046"
+msgid "SEEKING"
+msgstr "A PROCURAR"
+
+msgctxt "#31049"
+msgid "End time"
+msgstr "Hora de fim"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Orientar: Ascendente"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Orientar: Descendente"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Abrir Lista Reprodução"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "Guardar Lista Reprodução"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Fechar Lista Reprodução"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "Ficheiros de música do sistema"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Lista de Reprodução Actual"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "Este ficheiro está dividido por partes. Escolha a parte que pretende reproduzir."
+
+msgctxt "#31101"
+msgid "Home screen options"
+msgstr "Opções do ecrã inicial"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "Fundo de ecrã"
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr "Opções variadas"
+
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "Activar fundo personalizado"
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr "Caminho do fundo de ecrã:"
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Ocultar"
+
+msgctxt "#31112"
+msgid "Options"
+msgstr "Opções"
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "Tocar música de genérico na biblioteca de vídeo (Add-on TvTunes)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvTunes"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "Letras"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "Controlos de música"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "Controlos de vídeo"
+
+msgctxt "#31142"
+msgid "Settings level"
+msgstr "Nível das definições"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "Atalhos"
+
+msgctxt "#31206"
+msgid "Found"
+msgstr "Encontrado"
+
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "Fornecedor de dados"
+
+msgctxt "#31311"
+msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
+msgstr "Imagem de Fanart[CR][CR]Indisponível[CR][CR] Clique no botão para seleccionar"
+
+msgctxt "#31322"
+msgid "Aired"
+msgstr "Transmitido a"
+
+msgctxt "#31326"
+msgid "Created"
+msgstr "Criado a"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "Resolução"
+
+msgctxt "#31329"
+msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
+msgstr "[B]Temporizador activado![/B] [COLOR=grey2] - Sistema vai desligar-se em[/COLOR]"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "Pausar"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Parar"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Retroceder"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "Menu do filme"
+
+msgctxt "#31360"
+msgid "Watch as 2D"
+msgstr "Ver em 2D"
+
+msgctxt "#31361"
+msgid "Change mode"
+msgstr "Modo de alteração"
+
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "Activado"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "Predefinição do tema"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Baseada em Arial"
+
+msgctxt "#31400"
+msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
+msgstr "[B]CONFIGURAR DEFINIÇÕES DE APARÊNCIA[/B][CR][CR]Mudar de tema · Definir o idioma e a região · Opções de listagem de ficheiros[CR]Definir um protector de ecrã"
+
+msgctxt "#31401"
+msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
+msgstr "[B]CONFIGURAR DEFINIÇÕES DE VÍDEO[/B][CR][CR]Gerir Biblioteca de Vídeo · Opções de reprodução de vídeo · Opções de listagem de vídeo[CR]Definir tipo de letra das legendas"
+
+msgctxt "#31402"
+msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
+msgstr "[B]CONFIGURAR DEFINIÇÕES DE MÚSICA[/B][CR][CR]Gerir Biblioteca de Música · Opções de reprodução · Opções de listagem[CR]Definir envio de músicas · Opções de karaoke"
+
+msgctxt "#31406"
+msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
+msgstr "[B]CONFIGURAR DEFINIÇÕES DO SISTEMA[/B][CR][CR]Configurar e calibrar ecrãs · Configurar saída de áudio · Configurar controlo remoto[CR]Configurar poupança de energia · Activar depuração · Configurar bloqueio geral"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
+msgstr "[B]CONFIGURAR DEFINIÇÕES DE TV[/B][CR][CR]Definir informação em ecrã cheio · Gerir definições de dados do EPG"
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr "[B]CONFIGURAR DEFINIÇÕES DE SERVIÇOS[/B][CR][CR]Configurar controlo do Kodi via UPnP e HTTP · Configurar partilha de ficheiros[CR]Activar ZeroConf · Configurar AirPlay"
+
+msgctxt "#31413"
+msgid "Local subtitle available"
+msgstr "Legenda local disponível"
+
+msgctxt "#31420"
+msgid "Login"
+msgstr "Iniciar sessão"
+
+msgctxt "#31422"
+msgid "Show or hide the login screen at startup."
+msgstr "Mostrar ou ocultar o ecrã de início de sessão ao iniciar o Kodi"
+
+msgctxt "#31423"
+msgid "Select the profile that will be used at startup when the login screen is disabled."
+msgstr "Seleccionar o perfil que será usado inicialmente quando o ecrã de início de sessão não é exibido"
+
+msgctxt "#31502"
+msgid "TV"
+msgstr "TELEVISÃO"
+
+msgctxt "#31506"
+msgid "Available[CR]Groups"
+msgstr "Grupos[CR] disponíveis"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Previsão"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "A receber previsões meteorológicas..."
+
+msgctxt "#31910"
+msgid "Maps"
+msgstr "Mapas"
+
+msgctxt "#31950"
+msgid "WEATHER"
+msgstr "METEOROLOGIA"
+
+msgctxt "#31951"
+msgid "PICTURES"
+msgstr "IMAGENS"
+
+msgctxt "#31952"
+msgid "TV"
+msgstr "TELEVISÃO"
+
+msgctxt "#31953"
+msgid "VIDEOS"
+msgstr "VÍDEOS"
+
+msgctxt "#31954"
+msgid "MOVIES"
+msgstr "FILMES"
+
+msgctxt "#31955"
+msgid "TV SHOWS"
+msgstr "SÉRIES TV"
+
+msgctxt "#31956"
+msgid "MUSIC"
+msgstr "MÚSICA"
+
+msgctxt "#31957"
+msgid "PROGRAMS"
+msgstr "PROGRAMAS"
+
+msgctxt "#31958"
+msgid "PLAY DISC"
+msgstr "INICIAR DISCO"
+
+msgctxt "#31959"
+msgid "SYSTEM"
+msgstr "SISTEMA"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "RÁDIO"
diff --git a/addons/skin.confluence/language/resource.language.ro_ro/strings.po b/addons/skin.confluence/language/resource.language.ro_ro/strings.po
new file mode 100644
index 0000000000..c806c62cf6
--- /dev/null
+++ b/addons/skin.confluence/language/resource.language.ro_ro/strings.po
@@ -0,0 +1,529 @@
+# Kodi Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon Provider: Jezz_X, Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/kodi-main/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+msgctxt "#31000"
+msgid "Change your"
+msgstr "Modificați"
+
+msgctxt "#31003"
+msgid "Power options"
+msgstr "Opțiuni de alimentare"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "Procesare..."
+
+msgctxt "#31005"
+msgid "Hide information"
+msgstr "Ascunde informații"
+
+msgctxt "#31006"
+msgid "View options"
+msgstr "Opțiuni de afișare"
+
+msgctxt "#31008"
+msgid "Full screen"
+msgstr "Ecran complet"
+
+msgctxt "#31009"
+msgid "Total duration"
+msgstr "Durată totală"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Fișiere audio"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "Redare"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Pagina"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "Elemente"
+
+msgctxt "#31026"
+msgid "Misc options"
+msgstr "Opțiuni diverse"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "Locație"
+
+msgctxt "#31028"
+msgid "Poster wrap"
+msgstr "Roată afișe"
+
+msgctxt "#31029"
+msgid "Fanart"
+msgstr "Creație artistică"
+
+msgctxt "#31031"
+msgid "Pic thumbs"
+msgstr "Miniaturi imagini"
+
+msgctxt "#31032"
+msgid "Image wrap"
+msgstr "Roată de imagini"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "Informații"
+
+msgctxt "#31039"
+msgid "Actions"
+msgstr "Acțiuni"
+
+msgctxt "#31040"
+msgid "Now playing"
+msgstr "Acum în redare"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "ÎN REDARE"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "ÎN PAUZĂ"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "DERULARE ÎNAINTE"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "DERULARE ÎNAPOI"
+
+msgctxt "#31046"
+msgid "SEEKING"
+msgstr "DERULARE"
+
+msgctxt "#31049"
+msgid "End time"
+msgstr "Oră de încheiere"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Sortare:Ascendentă"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Sortare:Descendentă"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Deschide listă de redare"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "Salvează lista de redare"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Închide lista de redare"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "Fișiere de muzică în sistem"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Listă de redare curentă"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "Acest fișier este în stivă, selectați partea din care doriți să redați."
+
+msgctxt "#31061"
+msgid "Current selected"
+msgstr "Selectat curent"
+
+msgctxt "#31101"
+msgid "Home screen options"
+msgstr "Opțiuni ecran principal"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "Fundal"
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr "Opțiuni diverse"
+
+msgctxt "#31108"
+msgid "Hide main menu buttons"
+msgstr "Ascunde butoane meniu principal"
+
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "Activează fundal personalizat"
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr "Cale fundal"
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Ascunde"
+
+msgctxt "#31112"
+msgid "Options"
+msgstr "Opțiuni"
+
+msgctxt "#31116"
+msgid "Show recently added albums"
+msgstr "Arată albumele adăugate recent"
+
+msgctxt "#31117"
+msgid "Show recently added videos"
+msgstr "Arată fișierele video recent"
+
+msgctxt "#31119"
+msgid "Hide background fanart"
+msgstr "Ascunde creația artistică de pe fundal"
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "Redă cântece temă TV în mediateca video (supliment TvTunes)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvTunes"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "Versuri"
+
+msgctxt "#31132"
+msgid "Lyrics add-on"
+msgstr "Supliment versuri"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "Meniu audio"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "Meniu video"
+
+msgctxt "#31142"
+msgid "Settings level"
+msgstr "Nivel setări"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "Scurtături"
+
+msgctxt "#31203"
+msgid "Choose your song"
+msgstr "Alegeți-vă cântecul"
+
+msgctxt "#31205"
+msgid "Lyrics source"
+msgstr "Sursă versuri"
+
+msgctxt "#31206"
+msgid "Found"
+msgstr "Găsite"
+
+msgctxt "#31207"
+msgid "Find more items"
+msgstr "Găsește mai multe elemente"
+
+msgctxt "#31208"
+msgid "Upcoming episodes"
+msgstr "Episoade viitoare"
+
+msgctxt "#31301"
+msgid "Last updated"
+msgstr "Ultima actualizare"
+
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "Furnizor informații"
+
+msgctxt "#31307"
+msgid "Hide fanart"
+msgstr "Ascunde creația artistică"
+
+msgctxt "#31308"
+msgid "Movie details"
+msgstr "Detalii film"
+
+msgctxt "#31309"
+msgid "Memory used:"
+msgstr "Memorie folosită:"
+
+msgctxt "#31310"
+msgid "Track number"
+msgstr "Număr pistă"
+
+msgctxt "#31311"
+msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
+msgstr "Imagine creație artistică indisponibilă[CR][CR]Clic pe buton pentru setare"
+
+msgctxt "#31312"
+msgid "Current scraper"
+msgstr "Catalog curent"
+
+msgctxt "#31313"
+msgid "Choose a scraper"
+msgstr "Alegeți un catalog"
+
+msgctxt "#31314"
+msgid "Content scanning options"
+msgstr "Opțiuni scanare conținut"
+
+msgctxt "#31317"
+msgid "Set fanart path"
+msgstr "Definire cale creație artistică"
+
+msgctxt "#31319"
+msgid "Selected profile"
+msgstr "Profil selectat"
+
+msgctxt "#31320"
+msgid "Last logged in"
+msgstr "Ultimul autentificat"
+
+msgctxt "#31321"
+msgid "Karaoke song selector"
+msgstr "Selector cântece karaoke"
+
+msgctxt "#31322"
+msgid "Aired"
+msgstr "Difuzat pe"
+
+msgctxt "#31325"
+msgid "Playlist options"
+msgstr "Opțiuni listă de redare"
+
+msgctxt "#31326"
+msgid "Created"
+msgstr "Creat"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "Rezoluție"
+
+msgctxt "#31328"
+msgid "Recently added"
+msgstr "Adăugate recent"
+
+msgctxt "#31329"
+msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
+msgstr "[B]Planificare închidere activată![/B] [COLOR=grey2] Închidere sistem în[/COLOR]"
+
+msgctxt "#31331"
+msgid "Album details"
+msgstr "Detalii album"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "Pauză"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Stop"
+
+msgctxt "#31353"
+msgid "Fast forward"
+msgstr "Derulează înainte"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Derulează înapoi"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "Meniu film"
+
+msgctxt "#31356"
+msgid "Download subtitles"
+msgstr "Descarcă subtitrări"
+
+msgctxt "#31360"
+msgid "Watch as 2D"
+msgstr "Afișează în 2D"
+
+msgctxt "#31361"
+msgid "Change mode"
+msgstr "Schimbare mod"
+
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "Activat"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "Implicit pentru costum"
+
+msgctxt "#31391"
+msgid "Skin default with no caps"
+msgstr "Implicit pentru costum fără majuscule"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Cu Arial la bază"
+
+msgctxt "#31400"
+msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
+msgstr "[B]CONFIGURAȚI SETĂRI DE ASPECT[/B][CR][CR]Schimbați costumul · Alegeți limba și regiunea · Modificați opțiunile de listare a fișierelor[CR]Alegeți un protector ecran"
+
+msgctxt "#31401"
+msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
+msgstr "[B]CONFIGURAȚI SETĂRI VIDEO[/B][CR][CR]Administrați  mediateca video · Setați opțiuni redare video · Modificați opțiuni de listare video[CR]Alegeți font subtitrare"
+
+msgctxt "#31402"
+msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
+msgstr "[B]CONFIGURAȚI SETĂRI MUZICĂ[/B][CR][CR]Administrați mediateca audio · Setați opțiuni redare muzică · Modificați opțiuni de listare muzică[CR]Pregătiți trimitere cântec · Setați opțiuni karaoke"
+
+msgctxt "#31406"
+msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
+msgstr "[B]CONFIGURAȚI SETĂRI SISTEM[/B][CR][CR]Configurați și calibrați ecrane · Configurați ieșirea audio · Instalați telecomenzi[CR]Alegeți opțiuni de economisire energie · Activați depanarea · Configurați blocarea principală"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
+msgstr "[B]CONFIGURAȚI SETĂRI TELEVIZIUNE ÎN DIRECT[/B][CR][CR]Schimbați informațiile afișate pe ecran în modul ecran complet · Gestionați setări date ghid tv"
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr "[B]CONFIGURARAȚI SETĂRI SERVICII[/B][CR][CR]Stabiliți controului Kodi prin UPnP și HTTP · Configurarați partajarea de fișiere[CR]Activați Zeroconf · Configurați AirPlay"
+
+msgctxt "#31411"
+msgid "First run help..."
+msgstr "Ajutor la prima execuție..."
+
+msgctxt "#31413"
+msgid "Local subtitle available"
+msgstr "Este disponibilă o subtitrare locală"
+
+msgctxt "#31420"
+msgid "Login"
+msgstr "Autentificare"
+
+msgctxt "#31422"
+msgid "Show or hide the login screen at startup."
+msgstr "Arată sau ascunde ecranul de autentificare la pornire."
+
+msgctxt "#31423"
+msgid "Select the profile that will be used at startup when the login screen is disabled."
+msgstr "Selectați profilul care va fi folosit la pornire când ecranul de autentificare este dezactivat."
+
+msgctxt "#31502"
+msgid "TV"
+msgstr "Televizor"
+
+msgctxt "#31503"
+msgid "Add group"
+msgstr "Adăugare grup"
+
+msgctxt "#31504"
+msgid "Rename group"
+msgstr "Redenumire grup"
+
+msgctxt "#31505"
+msgid "Delete group"
+msgstr "Ștergere grup"
+
+msgctxt "#31506"
+msgid "Available[CR]Groups"
+msgstr "[CR]Grupuri disponibile"
+
+msgctxt "#31509"
+msgid "Channel group"
+msgstr "Grup de canale"
+
+msgctxt "#31511"
+msgid "Channel options"
+msgstr "Opțiuni canal"
+
+msgctxt "#31902"
+msgid "Hourly forecast"
+msgstr "Prognoză la o oră"
+
+msgctxt "#31903"
+msgid "Weekend forecast"
+msgstr "Prognoză pe sfârșit de săptămână"
+
+msgctxt "#31904"
+msgid "Daily forecast"
+msgstr "Prognoză zilnică"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Previziune"
+
+msgctxt "#31908"
+msgid "Chance of precipitation"
+msgstr "Șansă de precipitații"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "Preluare informații previziune..."
+
+msgctxt "#31910"
+msgid "Maps"
+msgstr "Hărți"
+
+msgctxt "#31950"
+msgid "WEATHER"
+msgstr "METEO"
+
+msgctxt "#31951"
+msgid "PICTURES"
+msgstr "IMAGINI"
+
+msgctxt "#31952"
+msgid "TV"
+msgstr "Televizor"
+
+msgctxt "#31953"
+msgid "VIDEOS"
+msgstr "VIDEO"
+
+msgctxt "#31954"
+msgid "MOVIES"
+msgstr "FILME"
+
+msgctxt "#31955"
+msgid "TV SHOWS"
+msgstr "SERIALE"
+
+msgctxt "#31956"
+msgid "MUSIC"
+msgstr "MUZICĂ"
+
+msgctxt "#31957"
+msgid "PROGRAMS"
+msgstr "PROGRAME"
+
+msgctxt "#31958"
+msgid "PLAY DISC"
+msgstr "REDARE DISC"
+
+msgctxt "#31959"
+msgid "SYSTEM"
+msgstr "SISTEM"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "RADIO"
diff --git a/addons/skin.confluence/language/Russian/strings.po b/addons/skin.confluence/language/resource.language.ru_ru/strings.po
index 63508939a2..1c9037c55b 100644
--- a/addons/skin.confluence/language/Russian/strings.po
+++ b/addons/skin.confluence/language/resource.language.ru_ru/strings.po
@@ -4,24 +4,24 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/xbmc-main/language/ru/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kodi-main/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
+"Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
+msgid "Change your"
 msgstr "Измените"
 
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "Настройки питания"
 
 msgctxt "#31004"
@@ -29,11 +29,11 @@ msgid "Working..."
 msgstr "Подождите…"
 
 msgctxt "#31005"
-msgid "Hide Information"
+msgid "Hide information"
 msgstr "Без сведений"
 
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Настройки просмотра"
 
 msgctxt "#31008"
@@ -41,7 +41,7 @@ msgid "Full screen"
 msgstr "Полный экран"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Общая длительность"
 
 msgctxt "#31022"
@@ -61,7 +61,7 @@ msgid "Items"
 msgstr "в списке"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "Другие параметры"
 
 msgctxt "#31027"
@@ -69,7 +69,7 @@ msgid "Location"
 msgstr "Расположение"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
+msgid "Poster wrap"
 msgstr "карусель постеров"
 
 msgctxt "#31029"
@@ -77,11 +77,11 @@ msgid "Fanart"
 msgstr "фанарт"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "эскизы фото"
 
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "карусель изображений"
 
 msgctxt "#31033"
@@ -93,7 +93,7 @@ msgid "Actions"
 msgstr "Действия"
 
 msgctxt "#31040"
-msgid "Now Playing"
+msgid "Now playing"
 msgstr "Сейчас воспроизводится:"
 
 msgctxt "#31042"
@@ -117,11 +117,11 @@ msgid "SEEKING"
 msgstr "ПОИСК"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr "Настройки визуализации"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Время окончания"
 
 msgctxt "#31050"
@@ -157,7 +157,7 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Это составной файл. Выберите часть для проигрывания."
 
 msgctxt "#31061"
-msgid "Current Selected"
+msgid "Current selected"
 msgstr "Текущее выделение"
 
 msgctxt "#31101"
@@ -168,29 +168,21 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Фон"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Показывать \"Пауза\" в режиме слайд-шоу"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
 msgstr "Воспроизводить трейлеры в окне [COLOR=grey3](только для окна сведений)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Различные параметры"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Скрыть флаги, полученные из имени видеофайла [COLOR=grey3](BluRray, HDTV)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
+msgid "Hide main menu buttons"
 msgstr "Скрыть кнопки главного меню"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Разрешить выбор фона"
+msgid "Enable custom background"
+msgstr "Использовать собственный фон"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,27 +197,23 @@ msgid "Options"
 msgstr "Параметры"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "Показывать последние добавленные альбомы"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
+msgid "Show recently added videos"
 msgstr "Показывать последнее добавленное видео"
 
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Подменю программ главного экрана"
-
 msgctxt "#31119"
-msgid "Hide Background Fanart"
+msgid "Hide background fanart"
 msgstr "Скрыть фоновый фанарт"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
+msgid "Show background \"Now playing\" video"
 msgstr "Воспроизводимое видео в качестве фона"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
+msgid "Show background \"Now playing\" visualisation"
 msgstr "Музыкальная визуализация в качестве фона"
 
 msgctxt "#31126"
@@ -241,25 +229,13 @@ msgid "Lyrics"
 msgstr "Тексты"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
+msgid "Hide fanart in full screen visualisation"
 msgstr "Скрывать фанарт в полноэкранной визуализации"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
+msgid "Lyrics add-on"
 msgstr "Дополнение текстов песен"
 
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Подменю видео главного экрана"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Подменю музыки главного экрана"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Подменю фото главного экрана"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Экранное меню музыки"
@@ -277,11 +253,11 @@ msgid "Shortcuts"
 msgstr "Ярлыки"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Выберите песню"
+msgid "Choose your song"
+msgstr "Выберите композицию"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
+msgid "Lyrics source"
 msgstr "Источник текстов песен"
 
 msgctxt "#31206"
@@ -289,19 +265,15 @@ msgid "Found"
 msgstr "Найдено"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Найти ещё"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "Следующие серии"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Текущая температура"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Последнее обновление"
 
 msgctxt "#31303"
@@ -309,19 +281,19 @@ msgid "Data provider"
 msgstr "Источник данных"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
+msgid "Hide fanart"
 msgstr "Скрыть фанарт"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Сведения о фильме"
 
 msgctxt "#31309"
-msgid "Memory Used:"
+msgid "Memory used:"
 msgstr "Использовано памяти:"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "Номер композиции"
 
 msgctxt "#31311"
@@ -329,31 +301,31 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Фанарт[CR][CR]недоступен,[CR][CR]нажмите кнопку, чтобы выбрать"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "Текущий инфоресурс"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "Выбрать инфоресурс"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
+msgid "Content scanning options"
 msgstr "Параметры сканирования содержимого"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
+msgid "Set fanart path"
 msgstr "Выбрать расположение фанарта"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "Выбранный профиль"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Последний вход"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
+msgid "Karaoke song selector"
 msgstr "Выбор песен для караоке"
 
 msgctxt "#31322"
@@ -361,7 +333,7 @@ msgid "Aired"
 msgstr "Премьера"
 
 msgctxt "#31325"
-msgid "Playlist Options"
+msgid "Playlist options"
 msgstr "Параметры плейлиста"
 
 msgctxt "#31326"
@@ -373,19 +345,19 @@ msgid "Resolution"
 msgstr "Размеры"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Последние"
+msgid "Recently added"
+msgstr "Недавно добавленные"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Установлен таймер![/B] [COLOR=grey2] Выключение через[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Нажмите кнопку,[CR][CR]чтобы посмотреть трейлер к фильму"
+msgid "Click button to play[CR][CR]movie trailer"
+msgstr "Нажмите кнопку,[CR][CR]чтобы воспроизвести трейлер к фильму"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "Сведения об альбоме"
 
 msgctxt "#31351"
@@ -397,7 +369,7 @@ msgid "Stop"
 msgstr "Стоп"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "Перемотка вперед"
 
 msgctxt "#31354"
@@ -409,7 +381,7 @@ msgid "Movie menu"
 msgstr "Меню фильма"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
+msgid "Download subtitles"
 msgstr "Загрузить субтитры"
 
 msgctxt "#31360"
@@ -429,8 +401,8 @@ msgid "Skin default"
 msgstr "Стандартные"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Стандартные без ПРОПИСНЫХ"
+msgid "Skin default with no caps"
+msgstr "Стандартные без прописных"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -448,20 +420,12 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]НАСТРОЙКА ПАРАМЕТРОВ МУЗЫКИ[/B][CR][CR]Управление медиатекой аудио • Параметры воспроизведения аудио[CR]Настройка списка аудио • Настройка добавления песен • Настройка караоке"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]НАСТРОЙКА ПАРАМЕТРОВ ФОТО[/B][CR][CR]Параметры списка фото • Настройка слайд-шоу"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]НАСТРОЙКА ПАРАМЕТРОВ ПОГОДЫ[/B][CR][CR]Выбор трёх городов для получения информации о погоде"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]НАСТРОЙКА ПАРАМЕТРОВ СИСТЕМЫ[/B][CR][CR]Настройка и калибровка дисплеев • Настройка вывода аудио • Настройка[CR]дистанционного управления • Настройка параметров энергосбережения • Включение отладки • Настройка блокировки"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
 msgstr "[B]КОНФИГУРАЦИЯ ДОПОЛНЕНИЙ[/B][CR][CR]Управление дополнениями - Поиск и установка дополнений с kodi.tv[CR]Настройки дополнений"
 
 msgctxt "#31409"
@@ -473,12 +437,8 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]НАСТРОЙКА ПАРАМЕТРОВ СЛУЖБ[/B][CR][CR]Настройка управления Kodi по UPnP и HTTP • Настройка доступа к файлам[CR]Включение Zeroconf • Настройка AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
-msgstr "Сведения при первом запуске."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Эта вкладка означает, что сбоку окна есть меню с дополнительными настройками.  Чтобы получить доступ к меню, перейдите влево при помощи пульта ДУ или клавиатуры либо поместите курсор мыши над вкладкой. [CR][CR]Нажмите ОК, чтобы закрыть этот диалог. Он больше не будет отображаться."
+msgid "First run help..."
+msgstr "Сведения при первом запуске..."
 
 msgctxt "#31413"
 msgid "Local subtitle available"
@@ -489,8 +449,8 @@ msgid "Login"
 msgstr "Вход"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Выберите профиль пользователя Kodi,[CR]чтобы войти в систему"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Выберите профиль пользователя Kodi,[CR]чтобы войти и продолжить"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,23 +461,23 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Выбрать профиль, используемый при запуске, если экран входа отключен."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
+msgid "Scheduled time"
 msgstr "Запланированное время"
 
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "ТВ"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "Добавить группу"
 
 msgctxt "#31504"
-msgid "Rename Group"
+msgid "Rename group"
 msgstr "Переименовать группу"
 
 msgctxt "#31505"
-msgid "Delete Group"
+msgid "Delete group"
 msgstr "Удалить группу"
 
 msgctxt "#31506"
@@ -525,31 +485,27 @@ msgid "Available[CR]Groups"
 msgstr "Доступные[CR]группы"
 
 msgctxt "#31509"
-msgid "Channel Group"
+msgid "Channel group"
 msgstr "Группа каналов"
 
 msgctxt "#31510"
-msgid "Timer Set"
+msgid "Timer set"
 msgstr "Таймер настроен"
 
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "Настройки канала"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Прогноз на 36 часов"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "Ежечасный прогноз"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "Прогноз на выходные"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "Ежедневный прогноз"
 
 msgctxt "#31905"
@@ -557,7 +513,7 @@ msgid "Forecast"
 msgstr "Прогноз"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "Возможны осадки"
 
 msgctxt "#31909"
diff --git a/addons/skin.confluence/language/Sinhala/strings.po b/addons/skin.confluence/language/resource.language.si_lk/strings.po
index b0f6ebb15f..85793ebd8d 100644
--- a/addons/skin.confluence/language/Sinhala/strings.po
+++ b/addons/skin.confluence/language/resource.language.si_lk/strings.po
@@ -4,18 +4,22 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Sinhala (http://www.transifex.com/projects/p/xbmc-main/language/si/)\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/kodi-main/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: si\n"
+"Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgctxt "#31006"
+msgid "View options"
+msgstr "වීඩියෝ කැමැත්ත "
+
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "සම්පුර්ණ තිරය"
diff --git a/addons/skin.confluence/language/Slovak/strings.po b/addons/skin.confluence/language/resource.language.sk_sk/strings.po
index 02e40f8446..d424ea4096 100644
--- a/addons/skin.confluence/language/Slovak/strings.po
+++ b/addons/skin.confluence/language/resource.language.sk_sk/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/xbmc-main/language/sk/)\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/kodi-main/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
+"Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Zmeniť"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Napájanie"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Pracujem..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Skryť informáciu"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Možnosti zobrazenia"
+msgid "View options"
+msgstr "Zobrazenie"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Celkové trvanie"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Hudba - Súbory"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Položky"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Ďalšie možnosti"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Mesto"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Obaly"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Náhľady"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Obrázky"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Informácie"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Akcie"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Práve hrá"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "PREHRÁVA SA"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "VYHĽADÁVANIE"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Predvoľby vizualizácie"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Koniec filmu"
+msgid "End time"
+msgstr "Čas konca"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Tento súbor sa skladá z viac častí. Vyberte tu, od ktorej chcete spustit prehrávaníe."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Aktuálne vybraný"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Informácie na Domovskej stránke"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Pozadie"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Zobrazovať 'Pauza' pri prezentácií obrázkov"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Prehrávať ukážky v okne [COLOR=grey3](iba z okna Detailné Informácie)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Rôzne nastavenia"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Nezobrazovať ikonky zdroja videa [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Skryť položky hlavného menu"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Zapnúť vlastné pozadie"
+msgid "Enable custom background"
+msgstr "Aktivovať vlastné pozadie"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Možnosti"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Zobraziť naposledy pridané albumy"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Zobrazovať Posledné pridané"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Domovská stránka / podmenu Programy"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Skryť Fanart na pozadí"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Zobrazovať práve prehrávané video na pozadí"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Zobrazovať vizualizáciu na pozadí"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Prehrávať skladbu TV seriálu vo video knižnici (TvTunes doplnok)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Texty skladieb"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Skryť Fanart pri vizualizácii na celú obrazovku"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Doplnok Texty skladieb"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Domovská stránka / podmenu Videá"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Domovská stránka / podmenu Hudba"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Domovská stránka / podmenu Obrázky"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Hudobný OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Odkazy"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Vyberte Vašu skladbu"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Zdroj textov skladieb"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Nájdené"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Hľadať viac položiek"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Pripravované časti"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Aktuálna teplota"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Naposledy aktualizované"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Počasie Vám prináša"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Skryť Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Informácie"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Použitá pamäť:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Číslo skladby"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart obrázok[CR][CR]Nedostupný[CR][CR] Klik pre nastavenie"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Aktuálny sťahovač"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Vyber sťahovač"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Možnosti vyhľadávania obsahu"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Nájsť FanArt"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Vybratý Profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Posledné prihlásenie"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Výber Karaoke skladby"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Vysielané"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Nastavenia Playlistu"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Vytvorené"
@@ -373,21 +197,13 @@ msgid "Resolution"
 msgstr "Rozlíšenie"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Posledné pridané"
+msgid "Recently added"
+msgstr "Naposledy pridané"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Časovač nastavený![/B] [COLOR=grey2] - Systém sa automaticky vypne za[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Pre spustenie ukážky[CR][CR]stlačte tlačítko"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detaily albumu"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pauza"
@@ -396,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Zastaviť"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Pretočiť dopredu"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Pretočiť dozadu"
@@ -408,10 +220,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menu filmu"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Stiahnuť titulky"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Pozerať ako 2D"
@@ -428,10 +236,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Predvolený vzhľad"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Predvolený vzhľad bez veľkých písmen"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial"
@@ -448,22 +252,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]MOŽNOSTI HUDBY[/B][CR][CR]Správa knižnice hudby · Možnosti prehrávania hudby · Zobrazenie hudobných súborov[CR]Služby pre odosielanie informácií o prehrávaných skladbách · Karaoke nastavenia"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]MOŽNOSTI OBRÁZKOV[/B][CR][CR]Možnosti zobrazenia obrázkov · Nastavenie prezentácie"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]MOŽNOSTI POČASIA[/B][CR][CR]Nastavenie oblastí pre ktoré si prajete získavať predpoveď počasia"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]MOŽNOSTI SYSTÉMU[/B][CR][CR]Nastavenie obrazovky · Nastavenie zvukového výstupu[CR]Možnosti úsporného režimu · Ukladanie informácií · Konfigurácia rodičovského zámku"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]MOŽNOSTI DOPLNKOV[/B][CR][CR]Správa nainštalovaných doplnkov · Vyhľadávanie a inštalácia doplnkov z kodi.tv[CR]Nastavenie doplnkov"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]NASTAVENIA TV[/B][CR][CR]Zmeniť informácie zobrazené na celej obrazovke · Spravovať nastavenia EPG dát"
@@ -472,14 +264,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGUROVAŤ NASTAVENIA SLUŽBY[/B][CR][CR]Nastaviť ovládanie Kodi pomocou UPnP a HTTP · Konfigurovať zdielanie[CR]Zapnúť Zeroconf · Konfigurovať AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Pomocník po prvom spustení..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Táto záložka zvýrazňuje, že sa na bočnej strane okna nachádza skryté menu. Aby ste sa k nemu dostali, kurzorovými tlačidlami na vašom diaľkovom ovládači alebo klávesnici choďte doľava, prípadne umiestnite kurzor myši ponad túto záložku. [CR][CR]Kliknutím na tlačidlo \"Ok\" sa zavrie toto dialógové okno. V budúcnosti sa už nezobrazí."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Dostupné lokálne titulky"
@@ -488,10 +272,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Prihlásiť"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Prihlásenie užívateľa[CR]Pokračujte výberom profilu"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Zobraziť alebo skryť prihlasovaciu obrazovku pri štarte."
@@ -500,62 +280,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Zvoľte profil, ktorý bude použitý pri štarte, ak je prihlasovacia obrazovka vypnutá."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Naplánovaný čas"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Živé TV vysielanie"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Pridať skupinu"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Premenovať skupinu"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Odstrániť skupinu"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Dostupné[CR]skupiny"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Skupina kanálu"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Nastaviť časovač"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Možnosti kanálu"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 Hodinová predpoveď"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Hodinová predpoveď"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Predpoveď na víkend"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Predpoveď"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Šanca zrážok"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Zisťujem informácie o počasí..."
diff --git a/addons/skin.confluence/language/Slovenian/strings.po b/addons/skin.confluence/language/resource.language.sl_si/strings.po
index 82661beede..e90e5c6653 100644
--- a/addons/skin.confluence/language/Slovenian/strings.po
+++ b/addons/skin.confluence/language/resource.language.sl_si/strings.po
@@ -4,36 +4,36 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Slovenian (http://www.transifex.com/projects/p/xbmc-main/language/sl/)\n"
+"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/kodi-main/language/sl_SI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
+"Language: sl_SI\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 msgctxt "#31000"
-msgid "Change Your"
-msgstr "Prilagodite vaše"
+msgid "Change your"
+msgstr "Spremenite vaše"
 
 msgctxt "#31003"
-msgid "Power Options"
-msgstr "Zapusti"
+msgid "Power options"
+msgstr "Možnosti napajanja"
 
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Počakajte ..."
 
 msgctxt "#31005"
-msgid "Hide Information"
+msgid "Hide information"
 msgstr "Skrij informacije"
 
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Možnosti pogleda"
 
 msgctxt "#31008"
@@ -41,7 +41,7 @@ msgid "Full screen"
 msgstr "Celozaslonsko"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "Celotno trajanje"
 
 msgctxt "#31022"
@@ -61,7 +61,7 @@ msgid "Items"
 msgstr "Predmetov"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "Razne možnosti"
 
 msgctxt "#31027"
@@ -69,7 +69,7 @@ msgid "Location"
 msgstr "Lokacija"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
+msgid "Poster wrap"
 msgstr "Plakati"
 
 msgctxt "#31029"
@@ -77,11 +77,11 @@ msgid "Fanart"
 msgstr "Grafike"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "Sličice"
 
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "Slike"
 
 msgctxt "#31033"
@@ -93,7 +93,7 @@ msgid "Actions"
 msgstr "Dejanja"
 
 msgctxt "#31040"
-msgid "Now Playing"
+msgid "Now playing"
 msgstr "Trenutno predvajam"
 
 msgctxt "#31042"
@@ -117,12 +117,12 @@ msgid "SEEKING"
 msgstr "ISKANJE"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr "Prednastavitve vizualizacije"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Čas zaključka"
+msgid "End time"
+msgstr "Končni čas"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -157,7 +157,7 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "Ta datoteka je združena. Izberite del za predvajanje."
 
 msgctxt "#31061"
-msgid "Current Selected"
+msgid "Current selected"
 msgstr "Trenutno izbrano"
 
 msgctxt "#31101"
@@ -168,29 +168,21 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Ozadje"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Prikaži \"Prekinitev\" v projekciji slik"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Predvajaj napovednike v oknu [COLOR=grey3](Samo okno z informacijami o videu)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
+msgstr "Predvajaj napovednik v oknu [COLOR=grey3](Samo informacije video dialoga)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Razne možnosti"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Skrij oznake videa, prebrane iz datotek [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Skrij gumbe v glavnem meniju"
+msgid "Hide main menu buttons"
+msgstr "Skrij gumbe glavnega okna"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Vključi poljubno ozadje"
+msgid "Enable custom background"
+msgstr "Omogoči ozadja po meri"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -205,28 +197,24 @@ msgid "Options"
 msgstr "Možnosti"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "Prikaži nedavno dodane albume"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
+msgid "Show recently added videos"
 msgstr "Prikaži nedavno dodane videe"
 
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Podmeni programov na domačem oknu"
-
 msgctxt "#31119"
-msgid "Hide Background Fanart"
+msgid "Hide background fanart"
 msgstr "Skrij ozadja"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "V ozadju prikaži video \"Trenutno predvajam\""
+msgid "Show background \"Now playing\" video"
+msgstr "Prikaži v ozadju \"Zdaj se predvaja\" video"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "V ozadju prikaži vizualizacijo \"Trenutno predvajam\""
+msgid "Show background \"Now playing\" visualisation"
+msgstr "Prikaži v ozadju \"Zdaj se predvaja\" vizualizacija"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -241,25 +229,13 @@ msgid "Lyrics"
 msgstr "Besedilo pesmi"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
+msgid "Hide fanart in full screen visualisation"
 msgstr "Skrij grafike v vizualizaciji v celozaslonskem načinu"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
+msgid "Lyrics add-on"
 msgstr "Dodatek besedil pesmi"
 
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Podmeni videa na domačem oknu"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Podmeni glasbe na domačem oknu"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Podmeni slik na domačem oknu"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Glasbeni OSD"
@@ -277,11 +253,11 @@ msgid "Shortcuts"
 msgstr "Bližnjice"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
+msgid "Choose your song"
 msgstr "Izberite svojo pesem"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
+msgid "Lyrics source"
 msgstr "Vir besedila pesmi"
 
 msgctxt "#31206"
@@ -289,19 +265,15 @@ msgid "Found"
 msgstr "Najdenih"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "Najdi več predmetov"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "Prihajajoče epizode"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "Zadnja posodobitev"
 
 msgctxt "#31303"
@@ -309,19 +281,19 @@ msgid "Data provider"
 msgstr "Ponudnik"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
+msgid "Hide fanart"
 msgstr "Skrij grafike"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "Podrobnosti o filmu"
 
 msgctxt "#31309"
-msgid "Memory Used:"
+msgid "Memory used:"
 msgstr "Uporabljen pomnilnik:"
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "Številka pesmi"
 
 msgctxt "#31311"
@@ -329,31 +301,31 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Grafika[CR][CR]Ni na voljo[CR][CR] Kliknite na gumb za nastavitev"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "Trenutni ponudnik"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "Izberi ponudnika"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
+msgid "Content scanning options"
 msgstr "Možnosti pregledovanja vsebin"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
+msgid "Set fanart path"
 msgstr "Nastavi pot grafik"
 
 msgctxt "#31319"
-msgid "Selected Profile"
+msgid "Selected profile"
 msgstr "Izbran profil"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "Zadnja prijava"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
+msgid "Karaoke song selector"
 msgstr "Izbirnik pesmi za karaoke"
 
 msgctxt "#31322"
@@ -361,7 +333,7 @@ msgid "Aired"
 msgstr "Predvajano"
 
 msgctxt "#31325"
-msgid "Playlist Options"
+msgid "Playlist options"
 msgstr "Možnosti seznama predvajanja"
 
 msgctxt "#31326"
@@ -373,7 +345,7 @@ msgid "Resolution"
 msgstr "Ločljivost"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Nedavno dodano"
 
 msgctxt "#31329"
@@ -381,11 +353,11 @@ msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Zakasnitev nastavljena![/B] [COLOR=grey2] - Sistem se bo izklopil po[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
 msgstr "Kliknite gumb za predvajanje[CR][CR]Filmski napovednik"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "Podrobnosti o albumu"
 
 msgctxt "#31351"
@@ -397,8 +369,8 @@ msgid "Stop"
 msgstr "Ustavi"
 
 msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Naprej"
+msgid "Fast forward"
+msgstr "Hitro naprej"
 
 msgctxt "#31354"
 msgid "Rewind"
@@ -409,7 +381,7 @@ msgid "Movie menu"
 msgstr "Filmski meni"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
+msgid "Download subtitles"
 msgstr "Prenesi podnapise"
 
 msgctxt "#31360"
@@ -429,7 +401,7 @@ msgid "Skin default"
 msgstr "Privzeto"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
+msgid "Skin default with no caps"
 msgstr "Privzeto brez velikih začetnic"
 
 msgctxt "#31392"
@@ -448,21 +420,13 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]PRILAGODITE NASTAVITVE GLASBE[/B][CR][CR]Upravljajte s knjižnico glasbe · Nastavite možnosti predvajanja glasbe[CR]Spremenite možnosti seznamov · Nastavite objavo pesmi · Nastavite karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]PRILAGODITE NASTAVITVE SLIK[/B][CR][CR]Spremenite možnosti seznamov · Nastavite projekcije slik"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]PRILAGODITE NASTAVITVE VREMENA[/B][CR][CR]Izberite tri mesta, za katere bo na voljo vremenska napoved"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]PRILAGODITE NASTAVITVE SISTEMA[/B][CR][CR]Nastavite in prilagodite zaslon · Nastavite zvočni izhod · Nastavite oddaljeno upravljanje[CR]Nastavite varčevanje z energijo · Vključite razhroščevanje · Določite glavno geslo"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]PRILAGODITE DODATKE[/B][CR][CR]Upravljajte nameščene dodatke · Brskajte in namestite nove dodatke iz kodi.tv[CR]Nastavite dodatke"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
+msgstr "[B]PRILAGODI DODATKE[/B][CR][CR]Upravljajte nameščene dodatke · Poiščite in namestite dodatke s kodi.tv[CR]Spremenite nastavitve dodatka"
 
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
@@ -470,16 +434,12 @@ msgstr "[B]PRILAGODITVE NASTAVITVE TV[/B][CR][CR]Spremenite informacije v celoza
 
 msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]PRILAGODITE NASTAVITVE STORITEV[/B][CR][CR]Nastavite upravljanje Kodi-ja preko UPnP-ja in HTTP-ja · Nastavite deljenje datotek[CR]Vključite Zeroconf · Prilagodite AirPlay"
+msgstr "[B]PRILAGODITE NASTAVITVE STORITEV[/B][CR][CR]Nastavite upravljanje Kodija preko UPnP-ja in HTTP-ja · Nastavite deljenje datotek[CR]Vključite Zeroconf · Prilagodite AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
+msgid "First run help..."
 msgstr "Pomoč ob prvem zagonu ..."
 
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Ta zavihek nakazuje, da se tu skriva meni z dodatnimi možnostmi trenutnega pogleda. Za dostop do menija pritisnite levo na vašem daljinskem upravljalniku ali tipkovnici, ali pa postavite miško na zavihek. [CR][CR]Kliknite \"Ok\", da zaprete to okno. Ne bo se več prikazalo."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Na voljo so krajevni podnapisi"
@@ -489,8 +449,8 @@ msgid "Login"
 msgstr "Prijava"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Izberite vaš Kodi uporabniški profil[CR]za prijavo in nadaljujte"
+msgid "Select your Kodi user profile[CR]to login and continue"
+msgstr "Izberite svoj Kodi uporabniški profil[CR]za prijavo in nadaljevanje"
 
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
@@ -501,23 +461,23 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "Izberite profil, ki bo uporabljen ob zagonu, ko je okno za prijavo onemogočeno."
 
 msgctxt "#31501"
-msgid "Scheduled Time"
+msgid "Scheduled time"
 msgstr "Načrtovan čas"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV v živo"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "Dodaj skupino"
 
 msgctxt "#31504"
-msgid "Rename Group"
+msgid "Rename group"
 msgstr "Preimenuj skupino"
 
 msgctxt "#31505"
-msgid "Delete Group"
+msgid "Delete group"
 msgstr "Izbriši skupino"
 
 msgctxt "#31506"
@@ -525,31 +485,27 @@ msgid "Available[CR]Groups"
 msgstr "Skupine[CR]na voljo"
 
 msgctxt "#31509"
-msgid "Channel Group"
+msgid "Channel group"
 msgstr "Skupina programa"
 
 msgctxt "#31510"
-msgid "Timer Set"
+msgid "Timer set"
 msgstr "Časovnik nastavljen"
 
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "Možnosti programa"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36-urna napoved"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "Urna napoved"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
+msgid "Weekend forecast"
 msgstr "Vikend napoved"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "Dnevna napoved"
 
 msgctxt "#31905"
@@ -557,7 +513,7 @@ msgid "Forecast"
 msgstr "Napoved"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "Možnost padavin"
 
 msgctxt "#31909"
@@ -566,7 +522,7 @@ msgstr "Prenašam vremenske informacije ..."
 
 msgctxt "#31910"
 msgid "Maps"
-msgstr "Karte"
+msgstr "Zemljevidi"
 
 msgctxt "#31950"
 msgid "WEATHER"
diff --git a/addons/skin.confluence/language/Albanian/strings.po b/addons/skin.confluence/language/resource.language.sq_al/strings.po
index 5904bfd0f7..0f1bf1fe6f 100644
--- a/addons/skin.confluence/language/Albanian/strings.po
+++ b/addons/skin.confluence/language/resource.language.sq_al/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/xbmc-main/language/sq/)\n"
+"Language-Team: Albanian (Albania) (http://www.transifex.com/projects/p/kodi-main/language/sq_AL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sq\n"
+"Language: sq_AL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Ndrysho"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opcionet e Energjisë"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Në Funksionim..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Fshehi Informacionet"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Opcionet e Pamjes"
+msgid "View options"
+msgstr "Opcionet e pamjes"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Ekrani i plotë"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Kohëzgjatja"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Skeda - Muzikë"
@@ -60,38 +44,18 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Artikuj"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Opcione të Ndryhme"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Lokalizimi"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Mbështjellëse Posteri"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Foto Thumb"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Mbështjellëse Imazhi"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Duke Luajtur Tani"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "DUKE LUAJTUR"
@@ -113,8 +77,8 @@ msgid "SEEKING"
 msgstr "Duke kërkuar"
 
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Koha e Përfundimit"
+msgid "End time"
+msgstr "Koha e përfundimit"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -148,10 +112,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Kjo skedë është grupuar, zgjidh pjesën, nga e cila doni të luani."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Selekcioni aktual"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opcionet e ekranit kryesor"
@@ -160,25 +120,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Sfondi"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Trego \"Pauzuar\" gjatë paradës së fotografive"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Opcione të ndryshme"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Fshehe \"Flagging read\" nga emrat të skedave [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Fshehi Butonet e Menys Kryesore"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Aktivizo Sfond alternativ"
+msgid "Enable custom background"
+msgstr "Aktivoni sfond të perzonalizuar"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -192,22 +140,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opcionet"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Trego Albume të shtuar së fundi"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Trego Video të shtuar së fundi"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Fsheh Fanart në Sfond"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Trego Sfondin \"Duke Riprodhuar\" Video"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Luaj melodinë kryesore përcjellse së një seriali televiziv ne bibleotekën video (Shtesa TVTunes)"
@@ -220,10 +152,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Tekste Këngësh"
 
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Shtesë Tekstesh të Këngëve"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD Muizikë"
@@ -236,94 +164,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Shkurtor"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Zgjidh Këngën Tënde"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Origjinë Tekstesh të Këngëve"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Gjetur"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Kërko më shumë artikuj"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Episode të ardhsme"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Temperatura Aktuale"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Azhornuar së Fundmi"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Pajisës i të Dhënave"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Fsheh Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Detale të Filmit"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Memorje Përdorur"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Numri i Këngës"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Imazhi Fanart [CR][CR]i padisponueshëm[CR][CR] Kliko butonin për aktualizimin"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "\"Scraper\" i Zgjedhur"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Zgjidh një \"Scraper\""
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opsionet e Skanimit të Përmbajtjes"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Vendos Vendndodhjen e \"Fanart'it\""
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Profili i Zgjedhur"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "I Loguar së Fundmi"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Përzgjedhës i Këngëve Karaoke"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Në Transmetim"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opcionet e Listës së Degjimit"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Krijuar"
@@ -332,22 +188,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Zbërthimi"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Shtuar së fundi"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]\"Timer\" ështe vendosur![/B] [COLOR=grey2] - Auto mbyllja në [/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Kliko butonin për të riprodhuar[CR][CR]Film \"trailer'in\""
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Detalet e Albumeve"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pauzo"
@@ -356,10 +200,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Ndalo"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Përshpejto"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Rikthe"
@@ -368,10 +208,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Meny Filmi"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Shkarko Titra"
-
 msgctxt "#31362"
 msgid "Enabled"
 msgstr "Aktivuar"
@@ -380,10 +216,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Standarte e Maskës"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Maska kryesore pa shkronja kapitale"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Në Arial"
@@ -400,94 +232,30 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGURO OPCIONET E MUZIKËS[/B][CR][CR]Menaxho bibliotekën e muzikës tënde · Cakto opcione të riprodhimit të muzikës · Ndrysho pamjen e listës së muzikës[CR]Cakto opcionet karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGURO OPCIONET E IMAZHEVE[/B][CR][CR]Cakto pamjen e listës së imazheve · Konfiguro paradën (slideshows)"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGURO OPCIONET E MOTIT[/B][CR][CR]Cakto tre shtete për shkarkimin e informatave mbi motin"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGURO OPCIONET E SISTEMIT[/B][CR][CR]Konfiguro dhe Kalibro Ekranet ·  Konfiguro daljen e zërit · Konfiguro telekomandat [CR]Cakto opcionet për kursimin e rrymës · Aktivizo debugging · Konfiguro dryrin përdorues"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGURO SHTESAT[/B][CR][CR]Menaxho shtesat e installuara · Shiko dhe installo shtesa nga kodi.tv[CR]Modifiko konfigurimet e shtesave."
-
 msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGURO OPCIONET E SERVISEVE[/B][CR][CR]Konfiguro kontrollimin e Kodi'së nëpërmjet UPnP dhe HTTP · Konfiguro shpërndarjen e skedeve[CR]Aktivizo Zeroconf · Konfiguro AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Ndihma për përdorimin e parë..."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Subtitra lokal në dispozicion"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Zgjidh Kodi profilin [CR] në cilin don të paraqitesh dhe vazhdo"
-
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Koha e caktuar"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Shto Grup"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Riemro Grupet"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Fshij Grupet"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Grupë në dispzicion[CR]"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Grupi i kanaleve"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Orari i saktësuar"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Opcionet e kanaleve"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Parashikimi 36 Orësh"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Parashikimi Orë pas Orë"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Parashikimi Fundjavë"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Parashikimi"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Mundësi për Reshje"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Duke tërhequr parashikimin..."
diff --git a/addons/skin.confluence/language/Serbian (Cyrillic)/strings.po b/addons/skin.confluence/language/resource.language.sr_rs/strings.po
index 7bcf840e41..fadc5b012e 100644
--- a/addons/skin.confluence/language/Serbian (Cyrillic)/strings.po
+++ b/addons/skin.confluence/language/resource.language.sr_rs/strings.po
@@ -4,33 +4,29 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Serbian (Cyrillic) (http://www.transifex.com/projects/p/xbmc-main/language/sr_RS/)\n"
+"Language-Team: Serbian (Serbia) (http://www.transifex.com/projects/p/kodi-main/language/sr_RS/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr_RS\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Промените ваше"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Опције напајања"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Обрада..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Сакриј инфо."
+msgctxt "#31006"
+msgid "View options"
+msgstr "Прикажи опције"
+
+msgctxt "#31008"
+msgid "Full screen"
+msgstr "Цео екран"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -48,37 +44,21 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Ставки"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Остале опције"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Локација"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Поређано"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Зан. слика"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Сличице"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Поређано"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Информације"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Тренутно се репродукује"
+msgctxt "#31039"
+msgid "Actions"
+msgstr "Наредбе"
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -94,12 +74,24 @@ msgstr "ПРЕМОТАВАЊЕ УНАПРЕД"
 
 msgctxt "#31045"
 msgid "REWIND"
+msgstr "ПРЕМОТАВАЊЕ УНАЗАД"
+
+msgctxt "#31046"
+msgid "SEEKING"
 msgstr "ПРЕМОТАВАЊЕ"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Време завршетка"
 
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Сортирај Растуће"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Сортирај Опадајуће"
+
 msgctxt "#31055"
 msgid "Open playlist"
 msgstr "Отвори реп. списак"
@@ -124,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Ова датотека је сложена, изаберите део који желите да репродукујете."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Тренутно изабрано"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Опције почетног екрана"
@@ -136,17 +124,17 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Позадина"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Прикажи „Паузирано“ приликом репродукције слика"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Разне опције"
 
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Сакриј тастере главног менија"
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "Омогући прилагођену позадину"
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr "Путања позадине:"
 
 msgctxt "#31111"
 msgid "Hide"
@@ -156,13 +144,13 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Опције"
 
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Прикажи недавно додате филмове"
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "Пусти насловну музичку тему из видео библиотеке (додатак TvTunes)"
 
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Прикажи тренутни филм у позадини"
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "ТвМелодије"
 
 msgctxt "#31128"
 msgid "Lyrics"
@@ -176,82 +164,30 @@ msgctxt "#31141"
 msgid "Video OSD"
 msgstr "Видео OSD"
 
+msgctxt "#31142"
+msgid "Settings level"
+msgstr "Ниво поставки"
+
 msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Пречице"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Изаберите вашу песму"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Извор текстова песама"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Тренутна температура"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Последње ажурирање"
-
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Сакриј слику"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Подаци о филму"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Искоришћеност меморије:"
+msgctxt "#31206"
+msgid "Found"
+msgstr "Пронађено"
 
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Број нумере"
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "Провајдер"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Занимљива слика[CR]није додељена.[CR][CR]Кликните на дугме да[CR]бисте је доделили."
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Тренутни добављач"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Изаберите добављача"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Опције анализирања садржаја"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Пост. пут. до слика"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Изабран профил"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Последња пријава"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Бирач караоке песме"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Емитовано"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Опције списка за репродукцију"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Направљено"
@@ -261,17 +197,13 @@ msgid "Resolution"
 msgstr "Резолуција"
 
 msgctxt "#31328"
-msgid "Recently Added"
+msgid "Recently added"
 msgstr "Недавно додато"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Одбројавање је постављено![/B] [COLOR=grey2] - Систем ће се искључити за[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Кликните на тастер за репродукцију[CR][CR]најаве филма"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Пауза"
@@ -280,10 +212,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Заустави"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Премотај унапред"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Премотај уназад"
@@ -292,9 +220,13 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Филмски мени"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Преузми титлове"
+msgctxt "#31360"
+msgid "Watch as 2D"
+msgstr "Гледај као 2D"
+
+msgctxt "#31361"
+msgid "Change mode"
+msgstr "Промени режим"
 
 msgctxt "#31362"
 msgid "Enabled"
@@ -304,6 +236,10 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Подразумевана маска"
 
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Засновано на Arial-у"
+
 msgctxt "#31400"
 msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
 msgstr "[B]КОНФИГУРИСАЊЕ ПОСТАВКИ ПРИКАЗА[/B][CR][CR]Промените маску · Изаберите језик и област где живите[CR]Промените опције излиставања датотека · Изаберите чувара екрана"
@@ -316,30 +252,94 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]КОНФИГУРИСАЊЕ ПОСТАВКИ МУЗИКЕ[/B][CR][CR]Управљајте вашом библиотеком музичких нумера · Поставите опције репрод. музике[CR]Промените опције излиставања музике · Поставите слање песама[CR]Поставите караоке опције"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]КОНФИГУРИСАЊЕ ПОСТАВКИ СЛИКА[/B][CR][CR]Поставите опције излиставања слика · Конфигуришите репродукцију слајдова"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]КОНФИГУРИСАЊЕ ПОСТАВКИ ВРЕМЕНСКЕ ПРОГНОЗЕ[/B][CR][CR]Поставите три града за прикупљање информација о временским приликама"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]КОНФИГУРИСАЊЕ ПОСТАВКИ СИСТЕМА[/B][CR][CR]Подесите и калибришите екране · Конфигуришите звучни излаз[CR]Подесите даљинско управљање · Поставите опције штедње енергије[CR]Омогућите евиденцију грешака · Подесите главну лозинку"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]КОНФИГУРИСАЊЕ ДОДАТНИХ ПРОГРАМА[/B][CR][CR]Управљајте вашим инсталираним додатним програмима · Потражите и инсталирајте додатне прог. са kodi.tv[CR]Прилагодите подешавање додатног програма"
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
+msgstr "[B]КОНФИГУРИСАЊЕ ТВ ПОСТАВКИ[/B][CR][CR]Промените информације целог екрана · Управљајте поставкама података електронског програмског водича (EPG)"
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr "[B]ПОДЕШАВАЊЕ СЕРВИСА[/B][CR][CR]Подешавање контроле Kodi-ја преко UPnP и HTTP · Подешавање дељења фајлова[CR]Укључи Zeroconf · Подешавање AirPlay"
 
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Локални превод доступан"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Изаберите ваш Kodi кориснички[CR]профил за пријаву, а потом наставите даље"
+msgctxt "#31420"
+msgid "Login"
+msgstr "Пријава"
+
+msgctxt "#31422"
+msgid "Show or hide the login screen at startup."
+msgstr "Прикажи или сакриј екран за пријаву при покретању."
+
+msgctxt "#31423"
+msgid "Select the profile that will be used at startup when the login screen is disabled."
+msgstr "Изаберите профил који ће се користити приликом покретања када је екран за пријаву онемогућен."
+
+msgctxt "#31502"
+msgid "TV"
+msgstr "ТВ"
+
+msgctxt "#31506"
+msgid "Available[CR]Groups"
+msgstr "Доступне[CR]групе"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Прогноза"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "Прибављам информације о прогнози..."
 
 msgctxt "#31910"
 msgid "Maps"
 msgstr "Карта"
+
+msgctxt "#31950"
+msgid "WEATHER"
+msgstr "ВРЕМЕ"
+
+msgctxt "#31951"
+msgid "PICTURES"
+msgstr "СЛИКЕ"
+
+msgctxt "#31952"
+msgid "TV"
+msgstr "ТВ"
+
+msgctxt "#31953"
+msgid "VIDEOS"
+msgstr "ВИДЕО"
+
+msgctxt "#31954"
+msgid "MOVIES"
+msgstr "ФИЛМОВИ"
+
+msgctxt "#31955"
+msgid "TV SHOWS"
+msgstr "ТВ СЕРИЈЕ"
+
+msgctxt "#31956"
+msgid "MUSIC"
+msgstr "МУЗИКА"
+
+msgctxt "#31957"
+msgid "PROGRAMS"
+msgstr "ПРОГРАМИ"
+
+msgctxt "#31958"
+msgid "PLAY DISC"
+msgstr "ОПТИЧКИ ДИСК"
+
+msgctxt "#31959"
+msgid "SYSTEM"
+msgstr "СИСТЕМ"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "РАДИО"
diff --git a/addons/skin.confluence/language/Serbian/strings.po b/addons/skin.confluence/language/resource.language.sr_rs@latin/strings.po
index d4b372faa3..07ff7f3871 100644
--- a/addons/skin.confluence/language/Serbian/strings.po
+++ b/addons/skin.confluence/language/resource.language.sr_rs@latin/strings.po
@@ -4,33 +4,25 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Serbian (http://www.transifex.com/projects/p/xbmc-main/language/sr/)\n"
+"Language-Team: Serbian (Latin) (Serbia) (http://www.transifex.com/projects/p/kodi-main/language/sr_RS@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
+"Language: sr_RS@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Promenite vaše"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Opcije napajanja"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Obrada..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Sakrij info."
+msgctxt "#31006"
+msgid "View options"
+msgstr "Prikaži opcije"
 
 msgctxt "#31008"
 msgid "Full screen"
@@ -52,38 +44,18 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Stavki"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Ostale opcije"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Lokacija"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poređano"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Zan. slika"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Sličice"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Poređano"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Informacije"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Trenutno se reprodukuje"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "REPRODUKOVANjE"
@@ -98,11 +70,15 @@ msgstr "PREMOTAVANjE UNAPRED"
 
 msgctxt "#31045"
 msgid "REWIND"
-msgstr "PREMOTAVANjE"
+msgstr "PREMOTAVANjE UNAZAD"
 
-msgctxt "#31049"
-msgid "End Time"
-msgstr "Vreme završetka"
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Složi: Uzlazno"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Složi: Silazno"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -128,10 +104,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Ova datoteka je složena, izaberite deo koji želite da reprodukujete."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Trenutno izabrano"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Opcije početnog ekrana"
@@ -140,17 +112,17 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Pozadina"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Prikaži „Pauzirano“ prilikom reprodukcije slika"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Razne opcije"
 
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Sakrij tastere glavnog menija"
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "Omogući prilagođenu pozadinu"
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr "Putanja pozadine:"
 
 msgctxt "#31111"
 msgid "Hide"
@@ -160,13 +132,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opcije"
 
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Prikaži nedavno dodate filmove"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Prikaži trenutni film u pozadini"
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvMelodije"
 
 msgctxt "#31128"
 msgid "Lyrics"
@@ -180,82 +148,26 @@ msgctxt "#31141"
 msgid "Video OSD"
 msgstr "Video OSD"
 
+msgctxt "#31142"
+msgid "Settings level"
+msgstr "Nivo postavki"
+
 msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Prečice"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Izaberite vašu pesmu"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Izvor tekstova pesama"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Trenutna temperatura"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Poslednje ažuriranje"
-
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Sakrij sliku"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Podaci o filmu"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Iskorišćenost memorije:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Broj numere"
+msgctxt "#31206"
+msgid "Found"
+msgstr "Pronađeno"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Zanimljiva slika[CR]nije dodeljena.[CR][CR]Kliknite na dugme da[CR]biste je dodelili."
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Trenutni dobavljač"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Izaberite dobavljača"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Opcije analiziranja sadržaja"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Post. put. do slika"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Izabran profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Poslednja prijava"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Birač karaoke pesme"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Emitovano"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Opcije spiska za reprodukciju"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Napravljeno"
@@ -264,18 +176,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Rezolucija"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Nedavno dodato"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Odbrojavanje je postavljeno![/B] [COLOR=grey2] - Sistem će se isključiti za[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Kliknite na taster za reprodukciju[CR][CR]najave filma"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Pauza"
@@ -284,10 +188,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Zaustavi"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Premotaj unapred"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Premotaj unazad"
@@ -296,9 +196,9 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Filmski meni"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Preuzmi titlove"
+msgctxt "#31360"
+msgid "Watch as 2D"
+msgstr "Gledaj kao 2D"
 
 msgctxt "#31362"
 msgid "Enabled"
@@ -308,6 +208,10 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Podrazumevana maska"
 
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Zasnovano na Arialu"
+
 msgctxt "#31400"
 msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
 msgstr "[B]KONFIGURISANjE POSTAVKI PRIKAZA[/B][CR][CR]Promenite masku · Izaberite jezik i oblast gde živite[CR]Promenite opcije izlistavanja datoteka · Izaberite čuvara ekrana"
@@ -320,46 +224,90 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGURISANjE POSTAVKI MUZIKE[/B][CR][CR]Upravljajte vašom bibliotekom muzičkih numera · Postavite opcije reprod. muzike[CR]Promenite opcije izlistavanja muzike · Postavite slanje pesama[CR]Postavite karaoke opcije"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGURISANjE POSTAVKI SLIKA[/B][CR][CR]Postavite opcije izlistavanja slika · Konfigurišite reprodukciju slajdova"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGURISANjE POSTAVKI VREMENSKE PROGNOZE[/B][CR][CR]Postavite tri grada za prikupljanje informacija o vremenskim prilikama"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGURISANjE POSTAVKI SISTEMA[/B][CR][CR]Podesite i kalibrišite ekrane · Konfigurišite zvučni izlaz[CR]Podesite daljinsko upravljanje · Postavite opcije štednje energije[CR]Omogućite evidenciju grešaka · Podesite glavnu lozinku"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGURISANjE DODATNIH PROGRAMA[/B][CR][CR]Upravljajte vašim instaliranim dodatnim programima · Potražite i instalirajte dodatne prog. sa kodi.tv[CR]Prilagodite podešavanje dodatnog programa"
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
+msgstr "[B]KONFIGURISANJE TV POSTAVKI[/B][CR][CR]Promenite informacije cielog ekrana · Upravljajte postavkama podataka elektronskog programskog vodiča (EPG) "
 
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Lokalni prevod dostupan"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Izaberite vaš Kodi korisnički[CR]profil za prijavu, a potom nastavite dalje"
+msgctxt "#31420"
+msgid "Login"
+msgstr "Prijava"
 
-msgctxt "#31502"
-msgid "Live TV"
-msgstr "Телевизија уживо"
+msgctxt "#31422"
+msgid "Show or hide the login screen at startup."
+msgstr "Prikaži ili sakrij ekran za prijavu pri pokretanju"
 
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Преименуј групу"
+msgctxt "#31423"
+msgid "Select the profile that will be used at startup when the login screen is disabled."
+msgstr "Izaberite profil koji će se koristiti prilikom pokretanja kada je ekran za prijavu onemogućen"
 
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Обриши групу"
+msgctxt "#31502"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
-msgstr "Доступне[CR]групе"
+msgstr "Dostupne[CR]grupe"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Prognoza"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "Dobavljanje informacija o prognozi..."
 
 msgctxt "#31910"
 msgid "Maps"
 msgstr "Karta"
+
+msgctxt "#31950"
+msgid "WEATHER"
+msgstr "VREME"
+
+msgctxt "#31951"
+msgid "PICTURES"
+msgstr "SLIKE"
+
+msgctxt "#31952"
+msgid "TV"
+msgstr "TV"
+
+msgctxt "#31953"
+msgid "VIDEOS"
+msgstr "VIDEO"
+
+msgctxt "#31954"
+msgid "MOVIES"
+msgstr "FILMOVI"
+
+msgctxt "#31955"
+msgid "TV SHOWS"
+msgstr "TV SERIJE"
+
+msgctxt "#31956"
+msgid "MUSIC"
+msgstr "MUZIKA"
+
+msgctxt "#31957"
+msgid "PROGRAMS"
+msgstr "PROGRAMI"
+
+msgctxt "#31958"
+msgid "PLAY DISC"
+msgstr "OPTIČKI DISK"
+
+msgctxt "#31959"
+msgid "SYSTEM"
+msgstr "SISTEM"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "RADIO"
diff --git a/addons/skin.confluence/language/Swedish/strings.po b/addons/skin.confluence/language/resource.language.sv_se/strings.po
index 034c8efd6a..415da3ac9e 100644
--- a/addons/skin.confluence/language/Swedish/strings.po
+++ b/addons/skin.confluence/language/resource.language.sv_se/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/xbmc-main/language/sv/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/kodi-main/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
+"Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Ändra din"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Energialternativ"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Arbetar..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Dölj information"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Vy alternativ"
+msgid "View options"
+msgstr "Vyalternativ"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Fullskärm"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Total längd"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musik - Filer"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Objekt"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Övr. alternativ"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Plats"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Omslagssvep"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Bildminiatyrer"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Bildsvep"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Info"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Åtgärder"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Nu spelas"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "SPELAR"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "SÖKER"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Visualiseringsval"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Sluttid"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Denna fil är sammanslagen, välj den del du vill spela."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Nuvarande vald"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Hemskärmsalternativ"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Bakgrund"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Visa \"Pausad\" i bildspel"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Spela trailers i ett fönster [COLOR=grey3](Endast Video Informations Dialog)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Övriga alternativ"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Dölj flaggläsning från videofilnamn [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Dölj huvudmenyknappar"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Aktivera egna bakgrunder"
+msgid "Enable custom background"
+msgstr "Aktivera anpassad bakgrund"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Alternativ"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Visa nyligen tillagda album"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Visa nyligen tillagda filmer"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Hemskärmens programundermeny"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Dölj bakgrundsfanart"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Visa bakgrund \"Nu spelas\" filmer"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Visa \"Spelas nu\" backgrundsvisualisering"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Spela TV-temasånger i videobiblioteket (TVTunes-tillägg)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Sångtexter"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Dölj fanart i fullskärmsvisualisering"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Sångtextstillägg"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Hemskärmens videoundermeny"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Hemskärmens musikundermeny"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Hemskärmens bildundermeny"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Musik-OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Välj din låt"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Sångtextkälla"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Hittade"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Hitta fler objekt"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Kommande avsnitt"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Nuvarande temp"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Senast uppdaterad"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Dataleverantör"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Dölj fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Filmdetaljer"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Använt minne:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Spårnummer"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart-bild[CR][CR]Inte Tillgänglig[CR][CR]Klicka på knappen för att ange"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Nuvarande skrapa"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Välj en skrapa"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Innehållsskrapealternativ"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Ange fanartsökväg"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Vald profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Senast inloggad"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke-låtväljare"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Sänt"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Spellistalternativ"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Skapad"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Upplösning"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Nyligen tillagda"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Timer satt![/B] [COLOR=grey2] - Automatisk avstängning av systemet om[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Klicka på knappen för att[CR][CR]spela filmtrailer"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Albumdetaljer"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Paus"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Stopp"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Spola framåt"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Spola bakåt"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Filmmeny"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Ladda ner undertexter"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Se i 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Skalets standard"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skalets standard utan VERSALER"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arialbaserad"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]KONFIGURERA MUSIKINSTÄLLNINGAR[/B][CR][CR]Hantera ditt musikbibliotek · Ange musikuppspelningsalternativ[CR]Ändra musiklistningsalternativ · Ange låtinskickning · Ange karaoke-alternativ"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]KONFIGURERA BILDINSTÄLLNINGAR[/B][CR][CR]Ange bildlistningsalternativ · Justera bildspel"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]KONFIGURERA VÄDERINSTÄLLNINGAR[/B][CR][CR]Ange tre städer för insamling av väderinformation"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]KONFIGURERA SYSTEMINSTÄLLNINGAR[/B][CR][CR]Ange och kalibrera bildskärmar · Konfigurera ljudutgång · Ställa in fjärrkontroller[CR]Ange energisparalternativ · Aktivera debuggningen · Konfigurera huvudkod och lås"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]KONFIGURERA TILLÄGG[/B][CR][CR]Hantera installerade tillägg · Visa och installera tillägg från kodi.tv[CR]Ändra inställningar för tillägg"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]KONFIGURERA TV-INSTÄLLNINGAR[/B][CR][CR]Ändra fullskärmslägesinformation · Hantera EPG-datainställningar"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]KONFIGURERA TJÄNSTINSTÄLLNINGAR[/B][CR][CR]Ställ in kontroll av Kodi via UPnP och HTTP · Konfigurera fildelning[CR]Aktivera Zeroconf · Konfigurera AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Förstagångshjälp..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Denna flik visar att det finns en meny till sidan om detta fönster som innehåller extra inställningar för denna sektion. För att nå menyn, navigera med din fjärrkontroll, tangentbord eller placera din mus ovanför fliken. [CR][CR]Klicka på \"OK\" för att stänga denna dialogruta. Den kommer inte att visas igen."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Lokal undertext tillgänglig"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Logga in"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Välj din Kodi-användarprofil[CR]för att logga in och fortsätta"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Visa eller dölj inloggningsskärmen vid start."
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Välj den profil som skall användas vid start då inloggningsskärmen inte visas."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Schemalagd tid"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Live-TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Lägg till grupp"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Döp om grupp"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Radera grupp"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Tillgängliga[CR]grupper"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanalgrupp"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Timer satt"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanalalternativ"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36-timmarsprognos"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Timprognos"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Helgprognos"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Daglig prognos"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Prognos"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Chans till nederbörd"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Hämtar prognosinfo..."
diff --git a/addons/skin.confluence/language/resource.language.ta_in/strings.po b/addons/skin.confluence/language/resource.language.ta_in/strings.po
new file mode 100644
index 0000000000..dcd785c502
--- /dev/null
+++ b/addons/skin.confluence/language/resource.language.ta_in/strings.po
@@ -0,0 +1,257 @@
+# Kodi Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon Provider: Jezz_X, Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/kodi-main/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "சற்று காத்திருக்கவும்..."
+
+msgctxt "#31006"
+msgid "View options"
+msgstr "விருப்பங்கள் காண்க"
+
+msgctxt "#31008"
+msgid "Full screen"
+msgstr "முழுத்திரை"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "பக்கம்"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "உருப்படிகள்"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "இருப்பிடம்"
+
+msgctxt "#31029"
+msgid "Fanart"
+msgstr "விசிறிபடம்"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "தகவல்"
+
+msgctxt "#31039"
+msgid "Actions"
+msgstr "நடவடிக்கைகள்"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "வாசிக்கபடுகிறது"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "இடைநிறுத்தம்"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "முன்சுற்று"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "பின்சுற்று"
+
+msgctxt "#31046"
+msgid "SEEKING"
+msgstr "தேடுகிறது"
+
+msgctxt "#31049"
+msgid "End time"
+msgstr "முடியும் நேரம்"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "வரிசைபடுத்து : ஏறுவரிசை"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "வரிசைபடுத்து : இறங்குவரிசை"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "பட்டியலை திற"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "பட்டியலை சேமி"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "பட்டியலை முடு"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "தற்போதைய பட்டியல்"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "கோப்பு அடுக்கப்பட்டுள்ளது - வாசிக்கப்பட வேண்டியதை தேர்வு செய்க"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "பின்னணி"
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr "இதர விருப்பங்கள்"
+
+msgctxt "#31109"
+msgid "Enable custom background"
+msgstr "தனிபயன் பின்புல இயக்கு"
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr "பின்புல பாதை:"
+
+msgctxt "#31112"
+msgid "Options"
+msgstr "விருப்பங்கள்"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "தொலைராகங்கள்"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "பாடல்வரிகள்"
+
+msgctxt "#31142"
+msgid "Settings level"
+msgstr "அமைப்புக்கள் நிலை"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "குறுக்குவழிகள்"
+
+msgctxt "#31206"
+msgid "Found"
+msgstr "கண்டுபிடிக்கப்பட்டுள்ளது"
+
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "தரவு வழங்குநர்"
+
+msgctxt "#31322"
+msgid "Aired"
+msgstr "வாசிக்கப்பட்டுள்ளது"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "திரைத்திறன்"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "இடைநிறுத்து"
+
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "செயல்படுத்தபட்டுள்ளது"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "இயல்புநிலை அலங்கார அமைப்பு"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "ஏரியல் தொடர்பான"
+
+msgctxt "#31400"
+msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
+msgstr "[B]தோற்றம் அமைப்புகள் கட்டமைப்பு[/B][CR][CR]அலங்காரம் மாற்று · மொழி மற்றும் பிராந்தியம் அமைக்க · கோப்பு பட்டியல் விருப்பங்களை மாற்று[CR]திரை காப்பான் அமைக்க"
+
+msgctxt "#31401"
+msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
+msgstr "[B]நிகழ்படம் அமைப்புகள் கட்டமைப்பு[/B][CR][CR]உங்கள் வீடியோ நூலக மேலாண்மை · வீடியோ பின்னணி விருப்பங்களை அமைக்க · வீடியோ பட்டியல் விருப்பங்களை மாற்ற[CR]வசன எழுத்துருக்களை அமைக்க"
+
+msgctxt "#31402"
+msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
+msgstr "[B]இசை அமைப்புகள் கட்டமைப்பு[/B][CR][CR]உங்கள் இசை நூலகம் நிர்வகிக்க · இசை பின்னணி விருப்பங்களை அமைக்க · இசை பட்டியல் விருப்பங்களை மாற்ற[CR]சமர்ப்பிப்பு பாடல் அமைப்பு · கரோக்கே விருப்பங்கள் அமைக்க"
+
+msgctxt "#31406"
+msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
+msgstr "[B]கணினி அமைப்புகள் கட்டமைப்பு[/B][CR][CR]காட்சிகளை அமைப்பது மற்றும் அளவீடு · ஆடியோ வெளியீடு கட்டமைக்க · ரிமோட் கண்ட்ரோல்கள் அமைப்பதற்கு[CR]மின் ஆற்றல் சேமிப்பு விருப்பங்கள் அமைக்க · பிழைத்திருத்தம் செயல்படுத்த · மாஸ்டர் பூட்டு அமைப்பு"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
+msgstr "[B]தொலைக்காட்சி அமைப்புகள் கட்டமைப்பு[/B][CR][CR]முழுத்திரை தகவல் மாற்று · EPG தரவு அமைப்புகள் மேலாண்மை"
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr "[B]சேவை அமைப்புகள் கட்டமைப்பு[/B][CR][CR]UPnP மற்றும் HTTP வழியாக Kodiஅமைப்பு கட்டுப்பாடு  · கோப்பு பகிர்வு கட்டமைப்பு[CR]Zeroconf செயல்படுத்த · AirPlay கட்டமைப்பு"
+
+msgctxt "#31413"
+msgid "Local subtitle available"
+msgstr "உள்ளூர் வசன வரிகள் இருக்கிறது"
+
+msgctxt "#31420"
+msgid "Login"
+msgstr "புகுபதிகை"
+
+msgctxt "#31502"
+msgid "TV"
+msgstr "தொலைக்காட்சி"
+
+msgctxt "#31506"
+msgid "Available[CR]Groups"
+msgstr "இருக்கின்ற[CR]குழுக்கள்"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "முன் அறிவிப்பு தகவல்களை சேகரித்தல்..."
+
+msgctxt "#31910"
+msgid "Maps"
+msgstr "வரைபடங்கள்"
+
+msgctxt "#31950"
+msgid "WEATHER"
+msgstr "வானிலை"
+
+msgctxt "#31951"
+msgid "PICTURES"
+msgstr "படங்கள்"
+
+msgctxt "#31952"
+msgid "TV"
+msgstr "தொலைக்காட்சி"
+
+msgctxt "#31953"
+msgid "VIDEOS"
+msgstr "வீடியோக்கள்"
+
+msgctxt "#31954"
+msgid "MOVIES"
+msgstr "திரைப்படங்கள்"
+
+msgctxt "#31955"
+msgid "TV SHOWS"
+msgstr "தொலைக்காட்சி நிகழ்சிகள்"
+
+msgctxt "#31956"
+msgid "MUSIC"
+msgstr "இசை"
+
+msgctxt "#31958"
+msgid "PLAY DISC"
+msgstr "தட்டை வாசி"
+
+msgctxt "#31959"
+msgid "SYSTEM"
+msgstr "கணினி"
diff --git a/addons/skin.confluence/language/Telugu/strings.po b/addons/skin.confluence/language/resource.language.te_in/strings.po
index 267b7695a5..ab88464960 100644
--- a/addons/skin.confluence/language/Telugu/strings.po
+++ b/addons/skin.confluence/language/resource.language.te_in/strings.po
@@ -4,18 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Telugu (http://www.transifex.com/projects/p/xbmc-main/language/te/)\n"
+"Language-Team: Telugu (India) (http://www.transifex.com/projects/p/kodi-main/language/te_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
+"Language: te_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "నిండుతెర"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "షార్ట్కట్లు"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "రిజల్యూషన్"
+
+msgctxt "#31362"
+msgid "Enabled"
+msgstr "ఎనేబుల్ చెయ్యబడింది"
diff --git a/addons/skin.confluence/language/Tajik/strings.po b/addons/skin.confluence/language/resource.language.tg_tj/strings.po
index e090b1cc3f..7ebcdff319 100644
--- a/addons/skin.confluence/language/Tajik/strings.po
+++ b/addons/skin.confluence/language/resource.language.tg_tj/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Tajik (http://www.transifex.com/projects/p/xbmc-main/language/tg/)\n"
+"Language-Team: Tajik (Tajikistan) (http://www.transifex.com/projects/p/kodi-main/language/tg_TJ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tg\n"
+"Language: tg_TJ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Тағйир додани"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Имконоти барқ"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Дар ҳоли иҷро..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Пинҳон кардани иттилоот"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Имконоти намоиш"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Экрани пурра"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Давомнокии умумӣ"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Файлҳои мусиқӣ"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Объект"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Имконоти гуногун"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Ҷойгиршавӣ"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Чархуфалаки постерҳо"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Маҳорати хӯшӣ"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Эскизҳои суратҳо"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Чархуфалаки суратҳо"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Маълумот"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Амалҳо"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Ҳозир пахш мекунад"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "ДАР ҲОЛИ ПАХШ"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "ҶУСТУҶӮ"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Танзимҳои таҷассум"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Вақти анҷом"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Ин файли таркибӣ мебошад, қисмеро, ки мехоҳед пахш кунед, интихоб намоед."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Интихобшудаи ҷорӣ"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Имконоти экрани асосӣ"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Пасзамина"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Намоиш додани \"Таваққуф\" дар ҳолати намоиши слайдҳо"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Пахш кардани трейлерҳо дар равзана [COLOR=grey3](танҳо барои равзанаи гуфтугӯи иттилоотӣ)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Имконоти гуногун"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Пинҳон кардани байрақчаҳои қабулшуда аз номи файли видеоӣ [COLOR=grey3](BluRray, HDTV)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Пинҳон кардани тугмаҳои менюи асосӣ"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Фаъол кардани пасзаминаи интихобӣ"
+msgid "Enable custom background"
+msgstr "Истифодаи пасзаминаи шахсӣ"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Имконот"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Намоиши албомҳои иловашудаи охирин"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Намоиши видеоҳои иловашудаи охирин"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Зермению барномаҳои экрани асосӣ"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Пинҳон кардани маҳорати хӯшии пасзаминаӣ"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Намоиш додани видеои пахшшаванда дар пасзамина"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Намоиш додани таҷассуми пахшшаванда дар пасзамина"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Пахш кардани суруди мавзӯи телевизионӣ дар китобхонаи видеоӣ (Барномаи иловагии TvTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Лирика"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Пинҳон кардани маҳорати хӯши дар таҷассуми экрани пурра"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Барномаи иловагии лирика"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Зермениюи видеои экрани асосӣ"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Зермениюи мусиқии экрани асосӣ"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Зермениюи суратҳои экрани асосӣ"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Мусиқии OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Миёнбурҳо"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Интихоби суруди худ"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Манбаи лирика"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Ёфтшуда"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Ёфтани чизҳои дигар"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Лаҳзаҳои навбатӣ"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Ҳарорати ҷорӣ"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Навсозии охирин"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Провайдери иттилоотӣ"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Пинҳон кардани маҳорати хӯшӣ"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Тафсилоти филм"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Ҳофизаи истифодашуда:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Рақами роҳча"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Маҳорати хӯшӣ[CR][CR]Дастнорас аст[CR][CR] Барои интихоб тугмаро зер кунед"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Аксгирандаи ҷорӣ"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Интихоби аксгиранда"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Имконоти сканкунии мӯҳтаво"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Интихоби масири маҳорати хӯшӣ"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Профили интихобшуда"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Воридшавии охирин"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Интихобкунандаи суруди караоке"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Премера"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Имконоти рӯйхати пахш"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Санаи эҷод"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Возеҳӣ"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Иловашудаи охирин"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Вақтсанҷ танзим шудааст![/B] [COLOR=grey2] Хомушкунии худкори система баъд аз[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Барои пахш кардани филм[CR][CR]тугмаро зер кунед"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Тафсилоти албом"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Таваққуф"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Истодан"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Басуръат ба пеш гардонидани роҳча"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Ба ақиб бурдан"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Менюи филм"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Боргирӣ кардани субтитрҳо"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Тамошо кардан дар 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Пӯсти пешфарз"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Пӯсти пешфарз бе ҳарфҳои калон"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Дар асоси шрифти Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]ТАНЗИМОТИ ПАРАМЕТРҲОИ МУСИҚӢ[/B][CR][CR]Идоракунии китобхонаи мусиқӣ · Имконоти пахши мусиқӣ · Тағйир додани имконоти рӯйхати мусиқӣ[CR]Танзими иловакунии мусиқӣ · Танзими имконоти караоке"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]ТАНЗИМОТИ ПАРАМЕТРҲОИ СУРАТҲО[/B][CR][CR]Тағйир додани имконоти рӯйхати суратҳо · Танзимоти намоиши слайдҳо"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]ТАНЗИМОТИ ПАРАМЕТРҲОИ ОБУ ҲАВО[/B][CR][CR]Интихоби се шаҳр барои гирифтани иттилооти пешгӯии обу ҳаво"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]ТАНЗИМОТИ ПАРАМЕТРҲОИ СИСТЕМА[/B][CR][CR]Танзимот ва санҷиши дисплейҳо · Танзимоти барориши аудио · Танзимоти идоракунии дурдаст[CR]Танзимоти масрафи барқ ·  Танзимоти ислоҳи хатоҳо · Танзимоти қулфкунӣ"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]ТАНЗИМОТИ БАРНОМАҲОИ ИЛОВАГӢ[/B][CR][CR]Идоракунии барномаҳои иловагии насбшуда • Тамошо кардан ва насб кардани барномаҳои иловагӣ аз kodi.tv[CR]Тағйир додани танзимоти барномаҳои иловагӣ"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]ТАНЗИМОТИ ПАРАМЕТРҲОИ ТВ[/B][CR][CR]Танзимоти иттилооти экрани пурра · Идоракунии танзимоти иттилооти EPG"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]ТАНЗИМОТИ ПАРАМЕТРҲОИ ХИДМАТҲО[/B][CR][CR]танзимоти идоракунии Kodi тавассути UPnP ва HTTP · Танзимоти мубодилакунии файлҳо[CR]Фаъол кардани Zeroconf · Танзимоти AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Кӯмаки оғози кор...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Ин варақа маънои онро дорад, ки дар паҳлӯи равзана барои ин қисмат меню бо имконоти иловагӣ вуҷуд дорад. Барои пайдо кардани дастрасӣ ба меню, ба тарафи чап бо истифодаи пулти идоракунии дурдаст ё клавиатура гузаред, ё курсори мушро ба болои он варақа монед. [CR][CR]Барои пӯшидани ин равзанаи гуфтугӯ тугмаи ОК-ро зер кунед, то ки он дигар намоиш дода нашавад."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Зерунвонҳои маҳаллӣ дастрасанд"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Вуруд"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Барои ворид шудан ва идома додан[CR]профили корбари Kodi-ро интихоб кунед"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Намоиш додан ё пинҳон кардани экрани вуруд дар оғози кори система."
@@ -500,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Профилеро, ки дар оғози кори система, ҳангоми ғайрифаъол будани экрани вуруд, истифода мешавад."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Вақти ба нақша гирифта"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Пахши мустақим"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Илова кардани гурӯҳ"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Тоза кардани гурӯҳ"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Нест кардани гурӯҳ"
+msgid "TV"
+msgstr "ТВ"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Гурӯҳҳои[CR]дастрас"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Гурӯҳи шабакавӣ"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Насби вақтсанҷ"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Имконоти шабака"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Пешгӯии обу ҳаво барои 36 соат"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Пешгӯии обу ҳаво барои як соат"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Пешгӯии обу ҳаво барои рӯзҳои истироҳат"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Пешгӯии обу ҳаво"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Эҳтимолияти барфу борон"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Бозёбии иттилооти пешгӯӣ..."
@@ -603,3 +335,7 @@ msgstr "ПАХШИ ДИСК"
 msgctxt "#31959"
 msgid "SYSTEM"
 msgstr "СИСТЕМА"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "РАДИО"
diff --git a/addons/skin.confluence/language/Thai/strings.po b/addons/skin.confluence/language/resource.language.th_th/strings.po
index ef366fb1b5..bb80b84c7b 100644
--- a/addons/skin.confluence/language/Thai/strings.po
+++ b/addons/skin.confluence/language/resource.language.th_th/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Thai (http://www.transifex.com/projects/p/xbmc-main/language/th/)\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/kodi-main/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
+"Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "ปรับเปลี่ยน"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "ตัวเลือก ด้านพลังงาน"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "ทำงานอยู่..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "ซ่อนข้อมูล"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "ตัวเลือก มุมมอง"
+msgid "View options"
+msgstr "ตัวเลือกการดู"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "เต็มจอ"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "รวม ระยะเวลา"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "แฟ้ม-เพลง"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "รายการ"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "ตัวเลือก อื่นๆ"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "ที่ตั้ง"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "เลื่อนโปสเตอร์"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "แฟนอาร์ต"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "รูปย่อ"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "ตัดส่วนภาพ"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "ข้อมูล"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "การกระทำ"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "ขณะนี้กำลังเล่น"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "กำลังเล่น"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "ค้นหา"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "ชุดรูปแบบ การแสดงแสงสี"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "เวลาสิ้นสุด"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "แฟ้มนี้ซ้อนกันอยู่เลือกส่วนที่คุณต้องการจะเล่นจาก"
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "ที่เลือกในปัจจุบัน"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "ตัวเลือก หน้าจอหลัก"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "พื้นหลัง"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "แสดง \"หยุดชั่วขณะ\" ในการนำเสนอภาพนิ่ง"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "เล่นตัวอย่างภาพยนตร์ในหน้าต่าง [COLOR=grey3](กล่องโต้ตอบข้อมูลวิดีโอเท่านั้น)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "ตัวเลือก อื่นๆ"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "ซ่อนป้ายกำกับ ที่อ่านได้จากชื่อไฟล์วิดีโอ [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "ซ่อนปุ่มของเมนูหลัก"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "เปิดใช้พิ้นหลังที่กำหนดเอง"
+msgid "Enable custom background"
+msgstr "เปิดใช้งานปรับแต่งพื้นหลัง"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "ตัวเลือก"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "แสดงอัลบัม ที่เพิ่งเพิ่ม"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "แสดงวิดีโอ ที่เพิ่งเพิ่ม"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "หน้าหลัก โปรแกรม เมนู-ย่อย"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "ซ่อน แฟนอาร์ตในพื้นหลัง"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "แสดงพื้นหลังด้วยวิดีโอ \"ที่กำลังเล่น\""
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "แสดงพื้นหลัง แสงสีประกอบเพลง \"ที่กำลังเล่น\""
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "เล่นเพลงธีมรายการทีวีในคลังข้อมูลวิดีโอ (ส่วนเสริม TvTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "เนื้อเพลง"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "ซ่อนแฟนอาร์ต ในการแสดงแสงสีแบบเต็มจอ"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "ส่วนเสริม เนื้อเพลง"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "หน้าหลัก วิดีโอ เมนู-ย่อย"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "หน้าหลัก เพลง เมนู-ย่อย"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "หน้าหลัก รูปภาพ เมนู-ย่อย"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD เพลง"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "ปุ่มลัด"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "เลือกเพลงของคุณ"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "แหล่งของเนื้อเพลง"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "ค้นพบ"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "ค้นหารายการเพิ่มเติม"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "ตอนที่กำลังจะออก"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "อุณภูมิปัจจุบัน"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "ปรับปรุงล่าสุด"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "ผู้ให้บริการข้อมูล"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "ซ่อน แฟนอาร์ต"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "รายละเอียดของภาพยนตร์"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "หน่วยความจำที่ใช้"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "หมายเลข แทรค"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "รูปภาพแฟนอาร์ต[CR][CR]ไม่มี[CR][CR] คลิกปุ่มเพื่อตั้งค่า"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "ตัวดึงข้อมูลปัจจุบัน"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "เลือก ตัวดึงข้อมูล"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "ตัวเลือกการสืบค้นเนื้อหา"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "ตั้งค่าเส้นทางของแฟนอาร์ต"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "เลือก โปรไฟล์"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "ที่เข้าใช้ ล่าสุด"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "ตัวเลือกเพลงคาราโอเกะ"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "ออกอากาศ"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "ตัวเลือกของรายการเล่น"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "สร้างเมื่อ"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "ความละเอียดจอ"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "ที่เพิ่งเพิ่ม"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]ตั้งค่า ตัวจับเวลา![/B] [COLOR=grey2] - ระบบจะปิดอัตโนมัติ ใน[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "คลิกปุ่ม เพื่อเล่น[CR][CR]ตัวอย่างภาพยนตร์"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "รายละเอียด อัลบั้ม"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "หยุดชั่วขณะ"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "หยุด"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "ไปหน้าแบบเร็ว"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "ย้อนกลับเร็ว"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "เมนู ภาพยนตร์"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "ดาวน์โหลด คำบรรยาย"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "ชมแบบ 2 มิติ"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "หน้าตาพื้นฐาน"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "ค่าเริ่มต้นของสกิน โดยไม่มีตัวพิมพ์ใหญ่"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "ใช้ฟ้อนท์ Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]ปรับเปลี่ยนการตั้งค่าเพลง[/B][CR][CR]จัดการคลังข้อมูลเพลงของคุณ · ตั้งค่าตัวเลือกการเล่นเพลง · เปลี่ยนตัวเลือกจัดเรียงรายการเพลง[CR]ตั้งค่าการส่งเพลง · ตั้งค่าตัวเลือกคาราโอเกะ"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]กำหนดการตั้งค่ารูปภาพ[/B][CR][CR]ตั้งค่าตัวเลือกจัดเรียงรายการรูปภาพ · กำหนดค่าแสดงภาพสไลด์"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]ตั้งค่าสภาพอากาศ[/B][CR][CR]กำหนดสามเมืองในการเก็บรวบรวมข้อมูลสภาพอากาศ"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]ปรับเปลี่ยนการตั้งค่าระบบ[/B][CR][CR]การติดตั้งและปรับเทียบการแสดงผล · กำหนดค่าการส่งออกสัญญาณเสียง · การติดตั้งรีโมทคอนโทรล[CR]ตั้งค่าตัวเลือกการประหยัดพลังงาน · เปิดใช้งานการแก้จุดบกพร่อง · ติดตั้ง กุญแจหลัก"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]ปรับเปลี่ยน ส่วนเสริม[/B][CR][CR]จัดการส่วนเสริมที่ติดตั้งไว้ของคุณ · เรียกดูและติดตั้งส่วนเสริม จาก kodi.tv[CR]ปรับเปลี่ยน การตั้งค่าส่วนเสริม"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B] ตั้งค่าทีวี [/B][CR][CR]เปลี่ยนแปลงข้อมูลแบบเต็มหน้าจอ·จัดการการตั้งค่าข้อมูล EPG"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]ปรับเปลี่ยนการตั้งค่าบริการ[/B][CR][CR]การตั้งค่าของ การควบคุม Kodi ผ่าน UPnP และ HTTP · กำหนดค่าใช้ไฟล์ร่วมกัน[CR]เปิดใช้ Zeroconf · กำหนดค่า AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "ตัวช่วยในการเริ่มใช้งาน"
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "แท็บนี้มีเครื่องหมายที่แสดงว่า มีเมนูในด้านข้างของหน้าต่าง ซึ่งมีเมนูการปรับแต่งพิเศษสำหรับส่วนนี้. ในการเข้าถึงเมนูนี้, ให้เลื่อนลูกศรซ้ายด้วยรีโมทหรือคีย์บอร์ด หรือวางตัวชี้ของเมาท์เหนือแท็บนี้. [CR][CR]กด \"ตกลง\" เพื่อปิดกล่องโต้ตอบนี้. ซึ่งจะไม่แสดงขึ้นมาอีก."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "พบคำบรรยายภายใน"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "ลงชื่อเข้าใช้"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "เลือกโปรไฟล์ ผู้ใช้ Kodi ของคุณ[CR]เพื่อเข้าสู่ระบบและดำเนินการต่อไป"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "แสดงหรือซ่อน หน้าจอลงชื่อเข้าใช้เมื่อเริ่มต้น"
@@ -500,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "เลือกโปรไฟล์ที่จะใช้ในตอนเริ่มต้น เมื่อหน้าจอลงชื่อเข้าใช้ถูกปิดการใช้งาน"
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "ระยะเวลาที่กำหนด"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "ทีวี สด"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "เพิ่มกลุ่ม"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "เปลี่ยนชื่อกลุ่ม"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "ลบกลุ่ม"
+msgid "TV"
+msgstr "ทีวี"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "กลุ่มทีมีอยู่"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "กลุ่มช่องสัญญาณ"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "ตัวตั้งเวลา"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "ตัวเลือกของช่องสัญญาณ"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "พยากรณ์ ใน 36 ชั่วโมง"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "พยากรณ์รายชั่วโมง"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "พยากรณ์สุดสัปดาห์"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "พยากรณ์"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "โอกาสเกิดฝน"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "กำลังเรียกข้อมูลการพยากรณ์ ..."
@@ -603,3 +335,7 @@ msgstr "เล่นแผ่น"
 msgctxt "#31959"
 msgid "SYSTEM"
 msgstr "ระบบ"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "วิทยุ"
diff --git a/addons/skin.confluence/language/Turkish/strings.po b/addons/skin.confluence/language/resource.language.tr_tr/strings.po
index e0b7eb9093..5d28752967 100644
--- a/addons/skin.confluence/language/Turkish/strings.po
+++ b/addons/skin.confluence/language/resource.language.tr_tr/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/xbmc-main/language/tr/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kodi-main/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
+"Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Değiştir"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Güç Seçenekleri"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Çalışıyor..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Bilgiyi Gizle"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Görünüm Seçenekleri"
+msgid "View options"
+msgstr "Görünüm seçenekleri"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Tam ekran"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Toplam Süre"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Müzik - Dosyalar"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Öğe"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Çeşitli Seçenekler"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Konum"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Kayan Poster"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Küçük Resimler"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Kayan Resim"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Bilgi"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Eylemler"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Şimdi Yürütülüyor"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "OYNATILIYOR"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "ARIYOR"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Görsel Öğe Önayarları"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Bitiş Zamanı"
+msgid "End time"
+msgstr "Bitiş zamanı"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Bu dosya yığınlandı, oynatmak istediğiniz bölümü seçin."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Seçilen Geçerli Parça"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Giriş ekranı seçenekleri"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Arka Plan"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Resim slayt gösterisinde \"Duraklatıldı\"yı göster"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Fragmanları pencere içinde oynat [COLOR=grey3](Sadece Video Bilgisi İletişim Kutusu İçin)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Çeşitli seçenekler"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Video dosya adlarında etiket okumayı gizle [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ana Menü Düğmelerini Gizle"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Özel Akra Planları Etkinleştir"
+msgid "Enable custom background"
+msgstr "Özel arka planları etkinleştir"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Seçenekler"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Son Eklenen Albümleri Göster"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Son Eklenen Videoları Göster"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Ana Sayfa Programlar Alt Menüsü"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Arka Plan Fanartını Gizle"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Arka Planda Oynatılan Videoyu Göster"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Arka Planda Görsel Ögeyi Göster"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "TV tema şarkılarını video kitaplığında çal (TvTunes eklentisi)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Şarkı Sözleri"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Tam ekran görsel öğede Fanart'ı gizle"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Şarkı Sözleri Eklentisi"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Ana Sayfa Videolar Alt Menüsü"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Ana Sayfa Müzik Alt Menüsü"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Ana Sayfa Resimler Alt Menüsü"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Müzik OSD"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Şarkını Seç"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Şarkı Sözleri Kaynağı"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Bulundu"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Daha Fazla Öğe Bul"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Gelecek Bölümler"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Mevcut Sıcaklık"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Son Güncelleme"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Veri sağlayıcı"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Fanart'ı gizle"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Film Detayları"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Kullanılan Bellek:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Parça Numarası"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Fanart resmi[CR][CR]Mevcut Değil[CR][CR] Ayarlamak için düğmeye basın"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Geçerli Scraper"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Scraper Seç"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "İçerik Tarama Seçenekleri"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Fanart Yolunu Ayarla"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Seçilen Profil"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Son Giriş Yapan"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Karaoke Şarkı Seçici"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Gösterim"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Çalma Listesi Seçenekleri"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Oluşturma"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Çözünürlük"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Son Eklenenler"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Zamanlayıcı ayarlandı![/B] [COLOR=grey2] - Sistem'in otomatik kapanma süresi[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Oynatmak için düğmeye basın[CR][CR]Film fragmanı"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Albüm Ayrıntıları"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Duraklat"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Durdur"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "İleri Sar"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Geri Sar"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Film menüsü"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Altyazıları İndir"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "2 Boyutlu olarak izle"
@@ -428,42 +232,26 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Dış görünüm varsayılanı"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "B. Harfsiz dış görünüm varsayılanı"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Arial tabanlı"
 
 msgctxt "#31400"
 msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
-msgstr "[B]GÖRÜNÜM AYARLARINI YAPILANDIR[/B][CR][CR]Dış görünümü değiştir · Dil ve bölgesel ayarları değiştir · Dosya listeleme seçeneklerini değiştir · Ekran koruyucuyu ayarla"
+msgstr "[B]GÖRÜNÜM AYARLARINI YAPILANDIR[/B][CR][CR]Dış görünümü değiştir · Dil ve bölgesel ayarları değiştir · Dosya listeleme seçeneklerini değiştir[CR]Ekran koruyucuyu ayarla"
 
 msgctxt "#31401"
 msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
-msgstr "[B]VİDEO AYARLARINI YAPILANDIR[/B][CR][CR]Video kitaplığını yönet · Video oynatma seçeneklerini ayarla · Video listeleme seçeneklerini değiştir · Altyazı karakterlerini ayarla"
+msgstr "[B]VİDEO AYARLARINI YAPILANDIR[/B][CR][CR]Video kitaplığını yönet · Video oynatma seçeneklerini ayarla · Video listeleme seçeneklerini değiştir[CR]Altyazı yazı tiplerini ayarla"
 
 msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]MÜZİK AYARLARINI YAPILANDIR[/B][CR][CR]Müzik kitaplığını yönet · Müzik çalma seçeneklerini ayarla · Müzik listeleme seçeneklerini değiştir · Şarkı sunumu ayarları · Karaoke seçeneklerini ayarla"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]RESİM AYARLARINI YAPILANDIR[/B][CR][CR]Resim listeleme seçeneklerini ayarla · Slayt gösterisi ayarlarını yapılandır"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]HAVA DURUMU AYARLARINI YAPILANDIR[/B][CR][CR]Hava Durumu bilgilerini almak için üç şehir seçin"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]SİSTEM AYARLARINI YAPILANDIR[/B][CR][CR]Görünüm ayarları · Ses çıkış ayarlarını yapılandır · Uzaktan kumandaları ayarla[CR]Güç tasarrufu seçeneklerini ayarla · Hata ayıklamayı etkinleştir · Sistem kilit ayarları"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]EKLENTİLERİ YAPILANDIR[/B][CR][CR]Yüklenmiş eklentileri yönet · Eklentilere gözat ve yenilerini yükle[CR]Eklenti ayarlarını değiştir"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]TV AYARLARINI YAPILANDIR[/B][CR][CR]Tam ekran bilgisini değiştir · EPG veri ayarlarını yönet"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]HİZMET AYARLARINI YAPILANDIR[/B][CR][CR]UPnP ve HTTP üzerinden Kodi kontrolü ayarları · Dosya paylaşımını yapılandır[CR]Zeroconf'u etkinleştir · AirPlay'i yapılandır"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "İlk çalıştırma yardımı...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Bu sekme bu bölüm için ekstra özellikleri içeren bir menüye, bu pencerenin kenarından ulaşılabileceğini belirtir. Menüye ulaşmak için, uzaktan kumanda, klavye ya da fare imlecini sekmenin sol tarafına götürün. [CR][CR]Pencereyi kapatmak için \"Tamam\" tuşuna basın. Bu bildiri bir daha çıkmayacaktır."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Yerel altyazı mevcut"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Oturum aç"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Oturum açıp devam etmek için[CR]Kodi kullanıcı profilinizi seçin"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Başlangıçta oturum açma ekranını göster veya gizle."
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Oturum açma ekranı devre dışı olduğunda başlangıçta kullanılacak profilinizi seçin."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Planlanan Saat"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "Canlı TV"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Grup Ekle"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Grubu Yeniden Adlandır"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Grubu Sil"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Mevcut[CR]Gruplar"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Kanal Grubu"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Zamanlayıcı Ayarlandı"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanal Seçenekleri"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36 Saatlik Hava Tahmini"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Saatlik Hava Tahmini"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Hafta Sonu Hava Tahmini"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Günlük Hava Tahmini"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Hava Tahmini"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Yağış Olasılığı"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Hava tahmini bilgisi getiriliyor..."
diff --git a/addons/skin.confluence/language/Ukrainian/strings.po b/addons/skin.confluence/language/resource.language.uk_ua/strings.po
index 7867b20943..e720732a6f 100644
--- a/addons/skin.confluence/language/Ukrainian/strings.po
+++ b/addons/skin.confluence/language/resource.language.uk_ua/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xbmc-main/language/uk/)\n"
+"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/kodi-main/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
+"Language: uk_UA\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Змініть"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Налаштування живлення"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Зачекайте…"
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Без відомостей"
-
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Налаштування перегляду"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Повний екран"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Загальна тривалість"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Музика - файли"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "у списку"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Інші параметри"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Розташування"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Карусель постерів"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Фанарт"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Мініатюри"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Карусель картинок"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Інформація"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Дії"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Зараз відтворюється:"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "ВІДТВОРЕННЯ"
@@ -116,13 +80,9 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "ПОШУК"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Налаштування візуалізації"
-
 msgctxt "#31049"
-msgid "End Time"
-msgstr "Час закінчення"
+msgid "End time"
+msgstr "Час кінця"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Складений файл; виберіть частину для відтворення."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Поточне виділення"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Налаштування головного екрану"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Тло"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Показувати \"Пауза\" в режими слайдшоу"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Відтворювати трейлери у вікні [COLOR=grey3](лише для вікна відомостей)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Різні параметри"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Приховати піктограми, отримані з імені відеофайлу [COLOR=grey3](BluRray, HDTV)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Приховати кнопки головного меню"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Дозволити власне тло"
+msgid "Enable custom background"
+msgstr "Дозволити вибір фонових зображень"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Параметри"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Показувати останні додані альбоми"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Показувати останнє додане відео"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Підменю програм головного екрану"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Приховувати фанарт на тлі"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Відтворюване відео на тлі"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Музична візуалізація на тлі"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Грати мелодію серіалу в медіатеці (надбудова TvTunes)"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Тексти"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Приховувати фанарт у повноекранній візуалізації"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Надбудова текстів пісень"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Підменю відео головного екрану"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Підменю музики головного екрану"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Домашня сторінка Фотографії підменю"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "OSD музики"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Ярлики"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Виберіть пісню"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Джерело текстів пісень"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "Знайдено"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Знайти більше об'єктів"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Наступні серії"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Поточна температура"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Останнє оновлення"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Джерело даних"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Приховати фанарт"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Відомості про фільм"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Використано пам'яті"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Номер треку"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "Фанарт[CR][CR]недоступний,[CR][CR]натисніть кнопку, щоб вибрати"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Поточний інфоресурс"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Вибрати інфоресурс"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Параметри сканування вмісту"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Вибрати розташування фанарту"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Обраний профіль"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Останній вхід"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Вибір пісень для караоке"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Прем'єра"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Параметри списку відтворення"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Створений"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Розмір"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Останні"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Встановлено таймер![/B] [COLOR=grey2] - Автоматичне відключення через[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Натисніть кнопку,[CR][CR]щоб переглянути кино-трейлер"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Відомості про альбом"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Пауза"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Стоп"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Перемотка вперед"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Перемотка назад"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Меню фільму"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Завантажити субтитри"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Переглядати як 2D"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Стандартні"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Стандартні без ВЕЛИКИХ"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Стиль Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]НАЛАШТУВАННЯ ПАРАМЕТРІВ МУЗИКИ[/B][CR][CR]Керування медиатекою аудіо • Параметри відтворення аудіо[CR]Налаштування списку аудіо • Налаштування додавання пісень[CR]Налаштування караоке"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]НАЛАШТУВАННЯ ПАРАМЕТРІВ ФОТО[/B][CR][CR]Параметри списку фото • Налаштування слайд-шоу"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]НАЛАШТУВАННЯ ПАРАМЕТРІВ ПОГОДИ[/B][CR][CR]Вибір трьох міст для отримання інформації про погоду"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]НАЛАШТУВАННЯ ПАРАМЕТРІВ СИСТЕМИ[/B][CR][CR]Налаштування та калібрування дисплеїв • Налаштування виведення аудіо[CR]Налаштування дистанційного керування • Налаштування параметрів енергозбереження[CR]Увімкнення налагодження • Налаштування блокування"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]НАЛАШТУВАННЯ НАДБУДОВ[/B][CR][CR]Керування встановленими надбудовами • Встановлення надбудов з kodi.tv[CR]Зміна налаштувань надбудов"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]НАЛАШТУВАННЯ ТБ[/B][CR][CR]Параметри повноекранної інформації · Налаштування показу телепрограми (EPG)"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]НАЛАШТУВАННЯ ПАРАМЕТРІВ СЛУЖБ[/B][CR][CR]Налаштування керування Kodi за UPnP і HTTP • Налаштування доступу до файлів[CR]Увімкнення Zeroconf • Налаштування AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Довідка при першому запуску."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Ця вкладка означає, що збоку є меню із додатковими налаштуваннями розділу.  Для доступу до меню перейдіть вліво за допомогою пульта ДУ чи клавіатури або помістіть курсор миші над вкладкою. [CR][CR] ОК — закрити цей діалог. Він більше не з'явиться."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Доступні локальні субтитри"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Вхід"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Виберіть профіль користувача Kodi,[CR]щоб увійти до системи"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Показати або приховати екран входу при запуску."
@@ -500,66 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Вибрати профіль, що буде використовуватися при запуску, коли екран входу вимкнено."
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Запланований час"
-
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "ТБ"
 
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Додати групу"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Перейменувати групу"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Видалити групу"
-
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Доступні[CR]групи"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Група каналів"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Таймер встановлено"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Параметри каналів"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Прогноз на 36 г."
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Щогодинний прогноз"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Прогноз на вихідні"
-
-msgctxt "#31904"
-msgid "Daily Forecast"
-msgstr "Щоденний прогноз"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Прогноз"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Можливі опади"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Отримання прогнозу…"
diff --git a/addons/skin.confluence/language/Uzbek/strings.po b/addons/skin.confluence/language/resource.language.uz_uz/strings.po
index 8eba16d96c..0fdab20425 100644
--- a/addons/skin.confluence/language/Uzbek/strings.po
+++ b/addons/skin.confluence/language/resource.language.uz_uz/strings.po
@@ -4,20 +4,20 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Uzbek (http://www.transifex.com/projects/p/xbmc-main/language/uz/)\n"
+"Language-Team: Uzbek (Uzbekistan) (http://www.transifex.com/projects/p/kodi-main/language/uz_UZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uz\n"
+"Language: uz_UZ\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "Ko'rish parametrlari"
 
 msgctxt "#31008"
@@ -28,6 +28,10 @@ msgctxt "#31033"
 msgid "Info"
 msgstr "Ma'lumot"
 
+msgctxt "#31049"
+msgid "End time"
+msgstr "Tugash vaqti"
+
 msgctxt "#31112"
 msgid "Options"
 msgstr "Parametrlar"
@@ -49,29 +53,13 @@ msgid "Login"
 msgstr "Kirish"
 
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "TV"
 
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Guruhni qo'shish"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Guruh nomini o'zgartirish"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Guruhni o'chirish"
-
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Mavjud[CR]guruhlar"
 
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Kanal parametrlari"
-
 msgctxt "#31952"
 msgid "TV"
 msgstr "TV"
diff --git a/addons/skin.confluence/language/Vietnamese/strings.po b/addons/skin.confluence/language/resource.language.vi_vn/strings.po
index 290f785910..5228150ac4 100644
--- a/addons/skin.confluence/language/Vietnamese/strings.po
+++ b/addons/skin.confluence/language/resource.language.vi_vn/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/xbmc-main/language/vi/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/kodi-main/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
+"Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "Thay đổi theo ý bạn"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "Tùy chọn nguồn điện"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "Đang tiến hành..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "Ẩn thông tin"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "Xem Tùy chọn"
+msgid "View options"
+msgstr "Các tuỳ chọn xem"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "Toàn màn hình"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "Độ dài thời gian"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Nhạc - Tập tin"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "Đối tượng"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "Tùy chọn tổng hợp"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "Địa điểm"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "Poster Wrap"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "Ảnh thu nhỏ"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "Image Wrap"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "Thông tin"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "Hành động"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "Đang phát"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "Đang Phát"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "Đang kiếm"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "Các hiệu ứng định sẵn"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "Thời gian kết thúc"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "Tập tin này đã bị lỗi, hãy chọn một đối tượng khác để phát."
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "Được lựa chọn hiện tại"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "Tùy chọn màn hình chính"
@@ -168,30 +124,10 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "Nền"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "Hiển thị \"Tạm Dừng\" ở trình diễn ảnh"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "Phát Trailers trong một cửa sổ [COLOR=grey3](Chỉ Hiển thị hộp thoại Thông tin của Video)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "Tùy chọn tổng quan"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ẩn cờ đánh dấu trong tên tập tin video [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "Ẩn nút menu chính"
-
-msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "Bật chế độ nền tự chọn"
-
 msgctxt "#31110"
 msgid "Background path:"
 msgstr "Đường dẫn nền:"
@@ -204,62 +140,18 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Tùy chọn"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "Hiển thị các album được thêm vào gần đây"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "Hiển thị các video được thêm vào gần đây"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "Trang chủ Ứng dụng Menu-con"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "Ẩn hình nền Fanart"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "Hiển thị hình nền \"Đang phát\" dạng video"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "Bật hiệu ứng nền \"Đang Chạy\""
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "Phát các bài hát từ TV trong hệ thống thư viện video (add-on TvTunes)"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr "TvTunes"
+msgstr "TV Turner"
 
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lời Bài Hát"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "Ẩn Fanart ở chế độ hiển thị toàn bộ màn hình"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "Lời Bài Hát của Addon"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "Trang chủ Video Menu-con"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "Trang chủ Nhạc Menu-con"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "Trang chủ Hình ảnh Menu-con"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "Bảng điều khiển Nhạc"
@@ -274,96 +166,24 @@ msgstr "Mức độ hiệu chỉnh"
 
 msgctxt "#31200"
 msgid "Shortcuts"
-msgstr "Phím nóng"
-
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "Chọn Bài Hát"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "Nguồn lyric"
+msgstr "Phím tắt"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr "Tìm Rồi"
-
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "Tìm Thêm"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "Các tập sắp chiếu"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "Nhiệt độ hiện giờ"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "Cập nhật cuối cùng"
+msgstr "Đã tìm thấy"
 
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Nhà cung cấp dữ liệu"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "Ẩn fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "Chi tiết phim"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "Bộ nhớ chiếm:"
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "Bài số"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "Ảnh fanart[CR][CR]Không có[CR][CR] Bấm nút để đặt"
-
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "Trình thu thập hiện tại"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "Chọn trình thu thập"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "Lựa chọn quét nội dung"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "Đặt đường dẫn fanart"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "Đã chọn profile"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "Lần truy cập cuối"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "Trình chọn bài hát karaoke"
+msgstr "Ảnh tự vẽ[CR][CR]Không có[CR][CR] Bấm nút để đặt"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Đã phát"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "Lựa chọn playlist"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "Đã tạo"
@@ -372,22 +192,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "Độ phân giải"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "Mới Bỏ Vào"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]Đã hẹn giờ![/B] [COLOR=grey2] - Hệ thống sẽ tự động tắt trong[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Bấm nút để xem[CR][CR]Phim giới thiệu"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "Chi tiết album"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "Tạm dừng"
@@ -396,10 +204,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "Ngừng"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "Tua nhanh"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "Quay Lại"
@@ -408,10 +212,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "Menu Phim"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "Tải phụ đề"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "Xem 2D"
@@ -428,10 +228,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "Skin mặc định"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "Skin mặc định không viết hoa"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "Theo chuẩn Arial"
@@ -448,22 +244,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]TUỲ CHỈNH CÀI ĐẶT NHẠC[/B][CR][CR]Quản lý thư viện nhạc · Đặt chế độ nghe nhạc · Thay đổi cách liệt kê nhạc[CR]Cài đặt gửi và lấy thông tin nhạc · Đặt chế độ karaoke"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]TUỲ CHỈNH CÀI ĐẶT ẢNH[/B][CR][CR]Đặt cách liệt kê ảnh · Chỉnh chương trình chiếu ảnh"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]TUỲ CHỈNH CÀI ĐẶT THỜI TIẾT[/B][CR][CR]Đặt ba thành phố để thu thập dữ liệu thời tiết"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]TUỲ CHỈNH CÀI ĐẶT HỆ THỐNG[/B][CR][CR]Cài đặt và điều chỉnh màn hình · Chỉnh đầu ra audio · Cài đặt điều khiển từ xa[CR]Đặt chế độ tiết kiệm năng lượng · Bật chế độ tìm sửa lỗi · Đặt khoá chủ"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]TUỲ CHỈNH ADD-ONS[/B][CR][CR]Quản lý những Add-on đã cài · Duyệt và cài các Add-on từ kodi.tv[CR]Thay đổi các thiết lập Add-on"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]HIỆU CHỈNH TV[/B][CR][CR]Thay đội thông tin · Quản lý các hiệu chỉnh của dữ liệu EPG"
@@ -472,14 +256,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]TUỲ CHỈNH CÀI ĐẶT DỊCH VỤ[/B][CR][CR]Cài đặt điều khiển Kodi thông qua UPnP và HTTP · Tuỳ chỉnh chia sẻ file[CR]Bật Zeroconf · Tuỳ chỉnh AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "Trợ giúp lần đầu tiên...."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "Thẻ này chỉ ra rằng có một menu ẩn ở bên cạnh cửa sổ này trong đó có những hiệu chỉnh thêm cho mục này. Để truy cập menu này, hãy di chuyển  điều khiển từ xa hay bàn phím của bạn về phía trái hoặc đưa con trỏ chuột của bạn lên trên thẻ. [CR][CR]Nhấn \"Ok\" để đóng cửa sổ này. Cửa sổ này sẽ không xuất hiện lần sau."
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "Phụ đề sẵn có trong máy"
@@ -488,10 +264,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "Đăng nhập"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Chọn profile Kodi[CR]để tiếp tục đăng nhập"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "Hiện hoặc ẩn cửa màn hình nhập khi khởi động"
@@ -500,62 +272,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "Chọn tài khoản sẽ được sử dụng trong trường hợp tắt màn hình đăng nhập"
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "Lịch phát sóng"
-
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "TV trực tuyến"
-
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "Thêm nhóm"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "Đổi tên nhóm"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "Xoá nhóm"
+msgid "TV"
+msgstr "TV"
 
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "Đang có[CR]Các nhóm"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "Nhóm kênh"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "Hẹn giờ"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "Thiết lập kênh"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "Thời Tiết - 36 Tiếng"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "Dự báo theo giờ"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "Dự báo cuối tuần"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "Dự báo"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "Khả năng mưa"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "Đang tải dữ liệu thời tiết..."
diff --git a/addons/skin.confluence/language/Chinese (Simple)/strings.po b/addons/skin.confluence/language/resource.language.zh_cn/strings.po
index c94a07f28c..a3fd587a01 100644
--- a/addons/skin.confluence/language/Chinese (Simple)/strings.po
+++ b/addons/skin.confluence/language/resource.language.zh_cn/strings.po
@@ -4,24 +4,24 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Chinese (Simple) (http://www.transifex.com/projects/p/xbmc-main/language/zh/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kodi-main/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31000"
-msgid "Change Your"
+msgid "Change your"
 msgstr "修改您的"
 
 msgctxt "#31003"
-msgid "Power Options"
+msgid "Power options"
 msgstr "电源选项"
 
 msgctxt "#31004"
@@ -29,11 +29,11 @@ msgid "Working..."
 msgstr "工作中..."
 
 msgctxt "#31005"
-msgid "Hide Information"
+msgid "Hide information"
 msgstr "隐藏信息"
 
 msgctxt "#31006"
-msgid "View Options"
+msgid "View options"
 msgstr "视图选项"
 
 msgctxt "#31008"
@@ -41,7 +41,7 @@ msgid "Full screen"
 msgstr "全屏"
 
 msgctxt "#31009"
-msgid "Total Duration"
+msgid "Total duration"
 msgstr "总时长"
 
 msgctxt "#31022"
@@ -61,7 +61,7 @@ msgid "Items"
 msgstr "项"
 
 msgctxt "#31026"
-msgid "Misc Options"
+msgid "Misc options"
 msgstr "其他选项"
 
 msgctxt "#31027"
@@ -69,7 +69,7 @@ msgid "Location"
 msgstr "所在地"
 
 msgctxt "#31028"
-msgid "Poster Wrap"
+msgid "Poster wrap"
 msgstr "海报卷动"
 
 msgctxt "#31029"
@@ -77,11 +77,11 @@ msgid "Fanart"
 msgstr "同人画"
 
 msgctxt "#31031"
-msgid "Pic Thumbs"
+msgid "Pic thumbs"
 msgstr "图片缩略图"
 
 msgctxt "#31032"
-msgid "Image Wrap"
+msgid "Image wrap"
 msgstr "图片卷动"
 
 msgctxt "#31033"
@@ -93,7 +93,7 @@ msgid "Actions"
 msgstr "操作"
 
 msgctxt "#31040"
-msgid "Now Playing"
+msgid "Now playing"
 msgstr "正在播放"
 
 msgctxt "#31042"
@@ -117,11 +117,11 @@ msgid "SEEKING"
 msgstr "搜索中"
 
 msgctxt "#31048"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr "可视化效果预设"
 
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "结束时间"
 
 msgctxt "#31050"
@@ -157,7 +157,7 @@ msgid "This file is stacked, select the part you want to play from."
 msgstr "这是一个堆叠文件，请选择要播放的片段。"
 
 msgctxt "#31061"
-msgid "Current Selected"
+msgid "Current selected"
 msgstr "当前选择"
 
 msgctxt "#31101"
@@ -168,28 +168,20 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "背景"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "图片幻灯片播放时显示“暂停”状态"
-
 msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
+msgid "Play trailers in a window [COLOR=grey3](Video information dialogue only)[/COLOR]"
 msgstr "窗口播放预告片[COLOR=grey3]（仅在视频信息显示画面）[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "其他选项"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "隐藏视频文件名的媒体标识[COLOR=grey3]（Blu-ray, HD-DVD）[/COLOR]"
-
 msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
+msgid "Hide main menu buttons"
 msgstr "隐藏主菜单按钮"
 
 msgctxt "#31109"
-msgid "Enable Custom Background"
+msgid "Enable custom background"
 msgstr "启用自定义背景"
 
 msgctxt "#31110"
@@ -205,27 +197,23 @@ msgid "Options"
 msgstr "选项"
 
 msgctxt "#31116"
-msgid "Show Recently added Albums"
+msgid "Show recently added albums"
 msgstr "显示最新加入专辑"
 
 msgctxt "#31117"
-msgid "Show Recently added Videos"
+msgid "Show recently added videos"
 msgstr "显示最新加入视频"
 
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "主界面程序子菜单"
-
 msgctxt "#31119"
-msgid "Hide Background Fanart"
+msgid "Hide background fanart"
 msgstr "隐藏同人画背景"
 
 msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
+msgid "Show background \"Now playing\" video"
 msgstr "在背景显示“正在播放”视频"
 
 msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
+msgid "Show background \"Now playing\" visualisation"
 msgstr "在背景显示“正在播放”可视化效果"
 
 msgctxt "#31126"
@@ -241,25 +229,13 @@ msgid "Lyrics"
 msgstr "歌词"
 
 msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
+msgid "Hide fanart in full screen visualisation"
 msgstr "全屏可视化效果隐藏同人画"
 
 msgctxt "#31132"
-msgid "Lyrics Add-on"
+msgid "Lyrics add-on"
 msgstr "歌词插件"
 
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "主界面视频子菜单"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "主界面音乐子菜单"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "主界面图片子菜单"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "音乐 OSD"
@@ -277,11 +253,11 @@ msgid "Shortcuts"
 msgstr "快捷方式"
 
 msgctxt "#31203"
-msgid "Choose Your Song"
+msgid "Choose your song"
 msgstr "选择歌曲"
 
 msgctxt "#31205"
-msgid "Lyrics Source"
+msgid "Lyrics source"
 msgstr "歌词来源"
 
 msgctxt "#31206"
@@ -289,19 +265,15 @@ msgid "Found"
 msgstr "找到"
 
 msgctxt "#31207"
-msgid "Find More Items"
+msgid "Find more items"
 msgstr "查找更多项目"
 
 msgctxt "#31208"
-msgid "Upcoming Episodes"
+msgid "Upcoming episodes"
 msgstr "即将播出的分集"
 
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "当前温度"
-
 msgctxt "#31301"
-msgid "Last Updated"
+msgid "Last updated"
 msgstr "最近修改"
 
 msgctxt "#31303"
@@ -309,19 +281,19 @@ msgid "Data provider"
 msgstr "数据来源"
 
 msgctxt "#31307"
-msgid "Hide Fanart"
+msgid "Hide fanart"
 msgstr "隐藏同人画"
 
 msgctxt "#31308"
-msgid "Movie Details"
+msgid "Movie details"
 msgstr "电影详细资料"
 
 msgctxt "#31309"
-msgid "Memory Used:"
+msgid "Memory used:"
 msgstr "己用内存："
 
 msgctxt "#31310"
-msgid "Track Number"
+msgid "Track number"
 msgstr "音轨号"
 
 msgctxt "#31311"
@@ -329,31 +301,31 @@ msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "同人画图片[CR][CR]不可用[CR][CR]按键设置"
 
 msgctxt "#31312"
-msgid "Current Scraper"
+msgid "Current scraper"
 msgstr "当前刮削器"
 
 msgctxt "#31313"
-msgid "Choose a Scraper"
+msgid "Choose a scraper"
 msgstr "选择刮削器"
 
 msgctxt "#31314"
-msgid "Content Scanning Options"
+msgid "Content scanning options"
 msgstr "内容扫描选项"
 
 msgctxt "#31317"
-msgid "Set Fanart Path"
+msgid "Set fanart path"
 msgstr "设置同人画目录"
 
 msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "选择用户配置文件"
+msgid "Selected profile"
+msgstr "选定用户配置文件"
 
 msgctxt "#31320"
-msgid "Last Logged In"
+msgid "Last logged in"
 msgstr "最近登录"
 
 msgctxt "#31321"
-msgid "Karaoke Song Selector"
+msgid "Karaoke song selector"
 msgstr "卡拉OK歌曲选择器"
 
 msgctxt "#31322"
@@ -361,7 +333,7 @@ msgid "Aired"
 msgstr "首播"
 
 msgctxt "#31325"
-msgid "Playlist Options"
+msgid "Playlist options"
 msgstr "播放列表选项"
 
 msgctxt "#31326"
@@ -373,19 +345,19 @@ msgid "Resolution"
 msgstr "分辨率"
 
 msgctxt "#31328"
-msgid "Recently Added"
-msgstr "最新加入"
+msgid "Recently added"
+msgstr "最近加入"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]时钟设置！[/B] [COLOR=grey2] - 系统自动关闭于[/COLOR]"
 
 msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
+msgid "Click button to play[CR][CR]movie trailer"
 msgstr "点此按钮播放预告片"
 
 msgctxt "#31331"
-msgid "Album Details"
+msgid "Album details"
 msgstr "专辑详情"
 
 msgctxt "#31351"
@@ -397,7 +369,7 @@ msgid "Stop"
 msgstr "停止"
 
 msgctxt "#31353"
-msgid "Fast Forward"
+msgid "Fast forward"
 msgstr "快进"
 
 msgctxt "#31354"
@@ -409,7 +381,7 @@ msgid "Movie menu"
 msgstr "电影菜单"
 
 msgctxt "#31356"
-msgid "Download Subtitles"
+msgid "Download subtitles"
 msgstr "下载字幕"
 
 msgctxt "#31360"
@@ -429,8 +401,8 @@ msgid "Skin default"
 msgstr "皮肤默认"
 
 msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "皮肤默认无Caps"
+msgid "Skin default with no caps"
+msgstr "皮肤默认无 Caps"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -448,20 +420,12 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]设置音乐选项[/B][CR][CR]管理音乐资料库 · 设置音乐播放选项 · 修改音乐列表选项 · 设置歌曲提交 · 设置卡拉OK选项"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]设置图片选项[/B][CR][CR]设置图片列表选项 · 设置幻灯片播放"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]设置天气预报[/B][CR][CR]设置三个获取天气信息的城市"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]设置系统选项[/B][CR][CR]设置和校正显示器 · 设置音频输出 · 设置摇控器 · 设置节电选项 · 启用调试 · 设置主机锁定"
 
 msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed add-ons · Browse for and install add-ons from kodi.tv[CR]Modify add-on settings"
 msgstr "[B]设置插件功能[/B][CR][CR]管理你安装的插件 · 在 kodi.tv 浏览并安装插件 · 修改插件设置"
 
 msgctxt "#31409"
@@ -473,13 +437,9 @@ msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP a
 msgstr "[B]设置网络服务[/B][CR][CR]设置通过 UPnP 和 HTTP 控制 Kodi · 配置文件共享[CR]启用 Zeroconf · 设置 AirPlay"
 
 msgctxt "#31411"
-msgid "First run help...."
+msgid "First run help..."
 msgstr "首次运行帮助...."
 
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "此选项卡表示有一个提供本功能模块特殊设置选项的菜单隐藏在窗口侧边。你可以通过按遥控器或键盘左键、或将鼠标指针移动到选项卡范围来开启此菜单。[CR] [CR]点“确定”关闭此对话框，本提示不会再次出现。"
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "本地字幕可用"
@@ -489,7 +449,7 @@ msgid "Login"
 msgstr "登录"
 
 msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
+msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "选择您的用户配置文件[CR]登录并继续"
 
 msgctxt "#31422"
@@ -501,23 +461,23 @@ msgid "Select the profile that will be used at startup when the login screen is
 msgstr "选择禁用登录界面时使用的用户配置文件。"
 
 msgctxt "#31501"
-msgid "Scheduled Time"
+msgid "Scheduled time"
 msgstr "预定时间"
 
 msgctxt "#31502"
-msgid "Live TV"
-msgstr "直播电视"
+msgid "TV"
+msgstr "电视"
 
 msgctxt "#31503"
-msgid "Add Group"
+msgid "Add group"
 msgstr "增加组"
 
 msgctxt "#31504"
-msgid "Rename Group"
+msgid "Rename group"
 msgstr "更名组"
 
 msgctxt "#31505"
-msgid "Delete Group"
+msgid "Delete group"
 msgstr "删除组"
 
 msgctxt "#31506"
@@ -525,31 +485,27 @@ msgid "Available[CR]Groups"
 msgstr "可用组"
 
 msgctxt "#31509"
-msgid "Channel Group"
+msgid "Channel group"
 msgstr "频道组"
 
 msgctxt "#31510"
-msgid "Timer Set"
+msgid "Timer set"
 msgstr "定时器设定"
 
 msgctxt "#31511"
-msgid "Channel Options"
+msgid "Channel options"
 msgstr "频道选项"
 
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36小时预报"
-
 msgctxt "#31902"
-msgid "Hourly Forecast"
+msgid "Hourly forecast"
 msgstr "每小时预报"
 
 msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "一周预报"
+msgid "Weekend forecast"
+msgstr "周末预报"
 
 msgctxt "#31904"
-msgid "Daily Forecast"
+msgid "Daily forecast"
 msgstr "每日预报"
 
 msgctxt "#31905"
@@ -557,7 +513,7 @@ msgid "Forecast"
 msgstr "天气预报"
 
 msgctxt "#31908"
-msgid "Chance of Precipitation"
+msgid "Chance of precipitation"
 msgstr "降雨概率"
 
 msgctxt "#31909"
diff --git a/addons/skin.confluence/language/Chinese (Traditional)/strings.po b/addons/skin.confluence/language/resource.language.zh_tw/strings.po
index 01693b8416..974575de9e 100644
--- a/addons/skin.confluence/language/Chinese (Traditional)/strings.po
+++ b/addons/skin.confluence/language/resource.language.zh_tw/strings.po
@@ -4,46 +4,30 @@
 # Addon Provider: Jezz_X, Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
-"Language-Team: Chinese (Traditional) (http://www.transifex.com/projects/p/xbmc-main/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kodi-main/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgctxt "#31000"
-msgid "Change Your"
-msgstr "修改你的"
-
-msgctxt "#31003"
-msgid "Power Options"
-msgstr "電源選項"
-
 msgctxt "#31004"
 msgid "Working..."
 msgstr "處理中..."
 
-msgctxt "#31005"
-msgid "Hide Information"
-msgstr "隱藏資訊"
-
 msgctxt "#31006"
-msgid "View Options"
-msgstr "檢視選項"
+msgid "View options"
+msgstr "瀏覽設定"
 
 msgctxt "#31008"
 msgid "Full screen"
 msgstr "全螢幕"
 
-msgctxt "#31009"
-msgid "Total Duration"
-msgstr "總計時間"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "音樂 - 檔案"
@@ -60,30 +44,14 @@ msgctxt "#31025"
 msgid "Items"
 msgstr "個項目"
 
-msgctxt "#31026"
-msgid "Misc Options"
-msgstr "其他選項"
-
 msgctxt "#31027"
 msgid "Location"
 msgstr "位置"
 
-msgctxt "#31028"
-msgid "Poster Wrap"
-msgstr "海報捲動"
-
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31031"
-msgid "Pic Thumbs"
-msgstr "圖片縮圖"
-
-msgctxt "#31032"
-msgid "Image Wrap"
-msgstr "圖片捲動"
-
 msgctxt "#31033"
 msgid "Info"
 msgstr "資訊"
@@ -92,10 +60,6 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr "動作"
 
-msgctxt "#31040"
-msgid "Now Playing"
-msgstr "正在播放"
-
 msgctxt "#31042"
 msgid "PLAYING"
 msgstr "正在播放"
@@ -116,12 +80,8 @@ msgctxt "#31046"
 msgid "SEEKING"
 msgstr "查找"
 
-msgctxt "#31048"
-msgid "Visualisation Presets"
-msgstr "視覺效果預設值"
-
 msgctxt "#31049"
-msgid "End Time"
+msgid "End time"
 msgstr "結束時間"
 
 msgctxt "#31050"
@@ -156,10 +116,6 @@ msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
 msgstr "這個檔案已堆疊，請選擇您要從哪個部分開始播放。"
 
-msgctxt "#31061"
-msgid "Current Selected"
-msgstr "目前的選擇"
-
 msgctxt "#31101"
 msgid "Home screen options"
 msgstr "首頁介面選項"
@@ -168,29 +124,13 @@ msgctxt "#31102"
 msgid "Background"
 msgstr "背景"
 
-msgctxt "#31103"
-msgid "Show \"Paused\" in picture slide show"
-msgstr "在圖片幻燈片秀中顯示\"已暫停\"狀態"
-
-msgctxt "#31104"
-msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialogue Only)[/COLOR]"
-msgstr "在視窗中播放預告片[COLOR=grey3](只在影片資訊對話框中)[/COLOR]"
-
 msgctxt "#31106"
 msgid "Miscellaneous options"
 msgstr "其他選項"
 
-msgctxt "#31107"
-msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "隱藏影片檔案名稱的媒體標示 [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-
-msgctxt "#31108"
-msgid "Hide Main Menu Buttons"
-msgstr "隱藏主選單按鈕"
-
 msgctxt "#31109"
-msgid "Enable Custom Background"
-msgstr "啟用自訂背景圖片"
+msgid "Enable custom background"
+msgstr "啟用 自訂背景"
 
 msgctxt "#31110"
 msgid "Background path:"
@@ -204,30 +144,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "選項"
 
-msgctxt "#31116"
-msgid "Show Recently added Albums"
-msgstr "顯示最近加入的專輯"
-
-msgctxt "#31117"
-msgid "Show Recently added Videos"
-msgstr "顯示最近加入的影片"
-
-msgctxt "#31118"
-msgid "Home Page Programs Sub-menu"
-msgstr "首頁程式子選單"
-
-msgctxt "#31119"
-msgid "Hide Background Fanart"
-msgstr "隱藏背景 Fanart"
-
-msgctxt "#31124"
-msgid "Show Background \"Now Playing\" Video"
-msgstr "在背景顯示正在播放的影片"
-
-msgctxt "#31125"
-msgid "Show Background \"Now Playing\" Visualisation"
-msgstr "在背景顯示正在播放的視覺效果"
-
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
 msgstr "在影片資料庫中播放電視主題曲（TvTunes 附加元件）"
@@ -240,26 +156,6 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "歌詞"
 
-msgctxt "#31129"
-msgid "Hide Fanart in full screen visualisation"
-msgstr "在全螢幕視覺效果中隱藏 Fanart"
-
-msgctxt "#31132"
-msgid "Lyrics Add-on"
-msgstr "歌詞附加元件"
-
-msgctxt "#31134"
-msgid "Home Page Videos Sub-menu"
-msgstr "首頁影片子選單"
-
-msgctxt "#31135"
-msgid "Home Page Music Sub-menu"
-msgstr "首頁音樂子選單"
-
-msgctxt "#31136"
-msgid "Home Page Pictures Sub-menu"
-msgstr "首頁圖片子選單"
-
 msgctxt "#31140"
 msgid "Music OSD"
 msgstr "音樂播放工具列"
@@ -276,94 +172,22 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "捷徑"
 
-msgctxt "#31203"
-msgid "Choose Your Song"
-msgstr "選擇你的歌曲"
-
-msgctxt "#31205"
-msgid "Lyrics Source"
-msgstr "歌詞來源"
-
 msgctxt "#31206"
 msgid "Found"
 msgstr "已找到"
 
-msgctxt "#31207"
-msgid "Find More Items"
-msgstr "尋找更多項目"
-
-msgctxt "#31208"
-msgid "Upcoming Episodes"
-msgstr "劇集預告"
-
-msgctxt "#31300"
-msgid "Current Temp"
-msgstr "現在溫度"
-
-msgctxt "#31301"
-msgid "Last Updated"
-msgstr "最後更新"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "資料提供者"
 
-msgctxt "#31307"
-msgid "Hide Fanart"
-msgstr "隱藏 Fanart"
-
-msgctxt "#31308"
-msgid "Movie Details"
-msgstr "電影詳細資訊"
-
-msgctxt "#31309"
-msgid "Memory Used:"
-msgstr "已使用記憶體："
-
-msgctxt "#31310"
-msgid "Track Number"
-msgstr "音軌編號"
-
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
 msgstr "無法取得[CR][CR]Fanart 圖片[CR][CR] 請點擊按鈕來設定"
 
-msgctxt "#31312"
-msgid "Current Scraper"
-msgstr "目前的站台"
-
-msgctxt "#31313"
-msgid "Choose a Scraper"
-msgstr "選擇一個站台"
-
-msgctxt "#31314"
-msgid "Content Scanning Options"
-msgstr "內容掃描選項"
-
-msgctxt "#31317"
-msgid "Set Fanart Path"
-msgstr "設定 Fanart 路徑"
-
-msgctxt "#31319"
-msgid "Selected Profile"
-msgstr "選擇的設定檔"
-
-msgctxt "#31320"
-msgid "Last Logged In"
-msgstr "上次登入在"
-
-msgctxt "#31321"
-msgid "Karaoke Song Selector"
-msgstr "卡拉OK歌曲選擇器"
-
 msgctxt "#31322"
 msgid "Aired"
 msgstr "首播"
 
-msgctxt "#31325"
-msgid "Playlist Options"
-msgstr "播放清單選項"
-
 msgctxt "#31326"
 msgid "Created"
 msgstr "已建立"
@@ -372,22 +196,10 @@ msgctxt "#31327"
 msgid "Resolution"
 msgstr "解析度"
 
-msgctxt "#31328"
-msgid "Recently Added"
-msgstr "最近新增"
-
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
 msgstr "[B]計時器啟動！[/B] [COLOR=grey2] - 系統將自動關機於：[/COLOR]"
 
-msgctxt "#31330"
-msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "點擊按鈕播放[CR][CR]電影預告片"
-
-msgctxt "#31331"
-msgid "Album Details"
-msgstr "專輯詳細資訊"
-
 msgctxt "#31351"
 msgid "Pause"
 msgstr "暫停"
@@ -396,10 +208,6 @@ msgctxt "#31352"
 msgid "Stop"
 msgstr "停止"
 
-msgctxt "#31353"
-msgid "Fast Forward"
-msgstr "快轉"
-
 msgctxt "#31354"
 msgid "Rewind"
 msgstr "倒轉"
@@ -408,10 +216,6 @@ msgctxt "#31355"
 msgid "Movie menu"
 msgstr "電影選單"
 
-msgctxt "#31356"
-msgid "Download Subtitles"
-msgstr "下載字幕"
-
 msgctxt "#31360"
 msgid "Watch as 2D"
 msgstr "以 2D 模式觀賞"
@@ -428,10 +232,6 @@ msgctxt "#31390"
 msgid "Skin default"
 msgstr "主題預設"
 
-msgctxt "#31391"
-msgid "Skin default with no Caps"
-msgstr "佈景主題預設（沒有開頭大寫）"
-
 msgctxt "#31392"
 msgid "Arial based"
 msgstr "基於 Arial"
@@ -448,22 +248,10 @@ msgctxt "#31402"
 msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
 msgstr "[B]配置音樂設定[/B][CR][CR]管理你的音樂資料庫 · 設定音樂播放選項 · 修改音樂清單選項[CR]設定歌曲提交 · 設定卡拉OK選項"
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B]配置圖片設定[/B][CR][CR]設定圖片清單選項 · 設定幻燈片秀"
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B]配置天氣設定[/B][CR][CR]設定三個要收集天氣資料的城市"
-
 msgctxt "#31406"
 msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
 msgstr "[B]配置系統設定[/B][CR][CR]設定和校正顯示輸出 · 設定音效輸出 · 設定遙控器[CR]設定節能選項 · 啟用除錯 · 設定鎖定密碼"
 
-msgctxt "#31408"
-msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from kodi.tv[CR]Modify Add-on settings"
-msgstr "[B]配置附加元件[/B][CR][CR]管理已安裝的附加元件 · 從 kodi.tv 瀏覽並安裝附加元件[CR]修改附加元件設定"
-
 msgctxt "#31409"
 msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change full screen info · Manage EPG data settings"
 msgstr "[B]電視設定[/B][CR][CR]修改全螢幕資訊 · 管理電子節目表資料設定"
@@ -472,14 +260,6 @@ msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of Kodi via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr "[B]配置服務設定[/B][CR][CR]設定透過 UPnP 和 HTTP 控製 Kodi · 配置檔案分享[CR]啟用 Zeroconf · 配置 AirPlay"
 
-msgctxt "#31411"
-msgid "First run help...."
-msgstr "第一次使用說明..."
-
-msgctxt "#31412"
-msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section.  To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
-msgstr "這個標籤表示這個部分在視窗的側邊有提供額外選項的選單。你可以使用遙控器或鍵盤的左鍵或者是將滑鼠指標移動到這個標籤的範圍來存取這個選單。[CR][CR]按一下\"Ok\" 可以關閉這個對話框。它不會再出現。"
-
 msgctxt "#31413"
 msgid "Local subtitle available"
 msgstr "有本地語言的字幕可選用"
@@ -488,10 +268,6 @@ msgctxt "#31420"
 msgid "Login"
 msgstr "登入"
 
-msgctxt "#31421"
-msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "選擇您的 Kodi 使用者設定檔[CR]登入並繼續"
-
 msgctxt "#31422"
 msgid "Show or hide the login screen at startup."
 msgstr "啟動時顯示或隱藏登入畫面"
@@ -500,62 +276,18 @@ msgctxt "#31423"
 msgid "Select the profile that will be used at startup when the login screen is disabled."
 msgstr "選擇登入畫面停用是要使用的設定檔。"
 
-msgctxt "#31501"
-msgid "Scheduled Time"
-msgstr "已排程的時間"
-
 msgctxt "#31502"
-msgid "Live TV"
+msgid "TV"
 msgstr "電視"
 
-msgctxt "#31503"
-msgid "Add Group"
-msgstr "新增群組"
-
-msgctxt "#31504"
-msgid "Rename Group"
-msgstr "重新命名群組"
-
-msgctxt "#31505"
-msgid "Delete Group"
-msgstr "刪除群組"
-
 msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr "可用的[CR]群組"
 
-msgctxt "#31509"
-msgid "Channel Group"
-msgstr "頻道群組"
-
-msgctxt "#31510"
-msgid "Timer Set"
-msgstr "計時器設定"
-
-msgctxt "#31511"
-msgid "Channel Options"
-msgstr "頻道選項"
-
-msgctxt "#31901"
-msgid "36 Hour Forecast"
-msgstr "36小時預報"
-
-msgctxt "#31902"
-msgid "Hourly Forecast"
-msgstr "每小時預報"
-
-msgctxt "#31903"
-msgid "Weekend Forecast"
-msgstr "一週預報"
-
 msgctxt "#31905"
 msgid "Forecast"
 msgstr "預報"
 
-msgctxt "#31908"
-msgid "Chance of Precipitation"
-msgstr "降雨機率"
-
 msgctxt "#31909"
 msgid "Fetching forecast info..."
 msgstr "正在擷取預報資訊..."
@@ -603,3 +335,7 @@ msgstr "播放光碟"
 msgctxt "#31959"
 msgid "SYSTEM"
 msgstr "系統"
+
+msgctxt "#31960"
+msgid "RADIO"
+msgstr "收音機"