From e6a276a8484fcdbf837b0767a58b6838e46ee848 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 04:38:43 +0200 Subject: [PATCH 01/16] Place the cursor back to the top of the buffer when opening files --- src/editor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/editor.c b/src/editor.c index c690ab0..59bdf30 100644 --- a/src/editor.c +++ b/src/editor.c @@ -886,6 +886,9 @@ int editor_open(Editor * editor, char const * filename) gtk_text_buffer_set_modified(tbuf, FALSE); editor->filename = g_strdup(filename); /* XXX may fail */ _new_set_title(editor); /* XXX make it a generic private function */ + /* place the cursor back at the top of the file */ + gtk_text_buffer_get_start_iter(tbuf, &iter); + gtk_text_buffer_place_cursor(tbuf, &iter); return 0; } -- 2.20.1 From 03d575bf537c24de39b0a34130080e5a86ef6c48 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 04:41:43 +0200 Subject: [PATCH 02/16] Minor optimization --- src/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor.c b/src/editor.c index 59bdf30..4d68925 100644 --- a/src/editor.c +++ b/src/editor.c @@ -858,9 +858,9 @@ int editor_open(Editor * editor, char const * filename) } tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(editor->view)); gtk_text_buffer_set_text(tbuf, "", 0); + gtk_text_buffer_get_start_iter(tbuf, &iter); while((len = fread(buf, sizeof(char), sizeof(buf), fp)) > 0) { - gtk_text_buffer_get_end_iter(tbuf, &iter); #if 0 if((p = g_convert(buf, len, "UTF-8", "ISO-8859-15", &rlen, &wlen, NULL)) != NULL) { -- 2.20.1 From 8441975646306b8150f94a191f897c2debe15593 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 04:56:41 +0200 Subject: [PATCH 03/16] Fixed the filename in the "Properties" dialog --- src/editor.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/editor.c b/src/editor.c index 4d68925..817c448 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1196,7 +1196,9 @@ void editor_show_properties(Editor * editor, gboolean show) GtkWidget * vbox; GtkWidget * widget; gchar * p; + gchar * q; char buf[256]; + GError * error = NULL; if(show == FALSE) /* XXX should really hide the window */ @@ -1216,12 +1218,16 @@ void editor_show_properties(Editor * editor, gboolean show) vbox = dialog->vbox; #endif /* filename */ - /* XXX place the full filename in here */ - p = (editor->filename != NULL) ? p : g_strdup(""); - p = g_filename_to_utf8(p, -1, NULL, NULL, NULL); + p = g_strdup((editor->filename != NULL) ? editor->filename : ""); + if((q = g_filename_to_utf8(p, -1, NULL, NULL, &error)) == NULL) + { + editor_error(NULL, error->message, 1); + g_error_free(error); + q = p; + } widget = gtk_entry_new(); gtk_entry_set_editable(GTK_ENTRY(widget), FALSE); - gtk_entry_set_text(GTK_ENTRY(widget), p); + gtk_entry_set_text(GTK_ENTRY(widget), q); g_free(p); widget = _properties_widget(editor, group, _("Filename:"), widget); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); -- 2.20.1 From a64e227f224cc86450514377cd501267dd3d715c Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 05:02:01 +0200 Subject: [PATCH 04/16] Added the character count to the "Properties" dialog --- src/editor.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/editor.c b/src/editor.c index 817c448..f3dd6fe 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1195,6 +1195,8 @@ void editor_show_properties(Editor * editor, gboolean show) GtkSizeGroup * group; GtkWidget * vbox; GtkWidget * widget; + GtkTextBuffer * tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW( + editor->view)); gchar * p; gchar * q; char buf[256]; @@ -1231,6 +1233,12 @@ void editor_show_properties(Editor * editor, gboolean show) g_free(p); widget = _properties_widget(editor, group, _("Filename:"), widget); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); + /* characters */ + snprintf(buf, sizeof(buf), "%u", gtk_text_buffer_get_char_count(tbuf)); + widget = gtk_label_new(buf); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + widget = _properties_widget(editor, group, _("Characters:"), widget); + gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); /* FIXME implement more properties */ gtk_widget_show_all(vbox); gtk_dialog_run(GTK_DIALOG(dialog)); -- 2.20.1 From cdccdf1aed31010ee1ce7c012742f7d36f943204 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 05:09:43 +0200 Subject: [PATCH 05/16] Added the line count as well --- src/editor.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/editor.c b/src/editor.c index f3dd6fe..36dc42d 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1192,7 +1192,8 @@ static GtkWidget * _properties_widget(Editor * editor, GtkSizeGroup * group, void editor_show_properties(Editor * editor, gboolean show) { GtkWidget * dialog; - GtkSizeGroup * group; + GtkSizeGroup * hgroup; + GtkSizeGroup * vgroup; GtkWidget * vbox; GtkWidget * widget; GtkTextBuffer * tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW( @@ -1213,7 +1214,8 @@ void editor_show_properties(Editor * editor, gboolean show) GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); gtk_window_set_default_size(GTK_WINDOW(dialog), 300, 200); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + hgroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + vgroup = gtk_size_group_new(GTK_SIZE_GROUP_VERTICAL); #if GTK_CHECK_VERSION(2, 14, 0) vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); #else @@ -1230,15 +1232,24 @@ void editor_show_properties(Editor * editor, gboolean show) widget = gtk_entry_new(); gtk_entry_set_editable(GTK_ENTRY(widget), FALSE); gtk_entry_set_text(GTK_ENTRY(widget), q); + gtk_size_group_add_widget(vgroup, widget); g_free(p); - widget = _properties_widget(editor, group, _("Filename:"), widget); - gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); + widget = _properties_widget(editor, hgroup, _("Filename:"), widget); + gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, FALSE, 0); /* characters */ snprintf(buf, sizeof(buf), "%u", gtk_text_buffer_get_char_count(tbuf)); widget = gtk_label_new(buf); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); - widget = _properties_widget(editor, group, _("Characters:"), widget); - gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); + gtk_size_group_add_widget(vgroup, widget); + widget = _properties_widget(editor, hgroup, _("Characters:"), widget); + gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, FALSE, 0); + /* lines */ + snprintf(buf, sizeof(buf), "%u", gtk_text_buffer_get_line_count(tbuf)); + widget = gtk_label_new(buf); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + gtk_size_group_add_widget(vgroup, widget); + widget = _properties_widget(editor, hgroup, _("Lines:"), widget); + gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, FALSE, 0); /* FIXME implement more properties */ gtk_widget_show_all(vbox); gtk_dialog_run(GTK_DIALOG(dialog)); -- 2.20.1 From abd7553a687e1772dbaa2da693ecda37799274a7 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 05:11:24 +0200 Subject: [PATCH 06/16] Gtk+ >= 2.4 is assumed by now --- src/editor.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/editor.c b/src/editor.c index 36dc42d..63f0bf1 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1047,7 +1047,6 @@ gboolean editor_save_as_dialog(Editor * editor) /* editor_select_all */ void editor_select_all(Editor * editor) { -#if GTK_CHECK_VERSION(2, 4, 0) GtkTextBuffer * tbuf; GtkTextIter start; GtkTextIter end; @@ -1056,7 +1055,6 @@ void editor_select_all(Editor * editor) gtk_text_buffer_get_start_iter(tbuf, &start); gtk_text_buffer_get_end_iter(tbuf, &end); gtk_text_buffer_select_range(tbuf, &start, &end); -#endif } @@ -1276,7 +1274,6 @@ static GtkWidget * _properties_widget(Editor * editor, GtkSizeGroup * group, /* editor_unselect_all */ void editor_unselect_all(Editor * editor) { -#if GTK_CHECK_VERSION(2, 4, 0) GtkTextBuffer * tbuf; GtkTextMark * mark; GtkTextIter iter; @@ -1285,7 +1282,6 @@ void editor_unselect_all(Editor * editor) mark = gtk_text_buffer_get_mark(tbuf, "insert"); gtk_text_buffer_get_iter_at_mark(tbuf, &iter, mark); gtk_text_buffer_select_range(tbuf, &iter, &iter); -#endif } -- 2.20.1 From 654b6763e3e9ddfbe41527f928f2b320cf3364a3 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 05:18:43 +0200 Subject: [PATCH 07/16] No longer risk losing the current filename --- src/editor.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/editor.c b/src/editor.c index 63f0bf1..b25134f 100644 --- a/src/editor.c +++ b/src/editor.c @@ -990,6 +990,7 @@ gboolean editor_save_as(Editor * editor, char const * filename) struct stat st; GtkWidget * dialog; int res; + char * p; if(stat(filename, &st) == 0) { @@ -1010,9 +1011,10 @@ gboolean editor_save_as(Editor * editor, char const * filename) if(res == GTK_RESPONSE_NO) return FALSE; } - g_free(editor->filename); - if((editor->filename = g_strdup(filename)) == NULL) + if((p = strdup(filename)) == NULL) return editor_error(editor, _("Allocation error"), FALSE); + free(editor->filename); + editor->filename = p; if(editor_save(editor) != TRUE) return FALSE; _new_set_title(editor); -- 2.20.1 From c34fc28cc540e96c71d1654c174312426d74f62a Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 05:38:55 +0200 Subject: [PATCH 08/16] Always use absolute filenames --- src/editor.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/src/editor.c b/src/editor.c index b25134f..1aaf565 100644 --- a/src/editor.c +++ b/src/editor.c @@ -50,7 +50,7 @@ static char const _license[] = struct _Editor { EditorPrefs prefs; - char * filename; + gchar * filename; size_t search; Config * config; @@ -267,6 +267,8 @@ static struct /* prototypes */ +static int _editor_set_filename(Editor * editor, char const * filename); + static char * _editor_config_filename(void); static gboolean _editor_find(Editor * editor, char const * text, gboolean sensitive, gboolean wrap); @@ -882,9 +884,12 @@ int editor_open(Editor * editor, char const * filename) } #endif } - fclose(fp); + if(fclose(fp) != 0) + /* XXX ignore this error */ + editor_error(NULL, filename, 1); gtk_text_buffer_set_modified(tbuf, FALSE); - editor->filename = g_strdup(filename); /* XXX may fail */ + /* XXX may fail */ + _editor_set_filename(editor, filename); _new_set_title(editor); /* XXX make it a generic private function */ /* place the cursor back at the top of the file */ gtk_text_buffer_get_start_iter(tbuf, &iter); @@ -990,7 +995,6 @@ gboolean editor_save_as(Editor * editor, char const * filename) struct stat st; GtkWidget * dialog; int res; - char * p; if(stat(filename, &st) == 0) { @@ -1011,11 +1015,8 @@ gboolean editor_save_as(Editor * editor, char const * filename) if(res == GTK_RESPONSE_NO) return FALSE; } - if((p = strdup(filename)) == NULL) - return editor_error(editor, _("Allocation error"), FALSE); - free(editor->filename); - editor->filename = p; - if(editor_save(editor) != TRUE) + if(_editor_set_filename(editor, filename) != 0 + || editor_save(editor) != TRUE) return FALSE; _new_set_title(editor); return TRUE; @@ -1289,6 +1290,29 @@ void editor_unselect_all(Editor * editor) /* private */ /* functions */ +/* accessors */ +/* editor_set_filename */ +static int _editor_set_filename(Editor * editor, char const * filename) +{ + gchar * p = NULL; + char * q; + + if(g_path_is_absolute(filename)) + p = g_strdup(filename); + else if((q = getcwd(NULL, 0)) != NULL) + { + p = g_build_filename(q, filename, NULL); + free(q); + } + if(p == NULL) + return -editor_error(editor, _("Could not update the filename"), + 1); + g_free(editor->filename); + editor->filename = p; + return 0; +} + + /* editor_config_filename */ static char * _editor_config_filename(void) { -- 2.20.1 From c6f840353effd1210f11c413b1b0f8615aafbcc4 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 05:43:59 +0200 Subject: [PATCH 09/16] Added a comment --- src/editor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/editor.c b/src/editor.c index 1aaf565..a730f04 100644 --- a/src/editor.c +++ b/src/editor.c @@ -15,6 +15,7 @@ static char const _license[] = "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see .\n"; /* TODO: + * - track the status of the buffer ("modified-changed") * - add a "Back" button to the "Find" dialog * - add a "Replace" dialog * - consider using GtkSourceView also/instead */ -- 2.20.1 From dd910e1e75e7dd807fde81c18baa9e7a440e71ea Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 05:44:12 +0200 Subject: [PATCH 10/16] Updated the translations --- po/de.po | 157 ++++++++++++++++++++++++++++------------------------ po/es.po | 157 ++++++++++++++++++++++++++++------------------------ po/fr.po | 165 ++++++++++++++++++++++++++++++------------------------- po/it.po | 157 ++++++++++++++++++++++++++++------------------------ 4 files changed, 349 insertions(+), 287 deletions(-) diff --git a/po/de.po b/po/de.po index aef6619..84c54c2 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-29 22:28+0100\n" +"POT-Creation-Date: 2014-04-06 05:41+0200\n" "PO-Revision-Date: 2010-04-07 22:05+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -16,262 +16,277 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/editor.c:103 +#: ../src/editor.c:108 msgid "_New" msgstr "_Neu" -#: ../src/editor.c:105 +#: ../src/editor.c:110 msgid "_Open" msgstr "_Offnen" -#: ../src/editor.c:108 +#: ../src/editor.c:113 ../src/editor.c:127 msgid "_Save" msgstr "_Speichern" -#: ../src/editor.c:110 +#: ../src/editor.c:115 msgid "_Save as..." msgstr "Speichern _unter..." -#: ../src/editor.c:113 +#: ../src/editor.c:118 ../src/editor.c:130 msgid "_Properties" msgstr "_Einstellungen" -#: ../src/editor.c:116 +#: ../src/editor.c:121 ../src/editor.c:133 msgid "_Close" msgstr "_Schließen" -#: ../src/editor.c:123 +#: ../src/editor.c:140 msgid "_Undo" msgstr "_Rückgängig" -#: ../src/editor.c:125 +#: ../src/editor.c:142 msgid "_Redo" msgstr "_Wiederholen" -#: ../src/editor.c:127 +#: ../src/editor.c:144 msgid "Cu_t" msgstr "_Ausschneiden" -#: ../src/editor.c:129 +#: ../src/editor.c:146 msgid "_Copy" msgstr "_Kopieren" -#: ../src/editor.c:131 +#: ../src/editor.c:148 msgid "_Paste" msgstr "E_infügen" -#: ../src/editor.c:134 +#: ../src/editor.c:151 msgid "Select _all" msgstr "A_lles markieren" -#: ../src/editor.c:141 +#: ../src/editor.c:158 msgid "_Unselect all" msgstr "_Nichts markieren" -#: ../src/editor.c:143 +#: ../src/editor.c:160 msgid "_Find" msgstr "_Suchen" -#: ../src/editor.c:146 +#: ../src/editor.c:163 msgid "_Preferences" msgstr "_Einstellungen" -#: ../src/editor.c:153 +#: ../src/editor.c:170 msgid "_File..." msgstr "_Datei..." -#: ../src/editor.c:159 +#: ../src/editor.c:176 msgid "_Contents" msgstr "" -#: ../src/editor.c:161 +#: ../src/editor.c:178 msgid "_About" msgstr "_Info" -#: ../src/editor.c:172 +#: ../src/editor.c:189 ../src/editor.c:198 msgid "_File" msgstr "_Datei" -#: ../src/editor.c:173 +#: ../src/editor.c:190 ../src/editor.c:199 msgid "_Edit" msgstr "_Bearbeitung" -#: ../src/editor.c:174 +#: ../src/editor.c:191 ../src/editor.c:200 msgid "_Insert" msgstr "_Einfügen" -#: ../src/editor.c:175 +#: ../src/editor.c:192 ../src/editor.c:201 msgid "_Help" msgstr "_Hilfe" -#: ../src/editor.c:182 +#: ../src/editor.c:208 msgid "New" msgstr "Neue" -#: ../src/editor.c:183 +#: ../src/editor.c:209 msgid "Open" msgstr "Offnen" -#: ../src/editor.c:185 +#: ../src/editor.c:211 ../src/editor.c:236 msgid "Save" msgstr "Speichern" -#: ../src/editor.c:186 +#: ../src/editor.c:212 msgid "Save as" msgstr "Speichern unter" -#: ../src/editor.c:189 +#: ../src/editor.c:215 ../src/editor.c:238 msgid "Cut" msgstr "Ausschneiden" -#: ../src/editor.c:190 +#: ../src/editor.c:216 ../src/editor.c:239 msgid "Copy" msgstr "Kopieren" -#: ../src/editor.c:191 +#: ../src/editor.c:217 ../src/editor.c:240 msgid "Paste" msgstr "Einfügen" -#: ../src/editor.c:194 +#: ../src/editor.c:220 ../src/editor.c:243 msgid "Find" msgstr "Suchen" -#: ../src/editor.c:197 +#: ../src/editor.c:223 ../src/editor.c:246 msgid "Preferences" msgstr "Einstellungen" -#: ../src/editor.c:199 +#: ../src/editor.c:225 ../src/editor.c:248 msgid "Properties" msgstr "" -#: ../src/editor.c:202 +#: ../src/editor.c:228 ../src/editor.c:251 msgid "Help" msgstr "Hilfe" -#: ../src/editor.c:214 +#: ../src/editor.c:263 msgid "none" msgstr "kein" -#: ../src/editor.c:215 +#: ../src/editor.c:264 msgid "characters" msgstr "" -#: ../src/editor.c:216 +#: ../src/editor.c:265 msgid "words" msgstr "wörte" -#: ../src/editor.c:217 +#: ../src/editor.c:266 msgid "words then characters" msgstr "" -#: ../src/editor.c:314 +#: ../src/editor.c:374 msgid "Find:" msgstr "Suchen:" -#: ../src/editor.c:335 +#: ../src/editor.c:395 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:337 +#: ../src/editor.c:397 msgid "Wrap" msgstr "" -#: ../src/editor.c:371 +#: ../src/editor.c:431 msgid "Text editor - " msgstr "" -#: ../src/editor.c:372 +#: ../src/editor.c:432 msgid "(Untitled)" msgstr "(Unbenannt)" -#: ../src/editor.c:481 +#: ../src/editor.c:543 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:488 +#: ../src/editor.c:550 msgid "translator-credits" msgstr "Pierre Pronchery " -#: ../src/editor.c:529 -msgid "Could not save configuration" +#: ../src/editor.c:591 +msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:547 ../src/editor.c:556 ../src/editor.c:925 -#: ../src/editor.c:930 +#: ../src/editor.c:609 ../src/editor.c:618 ../src/editor.c:1007 +#: ../src/editor.c:1013 msgid "Question" msgstr "Frage" -#: ../src/editor.c:576 ../src/editor.c:580 +#: ../src/editor.c:644 ../src/editor.c:648 msgid "Error" msgstr "Fehler" -#: ../src/editor.c:603 ../src/editor.c:756 +#: ../src/editor.c:678 ../src/editor.c:832 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:714 +#: ../src/editor.c:790 msgid "Insert file..." msgstr "Datei einfügen..." -#: ../src/editor.c:720 ../src/editor.c:835 +#: ../src/editor.c:796 ../src/editor.c:916 msgid "Text files" msgstr "Text Dateien" -#: ../src/editor.c:724 ../src/editor.c:839 +#: ../src/editor.c:800 ../src/editor.c:920 msgid "All files" msgstr "Alle Dateien" -#: ../src/editor.c:762 +#: ../src/editor.c:838 msgid "Discard" msgstr "Verwerfen" -#: ../src/editor.c:829 +#: ../src/editor.c:910 msgid "Open file..." msgstr "Offnen..." -#: ../src/editor.c:897 ../src/editor.c:903 +#: ../src/editor.c:979 ../src/editor.c:985 msgid "Partial write" msgstr "" -#: ../src/editor.c:929 +#: ../src/editor.c:1012 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:938 -msgid "Allocation error" -msgstr "" - -#: ../src/editor.c:953 +#: ../src/editor.c:1034 msgid "Save as..." msgstr "Speichern unter..." -#: ../src/editor.c:1010 +#: ../src/editor.c:1089 msgid "Text editor preferences" msgstr "Text Editor Einstellungen" -#: ../src/editor.c:1027 +#: ../src/editor.c:1106 msgid "Font:" msgstr "" -#: ../src/editor.c:1037 +#: ../src/editor.c:1116 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1128 +#: ../src/editor.c:1213 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1148 +#: ../src/editor.c:1239 msgid "Filename:" msgstr "" -#: ../src/editor.c:1322 +#: ../src/editor.c:1246 +msgid "Characters:" +msgstr "" + +#: ../src/editor.c:1253 +msgid "Lines:" +msgstr "" + +#: ../src/editor.c:1309 +msgid "Could not update the filename" +msgstr "" + +#: ../src/editor.c:1448 msgid "Text not found" msgstr "" -#: ../src/main.c:75 -msgid "Usage: editor [filename]\n" +#: ../src/main.c:111 ../tools/filter.c:157 +#, c-format +msgid "" +"Usage: %s [-F][filename]\n" +" -F\tBehave like a filter\n" +msgstr "" + +#: ../tools/filter.c:109 +msgid "Exited with error code " msgstr "" diff --git a/po/es.po b/po/es.po index 53b328b..2cf9727 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-29 22:28+0100\n" +"POT-Creation-Date: 2014-04-06 05:41+0200\n" "PO-Revision-Date: 2010-04-07 22:07+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -16,262 +16,277 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/editor.c:103 +#: ../src/editor.c:108 msgid "_New" msgstr "_Nuevo" -#: ../src/editor.c:105 +#: ../src/editor.c:110 msgid "_Open" msgstr "_Abrir" -#: ../src/editor.c:108 +#: ../src/editor.c:113 ../src/editor.c:127 msgid "_Save" msgstr "_Guardar" -#: ../src/editor.c:110 +#: ../src/editor.c:115 msgid "_Save as..." msgstr "Guardar co_mo..." -#: ../src/editor.c:113 +#: ../src/editor.c:118 ../src/editor.c:130 msgid "_Properties" msgstr "Prefere_ncias" -#: ../src/editor.c:116 +#: ../src/editor.c:121 ../src/editor.c:133 msgid "_Close" msgstr "_Cerrar" -#: ../src/editor.c:123 +#: ../src/editor.c:140 msgid "_Undo" msgstr "_Deshacer" -#: ../src/editor.c:125 +#: ../src/editor.c:142 msgid "_Redo" msgstr "_Rehacer" -#: ../src/editor.c:127 +#: ../src/editor.c:144 msgid "Cu_t" msgstr "Cor_tar" -#: ../src/editor.c:129 +#: ../src/editor.c:146 msgid "_Copy" msgstr "_Copiar" -#: ../src/editor.c:131 +#: ../src/editor.c:148 msgid "_Paste" msgstr "_Pegar" -#: ../src/editor.c:134 +#: ../src/editor.c:151 msgid "Select _all" msgstr "Seleccionar _todo" -#: ../src/editor.c:141 +#: ../src/editor.c:158 msgid "_Unselect all" msgstr "" -#: ../src/editor.c:143 +#: ../src/editor.c:160 msgid "_Find" msgstr "_Buscar" -#: ../src/editor.c:146 +#: ../src/editor.c:163 msgid "_Preferences" msgstr "Prefere_ncias" -#: ../src/editor.c:153 +#: ../src/editor.c:170 msgid "_File..." msgstr "" -#: ../src/editor.c:159 +#: ../src/editor.c:176 msgid "_Contents" msgstr "" -#: ../src/editor.c:161 +#: ../src/editor.c:178 msgid "_About" msgstr "Acerca _de" -#: ../src/editor.c:172 +#: ../src/editor.c:189 ../src/editor.c:198 msgid "_File" msgstr "" -#: ../src/editor.c:173 +#: ../src/editor.c:190 ../src/editor.c:199 msgid "_Edit" msgstr "" -#: ../src/editor.c:174 +#: ../src/editor.c:191 ../src/editor.c:200 msgid "_Insert" msgstr "" -#: ../src/editor.c:175 +#: ../src/editor.c:192 ../src/editor.c:201 msgid "_Help" msgstr "" -#: ../src/editor.c:182 +#: ../src/editor.c:208 msgid "New" msgstr "Nuevo" -#: ../src/editor.c:183 +#: ../src/editor.c:209 msgid "Open" msgstr "Abrir" -#: ../src/editor.c:185 +#: ../src/editor.c:211 ../src/editor.c:236 msgid "Save" msgstr "Guardar" -#: ../src/editor.c:186 +#: ../src/editor.c:212 msgid "Save as" msgstr "Guardar como" -#: ../src/editor.c:189 +#: ../src/editor.c:215 ../src/editor.c:238 msgid "Cut" msgstr "Cortar" -#: ../src/editor.c:190 +#: ../src/editor.c:216 ../src/editor.c:239 msgid "Copy" msgstr "Copiar" -#: ../src/editor.c:191 +#: ../src/editor.c:217 ../src/editor.c:240 msgid "Paste" msgstr "Pegar" -#: ../src/editor.c:194 +#: ../src/editor.c:220 ../src/editor.c:243 msgid "Find" msgstr "Buscar" -#: ../src/editor.c:197 +#: ../src/editor.c:223 ../src/editor.c:246 msgid "Preferences" msgstr "Preferencias" -#: ../src/editor.c:199 +#: ../src/editor.c:225 ../src/editor.c:248 msgid "Properties" msgstr "" -#: ../src/editor.c:202 +#: ../src/editor.c:228 ../src/editor.c:251 msgid "Help" msgstr "" -#: ../src/editor.c:214 +#: ../src/editor.c:263 msgid "none" msgstr "" -#: ../src/editor.c:215 +#: ../src/editor.c:264 msgid "characters" msgstr "" -#: ../src/editor.c:216 +#: ../src/editor.c:265 msgid "words" msgstr "" -#: ../src/editor.c:217 +#: ../src/editor.c:266 msgid "words then characters" msgstr "" -#: ../src/editor.c:314 +#: ../src/editor.c:374 msgid "Find:" msgstr "Buscar:" -#: ../src/editor.c:335 +#: ../src/editor.c:395 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:337 +#: ../src/editor.c:397 msgid "Wrap" msgstr "" -#: ../src/editor.c:371 +#: ../src/editor.c:431 msgid "Text editor - " msgstr "" -#: ../src/editor.c:372 +#: ../src/editor.c:432 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:481 +#: ../src/editor.c:543 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:488 +#: ../src/editor.c:550 msgid "translator-credits" msgstr "" -#: ../src/editor.c:529 -msgid "Could not save configuration" +#: ../src/editor.c:591 +msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:547 ../src/editor.c:556 ../src/editor.c:925 -#: ../src/editor.c:930 +#: ../src/editor.c:609 ../src/editor.c:618 ../src/editor.c:1007 +#: ../src/editor.c:1013 msgid "Question" msgstr "" -#: ../src/editor.c:576 ../src/editor.c:580 +#: ../src/editor.c:644 ../src/editor.c:648 msgid "Error" msgstr "" -#: ../src/editor.c:603 ../src/editor.c:756 +#: ../src/editor.c:678 ../src/editor.c:832 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:714 +#: ../src/editor.c:790 msgid "Insert file..." msgstr "" -#: ../src/editor.c:720 ../src/editor.c:835 +#: ../src/editor.c:796 ../src/editor.c:916 msgid "Text files" msgstr "" -#: ../src/editor.c:724 ../src/editor.c:839 +#: ../src/editor.c:800 ../src/editor.c:920 msgid "All files" msgstr "" -#: ../src/editor.c:762 +#: ../src/editor.c:838 msgid "Discard" msgstr "Descartar" -#: ../src/editor.c:829 +#: ../src/editor.c:910 msgid "Open file..." msgstr "" -#: ../src/editor.c:897 ../src/editor.c:903 +#: ../src/editor.c:979 ../src/editor.c:985 msgid "Partial write" msgstr "" -#: ../src/editor.c:929 +#: ../src/editor.c:1012 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:938 -msgid "Allocation error" -msgstr "" - -#: ../src/editor.c:953 +#: ../src/editor.c:1034 msgid "Save as..." msgstr "Guardar como..." -#: ../src/editor.c:1010 +#: ../src/editor.c:1089 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:1027 +#: ../src/editor.c:1106 msgid "Font:" msgstr "" -#: ../src/editor.c:1037 +#: ../src/editor.c:1116 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1128 +#: ../src/editor.c:1213 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1148 +#: ../src/editor.c:1239 msgid "Filename:" msgstr "" -#: ../src/editor.c:1322 +#: ../src/editor.c:1246 +msgid "Characters:" +msgstr "" + +#: ../src/editor.c:1253 +msgid "Lines:" +msgstr "" + +#: ../src/editor.c:1309 +msgid "Could not update the filename" +msgstr "" + +#: ../src/editor.c:1448 msgid "Text not found" msgstr "" -#: ../src/main.c:75 -msgid "Usage: editor [filename]\n" +#: ../src/main.c:111 ../tools/filter.c:157 +#, c-format +msgid "" +"Usage: %s [-F][filename]\n" +" -F\tBehave like a filter\n" +msgstr "" + +#: ../tools/filter.c:109 +msgid "Exited with error code " msgstr "" diff --git a/po/fr.po b/po/fr.po index ae11915..e0a8dd3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-29 22:28+0100\n" +"POT-Creation-Date: 2014-04-06 05:41+0200\n" "PO-Revision-Date: 2010-04-11 12:32+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -16,198 +16,198 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/editor.c:103 +#: ../src/editor.c:108 msgid "_New" msgstr "_Nouveau" -#: ../src/editor.c:105 +#: ../src/editor.c:110 msgid "_Open" msgstr "_Ouvrir" -#: ../src/editor.c:108 +#: ../src/editor.c:113 ../src/editor.c:127 msgid "_Save" msgstr "_Enregistrer" -#: ../src/editor.c:110 +#: ../src/editor.c:115 msgid "_Save as..." msgstr "_Enregistrer sous..." -#: ../src/editor.c:113 +#: ../src/editor.c:118 ../src/editor.c:130 msgid "_Properties" msgstr "_Préférences" -#: ../src/editor.c:116 +#: ../src/editor.c:121 ../src/editor.c:133 msgid "_Close" msgstr "_Fermer" -#: ../src/editor.c:123 +#: ../src/editor.c:140 msgid "_Undo" msgstr "_Annuler" -#: ../src/editor.c:125 +#: ../src/editor.c:142 msgid "_Redo" msgstr "_Rétablir" -#: ../src/editor.c:127 +#: ../src/editor.c:144 msgid "Cu_t" msgstr "Co_uper" -#: ../src/editor.c:129 +#: ../src/editor.c:146 msgid "_Copy" msgstr "_Copier" -#: ../src/editor.c:131 +#: ../src/editor.c:148 msgid "_Paste" msgstr "C_oller" -#: ../src/editor.c:134 +#: ../src/editor.c:151 msgid "Select _all" msgstr "Sélectionner _tout" -#: ../src/editor.c:141 +#: ../src/editor.c:158 msgid "_Unselect all" msgstr "Tout _désélectionner" -#: ../src/editor.c:143 +#: ../src/editor.c:160 msgid "_Find" msgstr "_Chercher" -#: ../src/editor.c:146 +#: ../src/editor.c:163 msgid "_Preferences" msgstr "_Préférences" -#: ../src/editor.c:153 +#: ../src/editor.c:170 msgid "_File..." msgstr "_Fichier..." -#: ../src/editor.c:159 +#: ../src/editor.c:176 msgid "_Contents" msgstr "_Sommaire" -#: ../src/editor.c:161 +#: ../src/editor.c:178 msgid "_About" msgstr "À _propos" -#: ../src/editor.c:172 +#: ../src/editor.c:189 ../src/editor.c:198 msgid "_File" msgstr "_Fichier" -#: ../src/editor.c:173 +#: ../src/editor.c:190 ../src/editor.c:199 msgid "_Edit" msgstr "É_dition" -#: ../src/editor.c:174 +#: ../src/editor.c:191 ../src/editor.c:200 msgid "_Insert" msgstr "_Insertion" -#: ../src/editor.c:175 +#: ../src/editor.c:192 ../src/editor.c:201 msgid "_Help" msgstr "_Aide" -#: ../src/editor.c:182 +#: ../src/editor.c:208 msgid "New" msgstr "Nouveau" -#: ../src/editor.c:183 +#: ../src/editor.c:209 msgid "Open" msgstr "Ouvrir" -#: ../src/editor.c:185 +#: ../src/editor.c:211 ../src/editor.c:236 msgid "Save" msgstr "Enregistrer" -#: ../src/editor.c:186 +#: ../src/editor.c:212 msgid "Save as" msgstr "Enregistrer sous" -#: ../src/editor.c:189 +#: ../src/editor.c:215 ../src/editor.c:238 msgid "Cut" msgstr "Couper" -#: ../src/editor.c:190 +#: ../src/editor.c:216 ../src/editor.c:239 msgid "Copy" msgstr "Copier" -#: ../src/editor.c:191 +#: ../src/editor.c:217 ../src/editor.c:240 msgid "Paste" msgstr "Coller" -#: ../src/editor.c:194 +#: ../src/editor.c:220 ../src/editor.c:243 msgid "Find" msgstr "Chercher" -#: ../src/editor.c:197 +#: ../src/editor.c:223 ../src/editor.c:246 msgid "Preferences" msgstr "Préférences" -#: ../src/editor.c:199 +#: ../src/editor.c:225 ../src/editor.c:248 msgid "Properties" msgstr "Propriétés" -#: ../src/editor.c:202 +#: ../src/editor.c:228 ../src/editor.c:251 msgid "Help" msgstr "Aide" -#: ../src/editor.c:214 +#: ../src/editor.c:263 msgid "none" msgstr "aucun" -#: ../src/editor.c:215 +#: ../src/editor.c:264 msgid "characters" msgstr "caractères" -#: ../src/editor.c:216 +#: ../src/editor.c:265 msgid "words" msgstr "mots" -#: ../src/editor.c:217 +#: ../src/editor.c:266 msgid "words then characters" msgstr "mots puis caractères" -#: ../src/editor.c:314 +#: ../src/editor.c:374 msgid "Find:" msgstr "Chercher :" -#: ../src/editor.c:335 +#: ../src/editor.c:395 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/editor.c:337 +#: ../src/editor.c:397 msgid "Wrap" msgstr "Boucler" -#: ../src/editor.c:371 +#: ../src/editor.c:431 msgid "Text editor - " msgstr "Éditeur de texte - " -#: ../src/editor.c:372 +#: ../src/editor.c:432 msgid "(Untitled)" msgstr "(Sans titre)" -#: ../src/editor.c:481 +#: ../src/editor.c:543 msgid "Text editor for the DeforaOS desktop" msgstr "Éditeur de texte pour l'environnement DeforaOS" -#: ../src/editor.c:488 +#: ../src/editor.c:550 msgid "translator-credits" msgstr "" "Calimero \n" "Pierre Pronchery " -#: ../src/editor.c:529 -msgid "Could not save configuration" +#: ../src/editor.c:591 +msgid "Could not save the configuration" msgstr "Erreur lors de la sauvegarde de la configuration" -#: ../src/editor.c:547 ../src/editor.c:556 ../src/editor.c:925 -#: ../src/editor.c:930 +#: ../src/editor.c:609 ../src/editor.c:618 ../src/editor.c:1007 +#: ../src/editor.c:1013 msgid "Question" msgstr "Question" -#: ../src/editor.c:576 ../src/editor.c:580 +#: ../src/editor.c:644 ../src/editor.c:648 msgid "Error" msgstr "Erreur" -#: ../src/editor.c:603 ../src/editor.c:756 +#: ../src/editor.c:678 ../src/editor.c:832 msgid "" "There are unsaved changes.\n" "Discard or save them?" @@ -215,67 +215,84 @@ msgstr "" "Il y a des changements non enregistrés.\n" "Abandonner ou enregistrer ?" -#: ../src/editor.c:714 +#: ../src/editor.c:790 msgid "Insert file..." msgstr "Insérer un fichier..." -#: ../src/editor.c:720 ../src/editor.c:835 +#: ../src/editor.c:796 ../src/editor.c:916 msgid "Text files" msgstr "Fichiers texte" -#: ../src/editor.c:724 ../src/editor.c:839 +#: ../src/editor.c:800 ../src/editor.c:920 msgid "All files" msgstr "Tous les fichiers" -#: ../src/editor.c:762 +#: ../src/editor.c:838 msgid "Discard" msgstr "Abandonner" -#: ../src/editor.c:829 +#: ../src/editor.c:910 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/editor.c:897 ../src/editor.c:903 +#: ../src/editor.c:979 ../src/editor.c:985 msgid "Partial write" msgstr "Écriture partielle" -#: ../src/editor.c:929 +#: ../src/editor.c:1012 msgid "This file already exists. Overwrite?" msgstr "Le fichier existe déjà. L'écraser ?" -#: ../src/editor.c:938 -msgid "Allocation error" -msgstr "Erreur d'allocation" - -#: ../src/editor.c:953 +#: ../src/editor.c:1034 msgid "Save as..." msgstr "Enregistrer sous..." -#: ../src/editor.c:1010 +#: ../src/editor.c:1089 msgid "Text editor preferences" msgstr "Préférences de l'éditeur de texte" -#: ../src/editor.c:1027 +#: ../src/editor.c:1106 msgid "Font:" msgstr "Police :" -#: ../src/editor.c:1037 +#: ../src/editor.c:1116 msgid "Wrap mode:" msgstr "Retour à la ligne :" -#: ../src/editor.c:1128 +#: ../src/editor.c:1213 #, c-format msgid "Properties of %s" -msgstr "" +msgstr "Propriétés de %s" -#: ../src/editor.c:1148 +#: ../src/editor.c:1239 msgid "Filename:" -msgstr "" +msgstr "Nom du fichier :" + +#: ../src/editor.c:1246 +msgid "Characters:" +msgstr "Caractères :" + +#: ../src/editor.c:1253 +msgid "Lines:" +msgstr "Lignes :" + +#: ../src/editor.c:1309 +msgid "Could not update the filename" +msgstr "Erreur lors de la mise à jour du nom de fichier" -#: ../src/editor.c:1322 +#: ../src/editor.c:1448 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/main.c:75 -msgid "Usage: editor [filename]\n" -msgstr "Usage: editor [fichier]\n" +#: ../src/main.c:111 ../tools/filter.c:157 +#, c-format +msgid "" +"Usage: %s [-F][filename]\n" +" -F\tBehave like a filter\n" +msgstr "" +"Usage: %s [-F][fichier]\n" +" -F\tSe comporter comme un filtre\n" + +#: ../tools/filter.c:109 +msgid "Exited with error code " +msgstr "Code de sortie " diff --git a/po/it.po b/po/it.po index 79ef570..fd3801e 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-29 22:28+0100\n" +"POT-Creation-Date: 2014-04-06 05:41+0200\n" "PO-Revision-Date: 2010-04-09 16:43+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -17,262 +17,277 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/editor.c:103 +#: ../src/editor.c:108 msgid "_New" msgstr "_Nuovo" -#: ../src/editor.c:105 +#: ../src/editor.c:110 msgid "_Open" msgstr "_Apri" -#: ../src/editor.c:108 +#: ../src/editor.c:113 ../src/editor.c:127 msgid "_Save" msgstr "_Salva" -#: ../src/editor.c:110 +#: ../src/editor.c:115 msgid "_Save as..." msgstr "Sa_lva come..." -#: ../src/editor.c:113 +#: ../src/editor.c:118 ../src/editor.c:130 msgid "_Properties" msgstr "Preferen_ze" -#: ../src/editor.c:116 +#: ../src/editor.c:121 ../src/editor.c:133 msgid "_Close" msgstr "_Chiudi" -#: ../src/editor.c:123 +#: ../src/editor.c:140 msgid "_Undo" msgstr "_Annulla" -#: ../src/editor.c:125 +#: ../src/editor.c:142 msgid "_Redo" msgstr "_Ripeti" -#: ../src/editor.c:127 +#: ../src/editor.c:144 msgid "Cu_t" msgstr "_Taglia" -#: ../src/editor.c:129 +#: ../src/editor.c:146 msgid "_Copy" msgstr "_Copia" -#: ../src/editor.c:131 +#: ../src/editor.c:148 msgid "_Paste" msgstr "_Incolla" -#: ../src/editor.c:134 +#: ../src/editor.c:151 msgid "Select _all" msgstr "_Seleziona tutto" -#: ../src/editor.c:141 +#: ../src/editor.c:158 msgid "_Unselect all" msgstr "" -#: ../src/editor.c:143 +#: ../src/editor.c:160 msgid "_Find" msgstr "Tr_ova" -#: ../src/editor.c:146 +#: ../src/editor.c:163 msgid "_Preferences" msgstr "Preferen_ze" -#: ../src/editor.c:153 +#: ../src/editor.c:170 msgid "_File..." msgstr "" -#: ../src/editor.c:159 +#: ../src/editor.c:176 msgid "_Contents" msgstr "" -#: ../src/editor.c:161 +#: ../src/editor.c:178 msgid "_About" msgstr "_Informazioni" -#: ../src/editor.c:172 +#: ../src/editor.c:189 ../src/editor.c:198 msgid "_File" msgstr "" -#: ../src/editor.c:173 +#: ../src/editor.c:190 ../src/editor.c:199 msgid "_Edit" msgstr "" -#: ../src/editor.c:174 +#: ../src/editor.c:191 ../src/editor.c:200 msgid "_Insert" msgstr "" -#: ../src/editor.c:175 +#: ../src/editor.c:192 ../src/editor.c:201 msgid "_Help" msgstr "" -#: ../src/editor.c:182 +#: ../src/editor.c:208 msgid "New" msgstr "Nuovo" -#: ../src/editor.c:183 +#: ../src/editor.c:209 msgid "Open" msgstr "Apri" -#: ../src/editor.c:185 +#: ../src/editor.c:211 ../src/editor.c:236 msgid "Save" msgstr "Salva" -#: ../src/editor.c:186 +#: ../src/editor.c:212 msgid "Save as" msgstr "Salva come" -#: ../src/editor.c:189 +#: ../src/editor.c:215 ../src/editor.c:238 msgid "Cut" msgstr "Taglia" -#: ../src/editor.c:190 +#: ../src/editor.c:216 ../src/editor.c:239 msgid "Copy" msgstr "Copia" -#: ../src/editor.c:191 +#: ../src/editor.c:217 ../src/editor.c:240 msgid "Paste" msgstr "Incolla" -#: ../src/editor.c:194 +#: ../src/editor.c:220 ../src/editor.c:243 msgid "Find" msgstr "Trova" -#: ../src/editor.c:197 +#: ../src/editor.c:223 ../src/editor.c:246 msgid "Preferences" msgstr "Preferenze" -#: ../src/editor.c:199 +#: ../src/editor.c:225 ../src/editor.c:248 msgid "Properties" msgstr "" -#: ../src/editor.c:202 +#: ../src/editor.c:228 ../src/editor.c:251 msgid "Help" msgstr "" -#: ../src/editor.c:214 +#: ../src/editor.c:263 msgid "none" msgstr "" -#: ../src/editor.c:215 +#: ../src/editor.c:264 msgid "characters" msgstr "" -#: ../src/editor.c:216 +#: ../src/editor.c:265 msgid "words" msgstr "" -#: ../src/editor.c:217 +#: ../src/editor.c:266 msgid "words then characters" msgstr "" -#: ../src/editor.c:314 +#: ../src/editor.c:374 msgid "Find:" msgstr "Trova:" -#: ../src/editor.c:335 +#: ../src/editor.c:395 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:337 +#: ../src/editor.c:397 msgid "Wrap" msgstr "" -#: ../src/editor.c:371 +#: ../src/editor.c:431 msgid "Text editor - " msgstr "" -#: ../src/editor.c:372 +#: ../src/editor.c:432 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:481 +#: ../src/editor.c:543 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:488 +#: ../src/editor.c:550 msgid "translator-credits" msgstr "" -#: ../src/editor.c:529 -msgid "Could not save configuration" +#: ../src/editor.c:591 +msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:547 ../src/editor.c:556 ../src/editor.c:925 -#: ../src/editor.c:930 +#: ../src/editor.c:609 ../src/editor.c:618 ../src/editor.c:1007 +#: ../src/editor.c:1013 msgid "Question" msgstr "" -#: ../src/editor.c:576 ../src/editor.c:580 +#: ../src/editor.c:644 ../src/editor.c:648 msgid "Error" msgstr "" -#: ../src/editor.c:603 ../src/editor.c:756 +#: ../src/editor.c:678 ../src/editor.c:832 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:714 +#: ../src/editor.c:790 msgid "Insert file..." msgstr "" -#: ../src/editor.c:720 ../src/editor.c:835 +#: ../src/editor.c:796 ../src/editor.c:916 msgid "Text files" msgstr "" -#: ../src/editor.c:724 ../src/editor.c:839 +#: ../src/editor.c:800 ../src/editor.c:920 msgid "All files" msgstr "" -#: ../src/editor.c:762 +#: ../src/editor.c:838 msgid "Discard" msgstr "Scarta" -#: ../src/editor.c:829 +#: ../src/editor.c:910 msgid "Open file..." msgstr "" -#: ../src/editor.c:897 ../src/editor.c:903 +#: ../src/editor.c:979 ../src/editor.c:985 msgid "Partial write" msgstr "" -#: ../src/editor.c:929 +#: ../src/editor.c:1012 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:938 -msgid "Allocation error" -msgstr "" - -#: ../src/editor.c:953 +#: ../src/editor.c:1034 msgid "Save as..." msgstr "Salva come..." -#: ../src/editor.c:1010 +#: ../src/editor.c:1089 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:1027 +#: ../src/editor.c:1106 msgid "Font:" msgstr "" -#: ../src/editor.c:1037 +#: ../src/editor.c:1116 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1128 +#: ../src/editor.c:1213 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1148 +#: ../src/editor.c:1239 msgid "Filename:" msgstr "" -#: ../src/editor.c:1322 +#: ../src/editor.c:1246 +msgid "Characters:" +msgstr "" + +#: ../src/editor.c:1253 +msgid "Lines:" +msgstr "" + +#: ../src/editor.c:1309 +msgid "Could not update the filename" +msgstr "" + +#: ../src/editor.c:1448 msgid "Text not found" msgstr "" -#: ../src/main.c:75 -msgid "Usage: editor [filename]\n" +#: ../src/main.c:111 ../tools/filter.c:157 +#, c-format +msgid "" +"Usage: %s [-F][filename]\n" +" -F\tBehave like a filter\n" +msgstr "" + +#: ../tools/filter.c:109 +msgid "Exited with error code " msgstr "" -- 2.20.1 From e4e57d16142278448a87062750ba12643889c646 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 05:57:39 +0200 Subject: [PATCH 11/16] Tracking the status of the text buffer --- src/editor.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/editor.c b/src/editor.c index a730f04..4620e28 100644 --- a/src/editor.c +++ b/src/editor.c @@ -15,7 +15,6 @@ static char const _license[] = "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see .\n"; /* TODO: - * - track the status of the buffer ("modified-changed") * - add a "Back" button to the "Find" dialog * - add a "Replace" dialog * - consider using GtkSourceView also/instead */ @@ -61,6 +60,7 @@ struct _Editor PangoFontDescription * bold; GtkWidget * view; GtkWidget * statusbar; + guint statusbar_id; #if GTK_CHECK_VERSION(2, 18, 0) /* infobar */ GtkWidget * infobar; @@ -269,6 +269,7 @@ static struct /* prototypes */ static int _editor_set_filename(Editor * editor, char const * filename); +static void _editor_set_status(Editor * editor, char const * status); static char * _editor_config_filename(void); static gboolean _editor_find(Editor * editor, char const * text, @@ -280,6 +281,7 @@ static void _editor_on_find_clear(gpointer data); #endif static void _editor_on_find_clicked(gpointer data); static void _editor_on_find_hide(gpointer data); +static void _editor_on_modified(GtkTextBuffer * tbuf, gpointer data); /* public */ @@ -294,6 +296,7 @@ Editor * editor_new(EditorPrefs * prefs) GtkWidget * vbox; GtkWidget * hbox; GtkWidget * widget; + GtkTextBuffer * tbuf; if((editor = object_new(sizeof(*editor))) == NULL) return NULL; @@ -363,6 +366,9 @@ Editor * editor_new(EditorPrefs * prefs) gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); editor->view = gtk_text_view_new(); + tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(editor->view)); + g_signal_connect(tbuf, "modified-changed", G_CALLBACK( + _editor_on_modified), editor); editor_set_font(editor, editor_get_font(editor)); editor_set_wrap_mode(editor, editor_get_wrap_mode(editor)); gtk_container_add(GTK_CONTAINER(widget), editor->view); @@ -413,6 +419,8 @@ Editor * editor_new(EditorPrefs * prefs) gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); /* statusbar */ editor->statusbar = gtk_statusbar_new(); + editor->statusbar_id = 0; + _editor_set_status(editor, _("Ready")); gtk_box_pack_end(GTK_BOX(vbox), editor->statusbar, FALSE, TRUE, 0); /* preferences */ editor->pr_window = NULL; @@ -1314,6 +1322,19 @@ static int _editor_set_filename(Editor * editor, char const * filename) } +/* editor_set_status */ +static void _editor_set_status(Editor * editor, char const * status) +{ + GtkStatusbar * sb = GTK_STATUSBAR(editor->statusbar); + + if(editor->statusbar_id != 0) + gtk_statusbar_remove(sb, gtk_statusbar_get_context_id(sb, ""), + editor->statusbar_id); + editor->statusbar_id = gtk_statusbar_push(sb, + gtk_statusbar_get_context_id(sb, ""), status); +} + + /* editor_config_filename */ static char * _editor_config_filename(void) { @@ -1456,3 +1477,20 @@ static void _editor_on_find_hide(gpointer data) gtk_widget_hide(editor->fi_dialog); } + + +/* editor_on_modified */ +static void _editor_on_modified(GtkTextBuffer * tbuf, gpointer data) +{ + Editor * editor = data; + gboolean modified; + char const * status; + + if((modified = gtk_text_buffer_get_modified(tbuf)) == TRUE) + status = _("Unsaved changes"); + else if(editor->filename != NULL) + status = _("Saved"); + else + status = _("Ready"); + _editor_set_status(editor, status); +} -- 2.20.1 From 42e14874c9a7e4dba80861a48ec16da650918834 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 06:00:28 +0200 Subject: [PATCH 12/16] Updated the translations --- po/de.po | 72 +++++++++++++++++++++++++++++++++----------------------- po/es.po | 72 +++++++++++++++++++++++++++++++++----------------------- po/fr.po | 72 +++++++++++++++++++++++++++++++++----------------------- po/it.po | 72 +++++++++++++++++++++++++++++++++----------------------- 4 files changed, 168 insertions(+), 120 deletions(-) diff --git a/po/de.po b/po/de.po index 84c54c2..226f79f 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-06 05:41+0200\n" +"POT-Creation-Date: 2014-04-06 05:57+0200\n" "PO-Revision-Date: 2010-04-07 22:05+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -164,122 +164,134 @@ msgstr "wörte" msgid "words then characters" msgstr "" -#: ../src/editor.c:374 +#: ../src/editor.c:380 msgid "Find:" msgstr "Suchen:" -#: ../src/editor.c:395 +#: ../src/editor.c:401 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:397 +#: ../src/editor.c:403 msgid "Wrap" msgstr "" -#: ../src/editor.c:431 +#: ../src/editor.c:423 ../src/editor.c:1494 +msgid "Ready" +msgstr "" + +#: ../src/editor.c:439 msgid "Text editor - " msgstr "" -#: ../src/editor.c:432 +#: ../src/editor.c:440 msgid "(Untitled)" msgstr "(Unbenannt)" -#: ../src/editor.c:543 +#: ../src/editor.c:551 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:550 +#: ../src/editor.c:558 msgid "translator-credits" msgstr "Pierre Pronchery " -#: ../src/editor.c:591 +#: ../src/editor.c:599 msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:609 ../src/editor.c:618 ../src/editor.c:1007 -#: ../src/editor.c:1013 +#: ../src/editor.c:617 ../src/editor.c:626 ../src/editor.c:1015 +#: ../src/editor.c:1021 msgid "Question" msgstr "Frage" -#: ../src/editor.c:644 ../src/editor.c:648 +#: ../src/editor.c:652 ../src/editor.c:656 msgid "Error" msgstr "Fehler" -#: ../src/editor.c:678 ../src/editor.c:832 +#: ../src/editor.c:686 ../src/editor.c:840 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:790 +#: ../src/editor.c:798 msgid "Insert file..." msgstr "Datei einfügen..." -#: ../src/editor.c:796 ../src/editor.c:916 +#: ../src/editor.c:804 ../src/editor.c:924 msgid "Text files" msgstr "Text Dateien" -#: ../src/editor.c:800 ../src/editor.c:920 +#: ../src/editor.c:808 ../src/editor.c:928 msgid "All files" msgstr "Alle Dateien" -#: ../src/editor.c:838 +#: ../src/editor.c:846 msgid "Discard" msgstr "Verwerfen" -#: ../src/editor.c:910 +#: ../src/editor.c:918 msgid "Open file..." msgstr "Offnen..." -#: ../src/editor.c:979 ../src/editor.c:985 +#: ../src/editor.c:987 ../src/editor.c:993 msgid "Partial write" msgstr "" -#: ../src/editor.c:1012 +#: ../src/editor.c:1020 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:1034 +#: ../src/editor.c:1042 msgid "Save as..." msgstr "Speichern unter..." -#: ../src/editor.c:1089 +#: ../src/editor.c:1097 msgid "Text editor preferences" msgstr "Text Editor Einstellungen" -#: ../src/editor.c:1106 +#: ../src/editor.c:1114 msgid "Font:" msgstr "" -#: ../src/editor.c:1116 +#: ../src/editor.c:1124 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1213 +#: ../src/editor.c:1221 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1239 +#: ../src/editor.c:1247 msgid "Filename:" msgstr "" -#: ../src/editor.c:1246 +#: ../src/editor.c:1254 msgid "Characters:" msgstr "" -#: ../src/editor.c:1253 +#: ../src/editor.c:1261 msgid "Lines:" msgstr "" -#: ../src/editor.c:1309 +#: ../src/editor.c:1317 msgid "Could not update the filename" msgstr "" -#: ../src/editor.c:1448 +#: ../src/editor.c:1469 msgid "Text not found" msgstr "" +#: ../src/editor.c:1490 +msgid "Unsaved changes" +msgstr "" + +#: ../src/editor.c:1492 +msgid "Saved" +msgstr "Gespeichert" + #: ../src/main.c:111 ../tools/filter.c:157 #, c-format msgid "" diff --git a/po/es.po b/po/es.po index 2cf9727..2d143e9 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-06 05:41+0200\n" +"POT-Creation-Date: 2014-04-06 05:57+0200\n" "PO-Revision-Date: 2010-04-07 22:07+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -164,122 +164,134 @@ msgstr "" msgid "words then characters" msgstr "" -#: ../src/editor.c:374 +#: ../src/editor.c:380 msgid "Find:" msgstr "Buscar:" -#: ../src/editor.c:395 +#: ../src/editor.c:401 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:397 +#: ../src/editor.c:403 msgid "Wrap" msgstr "" -#: ../src/editor.c:431 +#: ../src/editor.c:423 ../src/editor.c:1494 +msgid "Ready" +msgstr "" + +#: ../src/editor.c:439 msgid "Text editor - " msgstr "" -#: ../src/editor.c:432 +#: ../src/editor.c:440 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:543 +#: ../src/editor.c:551 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:550 +#: ../src/editor.c:558 msgid "translator-credits" msgstr "" -#: ../src/editor.c:591 +#: ../src/editor.c:599 msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:609 ../src/editor.c:618 ../src/editor.c:1007 -#: ../src/editor.c:1013 +#: ../src/editor.c:617 ../src/editor.c:626 ../src/editor.c:1015 +#: ../src/editor.c:1021 msgid "Question" msgstr "" -#: ../src/editor.c:644 ../src/editor.c:648 +#: ../src/editor.c:652 ../src/editor.c:656 msgid "Error" msgstr "" -#: ../src/editor.c:678 ../src/editor.c:832 +#: ../src/editor.c:686 ../src/editor.c:840 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:790 +#: ../src/editor.c:798 msgid "Insert file..." msgstr "" -#: ../src/editor.c:796 ../src/editor.c:916 +#: ../src/editor.c:804 ../src/editor.c:924 msgid "Text files" msgstr "" -#: ../src/editor.c:800 ../src/editor.c:920 +#: ../src/editor.c:808 ../src/editor.c:928 msgid "All files" msgstr "" -#: ../src/editor.c:838 +#: ../src/editor.c:846 msgid "Discard" msgstr "Descartar" -#: ../src/editor.c:910 +#: ../src/editor.c:918 msgid "Open file..." msgstr "" -#: ../src/editor.c:979 ../src/editor.c:985 +#: ../src/editor.c:987 ../src/editor.c:993 msgid "Partial write" msgstr "" -#: ../src/editor.c:1012 +#: ../src/editor.c:1020 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:1034 +#: ../src/editor.c:1042 msgid "Save as..." msgstr "Guardar como..." -#: ../src/editor.c:1089 +#: ../src/editor.c:1097 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:1106 +#: ../src/editor.c:1114 msgid "Font:" msgstr "" -#: ../src/editor.c:1116 +#: ../src/editor.c:1124 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1213 +#: ../src/editor.c:1221 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1239 +#: ../src/editor.c:1247 msgid "Filename:" msgstr "" -#: ../src/editor.c:1246 +#: ../src/editor.c:1254 msgid "Characters:" msgstr "" -#: ../src/editor.c:1253 +#: ../src/editor.c:1261 msgid "Lines:" msgstr "" -#: ../src/editor.c:1309 +#: ../src/editor.c:1317 msgid "Could not update the filename" msgstr "" -#: ../src/editor.c:1448 +#: ../src/editor.c:1469 msgid "Text not found" msgstr "" +#: ../src/editor.c:1490 +msgid "Unsaved changes" +msgstr "" + +#: ../src/editor.c:1492 +msgid "Saved" +msgstr "" + #: ../src/main.c:111 ../tools/filter.c:157 #, c-format msgid "" diff --git a/po/fr.po b/po/fr.po index e0a8dd3..e57a075 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-06 05:41+0200\n" +"POT-Creation-Date: 2014-04-06 05:57+0200\n" "PO-Revision-Date: 2010-04-11 12:32+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -164,50 +164,54 @@ msgstr "mots" msgid "words then characters" msgstr "mots puis caractères" -#: ../src/editor.c:374 +#: ../src/editor.c:380 msgid "Find:" msgstr "Chercher :" -#: ../src/editor.c:395 +#: ../src/editor.c:401 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/editor.c:397 +#: ../src/editor.c:403 msgid "Wrap" msgstr "Boucler" -#: ../src/editor.c:431 +#: ../src/editor.c:423 ../src/editor.c:1494 +msgid "Ready" +msgstr "Prêt" + +#: ../src/editor.c:439 msgid "Text editor - " msgstr "Éditeur de texte - " -#: ../src/editor.c:432 +#: ../src/editor.c:440 msgid "(Untitled)" msgstr "(Sans titre)" -#: ../src/editor.c:543 +#: ../src/editor.c:551 msgid "Text editor for the DeforaOS desktop" msgstr "Éditeur de texte pour l'environnement DeforaOS" -#: ../src/editor.c:550 +#: ../src/editor.c:558 msgid "translator-credits" msgstr "" "Calimero \n" "Pierre Pronchery " -#: ../src/editor.c:591 +#: ../src/editor.c:599 msgid "Could not save the configuration" msgstr "Erreur lors de la sauvegarde de la configuration" -#: ../src/editor.c:609 ../src/editor.c:618 ../src/editor.c:1007 -#: ../src/editor.c:1013 +#: ../src/editor.c:617 ../src/editor.c:626 ../src/editor.c:1015 +#: ../src/editor.c:1021 msgid "Question" msgstr "Question" -#: ../src/editor.c:644 ../src/editor.c:648 +#: ../src/editor.c:652 ../src/editor.c:656 msgid "Error" msgstr "Erreur" -#: ../src/editor.c:678 ../src/editor.c:832 +#: ../src/editor.c:686 ../src/editor.c:840 msgid "" "There are unsaved changes.\n" "Discard or save them?" @@ -215,75 +219,83 @@ msgstr "" "Il y a des changements non enregistrés.\n" "Abandonner ou enregistrer ?" -#: ../src/editor.c:790 +#: ../src/editor.c:798 msgid "Insert file..." msgstr "Insérer un fichier..." -#: ../src/editor.c:796 ../src/editor.c:916 +#: ../src/editor.c:804 ../src/editor.c:924 msgid "Text files" msgstr "Fichiers texte" -#: ../src/editor.c:800 ../src/editor.c:920 +#: ../src/editor.c:808 ../src/editor.c:928 msgid "All files" msgstr "Tous les fichiers" -#: ../src/editor.c:838 +#: ../src/editor.c:846 msgid "Discard" msgstr "Abandonner" -#: ../src/editor.c:910 +#: ../src/editor.c:918 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/editor.c:979 ../src/editor.c:985 +#: ../src/editor.c:987 ../src/editor.c:993 msgid "Partial write" msgstr "Écriture partielle" -#: ../src/editor.c:1012 +#: ../src/editor.c:1020 msgid "This file already exists. Overwrite?" msgstr "Le fichier existe déjà. L'écraser ?" -#: ../src/editor.c:1034 +#: ../src/editor.c:1042 msgid "Save as..." msgstr "Enregistrer sous..." -#: ../src/editor.c:1089 +#: ../src/editor.c:1097 msgid "Text editor preferences" msgstr "Préférences de l'éditeur de texte" -#: ../src/editor.c:1106 +#: ../src/editor.c:1114 msgid "Font:" msgstr "Police :" -#: ../src/editor.c:1116 +#: ../src/editor.c:1124 msgid "Wrap mode:" msgstr "Retour à la ligne :" -#: ../src/editor.c:1213 +#: ../src/editor.c:1221 #, c-format msgid "Properties of %s" msgstr "Propriétés de %s" -#: ../src/editor.c:1239 +#: ../src/editor.c:1247 msgid "Filename:" msgstr "Nom du fichier :" -#: ../src/editor.c:1246 +#: ../src/editor.c:1254 msgid "Characters:" msgstr "Caractères :" -#: ../src/editor.c:1253 +#: ../src/editor.c:1261 msgid "Lines:" msgstr "Lignes :" -#: ../src/editor.c:1309 +#: ../src/editor.c:1317 msgid "Could not update the filename" msgstr "Erreur lors de la mise à jour du nom de fichier" -#: ../src/editor.c:1448 +#: ../src/editor.c:1469 msgid "Text not found" msgstr "Texte non trouvé" +#: ../src/editor.c:1490 +msgid "Unsaved changes" +msgstr "Changements non sauvegardés" + +#: ../src/editor.c:1492 +msgid "Saved" +msgstr "Sauvegardé" + #: ../src/main.c:111 ../tools/filter.c:157 #, c-format msgid "" diff --git a/po/it.po b/po/it.po index fd3801e..8bbab60 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-06 05:41+0200\n" +"POT-Creation-Date: 2014-04-06 05:57+0200\n" "PO-Revision-Date: 2010-04-09 16:43+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -165,122 +165,134 @@ msgstr "" msgid "words then characters" msgstr "" -#: ../src/editor.c:374 +#: ../src/editor.c:380 msgid "Find:" msgstr "Trova:" -#: ../src/editor.c:395 +#: ../src/editor.c:401 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:397 +#: ../src/editor.c:403 msgid "Wrap" msgstr "" -#: ../src/editor.c:431 +#: ../src/editor.c:423 ../src/editor.c:1494 +msgid "Ready" +msgstr "" + +#: ../src/editor.c:439 msgid "Text editor - " msgstr "" -#: ../src/editor.c:432 +#: ../src/editor.c:440 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:543 +#: ../src/editor.c:551 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:550 +#: ../src/editor.c:558 msgid "translator-credits" msgstr "" -#: ../src/editor.c:591 +#: ../src/editor.c:599 msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:609 ../src/editor.c:618 ../src/editor.c:1007 -#: ../src/editor.c:1013 +#: ../src/editor.c:617 ../src/editor.c:626 ../src/editor.c:1015 +#: ../src/editor.c:1021 msgid "Question" msgstr "" -#: ../src/editor.c:644 ../src/editor.c:648 +#: ../src/editor.c:652 ../src/editor.c:656 msgid "Error" msgstr "" -#: ../src/editor.c:678 ../src/editor.c:832 +#: ../src/editor.c:686 ../src/editor.c:840 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:790 +#: ../src/editor.c:798 msgid "Insert file..." msgstr "" -#: ../src/editor.c:796 ../src/editor.c:916 +#: ../src/editor.c:804 ../src/editor.c:924 msgid "Text files" msgstr "" -#: ../src/editor.c:800 ../src/editor.c:920 +#: ../src/editor.c:808 ../src/editor.c:928 msgid "All files" msgstr "" -#: ../src/editor.c:838 +#: ../src/editor.c:846 msgid "Discard" msgstr "Scarta" -#: ../src/editor.c:910 +#: ../src/editor.c:918 msgid "Open file..." msgstr "" -#: ../src/editor.c:979 ../src/editor.c:985 +#: ../src/editor.c:987 ../src/editor.c:993 msgid "Partial write" msgstr "" -#: ../src/editor.c:1012 +#: ../src/editor.c:1020 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:1034 +#: ../src/editor.c:1042 msgid "Save as..." msgstr "Salva come..." -#: ../src/editor.c:1089 +#: ../src/editor.c:1097 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:1106 +#: ../src/editor.c:1114 msgid "Font:" msgstr "" -#: ../src/editor.c:1116 +#: ../src/editor.c:1124 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1213 +#: ../src/editor.c:1221 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1239 +#: ../src/editor.c:1247 msgid "Filename:" msgstr "" -#: ../src/editor.c:1246 +#: ../src/editor.c:1254 msgid "Characters:" msgstr "" -#: ../src/editor.c:1253 +#: ../src/editor.c:1261 msgid "Lines:" msgstr "" -#: ../src/editor.c:1309 +#: ../src/editor.c:1317 msgid "Could not update the filename" msgstr "" -#: ../src/editor.c:1448 +#: ../src/editor.c:1469 msgid "Text not found" msgstr "" +#: ../src/editor.c:1490 +msgid "Unsaved changes" +msgstr "" + +#: ../src/editor.c:1492 +msgid "Saved" +msgstr "" + #: ../src/main.c:111 ../tools/filter.c:157 #, c-format msgid "" -- 2.20.1 From 47c7dee478a6cfc3bb0fcb4ee4032565cdf816dd Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 06:09:44 +0200 Subject: [PATCH 13/16] Added a manual page for filter(1) --- Makefile | 1 + doc/Makefile | 16 +++++++-- doc/editor.xml | 9 +++++ doc/filter.xml | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ doc/project.conf | 16 +++++++-- 5 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 doc/filter.xml diff --git a/Makefile b/Makefile index d0cc851..8ebb66c 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ dist: $(PACKAGE)-$(VERSION)/doc/Makefile \ $(PACKAGE)-$(VERSION)/doc/docbook.sh \ $(PACKAGE)-$(VERSION)/doc/editor.xml \ + $(PACKAGE)-$(VERSION)/doc/filter.xml \ $(PACKAGE)-$(VERSION)/doc/project.conf \ $(PACKAGE)-$(VERSION)/po/Makefile \ $(PACKAGE)-$(VERSION)/po/gettext.sh \ diff --git a/doc/Makefile b/doc/Makefile index e077114..8c377ca 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,4 +1,4 @@ -TARGETS = editor.1 editor.html +TARGETS = editor.1 editor.html filter.1 filter.html PREFIX = /usr/local DESTDIR = RM = rm -f @@ -15,9 +15,15 @@ editor.1: editor.xml editor.html: editor.xml ./docbook.sh -P "$(PREFIX)" -- "editor.html" +filter.1: filter.xml + ./docbook.sh -P "$(PREFIX)" -- "filter.1" + +filter.html: filter.xml + ./docbook.sh -P "$(PREFIX)" -- "filter.html" + clean: - $(RM) -- $(editor.1_OBJS) $(editor.html_OBJS) - ./docbook.sh -c -P "$(PREFIX)" -- "editor.html" + $(RM) -- $(editor.1_OBJS) $(editor.html_OBJS) $(filter.1_OBJS) $(filter.html_OBJS) + ./docbook.sh -c -P "$(PREFIX)" -- "filter.html" distclean: clean $(RM) -- $(TARGETS) @@ -25,9 +31,13 @@ distclean: clean install: $(TARGETS) ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "editor.1" ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "editor.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "filter.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "filter.html" uninstall: ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "editor.1" ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "editor.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "filter.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "filter.html" .PHONY: all clean distclean install uninstall diff --git a/doc/editor.xml b/doc/editor.xml index ff1da0d..3e4b6b9 100644 --- a/doc/editor.xml +++ b/doc/editor.xml @@ -78,5 +78,14 @@ Issues can be listed and reported at . + + See also + + + filter + 1 + + + diff --git a/doc/filter.xml b/doc/filter.xml new file mode 100644 index 0000000..58190f5 --- /dev/null +++ b/doc/filter.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + +]> + + + &title; + &package; + + + &firstname; + &surname; + Code and documentation. +
+ &email; +
+ + + + 2014 + &firstname; &surname; <&email;> + + + This manual page was written for the DeforaOS project (and may be + used by others). + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU General Public License, + Version 3 as published by the Free Software Foundation. + + + + &name; + §ion; + + + &name; + &purpose; + + + + &name; + command + argument + + + + Description + &name; is a generic UNIX filtering tool. It reads + data from the standard input, creates a temporary file, executes the desired + command (with the absolute filename of the temporary file as the last + argument), and writes the contents of the file to the standard output. + + + Options + The name of a command (and optional arguments) must be supplied directly + on the command line. + + + Bugs + Issues can be listed and reported at . + + + See also + + + editor + 1 + , + + mktemp + 1 + + + + + diff --git a/doc/project.conf b/doc/project.conf index 5eadd04..41c8d51 100644 --- a/doc/project.conf +++ b/doc/project.conf @@ -1,5 +1,5 @@ -targets=editor.1,editor.html -dist=Makefile,docbook.sh,editor.xml +targets=editor.1,editor.html,filter.1,filter.html +dist=Makefile,docbook.sh,editor.xml,filter.xml [editor.1] type=script @@ -12,3 +12,15 @@ type=script script=./docbook.sh install= depends=editor.xml + +[filter.1] +type=script +script=./docbook.sh +install= +depends=filter.xml + +[filter.html] +type=script +script=./docbook.sh +install= +depends=filter.xml -- 2.20.1 From a3b2cff03fc1de9beea23fb8777955a95462d9e8 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 14:19:33 +0200 Subject: [PATCH 14/16] About to release DeforaOS Editor 0.3.0 --- Makefile | 2 +- config.h | 2 +- config.sh | 2 +- po/de.po | 8 ++++---- po/es.po | 8 ++++---- po/fr.po | 4 ++-- po/it.po | 9 ++++----- project.conf | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 8ebb66c..0852b03 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PACKAGE = Editor -VERSION = 0.2.1 +VERSION = 0.3.0 SUBDIRS = data doc po src tools RM = rm -f LN = ln -f diff --git a/config.h b/config.h index b940208..e94a06a 100644 --- a/config.h +++ b/config.h @@ -1,5 +1,5 @@ #define PACKAGE "Editor" -#define VERSION "0.2.1" +#define VERSION "0.3.0" #ifndef PREFIX # define PREFIX "/usr/local" diff --git a/config.sh b/config.sh index c29bb35..6fa7eaa 100644 --- a/config.sh +++ b/config.sh @@ -1,5 +1,5 @@ PACKAGE="Editor" -VERSION="0.2.1" +VERSION="0.3.0" PREFIX="/usr/local" LIBDIR="${PREFIX}/lib" diff --git a/po/de.po b/po/de.po index 226f79f..3d5132e 100644 --- a/po/de.po +++ b/po/de.po @@ -1,20 +1,20 @@ # $Id$ -# Copyright (c) 2010 Pierre Pronchery +# Copyright (c) 2010-2014 Pierre Pronchery # This file is distributed under the same license as the Editor package. # Pierre Pronchery , 2010. # msgid "" msgstr "" -"Project-Id-Version: Editor 0.1.1\n" +"Project-Id-Version: Editor 0.3.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-06 05:57+0200\n" "PO-Revision-Date: 2010-04-07 22:05+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../src/editor.c:108 msgid "_New" diff --git a/po/es.po b/po/es.po index 2d143e9..8df1262 100644 --- a/po/es.po +++ b/po/es.po @@ -1,20 +1,20 @@ # $Id$ -# Copyright (c) 2010 Pierre Pronchery +# Copyright (c) 2010-2014 Pierre Pronchery # This file is distributed under the same license as the Editor package. # Pierre Pronchery , 2010. # msgid "" msgstr "" -"Project-Id-Version: Editor 0.1.1\n" +"Project-Id-Version: Editor 0.3.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-06 05:57+0200\n" "PO-Revision-Date: 2010-04-07 22:07+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../src/editor.c:108 msgid "_New" diff --git a/po/fr.po b/po/fr.po index e57a075..96ad3f4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,11 +1,11 @@ # $Id$ -# Copyright (c) 2010 Pierre Pronchery +# Copyright (c) 2010-2014 Pierre Pronchery # This file is distributed under the same license as the Editor package. # Pierre Pronchery , 2010. # msgid "" msgstr "" -"Project-Id-Version: Editor 0.1.1\n" +"Project-Id-Version: Editor 0.3.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-06 05:57+0200\n" "PO-Revision-Date: 2010-04-11 12:32+0200\n" diff --git a/po/it.po b/po/it.po index 8bbab60..cca8731 100644 --- a/po/it.po +++ b/po/it.po @@ -1,21 +1,20 @@ # $Id$ -# Traduzioni italiane per il pacchetto Editor. -# Copyright (c) 2010 Pierre Pronchery +# Copyright (c) 2010-2014 Pierre Pronchery # This file is distributed under the same license as the Editor package. # Pierre Pronchery , 2010. # msgid "" msgstr "" -"Project-Id-Version: Editor 0.1.1\n" +"Project-Id-Version: Editor 0.3.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-06 05:57+0200\n" "PO-Revision-Date: 2010-04-09 16:43+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../src/editor.c:108 msgid "_New" diff --git a/project.conf b/project.conf index 8abab08..bc7a7b6 100644 --- a/project.conf +++ b/project.conf @@ -1,5 +1,5 @@ package=Editor -version=0.2.1 +version=0.3.0 config=h,sh subdirs=data,doc,po,src,tools -- 2.20.1 From 88ecab3fe7d939d2aef5baf4ade165a3846a8cf2 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 15:57:25 +0200 Subject: [PATCH 15/16] Avoid some warnings when building with Gtk+ >= 3.0 --- src/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/editor.c b/src/editor.c index 4620e28..ee15c47 100644 --- a/src/editor.c +++ b/src/editor.c @@ -328,7 +328,11 @@ Editor * editor_new(EditorPrefs * prefs) G_CALLBACK(on_closex), editor); editor->bold = pango_font_description_new(); pango_font_description_set_weight(editor->bold, PANGO_WEIGHT_BOLD); +#if GTK_CHECK_VERSION(3, 0, 0) + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); +#else vbox = gtk_vbox_new(FALSE, 0); +#endif /* menubar */ #ifndef EMBEDDED widget = desktop_menubar_create(editor->prefs.filter @@ -374,7 +378,11 @@ Editor * editor_new(EditorPrefs * prefs) gtk_container_add(GTK_CONTAINER(widget), editor->view); gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0); /* find */ +#if GTK_CHECK_VERSION(3, 0, 0) + editor->fi_dialog = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); +#else editor->fi_dialog = gtk_hbox_new(FALSE, 4); +#endif hbox = editor->fi_dialog; gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); widget = gtk_label_new(_("Find:")); @@ -1110,7 +1118,11 @@ void editor_show_preferences(Editor * editor, gboolean show) #endif group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* font */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); +#else hbox = gtk_hbox_new(FALSE, 4); +#endif widget = gtk_label_new(_("Font:")); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_size_group_add_widget(group, widget); @@ -1120,7 +1132,11 @@ void editor_show_preferences(Editor * editor, gboolean show) gtk_box_pack_start(GTK_BOX(hbox), editor->pr_font, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); /* wrap mode */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); +#else hbox = gtk_hbox_new(FALSE, 4); +#endif widget = gtk_label_new(_("Wrap mode:")); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_size_group_add_widget(group, widget); @@ -1272,7 +1288,11 @@ static GtkWidget * _properties_widget(Editor * editor, GtkSizeGroup * group, GtkWidget * hbox; GtkWidget * widget; +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); +#else hbox = gtk_hbox_new(FALSE, 4); +#endif widget = gtk_label_new(label); gtk_widget_modify_font(widget, editor->bold); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); -- 2.20.1 From 801b3e3d477cb9dcf8ba20d1dbee632412de8c4f Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 6 Apr 2014 15:57:47 +0200 Subject: [PATCH 16/16] Updated the translations --- po/de.po | 66 ++++++++++++++++++++++++++++---------------------------- po/es.po | 66 ++++++++++++++++++++++++++++---------------------------- po/fr.po | 66 ++++++++++++++++++++++++++++---------------------------- po/it.po | 66 ++++++++++++++++++++++++++++---------------------------- 4 files changed, 132 insertions(+), 132 deletions(-) diff --git a/po/de.po b/po/de.po index 3d5132e..4a2d053 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-06 05:57+0200\n" +"POT-Creation-Date: 2014-04-06 15:57+0200\n" "PO-Revision-Date: 2010-04-07 22:05+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -164,131 +164,131 @@ msgstr "wörte" msgid "words then characters" msgstr "" -#: ../src/editor.c:380 +#: ../src/editor.c:388 msgid "Find:" msgstr "Suchen:" -#: ../src/editor.c:401 +#: ../src/editor.c:409 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:403 +#: ../src/editor.c:411 msgid "Wrap" msgstr "" -#: ../src/editor.c:423 ../src/editor.c:1494 +#: ../src/editor.c:431 ../src/editor.c:1514 msgid "Ready" msgstr "" -#: ../src/editor.c:439 +#: ../src/editor.c:447 msgid "Text editor - " msgstr "" -#: ../src/editor.c:440 +#: ../src/editor.c:448 msgid "(Untitled)" msgstr "(Unbenannt)" -#: ../src/editor.c:551 +#: ../src/editor.c:559 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:558 +#: ../src/editor.c:566 msgid "translator-credits" msgstr "Pierre Pronchery " -#: ../src/editor.c:599 +#: ../src/editor.c:607 msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:617 ../src/editor.c:626 ../src/editor.c:1015 -#: ../src/editor.c:1021 +#: ../src/editor.c:625 ../src/editor.c:634 ../src/editor.c:1023 +#: ../src/editor.c:1029 msgid "Question" msgstr "Frage" -#: ../src/editor.c:652 ../src/editor.c:656 +#: ../src/editor.c:660 ../src/editor.c:664 msgid "Error" msgstr "Fehler" -#: ../src/editor.c:686 ../src/editor.c:840 +#: ../src/editor.c:694 ../src/editor.c:848 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:798 +#: ../src/editor.c:806 msgid "Insert file..." msgstr "Datei einfügen..." -#: ../src/editor.c:804 ../src/editor.c:924 +#: ../src/editor.c:812 ../src/editor.c:932 msgid "Text files" msgstr "Text Dateien" -#: ../src/editor.c:808 ../src/editor.c:928 +#: ../src/editor.c:816 ../src/editor.c:936 msgid "All files" msgstr "Alle Dateien" -#: ../src/editor.c:846 +#: ../src/editor.c:854 msgid "Discard" msgstr "Verwerfen" -#: ../src/editor.c:918 +#: ../src/editor.c:926 msgid "Open file..." msgstr "Offnen..." -#: ../src/editor.c:987 ../src/editor.c:993 +#: ../src/editor.c:995 ../src/editor.c:1001 msgid "Partial write" msgstr "" -#: ../src/editor.c:1020 +#: ../src/editor.c:1028 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:1042 +#: ../src/editor.c:1050 msgid "Save as..." msgstr "Speichern unter..." -#: ../src/editor.c:1097 +#: ../src/editor.c:1105 msgid "Text editor preferences" msgstr "Text Editor Einstellungen" -#: ../src/editor.c:1114 +#: ../src/editor.c:1126 msgid "Font:" msgstr "" -#: ../src/editor.c:1124 +#: ../src/editor.c:1140 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1221 +#: ../src/editor.c:1237 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1247 +#: ../src/editor.c:1263 msgid "Filename:" msgstr "" -#: ../src/editor.c:1254 +#: ../src/editor.c:1270 msgid "Characters:" msgstr "" -#: ../src/editor.c:1261 +#: ../src/editor.c:1277 msgid "Lines:" msgstr "" -#: ../src/editor.c:1317 +#: ../src/editor.c:1337 msgid "Could not update the filename" msgstr "" -#: ../src/editor.c:1469 +#: ../src/editor.c:1489 msgid "Text not found" msgstr "" -#: ../src/editor.c:1490 +#: ../src/editor.c:1510 msgid "Unsaved changes" msgstr "" -#: ../src/editor.c:1492 +#: ../src/editor.c:1512 msgid "Saved" msgstr "Gespeichert" diff --git a/po/es.po b/po/es.po index 8df1262..3ef62a8 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-06 05:57+0200\n" +"POT-Creation-Date: 2014-04-06 15:57+0200\n" "PO-Revision-Date: 2010-04-07 22:07+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -164,131 +164,131 @@ msgstr "" msgid "words then characters" msgstr "" -#: ../src/editor.c:380 +#: ../src/editor.c:388 msgid "Find:" msgstr "Buscar:" -#: ../src/editor.c:401 +#: ../src/editor.c:409 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:403 +#: ../src/editor.c:411 msgid "Wrap" msgstr "" -#: ../src/editor.c:423 ../src/editor.c:1494 +#: ../src/editor.c:431 ../src/editor.c:1514 msgid "Ready" msgstr "" -#: ../src/editor.c:439 +#: ../src/editor.c:447 msgid "Text editor - " msgstr "" -#: ../src/editor.c:440 +#: ../src/editor.c:448 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:551 +#: ../src/editor.c:559 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:558 +#: ../src/editor.c:566 msgid "translator-credits" msgstr "" -#: ../src/editor.c:599 +#: ../src/editor.c:607 msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:617 ../src/editor.c:626 ../src/editor.c:1015 -#: ../src/editor.c:1021 +#: ../src/editor.c:625 ../src/editor.c:634 ../src/editor.c:1023 +#: ../src/editor.c:1029 msgid "Question" msgstr "" -#: ../src/editor.c:652 ../src/editor.c:656 +#: ../src/editor.c:660 ../src/editor.c:664 msgid "Error" msgstr "" -#: ../src/editor.c:686 ../src/editor.c:840 +#: ../src/editor.c:694 ../src/editor.c:848 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:798 +#: ../src/editor.c:806 msgid "Insert file..." msgstr "" -#: ../src/editor.c:804 ../src/editor.c:924 +#: ../src/editor.c:812 ../src/editor.c:932 msgid "Text files" msgstr "" -#: ../src/editor.c:808 ../src/editor.c:928 +#: ../src/editor.c:816 ../src/editor.c:936 msgid "All files" msgstr "" -#: ../src/editor.c:846 +#: ../src/editor.c:854 msgid "Discard" msgstr "Descartar" -#: ../src/editor.c:918 +#: ../src/editor.c:926 msgid "Open file..." msgstr "" -#: ../src/editor.c:987 ../src/editor.c:993 +#: ../src/editor.c:995 ../src/editor.c:1001 msgid "Partial write" msgstr "" -#: ../src/editor.c:1020 +#: ../src/editor.c:1028 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:1042 +#: ../src/editor.c:1050 msgid "Save as..." msgstr "Guardar como..." -#: ../src/editor.c:1097 +#: ../src/editor.c:1105 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:1114 +#: ../src/editor.c:1126 msgid "Font:" msgstr "" -#: ../src/editor.c:1124 +#: ../src/editor.c:1140 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1221 +#: ../src/editor.c:1237 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1247 +#: ../src/editor.c:1263 msgid "Filename:" msgstr "" -#: ../src/editor.c:1254 +#: ../src/editor.c:1270 msgid "Characters:" msgstr "" -#: ../src/editor.c:1261 +#: ../src/editor.c:1277 msgid "Lines:" msgstr "" -#: ../src/editor.c:1317 +#: ../src/editor.c:1337 msgid "Could not update the filename" msgstr "" -#: ../src/editor.c:1469 +#: ../src/editor.c:1489 msgid "Text not found" msgstr "" -#: ../src/editor.c:1490 +#: ../src/editor.c:1510 msgid "Unsaved changes" msgstr "" -#: ../src/editor.c:1492 +#: ../src/editor.c:1512 msgid "Saved" msgstr "" diff --git a/po/fr.po b/po/fr.po index 96ad3f4..1de434b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-06 05:57+0200\n" +"POT-Creation-Date: 2014-04-06 15:57+0200\n" "PO-Revision-Date: 2010-04-11 12:32+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -164,54 +164,54 @@ msgstr "mots" msgid "words then characters" msgstr "mots puis caractères" -#: ../src/editor.c:380 +#: ../src/editor.c:388 msgid "Find:" msgstr "Chercher :" -#: ../src/editor.c:401 +#: ../src/editor.c:409 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/editor.c:403 +#: ../src/editor.c:411 msgid "Wrap" msgstr "Boucler" -#: ../src/editor.c:423 ../src/editor.c:1494 +#: ../src/editor.c:431 ../src/editor.c:1514 msgid "Ready" msgstr "Prêt" -#: ../src/editor.c:439 +#: ../src/editor.c:447 msgid "Text editor - " msgstr "Éditeur de texte - " -#: ../src/editor.c:440 +#: ../src/editor.c:448 msgid "(Untitled)" msgstr "(Sans titre)" -#: ../src/editor.c:551 +#: ../src/editor.c:559 msgid "Text editor for the DeforaOS desktop" msgstr "Éditeur de texte pour l'environnement DeforaOS" -#: ../src/editor.c:558 +#: ../src/editor.c:566 msgid "translator-credits" msgstr "" "Calimero \n" "Pierre Pronchery " -#: ../src/editor.c:599 +#: ../src/editor.c:607 msgid "Could not save the configuration" msgstr "Erreur lors de la sauvegarde de la configuration" -#: ../src/editor.c:617 ../src/editor.c:626 ../src/editor.c:1015 -#: ../src/editor.c:1021 +#: ../src/editor.c:625 ../src/editor.c:634 ../src/editor.c:1023 +#: ../src/editor.c:1029 msgid "Question" msgstr "Question" -#: ../src/editor.c:652 ../src/editor.c:656 +#: ../src/editor.c:660 ../src/editor.c:664 msgid "Error" msgstr "Erreur" -#: ../src/editor.c:686 ../src/editor.c:840 +#: ../src/editor.c:694 ../src/editor.c:848 msgid "" "There are unsaved changes.\n" "Discard or save them?" @@ -219,80 +219,80 @@ msgstr "" "Il y a des changements non enregistrés.\n" "Abandonner ou enregistrer ?" -#: ../src/editor.c:798 +#: ../src/editor.c:806 msgid "Insert file..." msgstr "Insérer un fichier..." -#: ../src/editor.c:804 ../src/editor.c:924 +#: ../src/editor.c:812 ../src/editor.c:932 msgid "Text files" msgstr "Fichiers texte" -#: ../src/editor.c:808 ../src/editor.c:928 +#: ../src/editor.c:816 ../src/editor.c:936 msgid "All files" msgstr "Tous les fichiers" -#: ../src/editor.c:846 +#: ../src/editor.c:854 msgid "Discard" msgstr "Abandonner" -#: ../src/editor.c:918 +#: ../src/editor.c:926 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/editor.c:987 ../src/editor.c:993 +#: ../src/editor.c:995 ../src/editor.c:1001 msgid "Partial write" msgstr "Écriture partielle" -#: ../src/editor.c:1020 +#: ../src/editor.c:1028 msgid "This file already exists. Overwrite?" msgstr "Le fichier existe déjà. L'écraser ?" -#: ../src/editor.c:1042 +#: ../src/editor.c:1050 msgid "Save as..." msgstr "Enregistrer sous..." -#: ../src/editor.c:1097 +#: ../src/editor.c:1105 msgid "Text editor preferences" msgstr "Préférences de l'éditeur de texte" -#: ../src/editor.c:1114 +#: ../src/editor.c:1126 msgid "Font:" msgstr "Police :" -#: ../src/editor.c:1124 +#: ../src/editor.c:1140 msgid "Wrap mode:" msgstr "Retour à la ligne :" -#: ../src/editor.c:1221 +#: ../src/editor.c:1237 #, c-format msgid "Properties of %s" msgstr "Propriétés de %s" -#: ../src/editor.c:1247 +#: ../src/editor.c:1263 msgid "Filename:" msgstr "Nom du fichier :" -#: ../src/editor.c:1254 +#: ../src/editor.c:1270 msgid "Characters:" msgstr "Caractères :" -#: ../src/editor.c:1261 +#: ../src/editor.c:1277 msgid "Lines:" msgstr "Lignes :" -#: ../src/editor.c:1317 +#: ../src/editor.c:1337 msgid "Could not update the filename" msgstr "Erreur lors de la mise à jour du nom de fichier" -#: ../src/editor.c:1469 +#: ../src/editor.c:1489 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/editor.c:1490 +#: ../src/editor.c:1510 msgid "Unsaved changes" msgstr "Changements non sauvegardés" -#: ../src/editor.c:1492 +#: ../src/editor.c:1512 msgid "Saved" msgstr "Sauvegardé" diff --git a/po/it.po b/po/it.po index cca8731..400ae5f 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-06 05:57+0200\n" +"POT-Creation-Date: 2014-04-06 15:57+0200\n" "PO-Revision-Date: 2010-04-09 16:43+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -164,131 +164,131 @@ msgstr "" msgid "words then characters" msgstr "" -#: ../src/editor.c:380 +#: ../src/editor.c:388 msgid "Find:" msgstr "Trova:" -#: ../src/editor.c:401 +#: ../src/editor.c:409 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:403 +#: ../src/editor.c:411 msgid "Wrap" msgstr "" -#: ../src/editor.c:423 ../src/editor.c:1494 +#: ../src/editor.c:431 ../src/editor.c:1514 msgid "Ready" msgstr "" -#: ../src/editor.c:439 +#: ../src/editor.c:447 msgid "Text editor - " msgstr "" -#: ../src/editor.c:440 +#: ../src/editor.c:448 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:551 +#: ../src/editor.c:559 msgid "Text editor for the DeforaOS desktop" msgstr "" -#: ../src/editor.c:558 +#: ../src/editor.c:566 msgid "translator-credits" msgstr "" -#: ../src/editor.c:599 +#: ../src/editor.c:607 msgid "Could not save the configuration" msgstr "" -#: ../src/editor.c:617 ../src/editor.c:626 ../src/editor.c:1015 -#: ../src/editor.c:1021 +#: ../src/editor.c:625 ../src/editor.c:634 ../src/editor.c:1023 +#: ../src/editor.c:1029 msgid "Question" msgstr "" -#: ../src/editor.c:652 ../src/editor.c:656 +#: ../src/editor.c:660 ../src/editor.c:664 msgid "Error" msgstr "" -#: ../src/editor.c:686 ../src/editor.c:840 +#: ../src/editor.c:694 ../src/editor.c:848 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:798 +#: ../src/editor.c:806 msgid "Insert file..." msgstr "" -#: ../src/editor.c:804 ../src/editor.c:924 +#: ../src/editor.c:812 ../src/editor.c:932 msgid "Text files" msgstr "" -#: ../src/editor.c:808 ../src/editor.c:928 +#: ../src/editor.c:816 ../src/editor.c:936 msgid "All files" msgstr "" -#: ../src/editor.c:846 +#: ../src/editor.c:854 msgid "Discard" msgstr "Scarta" -#: ../src/editor.c:918 +#: ../src/editor.c:926 msgid "Open file..." msgstr "" -#: ../src/editor.c:987 ../src/editor.c:993 +#: ../src/editor.c:995 ../src/editor.c:1001 msgid "Partial write" msgstr "" -#: ../src/editor.c:1020 +#: ../src/editor.c:1028 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:1042 +#: ../src/editor.c:1050 msgid "Save as..." msgstr "Salva come..." -#: ../src/editor.c:1097 +#: ../src/editor.c:1105 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:1114 +#: ../src/editor.c:1126 msgid "Font:" msgstr "" -#: ../src/editor.c:1124 +#: ../src/editor.c:1140 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1221 +#: ../src/editor.c:1237 #, c-format msgid "Properties of %s" msgstr "" -#: ../src/editor.c:1247 +#: ../src/editor.c:1263 msgid "Filename:" msgstr "" -#: ../src/editor.c:1254 +#: ../src/editor.c:1270 msgid "Characters:" msgstr "" -#: ../src/editor.c:1261 +#: ../src/editor.c:1277 msgid "Lines:" msgstr "" -#: ../src/editor.c:1317 +#: ../src/editor.c:1337 msgid "Could not update the filename" msgstr "" -#: ../src/editor.c:1469 +#: ../src/editor.c:1489 msgid "Text not found" msgstr "" -#: ../src/editor.c:1490 +#: ../src/editor.c:1510 msgid "Unsaved changes" msgstr "" -#: ../src/editor.c:1492 +#: ../src/editor.c:1512 msgid "Saved" msgstr "" -- 2.20.1