From 0700cc7e66b0853a505c0e5bf37f0654da0b2615 Mon Sep 17 00:00:00 2001
From: Calamares CI <teo@kde.org>
Date: Tue, 17 Jan 2017 00:36:22 +0000
Subject: [PATCH] [core] Automatic merge of Transifex translations

---
 lang/calamares_ca.ts | 4 ++--
 lang/calamares_ja.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index b4105d29a..5a78f521c 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -2099,12 +2099,12 @@ L&apos;instal·lador es tancarà i tots els canvis es perdran.</translation>
     <message>
         <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
         <source>Cannot disable root account.</source>
-        <translation type="unfinished"/>
+        <translation>No es pot inhabilitar el compte d&apos;arrel.</translation>
     </message>
     <message>
         <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
         <source>passwd terminated with error code %1.</source>
-        <translation type="unfinished"/>
+        <translation>El procés passwd ha acabat amb el codi d&apos;error %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/users/SetPasswordJob.cpp" line="88"/>
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index efb99bf7c..196c26620 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -620,7 +620,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="268"/>
         <source>Mountpoint already in use. Please select another one.</source>
-        <translation type="unfinished"/>
+        <translation>マウントポイントは既に使用されています。他を選択してください。</translation>
     </message>
 </context>
 <context>
@@ -945,7 +945,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="306"/>
         <source>Mountpoint already in use. Please select another one.</source>
-        <translation type="unfinished"/>
+        <translation>マウントポイントは既に使用されています。他を選択してください。</translation>
     </message>
 </context>
 <context>
@@ -2100,12 +2100,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
         <source>Cannot disable root account.</source>
-        <translation type="unfinished"/>
+        <translation>rootアカウントを使用することができません。</translation>
     </message>
     <message>
         <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
         <source>passwd terminated with error code %1.</source>
-        <translation type="unfinished"/>
+        <translation>passwd がエラーコード %1 のため終了しました。</translation>
     </message>
     <message>
         <location filename="../src/modules/users/SetPasswordJob.cpp" line="88"/>