[lang] September update of skin.confluence language files

author: alanwww1 <attila.jakosa@gmail.com> 2012-09-23 14:38:37 +0200
committer: alanwww1 <attila.jakosa@gmail.com> 2012-09-23 14:38:37 +0200
commit: 22ea5aec928950f53cb59d68669c0cac585d6d85 (patch)
tree: 878e698da6181df338f7d1f4073c7c9986dda40b
parent: 123c13d65e5c4dbc3c5ec67492cd5d119339d181 (diff)
43 files changed, 7060 insertions, 4730 deletions
diff --git a/addons/skin.confluence/addon.xml b/addons/skin.confluence/addon.xml
index 299d185a03..caabe7733e 100644
--- a/addons/skin.confluence/addon.xml
+++ b/addons/skin.confluence/addon.xml
@@ -15,44 +15,117 @@
     <res width="1280" height="720" aspect="16:9" default="true" folder="720p" />
   </extension>
   <extension point="xbmc.addon.metadata">
-    <summary lang="bg">Облик Confluence от Jezz_X. (стандартния облик на XBMC)</summary>
+    <summary lang="bg">Облик от Jezz_X. (стандартния за XBMC)</summary>
     <summary lang="ca">Aparença Confluence, per Jezz_X. (Aparença per defecte de l'XBMC)</summary>
+    <summary lang="cs">Vzhled Confluence od Jezz_X. (XBMC výchozí vzhled)</summary>
+    <summary lang="da">Confluence skin af Jezz_X. (XBMC's standard skin)</summary>
+    <summary lang="de">Confluence, ein Skin von Jezz_X. (XBMC standard Skin)</summary>
+    <summary lang="el">Το κέλυφος Confluence από τον Jezz_X (προεπιλεγμένο κέλυφος του XBMC).</summary>
     <summary lang="en">Confluence skin by Jezz_X. (XBMC's default skin)</summary>
     <summary lang="es">Confluence skin por Jezz_X. (skin por defecto)</summary>
+    <summary lang="es_MX">Skin confluende por Jezz_X. (skin por defecto de XMC)</summary>
+    <summary lang="et">Confluence rüü autorilt Jezz_X. (XBMC vaikerüü)</summary>
     <summary lang="fi">Confluence-ulkoasu Jezz_X:ltä. (XBMC:n oletus ulkoasu)</summary>
-    <summary lang="fr">Skin Confluence par Jezz_X. (skin par défaut)</summary>
-    <summary lang="hu">Confluence arculat. Készítő: Jezz_X</summary>
-    <summary lang="ko">Confluence 스킨 Jezz_X 만듬 (기본 스킨)</summary>
+    <summary lang="fr">Thème Confluence par Jezz_X. (skin par défaut)</summary>
+    <summary lang="gl">Pel Confluence por Jezz_Z. (Pel predeterminada de XBMC)</summary>
+    <summary lang="he">Confluence skin by Jezz_X. (XBMC's default skin)</summary>
+    <summary lang="hr">Confluence izgled autor Jezz_X. (XBMC-ov podrazumijevani izgled)</summary>
+    <summary lang="hu">Confluence felszín. Készítő: Jezz_X (XBMC alapértelmezett arculat)</summary>
+    <summary lang="is">Confluence eftir Jezz_X. (Sjálfgefið útlit XBMC)</summary>
+    <summary lang="it">Skin Confluence da Jezz_X. (skin predefinita di XBMC)</summary>
+    <summary lang="ja">Confluence スキン by Jezz_X. (XBMC デフォルトスキン)</summary>
+    <summary lang="ko">Confluence 스킨 Jezz_X 만듦 (XBMC 기본 스킨)</summary>
+    <summary lang="lt">Confluence viršelis sukūrtas Jezz_X.(XBMC's numatytasis viršelis)</summary>
     <summary lang="nl">Confluence skin door Jezz_X</summary>
+    <summary lang="no">Confluence tema av Jezz_X. (XBMC standardtema)</summary>
     <summary lang="pl">Confluence autorstwa Jezz_X</summary>
     <summary lang="pt">Tema Confluence desenvolvido por Jezz_X. (Tema padrão do XBMC)</summary>
+    <summary lang="pt_BR">Skin Confluence por Jexx_X (Skin padrão do XBMC)</summary>
     <summary lang="ro">Costum Confluence de Jezz_X. (costum implicit)</summary>
-    <summary lang="se">Confluence-skalet av Jezz_X. (XBMC standardskal)s</summary>
+    <summary lang="ru">Обложка Confluence (стандартная для XBMC). Автор: Jezz_X.</summary>
+    <summary lang="sk">Confluence skin od Jezz_X. (predvolený skin XBMC)</summary>
+    <summary lang="sl">Preobleka Confluence avtorja Jezz_X. (Privzeta)</summary>
+    <summary lang="sv">Confluence, ett skal av Jezz_X. (XBMC standardskal)</summary>
+    <summary lang="th">ชุดตกแต่ง Confluence โดย  Jezz_X (สกินเริ่มต้นของ XBMC)</summary>
+    <summary lang="tr">Jezz_X tarafından Confluence dış görünümü. (XBMC varsayılan dış görünüm)</summary>
+    <summary lang="uk">Обкладинка Confluence (стандартна обкладинка XBMC). Автор: Jezz_X.</summary>
+    <summary lang="vi">Confluence skin by Jezz_X. (XBMC's default skin)</summary>
     <summary lang="zh">Jezz_X开发的Confluence皮肤</summary>
+    <summary lang="zh_TW">Jezz_X 製作的佈景主題（XBMC的預設佈景主題）</summary>
     <description lang="bg">Confluence е стандартният облик на XBMC 9.11 и по-новите версии. Представлява смесица от концепциите на много от популярните облици. Целта е да се интегрират тези добри идеи в подходящ и удобен вид за хора, които се сблъскват за първи път с XBMC.</description>
     <description lang="ca">Confluence és l'aparença per defecte de l'XBMC 9.11 i superior. És una combinació de conceptes de moltes aparences populars, i intenta adoptar i integrar les seves bones idees en una aparença que sigui senzilla d'entendre i utilitzar per els nous usuaris d'XBMC.</description>
+    <description lang="cs">Confluence je výchozí vzhled pro XBMC 9.11 a novější. Jedná se o kombinaci konceptů z mnoha jiných populárních vzhledů, která se pokouší uchopit a integrovat jejich dobré nápady do vzhledu, který by měl být pro nového uživatele XBMC jednoduchý na pochopení a používání.</description>
+    <description lang="da">Confluence er standard skin for XBMC 9.11 og senere versioner. Det er en kombination af koncepter fra mange populære skins og forsøger at indarbejde og integrere de gode ideer i et skin, der bør være let for førstegangsbrugere af XBMC at forstå og bruge.</description>
+    <description lang="de">Confluence ist der standard Skin für XBMC 9.11 und später. Er ist eine Kombination mehrer unterschiedlicher Skin-Konzepte und versucht dabei die besten Ideen zu kombinieren, um einen einfachen Einstieg für neue XBMC-Nutzer zu ermöglichen.</description>
+    <description lang="el">Το Confluence είναι το προεπιλεγμένο κέλυφος για τις εκδόσεις XBMC 9.11 και άνω. Είναι ένας συνδυασμός από πολλά δημοφιλή κελύφη, και επιχειρεί να συμπεριλάβει τις καλύτερες ιδέες τους σε ένα κέλυφος το οποίο είναι εύκολο σε αρχάριους χρήστες του XBMC να κατανοήσουν και χρησιμοποιήσουν.</description>
     <description lang="en">Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use.</description>
-    <description lang="es">Confluence es la skin por defecto de XBMC 9.11 y posteriores. Es una combinación de conceptos de muchas skins populares, e intenta abarcare e integrar lo mejor de ellas en una skin que sea sencilla de entender y utilizar para los nuevos usuarios de XBMC.</description>
+    <description lang="es">Confluence es la skin por defecto de XBMC 9.11 y posteriores. Es una combinación de conceptos de muchas skins populares, e intenta abarcar e integrar lo mejor de ellas en una skin que sea sencilla de entender y utilizar para los nuevos usuarios de XBMC.</description>
+    <description lang="es_MX">Confluence es el skin por defecto para XBMC 9.11 en adelante. Es una combinación de conceptos de varias skins populares, e intenta adoptar e integrar sus buenas ideas en un skin que debería ser fá de entender y usar para quienes usen XBMC por primera vez.</description>
+    <description lang="et">Confluence on vaikerüü XBMC-le alates versioonist 9.11. Confluence on paljude populaarsete rüüde kombineerimise tulemus, mis üritab omavahel tööle panna teiste rüüde parimaid lahendusi, et saavutada rüü, mis oleks esmakasutajale ühtmoodi selge ja kerge kasutada.</description>
     <description lang="fi">Confluence on oletus ulkoasu XBMC:n versiosta 9.11 lähtien. Se on yhdistelmä useiden suosittujen ulkoasujen konsepteista, ja yritys omaksua ja integroida heidän hyvät ideat ulkoasuun, jonka pitäisi olla helppokäyttöinen ja -tajuinen kaikille XBMC:n käyttäjille.</description>
-    <description lang="fr">Confluence est le skin par défaut de XBMC 9.11 ou supérieur. C'est un condensé d'idées de plusieurs skins populaires. Il tente d'englober et intégrer toutes les bonnes idées que n'importe quel débutant sur XBMC pourrait utiliser avec facilité.</description>
-    <description lang="hu">A Confluence az alapértelmezett arculat az XBMC-hez a 9.11-es verziótól kezdődően. Merít sok sok népszerű arculat elképzeléséből, megpróbálva vegyíteni a jó ötleteket úgy, hogy az könnyen kezelhető legyen az XBMC-vel először találkozóknak is.</description>
+    <description lang="fr">Confluence est le thème par défaut de XBMC 9.11 ou supérieur. C'est un condensé de concepts issus de plusieurs thèmes populaires, une tentative d'englober et d'intégrer ces bonnes idées afin que n'importe quel débutant puisse comprendre et utiliser XBMC facilement.</description>
+    <description lang="gl">Confluence é a pel predeterminada para XBMC 9.11 e posteriores. É unha combinación de conceptos de algunhas peles populares, e tenta abranguer e integrar  as súas mellores ideas nunha pel que sexa fácil de entender e utilizar para as usuarias que utilizan por primeira vez XBMC.</description>
+    <description lang="he">Confluence הוא סקין ברירת המחדל של XBMC 9.11 ומעלה. זהו צירוף של קונספטים מסקינים פופולריים רבים, וניסיונות לאמץ ולסכם את הרעיונות הטובים שלהם לתוך סקין שיהיה פשוט להבנה ולשימוש עבור משתמשי XBMC חדשים.</description>
+    <description lang="hr">Confluence je podrazumijevani izgled od verzije XBMC 9.11 naviše. To je mješavina ideja i zamisli iz drugih popularnih izgleda, pokušaj da se objedine njihove dobre osobine u izgledu lak za uporabu i razumijevanje od novih XMBC korisnika.</description>
+    <description lang="hu">A Confluence az alapértelmezett felszín az XBMC-hez a 9.11-es verziótól kezdődően. Merít sok sok népszerű arculat elképzeléséből, megpróbálva vegyíteni a jó ötleteket úgy, hogy az könnyen kezelhető legyen az XBMC-vel először találkozóknak is.</description>
+    <description lang="is">Confluence er sjálfgefið útlit XBMC 9.11 og nýrra. Það er samsetning hugmynda frá mörgum vinsælum útlitum og er tilraun til að fanga og innlima þær góðu hugmyndir í útlit þar sem hugmyndin er að skuli vera einfalt fyrir fyrir nýja XBMC notendur að skilja og nota</description>
+    <description lang="it">Confluence è la skin predefinita di XBMC dalla versione 9.11 in poi. E' una combinazione di elementi provenienti da altre skin popolari e cerca di integrare e coinvolgere tutte le loro grandi idee in una skin facile da usare e comprendere per l'utente inesperto di XBMC.</description>
+    <description lang="ja">Confluence は XBMC 9.11 およびそれ以上のバージョンで標準のスキンです。さまざまな人気のスキンのコンセプトを組み合わせ、ユーザが初めて XBMC に触れる際に便利に使えるようにしてあります。</description>
     <description lang="ko">Confluence 는 XBMC 9.11 이상의 기본 스킨입니다. 많은 인기 스킨의 컨셉과 좋은 아이디어를 모아서 하나의 스킨으로 만들었으며 초보자도 사용하기 쉽습니다.</description>
+    <description lang="lt">Confluence yra numatytasis viršelis pradedant XBMC 9.11 ir toliau. Tai daugelio populiarių viršelių derinys. Bandymas priimti ir integruoti vartotojų idėjas į viršelį katras turėtų būti lengvai suprantamas  pirmą kartą naudojantiems XBMC</description>
     <description lang="nl">Confluence is de standaard skin voor XBMC 9.11 en hoger. Het combineert de concepten van andere populaire skins, waarbij het tracht hun goede ideëen te integreren in een skin die gemakkelijk in gebruik is.</description>
+    <description lang="no">Confluence er standard tema for XBMC 9.11 og oppover. Det er en kombinasjon av konseptene fra mange populære tema, og prøver å omfavne og integrere de gode idéene i et tema som bør være lett å forstå og benytte for nye XBMC-brukere.</description>
     <description lang="pl">Confluence jest domyślną skórą dla XBMC 9.11 i nowszych. To kombinacja wielu popularnych pomysłów i próba zawarcia tego co w nich najlepsze w skórze, która będzie łatwa do opanowania dla początkującego użytkownika.</description>
-    <description lang="pt">O tema Confluence é o tema padrão do XBMC 9.11 e superior. É uma mistura de conceitos de muitos temas populares e tenta integrar as boas ideias destes num tema que deve ser fácil de entender e manusear para utilizadores recentes do XBMC.</description>
+    <description lang="pt">O tema Confluence é o tema padrão do XBMC 9.11 e superior. É uma mistura de conceitos de muitos temas populares e tenta integrar as boas ideias destes num tema que deve ser fácil de entender e manusear para novos utilizadores do XBMC.</description>
+    <description lang="pt_BR">Confluence é a skin padrão do XBMC 9.11 e acima. É uma combinação de conceitos das mais populares skins, visando abraçar e integrar as boas idéias em uma skin  que seja fácil de entender e usar, destinada  aos usuários iniciantes do XBMC. </description>
     <description lang="ro">Confluence este costumul implicit pentru XBMC 9.11 și versiunile ulterioare. Este o combinație de concepte împrumutate de la mai multe costume populare, care încearcă să îmbrățișeze și să integreze ideile lor bune într-un costum care să fie ușor de înțeles și folosit de către utilizatorii XBMC începători.</description>
+    <description lang="ru">Confluence — это стандартная обложка XBMC, начиная с версии 9.11. Она представляет собой сочетание концепций, взятых из многих популярных обложек, в попытке интегрировать их удачные идеи в обложке, которая была простой для использования и понимания новыми пользователями XBMC.</description>
+    <description lang="sk">Confluence je predvolený pre XBMC 9.11 a vyššie. Je kombináciou konceptov z mnoho populárnych skinov a pokusom integrovať ich dobré nápady do skinu, ktorý by bol ľahko zrozumiteľný a použiteľný pre nových používateľov XBMC.</description>
+    <description lang="sl">Confluence je privzeta preobleka za XBMC 9.11 in novejše. Je kombinacija konceptov mnogih priljubljenih preoblek in poskuša zaobjeti in integrirati njihove dobre ideje v preobleko, ki bi bila preprosta za uporabo in razumevanje tudi novim uporabnikom XBMC.</description>
+    <description lang="sv">Confluence är standardskal för XBMC 9.11 och senare. Det är en kombination av koncept från många populära skal i ett försök att använda och integrera flera goda idéer till ett skal som är enkelt för användare som precis har börjat använda XBMC att förstå och använda.</description>
+    <description lang="th">Confluenceเป็นสกินเริ่มต้นสำหรับ XBMC 9.11 หรือสูงกว่า มันเป็นส่วนผสมของแนวคิดจากสกินที่ได้รับความนิยมและพยายามที่จะยอมรับและบูรณาการส่วนที่ดีของมันเข้าไปในสกิน ซึ่งน่าจะง่ายสำหรับผู้ใช้ XBMCใหม่ ที่จะเข้าใจและใช้งานได้ดี</description>
+    <description lang="tr">Confluence XBMC 9.11 ve yukarısı için varsayılan dış görünümdür. Birçok popüler dış görünümün kavramlarını bir araya getirip ilk kez XBMC kullananlar için anlaşılması ve kullanımı kolaydır.</description>
+    <description lang="uk">Confluence — це стандартна обкладинка XBMC, починаючи з версії 9.11. Концепції багатьох популярних обкладинок поєднано у спробі використати та інтегрувати їхні вдалі ідеї в обкладинці, що стала б зрозумілою та простою в застосуванні для нових користувачів XBMC.</description>
+    <description lang="vi">Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use.</description>
     <description lang="zh">在XBMC 9.11之后的版本中Confluence是默认皮肤。它集合了许多流行皮肤的创意，力求把这些优点融合到一个皮肤中，使得首次使用XBMC的用户能更容易上手。</description>
+    <description lang="zh_TW">Confluence 是從 XBMC 9.11 開始預設的佈景主題。它結合了許多受歡迎的佈景主題的概念，且試圖包含並整合它們的優點，使第一次使用 XBMC 的使用者可以簡單地上手。</description>
+    <disclaimer lang="bg">Confluence е стандартният облик на XBMC. Премахването му може да предизвика проблеми</disclaimer>
     <disclaimer lang="ca">Confluence és l'aparença per defecte de l'XBMC, la seva eliminació pot causar problemes.</disclaimer>
+    <disclaimer lang="cs">Confluence je výchozím vzhledem XBMC, jeho odstranění může způsobit problémy</disclaimer>
+    <disclaimer lang="da">Confluence er standard skin for XBMC, det kan forårsage problemer at fjerne det</disclaimer>
+    <disclaimer lang="de">Confluence ist der standard Skin für XBMC. Die Deinstallation kann zu unerwünschten Nebeneffekten führen.</disclaimer>
+    <disclaimer lang="el">Το Confluence είναι το προεπιλεγμένο κέλυφος για το XBMC, η αφαίρεσή του μπορεί να δημιουργήσει προβλήματα</disclaimer>
     <disclaimer lang="en">Confluence is the default skin for XBMC, removing it may cause issues</disclaimer>
-    <disclaimer lang="fr">Confluence est le skin par défaut de XBMC, l'effacer peut créer des dysfonctionnements</disclaimer>
-    <disclaimer lang="hu">A Confluence az alapértelmezett XBMC arculat. Annak eltávolítása problémákat okozhat.</disclaimer>
-    <disclaimer lang="ko">Confluence는 XBMC의 기본스킨으로 제거시 문제가 야기될수 있습니다.</disclaimer>
+    <disclaimer lang="es">Confluence es la skin por defecto de XBMC. Borrarla puede causar problemas</disclaimer>
+    <disclaimer lang="es_MX">Confluence es el skin por defecto para XBMC, removerlo podría causar problemas</disclaimer>
+    <disclaimer lang="et">Confluence on XBMC vaikerüü. Selle eemaldamine võib põhjustada ootamatusi.</disclaimer>
+    <disclaimer lang="fi">Confluence on XBMC:n oletus ulkoasu, sen poistaminen saattaa aiheuttaa ongelmia</disclaimer>
+    <disclaimer lang="fr">Confluence est le thème par défaut de XBMC, le supprimer peut créer des problèmes</disclaimer>
+    <disclaimer lang="gl">Confluence é a pel predeterminada para XBMC e eliminala pode causas problemas.</disclaimer>
+    <disclaimer lang="he">Confluence הוא סקין ברירת המחדל של XBMC, הסרה שלו עלולה לגרום לבעיות.</disclaimer>
+    <disclaimer lang="hr">Confluence je podrazumijevani izgled za XBMC, njegovo odstranjivanje može uzrokovati teškoće.</disclaimer>
+    <disclaimer lang="hu">A Confluence az alapértelmezett XBMC felszín. Eltávolítása problémákat okozhat.</disclaimer>
+    <disclaimer lang="is">Confluence er sjálfgefið útlit XBMC, það getur orsakað vandamál að fjarlægja það.</disclaimer>
+    <disclaimer lang="it">Confluence è la skin predefinita di XBMC, l'eliminazione potrebbe comportare dei problemi.</disclaimer>
+    <disclaimer lang="ja">Confluence は XBMC のデフォルトスキンですので、これを削除するとうまく動かなくなる可能性があります</disclaimer>
+    <disclaimer lang="ko">Confluence는 XBMC의 기본스킨으로 제거시 문제가 생길수 있습니다.</disclaimer>
+    <disclaimer lang="lt">Confluence yra numatytasis XBMC viršelis, jį panaikinus ar pakeitus gali kilti problemų</disclaimer>
     <disclaimer lang="nl">Confluence is de standaard XMBC skin, het verwijderen van Confluence kan leiden tot problemen.</disclaimer>
+    <disclaimer lang="no">Confluence er standard tema for XBMC, å fjerne det kan skape problemer</disclaimer>
     <disclaimer lang="pl">Confluence jest domyślną skórą XBMC. Jej usunięcie może powodować problemy.</disclaimer>
-    <disclaimer lang="pt">O tema Confluence é o tema padrão do XBMC. Removê-lo pode causar problemas. A sério! Deixe-o instalado, mesmo que não o use.</disclaimer>
+    <disclaimer lang="pt">O tema Confluence é o tema padrão do XBMC. Removê-lo pode causar problemas.</disclaimer>
+    <disclaimer lang="pt_BR">Confluence é a skin padrão do XBMC, removê-la pode lhe causar problemas.</disclaimer>
     <disclaimer lang="ro">Confluence este costumul implicit pentru XBMC, dacă îl eliminați pot apărea probleme!</disclaimer>
-    <disclaimer lang="se">Confluence är standardskalet för XBMC 9.11 och över. Det är en kombination av koncept från många populära skal och försöker fånga och integrera alla goda ideer i ett skal som ska vara enkelt att förstå och använda för förstagångsanvändaren av XBMC.</disclaimer>
+    <disclaimer lang="ru">Confluence — это стандартная обложка XBMC, и ее удаление может привести к возникновению проблем</disclaimer>
+    <disclaimer lang="sk">Confluence je predvolený skin pre XBMC, jeho odstránenie môže spôsobiť problémy</disclaimer>
+    <disclaimer lang="sl">Confluence je privzeta preobleka za XBMC, njena odstranitev lahko povzroči težave</disclaimer>
+    <disclaimer lang="sv">Confluence är standardskal för XBMC, att ta bort detta skal kan skapa problem.</disclaimer>
+    <disclaimer lang="th">Confluence เป็นสกินเริ่มต้นสำหรับ XBMC การลบมัน อาจทำให้เกิดปัญหา</disclaimer>
+    <disclaimer lang="tr">Confluence XBMC için varsayılan dış görünümdür, kaldırmak sorunlara yol açabilir</disclaimer>
+    <disclaimer lang="uk">Confluence — основна обкладинка XBMC, і її видалення може призвести до проблем</disclaimer>
+    <disclaimer lang="vi">Confluence is the default skin for XBMC, removing it may cause issues</disclaimer>
     <disclaimer lang="zh">Confluence是XMBC的默认皮肤，删除它可能导致故障。</disclaimer>
+    <disclaimer lang="zh_TW">Confluence 是 XMBC 預設的佈景主題，移除它可能會造成問題</disclaimer>
     <platform>all</platform>
   </extension>
 </addon>
diff --git a/addons/skin.confluence/language/Afrikaans/strings.po b/addons/skin.confluence/language/Afrikaans/strings.po
index c5657be058..49ab1556e1 100644
--- a/addons/skin.confluence/language/Afrikaans/strings.po
+++ b/addons/skin.confluence/language/Afrikaans/strings.po
@@ -3,44 +3,25 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-05-28 23:22+0000\n"
+"Last-Translator: TeamXBMC <xbmctranslations@gmail.com>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Verander Jou"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Lief Vir"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Haat"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Krag Opsies"
@@ -57,10 +38,6 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr ""
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Inproppe"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr ""
@@ -69,14 +46,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr ""
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Onlangs Bygevoeg"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Lêers"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musiek - Lêers"
@@ -109,10 +78,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Ondersteunerkuns"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Vol lys"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Prent Duime"
@@ -145,14 +110,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "TERUGSPOEL"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Audio Eienskappe"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Huidige Instelling"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Visualisering Instellings"
@@ -226,12 +183,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Versteek Hoof Kieslys Knoppies"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Media Agtergronde"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Redigeer Agtergrond vir Media Tipe"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,18 +198,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opsies"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Enkele Prentjie"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Veelvuldige Prentjie"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Verpersoonliker"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr ""
@@ -269,10 +214,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Stel verpersoonlikte byvoegsel knoppie in staat"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "KNOPPIE ETIKET"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Weer Bladsy"
@@ -301,6 +242,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lirieke"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr ""
@@ -333,22 +278,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Kortpaaie"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorië"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Wys Rolverdeling"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Kies Jou Liedjie"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Seksie Skakels"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Lirieke Bron"
@@ -373,26 +306,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Laas Opdateer"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Kieslys"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr ""
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Prentjie"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Geen Skyf Media Bespoor"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Haal Skyf Uit"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Versteek Ondersteunerkuns"
@@ -425,18 +342,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Inhoud Deursoek Opsies"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Basies"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Stel Ondersteunerkuns Pad"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Klein Ondersteunerkuns"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Geselekteerde Profiel"
@@ -453,14 +362,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Gelug"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Nuutste Flieks"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Nuutste Episodes"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Speellys Opsies"
@@ -558,6 +459,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]KONFIGUREER BYVOEGSELS[/B][CR][CR]Bestuur jou geïnstalleerde Byvoegsels · Soek en installeer Byvoegsels vanaf xbmc.org[CR]Verander Byvoeging verstellings"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,8 +470,44 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Selekteer jou XBMC gebruiker Profiel[CR]om in te log en voort te gaan"
 
-msgctxt "#31900"
-msgid "Weather Maps"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
 msgstr ""
 
 msgctxt "#31901"
@@ -593,10 +534,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr ""
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr ""
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr ""
diff --git a/addons/skin.confluence/language/Arabic/strings.po b/addons/skin.confluence/language/Arabic/strings.po
index ab79fc4ef5..6718ef22a0 100644
--- a/addons/skin.confluence/language/Arabic/strings.po
+++ b/addons/skin.confluence/language/Arabic/strings.po
@@ -3,44 +3,25 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-05-28 23:22+0000\n"
+"Last-Translator: TeamXBMC <xbmctranslations@gmail.com>\n"
 "Language-Team: LANGUAGE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"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 "#31001"
-msgid "Love"
-msgstr "حب"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "كراهية"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "خيارات الطاقة"
@@ -57,10 +38,6 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "خيارات العرض"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "الملحقات"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "شاشة كاملة"
@@ -69,14 +46,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr ""
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "أضيفت مؤخرا"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "الفيديو - ملفات"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "الموسيقى - ملفات"
@@ -109,10 +78,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "قائمة كاملة"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "مصغرات الصورة"
@@ -145,14 +110,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "إرجاع"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "خصائص الصوت"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "القيمة الحالية"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "التصور المسبقة"
@@ -226,12 +183,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "إخفاء أزرار القائمة الرئيسية"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "خلفيات الوسائط"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "تعديل خلفية نوع الوسائط"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,18 +198,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "خيارات"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "صورة واحدة"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "عدة صورة"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "مخصص"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr ""
@@ -269,10 +214,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Fanart إخفاء خلفية"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "علامة الزر"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "صفحة الطقس"
@@ -301,6 +242,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "كلمات الأغاني"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "ملحق كلمات الأغاني"
@@ -333,22 +278,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "اختصارات"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "الفئات"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "إظهار الرواية"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "اختر أغنيتك"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "روابط ذات صلة"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "مصدر كلمات الأغنية"
@@ -373,26 +306,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "اخر تحديث"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "القائمة"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr ": مزود البيانات"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "الصور"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "لم يتم الكشف عن قرص وسائط"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "إخراج"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Fanart إخفاء"
@@ -425,18 +342,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "خيارات فحص المحتوى "
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "أساسي"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Fanart تعيين مسار"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Fanart صغيرة"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "الملف الشخصي المحدد"
@@ -453,14 +362,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "المبث"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "أحدث الأفلام"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "أحدث الحلقات"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "خيارات قائمة التشغيل"
@@ -558,6 +459,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]تكوين الملحقات [/B][CR][CR]xbmc.org إدارة الملحقات المثبتة · تصفح وتثبيت الملحقات من[CR] تعديل إعدادت الملحق"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +470,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "للدخول والإستمرارا [CR]XBMC  حدد ملفك الشخصي الخاص بـ"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "خرائط الطقس"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +534,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "الخرائط والفيديو"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "[COLOR=grey2](Fullscreen Playback)[/COLOR]توقعات الطقس فيديو"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "فرصة هطول الأمطار"
diff --git a/addons/skin.confluence/language/Bulgarian/strings.po b/addons/skin.confluence/language/Bulgarian/strings.po
index c92f0e34ed..c5e019da9b 100644
--- a/addons/skin.confluence/language/Bulgarian/strings.po
+++ b/addons/skin.confluence/language/Bulgarian/strings.po
@@ -3,79 +3,49 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Kiril  <neohidra@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-18 17:33+0000\n"
+"Last-Translator: Kiril <neohidra@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Облик Confluence от Jezz_X. (стандартния облик на XBMC)"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence е стандартният облик на XBMC 9.11 и по-новите версии. Представлява смесица от концепциите на много от популярните облици. Целта е да се интегрират тези добри идеи в подходящ и удобен вид за хора, които се сблъскват за първи път с XBMC."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Променете вашите"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Love"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Hate"
-
 msgctxt "#31003"
 msgid "Power Options"
-msgstr "Опции на захранването"
+msgstr "Настройки на захранването"
 
 msgctxt "#31004"
 msgid "Working..."
-msgstr "Работя..."
+msgstr "Работи..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Скрий ИНФО"
+msgstr "Скрий информацията"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr "Изглед"
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Добавки"
+msgstr "Визуални настройки"
 
 msgctxt "#31008"
 msgid "Fullscreen"
-msgstr "Цял екран"
+msgstr "На целия екран"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Наскоро Добавени"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Видео - Файлове"
+msgstr "Общо времетраене"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -91,11 +61,11 @@ msgstr "Страница"
 
 msgctxt "#31025"
 msgid "Items"
-msgstr "Позиции"
+msgstr "Елемента"
 
 msgctxt "#31026"
 msgid "Misc Options"
-msgstr "Разни Опции"
+msgstr "Разни настройки"
 
 msgctxt "#31027"
 msgid "Location"
@@ -103,35 +73,31 @@ msgstr "Място"
 
 msgctxt "#31028"
 msgid "Poster Wrap"
-msgstr "Плакати въртене"
+msgstr "Плакати-поредица"
 
 msgctxt "#31029"
 msgid "Fanart"
-msgstr "Плакати"
-
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Пълен лист"
+msgstr "Fanart"
 
 msgctxt "#31031"
 msgid "Pic Thumbs"
-msgstr "Малки картинки"
+msgstr "Снимка и миниатюри"
 
 msgctxt "#31032"
 msgid "Image Wrap"
-msgstr "Изображение въртене"
+msgstr "Картини-поредица"
 
 msgctxt "#31033"
 msgid "Info"
-msgstr "Инфо"
+msgstr "Инф."
 
 msgctxt "#31040"
 msgid "Now Playing"
-msgstr "Възпроизвежда"
+msgstr "Сега се възпроизвежда"
 
 msgctxt "#31042"
 msgid "PLAYING"
-msgstr "ВЪЗПРОИЗВЕЖДА"
+msgstr "ВЪЗПРОИЗВЕЖДАНЕ"
 
 msgctxt "#31043"
 msgid "PAUSED"
@@ -139,35 +105,27 @@ msgstr "НА ПАУЗА"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
-msgstr "НАПРЕД"
+msgstr "ПРЕВЪРТАНЕ НАПРЕД"
 
 msgctxt "#31045"
 msgid "REWIND"
-msgstr "НАЗАД"
-
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Аудио Свойства"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Текущо Настроени"
+msgstr "ПРЕВЪРТАНЕ НАЗАД"
 
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Настроени Визуализации"
+msgstr "Шаблони за визуализации"
 
 msgctxt "#31049"
 msgid "End Time"
-msgstr "Крайно Време"
+msgstr "Ще свърши в:"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr "Сортиране: Възходящ"
+msgstr "Ред: Възходящ"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr "Сортиране: Низходящ"
+msgstr "Ред: Низходящ"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -175,15 +133,15 @@ msgstr "Отвори плейлист"
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "Запази плейлист"
+msgstr "Запиши плейлиста"
 
 msgctxt "#31057"
 msgid "Close playlist"
-msgstr "Затвори плейлист"
+msgstr "Затвори плейлиста"
 
 msgctxt "#31058"
 msgid "System music files"
-msgstr "Системна музика"
+msgstr "Музикални файлове (системни)"
 
 msgctxt "#31059"
 msgid "Current playlist"
@@ -191,15 +149,15 @@ msgstr "Текущ плейлист"
 
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
-msgstr "Изберете място, от което искате да възпроизвеждате."
+msgstr "Файлът е в група. Моля, изберете частта, която да бъде възпроизведена."
 
 msgctxt "#31061"
 msgid "Current Selected"
-msgstr "Текущо избрани"
+msgstr "Избрано"
 
 msgctxt "#31101"
 msgid "Home screen options"
-msgstr "Настройки на начален екран"
+msgstr "Настройки на началния екран"
 
 msgctxt "#31102"
 msgid "Background"
@@ -207,31 +165,31 @@ msgstr "Фон"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "Покажи \"На Пауза\" в слайдшоу на снимки"
+msgstr "Показвай \"На Пауза\" индикация при слайдшоу от снимки"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
-msgstr "Възпроизведи трейлърите в прозорец [COLOR=grey3](Само диалог за видео инфо)[/COLOR]"
+msgstr "Възпроизвеждай трейлърите в \"Информация за филма\"[COLOR=grey3], вместо в нов прозорец[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
-msgstr "Разни опции"
+msgstr "Разни настройки"
 
 msgctxt "#31107"
 msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr ""
+msgstr "Скривай флаговете от имената на файловете [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
 
 msgctxt "#31108"
 msgid "Hide Main Menu Buttons"
-msgstr "Скрий бутоните на главното меню"
+msgstr "Скриване на бутони от главното меню"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Фон на начален екран"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Редактиране на фон за Начало:"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -239,59 +197,43 @@ msgstr "Скрий"
 
 msgctxt "#31112"
 msgid "Options"
-msgstr "Опции"
-
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Една картина"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Много картини"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Потребителски"
+msgstr "Настройки"
 
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Показвай наскоро добавените албуми"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
-msgstr "Покажи Наскоро добавени видео"
+msgstr "Показвай наскоро добавените видео файлове"
 
 msgctxt "#31118"
 msgid "Home Page Programs Submenu"
-msgstr "Подменю Начална страница"
+msgstr "Добавки към подменюто на \"Програми\" от началния екран"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
-msgstr "Включи протребителски Скрипт Бутон"
-
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ЕТИКЕТ НА БУТОН"
+msgstr "Скривай фоновия Fanart"
 
 msgctxt "#31122"
 msgid "Weather Page"
-msgstr "Страница Времето"
+msgstr "Страница \"Времето\""
 
 msgctxt "#31123"
 msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
-msgstr "Ползвай \"Плакати\" вместо \"Банери\" за ТВ Шоу"
+msgstr "За ТВ Сериали ползвам \"Плакати\" вместо \"Банери\""
 
 msgctxt "#31124"
 msgid "Show Background \"Now Playing\" Video"
-msgstr "Покажи фон \"Възпроизвеждам\" Видео"
+msgstr "Ползвай за фон възпроизвежданото в момента видео"
 
 msgctxt "#31125"
 msgid "Show Background \"Now Playing\" Visualization"
-msgstr "Покажи фон \"Възпроизвеждам\" Визуализация"
+msgstr "Ползвай за фон текущата визуализация"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Пусни тв музика във видео библиотеката (TvTunes добавка)"
+msgstr "Тематични мелодии от ТВ Сериали във видео библиотеката (добавка TvTunes)"
 
 msgctxt "#31127"
 msgid "TvTunes"
@@ -299,27 +241,31 @@ msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
-msgstr "Текст"
+msgstr "Лирики"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
 
 msgctxt "#31132"
 msgid "Lyrics Add-on"
-msgstr "Добавка за текст"
+msgstr "Добавка за лирики"
 
 msgctxt "#31133"
 msgid "Subtitle Add-on"
-msgstr "Добавка субтитри"
+msgstr "Добавка за субтитри"
 
 msgctxt "#31134"
 msgid "Home Page Videos Submenu"
-msgstr "Начална страница подменю Видео"
+msgstr "Добавки към подменюто на \"Видео\" от началния екран"
 
 msgctxt "#31135"
 msgid "Home Page Music Submenu"
-msgstr "Начална страница подменю Музика"
+msgstr "Добавки към подменюто на \"Музика\" от началния екран"
 
 msgctxt "#31136"
 msgid "Home Page Pictures Submenu"
-msgstr "Начална страница подменю Снимки"
+msgstr "Добавки към подменюто на \"Снимки\" от началния екран"
 
 msgctxt "#31140"
 msgid "Music OSD"
@@ -333,37 +279,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Преки пътища"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Категории"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Покажи ролите"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
-msgstr "Избери песен"
-
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Секзия връзки"
+msgstr "Изберете вашата песен"
 
 msgctxt "#31205"
 msgid "Lyrics Source"
-msgstr "Източник на текст на песен"
+msgstr "Източник на лирики"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Резултат:"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Търси още елементи"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Предстоящи епизоди"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -371,99 +305,67 @@ msgstr "Текуща температура"
 
 msgctxt "#31301"
 msgid "Last Updated"
-msgstr "Последно обновен"
-
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Меню"
+msgstr "Последна актуализация"
 
 msgctxt "#31303"
 msgid "Data provider"
-msgstr ""
-
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Снимка"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Не е открит медия диск"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Извади"
+msgstr "Доставчик на данни"
 
 msgctxt "#31307"
 msgid "Hide Fanart"
-msgstr "Скрий плакат"
+msgstr "Скрий Fanart-а"
 
 msgctxt "#31308"
 msgid "Movie Details"
-msgstr "Детайли Филм"
+msgstr "Подробности за филма"
 
 msgctxt "#31309"
 msgid "Memory Used:"
-msgstr "Използвана памет:"
+msgstr "Памет в употреба:"
 
 msgctxt "#31310"
 msgid "Track Number"
-msgstr "Номер на песен"
+msgstr "Аудио запис №"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "ПЛАКАТ[CR][CR]НЕДОСТЪПЕН[CR][CR] НАТИСНИ БУТОНА ЗА ЗАДАВАНЕ"
+msgstr "Не е зададено[CR][CR]Fanart изображение[CR][CR]Натиснете бутона, за да изберете"
 
 msgctxt "#31312"
 msgid "Current Scraper"
-msgstr "Текущ Сайт Инфо"
+msgstr "Текущ източник на инф."
 
 msgctxt "#31313"
 msgid "Choose a Scraper"
-msgstr "Сайт Инфо"
+msgstr "Изберете източник на инф."
 
 msgctxt "#31314"
 msgid "Content Scanning Options"
-msgstr "Опции Сканиране на съдържание"
-
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Основни"
+msgstr "Настройки за сканиране на съдържанието"
 
 msgctxt "#31317"
 msgid "Set Fanart Path"
-msgstr "Задай път до Плакат"
-
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Малък Плакат"
+msgstr "Задай път до Fanart-а"
 
 msgctxt "#31319"
 msgid "Selected Profile"
-msgstr "Избран Профил"
+msgstr "Избран профил"
 
 msgctxt "#31320"
 msgid "Last Logged In"
-msgstr "Последно влизане"
+msgstr "Последно вписване"
 
 msgctxt "#31321"
 msgid "Karaoke Song Selector"
-msgstr "Караоке избирател на песни"
+msgstr "Прозорец за избор на караоке песен"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Излъчен"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Последни Филми"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Последни Епизоди"
-
 msgctxt "#31325"
 msgid "Playlist Options"
-msgstr "Опции на Плейлисти"
+msgstr "Настройки на елементите в плейлиста"
 
 msgctxt "#31326"
 msgid "Created"
@@ -475,19 +377,19 @@ msgstr "Резолюция"
 
 msgctxt "#31328"
 msgid "Recently Added"
-msgstr "Наскоро Добавени"
+msgstr "Наскоро добавени"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]ТАЙМЕР УСТАНОВЕН![/B] [COLOR=grey2] - АВТОМАТИЧНО ИЗКЛЮЧВАНЕ[/COLOR]"
+msgstr "[B]ТАЙМЕРЪТ Е НАСТРОЕН![/B] [COLOR=grey2]Изключване след[/COLOR]"
 
 msgctxt "#31330"
 msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Натисни бутон за възпроизвеждане[CR][CR]Трейлър"
+msgstr "Натиснете бутона, за да започне[CR][CR]възпроизвеждането на трейлъра"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr "Албум детайли"
+msgstr "Подробности за албума"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -495,79 +397,119 @@ msgstr "Пауза"
 
 msgctxt "#31352"
 msgid "Stop"
-msgstr "Стоп"
+msgstr "Спри"
 
 msgctxt "#31353"
 msgid "Fast Forward"
-msgstr "Превъртане напред"
+msgstr "Превърти напред"
 
 msgctxt "#31354"
 msgid "Rewind"
-msgstr "Превъртане назад"
+msgstr "Превърти назад"
 
 msgctxt "#31355"
 msgid "Movie menu"
-msgstr "Меню филм"
+msgstr "Меню на филма"
 
 msgctxt "#31356"
 msgid "Download Subtitles"
-msgstr "Свали субтитри"
+msgstr "Сваляне на субтитри"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "Кожа подразбиране"
+msgstr "Стандартните (за облика)"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
-msgstr "Кожа подразбиране без главни букви"
+msgstr "Стандартните, но без главни букви"
 
 msgctxt "#31392"
 msgid "Arial based"
-msgstr "Ариал базилан"
+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]Настройки на скрийнсейвър"
+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]Управление на видео библиотека · Настройки на видео възпроизвеждане · Промяна на видео файловите опции · Задаване на шрифт за субтитри"
+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]Управление на музикалната библиотека · Настройки на възпроизвежданена музика · Промяна на музикалните файлови опции · Настройки на караоке"
+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]Настройка на листингови опции · Конфигуриране на слайдшоу"
+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]Изберете до три града, за които желаете да следите прогнозата"
 
 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]Найстройки на дистанционни управления · Настройки на запазване на захранването · Включване на дебъг · Настройки на главно заключване"
