From a8e473e74db54275fe88442e45748a2c50f66c9d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Sun, 13 Jan 2013 15:59:08 +0000
Subject: merge

---
 perl-install/standalone/po/ja.po | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'perl-install/standalone/po/ja.po')

diff --git a/perl-install/standalone/po/ja.po b/perl-install/standalone/po/ja.po
index 0d200d690..d99de96fd 100644
--- a/perl-install/standalone/po/ja.po
+++ b/perl-install/standalone/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX-standalone-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-11 17:34+0100\n"
+"POT-Creation-Date: 2013-01-13 16:56+0100\n"
 "PO-Revision-Date: 2009-03-22 19:59+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -2676,6 +2676,16 @@ msgstr "メールアドレスを入力してください"
 msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr "/使用する SMTP サーバの名前 (または IP) を入力"
 
+#: logdrake:440
+#, fuzzy, c-format
+msgid "Email address"
+msgstr "IP アドレス"
+
+#: logdrake:441
+#, fuzzy, c-format
+msgid "Email server"
+msgstr "samba サーバ"
+
 #: logdrake:445
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
-- 
cgit v1.2.1