• R/O
  • SSH
  • HTTPS

tmaid: Commit


Commit MetaInfo

Revisão212 (tree)
Hora2013-06-25 01:30:22
Autoriwm

Mensagem de Log

CRLF negotiation

Mudança Sumário

Diff

--- tmaid/trunk/src/general.c (revision 211)
+++ tmaid/trunk/src/general.c (revision 212)
@@ -1,6 +1,6 @@
11 /*
22 Text maid
3- copyright (c) 1998-2011 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
3+ copyright (c) 1998-2013 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -530,7 +530,7 @@
530530 q->next = p->next;
531531 p->next = q;
532532 if (q->next)
533- q->next->prev=q;
533+ q->next->prev = q;
534534 g_memmove (q->text, p->text + data_pos,
535535 q->length * sizeof (gchar));
536536 p->length = data_pos;
--- tmaid/trunk/src/keyfile.c (revision 211)
+++ tmaid/trunk/src/keyfile.c (revision 212)
@@ -1,6 +1,6 @@
11 /*
22 Text maid
3- copyright (c) 1998-2011 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
3+ copyright (c) 1998-2013 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -179,6 +179,8 @@
179179 ftype[i].tab = g_key_file_get_integer (key_file, group, "tab", NULL);
180180 ftype[i].writemode = g_key_file_get_integer (key_file,
181181 group, "writemode", NULL);
182+ ftype[i].negotiate = g_key_file_get_boolean (key_file,
183+ group, "negotiate", NULL);
182184 ftype[i].associate = g_key_file_get_boolean (key_file,
183185 group, "associate", NULL);
184186 ftype[i].autoindent = g_key_file_get_boolean (key_file,
@@ -211,6 +213,15 @@
211213 group, "uline", NULL);
212214 ftype[i].vline = g_key_file_get_boolean (key_file,
213215 group, "vline", NULL);
216+ if (ftype[i].crlf > 2)
217+ {
218+#ifdef G_OS_WIN32
219+ ftype[i].crlf = 0;
220+#else /* not G_OS_WIN32 */
221+ ftype[i].crlf = 2;
222+#endif /* not G_OS_WIN32 */
223+ ftype[i].negotiate = TRUE;
224+ }
214225 /* ja:キャラクターセット */
215226 ftype[i].charset = g_key_file_get_string (key_file,
216227 group, "charset", NULL);
@@ -282,9 +293,14 @@
282293 ftype = g_malloc0 (ftnum * sizeof (FileType));
283294 ftype[0].text = g_strdup (_("All Files"));
284295 ftype[0].ext = g_strdup ("*");
285- ftype[0].crlf = 3;
296+#ifdef G_OS_WIN32
297+ ftype[0].crlf = 0;
298+#else /* not G_OS_WIN32 */
299+ ftype[0].crlf = 2;
300+#endif /* not G_OS_WIN32 */
286301 ftype[0].margin = 80;
287302 ftype[0].tab = 8;
303+ ftype[0].negotiate = TRUE;
288304 ftype[0].associate = TRUE;
289305 ftype[0].syscol = TRUE;
290306 /* ja:キャラクターセット */
@@ -434,6 +450,8 @@
434450 g_key_file_set_integer (key_file, group, "tab", ftype[i].tab);
435451 g_key_file_set_integer (key_file, group, "writemode",
436452 ftype[i].writemode);
453+ g_key_file_set_boolean (key_file, group, "negotiate",
454+ ftype[i].negotiate);
437455 g_key_file_set_boolean (key_file, group, "associate",
438456 ftype[i].associate);
439457 g_key_file_set_boolean (key_file, group, "autoindent",
--- tmaid/trunk/src/tmaid.h (revision 211)
+++ tmaid/trunk/src/tmaid.h (revision 212)
@@ -1,6 +1,6 @@
11 /*
22 Text maid
3- copyright (c) 1998-2012 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
3+ copyright (c) 1998-2013 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -26,16 +26,17 @@
2626
2727
2828 #define TMAID_VERSION_NOTICE "Text maid "VERSION" ("BUILD_ENVIRONMENT")"
29-#define TMAID_COPYRIGHT_NOTICE "Copyright (C) 1998-2012 Kazuki Iwamoto"
29+#define TMAID_COPYRIGHT_NOTICE "Copyright (C) 1998-2013 Kazuki Iwamoto"
3030
3131
3232 typedef struct _FileType
3333 {
3434 gint ft_id; /* ja:ファイルタイプのID(-1:無所属) */
35- gint crlf; /* ja:0:CR+LF,1:CR,2:LF,3:自動 */
35+ gint crlf; /* ja:0:CR+LF,1:CR,2:LF */
3636 gint margin; /* ja:右マージンの数 */
3737 gint tab; /* ja:タブの数 */
3838 gint writemode; /* ja:0:Abort,1:'?',2:HTML,3:Escape */
39+ gboolean negotiate; /* ja:TRUE:CRLF自動判別 */
3940 gboolean autoindent; /* ja:TRUE:自動字下げ */
4041 gboolean associate; /* ja:TRUE:関連づける */
4142 gboolean code; /* ja:TRUE:タブのコードを表示する */
--- tmaid/trunk/src/file.c (revision 211)
+++ tmaid/trunk/src/file.c (revision 212)
@@ -1,6 +1,6 @@
11 /*
22 Text maid
3- copyright (c) 1998-2012 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
3+ copyright (c) 1998-2013 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -174,19 +174,20 @@
174174 }
175175 g_strfreev (charset);
176176 /* ja:改行コード判定 */
177- if (tmaid->ft.crlf >= 3)
177+ if (tmaid->ft.negotiate)
178178 {
179179 gint crlf[3];
180180
181- crlf[0] = crlf[1] = crlf[2] = 0;
181+ for (i = 0; i < 3; i++)
182+ crlf[i] = 0;
182183 i = 0;
183184 while (abort_break && i < length)
184185 if (i <= length - 2 && outbuf[i] == '\r' && outbuf[i + 1] == '\n')
185186 {
187+ crlf[0]++;
186188 i += 2;
187- crlf[0]++;
188189 }
189- else
190+ else
190191 {
191192 if (outbuf[i] == '\r')
192193 crlf[1]++;
@@ -194,6 +195,9 @@
194195 crlf[2]++;
195196 i++;
196197 }
198+ for (i = 0; i < 3; i++)
199+ crlf[i] *= 2;
200+ crlf[tmaid->ft.crlf]++;
197201 #ifdef G_OS_WIN32
198202 if (crlf[0] >= crlf[1] && crlf[0] >= crlf[2])
199203 tmaid->ft.crlf = 0;
@@ -234,8 +238,7 @@
234238 break;
235239 }
236240 p->length = j - i;
237- p->text = g_malloc (p->length * sizeof (gchar));
238- g_memmove (p->text, outbuf + i, p->length);
241+ p->text = g_memdup (outbuf + i, p->length * sizeof (gchar));
239242 if (j < length)
240243 {
241244 LineBuffer *q;
--- tmaid/trunk/src/prop.c (revision 211)
+++ tmaid/trunk/src/prop.c (revision 212)
@@ -1,6 +1,6 @@
11 /*
22 Text maid
3- copyright (c) 1998-2011 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
3+ copyright (c) 1998-2013 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -46,6 +46,7 @@
4646 ft_dst->margin = ft_src->margin;
4747 ft_dst->tab = ft_src->tab;
4848 ft_dst->writemode = ft_src->writemode;
49+ ft_dst->negotiate = ft_src->negotiate;
4950 ft_dst->autoindent = ft_src->autoindent;
5051 ft_dst->code = ft_src->code;
5152 ft_dst->eof = ft_src->eof;
@@ -172,9 +173,6 @@
172173 GtkWidget *check_eof; /* ja:TRUE:1Ahをファイルの末尾に書き加える */
173174 GtkWidget *check_overwrite; /* ja:TRUE:ファイルを上書きするときに確認する */
174175 GtkWidget *check_syscol; /* ja:TRUE:システム色を使う */
175- GtkWidget *check_html; /* ja:TRUE:HTML数値文字参照を変換する */
176- GtkWidget *check_esc; /* ja:TRUE:エスケープシーケンスを変換する */
177- GtkWidget *check_associate; /* ja:TRUE:関連づける */
178176 GtkWidget *combo;
179177 GtkWidget *entry_text;
180178 GtkWidget *entry_ext;
@@ -324,9 +322,9 @@
324322 }
325323
326324
327-/* ja:文字符号化方式の設定ボタンが押された */
325+/* ja:文字符号化方式の登録ボタンが押された */
328326 static void
329-property_dialog_clicked_charlist (GtkWidget *widget,
327+property_dialog_clicked_register (GtkWidget *widget,
330328 PropertyDialog *propdlg)
331329 {
332330 gint i;
@@ -527,15 +525,23 @@
527525 #if ! GTK_CHECK_VERSION(2,4,0)
528526 GList *glist;
529527 #endif /* not GTK_CHECK_VERSION(2,4,0) */
530- GtkStockItem stock_item;
531528 GtkCellRenderer *renderer;
532529 GtkListStore *store;
533- GtkTreeIter iter;
534530 GtkTreeSelection *select;
535531 GtkTreeViewColumn *column;
536- GtkWidget *button_associated, *button_auto, *scroll, *label;
532+ GtkWidget *check_html; /* ja:TRUE:HTML数値文字参照を変換する */
533+ GtkWidget *check_esc; /* ja:TRUE:エスケープシーケンスを変換する */
534+ GtkWidget *check_negotiate; /* ja:TRUE:CRLF自動判別 */
535+ GtkWidget *check_associate; /* ja:TRUE:関連づける */
536+ GtkWidget *button_associated, *button_register, *scroll, *label;
537537 GtkWidget *hbox, *tbox, *vbox;
538- GtkWidget *frame0, *frame1, *frame2, *frame3, *frame4, *frame5, *frame6;
538+ GtkWidget *frame_display;
539+ GtkWidget *frame_right;
540+ GtkWidget *frame_tab;
541+ GtkWidget *frame_edit;
542+ GtkWidget *frame_save;
543+ GtkWidget *frame_color;
544+ GtkWidget *frame_character;
539545 #if ! GTK_CHECK_VERSION(2,4,0)
540546 GtkWidget *button_font;
541547 #endif /* not GTK_CHECK_VERSION(2,4,0) */
@@ -550,6 +556,8 @@
550556 /* ja:メインウインドウ */
551557 if (!ft->text || !ft->ext)
552558 {
559+ GtkStockItem stock_item;
560+
553561 gtk_stock_lookup (GTK_STOCK_PROPERTIES, &stock_item);
554562 title = misc_mnemonic_to_text (stock_item.label);
555563 }
@@ -590,25 +598,19 @@
590598 #endif /* not GTK_CHECK_VERSION(2,4,0) */
591599 if (ft->text && ft->ext)
592600 {
593- button_auto = gtk_button_new_with_label (_("Auto Negotiation"));
594- g_signal_connect (G_OBJECT (button_auto), "clicked",
595- G_CALLBACK (property_dialog_clicked_charlist), &propdlg);
601+ button_register = gtk_button_new_with_label (_("Register"));
602+ g_signal_connect (G_OBJECT (button_register), "clicked",
603+ G_CALLBACK (property_dialog_clicked_register), &propdlg);
604+ button_associated = NULL;
596605 }
597606 else
598607 {
599- button_auto = NULL;
600- }
601- if (!ft->text && !ft->ext)
602- {
603608 button_associated
604609 = gtk_button_new_with_mnemonic (_("_Associated File Type"));
605610 g_signal_connect (G_OBJECT (button_associated), "clicked",
606611 G_CALLBACK (property_dialog_clicked_ftype), &propdlg);
612+ button_register = NULL;
607613 }
608- else
609- {
610- button_associated = NULL;
611- }
612614 /* ja:チェックボタン */
613615 propdlg.check_gline = gtk_check_button_new_with_label (_("Grid"));
614616 propdlg.check_space = gtk_check_button_new_with_label
@@ -683,28 +685,33 @@
683685 G_CALLBACK (property_dialog_toggled_check), &propdlg);
684686 if (ft->text && ft->ext)
685687 {
686- propdlg.check_html = gtk_check_button_new_with_label
688+ check_html = gtk_check_button_new_with_label
687689 (_("HTML Numeric character reference"));
688- propdlg.check_esc = gtk_check_button_new_with_label
689- (_("Escape sequence"));
690- propdlg.check_associate = gtk_check_button_new_with_mnemonic
690+ check_esc = gtk_check_button_new_with_label (_("Escape sequence"));
691+ check_negotiate = gtk_check_button_new_with_label
692+ (_("Auto Negotiation"));
693+ check_associate = gtk_check_button_new_with_mnemonic
691694 (_("_Associate File Type"));
692695 gtk_toggle_button_set_active
693- (GTK_TOGGLE_BUTTON (propdlg.check_html), ft->html);
696+ (GTK_TOGGLE_BUTTON (check_negotiate), ft->negotiate);
694697 gtk_toggle_button_set_active
695- (GTK_TOGGLE_BUTTON (propdlg.check_esc), ft->esc);
698+ (GTK_TOGGLE_BUTTON (check_html), ft->html);
696699 gtk_toggle_button_set_active
697- (GTK_TOGGLE_BUTTON (propdlg.check_associate), ft->associate);
698- g_signal_connect (G_OBJECT (propdlg.check_html), "toggled",
700+ (GTK_TOGGLE_BUTTON (check_esc), ft->esc);
701+ gtk_toggle_button_set_active
702+ (GTK_TOGGLE_BUTTON (check_associate), ft->associate);
703+ g_signal_connect (G_OBJECT (check_negotiate), "toggled",
699704 G_CALLBACK (property_dialog_ok_sensitive), &propdlg);
700- g_signal_connect (G_OBJECT (propdlg.check_esc), "toggled",
705+ g_signal_connect (G_OBJECT (check_html), "toggled",
701706 G_CALLBACK (property_dialog_ok_sensitive), &propdlg);
702- g_signal_connect (G_OBJECT (propdlg.check_associate), "toggled",
707+ g_signal_connect (G_OBJECT (check_esc), "toggled",
703708 G_CALLBACK (property_dialog_ok_sensitive), &propdlg);
709+ g_signal_connect (G_OBJECT (check_associate), "toggled",
710+ G_CALLBACK (property_dialog_ok_sensitive), &propdlg);
704711 }
705712 else
706713 {
707- propdlg.check_html = propdlg.check_esc = propdlg.check_associate = NULL;
714+ check_negotiate = check_html = check_esc = check_associate = NULL;
708715 }
709716 /* ja:コンボボックス */
710717 #if GTK_CHECK_VERSION(2,4,0)
@@ -713,16 +720,11 @@
713720 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (propdlg.combo), "CR+LF");
714721 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (propdlg.combo), "CR");
715722 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (propdlg.combo), "LF");
716- if (ft->text && ft->ext)
717- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (propdlg.combo),
718- _("Auto"));
719723 # else /* not GTK_CHECK_VERSION(2,24,0) */
720724 propdlg.combo = gtk_combo_box_new_text ();
721725 gtk_combo_box_append_text (GTK_COMBO_BOX (propdlg.combo), "CR+LF");
722726 gtk_combo_box_append_text (GTK_COMBO_BOX (propdlg.combo), "CR");
723727 gtk_combo_box_append_text (GTK_COMBO_BOX (propdlg.combo), "LF");
724- if (ft->text && ft->ext)
725- gtk_combo_box_append_text (GTK_COMBO_BOX (propdlg.combo), _("Auto"));
726728 # endif /* not GTK_CHECK_VERSION(2,24,0) */
727729 gtk_combo_box_set_active (GTK_COMBO_BOX (propdlg.combo), ft->crlf);
728730 g_signal_connect (G_OBJECT (propdlg.combo), "changed",
@@ -731,8 +733,6 @@
731733 glist = g_list_append (NULL, "CR+LF");
732734 glist = g_list_append (glist, "CR");
733735 glist = g_list_append (glist, "LF");
734- if (ft->text && ft->ext)
735- glist = g_list_append (glist, _("Auto"));
736736 propdlg.combo = gtk_combo_new ();
737737 gtk_combo_set_popdown_strings (GTK_COMBO (propdlg.combo), glist);
738738 gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (propdlg.combo)->entry),
@@ -868,6 +868,8 @@
868868 xpm[i] = "XXXXXXXXXXXXXXXXXXXXXXXX";
869869 for (i = 0; i < 12; i++)
870870 {
871+ GtkTreeIter iter;
872+
871873 xpm[1] = g_strdup_printf ("X\tc #%02X%02X%02X",
872874 ft->color[i].red / 256,
873875 ft->color[i].green / 256,
@@ -900,8 +902,8 @@
900902 g_signal_connect (G_OBJECT (propdlg.spin_tab), "changed",
901903 G_CALLBACK (property_dialog_ok_sensitive), &propdlg);
902904 /* ja:フレームとボックス */
903- frame0 = gtk_frame_new ("");
904- label = gtk_frame_get_label_widget (GTK_FRAME (frame0));
905+ frame_display = gtk_frame_new ("");
906+ label = gtk_frame_get_label_widget (GTK_FRAME (frame_display));
905907 gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Display"));
906908 gtk_label_set_mnemonic_widget (GTK_LABEL (label), propdlg.check_gline);
907909 hbox = gtk_hbox_new (FALSE, SPACING);
@@ -909,10 +911,10 @@
909911 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_gline, TRUE, TRUE, 0);
910912 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_space, TRUE, TRUE, 0);
911913 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_nline, TRUE, TRUE, 0);
912- gtk_container_add (GTK_CONTAINER (frame0), hbox);
914+ gtk_container_add (GTK_CONTAINER (frame_display), hbox);
913915
914- frame1 = gtk_frame_new ("");
915- label = gtk_frame_get_label_widget (GTK_FRAME (frame1));
916+ frame_right = gtk_frame_new ("");
917+ label = gtk_frame_get_label_widget (GTK_FRAME (frame_right));
916918 gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Right Margin"));
917919 gtk_label_set_mnemonic_widget (GTK_LABEL (label), propdlg.spin_margin);
918920 hbox = gtk_hbox_new (FALSE, SPACING);
@@ -920,10 +922,10 @@
920922 gtk_box_pack_start (GTK_BOX (hbox), propdlg.spin_margin, TRUE, TRUE, 0);
921923 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_mline, FALSE, FALSE, 0);
922924 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_limit, FALSE, FALSE, 0);
923- gtk_container_add (GTK_CONTAINER (frame1), hbox);
925+ gtk_container_add (GTK_CONTAINER (frame_right), hbox);
924926
925- frame2 = gtk_frame_new ("");
926- label = gtk_frame_get_label_widget (GTK_FRAME (frame2));
927+ frame_tab = gtk_frame_new ("");
928+ label = gtk_frame_get_label_widget (GTK_FRAME (frame_tab));
927929 gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Tab"));
928930 gtk_label_set_mnemonic_widget (GTK_LABEL (label), propdlg.spin_tab);
929931 hbox = gtk_hbox_new (FALSE, SPACING);
@@ -932,10 +934,10 @@
932934 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_code, FALSE, FALSE, 0);
933935 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_uline, FALSE, FALSE, 0);
934936 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_vline, FALSE, FALSE, 0);
935- gtk_container_add (GTK_CONTAINER (frame2), hbox);
937+ gtk_container_add (GTK_CONTAINER (frame_tab), hbox);
936938
937- frame3 = gtk_frame_new ("");
938- label = gtk_frame_get_label_widget (GTK_FRAME (frame3));
939+ frame_edit = gtk_frame_new ("");
940+ label = gtk_frame_get_label_widget (GTK_FRAME (frame_edit));
939941 gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("Ed_it"));
940942 gtk_label_set_mnemonic_widget (GTK_LABEL (label), propdlg.check_autoindent);
941943 hbox = gtk_hbox_new (FALSE, SPACING);
@@ -943,10 +945,10 @@
943945 gtk_box_pack_start (GTK_BOX(hbox),
944946 propdlg.check_autoindent, FALSE, FALSE, 0);
945947 gtk_box_pack_start (GTK_BOX (hbox), propdlg.check_tabconv, FALSE, FALSE, 0);
946- gtk_container_add (GTK_CONTAINER (frame3), hbox);
948+ gtk_container_add (GTK_CONTAINER (frame_edit), hbox);
947949
948- frame4 = gtk_frame_new ("");
949- label = gtk_frame_get_label_widget (GTK_FRAME (frame4));
950+ frame_save = gtk_frame_new ("");
951+ label = gtk_frame_get_label_widget (GTK_FRAME (frame_save));
950952 gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Save"));
951953 gtk_label_set_mnemonic_widget (GTK_LABEL (label), propdlg.check_eof);
952954 tbox = gtk_vbox_new (FALSE, SPACING);
@@ -968,10 +970,10 @@
968970 gtk_box_pack_start (GTK_BOX (vbox), propdlg.radio_lower, FALSE, FALSE, 0);
969971 gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
970972 gtk_box_pack_start (GTK_BOX (tbox), hbox, FALSE, FALSE, 0);
971- gtk_container_add (GTK_CONTAINER (frame4), tbox);
973+ gtk_container_add (GTK_CONTAINER (frame_save), tbox);
972974
973- frame5 = gtk_frame_new ("");
974- label = gtk_frame_get_label_widget (GTK_FRAME (frame5));
975+ frame_color = gtk_frame_new ("");
976+ label = gtk_frame_get_label_widget (GTK_FRAME (frame_color));
975977 gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Color"));
976978 gtk_label_set_mnemonic_widget (GTK_LABEL (label), propdlg.check_syscol);
977979 vbox = gtk_vbox_new (FALSE, SPACING);
@@ -981,10 +983,10 @@
981983 hbox = gtk_hbox_new (FALSE, 0);
982984 gtk_box_pack_end (GTK_BOX (hbox), propdlg.button_color, FALSE, FALSE, 0);
983985 gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
984- gtk_container_add (GTK_CONTAINER (frame5), vbox);
986+ gtk_container_add (GTK_CONTAINER (frame_color), vbox);
985987
986- frame6 = gtk_frame_new ("");
987- label = gtk_frame_get_label_widget (GTK_FRAME (frame6));
988+ frame_character = gtk_frame_new ("");
989+ label = gtk_frame_get_label_widget (GTK_FRAME (frame_character));
988990 gtk_label_set_text_with_mnemonic (GTK_LABEL (label),
989991 _("Character _Encoding"));
990992 #if GTK_CHECK_VERSION(2,4,0)
@@ -996,19 +998,21 @@
996998 vbox = gtk_vbox_new (FALSE, SPACING);
997999 gtk_container_set_border_width (GTK_CONTAINER (vbox), SPACING);
9981000 gtk_box_pack_start (GTK_BOX (vbox), propdlg.combo, FALSE, FALSE, 0);
999- if (button_auto)
1001+ if (check_negotiate)
1002+ gtk_box_pack_start (GTK_BOX (vbox), check_negotiate, FALSE, FALSE, 0);
1003+ if (button_register)
10001004 {
10011005 hbox = gtk_hbox_new (FALSE, 0);
1002- gtk_box_pack_end (GTK_BOX (hbox), button_auto, FALSE, FALSE, 0);
1006+ gtk_box_pack_start (GTK_BOX (hbox), button_register, FALSE, FALSE, 0);
10031007 gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
10041008 }
10051009 if (propdlg.charset)
10061010 gtk_box_pack_start (GTK_BOX (vbox), propdlg.charset, FALSE, FALSE, 0);
1007- if (propdlg.check_html)
1008- gtk_box_pack_start (GTK_BOX (vbox), propdlg.check_html, FALSE, FALSE, 0);
1009- if (propdlg.check_esc)
1010- gtk_box_pack_start (GTK_BOX (vbox), propdlg.check_esc, FALSE, FALSE, 0);
1011- gtk_container_add (GTK_CONTAINER (frame6), vbox);
1011+ if (check_html)
1012+ gtk_box_pack_start (GTK_BOX (vbox), check_html, FALSE, FALSE, 0);
1013+ if (check_esc)
1014+ gtk_box_pack_start (GTK_BOX (vbox), check_esc, FALSE, FALSE, 0);
1015+ gtk_container_add (GTK_CONTAINER (frame_character), vbox);
10121016
10131017 tbox = gtk_hbox_new (FALSE, SPACING);
10141018 if (propdlg.entry_text && propdlg.entry_ext)
@@ -1031,15 +1035,15 @@
10311035
10321036 hbox = gtk_hbox_new (FALSE, SPACING);
10331037 vbox = gtk_vbox_new (FALSE, SPACING);
1034- gtk_box_pack_start (GTK_BOX (vbox), frame0, FALSE, FALSE, 0);
1035- gtk_box_pack_start (GTK_BOX (vbox), frame1, FALSE, FALSE, 0);
1036- gtk_box_pack_start (GTK_BOX (vbox), frame2, FALSE, FALSE, 0);
1037- gtk_box_pack_start (GTK_BOX (vbox), frame3, FALSE, FALSE, 0);
1038- gtk_box_pack_start (GTK_BOX (vbox), frame4, FALSE, FALSE, 0);
1038+ gtk_box_pack_start (GTK_BOX (vbox), frame_display, FALSE, FALSE, 0);
1039+ gtk_box_pack_start (GTK_BOX (vbox), frame_right, FALSE, FALSE, 0);
1040+ gtk_box_pack_start (GTK_BOX (vbox), frame_tab, FALSE, FALSE, 0);
1041+ gtk_box_pack_start (GTK_BOX (vbox), frame_edit, FALSE, FALSE, 0);
1042+ gtk_box_pack_start (GTK_BOX (vbox), frame_save, FALSE, FALSE, 0);
10391043 gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
10401044 vbox = gtk_vbox_new (FALSE, SPACING);
1041- gtk_box_pack_start (GTK_BOX (vbox), frame5, TRUE, TRUE, 0);
1042- gtk_box_pack_start (GTK_BOX (vbox), frame6, FALSE, FALSE, 0);
1045+ gtk_box_pack_start (GTK_BOX (vbox), frame_color, TRUE, TRUE, 0);
1046+ gtk_box_pack_start (GTK_BOX (vbox), frame_character, FALSE, FALSE, 0);
10431047 gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
10441048
10451049 vbox = gtk_dialog_get_content_area (GTK_DIALOG (propdlg.dialog));
@@ -1054,9 +1058,8 @@
10541058 #endif /* not GTK_CHECK_VERSION(2,4,0) */
10551059 if (button_associated)
10561060 gtk_box_pack_start (GTK_BOX (hbox), button_associated, FALSE, FALSE, 0);
1057- if (propdlg.check_associate)
1058- gtk_box_pack_start (GTK_BOX (hbox),
1059- propdlg.check_associate, FALSE, FALSE, 0);
1061+ if (check_associate)
1062+ gtk_box_pack_start (GTK_BOX (hbox), check_associate, FALSE, FALSE, 0);
10601063 gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
10611064
10621065 /* ja:表示 */
@@ -1070,7 +1073,7 @@
10701073
10711074 propdlg.ft_id = ft->ft_id;
10721075 g_memmove (propdlg.gdk_color, ft->color, sizeof (GdkColor) * 12);
1073- propdlg.charset_list = button_auto ? g_strdup (ft->charset) : NULL;
1076+ propdlg.charset_list = button_register ? g_strdup (ft->charset) : NULL;
10741077 #if ! GTK_CHECK_VERSION(2,4,0)
10751078 propdlg.font_name = g_strdup (ft->font_name);
10761079 #endif /* not GTK_CHECK_VERSION(2,4,0) */
@@ -1123,15 +1126,14 @@
11231126 (GTK_TOGGLE_BUTTON (propdlg.check_overwrite));
11241127 ft->syscol = gtk_toggle_button_get_active
11251128 (GTK_TOGGLE_BUTTON (propdlg.check_syscol));
1126- if (propdlg.check_html)
1129+ if (check_html)
11271130 ft->html = gtk_toggle_button_get_active
1128- (GTK_TOGGLE_BUTTON (propdlg.check_html));
1129- if (propdlg.check_esc)
1130- ft->esc = gtk_toggle_button_get_active
1131- (GTK_TOGGLE_BUTTON (propdlg.check_esc));
1132- if (propdlg.check_associate)
1131+ (GTK_TOGGLE_BUTTON (check_html));
1132+ if (check_esc)
1133+ ft->esc = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_esc));
1134+ if (check_associate)
11331135 ft->associate = gtk_toggle_button_get_active
1134- (GTK_TOGGLE_BUTTON (propdlg.check_associate));
1136+ (GTK_TOGGLE_BUTTON (check_associate));
11351137 if (gtk_toggle_button_get_active
11361138 (GTK_TOGGLE_BUTTON (propdlg.radio_question)))
11371139 ft->writemode = 1;
@@ -1170,9 +1172,12 @@
11701172 }
11711173 #endif /* not GTK_CHECK_VERSION(2,4,0) */
11721174 g_free (ft->charset);
1175+ if (check_negotiate)
1176+ ft->negotiate = gtk_toggle_button_get_active
1177+ (GTK_TOGGLE_BUTTON (check_negotiate));
11731178 if (propdlg.charset)
11741179 ft->charset = orz_charset_get_charset (ORZ_CHARSET (propdlg.charset));
1175- if (button_auto)
1180+ if (button_register)
11761181 {
11771182 ft->charset = propdlg.charset_list;
11781183 propdlg.charset_list = NULL;
--- tmaid/trunk/src/edit.c (revision 211)
+++ tmaid/trunk/src/edit.c (revision 212)
@@ -1,6 +1,6 @@
11 /*
22 Text maid
3- copyright (c) 1998-2011 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
3+ copyright (c) 1998-2013 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -651,8 +651,7 @@
651651 {
652652 /* ja:挿入位置以降の文字列をバッファに保存する */
653653 temp_leng = p->length - data_pos;
654- temp = g_malloc (temp_leng * sizeof (gchar));
655- g_memmove (temp, p->text + data_pos, temp_leng * sizeof (gchar));
654+ temp = g_memdup (p->text + data_pos, temp_leng * sizeof (gchar));
656655 p->length = data_pos;
657656 }
658657 else
--- tmaid/trunk/src/ftype.c (revision 211)
+++ tmaid/trunk/src/ftype.c (revision 212)
@@ -1,6 +1,6 @@
11 /*
22 Text maid
3- copyright (c) 1998-2011 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
3+ copyright (c) 1998-2013 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -41,6 +41,7 @@
4141 ft_dst->margin = ft_src->margin;
4242 ft_dst->tab = ft_src->tab;
4343 ft_dst->writemode = ft_src->writemode;
44+ ft_dst->negotiate = ft_src->negotiate;
4445 ft_dst->autoindent = ft_src->autoindent;
4546 ft_dst->code = ft_src->code;
4647 ft_dst->eof = ft_src->eof;
--- tmaid/trunk/ChangeLog (revision 211)
+++ tmaid/trunk/ChangeLog (revision 212)
@@ -2,6 +2,17 @@
22
33 * version 2.7.6
44
5+2013-06-24 Kazuki Iwamoto <iwm@maid.org>
6+
7+ * po/ja.po
8+ * src/edit.c
9+ * src/file.c
10+ * src/ftype.c
11+ * src/general.c
12+ * src/keyfile.c
13+ * src/prop.c
14+ * src/tmaid.h: CRLF negotiation
15+
516 2013-06-02 Kazuki Iwamoto <iwm@maid.org>
617
718 * Makefile.msc.in
--- tmaid/trunk/po/ja.po (revision 211)
+++ tmaid/trunk/po/ja.po (revision 212)
@@ -5,15 +5,17 @@
55 msgid ""
66 msgstr ""
77 "Project-Id-Version: tmaid 2.7.6\n"
8-"Report-Msgid-Bugs-To: http://www.maid.org/\n"
9-"POT-Creation-Date: 2013-05-29 03:59+0900\n"
8+"Report-Msgid-Bugs-To: \n"
9+"POT-Creation-Date: 2013-06-25 01:13+0900\n"
1010 "PO-Revision-Date: 2002-08-11 18:10+0900\n"
1111 "Last-Translator: Kazuki Iwamoto <iwm@maid.org>\n"
1212 "Language-Team: Kazuki Iwamoto <iwm@maid.org>\n"
13+"Language: \n"
1314 "MIME-Version: 1.0\n"
1415 "Content-Type: text/plain; charset=UTF-8\n"
1516 "Content-Transfer-Encoding: 8bit\n"
1617
18+#. ja:中途半端にライセンスが表示されているとき
1719 #: misc/license.c:75
1820 msgid "Scroll is too fast! Do you really view the license?"
1921 msgstr "スクロールが速すぎます! 本当にライセンスを読みましたか?"
@@ -22,6 +24,7 @@
2224 msgid "License"
2325 msgstr "ライセンス"
2426
27+#. ja:ラベル
2528 #: misc/license.c:132
2629 msgid "View the license. Please scroll to view the entire license text."
2730 msgstr ""
@@ -28,6 +31,7 @@
2831 "ライセンスをお読みください。すべてのライセンス文を読むためにスクロールしてく"
2932 "ださい。"
3033
34+#. ja:ラジオボタン
3135 #: misc/license.c:135
3236 msgid "I agree."
3337 msgstr "同意する"
@@ -36,6 +40,7 @@
3640 msgid "I deny."
3741 msgstr "同意しない"
3842
43+#. ja:メインウインドウ
3944 #: orz/orzcharlist.c:326
4045 msgid "Character Encoding"
4146 msgstr "文字符号化方式"
@@ -44,6 +49,7 @@
4449 msgid "Registered Character Encoding"
4550 msgstr "登録されている文字符号化方式"
4651
52+#. ja:チェックボタン
4753 #: orz/orzpref.c:137
4854 msgid "_New File"
4955 msgstr "新規ファイルを開く(_N)"
@@ -52,10 +58,12 @@
5258 msgid "_Open Window"
5359 msgstr "新規ウインドウを開く(_O)"
5460
61+#. ja:ラベル
5562 #: orz/orzpref.c:168
5663 msgid "H_istory"
5764 msgstr "ファイルの履歴(_I)"
5865
66+#. ja:ラベル
5967 #: orz/orzpref.c:169 src/print.c:1021
6068 msgid "_Width"
6169 msgstr "幅(_W)"
@@ -64,6 +72,7 @@
6472 msgid "_Height"
6573 msgstr "高さ(_H)"
6674
75+#. ja:ラジオボタン
6776 #: orz/orzpref.c:175 src/print.c:1023
6877 msgid "_Top"
6978 msgstr "上(_T)"
@@ -80,6 +89,7 @@
8089 msgid "_Bottom"
8190 msgstr "下(_B)"
8291
92+#. ja:フレームとボックス
8393 #: orz/orzpref.c:191 src/tmaid.c:120 src/sigmain.c:335
8494 msgid "Window Size"
8595 msgstr "ウインドウのサイズ"
@@ -160,40 +170,41 @@
160170 msgid "Conversion from character encoding '%s' to 'UTF-8' is not supported"
161171 msgstr "'%s'から'UTF-8'への文字符号化方式の変換に対応していません"
162172
163-#: src/file.c:644
173+#: src/file.c:647
164174 #, c-format
165175 msgid "Conversion from character encoding 'UTF-8' to '%s' is not supported"
166176 msgstr "'UTF-8'から'%s'への文字符号化方式の変換に対応していません"
167177
168-#: src/file.c:680
178+#: src/file.c:683
169179 msgid "Invalid byte sequence in conversion input"
170180 msgstr "変換入力の不正なバイト列"
171181
172-#: src/file.c:715 src/print.c:204
182+#: src/file.c:718 src/print.c:204
173183 msgid "Can not open file"
174184 msgstr "ファイルが開けません"
175185
176-#: src/file.c:741
186+#: src/file.c:744
177187 msgid "Can not write"
178188 msgstr "ファイルに書き込みできません"
179189
180-#: src/ftype.c:426
190+#: src/ftype.c:427
181191 msgid "Associating File Type"
182192 msgstr "ファイルタイプの読み込み"
183193
184-#: src/ftype.c:426
194+#: src/ftype.c:427
185195 msgid "File Type"
186196 msgstr "ファイルタイプ"
187197
188-#: src/ftype.c:450 src/menu.c:47
198+#: src/ftype.c:451 src/menu.c:47
189199 msgid "_Edit"
190200 msgstr "編集(_E)"
191201
192-#: src/ftype.c:466 src/prop.c:495 src/prop.c:799
202+#. ja:ファイルタイプなし
203+#: src/ftype.c:467 src/prop.c:493 src/prop.c:799
193204 msgid "Independent File Type"
194205 msgstr "ファイルタイプなし"
195206
196-#: src/ftype.c:481
207+#: src/ftype.c:482
197208 msgid "Registered File Type"
198209 msgstr "登録されているファイルタイプ"
199210
@@ -216,10 +227,11 @@
216227 "ファイル %s の内容が変更されています\n"
217228 "保存しますか?"
218229
219-#: src/keyfile.c:283
230+#: src/keyfile.c:294
220231 msgid "All Files"
221232 msgstr "すべてのファイル"
222233
234+#. ja:ラベル
223235 #: src/menu.c:30 src/print.c:1059 src/print.c:1068
224236 msgid "_File"
225237 msgstr "ファイル(_F)"
@@ -276,14 +288,17 @@
276288 msgid "_All Replace"
277289 msgstr "すべて置換(_A)"
278290
291+#. ja:チェックボタン
279292 #: src/panel.c:233
280293 msgid "Enable _Case"
281294 msgstr "大文字/小文字を区別する(_C)"
282295
296+#. ja:ラベル
283297 #: src/panel.c:301 src/repinfo.c:106
284298 msgid "Replace String"
285299 msgstr "置換文字列"
286300
301+#. ja:ラジオボタン
287302 #: src/panel.c:303
288303 msgid "_Up"
289304 msgstr "上へ(_U)"
@@ -313,22 +328,27 @@
313328 msgid "%d Lines"
314329 msgstr "%d行"
315330
331+#. ja:ラベル
316332 #: src/print.c:955
317333 msgid "_Columns"
318334 msgstr "桁(_C)"
319335
336+#. ja:ボタン
320337 #: src/print.c:960
321338 msgid "Browse..."
322339 msgstr "参照..."
323340
341+#. ja:チェックボタン
324342 #: src/print.c:965
325343 msgid "Print _Selection"
326344 msgstr "選択範囲を印刷(_S)"
327345
346+#. ja:ラベル
328347 #: src/print.c:1053
329348 msgid "C_opies"
330349 msgstr "部数(_O)"
331350
351+#. ja:ラジオボタン
332352 #: src/print.c:1057
333353 msgid "_Printer"
334354 msgstr "プリンタ(_P)"
@@ -337,6 +357,7 @@
337357 msgid "User Define"
338358 msgstr "ユーザー定義"
339359
360+#. ja:フレームとボックス
340361 #: src/print.c:1105
341362 msgid "Paper"
342363 msgstr "用紙"
@@ -345,142 +366,145 @@
345366 msgid "Margin"
346367 msgstr "マージン"
347368
348-#: src/prop.c:278
369+#: src/prop.c:276
349370 msgid "Color Configuration"
350371 msgstr "色の設定"
351372
352-#: src/prop.c:360
373+#: src/prop.c:358
353374 msgid "Font"
354375 msgstr "フォント"
355376
356-#: src/prop.c:543
377+#: src/prop.c:549
357378 msgid "Foreground"
358379 msgstr "文字"
359380
360-#: src/prop.c:543
381+#: src/prop.c:549
361382 msgid "Background"
362383 msgstr "背景"
363384
364-#: src/prop.c:543
385+#: src/prop.c:549
365386 msgid "Control Code"
366387 msgstr "コントロールコード"
367388
368-#: src/prop.c:544 src/prop.c:615
389+#: src/prop.c:550 src/prop.c:617
369390 msgid "Full Width Space"
370391 msgstr "全角スペース"
371392
372-#: src/prop.c:544 src/prop.c:616
393+#: src/prop.c:550 src/prop.c:618
373394 msgid "Return Code"
374395 msgstr "改行コード"
375396
376-#: src/prop.c:544
397+#: src/prop.c:550
377398 msgid "Tab Under Line"
378399 msgstr "タブ下線"
379400
380-#: src/prop.c:545
401+#: src/prop.c:551
381402 msgid "Right Margin"
382403 msgstr "右マージン"
383404
384-#: src/prop.c:545 src/prop.c:613
405+#. ja:チェックボタン
406+#: src/prop.c:551 src/prop.c:615
385407 msgid "Grid"
386408 msgstr "グリッド"
387409
388-#: src/prop.c:545
410+#: src/prop.c:551
389411 msgid "Selected Foreground"
390412 msgstr "選択された文字"
391413
392-#: src/prop.c:546
414+#: src/prop.c:552
393415 msgid "Selected Background"
394416 msgstr "選択された背景"
395417
396-#: src/prop.c:546
418+#: src/prop.c:552
397419 msgid "Foreground(Print)"
398420 msgstr "文字(印刷)"
399421
400-#: src/prop.c:547
422+#: src/prop.c:553
401423 msgid "Background(Print)"
402424 msgstr "背景(印刷)"
403425
404-#: src/prop.c:561
426+#: src/prop.c:569
405427 msgid "Details of File Type"
406428 msgstr "ファイルタイプの詳細"
407429
408-#: src/prop.c:576
430+#. ja:ボタン
431+#: src/prop.c:584
409432 msgid "Palette"
410433 msgstr "変更"
411434
412-#: src/prop.c:580
435+#: src/prop.c:588
413436 msgid "_Font"
414437 msgstr "フォント(_F)"
415438
416-#: src/prop.c:593
417-msgid "Auto Negotiation"
418-msgstr "自動識別"
439+#: src/prop.c:601
440+msgid "Register"
441+msgstr "登録"
419442
420-#: src/prop.c:604
443+#: src/prop.c:609
421444 msgid "_Associated File Type"
422445 msgstr "ファイルタイプを関連付ける(_A)"
423446
424-#: src/prop.c:618
447+#: src/prop.c:620
425448 msgid "Show Right Margin"
426449 msgstr "右マージン表示"
427450
428-#: src/prop.c:619
451+#: src/prop.c:621
429452 msgid "Turn"
430453 msgstr "折り返す"
431454
432-#: src/prop.c:620
455+#: src/prop.c:622
433456 msgid "Control Mark"
434457 msgstr "コード文字"
435458
436-#: src/prop.c:621
459+#: src/prop.c:623
437460 msgid "Under Line"
438461 msgstr "下線"
439462
440-#: src/prop.c:622
463+#: src/prop.c:624
441464 msgid "Vertical Line"
442465 msgstr "縦線"
443466
444-#: src/prop.c:624
467+#: src/prop.c:626
445468 msgid "Auto Indent"
446469 msgstr "自動字下げ"
447470
448-#: src/prop.c:626
471+#: src/prop.c:628
449472 msgid "Convert Tab to Space"
450473 msgstr "タブをスペースに変換する"
451474
452-#: src/prop.c:627
475+#: src/prop.c:629
453476 msgid "Append ^Z at EOF"
454477 msgstr "ファイルの最後に^Z(1A)を付ける"
455478
456-#: src/prop.c:629
479+#: src/prop.c:631
457480 msgid "Over Write with Agreement"
458481 msgstr "上書き保存を確認する"
459482
460-#: src/prop.c:631
483+#: src/prop.c:633
461484 msgid "Use System Color"
462485 msgstr "システム色を使う"
463486
464-#: src/prop.c:687
487+#: src/prop.c:689
465488 msgid "HTML Numeric character reference"
466489 msgstr "HTML文字数値参照"
467490
468-#: src/prop.c:689 src/prop.c:815
491+#: src/prop.c:690 src/prop.c:815
469492 msgid "Escape sequence"
470493 msgstr "エスケープシーケンス"
471494
472-#: src/prop.c:691
495+#: src/prop.c:692
496+msgid "Auto Negotiation"
497+msgstr "自動識別"
498+
499+#: src/prop.c:694
473500 msgid "_Associate File Type"
474501 msgstr "ファイルタイプを関連付ける(_A)"
475502
476-#: src/prop.c:718 src/prop.c:725 src/prop.c:735
477-msgid "Auto"
478-msgstr "自動"
479-
480503 #: src/prop.c:794
481504 msgid "Unknow File Type"
482505 msgstr "ファイルタイプ不明"
483506
507+#. ja:ラジオボタン
484508 #: src/prop.c:805
485509 msgid "Abort"
486510 msgstr "中断"
@@ -505,39 +529,39 @@
505529 msgid "Lower case"
506530 msgstr "小文字"
507531
508-#: src/prop.c:905
532+#: src/prop.c:907
509533 msgid "_Display"
510534 msgstr "表示(_D)"
511535
512-#: src/prop.c:916
536+#: src/prop.c:918
513537 msgid "_Right Margin"
514538 msgstr "右マージン(_R)"
515539
516-#: src/prop.c:927
540+#: src/prop.c:929
517541 msgid "_Tab"
518542 msgstr "タブ(_T)"
519543
520-#: src/prop.c:939
544+#: src/prop.c:941
521545 msgid "Ed_it"
522546 msgstr "編集(_I)"
523547
524-#: src/prop.c:950
548+#: src/prop.c:952
525549 msgid "_Save"
526550 msgstr "保存(_S)"
527551
528-#: src/prop.c:975
552+#: src/prop.c:977
529553 msgid "_Color"
530554 msgstr "色(_C)"
531555
532-#: src/prop.c:989
556+#: src/prop.c:991
533557 msgid "Character _Encoding"
534558 msgstr "文字符号化方式(_E)"
535559
536-#: src/prop.c:1018
560+#: src/prop.c:1022
537561 msgid "Title"
538562 msgstr "説明文"
539563
540-#: src/prop.c:1023
564+#: src/prop.c:1027
541565 msgid "Extension"
542566 msgstr "拡張子"
543567
@@ -574,6 +598,7 @@
574598 msgid "Character by Value"
575599 msgstr "文字コード入力"
576600
601+#. ja:ラジオボタン
577602 #: src/valchr.c:111
578603 msgid "_Hexadecimal"
579604 msgstr "16進数(_H)"
@@ -586,6 +611,7 @@
586611 msgid "_Octal"
587612 msgstr "8進数(_O)"
588613
614+#. ja:フレームとボックス
589615 #: src/valchr.c:134
590616 msgid "Base"
591617 msgstr "基数"
@@ -598,6 +624,9 @@
598624 msgid "Authors & Contributors"
599625 msgstr "作者と貢献者"
600626
627+#~ msgid "Auto"
628+#~ msgstr "自動"
629+
601630 #~ msgid "Replace Range"
602631 #~ msgstr "置換範囲"
603632
Show on old repository browser