+msgstr "[B]КОНФИГУРИРАЙТЕ СИСТЕМАТА[/B][CR][CR]Настройте и калибрирайте екраните · Настройте компютъра да пести енергия[CR]Настройте дистанционните · Конфигурирайте аудио изхода · Включете Debug режима · Задайте код за заключване"
 
 msgctxt "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
-msgstr "[B]КОНФИГУРИРАНЕ НАСТРОЙКИ ЗА КОЖА[/B][CR][CR]Настройки на кожа Confluence · Добавяне и премахване на позиции от начален екран · Промяна фона на кожите"
+msgstr "[B]КОНФИГУРИРАЙТЕ ОБЛИКА[/B][CR][CR]Настройте облика \"Confluence\" · Променете фоновете на облика[CR]Добавете/Премахнете елементи от менюто на началния екран"
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr "[B]КОНФИГУРИРАНЕ ДОБАВКИ[/B][CR][CR]Управление на инсталираните добавки · Разглеждане и инсталиране на добавки от xbmc.org · Промяна на настройките на добавките"
+msgstr "[B]КОНФИГУРИРАЙТЕ ДОБАВКИТЕ[/B][CR][CR]Управлявайте инсталираните добавки · Променяйте настройките на добавките[CR]Разглеждайте/Инсталирайте добавки от xbmc.org"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
-msgstr "Изберете XBMC потребителски профил[CR]за вход и продължаване"
+msgstr "Изберете потребителски профил,[CR]за да продължите"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 "#31900"
-msgid "Weather Maps"
-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"
@@ -575,11 +517,11 @@ msgstr "36 часова прогноза"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr "Часова прогноза"
+msgstr "Почасова прогноза"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
-msgstr "Уикенд прогноза"
+msgstr "Прогноза за уикенда"
 
 msgctxt "#31904"
 msgid "10 Day Forecast"
@@ -591,16 +533,12 @@ msgstr "Прогноза"
 
 msgctxt "#31906"
 msgid "Maps & Video"
-msgstr "Карти & Видео"
-
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Видео Прогноза [COLOR=grey2](Fullscreen Playback)[/COLOR]"
+msgstr "Карти и видео"
 
 msgctxt "#31908"
 msgid "Chance of Precipitation"
-msgstr "Възможност от превалявания"
+msgstr "Вероятност за преваляване"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr "Извличане информация за прогноза..."
+msgstr "Изтегляне на прогнозата..."
diff --git a/addons/skin.confluence/language/Catalan/strings.po b/addons/skin.confluence/language/Catalan/strings.po
index 05fadd58cc..82a4f5c5a9 100644
--- a/addons/skin.confluence/language/Catalan/strings.po
+++ b/addons/skin.confluence/language/Catalan/strings.po
@@ -3,51 +3,34 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# David Soms <dsoms.spam@gmail.com>, 2012.
+#   <regi24@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-07-29 10:03+0000\n"
+"Last-Translator: David Soms <dsoms.spam@gmail.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Aparença Confluence, per Jezz_X. (Aparença per defecte de l'XBMC)"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence és l'aparença per defecte de l'XBMC 9.11 i superior. És una combinació de conceptes de moltes aparences populars, i intenta adoptar i integrar les seves bones idees en una aparença que sigui senzilla d'entendre i utilitzar per els nous usuaris d'XBMC."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "Confluence és l'aparença per defecte de l'XBMC, la seva eliminació pot causar problemes."
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Canvia la"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "M'agrada"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "No m'agrada"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Opcions d'energia"
 
 msgctxt "#31004"
 msgid "Working..."
-msgstr "Treballant..."
+msgstr "Carregant..."
 
 msgctxt "#31005"
 msgid "Hide Information"
@@ -55,11 +38,7 @@ msgstr "Amaga la informació"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr "Veure les opcions"
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Connectors"
+msgstr "Opcions de la vista"
 
 msgctxt "#31008"
 msgid "Fullscreen"
@@ -67,15 +46,7 @@ msgstr "Pantalla completa"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Afegits recentment"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Fitxers - Vídeo"
+msgstr "Duració total"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +80,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Llista completa"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Miniatures"
@@ -139,23 +106,15 @@ msgstr "EN PAUSA"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
-msgstr "AVANÇA RÀPID"
+msgstr "AVANÇ RÀPID"
 
 msgctxt "#31045"
 msgid "REWIND"
 msgstr "REBOBINA"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Propietats de l'àudio"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Predefinit actual"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Visualitzacions predefinides"
+msgstr "Visualitzacions preestablertes"
 
 msgctxt "#31049"
 msgid "End Time"
@@ -207,7 +166,7 @@ msgstr "Fons"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "Visualitza \"En pausa\" en mode de presentació d'imatges"
+msgstr "Mostra \"Pausa\" a la presentació d'imatges"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
@@ -219,19 +178,19 @@ msgstr "Opcions vàries"
 
 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]"
+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 "Media backgrounds"
-msgstr "Fons multimèdia"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Edita el fons per els continguts multimèdia"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opcions"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Una imatge"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Múltiples imatges"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Personalitzador"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Mostra els àlbums afegits recentment"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,17 +216,13 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Amaga el fanart del fons"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ETIQUETA DEL BOTÓ"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Pàgina del temps"
 
 msgctxt "#31123"
 msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
-msgstr "Utilitza \"Cartells\" en lloc de \"Bàners\" per als programes de televisió"
+msgstr "Utilitza \"Cartells\" en lloc de \"Bàners\" per les sèries de televisió"
 
 msgctxt "#31124"
 msgid "Show Background \"Now Playing\" Video"
@@ -291,7 +234,7 @@ msgstr "Mostra la visualització en reproducció en el fons"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "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)"
 
 msgctxt "#31127"
 msgid "TvTunes"
@@ -301,6 +244,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lletres"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Complement de lletres"
@@ -333,37 +280,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Dreceres de teclat"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Categories"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Mostra el repartiment"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Escull la teva cançó"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Enllaços de secció"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Origen de les lletres"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Trobat"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Troba més elements"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Propers episodis"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -371,28 +306,12 @@ msgstr "Temperatura actual"
 
 msgctxt "#31301"
 msgid "Last Updated"
-msgstr "Actualització més recent"
-
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menú"
+msgstr "Última actualització"
 
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Proveïdor de dades"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Imatge"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "No s'ha detectat cap disc amb continguts multimèdia"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Expulsa"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Amaga el fanart"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Opcions d'escaneig de continguts"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Bàsic"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Estableix el camí del fanart"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Fanart petit"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Perfil seleccionat"
@@ -453,14 +364,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Emès"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Pel·lícules més recents"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Episodis més recents"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Opcions de la llista de reproducció"
@@ -499,7 +402,7 @@ msgstr "Atura"
 
 msgctxt "#31353"
 msgid "Fast Forward"
-msgstr "Avança ràpid"
+msgstr "Avanç ràpid"
 
 msgctxt "#31354"
 msgid "Rewind"
@@ -511,7 +414,7 @@ msgstr "Menú de la pel·lícula"
 
 msgctxt "#31356"
 msgid "Download Subtitles"
-msgstr "Descarrega els subtítols"
+msgstr "Baixar-se els subtítols"
 
 msgctxt "#31390"
 msgid "Skin default"
@@ -558,16 +461,56 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]CONFIGUREU ELS COMPLEMENTS[/B][CR][CR]Gestioneu els complements instal·lats · Cerqueu i instal·leu complements des de xbmc.org[CR]Modifiqueu els paràmetres dels complements"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
-msgstr "Seleccioneu el vostre perfil d'usuari[CR]per iniciar la sessió i continuar"
+msgstr "Seleccioneu el vostre perfil d'usuari de l'XBMC[CR]per iniciar la sessió i continuar"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+msgstr ""
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Mapes del temps"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +536,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Mapes i vídeo"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Vídeo de la predicció [COLOR=grey2](Reproducció a pantalla completa)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Possibilitat de precipitació"
diff --git a/addons/skin.confluence/language/Chinese (Simple)/strings.po b/addons/skin.confluence/language/Chinese (Simple)/strings.po
index 0d288befcd..ea30358330 100644
--- a/addons/skin.confluence/language/Chinese (Simple)/strings.po
+++ b/addons/skin.confluence/language/Chinese (Simple)/strings.po
@@ -3,44 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <taxigps@sina.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-05-31 16:18+0000\n"
+"Last-Translator: taxigps <taxigps@sina.com>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Jezz_X开发的Confluence皮肤"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "在XBMC 9.11之后的版本中Confluence是默认皮肤。它集合了许多流行皮肤的创意，力求把这些优点融合到一个皮肤中，使得首次使用XBMC的用户能更容易上手。"
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "Confluence是XMBC的默认皮肤，删除它可能导致故障。"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "修改您的"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "喜欢"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "讨厌"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "电源选项"
@@ -57,25 +39,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "视图选项"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "插件"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "全屏"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "最新增加"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "视频 - 文件"
+msgstr "总时长"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "同人画"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "完整列表"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "图片缩略图"
@@ -145,14 +111,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "回退"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "音频属性"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "当前预设"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "可视化效果设置"
@@ -226,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "隐藏主菜单按钮"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "媒体背景"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "编辑媒体背景"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +199,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "选项"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "单个图片"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "多个图片"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "自定义"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "显示最新加入专辑"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "隐藏同人画背景"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "按钮标签"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "天气页面"
@@ -301,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "歌词"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "歌词扩展功能"
@@ -333,37 +279,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "快捷方式"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "分类"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "显示演员表"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "选择歌曲"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "区块链接"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "歌词来源"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "找到"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "查找更多项目"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "即将播出的分集"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "最近修改"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "菜单"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "数据来源"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "图片"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "未检测到光盘"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "弹出"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "隐藏同人画"
@@ -425,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "内容扫描选项"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "基本信息"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "设置同人画目录"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "小同人画"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "选择用户配置文件"
@@ -453,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "首播"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "最新电影"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "最新剧集"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "播放列表选项"
@@ -558,6 +460,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]设置扩展功能[/B][CR][CR]管理你安装的扩展功能 · 在xbmc.org浏览并安装扩展功能 · 修改扩展功能设置"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +471,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "选择您的用户配置文件[CR]登录并继续"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "气象图"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "图像 & 视频"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "视频预报 [COLOR=grey2]（全屏播放）[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "降雨概率"
diff --git a/addons/skin.confluence/language/Chinese (Traditional)/strings.po b/addons/skin.confluence/language/Chinese (Traditional)/strings.po
index 11e34c5019..f7abbeec56 100644
--- a/addons/skin.confluence/language/Chinese (Traditional)/strings.po
+++ b/addons/skin.confluence/language/Chinese (Traditional)/strings.po
@@ -3,43 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Wei-Hsiang Hung <weihsiang.hung@gmail.com>, 2012.
+# 偉翔 洪 <weihsiang.hung@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-12 03:42+0000\n"
+"Last-Translator: 偉翔 洪 <weihsiang.hung@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31000"
 msgid "Change Your"
-msgstr "修改您的"
-
-msgctxt "#31001"
-msgid "Love"
-msgstr "喜歡"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "討厭"
+msgstr "修改你的"
 
 msgctxt "#31003"
 msgid "Power Options"
@@ -47,7 +30,7 @@ msgstr "電源選項"
 
 msgctxt "#31004"
 msgid "Working..."
-msgstr "工作中..."
+msgstr "處理中..."
 
 msgctxt "#31005"
 msgid "Hide Information"
@@ -57,25 +40,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "檢視選項"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "外掛"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "全螢幕"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "最近新增"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "視訊 - 檔案"
+msgstr "總計時間"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +80,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "劇照"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "全部清單"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "圖片縮圖"
@@ -131,7 +98,7 @@ msgstr "正在播放"
 
 msgctxt "#31042"
 msgid "PLAYING"
-msgstr "正在播方"
+msgstr "正在播放"
 
 msgctxt "#31043"
 msgid "PAUSED"
@@ -145,14 +112,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "倒轉"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "音效屬性"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "目前設定"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "視覺效果設定"
@@ -226,12 +185,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "隱藏主選單按鈕"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "媒體背景"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "編輯媒體類型的背景"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "選項"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "單一圖片"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "多張圖片"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "自訂"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "顯示最近加入的專輯"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,13 +216,9 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "隱藏背景劇照"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "按鈕標籤"
-
 msgctxt "#31122"
 msgid "Weather Page"
-msgstr "氣象頁面"
+msgstr "天氣頁面"
 
 msgctxt "#31123"
 msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
@@ -291,16 +234,20 @@ msgstr "在背景顯示正在播放的視覺效果"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr ""
+msgstr "在視訊資料庫中播放電視主題曲（TvTunes 附加元件）"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr ""
+msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "歌詞"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "歌詞附加元件"
@@ -333,21 +280,9 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "捷徑"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "分類"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "顯示演員"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
-msgstr "選擇您的歌曲"
-
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "段落連結"
+msgstr "選擇你的歌曲"
 
 msgctxt "#31205"
 msgid "Lyrics Source"
@@ -355,15 +290,15 @@ msgstr "歌詞來源"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "已找到"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "尋找更多項目"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "劇集預告"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,25 +308,9 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "最後更新"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "選單"
-
 msgctxt "#31303"
 msgid "Data provider"
-msgstr ""
-
-msgctxt "#31304"
-msgid "Picture"
-msgstr "圖片"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "沒有偵測到光碟媒體"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "退出"
+msgstr "資料提供者"
 
 msgctxt "#31307"
 msgid "Hide Fanart"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "內容掃描選項"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "基本"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "設定劇照路徑"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "小劇照"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "選擇的設定檔"
@@ -453,14 +364,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "首播"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "最新電影"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "最新劇集"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "播放清單選項"
@@ -519,45 +422,49 @@ msgstr "主題預設"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
-msgstr ""
+msgstr "佈景主題預設（沒有開頭大寫）"
 
 msgctxt "#31392"
 msgid "Arial based"
-msgstr ""
+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]設定螢幕保護程式"
+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]設定字幕字型"
+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]設定歌曲提交 · 設定卡拉OK選項"
+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]設定圖片清單選項 · 設定幻燈片秀"
+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]設定三個要收集天氣資料的城市"
 
 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]設定節能選項 · 啟用除錯 · 設定鎖定密碼"
+msgstr "[B]配置系統設定[/B][CR][CR]設定和校正顯示輸出 · 設定音效輸出 · 設定遙控器[CR]設定節能選項 · 啟用除錯 · 設定鎖定密碼"
 
 msgctxt "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
-msgstr "[B]設定佈景主題[/B][CR][CR]設定 Confluence 佈景主題 · 新增或移除首頁選單項目[CR]修改佈景主題背景"
+msgstr "[B]配置佈景主題[/B][CR][CR]設定 Confluence 佈景主題 · 新增或移除首頁選單項目[CR]修改佈景主題背景"
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr "[B]設定附加元件[/B][CR][CR]管理已安裝的附加元件 · 從 xbmc.org 瀏覽並安裝附加元件[CR]修改附加元件設定"
+msgstr "[B]配置附加元件[/B][CR][CR]管理已安裝的附加元件 · 從 xbmc.org 瀏覽並安裝附加元件[CR]修改附加元件設定"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +472,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "選擇您的 XBMC 使用者設定檔[CR]登入並繼續"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "天氣地圖"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +536,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "地圖 & 影片"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "影片預報 [COLOR=grey2]〈全螢幕播放〉[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "降雨機率"
diff --git a/addons/skin.confluence/language/Croatian/strings.po b/addons/skin.confluence/language/Croatian/strings.po
new file mode 100644
index 0000000000..7050081bce
--- /dev/null
+++ b/addons/skin.confluence/language/Croatian/strings.po
@@ -0,0 +1,547 @@
+# XBMC Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon version: 2.1.0
+# Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <ivan.p4vlovic@gmail.com>, 2012.
+# Ljubo Šimić <aske777@gmail.com>, 2012.
+#   <tujo2005@gmail.com>, 2012.
+# Zoran Mitić <mitic.zoran@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-08-26 10:49+0000\n"
+"Last-Translator: Zoran Mitić <mitic.zoran@hotmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: 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 "Promjenite Vaš"
+
+msgctxt "#31003"
+msgid "Power Options"
+msgstr "Mogućnosti napajanja"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "radim..."
+
+msgctxt "#31005"
+msgid "Hide Information"
+msgstr "Sakrij podatke"
+
+msgctxt "#31006"
+msgid "View Options"
+msgstr "Opcije Pregleda"
+
+msgctxt "#31008"
+msgid "Fullscreen"
+msgstr "Cijeli zaslon"
+
+msgctxt "#31009"
+msgid "Total Duration"
+msgstr "Ukupno trajanje"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Glazba - datoteke"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "Igra"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Stranica"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "Stavke"
+
+msgctxt "#31026"
+msgid "Misc Options"
+msgstr "Razne mogućnosti"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "Mjesto"
+
+msgctxt "#31028"
+msgid "Poster Wrap"
+msgstr "Omot Postera"
+
+msgctxt "#31029"
+msgid "Fanart"
+msgstr "Fanart"
+
+msgctxt "#31031"
+msgid "Pic Thumbs"
+msgstr "Slikovne Ikonice"
+
+msgctxt "#31032"
+msgid "Image Wrap"
+msgstr "Omot slike"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "#31040"
+msgid "Now Playing"
+msgstr "Trenutno Reproducira"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "REPRODUCIRA"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "PAUSIRANO"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "Brzo premotaj"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "PREMOTATI"
+
+msgctxt "#31048"
+msgid "Visualization Presets"
+msgstr "Vizualizacija Memorirana"
+
+msgctxt "#31049"
+msgid "End Time"
+msgstr "Završava"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Sortiraj: Ulazne"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Sortiraj: Izlazne"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Otvori listu izvedbi"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "Snimi listu izvedbi"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Zatvori listu izvedbi"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "Sustav glazbene datoteke"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Trenutna lista izvedbi"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "Ova datoteka je složena, odaberite dio koji želite pokreniti od."
+
+msgctxt "#31061"
+msgid "Current Selected"
+msgstr "Trenutno odabran"
+
+msgctxt "#31101"
+msgid "Home screen options"
+msgstr "Opcije početnog zaslon"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "Podloga"
+
+msgctxt "#31103"
+msgid "Show \"Paused\" in picture slide show"
+msgstr "Prikaži  \"Zaustavljeno\" u slikama dijaprojekcije"
+
+msgctxt "#31104"
+msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
+msgstr "Pokreni Najave na ekranu [COLOR=grey3](Video Informacije samo dijalog)[/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 Označavanje čitanje iz video datoteka [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
+
+msgctxt "#31108"
+msgid "Hide Main Menu Buttons"
+msgstr "Sakrite tipke glavnog izbornika"
+
+msgctxt "#31109"
+msgid "Enable Custom Background"
+msgstr ""
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr ""
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Sakrij"
+
+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 dodan Video"
+
+msgctxt "#31118"
+msgid "Home Page Programs Submenu"
+msgstr "Početna Stranica Programa Podizbornika"
+
+msgctxt "#31119"
+msgid "Hide Background Fanart"
+msgstr "Sakrij Pozadina Fanarta"
+
+msgctxt "#31122"
+msgid "Weather Page"
+msgstr "Vremenska oznaka"
+
+msgctxt "#31123"
+msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr "Koristite \"Plakati\" umjesto \"Transparenti\" za TV emisije"
+
+msgctxt "#31124"
+msgid "Show Background \"Now Playing\" Video"
+msgstr "Prikaži pozadinu \"Sad Igra\" Video"
+
+msgctxt "#31125"
+msgid "Show Background \"Now Playing\" Visualization"
+msgstr "Prikaži Pozadinu \"Sad igra\" Vizualizacija"
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "Izvodite pjesme iz tematski TV u videoteke (TvTunes Dodatci)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvTunes"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "tekst"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
+msgctxt "#31132"
+msgid "Lyrics Add-on"
+msgstr "Dodatci teksta skladbe"
+
+msgctxt "#31133"
+msgid "Subtitle Add-on"
+msgstr "Dodatak za podnapise"
+
+msgctxt "#31134"
+msgid "Home Page Videos Submenu"
+msgstr " Video podizbornik naslovnice"
+
+msgctxt "#31135"
+msgid "Home Page Music Submenu"
+msgstr "Glazbeni podizbornik naslovnice"
+
+msgctxt "#31136"
+msgid "Home Page Pictures Submenu"
+msgstr "Slike podizbornika naslovnice"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "Glazba OSD"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "Video OSD"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "Prečaci"
+
+msgctxt "#31203"
+msgid "Choose Your Song"
+msgstr "Izaberi pjesmu"
+
+msgctxt "#31205"
+msgid "Lyrics Source"
+msgstr "Izvor teksta skladbe"
+
+msgctxt "#31206"
+msgid "Found"
+msgstr "Pronađeno"
+
+msgctxt "#31207"
+msgid "Find More Items"
+msgstr "Potraži još stvari"
+
+msgctxt "#31208"
+msgid "Upcoming Episodes"
+msgstr "Nadolazeće epizode"
+
+msgctxt "#31300"
+msgid "Current Temp"
+msgstr "Trenutna temperatura"
+
+msgctxt "#31301"
+msgid "Last Updated"
+msgstr "Posljednja nadogradnja"
+
+msgctxt "#31303"
+msgid "Data provider"
+msgstr "Pružatelj podataka"
+
+msgctxt "#31307"
+msgid "Hide Fanart"
+msgstr "Skriti Fanart"
+
+msgctxt "#31308"
+msgid "Movie Details"
+msgstr "Filmske pojedinosti"
+
+msgctxt "#31309"
+msgid "Memory Used:"
+msgstr "Iskorištena memorija:"
+
+msgctxt "#31310"
+msgid "Track Number"
+msgstr "Redni br. skladbe"
+
+msgctxt "#31311"
+msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
+msgstr "Fanart slika [CR] [CR] Nedostupno [CR] [CR] Kliknite gumb za postavljanje"
+
+msgctxt "#31312"
+msgid "Current Scraper"
+msgstr "Trenutni Strugač"
+
+msgctxt "#31313"
+msgid "Choose a Scraper"
+msgstr "Odaberi Strugač"
+
+msgctxt "#31314"
+msgid "Content Scanning Options"
+msgstr "Sadržaj opcija skeniranja"
+
+msgctxt "#31317"
+msgid "Set Fanart Path"
+msgstr "Postavite put Fanarta"
+
+msgctxt "#31319"
+msgid "Selected Profile"
+msgstr "Odabrani Profil"
+
+msgctxt "#31320"
+msgid "Last Logged In"
+msgstr "Posljednji prijavljeni"
+
+msgctxt "#31321"
+msgid "Karaoke Song Selector"
+msgstr "Karoke Selektor Pjesama"
+
+msgctxt "#31322"
+msgid "Aired"
+msgstr "Emitirano"
+
+msgctxt "#31325"
+msgid "Playlist Options"
+msgstr "Opcije Lista Izvedbi"
+
+msgctxt "#31326"
+msgid "Created"
+msgstr "Postavio"
+
+msgctxt "#31327"
+msgid "Resolution"
+msgstr "Rezolucija"
+
+msgctxt "#31328"
+msgid "Recently Added"
+msgstr "Nedavno Dodano"
+
+msgctxt "#31329"
+msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
+msgstr "[B]Podesi tajmer![/B] [COLOR=grey2] - Sistem se automatski gasi za[/COLOR]"
+
+msgctxt "#31330"
+msgid "Click button to play[CR][CR]Movie trailer"
+msgstr "Kliknite gumb za reprodukciju [CR] [CR] Filmski najava"
+
+msgctxt "#31331"
+msgid "Album Details"
+msgstr "Detalji Albuma"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "Pauza"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Stani"
+
+msgctxt "#31353"
+msgid "Fast Forward"
+msgstr "Brzo napred"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Premotaj"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "Filmski izbornik"
+
+msgctxt "#31356"
+msgid "Download Subtitles"
+msgstr "Preuzmi prijevod"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "Zadani Izgled"
+
+msgctxt "#31391"
+msgid "Skin default with no Caps"
+msgstr "Drugačiji Izgled bez Pokrova"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Temeljen na Arial-u "
+
+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]PODESI POSTAVKE IZGLEDA[/B][CR][CR]Promjeni izgled · Odredi jezik i regiju  · Promjeni mogućnosti prikaza datoteka[CR]Postavite čuvara zaslona"
+
+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]PODESI POSTAVKE VIDEA[/B][CR][CR]Upravljanje Vašom video zbirkom · Postavi mogućnosti izvođenja videa · Promjeni  mogućnosti prikaza video sadržaja[CR]Podesi izgled podnapisa"
+
+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]PODESI POSTAVKE GLAZBE[/B][CR][CR]Upravljanje Vašom glazbenom zbirkom · Postavi mogućnosti izvođenja glazbe · Promjeni mogućnosti prikaza glazbenoga sadržaja[CR]Postavi slanje pjesama · Podesi mogućnosti karaoka"
+
+msgctxt "#31403"
+msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
+msgstr "[B] Urediti postavke slike [/B][CR][CR] Uredi sliku unos opcije · Postavke slikovnom prikazu"
+
+msgctxt "#31404"
+msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
+msgstr "[B] Uredi Postavke Vremena [/ b] [CR] [CR] Postavi tri grada i prikupi 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] Uredi postavke sustava [/ B] [CR] [CR] Podešavanje i kalibriranjem zaslona · Uredi audio izlaz · Postavljanje daljinskog upravljača [CR] Postavite opcije uštede energije  · Omogućite ispravljanje pogrešaka · Postavljanje glavnog zaključavanja"
+
+msgctxt "#31407"
+msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
+msgstr "[B] Uredi POSTAVKE Izgleda [/ b] [CR] [CR] Postavljanje Confluence izgleda · Dodavanje i uklanjanje stavke glavnog izbornik  [CR] Promjena izgleda pozadine"
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
+msgstr "[B] Uredite  DODATKE [/ B] [CR] [CR] Upravljate instaliranim dodacima · Pregledavajte i instalirajte dodatke iz xbmc.org [CR] Modificirajte  postavke DODATAKA"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr ""
+
+msgctxt "#31421"
+msgid "Select your XBMC user Profile[CR]to login and continue"
+msgstr "Odaberite svoj korisnički profil XBMC [CR] Te se prijavite i nastavite"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 "Prognoza za 36 sati"
+
+msgctxt "#31902"
+msgid "Hourly Forecast"
+msgstr "Prognoza za sat"
+
+msgctxt "#31903"
+msgid "Weekend Forecast"
+msgstr "Prognoza za vikend"
+
+msgctxt "#31904"
+msgid "10 Day Forecast"
+msgstr "Prognoza za 10 dana"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Prognoza"
+
+msgctxt "#31906"
+msgid "Maps & Video"
+msgstr "Mape & Video"
+
+msgctxt "#31908"
+msgid "Chance of Precipitation"
+msgstr "Moguće padaline"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "Dohvaćanje  informacija vremenske prognoze  ..."
diff --git a/addons/skin.confluence/language/Czech/strings.po b/addons/skin.confluence/language/Czech/strings.po
index 6786d12ed7..04683ea3bb 100644
--- a/addons/skin.confluence/language/Czech/strings.po
+++ b/addons/skin.confluence/language/Czech/strings.po
@@ -3,47 +3,30 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <jenda.mek@centrum.cz>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-08-26 12:07+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Změnit"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Milovat"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Nesnášet"
-
 msgctxt "#31003"
 msgid "Power Options"
