From ee696013acaefd9c3a1bd8e2bd7569da762e39bc Mon Sep 17 00:00:00 2001 From: Denis Auroux Date: Mon, 16 Apr 2018 14:23:05 -0700 Subject: [PATCH 1/7] Fix sporadic wrong detection of auto-save restores and creation of randomly named files when opening files from recently opened list --- po/ChangeLog | 1 + src/xo-file.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/po/ChangeLog b/po/ChangeLog index 5dd583fc..2fc4ee2b 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,4 @@ +- added Russian translation (Igor Nedoboy) - updated Italian translation (Marco Ciampa) Version 0.4.8: diff --git a/src/xo-file.c b/src/xo-file.c index 4b8b5b2f..a3ae3193 100644 --- a/src/xo-file.c +++ b/src/xo-file.c @@ -1169,7 +1169,6 @@ gboolean open_journal(char *filename) ui.layerno = ui.cur_page->nlayers-1; ui.cur_layer = (struct Layer *)(g_list_last(ui.cur_page->layers)->data); ui.zoom = ui.startup_zoom; - update_file_name(g_strdup(filename)); gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); make_canvas_items(); update_page_stuff(); @@ -1196,6 +1195,10 @@ gboolean open_journal(char *filename) } else ui.saved = TRUE; + update_file_name(g_strdup(filename)); /* postpone till now, as it + may corrupt the contents of filename if it was in MRU data -- updating the MRU + causes redundant MRU entries to get free()'d */ + g_free(filename_actual); ui.need_autosave = !ui.saved; return TRUE; From c7fee59f1bd357fcdfde30cb8181f2504eb1f671 Mon Sep 17 00:00:00 2001 From: Denis Auroux Date: Fri, 1 Jun 2018 10:33:38 -0700 Subject: [PATCH 2/7] Install html documentation in docdir/htmldir instead of html-doc --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c0d5b91..6c425738 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,14 +18,14 @@ install-data-local: done \ fi; \ if test -d $(srcdir)/html-doc; then \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html-doc; \ + $(mkinstalldirs) $(DESTDIR)$(htmldir); \ for docfile in $(srcdir)/html-doc/*; do \ if test -f $$docfile; then \ - $(INSTALL_DATA) $$docfile $(DESTDIR)$(pkgdatadir)/html-doc; \ + $(INSTALL_DATA) $$docfile $(DESTDIR)$(htmldir); \ fi \ done; \ - if test ! -e $(DESTDIR)$(pkgdatadir)/html-doc/pixmaps; then \ - ln -s ../pixmaps $(DESTDIR)$(pkgdatadir)/html-doc/pixmaps; \ + if test ! -e $(DESTDIR)$(htmldir)/pixmaps; then \ + ln -s $(DESTDIR)$(pkgdatadir)/pixmaps $(DESTDIR)$(htmldir)/pixmaps; \ fi \ fi; \ echo "*** Desktop files, icons, MIME types not installed. Run 'make desktop-install'"; \ From 2e969aae4d1760507414cd18315143f82abea04a Mon Sep 17 00:00:00 2001 From: Denis Auroux Date: Fri, 1 Jun 2018 13:22:44 -0700 Subject: [PATCH 3/7] Fix: Install html documentation in docdir/htmldir instead of html-doc --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 6c425738..4c615611 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ install-data-local: fi \ done; \ if test ! -e $(DESTDIR)$(htmldir)/pixmaps; then \ - ln -s $(DESTDIR)$(pkgdatadir)/pixmaps $(DESTDIR)$(htmldir)/pixmaps; \ + ln -s $(pkgdatadir)/pixmaps $(DESTDIR)$(htmldir)/pixmaps; \ fi \ fi; \ echo "*** Desktop files, icons, MIME types not installed. Run 'make desktop-install'"; \ From 07383c0374c644ca3728c9d1b954ec0fd120bc2d Mon Sep 17 00:00:00 2001 From: Denis Auroux Date: Sat, 2 Jun 2018 03:52:49 -0700 Subject: [PATCH 4/7] selection resize snaps to preserve aspect ratio --- ChangeLog | 1 + src/xo-selection.c | 83 ++++++++++++++++++++++++++++++++++++++++++++-- src/xournal.h | 8 ++++- 3 files changed, 89 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5db7598a..d7dc86c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ This version: (use in conjunction with xsetwacom to set RawSample = 1 or 2 until wacom driver fix is committed). - added Russian translation (Igor Nedoboy) + - selection resize snaps to preserve aspect ratio Version 0.4.8.2016 (July 20, 2017 bugfix release): * Bug fixes: diff --git a/src/xo-selection.c b/src/xo-selection.c index 7359bd8c..96a1a567 100644 --- a/src/xo-selection.c +++ b/src/xo-selection.c @@ -279,6 +279,13 @@ void finalize_selectregion(void) /*** moving/resizing the selection ***/ +#define RESIZE_LOCK_NA 0 +#define RESIZE_LOCK_WIDE 1 +#define RESIZE_LOCK_TALL 2 +#define RESIZE_LOCK_BOTH 3 +#define RESIZE_LOCK_TOOWIDE 4 +#define RESIZE_LOCK_TOOTALL 5 + gboolean start_movesel(GdkEvent *event) { double pt[2]; @@ -299,6 +306,7 @@ gboolean start_movesel(GdkEvent *event) ui.selection->move_layer = ui.selection->layer; ui.selection->move_pagedelta = 0.; gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL); + gnome_canvas_item_raise_to_top(ui.selection->canvas_item); update_cursor(); return TRUE; } @@ -339,13 +347,20 @@ gboolean start_resizesel(GdkEvent *event) if (!(ui.selection->resizing_left || ui.selection->resizing_right || ui.selection->resizing_top || ui.selection->resizing_bottom)) return FALSE; - + + if ((ui.selection->resizing_left || ui.selection->resizing_right) && + (ui.selection->resizing_top || ui.selection->resizing_bottom)) + ui.selection->resizing_aspect_lock_mode = RESIZE_LOCK_BOTH; + else + ui.selection->resizing_aspect_lock_mode = RESIZE_LOCK_NA; + ui.cur_item_type = ITEM_RESIZESEL; ui.selection->new_y1 = ui.selection->bbox.top; ui.selection->new_y2 = ui.selection->bbox.bottom; ui.selection->new_x1 = ui.selection->bbox.left; ui.selection->new_x2 = ui.selection->bbox.right; gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL); + gnome_canvas_item_raise_to_top(ui.selection->canvas_item); update_cursor_for_resize(pt); return TRUE; } @@ -487,20 +502,84 @@ void continue_movesel(GdkEvent *event) } } +/* test where we are in relation to a reference line for locking aspect ratio, with tolerance. + Return 1 if we are taller, 0 if we are wider */ +int resize_aspectratio_test(gdouble x, gdouble y, gdouble refx, gdouble refy, + gdouble slope, gdouble margin) +{ + gdouble delta = (y-refy) - slope * (x-refx); + if (slope*(x-refx)<0) delta = -delta; + if (delta > margin*hypot(1., slope)/ui.zoom) return 1; // taller + else return 0; // wider +} + void continue_resizesel(GdkEvent *event) { double pt[2]; + gboolean can_snap, should_snap; + double aspect_orig, aspect_new, aspect_factor; + double height, width, refx, refy; + int *lock_mode = &(ui.selection->resizing_aspect_lock_mode); + guint linecolor; get_pointer_coords(event, pt); + if (*lock_mode != RESIZE_LOCK_NA) { + aspect_orig = (ui.selection->bbox.bottom - ui.selection->bbox.top)/(ui.selection->bbox.right - ui.selection->bbox.left); + if (ui.selection->resizing_top) + { refy = ui.selection->bbox.bottom; aspect_orig = -aspect_orig; } + else refy = ui.selection->bbox.top; + if (ui.selection->resizing_left) + { refx = ui.selection->bbox.right; aspect_orig = -aspect_orig; } + else refx = ui.selection->bbox.left; + + if (resize_aspectratio_test(pt[0], pt[1], refx, refy, aspect_orig*RESIZE_SNAP_TOLERANCE2, RESIZE_SNAP_MARGIN)) + *lock_mode = RESIZE_LOCK_TOOTALL; // disengage + else if (resize_aspectratio_test(pt[0], pt[1], refx, refy, aspect_orig*RESIZE_SNAP_TOLERANCE1, RESIZE_SNAP_MARGIN)) + { + if (*lock_mode == RESIZE_LOCK_TALL) *lock_mode = RESIZE_LOCK_TOOTALL; // disengage on weak lock side + if (*lock_mode == RESIZE_LOCK_WIDE) *lock_mode = RESIZE_LOCK_BOTH; // lock both ways + } + else if (resize_aspectratio_test(pt[0], pt[1], refx, refy, aspect_orig, 0.)) + { + if (*lock_mode == RESIZE_LOCK_TOOWIDE) *lock_mode = RESIZE_LOCK_WIDE; // engage weak locking + } + else if (resize_aspectratio_test(pt[0], pt[1], refx, refy, aspect_orig/RESIZE_SNAP_TOLERANCE1, -RESIZE_SNAP_MARGIN)) + { + if (*lock_mode == RESIZE_LOCK_TOOTALL) *lock_mode = RESIZE_LOCK_TALL; // engage weak locking + } + else if (resize_aspectratio_test(pt[0], pt[1], refx, refy, aspect_orig/RESIZE_SNAP_TOLERANCE2, -RESIZE_SNAP_MARGIN)) + { + if (*lock_mode == RESIZE_LOCK_WIDE) *lock_mode = RESIZE_LOCK_TOOWIDE; // disengage on weak lock side + if (*lock_mode == RESIZE_LOCK_TALL) *lock_mode = RESIZE_LOCK_BOTH; // lock both ways + } + else *lock_mode = RESIZE_LOCK_TOOWIDE; // disengage + } + if (ui.selection->resizing_top) ui.selection->new_y1 = pt[1]; if (ui.selection->resizing_bottom) ui.selection->new_y2 = pt[1]; if (ui.selection->resizing_left) ui.selection->new_x1 = pt[0]; if (ui.selection->resizing_right) ui.selection->new_x2 = pt[0]; + if (*lock_mode == RESIZE_LOCK_WIDE || *lock_mode == RESIZE_LOCK_TALL || *lock_mode == RESIZE_LOCK_BOTH) { + aspect_new = (ui.selection->new_y2-ui.selection->new_y1) / (ui.selection->new_x2-ui.selection->new_x1); + aspect_factor = sqrt(fabs(aspect_new/aspect_orig)); + if (finite(aspect_factor) && aspect_factor > 0.01 && aspect_factor < 100.0) { // avoid NaN's + height = (ui.selection->new_y2-ui.selection->new_y1) / aspect_factor; + width = (ui.selection->new_x2-ui.selection->new_x1) * aspect_factor; + if (ui.selection->resizing_top) ui.selection->new_y1 = ui.selection->new_y2 - height; + if (ui.selection->resizing_bottom) ui.selection->new_y2 = ui.selection->new_y1 + height; + if (ui.selection->resizing_left) ui.selection->new_x1 = ui.selection->new_x2 - width; + if (ui.selection->resizing_right) ui.selection->new_x2 = ui.selection->new_x1 + width; + linecolor = 0xff0000ff; + } + } + else linecolor = 0x000000ff; + gnome_canvas_item_set(ui.selection->canvas_item, "x1", ui.selection->new_x1, "x2", ui.selection->new_x2, - "y1", ui.selection->new_y1, "y2", ui.selection->new_y2, NULL); + "y1", ui.selection->new_y1, "y2", ui.selection->new_y2, + "outline-color-rgba", linecolor, NULL); } void finalize_movesel(void) diff --git a/src/xournal.h b/src/xournal.h index d49cdfc4..f994dc92 100644 --- a/src/xournal.h +++ b/src/xournal.h @@ -61,7 +61,7 @@ #define MAX_ZOOM 20.0 #define DISPLAY_DPI_DEFAULT 96.0 #define MIN_ZOOM 0.2 -#define RESIZE_MARGIN 6.0 +#define RESIZE_MARGIN 10.0 #define MAX_SAFE_RENDER_DPI 720 // max dpi at which PDF bg's get rendered #define VBOX_MAIN_NITEMS 5 // number of interface items in vboxMain @@ -241,12 +241,18 @@ typedef struct Journal { int last_attach_no; // for naming of attached backgrounds } Journal; +// snapping parameters for aspect ratio preserving selection resize +#define RESIZE_SNAP_TOLERANCE1 1.05 +#define RESIZE_SNAP_TOLERANCE2 1.3 +#define RESIZE_SNAP_MARGIN 20.0 + typedef struct Selection { int type; // ITEM_SELECTRECT, ITEM_MOVESEL_VERT, ITEM_SELECTREGION BBox bbox; // the rectangle bbox of the selection struct Layer *layer; // the layer on which the selection lives double anchor_x, anchor_y, last_x, last_y; // for selection motion gboolean resizing_top, resizing_bottom, resizing_left, resizing_right; // for selection resizing + int resizing_aspect_lock_mode; // which way aspect-preserving resize is 'snapping' double new_x1, new_x2, new_y1, new_y2; // for selection resizing GnomeCanvasItem *canvas_item; // if the selection box is on screen GList *items; // the selected items (a list of struct Item) From 0efd9d66058118cef1df5b70efae22286c79524b Mon Sep 17 00:00:00 2001 From: Denis Auroux Date: Fri, 5 Oct 2018 07:29:11 -0400 Subject: [PATCH 5/7] Updated Italian translation (by Marco Ciampa) --- po/it.po | 242 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 141 insertions(+), 101 deletions(-) diff --git a/po/it.po b/po/it.po index 7868cc15..7ee1b3d8 100644 --- a/po/it.po +++ b/po/it.po @@ -2,13 +2,13 @@ # This file is distributed under the same license as the xournal package. # # Marco Poletti , 2009. -# Marco Ciampa , 2017. +# Marco Ciampa , 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-27 10:01+0200\n" -"PO-Revision-Date: 2017-03-27 11:16+0200\n" +"POT-Creation-Date: 2018-10-05 12:04+0200\n" +"PO-Revision-Date: 2018-10-05 12:07+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: Italian tp@lists.linux.it\n" "Language: it\n" @@ -860,7 +860,7 @@ msgstr "Apri appunti" msgid "Xournal files" msgstr "File di Xournal" -#: ../src/xo-callbacks.c:204 ../src/xo-callbacks.c:285 ../src/xo-file.c:1191 +#: ../src/xo-callbacks.c:204 ../src/xo-callbacks.c:285 ../src/xo-file.c:1190 #, c-format msgid "Error saving file '%s'" msgstr "Errore nel salvataggio del file «%s»" @@ -884,7 +884,11 @@ msgid "" "You are about to overwrite the file %s, which you are annotating. This is " "not recommended, and cannot be undone. All existing annotations will become " "permanently part of the background. Are you sure you want to proceed?" -msgstr "Si sta per sovrascrivere il file \"%s\", che si stava annotando. L'operazione non è consigliata e non può essere annullata. Tutte le annotazioni esistenti diverranno permanentemente parte dello sfondo. Sicuri di voler procedere ugualmente?" +msgstr "" +"Si sta per sovrascrivere il file \"%s\", che si stava annotando. " +"L'operazione non è consigliata e non può essere annullata. Tutte le " +"annotazioni esistenti diverranno permanentemente parte dello sfondo. Sicuri " +"di voler procedere ugualmente?" #: ../src/xo-callbacks.c:429 #, c-format @@ -997,94 +1001,103 @@ msgstr "Il file \"%s\" non esiste ancora. Crea un nuovo documento." msgid "Could not open background '%s'." msgstr "Apertura dello sfondo «%s» non riuscita." -#: ../src/xo-file.c:1183 +#: ../src/xo-file.c:1182 msgid "Save this version and delete auto-save?" msgstr "Salvare questa versione ed eliminare la copia autosalvata?" -#: ../src/xo-file.c:1439 +#: ../src/xo-file.c:1442 msgid "Unable to render one or more PDF pages." msgstr "Render di una o più pagine del PDF non riuscito." -#: ../src/xo-file.c:1864 +#: ../src/xo-file.c:1868 msgid " the display resolution, in pixels per inch" msgstr " la risoluzione dello schermo, in pixel per pollice" -#: ../src/xo-file.c:1867 +#: ../src/xo-file.c:1871 msgid " the initial zoom level, in percent" msgstr " il livello iniziale di zoom, in percentuale" -#: ../src/xo-file.c:1870 +#: ../src/xo-file.c:1874 msgid " maximize the window at startup (true/false)" msgstr " massimizza la finestra all'avvio (true/false)" -#: ../src/xo-file.c:1873 +#: ../src/xo-file.c:1877 msgid " start in full screen mode (true/false)" msgstr " avvia in modalità a tutto schermo (true/false)" -#: ../src/xo-file.c:1876 +#: ../src/xo-file.c:1880 msgid " the window width in pixels (when not maximized)" msgstr " la larghezza della finestra in pixel (quando non è massimizzata)" -#: ../src/xo-file.c:1879 +#: ../src/xo-file.c:1883 msgid " the window height in pixels" msgstr " l'altezza della finestra in pixel" -#: ../src/xo-file.c:1882 +#: ../src/xo-file.c:1886 msgid " scrollbar step increment (in pixels)" msgstr " passo di incremento della barra di scorrimento (in pixel)" -#: ../src/xo-file.c:1885 +#: ../src/xo-file.c:1889 msgid " the step increment in the zoom dialog box" msgstr " passo di incremento della finestra di dialogo dello zoom" -#: ../src/xo-file.c:1888 +#: ../src/xo-file.c:1892 msgid " the multiplicative factor for zoom in/out" msgstr " fattore moltiplicativo per lo zoom avanti/indietro" -#: ../src/xo-file.c:1891 +#: ../src/xo-file.c:1895 msgid "" " continuous view (false = one page, true = continuous, horiz = horizontal)" -msgstr " vista continua (false = una pagina, true = continuo, horiz = orizzontale)" +msgstr "" +" vista continua (false = una pagina, true = continuo, horiz = orizzontale)" -#: ../src/xo-file.c:1894 +#: ../src/xo-file.c:1898 msgid " use XInput extensions (true/false)" msgstr " usa le estensioni XInput (true/false)" -#: ../src/xo-file.c:1897 +#: ../src/xo-file.c:1901 msgid " discard Core Pointer events in XInput mode (true/false)" msgstr " scarta gli eventi Core Pointer in modalità XInput (true/false)" -#: ../src/xo-file.c:1900 +#: ../src/xo-file.c:1904 msgid " ignore events from other devices while drawing (true/false)" -msgstr " ignora gli eventi provenienti da altri dispositivi mentre si disegna (true/false)" +msgstr "" +" ignora gli eventi provenienti da altri dispositivi mentre si disegna (true/" +"false)" -#: ../src/xo-file.c:1903 +#: ../src/xo-file.c:1907 msgid "" " do not worry if device reports button isn't pressed while drawing (true/" "false)" -msgstr " non preoccuparti se il dispositivo dichiara che il pulsante non è premuto durante il disegno (true/false)" +msgstr "" +" non preoccuparti se il dispositivo dichiara che il pulsante non è premuto " +"durante il disegno (true/false)" -#: ../src/xo-file.c:1906 +#: ../src/xo-file.c:1910 msgid " always map eraser tip to eraser (true/false)" msgstr " mappa sempre la punta della gomma come gomma (true/false)" -#: ../src/xo-file.c:1909 +#: ../src/xo-file.c:1913 msgid "" " always map touchscreen device to hand tool (true/false) (requires separate " "pen and touch devices)" -msgstr " mappa sempre il dispositivo di tocco allo strumento mano (true/false) (richiede dispositivi penna e tocco separati)" +msgstr "" +" mappa sempre il dispositivo di tocco allo strumento mano (true/false) " +"(richiede dispositivi penna e tocco separati)" -#: ../src/xo-file.c:1912 +#: ../src/xo-file.c:1916 msgid "" " disable touchscreen device when pen is in proximity (true/false) (requires " "separate pen and touch devices)" -msgstr " disabilita il dispositivo di tocco quando la penna è in prossimità (true/false) (richiede dispositivi di penna e tocco separati)" +msgstr "" +" disabilita il dispositivo di tocco quando la penna è in prossimità (true/" +"false) (richiede dispositivi di penna e tocco separati)" -#: ../src/xo-file.c:1915 +#: ../src/xo-file.c:1919 msgid " name of touchscreen device for touchscreen_as_hand_tool" msgstr " nome del dispositivo di tocco per touchscreen_as_hand_tool" -#: ../src/xo-file.c:1918 +#: ../src/xo-file.c:1922 msgid "" " buttons 2 and 3 switch mappings instead of drawing (useful for some " "tablets) (true/false)" @@ -1092,47 +1105,55 @@ msgstr "" " i pulsanti 2 e 3 modificano la mappatura invece di disegnare (utile per " "certe tavolette) (true/false)" -#: ../src/xo-file.c:1921 +#: ../src/xo-file.c:1925 +msgid "" +" fix origin of strokes (devices with unreliable button press coordinates, e." +"g. Lenovo's AES pens) (true/false)" +msgstr " fissa l'origine dei tratteggi (dispositivi con coordinate di pressione non attendibili, per es. le penne Lenovo AES) (true/false)" + +#: ../src/xo-file.c:1928 msgid "" " automatically load filename.pdf.xoj instead of filename.pdf (true/false)" msgstr "" " carica automaticamente il file .pdf.xoj al posto di quello .pdf (true/false)" -#: ../src/xo-file.c:1924 +#: ../src/xo-file.c:1931 msgid "" " when attempting to open a non-existent file, treat it as a new file (true/" "false)" -msgstr " se si tenta di aprire un file non esistente, gestiscilo come nuovo file (true/false)" +msgstr "" +" se si tenta di aprire un file non esistente, gestiscilo come nuovo file " +"(true/false)" -#: ../src/xo-file.c:1927 +#: ../src/xo-file.c:1934 msgid " enable periodic autosaves (true/false)" msgstr " abilita autosalvataggi periodici (true/false)" -#: ../src/xo-file.c:1930 +#: ../src/xo-file.c:1937 msgid " delay for periodic autosaves (in seconds)" msgstr " ritardo per gli autosalvataggi periodici (in secondi)" -#: ../src/xo-file.c:1933 +#: ../src/xo-file.c:1940 msgid " default path for open/save (leave blank for current directory)" msgstr "" " percorso predefinito per l'apertura/salvataggio (lasciare vuoto per " "indicare la cartella corrente)" -#: ../src/xo-file.c:1936 +#: ../src/xo-file.c:1943 msgid " use pressure sensitivity to control pen stroke width (true/false)" msgstr "" " usa il sensore di pressione per controllare la dimensione del tratto (true/" "false)" -#: ../src/xo-file.c:1939 +#: ../src/xo-file.c:1946 msgid " minimum width multiplier" msgstr " moltiplicatore minimo della dimensione del tratto" -#: ../src/xo-file.c:1942 +#: ../src/xo-file.c:1949 msgid " maximum width multiplier" msgstr " moltiplicatore massimo della dimensione del tratto" -#: ../src/xo-file.c:1945 +#: ../src/xo-file.c:1952 msgid "" " interface components from top to bottom\n" " valid values: drawarea menu main_toolbar pen_toolbar statusbar" @@ -1140,21 +1161,21 @@ msgstr "" " componenti dell'interfaccia dall'alto in basso\n" " valori validi: drawarea menu main_toolbar pen_toolbar statusbar" -#: ../src/xo-file.c:1948 +#: ../src/xo-file.c:1955 msgid " interface components in fullscreen mode, from top to bottom" msgstr "" " componenti dell'interfaccia in modalità a tutto shermo, dall'alto in basso" -#: ../src/xo-file.c:1951 +#: ../src/xo-file.c:1958 msgid " interface has left-handed scrollbar (true/false)" msgstr " barra di scorrimento a sinistra nell'interfaccia (true/false)" -#: ../src/xo-file.c:1954 +#: ../src/xo-file.c:1961 msgid " hide some unwanted menu or toolbar items (true/false)" msgstr "" " nascondi alcuni elementi del menu e delle barre degli strumenti (true/false)" -#: ../src/xo-file.c:1957 +#: ../src/xo-file.c:1964 msgid "" " interface items to hide (customize at your own risk!)\n" " see source file xo-interface.c for a list of item names" @@ -1163,7 +1184,7 @@ msgstr "" "pericolo!)\n" " vedere il file sorgente xo-interface.c per la lista dei nomi degli elementi" -#: ../src/xo-file.c:1960 +#: ../src/xo-file.c:1967 msgid "" " highlighter opacity (0 to 1, default 0.5)\n" " warning: opacity level is not saved in xoj files!" @@ -1171,139 +1192,154 @@ msgstr "" " opacità dell'evidenziatore (da 0 a 1, il valore predefinito è 0,5)\n" " attenzione: il livello di opacità non viene salvato nei file xoj!" -#: ../src/xo-file.c:1963 +#: ../src/xo-file.c:1970 msgid " auto-save preferences on exit (true/false)" msgstr " salva automaticamente le impostazioni all'uscita (true/false)" -#: ../src/xo-file.c:1966 +#: ../src/xo-file.c:1973 msgid " force PDF rendering through cairo (slower but nicer) (true/false)" -msgstr " forza il rendering del PDF tramite cairo (più lento ma migliore) (true/false)" +msgstr "" +" forza il rendering del PDF tramite cairo (più lento ma migliore) (true/" +"false)" -#: ../src/xo-file.c:1969 +#: ../src/xo-file.c:1976 msgid " prefer xournal's own PDF code for exporting PDFs (true/false)" -msgstr " preferisce il codice PDF interno per l'esportazione in PDF (true/false)" +msgstr "" +" preferisce il codice PDF interno per l'esportazione in PDF (true/false)" -#: ../src/xo-file.c:1972 +#: ../src/xo-file.c:1979 msgid " export successive layers on separate pages in PDFs (true/false)" msgstr " esporta i livelli successivi su pagine separate PDF (true/false)" -#: ../src/xo-file.c:1976 +#: ../src/xo-file.c:1983 msgid " the default page width, in points (1/72 in)" msgstr " la larghezza predefinita delle pagine, in punti (1/72 di pollice)" -#: ../src/xo-file.c:1979 +#: ../src/xo-file.c:1986 msgid " the default page height, in points (1/72 in)" msgstr " l'altezza predefinita delle pagine, in punti (1/72 di pollice)" -#: ../src/xo-file.c:1982 +#: ../src/xo-file.c:1989 msgid " the default paper color" msgstr " il colore predefinito per la carta" -#: ../src/xo-file.c:1987 +#: ../src/xo-file.c:1994 msgid " the default paper style (plain, lined, ruled, or graph)" msgstr "" " lo stile predefinito per la carta («plain», «lined», «ruled», o «graph»)" -#: ../src/xo-file.c:1990 +#: ../src/xo-file.c:1997 msgid " apply paper style changes to all pages (true/false)" msgstr "" " applica le modifiche allo stile della carta a tutte le pagine (true/false)" -#: ../src/xo-file.c:1993 +#: ../src/xo-file.c:2000 msgid " preferred unit (cm, in, px, pt)" msgstr " unità di misura preferita (cm, in, px o pt)" -#: ../src/xo-file.c:1996 +#: ../src/xo-file.c:2003 msgid " include paper ruling when printing or exporting to PDF (true/false)" msgstr "" " includi le righe della carta quando si stampa o si esporta in PDF (true/" "false)" -#: ../src/xo-file.c:1999 +#: ../src/xo-file.c:2006 msgid "" " when creating a new page, duplicate a PDF or image background instead of " "using default paper (true/false)" -msgstr " se si crea una nuova pagina, duplica il PDF o l'immagine di sfondo invece che usare la carta predefinita (true/false)" +msgstr "" +" se si crea una nuova pagina, duplica il PDF o l'immagine di sfondo invece " +"che usare la carta predefinita (true/false)" -#: ../src/xo-file.c:2002 +#: ../src/xo-file.c:2009 msgid " just-in-time update of page backgrounds (true/false)" msgstr " aggiornamento progressivo dello sfondo delle pagine (true/false)" -#: ../src/xo-file.c:2005 +#: ../src/xo-file.c:2012 msgid "" " bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)" msgstr "" " risoluzione degli sfondi bitmap PS/PDF renderizzati con ghostscript (dpi)" -#: ../src/xo-file.c:2008 +#: ../src/xo-file.c:2015 msgid "" " bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)" msgstr "" " risoluzione degli sfondi bitmap PDF per la stampa con libgnomeprint (dpi)" -#: ../src/xo-file.c:2012 +#: ../src/xo-file.c:2019 msgid "" " selected tool at startup (pen, eraser, highlighter, selectregion, " "selectrect, vertspace, hand, image)" -msgstr " strumento selezionato all'avvio (pen, eraser, highlighter, selectregion, selectrect, vertspace, hand o image, rispettivamente penna, gomma, evidenziatore, selezione regione, selezione rettangolare, spazio verticale, mano o immagine)" +msgstr "" +" strumento selezionato all'avvio (pen, eraser, highlighter, selectregion, " +"selectrect, vertspace, hand o image, rispettivamente penna, gomma, " +"evidenziatore, selezione regione, selezione rettangolare, spazio verticale, " +"mano o immagine)" -#: ../src/xo-file.c:2015 +#: ../src/xo-file.c:2022 msgid " Use the pencil from cursor theme instead of a color dot (true/false)" -msgstr " Usa la matita dal tema del puntatore invece di un punto colorato (true/false)" +msgstr "" +" Usa la matita dal tema del puntatore invece di un punto colorato (true/" +"false)" -#: ../src/xo-file.c:2018 +#: ../src/xo-file.c:2025 msgid " default pen color" msgstr " colore della penna predefinita" -#: ../src/xo-file.c:2023 +#: ../src/xo-file.c:2030 msgid " default pen thickness (fine = 1, medium = 2, thick = 3)" msgstr " dimensione della penna predefinita (1: fine, 2: media, 3: spessa)" -#: ../src/xo-file.c:2026 +#: ../src/xo-file.c:2033 msgid " default pen is in ruler mode (true/false)" msgstr " la penna predefinita è in modalità righello (true/false)" -#: ../src/xo-file.c:2029 +#: ../src/xo-file.c:2036 msgid " default pen is in shape recognizer mode (true/false)" msgstr "" " la penna predefinita è in modalità riconoscimento delle forme (true/false)" -#: ../src/xo-file.c:2032 +#: ../src/xo-file.c:2039 msgid " default eraser thickness (fine = 1, medium = 2, thick = 3)" msgstr " dimensione della gomma predefinita (1: fine, 2: media, 3: spessa)" -#: ../src/xo-file.c:2035 +#: ../src/xo-file.c:2042 msgid " default eraser mode (standard = 0, whiteout = 1, strokes = 2)" msgstr "" " modalità della gomma predefinita (0: normale, 1: bianchetto, 2: cancella " "tratti)" -#: ../src/xo-file.c:2038 +#: ../src/xo-file.c:2045 msgid " default highlighter color" msgstr " colore dell'evidenziatore predefinito" -#: ../src/xo-file.c:2043 +#: ../src/xo-file.c:2050 msgid " default highlighter thickness (fine = 1, medium = 2, thick = 3)" msgstr "" " dimensione dell'evidenziatore predefinito (1: fine, 2: medio, 3: spesso)" -#: ../src/xo-file.c:2046 +#: ../src/xo-file.c:2053 msgid " default highlighter is in ruler mode (true/false)" msgstr " l'evidenziatore predefinito è in modalità righello (true/false)" -#: ../src/xo-file.c:2049 +#: ../src/xo-file.c:2056 msgid " default highlighter is in shape recognizer mode (true/false)" msgstr "" " l'evidenziatore predefinito è in modalità riconoscimento delle forme (true/" "false)" -#: ../src/xo-file.c:2052 +#: ../src/xo-file.c:2059 msgid "" " button 2 tool (pen, eraser, highlighter, text, selectregion, selectrect, " "vertspace, hand, image)" -msgstr " strumento associato al pulsante 2 (pen, eraser, highlighter, text, selecregion, selectrect, vertspace, hand, o image, rispettivamente penna, gomma, evidenziatore, testo, selezione regione, selezione rettangolare, spazio verticale, mano o immagine)" +msgstr "" +" strumento associato al pulsante 2 (pen, eraser, highlighter, text, " +"selecregion, selectrect, vertspace, hand, o image, rispettivamente penna, " +"gomma, evidenziatore, testo, selezione regione, selezione rettangolare, " +"spazio verticale, mano o immagine)" -#: ../src/xo-file.c:2055 +#: ../src/xo-file.c:2062 msgid "" " button 2 brush linked to primary brush (true/false) (overrides all other " "settings)" @@ -1311,93 +1347,97 @@ msgstr "" " il tratto associato al pulsante 2 è collegato al tratto primario (true/" "false) (questa impostazione ha la precedenza sulle altre)" -#: ../src/xo-file.c:2058 +#: ../src/xo-file.c:2065 msgid " button 2 brush color (for pen or highlighter only)" msgstr "" " colore del tratto associato al pulsante 2 (solo per penna e evidenziatore)" -#: ../src/xo-file.c:2065 +#: ../src/xo-file.c:2072 msgid " button 2 brush thickness (pen, eraser, or highlighter only)" msgstr "" " dimensione del tratto associato al pulsante 2 (solo per penna, gomma ed " "evidenziatore)" -#: ../src/xo-file.c:2069 +#: ../src/xo-file.c:2076 msgid " button 2 ruler mode (true/false) (for pen or highlighter only)" msgstr "" " il tratto associato al pulsante 2 è in modalità righello (true/false) (solo " "per penna ed evidenziatore)" -#: ../src/xo-file.c:2073 +#: ../src/xo-file.c:2080 msgid " button 2 shape recognizer mode (true/false) (pen or highlighter only)" msgstr "" " il tratto associato al pulsante 2 è in modalità riconoscimento delle forme " "(true/false) (solo per penna ed evidenziatore)" -#: ../src/xo-file.c:2077 +#: ../src/xo-file.c:2084 msgid " button 2 eraser mode (eraser only)" msgstr " modalità della gomma associata al pulsante 2 (solo per la gomma)" -#: ../src/xo-file.c:2080 +#: ../src/xo-file.c:2087 msgid "" " button 3 tool (pen, eraser, highlighter, text, selectregion, selectrect, " "vertspace, hand, image)" -msgstr " strumento associato al pulsante 3 (pen, eraser, highlighter, text, selectregion, selectrect, vertspace, hand o image)" +msgstr "" +" strumento associato al pulsante 3 (pen, eraser, highlighter, text, " +"selectregion, selectrect, vertspace, hand o image)" -#: ../src/xo-file.c:2083 +#: ../src/xo-file.c:2090 msgid "" " button 3 brush linked to primary brush (true/false) (overrides all other " "settings)" -msgstr " il tratto associato al pulsante 3 è collegato al tratto primario (true/false) (questa impostazione ha la precedenza sulle altre)" +msgstr "" +" il tratto associato al pulsante 3 è collegato al tratto primario (true/" +"false) (questa impostazione ha la precedenza sulle altre)" -#: ../src/xo-file.c:2086 +#: ../src/xo-file.c:2093 msgid " button 3 brush color (for pen or highlighter only)" msgstr "" " colore del tratto associato al pulsante 3 (solo per penna e evidenziatore)" -#: ../src/xo-file.c:2093 +#: ../src/xo-file.c:2100 msgid " button 3 brush thickness (pen, eraser, or highlighter only)" msgstr "" " dimensione del tratto associato al pulsante 3 (solo per penna, gomma ed " "evidenziatore)" -#: ../src/xo-file.c:2097 +#: ../src/xo-file.c:2104 msgid " button 3 ruler mode (true/false) (for pen or highlighter only)" msgstr "" " il tratto associato al pulsante 3 è in modalità righello (true/false) (solo " "per penna ed evidenziatore)" -#: ../src/xo-file.c:2101 +#: ../src/xo-file.c:2108 msgid " button 3 shape recognizer mode (true/false) (pen or highlighter only)" msgstr "" " il tratto associato al pulsante 3 è in modalità riconoscimento delle forme " "(true/false) (solo per penna ed evidenziatore)" -#: ../src/xo-file.c:2105 +#: ../src/xo-file.c:2112 msgid " button 3 eraser mode (eraser only)" msgstr " modalità della gomma assciata al pulsante 3 (solo per la gomma)" -#: ../src/xo-file.c:2109 +#: ../src/xo-file.c:2116 msgid " thickness of the various pens (in points, 1 pt = 1/72 in)" msgstr " larghezza delle varie penne (in punti, 1 pt = 1/72 in)" -#: ../src/xo-file.c:2115 +#: ../src/xo-file.c:2122 msgid " thickness of the various erasers (in points, 1 pt = 1/72 in)" msgstr " larghezza delle varie gomme (in punti, 1 pt = 1/72 in)" -#: ../src/xo-file.c:2120 +#: ../src/xo-file.c:2127 msgid " thickness of the various highlighters (in points, 1 pt = 1/72 in)" msgstr " larghezza dei vari evidenziatori (in punti, 1 pt = 1/72 in)" -#: ../src/xo-file.c:2125 +#: ../src/xo-file.c:2132 msgid " name of the default font" msgstr " nome del carattere predefinito" -#: ../src/xo-file.c:2128 +#: ../src/xo-file.c:2135 msgid " default font size" msgstr " dimensione del carattere predefinito" -#: ../src/xo-file.c:2310 +#: ../src/xo-file.c:2317 msgid "" " Xournal configuration file.\n" " This file is generated automatically upon saving preferences.\n" From a32dea9eecb9ec8cef7612d637f66ef20efc6f91 Mon Sep 17 00:00:00 2001 From: Denis Auroux Date: Thu, 6 Jun 2019 14:35:43 -0400 Subject: [PATCH 6/7] Added Valencian variant of Catalan translation (Alfredo Boix) --- po/ChangeLog | 1 + po/LINGUAS | 1 + po/ca@valencia.po | 1209 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1211 insertions(+) create mode 100644 po/ca@valencia.po diff --git a/po/ChangeLog b/po/ChangeLog index 2fc4ee2b..73f08c88 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,4 @@ +- added Valencian variant of Catalan translation (Alfredo Boix) - added Russian translation (Igor Nedoboy) - updated Italian translation (Marco Ciampa) diff --git a/po/LINGUAS b/po/LINGUAS index 719f7bce..24d53bd6 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,4 +1,5 @@ ca +ca@valencia cs de es diff --git a/po/ca@valencia.po b/po/ca@valencia.po new file mode 100644 index 00000000..ffec98e4 --- /dev/null +++ b/po/ca@valencia.po @@ -0,0 +1,1209 @@ +# Catalan translations for xournal package +# Traduccions al català del paquet «xournal». +# Copyright (C) 2009 THE xournal'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xournal package. +# David Planella , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: xournal 0.4.2.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-02 16:42-0700\n" +"PO-Revision-Date: 2009-05-09 21:36+0200\n" +"Last-Translator: David Planella \n" +"Language-Team: Catalan\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/main.c:65 +#, c-format +msgid "" +"Invalid command line parameters.\n" +"Usage: %s [filename.xoj]\n" +msgstr "" + +#: src/main.c:291 src/xo-callbacks.c:105 src/xo-callbacks.c:156 +#: src/xo-callbacks.c:3126 +#, c-format +msgid "Error opening file '%s'" +msgstr "S'ha produït un error en obrir el fitxer «%s»" + +#: src/xo-interface.c:350 src/xo-interface.c:2951 src/xo-misc.c:1405 +msgid "Xournal" +msgstr "Xournal" + +#: src/xo-interface.c:360 +msgid "_File" +msgstr "_Fitxer" + +#: src/xo-interface.c:371 +msgid "Annotate PD_F" +msgstr "Fes notes a un fitxer PD_F" + +#: src/xo-interface.c:396 +msgid "Recent Doc_uments" +msgstr "Doc_uments recents" + +#: src/xo-interface.c:403 +msgid "0" +msgstr "0" + +#: src/xo-interface.c:407 +msgid "1" +msgstr "1" + +#: src/xo-interface.c:411 +msgid "2" +msgstr "2" + +#: src/xo-interface.c:415 +msgid "3" +msgstr "3" + +#: src/xo-interface.c:419 +msgid "4" +msgstr "4" + +#: src/xo-interface.c:423 +msgid "5" +msgstr "5" + +#: src/xo-interface.c:427 +msgid "6" +msgstr "6" + +#: src/xo-interface.c:431 +msgid "7" +msgstr "7" + +#: src/xo-interface.c:440 +msgid "Print Options" +msgstr "Opcions d'impressió" + +#: src/xo-interface.c:455 +msgid "_Export to PDF" +msgstr "_Exporta a PDF" + +#: src/xo-interface.c:471 +msgid "_Edit" +msgstr "_Edita" + +#: src/xo-interface.c:516 +msgid "_View" +msgstr "_Visualitza" + +#: src/xo-interface.c:523 +msgid "_Continuous" +msgstr "_Continu" + +#: src/xo-interface.c:529 +msgid "_One Page" +msgstr "Pàgina ú_nica" + +#: src/xo-interface.c:540 +msgid "Full Screen" +msgstr "Pantalla completa" + +#: src/xo-interface.c:552 +msgid "_Zoom" +msgstr "_Ampliació" + +#: src/xo-interface.c:580 +msgid "Page _Width" +msgstr "Amplada de la _pàgina" + +#: src/xo-interface.c:591 +msgid "_Set Zoom" +msgstr "_Definix l'ampliació" + +#: src/xo-interface.c:600 +msgid "_First Page" +msgstr "Pàgina _inicial" + +#: src/xo-interface.c:611 +msgid "_Previous Page" +msgstr "Pàgina an_terior" + +#: src/xo-interface.c:622 +msgid "_Next Page" +msgstr "Pàgina _següent" + +#: src/xo-interface.c:633 +msgid "_Last Page" +msgstr "Pàgina _final" + +#: src/xo-interface.c:649 +msgid "_Show Layer" +msgstr "_Mostra la capa" + +#: src/xo-interface.c:657 +msgid "_Hide Layer" +msgstr "_Oculta la capa" + +#: src/xo-interface.c:665 +msgid "_Journal" +msgstr "_Diari" + +#: src/xo-interface.c:672 +msgid "New Page _Before" +msgstr "Pàgina nova a_bans" + +#: src/xo-interface.c:676 +msgid "New Page _After" +msgstr "Pàgina nova _després" + +#: src/xo-interface.c:680 +msgid "New Page At _End" +msgstr "Pàgina nova al _final" + +#: src/xo-interface.c:684 +msgid "_Delete Page" +msgstr "_Suprimix la pàgina" + +#: src/xo-interface.c:693 +msgid "_New Layer" +msgstr "_Capa nova" + +#: src/xo-interface.c:697 +msgid "Delete La_yer" +msgstr "Suprimix la ca_pa" + +#: src/xo-interface.c:701 +msgid "_Flatten" +msgstr "A_plana" + +#: src/xo-interface.c:710 +msgid "Paper Si_ze" +msgstr "Mida del _paper" + +#: src/xo-interface.c:714 +msgid "Paper _Color" +msgstr "_Color del paper" + +#: src/xo-interface.c:721 +msgid "_white paper" +msgstr "paper _blanc" + +#: src/xo-interface.c:727 +msgid "_yellow paper" +msgstr "paper _groc" + +#: src/xo-interface.c:733 +msgid "_pink paper" +msgstr "paper _rosa" + +#: src/xo-interface.c:739 +msgid "_orange paper" +msgstr "paper _taronja" + +#: src/xo-interface.c:745 +msgid "_blue paper" +msgstr "paper _blau" + +#: src/xo-interface.c:751 +msgid "_green paper" +msgstr "paper _verd" + +#: src/xo-interface.c:757 src/xo-interface.c:1025 +msgid "other..." +msgstr "un altre..." + +#: src/xo-interface.c:761 src/xo-interface.c:797 src/xo-interface.c:1029 +#: src/xo-interface.c:1270 src/xo-interface.c:1346 +msgid "NA" +msgstr "" + +#: src/xo-interface.c:766 +msgid "Paper _Style" +msgstr "E_stil del paper" + +#: src/xo-interface.c:773 +msgid "_plain" +msgstr "_llis" + +#: src/xo-interface.c:779 +msgid "_lined" +msgstr "_pautat" + +#: src/xo-interface.c:785 +msgid "_ruled" +msgstr "_reglat" + +#: src/xo-interface.c:791 +msgid "_graph" +msgstr "_quadriculat" + +#: src/xo-interface.c:802 +msgid "Apply _To All Pages" +msgstr "Apli_ca a totes les pàgines" + +#: src/xo-interface.c:811 +msgid "_Load Background" +msgstr "_Carrega un fons" + +#: src/xo-interface.c:819 +msgid "Background Screens_hot" +msgstr "Ca_ptura de pantalla del fons" + +#: src/xo-interface.c:828 +msgid "Default _Paper" +msgstr "Paper p_redeterminat" + +#: src/xo-interface.c:832 +msgid "Set As De_fault" +msgstr "Definix com a _predeterminat" + +#: src/xo-interface.c:836 +msgid "_Tools" +msgstr "Ei_nes" + +#: src/xo-interface.c:843 src/xo-interface.c:1206 src/xo-interface.c:1282 +msgid "_Pen" +msgstr "_Llapis" + +#: src/xo-interface.c:852 src/xo-interface.c:1212 src/xo-interface.c:1288 +msgid "_Eraser" +msgstr "_Esborrador" + +#: src/xo-interface.c:861 src/xo-interface.c:1218 src/xo-interface.c:1294 +msgid "_Highlighter" +msgstr "_Marcador fluorescent" + +#: src/xo-interface.c:870 src/xo-interface.c:1224 src/xo-interface.c:1300 +msgid "_Text" +msgstr "_Text" + +#: src/xo-interface.c:884 +msgid "_Shape Recognizer" +msgstr "_Reconixedor de formes" + +#: src/xo-interface.c:891 +msgid "Ru_ler" +msgstr "Reg_le" + +#: src/xo-interface.c:903 src/xo-interface.c:1230 src/xo-interface.c:1306 +msgid "Select Re_gion" +msgstr "Selecciona una re_gió" + +#: src/xo-interface.c:912 src/xo-interface.c:1236 src/xo-interface.c:1312 +msgid "Select _Rectangle" +msgstr "Selecciona un _rectangle" + +#: src/xo-interface.c:921 src/xo-interface.c:1242 src/xo-interface.c:1318 +msgid "_Vertical Space" +msgstr "Espai _vertical" + +#: src/xo-interface.c:930 src/xo-interface.c:1248 src/xo-interface.c:1324 +msgid "H_and Tool" +msgstr "_Ferramenta de mà" + +#: src/xo-interface.c:943 +msgid "_Color" +msgstr "_Color" + +#: src/xo-interface.c:954 +msgid "blac_k" +msgstr "_negre" + +#: src/xo-interface.c:960 +msgid "_blue" +msgstr "_blau" + +#: src/xo-interface.c:966 +msgid "_red" +msgstr "_vermell" + +#: src/xo-interface.c:972 +msgid "_green" +msgstr "v_erd" + +#: src/xo-interface.c:978 +msgid "gr_ay" +msgstr "gri_s" + +#: src/xo-interface.c:989 +msgid "light bl_ue" +msgstr "blau _cel" + +#: src/xo-interface.c:995 +msgid "light gr_een" +msgstr "ve_rd clar" + +#: src/xo-interface.c:1001 +msgid "_magenta" +msgstr "_magenta" + +#: src/xo-interface.c:1007 +msgid "_orange" +msgstr "taron_ja" + +#: src/xo-interface.c:1013 +msgid "_yellow" +msgstr "gro_c" + +#: src/xo-interface.c:1019 +msgid "_white" +msgstr "b_lanc" + +#: src/xo-interface.c:1034 +msgid "Pen _Options" +msgstr "_Opcions del llapis" + +#: src/xo-interface.c:1041 +msgid "_very fine" +msgstr "mol_t prim" + +#: src/xo-interface.c:1047 src/xo-interface.c:1078 src/xo-interface.c:1126 +msgid "_fine" +msgstr "_prim" + +#: src/xo-interface.c:1053 src/xo-interface.c:1084 src/xo-interface.c:1132 +msgid "_medium" +msgstr "_mitjà" + +#: src/xo-interface.c:1059 src/xo-interface.c:1090 src/xo-interface.c:1138 +msgid "_thick" +msgstr "_gruixut" + +#: src/xo-interface.c:1065 +msgid "ver_y thick" +msgstr "_molt gruixut" + +#: src/xo-interface.c:1071 +msgid "Eraser Optio_ns" +msgstr "Opcions de l'_esborrador" + +#: src/xo-interface.c:1101 +msgid "_standard" +msgstr "e_stàndard" + +#: src/xo-interface.c:1107 +msgid "_whiteout" +msgstr "nete_ja" + +#: src/xo-interface.c:1113 +msgid "_delete strokes" +msgstr "su_primix els traços" + +#: src/xo-interface.c:1119 +msgid "Highlighter Opt_ions" +msgstr "Opc_ions del marcador fluorescent" + +#: src/xo-interface.c:1144 +msgid "Text _Font..." +msgstr "_Tipus de lletra del text..." + +#: src/xo-interface.c:1160 +msgid "_Default Pen" +msgstr "_Llapis predeterminat" + +#: src/xo-interface.c:1164 +msgid "Default Eraser" +msgstr "Esborrador predeterminat" + +#: src/xo-interface.c:1168 +msgid "Default Highlighter" +msgstr "Marcador fluorescent predeterminat" + +#: src/xo-interface.c:1172 +msgid "Default Te_xt" +msgstr "Te_xt predeterminat" + +#: src/xo-interface.c:1176 +msgid "Set As Default" +msgstr "Definix-lo com a predeterminat" + +#: src/xo-interface.c:1180 +msgid "_Options" +msgstr "_Opcions" + +#: src/xo-interface.c:1187 +msgid "Use _XInput" +msgstr "Utilitza l'_XInput" + +#: src/xo-interface.c:1191 +msgid "_Eraser Tip" +msgstr "Utilitza la goma del _llapis" + +#: src/xo-interface.c:1195 +msgid "_Pressure sensitivity" +msgstr "Sensibilitat de la _pressió" + +#: src/xo-interface.c:1199 +msgid "Button _2 Mapping" +msgstr "Mapatge del botó _2" + +#: src/xo-interface.c:1258 src/xo-interface.c:1334 +msgid "_Link to Primary Brush" +msgstr "_Vincula al pinzell primari" + +#: src/xo-interface.c:1264 src/xo-interface.c:1340 +msgid "_Copy of Current Brush" +msgstr "_Copia el pinzell actual" + +#: src/xo-interface.c:1275 +msgid "Button _3 Mapping" +msgstr "Mapatge del botó _3" + +#: src/xo-interface.c:1351 +msgid "Buttons Switch Mappings" +msgstr "" + +#: src/xo-interface.c:1360 +msgid "_Progressive Backgrounds" +msgstr "Fons _progressius" + +#: src/xo-interface.c:1364 +msgid "Print Paper _Ruling" +msgstr "Imprimix les _línies del paper" + +#: src/xo-interface.c:1368 +msgid "Autoload pdf.xoj" +msgstr "" + +#: src/xo-interface.c:1372 +msgid "Left-Handed Scrollbar" +msgstr "Barra de desplaçament per a esquerrans" + +#: src/xo-interface.c:1376 +msgid "Shorten _Menus" +msgstr "Escurça els _menús" + +#: src/xo-interface.c:1385 +msgid "A_uto-Save Preferences" +msgstr "Guarda les preferències a_utomàticament" + +#: src/xo-interface.c:1389 +msgid "_Save Preferences" +msgstr "_Desa les preferències" + +#: src/xo-interface.c:1393 +msgid "_Help" +msgstr "A_juda" + +#: src/xo-interface.c:1404 +msgid "_About" +msgstr "_Quant a" + +#: src/xo-interface.c:1417 +msgid "Save" +msgstr "Guarda" + +#: src/xo-interface.c:1422 +msgid "New" +msgstr "Nova" + +#: src/xo-interface.c:1427 +msgid "Open" +msgstr "Obri" + +#: src/xo-interface.c:1440 +msgid "Cut" +msgstr "Retalla" + +#: src/xo-interface.c:1445 +msgid "Copy" +msgstr "Copia" + +#: src/xo-interface.c:1450 +msgid "Paste" +msgstr "Enganxa" + +#: src/xo-interface.c:1463 +msgid "Undo" +msgstr "Desfés" + +#: src/xo-interface.c:1468 +msgid "Redo" +msgstr "Refés" + +#: src/xo-interface.c:1481 +msgid "First Page" +msgstr "Primera pàgina" + +#: src/xo-interface.c:1486 +msgid "Previous Page" +msgstr "Pàgina anterior" + +#: src/xo-interface.c:1491 +msgid "Next Page" +msgstr "Pàgina següent" + +#: src/xo-interface.c:1496 +msgid "Last Page" +msgstr "Pàgina final" + +#: src/xo-interface.c:1509 +msgid "Zoom Out" +msgstr "Reduix" + +#: src/xo-interface.c:1514 src/xo-interface.c:3045 +msgid "Page Width" +msgstr "Amplada de la pàgina" + +#: src/xo-interface.c:1520 +msgid "Zoom In" +msgstr "Amplia" + +#: src/xo-interface.c:1525 +msgid "Normal Size" +msgstr "Mida normal" + +#: src/xo-interface.c:1530 src/xo-interface.c:3004 +msgid "Set Zoom" +msgstr "Definiu l'ampliació" + +#: src/xo-interface.c:1539 +msgid "Toggle Fullscreen" +msgstr "Commuta la pantalla completa" + +#: src/xo-interface.c:1548 +#, fuzzy +msgid "Pencil" +msgstr "Llapis" + +#: src/xo-interface.c:1554 +msgid "Pen" +msgstr "Llapis" + +#: src/xo-interface.c:1559 src/xo-interface.c:1565 +msgid "Eraser" +msgstr "Esborrador" + +#: src/xo-interface.c:1570 src/xo-interface.c:1576 +msgid "Highlighter" +msgstr "Marcador fluorescent" + +#: src/xo-interface.c:1581 src/xo-interface.c:1587 +msgid "Text" +msgstr "Text" + +#: src/xo-interface.c:1592 src/xo-interface.c:1598 +msgid "Shape Recognizer" +msgstr "Reconeixedor de formes" + +#: src/xo-interface.c:1601 src/xo-interface.c:1607 +msgid "Ruler" +msgstr "Regle" + +#: src/xo-interface.c:1618 src/xo-interface.c:1624 +msgid "Select Region" +msgstr "Selecciona una regió" + +#: src/xo-interface.c:1629 src/xo-interface.c:1635 +msgid "Select Rectangle" +msgstr "Selecciona un rectangle" + +#: src/xo-interface.c:1640 src/xo-interface.c:1646 +msgid "Vertical Space" +msgstr "Espai vertical" + +#: src/xo-interface.c:1651 +msgid "Hand Tool" +msgstr "Ferramenta de mà" + +#: src/xo-interface.c:1670 src/xo-interface.c:1674 +msgid "Default" +msgstr "Predeterminat" + +#: src/xo-interface.c:1678 src/xo-interface.c:1681 +msgid "Default Pen" +msgstr "Llapis predeterminat" + +#: src/xo-interface.c:1692 src/xo-interface.c:1700 +msgid "Fine" +msgstr "Prim" + +#: src/xo-interface.c:1705 src/xo-interface.c:1713 +msgid "Medium" +msgstr "Mitjà" + +#: src/xo-interface.c:1718 src/xo-interface.c:1726 +msgid "Thick" +msgstr "Gros" + +#: src/xo-interface.c:1745 src/xo-interface.c:1752 +msgid "Black" +msgstr "Negre" + +#: src/xo-interface.c:1757 src/xo-interface.c:1764 +msgid "Blue" +msgstr "Blau" + +#: src/xo-interface.c:1769 src/xo-interface.c:1776 +msgid "Red" +msgstr "Roig" + +#: src/xo-interface.c:1781 src/xo-interface.c:1788 +msgid "Green" +msgstr "Verd" + +#: src/xo-interface.c:1793 src/xo-interface.c:1800 +msgid "Gray" +msgstr "Gris" + +#: src/xo-interface.c:1805 src/xo-interface.c:1812 +msgid "Light Blue" +msgstr "Blau cel" + +#: src/xo-interface.c:1817 src/xo-interface.c:1824 +msgid "Light Green" +msgstr "Verd clar" + +#: src/xo-interface.c:1829 src/xo-interface.c:1836 +msgid "Magenta" +msgstr "Magenta" + +#: src/xo-interface.c:1841 src/xo-interface.c:1848 +msgid "Orange" +msgstr "Taronja" + +#: src/xo-interface.c:1853 src/xo-interface.c:1860 +msgid "Yellow" +msgstr "Groc" + +#: src/xo-interface.c:1865 src/xo-interface.c:1872 +msgid "White" +msgstr "Blanc" + +#: src/xo-interface.c:1919 +msgid " Page " +msgstr " Pàgina " + +#: src/xo-interface.c:1927 +msgid "Set page number" +msgstr "Definix el número de pàgina" + +#: src/xo-interface.c:1931 +msgid " of n" +msgstr " de n" + +#: src/xo-interface.c:1939 +msgid " Layer: " +msgstr " Capa: " + +#: src/xo-interface.c:2826 +msgid "Set Paper Size" +msgstr "Establix la mida del paper" + +#: src/xo-interface.c:2838 +msgid "Standard paper sizes:" +msgstr "Mides de paper estàndard:" + +#: src/xo-interface.c:2846 +msgid "A4" +msgstr "A4" + +#: src/xo-interface.c:2847 +msgid "A4 (landscape)" +msgstr "A4 (apaïsat)" + +#: src/xo-interface.c:2848 +msgid "US Letter" +msgstr "Carta nord-americana" + +#: src/xo-interface.c:2849 +msgid "US Letter (landscape)" +msgstr "Carta nord-americana (apaïsat)" + +#: src/xo-interface.c:2850 +msgid "Custom" +msgstr "Personalitzada" + +#: src/xo-interface.c:2856 +#, fuzzy +msgid "Width:" +msgstr "Amplaria de la pàgina" + +#: src/xo-interface.c:2865 +#, fuzzy +msgid "Height:" +msgstr "Alçaria de la pàgina" + +#: src/xo-interface.c:2877 +msgid "cm" +msgstr "cm" + +#: src/xo-interface.c:2878 +msgid "in" +msgstr "in" + +#: src/xo-interface.c:2879 +msgid "pixels" +msgstr "píxels" + +#: src/xo-interface.c:2880 +msgid "points" +msgstr "punts" + +#: src/xo-interface.c:2940 +msgid "About Xournal" +msgstr "Quant al Xournal" + +#: src/xo-interface.c:2956 +#, fuzzy +msgid "" +"Written by Denis Auroux\n" +"and other contributors\n" +" http://xournal.sourceforge.net/ " +msgstr "" +"Creat per Denis Auroux\n" +" http://xournal.sourceforge.net/ " + +#: src/xo-interface.c:3020 +msgid "Zoom: " +msgstr "Ampliació: " + +#: src/xo-interface.c:3033 +msgid "%" +msgstr "" + +#: src/xo-interface.c:3038 +msgid "Normal size (100%)" +msgstr "Mida normal (100%)" + +#: src/xo-interface.c:3052 +msgid "Page Height" +msgstr "Alçada de la pàgina" + +#. user aborted on save confirmation +#: src/xo-callbacks.c:51 src/xo-file.c:665 +msgid "Open PDF" +msgstr "Obre un fitxer PDF" + +#: src/xo-callbacks.c:59 src/xo-callbacks.c:132 src/xo-callbacks.c:231 +#: src/xo-callbacks.c:385 src/xo-callbacks.c:1444 src/xo-file.c:673 +msgid "All files" +msgstr "Tots els fitxers" + +#: src/xo-callbacks.c:62 src/xo-callbacks.c:388 src/xo-file.c:676 +msgid "PDF files" +msgstr "Fitxers PDF" + +#: src/xo-callbacks.c:70 src/xo-callbacks.c:1467 +msgid "Attach file to the journal" +msgstr "Adjunta el fitxer al diari" + +#. user aborted on save confirmation +#: src/xo-callbacks.c:124 +msgid "Open Journal" +msgstr "Obre un diari" + +#: src/xo-callbacks.c:135 src/xo-callbacks.c:234 +msgid "Xournal files" +msgstr "Fitxers del Xournal" + +#: src/xo-callbacks.c:184 src/xo-callbacks.c:279 +#, c-format +msgid "Error saving file '%s'" +msgstr "S'ha produït un error en guardar el fitxer «%s»" + +#: src/xo-callbacks.c:203 +msgid "Save Journal" +msgstr "Guarda el diari" + +#: src/xo-callbacks.c:260 src/xo-callbacks.c:406 +#, c-format +msgid "Should the file %s be overwritten?" +msgstr "Voleu sobreescriure el fitxer %s?" + +#: src/xo-callbacks.c:359 +msgid "Export to PDF" +msgstr "Exporta a PDF" + +#: src/xo-callbacks.c:419 +#, c-format +msgid "Error creating file '%s'" +msgstr "S'ha produït un error en crear el fitxer «%s»" + +#: src/xo-callbacks.c:1371 +#, fuzzy +msgid "Pick a Paper Color" +msgstr "_Color del paper" + +#: src/xo-callbacks.c:1436 +msgid "Open Background" +msgstr "Obre un fons" + +#: src/xo-callbacks.c:1452 +msgid "Bitmap files" +msgstr "Fitxers de mapa de bits" + +#: src/xo-callbacks.c:1460 +msgid "PS/PDF files (as bitmaps)" +msgstr "Fitxers PS/PDF (com a mapes de bits)" + +#: src/xo-callbacks.c:1490 +#, c-format +msgid "Error opening background '%s'" +msgstr "S'ha produït un error en obrir el fons «%s»" + +#: src/xo-callbacks.c:2036 +msgid "Select Font" +msgstr "Seleccioneu el tipus de lletra" + +#: src/xo-callbacks.c:2434 +msgid "" +"Drawing is not allowed on the background layer.\n" +" Switching to Layer 1." +msgstr "" +"No es pot dibuixar a la capa de fons.\n" +" Es commutarà a la capa 1." + +#: src/xo-support.c:90 src/xo-support.c:114 +#, c-format +msgid "Couldn't find pixmap file: %s" +msgstr "No s'ha trobat el fitxer de mapa de píxels: %s" + +#: src/xo-file.c:122 src/xo-file.c:154 +#, c-format +msgid "Could not write background '%s'. Continuing anyway." +msgstr "" + +#: src/xo-file.c:252 +#, c-format +msgid "Invalid file contents" +msgstr "Els continguts del fitxer no són vàlids" + +#: src/xo-file.c:402 +#, c-format +msgid "Could not open background '%s'. Setting background to white." +msgstr "" + +#: src/xo-file.c:660 +#, c-format +msgid "" +"Could not open background '%s'.\n" +"Select another file?" +msgstr "" + +#: src/xo-file.c:806 +#, c-format +msgid "Could not open background '%s'." +msgstr "" + +#: src/xo-file.c:1033 +msgid "Unable to render one or more PDF pages." +msgstr "" + +#: src/xo-file.c:1439 +msgid " the display resolution, in pixels per inch" +msgstr "" + +#: src/xo-file.c:1442 +msgid " the initial zoom level, in percent" +msgstr "" + +#: src/xo-file.c:1445 +msgid " maximize the window at startup (true/false)" +msgstr "" + +#: src/xo-file.c:1448 +msgid " start in full screen mode (true/false)" +msgstr "" + +#: src/xo-file.c:1451 +msgid " the window width in pixels (when not maximized)" +msgstr "" + +#: src/xo-file.c:1454 +msgid " the window height in pixels" +msgstr "" + +#: src/xo-file.c:1457 +msgid " scrollbar step increment (in pixels)" +msgstr "" + +#: src/xo-file.c:1460 +msgid " the step increment in the zoom dialog box" +msgstr "" + +#: src/xo-file.c:1463 +msgid " the multiplicative factor for zoom in/out" +msgstr "" + +#: src/xo-file.c:1466 +msgid " document view (true = continuous, false = single page)" +msgstr "" + +#: src/xo-file.c:1469 +msgid " use XInput extensions (true/false)" +msgstr "" + +#: src/xo-file.c:1472 +msgid " discard Core Pointer events in XInput mode (true/false)" +msgstr "" + +#: src/xo-file.c:1475 +msgid " always map eraser tip to eraser (true/false)" +msgstr "" + +#: src/xo-file.c:1478 +msgid "" +" buttons 2 and 3 switch mappings instead of drawing (useful for some " +"tablets) (true/false)" +msgstr "" + +#: src/xo-file.c:1481 +msgid "" +" automatically load filename.pdf.xoj instead of filename.pdf (true/false)" +msgstr "" + +#: src/xo-file.c:1484 +msgid " default path for open/save (leave blank for current directory)" +msgstr "" + +#: src/xo-file.c:1487 +msgid " use pressure sensitivity to control pen stroke width (true/false)" +msgstr "" + +#: src/xo-file.c:1490 +msgid " minimum width multiplier" +msgstr "" + +#: src/xo-file.c:1493 +msgid " maximum width multiplier" +msgstr "" + +#: src/xo-file.c:1496 +msgid "" +" interface components from top to bottom\n" +" valid values: drawarea menu main_toolbar pen_toolbar statusbar" +msgstr "" + +#: src/xo-file.c:1499 +msgid " interface components in fullscreen mode, from top to bottom" +msgstr "" + +#: src/xo-file.c:1502 +msgid " interface has left-handed scrollbar (true/false)" +msgstr "" + +#: src/xo-file.c:1505 +msgid " hide some unwanted menu or toolbar items (true/false)" +msgstr "" + +#: src/xo-file.c:1508 +msgid "" +" interface items to hide (customize at your own risk!)\n" +" see source file xo-interface.c for a list of item names" +msgstr "" + +#: src/xo-file.c:1511 +msgid "" +" highlighter opacity (0 to 1, default 0.5)\n" +" warning: opacity level is not saved in xoj files!" +msgstr "" + +#: src/xo-file.c:1514 +msgid " auto-save preferences on exit (true/false)" +msgstr "" + +#: src/xo-file.c:1518 +msgid " the default page width, in points (1/72 in)" +msgstr "" + +#: src/xo-file.c:1521 +msgid " the default page height, in points (1/72 in)" +msgstr "" + +#: src/xo-file.c:1524 +msgid " the default paper color" +msgstr "" + +#: src/xo-file.c:1529 +msgid " the default paper style (plain, lined, ruled, or graph)" +msgstr "" + +#: src/xo-file.c:1532 +msgid " apply paper style changes to all pages (true/false)" +msgstr "" + +#: src/xo-file.c:1535 +msgid " preferred unit (cm, in, px, pt)" +msgstr "" + +#: src/xo-file.c:1538 +msgid " include paper ruling when printing or exporting to PDF (true/false)" +msgstr "" + +#: src/xo-file.c:1541 +msgid " just-in-time update of page backgrounds (true/false)" +msgstr "" + +#: src/xo-file.c:1544 +msgid "" +" bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)" +msgstr "" + +#: src/xo-file.c:1547 +msgid "" +" bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)" +msgstr "" + +#: src/xo-file.c:1551 +msgid "" +" selected tool at startup (pen, eraser, highlighter, selectrect, vertspace, " +"hand)" +msgstr "" + +#: src/xo-file.c:1554 +msgid " default pen color" +msgstr "" + +#: src/xo-file.c:1559 +msgid " default pen thickness (fine = 1, medium = 2, thick = 3)" +msgstr "" + +#: src/xo-file.c:1562 +msgid " default pen is in ruler mode (true/false)" +msgstr "" + +#: src/xo-file.c:1565 +msgid " default pen is in shape recognizer mode (true/false)" +msgstr "" + +#: src/xo-file.c:1568 +msgid " default eraser thickness (fine = 1, medium = 2, thick = 3)" +msgstr "" + +#: src/xo-file.c:1571 +msgid " default eraser mode (standard = 0, whiteout = 1, strokes = 2)" +msgstr "" + +#: src/xo-file.c:1574 +msgid " default highlighter color" +msgstr "" + +#: src/xo-file.c:1579 +msgid " default highlighter thickness (fine = 1, medium = 2, thick = 3)" +msgstr "" + +#: src/xo-file.c:1582 +msgid " default highlighter is in ruler mode (true/false)" +msgstr "" + +#: src/xo-file.c:1585 +msgid " default highlighter is in shape recognizer mode (true/false)" +msgstr "" + +#: src/xo-file.c:1588 +msgid "" +" button 2 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)" +msgstr "" + +#: src/xo-file.c:1591 +msgid "" +" button 2 brush linked to primary brush (true/false) (overrides all other " +"settings)" +msgstr "" + +#: src/xo-file.c:1594 +msgid " button 2 brush color (for pen or highlighter only)" +msgstr "" + +#: src/xo-file.c:1601 +msgid " button 2 brush thickness (pen, eraser, or highlighter only)" +msgstr "" + +#: src/xo-file.c:1605 +msgid " button 2 ruler mode (true/false) (for pen or highlighter only)" +msgstr "" + +#: src/xo-file.c:1609 +msgid " button 2 shape recognizer mode (true/false) (pen or highlighter only)" +msgstr "" + +#: src/xo-file.c:1613 +msgid " button 2 eraser mode (eraser only)" +msgstr "" + +#: src/xo-file.c:1616 +msgid "" +" button 3 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)" +msgstr "" + +#: src/xo-file.c:1619 +msgid "" +" button 3 brush linked to primary brush (true/false) (overrides all other " +"settings)" +msgstr "" + +#: src/xo-file.c:1622 +msgid " button 3 brush color (for pen or highlighter only)" +msgstr "" + +#: src/xo-file.c:1629 +msgid " button 3 brush thickness (pen, eraser, or highlighter only)" +msgstr "" + +#: src/xo-file.c:1633 +msgid " button 3 ruler mode (true/false) (for pen or highlighter only)" +msgstr "" + +#: src/xo-file.c:1637 +msgid " button 3 shape recognizer mode (true/false) (pen or highlighter only)" +msgstr "" + +#: src/xo-file.c:1641 +msgid " button 3 eraser mode (eraser only)" +msgstr "" + +#: src/xo-file.c:1645 +msgid " thickness of the various pens (in points, 1 pt = 1/72 in)" +msgstr "" + +#: src/xo-file.c:1651 +msgid " thickness of the various erasers (in points, 1 pt = 1/72 in)" +msgstr "" + +#: src/xo-file.c:1656 +msgid " thickness of the various highlighters (in points, 1 pt = 1/72 in)" +msgstr "" + +#: src/xo-file.c:1661 +msgid " name of the default font" +msgstr "" + +#: src/xo-file.c:1664 +msgid " default font size" +msgstr "" + +#: src/xo-file.c:1842 +msgid "" +" Xournal configuration file.\n" +" This file is generated automatically upon saving preferences.\n" +" Use caution when editing this file manually.\n" +msgstr "" + +#: src/xo-misc.c:1274 +#, c-format +msgid " of %d" +msgstr " de %d" + +#: src/xo-misc.c:1279 +msgid "Background" +msgstr "Fons" + +#: src/xo-misc.c:1287 +#, c-format +msgid "Layer %d" +msgstr "Capa %d" + +#: src/xo-misc.c:1411 +#, c-format +msgid "Xournal - %s" +msgstr "Xournal - %s" + +#: src/xo-misc.c:1663 +#, c-format +msgid "Save changes to '%s'?" +msgstr "Voleu guardar els canvis al fitxer «%s»?" + +#: src/xo-misc.c:1664 +msgid "Untitled" +msgstr "Sense títol" + +#~ msgid "Discard _Core Events" +#~ msgstr "Descarta els esdeveniments _primaris" From f80a1658cdcc6102f7d0a89a908a5367a6f6e996 Mon Sep 17 00:00:00 2001 From: Denis Auroux Date: Tue, 17 Sep 2019 13:58:39 -0400 Subject: [PATCH 7/7] Fix bug where auto-saves would repeat instantly while user is drawing. Make default auto-save frequency less aggressive. --- src/xo-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xo-file.c b/src/xo-file.c index a3ae3193..20dc1c19 100644 --- a/src/xo-file.c +++ b/src/xo-file.c @@ -354,6 +354,7 @@ gboolean autosave_cb(gpointer is_catchup) // keep track of old save filenames old_filenames = ui.autosave_filename_list; ui.autosave_filename_list = NULL; + ui.autosave_need_catchup = FALSE; if (save_journal(test_filename, TRUE)) { // non-interactive save -> success ui.need_autosave = FALSE; // no longer need an auto-save autosave_cleanup(&old_filenames); @@ -1767,7 +1768,7 @@ void init_config_default(void) ui.device_for_touch = g_strdup(DEFAULT_DEVICE_FOR_TOUCH); ui.autosave_enabled = FALSE; ui.autosave_filename_list = NULL; - ui.autosave_delay = 5; + ui.autosave_delay = 20; ui.autosave_loop_running = FALSE; ui.autosave_need_catchup = FALSE; ui.fix_stroke_origin = FALSE;