From 7beab3aea8eacfd79c48eede1c62f977619ed08e Mon Sep 17 00:00:00 2001
From: Tomahawk CI <ci@tomahawk-player.org>
Date: Fri, 13 Jul 2012 22:23:20 +0000
Subject: [PATCH] Automatic merge of Transifex translations

---
 lang/tomahawk_ar.ts    | 2 +-
 lang/tomahawk_bg.ts    | 2 +-
 lang/tomahawk_ca.ts    | 2 +-
 lang/tomahawk_de.ts    | 2 +-
 lang/tomahawk_en.ts    | 2 +-
 lang/tomahawk_es.ts    | 2 +-
 lang/tomahawk_fr.ts    | 2 +-
 lang/tomahawk_ja.ts    | 8 ++++----
 lang/tomahawk_pl.ts    | 2 +-
 lang/tomahawk_pt_BR.ts | 2 +-
 lang/tomahawk_ru.ts    | 2 +-
 lang/tomahawk_sv.ts    | 2 +-
 lang/tomahawk_tr.ts    | 2 +-
 lang/tomahawk_zh_CN.ts | 2 +-
 lang/tomahawk_zh_TW.ts | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lang/tomahawk_ar.ts b/lang/tomahawk_ar.ts
index 41f6e1ebd..5e35311c7 100644
--- a/lang/tomahawk_ar.ts
+++ b/lang/tomahawk_ar.ts
@@ -3011,7 +3011,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>مجموعتي الخاصة</translation>
     </message>
diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts
index 0ae5c430d..c264e4a05 100644
--- a/lang/tomahawk_bg.ts
+++ b/lang/tomahawk_bg.ts
@@ -3018,7 +3018,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Моята колекция</translation>
     </message>
diff --git a/lang/tomahawk_ca.ts b/lang/tomahawk_ca.ts
index 578d03edc..f418c5b01 100644
--- a/lang/tomahawk_ca.ts
+++ b/lang/tomahawk_ca.ts
@@ -3010,7 +3010,7 @@ Intenteu ajustar els filtres per reproduir noves cançons.</translation>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>La meva Col·lecció</translation>
     </message>
diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts
index 5bbf3920d..a42d46de9 100644
--- a/lang/tomahawk_de.ts
+++ b/lang/tomahawk_de.ts
@@ -3006,7 +3006,7 @@ Versuch die Filter anzupassen für neue Lieder.</translation>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Meine Sammlung</translation>
     </message>
diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts
index 52dafea70..3de7bf057 100644
--- a/lang/tomahawk_en.ts
+++ b/lang/tomahawk_en.ts
@@ -3011,7 +3011,7 @@ Try tweaking the filters for a new set of songs to play.</translation>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>My Collection</translation>
     </message>
diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts
index ad5dbfa8a..a15a15459 100644
--- a/lang/tomahawk_es.ts
+++ b/lang/tomahawk_es.ts
@@ -3009,7 +3009,7 @@ Intente ajustar los filtros para reproducir nuevas canciones.</translation>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Mi colección</translation>
     </message>
diff --git a/lang/tomahawk_fr.ts b/lang/tomahawk_fr.ts
index b02fa3971..218ec8cec 100644
--- a/lang/tomahawk_fr.ts
+++ b/lang/tomahawk_fr.ts
@@ -3011,7 +3011,7 @@ Essayez de changer les filtres pour avoir de nouveaux morceaux à jouer.</transl
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Ma Collection</translation>
     </message>
diff --git a/lang/tomahawk_ja.ts b/lang/tomahawk_ja.ts
index 664ad2fbf..0b0f05cb0 100644
--- a/lang/tomahawk_ja.ts
+++ b/lang/tomahawk_ja.ts
@@ -1611,12 +1611,12 @@ connect and stream from you?</source>
     <message>
         <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
         <source>Username:</source>
-        <translation type="unfinished"/>
+        <translation>ユーザー名</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
         <source>Password:</source>
-        <translation type="unfinished"/>
+        <translation>パスワード</translation>
     </message>
 </context>
 <context>
@@ -1637,7 +1637,7 @@ connect and stream from you?</source>
     <message>
         <location filename="../src/StackedSettingsDialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
-        <translation type="unfinished"/>
+        <translation>設定</translation>
     </message>
     <message>
         <location filename="../src/StackedSettingsDialog.ui" line="158"/>
@@ -3001,7 +3001,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation type="unfinished"/>
     </message>
diff --git a/lang/tomahawk_pl.ts b/lang/tomahawk_pl.ts
index 638f26874..f0c7419de 100644
--- a/lang/tomahawk_pl.ts
+++ b/lang/tomahawk_pl.ts
@@ -3005,7 +3005,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Moja Kolekcja</translation>
     </message>
diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts
index 58ae843f8..4aff1a507 100644
--- a/lang/tomahawk_pt_BR.ts
+++ b/lang/tomahawk_pt_BR.ts
@@ -3011,7 +3011,7 @@ Tente ajustar os filtros para ouvir um novo conjunto de músicas.</translation>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Minha Coleção</translation>
     </message>
diff --git a/lang/tomahawk_ru.ts b/lang/tomahawk_ru.ts
index c8e9962d1..90086180e 100644
--- a/lang/tomahawk_ru.ts
+++ b/lang/tomahawk_ru.ts
@@ -3005,7 +3005,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Моя коллекция</translation>
     </message>
diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts
index f73257155..fcdef6931 100644
--- a/lang/tomahawk_sv.ts
+++ b/lang/tomahawk_sv.ts
@@ -3000,7 +3000,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation type="unfinished"/>
     </message>
diff --git a/lang/tomahawk_tr.ts b/lang/tomahawk_tr.ts
index 7149903f6..f68ddc294 100644
--- a/lang/tomahawk_tr.ts
+++ b/lang/tomahawk_tr.ts
@@ -2999,7 +2999,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation type="unfinished"/>
     </message>
diff --git a/lang/tomahawk_zh_CN.ts b/lang/tomahawk_zh_CN.ts
index 4daaeaeab..afe90f1f0 100644
--- a/lang/tomahawk_zh_CN.ts
+++ b/lang/tomahawk_zh_CN.ts
@@ -2999,7 +2999,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation type="unfinished"/>
     </message>
diff --git a/lang/tomahawk_zh_TW.ts b/lang/tomahawk_zh_TW.ts
index cb8ce803d..25d9db4db 100644
--- a/lang/tomahawk_zh_TW.ts
+++ b/lang/tomahawk_zh_TW.ts
@@ -2999,7 +2999,7 @@ Try tweaking the filters for a new set of songs to play.</source>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/TomahawkApp.cpp" line="602"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>我的收藏</translation>
     </message>