-msgstr "Napájení"
+msgstr "Možnosti napájení"
 
 msgctxt "#31004"
 msgid "Working..."
@@ -51,31 +34,19 @@ msgstr "Pracuji..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Skrýt Info"
+msgstr "Skrýt informace"
 
 msgctxt "#31006"
 msgid "View Options"
 msgstr "Zobrazit možnosti"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Pluginy"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Nejnovější položky"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Soubory"
+msgstr "Celková doba trvání"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,13 +80,9 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Seznam"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
-msgstr "Náhledy"
+msgstr "Náhledy obrázků"
 
 msgctxt "#31032"
 msgid "Image Wrap"
@@ -123,11 +90,11 @@ msgstr "Obrázky"
 
 msgctxt "#31033"
 msgid "Info"
-msgstr "Info"
+msgstr "Informace"
 
 msgctxt "#31040"
 msgid "Now Playing"
-msgstr "Přehrává se"
+msgstr "Nyní přehrávám"
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -139,20 +106,12 @@ msgstr "POZASTAVENO"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
-msgstr "PŘETÁČÍ SE VPŘED"
+msgstr "RYCHLE VPŘED"
 
 msgctxt "#31045"
 msgid "REWIND"
 msgstr "PŘETÁČÍ SE ZPĚT"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Vlastnosti zvuku"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Aktuální předvolba"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Předvolby vizualizace"
@@ -163,11 +122,11 @@ msgstr "Čas ukončení"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr "Seřadit: vzestupně"
+msgstr "Řazení: vzestupně"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr "Seřadit: sestupně"
+msgstr "Řazení: sestupně"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -191,7 +150,7 @@ msgstr "Aktuální seznam stop"
 
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
-msgstr "Tento soubor se skládá z více částí. Vyberte tu, od které chcete spustit přehrávání."
+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"
@@ -199,7 +158,7 @@ msgstr "Aktuálně vybraný"
 
 msgctxt "#31101"
 msgid "Home screen options"
-msgstr "Informace na Úvodní obrazovce"
+msgstr "Možnosti úvodní obrazovky"
 
 msgctxt "#31102"
 msgid "Background"
@@ -207,7 +166,7 @@ msgstr "Pozadí"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "Zobrazovat \"Pozastaveno\" při prezentaci obrázků"
+msgstr "Zobrazovat \"Pozastaveno\" při promítání obrázků"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
@@ -215,23 +174,23 @@ msgstr "Přehrávat upoutávky v okně [COLOR=grey3](pouze z okna Informace o vi
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
-msgstr "Různé"
+msgstr "Různá nastavení"
 
 msgctxt "#31107"
 msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Nezobrazovat ikony zdroje videí [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 "Zobrazení sekcí úvodní obrazovky"
+msgstr "Skrýt tlačítka hlavního menu"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Pozadí úvodní obrazovky"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Změnit pozadí úvodní obrazovky - sekce"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,38 +200,22 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Možnosti"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Jeden obrázek"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Více obrázků"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Přizpůsobení"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Zobrazit nedávno přidaná alba"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
-msgstr "Zobrazovat Nejnovější filmy a epizody"
+msgstr "Zobrazovat nedávno přidané filmy"
 
 msgctxt "#31118"
 msgid "Home Page Programs Submenu"
-msgstr "Úvodní obrazovka - nabídka Programy"
+msgstr "Úvodní obrazovka, podmenu programů"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Skrýt Fanart na pozadí"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "NÁZEV POLOŽKY"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Počasí"
@@ -287,7 +230,7 @@ msgstr "Zobrazovat na pozadí právě přehrávané video"
 
 msgctxt "#31125"
 msgid "Show Background \"Now Playing\" Visualization"
-msgstr "Zobrazovat na pozadí vizualizaci"
+msgstr "Zobrazovat právě přehrávanou vizualizaci na pozadí"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -299,107 +242,83 @@ msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
-msgstr "Texty skladeb"
+msgstr "Texty písní"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
 
 msgctxt "#31132"
 msgid "Lyrics Add-on"
-msgstr "Doplněk Texty skladeb"
+msgstr "Doplněk textů písní"
 
 msgctxt "#31133"
 msgid "Subtitle Add-on"
-msgstr "Doplněk Titulky"
+msgstr "Doplněk titulků"
 
 msgctxt "#31134"
 msgid "Home Page Videos Submenu"
-msgstr "Úvodní strana - podmenu Videa"
+msgstr "Úvodní obrazovka, podmenu videí"
 
 msgctxt "#31135"
 msgid "Home Page Music Submenu"
-msgstr "Úvodní strana - podmenu Hudba"
+msgstr "Úvodní obrazovka, podmenu Hudba"
 
 msgctxt "#31136"
 msgid "Home Page Pictures Submenu"
-msgstr "Úvodní strana - podmenu Obrázky"
+msgstr "Úvodní obrazovka, podmenu obrázků"
 
 msgctxt "#31140"
 msgid "Music OSD"
-msgstr "Hudební OSD"
+msgstr "OSD hudby"
 
 msgctxt "#31141"
 msgid "Video OSD"
-msgstr "Video OSD"
+msgstr "OSD videa"
 
 msgctxt "#31200"
 msgid "Shortcuts"
-msgstr "Zástupci"
-
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorie"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Zobrazovat obsazení"
+msgstr "Zkratky"
 
 msgctxt "#31203"
 msgid "Choose Your Song"
-msgstr "Vyberte vaši skladbu"
-
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Odkazy sekcí"
+msgstr "Vyberte Vaši skladbu"
 
 msgctxt "#31205"
 msgid "Lyrics Source"
-msgstr "Zdroj textu skladeb"
+msgstr "Zdroj textu písní"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Nalezeno"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Hledat další položky"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Nadcházející epizody"
 
 msgctxt "#31300"
 msgid "Current Temp"
-msgstr "Aktuální počasí"
+msgstr "Aktuální teplota"
 
 msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Naposledy aktualizováno"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Poskytovatel dat"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Obrázky"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Není vložen žádný optický disk"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Vysunout"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Skrýt Fanart"
 
 msgctxt "#31308"
 msgid "Movie Details"
-msgstr "Detaily o filmu"
+msgstr "Podrobnosti filmu"
 
 msgctxt "#31309"
 msgid "Memory Used:"
@@ -411,7 +330,7 @@ msgstr "Číslo stopy"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "Fanart[CR][CR]není k dispozici[CR][CR] Nastavte ho stisknutím tlačítka"
+msgstr "Fanart[CR][CR]není k dispozici[CR][CR] Nastavte jej kliknutím tlačítka"
 
 msgctxt "#31312"
 msgid "Current Scraper"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Možnosti vyhledávání obsahu"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Základní"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Umístění Fanartu"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Malý Fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Vybraný profil"
@@ -453,17 +364,9 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Odvysíláno"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Nejnovější filmy"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Nejnovější epizody"
-
 msgctxt "#31325"
 msgid "Playlist Options"
-msgstr "Možnosti seznamu stop"
+msgstr "Možnosti seznamu skladeb"
 
 msgctxt "#31326"
 msgid "Created"
@@ -475,7 +378,7 @@ msgstr "Rozlišení"
 
 msgctxt "#31328"
 msgid "Recently Added"
-msgstr "Nejnovější položky"
+msgstr "Nedávno přidané"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
@@ -487,7 +390,7 @@ msgstr "Pro přehrání upoutávky[CR][CR]stiskněte tlačítko"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr "Detaily o albu"
+msgstr "Podrobnosti alba"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -499,7 +402,7 @@ msgstr "Zastavit"
 
 msgctxt "#31353"
 msgid "Fast Forward"
-msgstr "Přetočit vpřed"
+msgstr "Rychle vpřed"
 
 msgctxt "#31354"
 msgid "Rewind"
@@ -527,47 +430,87 @@ msgstr "Písmo 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]MOŽNOSTI PROSTŘEDÍ[/B][CR][CR]Změna vzhledu · Výběr jazyka a oblasti · Možnosti zobrazení souborů[CR]Nastavení spořiče obrazovky"
+msgstr "[B]NASTAVENÍ MOŽNOSTÍ VZHLEDU PROSTŘEDÍ[/B][CR][CR]Změna vzhledu · Výběr jazyka a oblasti · Možnosti zobrazení souborů[CR]Nastavení spořiče obrazovky"
 
 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]MOŽNOSTI VIDEA[/B][CR][CR]Správa knihovny videí · Možnosti přehrávání videa · Možnosti zobrazení video souborů[CR]Nastavení fontu titulků"
+msgstr "[B]NASTAVENÍ MOŽNOSTÍ VIDEA[/B][CR][CR]Správa knihovny videí · Možnosti přehrávání videa · Možnosti zobrazení video souborů[CR]Nastavení fontu titulků"
 
 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 knihovny hudby · Možnosti přehrávání hudby · Možnosti zobrazení hudeb. souborů[CR]Služby pro odesílání informací o přehrávaných skladbách · Nastavení karaoke"
+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]MOŽNOSTI OBRÁZKŮ[/B][CR][CR]Možnosti zobrazení obrázků · Konfigurace prezentace"
+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]MOŽNOSTI POČASÍ[/B][CR][CR]Nastavení oblastí pro předpověď počasí"
+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]MOŽNOSTI SYSTÉMU[/B][CR][CR]Nastavení obrazovky · Konfigurace výstupu zvuku · Nastavení dálkového ovládání[CR]Možnosti úsporného režimu · Ukládání informací o ladění · Rodičovský zámek"
+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 · Povolit informací o ladění · Rodičovský zámek"
 
 msgctxt "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
-msgstr "[B]MOŽNOSTI VZHLEDU[/B][CR][CR]Přizpůsobení vzhledu Confluence · Správa sekcí na úvodní obrazovce[CR]Nastavení pozadí vzhledu"
+msgstr "[B]NASTAVENÍ MOŽNOSTÍ VZHLEDU[/B][CR][CR]Nastavení vzhledu Confluence · Správa sekcí úvodní obrazovky[CR]Změnit pozadí vzhledu"
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr "[B]MOŽNOSTI DOPLŇKŮ[/B][CR][CR]Správa nainstalovaných doplňků · Vyhledávání a instalace doplňků z xbmc.org[CR]Nastavení doplňků"
+msgstr "[B]NASTAVENÍ MOŽNOSTÍ DOPLŇKŮ[/B][CR][CR]Správa nainstalovaných doplňků · Vyhledávání a instalace doplňků z xbmc.org[CR]Nastavení doplňků"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
-msgstr "Přihlášení uživatele[CR]Pokračujte výběrem profilu"
+msgstr "Vyberte preofil XBMC[CR]pro přihlášení a pokračování"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+msgstr ""
+
+msgctxt "#31501"
+msgid "Scheduled Time"
+msgstr ""
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Mapy počasí"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,14 +536,10 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Mapy a Video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Video předpověď [COLOR=grey2](Přehrávání na celé obrazovce)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Pravděpodobnost srážek"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr "Načítání informací o předpovědi..."
+msgstr "Získávám informace předpovědi..."
diff --git a/addons/skin.confluence/language/Danish/strings.po b/addons/skin.confluence/language/Danish/strings.po
index 67707a52df..32f9ee49fb 100644
--- a/addons/skin.confluence/language/Danish/strings.po
+++ b/addons/skin.confluence/language/Danish/strings.po
@@ -3,43 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Simon Grønkjær <zimi.grnkjr@gmail.com>, 2012.
+#   <stouenberg@nal-net.dk>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-05 12:29+0000\n"
+"Last-Translator: stouenberg <stouenberg@nal-net.dk>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
-msgstr "Ændr din"
-
-msgctxt "#31001"
-msgid "Love"
-msgstr "Elsker"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Hader"
+msgstr "Ændrer din"
 
 msgctxt "#31003"
 msgid "Power Options"
@@ -47,35 +30,23 @@ msgstr "Strømstyring"
 
 msgctxt "#31004"
 msgid "Working..."
-msgstr ""
+msgstr "Arbejder..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr ""
+msgstr "Skjul information"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr ""
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
+msgstr "Se muligheder"
 
 msgctxt "#31008"
 msgid "Fullscreen"
-msgstr ""
+msgstr "Fuld skærm"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Nyligt tilføjet"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Filer"
+msgstr "Total varighed"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +80,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fankunst"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Komplet liste"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Billedeikoner"
@@ -123,7 +90,7 @@ msgstr "Billedevæg"
 
 msgctxt "#31033"
 msgid "Info"
-msgstr ""
+msgstr "Info"
 
 msgctxt "#31040"
 msgid "Now Playing"
@@ -145,14 +112,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "SPOL TILBAGE"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Lydegenskaber"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Nuværende standard"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Standard til visualisering"
@@ -163,11 +122,11 @@ msgstr "Sluttid"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr ""
+msgstr "Sorter: Stigende"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr ""
+msgstr "Sorter: Faldende"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -195,7 +154,7 @@ msgstr "Denne fil er stakket. Vælg den del du vil afspille fra."
 
 msgctxt "#31061"
 msgid "Current Selected"
-msgstr ""
+msgstr "Nuværende valgt"
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -211,7 +170,7 @@ msgstr "Vis \"PAUSE\" i  billedserier"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
-msgstr ""
+msgstr "Afspil trailere i et vindue [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
@@ -219,19 +178,19 @@ msgstr "Diverse indstillinger"
 
 msgctxt "#31107"
 msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr ""
+msgstr "Skjul flagglæsning fra videofilnavne [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
 
 msgctxt "#31108"
 msgid "Hide Main Menu Buttons"
 msgstr "Skjul hovedsideknapper"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Baggrunde til hovedsiden"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Skift baggrund på hjem-knappen"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Indstillinger"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Enkelt billede"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Flere billeder"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Tilpasningsprogram"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Vis nyligt tilføjede album"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -267,11 +214,7 @@ msgstr "Undermenu til hovedsiden"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
-msgstr ""
-
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "KNAPTITEL"
+msgstr "Skjul baggrundsfankunst"
 
 msgctxt "#31122"
 msgid "Weather Page"
@@ -291,79 +234,71 @@ msgstr "Vis \"Spiller nu\" i baggrunden for visualisering"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr ""
+msgstr "Afspil TV temasange i videobiblioteket (TvTunes add-on)"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr ""
+msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
-msgstr "XBMC Sangtekster"
+msgstr "Sangtekster"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
 
 msgctxt "#31132"
 msgid "Lyrics Add-on"
-msgstr ""
+msgstr "Sangtekst tilføjelse"
 
 msgctxt "#31133"
 msgid "Subtitle Add-on"
-msgstr ""
+msgstr "Undertekst tilføjelse"
 
 msgctxt "#31134"
 msgid "Home Page Videos Submenu"
-msgstr ""
+msgstr "Hjemmeside videoer undermenu"
 
 msgctxt "#31135"
 msgid "Home Page Music Submenu"
-msgstr ""
+msgstr "Hjemmeside musik undermenu"
 
 msgctxt "#31136"
 msgid "Home Page Pictures Submenu"
-msgstr ""
+msgstr "Hjemmeside billeder undermenu"
 
 msgctxt "#31140"
 msgid "Music OSD"
-msgstr ""
+msgstr "Musik OSD"
 
 msgctxt "#31141"
 msgid "Video OSD"
-msgstr ""
+msgstr "Video OSD"
 
 msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Genveje"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorier"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Vis rolleliste"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Vælg din sang"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Sektionlinks"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Sangtekstkilde"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Fundet"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Find flere elementer"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Kommende episoder"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,25 +308,9 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Sidst opdateret"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
-msgstr ""
-
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Billede"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Intet diskmedie fundet"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Skub ud"
+msgstr "Data leverandør"
 
 msgctxt "#31307"
 msgid "Hide Fanart"
@@ -411,7 +330,7 @@ msgstr "Spor nummer"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "FANKUNST BILLDE[CR][CR]IKKE TILGÆNGELIG[CR][CR]TRYK FOR AT VÆLGE"
+msgstr "FANKUNST BILLEDE[CR][CR]IKKE TILGÆNGELIG[CR][CR]TRYK FOR AT VÆLGE"
 
 msgctxt "#31312"
 msgid "Current Scraper"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Indstillinger til indholdsskanning"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Simpel"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Vælg sti til fankunst"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Lille fankunst"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Valgt profil"
@@ -453,14 +364,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Sendt"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Seneste film"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Seneste episoder"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Indstillinger til afspilningsliste"
@@ -479,51 +382,51 @@ msgstr "Nyligt tilføjet"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]TIMER STARTET![/B] [COLOR=grey2] - SYSTEMET LUKKER NED OM[/COLOR]"
+msgstr "Skjul baggrundsfankunst"
 
 msgctxt "#31330"
 msgid "Click button to play[CR][CR]Movie trailer"
-msgstr ""
+msgstr "Klik på knappen for at afspille[CR][CR]Film trailer"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr ""
+msgstr "Album detaljer"
 
 msgctxt "#31351"
 msgid "Pause"
-msgstr ""
+msgstr "Pause"
 
 msgctxt "#31352"
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 msgctxt "#31353"
 msgid "Fast Forward"
-msgstr ""
+msgstr "Spol frem"
 
 msgctxt "#31354"
 msgid "Rewind"
-msgstr ""
+msgstr "Spol tilbage"
 
 msgctxt "#31355"
 msgid "Movie menu"
-msgstr ""
+msgstr "Film menu"
 
 msgctxt "#31356"
 msgid "Download Subtitles"
-msgstr ""
+msgstr "Sangtekster"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr ""
+msgstr "Skinnets standard"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
-msgstr ""
+msgstr "Skinnets standard uden store bogstaver"
 
 msgctxt "#31392"
 msgid "Arial based"
-msgstr ""
+msgstr "Arial baseret"
 
 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"
@@ -555,9 +458,13 @@ msgstr "[B]SKIFT SKIN-INDSTILLINGER[/B][CR][CR]Indstil Confluence · Konfigurer
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr ""
+msgstr "[B]KONFIGURER ADD-ONS[/B][CR][CR]Administrere dine installerede Add-ons · Browse efter og installere Add-ons fra xbmc.org[CR]Ændre Add-on indstillinger"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,42 +472,74 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Vælg din XBMC-brugerprofil[CR]for at logge ind og fortsætte"
 
-msgctxt "#31900"
-msgid "Weather Maps"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 ""
+msgstr "36 timers prognose"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr ""
+msgstr "Prognose for næste time"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
-msgstr ""
+msgstr "Weekend prognose"
 
 msgctxt "#31904"
 msgid "10 Day Forecast"
-msgstr ""
+msgstr "10 døgns prognose"
 
 msgctxt "#31905"
 msgid "Forecast"
-msgstr ""
+msgstr "Prognose"
 
 msgctxt "#31906"
 msgid "Maps & Video"
-msgstr ""
-
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr ""
+msgstr "Kort og video"
 
 msgctxt "#31908"
 msgid "Chance of Precipitation"
-msgstr ""
+msgstr "Risiko for nedbør"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr ""
+msgstr "Henter prognose oplysninger..."
diff --git a/addons/skin.confluence/language/Dutch/strings.po b/addons/skin.confluence/language/Dutch/strings.po
index d567de4d13..fe21bc6ddd 100644
--- a/addons/skin.confluence/language/Dutch/strings.po
+++ b/addons/skin.confluence/language/Dutch/strings.po
@@ -5,44 +5,27 @@
 # Addon Provider: Jezz_X, Team XBMC
 # Translators:
 #   <machine.sanctum@gmail.com>, 2012.
+# Martijn Kaijser <machine.sanctum@gmail.com>, 2012.
+#   <moedt1@hotmail.com>, 2012.
+# Peter Van Riet <>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: 2012-05-10 16:07+0000\n"
-"Last-Translator: Martijn <machine.sanctum@gmail.com>\n"
-"Language-Team: Dutch\n"
+"PO-Revision-Date: 2012-09-18 03:08+0000\n"
+"Last-Translator: Martijn Kaijser <machine.sanctum@gmail.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Confluence skin door Jezz_X"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence is de standaard skin voor XBMC 9.11 en hoger. Het combineert de concepten van andere populaire skins, waarbij het tracht hun goede ideëen te integreren in een skin die gemakkelijk in gebruik is."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "Confluence is de standaard XMBC skin, het verwijderen van Confluence kan leiden tot problemen."
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Aanpassen"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Liefde"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Haat"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Energiebeheer"
@@ -59,10 +42,6 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Weergave Opties"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Volledig scherm"
@@ -71,14 +50,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr "Totale duur"
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Hoofdstuktitel"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Bestanden"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Muziek - Bestanden"
@@ -111,13 +82,9 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Volledige lijst"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
-msgstr "Pic Thumbs"
+msgstr "Foto miniaturen"
 
 msgctxt "#31032"
 msgid "Image Wrap"
@@ -147,14 +114,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "TERUGSPOELEN"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Geluidopties"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Huidige instelling"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Visualisatiestijl"
@@ -228,12 +187,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Verberg knoppen hoofdmenu"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Beginschermachtergronden"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Achtergrond beginschermknop aanpassen"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -243,18 +202,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opties"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Enkele afbeelding"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Meerdere afbeeldingen"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Aanpassen"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr "Toon recent toegevoegde albums"
@@ -271,10 +218,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Fanart achtergronden verbergen"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "Knoplabel"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Weerpagina"
@@ -293,7 +236,7 @@ msgstr "Laat achtergrond \"Nu Afspelen\" zien voor visualisatie"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr ""
+msgstr "Speel de Themesong van de TV serie af in de videobibliotheek. (TvTunes add-on)"
 
 msgctxt "#31127"
 msgid "TvTunes"
@@ -301,11 +244,15 @@ msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
-msgstr "XBMC-songteksten"
+msgstr "Songteksten"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
 
 msgctxt "#31132"
 msgid "Lyrics Add-on"
-msgstr "Liedtekst Add-on"
+msgstr "Songtekst Add-on"
 
 msgctxt "#31133"
 msgid "Subtitle Add-on"
@@ -335,22 +282,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Snelkoppelingen"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Categorieën"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Toon cast"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Kies uw nummer"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Sectie links"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Liedtekst bron"
@@ -375,26 +310,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Laatst bijgewerkt"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Data provider"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Afbeelding"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Geen media gedetecteerd"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Uitwerpen"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Fanart verbergen"
@@ -427,18 +346,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Opties inhoudsscanner"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Basis"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Fanartpad opgeven"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Kleine fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Profiel selecteren"
@@ -455,14 +366,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Uitgezonden"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Laatste films"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Laatste afleveringen"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Afspeellijstopties"
@@ -560,6 +463,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]ADD-ONS CONFIGUREREN[/B][CR][CR]Beheer uw geïnstalleerde Add-ons · Zoek en installeer Add-ons via xbmc.org · Wijzig Add-oninstellingen"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -607,17 +514,13 @@ msgctxt "#31511"
 msgid "Channel Options"
 msgstr "Kanaal opties"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Weer Kaarten"
-
 msgctxt "#31901"
 msgid "36 Hour Forecast"
 msgstr "36 Uur Voorspelling"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr "Per Uur Voorspelling"
+msgstr "Uurs Voorspelling"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
@@ -635,10 +538,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Kaarten en Video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Video voorspelling [COLOR=grey2](Volledig scherm Afspelen)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Kans Op Neerslag"
diff --git a/addons/skin.confluence/language/English (US)/strings.po b/addons/skin.confluence/language/English (US)/strings.po
new file mode 100644
index 0000000000..e58b73d7e4
--- /dev/null
+++ b/addons/skin.confluence/language/English (US)/strings.po
@@ -0,0 +1,543 @@
+# XBMC Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon version: 2.1.0
+# Addon Provider: Jezz_X, Team XBMC
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-05-28 23:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (United States) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\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 "Fullscreen"
+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 "#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 "#31042"
+msgid "PLAYING"
+msgstr ""
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr ""
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr ""
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr ""
+
+msgctxt "#31048"
+msgid "Visualization 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 Dialog Only)[/COLOR]"
+msgstr ""
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr ""
+
+msgctxt "#31107"
+msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
+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"
+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 Submenu"
+msgstr ""
+
+msgctxt "#31119"
+msgid "Hide Background Fanart"
+msgstr ""
+
+msgctxt "#31122"
+msgid "Weather Page"
+msgstr ""
+
+msgctxt "#31123"
+msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr ""
+
+msgctxt "#31124"
+msgid "Show Background \"Now Playing\" Video"
+msgstr ""
+
+msgctxt "#31125"
+msgid "Show Background \"Now Playing\" Visualization"
+msgstr ""
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr ""
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr ""
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr ""
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
+msgctxt "#31132"
+msgid "Lyrics Add-on"
+msgstr ""
+
+msgctxt "#31133"
+msgid "Subtitle Add-on"
+msgstr ""
+
+msgctxt "#31134"
+msgid "Home Page Videos Submenu"
+msgstr ""
+
+msgctxt "#31135"
+msgid "Home Page Music Submenu"
+msgstr ""
+
+msgctxt "#31136"
+msgid "Home Page Pictures Submenu"
+msgstr ""
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr ""
+
+msgctxt "#31141"
+msgid "Video OSD"
+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 "#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 ""
+
+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 ""
+
+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 ""
+
+msgctxt "#31330"
+msgid "Click button to play[CR][CR]Movie trailer"
+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 "#31390"
+msgid "Skin default"
+msgstr ""
+
+msgctxt "#31391"
+msgid "Skin default with no Caps"
+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 ""
+
+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 ""
+
+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 ""
+
+msgctxt "#31403"
+msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
+msgstr ""
+
+msgctxt "#31404"
+msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
+msgstr ""
+
+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 ""
+
+msgctxt "#31407"
+msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
+msgstr ""
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
+msgstr ""
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr ""
+
+msgctxt "#31421"
+msgid "Select your XBMC user Profile[CR]to login and continue"
+msgstr ""
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 ""
+
+msgctxt "#31902"
+msgid "Hourly Forecast"
+msgstr ""
+
+msgctxt "#31903"
+msgid "Weekend Forecast"
+msgstr ""
+
+msgctxt "#31904"
+msgid "10 Day Forecast"
+msgstr ""
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr ""
+
+msgctxt "#31906"
+msgid "Maps & Video"
+msgstr ""
+
+msgctxt "#31908"
+msgid "Chance of Precipitation"
+msgstr ""
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr ""
diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/English/strings.po
index a074d74351..671969a74c 100644
--- a/addons/skin.confluence/language/English/strings.po
+++ b/addons/skin.confluence/language/English/strings.po
@@ -17,24 +17,14 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
-
 #Misc labels
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr ""
 
+#empty strings from id 31001 to 31002
+
 msgctxt "#31003"
 msgid "Power Options"
 msgstr ""
@@ -51,6 +41,8 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr ""
 
+#empty string with id 31007
+
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr ""
@@ -59,7 +51,7 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr ""
 
-#empty strings from id 31010 to 31019
+#empty strings from id 31010 to 31021
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -95,6 +87,8 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr ""
 
+#empty string with id 31030
+
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr ""
@@ -132,6 +126,8 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr ""
 
+#empty strings from id 31046 to 31047
+
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr ""
@@ -228,6 +224,8 @@ msgctxt "#31112"
 msgid "Options"
 msgstr ""
 
+#empty strings from id 31113 to 31115
+
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr ""
@@ -244,7 +242,7 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr ""
 
-#empty string with id 31121
+#empty strings from id 31120 to 31121
 
 msgctxt "#31122"
 msgid "Weather Page"
@@ -317,10 +315,14 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr ""
 
+#empty strings from id 31201 to 31202
+
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr ""
 
+#empty string with id 31204
+
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr ""
@@ -348,10 +350,14 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr ""
 
+#empty string with id 31302
+
 msgctxt "#31303"
 msgid "Data provider"
 msgstr ""
 
+#empty strings from id 31304 to 31306
+
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr ""
@@ -384,12 +390,14 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr ""
 
-#empty string with id 31316
+#empty strings from id 31315 to 31316
 
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr ""
 
+#empty string with id 31318
+
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr ""
@@ -406,6 +414,8 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr ""
 
+#empty strings from id 31323 to 31324
+
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr ""
@@ -557,6 +567,8 @@ msgctxt "#31506"
 msgid "Available[CR]Groups"
 msgstr ""
 
+#empty strings from id 31507 to 31508
+
 msgctxt "#31509"
 msgid "Channel Group"
 msgstr ""
@@ -570,7 +582,7 @@ msgid "Channel Options"
 msgstr ""
 
 #Weather plugin
-#empty strings from id 31512 to 31899
+#empty strings from id 31512 to 31900
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -596,6 +608,8 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr ""
 
