From 2679e82fdc37875f9386ac997c5dce5838ef2ff7 Mon Sep 17 00:00:00 2001
From: Milton Goncalves <milton.otm.goncalves@gmail.com>
Date: Thu, 26 Jan 2012 02:43:24 +0000
Subject: [PATCH 1/2] updated portuguese translation

---
 cockatrice/translations/cockatrice_pt.ts | 28 ++++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts
index c85d16f5..d6bf302f 100644
--- a/cockatrice/translations/cockatrice_pt.ts
+++ b/cockatrice/translations/cockatrice_pt.ts
@@ -141,47 +141,47 @@ Introduza 0 para um banimento indefinido.</translation>
     <message>
         <location filename="../src/userlist.cpp" line="28"/>
         <source>ban &amp;user name</source>
-        <translation type="unfinished"></translation>
+        <translation>banir &amp;nome de utilizador</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="31"/>
         <source>ban &amp;IP address</source>
-        <translation type="unfinished"></translation>
+        <translation>banir &amp;endereço de IP</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="39"/>
         <source>Ban type</source>
-        <translation type="unfinished"></translation>
+        <translation>Banir tipo</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="42"/>
         <source>&amp;permanent ban</source>
-        <translation type="unfinished"></translation>
+        <translation>banimento &amp;permanente</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="43"/>
         <source>&amp;temporary ban</source>
-        <translation type="unfinished"></translation>
+        <translation>banimento &amp;temporário</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="46"/>
         <source>&amp;Days:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dias:</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="52"/>
         <source>&amp;Hours:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Horas:</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="58"/>
         <source>&amp;Minutes:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Minutos:</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="73"/>
         <source>Duration of the ban</source>
-        <translation type="unfinished"></translation>
+        <translation>Duração do banimento</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="76"/>
@@ -193,7 +193,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
     <message>
         <location filename="../src/userlist.cpp" line="79"/>
         <source>&amp;OK</source>
-        <translation></translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="82"/>
@@ -208,12 +208,12 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
     <message>
         <location filename="../src/userlist.cpp" line="104"/>
         <source>Error</source>
-        <translation type="unfinished">Erro</translation>
+        <translation>Erro</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="104"/>
         <source>You have to select a name-based or IP-based ban, or both.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem de seleccionar um banimento baseado no nome, no Ip ou ambos.</translation>
     </message>
 </context>
 <context>
@@ -1786,7 +1786,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
     <message>
         <location filename="../src/window_main.cpp" line="190"/>
         <source>Italian:</source>
-        <translation type="unfinished"></translation>
+        <translation>Italiano:</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="196"/>
@@ -4435,7 +4435,7 @@ Introduza 0 para um banimento indefinido.</translation>
     <message>
         <location filename="../src/window_deckeditor.cpp" line="118"/>
         <source>Hash:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash:</translation>
     </message>
     <message>
         <location filename="../src/window_deckeditor.cpp" line="132"/>

From 22e12db15e628b2f7dd5d3ea3f84076c87e0b928 Mon Sep 17 00:00:00 2001
From: armyfrank <shuraba@.(none)>
Date: Sat, 9 Jun 2012 13:25:48 +0900
Subject: [PATCH 2/2] Updated Japanese translation

---
 cockatrice/translations/cockatrice_ja.ts | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts
index bdd1b0ef..0d3ffac2 100644
--- a/cockatrice/translations/cockatrice_ja.ts
+++ b/cockatrice/translations/cockatrice_ja.ts
@@ -141,47 +141,47 @@ Enter 0 for an indefinite ban.</source>
     <message>
         <location filename="../src/userlist.cpp" line="28"/>
         <source>ban &amp;user name</source>
-        <translation type="unfinished"></translation>
+        <translation>ユーザー名でBAN</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="31"/>
         <source>ban &amp;IP address</source>
-        <translation type="unfinished"></translation>
+        <translation>IPアドレスでBAN</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="39"/>
         <source>Ban type</source>
-        <translation type="unfinished"></translation>
+        <translation>BANタイプ</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="42"/>
         <source>&amp;permanent ban</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="43"/>
         <source>&amp;temporary ban</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="46"/>
         <source>&amp;Days:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="52"/>
         <source>&amp;Hours:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="58"/>
         <source>&amp;Minutes:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="73"/>
         <source>Duration of the ban</source>
-        <translation type="unfinished"></translation>
+        <translation>BAN期間</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="76"/>
@@ -207,12 +207,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     <message>
         <location filename="../src/userlist.cpp" line="104"/>
         <source>Error</source>
-        <translation type="unfinished">エラー</translation>
+        <translation>エラー</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="104"/>
         <source>You have to select a name-based or IP-based ban, or both.</source>
-        <translation type="unfinished"></translation>
+        <translation>名前によるBANかIPによるBAN、もしくは両方を選択してください</translation>
     </message>
 </context>
 <context>
@@ -287,7 +287,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     <message>
         <location filename="../src/cardinfowidget.cpp" line="193"/>
         <source>Loyalty:</source>
-        <translation type="unfinished"></translation>
+        <translation>忠誠値:</translation>
     </message>
 </context>
 <context>
@@ -1394,7 +1394,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     <message>
         <location filename="../src/gameselector.cpp" line="133"/>
         <source>Show u&amp;navailable games</source>
-        <translation type="unfinished"></translation>
+        <translation>プレイ不可のゲームを見る</translation>
     </message>
     <message>
         <source>Show &amp;full games</source>
@@ -1675,7 +1675,7 @@ Reason for shutdown: %1</source>
     <message>
         <location filename="../src/window_main.cpp" line="190"/>
         <source>Italian:</source>
-        <translation type="unfinished"></translation>
+        <translation>イタリア語:</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="196"/>
@@ -4044,7 +4044,7 @@ Enter 0 for an indefinite ban.</source>
     <message>
         <location filename="../src/window_deckeditor.cpp" line="118"/>
         <source>Hash:</source>
-        <translation type="unfinished"></translation>
+        <translation>ハッシュ:</translation>
     </message>
     <message>
         <location filename="../src/window_deckeditor.cpp" line="132"/>