diff -C 3 -r jpilot-0.98.1/address_gui.c jpilot-0.98.1-more_jp/address_gui.c *** jpilot-0.98.1/address_gui.c Sat Feb 5 12:40:39 2000 --- jpilot-0.98.1-more_jp/address_gui.c Fri Jun 30 15:37:55 2000 *************** *** 64,69 **** --- 64,72 ---- int clist_row_selected; extern GtkTooltips *glob_tooltips; + int je_labels = 3; + char *je_label[3]={"よみ(姓)","よみ(名)","よみ(会社名)"}; + void update_address_screen(); int address_clist_redraw(); *************** *** 153,163 **** void cb_new_address_done(GtkWidget *widget, gpointer data) { ! int i, found; struct Address a; MyAddress *ma; unsigned char attrib; unsigned int unique_id; gtk_widget_hide(vbox2_2); gtk_widget_show(vbox2_1); --- 156,167 ---- void cb_new_address_done(GtkWidget *widget, gpointer data) { ! int i, ii, found, charnum; struct Address a; MyAddress *ma; unsigned char attrib; unsigned int unique_id; + gchar *tmpstr, tmpstr2[2]; gtk_widget_hide(vbox2_2); gtk_widget_show(vbox2_1); *************** *** 184,191 **** found=0; a.showPhone=0; for (i=0; i2 && i<8 && !found) { if (a.entry[i][0]!='\0') { found=1; --- 188,205 ---- found=0; a.showPhone=0; for (i=0; i2 && i<8 && !found) { if (a.entry[i][0]!='\0') { found=1; *************** *** 225,231 **** int new_cat; /*Clear all the address entry texts */ ! for (i=0; iattrib & 0x0F], -1); gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, "\n", -1); ! for (i=0; ientry[i2]) { if (i2>2 && i2<8) { gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, address_app_info.phoneLabels[a->phoneLabel[i2-3]], -1); } else { ! gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, address_app_info.labels[i2], -1); } gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, ": ", -1); ! gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, a->entry[i2], -1); gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, "\n", -1); } } --- 364,408 ---- gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, address_app_info.category.name[ma->attrib & 0x0F], -1); gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, "\n", -1); ! for (i=0; ientry[i2]) { ! strcpy(tempstr, a->entry[i2]); ! for (charnum=0; tempstr[charnum] != '\0' ; charnum++) { ! if ( tempstr[charnum] == 1) { ! strncpy(tempstr, tempstr, charnum); ! tempstr[charnum] = '\0'; ! tempstr2 = tempstr; ! break; ! } ! } ! tempstr2 = tempstr; ! } ! else if (i2>=NUM_ADDRESS_ENTRIES && i2entry[i2-19]) { ! strcpy(tempstr, a->entry[i2-19]); ! tempstr2 = strchr(tempstr, 1); ! if (tempstr2) tempstr2++; ! } ! ! if ( (i2<19 && a->entry[i2]) || tempstr2) { if (i2>2 && i2<8) { gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, address_app_info.phoneLabels[a->phoneLabel[i2-3]], -1); + } else if (19<=i2 && i2<=21) { + gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, je_label[i2-19], -1); } else { ! gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, gettext(address_app_info.labels[i2]), -1); } gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, ": ", -1); ! if (i2<=2 || i2>=19) { ! gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, tempstr2, -1); ! } ! else { ! gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, a->entry[i2], -1); ! } gtk_text_insert(GTK_TEXT(text), NULL,NULL,NULL, "\n", -1); } } *************** *** 386,398 **** gtk_option_menu_set_history(GTK_OPTION_MENU(address_cat_menu2), count); ! for (i=0; ientry[i]) { gtk_text_insert(GTK_TEXT(address_text[i]), NULL,NULL,NULL, a->entry[i], -1); } } for (i=0; i<5; i++) { if (GTK_IS_WIDGET(menu_item[i][a->phoneLabel[i]])) { --- 428,458 ---- gtk_option_menu_set_history(GTK_OPTION_MENU(address_cat_menu2), count); ! for (i=0; ientry[i]) { gtk_text_insert(GTK_TEXT(address_text[i]), NULL,NULL,NULL, a->entry[i], -1); } + else if (i<=2 && a->entry[i]) { + strcpy(tempstr, a->entry[i]); + for (charnum=0; tempstr[charnum] != '\0' ; charnum++) { + if (tempstr[charnum] == 1) { + strncpy(tempstr, tempstr, charnum); + tempstr[charnum] = '\0'; + break; + } + } + tempstr2 = tempstr; + gtk_text_insert(GTK_TEXT(address_text[i]), NULL,NULL,NULL, tempstr2, -1); + } + else if (i>=NUM_ADDRESS_ENTRIES && ientry[i-19]) { + tempstr2 = strchr(a->entry[i-19], 1); + if (tempstr2) tempstr2++; + gtk_text_insert(GTK_TEXT(address_text[i]), NULL,NULL,NULL, tempstr2, -1); + } } for (i=0; i<5; i++) { if (GTK_IS_WIDGET(menu_item[i][a->phoneLabel[i]])) { *************** *** 407,413 **** void update_address_screen() { int num_entries, entries_shown, i; ! int show1, show2, show3; gchar *empty_line[] = { "","","" }; GdkPixmap *pixmap_note; GdkBitmap *mask_note; --- 467,473 ---- void update_address_screen() { int num_entries, entries_shown, i; ! int show1, show2, show3, charnum, show[3], ii; gchar *empty_line[] = { "","","" }; GdkPixmap *pixmap_note; GdkBitmap *mask_note; *************** *** 415,421 **** GdkColormap *colormap; AddressList *temp_al; static AddressList *address_list=NULL; ! char str[50]; long modified, deleted; free_AddressList(&address_list); --- 475,481 ---- GdkColormap *colormap; AddressList *temp_al; static AddressList *address_list=NULL; ! char str[50], tempstr[3][128]; long modified, deleted; free_AddressList(&address_list); *************** *** 495,512 **** entries_shown++; str[0]='\0'; if (temp_al->ma.a.entry[show1] || temp_al->ma.a.entry[show2]) { if (temp_al->ma.a.entry[show1] && temp_al->ma.a.entry[show2]) { ! g_snprintf(str, 48, "%s, %s", temp_al->ma.a.entry[show1], temp_al->ma.a.entry[show2]); } if (temp_al->ma.a.entry[show1] && ! temp_al->ma.a.entry[show2]) { ! strncpy(str, temp_al->ma.a.entry[show1], 48); } if (! temp_al->ma.a.entry[show1] && temp_al->ma.a.entry[show2]) { ! strncpy(str, temp_al->ma.a.entry[show2], 48); } } else if (temp_al->ma.a.entry[show3]) { ! strncpy(str, temp_al->ma.a.entry[show3], 48); } else { strcpy(str, "-Unnamed-"); } --- 555,587 ---- entries_shown++; str[0]='\0'; + show[0]=show1; show[1]=show2; show[2]=show3; + + for (ii=0; ii<=2; ii++) { + if (temp_al->ma.a.entry[show[ii]]) { + strcpy(tempstr[ii],temp_al->ma.a.entry[show[ii]]); + for (charnum=0; tempstr[ii][charnum] != '\0' ; charnum++) { + if ( tempstr[ii][charnum] == 1) { + strncpy(tempstr[ii], tempstr[ii], charnum); + tempstr[ii][charnum] = '\0'; + break; + } + } + } + } + if (temp_al->ma.a.entry[show1] || temp_al->ma.a.entry[show2]) { if (temp_al->ma.a.entry[show1] && temp_al->ma.a.entry[show2]) { ! g_snprintf(str, 48, "%s, %s", tempstr[0], tempstr[1]); } if (temp_al->ma.a.entry[show1] && ! temp_al->ma.a.entry[show2]) { ! strncpy(str, tempstr[0], 48); } if (! temp_al->ma.a.entry[show1] && temp_al->ma.a.entry[show2]) { ! strncpy(str, tempstr[1], 48); } } else if (temp_al->ma.a.entry[show3]) { ! strncpy(str, tempstr[2], 48); } else { strcpy(str, "-Unnamed-"); } *************** *** 758,764 **** /* This is needed because the text boxes aren't shown on the * screen in the same order as the array. I show them in the * same order that the palm does */ ! int page[22]={0,0,0,0,0,0,0,1,1,1,1,1,2,0,2,2,2,2,2,2,2,2 }; int i; --- 833,839 ---- /* This is needed because the text boxes aren't shown on the * screen in the same order as the array. I show them in the * same order that the palm does */ ! int page[22]={0,0,0,0,0,0,0,1,2,1,1,1,1,0,2,2,2,2,0,0,0,0 }; int i; *************** *** 810,817 **** int i, i1, i2; ! int order[22]={0,1,13,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,19,20,21 }; clist_row_selected=0; --- 885,893 ---- int i, i1, i2; ! int order[23]={19,0,20,1,13,21,2,3,4,5,6,7,12,11,10,9,8,14,15,16,17,18,19 }; + int ncol[4]={12,17,22,100}; clist_row_selected=0; *************** *** 1046,1057 **** gtk_box_pack_start(GTK_BOX(vbox_temp3), table3, TRUE, TRUE, 0); label = NULL; ! for (i=0; i2 && i2<8) { make_phone_menu(i2-3, (i2-3)<<4, i2-3); } else { ! label = gtk_label_new(address_app_info.labels[i2]); /*gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); */ gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); } --- 1122,1136 ---- gtk_box_pack_start(GTK_BOX(vbox_temp3), table3, TRUE, TRUE, 0); label = NULL; ! for (i=0; i2 && i2<8) { make_phone_menu(i2-3, (i2-3)<<4, i2-3); + } else if (i2>=19 && i2<=21) { + label = gtk_label_new(je_label[i2-19]); + gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); } else { ! label = gtk_label_new(gettext(address_app_info.labels[i2])); /*gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); */ gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); } *************** *** 1062,1068 **** gtk_widget_set_usize(GTK_WIDGET(address_text[i2]), 0, 25); /*gtk_box_pack_start(GTK_BOX(hbox_temp), address_text[i2], TRUE, TRUE, 0); */ /*hbox_temp = gtk_hbox_new(FALSE, 0); */ ! if (i<9) { if (i2>2 && i2<8) { gtk_table_attach_defaults(GTK_TABLE(table1), GTK_WIDGET(phone_list_menu[i2-3]), 0, 1, i, i+1); --- 1141,1147 ---- gtk_widget_set_usize(GTK_WIDGET(address_text[i2]), 0, 25); /*gtk_box_pack_start(GTK_BOX(hbox_temp), address_text[i2], TRUE, TRUE, 0); */ /*hbox_temp = gtk_hbox_new(FALSE, 0); */ ! if (i2 && i2<8) { gtk_table_attach_defaults(GTK_TABLE(table1), GTK_WIDGET(phone_list_menu[i2-3]), 0, 1, i, i+1); *************** *** 1074,1091 **** 1, 2, i, i+1); /*gtk_box_pack_start(GTK_BOX(vbox_temp1), hbox_temp, TRUE, TRUE, 0); */ } ! if (i>8 && i<14) { gtk_table_attach_defaults(GTK_TABLE(table2), GTK_WIDGET(label), ! 0, 1, i-9, i-8); gtk_table_attach_defaults(GTK_TABLE(table2), GTK_WIDGET(address_text[i2]), ! 1, 2, i-9, i-8); /*gtk_box_pack_start(GTK_BOX(vbox_temp2), hbox_temp, TRUE, TRUE, 0); */ } ! if (i>13 && i<100) { gtk_table_attach_defaults(GTK_TABLE(table3), GTK_WIDGET(label), ! 0, 1, i-14, i-13); gtk_table_attach_defaults(GTK_TABLE(table3), GTK_WIDGET(address_text[i2]), ! 1, 2, i-14, i-13); /*gtk_box_pack_start(GTK_BOX(vbox_temp3), hbox_temp, TRUE, TRUE, 0); */ } /*gtk_widget_show(hbox_temp); */ --- 1153,1170 ---- 1, 2, i, i+1); /*gtk_box_pack_start(GTK_BOX(vbox_temp1), hbox_temp, TRUE, TRUE, 0); */ } ! if (i>=ncol[0] && i=ncol[1] && i\n" "Language-Team: LANGUAGE \n" --- 6,12 ---- msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2000-06-30 13:42+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" *************** *** 19,25 **** msgstr "" #: address.c:188 address.c:209 address.c:290 address.c:318 address.c:408 ! #: address.c:432 datebook.c:598 datebook.c:626 datebook.c:852 memo.c:138 #: memo.c:158 memo.c:202 memo.c:231 memo.c:309 memo.c:333 memo.c:415 #: todo.c:232 todo.c:251 todo.c:335 todo.c:363 todo.c:443 todo.c:467 #: todo.c:546 --- 19,25 ---- msgstr "" #: address.c:188 address.c:209 address.c:290 address.c:318 address.c:408 ! #: address.c:432 datebook.c:602 datebook.c:630 datebook.c:856 memo.c:138 #: memo.c:158 memo.c:202 memo.c:231 memo.c:309 memo.c:333 memo.c:415 #: todo.c:232 todo.c:251 todo.c:335 todo.c:363 todo.c:443 todo.c:467 #: todo.c:546 *************** *** 32,38 **** msgstr "" #: address.c:240 address.c:284 address.c:400 address.c:557 datebook.c:279 ! #: datebook.c:592 datebook.c:845 datebook.c:1004 memo.c:103 memo.c:196 #: memo.c:302 todo.c:283 todo.c:328 todo.c:436 #, c-format msgid "Error opening %s\n" --- 32,38 ---- msgstr "" #: address.c:240 address.c:284 address.c:400 address.c:557 datebook.c:279 ! #: datebook.c:596 datebook.c:849 datebook.c:1008 memo.c:103 memo.c:196 #: memo.c:302 todo.c:283 todo.c:328 todo.c:436 #, c-format msgid "Error opening %s\n" *************** *** 59,396 **** msgid "Out of memory 4\n" msgstr "" ! #: address_gui.c:348 msgid "Category: " ! msgstr "" ! #: address_gui.c:449 memo_gui.c:315 todo_gui.c:472 msgid "0 records" msgstr "" ! #: address_gui.c:560 memo_gui.c:424 todo_gui.c:583 #, c-format msgid "%d of %d records" ! msgstr "" ! #: address_gui.c:615 datebook_gui.c:315 memo_gui.c:440 todo_gui.c:600 msgid "All" ! msgstr "" ! #: address_gui.c:847 datebook_gui.c:2108 memo_gui.c:620 todo_gui.c:811 msgid "Delete" msgstr "削除" ! #: address_gui.c:909 msgid "Quick Find" msgstr "簡易検索" ! #: address_gui.c:927 msgid "Quick View" msgstr "内容" ! #: address_gui.c:938 msgid "Add or Modify a Record" msgstr "レコードの追加/変更" ! #: address_gui.c:971 datebook_gui.c:2335 memo_gui.c:687 todo_gui.c:884 msgid "Add It" msgstr "追加" ! #: address_gui.c:978 datebook_gui.c:2342 memo_gui.c:694 todo_gui.c:890 msgid "Apply Changes" msgstr "変更" ! #: address_gui.c:985 print_gui.c:220 msgid "Cancel" ! msgstr "" ! #: address_gui.c:993 datebook_gui.c:2349 memo_gui.c:701 todo_gui.c:896 msgid "New" msgstr "新規" ! #: address_gui.c:1019 msgid "Name" ! msgstr "" ! #: address_gui.c:1026 ! #, fuzzy msgid "Address" ! msgstr "/表示/アドレス帳" ! #: address_gui.c:1034 msgid "Other" ! msgstr "" #: datebook.c:193 datebook.c:212 datebook.c:243 #, c-format msgid "Error on reading %s\n" msgstr "" ! #: datebook.c:206 datebook.c:321 datebook.c:328 datebook.c:358 datebook.c:947 ! #: datebook.c:1024 memo.c:151 memo.c:222 memo.c:356 memo.c:409 memo.c:438 ! #: memo.c:472 sync.c:1385 todo.c:245 todo.c:354 todo.c:490 todo.c:574 #: todo.c:615 msgid "Out of memory\n" msgstr "" ! #: datebook.c:982 msgid "Out of memory" msgstr "" ! #: datebook_gui.c:309 install_gui.c:281 prefs_gui.c:386 search_gui.c:634 msgid "Done" msgstr "完了" ! #: datebook_gui.c:321 datebook_gui.c:2712 msgid "None" msgstr "なし" ! #: datebook_gui.c:457 monthview_gui.c:239 monthview_gui.c:246 ! #: weekview_gui.c:111 msgid "Sunday" msgstr "日曜日" ! #: datebook_gui.c:458 monthview_gui.c:240 weekview_gui.c:112 msgid "Monday" msgstr "月曜日" ! #: datebook_gui.c:459 monthview_gui.c:241 weekview_gui.c:113 msgid "Tuesday" msgstr "火曜日" ! #: datebook_gui.c:460 monthview_gui.c:242 weekview_gui.c:114 msgid "Wednesday" msgstr "水曜日" ! #: datebook_gui.c:461 monthview_gui.c:243 weekview_gui.c:115 msgid "Thursday" msgstr "木曜日" ! #: datebook_gui.c:462 monthview_gui.c:244 weekview_gui.c:116 msgid "Friday" msgstr "金曜日" ! #: datebook_gui.c:463 monthview_gui.c:245 weekview_gui.c:117 msgid "Saturday" msgstr "土曜日" ! #: datebook_gui.c:631 msgid "none" msgstr "なし" ! #: datebook_gui.c:632 msgid "day" msgstr "日" ! #: datebook_gui.c:633 msgid "week" msgstr "週" ! #: datebook_gui.c:634 msgid "month" msgstr "月" ! #: datebook_gui.c:635 msgid "year" msgstr "年" ! #: datebook_gui.c:880 #, c-format msgid "You cannot have an appointment that repeats every %d %s(s)\n" msgstr "" ! #: datebook_gui.c:889 msgid "" "You can not have a weekly repeating appointment that doesn't repeat on any " "day of the week.\n" msgstr "" ! #: datebook_gui.c:987 msgid "No Time" msgstr "" ! #: datebook_gui.c:1814 datebook_gui.c:1821 datebook_gui.c:2075 ! #: datebook_gui.c:2082 msgid "Su" msgstr "日" ! #: datebook_gui.c:1815 datebook_gui.c:2076 msgid "Mo" msgstr "月" ! #: datebook_gui.c:1816 datebook_gui.c:2077 msgid "Tu" msgstr "火" ! #: datebook_gui.c:1817 datebook_gui.c:2078 msgid "We" msgstr "水" ! #: datebook_gui.c:1818 datebook_gui.c:2079 msgid "RTh" msgstr "木" ! #: datebook_gui.c:1819 datebook_gui.c:2080 msgid "Fr" msgstr "金" ! #: datebook_gui.c:1820 datebook_gui.c:2081 msgid "Sa" msgstr "土" ! #: datebook_gui.c:2155 msgid "Go backward 1 year" msgstr "" ! #: datebook_gui.c:2168 msgid "Go backward 1 month" msgstr "" ! #: datebook_gui.c:2186 msgid "Go forward 1 month" msgstr "" ! #: datebook_gui.c:2199 msgid "Go forward 1 year" msgstr "" ! #: datebook_gui.c:2217 datebook_gui.c:2714 msgid "Week" msgstr "週" ! #: datebook_gui.c:2223 datebook_gui.c:2715 msgid "Month" msgstr "月" ! #: datebook_gui.c:2249 msgid "Daily Schedule" msgstr "一日の予定" ! #: datebook_gui.c:2359 msgid "Details" msgstr "詳細" ! #: datebook_gui.c:2371 msgid "Alarm" msgstr "アラーム" ! #: datebook_gui.c:2390 msgid "Minutes" msgstr "分" ! #: datebook_gui.c:2394 msgid "Hours" msgstr "時" ! #: datebook_gui.c:2396 msgid "Days" msgstr "日" ! #: datebook_gui.c:2416 msgid "This Event has no particular time" msgstr "時刻指定なし" ! #: datebook_gui.c:2435 ! #, fuzzy msgid "Begin: " msgstr "開始:" ! #: datebook_gui.c:2463 todo_gui.c:983 msgid "Month:" msgstr "月:" ! #: datebook_gui.c:2477 todo_gui.c:985 msgid "Day:" msgstr "日:" ! #: datebook_gui.c:2492 todo_gui.c:987 msgid "Year:" msgstr "年:" ! #: datebook_gui.c:2510 msgid "Hour:" msgstr "時:" ! #: datebook_gui.c:2528 msgid "Min:" msgstr "分:" ! #: datebook_gui.c:2545 msgid "End: " msgstr "終わり:" ! #: datebook_gui.c:2713 msgid "Day" msgstr "日" ! #: datebook_gui.c:2716 msgid "Year" msgstr "年" ! #: datebook_gui.c:2723 msgid "This event will not repeat" msgstr "繰り返しなし" ! #: datebook_gui.c:2734 datebook_gui.c:2822 datebook_gui.c:2939 ! #: datebook_gui.c:3048 msgid "Frequency is Every" msgstr "繰り返し周期" ! #: datebook_gui.c:2742 msgid "Day(s)" msgstr "日毎" ! #: datebook_gui.c:2746 datebook_gui.c:2834 datebook_gui.c:2951 ! #: datebook_gui.c:3060 msgid "End on" msgstr "終わりは" ! #: datebook_gui.c:2830 msgid "Week(s)" msgstr "週毎" ! #: datebook_gui.c:2902 msgid "Repeat on Days:" msgstr "繰り返し曜日:" ! #: datebook_gui.c:2947 msgid "Month(s)" msgstr "月毎" ! #: datebook_gui.c:3020 msgid "Repeat by:" msgstr "繰り返し設定:" ! #: datebook_gui.c:3025 msgid "Day of week" msgstr "曜日" ! #: datebook_gui.c:3035 msgid "Date" msgstr "日付" ! #: datebook_gui.c:3056 msgid "Year(s)" msgstr "年毎" ! #: install_gui.c:222 ! #, fuzzy msgid "Install" msgstr "/ファイル/インストール" ! #: install_gui.c:238 msgid "Files to be installed" msgstr "インストールするファイル" ! #: install_gui.c:261 msgid "To change to a hidden directory type it below and hit TAB" msgstr "隠されたディレクトリに移動するにはディレクトリ名を入力して TAB" ! #: install_gui.c:267 msgid "Add" msgstr "追加" ! #: install_gui.c:274 msgid "Remove" msgstr "削除" --- 59,424 ---- msgid "Out of memory 4\n" msgstr "" ! #: address_gui.c:363 msgid "Category: " ! msgstr "カテゴリー: " ! #: address_gui.c:509 memo_gui.c:315 todo_gui.c:472 msgid "0 records" msgstr "" ! #: address_gui.c:635 memo_gui.c:424 todo_gui.c:583 #, c-format msgid "%d of %d records" ! msgstr "%d件です(%d件中)" ! #. Create a "All" button ! #: address_gui.c:690 datebook_gui.c:314 memo_gui.c:440 todo_gui.c:600 msgid "All" ! msgstr "すべて" ! #. gtk_box_pack_start(GTK_BOX(hbox), vbox1, TRUE, TRUE, 5); ! #. gtk_box_pack_start(GTK_BOX(hbox), vbox2_1, TRUE, TRUE, 5); ! #. gtk_box_pack_start(GTK_BOX(hbox), vbox2_2, TRUE, TRUE, 5); ! #. Add buttons in left vbox ! #: address_gui.c:923 datebook_gui.c:2107 memo_gui.c:620 todo_gui.c:811 msgid "Delete" msgstr "削除" ! #: address_gui.c:985 msgid "Quick Find" msgstr "簡易検索" ! #. calendar = gtk_calendar_new(); ! #. gtk_box_pack_start(GTK_BOX(vbox2), calendar, TRUE, TRUE, 0); ! #. gtk_widget_show(calendar); ! #. gtk_box_pack_start (GTK_BOX (vbox_detail), hbox_text1, TRUE, TRUE, 0); ! #. The Frame on the right side ! #: address_gui.c:1003 msgid "Quick View" msgstr "内容" ! #. The Right hand side of the screen ! #: address_gui.c:1014 msgid "Add or Modify a Record" msgstr "レコードの追加/変更" ! #. Add record modification buttons on right side ! #: address_gui.c:1047 datebook_gui.c:2334 memo_gui.c:687 todo_gui.c:884 msgid "Add It" msgstr "追加" ! #: address_gui.c:1054 datebook_gui.c:2341 memo_gui.c:694 todo_gui.c:890 msgid "Apply Changes" msgstr "変更" ! #. Create a "Quit" button ! #: address_gui.c:1061 print_gui.c:220 msgid "Cancel" ! msgstr "キャンセル" ! #: address_gui.c:1069 datebook_gui.c:2348 memo_gui.c:701 todo_gui.c:896 msgid "New" msgstr "新規" ! #. Page 1 ! #: address_gui.c:1095 msgid "Name" ! msgstr "名前・電話" ! #. Page 2 ! #: address_gui.c:1102 msgid "Address" ! msgstr "住所" ! #. Page 3 ! #: address_gui.c:1110 msgid "Other" ! msgstr "その他" #: datebook.c:193 datebook.c:212 datebook.c:243 #, c-format msgid "Error on reading %s\n" msgstr "" ! #: datebook.c:206 datebook.c:321 datebook.c:328 datebook.c:358 datebook.c:951 ! #: datebook.c:1028 memo.c:151 memo.c:222 memo.c:356 memo.c:409 memo.c:438 ! #: memo.c:472 sync.c:1478 todo.c:245 todo.c:354 todo.c:490 todo.c:574 #: todo.c:615 msgid "Out of memory\n" msgstr "" ! #: datebook.c:986 msgid "Out of memory" msgstr "" ! #. Create a "Quit" button ! #: datebook_gui.c:308 install_gui.c:283 prefs_gui.c:386 search_gui.c:634 msgid "Done" msgstr "完了" ! #. Create a "None" button ! #: datebook_gui.c:320 datebook_gui.c:2711 msgid "None" msgstr "なし" ! #: datebook_gui.c:456 monthview_gui.c:237 monthview_gui.c:244 prefs.c:270 ! #: weekview_gui.c:109 msgid "Sunday" msgstr "日曜日" ! #: datebook_gui.c:457 monthview_gui.c:238 prefs.c:271 weekview_gui.c:110 msgid "Monday" msgstr "月曜日" ! #: datebook_gui.c:458 monthview_gui.c:239 weekview_gui.c:111 msgid "Tuesday" msgstr "火曜日" ! #: datebook_gui.c:459 monthview_gui.c:240 weekview_gui.c:112 msgid "Wednesday" msgstr "水曜日" ! #: datebook_gui.c:460 monthview_gui.c:241 weekview_gui.c:113 msgid "Thursday" msgstr "木曜日" ! #: datebook_gui.c:461 monthview_gui.c:242 weekview_gui.c:114 msgid "Friday" msgstr "金曜日" ! #: datebook_gui.c:462 monthview_gui.c:243 weekview_gui.c:115 msgid "Saturday" msgstr "土曜日" ! #: datebook_gui.c:630 msgid "none" msgstr "なし" ! #: datebook_gui.c:631 msgid "day" msgstr "日" ! #: datebook_gui.c:632 msgid "week" msgstr "週" ! #: datebook_gui.c:633 msgid "month" msgstr "月" ! #: datebook_gui.c:634 msgid "year" msgstr "年" ! #: datebook_gui.c:879 #, c-format msgid "You cannot have an appointment that repeats every %d %s(s)\n" msgstr "" ! #: datebook_gui.c:888 msgid "" "You can not have a weekly repeating appointment that doesn't repeat on any " "day of the week.\n" msgstr "" ! #. This is a timeless event ! #: datebook_gui.c:986 msgid "No Time" msgstr "" ! #: datebook_gui.c:1813 datebook_gui.c:1820 datebook_gui.c:2074 ! #: datebook_gui.c:2081 msgid "Su" msgstr "日" ! #: datebook_gui.c:1814 datebook_gui.c:2075 msgid "Mo" msgstr "月" ! #: datebook_gui.c:1815 datebook_gui.c:2076 msgid "Tu" msgstr "火" ! #: datebook_gui.c:1816 datebook_gui.c:2077 msgid "We" msgstr "水" ! #: datebook_gui.c:1817 datebook_gui.c:2078 msgid "RTh" msgstr "木" ! #: datebook_gui.c:1818 datebook_gui.c:2079 msgid "Fr" msgstr "金" ! #: datebook_gui.c:1819 datebook_gui.c:2080 msgid "Sa" msgstr "土" ! #: datebook_gui.c:2154 msgid "Go backward 1 year" msgstr "" ! #: datebook_gui.c:2167 msgid "Go backward 1 month" msgstr "" ! #: datebook_gui.c:2185 msgid "Go forward 1 month" msgstr "" ! #: datebook_gui.c:2198 msgid "Go forward 1 year" msgstr "" ! #. Make Monthview button ! #: datebook_gui.c:2216 datebook_gui.c:2713 msgid "Week" msgstr "週" ! #. Make Weekview button ! #: datebook_gui.c:2222 datebook_gui.c:2714 msgid "Month" msgstr "月" ! #: datebook_gui.c:2248 msgid "Daily Schedule" msgstr "一日の予定" ! #. start details ! #: datebook_gui.c:2358 msgid "Details" msgstr "詳細" ! #: datebook_gui.c:2370 msgid "Alarm" msgstr "アラーム" ! #: datebook_gui.c:2389 msgid "Minutes" msgstr "分" ! #: datebook_gui.c:2393 msgid "Hours" msgstr "時" ! #: datebook_gui.c:2395 msgid "Days" msgstr "日" ! #: datebook_gui.c:2415 msgid "This Event has no particular time" msgstr "時刻指定なし" ! #: datebook_gui.c:2434 msgid "Begin: " msgstr "開始:" ! #. Put Month spinner in ! #: datebook_gui.c:2462 todo_gui.c:983 msgid "Month:" msgstr "月:" ! #. Put Day spinner in ! #: datebook_gui.c:2476 todo_gui.c:985 msgid "Day:" msgstr "日:" ! #. Put year spinner in ! #: datebook_gui.c:2491 todo_gui.c:987 msgid "Year:" msgstr "年:" ! #: datebook_gui.c:2509 msgid "Hour:" msgstr "時:" ! #: datebook_gui.c:2527 msgid "Min:" msgstr "分:" ! #. End Begin spinners ! #. Begin End spinners ! #: datebook_gui.c:2544 msgid "End: " msgstr "終わり:" ! #: datebook_gui.c:2712 msgid "Day" msgstr "日" ! #: datebook_gui.c:2715 msgid "Year" msgstr "年" ! #. no repeat page for notebook ! #: datebook_gui.c:2722 msgid "This event will not repeat" msgstr "繰り返しなし" ! #: datebook_gui.c:2733 datebook_gui.c:2821 datebook_gui.c:2938 ! #: datebook_gui.c:3047 msgid "Frequency is Every" msgstr "繰り返し周期" ! #: datebook_gui.c:2741 msgid "Day(s)" msgstr "日毎" ! #. checkbutton ! #: datebook_gui.c:2745 datebook_gui.c:2833 datebook_gui.c:2950 ! #: datebook_gui.c:3059 msgid "End on" msgstr "終わりは" ! #: datebook_gui.c:2829 msgid "Week(s)" msgstr "週毎" ! #. end spinners ! #: datebook_gui.c:2901 msgid "Repeat on Days:" msgstr "繰り返し曜日:" ! #: datebook_gui.c:2946 msgid "Month(s)" msgstr "月毎" ! #. end spinners ! #: datebook_gui.c:3019 msgid "Repeat by:" msgstr "繰り返し設定:" ! #: datebook_gui.c:3024 msgid "Day of week" msgstr "曜日" ! #: datebook_gui.c:3034 msgid "Date" msgstr "日付" ! #: datebook_gui.c:3055 msgid "Year(s)" msgstr "年毎" ! #: install_gui.c:224 msgid "Install" msgstr "/ファイル/インストール" ! #: install_gui.c:240 msgid "Files to be installed" msgstr "インストールするファイル" ! #: install_gui.c:263 msgid "To change to a hidden directory type it below and hit TAB" msgstr "隠されたディレクトリに移動するにはディレクトリ名を入力して TAB" ! #: install_gui.c:269 msgid "Add" msgstr "追加" ! #: install_gui.c:276 msgid "Remove" msgstr "削除" *************** *** 404,415 **** #: jpilot.c:304 print_gui.c:214 msgid "Print" ! msgstr "" #: jpilot.c:305 msgid "There is no print support for this conduit." ! msgstr "" #: jpilot.c:529 msgid "Hide this window" msgstr "このウインドウを隠す" --- 432,444 ---- #: jpilot.c:304 print_gui.c:214 msgid "Print" ! msgstr "印刷" #: jpilot.c:305 msgid "There is no print support for this conduit." ! msgstr "このコンジットでは印刷はサポートされていません." + #. Button #: jpilot.c:529 msgid "Hide this window" msgstr "このウインドウを隠す" *************** *** 436,446 **** #: jpilot.c:690 msgid "/File/Preferences" ! msgstr "/ファイル/プリファレンス" ! ## kei added manually #: jpilot.c:691 - #, fuzzy msgid "/File/Print" msgstr "/ファイル/印刷" --- 465,474 ---- #: jpilot.c:690 msgid "/File/Preferences" ! msgstr "/ファイル/設定" ! # # kei added manually #: jpilot.c:691 msgid "/File/Print" msgstr "/ファイル/印刷" *************** *** 454,460 **** #: jpilot.c:695 msgid "/View/Datebook" ! msgstr "/表示/Datebook" #: jpilot.c:696 msgid "/View/Addresses" --- 482,488 ---- #: jpilot.c:695 msgid "/View/Datebook" ! msgstr "/表示/予定表" #: jpilot.c:696 msgid "/View/Addresses" *************** *** 490,528 **** msgid "/_Help/%s" msgstr "/ヘルプ/%s" #: jpilot.c:1154 msgid "Quit!" msgstr "終了" #: jpilot.c:1169 msgid "Sync your palm to the desktop" ! msgstr "" #: jpilot.c:1173 msgid "Backup" ! msgstr "" #: jpilot.c:1182 msgid "" "Sync your palm to the desktop\n" "and then do a backup" ! msgstr "" #: jpilot.c:1234 msgid "Datebook/Go to Today" ! msgstr "" #: jpilot.c:1236 msgid "Address Book" ! msgstr "" #: jpilot.c:1238 msgid "ToDo List" ! msgstr "" #: jpilot.c:1240 msgid "Memo Pad" ! msgstr "" #: log.c:69 msgid "Cannot open log file, giving up.\n" --- 518,563 ---- msgid "/_Help/%s" msgstr "/ヘルプ/%s" + #. Create "Quit" button #: jpilot.c:1154 msgid "Quit!" msgstr "終了" + #. Create "Sync" button + #: jpilot.c:1161 + msgid "Sync" + msgstr "同期" + #: jpilot.c:1169 msgid "Sync your palm to the desktop" ! msgstr "Palmとデスクトップのデータを同期します" + #. Create "Backup" button in left column #: jpilot.c:1173 msgid "Backup" ! msgstr "バックアップ" #: jpilot.c:1182 msgid "" "Sync your palm to the desktop\n" "and then do a backup" ! msgstr "Palmとデスクトップのデータを同期し、バックアップを行います" #: jpilot.c:1234 msgid "Datebook/Go to Today" ! msgstr "予定表" #: jpilot.c:1236 msgid "Address Book" ! msgstr "アドレス帳" #: jpilot.c:1238 msgid "ToDo List" ! msgstr "ToDo" #: jpilot.c:1240 msgid "Memo Pad" ! msgstr "メモ帳" #: log.c:69 msgid "Cannot open log file, giving up.\n" *************** *** 545,582 **** msgstr "" #: prefs_gui.c:204 - #, fuzzy msgid "Preferences" ! msgstr "/ファイル/プリファレンス" #: prefs_gui.c:221 msgid "Short date format " msgstr "短い日付形式" #: prefs_gui.c:234 msgid "Long date format " msgstr "長い日付形式" #: prefs_gui.c:248 msgid "Time format " msgstr "時刻形式" #: prefs_gui.c:262 msgid "The first day of the week is " msgstr "一週間の始まり" #: prefs_gui.c:276 msgid "My GTK colors file is " msgstr "GTK カラーファイルの設定" #: prefs_gui.c:290 msgid "Serial Port " msgstr "シリアルポートの選択" #: prefs_gui.c:305 msgid "Serial Rate " msgstr "シリアル速度の選択" #: prefs_gui.c:318 msgid "Number of backups to be archived" msgstr "保存するバックアップの個数" --- 580,624 ---- msgstr "" #: prefs_gui.c:204 msgid "Preferences" ! msgstr "設定" + #. Shortdate #: prefs_gui.c:221 msgid "Short date format " msgstr "短い日付形式" + #. Longdate #: prefs_gui.c:234 msgid "Long date format " msgstr "長い日付形式" + #. Time #: prefs_gui.c:248 msgid "Time format " msgstr "時刻形式" + #. FDOW #: prefs_gui.c:262 msgid "The first day of the week is " msgstr "一週間の始まり" + #. GTK colors file #: prefs_gui.c:276 msgid "My GTK colors file is " msgstr "GTK カラーファイルの設定" + #. Port #: prefs_gui.c:290 msgid "Serial Port " msgstr "シリアルポートの選択" + #. Rate #: prefs_gui.c:305 msgid "Serial Rate " msgstr "シリアル速度の選択" + #. Number of backups #: prefs_gui.c:318 msgid "Number of backups to be archived" msgstr "保存するバックアップの個数" *************** *** 593,640 **** msgid "Highlight calendar days with appointments" msgstr "約束のある日をハイライトする" - ## kei added manually - msgid "Use DateBk3 note tags" - msgstr "DateBk3 のノートタグを使う" - #: prefs_gui.c:374 msgid "Use DateBk3 note tags" ! msgstr "" #: print_gui.c:135 msgid "Print Options" ! msgstr "" #: print_gui.c:149 msgid "One record" ! msgstr "" #: print_gui.c:153 msgid "All records in this category" ! msgstr "" #: print_gui.c:157 msgid "Print all records" ! msgstr "" #: print_gui.c:177 msgid "One record per page" ! msgstr "" #: print_gui.c:191 msgid " Blank lines between each record" ! msgstr "" #: print_gui.c:200 msgid "Print Command (e.g. lpr, or cat > file.ps)" ! msgstr "" #: search_gui.c:512 msgid "No records found" ! msgstr "" #: search_gui.c:583 - #, fuzzy msgid "Search" msgstr "検索文字列: " --- 635,678 ---- msgid "Highlight calendar days with appointments" msgstr "約束のある日をハイライトする" #: prefs_gui.c:374 msgid "Use DateBk3 note tags" ! msgstr "DateBk3 のノートタグを使う" #: print_gui.c:135 msgid "Print Options" ! msgstr "印刷オプション" #: print_gui.c:149 msgid "One record" ! msgstr "現在のレコード" #: print_gui.c:153 msgid "All records in this category" ! msgstr "現在のカテゴリの全てのレコード" #: print_gui.c:157 msgid "Print all records" ! msgstr "全てのレコード" #: print_gui.c:177 msgid "One record per page" ! msgstr "1ページにつき1レコードにする" #: print_gui.c:191 msgid " Blank lines between each record" ! msgstr "レコード間の行数" + #. Print Command #: print_gui.c:200 msgid "Print Command (e.g. lpr, or cat > file.ps)" ! msgstr "印刷コマンド (例: lpr, or cat > file.ps)" #: search_gui.c:512 msgid "No records found" ! msgstr "レコードが見付かりません." #: search_gui.c:583 msgid "Search" msgstr "検索文字列: " *************** *** 648,666 **** #: sync.c:362 msgid " Press the HotSync button now\n" ! msgstr "" #: sync.c:381 msgid "Check your serial port and settings\n" msgstr "" #: sync.c:487 msgid "Doing a fast sync.\n" ! msgstr "" #: sync.c:494 msgid "Doing a slow sync.\n" ! msgstr "" #: sync.c:542 msgid "Thank you for using J-Pilot." --- 686,755 ---- #: sync.c:362 msgid " Press the HotSync button now\n" ! msgstr "HotSyncボタンを押して下さい\n" #: sync.c:381 msgid "Check your serial port and settings\n" + msgstr "シリアルポートと設定を見直して下さい\n" + + #. These are carefully worded so as not to be read by + #. * the parent program and interpreted + #: sync.c:414 sync.c:427 sync.c:438 + #, c-format + msgid "Last Username-->\"%s\"\n" + msgstr "" + + #: sync.c:415 sync.c:428 sync.c:439 + #, c-format + msgid "Last UserID-->\"%d\"\n" + msgstr "" + + #: sync.c:416 sync.c:429 sync.c:440 + #, c-format + msgid "Username-->\"%s\"\n" + msgstr "" + + #: sync.c:417 sync.c:430 sync.c:441 + #, c-format + msgid "User ID-->%d\n" msgstr "" + #. User name and User ID is read by the parent process and stored + #. * in the preferences + #. * So, this is more than just displaying it to the user + #: sync.c:450 + #, c-format + msgid "Username is \"%s\"\n" + msgstr "ユーザー名は \"%s\"\n" + + #: sync.c:451 + #, c-format + msgid "User ID is %d\n" + msgstr "ユーザーIDは %d\n" + + #. writef(pipe_out, "passwordlen = [%d]\n", U.passwordLength); + #. writef(pipe_out, "password = [%s]\n", U.password); + #: sync.c:460 + #, c-format + msgid "lastSyncPC = %d\n" + msgstr "最後に同期したPC = %d\n" + + #: sync.c:461 + #, c-format + msgid "This PC = %d\n" + msgstr "このPC = %d\n" + + #: sync.c:464 + msgid "Sync canceled\n" + msgstr "同期はキャンセルされました\n" + #: sync.c:487 msgid "Doing a fast sync.\n" ! msgstr "高速同期を行います.\n" #: sync.c:494 msgid "Doing a slow sync.\n" ! msgstr "低速同期を行います.\n" #: sync.c:542 msgid "Thank you for using J-Pilot." *************** *** 668,713 **** #: sync.c:570 msgid "Finished.\n" ! msgstr "" ! #: sync.c:842 #, c-format ! msgid "Skipping %s\n" ! msgstr "" ! #: sync.c:917 #, c-format msgid "%s is up to date, fetch skipped.\n" ! msgstr "" ! #: sync.c:921 #, c-format msgid "Fetching '%s'... " ! msgstr "" ! #: sync.c:938 sync.c:1016 msgid "OK\n" msgstr "" ! #: sync.c:973 #, c-format ! msgid "Installing %s... " msgstr "" ! #: sync.c:1003 #, c-format msgid "Install %s failed" ! msgstr "" ! #: sync.c:1012 #, c-format msgid "Installed %s" ! msgstr "" #: todo_gui.c:844 msgid "Hide Completed ToDos" msgstr "完了したToDoを表示しない" #: todo_gui.c:909 msgid "Completed" msgstr "完了" --- 757,837 ---- #: sync.c:570 msgid "Finished.\n" ! msgstr "終了しました.\n" ! #: sync.c:599 sync.c:1877 #, c-format ! msgid "Syncing %s\n" ! msgstr "同期中 %s\n" ! #: sync.c:815 sync.c:1005 #, c-format msgid "%s is up to date, fetch skipped.\n" ! msgstr "%s は同期する必要がありません.スキップします.\n" ! #: sync.c:819 sync.c:1009 #, c-format msgid "Fetching '%s'... " ! msgstr "取得中 '%s'... " ! #: sync.c:834 sync.c:1028 sync.c:1106 msgid "OK\n" msgstr "" ! #: sync.c:866 ! msgid "DatebookDB" ! msgstr "予定表" ! ! #: sync.c:867 ! msgid "AddressDB" ! msgstr "アドレス" ! ! #: sync.c:868 ! msgid "ToDoDB" ! msgstr "ToDo" ! ! #: sync.c:869 ! msgid "MemoDB" ! msgstr "メモ帳" ! ! #: sync.c:870 ! msgid "Saved Preferences" ! msgstr "本体設定" ! ! #: sync.c:930 #, c-format ! msgid "Skipping %s\n" msgstr "" ! #: sync.c:1063 ! #, c-format ! msgid "Installing %s... " ! msgstr "インストール中 %s... " ! ! #: sync.c:1093 #, c-format msgid "Install %s failed" ! msgstr "%s のインストールに失敗しました" ! #: sync.c:1102 #, c-format msgid "Installed %s" ! msgstr "インストール成功 %s" ! ! #: sync.c: ! msgid "ExpenseDB" ! msgstr "支払メモ" + #: sync.c: + msgid "MailDB" + msgstr "メール" + + #. The hide completed check box #: todo_gui.c:844 msgid "Hide Completed ToDos" msgstr "完了したToDoを表示しない" + #. The completed check box #: todo_gui.c:909 msgid "Completed" msgstr "完了" *************** *** 716,721 **** --- 840,847 ---- msgid "Priority: " msgstr "優先度" + #. Due date stuff + #. The No due date check box #: todo_gui.c:947 msgid "No Due Date" msgstr "締め切りなし" *************** *** 740,745 **** --- 866,879 ---- #, c-format msgid "I generated a new PC ID. It is %d\n" msgstr "" + + # address_gui.c: + msgid "災歡:" + msgstr "コメント:" + + # address_gui.c: + msgid "災歡" + msgstr "コメント" #~ msgid "4th" #~ msgstr "第4" diff -C 3 -r jpilot-0.98.1/prefs.c jpilot-0.98.1-more_jp/prefs.c *** jpilot-0.98.1/prefs.c Sat Feb 5 12:13:21 2000 --- jpilot-0.98.1-more_jp/prefs.c Fri Jun 30 15:38:54 2000 *************** *** 267,274 **** }; static const char *days[] = { ! "Sunday", ! "Monday" }; static const char *rates[] = { --- 267,274 ---- }; static const char *days[] = { ! gettext_noop("Sunday"), ! gettext_noop("Monday") }; static const char *rates[] = { *************** *** 320,326 **** pref_str[0]='\0'; return -1; } ! strcpy(pref_str, days[n]); break; case PREF_RATE: --- 320,326 ---- pref_str[0]='\0'; return -1; } ! strcpy(pref_str, gettext(days[n])); break; case PREF_RATE: diff -C 3 -r jpilot-0.98.1/sync.c jpilot-0.98.1-more_jp/sync.c *** jpilot-0.98.1/sync.c Thu Feb 24 11:20:33 2000 --- jpilot-0.98.1-more_jp/sync.c Fri Jun 30 15:38:54 2000 *************** *** 411,420 **** * the last time */ if (U.userID == 0) { ! writef(pipe_out, "Last Username-->\"%s\"\n", sync_info->username); ! writef(pipe_out, "Last UserID-->\"%d\"\n", sync_info->userID); ! writef(pipe_out, "Username-->\"%s\"\n", U.username); ! writef(pipe_out, "User ID-->%d\n", U.userID); dlp_EndOfSync(sd, 0); pi_close(sd); return SYNC_ERROR_NULL_USERID; --- 411,420 ---- * the last time */ if (U.userID == 0) { ! writef(pipe_out, _("Last Username-->\"%s\"\n"), sync_info->username); ! writef(pipe_out, _("Last UserID-->\"%d\"\n"), sync_info->userID); ! writef(pipe_out, _("Username-->\"%s\"\n"), U.username); ! writef(pipe_out, _("User ID-->%d\n"), U.userID); dlp_EndOfSync(sd, 0); pi_close(sd); return SYNC_ERROR_NULL_USERID; *************** *** 424,433 **** (!(sync_info->flags & SYNC_OVERRIDE_USER))) { /* These are carefully worded so as not to be read by * the parent program and interpreted */ ! writef(pipe_out, "Last Username-->\"%s\"\n", sync_info->username); ! writef(pipe_out, "Last UserID-->\"%d\"\n", sync_info->userID); ! writef(pipe_out, "Username-->\"%s\"\n", U.username); ! writef(pipe_out, "User ID-->%d\n", U.userID); dlp_EndOfSync(sd, 0); pi_close(sd); return SYNC_ERROR_NOT_SAME_USERID; --- 424,433 ---- (!(sync_info->flags & SYNC_OVERRIDE_USER))) { /* These are carefully worded so as not to be read by * the parent program and interpreted */ ! writef(pipe_out, _("Last Username-->\"%s\"\n"), sync_info->username); ! writef(pipe_out, _("Last UserID-->\"%d\"\n"), sync_info->userID); ! writef(pipe_out, _("Username-->\"%s\"\n"), U.username); ! writef(pipe_out, _("User ID-->%d\n"), U.userID); dlp_EndOfSync(sd, 0); pi_close(sd); return SYNC_ERROR_NOT_SAME_USERID; *************** *** 435,444 **** if ((strcmp(sync_info->username, U.username)) && (sync_info->username[0]!='\0') && (!(sync_info->flags & SYNC_OVERRIDE_USER))) { ! writef(pipe_out, "Last Username-->\"%s\"\n", sync_info->username); ! writef(pipe_out, "Last UserID-->\"%d\"\n", sync_info->userID); ! writef(pipe_out, "Username-->\"%s\"\n", U.username); ! writef(pipe_out, "User ID-->%d\n", U.userID); dlp_EndOfSync(sd, 0); pi_close(sd); return SYNC_ERROR_NOT_SAME_USER; --- 435,444 ---- if ((strcmp(sync_info->username, U.username)) && (sync_info->username[0]!='\0') && (!(sync_info->flags & SYNC_OVERRIDE_USER))) { ! writef(pipe_out, _("Last Username-->\"%s\"\n"), sync_info->username); ! writef(pipe_out, _("Last UserID-->\"%d\"\n"), sync_info->userID); ! writef(pipe_out, _("Username-->\"%s\"\n"), U.username); ! writef(pipe_out, _("User ID-->%d\n"), U.userID); dlp_EndOfSync(sd, 0); pi_close(sd); return SYNC_ERROR_NOT_SAME_USER; *************** *** 449,467 **** * So, this is more than just displaying it to the user */ writef(pipe_out, "Username is \"%s\"\n", U.username); writef(pipe_out, "User ID is %d\n", U.userID); ! jpilot_logf(LOG_DEBUG, "Last Username = [%s]\n", sync_info->username); ! jpilot_logf(LOG_DEBUG, "Last UserID = %d\n", sync_info->userID); ! jpilot_logf(LOG_DEBUG, "Username = [%s]\n", U.username); ! jpilot_logf(LOG_DEBUG, "userID = %d\n", U.userID); ! jpilot_logf(LOG_DEBUG, "lastSyncPC = %d\n", U.lastSyncPC); /*writef(pipe_out, "passwordlen = [%d]\n", U.passwordLength); */ /*writef(pipe_out, "password = [%s]\n", U.password); */ ! writef(pipe_out, "lastSyncPC = %d\n", U.lastSyncPC); ! writef(pipe_out, "This PC = %d\n", sync_info->PC_ID); if (dlp_OpenConduit(sd)<0) { ! writef(pipe_out, "Sync canceled\n"); #ifdef ENABLE_PLUGINS free_plugin_list(&plugin_list); #endif --- 449,467 ---- * So, this is more than just displaying it to the user */ writef(pipe_out, "Username is \"%s\"\n", U.username); writef(pipe_out, "User ID is %d\n", U.userID); ! jpilot_logf(LOG_DEBUG, _("Last Username = [%s]\n"), sync_info->username); ! jpilot_logf(LOG_DEBUG, _("Last UserID = %d\n"), sync_info->userID); ! jpilot_logf(LOG_DEBUG, _("Username = [%s]\n"), U.username); ! jpilot_logf(LOG_DEBUG, _("userID = %d\n"), U.userID); ! jpilot_logf(LOG_DEBUG, _("lastSyncPC = %d\n"), U.lastSyncPC); /*writef(pipe_out, "passwordlen = [%d]\n", U.passwordLength); */ /*writef(pipe_out, "password = [%s]\n", U.password); */ ! writef(pipe_out, _("lastSyncPC = %d\n"), U.lastSyncPC); ! writef(pipe_out, _("This PC = %d\n"), sync_info->PC_ID); if (dlp_OpenConduit(sd)<0) { ! writef(pipe_out, _("Sync canceled\n")); #ifdef ENABLE_PLUGINS free_plugin_list(&plugin_list); #endif *************** *** 596,602 **** if ((DB_name==NULL) || (strlen(DB_name) > 250)) { return -1; } ! g_snprintf(log_entry, 255, "Syncing %s\n", DB_name); log_entry[255]='\0'; writef(pipe_out, log_entry); g_snprintf(pc_filename, 255, "%s.pc", DB_name); --- 596,602 ---- if ((DB_name==NULL) || (strlen(DB_name) > 250)) { return -1; } ! g_snprintf(log_entry, 255, _("Syncing %s\n"), gettext(DB_name)); log_entry[255]='\0'; writef(pipe_out, log_entry); g_snprintf(pc_filename, 255, "%s.pc", DB_name); *************** *** 816,822 **** continue; } ! writef(pipe_out, _("Fetching '%s'... "), info.name); info.flags &= 0xff; --- 816,822 ---- continue; } ! writef(pipe_out, _("Fetching '%s'... "), gettext(info.name)); info.flags &= 0xff; *************** *** 863,873 **** struct DBInfo info; char db_copy_name[MAX_DBNAME]; char *palm_dbname[]={ ! "DatebookDB", ! "AddressDB", ! "ToDoDB", ! "MemoDB", ! "Saved Preferences", NULL }; char *extra_dbname[]={ --- 863,873 ---- struct DBInfo info; char db_copy_name[MAX_DBNAME]; char *palm_dbname[]={ ! gettext_noop("DatebookDB"), ! gettext_noop("AddressDB"), ! gettext_noop("ToDoDB"), ! gettext_noop("MemoDB"), ! gettext_noop("Saved Preferences"), NULL }; char *extra_dbname[]={ *************** *** 1006,1012 **** continue; } ! writef(pipe_out, _("Fetching '%s'... "), info.name); info.flags &= 0xff; --- 1006,1012 ---- continue; } ! writef(pipe_out, _("Fetching '%s'... "), gettext(info.name)); info.flags &= 0xff; *************** *** 1874,1880 **** if ((DB_name==NULL) || (strlen(DB_name) > 250)) { return -1; } ! g_snprintf(log_entry, 255, "Syncing %s\n", DB_name); log_entry[255]='\0'; writef(pipe_out, log_entry); --- 1874,1880 ---- if ((DB_name==NULL) || (strlen(DB_name) > 250)) { return -1; } ! g_snprintf(log_entry, 255, _("Syncing %s\n"), gettext(DB_name)); log_entry[255]='\0'; writef(pipe_out, log_entry);