+#empty string with id 31907
+
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr ""
diff --git a/addons/skin.confluence/language/Estonian/strings.po b/addons/skin.confluence/language/Estonian/strings.po
new file mode 100644
index 0000000000..2639e1794e
--- /dev/null
+++ b/addons/skin.confluence/language/Estonian/strings.po
@@ -0,0 +1,545 @@
+# XBMC Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon version: 2.1.0
+# Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <hhinkus@gmail.com>, 2012.
+# Ivar Smolin <okul@linux.ee>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-06-17 14:41+0000\n"
+"Last-Translator: Hinkus <hhinkus@gmail.com>\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#31000"
+msgid "Change Your"
+msgstr "Määra"
+
+msgctxt "#31003"
+msgid "Power Options"
+msgstr "Valikud"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "Toimetamine..."
+
+msgctxt "#31005"
+msgid "Hide Information"
+msgstr "Peida informatsioon"
+
+msgctxt "#31006"
+msgid "View Options"
+msgstr "Vaate valikud"
+
+msgctxt "#31008"
+msgid "Fullscreen"
+msgstr "Täisekraan"
+
+msgctxt "#31009"
+msgid "Total Duration"
+msgstr "Kogukestvus"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Muusika - Failid"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "Mängib"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Leht"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr "Nimetused"
+
+msgctxt "#31026"
+msgid "Misc Options"
+msgstr "Veel valikuid"
+
+msgctxt "#31027"
+msgid "Location"
+msgstr "Asukoht"
+
+msgctxt "#31028"
+msgid "Poster Wrap"
+msgstr "Poster ääreni"
+
+msgctxt "#31029"
+msgid "Fanart"
+msgstr "Pildid"
+
+msgctxt "#31031"
+msgid "Pic Thumbs"
+msgstr "Pisipildid"
+
+msgctxt "#31032"
+msgid "Image Wrap"
+msgstr "Pilt ääreni"
+
+msgctxt "#31033"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "#31040"
+msgid "Now Playing"
+msgstr "Hetkel mängib"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "MÄNGIB"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "PAUSIS"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "KIIRELT EDASI"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "TAGASI"
+
+msgctxt "#31048"
+msgid "Visualization Presets"
+msgstr "Visuaalide häälestused"
+
+msgctxt "#31049"
+msgid "End Time"
+msgstr "Lõpp aeg"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Järjesta: Kasvav"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Järjesta: Kahanev"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Ava esitusloend"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "Salvesta esitusloend"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Sulge esitusloend"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "Süsteemi muusika failid"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Valitud esitusloend"
+
+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"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "Taust"
+
+msgctxt "#31103"
+msgid "Show \"Paused\" in picture slide show"
+msgstr "Näita piltide slaidieslitusel teksti \"pausis\""
+
+msgctxt "#31104"
+msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
+msgstr "Esitja treilereid aknas [COLOR=grey3](ainult Video dialoogiaken)[/COLOR]"
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr "Mitmesugused seaded"
+
+msgctxt "#31107"
+msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
+msgstr "Peida loetud 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 ""
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr ""
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Peida"
+
+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 videosid"
+
+msgctxt "#31118"
+msgid "Home Page Programs Submenu"
+msgstr "Peamenüü Programmide alammenüü"
+
+msgctxt "#31119"
+msgid "Hide Background Fanart"
+msgstr "Peida fännipiltide taust"
+
+msgctxt "#31122"
+msgid "Weather Page"
+msgstr "Ilmaleht"
+
+msgctxt "#31123"
+msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr "Kasuta telesaadete puhul bänneri asemel posterit"
+
+msgctxt "#31124"
+msgid "Show Background \"Now Playing\" Video"
+msgstr "Näita taustal \"Hetkel mängib\" videot"
+
+msgctxt "#31125"
+msgid "Show Background \"Now Playing\" Visualization"
+msgstr "Näita taustal \"Hetkel mängib\" visuaali"
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "Esita videoteegis telesaadete tunnusmuusikat (TvTunes lisamoodul)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvTunes"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "Laulutekst"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
+msgctxt "#31132"
+msgid "Lyrics Add-on"
+msgstr "Laulutekstide lisamoodulid"
+
+msgctxt "#31133"
+msgid "Subtitle Add-on"
+msgstr "Subtiitrite lisamoodulid"
+
+msgctxt "#31134"
+msgid "Home Page Videos Submenu"
+msgstr "Peamenüü Videode alammenüü"
+
+msgctxt "#31135"
+msgid "Home Page Music Submenu"
+msgstr "Peamenüü Muusika alammenüü"
+
+msgctxt "#31136"
+msgid "Home Page Pictures Submenu"
+msgstr "Peamenüü Pildid alammenüü"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "Muusika OSD"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "Video OSD"
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr "Otseteed"
+
+msgctxt "#31203"
+msgid "Choose Your Song"
+msgstr "Vali laul"
+
+msgctxt "#31205"
+msgid "Lyrics Source"
+msgstr "Laulusõnade 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 kraabits"
+
+msgctxt "#31313"
+msgid "Choose a Scraper"
+msgstr "Vali kraabits"
+
+msgctxt "#31314"
+msgid "Content Scanning Options"
+msgstr "Sisu skaneerimise valikud"
+
+msgctxt "#31317"
+msgid "Set Fanart Path"
+msgstr "Määra fännipiltide rada"
+
+msgctxt "#31319"
+msgid "Selected Profile"
+msgstr "Vali 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"
+
+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]Loendur määratud![/B] [COLOR=grey2] - Süsteemi automaatne sulgemine[/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"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Stopp"
+
+msgctxt "#31353"
+msgid "Fast Forward"
+msgstr "Kiirelt edasi"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Tagasi"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "Filmi menüü"
+
+msgctxt "#31356"
+msgid "Download Subtitles"
+msgstr "Lae subtiitrid alla"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "Rüü vaikeväärtus"
+
+msgctxt "#31391"
+msgid "Skin default with no Caps"
+msgstr "Rüü vaikeväärtus ilma tõstutundlikuseta"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Arial-il põhinev"
+
+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]KONFIGUREERI VÄLIMUSE SEADEID[/B][CR][CR]Muuda rüüd · Muuda keelt ja regiooni · Muuda faililoendi valikuid[CR]Seadista ekraanisäästja"
+
+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]KONFIGUREERI VIDEO SEADEID[/B][CR][CR]Halda enda videoteeki · Määra video esitamise seaded · Muuda videoloendi valikuid[CR]Määra subtiitrite font"
+
+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 · Määra muusika loendi seaded[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 piltide loendi 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 kolm linna, millele ilmaprognoose koostatakse"
+
+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 energia säästu valikud· Luba silumine · Seadista pealukk"
+
+msgctxt "#31407"
+msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
+msgstr "[B]KONFIGUREERI RÜÜ SEADEID[/B][CR][CR]Seadista Confluence rüü · Lisa ja eemalda menüü nimetusi[CR]Muuda rüü taustu"
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
+msgstr "[B]KONFIGUREERI LISAMOODULEID[/B][CR][CR]Halda enda lisamooduleid · Sirvi ja paigalda lisamooduleid aadressilt xbmc.org[CR]Muuda lisamoodulite seadeid"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr ""
+
+msgctxt "#31421"
+msgid "Select your XBMC user Profile[CR]to login and continue"
+msgstr "Vali enda XBMC profiil[CR]ja jätka"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 tunni prognoos"
+
+msgctxt "#31902"
+msgid "Hourly Forecast"
+msgstr "Igatunnine prognoos"
+
+msgctxt "#31903"
+msgid "Weekend Forecast"
+msgstr "Nädalalõpu prognoos"
+
+msgctxt "#31904"
+msgid "10 Day Forecast"
+msgstr "Kümne päeva prognoos"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Ilmateade"
+
+msgctxt "#31906"
+msgid "Maps & Video"
+msgstr "Kaardid ja videod"
+
+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/Finnish/strings.po b/addons/skin.confluence/language/Finnish/strings.po
index a02ed9a5f9..b33b75fdb3 100644
--- a/addons/skin.confluence/language/Finnish/strings.po
+++ b/addons/skin.confluence/language/Finnish/strings.po
@@ -3,44 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <joonas.tammisto@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-24 13:22+0000\n"
+"Last-Translator: joonastammisto <joonas.tammisto@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Confluence-ulkoasu Jezz_X:ltä. (XBMC:n oletus ulkoasu)"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence on oletus ulkoasu XBMC:n versiosta 9.11 lähtien. Se on yhdistelmä useiden suosittujen ulkoasujen konsepteista, ja yritys omaksua ja integroida heidän hyvät ideat ulkoasuun, jonka pitäisi olla helppokäyttöinen ja -tajuinen kaikille XBMC:n käyttäjille."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Määritä"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Pitää"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Inhoaa"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Virta-asetukset"
@@ -57,25 +39,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Näkymän asetukset"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Lisäosat"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Kokoruutu"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Viimeksi lisätyt"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Tiedostot"
+msgstr "Kokonaiskesto"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanitaide"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Täysi lista"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Kuva kuvake"
@@ -145,14 +111,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "KELAUS TAAKSEPÄIN"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Ääniasetukset"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Nykyinen esiasetus"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Visualisoinnin esiasetukset"
@@ -226,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Piilota päävalikon painikkeet"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Päävalikon taustakuvat"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Muokkaa taustakuvaa päävalikon painikkeelle"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +199,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Asetukset"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Yksittäinen kuva"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Vaihtuva kuva"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Mukautus"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Näytä viimeksi lisätyt albumit"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Piilota taustan fanitaide"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "PAINIKKEEN TEKSTI"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Sääsivu"
@@ -301,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Sanoitukset"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Sanoitukset-lisäosa"
@@ -333,37 +279,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategoriat"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Näytä näyttelijät"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Valitse kappale"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Valinta linkit"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Sanoitusten lähde"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Löytyi"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Etsi lisää kohteita"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Tulevat jaksot"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Viimeksi päivitetty"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Valikko"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Tietojen tarjoaja"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Kuva"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Levyä ei löytynyt"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Avaa asema"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Piilota fanitaide"
@@ -425,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Sisällön hakuasetukset"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Perus"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Polku"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Pieni fanitaide"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Valittu profiili"
@@ -453,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Esitetty"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Uusimmat elokuvat"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Uusimmat jaksot"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Toistolistan asetukset"
@@ -609,10 +511,6 @@ msgctxt "#31511"
 msgid "Channel Options"
 msgstr "Kanavan valinnat"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Sääkartat"
-
 msgctxt "#31901"
 msgid "36 Hour Forecast"
 msgstr "36 tunnin ennuste"
@@ -637,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Kartat & Video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Videoennuste [COLOR=grey2](Kokoruututila)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Sateen mahdollisuus"
diff --git a/addons/skin.confluence/language/French/strings.po b/addons/skin.confluence/language/French/strings.po
index f9dd7f50cc..4bdb95726b 100644
--- a/addons/skin.confluence/language/French/strings.po
+++ b/addons/skin.confluence/language/French/strings.po
@@ -3,79 +3,54 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <bastien.leblanc@gmail.com>, 2012.
+#   <danone_kid@hotmail.com>, 2012.
+# Fred  <bafforosso@geneva-racing.ch>, 2012.
+#   <parisienne17@free.fr>, 2012.
+#   <stuff@axelsimon.net>, 2012.
+#   <tony.vieira@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-08-06 14:35+0000\n"
+"Last-Translator: idoru <parisienne17@free.fr>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Skin Confluence par Jezz_X. (skin par défaut)"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence est le skin par défaut de XBMC 9.11 ou supérieur. C'est un condensé d'idées de plusieurs skins populaires. Il tente d'englober et intégrer toutes les bonnes idées que n'importe quel débutant sur XBMC pourrait utiliser avec facilité."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "Confluence est le skin par défaut de XBMC, l'effacer peut créer des dysfonctionnements"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Changement des"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "J'aime"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Je déteste"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Options d'alimentation"
 
 msgctxt "#31004"
 msgid "Working..."
-msgstr "En cours..."
+msgstr "En cours…"
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Cacher INFO"
+msgstr "Masquer les informations"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr "Options d'Affichage"
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
+msgstr "Options d'affichage"
 
 msgctxt "#31008"
 msgid "Fullscreen"
-msgstr "Plein Ecran"
+msgstr "Plein écran"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Récemment ajouté"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Vidéo - Fichiers"
+msgstr "Durée totale"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -103,23 +78,19 @@ msgstr "Emplacement"
 
 msgctxt "#31028"
 msgid "Poster Wrap"
-msgstr "Affiche Wrap"
+msgstr "Galerie d'affiches"
 
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Liste complète"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Vignettes"
 
 msgctxt "#31032"
 msgid "Image Wrap"
-msgstr "Image Wrap"
+msgstr "Galerie d'images"
 
 msgctxt "#31033"
 msgid "Info"
@@ -145,21 +116,13 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "RETOUR RAPIDE"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Propriétés audio"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Préréglage Actuel"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Préréglages Visualisation"
+msgstr "Préréglages de visualisation"
 
 msgctxt "#31049"
 msgid "End Time"
-msgstr "Echéance"
+msgstr "Échéance"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -171,15 +134,15 @@ msgstr "Tri : Descendant"
 
 msgctxt "#31055"
 msgid "Open playlist"
-msgstr "Ouvrir playlist"
+msgstr "Ouvrir une playlist"
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "Sauvegarder playlist"
+msgstr "Sauvegarder la playlist"
 
 msgctxt "#31057"
 msgid "Close playlist"
-msgstr "Fermer playlist"
+msgstr "Fermer la playlist"
 
 msgctxt "#31058"
 msgid "System music files"
@@ -195,7 +158,7 @@ msgstr "Ce fichier est empilé, sélectionnez la partie que vous souhaitez lire.
 
 msgctxt "#31061"
 msgid "Current Selected"
-msgstr "Selection actuelle"
+msgstr "Sélection actuelle"
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -207,11 +170,11 @@ msgstr "Arrière-plan"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "Afficher \"Pause\" dans diaporama d'images"
+msgstr "Afficher « Pause » dans le diaporama d'images"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
-msgstr "Jouer les trailers dans un fenêtre [COLOR=grey3](Uniquement dans les infos du film)[/COLOR]"
+msgstr "Jouer les bandes-annonces dans une fenêtre [COLOR=grey3](Uniquement dans les informations de la vidéo en cours)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
@@ -219,19 +182,19 @@ msgstr "Options diverses"
 
 msgctxt "#31107"
 msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Ne pas détecter le format par le nom de fichier [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"
-msgstr "Masquer les Boutons du Menu Principal"
+msgstr "Masquer les boutons du menu principal"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Arrière-plans Média"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Modifier l'arrière-plan pour le type de média"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +204,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Options"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Image simple"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Image multiple"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Personnaliser"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Afficher les albums récemment ajoutés"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -267,19 +218,15 @@ msgstr "Sous-menu Programmes de la page d'accueil"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
-msgstr ""
-
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ÉTIQUETTE DU BOUTON"
+msgstr "Masquer le Fanart d’arrière plan"
 
 msgctxt "#31122"
 msgid "Weather Page"
-msgstr "Page météo"
+msgstr "Page Météo"
 
 msgctxt "#31123"
 msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
-msgstr "Préférer les \"Affiches\" aux \"Bannières\" pour les émissions TV"
+msgstr "Préférer les « Affiches » aux « Bannières » pour les séries TV"
 
 msgctxt "#31124"
 msgid "Show Background \"Now Playing\" Video"
@@ -291,23 +238,27 @@ msgstr "Afficher la visualisation en cours de lecture en arrière-plan"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr ""
+msgstr "Jouer les génériques TV dans la médiathèque vidéo (extension TvTunes)"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr ""
+msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
-msgstr "Lyrics"
+msgstr "Paroles"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
 
 msgctxt "#31132"
 msgid "Lyrics Add-on"
-msgstr "Add-on Lyrics"
+msgstr "Extension gérant les paroles"
 
 msgctxt "#31133"
 msgid "Subtitle Add-on"
-msgstr "Add-on Sous-titres"
+msgstr "Extension gérant les sous-titres"
 
 msgctxt "#31134"
 msgid "Home Page Videos Submenu"
@@ -333,65 +284,37 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Catégories"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Voir le casting"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Choisissez votre chanson"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Section Liens"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
-msgstr "Lyrics Source"
+msgstr "Source pour les paroles"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Trouvé"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Trouver plus d'éléments"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Prochains épisodes"
 
 msgctxt "#31300"
 msgid "Current Temp"
-msgstr "Temp. Actuelle"
+msgstr "Température actuelle"
 
 msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
-msgstr ""
-
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Image"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Aucun disque de média détecté"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Éjecter"
+msgstr "Fournisseur de données"
 
 msgctxt "#31307"
 msgid "Hide Fanart"
@@ -403,7 +326,7 @@ msgstr "Détails du film"
 
 msgctxt "#31309"
 msgid "Memory Used:"
-msgstr "Mémoire utilisée:"
+msgstr "Mémoire utilisée :"
 
 msgctxt "#31310"
 msgid "Track Number"
@@ -411,59 +334,43 @@ msgstr "Numéro de la 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]Indisponible[CR][CR] Cliquer sur le bouton pour définir"
 
 msgctxt "#31312"
 msgid "Current Scraper"
-msgstr "Scraper Actuel"
+msgstr "Scraper actuel"
 
 msgctxt "#31313"
 msgid "Choose a Scraper"
-msgstr "Choisissez un Scraper"
+msgstr "Choisissez un scraper"
 
 msgctxt "#31314"
 msgid "Content Scanning Options"
-msgstr "Options Contenu du Scan"
-
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Basic"
+msgstr "Options de scan de contenu"
 
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Définir le chemin du Fanart"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Petit Fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Profil sélectionné"
 
 msgctxt "#31320"
 msgid "Last Logged In"
-msgstr "Derniers connectés"
+msgstr "Dernière connexion"
 
 msgctxt "#31321"
 msgid "Karaoke Song Selector"
-msgstr "Sélecteur chanson Karaoké"
+msgstr "Sélecteur chanson karaoké"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Diffusé"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Derniers films"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Derniers épisodes"
-
 msgctxt "#31325"
 msgid "Playlist Options"
-msgstr "Options Playliste"
+msgstr "Options de playlist"
 
 msgctxt "#31326"
 msgid "Created"
@@ -479,15 +386,15 @@ msgstr "Récemment ajouté"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]Réglage minuterie ![/B] [COLOR=grey2] - Fermer le système automatiquement dans[/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 voir[CR][CR]le trailer du film"
+msgstr "Cliquer sur le bouton pour lire[CR][CR]la bande-annonce du film"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr "Détails de l'Album"
+msgstr "Détails de l'lbum"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -499,11 +406,11 @@ msgstr "Stop"
 
 msgctxt "#31353"
 msgid "Fast Forward"
-msgstr "Avance Rapide"
+msgstr "Avance rapide"
 
 msgctxt "#31354"
 msgid "Rewind"
-msgstr "Retour Rapide"
+msgstr "Retour rapide"
 
 msgctxt "#31355"
 msgid "Movie menu"
@@ -519,7 +426,7 @@ msgstr "Par défaut"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
-msgstr "Par défaut sans Majuscule"
+msgstr "Par défaut sans majuscule"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -527,15 +434,15 @@ 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 skin · Choisir la langue et la région · Changer les options de liste[CR]Changer l'économiseur d'écran"
+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"
 
 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]CONFIGURATION DES PARAMÈTRES VIDÉO[/B][CR][CR]Gérer votre médiathèque · Définir les options de lecture · Changer les options de liste[CR]Régler la police des sous-titres"
+msgstr "[B]CONFIGURATION DES PARAMÈTRES VIDÉO[/B][CR][CR]Gérer votre médiathèque vidéo · Définir les options de lecture · Changer les options des listes de vidéos[CR]Définir la police des sous-titres"
 
 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 · Définir les options de lecture · Changer les options de liste[CR]Soumettre des chansons · Changer les options karaoké"
+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"
@@ -543,21 +450,25 @@ msgstr "[B]CONFIGURATION DES PARAMÈTRES IMAGE[/B][CR][CR]Définir les options d
 
 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 les trois villes qui recueilleront les informations météorologiques"
+msgstr "[B]CONFIGURATION DES PARAMÈTRES MÉTÉO[/B][CR][CR]Choisir trois villes pour lesquelles recueillir les 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]CONFIGURATION DES PARAMÈTRES SYSTÈME[/B][CR][CR]Configurer les sorties vidéo et 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 la sécurité"
 
 msgctxt "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
-msgstr "[B]CONFIGURATION DES PARAMÈTRES THÈME[/B][CR][CR]Configuration du skin Confluence · Ajouter et supprimer des éléments du menu d'accueil[CR]Changer les arrière-plans du skin"
+msgstr "[B]CONFIGURATION DES PARAMÈTRES DU THÈME[/B][CR][CR]Configuration du thème Confluence · Ajouter et supprimer des éléments du menu d'accueil[CR]Changer les arrière-plans du thème"
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURATION DES ADD-ONS[/B][CR][CR]Gérer les Add-ons installés· Recherche et installation d'Add-ons depuis xbmc.org[CR]Modifier les paramètres Add-on"
+msgstr "[B]CONFIGURATION DES EXTENSIONS[/B][CR][CR]Gérer les extensions installées · Recherche et installation d'extensions depuis xbmc.org[CR]Modifier les paramètres des extensions"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,25 +476,61 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Sélectionnez un profil d'utilisateur[CR]pour vous connecter et continuer"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Cartes Météo"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 "Prévisions sur 36 Heures"
+msgstr "Prévisions sur 36 heures"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr "Prévisions Heure par Heure"
+msgstr "Prévisions heure par heure"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
-msgstr "Prévisions pour le Weekend"
+msgstr "Prévisions pour le weekend"
 
 msgctxt "#31904"
 msgid "10 Day Forecast"
-msgstr "Prévisions sur 10 Jours"
+msgstr "Prévisions sur 10 jours"
 
 msgctxt "#31905"
 msgid "Forecast"
@@ -591,11 +538,7 @@ msgstr "Prévisions"
 
 msgctxt "#31906"
 msgid "Maps & Video"
-msgstr "Cartes & Vidéo"
-
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Bulletin vidéo [COLOR=grey2](affichage en plein écran)[/COLOR]"
+msgstr "Cartes & vidéo"
 
 msgctxt "#31908"
 msgid "Chance of Precipitation"
@@ -603,4 +546,4 @@ msgstr "Risque de pluie"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr "Récupération des prévisions météo..."
+msgstr "Récupération des prévisions météo…"
diff --git a/addons/skin.confluence/language/Galician/strings.po b/addons/skin.confluence/language/Galician/strings.po
new file mode 100644
index 0000000000..9adc55b7d2
--- /dev/null
+++ b/addons/skin.confluence/language/Galician/strings.po
@@ -0,0 +1,545 @@
+# XBMC Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon version: 2.1.0
+# Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <d3b.null@gmail.com>, 2012.
+#   <monfero@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-07-08 15:35+0000\n"
+"Last-Translator: diegoXA <d3b.null@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\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 "A traballar..."
+
+msgctxt "#31005"
+msgid "Hide Information"
+msgstr "Ocultar información"
+
+msgctxt "#31006"
+msgid "View Options"
+msgstr "Ver opcións"
+
+msgctxt "#31008"
+msgid "Fullscreen"
+msgstr "Pantalla compelta"
+
+msgctxt "#31009"
+msgid "Total Duration"
+msgstr "Duración total"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Música - Ficheiros"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "A reproducir"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Páxina"
+
+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"
+
+msgctxt "#31040"
+msgid "Now Playing"
+msgstr "Reproducindo"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "REPRODUCINDO"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "PAUSADO"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "AXIÑA ADIANTE"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "REBOBINAR"
+
+msgctxt "#31048"
+msgid "Visualization Presets"
+msgstr "Preconfiguracións de visualizacións"
+
+msgctxt "#31049"
+msgid "End Time"
+msgstr "Tempo final"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Ordear: Ascendente"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Ordear: Descendente"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Abrir lista de reproducción"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "Gardar lista de reproducción"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Pechar lista de reproducción"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "Ficheiros de música do sistema"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Lista de reproducción actual"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "Este arquivo 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"
+
+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 Dialog Only)[/COLOR]"
+msgstr "Reproducir trailers nunha fiestra [COLOR=grey3](Só diálgo de información de video)[/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"
+msgstr ""
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr ""
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Ocultar"
+
+msgctxt "#31112"
+msgid "Options"
+msgstr "Opcións"
+
+msgctxt "#31116"
+msgid "Show Recently added Albums"
+msgstr "Mostrar albumes engadidos recentemente"
+
+msgctxt "#31117"
+msgid "Show Recently added Videos"
+msgstr "Mostrar vídeos engadidos recentemente"
+
+msgctxt "#31118"
+msgid "Home Page Programs Submenu"
+msgstr "Submenú de aplicativos da páxina de inicio"
+
+msgctxt "#31119"
+msgid "Hide Background Fanart"
+msgstr "Agochar o fondo do cartel"
+
+msgctxt "#31122"
+msgid "Weather Page"
+msgstr "Páxina do Tempo"
+
+msgctxt "#31123"
+msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr "Empregar \"Carteis\" en lugar de \"Banners\" para as series de TV"
+
+msgctxt "#31124"
+msgid "Show Background \"Now Playing\" Video"
+msgstr "Amosar o video reproducíndose actualmente no fondo"
+
+msgctxt "#31125"
+msgid "Show Background \"Now Playing\" Visualization"
+msgstr "Amosar a visualización reproducíndose actualmente 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)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvTunes"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "Letras"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
+msgctxt "#31132"
+msgid "Lyrics Add-on"
+msgstr "Complemento de letras"
+
+msgctxt "#31133"
+msgid "Subtitle Add-on"
+msgstr "Complemento de subtítulos"
+
+msgctxt "#31134"
+msgid "Home Page Videos Submenu"
+msgstr "Submenú de Videos da páxina de inicio"
+
+msgctxt "#31135"
+msgid "Home Page Music Submenu"
+msgstr "Submenú de Música da páxina de inicio"
+
+msgctxt "#31136"
+msgid "Home Page Pictures Submenu"
+msgstr "Submenú de Imaxes da páxina de inicio"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "OSD de Música"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "OSD de Video"
+
+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 cartel"
+
+msgctxt "#31308"
+msgid "Movie Details"
+msgstr "Detalles da Película"
+
+msgctxt "#31309"
+msgid "Memory Used:"
+msgstr "Memoria empregada:"
+
+msgctxt "#31310"
+msgid "Track Number"
+msgstr "Número de seguemento"
+
+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 "Estabrecer ruta de Carteis"
+
+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 lista de reprodución"
+
+msgctxt "#31326"
+msgid "Created"
+msgstr "Creado"
+
+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]Trailer da Película"
+
+msgctxt "#31331"
+msgid "Album Details"
+msgstr "Detalles do Álbum"
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr "Pausa"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Parar"
+
+msgctxt "#31353"
+msgid "Fast Forward"
+msgstr "Axiña Adiante"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Atrás"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "Menú de Película"
+
+msgctxt "#31356"
+msgid "Download Subtitles"
+msgstr "Descargar Subtítulos"
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr "Pel por defecto"
+
+msgctxt "#31391"
+msgid "Skin default with no Caps"
+msgstr "Pel por defecto sen Maiúsculas"
+
+msgctxt "#31392"
+msgid "Arial based"
+msgstr "Baseado en 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 PARÁMETROS DE APARIENCIA[/B][CR][CR]Trocar a pel · Estabrecer lingua e rexión · Trocar as opcións de listado de arquivos[CR]Estabrecer gardapantallas"
+
+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 PARÁMETROS DE VIDEO[/B][CR][CR]Xestionar a bibloteca de video · Estabrecer opcións da reprodución de video · Trocar opcións de listado de videos[CR]Estabrecer fontes dos subtítulos"
+
+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 a sumisión das 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 cidade para a colleita de 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 "#31407"
+msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
+msgstr "[B]CONFIGURAR PARÁMETROS DA PEL[/B][CR][CR]Configurar a pel Confluence · Engadir e eliminar elementos do menú inicial[CR]Trocar fondos da pel"
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
+msgstr "[B]CONFIGURAR ENGADIDOS[/B][CR][CR]Xestionar engadidos instalados · Buscar e instalar Engadidos de xbmc.org[CR]Modificar a configuración dos Engadidos"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr ""
+
+msgctxt "#31421"
+msgid "Select your XBMC user Profile[CR]to login and continue"
+msgstr "Selecione o seu perfíl de usuario de XBMC[CR]para ingresar e continuar"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 "Predición de 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 "10 Day Forecast"
+msgstr "Predición de 10 días"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Predición"
+
+msgctxt "#31906"
+msgid "Maps & Video"
+msgstr "Mapas e Video"
+
+msgctxt "#31908"
+msgid "Chance of Precipitation"
+msgstr "Probabilidades de chuvia"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "Colleitando información da predición..."
diff --git a/addons/skin.confluence/language/German/strings.po b/addons/skin.confluence/language/German/strings.po
index c182b4984c..b44fefae10 100644
--- a/addons/skin.confluence/language/German/strings.po
+++ b/addons/skin.confluence/language/German/strings.po
@@ -4,63 +4,42 @@
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
 # Translators:
+# Max  <M_Auer1@gmx.de>, 2012.
+# Philipp Temminghoff <philipptemminghoff@googlemail.com>, 2012.
+#   <thomas.bueter@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: 2012-05-09 13:51+0000\n"
-"Last-Translator: Max <M_Auer1@gmx.de>\n"
-"Language-Team: German\n"
+"PO-Revision-Date: 2012-06-13 14:08+0000\n"
+"Last-Translator: henryford <thomas.bueter@gmail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/XBMC-Main-Frodo/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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Ändern der"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Liebe"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Hass"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Power Optionen"
 
 msgctxt "#31004"
 msgid "Working..."
-msgstr "In Arbeit..."
+msgstr "Arbeitet..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Verberge Info"
+msgstr "Verstecke Info"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr "Anzeige Optionen"
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
+msgstr "Anzeige - Optionen"
 
 msgctxt "#31008"
 msgid "Fullscreen"
@@ -70,14 +49,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr "Insgesamte Laufzeit"
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Kürzlich hinzugefügt"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Dateien"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musik - Dateien"
@@ -96,7 +67,7 @@ msgstr "Einträge"
 
 msgctxt "#31026"
 msgid "Misc Options"
-msgstr "Allg. Optionen"
+msgstr "Allgemeine Optionen"
 
 msgctxt "#31027"
 msgid "Location"
@@ -110,13 +81,9 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Komplette Liste"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
-msgstr "Bild Vorschau"
+msgstr "Bildvorschau"
 
 msgctxt "#31032"
 msgid "Image Wrap"
@@ -140,27 +107,19 @@ msgstr "PAUSE"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
-msgstr "SCHNELL VORLAUF"
+msgstr "VORSPULEN"
 
 msgctxt "#31045"
 msgid "REWIND"
-msgstr "RÜCKLAUF"
-
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Audio Einstellungen"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Aktuelle Einstellung"
+msgstr "ZURÜCKSPULEN"
 
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Visualisierungs Einstellungen"
+msgstr "Visualisierungs - Voreinstellung"
 
 msgctxt "#31049"
 msgid "End Time"
-msgstr "Schluss Zeit"
+msgstr "Endzeit"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -176,15 +135,15 @@ msgstr "Öffne Wiedergabeliste"
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "Sichere Wiedergabeliste"
+msgstr "Wiedergabeliste abspeichern"
 
 msgctxt "#31057"
 msgid "Close playlist"
-msgstr "Schliesse Wiedergabeliste"
+msgstr "Wiedergabeliste schließen"
 
 msgctxt "#31058"
 msgid "System music files"
-msgstr "System Musik Dateien"
+msgstr "System Musikdateien"
 
 msgctxt "#31059"
 msgid "Current playlist"
@@ -192,7 +151,7 @@ msgstr "Aktuelle Wiedergabeliste"
 
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
-msgstr "Die Datei ist gestapelt, wähle den Teil zum abspielen."
+msgstr "Diese Datei ist gestapelt, wähle den zu startenden Teil aus."
 
 msgctxt "#31061"
 msgid "Current Selected"
@@ -200,7 +159,7 @@ msgstr "Aktuell ausgewählt"
 
 msgctxt "#31101"
 msgid "Home screen options"
-msgstr "Home Screen Optionen"
+msgstr "Hauptmenü - Optionen"
 
 msgctxt "#31102"
 msgid "Background"
@@ -212,7 +171,7 @@ msgstr "Zeige \"Pause\" in Bilder Diaschau"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
-msgstr "Trailer im Fenster wiedergeben [COLOR=grey3](Video Information Dialog)[/COLOR]"
+msgstr "Trailer im Fenster wiedergeben [COLOR=grey3](Nur im Videoinformationsdialog)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
@@ -227,12 +186,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Verstecke Hauptmenü Buttons"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Home Screen Hintergrund"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Ändere Hintergrund für Home Button"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -242,18 +201,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Optionen"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Einzel Bild"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Mehrfach Bild"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Spezifische"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr "Zeige kürzlich hinzugefügte Alben"
@@ -264,35 +211,31 @@ msgstr "Zeige kürzlich hinzugefügte Videos"
 
 msgctxt "#31118"
 msgid "Home Page Programs Submenu"
-msgstr "Hauptfenster Programme-Untermenü"
+msgstr "Hauptmenü Programme-Untermenü"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
-msgstr "Verstecke Hintergrund Fanart"
-
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "BUTTON BESCHRIFTUNG"
+msgstr "Verstecke Hintergrund - Fanart"
 
 msgctxt "#31122"
 msgid "Weather Page"
-msgstr "Wetter Seite"
+msgstr "Wetter - Infos"
 
 msgctxt "#31123"
 msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
-msgstr "Verwende \"Posters\" anstelle von \"Banners\" für TV Shows"
+msgstr "Verwende \"Poster\" anstelle von \"Bannern\" für TV-Serien"
 
 msgctxt "#31124"
 msgid "Show Background \"Now Playing\" Video"
-msgstr "Zeige Hintergrund \"Aktuell abgespielt\" Video"
+msgstr "Zeige im Hintergrund \"Aktuell abgespielt\"-Video"
 
 msgctxt "#31125"
 msgid "Show Background \"Now Playing\" Visualization"
-msgstr "Zeige Hintergrund \"Aktuell abgespielt\" Visualisierung"
+msgstr "Zeige im Hintergrund \"Aktuell abgespielt\"-Visualisierung"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Spiele TV Themes in der Video Datenbank (TvTunes Ad-on)"
+msgstr "Spiele TV-Titelmusik in der Video-Bibliothek (TvTunes Ad-on)"
 
 msgctxt "#31127"
 msgid "TvTunes"
@@ -300,7 +243,11 @@ msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
-msgstr "Lyrics"
+msgstr "Songtexte"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
 
 msgctxt "#31132"
 msgid "Lyrics Add-on"
@@ -312,47 +259,35 @@ msgstr "Untertitel Add-on"
 
 msgctxt "#31134"
 msgid "Home Page Videos Submenu"
-msgstr "Homefenster Videos-Untermenü"
+msgstr "Hauptmenü Videos-Untermenü"
 
 msgctxt "#31135"
 msgid "Home Page Music Submenu"
-msgstr "Homefenster Musik-Untermenü"
+msgstr "Hauptmenü Musik-Untermenü"
 
 msgctxt "#31136"
 msgid "Home Page Pictures Submenu"
-msgstr "Homefenster Bilder-Untermenü"
+msgstr "Hauptmenü Bilder-Untermenü"
 
 msgctxt "#31140"
 msgid "Music OSD"
-msgstr "Musik OSD"
+msgstr "Musik-OSD"
 
 msgctxt "#31141"
 msgid "Video OSD"
-msgstr "Video OSD"
+msgstr "Video-OSD"
 
 msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorie"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Zeige Darsteller"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
-msgstr "Wähle Dein Lied"
-
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Sektions Verknüpfung"
+msgstr "Wähle Deinen Song"
 
 msgctxt "#31205"
 msgid "Lyrics Source"
-msgstr "Lyrics Quelle"
+msgstr "Songtext - Quelle"
 
 msgctxt "#31206"
 msgid "Found"
@@ -364,7 +299,7 @@ msgstr "Finde mehr"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr "Anstehende Folgen"
+msgstr "Kommende Episoden"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -372,47 +307,31 @@ msgstr "Aktuelle Temperatur"
 
 msgctxt "#31301"
 msgid "Last Updated"
-msgstr "Letztes Update"
-
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menü"
+msgstr "Zuletzt aktualisiert"
 
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Quelle"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Bild"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Keine Disk vorhanden"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Auswerfen"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Verberge Fanart"
 
 msgctxt "#31308"
 msgid "Movie Details"
-msgstr "Film Details"
+msgstr "Film - Details"
 
 msgctxt "#31309"
 msgid "Memory Used:"
-msgstr "Speicher in Benutzung:"
+msgstr "Speicher-Auslastung:"
 
 msgctxt "#31310"
 msgid "Track Number"
-msgstr "Lied Nummer"
+msgstr "Song - Nummer"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "FANART BILD[CR][CR]NICHT VORHANDEN[CR][CR] CLICK BUTTON ZUM SETZEN"
+msgstr "FANART BILD[CR][CR]NICHT VORHANDEN[CR][CR] KLICKE BUTTON ZUM FESTLEGEN"
 
 msgctxt "#31312"
 msgid "Current Scraper"
@@ -426,17 +345,9 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Inhalt Scanning Optionen"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Basic"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
-msgstr "Setze Fanart Pfad"
-
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Kleines Fanart"
+msgstr "Setze Fanart - Pfad"
 
 msgctxt "#31319"
 msgid "Selected Profile"
@@ -448,23 +359,15 @@ msgstr "Letzte Anmeldung"
 
 msgctxt "#31321"
 msgid "Karaoke Song Selector"
-msgstr "Karaoke Song Selector"
+msgstr "Karaoke Songauswahl"
 
 msgctxt "#31322"
 msgid "Aired"
-msgstr "Gesendet"
-
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Letzte Filme"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Letzte Episoden"
+msgstr "Erschienen"
 
 msgctxt "#31325"
 msgid "Playlist Options"
-msgstr "Wiedergabeliste Optionen"
+msgstr "Wiedergabeliste - Optionen"
 
 msgctxt "#31326"
 msgid "Created"
@@ -480,7 +383,7 @@ msgstr "Kürzlich Hinzugefügt"
 
 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]"
+msgstr "[B]TIMER GESETZT![/B] [COLOR=grey2] - SYSTEM FÄHRT HERUNTER  IN[/COLOR]"
 
 msgctxt "#31330"
 msgid "Click button to play[CR][CR]Movie trailer"
@@ -516,11 +419,11 @@ msgstr "Untertitel herunterladen"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "Skin Standard"
+msgstr "Skin - Standard"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
-msgstr "Skin Standard ohne Großbuchstaben"
+msgstr "Skin - Standard ohne Großbuchstaben"
 
 msgctxt "#31392"
 msgid "Arial based"
@@ -528,51 +431,91 @@ 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 DIE DARSTELLUNGS EINSTELLUNGEN[/B][CR][CR]Wechsel den Skin · Wähle Sprache und Region · Wechsel Dateilisten Optionen[CR]Setze Bildschirmschoner"
+msgstr "[B]KONFIGURIERE DIE DARSTELLUNGS EINSTELLUNGEN[/B][CR][CR]Ändere den Skin · Wähle Sprache und Region · Ändere Dateilisten Optionen[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 DB · Setze die Abspiel Optionen · Wechsel die Video Auflistungs Optionen · Setze Untertitel Schrift"
+msgstr "[B]KONFIGURIERE VIDEO EINSTELLUNGEN[/B][CR][CR]Organisiere die Video-Bibliothek · Setze die Abspiel-Optionen · Ä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 DB · Setze die Musik Abspiel Optionen · Wechsel die Musik Auflistungs Optionen · Einrichten der Lied Vorlage · Setze Karaoke Optionen"
+msgstr "[B]KONFIGURIERE MUSIK-EINSTELLUNGEN[/B][CR][CR]Organisiere die Musik-Bibliothek · Setze die Musik Abspiel Optionen · Ä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 Bild Auflistungs Optionen · Konfiguriere Diaschau"
+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 drei Städte zum sammeln der Wetter Informationen"
+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]Setze und kalibriere Displays · Konfiguriere Audioausgabe · Setze Fernbedienungs Einstellungen · Setze Energiespar Optionen · Aktiviere Debugging · Einrichten Master Sperre"
+msgstr "[B]KONFIGURIERE SYSTEM EINSTELLUNGEN[/B][CR][CR]Konfiguriere und kalibriere Anzeigen · Konfiguriere Audioausgabe · Setze Fernbedienungseinstellungen · Setze Energiespar-Optionen · Aktiviere Debugging · Einrichten der Master-Sperre"
 
 msgctxt "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
