Merge translation files from master branch.

3 files changed, 40 insertions, 40 deletions

diff --git a/tde-i18n-ja/messages/tdenetwork/kopete.po b/tde-i18n-ja/messages/tdenetwork/kopete.po
index b9f6d6eec13..72f36504dc3 100644
--- a/tde-i18n-ja/messages/tdenetwork/kopete.po
+++ b/tde-i18n-ja/messages/tdenetwork/kopete.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kopete\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2008-02-06 20:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -3519,7 +3519,7 @@ msgid "Please enter the same password twice."
 msgstr "パスワードを二度入力してください。"
 
 #: protocols/gadu/gaduregisteraccount.cpp:106
-#: protocols/jabber/ui/jabberregisteraccount.cpp:160
+#: protocols/jabber/ui/jabberregisteraccount.cpp:161
 msgid "Password entries do not match."
 msgstr "パスワードが一致しません。"
 
@@ -3676,7 +3676,7 @@ msgid "&Manage Privacy..."
 msgstr "プライバシーを設定(&M)..."
 
 #: protocols/groupwise/gwaccount.cpp:251 protocols/jabber/jabberaccount.cpp:428
-#: protocols/jabber/ui/jabberregisteraccount.cpp:269
+#: protocols/jabber/ui/jabberregisteraccount.cpp:270
 #, fuzzy
 msgid ""
 "SSL support could not be initialized for account %1. This is most likely "
@@ -5100,7 +5100,7 @@ msgid "Jabber Error"
 msgstr "Jabber エラー"
 
 #: protocols/jabber/jabberaccount.cpp:430
-#: protocols/jabber/ui/jabberregisteraccount.cpp:271
+#: protocols/jabber/ui/jabberregisteraccount.cpp:272
 msgid "Jabber SSL Error"
 msgstr "Jabber SSL エラー"
 
@@ -6031,7 +6031,7 @@ msgstr "新しいサーバ名を入力するか、「選択」をクリックし
 msgid "Please enter a valid Jabber ID."
 msgstr "有効な Jabber ID を入力してください。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:192
+#: protocols/jabber/ui/jabberregisteraccount.cpp:193
 msgid ""
 "Unless you know what you are doing, your JID should be of the form "
 "\"username@server.com\".  In your case for example \"username@%1\"."
@@ -6039,27 +6039,27 @@ msgstr ""
 "特別な理由がない限り、Jabber  ID は \"username@server.com\" の形式で指定しま"
 "す。あなたの場合は \"username@%1\" です。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:247
+#: protocols/jabber/ui/jabberregisteraccount.cpp:248
 msgid "Connecting to server..."
 msgstr "サーバに接続中..."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:316
+#: protocols/jabber/ui/jabberregisteraccount.cpp:317
 msgid "Protocol error."
 msgstr "プロトコルエラー"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:329
+#: protocols/jabber/ui/jabberregisteraccount.cpp:330
 msgid "Connected successfully, registering new account..."
 msgstr "接続に成功。アカウントを登録中..."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:344
+#: protocols/jabber/ui/jabberregisteraccount.cpp:345
 msgid "Registration successful."
 msgstr "登録成功！"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:378
+#: protocols/jabber/ui/jabberregisteraccount.cpp:379
 msgid "Registration failed."
 msgstr "登録に失敗。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:380
+#: protocols/jabber/ui/jabberregisteraccount.cpp:381
 msgid ""
 "Unable to create account on the server. The Jabber ID is probably already in "
 "use."
@@ -6067,7 +6067,7 @@ msgstr ""
 "サーバにアカウントを作成できませんでした。おそらく Jabber ID は既に使用中だと"
 "思われます。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:381
+#: protocols/jabber/ui/jabberregisteraccount.cpp:382
 msgid "Jabber Account Registration"
 msgstr "Jabber アカウント登録"
 
diff --git a/tde-i18n-ja/messages/tdenetwork/krdc.po b/tde-i18n-ja/messages/tdenetwork/krdc.po
index f16cb85dd6b..4a30e0c9269 100644
--- a/tde-i18n-ja/messages/tdenetwork/krdc.po
+++ b/tde-i18n-ja/messages/tdenetwork/krdc.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krdc\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2007-06-13 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -296,13 +296,13 @@ msgstr ""
 msgid "rdesktop Failure"
 msgstr "リモートデスクトップ接続失敗"
 
-#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:470
+#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:467
 msgid "Connection attempt to host failed."
 msgstr "ホストへの接続に失敗しました。"
 
-#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:217 vnc/kvncview.cpp:471
-#: vnc/kvncview.cpp:476 vnc/kvncview.cpp:481 vnc/kvncview.cpp:486
-#: vnc/kvncview.cpp:491 vnc/kvncview.cpp:496
+#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:225 vnc/kvncview.cpp:468
+#: vnc/kvncview.cpp:473 vnc/kvncview.cpp:478 vnc/kvncview.cpp:483
+#: vnc/kvncview.cpp:488 vnc/kvncview.cpp:493
 msgid "Connection Failure"
 msgstr "接続失敗"
 
@@ -320,36 +320,36 @@ msgstr "はい"
 msgid "no"
 msgstr "いいえ"
 
-#: vnc/kvncview.cpp:216
+#: vnc/kvncview.cpp:224
 msgid "It is not possible to connect to a local desktop sharing service."
 msgstr "ローカルのデスクトップ共有サービスには接続できません。"
 
