From 383001f055b670aa19b4de0d64e4518c42a7c06c Mon Sep 17 00:00:00 2001 From: alec Date: Fri, 13 Aug 2010 06:21:29 +0000 Subject: - ja_JP update (#1486911) git-svn-id: https://svn.roundcube.net/trunk@3895 208e9e7b-5314-0410-a742-e7e81cd9613c --- plugins/archive/localization/ja_JP.inc | 2 + plugins/help/localization/ja_JP.inc | 2 + plugins/managesieve/localization/ja_JP.inc | 82 ++++++++++++++++++ plugins/markasjunk/localization/ja_JP.inc | 9 ++ plugins/new_user_dialog/localization/ja_JP.inc | 9 ++ plugins/password/localization/ja_JP.inc | 2 + .../subscriptions_option/localization/ja_JP.inc | 8 ++ plugins/userinfo/localization/ja_JP.inc | 2 + plugins/vcard_attachments/localization/ja_JP.inc | 2 + .../program/localization/ja_JP/labels.inc | 99 ++++++++++++++++++---- .../program/localization/ja_JP/messages.inc | 26 +++--- .../program/steps/settings/delete_identity.inc | 15 ++-- .../program/steps/settings/save_identity.inc | 63 +++++++------- 13 files changed, 254 insertions(+), 67 deletions(-) create mode 100644 plugins/managesieve/localization/ja_JP.inc create mode 100644 plugins/markasjunk/localization/ja_JP.inc create mode 100644 plugins/new_user_dialog/localization/ja_JP.inc create mode 100644 plugins/subscriptions_option/localization/ja_JP.inc diff --git a/plugins/archive/localization/ja_JP.inc b/plugins/archive/localization/ja_JP.inc index 5093b6815..31fa15267 100644 --- a/plugins/archive/localization/ja_JP.inc +++ b/plugins/archive/localization/ja_JP.inc @@ -1,5 +1,7 @@ diff --git a/plugins/markasjunk/localization/ja_JP.inc b/plugins/markasjunk/localization/ja_JP.inc new file mode 100644 index 000000000..bd5b8b203 --- /dev/null +++ b/plugins/markasjunk/localization/ja_JP.inc @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/plugins/new_user_dialog/localization/ja_JP.inc b/plugins/new_user_dialog/localization/ja_JP.inc new file mode 100644 index 000000000..55f47914a --- /dev/null +++ b/plugins/new_user_dialog/localization/ja_JP.inc @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/plugins/password/localization/ja_JP.inc b/plugins/password/localization/ja_JP.inc index 92f510bd3..47cac0430 100644 --- a/plugins/password/localization/ja_JP.inc +++ b/plugins/password/localization/ja_JP.inc @@ -1,5 +1,7 @@ diff --git a/plugins/userinfo/localization/ja_JP.inc b/plugins/userinfo/localization/ja_JP.inc index e546894b6..1fd4eaf51 100644 --- a/plugins/userinfo/localization/ja_JP.inc +++ b/plugins/userinfo/localization/ja_JP.inc @@ -1,5 +1,7 @@ vCard 形式からのインポートに対応しています。'; $labels['done'] = '完了'; + $labels['settingsfor'] = '次の設定:'; + $labels['preferences'] = '設定'; $labels['userpreferences'] = 'ユーザー設定'; $labels['editpreferences'] = 'ユーザー設定の変更'; + $labels['identities'] = '個人情報'; $labels['manageidentities'] = 'アカウントの個人情報管理'; $labels['newidentity'] = '個人情報の新規作成'; + $labels['newitem'] = '新しい項目'; $labels['edititem'] = '項目の編集'; + $labels['preferhtml'] = 'HTML を表示する'; $labels['defaultcharset'] = '標準の文字セット'; $labels['htmlmessage'] = 'HTML メール'; -$labels['prettydate'] = '短い日付表示'; +$labels['prettydate'] = '短い日付で表示'; $labels['setdefault'] = '標準の設定'; $labels['autodetect'] = '自動識別'; $labels['language'] = '言語'; @@ -267,14 +326,14 @@ $labels['flagfordeletion'] = '実際に削除せずに削除済みフラグを $labels['skipdeleted'] = '削除済みメールを表示しない'; $labels['deletealways'] = 'ごみ箱への移動に失敗したメールはすぐに削除'; $labels['showremoteimages'] = '外部 URL の画像をインライン表示する'; -$labels['fromknownsenders'] = '知り合いから'; +$labels['fromknownsenders'] = '送信者が知人の場合'; $labels['always'] = '常に'; $labels['showinlineimages'] = 'メールに添付された画像を表示する'; $labels['autosavedraft'] = '自動的に下書きを保存する'; $labels['everynminutes'] = '$n 分毎'; $labels['keepalive'] = '新着メールの確認間隔'; -$labels['never'] = '確認しない'; -$labels['immediately'] = '今すぐ確認'; +$labels['never'] = 'しない'; +$labels['immediately'] = 'すぐに'; $labels['messagesdisplaying'] = 'メールの表示'; $labels['messagescomposition'] = 'メールの作成'; $labels['mimeparamfolding'] = '添付ファイル名'; @@ -283,9 +342,9 @@ $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)'; $labels['2047folding'] = 'RFC 2047 準拠 (他のメーラー)'; $labels['force7bit'] = 'マルチバイト文字列を MIME エンコードする'; $labels['advancedoptions'] = '高度な設定'; -$labels['focusonnewmessage'] = '新着メールが届いたらブラウザーをアクティブ化'; +$labels['focusonnewmessage'] = '新着メールが届いたらブラウザーをアクティブにする'; $labels['checkallfolders'] = 'すべてのフォルダーで新着メールを表示する'; -$labels['displaynext'] = 'メールの削除・移動後に次のメールを表示する'; +$labels['displaynext'] = 'メールの削除や移動後に次のメールを表示する'; $labels['mainoptions'] = '基本設定'; $labels['section'] = '設定項目'; $labels['maintenance'] = 'メンテナンス設定'; @@ -305,6 +364,7 @@ $labels['abovequote'] = '引用部の前'; $labels['insertsignature'] = '署名の挿入'; $labels['previewpanemarkread'] = '開封済みにする'; $labels['afternseconds'] = '$n 秒後'; + $labels['folder'] = 'フォルダー'; $labels['folders'] = 'フォルダー一覧'; $labels['foldername'] = 'フォルダー名'; @@ -317,13 +377,18 @@ $labels['renamefolder'] = 'フォルダー名の変更'; $labels['deletefolder'] = 'フォルダーの削除'; $labels['managefolders'] = 'フォルダーの管理'; $labels['specialfolders'] = '特殊なフォルダー'; -$labels['sortby'] = '整列の基準'; -$labels['sortasc'] = '昇順で整列'; -$labels['sortdesc'] = '降順で整列'; + +$labels['sortby'] = '並び替えの基準'; +$labels['sortasc'] = '昇順で並び替え'; +$labels['sortdesc'] = '降順で並び替え'; + +// units $labels['B'] = 'バイト'; $labels['KB'] = 'KB'; $labels['MB'] = 'MB'; $labels['GB'] = 'GB'; + +// character sets $labels['unicode'] = 'Unicode'; $labels['english'] = '英語'; $labels['westerneuropean'] = '西ヨーロッパ言語'; diff --git a/roundcubemail/program/localization/ja_JP/messages.inc b/roundcubemail/program/localization/ja_JP/messages.inc index d5b2b53fa..8049d3133 100644 --- a/roundcubemail/program/localization/ja_JP/messages.inc +++ b/roundcubemail/program/localization/ja_JP/messages.inc @@ -2,20 +2,22 @@ /* -+-----------------------------------------------------------------------+ -| language/ja_JP/messages.inc | -| | -| Language file of the RoundCube Webmail client | -| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland | -| Licensed under the GNU GPL | -| | -+-----------------------------------------------------------------------+ -| Author: Tadashi Jokagi | -| Takashi Takamatsu | -+-----------------------------------------------------------------------+ + +-----------------------------------------------------------------------+ + | language/ja_JP/messages.inc | + | | + | Language file of the RoundCube Webmail client | + | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland | + | Licensed under the GNU GPL | + | | + +-----------------------------------------------------------------------+ + | Author: Tadashi Jokagi | + | Takashi Takamatsu | + +-----------------------------------------------------------------------+ @version $Id$ +// EN-Revision: 3891 + */ $messages = array(); @@ -59,7 +61,7 @@ $messages['foldercreating'] = 'フォルダーを作成しています...'; $messages['folderdeleting'] = 'フォルダーを削除しています...'; $messages['folderrenaming'] = 'フォルダー名を変更しています...'; $messages['foldermoving'] = 'フォルダーを移動しています...'; -$messages['formincomplete'] = 'フォームの項目がすべて入力されていません。'; +$messages['formincomplete'] = 'すべてのフォームの項目を入力していません。'; $messages['noemailwarning'] = '有効なメールアドレスを入力してください。'; $messages['nonamewarning'] = '名前を入力してください。'; $messages['nopagesizewarning'] = 'ページのサイズを入力してください。'; diff --git a/roundcubemail/program/steps/settings/delete_identity.inc b/roundcubemail/program/steps/settings/delete_identity.inc index 06bcab906..42c1da61f 100644 --- a/roundcubemail/program/steps/settings/delete_identity.inc +++ b/roundcubemail/program/steps/settings/delete_identity.inc @@ -31,13 +31,16 @@ if (!$OUTPUT->ajax_call && !$RCMAIL->check_request(RCUBE_INPUT_GPC)) { if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid)) { $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid)); - - if (!$plugin['abort'] && $USER->delete_identity($iid)) { - $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false); - } - else { - $OUTPUT->show_message('nodeletelastidentity', 'error', null, false); + + if (!$plugin['abort']) { + if ($USER->delete_identity($iid)) { + $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false); + } + else { + $OUTPUT->show_message('nodeletelastidentity', 'error', null, false); + } } + // send response if ($OUTPUT->ajax_call) $OUTPUT->send(); diff --git a/roundcubemail/program/steps/settings/save_identity.inc b/roundcubemail/program/steps/settings/save_identity.inc index 6c2cd8136..8673d4099 100644 --- a/roundcubemail/program/steps/settings/save_identity.inc +++ b/roundcubemail/program/steps/settings/save_identity.inc @@ -64,25 +64,24 @@ if ($_POST['_iid']) $plugin = $RCMAIL->plugins->exec_hook('identity_update', array('id' => $iid, 'record' => $save_data)); $save_data = $plugin['record']; - if (!$plugin['abort'] && ($updated = $USER->update_identity($iid, $save_data))) - { - $OUTPUT->show_message('successfullysaved', 'confirmation'); - - if (!empty($_POST['_standard'])) - $default_id = get_input_value('_iid', RCUBE_INPUT_POST); - - if ($_POST['_framed']) - { - // update the changed col in list - // ... + if (!$plugin['abort']) { + if ($updated = $USER->update_identity($iid, $save_data)) { + $OUTPUT->show_message('successfullysaved', 'confirmation'); + + if (!empty($_POST['_standard'])) + $default_id = get_input_value('_iid', RCUBE_INPUT_POST); + + if ($_POST['_framed']) { + // update the changed col in list + // ... + } + } + else if ($DB->is_error()) { + // show error message + $OUTPUT->show_message('errorsaving', 'error', null, false); + rcmail_overwrite_action('edit-identity'); + return; } - } - else if ($plugin['abort'] || $DB->is_error()) - { - // show error message - $OUTPUT->show_message('errorsaving', 'error', null, false); - rcmail_overwrite_action('edit-identity'); - return; } } @@ -95,21 +94,21 @@ else if (IDENTITIES_LEVEL < 2) $plugin = $RCMAIL->plugins->exec_hook('identity_create', array('record' => $save_data)); $save_data = $plugin['record']; - if (!$plugin['abort'] && $save_data['email'] && ($insert_id = $USER->insert_identity($save_data))) - { - $OUTPUT->show_message('successfullysaved', 'confirmation', null, false); - - $_GET['_iid'] = $insert_id; + if (!$plugin['abort']) { + if ($save_data['email'] && ($insert_id = $USER->insert_identity($save_data))) { + $OUTPUT->show_message('successfullysaved', 'confirmation', null, false); - if (!empty($_POST['_standard'])) - $default_id = $insert_id; - } - else - { - // show error message - $OUTPUT->show_message('errorsaving', 'error', null, false); - rcmail_overwrite_action('edit-identity'); - return; + $_GET['_iid'] = $insert_id; + + if (!empty($_POST['_standard'])) + $default_id = $insert_id; + } + else { + // show error message + $OUTPUT->show_message('errorsaving', 'error', null, false); + rcmail_overwrite_action('edit-identity'); + return; + } } } else -- cgit v1.2.3