-msgstr "[B]KONFIGURIERE SKIN EINSTELLUNGEN[/B][CR][CR]Einrichten des Confluence Skin · Hinzufügen und entfernen der Home Menü Einträge[CR]Wechseln der Skin Hintergründe"
+msgstr "[B]KONFIGURIERE SKIN EINSTELLUNGEN[/B][CR][CR]Einrichten des Confluence-Skin · Hinzufügen und Entfernen der Hauptmenü  Einträge[CR]Ändere die Hauptmenü-Hintergründe"
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
 msgstr "[B]KONFIGURIERE ADD-ONS[/B][CR][CR]Organisiere die installierten Add-ons · Installiere Add-ons von xbmc.org[CR]Add-on Einstellungen anpassen"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]KONFIGURIERE DIENSTE[/B][CR][CR]Richte Zugriff auf XBMC via UPnP und HTTP ein · Konfiguriere die Dateifreigabe[CR]Aktiviere Zeroconf · Konfiguriere AirPlay"
+msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
-msgstr "Wähle Dein XBMC Benutzer Profil[CR]Zum Anmelden und Weitermachen"
+msgstr "Wähle Dein XBMC Benutzer Profil[CR]Zum Anmelden und Fortfahren"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+msgstr ""
+
+msgctxt "#31501"
+msgid "Scheduled Time"
+msgstr ""
+
+msgctxt "#31502"
+msgid "Live TV"
+msgstr ""
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Wetterkarten"
+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 ""
+
+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 Stunden Prognose"
+msgstr "36-Stunden-Prognose"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
@@ -580,11 +523,11 @@ msgstr "Stündliche Prognose"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
-msgstr "Wochenend Prognose"
+msgstr "Wochenend-Prognose"
 
 msgctxt "#31904"
 msgid "10 Day Forecast"
-msgstr "10 Tage Prognose"
+msgstr "10-Tage-Prognose"
 
 msgctxt "#31905"
 msgid "Forecast"
@@ -594,10 +537,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Karten & Video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Video Prognose [COLOR=grey2](Vollbild Wiedergabe)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Niederschlagswahrscheinlichkeit"
diff --git a/addons/skin.confluence/language/Greek/strings.po b/addons/skin.confluence/language/Greek/strings.po
index 07b0770db0..411bbfb3cb 100644
--- a/addons/skin.confluence/language/Greek/strings.po
+++ b/addons/skin.confluence/language/Greek/strings.po
@@ -4,47 +4,28 @@
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
 # Translators:
+#   <cutsickass@yahoo.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: 2012-05-08 11:57+0000\n"
+"PO-Revision-Date: 2012-07-08 07:43+0000\n"
 "Last-Translator: CutSickAss <cutsickass@yahoo.com>\n"
-"Language-Team: Greek\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el_GR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Αλλαγή"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Αγαπητό"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Απεχθές"
-
 msgctxt "#31003"
 msgid "Power Options"
-msgstr "Επιλογές λειτουργίας"
+msgstr "Επιλογές Λειτουργίας"
 
 msgctxt "#31004"
 msgid "Working..."
@@ -56,11 +37,7 @@ msgstr "Απόκρυψη Πληροφοριών"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr "Προβολή Επιλογών"
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
+msgstr "Επιλογές Προβολής"
 
 msgctxt "#31008"
 msgid "Fullscreen"
@@ -70,14 +47,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr "Συνολική Διάρκεια"
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Προστέθηκαν πρόσφατα"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Βίντεο - Αρχεία"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Μουσική - Αρχεία"
@@ -110,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Πλήρης λίστα"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Μικρογραφίες"
@@ -146,17 +111,9 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "ΠΙΣΩ"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Ιδιότητες Ήχου"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Τρέχον Προκαθορισμένο"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Προκαθορισμένες Οπτικοποιήσεις"
+msgstr "Προρυθμίσεις Οπτικοποιητή"
 
 msgctxt "#31049"
 msgid "End Time"
@@ -227,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Απόκρυψη πλήκτρων του Κεντρικού Μενού"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Υπόβαθρα αρχικής οθόνης"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Επεξεργασία υποβάθρου για το αρχικό πλήκτρο"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -242,18 +199,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Επιλογές"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Μία Εικόνα"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Πολλαπλές εικόνες"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Προσαρμογή"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr "Εμφάνιση των πρόσφατα προστιθέμενων άλμπουμ"
@@ -270,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Απόκρυψη Fanart υποβάθρου"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ΕΤΙΚΕΤΑ ΠΛΗΚΤΡΟΥ"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Σελίδα Καιρού"
@@ -302,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Στίχοι"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Πρόσθετο στίχων"
@@ -334,22 +279,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Συντομεύσεις"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Κατηγορίες"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Εμφάνιση διανομής"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Επιλογή τραγουδιού"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Επιλογή Συνδέσμων"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Προέλευση στίχων"
@@ -374,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Τελευταία ενημέρωση"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Μενού"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Πηγή δεδομένων"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Εικόνα"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Δεν εντοπίστηκε οπτικός δίσκος"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Εξαγωγή"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Απόκρυψη Fanart"
@@ -426,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Επιλογές Σάρωσης Περιεχομένου"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Βασικό"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Ορισμός διαδρομής Fanart"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Μικρό Fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Επιλεγμένο προφίλ"
@@ -454,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Πρώτη Προβολή"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Νεώτερες Ταινίες"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Νεώτερα Επεισόδια"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Επιλογές λίστας αναπαραγωγής"
@@ -559,49 +460,85 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]ΡΥΘΜΙΣΕΙΣ ΠΡΟΣΘΕΤΩΝ[/B][CR][CR]Διαχείριση εγκατεστημένων πρόσθετων · Αναζήτηση και εγκατάσταση πρόσθετων από το xbmc.org[CR]Τροποποίηση ρυθμίσεων των πρόσθετων"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]ΡΥΘΜΙΣΕΙΣ ΥΠΗΡΕΣΙΑΣ[/B][CR][CR]Χειρισμός του XBMC μέσω UPnP και HTTP · Ρύθμιση κοινής χρήσης αρχείων[CR]Ενεργοποίηση Zeroconf · Ρύθμιση AirPlay"
+msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Επιλέξτε προφίλ χρήστη για το XBMC[CR]για να συνδεθείτε και να συνεχίσετε"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Χάρτες Καιρού"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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ωρη Πρόβλεψη"
+msgstr "36ωρη Πρόγνωση"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr "Ωριαία Πρόβλεψη"
+msgstr "Ωριαία Πρόγνωση"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
-msgstr "Πρόβλεψη Σαββατοκύριακου"
+msgstr "Πρόγνωση Σαββατοκύριακου"
 
 msgctxt "#31904"
 msgid "10 Day Forecast"
-msgstr "Πρόβλεψη 10 ημερών"
+msgstr "Πρόγνωση 10 ημερών"
 
 msgctxt "#31905"
 msgid "Forecast"
-msgstr "Πρόβλεψη"
+msgstr "Πρόγνωση"
 
 msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Χάρτες & Βίντεο"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Βίντεο Πρόβλεψης [COLOR=grey2](Πλήρης Οθόνη)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Πιθανότητα Υετού"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr "Ανάκτηση πρόβλεψης καιρού..."
+msgstr "Ανάκτηση πρόγνωσης καιρού..."
diff --git a/addons/skin.confluence/language/Hebrew/strings.po b/addons/skin.confluence/language/Hebrew/strings.po
new file mode 100644
index 0000000000..36f0a5c3b0
--- /dev/null
+++ b/addons/skin.confluence/language/Hebrew/strings.po
@@ -0,0 +1,546 @@
+# XBMC Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon version: 2.1.0
+# Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Idan Bushari <bushari2003@hotmail.com>, 2012.
+#   <sagiben@gmail.com>, 2012.
+#   <zivads@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-07-30 16:22+0000\n"
+"Last-Translator: Idan Bushari <bushari2003@hotmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\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 "Fullscreen"
+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 "#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 "#31042"
+msgid "PLAYING"
+msgstr "מנגן"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "הפסקה"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "הרצה קדימה"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "הרצה אחורה"
+
+msgctxt "#31048"
+msgid "Visualization 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 Dialog 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 ""
+
+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 Submenu"
+msgstr "תת-תפריט תוכנות במסך הבית"
+
+msgctxt "#31119"
+msgid "Hide Background Fanart"
+msgstr "החבא הצגת פאנארט ברקע"
+
+msgctxt "#31122"
+msgid "Weather Page"
+msgstr "מסך מזג אויר"
+
+msgctxt "#31123"
+msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr "השתמש ב\"פוסטרים\" במקום ב\"באנרים\" עבור סדרות טלוויזיה"
+
+msgctxt "#31124"
+msgid "Show Background \"Now Playing\" Video"
+msgstr "הצג ברקע \"מנגן כעת\" וידאו"
+
+msgctxt "#31125"
+msgid "Show Background \"Now Playing\" Visualization"
+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 "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
+msgctxt "#31132"
+msgid "Lyrics Add-on"
+msgstr "תוספי מילים לשירים"
+
+msgctxt "#31133"
+msgid "Subtitle Add-on"
+msgstr "תסוף כתובית"
+
+msgctxt "#31134"
+msgid "Home Page Videos Submenu"
+msgstr "תת-תפריט וידאו במסך הבית"
+
+msgctxt "#31135"
+msgid "Home Page Music Submenu"
+msgstr "תת-תפריט מוסיקה במסך הבית"
+
+msgctxt "#31136"
+msgid "Home Page Pictures Submenu"
+msgstr "תת-תפריט תמונות במסך הבית"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "מוזיקה OSD"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "וידאו 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 "#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 "נוצר"
+
+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 "#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"
+
+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 "#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]קבע 3 ערים שבהן תרצה לאסוף מידע על מזג האוויר"
+
+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 "#31407"
+msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
+msgstr "[B]שינוי הגדרות סקין[/B][CR][CR]הגדר את סקין Confluence, הוסף"
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
+msgstr "[B]שינוי הגדרות הרחבות[/B][CR][CR]נהל את ההרחבות המותקנות אצלך, עיין והתקן הרחבות נוספות מxbmc.org[CR]שנה הגדרות הרחבות"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr ""
+
+msgctxt "#31421"
+msgid "Select your XBMC user Profile[CR]to login and continue"
+msgstr "בחר בפרופיל משתמש XBMC [CR]שלך כדי להתחבר ולהמשיך"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 "10 Day Forecast"
+msgstr "תחזית ל-10 ימים"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "תחזית"
+
+msgctxt "#31906"
+msgid "Maps & Video"
+msgstr "מפות ווידאו"
+
+msgctxt "#31908"
+msgid "Chance of Precipitation"
+msgstr "סיכוי לרטיבות"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "משיג פרטי תחזית..."
diff --git a/addons/skin.confluence/language/Hungarian/strings.po b/addons/skin.confluence/language/Hungarian/strings.po
index cff914adfa..9ecde02b22 100644
--- a/addons/skin.confluence/language/Hungarian/strings.po
+++ b/addons/skin.confluence/language/Hungarian/strings.po
@@ -3,44 +3,27 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <bilbohu@gmail.com>, 2012.
+# Peter Sarossy <peter.sarossy@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-05-31 16:52+0000\n"
+"Last-Translator: frodo <bilbohu@gmail.com>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Confluence arculat. Készítő: Jezz_X"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "A Confluence az alapértelmezett arculat az XBMC-hez a 9.11-es verziótól kezdődően. Merít sok sok népszerű arculat elképzeléséből, megpróbálva vegyíteni a jó ötleteket úgy, hogy az könnyen kezelhető legyen az XBMC-vel először találkozóknak is."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "A Confluence az alapértelmezett XBMC arculat. Annak eltávolítása problémákat okozhat."
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Választható"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Szeretem"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Utálom"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Kikapcsolási lehetőségek"
@@ -57,25 +40,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Nézet lehetőségek"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Beépülők"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Nemrég hozzáadott"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Videók - Fájlmód"
+msgstr "Teljes időtartam"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -95,7 +66,7 @@ msgstr "Elem"
 
 msgctxt "#31026"
 msgid "Misc Options"
-msgstr "Más beállítások"
+msgstr "Egyéb beállítások"
 
 msgctxt "#31027"
 msgid "Location"
@@ -109,10 +80,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Telj. lista"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Kép ikonok"
@@ -145,17 +112,9 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "VISSZATEKERÉS"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Hang tulajdonságok"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Jelenlegi beállítás"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Vizualizáció altípus"
+msgstr "Vizualizáció altípusok"
 
 msgctxt "#31049"
 msgid "End Time"
@@ -171,27 +130,27 @@ msgstr "Sorrend: Csökkenő"
 
 msgctxt "#31055"
 msgid "Open playlist"
-msgstr "Játszáslista megnyitása"
+msgstr "Lejátszásilista megnyitása"
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "Játszáslista mentése"
+msgstr "Lejátszásilista mentése"
 
 msgctxt "#31057"
 msgid "Close playlist"
-msgstr "Játszáslista zárása"
+msgstr "Lejátszáslista bezárása"
 
 msgctxt "#31058"
 msgid "System music files"
-msgstr "Rendszer zene fájlok"
+msgstr "Rendszer, zene fájlok"
 
 msgctxt "#31059"
 msgid "Current playlist"
-msgstr "Jelenlegi játszáslista"
+msgstr "Jelenlegi lejátszásilista"
 
 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, amelyiket játszani akarod."
+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"
@@ -215,7 +174,7 @@ msgstr "Filmelőzetesek lejátszása ablakban [COLOR=grey3](csak a videóinfó a
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
-msgstr "Vegyes beállítások"
+msgstr "Egyéb beállítások"
 
 msgctxt "#31107"
 msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
@@ -223,15 +182,15 @@ msgstr "Fájlnevekből olvasott filmjellemzők elrejtése [COLOR=grey3](BR, HD-D
 
 msgctxt "#31108"
 msgid "Hide Main Menu Buttons"
-msgstr "Főmenügombok láthatósága"
+msgstr "Főmenü gombok láthatósága"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Médiahátterek"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Háttér beállítása ehhez a médiatípushoz"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Lehetőségek"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Egyetlen Kép"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Több kép"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Testreszabás"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Nemrég hozzáadott albumok mutatása"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +216,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Fanart-háttér elrejtése"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "GOMBFELIRAT"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Időjárás oldal"
@@ -301,6 +244,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Dalszöveg"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Dalszöveg kiegészítő"
@@ -333,37 +280,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Parancsikonok"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategóriák"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Szereposztás mutatása"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Válaszd a dalodat"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Szekció linkek"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Dalszövegforrás"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Található"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "További elemek keresése"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Következő epizódok"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +308,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Utoljára frissítve"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menü"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Adatszolgáltató"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Kép"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Lemez média nem található"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Nyitás"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Fanart elrejtése"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Tartalomkeresési lehetőségek"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Alap"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Fanart elérési helye"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Kis fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Választott profil"
@@ -453,17 +364,9 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Játszva"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Legfrissebb filmek  "
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Legfrissebb epizódok  "
-
 msgctxt "#31325"
 msgid "Playlist Options"
-msgstr "Játszáslista lehetőségek"
+msgstr "Lejátszásilista lehetőségek"
 
 msgctxt "#31326"
 msgid "Created"
@@ -491,7 +394,7 @@ msgstr "Album részletek"
 
 msgctxt "#31351"
 msgid "Pause"
-msgstr "Pillanatmegállítás"
+msgstr "Pillanat állj"
 
 msgctxt "#31352"
 msgid "Stop"
@@ -547,7 +450,7 @@ msgstr "[B]IDŐJÁRÁS BEÁLLÍTÁSOK[/B][CR][CR]Három város megadása, melyek
 
 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ávkapcsoló 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"
+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 "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
@@ -558,6 +461,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 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 az xbmc.org[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 fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +472,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Válaszd ki az XBMC felhasználói profilod[CR]a belépéshez"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Időjárási térképek"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -575,7 +518,7 @@ msgstr "36 órás előrejelzés"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr "Előrejelzés óra bontással"
+msgstr "Előrejelzés óránként"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
@@ -593,10 +536,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Térképek & Videó"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Videó előrejelzés [COLOR=grey2](Teljesképernyős lejátszás)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Csapadék esélye"
diff --git a/addons/skin.confluence/language/Icelandic/strings.po b/addons/skin.confluence/language/Icelandic/strings.po
index 5ea2319214..b748a51622 100644
--- a/addons/skin.confluence/language/Icelandic/strings.po
+++ b/addons/skin.confluence/language/Icelandic/strings.po
@@ -3,44 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Sigurdur Olafsson <here@hell.is>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-05-29 09:03+0000\n"
+"Last-Translator: Sigurdur Olafsson <here@hell.is>\n"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Breyta -"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Ást"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Hatri"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Orkukostir"
@@ -57,25 +39,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Stillingar sjónarhorns"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Tengiforrit"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Allur skjárinn"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Nýlega bætt við"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Myndefni - Skrár"
+msgstr "Alls tímalengd"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Aðdáendamyndir"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Heildarlisti"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Smámyndir"
@@ -145,14 +111,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "TIL BAKA"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Hljóðeiginleikar"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Gildandi forstilling"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Forstillingar myndskreytinga"
@@ -226,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Fela hnapp í aðalvalmynd"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Bakgrunnar heimasvæðis"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Breyta bakgrunni fyrir heimahnapp"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +199,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Valkostir"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Einföld mynd"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Margföld mynd"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Sérsníðari"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Sýna hljómplötur sem hefur nýlega verið bætt við"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Fela aðdáendamyndir í bakgrunni"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "HNAPPAHEITI"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Veðursíða"
@@ -301,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Lagatextar"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Viðbót fyrir lagatexta"
@@ -333,37 +279,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Flýtileiðir"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Flokkar"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Sýna leikara"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Veldu þitt lag"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Tenglar svæðis"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Frumkóði lagatexta"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Fann"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Finna fleiri atriði"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Næstu þættir"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Síðast uppfært"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Valmynd"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Gagnaveita"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Mynd"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Enginn diskur með myndefni fannst"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Ýta út"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Fela aðdáendamyndir"
@@ -425,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Stillingar fyrir skönnun innihalds"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Einfalt"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Breyta slóð fyrir aðdáendamyndir"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Lítil aðdáendamynd"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Veldu notanda"
@@ -453,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Sýnt"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Nýjustu kvikmyndirnar"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Nýjustu þættirnir"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Valkostir lagalista"
@@ -558,6 +460,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]BREYTA VIÐBÓTUM[/B][CR][CR]Breyttu uppsettum viðbótum · Leitaðu að og settu upp viðbætur frá xbmc.org[CR]Breyta stillingum viðbóta"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +471,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Veldu XBMC notanda[CR]til að skrá þig inn og halda áfram"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Veðurkort"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Kort og Myndbönd"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Myndbandaveðurspá [COLOR=grey2](Spila á öllum skjánum)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Líkur á úrkomu"
diff --git a/addons/skin.confluence/language/Italian/strings.po b/addons/skin.confluence/language/Italian/strings.po
index 426bb20d7a..a5652a465b 100644
--- a/addons/skin.confluence/language/Italian/strings.po
+++ b/addons/skin.confluence/language/Italian/strings.po
@@ -3,44 +3,28 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <andreadepirro@gmail.com>, 2012.
+# Francesco Tili <>, 2012.
+# Gianluca Cembrani <melagodo@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-06 17:08+0000\n"
+"Last-Translator: Gianluca Cembrani <melagodo@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Cambia il tuo"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Amo"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Odio"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Impostazioni Avanzate"
@@ -57,25 +41,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Vedi Opzioni"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Schermo Intero"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Aggiunti di recente"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Files - Video"
+msgstr "Durata totale"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +81,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Lista estesa"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Miniature immagini"
@@ -145,14 +113,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "INDIETRO"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Proprietà Audio "
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Preset Corrente"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Preset Visualizzazione"
@@ -226,12 +186,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Nascondi i bottoni del menù principale"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Sfondi per le sezioni principali"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Modifica lo Sfondo per la Sezione"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +201,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opzioni"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Singola Immagine"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Immagini Multiple"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Personalizzazione"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Mostra gli album aggiunti di recente"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +217,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Nascondi i Fanart sullo sfondo"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ETICHETTA BOTTONE"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Pagina Meteo"
@@ -301,6 +245,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "XBMC Testi Canzoni"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Add-on Testi"
@@ -333,37 +281,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Collegamenti"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Categorie"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Mostra il Cast"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Scegli la canzone"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Sezione Links"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Sorgente Testi"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Trovato"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Cerca altri elementi"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Prossimi Episodi"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +309,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Ultimo Aggiornamento"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menù"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Fornitore dei dati"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Immagini"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Nessun Disco Rilevato"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Espelli"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Nascondi Fanart"
@@ -425,18 +345,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Opzioni Scansione Contenuti"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Base"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Imposta il percorso per le immagini fanart"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Fanart ridotte"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Scegli il Profilo"
@@ -453,14 +365,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Trasmessa"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Ultimi Film"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Ultimi Episodi"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Opzioni Playlist"
@@ -535,7 +439,7 @@ msgstr "[B]CONFIGURA IMPOSTAZIONI VIDEO[/B][CR][CR]Gestisci la tua Libreria Vide
 
 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 impostazioni di riproduzione della musica · Cambia impostazioni per le liste audio[CR]Setup song submission · Imposta le opzioni per il karaoke"
+msgstr "[B]CONFIGURA IMPOSTAZIONI MUSICA[/B][CR][CR]Gestisci la tua Libreria Musicale · Imposta le impostazioni di riproduzione della musica · Cambia 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"
@@ -558,6 +462,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]CONFIGURA GLI ADD-ONS[/B][CR][CR]Gestisci i tuoi Add-ons installati · Cerca ed installa gli Add-ons da xbmc.org[CR]Modifica le impostazioni degli Add-ons"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +473,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Scegli il tuo profilo utente di XBMC[CR]per fare il login e continuare"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Mappa Meteo"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +537,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Mappe & Video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Previsioni Video [COLOR=grey2](Riproduzione a schermo intero)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Percentuale di precipitazioni"
diff --git a/addons/skin.confluence/language/Japanese/strings.po b/addons/skin.confluence/language/Japanese/strings.po
index 6929e898bf..d8038dc66b 100644
--- a/addons/skin.confluence/language/Japanese/strings.po
+++ b/addons/skin.confluence/language/Japanese/strings.po
@@ -3,43 +3,25 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <shaolin@rhythmaning.org>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-05-31 00:48+0000\n"
+"Last-Translator: shaolin <shaolin@rhythmaning.org>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31000"
 msgid "Change Your"
-msgstr ""
-
-msgctxt "#31001"
-msgid "Love"
-msgstr "Love"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Hate"
+msgstr " "
 
 msgctxt "#31003"
 msgid "Power Options"
@@ -57,25 +39,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "表示オプション"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "プラグイン"
-
 msgctxt "#31008"
 msgid "Fullscreen"
-msgstr ""
+msgstr "フルスクリーン"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "最新の追加"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "ビデオ - ファイル"
+msgstr "総時間"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "ファンアート"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "フルリスト"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "サムネール"
@@ -145,21 +111,13 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "巻戻し"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "オーディオ設定"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "現在の設定"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Visualization Presets"
+msgstr "ビジュアライザーのプリセット"
 
 msgctxt "#31049"
 msgid "End Time"
-msgstr "End Time"
+msgstr "終了時間"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -223,15 +181,15 @@ msgstr "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/
 
 msgctxt "#31108"
 msgid "Hide Main Menu Buttons"
-msgstr "メインメニューから隠すボタン"
+msgstr "「メインメニュー」ボタンを隠す"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "メディア別の背景設定"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "編集するメディアタイプを選択"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,25 +199,13 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "オプション"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "単一イメージ"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "複数イメージ"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "カスタマイズ"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "最近追加されたアルバムを表示"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
-msgstr "最近追加したビデオを表示"
+msgstr "最近追加されたビデオを表示"
 
 msgctxt "#31118"
 msgid "Home Page Programs Submenu"
@@ -269,17 +215,13 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "背景のファンアートを隠す"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ボタンラベル"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "天気予報ページ"
 
 msgctxt "#31123"
 msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
-msgstr "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr "TV ショーで「バナー」の代わりに「ポスター】を使用"
 
 msgctxt "#31124"
 msgid "Show Background \"Now Playing\" Video"
@@ -291,7 +233,7 @@ msgstr "背景に「現在再生中」視覚化を表示"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Play TV theme songs in video library (TvTunes add-on)"
+msgstr "ビデオライブラリで TV テーマ曲を再生 (TvTunes アドオン)"
 
 msgctxt "#31127"
 msgid "TvTunes"
@@ -301,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "歌詞"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "歌詞アドオン"
@@ -333,37 +279,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "カテゴリ"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "キャストを表示"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "曲を選択"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "セクションリンク"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "歌詞の情報源"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "見つかりました"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "もっと見つける"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "今後のエピソード"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "最終更新時刻"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "メニュー"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "気象データ提供元"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "ピクチャ"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "ディスクメディアが検出されませんでした"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "イジェクト"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "ファンアートを隠す"
@@ -425,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "コンテントスキャンオプション"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "標準"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "ファンアートのパスを設定"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "小さなファンアート"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "選択されたプロファイル"
@@ -453,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "放映日"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "最新ムービー"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "最新エピソード"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "プレイリストオプション"
@@ -558,6 +460,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]アドオン設定[/B][CR][CR]インストール済みアドオン管理 - xbmc.orgからアドオンを検索・インストール[CR]アドオン設定変更"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +471,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "XBMC ユーザープロファイルを選択して[CR]ログインしてください"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "天気図"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "天気図 & ビデオ"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "ビデオ予報 [COLOR=grey2](フルスクリーン再生)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "降水確率"
diff --git a/addons/skin.confluence/language/Korean/strings.po b/addons/skin.confluence/language/Korean/strings.po
index 09a2bd5967..4e4d1bf180 100644
--- a/addons/skin.confluence/language/Korean/strings.po
+++ b/addons/skin.confluence/language/Korean/strings.po
@@ -3,44 +3,27 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <airplanez@gmail.com>, 2012.
+#   <piodio@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-07-18 07:22+0000\n"
+"Last-Translator: airplanez <airplanez@gmail.com>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Confluence 스킨 Jezz_X 만듬 (기본 스킨)"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence 는 XBMC 9.11 이상의 기본 스킨입니다. 많은 인기 스킨의 컨셉과 좋은 아이디어를 모아서 하나의 스킨으로 만들었으며 초보자도 사용하기 쉽습니다."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "Confluence는 XBMC의 기본스킨으로 제거시 문제가 야기될수 있습니다."
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "변경"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "좋아함"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "싫어함"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "전원 옵션"
@@ -57,25 +40,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "보기 옵션"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "플러그인"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "전체화면"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "최근 추가됨"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "비디오 - 파일"
+msgstr "총 재생시간"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +80,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "팬아트"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "전체 목록"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "사진 미리보기"
@@ -135,31 +102,23 @@ msgstr "재생중"
 
 msgctxt "#31043"
 msgid "PAUSED"
-msgstr "일시중지됨"
+msgstr "일시정지"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
-msgstr "빨리 감기"
+msgstr "빨리감기"
 
 msgctxt "#31045"
 msgid "REWIND"
 msgstr "되감기"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "오디오 속성"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "현재 사전설정"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "시각화 사전설정"
 
 msgctxt "#31049"
 msgid "End Time"
-msgstr "종료 시간"
+msgstr "종료 시각"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -207,7 +166,7 @@ msgstr "배경"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "사진 슬라이드쇼에 \"일시중지됨\" 보이기"
+msgstr "사진 슬라이드쇼에 \"일시정지됨\" 보기"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
@@ -226,12 +185,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "메인 메뉴 버튼 숨기기"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "미디어 배경"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "미디어 형식의 배경 수정"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,25 +200,13 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "옵션"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "단일 이미지"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "다중 이미지"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "사용자 지정"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "최근 추가한 앨범 보기"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
-msgstr "최근 추가된 비디오 보이기"
+msgstr "최근 추가한 비디오 보기"
 
 msgctxt "#31118"
 msgid "Home Page Programs Submenu"
@@ -269,10 +216,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "배경 팬아트 숨기기"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "버튼 라벨"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "날씨 페이지"
@@ -283,11 +226,11 @@ msgstr "TV 쇼에 \"배너\" 대신 \"포스터\" 사용"
 
 msgctxt "#31124"
 msgid "Show Background \"Now Playing\" Video"
-msgstr "배경에 \"지금 재생중\" 비디오 보이기"
+msgstr "배경에 \"지금 재생중\" 비디오 보기"
 
 msgctxt "#31125"
 msgid "Show Background \"Now Playing\" Visualization"
-msgstr "배경에 \"지금 재생중\" 시각화 보이기"
+msgstr "배경에 \"지금 재생중\" 시각화 보기"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -301,6 +244,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "가사"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "가사 추가기능"
@@ -333,37 +280,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "바로가기"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "카테고리"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "배역 보이기"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "노래 선택"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "섹션 링크"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "가사 소스"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "찾음"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "더 찾아보기"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "방송 예정 에피소드"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +308,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "마지막 업데이트"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "메뉴"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "날씨 정보 제공"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "사진"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "디스크 미디어 감지되지 않음"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "꺼내기"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "팬아트 숨기기"
@@ -411,7 +330,7 @@ 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"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "컨텐츠 검색 옵션"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "기본"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "팬아트 경로 설정"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "작은 팬아트"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "선택된 프로파일"
@@ -451,15 +362,7 @@ msgstr "노래방 노래 선택기"
 
 msgctxt "#31322"
 msgid "Aired"
-msgstr "방영됨"
-
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "최근 영화"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "최근 에피소드"
+msgstr "방영"
 
 msgctxt "#31325"
 msgid "Playlist Options"
@@ -475,7 +378,7 @@ msgstr "해상도"
 
 msgctxt "#31328"
 msgid "Recently Added"
-msgstr "최근 추가됨"
+msgstr "최근 추가"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
@@ -499,7 +402,7 @@ msgstr "정지"
 
 msgctxt "#31353"
 msgid "Fast Forward"
-msgstr "빨리 감기"
+msgstr "빨리감기"
 
 msgctxt "#31354"
 msgid "Rewind"
@@ -507,7 +410,7 @@ msgstr "되감기"
 
 msgctxt "#31355"
 msgid "Movie menu"
-msgstr "영화 메뉴"
+msgstr "자막 추가기능"
 
 msgctxt "#31356"
 msgid "Download Subtitles"
@@ -555,9 +458,13 @@ msgstr "[B]스킨 설정[/B][CR][CR]Confluence 스킨 설정 · 홈 메뉴 항�
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr "[B]추가기능 설정[/B][CR][CR]설치된 추가기능 관리 · xbmc.org 에서 추가기능 찾기 및 설치[CR]추가기능 설정 변경"
+msgstr "[B]애드온 설정[/B][CR][CR]설치한 추가기능 관리 · xbmc.org에서 추가기능 찾기 및 설치[CR]추가기능 설정 변경"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +472,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "로그인할 XBMC 사용자 프로파일을[CR]선택하고 계속하세요"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "기상도"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +536,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "지도와 비디오"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "비디오예보 [COLOR=grey2](전체화면 재생)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "강수확률"
diff --git a/addons/skin.confluence/language/Lithuanian/strings.po b/addons/skin.confluence/language/Lithuanian/strings.po
index e65b685367..ce92317e77 100644
--- a/addons/skin.confluence/language/Lithuanian/strings.po
+++ b/addons/skin.confluence/language/Lithuanian/strings.po
@@ -3,44 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Artūras Griškonis <xbmc.lt@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-09-04 10:26+0000\n"
+"Last-Translator: Artūras Griškonis <ArtX38@gmail.com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: 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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"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 "Keičiami"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Patinka"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Nepatinka"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Energijos nustatymai"
@@ -51,31 +33,19 @@ msgstr "Veikia..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Paslėpti Informaciją"
+msgstr "Paslėpti informaciją"
 
 msgctxt "#31006"
 msgid "View Options"
 msgstr "Rodinio parinktys"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Pridėtis"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Per visą ekraną"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Neseniai Pridėti"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Failai"
+msgstr "Bendra trukmė"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -95,24 +65,20 @@ msgstr "Elementai"
 
 msgctxt "#31026"
 msgid "Misc Options"
-msgstr "Kitos Opcijos"
+msgstr "Kitos opcijos"
 
 msgctxt "#31027"
 msgid "Location"
-msgstr "Vietovė"
+msgstr "Vieta (Lokacija)"
 
 msgctxt "#31028"
 msgid "Poster Wrap"
-msgstr "Posterių Karuselė"
+msgstr "Posterių karuselė"
 
 msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Pilnas sąrašas"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Miniatiūros"
@@ -127,11 +93,11 @@ msgstr "Informacija"
 
 msgctxt "#31040"
 msgid "Now Playing"
-msgstr "Aktualus failas"
+msgstr "Dabar Rodoma/Grojama"
 
 msgctxt "#31042"
 msgid "PLAYING"
-msgstr "RODOMA"
+msgstr "ATKŪRIMAS"
 
 msgctxt "#31043"
 msgid "PAUSED"
@@ -145,21 +111,13 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "PRASUKTI ATGAL"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Garso Savybės"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Aktualūs Nustatymai"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Vizualizacijos Parinktys"
+msgstr "Vizualizacijos parinktys"
 
 msgctxt "#31049"
 msgid "End Time"
-msgstr "Pabaigos Laikas"
+msgstr "Pabaigos laikas"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -195,7 +153,7 @@ msgstr "Šie failai yra sugrupuoti, pasirinkite dalį katrą norite atkurti."
 
 msgctxt "#31061"
 msgid "Current Selected"
-msgstr "Dabartinis Pasirinkimas"
+msgstr "Dabartinis pasirinkimas"
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -203,15 +161,15 @@ msgstr "Pagrindinio ekrano nustatymai"
 
 msgctxt "#31102"
 msgid "Background"
-msgstr "Fonas"
+msgstr "Fono"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "Rodyti \"Pauzė\" prezentacijos režime"
+msgstr "Rodyti [COLOR=red]Pauzė[/COLOR] prezentacijos režime"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
-msgstr "Rodyti treilerį lange [COLOR=red](Tik dėl informacijos apie video dialogą)[/COLOR]"
+msgstr "Rodyti Filmo anonsą lange [COLOR=grey3](Tik informacijai apie filmo santrauką)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
@@ -219,19 +177,19 @@ msgstr "Įvairios opcijos"
 
 msgctxt "#31107"
 msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Paslėpti nuorodas iš skaitomo failo [COLOR=red](Blu-ray, HD-DVD)[/COLOR]"
+msgstr "Paslėpti nuorodas iš skaitomo failo [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
 
 msgctxt "#31108"
 msgid "Hide Main Menu Buttons"
-msgstr "Slėpti  Pagrindinio Menių Nuorodas"
+msgstr "Slėpti  pagrindinio meniu nuorodas"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Pagrindinio menių fonas"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Pakeisti pagrindinio ekrano foną"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,89 +199,77 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Nustatymai"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Vienas Vaizdas"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Daug Vaizdų"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Nustatymai"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Rodyti neseniai patalpintus albumus"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
-msgstr "Rodyti Neseniai Patalpintus Video"
+msgstr "Rodyti neseniai patalpintus video"
 
 msgctxt "#31118"
 msgid "Home Page Programs Submenu"
