変愚蛮怒のメインリポジトリです
Revision | 402d43055754193e3b66ddb2e50d2fdc57059cfa (tree) |
---|---|
Time | 2019-01-01 15:47:21 |
Author | Deskull <deskull@user...> |
Commiter | Deskull |
[Refactor] #37353 メッセージ整理。 / Refactor messages.
@@ -2549,12 +2549,8 @@ static bool get_player_race(void) | ||
2549 | 2549 | sym[n] = I2A(n); |
2550 | 2550 | else |
2551 | 2551 | sym[n] = ('A' + n - 26); |
2552 | -#ifdef JP | |
2553 | 2552 | sprintf(buf, "%c%c%s", sym[n], p2, str); |
2554 | -#else | |
2555 | - sprintf(buf, "%c%c %s", sym[n], p2, str); | |
2556 | -#endif | |
2557 | - put_str(buf, 12 + (n/5), 1 + 16 * (n%5)); | |
2553 | + put_str(buf, 12 + (n / 5), 1 + 16 * (n % 5)); | |
2558 | 2554 | |
2559 | 2555 | } |
2560 | 2556 |
@@ -2573,11 +2569,7 @@ static bool get_player_race(void) | ||
2573 | 2569 | put_str(" ", 3, 40); |
2574 | 2570 | if(cs == MAX_RACES) |
2575 | 2571 | { |
2576 | -#ifdef JP | |
2577 | - sprintf(cur, "%c%c%s", '*', p2, "ランダム"); | |
2578 | -#else | |
2579 | - sprintf(cur, "%c%c %s", '*', p2, "Random"); | |
2580 | -#endif | |
2572 | + sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random")); | |
2581 | 2573 | put_str(" ", 4, 40); |
2582 | 2574 | put_str(" ", 5, 40); |
2583 | 2575 | } |
@@ -2585,17 +2577,11 @@ static bool get_player_race(void) | ||
2585 | 2577 | { |
2586 | 2578 | rp_ptr = &race_info[cs]; |
2587 | 2579 | str = rp_ptr->title; |
2588 | -#ifdef JP | |
2589 | 2580 | sprintf(cur, "%c%c%s", sym[cs], p2, str); |
2590 | 2581 | c_put_str(TERM_L_BLUE, rp_ptr->title, 3, 40); |
2591 | - put_str("の種族修正", 3, 40+strlen(rp_ptr->title)); | |
2592 | - put_str("腕力 知能 賢さ 器用 耐久 魅力 経験 ", 4, 40); | |
2593 | -#else | |
2594 | - sprintf(cur, "%c%c %s", sym[cs], p2, str); | |
2595 | - c_put_str(TERM_L_BLUE, rp_ptr->title, 3, 40); | |
2596 | - put_str(": Race modification", 3, 40+strlen(rp_ptr->title)); | |
2597 | - put_str("Str Int Wis Dex Con Chr EXP ", 4, 40); | |
2598 | -#endif | |
2582 | + put_str(_("腕力 知能 賢さ 器用 耐久 魅力 経験 ", "Str Int Wis Dex Con Chr EXP "), 4, 40); | |
2583 | + put_str(_("の種族修正", ": Race modification"), 3, 40 + strlen(rp_ptr->title)); | |
2584 | + | |
2599 | 2585 | sprintf(buf, "%+3d %+3d %+3d %+3d %+3d %+3d %+4d%% ", |
2600 | 2586 | rp_ptr->r_adj[0], rp_ptr->r_adj[1], rp_ptr->r_adj[2], rp_ptr->r_adj[3], |
2601 | 2587 | rp_ptr->r_adj[4], rp_ptr->r_adj[5], (rp_ptr->r_exp - 100)); |
@@ -2729,26 +2715,14 @@ static bool get_player_class(void) | ||
2729 | 2715 | |
2730 | 2716 | /* Display */ |
2731 | 2717 | if (!(rp_ptr->choice & (1L << n))) |
2732 | -#ifdef JP | |
2733 | 2718 | sprintf(buf, "%c%c(%s)", sym[n], p2, str); |
2734 | -#else | |
2735 | - sprintf(buf, "%c%c (%s)", sym[n], p2, str); | |
2736 | -#endif | |
2737 | 2719 | else |
2738 | -#ifdef JP | |
2739 | 2720 | sprintf(buf, "%c%c%s", sym[n], p2, str); |
2740 | -#else | |
2741 | - sprintf(buf, "%c%c %s", sym[n], p2, str); | |
2742 | -#endif | |
2743 | 2721 | |
2744 | 2722 | put_str(buf, 13+ (n/4), 2 + 19 * (n%4)); |
2745 | 2723 | } |
2746 | 2724 | |
2747 | -#ifdef JP | |
2748 | - sprintf(cur, "%c%c%s", '*', p2, "ランダム"); | |
2749 | -#else | |
2750 | - sprintf(cur, "%c%c %s", '*', p2, "Random"); | |
2751 | -#endif | |
2725 | + sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random")); | |
2752 | 2726 | |
2753 | 2727 | /* Get a class */ |
2754 | 2728 | k = -1; |
@@ -2763,11 +2737,7 @@ static bool get_player_class(void) | ||
2763 | 2737 | put_str(" ", 3, 40); |
2764 | 2738 | if(cs == MAX_CLASS_CHOICE) |
2765 | 2739 | { |
2766 | -#ifdef JP | |
2767 | - sprintf(cur, "%c%c%s", '*', p2, "ランダム"); | |
2768 | -#else | |
2769 | - sprintf(cur, "%c%c %s", '*', p2, "Random"); | |
2770 | -#endif | |
2740 | + sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random")); | |
2771 | 2741 | put_str(" ", 4, 40); |
2772 | 2742 | put_str(" ", 5, 40); |
2773 | 2743 | } |
@@ -2777,32 +2747,19 @@ static bool get_player_class(void) | ||
2777 | 2747 | mp_ptr = &m_info[cs]; |
2778 | 2748 | str = cp_ptr->title; |
2779 | 2749 | if (!(rp_ptr->choice & (1L << cs))) |
2780 | -#ifdef JP | |
2781 | 2750 | sprintf(cur, "%c%c(%s)", sym[cs], p2, str); |
2782 | -#else | |
2783 | - sprintf(cur, "%c%c (%s)", sym[cs], p2, str); | |
2784 | -#endif | |
2785 | 2751 | else |
2786 | -#ifdef JP | |
2787 | 2752 | sprintf(cur, "%c%c%s", sym[cs], p2, str); |
2788 | -#else | |
2789 | - sprintf(cur, "%c%c %s", sym[cs], p2, str); | |
2790 | -#endif | |
2791 | -#ifdef JP | |
2792 | - c_put_str(TERM_L_BLUE, cp_ptr->title, 3, 40); | |
2793 | - put_str("の職業修正", 3, 40+strlen(cp_ptr->title)); | |
2794 | - put_str("腕力 知能 賢さ 器用 耐久 魅力 経験 ", 4, 40); | |
2795 | -#else | |
2753 | + | |
2796 | 2754 | c_put_str(TERM_L_BLUE, cp_ptr->title, 3, 40); |
2797 | - put_str(": Class modification", 3, 40+strlen(cp_ptr->title)); | |
2798 | - put_str("Str Int Wis Dex Con Chr EXP ", 4, 40); | |
2799 | -#endif | |
2755 | + put_str(_("の職業修正", ": Class modification"), 3, 40+strlen(cp_ptr->title)); | |
2756 | + put_str(_("腕力 知能 賢さ 器用 耐久 魅力 経験 ", "Str Int Wis Dex Con Chr EXP "), 4, 40); | |
2800 | 2757 | sprintf(buf, "%+3d %+3d %+3d %+3d %+3d %+3d %+4d%% ", |
2801 | 2758 | cp_ptr->c_adj[0], cp_ptr->c_adj[1], cp_ptr->c_adj[2], cp_ptr->c_adj[3], |
2802 | 2759 | cp_ptr->c_adj[4], cp_ptr->c_adj[5], cp_ptr->c_exp); |
2803 | 2760 | c_put_str(TERM_L_BLUE, buf, 5, 40); |
2804 | 2761 | } |
2805 | - c_put_str(TERM_YELLOW, cur, 13 + (cs/4), 2 + 19 * (cs%4)); | |
2762 | + c_put_str(TERM_YELLOW, cur, 13 + (cs / 4), 2 + 19 * (cs % 4)); | |
2806 | 2763 | os = cs; |
2807 | 2764 | } |
2808 | 2765 |
@@ -2885,7 +2842,6 @@ static bool get_player_class(void) | ||
2885 | 2842 | cp_ptr = &class_info[p_ptr->pclass]; |
2886 | 2843 | mp_ptr = &m_info[p_ptr->pclass]; |
2887 | 2844 | |
2888 | - | |
2889 | 2845 | /* Display */ |
2890 | 2846 | c_put_str(TERM_L_BLUE, cp_ptr->title, 5, 15); |
2891 | 2847 |
@@ -2899,13 +2855,13 @@ static bool get_player_class(void) | ||
2899 | 2855 | */ |
2900 | 2856 | static bool get_player_seikaku(void) |
2901 | 2857 | { |
2902 | - int k, n, os, cs; | |
2903 | - char c; | |
2904 | - char sym[MAX_SEIKAKU]; | |
2905 | - char p2 = ')'; | |
2906 | - char buf[80], cur[80]; | |
2907 | - char tmp[64]; | |
2908 | - cptr str; | |
2858 | + int k, n, os, cs; | |
2859 | + char c; | |
2860 | + char sym[MAX_SEIKAKU]; | |
2861 | + char p2 = ')'; | |
2862 | + char buf[80], cur[80]; | |
2863 | + char tmp[64]; | |
2864 | + cptr str; | |
2909 | 2865 | |
2910 | 2866 | |
2911 | 2867 | /* Extra info */ |
@@ -2930,20 +2886,11 @@ static bool get_player_seikaku(void) | ||
2930 | 2886 | sym[n] = ('A' + n - 26); |
2931 | 2887 | |
2932 | 2888 | /* Display */ |
2933 | - /* Display */ | |
2934 | -#ifdef JP | |
2935 | 2889 | sprintf(buf, "%c%c%s", I2A(n), p2, str); |
2936 | -#else | |
2937 | - sprintf(buf, "%c%c %s", I2A(n), p2, str); | |
2938 | -#endif | |
2939 | 2890 | put_str(buf, 12 + (n/4), 2 + 18 * (n%4)); |
2940 | 2891 | } |
2941 | 2892 | |
2942 | -#ifdef JP | |
2943 | - sprintf(cur, "%c%c%s", '*', p2, "ランダム"); | |
2944 | -#else | |
2945 | - sprintf(cur, "%c%c %s", '*', p2, "Random"); | |
2946 | -#endif | |
2893 | + sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random")); | |
2947 | 2894 | |
2948 | 2895 | /* Get a seikaku */ |
2949 | 2896 | k = -1; |
@@ -2958,11 +2905,7 @@ static bool get_player_seikaku(void) | ||
2958 | 2905 | put_str(" ", 3, 40); |
2959 | 2906 | if(cs == MAX_SEIKAKU) |
2960 | 2907 | { |
2961 | -#ifdef JP | |
2962 | - sprintf(cur, "%c%c%s", '*', p2, "ランダム"); | |
2963 | -#else | |
2964 | - sprintf(cur, "%c%c %s", '*', p2, "Random"); | |
2965 | -#endif | |
2908 | + sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random")); | |
2966 | 2909 | put_str(" ", 4, 40); |
2967 | 2910 | put_str(" ", 5, 40); |
2968 | 2911 | } |
@@ -2970,24 +2913,14 @@ static bool get_player_seikaku(void) | ||
2970 | 2913 | { |
2971 | 2914 | ap_ptr = &seikaku_info[cs]; |
2972 | 2915 | str = ap_ptr->title; |
2973 | -#ifdef JP | |
2974 | - sprintf(cur, "%c%c%s", sym[cs], p2, str); | |
2975 | -#else | |
2976 | - sprintf(cur, "%c%c %s", sym[cs], p2, str); | |
2977 | -#endif | |
2978 | -#ifdef JP | |
2979 | - c_put_str(TERM_L_BLUE, ap_ptr->title, 3, 40); | |
2980 | - put_str("の性格修正", 3, 40+strlen(ap_ptr->title)); | |
2981 | - put_str("腕力 知能 賢さ 器用 耐久 魅力 ", 4, 40); | |
2982 | -#else | |
2983 | - c_put_str(TERM_L_BLUE, ap_ptr->title, 3, 40); | |
2984 | - put_str(": Personality modification", 3, 40+strlen(ap_ptr->title)); | |
2985 | - put_str("Str Int Wis Dex Con Chr ", 4, 40); | |
2986 | -#endif | |
2987 | - sprintf(buf, "%+3d %+3d %+3d %+3d %+3d %+3d ", | |
2988 | - ap_ptr->a_adj[0], ap_ptr->a_adj[1], ap_ptr->a_adj[2], ap_ptr->a_adj[3], | |
2989 | - ap_ptr->a_adj[4], ap_ptr->a_adj[5]); | |
2990 | - c_put_str(TERM_L_BLUE, buf, 5, 40); | |
2916 | + sprintf(cur, "%c%c%s", sym[cs], p2, str); | |
2917 | + c_put_str(TERM_L_BLUE, ap_ptr->title, 3, 40); | |
2918 | + put_str(_("の性格修正", ": Personality modification"), 3, 40+strlen(ap_ptr->title)); | |
2919 | + put_str(_("腕力 知能 賢さ 器用 耐久 魅力 ", "Str Int Wis Dex Con Chr "), 4, 40); | |
2920 | + sprintf(buf, "%+3d %+3d %+3d %+3d %+3d %+3d ", | |
2921 | + ap_ptr->a_adj[0], ap_ptr->a_adj[1], ap_ptr->a_adj[2], ap_ptr->a_adj[3], | |
2922 | + ap_ptr->a_adj[4], ap_ptr->a_adj[5]); | |
2923 | + c_put_str(TERM_L_BLUE, buf, 5, 40); | |
2991 | 2924 | } |
2992 | 2925 | c_put_str(TERM_YELLOW, cur, 12 + (cs/4), 2 + 18 * (cs%4)); |
2993 | 2926 | os = cs; |
@@ -2995,11 +2928,7 @@ static bool get_player_seikaku(void) | ||
2995 | 2928 | |
2996 | 2929 | if (k >= 0) break; |
2997 | 2930 | |
2998 | -#ifdef JP | |
2999 | - sprintf(buf, "性格を選んで下さい (%c-%c) ('='初期オプション設定): ", sym[0], sym[MAX_SEIKAKU-1]); | |
3000 | -#else | |
3001 | - sprintf(buf, "Choose a personality (%c-%c) ('=' for options): ", sym[0], sym[MAX_SEIKAKU-1]); | |
3002 | -#endif | |
2931 | + sprintf(buf, _("性格を選んで下さい (%c-%c) ('='初期オプション設定): ", "Choose a personality (%c-%c) ('=' for options): "), sym[0], sym[MAX_SEIKAKU-1]); | |
3003 | 2932 | |
3004 | 2933 | put_str(buf, 10, 10); |
3005 | 2934 | c = inkey(); |
@@ -3107,19 +3036,14 @@ static bool get_player_seikaku(void) | ||
3107 | 3036 | else if (c == '=') |
3108 | 3037 | { |
3109 | 3038 | screen_save(); |
3110 | -#ifdef JP | |
3111 | - do_cmd_options_aux(OPT_PAGE_BIRTH, "初期オプション((*)はスコアに影響)"); | |
3112 | -#else | |
3113 | - do_cmd_options_aux(OPT_PAGE_BIRTH, "Birth Option((*)s effect score)"); | |
3114 | -#endif | |
3115 | - | |
3039 | + do_cmd_options_aux(OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)")); | |
3116 | 3040 | screen_load(); |
3117 | 3041 | } |
3118 | 3042 | else if (c !='2' && c !='4' && c !='6' && c !='8') bell(); |
3119 | 3043 | } |
3120 | 3044 | |
3121 | 3045 | /* Set seikaku */ |
3122 | - p_ptr->pseikaku = (byte_hack)k; | |
3046 | + p_ptr->pseikaku = k; | |
3123 | 3047 | ap_ptr = &seikaku_info[p_ptr->pseikaku]; |
3124 | 3048 | #ifdef JP |
3125 | 3049 | strcpy(tmp, ap_ptr->title); |
@@ -3131,7 +3055,6 @@ static bool get_player_seikaku(void) | ||
3131 | 3055 | #endif |
3132 | 3056 | strcat(tmp,p_ptr->name); |
3133 | 3057 | |
3134 | - | |
3135 | 3058 | /* Display */ |
3136 | 3059 | c_put_str(TERM_L_BLUE, tmp, 1, 34); |
3137 | 3060 |
@@ -3155,19 +3078,10 @@ static bool get_stat_limits(void) | ||
3155 | 3078 | clear_from(10); |
3156 | 3079 | |
3157 | 3080 | /* Extra infomation */ |
3158 | -#ifdef JP | |
3159 | - put_str("最低限得たい能力値を設定して下さい。", 10, 10); | |
3160 | - put_str("2/8で項目選択、4/6で値の増減、Enterで次へ", 11, 10); | |
3161 | -#else | |
3162 | - put_str("Set minimum stats.", 10, 10); | |
3163 | - put_str("2/8 for Select, 4/6 for Change value, Enter for Goto next", 11, 10); | |
3164 | -#endif | |
3081 | + put_str(_("最低限得たい能力値を設定して下さい。", "Set minimum stats."), 10, 10); | |
3082 | + put_str(_("2/8で項目選択、4/6で値の増減、Enterで次へ", "2/8 for Select, 4/6 for Change value, Enter for Goto next"), 11, 10); | |
3165 | 3083 | |
3166 | -#ifdef JP | |
3167 | - put_str(" 基本値 種族 職業 性格 合計値 最大値", 13, 10); | |
3168 | -#else | |
3169 | - put_str(" Base Rac Cla Per Total Maximum", 13, 10); | |
3170 | -#endif | |
3084 | + put_str(_(" 基本値 種族 職業 性格 合計値 最大値", " Base Rac Cla Per Total Maximum"), 13, 10); | |
3171 | 3085 | |
3172 | 3086 | /* Output the maximum stats */ |
3173 | 3087 | for (i = 0; i < 6; i++) |