-#: vnc/kvncview.cpp:231
+#: vnc/kvncview.cpp:239
 #, c-format
 msgid "VNC Host Preferences for %1"
 msgstr "%1 の VNC ホスト設定"
 
-#: vnc/kvncview.cpp:419
+#: vnc/kvncview.cpp:416
 msgid "Access to the system requires a password."
 msgstr "システムへのアクセスにはパスワードが必要です。"
 
-#: vnc/kvncview.cpp:475
+#: vnc/kvncview.cpp:472
 msgid "Remote host is using an incompatible protocol."
 msgstr "リモートホストは互換性のないプロトコルを使用しています。"
 
-#: vnc/kvncview.cpp:480
+#: vnc/kvncview.cpp:477
 msgid "The connection to the host has been interrupted."
 msgstr "ホストへの接続は中断されました。"
 
-#: vnc/kvncview.cpp:485
+#: vnc/kvncview.cpp:482
 msgid "Connection failed. The server does not accept new connections."
 msgstr "接続失敗。サーバは新規接続を受け付けません。"
 
-#: vnc/kvncview.cpp:490
+#: vnc/kvncview.cpp:487
 msgid "Connection failed. A server with the given name cannot be found."
 msgstr "接続失敗。指定された名前のサーバは見つかりません。"
 
-#: vnc/kvncview.cpp:495
+#: vnc/kvncview.cpp:492
 #, fuzzy
 msgid ""
 "Connection failed. No server running at the given address and port. Verify "
@@ -357,19 +357,19 @@ msgid ""
 msgstr ""
 "接続失敗。指定されたアドレスとポートで実行されているサーバはありません。"
 
-#: vnc/kvncview.cpp:504
+#: vnc/kvncview.cpp:501
 msgid "Authentication failed. Connection aborted."
 msgstr "認証失敗。接続を中止しました。"
 
-#: vnc/kvncview.cpp:505
+#: vnc/kvncview.cpp:502
 msgid "Authentication Failure"
 msgstr "認証失敗"
 
-#: vnc/kvncview.cpp:509
+#: vnc/kvncview.cpp:506
 msgid "Unknown error."
 msgstr "未知のエラー"
 
-#: vnc/kvncview.cpp:510
+#: vnc/kvncview.cpp:507
 msgid "Unknown Error"
 msgstr "未知のエラー"
 
diff --git a/tde-i18n-ja/messages/tdenetwork/krfb.po b/tde-i18n-ja/messages/tdenetwork/krfb.po
index c72252587a9..fec234cafb5 100644
--- a/tde-i18n-ja/messages/tdenetwork/krfb.po
+++ b/tde-i18n-ja/messages/tdenetwork/krfb.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krfb\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2007-03-22 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -160,7 +160,7 @@ msgstr ""
 "KInetD を見つけることができません。TDE デーモン (kded) はクラッシュしたか全く"
 "起動しませんでした。あるいは、インストールに失敗しました。"
 
-#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:894
+#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:885
 msgid "Desktop Sharing Error"
 msgstr "デスクトップ共有エラー"
 
@@ -176,43 +176,43 @@ msgstr ""
 msgid "Personal Invitation"
 msgstr "個人招待"
 
-#: krfb/rfbcontroller.cc:378
+#: krfb/rfbcontroller.cc:376
 msgid "%1@%2 (shared desktop)"
 msgstr "%1@%2 (共有されるデスクトップ)"
 
-#: krfb/rfbcontroller.cc:516
+#: krfb/rfbcontroller.cc:510
 #, c-format
 msgid "User accepts connection from %1"
 msgstr "%1 からの接続を許可しました"
 
-#: krfb/rfbcontroller.cc:530
+#: krfb/rfbcontroller.cc:523
 #, c-format
 msgid "User refuses connection from %1"
 msgstr "%1 からの接続を拒否しました"
 
-#: krfb/rfbcontroller.cc:578
+#: krfb/rfbcontroller.cc:571
 #, c-format
 msgid "Closed connection: %1."
 msgstr "切断しました: %1"
 
-#: krfb/rfbcontroller.cc:705 krfb/rfbcontroller.cc:710
+#: krfb/rfbcontroller.cc:700 krfb/rfbcontroller.cc:705
 msgid "Failed login attempt from %1: wrong password"
 msgstr "%1 からのログインが失敗しました: 不正なパスワード"
 
-#: krfb/rfbcontroller.cc:748
+#: krfb/rfbcontroller.cc:741
 msgid "Connection refused from %1, already connected."
 msgstr "%1 からの接続を拒否しました。既に接続しています。"
 
-#: krfb/rfbcontroller.cc:758
+#: krfb/rfbcontroller.cc:751
 #, c-format
 msgid "Accepted uninvited connection from %1"
 msgstr "%1 からの招待していない接続を許可しました"
 
-#: krfb/rfbcontroller.cc:766
+#: krfb/rfbcontroller.cc:759
 msgid "Received connection from %1, on hold (waiting for confirmation)"
 msgstr "%1 から接続要求を受け取りました。保留中です (確認待ち)"
 
-#: krfb/rfbcontroller.cc:893
+#: krfb/rfbcontroller.cc:884
 msgid ""
 "Your X11 Server does not support the required XTest extension version 2.2. "
 "Sharing your desktop is not possible."