-msgstr "Pagrindinio Ekrano Submeniu"
+msgstr "Pagrindinio ekrano submeniu"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
-msgstr "Slėpti Fanart informaciją"
-
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "MYGTUKO PAVADINIMAS"
+msgstr "Slėpti [COLOR=red]Fanart[/COLOR] informaciją"
 
 msgctxt "#31122"
 msgid "Weather Page"
-msgstr "Orų Puslapis"
+msgstr "Orų puslapis"
 
 msgctxt "#31123"
 msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
-msgstr "Naudoti \"Posterius\" vietoi \"Banerių\" serialams"
+msgstr "Naudoti [COLOR=red]Posterius[/COLOR] vietoj [COLOR=red]Banerių[/COLOR] serialams"
 
 msgctxt "#31124"
 msgid "Show Background \"Now Playing\" Video"
-msgstr "Rodyti foninį \"Atkuriamasis\" Video"
+msgstr "Rodyti foninį [COLOR=red]Atkuriamasis[/COLOR] video"
 
 msgctxt "#31125"
 msgid "Show Background \"Now Playing\" Visualization"
-msgstr "Rodyti foninį \"Atkuriamasis\" Vizualizacija"
+msgstr "Rodyti foninį [COLOR=red]Atkuriamasis[/COLOR] vizualizacija"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr "Ijungti Dainų Tekstai OSD"
+msgstr "Groti TV temų dainas vaizdo bibliotekoje [COLOR=red]TvTunes priedai[/COLOR]"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr "KELIAS IKI LYRICS PRIEDŲ"
+msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
-msgstr "Dainų Tekstai"
+msgstr "Dainų tekstai"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
 
 msgctxt "#31132"
 msgid "Lyrics Add-on"
-msgstr "Dainų Tekstų Priedas"
+msgstr "Dainų tekstų priedas"
 
 msgctxt "#31133"
 msgid "Subtitle Add-on"
-msgstr "Subtitrų Priedas"
+msgstr "Subtitrų priedas"
 
 msgctxt "#31134"
 msgid "Home Page Videos Submenu"
-msgstr "Pagrindinio puslapio Video Submeniu"
+msgstr "Pagrindinio puslapio video submeniu"
 
 msgctxt "#31135"
 msgid "Home Page Music Submenu"
-msgstr "Pagrindinio puslapio Muzikos Submeniu"
+msgstr "Pagrindinio puslapio muzikos submeniu"
 
 msgctxt "#31136"
 msgid "Home Page Pictures Submenu"
-msgstr "Pagrindinio puslapio Paveikslėlių Submeniu"
+msgstr "Pagrindinio puslapio paveikslėlių submeniu"
 
 msgctxt "#31140"
 msgid "Music OSD"
-msgstr "Muzika OSD"
+msgstr "Muzikos OSD"
 
 msgctxt "#31141"
 msgid "Video OSD"
@@ -333,77 +279,49 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Etiketės"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorijos"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Rodyti Vaidmenis"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
-msgstr "Išsirinkti Jūsų Dainą"
-
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Nuorodų Kategorija"
+msgstr "Išsirinkti savo dainą"
 
 msgctxt "#31205"
 msgid "Lyrics Source"
-msgstr "Dainų Tekstų Šaltinis"
+msgstr "Dainų tekstų šaltinis"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Iš viso"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Rasti daugiau elementų"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Artėjantys epizodai"
 
 msgctxt "#31300"
 msgid "Current Temp"
-msgstr "Dabartinė Temperatūra"
+msgstr "Dabartinė temperatūra"
 
 msgctxt "#31301"
 msgid "Last Updated"
-msgstr "Paskutiniai Atnaujinimai"
-
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Meniu"
+msgstr "Paskutiniai atnaujinimai"
 
 msgctxt "#31303"
 msgid "Data provider"
-msgstr ""
-
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Vaizdas"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Nėra Disko"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Išimti"
+msgstr "Duomenų teikėjas"
 
 msgctxt "#31307"
 msgid "Hide Fanart"
-msgstr "Paslėpti Fanart"
+msgstr "Paslėpti [COLOR=red]Fanart[/COLOR]"
 
 msgctxt "#31308"
 msgid "Movie Details"
-msgstr "Daugiau apie Filmą"
+msgstr "Daugiau apie filmą"
 
 msgctxt "#31309"
 msgid "Memory Used:"
-msgstr "Išnaudota Atminties:"
+msgstr "Išnaudota atminties:"
 
 msgctxt "#31310"
 msgid "Track Number"
@@ -411,59 +329,43 @@ msgstr "Takelio Num.:"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
-msgstr "FANART[CR][CR]NEPASIEKIAMAS[CR][CR] PASPAUSTI, KAD PASIRINKTI"
+msgstr "[COLOR=red]Fanart[/COLOR][CR][CR]nepasiekiamas[CR][CR] paspauskite pasirinkimui"
 
 msgctxt "#31312"
 msgid "Current Scraper"
-msgstr "Aktualus Skreperis"
+msgstr "Aktualus skreperis"
 
 msgctxt "#31313"
 msgid "Choose a Scraper"
-msgstr "Pasirinkti Skreperį"
+msgstr "Pasirinkti skreperį"
 
 msgctxt "#31314"
 msgid "Content Scanning Options"
-msgstr "Nuskaitomo Turinio Parinktys"
-
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Bazinis(ė/iai)"
+msgstr "Nuskaitomo turinio parinktys"
 
 msgctxt "#31317"
 msgid "Set Fanart Path"
-msgstr "Nurodyti Kelią iki Fanart"
-
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Mažas Fanart"
+msgstr "Nurodyti kelią iki [COLOR=red]Fanart[/COLOR]"
 
 msgctxt "#31319"
 msgid "Selected Profile"
-msgstr "Pasirinktas Profilis"
+msgstr "Pasirinktas profilis"
 
 msgctxt "#31320"
 msgid "Last Logged In"
-msgstr "Paskutinis Įėjimas"
+msgstr "Paskutinis įėjimas"
 
 msgctxt "#31321"
 msgid "Karaoke Song Selector"
-msgstr "Karaoke Dainos Pasirinkimas"
+msgstr "Karaoke dainos pasirinkimas"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Rodomas"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Nauji Filmai"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Nauji Epizodai"
-
 msgctxt "#31325"
 msgid "Playlist Options"
-msgstr "Sąrašo Opcijos"
+msgstr "Sąrašo opcijos"
 
 msgctxt "#31326"
 msgid "Created"
@@ -475,19 +377,19 @@ msgstr "Leidimas"
 
 msgctxt "#31328"
 msgid "Recently Added"
-msgstr "Neseniai Dadėta"
+msgstr "Neseniai dadėta"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]NUSTATYTAS LAIKRODIS![/B] [COLOR=red] - AUTOMATIŠKAI ATSIJUNGS PO[/COLOR]"
+msgstr "[B]Nustatytas laikrodis![/B] [COLOR=grey2] - automatiškai atsijungs po[/COLOR]"
 
 msgctxt "#31330"
 msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Spustelėkite norėdami atkūrti[CR][CR]Video treilerį"
+msgstr "Spustelėkite norėdami atkūrti[CR][CR]Filmo anonsą"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr "Albumai Detaliau"
+msgstr "Albumai detaliau"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -499,65 +401,69 @@ msgstr "Stop"
 
 msgctxt "#31353"
 msgid "Fast Forward"
-msgstr "Prasukimas Pirmyn"
+msgstr "Prasukimas pirmyn"
 
 msgctxt "#31354"
 msgid "Rewind"
-msgstr "Prasukimas Atgal"
+msgstr "Prasukimas atgal"
 
 msgctxt "#31355"
 msgid "Movie menu"
-msgstr "Filmo Menių"
+msgstr "Filmo meniu"
 
 msgctxt "#31356"
 msgid "Download Subtitles"
-msgstr "Atsisiųsti Subtitrus"
+msgstr "Atsisiųsti subtitrus"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "Pagal nutylėjimą šablonui"
+msgstr "Numatytasis viršelis"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
-msgstr "Pagal nutylėjimą šablonui be Kaps"
+msgstr "Viršelis pagal nutylėjimą šablonui be [COLOR=red]Kaps[/COLOR]"
 
 msgctxt "#31392"
 msgid "Arial based"
-msgstr "Arial Pagrindu"
+msgstr "[COLOR=red]Arial[/COLOR] pagrindu"
 
 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][COLOR=blue]IŠVAIZDOS PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR][COLOR=red]Pakeisti išvaizdą · Nustatyti kalbą ir regioną[CR]Pakeisti failų sarašą · Nustatyti ekrano vaizdą.[/COLOR]"
+msgstr "[B][COLOR=red]VIRŠELIO PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR]Pakeisti viršelį · Nustatyti kalbą ir regioną[CR][COLOR=red]Žemiau pateikiami trumpinių tokių kaip[/COLOR][CR][COLOR=blue](DXVA, Replaygain, EXIF, Zeroconf, AirPlay ir Prezentacija t.t...) paaiškinimai[/COLOR]"
 
 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][COLOR=blue]VIDEO PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR][COLOR=red]Tvarkyti video biblioteką · Nustatyti video atkūrimo opcijas.[CR]Nustatyti video sarašą · Nustatyti subtitrų šriftą.[/COLOR]"
+msgstr "[B][COLOR=red]VIDEO PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR]Tvarkyti video biblioteką · Nustatyti video atkūrimo opcijas Nustatyti video sarašą[CR][COLOR=red]DXVA2[/COLOR] [COLOR=blue]aparatūrinis spartinimas (Direct-X) · Aparatūros video dekodavimas GPU(DXVA)[CR]gerokai sumažina CPU apkrovą kai kuriais atvejais žymiai pagerina vaizdo kokybę[/COLOR]"
 
 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][COLOR=blue]MUZIKOS PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR][COLOR=red]Tvarkyti audio biblioteką· Nustatyti audio atkūrimo opcijas.[CR]Nustatyti audio sarašą · Nustatyti audio pridėjimą · Nustatyti karaoke.[/COLOR]"
+msgstr "[B][COLOR=red]MUZIKOS PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR]Tvarkyti audio biblioteką· Nustatyti audio atkūrimo opcijas · Nustatyti audio sarašą[CR]Nustatyti audio pridėjimą · [COLOR=red]ReplayGain[/COLOR] [COLOR=blue]funkcija, kuri garantuos skirtingo garsumo[CR]muzikos kūrinių grojimą vienodu lygiu[/COLOR]"
 
 msgctxt "#31403"
 msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr "[B][COLOR=blue]PAVEIKSLŲ PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR][COLOR=red]Tvarkyti nuotraukų biblioteką · Nustatyti pristatymą · Nustatyti prezentaciją.[/COLOR]"
+msgstr "[B][COLOR=red]FOTO /PAVEIKSLĖLIŲ PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR]Tvarkyti nuotraukų biblioteką · Nustatyti pristatymą · Nustatyti prezentaciją[CR][COLOR=red]EXIF[/COLOR] [COLOR=blue]tai nuotraukos faile saugoma papildoma informacija kurioje nurodyti visi[CR]fotografavimo parametrai: data, laikas, išlaikymas, diafragma ir t.t...[/COLOR]"
 
 msgctxt "#31404"
 msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr "[B][COLOR=blue]ORŲ PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR][COLOR=red]Nustatyti trys Miestus gauti informacijai apie orus.[/COLOR]"
+msgstr "[B][COLOR=red]ORŲ PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR]Nustatyti trys Miestus gauti informacijai apie orus"
 
 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][COLOR=blue]SISTEMOS PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR][COLOR=red]Nustatyti ekrano kalibravimą · Nustatyti audio išėjimą · Nustatyti distancinį pultą.[CR]Nustatyti energijos sąnaudas · Nustatyti derinimą · Nustatyti blokavimą.[/COLOR]"
+msgstr "[B][COLOR=red]SISTEMOS PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR]Nustatyti ekrano kalibravimą · Nustatyti audio išėjimą · Nustatyti distancinį pultą[CR][COLOR=red]Master Lock[/COLOR] [COLOR=blue]leidžia nustatyti pagrindinį užrakto slaptažodį. Apriboja prieigą prie[CR]pasirinktų skyrių tokių kaip Programos ir Scenarijai, Failų tvarkyklė ir Nustatymai[/COLOR]"
 
 msgctxt "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
-msgstr "[B][COLOR=blue]ŠABLONŲ PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR][COLOR=red]Nustatyti pasirinktą šabloną. Pakeisti šablono foną.[CR]Pridėti ir (arba) pašalinti pagrindinius menių punktus.[/COLOR]"
+msgstr "[B][COLOR=red]VIRŠELIO PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR]Nustatyti pasirinktą viršelį · Pakeisti viršelio foną · [COLOR=red]FanArt[/COLOR] [COLOR=blue]yra meno kūrinys · Kuriami[CR]baneriai, avatarai, animacija ir plakatai.[/COLOR] · [COLOR=red]Baneris[/COLOR] [COLOR=blue]tai keturkampio formos, patrauklus[CR]dėmesį patraukiantis tekstinis ar vaizdinis paveikslėlis dedamas viršuje, apačioje ar šone[/COLOR]"
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr "[B][COLOR=blue]PRIEDŲ PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR][CR][COLOR=red]Nustatyti parametrų valdymą · Nustatymų diegimą iš xbmc.org[CR]Nustatyti priedų pakeitimą.[/COLOR]"
+msgstr "[B][COLOR=red]PRIEDŲ PARAMETRŲ NUSTATYMAI[/COLOR][/B][CR]Nustatyti parametrų valdymą · Nustatyti diegimą iš xbmc.org · Nustatyti priedų pakeitimą[CR][COLOR=red]Prezentacija[/COLOR] — [COLOR=blue]visuomeninės komunikacijos forma, ko nors naujo, įdomaus, vertingo[CR]pristatymas visuomenei arba visuomenės grupei[/COLOR]"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,25 +471,61 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Pasirinkite XBMC vartotojo profilį[CR]įeiti į sistemą ir tęsti."
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Orų Žemėlapiai"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 Valandų Prognozė"
+msgstr "36 Valandų prognozė"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr "Valandinė Prognozė"
+msgstr "Valandinė prognozė"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
-msgstr "Savaitgalio Prognozė"
+msgstr "Savaitgalio prognozė"
 
 msgctxt "#31904"
 msgid "10 Day Forecast"
-msgstr "10 Dienų Prognozė"
+msgstr "10 Dienų prognozė"
 
 msgctxt "#31905"
 msgid "Forecast"
@@ -591,16 +533,12 @@ msgstr "Prognozė"
 
 msgctxt "#31906"
 msgid "Maps & Video"
-msgstr "Žemėlapiai ir Video"
-
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Video Prognozė [COLOR=grey2](Pilnaekranis Atkūrimas)[/COLOR]"
+msgstr "Žemėlapiai ir video"
 
 msgctxt "#31908"
 msgid "Chance of Precipitation"
-msgstr "Kritulių Tikimybė"
+msgstr "Kritulių tikimybė"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr "Parsiunčiama Prognozės Informacija..."
+msgstr "Parsiunčiama prognozės informacija..."
diff --git a/addons/skin.confluence/language/Norwegian/strings.po b/addons/skin.confluence/language/Norwegian/strings.po
index 71b9844f1c..eb59a9c24f 100644
--- a/addons/skin.confluence/language/Norwegian/strings.po
+++ b/addons/skin.confluence/language/Norwegian/strings.po
@@ -3,44 +3,27 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <cwattengard@gmail.com>, 2012.
+#   <thomas.amland@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-02 11:56+0000\n"
+"Last-Translator: takoi <thomas.amland@gmail.com>\n"
+"Language-Team: Norwegian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/no/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: no\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Endre dine"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Elsk"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Hat"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Strømalternativer"
@@ -55,27 +38,15 @@ msgstr "Gjem INFO"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr ""
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Tillegg"
+msgstr "Visningsalternativer"
 
 msgctxt "#31008"
 msgid "Fullscreen"
-msgstr ""
+msgstr "Fullskjerm"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Nylig lagt til"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Videoer - Filer"
+msgstr "Total varighet"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -91,15 +62,15 @@ msgstr "Side"
 
 msgctxt "#31025"
 msgid "Items"
-msgstr "objekter"
+msgstr "elementer"
 
 msgctxt "#31026"
 msgid "Misc Options"
-msgstr "Øvr. alternativer"
+msgstr "Øvrige alternativer"
 
 msgctxt "#31027"
 msgid "Location"
-msgstr "Plassering"
+msgstr "Sted"
 
 msgctxt "#31028"
 msgid "Poster Wrap"
@@ -107,11 +78,7 @@ msgstr "Plakat"
 
 msgctxt "#31029"
 msgid "Fanart"
-msgstr "FanArt"
-
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Full liste"
+msgstr "Fanart"
 
 msgctxt "#31031"
 msgid "Pic Thumbs"
@@ -123,7 +90,7 @@ msgstr "Bildeinnpakking"
 
 msgctxt "#31033"
 msgid "Info"
-msgstr "Informasjon"
+msgstr "Info"
 
 msgctxt "#31040"
 msgid "Now Playing"
@@ -145,29 +112,21 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "SPOL TILBAKE"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Lydegenskaper"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Nåværende forvalg"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Visualiseringsforvalg"
 
 msgctxt "#31049"
 msgid "End Time"
-msgstr "Slutt tid"
+msgstr "Ferdig klokken"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr ""
+msgstr "Sorter: Stigende"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr ""
+msgstr "Sorter: Synkende"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -226,12 +185,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Inaktive hovedmenyknapper"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Mediebakgrunner"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Endre bakgrunn for medietype"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Alternativer"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Enkeltbilde"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Multibilde"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Tilpasser"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Vis sist tillagte album"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -267,11 +214,7 @@ msgstr "Programundermeny i hovedmeny"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
-msgstr ""
-
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "KNAPPETIKETT"
+msgstr "Gjem fanart bakgrunn"
 
 msgctxt "#31122"
 msgid "Weather Page"
@@ -291,35 +234,39 @@ msgstr "Vis visualisering for \"Nå spilles\" i bakgrunnen"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr ""
+msgstr "Spill av temamelodi i videobiblioteket (TvTunes tillegg)"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr ""
+msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Sangtekster"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
-msgstr ""
+msgstr "Tekst tillegg"
 
 msgctxt "#31133"
 msgid "Subtitle Add-on"
-msgstr ""
+msgstr "Undertekst tillegg"
 
 msgctxt "#31134"
 msgid "Home Page Videos Submenu"
-msgstr ""
+msgstr "Hjemmeskjerm video undermeny"
 
 msgctxt "#31135"
 msgid "Home Page Music Submenu"
-msgstr ""
+msgstr "Hjemmeskjerm musikk undermeny"
 
 msgctxt "#31136"
 msgid "Home Page Pictures Submenu"
-msgstr ""
+msgstr "Hjemmeskjerm bilder undermeny"
 
 msgctxt "#31140"
 msgid "Music OSD"
@@ -333,37 +280,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Hurtigsti"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorier"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Vis rolleliste"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Velg din låt"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Seksjonslenker"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Sangtekstskilde"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Funnet"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Finn flere objekter"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Kommende episoder"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,25 +308,9 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Sist oppdatert"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Meny"
-
 msgctxt "#31303"
 msgid "Data provider"
-msgstr ""
-
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Bilde"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Ingen diskmedia oppdaget"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Løs ut"
+msgstr "Datatilbyder"
 
 msgctxt "#31307"
 msgid "Hide Fanart"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Alternativer for innholdsskraper"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Grunnleggende"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Sett søkesti for FanArt"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Liten FanArt"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Valgt profil"
@@ -453,14 +364,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Sendt"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Siste filmer"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Siste episoder"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Alternativer for spilleliste"
@@ -487,7 +390,7 @@ msgstr "Klikk for å spille[CR][CR]filmtrailer"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr ""
+msgstr "Albumdetaljer"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -515,15 +418,15 @@ msgstr "Hent undertekster"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr ""
+msgstr "Standard for skinnet"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
-msgstr ""
+msgstr "Temastandard uten caps"
 
 msgctxt "#31392"
 msgid "Arial based"
-msgstr ""
+msgstr "Arial-basert"
 
 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"
@@ -558,6 +461,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]KONFIGURER TILLEGG[/B][CR][CR]Håndter installerte tillegg · Let etter og installer tillegg fra xbmc.org[CR]Endre tilleggsinnstillinger"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,42 +472,74 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Velg din XBMC brukerprofil[CR]for å logge inn og fortsette"
 
-msgctxt "#31900"
-msgid "Weather Maps"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 ""
+msgstr "36-timersvarsel"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr ""
+msgstr "Time for time"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
-msgstr ""
+msgstr "Helgevarsel"
 
 msgctxt "#31904"
 msgid "10 Day Forecast"
-msgstr ""
+msgstr "10-dagersvarsel"
 
 msgctxt "#31905"
 msgid "Forecast"
-msgstr ""
+msgstr "Værvarsel"
 
 msgctxt "#31906"
 msgid "Maps & Video"
-msgstr ""
-
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr ""
+msgstr "Kart og video"
 
 msgctxt "#31908"
 msgid "Chance of Precipitation"
-msgstr ""
+msgstr "Mulighet for nedbør"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr ""
+msgstr "Henter værvarsel..."
diff --git a/addons/skin.confluence/language/Polish/strings.po b/addons/skin.confluence/language/Polish/strings.po
index 8625be0515..13ab4d1be3 100644
--- a/addons/skin.confluence/language/Polish/strings.po
+++ b/addons/skin.confluence/language/Polish/strings.po
@@ -3,44 +3,27 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Rafał Wójcik <rafal.wojcik@gmail.com>, 2012.
+#   <smuto.promyk@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-01 12:44+0000\n"
+"Last-Translator: smuto <smuto.promyk@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: 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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Confluence autorstwa Jezz_X"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence jest domyślną skórą dla XBMC 9.11 i nowszych. To kombinacja wielu popularnych pomysłów i próba zawarcia tego co w nich najlepsze w skórze, która będzie łatwa do opanowania dla początkującego użytkownika."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "Confluence jest domyślną skórą XBMC. Jej usunięcie może powodować problemy."
+"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 "Zmień"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Lubię"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Nie lubię"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Opcje zasilania"
@@ -57,25 +40,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Zobacz opcje"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Wtyczki"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Ostatnio dodane"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Wideo - pliki"
+msgstr "Całkowity czas trwania"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -83,7 +54,7 @@ msgstr "Muzyka - pliki"
 
 msgctxt "#31023"
 msgid "Playing"
-msgstr "Otwarzam"
+msgstr "Odtwarzam"
 
 msgctxt "#31024"
 msgid "Page"
@@ -109,10 +80,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Pełna lista"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Miniatury zdjęć"
@@ -145,14 +112,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "COFNIJ"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Właściwości audio"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Obecny efekt"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Efekty wizualizacji"
@@ -226,12 +185,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Ukryj przyciski głównego menu"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Tła ekranu głównego"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Edytuj tło dla"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opcje"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Pojedynczy obraz"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Wiele obrazów"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Modyfikacja"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Pokaż ostatnio dodane albumy"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +216,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Ukryj tło fanartu"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ETYKIETA PRZYCISKU"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Strona pogody"
@@ -295,12 +238,16 @@ msgstr "Odtwarzaj motyw TV w bibliotece wideo (wtyczka TvTunes)"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr ""
+msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Teksty piosenek"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Wtyczka Teksty piosenek"
@@ -333,37 +280,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Skróty"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorie"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Pokaż obsadę"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Wybierz swoją piosenkę"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Linki sekcji"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Źródło tekstów piosenek"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Znaleziono"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Znajdź więcej pozycji"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Nadchodzące odcinki"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +308,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Ostatnia aktualizacja"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Dostawca danych"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Zdjęcia"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Nie wykryto płyty"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Wysuń"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Ukryj fanart"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Opcje skanowania zawartości"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Podstawowe"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Wskaż ścieżkę fanartu"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Mały fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Wybrany profil"
@@ -453,14 +364,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Emisja"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Najnowsze filmy"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Najnowsze odcinki"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Opcje playlisty"
@@ -558,6 +461,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]KONFIGURUJ USTAWIENIA WTYCZEK[/B][CR][CR]Zarządzaj wtyczkami · Przeglądaj i instaluj wtyczki[CR]Ustawienia wtyczek"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +472,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Wybierz profil użytkownika"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Mapy pogody"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +536,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Mapy i wideo"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Pogoda wideo [COLOR=grey2](na pełnym ekranie)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Możliwość opadów"
diff --git a/addons/skin.confluence/language/Portuguese (Brazil)/strings.po b/addons/skin.confluence/language/Portuguese (Brazil)/strings.po
index 47b2a22d95..954198837c 100644
--- a/addons/skin.confluence/language/Portuguese (Brazil)/strings.po
+++ b/addons/skin.confluence/language/Portuguese (Brazil)/strings.po
@@ -3,44 +3,27 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <marcioscheibel@gmail.com>, 2012.
+# Wanilton Campos <>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-05 12:01+0000\n"
+"Last-Translator: marcioscheibel <marcioscheibel@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Alterar seu"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Amor"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Ódio"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Opções de energia"
@@ -55,11 +38,7 @@ msgstr "Esconder INFO"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr ""
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
+msgstr "Opções de Visualização"
 
 msgctxt "#31008"
 msgid "Fullscreen"
@@ -67,15 +46,7 @@ msgstr "Tela Cheia"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Adicionado recentemente"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Arquivos"
+msgstr "Duração Total"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +80,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Lista Completa"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Ícones de imagens"
@@ -145,14 +112,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "RETROCEDER"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Propriedades de áudio"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Pré configuração atual"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Visualizar pré-configurações"
@@ -226,12 +185,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Ocultar botões do Menu Principal"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Fundos da tela principal (home)"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Editar fundo para botão principal (home)"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opções"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Imagem única"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Multi imagens"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Personalizador"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Mostrar Álbuns Adicionados Recentemente"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +216,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Ocultar fanart fundo da visualização"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "RÓTULO DE BOTÃO"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Página do Tempo"
@@ -301,6 +244,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Letras"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Add-on de Letras"
@@ -333,37 +280,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Categorias"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Elenco do Seriado"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Escolha sua música"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Seção de Links"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Origem das Letras"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Encontrado"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Procurar mais Itens"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Próximos Episódios"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,25 +308,9 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Última atualização"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
-msgstr ""
-
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Imagem"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Nenhum disco de mídia detectado"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Ejetar"
+msgstr "Provedor de Dados"
 
 msgctxt "#31307"
 msgid "Hide Fanart"
@@ -425,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Opções de busca de conteúdo"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Básico"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Definir caminho do Fanart"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Fanart Pequeno"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Perfil selecionado"
@@ -453,14 +364,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Transmitido"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Últimos Filmes"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Últimos Episódios"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Opções do Playlist"
@@ -558,6 +461,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]CONFIGURAR AJUSTES DE ADD-ONS[/B][CR][CR]Configurar Add-ons existentes · Procurar e instalar novos Add-ons de xbmc.org[CR]Alterar configurações do Add-on"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +472,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Selecione seu Perfil de usuário XBMC[CR]para conectar e continue"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Mapas - Clima"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +536,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Mapas & Video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Vídeo da Previsão [COLOR=grey2](Playback em tela cheia)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Chance de precipitação"
diff --git a/addons/skin.confluence/language/Portuguese/strings.po b/addons/skin.confluence/language/Portuguese/strings.po
index c8a89096e8..e538131175 100644
--- a/addons/skin.confluence/language/Portuguese/strings.po
+++ b/addons/skin.confluence/language/Portuguese/strings.po
@@ -3,79 +3,52 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <b1sgas.pt@gmail.com>, 2012.
+#   <badasilva@gmail.com>, 2012.
+#   <joao.lnsa@netcabo.pt>, 2012.
+# Ricardo Perdigão <ricardofonseca1977@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-30 17:23+0000\n"
+"Last-Translator: pingo.mister <joao.lnsa@netcabo.pt>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/XBMC-Main-Frodo/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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Tema Confluence desenvolvido por Jezz_X. (Tema padrão do XBMC)"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "O tema Confluence é o tema padrão do XBMC 9.11 e superior. É uma mistura de conceitos de muitos temas populares e tenta integrar as boas ideias destes num tema que deve ser fácil de entender e manusear para utilizadores recentes do XBMC."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "O tema Confluence é o tema padrão do XBMC. Removê-lo pode causar problemas. A sério! Deixe-o instalado, mesmo que não o use."
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
-msgstr "Mude o seu"
-
-msgctxt "#31001"
-msgid "Love"
-msgstr "Adoro"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Odeio"
+msgstr "Mude as suas"
 
 msgctxt "#31003"
 msgid "Power Options"
-msgstr "Opções de Power"
+msgstr "Opções de energia"
 
 msgctxt "#31004"
 msgid "Working..."
-msgstr "A trabalhar..."
+msgstr "Processando..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Esconder INFO"
+msgstr "Ocultar Informação"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr ""
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
+msgstr "Ver opções"
 
 msgctxt "#31008"
 msgid "Fullscreen"
-msgstr ""
+msgstr "Ecrã cheio"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Adicionados recentemente"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Vídeo - Ficheiros"
+msgstr "Duração total"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,13 +82,9 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Lista completa"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
-msgstr "Imagem de miniaturas"
+msgstr "Miniatura e Imagem"
 
 msgctxt "#31032"
 msgid "Image Wrap"
@@ -127,11 +96,11 @@ msgstr "Info"
 
 msgctxt "#31040"
 msgid "Now Playing"
-msgstr "A reproduzir agora"
+msgstr "A reproduzir"
 
 msgctxt "#31042"
 msgid "PLAYING"
-msgstr "A REPRODUZIR"
+msgstr "REPRODUZINDO"
 
 msgctxt "#31043"
 msgid "PAUSED"
@@ -139,23 +108,15 @@ msgstr "PAUSADO"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
-msgstr "FAST FORWARD"
+msgstr "AVANÇAR"
 
 msgctxt "#31045"
 msgid "REWIND"
-msgstr "REWIND"
-
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Propriedades do áudio"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Definição corrente"
+msgstr "RETROCEDER "
 
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Definições de visualização"
+msgstr "Pré-selecções de visualização"
 
 msgctxt "#31049"
 msgid "End Time"
@@ -163,11 +124,11 @@ msgstr "Tempo para terminar"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr ""
+msgstr "Orientação: Ascendente"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr ""
+msgstr "Orientação: Descendente"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -187,11 +148,11 @@ msgstr "Ficheiros de música do sistema"
 
 msgctxt "#31059"
 msgid "Current playlist"
-msgstr "Lista de reprodução corrente"
+msgstr "Lista de reprodução actual"
 
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
-msgstr "Ficheiro multi-parte. Escolha a parte que quer reproduzir."
+msgstr "Este ficheiro está dividido por partes. Escolha a parte que quer reproduzir."
 
 msgctxt "#31061"
 msgid "Current Selected"
@@ -199,79 +160,63 @@ msgstr "Seleccionado neste momento"
 
 msgctxt "#31101"
 msgid "Home screen options"
-msgstr "Opções do menu principal"
+msgstr "Opções do menu inicial"
 
 msgctxt "#31102"
 msgid "Background"
-msgstr "Fundo"
+msgstr "Ecrã de Fundo"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "Mostrar \"Pausado\" na apresentação de slides"
+msgstr "Mostrar \"Pausado\" ao Apresentar Slides"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
-msgstr "Reproduzir trailers numa janela [COLOR=grey3](Apenas diálogo de informação vídeo)[/COLOR]"
+msgstr "Reproduzir trailers numa janela [COLOR=grey3](Só janela de info de vídeo)[/COLOR]"
 
 msgctxt "#31106"
 msgid "Miscellaneous options"
-msgstr "Opções várias"
+msgstr "Várias opções"
 
 msgctxt "#31107"
 msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
-msgstr "Esconder leitura de flags dos ficheiros de vídeo [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 "Esconder botões do menu principal"
+msgstr "Ocultar botões do Menu Principal"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Fundos de média"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Editar fundo pra tipo de média"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
-msgstr "Esconder"
+msgstr "Ocultar"
 
 msgctxt "#31112"
 msgid "Options"
 msgstr "Opções"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Imagem única"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Imagens multiplas"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Customizar"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Mostrar Álbuns Recentes"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
-msgstr "Mostrar vídeos adicionados recentemente"
+msgstr "Mostrar Vídeos Recentes"
 
 msgctxt "#31118"
 msgid "Home Page Programs Submenu"
-msgstr "Submenu de Programas da página inicial"
+msgstr "Submenu de Programas da Página Inicial"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
-msgstr ""
-
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ETIQUETA DE BOTÃO"
+msgstr "Ocultar Fanart de fundo"
 
 msgctxt "#31122"
 msgid "Weather Page"
@@ -291,23 +236,27 @@ msgstr "Mostrar visualização \"A reproduzir\" em fundo"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr ""
+msgstr "Tocar música de genérico na biblioteca de vídeo (com o Add-on TvTunes)"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr ""
+msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Letras"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
-msgstr "Add-on de letras de música"
+msgstr "Add-on de Letras de música"
 
 msgctxt "#31133"
 msgid "Subtitle Add-on"
-msgstr "Add-on de legendas"
+msgstr "Add-on de Legendas"
 
 msgctxt "#31134"
 msgid "Home Page Videos Submenu"
@@ -323,79 +272,51 @@ msgstr "Submenu de Fotos da Página Inicial"
 
 msgctxt "#31140"
 msgid "Music OSD"
-msgstr "OSD de Música"
+msgstr "Controlos de Música"
 
 msgctxt "#31141"
 msgid "Video OSD"
-msgstr "OSD de Vídeo"
+msgstr "Controlos de Vídeo"
 
 msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Categorias"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Mostrar elenco"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Escolha a sua música"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Atalhos de secção"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Fonte das letras"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Encontrado"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Encontrar mais itens"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Proximos episódios"
 
 msgctxt "#31300"
 msgid "Current Temp"
-msgstr "Temp corrente"
+msgstr "Temperatura actual"
 
 msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Última actualização"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
-msgstr ""
-
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Imagem"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Disco de média não detectado"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Ejectar"
+msgstr "Fornecedor de dados"
 
 msgctxt "#31307"
 msgid "Hide Fanart"
-msgstr "Esconder Fanart"
+msgstr "Ocultar Fanart"
 
 msgctxt "#31308"
 msgid "Movie Details"
@@ -407,7 +328,7 @@ msgstr "Memória usada:"
 
 msgctxt "#31310"
 msgid "Track Number"
-msgstr "Faixa número"
+msgstr "Número da Faixa"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
@@ -415,27 +336,19 @@ msgstr "Imagem de Fanart[CR][CR]Indisponível[CR][CR] Clique no botão para sele
 
 msgctxt "#31312"
 msgid "Current Scraper"
-msgstr "Scraper corrente"
+msgstr "Scraper actual"
 
 msgctxt "#31313"
 msgid "Choose a Scraper"
-msgstr "Escolher um scraper"
+msgstr "Escolha um scraper"
 
 msgctxt "#31314"
 msgid "Content Scanning Options"
-msgstr "Opções de procura de conteúdos"
-
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Básico"
+msgstr "Opções da busca de conteúdos"
 
 msgctxt "#31317"
 msgid "Set Fanart Path"
-msgstr "Escolher caminho de Fanart"
-
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Fanart pequeno"
+msgstr "Escolher localização de Fanart"
 
 msgctxt "#31319"
 msgid "Selected Profile"
@@ -443,7 +356,7 @@ msgstr "Perfil seleccionado"
 
 msgctxt "#31320"
 msgid "Last Logged In"
-msgstr "Último ligado"
+msgstr "Última vez ligado"
 
 msgctxt "#31321"
 msgid "Karaoke Song Selector"
@@ -451,15 +364,7 @@ msgstr "Selecção de música de karaoke"
 
 msgctxt "#31322"
 msgid "Aired"
-msgstr "Estreia"
-
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Filmes recentes"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Episódeos recentes"
+msgstr "Transmitido a"
 
 msgctxt "#31325"
 msgid "Playlist Options"
@@ -467,7 +372,7 @@ msgstr "Opções da lista de reprodução"
 
 msgctxt "#31326"
 msgid "Created"
-msgstr "Criado"
+msgstr "Criado a"
 
 msgctxt "#31327"
 msgid "Resolution"
@@ -475,35 +380,35 @@ msgstr "Resolução"
 
 msgctxt "#31328"
 msgid "Recently Added"
-msgstr "Adicionados recentemente"
+msgstr "Recentes"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]Definir temporizador![/B] [COLOR=grey2] - Sistema vai desligar em[/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 o[CR][CR]Trailer do filme"
+msgstr "Clique no botão para reproduzir o[CR][CR]trailer do filme"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr ""
+msgstr "Detalhes do álbum"
 
 msgctxt "#31351"
 msgid "Pause"
-msgstr "Pausa"
+msgstr "Pausar"
 
 msgctxt "#31352"
 msgid "Stop"
-msgstr "Stop"
+msgstr "Parar"
 
 msgctxt "#31353"
 msgid "Fast Forward"
-msgstr "Fast Forward"
+msgstr "Avançar"
 
 msgctxt "#31354"
 msgid "Rewind"
-msgstr "Rewind"
+msgstr "Retroceder"
 
 msgctxt "#31355"
 msgid "Movie menu"
@@ -511,7 +416,7 @@ msgstr "Menu do filme"
 
 msgctxt "#31356"
 msgid "Download Subtitles"
-msgstr "Descarregar legenda"
+msgstr "Transferir legenda"
 
 msgctxt "#31390"
 msgid "Skin default"
@@ -527,80 +432,116 @@ 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 OPÇÕES DE APARÊNCIA[/B][CR][CR]Mudar o Tema · Definir Linguagem e Região · Mudar opções de listagem de ficheiros[CR]Definir protector de ecrã"
+msgstr "[B]CONFIGURAÇÕES DE VISUAL[/B][CR][CR]Mudar o Tema · Definir Idioma e Região · Opções de listagem de ficheiros[CR]Definir 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 OPÇÕES DE VÍDEO[/B][CR][CR]Gerir Biblioteca de Vídeo · Definir opções de reprodução de vídeo · Mudar opções de listagem de vídeo[CR]Definir fonte de legendas"
+msgstr "[B]CONFIGURAÇÕ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 fonte 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 OPÇÕES DE MÚSICA[/B][CR][CR]Gerir Biblioteca de Música · Definir opções de reprodução de música · Mudar opções de listagem de música[CR]Definir submissão de músicas · Definir opções de karaoke"
+msgstr "[B]CONFIGURAÇÕES DE MÚSICA[/B][CR][CR]Gerir Biblioteca de Música · Opções de reprodução de música · Opções de listagem de música[CR]Definir submissão 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 OPÇÕES DE IMAGENS[/B][CR][CR]Mudar opções de listagem de imagens · Configurar apresentação de slides"
+msgstr "[B]CONFIGURAÇÕ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 OPÇÕES METEOROLÓGICAS[/B][CR][CR]Definir três locais para informação meteorológica"
+msgstr "[B]CONFIGURAÇÕ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 OPÇÕES DE SISTEMA[/B][CR][CR]Definir e calibrar ecrãs · Configurar saída de áudio · Configurar comando à distância[CR]Definir opções de poupança de energia · Ligar depuração · Definir bloqueio geral"
+msgstr "[B]CONFIGURAÇÕES DE 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 "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
-msgstr "[B]CONFIGURAR OPÇÕES DO TEMA[/B][CR][CR]Gerir o tema Confluence · Adicionar ou remover itens do menu principal[CR]Mudar fundos do tema"
+msgstr "[B]CONFIGURAÇÕES DO TEMA[/B][CR][CR]Gerir o tema Confluence · Adicionar ou remover itens do menu inicial[CR]Mudar fundos do tema"
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr "[B]CONFIGURAR ADD-ONS[/B][CR][CR]Gerir Add-ons instalados · Procurar Add-ons em xbmc.org e instalar[CR]Alterar opções dos Add-ons"
+msgstr "[B]CONFIGURAR ADD-ONS[/B][CR][CR]Gerir Add-ons instalados · Procurar e instalar Add-ons de xbmc.org[CR]Alterar opções dos Add-ons"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
-msgstr "Escolha o seu perfil de utilizador do XBMC[CR]para ligar e continuar"
+msgstr "Escolha o seu perfil de utilizador do XBMC[CR]para se ligar e prosseguir"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
 
-msgctxt "#31900"
-msgid "Weather Maps"
+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 ""
+msgstr "Previsão de 36 Horas"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
-msgstr ""
+msgstr "Previsão horária"
 
 msgctxt "#31903"
 msgid "Weekend Forecast"
-msgstr ""
+msgstr "Previsão de fim de semana"
 
 msgctxt "#31904"
 msgid "10 Day Forecast"
-msgstr ""
+msgstr "Previsão de 10 Dias"
 
 msgctxt "#31905"
 msgid "Forecast"
-msgstr ""
+msgstr "Previsão"
 
 msgctxt "#31906"
 msgid "Maps & Video"
-msgstr ""
-
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr ""
+msgstr "Mapas e vídeo"
 
 msgctxt "#31908"
 msgid "Chance of Precipitation"
-msgstr ""
+msgstr "Possibilidade de chuva"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr ""
+msgstr "Recebendo previsões meteorológicas..."
diff --git a/addons/skin.confluence/language/Romanian/strings.po b/addons/skin.confluence/language/Romanian/strings.po
index 6858a4fc6f..5d9d5a7e8f 100644
--- a/addons/skin.confluence/language/Romanian/strings.po
+++ b/addons/skin.confluence/language/Romanian/strings.po
@@ -3,44 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Daniel Gugu <atlas3266@hotmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-05-30 19:20+0000\n"
+"Last-Translator: Daniel Gugu <atlas3266@hotmail.com>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Costum Confluence de Jezz_X. (costum implicit)"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence este costumul implicit pentru XBMC 9.11 și versiunile ulterioare. Este o combinație de concepte împrumutate de la mai multe costume populare, care încearcă să îmbrățișeze și să integreze ideile lor bune într-un costum care să fie ușor de înțeles și folosit de către utilizatorii XBMC începători."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr "Confluence este costumul implicit pentru XBMC, dacă îl eliminați pot apărea probleme!"
+"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 "#31001"
-msgid "Love"
-msgstr "Dragoste"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Ură"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Opțiuni de alimentare"
@@ -57,25 +39,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Opțiuni vizualizare"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Module"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Pe tot ecranul"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Adăugate recent"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Fișiere video"
+msgstr "Durata Totală"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Listă completă"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Detalii"
@@ -145,14 +111,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "DERULARE ÎNAPOI"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Proprietăți audio"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Viz. predefinită curentă"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Vizualizări predefinite"
@@ -226,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Ascundere butoane meniu principal"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Fundale media"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Modificare fundal pentru"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +199,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opțiuni"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "O singură imagine"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Mai multe imagini"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Personalizator"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Arată Albumele adăugate Recent"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Ascunde fundal (Fanart)"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ETICHETĂ BUTON"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Pagină meteo"
@@ -301,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Versuri"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Supliment versuri"
@@ -333,37 +279,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Scurtături"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Categorii"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Distribuție serial"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Alegeți-vă cântecul"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Legături secțiune"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Sursă versuri"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Găsite"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Găsește Mai Multe Articole"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Episoade Viitoare"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Ultima actualizare"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Meniu"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Furnizor informații"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Imagine"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Niciun disc media detectat"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Scoate"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Ascunde Fanart"
@@ -425,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Opțiuni de scanare conținut"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "De bază"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Setează cale Fanart"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Fanart mic"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Profil selectat"
@@ -453,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Difuzat pe"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Ultimele filme"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Ultimele episoade"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Opțiuni listă de redare"
@@ -558,6 +460,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]CONFIGURAȚI SUPLIMENTE[/B][CR][CR]Administrați suplimentele instalate · Căutați și instalați suplimente de la xbmc.org[CR]Modificați setări suplimente"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +471,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Selectați profilul dumneavoastră de utilizator XBMC[CR]pentru a vă autentifica și a continua"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Hărți meteo"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Hărți și video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Previziune video [COLOR=grey2](Redare pe tot ecranul)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Șansă de precipitații"
diff --git a/addons/skin.confluence/language/Russian/strings.po b/addons/skin.confluence/language/Russian/strings.po
index e4bb045d52..868d79c7cf 100644
--- a/addons/skin.confluence/language/Russian/strings.po
+++ b/addons/skin.confluence/language/Russian/strings.po
@@ -4,45 +4,26 @@
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
 # Translators:
+# Pavel Maryanov <acid@jack.kiev.ua>, 2012.
 # Roman Miroshnychenko <romanvm@yandex.ru>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: 2012-05-09 15:43+0000\n"
+"PO-Revision-Date: 2012-07-07 17:34+0000\n"
 "Last-Translator: Roman Miroshnychenko <romanvm@yandex.ru>\n"
-"Language-Team: Russian\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: 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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"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 "#31001"
-msgid "Love"
-msgstr "Нравится"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Не нравится"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Настройки питания"
@@ -59,10 +40,6 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Настройки просмотра"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Дополнения"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Полный экран"
@@ -71,17 +48,9 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr "Общая длительность"
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Последние"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Видео - файлы"
-
 msgctxt "#31022"
 msgid "Music - Files"
-msgstr "Музыка - файлы"
+msgstr "Музыка: файлы"
 
 msgctxt "#31023"
 msgid "Playing"
@@ -111,17 +80,13 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Фанарт"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Полный список"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
-msgstr "Миниатюры"
+msgstr "Эскизы фото"
 
 msgctxt "#31032"
 msgid "Image Wrap"
-msgstr "Карусель картинок"
+msgstr "Карусель изображений"
 
 msgctxt "#31033"
 msgid "Info"
@@ -147,14 +112,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "ПЕРЕМОТКА НАЗАД"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Свойства аудио"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Текущие настройки"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Настройки визуализации"
@@ -193,7 +150,7 @@ msgstr "Текущий плейлист"
 
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
-msgstr "Составной файл; выберите часть для проигрывания."
+msgstr "Это составной файл. Выберите часть для проигрывания."
 
 msgctxt "#31061"
 msgid "Current Selected"
@@ -209,7 +166,7 @@ msgstr "Фон"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "Показывать \"Пауза\" в режиме слайдшоу"
+msgstr "Показывать \"Пауза\" в режиме слайд-шоу"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
@@ -228,12 +185,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Скрыть кнопки главного меню"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Фон разделов"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Выбрать фон раздела"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -243,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Параметры"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Одна картинка"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Набор картинок"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Выбор"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr "Показывать недавно добавленные альбомы"
+msgstr "Показывать последние добавленные альбомы"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -271,10 +216,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Скрыть фоновый фанарт"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "НАЗВАНИЕ КНОПКИ"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Страница погоды"
@@ -303,6 +244,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Тексты"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Дополнение текстов песен"
@@ -325,32 +270,20 @@ msgstr "Подменю фото главного экрана"
 
 msgctxt "#31140"
 msgid "Music OSD"
-msgstr "OSD музыки"
+msgstr "Экранное меню музыки"
 
 msgctxt "#31141"
 msgid "Video OSD"
-msgstr "OSD видео"
+msgstr "Экранное меню видео"
 
 msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Ярлыки"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Категории"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Показывать роли"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Выберите песню"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Ссылки разделов"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Источник текстов песен"
@@ -361,7 +294,7 @@ msgstr "Найдено"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr "Найти еще"
+msgstr "Найти ещё"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
@@ -375,26 +308,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Последнее обновление"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Меню"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Источник данных"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Фотография"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Не вставлен диск"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Извлечь"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Скрыть фанарт"
@@ -409,7 +326,7 @@ msgstr "Использовано памяти:"
 
 msgctxt "#31310"
 msgid "Track Number"
-msgstr "Номер трека"
+msgstr "Номер композиции"
 
 msgctxt "#31311"
 msgid "Fanart image[CR][CR]Unavailable[CR][CR] Click button to set"
@@ -427,18 +344,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Параметры сканирования содержимого"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Базовый"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Выбрать расположение фанарта"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Маленький фанарт"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Выбранный профиль"
@@ -455,14 +364,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Премьера"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Последние фильмы"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Последние серии"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Параметры плейлиста"
@@ -481,11 +382,11 @@ msgstr "Последние"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]Установлен таймер![/B] [COLOR=grey2] - Автоматическое отключение через[/COLOR]"
+msgstr "[B]Установлен таймер![/B] [COLOR=grey2] Автоматическое отключение через[/COLOR]"
 
 msgctxt "#31330"
 msgid "Click button to play[CR][CR]Movie trailer"
-msgstr "Нажмите кнопку,[CR][CR]чтобы посмотреть кино-трейлер"
+msgstr "Нажмите кнопку,[CR][CR]чтобы посмотреть трейлер к фильму"
 
 msgctxt "#31331"
 msgid "Album Details"
@@ -525,11 +426,11 @@ msgstr "Стандартные без ПРОПИСНЫХ"
 
 msgctxt "#31392"
 msgid "Arial based"
-msgstr "Стиль Arial"
+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]Настройка хранителя экрана"
+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"
@@ -545,7 +446,7 @@ 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]Выбор трёх городов для получения информации о погоде"
 
 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"
@@ -557,23 +458,63 @@ 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 xbmc.org[CR]Modify Add-on settings"
-msgstr "[B]НАСТРОЙКА ДОПОЛНЕНИЙ[/B][CR][CR]Управление установленными дополнениями • Установка дополнений с xbmc.org[CR]Изменение настроек дополнений"
+msgstr "[B]НАСТРОЙКА ДОПОЛНЕНИЙ[/B][CR][CR]Управление установленными дополнениями • Установка дополнений с xbmc.org[CR]Настройка дополнений"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]НАСТРОЙКА ПАРАМЕТРОВ СЛУЖБ[/B][CR][CR]Настройки управления XBMC по UPnP и HTTP • Настройки доступа к файлам[CR]Включение Zeroconf • Настройка AirPlay"
+msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Выберите профиль пользователя XBMC,[CR]чтобы войти в систему"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Карты погоды"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 ч."
+msgstr "Прогноз на 36 часов"
 
 msgctxt "#31902"
 msgid "Hourly Forecast"
@@ -595,10 +536,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Карты и видео"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Видео-прогноз [COLOR=grey2](полный экран)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Возможны осадки"
diff --git a/addons/skin.confluence/language/Serbian (Cyrillic)/strings.po b/addons/skin.confluence/language/Serbian (Cyrillic)/strings.po
index 0971d3bff4..656c84fd55 100644
--- a/addons/skin.confluence/language/Serbian (Cyrillic)/strings.po
+++ b/addons/skin.confluence/language/Serbian (Cyrillic)/strings.po
@@ -3,44 +3,25 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-05-28 23:22+0000\n"
+"Last-Translator: TeamXBMC <xbmctranslations@gmail.com>\n"
+"Language-Team: Serbian (Serbia) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"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 "#31001"
-msgid "Love"
-msgstr "Љубав"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Мржња"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Опције напајања"
@@ -57,10 +38,6 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr ""
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Додаци"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr ""
@@ -69,14 +46,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr ""
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Недавно додато"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Видео - Датотеке"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Музика - Датотеке"
@@ -109,10 +78,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Зан. слика"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Пуни списак"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Сличице"
@@ -145,14 +110,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "ПРЕМОТАВАЊЕ"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Својства звука"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Тренутна поставка"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Постојеће визуализације"
@@ -226,12 +183,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Сакриј тастере главног менија"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Позадине почетног екрана"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Уредите позадину тастера за почетни екран"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,18 +198,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Опције"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Једна слика"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Више слика"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Прилагођавач"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr ""
@@ -269,10 +214,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr ""
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "НАТПИС ТАСТЕРА"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Страна временске прогнозе"
@@ -301,6 +242,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Текстови песама"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr ""
@@ -333,22 +278,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Пречице"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Категорије"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Прикажи улоге"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Изаберите вашу песму"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Линкови одељка"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Извор текстова песама"
@@ -373,26 +306,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Последње ажурирање"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Мени"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr ""
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Фотографија"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Није откривен оптички диск"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Избаци"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Сакриј слику"
@@ -425,18 +342,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Опције анализирања садржаја"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Основно"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Пост. пут. до слика"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Занимљиве слике малих димензија"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Изабран профил"
@@ -453,14 +362,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Емитовано"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Новији филмови"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Новије епизоде"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Опције списка за репродукцију"
@@ -515,7 +416,7 @@ msgstr "Преузми титлове"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr ""
+msgstr "Подразумевана маска"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
@@ -558,6 +459,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]КОНФИГУРИСАЊЕ ДОДАТНИХ ПРОГРАМА[/B][CR][CR]Управљајте вашим инсталираним додатним програмима · Потражите и инсталирајте додатне прог. са xbmc.org[CR]Прилагодите подешавање додатног програма"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,8 +470,44 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Изаберите ваш XBMC кориснички[CR]профил за пријаву, а потом наставите даље"
 
-msgctxt "#31900"
-msgid "Weather Maps"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
 msgstr ""
 
 msgctxt "#31901"
@@ -593,10 +534,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr ""
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr ""
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr ""
diff --git a/addons/skin.confluence/language/Serbian/strings.po b/addons/skin.confluence/language/Serbian/strings.po
index 93bd6d55ac..c825422417 100644
--- a/addons/skin.confluence/language/Serbian/strings.po
+++ b/addons/skin.confluence/language/Serbian/strings.po
@@ -3,44 +3,25 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-05-28 23:22+0000\n"
+"Last-Translator: TeamXBMC <xbmctranslations@gmail.com>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"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 "#31001"
-msgid "Love"
-msgstr "Ljubav"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Mržnja"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Opcije napajanja"
@@ -57,10 +38,6 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr ""
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Dodaci"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr ""
@@ -69,14 +46,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr ""
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Nedavno dodato"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Datoteke"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Muzika - Datoteke"
@@ -109,10 +78,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Zan. slika"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Puni spisak"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Sličice"
@@ -145,14 +110,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "PREMOTAVANjE"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Svojstva zvuka"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Trenutna postavka"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Postojeće vizualizacije"
@@ -226,12 +183,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Sakrij tastere glavnog menija"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Pozadine početnog ekrana"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Uredite pozadinu tastera za početni ekran"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,18 +198,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opcije"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Jedna slika"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Više slika"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Prilagođavač"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr ""
@@ -269,10 +214,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr ""
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "NATPIS TASTERA"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Strana vremenske prognoze"
@@ -301,6 +242,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Tekstovi pesama"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr ""
@@ -333,22 +278,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Prečice"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorije"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Prikaži uloge"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Izaberite vašu pesmu"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Linkovi odeljka"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Izvor tekstova pesama"
@@ -373,26 +306,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Poslednje ažuriranje"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Meni"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr ""
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Fotografija"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Nije otkriven optički disk"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Izbaci"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Sakrij sliku"
@@ -425,18 +342,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Opcije analiziranja sadržaja"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Osnovno"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Post. put. do slika"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Zanimljive slike malih dimenzija"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Izabran profil"
@@ -453,14 +362,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Emitovano"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Noviji filmovi"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Novije epizode"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Opcije spiska za reprodukciju"
@@ -515,7 +416,7 @@ msgstr "Preuzmi titlove"
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr ""
+msgstr "Podrazumevana maska"
 
 msgctxt "#31391"
 msgid "Skin default with no Caps"
@@ -558,6 +459,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]KONFIGURISANjE DODATNIH PROGRAMA[/B][CR][CR]Upravljajte vašim instaliranim dodatnim programima · Potražite i instalirajte dodatne prog. sa xbmc.org[CR]Prilagodite podešavanje dodatnog programa"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,8 +470,44 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Izaberite vaš XBMC korisnički[CR]profil za prijavu, a potom nastavite dalje"
 
-msgctxt "#31900"
-msgid "Weather Maps"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
 msgstr ""
 
 msgctxt "#31901"
@@ -593,10 +534,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr ""
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr ""
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr ""
diff --git a/addons/skin.confluence/language/Slovak/strings.po b/addons/skin.confluence/language/Slovak/strings.po
index d7706d55c3..ba5f4c8de9 100644
--- a/addons/skin.confluence/language/Slovak/strings.po
+++ b/addons/skin.confluence/language/Slovak/strings.po
@@ -3,44 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Dominik  <dominikla@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-09-08 10:44+0000\n"
+"Last-Translator: Dominik <dominikla@gmail.com>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Zmeniť"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Milovať"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Nenávidieť"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Napájanie"
@@ -51,31 +33,19 @@ msgstr "Pracujem..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Skryť informácie"
+msgstr "Skryť informáciu"
 
 msgctxt "#31006"
 msgid "View Options"
 msgstr "Možnosti zobrazenia"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Pluginy"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Posledné pridané"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Súbory"
+msgstr "Celkové trvanie"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Celý Zoznam"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Náhľady"
@@ -131,7 +97,7 @@ msgstr "Práve hrá"
 
 msgctxt "#31042"
 msgid "PLAYING"
-msgstr "Prehráva sa"
+msgstr "PREHRÁVA SA"
 
 msgctxt "#31043"
 msgid "PAUSED"
@@ -145,14 +111,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "PRETÁČA SA DOZADU"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Vlastnosti zvuku"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Aktuálna predvolba"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Predvolby Vizualizácií"
@@ -226,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Skryť položky hlavného menu"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Pozadie Domovskej stránky"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Zmeniť pozadie domovskej stránky, pozadie sekciíam"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +199,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Možnosti"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Jeden obrázok"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Viac obrázkov"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Prispôsobenie"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Zobraziť naposledy pridané albumy"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Skryť Fanart na pozadí"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "NÁZOV POLOŽKY"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Počasie"
@@ -301,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Texty skladieb"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Doplnok Texty skladieb"
@@ -333,37 +279,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Odkazy"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategórie"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Zobrazovať účinkujúcich"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Vyberte Vašu skladbu"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Odkazy Sekcií"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Zdroj textov skladieb"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Nájdené"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Hľadať viac položiek"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Pripravované časti"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Naposledy aktualizované"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Počasie Vám prináša"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Obrázok"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Židny disk nie je vložený"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Vysunúť"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Skryť Fanart"
@@ -425,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Možnosti vyhľadávania obsahu"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Základné"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Nájsť FanArt"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Malý Fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Vybratý Profil"
@@ -453,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Vysielané"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Posledné Filmy"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Posledné Epizódy"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Nastavenia Playlistu"
@@ -487,7 +389,7 @@ msgstr "Pre spustenie ukážky[CR][CR]stlačte tlačítko"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr "Album Details"
+msgstr "Detaily albumu"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -558,6 +460,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]MOŽNOSTI DOPLNKOV[/B][CR][CR]Správa nainštalovaných doplnkov · Vyhľadávanie a inštalácia doplnkov z xbmc.org[CR]Nastavenie doplnkov"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +471,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Prihlásenie užívateľa[CR]Pokračujte výberom profilu"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Mapy počasia"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Mapy & Video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Video Predpoveď [COLOR=grey2](Prehrávanie na celej obrazovke)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Šanca zrážok"
diff --git a/addons/skin.confluence/language/Slovenian/strings.po b/addons/skin.confluence/language/Slovenian/strings.po
index 581661077f..3c74cd0b1c 100644
--- a/addons/skin.confluence/language/Slovenian/strings.po
+++ b/addons/skin.confluence/language/Slovenian/strings.po
@@ -7,42 +7,22 @@
 # Tadej Novak <tadej@tano.si>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: 2012-05-10 12:23+0000\n"
+"PO-Revision-Date: 2012-05-29 15:09+0000\n"
 "Last-Translator: Tadej Novak <tadej@tano.si>\n"
-"Language-Team: Slovenian\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"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"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Ljubim"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Sovražim"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Zapusti"
@@ -59,10 +39,6 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Možnosti pogleda"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Vtičniki"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Celozaslonski način"
@@ -71,14 +47,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr "Celotno trajanje"
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Nazadnje dodano"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Datoteke"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Glasba - Datoteke"
@@ -111,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Ozadja"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Celoten seznam"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Sličice"
@@ -147,14 +111,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "NAZAJ"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Zvočne lastnosti"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Trenutna prednastavitev"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Prednastavitve vizualizacije"
@@ -228,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Skrij gumbe v glavnem menuju"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Ozadja medijev"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Uredi ozadje za tip medija"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -243,18 +199,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Možnosti"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Ena slika"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Več slik"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Poljubno"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr "Prikaži nazadnje dodane albume"
@@ -271,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Skrij ozadja"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "OZNAKA GUMBA"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Vreme"
@@ -303,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Besedilo pesmi"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Dodatek besedil pesmi"
@@ -335,22 +279,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorije"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Prikaži igralce"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Izberite svojo pesem"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Povezave"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Vir besedila pesmi"
@@ -375,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Zadnja posodobitev"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menu"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Ponudnik"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Slika"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Ni zaznanega diska"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Izvrzi"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Skrij ozadje"
@@ -427,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Možnosti iskanja"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Osnovno"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Nastavi pot ozadij"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Majhno ozadje"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Izbran profil"
@@ -455,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Predvajano"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Najnovejši filmi"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Najnovejše epizode"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Možnosti predvajalnega seznama"
@@ -560,16 +460,56 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]PRILAGODITE DODATKE[/B][CR][CR]Upravljajte nameščene dodatke • Brskajte in namestite nove dodatke iz xbmc.org[CR]Nastavite dodatke"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]PRILAGODITE NASTAVITVE STORITEV[/B][CR][CR]Nastavite upravljanje XBMC preko UPnP in HTTP · Nastavite deljenje datotek[CR]Vključite Zeroconf · Prilagodite AirPlay"
+msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Izberite vaš XBMC uporabniški profil[CR]za prijavo in nadaljujte"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Vremenska slika"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -595,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Mape & Video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Video napoved [COLOR=grey2](celozaslonsko predvajanje)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Možnost padavin"
diff --git a/addons/skin.confluence/language/Spanish (Mexico)/strings.po b/addons/skin.confluence/language/Spanish (Mexico)/strings.po
new file mode 100644
index 0000000000..8025da18ed
--- /dev/null
+++ b/addons/skin.confluence/language/Spanish (Mexico)/strings.po
@@ -0,0 +1,544 @@
+# XBMC Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon version: 2.1.0
+# Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <sergioleoncuen@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-06-07 15:00+0000\n"
+"Last-Translator: sergioleoncuen <sergioleoncuen@gmail.com>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/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"
+
+msgctxt "#31008"
+msgid "Fullscreen"
+msgstr "Pantalla Completa"
+
+msgctxt "#31009"
+msgid "Total Duration"
+msgstr "Duración Total"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Música - Archivos"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "Reproduciendo"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Página"
+
+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"
+
+msgctxt "#31040"
+msgid "Now Playing"
+msgstr "Reproduciendo Ahora"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "REPRODUCIENDO"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "PAUSA"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "ADELANTAR"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "REBOBINAR"
+
+msgctxt "#31048"
+msgid "Visualization Presets"
+msgstr "Preajustes de Visualización"
+
+msgctxt "#31049"
+msgid "End Time"
+msgstr "Hora de Finalización"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr "Ordenar: Ascendente"
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr "Ordenar: Descendente"
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Lista de reproducción abierta"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr "Guardar lista de reproducción"
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Cerrar lista de reproducción"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "Archivos de música del Sistema"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Lista de reproducción actual"
+
+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"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "Background"
+
+msgctxt "#31103"
+msgid "Show \"Paused\" in picture slide show"
+msgstr "Mostrar \"Pausa\" en presentacion de imágenes"
+
+msgctxt "#31104"
+msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
+msgstr "Reproducir Trailers en una ventana [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
+
+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 ""
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr ""
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Esconder"
+
+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 "#31118"
+msgid "Home Page Programs Submenu"
+msgstr "Submenú de Programas de Pantalla Principal"
+
+msgctxt "#31119"
+msgid "Hide Background Fanart"
+msgstr "Esconder Fanart de Fondo"
+
+msgctxt "#31122"
+msgid "Weather Page"
+msgstr "Página de Clima"
+
+msgctxt "#31123"
+msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr "Usar \"Posters\" en vez de \"Banners\" para Series de TV"
+
+msgctxt "#31124"
+msgid "Show Background \"Now Playing\" Video"
+msgstr "Mostrar Video de Fondo \"Reproduciendo Ahora\""
+
+msgctxt "#31125"
+msgid "Show Background \"Now Playing\" Visualization"
+msgstr "Mostrar Visualización 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)"
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr "TvTunes"
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "Letras"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
+msgctxt "#31132"
+msgid "Lyrics Add-on"
+msgstr "Add-on de Liricas"
+
+msgctxt "#31133"
+msgid "Subtitle Add-on"
+msgstr "Add-on de Subtítulos"
+
+msgctxt "#31134"
+msgid "Home Page Videos Submenu"
+msgstr "Submenú de Videos de Pantalla Principal"
+
+msgctxt "#31135"
+msgid "Home Page Music Submenu"
+msgstr "Submenú de Música de Pantalla Principal"
+
+msgctxt "#31136"
+msgid "Home Page Pictures Submenu"
+msgstr "Submenú de Imágenes de Pantalla Principal"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "OSD de Música"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "OSD de Video"
+
+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"
+
+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"
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Detener"
+
+msgctxt "#31353"
+msgid "Fast Forward"
+msgstr "Avanzar"
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Rebobinar"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr "Menú de Película"
+
+msgctxt "#31356"
+msgid "Download Subtitles"
+msgstr "Descargar Subtítulos"
+
+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"
+
+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 AJUSTES DE APARIENCIA[/B][CR][CR]Cambiar el skin · Establecer lenguaje y región · Cambiar las opciones de listado de archivos[CR]Establecer un protector de pantalla"
+
+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 AJUSTES DE VIDEO[/B][CR][CR]Administrar tu biblioteca de video · Configurar las opciones de reproducción de vídeo · Cambiar las opciones de listado de videos[CR]Establecer fuentes de subtítulos"
+
+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 "#31407"
+msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
+msgstr "[B]CONFIGURAR AJUSTES DE SKIN[/B][CR][CR]Configurar el skin Confluence · Añadir y eliminar elementos del menú principal[CR]Cambiar fondos de skin"
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
+msgstr "[B]CONFIGURAR ADD-ONS[/B][CR][CR]Administrar tus Add-ons instalados · Buscar e instalar add-ons desde xbmc.org[CR]Modificar la configuración de Add-ons"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr ""
+
+msgctxt "#31421"
+msgid "Select your XBMC user Profile[CR]to login and continue"
+msgstr "Selecciona tu Perfil XBMC[CR]para iniciar sesión y continuar"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 "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 "#31904"
+msgid "10 Day Forecast"
+msgstr "Pronóstico de 10 Días"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "Pronóstico"
+
+msgctxt "#31906"
+msgid "Maps & Video"
+msgstr "Mapas y Video"
+
+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/Spanish/strings.po b/addons/skin.confluence/language/Spanish/strings.po
index 12ba721160..7129d3f2bd 100644
--- a/addons/skin.confluence/language/Spanish/strings.po
+++ b/addons/skin.confluence/language/Spanish/strings.po
@@ -3,44 +3,27 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Héctor Cordobés <hector@filemon.dyndns.org>, 2012.
+# Osiris Magro <>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-11 22:48+0000\n"
+"Last-Translator: Héctor Cordobés <hector@filemon.dyndns.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr "Confluence skin por Jezz_X. (skin por defecto)"
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr "Confluence es la skin por defecto de XBMC 9.11 y posteriores. Es una combinación de conceptos de muchas skins populares, e intenta abarcare e integrar lo mejor de ellas en una skin que sea sencilla de entender y utilizar para los nuevos usuarios de XBMC."
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Cambiar tus"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Me gusta"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "No me gusta"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Opciones de energía"
@@ -51,31 +34,19 @@ msgstr "Cargando..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Ocultar INFO"
+msgstr "Ocultar información"
 
 msgctxt "#31006"
 msgid "View Options"
 msgstr "Opciones de vista"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Plugins"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Añadido recientemente"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Archivos - vídeo"
+msgstr "Duración total"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +80,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Lista completa"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Miniaturas"
@@ -145,17 +112,9 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "RETROCESO"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Propiedades de audio"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Opciones preestablecidas actuales"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
-msgstr "Visualización preestablecida"
+msgstr "Visualizaciónes preestablecidas"
 
 msgctxt "#31049"
 msgid "End Time"
@@ -183,7 +142,7 @@ msgstr "Cerrar lista de reproducción"
 
 msgctxt "#31058"
 msgid "System music files"
-msgstr "Sistema de archivos de música"
+msgstr "Archivos de música del sistema"
 
 msgctxt "#31059"
 msgid "Current playlist"
@@ -191,7 +150,7 @@ msgstr "Lista de reproducción actual"
 
 msgctxt "#31060"
 msgid "This file is stacked, select the part you want to play from."
-msgstr "Este archivo está agrupado, seleccione la parte que desee reproducir."
+msgstr "Este archivo está agrupado, seleccione la parte desde la que desea reproducir."
 
 msgctxt "#31061"
 msgid "Current Selected"
@@ -207,7 +166,7 @@ msgstr "Fondo"
 
 msgctxt "#31103"
 msgid "Show \"Paused\" in picture slide show"
-msgstr "Ver \"Pausa\" en modo presentación de imágenes"
+msgstr "Mostrar \"Pausa\" en modo presentación de imágenes"
 
 msgctxt "#31104"
 msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
@@ -223,15 +182,15 @@ msgstr "Ocultar marcas de lectura de archivos de vídeo [COLOR=grey3](Blu-ray, H
 
 msgctxt "#31108"
 msgid "Hide Main Menu Buttons"
-msgstr "Ocultar botones de la pantalla principal"
+msgstr "Ocultar botones del menú principal"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Fondos de medio"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Editar fondo para el tipo de medio"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +200,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Opciones"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Una imagen"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Multi-imagen"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Personalizado"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Mostrar discos añadidos recientemente"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +216,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Ocultar el Fanart del fondo"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "ETIQUETA DEL BOTON"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "El Clima"
@@ -291,16 +234,20 @@ msgstr "Mostrar visualización en el fondo"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr ""
+msgstr "Reproducir canciones de series en la librería de video (complemento TvTunes)"
 
 msgctxt "#31127"
 msgid "TvTunes"
-msgstr ""
+msgstr "TvTunes"
 
 msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Letras"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Add-on para letras"
@@ -333,37 +280,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Accesos directos"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Categorías"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Mostrar reparto"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Elige tu canción"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Sección de links"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Fuente para letras"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Encontrados"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Encuentra mas elementos"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Próximos episodios"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +308,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Última actualización"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menú"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Proveedor de Datos"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Imagen"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Ningún disco detectado"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Expulsar"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Ocultar fanarts"
@@ -425,25 +344,17 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Opciones de escanéo de contenido"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Básico"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Selecciona ruta del fanart"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Fanart pequeño"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Perfil seleccionado"
 
 msgctxt "#31320"
 msgid "Last Logged In"
-msgstr "Última visita el"
+msgstr "Última sesión el"
 
 msgctxt "#31321"
 msgid "Karaoke Song Selector"
@@ -453,14 +364,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Estrenado"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Últimas películas"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Últimos episodios"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Opciones de lista de reproducción"
@@ -475,11 +378,11 @@ msgstr "Resolución"
 
 msgctxt "#31328"
 msgid "Recently Added"
-msgstr "Recientes"
+msgstr "Añadido recientemente"
 
 msgctxt "#31329"
 msgid "[B]Timer set![/B] [COLOR=grey2] - System auto shutdown in[/COLOR]"
-msgstr "[B]Temporizador[/B] [COLOR=grey2] - El sistema se apagará en[/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"
@@ -487,7 +390,7 @@ msgstr "Click para reproducir[CR][CR]trailer de película"
 
 msgctxt "#31331"
 msgid "Album Details"
-msgstr "Detalles del Album"
+msgstr "Detalles del disco"
 
 msgctxt "#31351"
 msgid "Pause"
@@ -558,6 +461,10 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]Configura los ADD-ONS[/B][CR][CR]Administra tus addons instalados · Busca e instala addons desde xbmc.org[CR]Modifica la configuración de los addons"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
 msgstr ""
 
@@ -565,9 +472,45 @@ msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Seleccione su perfil de usuario de XBMC[CR]para ingresar y continuar"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Mapas de clima"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,14 +536,10 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Mapas y video"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Pronóstico de video [COLOR=grey2](A pantalla completa)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Probabilidada de precipitación"
 
 msgctxt "#31909"
 msgid "Fetching forecast info..."
-msgstr "Obteniendo información"
+msgstr "Obteniendo información meteorológica..."
diff --git a/addons/skin.confluence/language/Swedish/strings.po b/addons/skin.confluence/language/Swedish/strings.po
index 33977f8a70..b7d620a0bd 100644
--- a/addons/skin.confluence/language/Swedish/strings.po
+++ b/addons/skin.confluence/language/Swedish/strings.po
@@ -4,45 +4,27 @@
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
 # Translators:
+#   <frans_jaeger@hotmail.com>, 2012.
 # Gunnar Norin <blittan@xbmc.org>, 2012.
+# jonas lidström <lidstrom.jonas@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: 2012-05-08 16:16+0000\n"
+"PO-Revision-Date: 2012-06-29 05:57+0000\n"
 "Last-Translator: Gunnar Norin <blittan@xbmc.org>\n"
-"Language-Team: Swedish\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Ändra din"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Älska"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Hata"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Strömalternativ"
@@ -53,15 +35,11 @@ msgstr "Arbetar..."
 
 msgctxt "#31005"
 msgid "Hide Information"
-msgstr "Dölj INFO"
+msgstr "Dölj information"
 
 msgctxt "#31006"
 msgid "View Options"
-msgstr "Visa val"
-
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Tillägg"
+msgstr "Visa alternativ"
 
 msgctxt "#31008"
 msgid "Fullscreen"
@@ -71,14 +49,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr "Total längd"
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Nyligen tillagda"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Filmer - Filer"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Musik - Filer"
@@ -111,10 +81,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Full lista"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Bildminiatyrer"
@@ -147,14 +113,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "SPOLA BAKÅT"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Ljudegenskaper"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Nuvarande förval"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Visualiseringsförval"
@@ -165,11 +123,11 @@ msgstr "Sluttid"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr "Sort: stigande"
+msgstr "Sort: Stigande"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr "Sort: fallande"
+msgstr "Sort: Fallande"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -228,33 +186,21 @@ msgid "Hide Main Menu Buttons"
 msgstr "Dölj huvudmenyknappar"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Mediabakgrunder"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Ändra bakgrund för mediatyp"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
-msgstr "Göm"
+msgstr "Dölj"
 
 msgctxt "#31112"
 msgid "Options"
 msgstr "Alternativ"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Solobild"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Flerbild"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Anpassare"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr "Visa nyligen tillagda album"
@@ -265,23 +211,19 @@ msgstr "Visa nyligen tillagda filmer"
 
 msgctxt "#31118"
 msgid "Home Page Programs Submenu"
-msgstr "Hemsidans undermeny"
+msgstr "Hemskärmens programundermeny"
 
 msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Dölj bakgrundsfanart"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "KNAPPETIKETT"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Vädersida"
 
 msgctxt "#31123"
 msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
-msgstr "Använd omslag istället för banner för TV-serier"
+msgstr "Använd omslag istället för banner i TV-serier"
 
 msgctxt "#31124"
 msgid "Show Background \"Now Playing\" Video"
@@ -289,7 +231,7 @@ msgstr "Visa bakgrund \"Nu spelas\" filmer"
 
 msgctxt "#31125"
 msgid "Show Background \"Now Playing\" Visualization"
-msgstr "Visa bakgrund \"Nu spelas\" visualisering"
+msgstr "Visa bakgrund i \"Nu spelas\" visualisering"
 
 msgctxt "#31126"
 msgid "Play TV theme songs in video library (TvTunes add-on)"
@@ -303,6 +245,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Sångtexter"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Sångtextstillägg"
@@ -335,22 +281,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategorier"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Visa rollista"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Välj din låt"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Sektionslänkar"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Sångtextkälla"
@@ -373,28 +307,12 @@ msgstr "Nuvarande temp"
 
 msgctxt "#31301"
 msgid "Last Updated"
-msgstr "Sist uppdaterad"
-
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Meny"
+msgstr "Senast uppdaterad"
 
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Dataleverantör"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Bild"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Ingen diskmedia upptäckt"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Mata ut"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Dölj fanart"
@@ -427,18 +345,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Innehållsskrapealternativ"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Grundläggande"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Sätt fanartsökväg"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Liten fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Vald profil"
@@ -449,23 +359,15 @@ msgstr "Sist inloggad"
 
 msgctxt "#31321"
 msgid "Karaoke Song Selector"
-msgstr "Karaoke-låtväljare"
+msgstr "Karaokelåtväljare"
 
 msgctxt "#31322"
 msgid "Aired"
 msgstr "Sänt"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Senaste filmerna"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Senaste avsnitten"
-
 msgctxt "#31325"
 msgid "Playlist Options"
-msgstr "Spellistsalternativ"
+msgstr "Spellistalternativ"
 
 msgctxt "#31326"
 msgid "Created"
@@ -545,7 +447,7 @@ msgstr "[B]KONFIGURERA BILDINSTÄLLNINGAR[/B][CR][CR]Ange bildlistningsalternati
 
 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 att insamling av väderinformation"
+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"
@@ -553,23 +455,63 @@ msgstr "[B]KONFIGURERA SYSTEMINSTÄLLNINGAR[/B][CR][CR]Ange och kalibrera bildsk
 
 msgctxt "#31407"
 msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
-msgstr "[B]KONFIGURERA SKALINSTÄLLNINGAR[/B][CR][CR]Ställa in Confluence-skalet · Lägga till och ta bort hemsidans menyknappar[CR]Ändra skalets bakgrunder"
+msgstr "[B]KONFIGURERA SKALINSTÄLLNINGAR[/B][CR][CR]Ställa in Confluence-skalet · Lägga till och ta bort hemskärmens menyknappar[CR]Ändra skalets bakgrunder"
 
 msgctxt "#31408"
 msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
-msgstr "[B]KONFIGURERA TILLÄGG[/B][CR][CR]Hantera installerade tillägg - Visa och installera tillägg från xbmc.org[CR]Ändra inställningar för tillägg"
+msgstr "[B]KONFIGURERA TILLÄGG[/B][CR][CR]Hantera installerade tillägg · Visa och installera tillägg från xbmc.org[CR]Ändra inställningar för tillägg"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]KONFIGURERA SERVICEINSTÄLLNINGAR[/B][CR][CR]Ställ in kontroll av XBMC via UPnP och HTTP · Konfigurera fildelning[CR]Aktivera Zeroconf · Konfigurera AirPlay"
+msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
-msgstr "Välj din XBMC användarprofil[CR]för att logga in  och fortsätta"
+msgstr "Välj din XBMC användarprofil[CR]för att logga in och fortsätta"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+msgstr ""
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Väderkartor"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,11 +535,7 @@ msgstr "Prognos"
 
 msgctxt "#31906"
 msgid "Maps & Video"
-msgstr "Karta & video"
-
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Videoprognost [COLOR=grey2](Helskärmsuppspelning)[/COLOR]"
+msgstr "Kartor & video"
 
 msgctxt "#31908"
 msgid "Chance of Precipitation"
diff --git a/addons/skin.confluence/language/Thai/strings.po b/addons/skin.confluence/language/Thai/strings.po
new file mode 100644
index 0000000000..e766ea47ea
--- /dev/null
+++ b/addons/skin.confluence/language/Thai/strings.po
@@ -0,0 +1,544 @@
+# XBMC Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon version: 2.1.0
+# Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <devilshura@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-09-13 18:29+0000\n"
+"Last-Translator: devilshura <devilshura@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: 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 "ตัวเลือก มุมมอง"
+
+msgctxt "#31008"
+msgid "Fullscreen"
+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 "#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 "#31042"
+msgid "PLAYING"
+msgstr "กำลังเล่น"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "หยุดชั่วขณะ"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr "ไปหน้าแบบเร็ว"
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "ย้อนกลับเร็ว"
+
+msgctxt "#31048"
+msgid "Visualization 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 Dialog 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 ""
+
+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 Submenu"
+msgstr "หน้าหลักของเมนูย่อย โปรแกรม"
+
+msgctxt "#31119"
+msgid "Hide Background Fanart"
+msgstr "ซ่อน แฟนอาร์ตในพื้นหลัง"
+
+msgctxt "#31122"
+msgid "Weather Page"
+msgstr "หน้าแสดง สภาพอากาศ"
+
+msgctxt "#31123"
+msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr "ใช้ \"โปสเตอร์\" แทน \"ป้ายรายการ\" สำหรับรายการทีวี"
+
+msgctxt "#31124"
+msgid "Show Background \"Now Playing\" Video"
+msgstr "แสดงพื้นหลังด้วยวิดีโอ \"ที่กำลังเล่น\""
+
+msgctxt "#31125"
+msgid "Show Background \"Now Playing\" Visualization"
+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 "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
+msgctxt "#31132"
+msgid "Lyrics Add-on"
+msgstr "ส่วนเสริม เนื้อเพลง"
+
+msgctxt "#31133"
+msgid "Subtitle Add-on"
+msgstr "ส่วนเสริม คำบรรยาย"
+
+msgctxt "#31134"
+msgid "Home Page Videos Submenu"
+msgstr "หน้าหลักของเมนูย่อย วิดีโอ"
+
+msgctxt "#31135"
+msgid "Home Page Music Submenu"
+msgstr "หน้าหลักของเมนูย่อย เพลง"
+
+msgctxt "#31136"
+msgid "Home Page Pictures Submenu"
+msgstr "หน้าหลักของเมนูย่อย รูปภาพ"
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr "OSD เพลง"
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr "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 "#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 "สร้างเมื่อ"
+
+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 "#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 "#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 "#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 "#31407"
+msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
+msgstr "[B]กำหนดการตั้งค่าชุดตกแต่ง[/B][CR][CR]ตั้งค่าชุดตกแต่ง Confluence · เพิ่มและลบรายการเมนูหลัก[CR]เปลี่ยนพื้นหลังชุดตกแต่ง"
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
+msgstr "[B]ปรับเปลี่ยน ส่วนเสริม[/B][CR][CR]จัดการส่วนเสริมที่ติดตั้งไว้ของคุณ · เรียกดูและติดตั้งส่วนเสริม จาก xbmc.org[CR]ปรับเปลี่ยน การตั้งค่าส่วนเสริม"
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr ""
+
+msgctxt "#31421"
+msgid "Select your XBMC user Profile[CR]to login and continue"
+msgstr "เลือกโปรไฟล์ ผู้ใช้ XBMC ของคุณ[CR]เพื่อเข้าสู่ระบบและดำเนินการต่อไป"
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 "10 Day Forecast"
+msgstr "พยากรณ์ ใน 10 วัน"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr "พยากรณ์"
+
+msgctxt "#31906"
+msgid "Maps & Video"
+msgstr "แผนที่และวิดีโอ"
+
+msgctxt "#31908"
+msgid "Chance of Precipitation"
+msgstr "โอกาสเกิดฝน"
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr "กำลังเรียกข้อมูลการพยากรณ์ ..."
diff --git a/addons/skin.confluence/language/Turkish/strings.po b/addons/skin.confluence/language/Turkish/strings.po
index 7baaf15951..4092879967 100644
--- a/addons/skin.confluence/language/Turkish/strings.po
+++ b/addons/skin.confluence/language/Turkish/strings.po
@@ -3,44 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Özgür BASKIN <bebeto_baskin@yahoo.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
 "POT-Creation-Date: 2012-05-04 12:52+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"PO-Revision-Date: 2012-06-02 10:40+0000\n"
+"Last-Translator: Özgür BASKIN <bebeto_baskin@yahoo.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-msgctxt "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "#31000"
 msgid "Change Your"
 msgstr "Değiştir"
 
-msgctxt "#31001"
-msgid "Love"
-msgstr "Aşk"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Nefret"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Güç Seçenekleri"
@@ -57,25 +39,13 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Görünüm Seçenekleri"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Eklentiler"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Tam ekran"
 
 msgctxt "#31009"
 msgid "Total Duration"
-msgstr ""
-
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Son Eklenenler"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Video - Dosyalar"
+msgstr "Toplam Süre"
 
 msgctxt "#31022"
 msgid "Music - Files"
@@ -109,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Fanart"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Tam liste"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Küçük Resimler"
@@ -145,14 +111,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "GERİ SAR"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Ses Özellikleri"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Geçerli Önayar"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Görsel Öğe Önayarları"
@@ -226,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Ana Menü Tuşlarını Gizle"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Medya arka planları"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Medya Türü için Arka planı değiştir"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,21 +199,9 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Seçenekler"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Tek Resim"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Çoklu Resim"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Özelleştir"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
-msgstr ""
+msgstr "Son Eklenen Albümleri Göster"
 
 msgctxt "#31117"
 msgid "Show Recently added Videos"
@@ -269,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Arkaplan Fanartını Gizle"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "TUŞ ETİKETİ"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Hava Durumu Sayfası"
@@ -301,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Şarkı Sözleri"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Şarkı Sözleri Eklentisi"
@@ -333,37 +279,25 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Kategoriler"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Oyuncuları Göster"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Şarkını Seç"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Bölüm Bağlantıları"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Şarkı Sözleri Kaynağı"
 
 msgctxt "#31206"
 msgid "Found"
-msgstr ""
+msgstr "Bulundu"
 
 msgctxt "#31207"
 msgid "Find More Items"
-msgstr ""
+msgstr "Daha Fazla Öğe Bul"
 
 msgctxt "#31208"
 msgid "Upcoming Episodes"
-msgstr ""
+msgstr "Gelecek Bölümler"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -373,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Son Güncelleme"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Menü"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Veri sağlayıcı"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Resim"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Disk Ortamı Algılanmadı"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Çıkart"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Fanart'ı gizle"
@@ -425,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "İçerik Tarama Seçenekleri"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Temel Bilgiler"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Fanart Yolunu Ayarla"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Küçük Fanart"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Seçilen Profil"
@@ -453,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Gösterim"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "En Yeni Filmler"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "En Yeni Bölümler"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Çalma Listesi Seçenekleri"
@@ -558,16 +460,56 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 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 fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC 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 XBMC kontrolü ayarları · Dosya paylaşımını yapılandır[CR]Zeroconf'u etkinleştir · AirPlay'i yapılandır"
+msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Oturum açıp devam etmek için[CR]XBMC kullanıcı profilinizi seçin"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Hava Durumu Haritaları"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Video ve Haritalar"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Video Hava Tahmini [COLOR=grey2](Tam ekran oynatım)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Chance of Precipitation"
diff --git a/addons/skin.confluence/language/Ukrainian/strings.po b/addons/skin.confluence/language/Ukrainian/strings.po
index a64a31d327..32085a4216 100644
--- a/addons/skin.confluence/language/Ukrainian/strings.po
+++ b/addons/skin.confluence/language/Ukrainian/strings.po
@@ -3,44 +3,26 @@
 # Addon id: skin.confluence
 # Addon version: 2.1.0
 # Addon Provider: Jezz_X, Team XBMC
+# Translators:
+# Roman Miroshnychenko <romanvm@yandex.ru>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: xbmc.skin.confluence-Frodo\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
-"POT-Creation-Date: 2012-05-09 22:50+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-05-29 12:56+0000\n"
+"Last-Translator: Roman Miroshnychenko <romanvm@yandex.ru>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\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 "Addon Summary"
-msgid "Confluence skin by Jezz_X. (XBMC's default skin)"
-msgstr ""
-
-msgctxt "Addon Description"
-msgid "Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use."
-msgstr ""
-
-msgctxt "Addon Disclaimer"
-msgid "Confluence is the default skin for XBMC, removing it may cause issues"
-msgstr ""
+"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 "#31001"
-msgid "Love"
-msgstr "Подобається"
-
-msgctxt "#31002"
-msgid "Hate"
-msgstr "Не подобається"
-
 msgctxt "#31003"
 msgid "Power Options"
 msgstr "Налаштування живлення"
@@ -57,10 +39,6 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr "Налаштування перегляду"
 
-msgctxt "#31007"
-msgid "Plugins"
-msgstr "Надбудови"
-
 msgctxt "#31008"
 msgid "Fullscreen"
 msgstr "Повний екран"
@@ -69,14 +47,6 @@ msgctxt "#31009"
 msgid "Total Duration"
 msgstr "Загальна тривалість"
 
-msgctxt "#31020"
-msgid "Recently Added"
-msgstr "Останні"
-
-msgctxt "#31021"
-msgid "Video - Files"
-msgstr "Відео - файли"
-
 msgctxt "#31022"
 msgid "Music - Files"
 msgstr "Музика - файли"
@@ -109,10 +79,6 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr "Фанарт"
 
-msgctxt "#31030"
-msgid "Full list"
-msgstr "Повний список"
-
 msgctxt "#31031"
 msgid "Pic Thumbs"
 msgstr "Мініатюри"
@@ -145,14 +111,6 @@ msgctxt "#31045"
 msgid "REWIND"
 msgstr "ПЕРЕМОТКА НАЗАД"
 
-msgctxt "#31046"
-msgid "Audio Properties"
-msgstr "Властивості аудіо"
-
-msgctxt "#31047"
-msgid "Current Preset"
-msgstr "Поточні налаштування"
-
 msgctxt "#31048"
 msgid "Visualization Presets"
 msgstr "Налаштування візуалізації"
@@ -226,12 +184,12 @@ msgid "Hide Main Menu Buttons"
 msgstr "Приховати кнопки головного меню"
 
 msgctxt "#31109"
-msgid "Media backgrounds"
-msgstr "Тло розділів"
+msgid "Enable Custom Background"
+msgstr ""
 
 msgctxt "#31110"
-msgid "Edit Background for Media Type"
-msgstr "Вибрати тло розділу"
+msgid "Background path:"
+msgstr ""
 
 msgctxt "#31111"
 msgid "Hide"
@@ -241,18 +199,6 @@ msgctxt "#31112"
 msgid "Options"
 msgstr "Параметри"
 
-msgctxt "#31113"
-msgid "Single Image"
-msgstr "Одна картинка"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "Набір картинок"
-
-msgctxt "#31115"
-msgid "Customizer"
-msgstr "Вибір"
-
 msgctxt "#31116"
 msgid "Show Recently added Albums"
 msgstr "Показувати останні додані альбоми"
@@ -269,10 +215,6 @@ msgctxt "#31119"
 msgid "Hide Background Fanart"
 msgstr "Приховувати фанарт на тлі"
 
-msgctxt "#31120"
-msgid "BUTTON LABEL"
-msgstr "НАЗВА КНОПКИ"
-
 msgctxt "#31122"
 msgid "Weather Page"
 msgstr "Сторінка кнопки"
@@ -301,6 +243,10 @@ msgctxt "#31128"
 msgid "Lyrics"
 msgstr "Тексти"
 
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
 msgctxt "#31132"
 msgid "Lyrics Add-on"
 msgstr "Надбудова текстів пісень"
@@ -333,22 +279,10 @@ msgctxt "#31200"
 msgid "Shortcuts"
 msgstr "Ярлики"
 
-msgctxt "#31201"
-msgid "Categories"
-msgstr "Категорії"
-
-msgctxt "#31202"
-msgid "Show Cast"
-msgstr "Показувати ролі"
-
 msgctxt "#31203"
 msgid "Choose Your Song"
 msgstr "Виберіть пісню"
 
-msgctxt "#31204"
-msgid "Section Links"
-msgstr "Посилання розділів"
-
 msgctxt "#31205"
 msgid "Lyrics Source"
 msgstr "Джерело текстів пісень"
@@ -373,26 +307,10 @@ msgctxt "#31301"
 msgid "Last Updated"
 msgstr "Останнє оновлення"
 
-msgctxt "#31302"
-msgid "Menu"
-msgstr "Меню"
-
 msgctxt "#31303"
 msgid "Data provider"
 msgstr "Джерело даних"
 
-msgctxt "#31304"
-msgid "Picture"
-msgstr "Фото"
-
-msgctxt "#31305"
-msgid "No Disc Media Detected"
-msgstr "Диск не вставлено"
-
-msgctxt "#31306"
-msgid "Eject"
-msgstr "Витягти"
-
 msgctxt "#31307"
 msgid "Hide Fanart"
 msgstr "Приховати фанарт"
@@ -425,18 +343,10 @@ msgctxt "#31314"
 msgid "Content Scanning Options"
 msgstr "Параметри сканування вмісту"
 
-msgctxt "#31315"
-msgid "Basic"
-msgstr "Базовий"
-
 msgctxt "#31317"
 msgid "Set Fanart Path"
 msgstr "Вибрати розташування фанарту"
 
-msgctxt "#31318"
-msgid "Small Fanart"
-msgstr "Маленький фанарт"
-
 msgctxt "#31319"
 msgid "Selected Profile"
 msgstr "Обраний профіль"
@@ -453,14 +363,6 @@ msgctxt "#31322"
 msgid "Aired"
 msgstr "Прем'єра"
 
-msgctxt "#31323"
-msgid "Latest Movies"
-msgstr "Останні фільми"
-
-msgctxt "#31324"
-msgid "Latest Episodes"
-msgstr "Останні серії"
-
 msgctxt "#31325"
 msgid "Playlist Options"
 msgstr "Параметри списку відтворення"
@@ -558,16 +460,56 @@ msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse f
 msgstr "[B]НАЛАШТУВАННЯ НАДБУДОВ[/B][CR][CR]Керування встановленими надбудовами • Встановлення надбудов з xbmc.org[CR]Зміна налаштувань надбудов"
 
 msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
 msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
-msgstr "[B]НАЛАШТУВАННЯ ПАРАМЕТРІВ СЛУЖБ[/B][CR][CR]Налаштування керування XBMC за UPnP і HTTP • Налаштування доступу до файлів[CR]Увімкнення Zeroconf • Налаштування AirPlay"
+msgstr ""
 
 msgctxt "#31421"
 msgid "Select your XBMC user Profile[CR]to login and continue"
 msgstr "Виберіть профіль користувача XBMC,[CR]щоб увійти до системи"
 
-msgctxt "#31900"
-msgid "Weather Maps"
-msgstr "Мапа погоди"
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+msgctxt "#31509"
+msgid "Channel Group"
+msgstr ""
+
+msgctxt "#31510"
+msgid "Timer Set"
+msgstr ""
+
+msgctxt "#31511"
+msgid "Channel Options"
+msgstr ""
 
 msgctxt "#31901"
 msgid "36 Hour Forecast"
@@ -593,10 +535,6 @@ msgctxt "#31906"
 msgid "Maps & Video"
 msgstr "Мапи та відео"
 
-msgctxt "#31907"
-msgid "Video Forecast [COLOR=grey2](Fullscreen Playback)[/COLOR]"
-msgstr "Відео-прогноз [COLOR=grey2](повний екран)[/COLOR]"
-
 msgctxt "#31908"
 msgid "Chance of Precipitation"
 msgstr "Можливі опади"
diff --git a/addons/skin.confluence/language/Vietnamese/strings.po b/addons/skin.confluence/language/Vietnamese/strings.po
new file mode 100644
index 0000000000..b40f6bbb15
--- /dev/null
+++ b/addons/skin.confluence/language/Vietnamese/strings.po
@@ -0,0 +1,545 @@
+# XBMC Media Center language file
+# Addon Name: Confluence
+# Addon id: skin.confluence
+# Addon version: 2.1.0
+# Addon Provider: Jezz_X, Team XBMC
+# Translators:
+#   <hc.nguyen111@gmail.com>, 2012.
+# Steve Zink <zinkzinpro@live.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
+"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"POT-Creation-Date: 2012-05-04 12:52+0000\n"
+"PO-Revision-Date: 2012-08-08 12:22+0000\n"
+"Last-Translator: Steve Zink <zinkzinpro@live.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#31000"
+msgid "Change Your"
+msgstr "Thay Dổi"
+
+msgctxt "#31003"
+msgid "Power Options"
+msgstr "??? lựa chọn"
+
+msgctxt "#31004"
+msgid "Working..."
+msgstr "Dang /làm..."
+
+msgctxt "#31005"
+msgid "Hide Information"
+msgstr "Trốn Thông Tin"
+
+msgctxt "#31006"
+msgid "View Options"
+msgstr "Xem ???"
+
+msgctxt "#31008"
+msgid "Fullscreen"
+msgstr "Toàn Màn Hình"
+
+msgctxt "#31009"
+msgid "Total Duration"
+msgstr "Tổng Số Thời Gian"
+
+msgctxt "#31022"
+msgid "Music - Files"
+msgstr "Nhạc - Files"
+
+msgctxt "#31023"
+msgid "Playing"
+msgstr "Đang chơi"
+
+msgctxt "#31024"
+msgid "Page"
+msgstr "Trang"
+
+msgctxt "#31025"
+msgid "Items"
+msgstr ""
+
+msgctxt "#31026"
+msgid "Misc Options"
+msgstr "Lựa chọn khác"
+
+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 "Thông Tin"
+
+msgctxt "#31040"
+msgid "Now Playing"
+msgstr "Đang chơi"
+
+msgctxt "#31042"
+msgid "PLAYING"
+msgstr "ĐANG CHƠI"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "ĐÃ DỪNG"
+
+msgctxt "#31044"
+msgid "FAST FORWARD"
+msgstr ""
+
+msgctxt "#31045"
+msgid "REWIND"
+msgstr "Quay Lại"
+
+msgctxt "#31048"
+msgid "Visualization Presets"
+msgstr ""
+
+msgctxt "#31049"
+msgid "End Time"
+msgstr "Giờ Hết"
+
+msgctxt "#31050"
+msgid "Sort: Ascending"
+msgstr ""
+
+msgctxt "#31051"
+msgid "Sort: Descending"
+msgstr ""
+
+msgctxt "#31055"
+msgid "Open playlist"
+msgstr "Mở Playlist"
+
+msgctxt "#31056"
+msgid "Save playlist"
+msgstr ""
+
+msgctxt "#31057"
+msgid "Close playlist"
+msgstr "Dóng Playlist"
+
+msgctxt "#31058"
+msgid "System music files"
+msgstr "Tệp nhạc hệ thống"
+
+msgctxt "#31059"
+msgid "Current playlist"
+msgstr "Danh sách hiện tại"
+
+msgctxt "#31060"
+msgid "This file is stacked, select the part you want to play from."
+msgstr "Tệp này đã bị chia cắt, chọn phần bạn muốn chơi."
+
+msgctxt "#31061"
+msgid "Current Selected"
+msgstr "Chọn lựa hiện tại"
+
+msgctxt "#31101"
+msgid "Home screen options"
+msgstr "Lựa chọn màn hình chính"
+
+msgctxt "#31102"
+msgid "Background"
+msgstr "Hình nền"
+
+msgctxt "#31103"
+msgid "Show \"Paused\" in picture slide show"
+msgstr "Hiển thị \"Đã dừng\" ở trình diễn ảnh"
+
+msgctxt "#31104"
+msgid "Play Trailers in a window [COLOR=grey3](Video Information Dialog Only)[/COLOR]"
+msgstr ""
+
+msgctxt "#31106"
+msgid "Miscellaneous options"
+msgstr ""
+
+msgctxt "#31107"
+msgid "Hide Flagging read from video filenames [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]"
+msgstr ""
+
+msgctxt "#31108"
+msgid "Hide Main Menu Buttons"
+msgstr "Ẩn nút Màn Hình Chính"
+
+msgctxt "#31109"
+msgid "Enable Custom Background"
+msgstr ""
+
+msgctxt "#31110"
+msgid "Background path:"
+msgstr ""
+
+msgctxt "#31111"
+msgid "Hide"
+msgstr "Giấu"
+
+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 Submenu"
+msgstr ""
+
+msgctxt "#31119"
+msgid "Hide Background Fanart"
+msgstr ""
+
+msgctxt "#31122"
+msgid "Weather Page"
+msgstr "Thời Tiết"
+
+msgctxt "#31123"
+msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
+msgstr ""
+
+msgctxt "#31124"
+msgid "Show Background \"Now Playing\" Video"
+msgstr ""
+
+msgctxt "#31125"
+msgid "Show Background \"Now Playing\" Visualization"
+msgstr ""
+
+msgctxt "#31126"
+msgid "Play TV theme songs in video library (TvTunes add-on)"
+msgstr ""
+
+msgctxt "#31127"
+msgid "TvTunes"
+msgstr ""
+
+msgctxt "#31128"
+msgid "Lyrics"
+msgstr "Lời Bài Hát"
+
+msgctxt "#31129"
+msgid "Hide Fanart in full screen visualization"
+msgstr ""
+
+msgctxt "#31132"
+msgid "Lyrics Add-on"
+msgstr "Lời Bài Hát (Addon?)"
+
+msgctxt "#31133"
+msgid "Subtitle Add-on"
+msgstr "Phụ Dề (Addon?)"
+
+msgctxt "#31134"
+msgid "Home Page Videos Submenu"
+msgstr ""
+
+msgctxt "#31135"
+msgid "Home Page Music Submenu"
+msgstr ""
+
+msgctxt "#31136"
+msgid "Home Page Pictures Submenu"
+msgstr ""
+
+msgctxt "#31140"
+msgid "Music OSD"
+msgstr ""
+
+msgctxt "#31141"
+msgid "Video OSD"
+msgstr ""
+
+msgctxt "#31200"
+msgid "Shortcuts"
+msgstr ""
+
+msgctxt "#31203"
+msgid "Choose Your Song"
+msgstr "Chọn Bài Hát"
+
+msgctxt "#31205"
+msgid "Lyrics Source"
+msgstr ""
+
+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 ""
+
+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 ""
+
+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 ""
+
+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 ""
+
+msgctxt "#31330"
+msgid "Click button to play[CR][CR]Movie trailer"
+msgstr ""
+
+msgctxt "#31331"
+msgid "Album Details"
+msgstr ""
+
+msgctxt "#31351"
+msgid "Pause"
+msgstr ""
+
+msgctxt "#31352"
+msgid "Stop"
+msgstr "Ngừng"
+
+msgctxt "#31353"
+msgid "Fast Forward"
+msgstr ""
+
+msgctxt "#31354"
+msgid "Rewind"
+msgstr "Quay Lại"
+
+msgctxt "#31355"
+msgid "Movie menu"
+msgstr ""
+
+msgctxt "#31356"
+msgid "Download Subtitles"
+msgstr ""
+
+msgctxt "#31390"
+msgid "Skin default"
+msgstr ""
+
+msgctxt "#31391"
+msgid "Skin default with no Caps"
+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 ""
+
+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 ""
+
+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 ""
+
+msgctxt "#31403"
+msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
+msgstr ""
+
+msgctxt "#31404"
+msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
+msgstr ""
+
+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 ""
+
+msgctxt "#31407"
+msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds"
+msgstr ""
+
+msgctxt "#31408"
+msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
+msgstr ""
+
+msgctxt "#31409"
+msgid "[B]CONFIGURE TV SETTINGS[/B][CR][CR]Change fullscreen info · Manage EPG data settings"
+msgstr ""
+
+msgctxt "#31410"
+msgid "[B]CONFIGURE SERVICE SETTINGS[/B][CR][CR]Setup control of XBMC via UPnP and HTTP · Configure file sharing[CR]Enable Zeroconf · Configure AirPlay"
+msgstr ""
+
+msgctxt "#31421"
+msgid "Select your XBMC user Profile[CR]to login and continue"
+msgstr ""
+
+msgctxt "#31500"
+msgid "Recording Timers"
+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 ""
+
+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 "Thời Tiết - 36 Tiếng"
+
+msgctxt "#31902"
+msgid "Hourly Forecast"
+msgstr ""
+
+msgctxt "#31903"
+msgid "Weekend Forecast"
+msgstr ""
+
+msgctxt "#31904"
+msgid "10 Day Forecast"
+msgstr "Thời Tiết - 10 Ngày"
+
+msgctxt "#31905"
+msgid "Forecast"
+msgstr ""
+
+msgctxt "#31906"
+msgid "Maps & Video"
+msgstr ""
+
+msgctxt "#31908"
+msgid "Chance of Precipitation"
+msgstr ""
+
+msgctxt "#31909"
+msgid "Fetching forecast info..."
+msgstr ""
author	alanwww1 <attila.jakosa@gmail.com>	2012-09-23 14:38:37 +0200
committer	alanwww1 <attila.jakosa@gmail.com>	2012-09-23 14:38:37 +0200
commit	22ea5aec928950f53cb59d68669c0cac585d6d85 (patch)
tree	878e698da6181df338f7d1f4073c7c9986dda40b
parent	123c13d65e5c4dbc3c5ec67492cd5d119339d181 (diff)