From: Jim Evins Date: Tue, 29 Sep 2009 01:11:55 +0000 (-0400) Subject: Merge original SVN glabels-2_2 branch into glabels_2_2 X-Git-Tag: glabels-2_2_6~20 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=484197466a1ddace52d14046709ad6e8c4f17bbc;p=glabels Merge original SVN glabels-2_2 branch into glabels_2_2 Restored history past 2.2.5 release that was lost when originally creating branch from SVN. --- 484197466a1ddace52d14046709ad6e8c4f17bbc diff --cc AUTHORS index d83a63f5,00000000..4ca41f61 mode 100644,000000..100644 --- a/AUTHORS +++ b/AUTHORS @@@ -1,182 -1,0 +1,184 @@@ +gLabels Author +============== + +Jim Evins + +Acknowledgments +=============== + +- The GNU Barcode Library provides a large chunk of the barcode functionality +and is distributed with glabels. See ./barcode-0.98/README for more +information. The author: + + Alessandro Rubini + +- The iec16022 library provides encoding for 2D barcodes. See +iec16022-0.2.1/README for more information. + +- Glabels includes modified versions of several widgets from the GAL library. +These are copyright: + + * Copyright 2000, 2001, Ximian, Inc. + * Copyright 2000, Michael Levy + * Copyright 2001, Almer S. Tigelaar + +- Glabels includes a modified version of the gimpchainbutton widget from the +gimp, as well as several stock icons from the gimp's default theme. +These are copyright: + + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * Copyright (C) 1999-2000 Sven Neumann + +Glabels includes contributions from: + Frederic Ruaudel + Emmanuel Pacaud + Wayne Schuller + Austin Henry -- EDS and vcard backends + nestor di -- excellent splash screen + that first appeared in + 0.4.3: + Darren Warner + Javier Donaire Segarra + Alessandro Zummo + José Dapena Paz + Akkana + Dag Wieers + Mário Meyer + Peter Cherriman + +Translations: + + Olivier Berger -- French (original) + Florent Morel -- French (2.0.2) + Claude Paroz -- French (2.1.4) + Marcus Bauer -- German (original) + Christian Neumair -- German (1.89.1) + Mario Blättermann -- German (2.2.5) + Takeshi AIHANA -- Japanese + Paulo Rogério Ormenese -- Brazilian Portuguese - Víctor Moral -- Spanish translations - sergio rivadero -- Spanish Translations (2.0.3) - Vitaly Lipatov -- Russian translations - Shell, Hin-lik Hung -- Chinese Translations - Arkadiusz Lipiec -- Polish Translations - David Makovský (Yakeen) -- Czech Translations - Zbynek Mrkvicka -- Czech Translations (2.0.3) - Mancio -- Italian Translations - Daniele Medri -- Italian Translations (2.0.3) ++ Víctor Moral -- Spanish ++ sergio rivadero -- Spanish (2.0.3) ++ Vitaly Lipatov -- Russian ++ Shell, Hin-lik Hung -- Chinese (TW) ++ Arkadiusz Lipiec -- Polish ++ David Makovský (Yakeen) -- Czech ++ Zbynek Mrkvicka -- Czech (2.0.3) ++ Mancio -- Italian ++ Daniele Medri -- Italian (2.0.3) + Antonio C. Codazzi "la Filozofo" -- Esperanto ++ David Planella -- Catalan ++ Careon -- Chinese (CN) + +The following people have submitted label templates or information about +particular products (I apologize if I have missed anybody): + + Hap + Olivier Berger + Marcus Bauer + Jochen Hein + Jonathan Buzzard + Jeff Davis + Ludger Solbach + Darren Ross + George Mitchell + Douglas Bollinger + Tim Jackson + John Stoffel + Dany De Bontridder + Andy Longton + Bostjan Muller + John Helms + no-exit + Mozilla from marela + Holger + Bill Tihen + Dan Gray + Keith Hudson + Tamas Bondar + George Mitchell + Erich Pfennig + Gwen Patton + Miek Gieben + Joerg Schmitz-Linneweber + David Makovský + Oliver Schwank + Akkana + Ted Poe + hans-helmut.belter + Uli Wachowitz + Stephan Hegel + Holger Reinmann + Michael Wojciechowski + Jim Mueller + Mark Fullalove + Zamiel Al'Shaitan + Philip Paeps + Bryan Fields + Martin Klaffenboeck + Lauri Ampuja + Allan Wind + Mark S Burgunder + Christian Holländer + Marvin P. Dickens + Julien BLACHE + James D Strandboge + Linas Jakucionis + Henrik Brix Andersen + Nigel Titley + Sean 'Shaleh' Perry + Anthony Brockman + Thorsten Hirsch + John Ross + Mike Machado + Rob Elshire + Niels + Ernst W. Winter + regis rampnoux + Sven Salzwedel + Dick Middleton + Ian Peake + Wayne Schuller + Thomas Vill + Fred Bacon + JBadger + Frank Altpeter + Matthew J. Lockner + Larry Harriman + Juan Carlos Valero + Nick Hill + Ali Akcaagac + Dan Clark + Peter L. Berghold + Vitaly Lipatov + Steve Saxon + Roman Kreisel + Steve Reppucci + Lionel CONS + Richard Lance + Anand Kumria + Alexandre Sauvé + Ironblade + Matthias Mailänder + Bernhard Walle + Stephen Hilliard + Alessandro Zummo + Herbert Straub + Dennis Böckmann + Anon + D. Leitner + Georg Ostertag + Manuel Siggen + David Huber + Harald Welte + Richard Rothwell + Gernot Hassenpflug + Pau Ruŀlan Ferragut + Richard Hurt + Phil Endecott + Koen Wybo + Mark Moeller + Bertus W. + Oliver Friedrich + + +And many others for their many helpful suggestions and bug reports -- thanks. diff --cc ChangeLog index eea2a733,00000000..9c266543 mode 100644,000000..100644 --- a/ChangeLog +++ b/ChangeLog @@@ -1,4289 -1,0 +1,4351 @@@ - 2009-04-29 Jim Evins ++2009-09-17 Jim Evins ++ ++ * src/stock.c: (add_icons), (add_button_icon): ++ Use proper free function for GtkIconSource (gtk_icon_source_free() not g_free()). ++ Patch provided by Christian Persch . ++ ++2009-09-09 Jim Evins ++ ++ * configure.in: ++ Deleted help/C/Makefile.am. Fixes "make dist". ++ * help/Makefile.am: ++ Removed trailing whitespace. ++ ++2009-09-09 Alexandre Prokoudine ++ ++ * po/ru.po: Updated Russian translation ++ ++2009-08-31 Jim Evins ++ ++ * po/fr.po: ++ Updated french translation (Claude Paroz) ++ ++2009-05-19 Jim Evins ++ ++ * configure.in: ++ * po/LINGUAS: ++ Moved translation list from configure.in to po/LINGUAS. ++ ++2009-05-19 Jim Evins ++ ++ * configure.in: ++ * po/zh_CN.po: ++ New Chinese translation (Careon ). ++ * AUTHORS: ++ Added above translation to acknowledgements. ++ ++2009-05-18 Jim Evins ++ ++ * src/prefs-model.c: (gl_prefs_model_load_settings): ++ Make an educated guess at locale settings when run for the ++ first time. ++ ++2009-05-17 Jim Evins ++ ++ * Makefile.am: ++ * configure.in: ++ * help/C/glabels-C.omf: ++ * help/C/glabels.xml: ++ * help/Makefile.am: ++ * help/de/de.po: ++ * help/glabels.omf.in: ++ * po/de.po: ++ Updated german translation, gnome-doc-utils support and ++ german translation of glabels manual (Mario Blättermann). ++ ++2009-05-01 Jim Evins ++ ++ * AUTHORS: ++ * configure.in: ++ * po/ca.po: ++ Added catalan translation (David Planella). ++ ++2009-04-29 Jim Evins + + * NEWS: + * configure.in: + * docs/libglabels/libglabels-decl-list.txt: + * gtk-doc.make: + * src/ui-commands.c: (gl_ui_cmd_help_about): + Prepare for 2.2.5 release. + - 2009-04-29 Jim Evins ++2009-04-29 Jim Evins + + * data/templates/avery-iso-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-us-templates.xml: + Make sure new descriptions are marked translatable. + - 2009-04-29 Jim Evins ++2009-04-29 Jim Evins + + * data/templates/avery-iso-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-us-templates.xml: + Caught up on user submitted templates. + * AUTHORS: + Acknowledgements for above templates. + - 2009-04-29 Jim Evins ++2009-04-29 Jim Evins + + * po/de.po: + Updated german translation (Mario Blättermann). + - 2009-04-29 Jim Evins ++2009-04-29 Jim Evins + + * src/color.c: (gl_color_to_gdk_color), (gl_color_from_gdk_color): + * src/mygal/widget-color-combo.c: (color_combo_new): + * src/object-editor.c: (gl_object_editor_construct_color_combo): + * src/ui-property-bar.c: (gl_ui_property_bar_construct_color_combo): + Bug #2760830. Display correct preview color in color combos when default + color selected. + - 2009-04-28 Jim Evins ++2009-04-28 Jim Evins + + * data/glade/object-editor.glade: + * data/glade/prefs-dialog.glade: + * data/glade/property-bar.glade: + * data/glade/template-designer.glade: + * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct), + (first_spin_cb), (last_spin_cb): + * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct): + Zero out adjustment->page_size for all spinbuttons. With gtk-2.14 this causes + many warning and with gtk-2.16 this actually breaks the spinbuttons. + +2009-01-07 Jim Evins + + * src/critical-error-handler.c: (critical_error_handler): + * src/ui-commands.c: (gl_ui_cmd_help_contents): + * src/warning-handler.c: (warning_handler): + * src/view.c: (selection_received_cb): + Compile without warning with additional CFLAGS of + -O1 -Wall -Wformat=2. + +2009-01-02 Jim Evins + + * COPYING.README_FIRST: + Fixed typo. + +2008-12-27 Jim Evins + + * data/templates/avery-iso-templates.xml: + * data/templates/avery-other-templates.xml: + * data/templates/avery-us-templates.xml: + * data/templates/brother-other-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-other-templates.xml: + * data/templates/zweckform-iso-templates.xml: + Make sure all descriptions are marked as translatable. + +2008-12-27 Jim Evins + + * de.po: + Updated german translation (Mario Blättermann) + * AUTHORS: + Updated credits to reflect above translation. + * data/glade/object-editor.glade: + * data/glade/prefs-dialog.glade: + * data/glade/template-designer.glade: + Removed "translatable" attribute from whitespace strings, + which are used only to help layout. + +2008-12-22 Jim Evins + + * NEWS: + * configure.in: + Prepare for 2.2.4 release. + +2008-12-21 Jim Evins + + * data/templates/avery-us-templates.xml: + * data/templates/misc-iso-templates.xml: + A couple of recent template submissions. + * AUTHORS: + Acknowledgements for above templates. + +2008-12-21 Jim Evins + + * src/view.c: (motion_notify_event_cb), (button_press_event_cb): + Don't check for handles on aggregate selections. + +2008-12-18 Jim Evins + + * src/view.c: (selection_received_cb): + Fixed paste bug that caused a duplicate phantom view_object to be created for + each new label_object. This is because the view now (as of r673) the view + monitiors the label for new objects and creates view_objects automatically. + +2008-12-14 Jim Evins + + * po/POTFILES.in: + Bug #2395628. Reconciled POTFILES.in with current files. + +2008-12-14 Jim Evins + + * src/ui.c: (gl_ui_new): + Bug #2395628. Fixed i18n for application shell. + +2008-12-14 Jim Evins + + * configure.in: + Bug #2316013. Added PKG_PROG_PKG_CONFIG. + +2008-11-15 Jim Evins + + * libglabels/db.c: (lgl_db_register_template): + * libglabels/xml-template.c: + (lgl_xml_template_parse_template_node): + * src/glabels-batch.c: + * src/view-text.c: (gl_view_text_create_button_press_event): + Fixed several issues such as possible use of uninitialized variables found with "-O1 -Wall". + +2008-11-09 Jim Evins + + * data/templates/misc-iso-templates.xml: + Another user submitted template. + +2008-10-27 Jim Evins + + * data/templates/avery-us-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/zweckform-iso-templates.xml: + Caught up on user submitted templates. + * AUTHORS: + Acknowledgements for above templates. + +2008-10-23 Jim Evins + + * src/label-text.c: (set_font_family): + * src/object-editor-text-page.c: + (gl_object_editor_prepare_text_page), + (gl_object_editor_set_font_family): + * src/prefs-dialog.c: (construct_object_page), + (update_object_page_from_prefs): + * src/ui-property-bar.c: (gl_ui_property_bar_construct), + (reset_to_default_properties): + * src/util.c: (gl_util_get_font_family_list): + * src/util.h: + Bug #1902275 and Bug #2186214. Cache font list so that it is not re-created everytime + the list is requested. + * src/object-editor-text-page.c: (gl_object_editor_set_font_family): + Don't change font-family if it hasn't actually changed. + +2008-08-29 Jim Evins + + * src/file.c: (gl_file_open), (gl_file_save_as): + Bug #2069668. Corrected button order in Open and "Save as" + dialogs. + +2008-08-18 Jim Evins + + * NEWS: + * configure.in: + * docs/libglabels/tmpl/paper.sgml: + Prepare for 2.2.3 release. + +2008-08-17 Jim Evins + + * data/dtd/glabels-2.2.dtd: + * data/templates/paper-sizes.xml: + * libglabels/db.c: (lgl_db_init): + * libglabels/paper.c: (lgl_paper_new), (lgl_paper_dup), (lgl_paper_free): + * libglabels/paper.h: + * libglabels/xml-paper.c: (lgl_xml_paper_parse_paper_node): + * src/print-op.c: (set_page_size): + Bug #2049431. Always explicitely set page size. Added pwg_size field (PWG 5101.1-2002 + size specification) to the libglabels paper database to allow the page size to be + communicated to GtkPrintOp un-ambiguously. + +2008-07-25 Jim Evins + + * src/object-editor-size-page.c: (size_reset_cb), + (gl_object_editor_set_max_size): + Bug #1993550. Set size limits based on longest side of label. + +2008-07-19 Jim Evins + + * configure.in: + * src/mygal/Makefile.am: + Make sure libtool handles library dependencies for mygal + properly. + +2008-05-21 Jim Evins + + * src/glabels-batch.c: (main): + Bug #1968653. Initialize prefs subsystem. + +2008-05-09 Jim Evins + + * data/glade/object-editor.glade: + Bug #1959135. A couple of radio buttons somehow became + ungrouped. + +2008-04-04 Jim Evins + + * data/templates/brother-other-templates.xml: + Added categories to existing templates. + * data/templates/misc-other-templates.xml: + Moved dymo templates to their own file. + * data/templates/Makefile.am: + * data/templates/dymo-other-templates.xml: + Additional dymo templates provided by Harald Welte . + * AUTHORS: + Acknowledgement for above templates. + +2008-03-24 Jim Evins + + * src/xml-label.c: (xml_doc_to_label): + Bug #1872584. Don't refuse to parse label file if namespace is + unrecognized -- it may be from a newer version of glabels. + +2008-03-15 Jim Evins + + * data/templates/Makefile.am: + * data/templates/brother-other-templates.xml: + Added brother templates. + * src/cairo-markup-path.c: (gl_cairo_markup_margin_rect_path), + (gl_cairo_markup_margin_cd_path): + * src/view.c: (draw_markup_layer): + Fixed markup drawing errors when label is rotated. + +2008-03-03 Jim Evins + + * configure.in: + * ko.po: + Added korean translation provided by xein@naver.com. + +2008-02-21 Jim Evins + + * src/ui.c: + Last minute bug fix for 2.2.2 release. + Fixed typo that prevented "Save" from being deactivated when + document is not modified. + +2008-02-21 Jim Evins + + * NEWS: + * configure.in: + Prepare for 2.2.2 release. + +2008-02-18 Jim Evins + + * src/prefs-model.c: (gl_prefs_model_save_settings), + (gl_prefs_model_load_settings): + Set default units for file output. + +2008-02-18 Jim Evins + + * help/C/glabels.xml: + Fixed example template. + +2008-02-16 Jim Evins + + * AUTHORS: + * data/templates/avery-iso-templates.xml: + * data/templates/avery-us-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-us-templates.xml: + Caught up on user submitted templates. + +2008-02-04 Jim Evins + + * src/view-image.c: (update_object_from_editor_cb): + Bug #1886438. Don't update the image size unless it is actually + triggered by a change in image source. The result of this bug + was that any attempt to edit the size spinboxes, immediately + reset the size. + +2008-02-03 Jim Evins + + * src/label-image.c: (gl_label_image_class_init), (set_size): + Enforce minimum size for images. + +2008-02-03 Jim Evins + + * src/object-editor-lsize-page.c: (gl_object_editor_set_max_lsize): + * src/object-editor-private.h: + * src/object-editor-shadow-page.c: + (gl_object_editor_set_max_shadow_offset): + * src/object-editor-size-page.c: (gl_object_editor_set_max_size): + * src/object-editor.c: (gl_object_editor_finalize), + (gl_object_editor_new), (gl_object_notebook_construct_valist), + (label_changed_cb): + * src/object-editor.h: + * src/ui-sidebar.c: (gl_ui_sidebar_construct): + * src/view-barcode.c: (construct_properties_editor): + * src/view-box.c: (construct_properties_editor): + * src/view-ellipse.c: (construct_properties_editor): + * src/view-image.c: (construct_properties_editor): + * src/view-line.c: (construct_properties_editor): + * src/view-object.c: (gl_view_object_finalize): + * src/view-text.c: (construct_properties_editor): + Move update_editor_from_label callback from individual view objects + to the object editor, so that signals can be disconnected when + object editor is finalized. + * src/view-text.c: (gl_view_text_create_button_press_event): + Fixed bug that caused multiple view objects to be created for a + single text object. This bug would manifest itself as a crash + when deleting multi-object selections which included text objects. + +2008-01-31 Jim Evins + + * src/label-barcode.c: (draw_object): + Fixed rendering problem when "Invalid data" is displayed when text + object is lower in stacking order. + +2008-01-30 Jim Evins + + * src/label-text.c: (get_size), (draw_object), (draw_shadow): + Don't turn off cairo_hint_metrics. This causes serious issues with + bitmap fonts. + +2008-01-29 Jim Evins + + * src/print-op.c: (gl_print_op_construct), + (gl_print_op_construct_batch), (set_page_size): + Explicitly set page size for "other" page sizes. + +2008-01-25 Jim Evins + + * src/bc.c: + Fixed Code128C backend parameters. + * src/label-barcode.c: (get_size): + Bug #1766425. If barcode is not renderable with either + input data or default data, use a default size. Also + fixed small leak. + +2008-01-22 Jim Evins + + * NEWS: + * configure.in: + Preparation for 2.2.1 release. + +2008-01-16 Jim Evins + + * src/print.c: (print_label): + Bug #1872568. Don't apply special transforms (rotate and + mirror) to clipping region or outline. + +2008-01-01 Jim Evins + + * src/util.c: + Sort font lists alphabetically. + +2008-01-01 Jim Evins + + * src/merge-evolution.c: + Do a case-insensitive sort. + +2008-01-01 Jim Evins + + * src/merge-evolution.c: + Sort evolution by "file_under" field. Original patch provided + by Peter Cherriman in + Patch #1860423. + * AUTHORS: + Added acknowledgement for above patch. + +2007-12-25 Jim Evins + + * glabels.spec.in: + Fix spec file. + +2007-12-25 Jim Evins + + * MESSAGE-OF-DOOM: + Removed for 2.2 stable branch. + * Makefile.am: + * NEWS: + * configure.in: + Prepare for 2.2.0 release. + +2007-12-21 Jim Evins + + * COPYING.LIBGLABELS: + * COPYING.README_FIRST: + * README: + Updating license information to make more complete and understandable. + +2007-12-16 Jim Evins + + * configure.in: + Updated version to 2.pre2. + * help/C/glabels.xml: + Updated documentation. + * src/ui-commands.c: (gl_ui_cmd_help_about): + Updated copyright string. + +2007-12-15 Jim Evins + + * data/glade/object-editor.glade: + Removed any GtkTable that contained a GtkComboBox because the size of + the combo box was not constrained properly. This sacrifices the nice + orderly labels for combo boxes that don't extend beyond the edge of the + window. + +2007-12-15 Jim Evins + + * libglabels/db.c: (lgl_db_lookup_template_from_name): + * src/object-editor.c: (gl_object_editor_finalize): + * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize): + Fixed several small memory leaks. + +2007-12-14 Jim Evins + + * libglabels/db.c: + Optimize template search by name by using a GHashTable. + * src/mini-preview-pixbuf-cache.c: + * src/mini-preview-pixbuf-cache.h: + Store one pixbuf per template, but use a key for each alias. + * src/wdgt-media-select.c: + Optimize loading of tree data, thus optimizing the "new label" dialog. + +2007-12-12 Jim Evins + + * data/templates/avery-us-templates.xml: + More templates and aliases. + +2007-12-08 Jim Evins + + * TODO: + More prep for 2.1.5/2.2.0. + +2007-12-08 Jim Evins + + * NEWS: + * README: + * TODO: + * configure.in: + Preparation for 2.1.5. + +2007-12-08 Jim Evins + + * docs/libglabels/libglabels-decl-list.txt: + * docs/libglabels/libglabels-docs.sgml: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/db.sgml: + * docs/libglabels/tmpl/str.sgml: + * libglabels/str.c: + Documentation cleanup for libglabels. + +2007-11-29 Jim Evins + + * libglabels/db.h: + * libglabels/db.c: + Added lgl_db_does_template_name_exist(). + In lgl_db_lookup_template_from_name() substitute brand/part of new template from + requested alias. + * src/prefs-model.c: + Proof read recent templates -- make sure they still exist. + * src/wdgt-media-select.c: + Default to "search all templates" tab if no recent templates found. + +2007-11-28 Jim Evins + + * data/glade/wdgt-media-select.glade: + * src/wdgt-media-select.c: + Added tabbed notebook to allow selection of recent template versus searching the + entire database. + + +2007-11-26 Jim Evins + + * libglabels/Makefile.am: + * libglabels/libglabels.h: + Make str.h public. + * src/label.c: + * src/prefs-dialog.c: + * src/prefs-model.c: + * src/prefs-model.h: + * src/prefs.c: + * src/prefs.h: + Added tracking of recently used templates. + +2007-11-20 Jim Evins + + * data/glade/template-designer.glade: + * src/template-designer.c: + Added warning icon when match brand and part match an existing template. + +2007-11-18 Jim Evins + + * libglabels/Makefile.am: + * libglabels/str.h: + * libglabels/str.c: + Added lgl_str_utf8_casecmp(). + * libglabels/libglabels-private.h: + Use lgl_str_utf8_casecmp() for UTF8_EQUAL macro -- do case insensitive comparisons. + * libglabels/db.c: (lgl_db_get_brand_list): + Use lgl_str_utf8_casecmp() to determine if we have seen brand before when building + brand list. + +2007-11-18 Jim Evins + + * data/glade/template-designer.glade: + * src/template-designer.c: + Don't advance past name page, if brand and part match an existing template. + +2007-11-18 Jim Evins + + * libglabels/db.c: (lgl_db_register_template), (read_templates): + When registering a new template, don't add to "User defined" category before + writing to file. Add to "User defined" category when reading from "~/.glabels" + directory instead. This will allow legacy templates (and manually created + templates) to be automatically added to the "user defined" category. + * libglabels/xml-template.c: + (lgl_xml_template_create_template_node): + Fixed typo/bug causing brand to be wrong. + +2007-11-16 Jim Evins + + * libglabels/db.c: + * libglabels/db.h: + Added return codes to lgl_db_register_template(). Added lgl_db_does_template_exist() + function. Automatically create "User defined" category and add to all user + registered templates. + * libglabels/xml-template.c: + * libglabels/xml-template.h: + Return number of bytes written from lgl_xml_template_write_templates_to_file() and + lgl_xml_template_write_template_to_file(). + * docs/libglabels/libglabels-decl-list.txt: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/db.sgml: + * docs/libglabels/tmpl/xml-template.sgml: + Update documentation to reflect above changes. + +2007-10-28 Jim Evins + + * libglabels/xml-template.c: + Remove any leading white space from part #s when parsing old names. + * src/mini-preview-pixbuf-cache.c: + If name isn't in cache add it. + +2007-10-26 Jim Evins + + * libglabels/Makefile.am: + * libglabels/category.c: + * libglabels/category.h: + * libglabels/db.c: + * libglabels/db.h: + * libglabels/libglabels-private.h: + * libglabels/libglabels.h: + * libglabels/paper.c: + * libglabels/paper.h: + * libglabels/template.c: + * libglabels/template.h: + * libglabels/xml-template.c: + Another pass at screwing with the libglabels API. Moved all + database related stuff to db.[ch]. + * docs/libglabels/libglabels-decl-list.txt: + * docs/libglabels/libglabels-docs.sgml: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/category.sgml: + * docs/libglabels/tmpl/db.sgml: + * docs/libglabels/tmpl/init.sgml: + * docs/libglabels/tmpl/libglabels-unused.sgml: + * docs/libglabels/tmpl/paper.sgml: + * docs/libglabels/tmpl/template-construction.sgml: + * docs/libglabels/tmpl/template-db.sgml: + * docs/libglabels/tmpl/template-misc.sgml: + * docs/libglabels/tmpl/template-struct.sgml: + * docs/libglabels/tmpl/template.sgml: + Updated documentation to reflect above changes to libglabels API. + * src/file.c: + * src/glabels-batch.c: + * src/glabels.c: + * src/mini-preview-pixbuf-cache.c: + * src/prefs-model.c: + * src/print.c: + * src/template-designer.c: + * src/wdgt-media-select.c: + * src/wdgt-mini-preview.c: + * src/wdgt-rotate-label.c: + * src/xml-label-04.c: + * src/xml-label.c: + Reconciled usage with above libglabels API changes. + +2007-10-21 Jim Evins + + * data/glade/wdgt-media-select.glade: + * src/wdgt-media-select.c: + Added brand to filter settings. + +2007-10-21 Jim Evins + + * data/dtd/glabels-2.2.dtd: + Forgot to replace Alias name attribute with brand and part attributes. + * data/templates/avery-iso-templates.xml: + * data/templates/avery-other-templates.xml: + * data/templates/avery-us-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-other-templates.xml: + * data/templates/misc-us-templates.xml: + * data/templates/zweckform-iso-templates.xml: + Replaced all name attributes with brand/part attribute pairs. + +2007-10-20 Jim Evins + + * src/stock-pixmaps/*.png + Updated icons to use Tango color palette. + +2007-10-20 Jim Evins + + * data/dtd/Makefile.am: + * data/dtd/glabels-2.0.dtd: + * data/dtd/glabels-2.2.dtd: + Rename glabels-2.0.dtd to glabels-2.2.dtd. Added brand and part attributes to + template node. + * libglabels/template.c: + * libglabels/template.h: + * libglabels/xml-template.c: + * libglabels/xml.h: + Added brand and part attributes to template and alias structures and nodes. + * src/file.c: + * src/label.c: + * src/mini-preview-pixbuf-cache.c: + * src/template-designer.c: + * src/wdgt-media-select.c: + Use modified libglabels API. + * docs/libglabels/libglabels-decl-list.txt: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/template-construction.sgml: + * docs/libglabels/tmpl/template-db.sgml: + * docs/libglabels/tmpl/template-struct.sgml: + Update libglabels documentation to reflect above modifications. + +2007-10-14 Jim Evins + + * docs/libglabels/libglabels-decl-list.txt: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/category.sgml: + * libglabels/category.c: + * libglabels/category.h: + Added lgl_category_get_id_list() and lgl_category_free_id_list() to have + parity with paper functions. + +2007-10-12 Jim Evins + + * docs/libglabels/libglabels-decl-list.txt: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/category.sgml: + * docs/libglabels/tmpl/enums.sgml: + * docs/libglabels/tmpl/libglabels-unused.sgml: + * docs/libglabels/tmpl/paper.sgml: + * docs/libglabels/tmpl/template-struct.sgml: + * libglabels/init.c: + * libglabels/template.c: + * libglabels/template.h: + Another pass at fleshing out the libglabels documentation. + * src/cairo-label-path.c: + * src/cairo-markup-path.c: + * src/label.c: + * src/mini-preview-pixbuf.c: + * src/print-op.c: + * src/print.c: + * src/view.c: + * src/wdgt-media-select.c: + * src/wdgt-mini-preview.c: + * src/wdgt-print-copies.c: + * src/wdgt-print-merge.c: + * src/wdgt-rotate-label.c: + Removed lgl_template_get_first_frame() from libglabels API and all references. + +2007-10-11 Jim Evins + * configure.in: + Extended checks for deprecated symbols. + * libglabels/template.c: + Removed g_strcasecmp references, which are deprecated. + +2007-10-09 Jim Evins + + * src/merge-evolution.c: + Create address book if it does not exist. Also, be more robust about handling + error conditions -- don't just assume GError has been set. + +2007-10-08 Jim Evins + + * libglabels/template.c: + * libglabels/xml-template.c: + * src/template-designer.c: + Missed some symbols with libglabels API work. + +2007-10-01 Jim Evins + + * docs/libglabels/libglabels-decl-list.txt: + * docs/libglabels/libglabels-docs.sgml: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/category.sgml: + * docs/libglabels/tmpl/enums.sgml: + * docs/libglabels/tmpl/init.sgml: + * docs/libglabels/tmpl/libglabels-unused.sgml: + * docs/libglabels/tmpl/paper.sgml: + * docs/libglabels/tmpl/template-construction.sgml: + * docs/libglabels/tmpl/template-db.sgml: + * docs/libglabels/tmpl/template-misc.sgml: + * docs/libglabels/tmpl/template-struct.sgml: + * docs/libglabels/tmpl/template.sgml: + * docs/libglabels/tmpl/xml-category.sgml: + * docs/libglabels/tmpl/xml-template.sgml: + * libglabels/category.h: + * libglabels/init.c: + * libglabels/libglabels-private.h: + * libglabels/paper.h: + * libglabels/template.c: + * libglabels/template.h: + * libglabels/xml-template.h: + Basic documentation framework for libglabels updated. This still needs some + fleshing out. + +2007-09-27 Jim Evins + + * docs/libglabels/libglabels-decl-list.txt: + * docs/libglabels/libglabels-docs.sgml: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/enums.sgml: + * docs/libglabels/tmpl/init.sgml: + * docs/libglabels/tmpl/libglabels-unused.sgml: + * docs/libglabels/tmpl/paper.sgml: + * docs/libglabels/tmpl/template.sgml: + * docs/libglabels/tmpl/xml-paper.sgml: + * docs/libglabels/tmpl/xml-template.sgml: + * docs/libglabels/tmpl/xml.sgml: + * libglabels/Makefile.am: + * libglabels/category.c: + * libglabels/category.h: + * libglabels/enums.h: + * libglabels/init.c: + * libglabels/init.h: + * libglabels/libglabels-private.h: + * libglabels/libglabels.h: + * libglabels/paper.c: + * libglabels/paper.h: + * libglabels/template.c: + * libglabels/template.h: + * libglabels/xml-category.c: + * libglabels/xml-category.h: + * libglabels/xml-paper.c: + * libglabels/xml-paper.h: + * libglabels/xml-template.c: + * libglabels/xml-template.h: + * libglabels/xml.c: + * libglabels/xml.h: + * src/cairo-label-path.c: + * src/cairo-label-path.h: + * src/cairo-markup-path.c: + * src/cairo-markup-path.h: + * src/file.c: + * src/glabels-batch.c: + * src/glabels.c: + * src/label-object.c: + * src/label.c: + * src/label.h: + * src/mini-preview-pixbuf-cache.c: + * src/mini-preview-pixbuf.c: + * src/mini-preview-pixbuf.h: + * src/prefs-dialog.c: + * src/prefs-model.c: + * src/prefs-model.h: + * src/prefs.c: + * src/prefs.h: + * src/print-op.c: + * src/print.c: + * src/template-designer.c: + * src/view-barcode.c: + * src/view-box.c: + * src/view-ellipse.c: + * src/view-image.c: + * src/view-line.c: + * src/view.c: + * src/wdgt-media-select.c: + * src/wdgt-mini-preview.c: + * src/wdgt-mini-preview.h: + * src/wdgt-print-copies.c: + * src/wdgt-print-merge.c: + * src/wdgt-rotate-label.c: + * src/xml-label-04.c: + * src/xml-label.c: + Major cleanup of libglabels API -- this breaks API compatibility with older + development and stable versions -- as far as I know, there are currently + no external users of this library yet. + +2007-09-14 Jim Evins + + * src/marshal.list: + * src/label.c: + * src/label.h: + * src/label-object.c: + * src/label-object.h: + * src/label-barcode.c: + * src/label-ellipse.c: + * src/view.c: + * src/view-object.c: + * src/view-barcode.c: + * src/view-box.c: + * src/view-ellipse.c: + * src/view-image.c: + * src/view-line.c: + * src/view-text.c: + Better separation of model from view. + +2007-08-21 Jim Evins + + * src/print-op.c: (create_custom_widget_cb): + Fix problem with force_outline_flag -- don't override with default. + +2007-08-21 Jim Evins + + * data/dtd/glabels-2.0.dtd: + * libglabels/template.c: + * libglabels/template.h: + * libglabels/xml-template.c: + * src/cairo-markup-path.c: + Added "Markup-rect" element to template format. + +2007-08-21 Jim Evins + + * configure.in: + Changed version to 2.1.pre5svn. + * src/view.c: (draw_markup_layer): + Do a stroke for each markup path, otherwise multiple markups + get connected. + +2007-08-17 Jim Evins + + * configure.in: + Bump libglabels revision numbers for 2.1.4 release. + +2007-08-16 Jim Evins + + * Makefile.am: + Include subdir iec16022-0.2.1. + * NEWS: + * configure.in: + * glabels.spec.in: + Preparation for 2.1.4. + + +2007-08-11 Jim Evins + + * po/POTFILES.in: + Updated file list. + * configure.in: + * po/eo.po: + Added Esperanto translation. Provided by Antonio C. + Codazzi "la Filozofo" . + * po/fr.po: + Updated French translation. Provided by Claude Paroz + . + * AUTHORS: + Updated to reflect above translations. + +2007-08-11 Jim Evins + + * AUTHORS: + * data/templates/avery-iso-templates.xml: + * data/templates/avery-us-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-other-templates.xml: + * data/templates/misc-us-templates.xml: + * data/templates/zweckform-iso-templates.xml: + Caught up with backlog of template submissions. + +2007-08-10 Jim Evins + + * src/bc-postnet.c: (gl_barcode_postnet_new): + * src/bc.c: + Added support for Brazilian CEPNet barcodes. This is simply an + instance of the US POSTNET format with 8 digits. Patch supplied + by Mário Meyer in bug # 1768792. + * AUTHORS: + Updated acknowledgments to reflect above patch and recent shuffling + of underlying technology. + +2007-05-13 Jim Evins + + * src/merge-text.c: (parse_line), (parse_field): + Remove leading and trailing spaces from CSV fields, unless quoted. + +2007-05-09 Jim Evins + + * src/object-editor-bc-page.c: + * src/object-editor-data-page.c: + * src/object-editor-fill-page.c: + * src/object-editor-image-page.c: + * src/object-editor-line-page.c: + * src/object-editor-lsize-page.c: + * src/object-editor-position-page.c: + * src/object-editor-private.h: + * src/object-editor-shadow-page.c: + * src/object-editor-size-page.c: + * src/object-editor-text-page.c: + * src/object-editor.c: + * src/prefs-dialog.c: + * src/template-designer.c: + * src/ui-property-bar.c: + * src/wdgt-media-select.c: + Replaced signal block/unblock pairs with simple flags. This reduces + some code clutter, hopefully making it easier to read. + +2007-05-05 Jim Evins + + * src/template-designer.c: (apply_cb): + Add new template to mini-preview pixbuf cache. + +2007-05-03 Jim Evins + + * src/label-image.c: (gl_label_image_init), (draw_object): + Scale default pixbuf up, to prevent bluring. Use cairo_fill to + render image. + +2007-05-02 Jim Evins + + * src/view.c: (draw_select_region_layer), (motion_notify_event_cb), + (button_release_event_cb): + Removed attempt at rendering optimization by clipping the updates + to areas affected -- this actually seemed to hurt update performance. + +2007-04-30 Jim Evins + + * src/color.h: + * src/color.c: (gl_color_shadow), (gl_color_node_new_default), + (gl_color_node_equal), (gl_color_node_expand): + * src/label-barcode.c: (draw_object): + * src/label-box.c: (draw_object), (draw_shadow): + * src/label-ellipse.c: (draw_object), (draw_shadow): + * src/label-line.c: (draw_object), (draw_shadow): + * src/label-text.c: (draw_object), (draw_shadow): + * src/wdgt-mini-preview.c: (draw_shadow), (draw_labels): + * src/wdgt-rotate-label.c: (drawingarea_update): + Some cleanup to color related code. + +2007-04-30 Jim Evins + + * src/label.h: + Added glLabelRegion structure type. + * src/label-object.c: (gl_label_object_get_extent): + * src/label-object.h: + Modified gl_label_object_get_extent() to fill in a glLabelRegion struct. + * src/view.h: + * src/view.c: (gl_view_update_region), (draw_select_region_layer), + (gl_view_select_region), (gl_view_align_selection_left), + (gl_view_align_selection_right), (gl_view_align_selection_hcenter), + (gl_view_align_selection_top), (gl_view_align_selection_bottom), + (gl_view_align_selection_vcenter), + (gl_view_center_selection_horiz), (gl_view_center_selection_vert), + (gl_view_move_selection), (gl_view_can_selection_text), + (motion_notify_event_cb), (button_press_event_cb), + (button_release_event_cb): + - Reconcile with new gl_label_object_get_extent() API. + - Use glLabelRegion for view->select_region. + - Added gl_view_update_region() to clip updates to region. + - Use gl_view_update_region() during manipulation of view->select_region. + +2007-04-26 Jim Evins + + * src/mini-preview-pixbuf.c: (draw_paper), (draw_label_outlines), + (draw_label_outline): + * src/print.c: (print_crop_marks), (draw_outline): + * src/view-object.c: (gl_view_object_draw_handles): + * src/view.c: (draw_bg_layer), (draw_grid_layer), + (draw_markup_layer), (draw_fg_layer), (draw_select_region_layer): + * src/wdgt-mini-preview.c: (draw_paper), (draw_labels): + * src/wdgt-rotate-label.c: (drawingarea_update): + Added defines for various magic numbers. + +2007-04-25 Jim Evins + + * src/label-text.c: (get_size), (draw_object), (draw_shadow): + Scale text down. Cairo seems to render text too large. + +2007-04-25 Jim Evins + + * src/view.h: + * src/view.c: (gl_view_update), (expose_cb), + (motion_notify_event_cb), (button_press_event_cb), + (button_release_event_cb): + - Try not to let updates get backed up. + - Grab pointer when doing any drag operations. + +2007-04-11 Jim Evins + + * src/cairo-label-path.c: (gl_cairo_label_path), + (gl_cairo_rect_label_path), (gl_cairo_round_label_path), + (gl_cairo_cd_label_path): + * src/cairo-label-path.h: + * src/mini-preview-pixbuf.c: (draw_paper), (draw_label_outlines), + (draw_label_outline): + * src/print.c: (draw_outline), (clip_to_outline): + * src/view.c: (draw_bg_layer), (draw_fg_layer): + * src/wdgt-mini-preview.c: (draw_labels): + * src/wdgt-rotate-label.c: (drawingarea_update): + Modified to universally use gl_cairo_label_path() to create paths + for labels. Added shadow to mini preview in rotate widget. + +2007-04-10 Jim Evins + + * libglabels/template.h: + * libglabels/template.c: (gl_template_get_name_list_unique), + (gl_template_get_name_list_all), (gl_template_from_name): + Modified libglabels to allow you to get a list of all template names + including all aliases or just a list of primary names of each unique + template. + * src/Makefile.am: + * src/file.c: (gl_file_properties): + * src/glabels.c: (main): + * src/mini-preview-pixbuf-cache.h: + * src/mini-preview-pixbuf-cache.c: + * src/wdgt-media-select.c: (gl_wdgt_media_select_construct), + (filter_changed_cb), (load_list): + Added mini-preview pixbuf cache, so that only one mini-preview is + needed for a unique template and gets reused for all aliases. These + pixbufs will also live for the life of the program so they are not + rebuilt everytime a new label dialog is invoked. + * src/mini-preview-pixbuf.c: (draw_paper), + (draw_rect_label_outline), (draw_round_label_outline), + (draw_cd_label_outline): + Removed some comment artifacts. + +2007-04-04 Jim Evins + + * src/mini-preview-pixbuf.c: (gl_mini_preview_pixbuf_new), + (draw_paper), (draw_label_outlines), (draw_rect_label_outline), + (draw_round_label_outline), (draw_cd_label_outline): + * src/wdgt-media-select.c: (load_list): + * src/wdgt-rotate-label.c: (draw_cd_label_outline): + Cosmetic enhancments to mini previews. + +2007-04-04 Jim Evins + + * src/ui-property-bar.c: (gl_ui_property_bar_finalize), + (gl_ui_property_bar_construct): + Save copy of GladeXML tree so that we don't lose tooltips. + +2007-04-02 Jim Evins + + * src/merge-properties-dialog.c: + * src/new-label-dialog.c: + * src/object-editor.c: + * src/prefs-dialog.c: + * src/print-op.c: + * src/template-designer.c: + * src/ui-property-bar.c: + * src/wdgt-media-select.c: + * src/wdgt-rotate-label.c: + Fixed several memory leaks. + +2007-04-01 Jim Evins + + * src/label-text.c: (gl_label_text_init), (copy), + (gl_label_text_set_lines), (buffer_changed_cb), (get_size), + (set_font_family), (set_font_size), (set_font_weight), + (set_font_italic_flag), (set_text_alignment), + (set_text_line_spacing): + Cache object size, so that expensive extent calculations are only done + when needed. + +2007-03-30 Jim Evins + + * src/prefs-model.c: (gl_prefs_model_load_settings): + Default to an unlimited list of recent documents, since this parameter + seems to be pre-filter anyway. + +2007-03-30 Jim Evins + + * src/label-box.c: (draw_shadow): + * src/label-ellipse.c: (draw_shadow): + Added missing shadow fill. + +2007-03-28 Jim Evins + + * src/ui-commands.c: (gl_ui_cmd_file_print): + Unreferencing the print operation sometimes crashes. Just don't do it + right now. + +2007-03-28 Jim Evins + + * src/print-op.c: (gl_print_op_construct), + (gl_print_op_get_settings), (gl_print_op_set_settings), + (gl_print_op_free_settings), (create_custom_widget_cb): + * src/print-op.h: + * src/ui-commands.c: (gl_ui_cmd_file_print): + * src/window.c: (gl_window_init): + * src/window.h: + Save print settings and custom settings between print operations + on the same window. + +2007-03-24 Jim Evins + + * src/object-editor-image-page.c: + (gl_object_editor_prepare_image_page), + (gl_object_editor_set_image), (img_selection_changed_cb): + Workaround for GtkFileChooserButton bug # 327243. This the root + cause for gLabels bug # 1192884. I have actually observed 3 delayed + "selection-changed" signals -- the first 2 return NULL -- this is + what caused the image to reset to the default followed by setting + it back to the original image, trying to fit it into a new bounding + box. This sequence of events is much more evident with the new + cairo rendering. + +2007-03-23 Jim Evins + + Merged all changes from experimental cairo branch to trunk. + Trunk no longer depends on libgnomecanvas or libgnomeprint[ui]. + +2007-03-23 Jim Evins + + * src/label-object.h: + * src/label-object.c: (gl_label_object_class_init), + (gl_label_object_get_raw_size), (gl_label_object_get_size): + Created "get_raw_size" method. + * src/label-barcode.c: (get_size): + * src/xml-label.c: (xml_create_object_text), + (xml_create_object_barcode): + Use new "get_raw_size" method on label-objects when apropos. + * src/label-text.h: + * src/label-text.c: (get_size), (draw_object), (draw_shadow), + (auto_shrink_font_size): + Added "auto shrink" functionality back. + +2007-03-19 Jim Evins + + * src/label-text.c: (draw_object), (draw_shadow): + Don't use negative scales in workaround from previous commit. + + +2007-03-18 Jim Evins + + * src/xml-label.c: + Forgot to remove include of xml-lable-191 in previous commit. + * src/label-text.c: (get_size), (draw_object), (draw_shadow): + Workaround for pango Bug #341481. Render text at device scale, + and scale font size accordingly. Also, don't do any hinting. + +2007-03-18 Jim Evins + + * src/cairo-ellipse-path.c: + * src/cairo-ellipse-path.h: + Forgot to add these new files during last mass commit. + +2007-03-18 Jim Evins + + * src/Makefile.am: + * src/xml-label-191.c: + * src/xml-label-191.h: + Removed -- Very buggy. Version 1.91 is a very old "unstable" version, + so there is no need to keep compatability. + * src/base64.c: + * src/bc-iec16022.c: + * src/cairo-label-path.c: + * src/cairo-label-path.h: + * src/cairo-markup-path.c: + * src/color.c: + * src/debug.c: + * src/file.c: + * src/glabels-batch.c: + * src/glabels.c: + * src/label-barcode.c: + * src/label-box.c: + * src/label-ellipse.c: + * src/label-image.c: + * src/label-line.c: + * src/label-object.c: + * src/label-object.h: + * src/label-text.c: + * src/label.c: + * src/label.h: + * src/merge-properties-dialog.c: + * src/merge.c: + * src/new-label-dialog.c: + * src/object-editor-bc-page.c: + * src/object-editor-data-page.c: + * src/object-editor-edit-page.c: + * src/object-editor-fill-page.c: + * src/object-editor-image-page.c: + * src/object-editor-line-page.c: + * src/object-editor-private.h: + * src/object-editor-shadow-page.c: + * src/object-editor-text-page.c: + * src/object-editor.c: + * src/pixbuf-cache.c: + * src/print-op.c: + * src/print.c: + * src/recent.c: + * src/stock.c: + * src/template-designer.c: + * src/text-node.c: + * src/ui-property-bar.c: + * src/ui.c: + * src/view-barcode.c: + * src/view-box.c: + * src/view-ellipse.c: + * src/view-image.c: + * src/view-line.c: + * src/view-object.c: + * src/view-object.h: + * src/view-text.c: + * src/view.c: + * src/wdgt-media-select.c: + * src/wdgt-print-copies.c: + * src/wdgt-print-merge.c: + * src/window.c: + * src/xml-label-04.c: + * src/xml-label.c: + Many changes, including: + - Move draw methods from view-*() to label-*(). + - Use same drawing code for on screen view and printing. + - Fix all issues exposed with '-Wall -Werror'. + +2007-03-14 Jim Evins + + * src/Makefile.am: + * src/cairo-handle-path.c: + * src/cairo-handle-path.h: + * src/cairo-object-path.c: + * src/cairo-object-path.h: + Removed cairo-handle-path.[ch] and cairo-object-path.[ch]. + * src/view-barcode.c: (gl_view_barcode_class_init), (draw_object), + (object_at): + * src/view-box.c: (gl_view_box_class_init), (draw_object), + (draw_shadow), (object_at): + * src/view-ellipse.c: (gl_view_ellipse_class_init), + (create_ellipse_path), (draw_object), (draw_shadow), (object_at): + * src/view-image.c: (gl_view_image_class_init), (draw_object), + (object_at): + * src/view-line.c: (gl_view_line_class_init), (draw_object), + (draw_shadow), (object_at): + * src/view-object.c: (gl_view_object_draw), (gl_view_object_at), + (create_handle_path), (gl_view_object_draw_handles), + (gl_view_object_handle_at): + * src/view-object.h: + * src/view-text.c: (gl_view_text_class_init), (draw_object), + (draw_shadow), (object_at): + * src/view.c: (motion_notify_event_cb), (button_press_event_cb): + Some restructuring of new code. + +2007-03-12 Jim Evins + + * src/Makefile.am: + * src/cairo-object-path.c: + * src/view-barcode.c: + * src/view-barcode.h: + * src/view.c: + Added barcode object support to view. + +2007-03-12 Jim Evins + + * src/Makefile.am: + * src/view-text.h: + * src/view-text.c: + * src/view.c: + * src/cairo-object-path.c: + * src/cairo-object-path.h: + * src/view-box.c: + * src/view-ellipse.c: + * src/view-image.c: + * src/view-line.c: + * src/view-object.c: + * src/view-object.h: + Added text object support to view. Added object_at method to all + view_objects. + +2007-03-11 Jim Evins + + * src/Makefile.am: + * src/cairo-object-path.c: (gl_cairo_object_path), + (gl_cairo_image_object_path): + * src/view-image.c: (gl_view_image_class_init), + (gl_view_image_finalize), (gl_view_image_new), + (update_editor_from_label_cb), (draw), + (gl_view_image_get_create_cursor), + (gl_view_image_create_button_press_event), + (gl_view_image_create_motion_event), + (gl_view_image_create_button_release_event): + * src/view-image.h: + * src/view.c: (gl_view_construct), (gl_view_object_create_mode), + (selection_received_cb), (motion_notify_event_cb), + (button_press_event_cb), (button_release_event_cb): + Added image object support to view. + +2007-03-11 Jim Evins + + * src/Makefile.am: + * src/cairo-object-path.c: (gl_cairo_object_path), + (gl_cairo_line_object_path): + * src/view-line.c: (gl_view_line_class_init), (gl_view_line_new), + (update_object_from_editor_cb), (update_editor_from_object_cb), + (update_editor_from_label_cb), (draw), + (gl_view_line_get_create_cursor), + (gl_view_line_create_button_press_event), + (gl_view_line_create_motion_event), + (gl_view_line_create_button_release_event): + * src/view-line.h: + * src/view-object.c: (gl_view_object_resize_event): + * src/view.c: (gl_view_construct), (gl_view_object_create_mode), + (selection_received_cb), (motion_notify_event_cb), + (button_press_event_cb), (button_release_event_cb): + Added line object support to view. + * src/cairo-handle-path.c: + Made handles slightly larger. + + +2007-03-11 Jim Evins + + * src/Makefile.am: + * src/cairo-handle-path.c: + * src/cairo-label-path.c: (gl_cairo_rect_label_path), + (gl_cairo_round_label_path), (gl_cairo_cd_label_path): + * src/cairo-markup-path.c: (gl_cairo_markup_margin_rect_path), + (gl_cairo_markup_margin_round_path), + (gl_cairo_markup_margin_cd_path), (gl_cairo_markup_circle_path): + * src/cairo-object-path.c: (gl_cairo_object_path), + (gl_cairo_ellipse_object_path): + * src/label-object.c: (gl_label_object_rotate): + * src/view-box.c: + * src/view-box.h: + * src/view-ellipse.c: (gl_view_ellipse_class_init), + (gl_view_ellipse_new), (update_object_from_editor_cb), + (update_editor_from_object_cb), (update_editor_from_label_cb), + (draw), (gl_view_ellipse_get_create_cursor), + (gl_view_ellipse_create_button_press_event), + (gl_view_ellipse_create_motion_event), + (gl_view_ellipse_create_button_release_event): + * src/view-ellipse.h: + * src/view-object.c: + * src/view-object.h: + * src/view.c: (gl_view_construct), (gl_view_object_create_mode), + (select_object_real), (selection_received_cb), + (motion_notify_event_cb), (button_press_event_cb), + (button_release_event_cb): + * src/view.h: + Added ellipse object support to view. Plus other cleanup. + +2007-03-11 Jim Evins + + * src/view-box.h: + * src/view-box.c: (gl_view_box_get_create_cursor), + (gl_view_box_create_button_press_event), + (gl_view_box_create_motion_event), + (gl_view_box_create_button_release_event): + * src/view-object.c: (gl_view_object_set_view), + (gl_view_object_handle_at): + * src/view.h: + * src/view.c: (gl_view_arrow_mode), (gl_view_object_create_mode), + (motion_notify_event_cb), (button_press_event_cb), + (button_release_event_cb), (key_press_event_cb): + Added creation code for box object. + +2007-03-09 Jim Evins + + * src/view-object.c: (gl_view_object_resize_event): + * src/view-object.h: + * src/view.c: (motion_notify_event_cb): + Fix bugs with resizing transformed objects. + * src/cairo-handle-path.c: (gl_cairo_handle_path): + * src/cairo-object-path.c: (gl_cairo_object_path): + * src/cairo-object-path.h: + * src/label-object.c: (gl_label_object_init), + (gl_label_object_dup), (gl_label_object_get_extent), + (gl_label_object_flip_horiz), (gl_label_object_flip_vert), + (gl_label_object_rotate), (gl_label_object_set_matrix), + (gl_label_object_get_matrix): + * src/label-object.h: + * src/print.c: (draw_object): + * src/view-box.c: + * src/view-highlight.c: + * src/view-highlight.h: + * src/xml-label-191.c: (xml191_parse_object): + * src/xml-label.c: (xml_parse_affine_attrs), + (xml_create_affine_attrs): + Replace libart affine matrices with cairo matrices. + +2007-03-08 Jim Evins + + * src/view-object.h: + * src/view.c: (gl_view_update), (motion_notify_event_cb): + * src/view-object.c: (gl_view_object_handle_at), + (gl_view_object_resize_event): + Added resize code -- still a bit buggy. + +2007-03-07 Jim Evins + + * src/Makefile.am: + * src/cairo-handle-path.c: + * src/cairo-handle-path.h: + * src/view-box.c: (gl_view_box_new): + * src/view-object.c: (gl_view_object_set_object), + (gl_view_object_draw_handles), (gl_view_object_handle_at): + * src/view-object.h: + * src/view.c: (draw_highlight_layer), (select_object_real), + (unselect_object_real), (view_handle_at), (motion_notify_event_cb), + (button_press_event_cb), (button_release_event_cb), + (key_press_event_cb): + * src/view.h: + Added beginnings of object resize handles. + +2007-03-07 Jim Evins + + * src/view.h: + * src/view.c: (gl_view_init), (gl_view_arrow_mode), + (gl_view_object_create_mode), (motion_notify_event_cb), + (button_press_event_cb), (button_release_event_cb), + (key_press_event_cb): + Added move selection support. + +2007-03-05 Jim Evins + + * src/cairo-object-path.c: (gl_cairo_object_path): + * src/view-object.c: (gl_view_object_draw), + (gl_view_object_draw_highlight): + * src/view.c: (view_object_at), (motion_notify_event_cb), + (button_press_event_cb), (button_release_event_cb): + Additional refinements to select logic. + +2007-03-05 Jim Evins + + * src/view.h: + * src/view.c: (gl_view_init), (gl_view_construct), + (label_changed_cb), (draw_layers), (draw_select_region_layer), + (gl_view_select_region), (object_at), (motion_notify_event_cb), + (button_press_event_cb), (button_release_event_cb): + Added initial select region support and context menu. + +2007-03-04 Jim Evins + + * configure.in: + * src/Makefile.am: + * src/debug.c: + * src/debug.h: + * src/file.c: + * src/label.c: + * src/label.h: + * src/print-op.c: + * src/print.c: + * src/ui-commands.c: + * src/view-box.c: + * src/view-box.h: + * src/view-object.c: + * src/view-object.h: + * src/view.c: + * src/view.h: + * src/wdgt-print-copies.c: + * src/wdgt-print-merge.c: + * src/xml-label.c: + Initial port to a raw Cairo canvas. This removes all remaining + dependencies on libgnomecanvas and libgnomeprint[ui]. Basically + the view is becoming a canvas widget in its own right. Still needs + a lot of work. + * src/cairo-label-path.c: + * src/cairo-label-path.h: + * src/cairo-markup-path.c: + * src/cairo-markup-path.h: + * src/cairo-object-path.c: + * src/cairo-object-path.h: + New files to support cairo canvas. + * src/canvas-hacktext.c: + * src/canvas-hacktext.h: + Removed. + +2007-02-18 Jim Evins + + * src/bc.h: + GNOME_FONT_BOOK changed to PANGO_WEIGHT_NORMAL. + +2007-02-14 Jim Evins + + * src/base64.c: + * src/base64.h: + * src/bc-gnubarcode.c: + * src/bc-gnubarcode.h: + * src/bc-postnet.c: + * src/bc-postnet.h: + * src/bc.c: + * src/bc.h: + * src/canvas-hacktext.c: + * src/canvas-hacktext.h: + * src/debug.c: + * src/debug.h: + * src/file.c: + * src/file.h: + * src/glabels.c: + * src/hig.h: + * src/label-barcode.c: + * src/label-barcode.h: + * src/label-box.c: + * src/label-box.h: + * src/label-ellipse.c: + * src/label-ellipse.h: + * src/label-image.c: + * src/label-image.h: + * src/label-line.c: + * src/label-line.h: + * src/label-object.c: + * src/label-object.h: + * src/label-text.c: + * src/label-text.h: + * src/label.c: + * src/label.h: + * src/merge-evolution.c: + * src/merge-evolution.h: + * src/merge-init.c: + * src/merge-init.h: + * src/merge-properties-dialog.c: + * src/merge-properties-dialog.h: + * src/merge-text.c: + * src/merge-text.h: + * src/merge-vcard.c: + * src/merge-vcard.h: + * src/merge.c: + * src/merge.h: + * src/mini-preview-pixbuf.h: + * src/new-label-dialog.c: + * src/new-label-dialog.h: + * src/object-editor-bc-page.c: + * src/object-editor-data-page.c: + * src/object-editor-edit-page.c: + * src/object-editor-fill-page.c: + * src/object-editor-image-page.c: + * src/object-editor-line-page.c: + * src/object-editor-lsize-page.c: + * src/object-editor-position-page.c: + * src/object-editor-private.h: + * src/object-editor-size-page.c: + * src/object-editor-text-page.c: + * src/object-editor.c: + * src/object-editor.h: + * src/pixbuf-cache.c: + * src/pixbuf-cache.h: + * src/prefs-dialog.c: + * src/prefs-dialog.h: + * src/prefs-model.c: + * src/prefs-model.h: + * src/prefs.c: + * src/prefs.h: + * src/print-op.c: + * src/stock.c: + * src/stock.h: + * src/template-designer.c: + * src/text-node.c: + * src/text-node.h: + * src/ui-commands.c: + * src/ui-commands.h: + * src/ui-property-bar.c: + * src/ui-property-bar.h: + * src/ui-sidebar.c: + * src/ui-sidebar.h: + * src/ui-util.c: + * src/ui-util.h: + * src/ui.c: + * src/ui.h: + * src/util.c: + * src/util.h: + * src/view-barcode.c: + * src/view-barcode.h: + * src/view-box.c: + * src/view-box.h: + * src/view-ellipse.c: + * src/view-ellipse.h: + * src/view-highlight.c: + * src/view-highlight.h: + * src/view-image.c: + * src/view-image.h: + * src/view-line.c: + * src/view-line.h: + * src/view-object.c: + * src/view-object.h: + * src/view-text.c: + * src/view-text.h: + * src/view.c: + * src/view.h: + * src/wdgt-chain-button.c: + * src/wdgt-chain-button.h: + * src/wdgt-media-select.c: + * src/wdgt-mini-preview.c: + * src/wdgt-print-copies.c: + * src/wdgt-print-copies.h: + * src/wdgt-print-merge.c: + * src/wdgt-print-merge.h: + * src/wdgt-rotate-label.c: + * src/window.h: + * src/xml-label-04.c: + * src/xml-label-04.h: + * src/xml-label-191.c: + * src/xml-label-191.h: + * src/xml-label.c: + * src/xml-label.h: + + Assorted superficial cleanup. Including: + - Use G_DEFINE_TYPE for all objects. + - Reconcile style of all class initializer functions + - Reconcile style of all finalize functions + - Add emacs mode line to all source files + +2007-02-06 Jim Evins + +Assorted cleanup and removal of deprecated items. + + * src/splash.c: + * src/splash.h: + * src/Makefile.am: + Removed annoying splash screen. + * src/glabels-batch.c: (main): + * src/glabels.c: (main): + Converted from popt to GOption. + * src/object-editor-shadow-page.c: + (gl_object_editor_set_shadow_state): + Removed deprecated method on GtkToggleButton. + * src/ui-commands.c: (gl_ui_cmd_help_about): + Removed dependency on libgnomui/qnome-url.h. + * src/template-designer.c: + Removed dependency on libgnome/gnome-program.h. + + +2007-02-04 Jim Evins + + * src/color.c: + * src/color.h: + * src/prefs-model.c: + * src/print.c: (draw_text_object): + * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_construct): + Removed GnomeCanvas artifacts from color.[ch] and related modules. + +2007-02-04 Jim Evins + + * src/wdgt-mini-preview.c: + * src/wdgt-mini-preview.h: + Ported widget from GnomeCanvas to Cairo. + +2007-02-03 Jim Evins + + * data/glade/template-designer.glade: + * src/template-designer.c: + * src/template-designer.h: + Ported GnomeDruid to GtkAssistant. Since libglade does not + yet support the GtkAssistant and we derive directly from + the Assistant, the pages are layed out in a GtkNotebook in + the glade description -- we then append each page to the + assistant. + +2007-01-25 Jim Evins + + * data/glade/object-editor.glade: + Added dummy page to notebook, to prevent shadow page from + becoming the default current page at creation. + * src/view-box.c: (construct_properties_editor): + * src/view-ellipse.c: (construct_properties_editor): + * src/view-line.c: (construct_properties_editor): + * src/view-text.c: (construct_properties_editor): + Reconciled order of params. + +2007-01-19 Jim Evins + + * src/label-barcode.h: + * src/label-object.c: (gl_label_object_set_font_weight), + (gl_label_object_set_text_alignment), + (gl_label_object_get_font_weight), + (gl_label_object_get_text_alignment): + * src/label-object.h: + * src/label-text.c: (gl_label_text_instance_init), (copy), + (get_size), (set_font_family), (set_font_weight), + (set_text_alignment), (get_font_weight), (get_text_alignment): + * src/label-text.h: + * src/object-editor-text-page.c: + (gl_object_editor_prepare_text_page), + (gl_object_editor_set_font_family), + (gl_object_editor_set_font_weight), + (gl_object_editor_get_font_weight), + (gl_object_editor_set_text_alignment), + (gl_object_editor_get_text_alignment), + (gl_object_editor_set_text_color): + * src/object-editor.h: + * src/prefs-dialog.c: (construct_object_page), + (update_object_page_from_prefs), (update_prefs_from_object_page): + * src/prefs-model.c: (gl_prefs_model_save_settings), + (gl_prefs_model_load_settings): + * src/prefs-model.h: + * src/print.c: (draw_text_object): + * src/ui-property-bar.c: (gl_ui_property_bar_construct), + (reset_to_default_properties), (update_text_properties), + (font_bold_toggled_cb), (text_align_toggled_cb): + * src/ui-sidebar.c: + * src/util.c: (gl_util_align_to_string), (gl_util_string_to_align), + (gl_util_weight_to_string), (gl_util_string_to_weight), + (gl_util_get_font_family_list), (gl_util_font_family_list_free): + * src/util.h: + * src/view-text.c: (update_object_from_editor_cb), + (update_editor_from_object_cb), (draw_hacktext), (draw_cursor): + * src/view.c: (gl_view_set_selection_text_alignment), + (gl_view_set_default_text_alignment), + (gl_view_get_default_text_alignment): + * src/view.h: + * src/xml-label-04.c: (xml04_parse_text_props): + * src/xml-label-191.c: (xml191_parse_text_props): + * src/xml-label.c: (xml_parse_object_text), + (xml_parse_toplevel_span), (xml_create_object_text), + (xml_create_toplevel_span): + Converted all model internals to Pango. GnomeFont remains in + view until GnomeCanvas can be replaced with a cairo-based canvas. + +2007-01-17 Jim Evins + + * src/Makefile.am: + * src/hig.c: + Deleted hig.c. + * src/hig.h: + * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type), + (gl_wdgt_print_copies_construct): + * src/wdgt-print-copies.h: + * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type), + (gl_wdgt_print_merge_construct): + * src/wdgt-print-merge.h: + Removed all remaining HIG wrapper widgets. + +2007-01-16 Jim Evins + + * src/Makefile.am: + * src/print-dialog.c: + * src/print-dialog.h: + * src/print-op.c: + * src/print-op.h: + * src/template-designer.c: (print_test_cb): + * src/ui-commands.c: (gl_ui_cmd_file_print): + * src/print.c: + Renamed PrintDialog to PrintOp. Added constructor for batch + printing. + * src/glabels-batch.c: (main): + Converted to use new PrintOp object for printing. + +2007-01-15 Jim Evins + + * data/glade/Makefile.am: + * data/glade/print-custom-widget.glade: + * src/print-dialog.c: + * src/print-dialog.h: + * src/print.c: + * src/print.h: + * src/template-designer.c: (print_test_cb): + * src/ui-commands.c: (gl_ui_cmd_file_print): + * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_copies): + * src/wdgt-print-merge.h: + * src/window.c: (gl_window_init): + * src/window.h: + Initial conversion to GtkPrintOperation. + Still to do: + - Remove font and other libgnomeprint[ui] from elsewhere + - Add batch initialization of print operation + +2007-01-08 Jim Evins + * configure.in: + Updated dependencies. Set version to 2.1.pre4cvs. + +2007-01-03 Jim Evins + + * src/recent-files/* + Removed EggRecent stuff. + * configure.in: + * src/Makefile.am: + * src/file.c: + * src/recent.c: + * src/recent.h: + * src/ui-commands.c: + * src/ui-commands.h: + * src/ui.c: + Ported from EggRecent to GtkRecentManager. + + +2007-01-02 Jim Evins + + * configure.in: + * iec16022-0.2.1/BUGS: + * iec16022-0.2.1/CHANGELOG: + * iec16022-0.2.1/CREDITS: + * iec16022-0.2.1/INSTALL: + * iec16022-0.2.1/LICENSE: + * iec16022-0.2.1/Makefile.am: + * iec16022-0.2.1/Makefile.dist: + * iec16022-0.2.1/README: + * iec16022-0.2.1/README.glabels: + * iec16022-0.2.1/TODO: + * iec16022-0.2.1/iec16022.1: + * iec16022-0.2.1/iec16022.c: + * iec16022-0.2.1/iec16022ecc200.c: + * iec16022-0.2.1/iec16022ecc200.h: + * iec16022-0.2.1/image.c: + * iec16022-0.2.1/image.h: + * iec16022-0.2.1/reedsol.c: + * iec16022-0.2.1/reedsol.h: + * iec16022-0.2.1/test/testsuite-example.bin: + * iec16022-0.2.1/test/testsuite-example.eps: + * iec16022-0.2.1/test/testsuite-example.hex: + * iec16022-0.2.1/test/testsuite-example.png: + * iec16022-0.2.1/test/testsuite-example.text: + * iec16022-0.2.1/test/testsuite.sh: + Include modified copy of iec16022-0.2.1 to provide encoding + support for datamatrix 2D barcodes. + * src/Makefile.am: + * src/bc-iec16022.c: + * src/bc-iec16022.h: + * src/bc.c: + Added initial datamatrix 2D barcode backend to barcode code. + * INSTALL: + * gtk-doc.make: + Automatic updates to later versions of these files. + +2006-11-28 Jim Evins + + * data/templates/avery-iso-templates.xml: + * data/templates/avery-us-templates.xml: + * data/templates/categories.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-us-templates.xml: + * data/templates/zweckform-iso-templates.xml: + More categorization. + +2006-09-12 Jim Evins + + * data/dtd/glabels-2.0.dtd: + * data/templates/Makefile.am: + * data/templates/avery-iso-templates.xml: + * data/templates/avery-other-templates.xml: + * data/templates/avery-us-templates.xml: + * data/templates/categories.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-other-templates.xml: + * data/templates/zweckform-iso-templates.xml: + * data/glade/Makefile.am: + * data/glade/new-label-dialog.glade: + * data/glade/wdgt-media-select.glade: + * data/glade/wdgt-rotate-label.glade: + * libglabels/Makefile.am: + * libglabels/category.c: + * libglabels/category.h: + * libglabels/libglabels.h: + * libglabels/paper.c: + * libglabels/template.c: + * libglabels/template.h: + * libglabels/xml-category.c: + * libglabels/xml-category.h: + * libglabels/xml-template.c: + Added support for category meta data. + * src/Makefile.am: + * src/file.c: + * src/mini-preview-pixbuf.c: + * src/mini-preview-pixbuf.h: + * src/new-label-dialog.c: + * src/new-label-dialog.h: + * src/wdgt-media-select.c: + * src/wdgt-media-select.h: + * src/wdgt-rotate-label.c: + * src/wdgt-rotate-label.h: + New "new label" dialog. + +2006-05-27 Jim Evins + + * NEWS: + * autogen.sh: + * configure.in: + Preparation for 2.1.3. + * acinclude.m4: + * omf.make: + * xmldocs.make: + Removed. + +2006-05-22 Jim Evins + + * src/print.c: (draw_barcode_object): + Don't print "Invalid barcode data" if data field is empty. Patch provided + by Darren Warner . Fixes Bug #1479839. + * AUTHORS: + Added acknowledgment for above patch. + * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new): + * src/bc-postnet.c: (postnet_code): + Removed "Invalid barcode data" warnings from stderr. + * src/view-barcode.c: (draw_barcode): + Draw box around barcode extent if data empty or invalid. Center a + message whether the data is empty or invalid in box. + +2006-05-22 Jim Evins + + * src/print.c: (draw_text_object): + Check shadow state when printing text. + +2006-05-20 Jim Evins + + * src/ui-commands.c: (gl_ui_cmd_view_grid_toggle), + (gl_ui_cmd_view_markup_toggle): + Fixed crash when grid or markup have been toggled off during + a previous session. Bug #1434324. + +2006-04-05 Jim Evins + + * src/object-editor.c: (gl_object_editor_set_key_names): + Fixed potential crash when freeing empty key list. + +2006-03-11 Jim Evins + + * src/print.c: (draw_text_object): + * src/view-text.c: (gl_view_text_new), + (construct_properties_editor), (update_object_from_editor_cb), + (update_editor_from_object_cb), (update_editor_from_label_cb), + (draw_hacktext): + Added shadow support to text object. + +2006-02-18 Jim Evins + + * src/print.c: (draw_line_object): + * src/view-line.c: (gl_view_line_new), + (construct_properties_editor), (update_canvas_item_from_object_cb), + (update_object_from_editor_cb), (update_editor_from_object_cb), + (update_editor_from_label_cb): + Added shadow support to line object. + +2006-02-16 Jim Evins + + * src/view-box.c: + Comment changes. + * src/print.c: (draw_ellipse_object): + * src/view-ellipse.c: (gl_view_ellipse_new), + (construct_properties_editor), (update_canvas_item_from_object_cb), + (update_object_from_editor_cb), (update_editor_from_object_cb), + (update_editor_from_label_cb): + Added shadow support to ellipse object. + +2006-02-15 Jim Evins + + * src/label-object.c: + Changed default shadow offsets. + * src/view-box.c: (gl_view_box_new): + Simplified gl_view_box_new() so that is does not duplicate code + in update_canvas_item_from_object_cb(). + +2006-02-07 Jim Evins + + * data/glade/object-editor.glade: + Fixed color groups of color combos. + * src/color.h: + Added default shadow color. + * src/object-editor.c: (gl_object_editor_construct_color_combo): + Added shadow color group. + +2006-02-06 Jim Evins + + * src/object-editor-shadow-page.c: + Forgot to add this file. + * src/view-box.c: (gl_view_box_new), + (update_canvas_item_from_object_cb), (update_editor_from_label_cb): + Update limits on shadow offset spinbuttons. + +2006-01-19 Jim Evins + + * src/merge-evolution.c: (gl_merge_evolution_get_key_list): + Initialize key_list to NULL. + * data/glade/object-editor.glade: + * src/Makefile.am: + * src/color.c: + * src/color.h: + * src/label-object.c: + * src/label-object.h: + * src/object-editor-fill-page.c: + * src/object-editor-private.h: + * src/object-editor.c: + * src/object-editor.h: + * src/xml-label.c: + Created infrastructure for shadow support. + * src/view-box.c: + * src/print.c: + Initial shadow support in box object only. + +2006-01-05 Jim Evins + + * src/merge-properties-dialog.c: (src_changed_cb): + Be extra paranoid before calling strcmp(). + * src/merge.c: (gl_merge_set_src): + Don't make (merge == NULL) a critical error. + +2005-12-22 Jim Evins + + * src/glabels-batch.c: (main): + Compile warning free with gcc 4.0. + +2005-12-21 Jim Evins + + * glabels.spec.in: + Updated example RPM spec file. + +2005-12-21 Jim Evins + + * NEWS: + * configure.in: + Preparation for 2.1.2. + +2005-12-20 Jim Evins + + * src/Makefile.am: + Define unique G_LOG_DOMAIN for glabels. + * src/critical-error-handler.c: (gl_critical_error_handler_init): + * src/warning-handler.c: (gl_warning_handler_init), + (warning_handler): + Register for G_LOG_DOMAIN instead of NULL. + +2005-12-10 Jim Evins + + * src/merge-evolution.c: + * src/merge-vcard.c: + Fixed indentation. + +2005-12-08 Jim Evins + + * libglabels/paper.c: (read_paper_files_from_dir): + * libglabels/template.c: (gl_template_register), + (read_template_files_from_dir): + * libglabels/xml-paper.c: (gl_xml_paper_read_papers_from_file), + (gl_xml_paper_parse_papers_doc): + * libglabels/xml-template.c: + (gl_xml_template_read_templates_from_file), + (gl_xml_template_parse_templates_doc), + (gl_xml_template_parse_template_node), + (xml_parse_label_rectangle_node), (xml_parse_label_round_node), + (xml_parse_label_cd_node), (xml_parse_layout_node), + (xml_parse_markup_margin_node), (xml_parse_markup_line_node), + (xml_parse_markup_circle_node), + (gl_xml_template_write_templates_to_file), (xml_create_label_node): + * libglabels/xml.c: (gl_xml_get_prop_length): + Re-classified g_warnings to g_messages. + * src/Makefile.am: + * src/glabels.c: (main): + * src/warning-handler.c: (gl_warning_handler_init), + (warning_handler): + * src/warning-handler.h: + Added warning message handler to make sure the user is + presented with appropriate non-fatal errors. + * src/critical-error-handler.c: (critical_error_handler): + Changed exit to abort. + * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new), (render_pass1): + * src/bc-postnet.c: (postnet_code): + * src/bc.c: (id_to_index), (name_to_index): + * src/merge.c: (gl_merge_register_backend), (gl_merge_new): + * src/object-editor.c: (gl_object_notebook_construct_valist): + * src/prefs-dialog.c: (update_locale_page_from_prefs): + * src/prefs.c: (gl_prefs_get_units_per_point), + (gl_prefs_get_units_precision), (gl_prefs_get_units_step_size), + (gl_prefs_get_units_string): + * src/print.c: (draw_outline), (clip_to_outline), (clip_punchouts): + * src/splash.c: (gl_splash): + * src/ui-commands.c: (gl_ui_cmd_help_contents): + * src/view-highlight.c: (gl_view_highlight_new), + (highlight_resizable_box_construct), (object_changed_cb), + (view_scale_changed_cb): + * src/view.c: (draw_label_layer), (draw_bg_fg_layers), + (draw_markup_layer), (draw_markup_margin), + (gl_view_object_create_mode), (canvas_event), + (selection_received_cb): + * src/wdgt-mini-preview.c: (mini_outline_list_new): + * src/wdgt-rotate-label.c: (mini_preview_canvas_update): + * src/xml-label-04.c: (gl_xml_label_04_parse), + (xml04_parse_media_description), (xml04_parse_text_props), + (xml04_parse_barcode_props): + * src/xml-label-191.c: (gl_xml_label_191_parse), + (xml191_parse_objects), (xml191_parse_object), + (xml191_parse_text_props), (xml191_parse_image_props), + (xml191_parse_barcode_props), (xml191_parse_data), + (xml191_parse_sheet), (xml191_parse_label), (xml191_parse_layout), + (xml191_parse_markup): + * src/xml-label.c: (gl_xml_label_open), (gl_xml_label_open_buffer), + (xml_doc_to_label), (xml_parse_label), (xml_parse_objects), + (xml_parse_object_text), (xml_parse_object_image), + (xml_parse_object_barcode), (xml_parse_data), + (xml_parse_toplevel_span), (gl_xml_label_save), + (xml_create_objects): + Re-classified g_warnings to g_messages. + * src/merge-evolution.c: (gl_merge_evolution_open), + (gl_merge_evolution_close), (gl_merge_evolution_get_record): + Use g_warning to output errors encountered while + communicating with the evolution data server + instead of embedding them in the data. + +2005-12-08 Jim Evins + + * libglabels/libglabels-private.h: + Set G_LOG_DOMAIN + * libglabels/paper.c: (read_papers): + * libglabels/template.c: (read_templates): + Made appropriate warnings critical. + * src/Makefile.am: + * src/critical-error-handler.h: + * src/critical-error-handler.c: (gl_critical_error_handler_init), + (critical_error_handler): + Created critical error handler. + * src/glabels.c: (main): + Register critical error handler. + * src/merge-properties-dialog.c: (gl_merge_properties_dialog_init): + * src/object-editor.c: (gl_object_editor_init): + * src/prefs-dialog.c: (gl_prefs_dialog_init): + * src/template-designer.c: (gl_template_designer_init): + * src/ui-property-bar.c: (gl_ui_property_bar_instance_init): + Made appropriate warnings critical. + +2005-11-27 Jim Evins + + * src/merge-evolution.c: (gl_merge_evolution_get_key_list), + (gl_merge_evolution_get_primary_key), + (gl_merge_evolution_get_record): + Don't create "record_key" pseudo-key. Don't populate + fields with null data. + +2005-11-25 Jim Evins + + * src/merge-evolution.c: (gl_merge_evolution_finalize), + (gl_merge_evolution_get_key_list), (gl_merge_evolution_open), + (gl_merge_evolution_get_record), (gl_merge_evolution_copy), + (free_field_list): + Query EDS for all supported fields. Patch provided by + Austin Henry . + +2005-10-29 Jim Evins + + * src/glabels.c: (main): + * src/label-barcode.c: (gl_label_barcode_finalize): + * src/label-text.c: (gl_label_text_finalize), (set_font_family): + * src/label.c: (gl_label_instance_init), (gl_label_finalize): + * src/object-editor.c: (gl_object_editor_finalize): + Another pass at valgrinding -- plugged several memory leaks. + * src/view-text.c: (gl_view_text_new), + (update_canvas_item_from_object_cb), (draw_hacktext): + Commented out artifacts of edit-in-place code. + +2005-10-28 Jim Evins + + * src/canvas-hacktext.c: (gl_canvas_hacktext_set_arg): + Fixed use of uninitialized variable. Caught by + d binderman . + +2005-10-27 Jim Evins + + * src/merge-evolution.c: (gl_merge_evolution_get_record): + * src/merge-vcard.c: (gl_merge_vcard_get_record), + (parse_next_vcard): + Additional cleanup of EDS and vcard backends. Provided by + Austin Henry . + +2005-10-24 Jim Evins + + * AUTHORS: + * src/Makefile.am: + * src/merge-evolution.c: + * src/merge-evolution.h: + * src/merge-init.c: (gl_merge_init): + * src/merge-properties-dialog.c: (type_changed_cb): + * src/merge-vcard.c: + * src/merge-vcard.h: + * src/ui-commands.c: (gl_ui_cmd_help_about): + Added Evolution Data Server and VCard merge backends. Original patch + provided by Austin Henry . + * configure.in: + Only support EDS and VCard backends if libebook is installed. Allow + user to disable support, even if installed. + +2005-10-24 Jim Evins + + * AUTHORS: + * data/templates/avery-iso-templates.xml: + * data/templates/avery-us-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/zweckform-iso-templates.xml: + Collected all template changes and submissions since last + release. + +2005-10-23 Jim Evins + + * configure.in: + * data/mime/Makefile.am: + Added configure options to disable update-mime-database and + update-desktop-database as part of the install. Patch + provided by Leonardo Boshell (qhoracio@sourceforge.net). + +2005-10-23 Jim Evins + + * libglabels/xml.h: + * libglabels/xml.c: (gl_xml_get_prop_string), + (gl_xml_get_prop_i18n_string), (gl_xml_set_prop_string), + (gl_xml_is_node), (gl_xml_get_node_content): + Added new XML utility functions. + * libglabels/xml-paper.c: + * libglabels/xml-template.c: + * src/xml-label.c: + Cleanup by using new xml utilities created above. + * libglabels/paper.c: (gl_paper_free): + * src/file.c: (new_response): + * src/object-editor-image-page.c: (add_image_filters_to_chooser): + * src/pixbuf-cache.c: (gl_pixbuf_cache_add_pixbuf), + (gl_pixbuf_cache_get_pixbuf): + * src/ui-property-bar.c: + (gl_ui_property_bar_construct_color_combo): + * src/view-highlight.c: (gl_view_highlight_finalize): + * src/view-image.c: (update_object_from_editor_cb): + * src/view.c: (gl_view_finalize), (draw_bg_fg_layers), + (draw_bg_fg_rounded_rect), (draw_bg_fg_round), (draw_bg_fg_cd), + (draw_bg_fg_cd_bc), (draw_markup_layer), (draw_markup_margin), + (draw_markup_margin_rect), (draw_markup_margin_rounded_rect), + (draw_markup_margin_round), (draw_markup_margin_cd), + (draw_markup_margin_cd_bc): + * src/wdgt-mini-preview.c: (mini_outline_list_new): + * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_finalize): + Plugged various memory leaks located with valgrind. + * src/view-image.c: (update_canvas_item_from_object_cb): + Don't allow a width or height of zero when drawing pixbuf. + +2005-10-22 Jim Evins + + * libglabels/xml-paper.c: + * libglabels/xml-template.c: + * libglabels/xml.c: + * src/base64.c: + * src/bc-gnubarcode.c: + * src/canvas-hacktext.c: + * src/label-text.c: + * src/object-editor-data-page.c: + * src/print-dialog.c: + * src/print.c: + * src/recent.c: + * src/template-designer.c: + * src/text-node.c: + * src/ui-property-bar.c: + * src/ui.c: + * src/view-barcode.c: + * src/view-box.c: + * src/view-ellipse.c: + * src/view-image.c: + * src/view-line.c: + * src/view-text.c: + * src/view.c: + * src/wdgt-media-select.c: + * src/xml-label-04.c: + * src/xml-label-191.c: + * src/xml-label.c: + Modified to compile warning free with gcc-4.0. Mostly + casting to change signedness of characters. Did not + attack gnu-barcode library yet. + +2005-10-22 Jim Evins + + * src/glabels.c: (main): + * src/splash.c: (gl_splash): + Removed some small memory leaks. + * gtk-doc.make: + Added. + +2005-09-19 Jim Evins + + * data/glade/property-bar.glade: + Remove items from font_family_combo. This prevents the + double entry after adding text model and list of fonts. + * src/ui-property-bar.c: (reset_to_default_properties): + Free font_family_list. + +2005-07-01 Jim Evins + + * po/it.po: + Updated italian translation (Daniele Medri) + +2005-06-26 Jim Evins + + * docs/libglabels/libglabels-decl-list.txt: + Somehow never got checked in before. + * docs/libglabels/libglabels.types: + Removed -- don't need it afterall. + +2005-06-20 Jim Evins + + * NEWS: + Final prep for 2.1.1 release. + +2005-06-20 Jim Evins + + * configure.in: + Final preps for 2.1.1 release. + * docs/libglabels/libglabels.types: + Somehow never got checked in before. + * po/POTFILES.in: + Bring up-to-date with recent reorg of ui code. + + +2005-06-19 Jim Evins + + * src/template-designer.c: (construct_layout_page): + Removed attempt to match background color of mini preview widget to + background. + +2005-06-17 Jim Evins + + * help/C/figures/merge-ex2-4.png: + * help/C/glabels.xml: + Fixed spelling error. + +2005-06-13 Jim Evins + + * help/C/figures/merge-ex1-1.png: + * help/C/figures/merge-ex1-2.png: + * help/C/figures/merge-ex1-3.png: + * help/C/figures/merge-ex1-4.png: + * help/C/figures/merge-ex2-1.png: + * help/C/figures/merge-ex2-2.png: + * help/C/figures/merge-ex2-3.png: + * help/C/figures/merge-ex2-4.png: + Added figures for document merge tutorial. + * help/C/glabels.xml: + Added document merge tutorial. + +2005-05-19 Jim Evins + + * data/glade/merge-properties-dialog.glade: + Fixed irregular spacing. + * src/merge-properties-dialog.c: (gl_merge_properties_dialog_init), + (gl_merge_properties_dialog_construct): + Set outer padding and remove separator. + +2005-05-18 Jim Evins + + * src/hig.h: + * src/hig.c: + Removed glHigDialog class. + * src/file.c: (gl_file_new), (create_new_dialog_widgets), + (gl_file_properties), (create_properties_dialog_widgets): + * src/prefs-dialog.h: + * src/prefs-dialog.c: (gl_prefs_dialog_get_type), + (gl_prefs_dialog_init), (gl_prefs_dialog_construct): + * src/print-dialog.h: + * src/prefs-dialog.h: + * src/print-dialog.c: (gl_print_dialog_get_type), + (gl_print_dialog_init), (gl_print_dialog_construct): + Replaced all instances of glHigDialog with GtkDialog. + +2005-05-17 Jim Evins + + * src/hig.h: + * src/hig.c: + Removed HigAlert class since it is obsoleted by the GtkMessageDialog class. + * src/file.c: (open_response), (gl_file_open_real), (gl_file_save), + (save_as_response), (gl_file_close): + Replaced all instances of HigAlert widgets with GtkMessageDialog widgets. + +2005-05-15 Jim Evins + + * src/ui-commands.h: + * src/ui-util.c: + * src/ui-util.h: + * src/ui.c: + * src/ui.h: + * src/view.c: + * src/window.c: + * src/window.h: + A little code reformatting -- no functional changes. + +2005-05-14 Jim Evins + + * src/Makefile.am: + Removed obsolete macros. + * src/marshal.list: + Added marshalling template to support new view signal: "context_menu_activate." + * src/view.h: + * src/view.c: (gl_view_class_init), (gl_view_construct), + (canvas_event_arrow_mode): + - Removed hardcoded context menus and added new signal "context_menu_activate" + to push this up to the uimanager. + - Removed merge properties and print dialogs so that they can be managed with + the window by the uimanager. + * src/merge-properties-dialog.h: + * src/merge-properties-dialog.c: (gl_merge_properties_dialog_new), + (gl_merge_properties_dialog_construct): + Changed calling convention of gl_merge_properties_dialog_new() to use + glLabel and GtkWindow instead of view to make more consistent with other + dialogs. + * src/print-dialog.h: + * src/print-dialog.c: (gl_print_dialog_new), + (gl_print_dialog_construct): + Removed last artifact of libbonoboui. + * src/ui-commands.c: (gl_ui_cmd_file_print), + (gl_ui_cmd_objects_merge_properties), (gl_ui_cmd_help_about): + Reconciled style for launching dialogs. + * src/ui.c: (gl_ui_new): + Added context menus to ui manager. + * src/view-object.c: (item_event_arrow_mode): + No longer try to select objects with right-click. + * src/window.h: + * src/window.c: (gl_window_init), (gl_window_set_label), + (context_menu_activate_cb): + Context menus and all dialogs are now managed in a consistent way in window + by the ui manager. + +2005-05-11 Jim Evins + + * src/window.h: + * src/window.c: (gl_window_init), (gl_window_destroy): + * src/ui.c: (gl_ui_new), (gl_ui_unref), (recent_tooltip_func): + * src/ui-commands.c: (gl_ui_cmd_file_open_recent): + Moved management of recent_view back from window.c to ui.c -- it just feels + better there. + +2005-05-10 Jim Evins + + * src/window.h: + * src/window.c: (gl_window_init): + * src/ui.h: + * src/ui.c: (gl_ui_new), (connect_proxy_cb), (disconnect_proxy_cb), + (menu_item_select_cb), (menu_item_deselect_cb): + Added GtkStatusbar which displays menu tooltips. + +2005-05-09 Jim Evins + + Replaced libbonoboui with GtkUIManager for creation of basic user interface menus + and toolbars. + + * configure.in: + * glabels.spec.in: + Removed dependencies on libbonoboui. + * data/Makefile.am: + * data/ui/Makefile.am: + * data/ui/glabels-ui.xml: + Removed data/ui directory. + * data/glade/Makefile.am: + * data/property-bar.glade: + Added glade description of property-bar for new libglade implementation + of glUIPropertyBar. + * src/Makefile.am: + * src/commands.h: + * src/commands.c: + * src/tools.h: + * src/tools.c: + * src/ui-commands.h: + * src/ui-commands.c: + Replaced commands.[ch] and tools.[ch] with the single ui-commands.[ch] module + since the distinction between "commands" and "tools" is no longer that clear. + * src/file.h: + * src/file.c: + Modified to expect glWindow instead of GtkWindow. gl_file_open_recent() + no longer has knowledge of eggRecent*. + * src/glabels.c: (main): + Removed libbonobo initialization and replaced bonobo_main loop with gtk_main + loop. + * src/object-editor.c: (gl_object_editor_init): + Make sure notebook does not respond to a "show_all" on the parent. + * src/recent-files/Makefile.am: + * src/recent-files/*.[ch] + Updated from latest version of libegg which now has a view based on + GtkUIManager. Removed unused bonobo and gtk views. + * src/ui-property-bar.h: + * src/ui-property-bar.c: + New implementation based on libglade. + * src/ui-sidebar.h: + * src/ui-sidebar.c: + Sidebar is now simply a GtkWidget and does not expect to be a part of + a libbonoboui interface. + * src/ui-util.h: + * src/ui-util.c: + * src/ui.h: + * src/ui.c: + Converted for use with GtkUIManager. + * src/window.h: + * src/window.c: + Now derived from GtkWindow instead of BonoboWindow and uses GtkUIManager + to create menus and toolbars. + +2005-04-25 Jim Evins + + * data/templates/misc-iso-templates.xml: + Added Fellows 04715 template provided by Steve Saxon. + * AUTHORS: + Updated acknowledgement for above. + +2005-04-23 Jim Evins + + * src/util.c: (gl_util_combo_box_set_strings): + Make sure to clear model before loading a new list of strings. + * src/wdgt-media-select.h: + * src/wdgt-media-select.c: (gl_wdgt_media_select_instance_init), + (gl_wdgt_media_select_construct), (page_size_combo_changed_cb), + (template_combo_changed_cb), (prefs_changed_cb), + (gl_wdgt_media_select_get_name), (gl_wdgt_media_select_set_name), + (gl_wdgt_media_select_get_page_size), + (gl_wdgt_media_select_set_page_size): + Replaced the deprecated GtkCombo widget with the new + GtkComboBox. + +2005-04-21 Jim Evins + + * data/glade/template-designer.glade: + * src/template-designer.c: (construct_pg_size_page), + (pg_size_page_changed_cb), (build_template): + Replaced the deprecated GtkCombo widget with the new + GtkComboBox. + +2005-04-20 Jim Evins + + * data/glade/prefs-dialog.glade: + * src/prefs-dialog.c: (construct_object_page), + (update_object_page_from_prefs), (update_prefs_from_object_page): + Replaced the deprecated GtkCombo widget with the new + GtkComboBox. + +2005-04-19 Jim Evins + + * data/glade/object-editor.glade: + * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page), + (style_changed_cb), (gl_object_editor_set_bc_style), + (gl_object_editor_get_bc_style), (gl_object_editor_set_bc_color), + (gl_object_editor_get_bc_color): + * src/object-editor-data-page.c: + (gl_object_editor_prepare_data_page), (gl_object_editor_set_data), + (gl_object_editor_get_data): + * src/object-editor-edit-page.c: + (gl_object_editor_prepare_edit_page), (insert_button_cb): + * src/object-editor-fill-page.c: + (gl_object_editor_prepare_fill_page), + (gl_object_editor_set_fill_color), + (gl_object_editor_get_fill_color): + * src/object-editor-image-page.c: + (gl_object_editor_prepare_image_page), + (gl_object_editor_set_image), (gl_object_editor_get_image): + * src/object-editor-line-page.c: + (gl_object_editor_prepare_line_page), + (gl_object_editor_set_line_color), + (gl_object_editor_get_line_color): + * src/object-editor-private.h: + * src/object-editor-text-page.c: + (gl_object_editor_prepare_text_page), + (gl_object_editor_set_font_family), + (gl_object_editor_get_font_family), + (gl_object_editor_set_text_color), + (gl_object_editor_get_text_color): + * src/object-editor.c: (gl_object_editor_set_key_names): + * src/ui-sidebar.c: + In the object editor: replaced all instances of the deprecated + GtkCombo widget with the new GtkComboBox. + +2005-04-18 Jim Evins + + * src/stock.c: + Neglected to save this one in previous checkin to support + header cleanup. + +2005-04-17 Jim Evins + + * libglabels/libglabels-private.h: + * libglabels/paper.c: + * libglabels/paper.h: + * libglabels/template.c: + * libglabels/template.h: + * libglabels/xml-paper.c: + * libglabels/xml-paper.h: + * libglabels/xml-template.c: + * libglabels/xml.c: + * libglabels/xml.h: + * src/base64.c: + * src/base64.h: + * src/bc-gnubarcode.c: + * src/bc-postnet.c: + * src/bc.c: + * src/bc.h: + * src/commands.c: + * src/debug.c: + * src/debug.h: + * src/file.c: + * src/file.h: + * src/hig.c: + * src/hig.h: + * src/label-barcode.c: + * src/label-box.c: + * src/label-ellipse.c: + * src/label-image.c: + * src/label-image.h: + * src/label-line.c: + * src/label-object.c: + * src/label-text.c: + * src/label-text.h: + * src/label.c: + * src/merge-properties-dialog.c: + * src/object-editor-bc-page.c: + * src/object-editor-data-page.c: + * src/object-editor-edit-page.c: + * src/object-editor-fill-page.c: + * src/object-editor-image-page.c: + * src/object-editor-line-page.c: + * src/object-editor-lsize-page.c: + * src/object-editor-position-page.c: + * src/object-editor-private.h: + * src/object-editor-size-page.c: + * src/object-editor-text-page.c: + * src/object-editor.c: + * src/object-editor.h: + * src/pixbuf-cache.h: + * src/prefs-dialog.c: + * src/prefs-dialog.h: + * src/prefs-model.c: + * src/prefs-model.h: + * src/prefs.c: + * src/print-dialog.c: + * src/print-dialog.h: + * src/print.c: + * src/print.h: + * src/recent.c: + * src/recent.h: + * src/splash.c: + * src/splash.h: + * src/stock.h: + * src/template-designer.c: + * src/template-designer.h: + * src/text-node.h: + * src/tools.c: + * src/ui-property-bar.c: (gl_ui_property_bar_construct): + * src/ui-sidebar.c: + * src/ui-util.c: + * src/ui.c: + * src/util.c: + * src/util.h: + * src/view-barcode.c: + * src/view-box.c: + * src/view-ellipse.c: + * src/view-highlight.c: + * src/view-highlight.h: + * src/view-image.c: + * src/view-line.c: + * src/view-object.c: + * src/view-object.h: + * src/view-text.c: + * src/view.c: + * src/view.h: + * src/wdgt-chain-button.c: + * src/wdgt-media-select.c: + * src/wdgt-media-select.h: + * src/wdgt-mini-preview.c: + * src/wdgt-mini-preview.h: + * src/wdgt-print-copies.c: + * src/wdgt-print-copies.h: + * src/wdgt-print-merge.c: + * src/wdgt-print-merge.h: + * src/wdgt-rotate-label.c: + * src/wdgt-rotate-label.h: + * src/window.c: + * src/window.h: + * src/xml-label-04.c: + * src/xml-label-191.c: + * src/xml-label.c: + Cleanup of header files: + - all header files are now stand-alone, verified by including + first in corresponding "c" files + - replaced blanket includes of gnome, gtk, and glib with + targetted includes + +2005-04-16 Jim Evins + + * data/glade/Makefile.am: + * data/glade/merge-properties-dialog.glade: + Added merge properties dialog glade description file. + * src/merge-properties-dialog.h: + * src/merge-properties-dialog.c: + (gl_merge_properties_dialog_get_type), + (gl_merge_properties_dialog_init), + (gl_merge_properties_dialog_finalize), + (gl_merge_properties_dialog_new), + (gl_merge_properties_dialog_construct), (type_changed_cb), + (src_changed_cb), (response_cb), (load_tree), + (record_select_toggled_cb), (select_all_button_clicked_cb), + (unselect_all_button_clicked_cb): + Modified merge properties dialog to use libglade. Added + "select all" and "unselect all" buttons. + * src/merge-text.c: (parse_line): + Handle empty lines better. + * src/merge.c: (gl_merge_eval_key): + Evaluate the key whether the record is selected or not. + * src/util.h: + * src/util.c: (gl_util_combo_box_add_text_model): + Since libglade does not use the gtk_combo_box_new_text() + constructor for GtkComboBoxes, a utility function was created + to add an appropriate text model to a GtkComboBox. + * src/view.c: (gl_view_edit_merge_props): + Removed unnecessary "show all's". + +2005-04-15 Jim Evins + + * po/ru.po: + Updated russian translation (Vitaly Lipatov) + * data/templates/misc-iso-templates.xml: + Added templates for russian business cards provided by Vitaly Lipatov. + * AUTHORS: + Updated acknowledgements for above. + +2005-04-15 Jim Evins + + * data/templates/avery-us-templates.xml: + Added Avery 5388 and 5389 templates provided by Peter L. Berghold. + * data/templates/misc-iso-templates.xml: + Added Ryman standard CD/DVD template, provided by Dan Clark. + * AUTHORS: + Added acknowledgements for above. + +2005-04-10 Jim Evins + + * libglabels/xml-paper.c: (gl_xml_paper_parse_paper_node): + * libglabels/xml-template.c: (gl_xml_template_parse_template_node), + (xml_parse_label_rectangle_node), (xml_parse_label_round_node), + (xml_parse_label_cd_node), (xml_parse_alias_node): + * libglabels/xml.c: (gl_xml_get_prop_double), + (gl_xml_get_prop_boolean), (gl_xml_get_prop_int), + (gl_xml_get_prop_uint), (gl_xml_get_prop_length): + * src/xml-label-04.c: (xml04_parse_media_description), + (xml04_parse_text_props), (xml04_parse_barcode_props), + (xml04_parse_merge_properties): + * src/xml-label-191.c: (xml191_parse_object), + (xml191_parse_text_props), (xml191_parse_barcode_props), + (xml191_parse_merge_fields), (xml191_parse_pixdata), + (xml191_parse_sheet), (xml191_parse_label), (xml191_parse_markup), + (xml191_parse_alias): + * src/xml-label.c: (xml_parse_object_text), + (xml_parse_object_barcode), (xml_parse_merge_fields), + (xml_parse_pixdata), (xml_parse_toplevel_span): + Make sure to use xmlFree for anything obtained from libxml + in case libxml and glib use different memory management + space. + +2005-04-08 Jim Evins + + * src/util.h: + * src/util.c: (gl_util_combo_box_set_strings), (search_text_func), + (gl_util_combo_box_set_active_text): + Added utility functions to simplify working with GtkComboBox + widgets in GTK-2.6. + * src/ui-property-bar.h: + * src/ui-property-bar.c: (gl_ui_property_bar_construct), + (reset_to_default_properties), (update_text_properties), + (font_family_changed_cb): + Replaced deprecated GtkCombo with GtkComboBox. + + +2005-04-03 Jim Evins + + * src/Makefile.am: + * src/wdgt-image-select.h: + * src/wdgt-image-select.c: + Removed obsolete wdgt-image-select.[ch] files. + * libglabels/paper.c: (gl_paper_dup): + Fixed rename of parameter introduced during documentation + updates. + * data/glade/object-editor.glade: + * src/object-editor-image-page.c: + (gl_object_editor_prepare_image_page), (img_radio_toggled_cb), + (gl_object_editor_set_image), (gl_object_editor_get_image), + (update_preview_cb), (add_image_filters_to_chooser): + * src/object-editor-private.h: + Replaced deprecated GnomePixmapEntry with + GtkFileChooserButton. + +2005-04-02 Jim Evins + + * src/mygal/mygal-combo-box.c: (deactivate_arrow), + (mygal_combo_box_popup_hide_unconditional), + (mygal_combo_box_popup_hide), (mygal_combo_box_popup_display), + (mygal_combo_toggle_pressed), (mygal_combo_box_init), + (mygal_combo_popup_tear_off), (mygal_combo_set_tearoff_state), + (mygal_combo_tearoff_bg_copy), (mygal_combo_popup_reparent), + (cb_tearable_button_release), (mygal_combo_box_set_tearable): + Renamed all internal gtk_combo functions to mygal_combo + to prevent namespace confusion. + +2005-04-02 Jim Evins + + * src/mygal/color-palette.c: (color_palette_change_custom_color), + (cust_color_set), (color_palette_setup): + * src/mygal/color-palette.h: + Replaced deprecated GnomeColorPicker with GtkColorButton. + +2005-04-02 Jim Evins + + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/enums.sgml: + * docs/libglabels/tmpl/paper.sgml: + * docs/libglabels/tmpl/xml-paper.sgml: + * docs/libglabels/tmpl/xml-template.sgml: + * libglabels/enums.h: + * libglabels/paper.c: (gl_paper_dup): + * libglabels/paper.h: + * libglabels/xml-paper.c: + * libglabels/xml-template.c: + More documentation updates for libglabels. + +2005-03-23 Jim Evins + + * INSTALL: + Automatically updated. + * Makefile.am: + * autogen.sh: + * configure.in: + * docs/Makefile.am: + * docs/libglabels/Makefile.am: + * docs/libglabels/libglabels-docs.sgml: + * docs/libglabels/libglabels-sections.txt: + * docs/libglabels/libglabels-undocumented.txt: + * docs/libglabels/tmpl/enums.sgml: + * docs/libglabels/tmpl/libglabels-unused.sgml: + * docs/libglabels/tmpl/libglabels.sgml: + * docs/libglabels/tmpl/paper.sgml: + * docs/libglabels/tmpl/template.sgml: + * docs/libglabels/tmpl/xml-paper.sgml: + * docs/libglabels/tmpl/xml-template.sgml: + * docs/libglabels/tmpl/xml.sgml: + Added basic gtk-doc stuff to support documenting libglabels + API. + * libglabels/xml.c: + Updated function comments with gtk-doc markup. + * missing: + Removed. + +2005-03-22 Jim Evins + + Since the development version now requires gtk-2.6/gnome-2.10, I + have made a first pass at removing deprecations. + + * configure.in: + * libglabels/Makefile.am: + * src/Makefile.am: + Added configure option to turn on X_DISABLE_DEPRECATED flags. + Also removed all remnants of HAVE_FILECHOOSER. + * src/file.c: (gl_file_open_real): + Removed code for old GtkFileSelection. + * libglabels/libglabels-private.h: + * libglabels/paper.c: + * libglabels/template.c: + * libglabels/xml-paper.c: + * libglabels/xml-template.c: + * libglabels/xml.c: + * src/bc.c: + * src/file.c: + * src/glabels-batch.c: + * src/glabels.c: + * src/label.c: + * src/merge-init.c: + * src/merge-properties-dialog.c: + * src/merge.c: + * src/object-editor.c: + * src/prefs-dialog.c: + * src/prefs.c: + * src/print-dialog.c: + * src/print.c: + * src/stock.c: + * src/template-designer.c: + * src/ui-property-bar.c: + * src/ui-sidebar.c: + * src/view-barcode.c: + * src/view-box.c: + * src/view-ellipse.c: + * src/view-image.c: + * src/view-line.c: + * src/view-text.c: + * src/view.c: + * src/wdgt-image-select.c: + * src/wdgt-media-select.c: + * src/wdgt-print-copies.c: + * src/wdgt-print-merge.c: + * src/wdgt-rotate-label.c: + * src/window.c: + * src/xml-label-04.c: + * src/xml-label-191.c: + * src/xml-label.c: + Added '#include " where needed. + Removed any unused '#include "s. + +2005-03-22 Jim Evins + + * src/commands.c: (activate_url), (gl_cmd_help_about): + Replaced GnomeAbout with GtkAboutDialog. Therefore the + development version of glabels now depends on GTK 2.6 and + GNOME 2.10. + * configure.in: + Updated library dependencies. + +2005-02-28 Jim Evins + + * AUTHORS: + * data/templates/misc-iso-templates.xml: + Added 'Ednet 45021' template provided by Ali Akcaagac + . + +2005-02-14 Jim Evins + + * data/templates/avery-us-templates.xml: + Updated templates to use inches instead of points. + * src/print-dialog.c: (printer_page_new): + Changed packing style when adding printer selector widget. This fixes + debian Bug#295274. + +2005-02-13 Jim Evins + + * AUTHORS: + * po/es.po: + Updated spanish translations. (sergio rivadero) + +2005-02-05 Jim Evins + + Some cleanup to libglabels. + + * configure.in: + Updated version to 2.1.1cvs. Added generation of libglabels.pc. + * libglabels/libglabels.pc.in + Created. + * libglabels/enums.h + Created. Currently only contains glUnitsType which provides enumerations + for all possible units of distance. + * libglabels/Makefile.am: + Incorporated new files enums.h and libglabels.pc[.in]. + * libglabels/libglabels.h: + Include enums.h. + * libglabels/template.h: + * libglabels/template.c: (gl_template_layout_new): + Changed parameters nx and ny to gint from gdouble. + * libglabels/xml.h: + * libglabels/xml.c: (gl_xml_get_prop_length), + (gl_xml_set_prop_length), (gl_xml_set_default_units): + Added support for different output units. + * src/prefs-dialog.c: (update_locale_page_from_prefs), + (update_prefs_from_locale_page): + * src/prefs-model.c: (string_to_units), (units_to_string): + * src/prefs-model.h: + * src/prefs.c: (gl_prefs_get_units_per_point), + (gl_prefs_get_units_precision), (gl_prefs_get_units_step_size), + (gl_prefs_get_units_string): + * src/prefs.h: + * src/wdgt-media-select.c: (details_update), (get_label_size_desc): + Reconciled all length enumerations with the new enumerations provided + in libglabels/enums.h. + +2005-02-03 Jim Evins + + * po/cs.po: + Updated Czech translations. (David Makovský and Zbynek Mrkvick) + * po/it.po: + Updated Italian translations. (Daniele Medri) + * AUTHORS: + Updated credits to reflect above translations. + + +2005-01-22 Jim Evins + + * MESSAGE-OF-DOOM: + Added. + * Makefile.am: + Added MESSAGE-OF-DOOM to EXTRA_DIST. + * NEWS: + Final prep for 2.1.0. + * configure.in: + Set version to 2.1.0. Output MESSAGE-OF-DOOM. + * glabels.spec.in: + Added '--remove-original' flag to desktop-file-install, so that there is + only one menu entry. + +2005-01-20 Jim Evins + + * data/glade/object-editor.glade: + - Font family entry should not be editable. + - img_key_entry should have sensitivity=YES, so that it follows the + sensitivity of img_key_combo. + +2005-01-19 Jim Evins + + * AUTHORS: + Give credit to Frederic Ruaudel for the color merge patches. + +2005-01-18 Frederic Ruaudel + + Add support to merge color for all other color attribute (Feature + Requests item #1008635. If the data is invalid, the color used is transparent + (GL_COLOR_NONE). The format for color in merge data file are those accepted + by gdk_color_parse() these include name for a color from rgb.txt, such as + DarkSlateGray, or a hex specification such as #305050. File format has been + changed but backward compatibility is preserved for all format. For + box/ellipse/line, keep attribute "line_color" for static color or replace by + "line_color_field" for merge data. For text/barcode objects, keep attribute + "color" for static color or replace by "color_field" for merge data. In the + edit canvas window, merged color are represented by half-transparent black + line/area. + + * data/dtd/glabels-2.0.dtd: + Added line_color_field to line_attrs. Added color_field to + Object-barcode and Span. + * data/glade/object-editor.glade: + Modify the layout of the editor to add merge possibility to color options + * src/color.c: + Fix a copy/paste error in a comment + * src/color.h: + Add default color for merge color representation in the editor canvas. + * src/label-barcode.c: + * src/object-editor-bc-page.c: + * src/view-barcode.c: + Add merge color support for barcode color. + * src/label-box.c: + * src/view-box.c: + Add merge color support for box border color. + * src/label-ellipse.c: + * src/view-ellipse.c: + Add merge color support for ellipse border color. + * src/label-line.c: + * src/view-line.c: + Add merge color support for line color. + * src/label-object.c: + * src/label-object.h: + * src/object-editor.c: + * src/object-editor.h: + * src/ui-property-bar.c: + * src/view.c: + * src/view.h: + * src/xml-label-04.c: + * src/xml-label-191.c: + Add support for merging to other color attribute. + * src/label-text.c: + * src/object-editor-text-page.c: + * src/view-text.c: + Add merge color support for text color. + * src/object-editor-fill-page.c: + Change a blocked handler that didn't match the good widget. Fix the type + of some debug message. + * src/object-editor-line-page.c: + Add merging support to line color option. + * src/object-editor-private.h: + Add variables for new widget. + * src/print.c: + Modify the draw functions to get merge data if needed. + * src/window.c: + Change the default size of the window in order to see all widget in the + "text style tab" of the editor. + * src/xml-label.c: + Modify the parser to record/retreive the field value for objects that need + "color" attribute. For box/ellipse/line, keep attribute "line_color" for + static color or replace by "line_color_field" for merge data. For + text/barcode objects, keep attribute "color" for static color or replace + by "color_field" for merge data. + +2005-01-17 Jim Evins + + * src/view.c: (screen_changed_cb): + Don't do anything if we don't have a screen. + +2005-01-06 Jim Evins + + * src/view.c: (get_home_scale): + Fixed bad call to gtk_widget_has_screen() -- huh?. + +2005-01-06 Jim Evins + + * data/dtd/glabels-2.0.dtd: + Added fill_color_field to fill_attrs. Also added xmlns attribute to all + top-level elements. + +2005-01-06 Jim Evins + + * data/glade/object-editor.glade: + Set entries for fill and data field key dropdowns to NOT editable. + * src/view-box.c: (construct_properties_editor): + * src/view-ellipse.c: (construct_properties_editor): + Update object editor when label's merge property has changed. + * src/xml-label.c: (xml_parse_object_ellipse): + Completed the merge color support for the ellipse item. + +2005-01-06 Frederic Ruaudel + + Add support to merge color for object that have a "Fill color" attribute (Feature + Requests item #1008635. If the data is invalid, the color used is transparent + (GL_COLOR_NONE). The format for color in merge data file are those accepted + by gdk_color_parse() these include name for a color from rgb.txt, such as + DarkSlateGray, or a hex specification such as #305050. File format has been + changed but backward compatibility is preserved for all format. For box/ellipse, + keep attribute "fill_color" for static color or replace by "fill_color_field" + for merge data. + + * data/glade/object-editor.glade: + Modify "Fill" tab to add the merge key combo and convert the labels into + radio button. + * src/color.h: + * src/color.c: + Add "glColorNode" structure and associated functions to manage it. This + structure is equivalent for color than the "glTextNode". It holds the color + and the key field. + * src/label-object.h: + * src/label-object.c: + * src/label-box.c: + * src/label-ellipse.c: + * src/ui-property-bar.c: + * src/view.h: + * src/view.c: + * src/view-box.c: + * src/view-ellipse.c: + * src/xml-label-04.c: + * src/xml-label-191.c: + Change functions of objects that have a "fill color" attribute to use the + new "glColorNode" structure. Use barcode code as example. + * src/Makefile.am: + Add the color.[ch] file to glabels_batch binary that now need support for + "glColorNode". + * src/object-editor.h: + * src/object-editor.c: + * src/object-editor-fill-page.c: + Manage the new widget of the editor's "Fill" tab : key combo and radio button + to choose between static color or merge key. Use barcode code as example. + * src/object-editor-private.h: + Add new widget in the "_glObjectEditorPrivate" structure. + * src/print.c: + Modify the draw functions to get merge data if needed. + * src/xml-label.c: + Modify the parser to record/retreive the field value for objects that need + "Fill color" attribute. For box/ellipse, put attribute "fill_color" for static + color or "fill_color_field" for merge data. + +2005-01-04 Jim Evins + + * AUTHORS: + * data/templates/avery-iso-templates.xml: + * data/templates/misc-iso-templates.xml: + * data/templates/misc-us-templates.xml: + Added templates, submitted by Larry Harriman, Juan Carlos Valero, and + Nick Hill. + +2004-11-26 Jim Evins + + * AUTHORS: + * po/fr.po: + Updated french translations provided by Florent Morel . + * src/view-barcode.c: + * src/view-box.c: + * src/view-ellipse.c: + * src/view-image.c: + * src/view-line.c: + * src/view-text.c: + Added '#include ' -- HAVE_*GETTEXT macros were not defined and + thus _() strings were not being translated. + +2004-11-14 Jim Evins + + * src/debug.h: + * src/debug.c: (gl_debug_init), (gl_debug): + Borrowed from gedit: use environmental variables to select debug + sections. + * src/splash.c: + Removed unused include of debug.h. + * src/glabels.c: (main): + Added call to gl_debug_init(), and removed debug clutter from command line + options. + * src/glabels-batch.c: (main): + Added call to gl_debug_init(). + +2004-11-13 Jim Evins + + Drawing and property toolbars were being initialized with the "icons and text" + look in Fedora Core 3. Even though none of the buttons had any text attached to + them, the buttons were being sized as if they were. This led to less real estate + for the property editor, leading to Bug #1064630. The + + * data/ui/glabels-ui.xml: + Added explicit "look" property to both drawing and property toolbars. + * src/prefs-model.c: (gl_prefs_model_save_settings), + (gl_prefs_model_load_settings): + * src/prefs-model.h: + Removed drawing_toolbar_button_style configuration parameter. + * src/ui.c: (view_menu_item_toggled_cb), + (set_app_drawing_toolbar_style): + Do not attempt to adjust look property of the drawing toolbar. + +2004-10-28 Jim Evins + + * data/pixmaps/glabels-about-logo.png: + Updated about logo. + +2004-10-28 Jim Evins + + * data/man/glabels.1: + * src/glabels-batch.c: (main): + * src/print.h: + * src/print.c: (gl_print_batch): + + Added option to glabels-batch to select the first label to begin + printing on. + +2004-09-26 Jim Evins + + * data/desktop/glabels.desktop.in: + Point to app icon, "glabels.png" + * data/mime/glabels.keys.in: + Point at mime icon, "glabels-application-x-glabels.png" + * data/pixmaps/Makefile.am: + Added glabels_app_icondir. Renamed icons. + * data/pixmaps/glabels.png: + New cleaned up app icon. Deleted glabels-icon.png. + * data/pixmaps/glabels-application-x-glabels.png: + New mime icon. + * data/pixmaps/glabels-splash.png: + Renamed glabels-logo to glabels-splash to be more correct about role. + * src/glabels.c: + * src/template-designer.c: + Point at app icon, "glabels.png" + * src/splash.c: + Point at renamed splash image, "glabels-splash.png" + +2004-08-22 Jim Evins + + * AUTHORS: + * src/glabels-batch.c: (main): + Applied patch with minor mods to allow selecting merge source and + crop-marks on glabels-batch's command line. Original patch provided by + José Dapena Paz . + +2004-08-15 Jim Evins + + * data/desktop/glabels.desktop.in: + - Added encoding line + - Removed period from comment + - Fixed Terminal line, changed "0" to "false" + - Added semicolen to Categories line + * po/ja.po: + - Made sure desktop.in comment string above still translated properly + +2004-08-14 Jim Evins + + * libglabels/xml-paper.c: (gl_xml_paper_parse_paper_node): + * libglabels/xml-template.c: (gl_xml_template_parse_template_node): + * src/xml-label-191.c: (xml191_parse_sheet): + Fixed improper freeing of gettext strings. Merged from 2.0.1. + * configure.in: + Reconciled libglabels versioning with 2.0.1. + + +2004-08-14 Jim Evins + + * configure.in: + Updated version to 2.1cvs. + +2004-08-14 Jim Evins + + * po/ja.po: + Updated 2.0.x translation by Takeshi AIHANA . + +2004-08-14 Jim Evins + + Fixes for Bug #1008181. + + * src/bc.c: (gl_barcode_default_digits): + Make a format of zero digits, harmless. + * src/xml-label.c: (xml_parse_object_barcode): + Set default value of the format property of barcode objects to 10, not + zero. This will prevent crashes when reading pre 2.0.x files. + +2004-08-09 Jim Evins + + * NEWS: + * TODO: + * help/C/glabels-C.omf: + * help/C/glabels.xml: + Brought documentation up-to-date for 2.0.0 release. + +2004-08-09 Jim Evins + + These are hopefully the final preparations for 2.0.0. + + * data/mime/Makefile.am: + Include glabels.xml in EXTRA_DIST. + * configure.in: + - Updated comment style. + - Added LIBGLABELS_VERSION_INFO macro, updated Current. + - Added package and version info to configuration printout + - Update version to 2.0.0 + * libglabels/Makefile.am: + Use the new LIBGLABELS_VERSION_INFO macro. + +2004-08-09 Jim Evins + + * configure.in: + * glabels.spec.in: + Cleanup of required library macros. + +2004-08-08 Jim Evins + + * glabels.spec.in: + - Updated URL + - More specific of what to install in /usr/bin and /usr/lib + - Remove built mime registration files from staging directory + +2004-08-08 Jim Evins + + * data/mime/Makefile.am: + Fixed typo: key_files should have been keys_files. + +2004-08-08 Jim Evins + + Reorganization of runtime data files. Also added registration of mimetype with + new freedesktop.org mime database if available. + + * data/* + Moved files to appropriate subdirectories, creating local Makefile.am + in each subdirectory. + - Moved paper-sizes.xml and *-templates.xml to templates subdirectory. + These are now installed at $datadir/glabels/templates. + - Moved glabels.1 to man subdirectory. + - Moved glabels-2.0.dtd to dtd subdirectory. + - Moved glabels.desktop.in to desktop subdirectory. + - Moved glabels.keys.in and glabels.mime to mime subdirectory. + * data/pixmaps/* + Moved "./pixmaps" to "./data/pixmaps" + * data/ui/* + Moved src/glabels-ui.xml to data/ui directory. Created Makefile.am. + * data/glade/* + Moved libglade files from src to data/glade. Created Makefile.am. + * Makefile.am: + Removed pixmaps from SUBDIRS. + * configure.in: + - Removed pixmaps from makefiles. + - Added makefiles for new subdirs of data. + - Added tests for freedesktop.org mime database. + * glabels.spec.in: + - Added tests for freedesktop.org mime database for post install and + post un-install actions. + * libglabels/Makefile.am: + Moved system template files to $(datadir)/glabels/templates. + * libglabels/libglabels-private.h: + Moved system template files to $(datadir)/glabels/templates. + * po/POTFILES.in: + - Accounted for movement of ui and libglade files. + - Added missing .in files. + - Reorganized by directory. + * src/Makefile.am: + Accounted for movement of ui and libglade files. + * data/mime/glabels.xml.in: + New file for registering with freedesktop.org mime database. + +2004-08-07 Jim Evins + + * src/recent-files/*: + Re-synced to latest libegg/recent-files. + +2004-08-07 Jim Evins + + * Makefile.am: + * configure.in: + * help/* + Renamed "./doc" directory to "./help" which contains user documentation, + to be more consistent with other GNOME applications. + + +2004-07-26 Jim Evins + + * src/merge-properties-dialog.c: (gl_merge_properties_dialog_init): + Corrected button order of merge properties dialog. + +2004-07-18 Jim Evins + + * data/glabels-2.0.dtd: + * src/bc.c: (gl_barcode_default_digits), (gl_barcode_can_freeform), + (gl_barcode_get_prefered_n): + * src/bc.h: + * src/label-barcode.c: (copy), (gl_label_barcode_set_props), + (gl_label_barcode_get_props), (get_size): + * src/label-barcode.h: + * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page), + (style_changed_cb), (gl_object_editor_set_bc_style), + (gl_object_editor_get_bc_style): + * src/object-editor-data-page.c: (data_radio_toggled_cb), + (gl_object_editor_set_data), (gl_object_editor_get_data): + * src/object-editor-private.h: + * src/object-editor.c: (gl_object_editor_set_key_names): + * src/object-editor.glade: + * src/object-editor.h: + * src/print.c: (draw_barcode_object): + * src/view-barcode.c: (update_object_from_editor_cb), + (update_editor_from_object_cb), + (gl_view_barcode_create_event_handler), (draw_barcode): + * src/xml-label-04.c: (xml04_parse_barcode_props): + * src/xml-label-191.c: (xml191_parse_barcode_props): + * src/xml-label.c: (xml_parse_object_barcode), + (xml_create_object_barcode): + Added "format" attribute to barcode objects. This attribute is used + to properly format freeform barcodes barcodes prior to merge data is + applied, so that barcodes can be accurately layed out. This addresses + remaining issues of feature request #824787. Also added an example of + the format in the object editor. + +2004-07-12 Jim Evins + + Various code cleanups. + + * src/label-barcode.c: + Removed unneeded include of gnome-glyphlist.h. + + * src/label-text.c: (get_size): + Fixed memory leak: unref glyphlists when done with them. + + * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page): + * src/object-editor-data-page.c: + (gl_object_editor_prepare_data_page): + * src/object-editor-image-page.c: + (gl_object_editor_prepare_image_page): + * src/object-editor-line-page.c: + (gl_object_editor_prepare_line_page): + * src/object-editor-lsize-page.c: + (gl_object_editor_prepare_lsize_page): + * src/object-editor-position-page.c: + (gl_object_editor_prepare_position_page): + * src/object-editor-size-page.c: + (gl_object_editor_prepare_size_page): + * src/object-editor-text-page.c: + (gl_object_editor_prepare_text_page): + Removed unneeded size groups, originally intended to keep widgets aligned. + Now use tables to lay these out in object-editor.glade. + + * src/print.c: (draw_text_object): + Fixed memory leak: unref glyphlists when done with them. + + * src/view-barcode.c: (draw_barcode): + Fixed memory leak: unref glyphlists when done with them. + + * src/view-text.c: (update_object_from_editor_cb), (draw_hacktext): + - Removed unneeded cast of gl_object_editor_get_text_line_spacing()s + return value. + - Fixed memory leak: unref glyphlists when done with them. + +2004-07-11 Jim Evins + + * data/glabels-2.0.dtd: + * src/label-text.c: (gl_label_text_instance_init), (copy), + (gl_label_text_set_auto_shrink), (gl_label_text_get_auto_shrink): + * src/label-text.h: + * src/object-editor-private.h: + * src/object-editor-text-page.c: + (gl_object_editor_prepare_text_page), + (gl_object_editor_set_text_auto_shrink), + (gl_object_editor_get_text_auto_shrink): + * src/object-editor.c: (gl_object_editor_set_key_names): + * src/object-editor.glade: + * src/object-editor.h: + * src/print.c: (draw_text_object): + * src/view-text.c: (update_object_from_editor_cb), + (update_editor_from_object_cb): + * src/xml-label.c: (xml_parse_object_text), + (xml_create_object_text): + Added option to allow document merge to auto shrink text size to fit + within the text box. The code in print.c that actually shrinks the + text is loosely based on a patch submitted by Mark Harrison + . This addresses feature request + #661421. + +2004-07-11 Jim Evins + + * data/glabels-2.0.dtd: + * libglabels/template.c: (gl_template_rect_label_type_new), + (gl_template_round_label_type_new), + (gl_template_cd_label_type_new), (gl_template_label_type_dup), + (template_full_page): + * libglabels/template.h: + * libglabels/xml-template.c: (xml_parse_label_rectangle_node), + (xml_create_label_node): + * pixmaps/ex-rect-size.png: + * src/print.c: (clip_to_outline), (clip_punchouts): + * src/template-designer.c: (construct_rect_size_page), + (rect_size_page_prepare_cb), (layout_page_prepare_cb), + (build_template): + * src/template-designer.glade: + * src/xml-label-191.c: (xml191_parse_label): + Modifications to allow separate horizontal (x_waste) and vertical (y_waste) + properties for rectangular labels. Templates remain backwards compatible, + but this breaks the libglabels API (I don't know of anyone outside of + glabels using libglabels at this time -- what can I say, the program is + is still "unstable"). This addresses the suggestion in Feature Request + #976313. + +2004-07-05 Jim Evins + * src/print.c: (print_crop_marks), (draw_outline): + Changed crop marks and label outlines to black, instead of 25% gray. + This addresses debian Bug #257460. + +2004-07-05 Jim Evins + + * src/object-editor-fill-page.c: (gl_object_editor_set_fill_color): + * src/object-editor-line-page.c: (gl_object_editor_set_line_color): + Preserve "is_default" of fill and line color_combos when creating from + existing objects. + +2004-07-02 Jim Evins + + * data/glabels.1: + Created man page. Based on page submitted by Matthew J. Lockner, however + it has been severely edited. + + * data/avery-other-templates.xml + * data/misc-other-templates.xml: + Started new files for predefined templates with non-standard sheet sizes. + These have been initially populated with the Avery 06141 and + OfficeMax #86112, both provided by Matthew J. Lockner. + + * data/Makefile.am: + Install above manpage and template files. + + * glabels.spec.in: + Make sure we install man pages. + + * src/glabels-batch.c: + Changed short form of help option to '-?' to be consistent with glabels. + + * AUTHORS: + Added acknowledgement for above labels. + +2004-07-02 Jim Evins + + * src/glabels.c: (main), (save_session_cb): + - Now include libbonoboui.h, recent.h, and file.h to provide missing + prototypes. + - save_session_cb() now returns gboolean. + - Minor formatting changes. + + * src/window.h: + * src/window.c: + - Now include file.h to provide missing prototype. + - gl_window_get_type() now returns GType, not guint. I believe this may + ultimately be cause of the segfault reported in Bug #982287, since + GType is actually a gulong, which may not be compatible on other + architectures (64bit) -- I cannot personally test this at this time. + I was sloppy in several other xxx_get_type() functions which also + returned guint -- see next group of files: + + * src/window.c: (gl_window_get_type): + * src/canvas-hacktext.c: (gl_canvas_hacktext_get_type): + * src/canvas-hacktext.h: + * src/hig.c: (gl_hig_alert_get_type), (gl_hig_dialog_get_type), + (gl_hig_category_get_type), (gl_hig_vbox_get_type), + (gl_hig_hbox_get_type): + * src/hig.h: + * src/label-barcode.c: (gl_label_barcode_get_type): + * src/label-barcode.h: + * src/label-box.c: (gl_label_box_get_type): + * src/label-box.h: + * src/label-ellipse.c: (gl_label_ellipse_get_type): + * src/label-ellipse.h: + * src/label-image.c: (gl_label_image_get_type): + * src/label-image.h: + * src/label-line.c: (gl_label_line_get_type): + * src/label-line.h: + * src/label-object.c: (gl_label_object_get_type): + * src/label-object.h: + * src/label-text.c: (gl_label_text_get_type): + * src/label-text.h: + * src/label.c: (gl_label_get_type): + * src/label.h: + * src/merge-properties-dialog.c: + (gl_merge_properties_dialog_get_type): + * src/merge-properties-dialog.h: + * src/merge-text.c: (gl_merge_text_get_type): + * src/merge-text.h: + * src/merge.c: (gl_merge_get_type): + * src/merge.h: + * src/object-editor.c: (gl_object_editor_get_type): + * src/prefs-dialog.c: (gl_prefs_dialog_get_type): + * src/prefs-dialog.h: + * src/prefs-model.c: (gl_prefs_model_get_type): + * src/prefs-model.h: + * src/print-dialog.c: (gl_print_dialog_get_type): + * src/print-dialog.h: + * src/template-designer.c: (gl_template_designer_get_type): + * src/template-designer.h: + * src/ui-property-bar.c: (gl_ui_property_bar_get_type): + * src/ui-property-bar.h: + * src/ui-sidebar.c: (gl_ui_sidebar_get_type): + * src/ui-sidebar.h: + * src/view-barcode.c: (gl_view_barcode_get_type): + * src/view-barcode.h: + * src/view-box.c: (gl_view_box_get_type): + * src/view-box.h: + * src/view-ellipse.c: (gl_view_ellipse_get_type): + * src/view-ellipse.h: + * src/view-highlight.c: (gl_view_highlight_get_type): + * src/view-highlight.h: + * src/view-image.c: (gl_view_image_get_type): + * src/view-image.h: + * src/view-line.c: (gl_view_line_get_type): + * src/view-line.h: + * src/view-object.c: (gl_view_object_get_type): + * src/view-object.h: + * src/view-text.c: (gl_view_text_get_type): + * src/view-text.h: + * src/view.c: (gl_view_get_type): + * src/view.h: + * src/wdgt-chain-button.c: (gl_wdgt_chain_button_get_type): + * src/wdgt-image-select.c: (gl_wdgt_image_select_get_type): + * src/wdgt-image-select.h: + * src/wdgt-media-select.c: (gl_wdgt_media_select_get_type): + * src/wdgt-media-select.h: + * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_get_type): + * src/wdgt-mini-preview.h: + * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type): + * src/wdgt-print-copies.h: + * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type): + * src/wdgt-print-merge.h: + * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_get_type): + * src/wdgt-rotate-label.h: + - Made sure all xxx_get_type functions returned GType, not guint. This + was the case in hig.[ch], window.[ch], ui-property-bar.[ch], + ui-sidebar.[ch], view.[ch], wdgt-image-select.[ch], + wdgt-media-select.[ch], wdgt-mini-preview.[ch], wdgt-print-copies.[ch], + wdt-print-merge.[ch], and wdgt-rotate-label.[ch]. See separate + window.[ch] details above for more info. + - Reconciled various coding style differences in all xxx_get_type() + functions: + * All prototypes include G_GNUC_CONST. + * All prototypes specify the return value as GType, not GtkType + or guint. + * Info structures are all declared as "static const." + * Generalized the names of type and info variables. + * Miscelaneous formatting. + +2004-06-08 Jim Evins + + * src/label.c: + * src/label.h: + * src/xml-label.c: + * AUTHORS: + Don't touch compression of original file -- still defaults to 9 for + new files. Original patch provided by Javier Donaire Segarra + (#912252 in patch tracker). + +2004-05-05 Jim Evins + + * data/glabels-2.0.dtd: + Broke DTD previously when adding new barcode types that contain a + plus sign (+). Simply changed the BC_STYLE_TYPE entity to "CDATA" + to avoid the problem. + * data/avery-iso-templates.xml: + * data/zweckform-iso-templates.xml: + * AUTHORS: + Added templates for Avery 7165, Zweckform 3688, 4732, and 6021. Templates + provided by Frank Altpeter. + * libglabels/xml-template.c: (xml_create_label_node): + Reordered markup and layout sub-nodes so that resulting templates will + validate against DTD. + +2004-03-13 Jim Evins + + * src/object-editor-size-page.c: (gl_object_editor_prepare_size_page): + Changed spin callback signals from "value-changed" back to "changed." + This was accidentally introduced in a previous revision, and can cause + size changes just by selecting the size tab. + +2004-03-06 Jim Evins + + * src/view.c: (draw_grid_layer): + For round labels (round and cd) adjust grid so that it lines up with + center of label. Also, no longer draw box around label in the grid layer, + it is hidden by he fg layer anyway. Feature suggested by + nemolivier@free.fr. Although the grid is aligned with the center of the + label, the coordinate system is still relative to the upper left corner + of the rectangle containing the label. + +2004-02-25 Jim Evins + + * configure.in: + Changed version to 2.0pre1cvs + + * libglabels/xml-template.c: (gl_xml_template_parse_templates_doc): + Removed extra xmlFreeDoc() calls upon error. Also print the doc->URL + instead of doc->name fields when errors encountered. + +2004-02-21 Jim Evins + + * data/avery-iso-templates.xml: + Added aliases for Avery 8651. Patch provided by Wayne Schuller. + + * glabels.spec.in: + Added libglabels library and include file to installed files. + + * configure.in: + Final prep for 1.93.3. + +2004-02-20 Jim Evins + + * src/glabels-batch.c: (main): + Changed key for setting output filename to GNOME_PRINT_KEY_OUTPUT_FILENAME + as suggested by Javier Donaire Segarra. This addresses bug #901063. + +2004-02-16 Jim Evins + + * configure.in: + If gtk+ >= 2.3.2 then define HAVE_FILE_CHOOSER. + + * src/Makefile.am: + Added HAVE_FILE_CHOOSER to INCLUDES. + + * src/file.c: (gl_file_open), (open_response), (gl_file_open_real), + (gl_file_save_as), (save_as_response): + Ported to use GtkFileChooserDialog if HAVE_FILE_CHOOSER is defined. + +2004-02-16 Jim Evins + + * src/xml-label-04.c: (xml04_parse_image_props): + * src/xml-label-191.c: (xml191_parse_image_props): + * src/xml-label.c: (xml_parse_object_image): + Delay setting image size until after image has been applied to new + object. + +2004-02-15 Jim Evins + + * src/label-barcode.c: (gl_label_barcode_set_data), + (gl_label_barcode_set_props): + Don't emit "changed" signal, if no change actually made for these + methods. Reduces number of unnecessary redraws of barcodes. + + * src/label-object.h: + * src/label-object.c: (gl_label_object_set_position), + (gl_label_object_set_position_relative), (set_size), + (gl_label_object_set_size), + (gl_label_object_set_size_honor_aspect): + Don't emit "changed" signal, if no change actually made for these + methods. + +2004-02-15 Jim Evins + + * data/glabels-2.0.dtd: + Added specific subtypes for various barcode types. + + * src/bc.h: + * src/bc.c: (id_to_index), (name_to_index), (gl_barcode_new), + (gl_barcode_get_styles_list), (gl_barcode_default_digits), + (gl_barcode_can_text), (gl_barcode_text_optional), + (gl_barcode_can_csum), (gl_barcode_csum_optional), + (gl_barcode_id_to_name), (gl_barcode_name_to_id): + Changed API to use a string id, rather than a fixed enumeration. Id and + name are separate strings. Added entries to backend table for specific + subtypes for various barcode types. + + * src/bc-postnet.h: + * src/bc-postnet.c: (gl_barcode_postnet_new), (postnet_code), + (is_length_valid): + Modified to conform to above API. Now more stringent with data length + for various subtypes. + + * src/bc-gnubarcode.h: + * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new), + (is_length_valid), (is_length1_valid), (is_length2_valid): + Modified to conform to above API. Now more stringent with data length + for various subtypes. + + * src/label-barcode.h: + * src/label-barcode.c: (copy), (gl_label_barcode_set_props), + (gl_label_barcode_get_props), (get_size): + Modified to use above API for storing barcode type. + + * src/object-editor.h: + * src/object-editor-bc-page.c: (style_changed_cb), + (gl_object_editor_set_bc_style), (gl_object_editor_get_bc_style): + Modified to use above API for storing barcode type. + + * src/object-editor-size-page.c: + (gl_object_editor_prepare_size_page), (aspect_toggle_cb), + (w_spin_cb), (h_spin_cb), (size_reset_cb): + Added debug markers. + + * src/object-editor.glade: + Made barcode style combo's text entry non-editable. + + * src/print.c: (draw_barcode_object): + Modified to use above API for barcode type. + + * src/view-barcode.c: (update_object_from_editor_cb), + (update_editor_from_object_cb), + (gl_view_barcode_create_event_handler), (draw_barcode): + Modified to use above API for barcode type. + + * src/xml-label-04.c: (xml04_parse_barcode_props): + * src/xml-label-191.c: (xml191_parse_barcode_props): + * src/xml-label.c: (xml_parse_object_barcode), + (xml_create_object_barcode): + Modified to use above API for barcode type. + +2004-02-07 Jim Evins + + * src/stock-pixmaps/Makefile.am: + * src/stock-pixmaps/stock_hchain_24.png: + * src/stock-pixmaps/stock_hchain_broken_24.png: + * src/stock-pixmaps/stock_vchain_24.png: + * src/stock-pixmaps/stock_vchain_broken_24.png: + Added chain pixmaps borrowed from the gimp's default theme. + + * src/stock.h: + * src/stock.c: (gl_stock_init), (add_button_icon): + Added above pixmaps to stock icon sets. Created add_button_icon() to + add these pixmaps sized as GTK_ICON_SIZE_BUTTON. + + * src/wdgt-chain-button.h + * src/wdgt-chain-button.c + * src/Makefile.am: + * po/POTFILES.in: + Added this Modified version of gimpchainbutton widget, borrowed from + the gimp. + + * AUTHORS: + Added acknowledgements of the above borrowing from the gimp. + + * src/object-editor-size-page.c: (aspect_toggle_cb), (w_spin_cb), + (h_spin_cb): + * src/object-editor.c: (gl_object_editor_construct_chain_button): + * src/object-editor.glade: + Replaced the keep aspect ratio check box with the above chain-button + widget. + + * src/text-node.c: (gl_text_node_equal): + * src/text-node.h: + Added function gl_text_node_equal() to compare text_nodes. + + * src/label-image.c: (gl_label_image_set_filename): + Replaced incomplete text_node comparison code with invocation of + gl_text_node_equal. This fixed the problem of not being able to + resize an image using the object_editor if the aspect ratio is not + locked. + +2004-02-04 Jim Evins + + * src/object-editor-image-page.c: + (gl_object_editor_prepare_image_page): + Track "changed" signal of pixmap entry's GtkEntry rather than its + "activate" signal -- this catches all changes to the entry rather than + just changes resulting from a browse, so one can easily pull previous + entries from the history. (This change is marked below on 2004-02-03, + but somehow never got checked in.) + + * src/view-highlight.c: (sl_resize_event_handler), + (sr_resize_event_handler), (st_resize_event_handler), + (sb_resize_event_handler): + Side resize handles will now confirm the actual resize that the object + accepted before adjusting position parameters. Previously some interesting + things happened when resizing a barcode to its minimum size. + +2004-02-03 Jim Evins + + * src/object-editor-image-page.c: + (gl_object_editor_prepare_image_page): + Track "changed" signal of pixmap entry's GtkEntry rather than its + "activate" signal -- this catches all changes to the entry rather than + just changes resulting from a browse, so one can easily pull previous + entries from the history. + + * src/view-highlight.c: (tl_resize_event_handler), + (tr_resize_event_handler), (bl_resize_event_handler), + (br_resize_event_handler): + Allow control key to be dropped while dragging a corner resize handle + without losing the aspect ratio lock. + +2004-02-02 Jim Evins + + * src/label-image.c: (gl_label_image_set_filename): + When setting a new filename adjust size such that the aspect ratio of + the image is preserved using the current size as a bounding box. + + * src/view-image.c: (update_object_from_editor_cb): + When updating object from editor, feed back possible size changes to + editor as a result of a possible change in image. + + * src/object-editor-size-page.c: (size_reset_cb): + Fixed typo when blocking spin handlers. If the base size is larger than + the max size, treat max size as a bounding box while keeping aspect + ratio. + + +2004-02-02 Jim Evins + + * src/label-object.h: + * src/label-object.c: (gl_label_object_set_size), + (gl_label_object_set_size_honor_aspect): + Added gl_label_object_set_size_honor_aspect() which will maintain the + current aspect ratio by modifying the supplied w or h apropriately. + + * src/view-highlight.c: (tl_resize_event_handler), + (tr_resize_event_handler), (bl_resize_event_handler), + (br_resize_event_handler): + Corner handles will now maintain the current aspect ratio if the + control key is pressed while resizing. This addresses feature + request #816603. + + +2004-01-31 Jim Evins + + * AUTHORS: + * data/avery-us-templates.xml: + Added entries for "LSK-3," "LSK-5," and "LSK-8." Submitted by JBadger. + + * libglabels/template.c: (read_template_files_from_dir): + Corrected problem with testing for extensions. + + * src/object-editor.glade: + Corrected grouping of radio buttons in barcode data page. + + * src/print.c: (draw_barcode_object): + * src/view-barcode.c: (draw_barcode): + Corrected problem with calculation of y_offset for locating characters. + +2004-01-24 Jim Evins + + * AUTHORS: + * data/avery-us-templates.xml: + Added Avery 5824, submitted by Fred Bacon. + +2004-01-20 Jim Evins + + Catching up on a couple of backlogged user template submissions. + + * data/avery-iso-templates.xml: + Added "DECAdry OLW-4731" and "DECAdry DLW-1731" aliases for Avery 7160. + Suggested by Linas Jakucionis. + + * data/zweckform-iso-templates.xml: + Added Zweckform 4760, submitted by Thomas Vill. + + * AUTHORS: + Updated to reflect above submissions. + +2004-01-06 Jim Evins + + Split-out template.[ch], paper.[ch], xml-template.[ch], xml-paper.[ch], and + xml.[ch] into a separate library called libglabels, to facilitate third + party use of glabels template files. This was suggested by Wayne Schuller. + Once split-out, some modifications to the structures and functions to + make a cleaner more useful API, hopefully. Rather extensive changes have + propogated to other modules. + + * src/paper.h: + * src/paper.c: + * src/template.h: + * src/template.c: + * src/xml-paper.h: + * src/xml-paper.c: + * src/xml-template.h: + * src/xml-template.c: + * src/xml.h: + * src/xml.c: + These files have been moved to libglabels/. API cleanup performed. + + * libglabels/libglabels.h: + * libglabels/libglabels-private.h: + * libglabels/Makefile.am: + These files have been added to finish out libglabels. + + * Makefile.am: + * configure.in: + * glabels.spec.in: + * po/POTFILES.in: + * src/Makefile.am: + Modified to reflect new sets of files in src/ and libglabels/. + + * COPYING.LIBGLABELS: + * COPYING-DOCS: + Added copy of the LGPL for libglabels, and a copy the GFDL for + documentation. + + * src/glabels-batch.c: + * src/glabels.c: + * src/label.c: (gl_label_finalize), (gl_label_set_template), + (gl_label_get_size): + * src/label.h: + * src/prefs-model.c: (gl_prefs_model_load_settings): + * src/print-dialog.c: + * src/print.c: (gl_print_simple), (gl_print_merge_collated), + (gl_print_merge_uncollated), (gl_print_batch), (print_info_free), + (print_crop_marks), (print_label), (draw_outline), + (clip_to_outline), (clip_punchouts): + * src/template-designer.c: (construct_pg_size_page), + (pg_size_page_changed_cb), (layout_page_changed_cb), + (print_test_cb), (build_template): + * src/util.c: (gl_util_fraction): + * src/util.h: + * src/view.c: (draw_bg_fg_layers), (draw_bg_fg_rect), + (draw_bg_fg_rounded_rect), (draw_bg_fg_round), (draw_bg_fg_cd), + (draw_bg_fg_cd_bc), (draw_markup_layer), (draw_markup_margin), + (draw_markup_margin_rect), (draw_markup_margin_rounded_rect), + (draw_markup_margin_round), (draw_markup_margin_cd), + (draw_markup_margin_cd_bc), (draw_markup_line), + (draw_markup_circle), (gl_view_copy): + * src/wdgt-media-select.c: (gl_wdgt_media_select_construct), + (page_size_entry_changed_cb), (details_update), (get_layout_desc), + (get_label_size_desc): + * src/wdgt-mini-preview.c: + (gl_wdgt_mini_preview_set_label_by_name), (mini_outline_list_new), + (cdbc_item): + * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct): + * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct): + * src/wdgt-rotate-label.c: (mini_preview_canvas_update), + (gl_wdgt_rotate_label_set_template_name), (cdbc_item): + * src/wdgt-rotate-label.h: + * src/xml-label-04.c: (xml04_parse_media_description): + * src/xml-label-191.c: (gl_xml_label_191_parse), + (xml191_parse_sheet), (xml191_parse_label), (xml191_parse_layout), + (xml191_parse_markup), (xml191_parse_alias): + * src/xml-label.c: (xml_doc_to_label), (xml_parse_label), + (xml_label_to_doc): + Various changes to accomodate new libglabels API. + +2004-01-03 Jim Evins + + * configure.in: + Release 1.93.2. + +2004-01-03 Jim Evins + + * AUTHORS: + Added acknowledgement of contributions by Wayne Schuller. + + * src/commands.c: (gl_cmd_file_print): + Create extra reference to print dialog, so that it can be properly re-used. + + * src/mygal/mygal-combo-box.h: + * src/mygal/mygal-combo-box.c: + (mygal_combo_box_popup_hide_unconditional), + (mygal_combo_box_popup_display), (mygal_combo_box_set_display), + (gtk_combo_set_tearoff_state), (mygal_combo_box_construct), + (mygal_combo_box_set_arrow_relief), (mygal_combo_box_set_title), + (mygal_combo_box_set_tearable): + Changed all occurances of GTK_IS_COMBO_BOX to MYGAL_IS_COMBO_BOX, to + complete the rename of this widget to prevent namespace collisions + with Gtk+-2.3. + + * src/prefs-dialog.glade: + Fixed alignment of Fill/Color widgets. + +2004-01-03 Jim Evins + + * data/avery-iso-templates.xml: + Added user submitted templates. + Avery 8435A & 8435B, submitted by Ludger Solbach. + + * doc/C/glabels.xml: + Added minimal documentation, noting the new template designer. + +2004-01-03 Jim Evins + + * pixmaps/ex-rect-size.png: + * pixmaps/ex-round-size.png: + * pixmaps/ex-cd-size.png: + * pixmaps/Makefile.am: + Added ex-rect-size.png, ex-round-size.png, and ex-cd-size.png image + files to be used as illustrations/examples in the template-designer. + + * src/template-designer.c: (construct_rect_size_page), + (construct_round_size_page), (construct_cd_size_page), + (construct_nlayouts_page), (rect_size_page_prepare_cb), + (round_size_page_prepare_cb), (cd_size_page_prepare_cb), + (layout_page_prepare_cb), (build_template): + * src/template-designer.glade: + Added illustrations for rectangle, round, and cd label size pages. + Added margin spinboxes to these pages, and now add a margin markup + to the constructed template. Added realistic default values for + some of the size spinboxes. Cleaned up the code for setting spinbox + ranges on the layouts page. + +2004-01-02 Jim Evins + + * src/object-editor-size-page.c: (h_spin_cb): + Fixed cut-n-paste error in h_spin_cb that loaded h from + the wrong spinbutton. + + * src/object-editor.h: + * src/object-editor.c: (gl_object_editor_class_init), + (gl_object_editor_changed_cb), (gl_object_editor_size_changed_cb): + * src/object-editor-private.h: + * src/object-editor-size-page.c: (w_spin_cb), (h_spin_cb), + (size_reset_cb): + Added "size_changed" signal. + + * src/view-text.c: (construct_properties_editor), + (update_object_from_editor_cb), + (update_object_from_editor_size_cb): + Track size changes from object editor separately from other + properties. This is so the default size (0,0) of a text + object is not modified unintentionally. + +2003-12-30 Wayne Schuller + + Added feature: line spacing - allows you to comfortably space a text box to + fit a label perfectly. + + * data/glabels-2.0.dtd: + * src/label-object.c: (gl_label_object_set_text_line_spacing), + (gl_label_object_get_text_alignment), + (gl_label_object_get_text_line_spacing): + * src/label-object.h: + * src/label-text.c: (gl_label_text_class_init), + (gl_label_text_instance_init), (copy), (get_size), + (set_text_line_spacing), (get_text_alignment), + (get_text_line_spacing): + * src/object-editor-private.h: + * src/object-editor-text-page.c: + (gl_object_editor_prepare_text_page), + (gl_object_editor_set_text_line_spacing), + (gl_object_editor_get_text_line_spacing): + * src/object-editor.glade: + * src/object-editor.h: + * src/prefs-dialog.c: (construct_object_page), + (update_object_page_from_prefs), (update_prefs_from_object_page): + * src/prefs-dialog.glade: + * src/prefs-model.c: (gl_prefs_model_save_settings), + (gl_prefs_model_load_settings), (get_float): + * src/prefs-model.h: + * src/print.c: (draw_text_object): + * src/ui-sidebar.c: + * src/view-text.c: (update_object_from_editor_cb), + (update_editor_from_object_cb), + (gl_view_text_create_event_handler), (draw_hacktext): + * src/view.c: (gl_view_construct), + (gl_view_set_selection_text_line_spacing), + (gl_view_set_default_text_line_spacing), + (gl_view_get_default_text_line_spacing): + * src/view.h: + * src/xml-label.c: (xml_parse_toplevel_span), + (xml_create_toplevel_span): + +2003-12-30 Jim Evins + + * src/template-designer.c: + * src/template-designer.h: + * src/template-designer.glade: + New template designer assistant. + + * po/POTFILES.in: + * src/Makefile.am: + Added entries for src/template-designer.* files. + + * pixmaps/ex-1layout.png + * pixmaps/ex-2layouts.png + * pixmaps/Makefile.am: + Added the new image files ex-*.png used as illustrations in the + template designer assistant. + + * src/print-dialog.h: + * src/print-dialog.c: (gl_print_dialog_finalize), + (gl_print_dialog_new), (gl_print_dialog_construct), + (gl_print_dialog_force_outline_flag): + Changed first argument of gl_print_dialog_new() from glView to glLabel, + to support printing from the template designer assistant which does not + have a full-fledged view. Nothing else from the view object was being + used by the dialog anyway. + + Added the gl_print_dialog_force_outline_flag() method, for better + integration with the template designer assistant. + + + * src/commands.h: + * src/commands.c: (gl_cmd_file_template_designer), + (gl_cmd_file_print): + Modified print command to provide label instead of view to dialog. + Added the gl_cmd_file_template_designer() command to invoke the + template designer assistant. + + * src/ui.c: + * src/glabels-ui.xml: + Added support for template designer assistant. + + * src/wdgt-mini-preview.h: + * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_set_template), + (gl_wdgt_mini_preview_set_bg_color): + Preview is now centered in canvas. Added + gl_wdgt_mini_preview_set_bg_color() to allow the template designer + assistant to match the background color with its own. + + * src/print.c: (clip_to_outline): + Fixed really stupid bug when adding waste to clip region of rectangular + labels/cards. Each side of the clip region needs to be extended by + twice the waste margin, as well as negatively offset by the waste + margin. + +2003-12-28 Jim Evins + + * src/prefs-dialog.c: (update_object_page_from_prefs): + Block intermediary function align_toggle_cb() instead of + update_prefs_from_object_page() for the three alignment + widgets. + +2003-12-28 Wayne Schuller + + * src/file.c: (gl_file_new), (gl_file_properties): + Swap button order and set default for higificatory pleasure. + +2003-12-27 Jim Evins + + * barcode-0.98/Makefile.am: + One last time: removed doc/Makefile and po/Makefile.in.in from + EXTRA_DIST files. + +2003-12-27 Jim Evins + + * barcode-0.98/Makefile.am: + Removed config.stat entry from EXTRA_DIST files. + + * barcode-0.98/Makefile.in: + Removed. + +2003-12-27 Jim Evins + + * configure.in: + Updated to work with latest gnome-common package from CVS. + Removed recursive configuration of barcode-0.98. + + * acconfig.h: + * macros/*: + Removed. + + * Makefile.am: + Added barcode-0.98/ as a SUBDIR, and removed dist-hook. + + * barcode-0.98/Makefile.in: + * barcode-0.98/configure.in: + * barcode-0.98/Makefile.am: + * barcode-0.98/README.glabels: + Modified to ignore the barcode package's build system, and build + as a part of glabels. + Renamed Makefile.in to Makefile.in.dist. + Renamed configure.in to configure.in.dist. + Added barcode-0.98/Makefile.am and barcode-0.98/README.glabels. + + * src/Makefile.am: + * src/mygal/Makefile.am: + * src/recent-files/Makefile.am: + In order to build against the GNOME 2.5 platform, + all use of *_DISABLE_DEPRECATED compile-time flags has been removed. + + * src/mygal/Makefile.am: + * src/mygal/mygal-combo-box.c: + * src/mygal/mygal-combo-box.h: + * src/mygal/widget-color-combo.c: + * src/mygal/widget-color-combo.h: + * po/POTFILES.in: + In order to build against the GNOME 2.5 platform, + Renamed gtk_combo_box widget to mygal_combo_box, to prevent namespace + collisions with the real gtk_combo_box widget, now a part of gtk. + +2003-12-26 Jim Evins + + * src/paper.c: + * src/template.c: + * src/util.c: + * src/util.h: + Moved local versions of get_home_data_dir() in paper.c and + template.c to util package. Cleaned up formatting in + util.[ch]. + + * src/template.c: + In gl_template_register() save a copy of the template in + ~/.glabels if the template is not known. Still need to + handle duplicate filename case and duplicate name but + different template case. + + * src/xml-label.c: + * src/xml.h: + Moved local definition of NAME_SPACE macro from xml-label.c + to xml.h. + + * src/xml-template.c: + * src/xml-template.h: + Added function gl_xml_template_write_template_to_file(), used + in gl_template_register(). diff --cc Makefile.am index d7b22a01,00000000..78c0a321 mode 100644,000000..100644 --- a/Makefile.am +++ b/Makefile.am @@@ -1,31 -1,0 +1,38 @@@ +## Process this file with automake to produce Makefile.in + +LIB_BARCODE_DIR = barcode-0.98 +LIB_IEC16022_DIR = iec16022-0.2.1 + ++#distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper ++ +SUBDIRS = \ + po \ + $(LIB_BARCODE_DIR) \ + $(LIB_IEC16022_DIR) \ + libglabels \ + src \ + data \ + help \ + docs + +EXTRA_DIST = \ + README \ + COPYING.README_FIRST \ + COPYING \ + COPYING-DOCS \ + COPYING-LIBGLABELS \ + AUTHORS \ + ChangeLog \ + INSTALL \ + NEWS \ + TODO \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ + glabels.spec.in \ + glabels.spec ++ gnome-doc-utils.make ++ ++DISTCLEANFILES = gnome-doc-utils.make ++ ++DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper diff --cc configure.in index 06bd811c,00000000..ba945af0 mode 100644,000000..100644 --- a/configure.in +++ b/configure.in @@@ -1,228 -1,0 +1,225 @@@ +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.52) + +AC_INIT(glabels, 2.2.5, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116) +AC_CONFIG_SRCDIR(src/glabels.c) +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) ++GNOME_DOC_INIT + +AM_MAINTAINER_MODE +AM_CONFIG_HEADER(config.h) + +AC_PROG_INTLTOOL([0.21]) +PKG_PROG_PKG_CONFIG + +AM_PROG_LIBTOOL + +AC_ISC_POSIX +AC_PROG_CC +AM_PROG_CC_STDC +AC_HEADER_STDC + +GNOME_COMPILE_WARNINGS + +AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + +GTK_DOC_CHECK(1.0) + +dnl --------------------------------------------------------------------------- +dnl - LIBGLABELS API versioning +dnl --------------------------------------------------------------------------- +dnl From the libtool manual: +dnl 1. Start with version information of `0:0:0' for each libtool library. +dnl 2. Update the version information only immediately before a public release. +dnl More frequent updates are unnecessary, and only guarantee that the current +dnl interface number gets larger faster. +dnl 3. If the library source code has changed at all since the last update, then increment +dnl revision (`c:r:a' becomes `c:r+1:a'). +dnl 4. If any interfaces have been added, removed, or changed since the last update, +dnl increment current, and set revision to 0. +dnl 5. If any interfaces have been added since the last public release, then increment age. +dnl 6. If any interfaces have been removed since the last public release, then set age +dnl to 0. +LIBGLABELS_C=6 +LIBGLABELS_R=1 +LIBGLABELS_A=1 + +LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A} +AC_SUBST(LIBGLABELS_VERSION_INFO) + + +dnl --------------------------------------------------------------------------- +dnl - Library dependencies +dnl --------------------------------------------------------------------------- +GLIB_REQUIRED=2.12.0 +GTK_REQUIRED=2.10.0 +LIBGNOME_REQUIRED=2.16.0 +LIBGNOMEUI_REQUIRED=2.16.0 +LIBXML_REQUIRED=2.6.0 +LIBGLADE_REQUIRED=2.6.0 +LIBEBOOK_REQUIRED=1.8.0 + +dnl Make above strings available for packaging files (e.g. rpm spec files) +AC_SUBST(GLIB_REQUIRED) +AC_SUBST(GTK_REQUIRED) +AC_SUBST(LIBGNOME_REQUIRED) +AC_SUBST(LIBGNOMEUI_REQUIRED) +AC_SUBST(LIBXML_REQUIRED) +AC_SUBST(LIBGLADE_REQUIRED) +AC_SUBST(LIBEBOOK_REQUIRED) + + +dnl --------------------------------------------------------------------------- +dnl - Check for evolution data server +dnl --------------------------------------------------------------------------- +AC_ARG_WITH(libebook, + [AC_HELP_STRING([--without-libebook], + [build without Evolution Data Server support])]) +have_libebook=no +if test "x$with_libebook" != xno; then + PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2 >= $LIBEBOOK_REQUIRED, + [have_libebook=yes], [have_libebook=no]) +fi + +if test "x$have_libebook" = "xyes"; then + AC_DEFINE(HAVE_LIBEBOOK,1,[Define to 1 for EDS support]) + OPTIONAL_MODULES="$OPTIONAL_MODULES libebook-1.2 >= $LIBEBOOK_REQUIRED" +fi + + +dnl --------------------------------------------------------------------------- +dnl - GLABELS prerequisites +dnl --------------------------------------------------------------------------- +PKG_CHECK_MODULES(GLABELS, \ +glib-2.0 >= $GLIB_REQUIRED \ +gtk+-2.0 >= $GTK_REQUIRED \ +libgnome-2.0 >= $LIBGNOME_REQUIRED \ +libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ +libxml-2.0 >= $LIBXML_REQUIRED \ +libglade-2.0 >= $LIBGLADE_REQUIRED \ +$OPTIONAL_MODULES \ +) + +AC_SUBST(GLABELS_CFLAGS) +AC_SUBST(GLABELS_LIBS) + + +dnl --------------------------------------------------------------------------- +dnl - LIBGLABELS more modest prerequisites +dnl --------------------------------------------------------------------------- +PKG_CHECK_MODULES(LIBGLABELS, \ +glib-2.0 >= $GLIB_REQUIRED \ +libxml-2.0 >= $LIBXML_REQUIRED \ +) + +AC_SUBST(LIBGLABELS_CFLAGS) +AC_SUBST(LIBGLABELS_LIBS) + + +dnl --------------------------------------------------------------------------- +dnl - MYGAL prerequisites +dnl --------------------------------------------------------------------------- +PKG_CHECK_MODULES(MYGAL, \ +gtk+-2.0 >= $GTK_REQUIRED \ +libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ +) + +AC_SUBST(MYGAL_CFLAGS) +AC_SUBST(MYGAL_LIBS) + + +dnl --------------------------------------------------------------------------- +dnl - Enable deprecation testing +dnl --------------------------------------------------------------------------- +AC_ARG_ENABLE(deprecations, + [AC_HELP_STRING([--enable-deprecations], + [warn about deprecated usages [default=no]])],, + [enable_deprecations=no]) + +if test "x$enable_deprecations" = "xyes"; then + DISABLE_DEPRECATED_CFLAGS="\ +-DG_DISABLE_DEPRECATED \ +-DGDK_DISABLE_DEPRECATED \ +-DGTK_DISABLE_DEPRECATED \ +-DGDK_PIXBUF_DISABLE_DEPRECATED \ +-DGNOME_DISABLE_DEPRECATED \ +-DLIBGLADE_DISABLE_DEPRECATED" + AC_SUBST(DISABLE_DEPRECATED_CFLAGS) +fi + + +dnl --------------------------------------------------------------------------- +dnl - Is freedesktop mime dbase available? +dnl --------------------------------------------------------------------------- +AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) +AM_CONDITIONAL(HAVE_NEW_MIME, test x$UPDATE_MIME_DATABASE != xno) + +AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) +AM_CONDITIONAL(HAVE_NEWER_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) + +AC_ARG_ENABLE(update-mimedb, AC_HELP_STRING([--disable-update-mimedb], + [disable the update-mime-database after install [default=no]]),, + enable_update_mimedb=yes) +AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) + +AC_ARG_ENABLE(update-desktopdb, AC_HELP_STRING([--disable-update-desktopdb], + [disable the update-desktop-database after install [default=no]]),, + enable_update_desktopdb=yes) +AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes) + + +dnl --------------------------------------------------------------------------- +dnl - Supported languages +dnl --------------------------------------------------------------------------- +GETTEXT_PACKAGE=glabels +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) + - dnl Add the languages here. - ALL_LINGUAS="fr de ja pt_BR es ru zh_TW.Big5 pl cs it eo ko" +AM_GLIB_GNU_GETTEXT + + +dnl --------------------------------------------------------------------------- +dnl - Makefiles, etc. +dnl --------------------------------------------------------------------------- +AC_OUTPUT([ +Makefile +barcode-0.98/Makefile +iec16022-0.2.1/Makefile +libglabels/Makefile +libglabels/libglabels.pc +src/Makefile +src/pixmaps/Makefile +src/stock-pixmaps/Makefile +src/mygal/Makefile +data/Makefile +data/templates/Makefile +data/pixmaps/Makefile +data/mime/Makefile +data/glade/Makefile +data/desktop/Makefile +data/dtd/Makefile +data/man/Makefile +po/Makefile.in +help/Makefile - help/C/Makefile +docs/Makefile +docs/libglabels/Makefile +glabels.spec +]) + + +dnl --------------------------------------------------------------------------- +dnl - Print configuration information +dnl --------------------------------------------------------------------------- +echo " +Configuration: + + Package: ${PACKAGE}-${VERSION}: + Installation prefix ${prefix} + Source code location: ${srcdir} + Compiler: ${CC} + Evolution Data Server support: ${have_libebook} + +" + +dnl cat ${srcdir}/MESSAGE-OF-DOOM - diff --cc gtk-doc.make index 354ffb7c,00000000..0f87cc79 mode 100644,000000..100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@@ -1,173 -1,0 +1,196 @@@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++GTKDOC_RUN = $(LIBTOOL) --mode=execute +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++GTKDOC_RUN = sh -c +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp + ++$(REPORT_FILES): sgml-build.stamp ++ +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +tmpl/*.sgml: + @true + + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ mkhtml_options=""; \ ++ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ ++ if test "$(?)" = "0"; then \ ++ mkhtml_options=--path="$(srcdir)"; \ ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + +install-data-local: - -installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ ++ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ ++ else \ ++ installdir="$(DESTDIR)$(TARGET_DIR)"; \ ++ fi; \ ++ $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ ++ $(INSTALL_DATA) $$i $${installdir}; \ + done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ ++ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ ++ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ ++ mv -f $${installdir}/$(DOC_MODULE).devhelp \ ++ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ ++ fi; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi - + +uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* ++ if test -n "$(DOC_MODULE_VERSION)"; then \ ++ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ ++ else \ ++ installdir="$(DESTDIR)$(TARGET_DIR)"; \ ++ fi; \ ++ rm -rf $${installdir} + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs diff --cc help/C/glabels.xml index 3c36199b,00000000..648dbecb mode 100644,000000..100644 --- a/help/C/glabels.xml +++ b/help/C/glabels.xml @@@ -1,2136 -1,0 +1,2127 @@@ + + + + + + gLabels"> + +]> + + + + + +
+ + + + &app; Manual V&manrevision; - ++ ++ ++ User manual for the &app; label and business card creation program ++ ++ + + 2003-2007 + Jim Evins - - - - - - - Jim Evins - ++ ++ ++ Jim Evins ++ + + &legal; + + + - ++ + Jim + Evins + + + + + + + + + + + + + + + + + + + + + gLabels Manual V&manrevision; + &date; + + Jim Evins + evins@snaught.com + + Jim Evins + + + + - This manual describes version &appversion; of gLabels. ++ This manual describes version &appversion; of &app;. + + + Feedback + To report a bug or make a suggestion regarding the &app; application or + this manual, follow the directions in the gLabels Contact Page. ++ type="http">&app; Contact Page. + + + + + + + gLabels + + + glabels + + + + + + + + + + Introduction + + The &app; application is a lightweight program for creating labels + and business cards for the GNOME desktop + environment. It is designed to work with various laser/ink-jet + peel-off label and business card sheets that you'll find at most + office supply stores. + + + + + + + + + + + Getting Started + + + To Start &app; - You can start &app; in the following ways: ++ You can start &app; in the following ways: + + + + Applications menu + + Choose + + Office + gLabels + . + + + + Command line + + Type glabels, + then press Return: + + + + + + + When You Start &app; - When you start &app;, the following window is displayed. ++ When you start &app;, the following window is displayed. + + +
+ &app; Start Up Window + + + + + + +
+ + + + + + The &app; window contains the following elements: + + + + Menubar. + + The menus on the menubar contain all of the commands you + need to create and edit labels and business cards in - &app;. ++ &app;. + + + + Main toolbar. + + The main toolbar contains a subset of common File and Edit + commands that you can access from the menubar. + + + - Drawing toolbar. ++ Drawing toolbar. + + The drawing toolbar contains a subset of commands for - editing the current glabels document. ++ editing the current &app; document. + + + - Display area. ++ Display area. + + The display area is the main drawing interface to - &app;. ++ &app;. + + + - Object sidebar. ++ Object sidebar. + + The object sidebar provides an interface for viewing and + editing all properties of an individual object. + + + + Properties toolbar. + + The properties toolbar contains a set of tools to + manipulate the properties of selected objects and set default + properties for new objects. + + + + Statusbar. + + The statusbar displays information about current - &app; activity and contextual ++ &app; activity and contextual + information about the menu items. + + + + + + + + + + + + + Usage + + + + To Create a New Label or Card + + To create a new label or business card, choose + File New + + to display the New Label or Card dialog. Select + the media type and orientation for the new document, + then click OK. A new document is - displayed in the display area of the &app; ++ displayed in the display area of the &app; + window. + + If your particular media type is missing from this dialog, + see + + + + + + To Open a File + + To open a file, choose + File Open + to display the Open File dialog. + Select the file that you want to open, then click + OK. The file is displayed in the display area - of the &app; window. ++ of the &app; window. + + You can also open multiple files in - &app;. The application creates a separate ++ &app;. The application creates a separate + application window for each open file. + + The application records the paths and filenames of the + most recent files that you have edited and displays the files as menu + items on the + FileRecent Files + menu. + + + + + + To Open Multiple Files from a Command Line + - You can run &app; from a command line ++ You can run &app; from a command line + and open a single file or multiple files. To open multiple files from + a command line, type the following command, then press + Return: + + glabels + file1.glabels file2.glabels file3.glabels + + + When the application starts, the files that you specify are - displayed in separate &app; windows. ++ displayed in separate &app; windows. + + + + + + To Save a File + + You can save files in the following ways: + + + + + To save changes to an existing file, choose + File + Save . + + + + + To save a new file or to save an existing file under a new + filename, choose File + Save As . Enter a name + for the file in the Save As dialog box, + then click OK. + + + + + + + + + To Change Label Properties + + To change the media type and/or orientation of a label, choose + File + Properties to display the + Label properties dialog. Select the + new media type and orientation for the document, then click + OK. + + + + + + To Create a Custom Template + + To create a new custom template, choose + File + Template Designer ... + to display the Template Designer dialog. + This dialog will assist you in creating a custom template for + most types of label or card stationery that you may encounter. + + If you prefer, you can create your templates manually. + For this option see + + + + + + + To Close a File + + To close the current document, choose + File + Close to close the application + window. If the current document is modified, a confirmation dialog + will be presented, allowing you to save the document or cancel + the command. If the window being closed is the only open window, - &app; will exit. ++ &app; will exit. + + + + + - To Quit <application>&app;</application> ++ To Quit &app; + - To quit &app;, choose ++ To quit &app;, choose + File + Quit . This is equivalent + to closing all open windows. See + . + + + + + + To Print Labels or Cards + + To print labels or cards, choose + File Print + to display the Print dialog. + Once print options have been selected, click Print + to print the labels or cards. To simply preview the results, + click Print Preview instead. + + The Print dialog allows you to specify the + following print options: + + + The Labels Tab of the Print Dialog + + + + + Print control (Simple) + + + For simple labels or cards (no document merge), the job + tabbed section contains the following copy controls. + + + + + + The number of copies of the label can be selected by + choosing the number of full sheets to print, or a specific + subset of labels on a single sheet. + + The mini-preview can also be used to graphically select + the subset of labels by clicking the first label on the + mini-preview and dragging to the last label. + + + + + + Print control (Merge) + + + For labels or cards using the document merge (also known + as "mail merge") capability, the job tabbed section contains + the following merge controls instead of copy controls. + + + + + + The total number of labels or cards printed is the + product of the number of records in the merge source and + the number of copies selected. If multiple copies are + selected, these can be either collated (copies of the + same record grouped together) or un-collated (one copy + each record is printed before next copy). + + Printing can begin on any label on the first sheet. + This can be selected with the Start on + label spinbutton. + + The mini-preview can also be used to graphically select + this first label, by clicking on the desired label in the + mini-preview. + + + + + Options + + The following options can also be selected. + + + print outlines + Print outlines of labels. This option is useful for + dry-runs, to test printer alignment. + + + print in reverse + Prints the labels as mirror images. This option is + useful for printing on clear labels that will be viewed + from the reverse side (e.g. in a car window). + + + print crop marks + Prints crop marks along the edge of the sheet. + This option is useful for printing on blank stock, to + be cut after printing. This option does not work well + with all templates. + + + + + + + + + + + + To Create New Objects + + Objects are created by choosing the appropriate selection under + the Objects + Create Object submenu or + the Drawing Toolbar. This will place the + display area into object creation mode as indicated by its cursor. + To return to the default object selection mode without creating + an object, choose Objects + Select Mode . This will + return the display area's cursor to the default selection arrow. + + The following describes the object creation mode for each object + type: + + + + + Text + + Click the desired location of the upper left corner of the + text object. New text objects are initialized with the + string "Text." To change this text, or other properties, see + . + + + + + Box + + Click the desired location of the upper left corner of the + box object and drag to the desired location of the lower right + corner. If you simply click in a single location, a square + box will be created. To change properties of the box object, see + . + + + + + Line + + Click the desired location of one end of the + line object and drag to the desired location of the other end. + If you simply click in a single location, a diagonal line + will be created. To change properties of the line object, see + . + + + + + Ellipse + + Click the desired location of the upper left corner of the + ellipse object and drag to the desired location of the lower + right corner. If you simply click in a single location, a circle + will be created. To change properties of the ellipse object, see + . + + + + + Image + + Click the desired location of the upper left corner of the + image object and drag to the desired location of the lower + right corner. If you simply click in a single location, a square + will be created. New image objects are initialized with a + simple checkerboard image. To change this image, or other + properties of the image object, see + . + + + + + Barcode + + Click the desired location of the upper left corner of the + barcode object. New barcode objects are initialized to a + POSTNET barcode with representative data. To change data + and properties of the barcode object, see + . + + + + + + + + + + + To Select Objects + + A prerequisite for performing operations on objects is the + selection of individual objects or groups of objects. The + display area must be in the object selection mode to create new + selections, as indicated by an arrow cursor. The object + selection mode is selected by the + Objects + Select Mode menu item, + or the corresponding command on the Drawing + Toolbar. + + + + + Selecting a single object + + A single object can be selected simply by clicking + on the desired object in the display area. + Once selected the object will be highlighted with a set of + resizing handles. + + + + + Aggregate object selections + + Multiple objects can be selected by first selecting the first + object as above and then by holding the Ctrl + key while selecting additional objects. + Individual objects can be added to an existing selection + at any time by holding the Ctrl key while + selecting the desired objects. All objects can also be + selected by using the Edit + Select All + menu item. All objects in an aggregate object selection will be + highlighted. + + + + + Area selections + + Multiple objects can also be selected by clicking an empty + area and dragging to form a rectangular area. When released, + all objects contained in the area will form an aggregate + selection. An area selection can be used to add to an existing + selection by holding the Ctrl key while + performing the selection. + + + + + Unselecting objects + + Individual objects can be removed from an existing + selection by holding the Ctrl key while + clicking on a previously selected object. An entire selection + can be dismissed by using the + Edit Un-select All + menu item + or by simply clicking any empty space in the display area. + Once an object is unselected its highlight is removed. + + + + + + + + + + Clipboard Commands + + Object selections can be manipulated using the standard clipboard + operations Cut, + Copy, Paste, + and Delete. + + + + + + + + CtrlX + + Cut + + + + Moves selected objects to the clipboard. The objects are + then available for pasting back into the current document or + another document. + + + + + + + + CtrlC + + Copy + + + + Copies selected objects to the clipboard without deleting + them. The objects are then available for pasting back into + the current document or another document. + + + + + + + + CtrlV + + Paste + + + + Pastes objects from the clipboard into the current document. - &app; can only paste objects from - another &app; document. ++ &app; can only paste objects from ++ another &app; document. + + + + + + + + Delete + + Delete + + + + Deletes selected objects without placing them on the + clipboard. + + + + + + + + + + To Edit Object Properties + + Most object properties can be modified through the object + editor sidebar, illustrated below. To use the object editor, + a single object must first be selected. See + . + + +
+ Object Editor Sidebar + + + + + + +
+ + + The object editor will contain a subset of the following + tabbed sections, depending on object type: + + + Text Tabbed Section (Text objects) + + This section contains a small editor for changing the content + of a text object. It also contains a dropdown menu of available + document merge keys, that can be inserted into text. + + + + + Image Tabbed Section (Image objecs) + + This section contains a file entry with preview to select + image files. The browse button can be used to easily locate + image files. Alternatively, a document merge key can be used + instead to provide a filename at print time. + + + + + Data Tabbed Section (Barcode objecs) + + This section contains a text entry to enter literal barcode - data. Alternatively, a document merge key can be used to ++ data. Alternatively, a document merge key can be used to + provide this data at print time. + + + + + Style Tabbed Section (Text objects) + + This section contains controls to select text properties, + including font family, font size, font weight, color, and + text justification. + + + + + Style Tabbed Section (Barcode objecs) + + This section contains controls to select barcode properties, + including barcode style, color, whether to print text, and whether + to include a checksum digit. + + + + + Line Tabbed Section + + This section contains controls to select properties of lines + and outlines. These properties include line width and color. + + + + + Fill Tabbed Section + + This section contains controls to select fill properties of box + and ellipse objects. Currently the only fill property is fill + color. + + + + + Size Tabbed Section (All except line objects) + + This section contains controls to select the width and height + of an object. A checkbox is provided, so that the current aspect + ratio can be locked while manipulating the width and height controls. + Image objects also provide a button to reset the size to the + image's natural size (Assumes 72DPI). + + + + + Size Tabbed Section (Line objects) + + This section contains controls to select the length and angle + of a line object. + + + + + Position Tabbed Section + + This section contains controls to change the position of an + object. + + + + + + Shadow Tabbed Section (All except image and barcode objects) + + This section contains controls to add a shadow to an object. + + + + + + + + + Other Manipulations of Objects + + Objects can also be manipulated in the following ways. + + + Moving and Resizing Objects + + Objects can be moved by simply clicking on a selected + object and dragging the object to its new location. If the object + is part of an aggregate selection, all objects in the selection + will move with the object being dragged, maintaining their relative + positions to one another. If no object is selected, clicking on + an object will create a new selection containing that object. + See . + + A selected object can be resized by clicking one of its resize + handle and dragging it to obtain the new size. + + + + + Changing Stacking Order + + Stacking order refers to relative position in the z-axis of + objects. That is when objects overlap, which object will appear + on top of the other. By default, newer objects will appear above + older objects. To change this order, select one or more objects + and choose Objects + Order + Bring to Front + to raise the selection to the top of the stacking + order, or choose Objects + Order + Send to Back + to lower the selection to the bottom of the + stacking order. These menuitems are also available by right-clicking + the display area when there is a non-empty selection. + + + + + Rotating and Flipping Objects + + Objects can be rotated 90 degrees in either direction, or flipped + horizontally or vertically, by choosing the appropriate menuitem + in the Objects + Rotate/Flip sub-menu. These + menuitems are also available by right-clicking + the display area when there is a non-empty selection. + + + + + Aligning Objects + + Objects can be aligned horizontally or vertically, relative to + one another, or relative to the center line of the label, by + choosing the appropriate menuitem from the + Objects + Align Horizontal + or Objects + Align Horizontal sub-menus. + These menuitems are also available by right-clicking + the display area when there is a non-empty selection. + + + + + Using the Property Bar + + The property bar can be used to change some common properties + of objects en-masse. These properties include font family, font + size, font weight, text alignment, text color, fill color, line + or outline color, and line width. The property bar also controls + the defaults for these properties for any newly created objects. + + + + + + + + + + + Performing a Document Merge + + Document Merge (sometimes called "Mail Merge") is a powerful + feature that allows a unique label or card to be printed for each + record in an external data source. + + The first step to performing a document merge is to prepare + a source document that contains your merge data. This data could + be mailing addresses or any other data that you wish to create + unique labels or cards for. Currently back-ends only exist for + text files and the evolution data server -- others are planned. The currently + supported text-file format is very simple: each line is a record; + fields are delimited by commas (CSV), tabs, or colons; and newlines + can be embedded into fields by using the "\n" entity. This file + could be created using any text editor or could be created by + another program or script. A common way of creating CSV files is + to export them from a spreadsheet program. + + A label must then be configured to "point at" this data file. + To configure the merge properties of a document, choose + Objects + Merge Properties menu item + to display the merge properties dialog. This + dialog is used to select the exact data file format and file + name (location) of the merge data. + + Finally, once the label has been configured for a data file, + field keys can be inserted into text objects and used as source + or data for barcode objects and image filenames for image objects. + See for more information + on using merge data for these object types. + - Now that your label is configured, gLabels will print a unique ++ Now that your label is configured, &app; will print a unique + label for each record in your source document -- substituting fields + from each record for field keys in the all text, barcode, and + image objects. + + See for a detailed + tutorial on the document merge feature. + + + + + + + + + + + + + + Settings + To configure &app;, choose + + Settings + Preferences + . The + Preferences dialog contains the following tabbed + sections: + + + + + + + + + + + + + + Locale + + + + Units + - Use this radio button group to specify your prefered units. ++ Use this radio button group to specify your preferred units. + Select one of the following options: + + + + Points + Use points (1 point = 1/72 in = 0.352778 mm). + + + + Inches + Use inches. + + + + Millimeters + Use millimeters. + + + Default: + Inches. + + + + + Default page size + - Use this radio button group to specify your prefered page size. ++ Use this radio button group to specify your preferred page size. + This will make it quicker for you to locate media types when creating a new + label or card. + + + + US Letter + Most of your media will be of the US Letter page size (8.5 x 11 inches). + + + + ISO A4 + Most of your media will be of the ISO A4 page size (210 x 297 mm). + + + Default: + US Letter. + + + + + + + + Object defaults + + + + Text + + Use these controls to set the default properties of new text objects. + These properties are + + + + Font + These controls are used to select font family and font size, and + whether the font should bold or in italics. + + + + Color + This control selects the default text color. + + + + Alignment + These controls are used to select the default text alignment (left, center or right). + + + + + + + Line + + Use these controls to set the default properties of lines and outlines of + new objects. These properties are + + + + Width + This control selects the default line width. + + + + Color + This control selects the default line color. + + + + + + + Fill + + Use these controls to set the default fill properties of + new objects. These properties are + + + + Color + This control selects the default fill color. + + + + + + + + + + + + + + Document Merge Tutorial + + Document Merge (sometimes called "Mail Merge") is a powerful + feature that allows a unique label or card to be printed for each + record in an external data source. It is however, the most mis-understood - feature of glabels. The following examples ++ feature of &app;. The following examples + will step through a couple of common tasks using the document merge + feature. + + + Example 1: Name Tags + + In this example we are organizing an orientation party for the new + crew members of our ship. We have a list of freshman crew members that we + created in gnumeric and exported as the following + CSV file. We could have created this file by using a text editor, but heck it + is the 23rd century. + + +Name,Department,SN +"Jim Kirk",Management,"SC937-0176 CEC" +"Mr. Spock",Sciences,S179-276SP +"Leonard McCoy",Medicine,unknown +"Montgomery Scott",Engineering,SE-197-54T + + - In glabels we have created a new glabels ++ In &app; we have created a new &app; + document using the Avery 5395 "Name Badge Labels" template. Next we use the + Objects + Merge Properties menu item to display + the merge properties dialog. We use this dialog to + select the source type (in our case CSV) and the merge source (filename) as + shown. + + +
+ Merge properties dialog + + + + + + +
+ + + Before applying the merge source, we uncheck the first record since it is only + column headers from our original gnumeric spreadsheet + and would simply waste our first label. We could also unselect any other records + that we didn't want to print a label for. + + We can also view each record in more detail by clicking on the appropriate + expander (the little triangles) as shown. Once we are satisfied with the + selections in this dialog we click OK to accept the + changes. + - Now we start adding objects to our glabels document as shown. ++ Now we start adding objects to our &app; document as shown. + + +
+ Adding objects + + + + + + +
+ + + In this example we have added three text objects and a barcode object. The + first text object contains only simple literal text ("Hello, my name is"). The + second text object contains a single merge field ("${1}") corresponding to the + first field of a record (first column of a line) which contains the new crew + member's full name. The third text field contains both literal text + ("Department: ") followed by a single merge field ("${2}") corresponding to + the second field or the crew member's department. The barcode object is + configured to use field (or key) "3" which contains our crew member's + starfleet serial number. + + Now we can print our name tags by selecting the + File + Print menu item. This will display + print dialog as shown below. + + +
+ Printing name tags + + + + + + +
+ + + Just to make sure our labels are going to look okay, we select the + Print outlines option and click + Print Preview. This will display a print preview dialog + as shown below. + + +
+ Name tags preview + + + + + + +
+ + + Everything looks good, so we can now load up our printer with + the appropriate label stock, print our name tags and start beaming our guests + aboard. + + + + + Example 2: Address Labels + + In this example we are going to throw a party and need to print mailing + address labels for our invitations. We have a list of our closest friends + that we created in gnumeric and exported as the + following CSV file. It should be noted that not everyone has a middle initial or + a two line address. + + +LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP +,,,,,,, +Critter,Ess,S,"123 Faux St.",,Alexandria,VA,22310 +Doe,John,,"Apt 1X","451 Mystery St.",Trenton,NJ,08601 +Summers,Joyce,,"1630 Revello Dr",,Sunnydale,CA,95037 +McGarret,Steve,O,"404 Piikoi Street",,Honolulu,HI,96813 +Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207 + + - In glabels we have created a new glabels ++ In &app; we have created a new &app; + document using the Avery 5512 "Address Labels" template. Next we use the + Objects + Merge Properties menu item to display + the merge properties dialog. We use this dialog to + select the source type (in our case CSV) and the merge source (filename) as + shown. + + +
+ Merge properties dialog + + + + + + +
+ + + Before applying the merge source, we uncheck the first record since it is only + column headers from our original gnumeric spreadsheet + and would simply waste our first label. We also unselect the second record + which is empty (an artifact of our original spreadsheet). We could also unselect + any other records that we didn't want to print a label for. + + We can also view each record in more detail by clicking on the appropriate + expander (the little triangles) as shown. Once we are satisfied with the + selections in this dialog we click OK to accept the + changes. + - Now we start adding objects to our glabels document as shown. ++ Now we start adding objects to our &app; document as shown. + + +
+ Adding objects + + + + + + +
+ + + In this example we have a single text object. This text object contains + all of our merge fields organized on multiple lines as a mailing address. + Notice that fields ${4} and ${5} (corresponding to ADDR1 and ADDR2) are each + located with no other text on their own lines. When - glabels encounters a field as the only text on ++ &app; encounters a field as the only text on + a line, it will not expand the line if the field is empty. + + Now we can print our address labels by selecting the + File + Print menu item. This will display + print dialog as shown below. + + +
+ Printing address labels + + + + + + +
+ + + Just to make sure our labels are going to look okay, we select the + Print outlines option and click + Print Preview. This will display a print preview dialog + as shown below. + + +
+ Address labels preview + + + + + + +
+ + + Everything looks good, so we can now load up our printer with + the appropriate label stock, print our address labels and start mailing + our party invitations. + + + + + + + + + + + Manually Creating New Templates + + Predefined templates are defined by XML files located in + ${prefix}/share/glabels/, + where ${prefix} is usually something like + /usr/local or /usr depending - on the configuration option prefix. gLabels will ++ on the configuration option prefix. &app; will + use all files of the form *-templates.xml + or *.template, that it finds in + ${prefix}/share/glabels/ and + ${HOME}/.glabels/. + Additional templates can be added by creating additional + *.template files in either of these directories. + + + The format for these files is defined in the DTD: + glabels-2.2.dtd. (This DTD also describes other - XML formats used by glabels.) ++ XML formats used by &app;.) + + + Assumptions/caveats + + + A sheet contains only one size of label or card (if a sheet + contains more than one size of item, it can be split into + multiple templates for multiple pass printing) + + + Distances can be expressed in units of pt, + in, mm, + cm, or pc. For example: + "1.0in" or "2.54cm". If no + units are specified, computer points (pt) will + be assumed (1 pt = + 1/72 in = 0.352778 mm). + + + + + + + Template Files + + +<?xml version="1.0"?> +<Glabels-templates> + + ...templates... + +</Glabels-templates> + + + + + + Example Template + + <Template brand="Avery" part="8160" size="US-Letter" description="Mailing Labels"> + <Label-rectangle id="0" width="189pt" height="72pt" round="5pt"> + <Markup-margin size="5pt"/> + <Layout nx="3" ny="10" x0="11.25pt" y0="36pt" dx="200pt" dy="72pt"/> + </Label-rectangle> + <Alias brand="Avery" part="5160"/> + <Alias brand="Avery" part="6233"/> + </Template> + + + + + Template Node + + A Template node describes a single stationary + product. It must contain one instance of any type of Label node + (Label-rectangle, + Label-round, or Label-cd). + This node can be followed by zero or more + Alias nodes. + + + + + + + + + Property + + + Description + + + + + + brand + + Brand or manufacturer of stationary product. + E.g. "Avery" + + + + part + + Part number or name of stationary product. + E.g. "8160" + + + + size + + Size of sheet. E.g., "US-Letter," "A4", ... + + + + description + + Description of stationary product. E.g, + "Mailing Labels." + + + + _description + + Translatable description of stationary product. + E.g, "Mailing Labels." (Only useful for predefined + templates) + + + + width + + Page width. Only valid if size="Other" + + + + height + + Page height. Only valid if size="Other" + + + + + + + + + + Label-rectangle Node + + A Label-rectangle node describes the + dimensions of a single label or business card that is rectangular + in shape (may have rounded edges). + + + + + + + + + Property + + + Description + + + + + + id + + Reserved for future use. Should always be 0. + + + + width + Width of label/card + + + height + Height of label/card + + + round + + Radius of corners. For items with square edges + (business cards), the radius should be 0. + + + + x_waste + + Amount of horizontal waste (over-print) to allow. This is useful + for minimizing alignment problems when using non-white + backgrounds (e.g. images). + + + + y_waste + + Amount of vertical waste (over-print) to allow. This is useful + for minimizing alignment problems when using non-white + backgrounds (e.g. images). + + + + + + + +
+ Label-rectangle Parameters + + + + + + +
+ + + + + + Label-round Node + + A Label-round node describes the dimensions + of a simple round label (not a CD). + + + + + + + + + Property + + + Description + + + + + + id + + Reserved for future use. Should always be 0. + + + + radius + Radius (1/2 diameter) of label + + + waste + + Amount of waste (over-print) to allow. This is useful + for minimizing alignment problems when using non-white + backgrounds (e.g. images). + + + + + + + + + + Label-cd Node + + A Label-cd node describes the dimensions + of a CD, DVD, or business card CD. + + + + + + + + + Property + + + Description + + + + + + id + + Reserved for future use. Should always be 0. + + + + radius + Outer radius of label + + + hole + Radius of concentric hole + + + width + + If present, the label is clipped to the given width. + (Useful for "business card CDs"). + + + + height + + If present, the label is clipped to the given height. + (Useful for "business card CDs"). + + + + waste + + Amount of waste (over-print) to allow. This is useful + for minimizing alignment problems when using non-white + backgrounds (e.g. images). + + + + + + + +
+ CD Label Parameters + + + + + + +
+ + + + + + Markup-margin Node + + A Markup-margin describes a margin along + all edges of a label. + + + + + + + + + Property + + + Description + + + + + + size + + Size of the margin. I.e. the distance of the margin + line from the edge of the card/label. + + + + + + + + + + Markup-line Node + + A Markup-line describes a markup line. + + + + + + + + + Property + + + Description + + + + + + x1 + + x coordinate of 1st endpoint of the line segment. + + + + y1 + + y coordinate of 1st endpoint of the line segment. + + + + x2 + + x coordinate of 2nd endpoint of the line segment. + + + + y2 + + y coordinate of 2nd endpoint of the line segment. + + + + + + + + + + Markup-circle Node + + A Markup-circle describes a markup circle. + + + + + + + + + + Property + + + Description + + + + + + x0 + + x coordinate of circle origin (center). + + + + y0 + + y coordinate of circle origin (center). + + + + radius + Radius of circle. + + + + + + + + + Markup-rect Node + + A Markup-rect describes a markup rectangle. + + + + + + + + + + Property + + + Description + + + + + + x1 + + x coordinate of upper left corner of rectangle. + + + + y1 + + y coordinate of upper left corner of rectangle. + + + + w + + Width of rectangle. + + + + h + + Height of rectangle. + + + + r + Radius of rounded corners of rectangle. + + + + + + + + + Layout Node + + A label node may contain multiple Layout + children. If labels are arranged in a simple grid pattern, only + one layout is needed. However, if labels are arranged in multiple + grids, such as a running bond pattern, multiple + layout tags can be used. Note: a single label + can always be treated as a grid of one. + + + + + + + + + Property + + + Description + + + + + + nx + + Number of labels/cards across in the grid + (horizontal) + + + + ny + + Number of labels/cards up and down in the grid + (vertical) + + + + x0 + + Distance from left edge of sheet to the left edge of + the left column of cards/labels in the layout. + + + + y0 + + Distance from the top edge of sheet to the top edge of + the top row of labels/cards in the layout. + + + + dx + Horizontal pitch of grid. + + + dy + Vertical pitch of grid. + + + + + + +
+ Layout Parameters + + + + + + +
+ + + + + + Alias Node + + An Alias node provides the name of a + product with the same size and layout characteristics as the + parent template. + + + + + + + + + Property + + + Description + + + + + + brand + + The brand or manufacturer of the equivalent product. + + + + part + + The part number or name of the equivalent product. + + + + + + + + + + + + + + + + + + + + + + + About &app; + &app; was written by Jim Evins + (evins@snaught.com). To find more information about + &app;, please visit the + gLabels Web + page. + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions at the - gLabels Contact Page. ++ &app; Contact Page. + + + This program is distributed under the terms of the GNU + General Public license as published by the Free Software + Foundation; either version 2 of the License, or (at your option) + any later version. A copy of this license can be found at this + link, or in the file + COPYING included with the source code of this program. + + + + + + + +
diff --cc help/Makefile.am index a68e4e50,00000000..708fb593 mode 100644,000000..100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@@ -1,3 -1,0 +1,24 @@@ - ## Process this file with automake to produce Makefile.in. ++include $(top_srcdir)/gnome-doc-utils.make + - SUBDIRS = C ++dist-hook: doc-dist-hook ++ ++DOC_MODULE = glabels ++DOC_ENTITIES = legal.xml ++DOC_INCLUDES = ++DOC_FIGURES = figures/glabels-template-cd.png \ ++ figures/glabels-template-label.png \ ++ figures/glabels-template-layout.png \ ++ figures/main-window-empty.png \ ++ figures/merge-ex1-1.png \ ++ figures/merge-ex1-2.png \ ++ figures/merge-ex1-3.png \ ++ figures/merge-ex1-4.png \ ++ figures/merge-ex2-1.png \ ++ figures/merge-ex2-2.png \ ++ figures/merge-ex2-3.png \ ++ figures/merge-ex2-4.png \ ++ figures/object-editor-sidebar.png \ ++ figures/print-copies.png \ ++ figures/print-merge.png ++ ++DOC_LINGUAS = de diff --cc po/de.po index 6d2d9125,00000000..b4207b93 mode 100644,000000..100644 --- a/po/de.po +++ b/po/de.po @@@ -1,2707 -1,0 +1,2736 @@@ +# German translation of glabels. +# Copyright (C) 2001-2008 Jim Evins +# Marcus Bauer , 2001. +# Christian Neumair , 2002. +# Mario Blättermann , 2008, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: glabels HEAD\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2009-04-29 12:35+0200\n" - "PO-Revision-Date: 2009-04-29 12:45+0100\n" ++"POT-Creation-Date: 2009-05-10 17:00+0200\n" ++"PO-Revision-Date: 2009-05-10 17:09+0100\n" +"Last-Translator: Mario Blättermann \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + - #: ../src/glabels.c:66 ../src/glabels-batch.c:69 ++#: ../src/glabels.c:75 ../src/glabels-batch.c:70 +msgid "[FILE...]" +msgstr "[DATEI...]" + - #: ../src/glabels.c:83 - msgid "Launch gLabels label and business card designer." - msgstr "Starten des gLabels Etiketten- und Visitenkarten-Designers." ++#: ../src/glabels.c:91 ++msgid "- gLabels label designer" ++msgstr "- gLabels Etiketten-Designer" + - #: ../src/glabels.c:91 ../src/glabels-batch.c:105 - #, c-format - msgid "" - "%s\n" - "Run '%s --help' to see a full list of available command line options.\n" - msgstr "" - "%s\n" - "Rufen Sie »%s --help« auf, um eine vollständige Liste der " - "Befehlszeilenoptionen zu erhalten.\n" - - #: ../src/glabels-batch.c:53 ++#: ../src/glabels-batch.c:54 +msgid "set output filename (default=\"output.pdf\")" +msgstr "Ausgabe-Dateiname festlegen (Vorgabe: »output.pdf«)" + - #: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67 ++#: ../src/glabels-batch.c:54 ../src/glabels-batch.c:68 +msgid "filename" +msgstr "Dateiname" + - #: ../src/glabels-batch.c:55 ++#: ../src/glabels-batch.c:56 +msgid "number of sheets (default=1)" +msgstr "Anzahl der Blätter (Vorgabe: 1)" + - #: ../src/glabels-batch.c:55 ++#: ../src/glabels-batch.c:56 +msgid "sheets" +msgstr "Blätter" + - #: ../src/glabels-batch.c:57 ++#: ../src/glabels-batch.c:58 +msgid "number of copies (default=1)" +msgstr "Anzahl der Kopien (Vorgabe: 1)" + - #: ../src/glabels-batch.c:57 ++#: ../src/glabels-batch.c:58 +msgid "copies" +msgstr "Kopien" + - #: ../src/glabels-batch.c:59 ++#: ../src/glabels-batch.c:60 +msgid "first label on first sheet (default=1)" +msgstr "Erstes Etikett auf dem ersten Blatt (Vorgabe: 1)" + - #: ../src/glabels-batch.c:59 ++#: ../src/glabels-batch.c:60 +msgid "first" +msgstr "Erste" + - #: ../src/glabels-batch.c:61 ../data/builder/print-custom-widget.glade.h:6 ++#: ../src/glabels-batch.c:62 ../data/glade/print-custom-widget.glade.h:6 +msgid "print outlines (to test printer alignment)" +msgstr "Begrenzungen drucken (um Druckausrichtung zu testen)" + - #: ../src/glabels-batch.c:63 ../data/builder/print-custom-widget.glade.h:5 ++#: ../src/glabels-batch.c:64 ../data/glade/print-custom-widget.glade.h:5 +msgid "print in reverse (i.e. a mirror image)" +msgstr "Spiegelbildlich drucken" + - #: ../src/glabels-batch.c:65 ../data/builder/print-custom-widget.glade.h:4 ++#: ../src/glabels-batch.c:66 ../data/glade/print-custom-widget.glade.h:4 +msgid "print crop marks" +msgstr "Schnittmarken drucken" + - #: ../src/glabels-batch.c:67 ++#: ../src/glabels-batch.c:68 +msgid "input file for merging" +msgstr "Eingabedatei zum Mischen" + - #: ../src/glabels-batch.c:97 - msgid "Print files created with gLabels." - msgstr "Mit gLabels erstellte Dateien drucken." ++#: ../src/glabels-batch.c:96 ++msgid "- batch process gLabels label files" ++msgstr "- Stapelverarbeitung von gLabels-Dateien" + - #: ../src/glabels-batch.c:147 ++#: ../src/glabels-batch.c:142 +#, c-format +msgid "cannot perform document merge with glabels file %s\n" +msgstr "" +"Dokumentverarbeitung kann mit gLabels-Datei %s nicht ausgeführt werden\n" + - #: ../src/glabels-batch.c:169 ++#: ../src/glabels-batch.c:164 +#, c-format +msgid "cannot open glabels file %s\n" +msgstr "glabels-Datei %s kann nicht geöffnet werden\n" + +#: ../src/window.c:259 +msgid "(none) - gLabels" +msgstr "(Unbenannt) - gLabels" + +#: ../src/window.c:432 +msgid "(modified)" +msgstr "(geändert)" + +#: ../src/stock.c:72 +msgid "_Select Mode" +msgstr "Modus au_swählen" + +#: ../src/stock.c:73 +msgid "_Text" +msgstr "_Text" + +#: ../src/stock.c:74 +msgid "_Line" +msgstr "_Linie" + +#: ../src/stock.c:75 +msgid "_Box" +msgstr "_Rechteck" + +#: ../src/stock.c:76 +msgid "_Ellipse" +msgstr "_Ellipse" + +#: ../src/stock.c:77 +msgid "_Image" +msgstr "B_ild" + +#: ../src/stock.c:78 +msgid "Bar_code" +msgstr "Strich_code" + +#: ../src/stock.c:79 +msgid "_Merge Properties" +msgstr "_Mischeinstellungen" + +#: ../src/stock.c:80 +msgid "Object _Properties" +msgstr "Objektei_genschaften" + +#: ../src/stock.c:81 +msgid "Bring to _Front" +msgstr "Ganz nach _vorn" + +#: ../src/stock.c:82 +msgid "Send to _Back" +msgstr "Ganz nach _hinten" + +#: ../src/stock.c:83 +msgid "Rotate _Left" +msgstr "_Links drehen" + +#: ../src/stock.c:84 +msgid "Rotate _Right" +msgstr "_Rechts drehen" + +#: ../src/stock.c:85 +msgid "Flip _Horizontally" +msgstr "_Horizontal spiegeln" + +#: ../src/stock.c:86 +msgid "Flip _Vertically" +msgstr "_Vertikal spiegeln" + +#: ../src/stock.c:87 +msgid "_Lefts" +msgstr "_Links" + +#: ../src/stock.c:88 +msgid "_Rights" +msgstr "_Rechts" + +#: ../src/stock.c:89 +msgid "_Centers" +msgstr "_Mitte" + +#: ../src/stock.c:90 +msgid "_Tops" +msgstr "_Oben" + +#: ../src/stock.c:91 +msgid "Bottoms" +msgstr "Unten" + +#: ../src/stock.c:92 +msgid "Centers" +msgstr "Mitte" + +#: ../src/stock.c:93 ../src/stock.c:94 +msgid "Label Ce_nter" +msgstr "Etikett ze_ntrieren" + - #: ../src/stock.c:95 ../data/builder/property-bar.glade.h:3 ++#: ../src/stock.c:95 ../data/glade/property-bar.glade.h:3 +msgid "Fill color" +msgstr "Füllfarbe" + - #: ../src/stock.c:96 ../data/builder/property-bar.glade.h:8 ++#: ../src/stock.c:96 ../data/glade/property-bar.glade.h:8 +msgid "Line color" +msgstr "Linienfarbe" + +#: ../src/stock.c:97 ../src/stock.c:99 +msgid "Linked" +msgstr "Verknüpft" + +#: ../src/stock.c:98 ../src/stock.c:100 +msgid "Not Linked" +msgstr "Nicht verknüpft" + +#. Menu entries. +#: ../src/ui.c:93 +msgid "_File" +msgstr "_Datei" + +#: ../src/ui.c:94 +msgid "Open Recent _Files" +msgstr "_Zuletzt geöffnete Dateien" + +#: ../src/ui.c:95 +msgid "_Edit" +msgstr "_Bearbeiten" + +#: ../src/ui.c:96 +msgid "_View" +msgstr "_Ansicht" + +#: ../src/ui.c:97 +msgid "Customize Main Toolbar" +msgstr "Werkzeugleiste anpassen" + +#: ../src/ui.c:98 +msgid "Customize Drawing Toolbar" +msgstr "Zeichenwerkzeugleiste anpassen" + +#: ../src/ui.c:99 +msgid "Customize Properties Toolbar" +msgstr "Eigenschaften-Werkzeugleiste anpassen" + +#: ../src/ui.c:100 +msgid "_Objects" +msgstr "_Objekte" + +#: ../src/ui.c:101 +msgid "_Create" +msgstr "_Erzeugen" + +#: ../src/ui.c:102 +msgid "_Order" +msgstr "_Anordnung" + +#: ../src/ui.c:103 +msgid "_Rotate/Flip" +msgstr "D_rehen/Spiegeln" + +#: ../src/ui.c:104 +msgid "Align _Horizontal" +msgstr "_Horizontal" + +#: ../src/ui.c:105 +msgid "Align _Vertical" +msgstr "_Vertikal" + +#: ../src/ui.c:106 +msgid "_Help" +msgstr "_Hilfe" + +#. Popup entries. +#: ../src/ui.c:109 ../src/ui.c:110 +msgid "Context Menu" +msgstr "Kontextmenü" + +#: ../src/ui.c:115 +msgid "_New" +msgstr "_Neu" + +#: ../src/ui.c:117 +msgid "Create a new file" +msgstr "Eine neue Datei erstellen" + +#: ../src/ui.c:122 +msgid "_Open..." +msgstr "Ö_ffnen …" + +#: ../src/ui.c:124 +msgid "Open a file" +msgstr "Eine Datei öffnen" + +#: ../src/ui.c:129 +msgid "_Save" +msgstr "_Speichern" + +#: ../src/ui.c:131 +msgid "Save current file" +msgstr "Die aktuelle Datei speichern" + +#: ../src/ui.c:136 +msgid "Save _As..." +msgstr "Speichern _unter …" + +#: ../src/ui.c:138 +msgid "Save the current file to a different name" +msgstr "Die aktuelle Datei unter einem anderen Dateinamen speichern" + +#: ../src/ui.c:143 +msgid "_Print..." +msgstr "_Drucken …" + +#: ../src/ui.c:145 +msgid "Print the current file" +msgstr "Die aktuelle Datei drucken" + +#: ../src/ui.c:150 +msgid "Properties..." +msgstr "Einstellungen …" + +#: ../src/ui.c:152 +msgid "Modify document properties" +msgstr "Dokumenteigenschaften ändern" + +#: ../src/ui.c:157 +msgid "Template _Designer..." +msgstr "Vorlagen-_Designer …" + +#: ../src/ui.c:159 +msgid "Create a custom template" +msgstr "Eine neue benutzerdefinierte Vorlage erstellen" + +#: ../src/ui.c:164 +msgid "_Close" +msgstr "S_chließen" + +#: ../src/ui.c:166 +msgid "Close the current file" +msgstr "Die aktuelle Datei schließen" + +#: ../src/ui.c:171 +msgid "_Quit" +msgstr "_Beenden" + +#: ../src/ui.c:173 +msgid "Quit the program" +msgstr "Das Programm beenden" + +#: ../src/ui.c:180 +msgid "Cut" +msgstr "Ausschneiden" + +#: ../src/ui.c:182 +msgid "Cut the selection" +msgstr "Die Markierung ausschneiden" + +#: ../src/ui.c:187 +msgid "Copy" +msgstr "Kopieren" + +#: ../src/ui.c:189 +msgid "Copy the selection" +msgstr "Die Markierung kopieren" + +#: ../src/ui.c:194 +msgid "Paste" +msgstr "Einfügen" + +#: ../src/ui.c:196 +msgid "Paste the clipboard" +msgstr "Inhalt der Zwischenablage einfügen" + +#: ../src/ui.c:201 +msgid "Delete" +msgstr "Löschen" + +#: ../src/ui.c:203 +msgid "Delete the selected objects" +msgstr "Die markierten Objekte löschen" + +#: ../src/ui.c:208 +msgid "Select All" +msgstr "Alles markieren" + +#: ../src/ui.c:210 +msgid "Select all objects" +msgstr "Alle Objekte markieren" + +#: ../src/ui.c:215 +msgid "Un-select All" +msgstr "Alle Markierungen löschen" + +#: ../src/ui.c:217 +msgid "Remove all selections" +msgstr "Alle Auswahlen aufheben" + +#: ../src/ui.c:222 +msgid "Preferences" +msgstr "Einstellungen" + +#: ../src/ui.c:224 +msgid "Configure the application" +msgstr "Die Anwendung konfigurieren" + +#: ../src/ui.c:231 +msgid "Zoom in" +msgstr "Vergrößern" + +#: ../src/ui.c:233 +msgid "Increase magnification" +msgstr "Vergrößern" + +#: ../src/ui.c:238 +msgid "Zoom out" +msgstr "Verkleinern" + +#: ../src/ui.c:240 +msgid "Decrease magnification" +msgstr "Verkleinern" + +#: ../src/ui.c:245 +msgid "Zoom 1 to 1" +msgstr "Vergrößerung 1:1" + +#: ../src/ui.c:247 +msgid "Restore scale to 100%" +msgstr "Maßstab auf 100% wiederherstellen" + +#: ../src/ui.c:252 +msgid "Zoom to fit" +msgstr "Einpassen" + +#: ../src/ui.c:254 +msgid "Set scale to fit window" +msgstr "In Fenster einpassen" + +#: ../src/ui.c:261 +msgid "Select Mode" +msgstr "Modus auswählen" + +#: ../src/ui.c:263 +msgid "Select, move and modify objects" +msgstr "Objekte auswählen, bewegen, ändern" + +#: ../src/ui.c:268 ../src/view-text.c:494 - #: ../data/builder/object-editor.glade.h:32 ++#: ../data/glade/object-editor.glade.h:32 +msgid "Text" +msgstr "Text" + +#: ../src/ui.c:270 +msgid "Create text object" +msgstr "Textobjekt erzeugen" + +#: ../src/ui.c:275 +msgid "Box" +msgstr "Rechteck" + +#: ../src/ui.c:277 +msgid "Create box/rectangle object" +msgstr "Rechteck-Objekt erzeugen" + - #: ../src/ui.c:282 ../data/builder/object-editor.glade.h:20 ++#: ../src/ui.c:282 ../data/glade/object-editor.glade.h:20 +msgid "Line" +msgstr "Linie" + +#: ../src/ui.c:284 +msgid "Create line object" +msgstr "Linienobjekt erzeugen" + +#: ../src/ui.c:289 +msgid "Ellipse" +msgstr "Ellipse" + +#: ../src/ui.c:291 +msgid "Create ellipse/circle object" +msgstr "Ellipsen- oder Kreisobjekt erzeugen" + - #: ../src/ui.c:296 ../data/builder/object-editor.glade.h:16 ++#: ../src/ui.c:296 ../data/glade/object-editor.glade.h:16 +msgid "Image" +msgstr "Bild" + +#: ../src/ui.c:298 +msgid "Create image object" +msgstr "Bildobjekt erzeugen" + +#: ../src/ui.c:303 +msgid "Barcode" +msgstr "Strichcode" + +#: ../src/ui.c:305 +msgid "Create barcode object" +msgstr "Strichcodeobjekt erzeugen" + +#: ../src/ui.c:310 +msgid "Bring to front" +msgstr "Ganz nach vorn" + +#: ../src/ui.c:312 +msgid "Raise object to top" +msgstr "Objekt im Ebenenstapel nach oben verschieben" + +#: ../src/ui.c:317 +msgid "Send to back" +msgstr "Ganz nach hinten" + +#: ../src/ui.c:319 +msgid "Lower object to bottom" +msgstr "Objekt im Ebenenstapel nach unten verschieben" + +#: ../src/ui.c:324 +msgid "Rotate left" +msgstr "Links drehen" + +#: ../src/ui.c:326 +msgid "Rotate object 90 degrees counter-clockwise" +msgstr "Objekt um 90 Grad gegen den Uhrzeigersinn drehen" + +#: ../src/ui.c:331 +msgid "Rotate right" +msgstr "Rechts drehen" + +#: ../src/ui.c:333 +msgid "Rotate object 90 degrees clockwise" +msgstr "Objekt um 90 Grad im Uhrzeigersinn drehen" + +#: ../src/ui.c:338 +msgid "Flip horizontally" +msgstr "Horizontal spiegeln" + +#: ../src/ui.c:340 +msgid "Flip object horizontally" +msgstr "Objekt horizontal spiegeln" + +#: ../src/ui.c:345 +msgid "Flip vertically" +msgstr "Vertikal spiegeln" + +#: ../src/ui.c:347 +msgid "Flip object vertically" +msgstr "Objekt vertikal spiegeln" + +#: ../src/ui.c:352 +msgid "Align left" +msgstr "Linksbündig" + +#: ../src/ui.c:354 +msgid "Align objects to left edges" +msgstr "Objekte am linken Rand anordnen" + +#: ../src/ui.c:359 +msgid "Align right" +msgstr "Rechtsbündig" + +#: ../src/ui.c:361 +msgid "Align objects to right edges" +msgstr "Objekte am rechten Rand anordnen" + +#: ../src/ui.c:366 +msgid "Align horizontal center" +msgstr "Horizontal mittig anordnen" + +#: ../src/ui.c:368 +msgid "Align objects to horizontal centers" +msgstr "Objekte an der horizontalen Mitte anordnen" + +#: ../src/ui.c:373 +msgid "Align tops" +msgstr "Oben bündig" + +#: ../src/ui.c:375 +msgid "Align objects to top edges" +msgstr "Objekte am oberen Rand anordnen" + +#: ../src/ui.c:380 +msgid "Align bottoms" +msgstr "Unten bündig" + +#: ../src/ui.c:382 +msgid "Align objects to bottom edges" +msgstr "Objekte am unteren Rand anordnen" + +#: ../src/ui.c:387 +msgid "Align vertical center" +msgstr "Vertikal mittig anordnen" + +#: ../src/ui.c:389 +msgid "Align objects to vertical centers" +msgstr "Objekte an der vertikalen Mitte anordnen" + +#: ../src/ui.c:394 +msgid "Center horizontally" +msgstr "Horizontal zentrieren" + +#: ../src/ui.c:396 +msgid "Center objects to horizontal label center" +msgstr "Objekte zur horizontalen Mitte des Etiketts zentrieren" + +#: ../src/ui.c:401 +msgid "Center vertically" +msgstr "Vertikal zentrieren" + +#: ../src/ui.c:403 +msgid "Center objects to vertical label center" +msgstr "Objekte zur vertikalen Mitte des Etiketts zentrieren" + +#: ../src/ui.c:408 +msgid "Merge properties" +msgstr "Mischeinstellungen" + +#: ../src/ui.c:410 +msgid "Edit merge properties" +msgstr "Mischeinstellungen bearbeiten" + +#: ../src/ui.c:417 +msgid "Contents" +msgstr "Inhalte" + +#: ../src/ui.c:419 +msgid "Open glabels manual" +msgstr "Das gLabels-Handbuch öffnen" + +#: ../src/ui.c:424 +msgid "About..." +msgstr "Info …" + +#: ../src/ui.c:426 +msgid "About glabels" +msgstr "Info zu gLabels" + +# CHECK +#: ../src/ui.c:436 +msgid "Property toolbar" +msgstr "Eigenschaften-Werkzeugleiste" + +#: ../src/ui.c:438 +msgid "Change the visibility of the property toolbar in the current window" +msgstr "" +"Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ein- oder ausschalten" + - #: ../src/ui.c:444 ++#: ../src/ui.c:444 ../src/ui.c:489 ../src/ui.c:497 ++msgid "Show tooltips" ++msgstr "Minihilfen anzeigen" ++ ++# CHECK ++#: ../src/ui.c:446 ++msgid "Show tooltips for property toolbar" ++msgstr "Minihilfen für Eigenschaften-Werkzeugleiste anzeigen" ++ ++#: ../src/ui.c:452 +msgid "Grid" +msgstr "Raster" + - #: ../src/ui.c:446 ++#: ../src/ui.c:454 +msgid "Change the visibility of the grid in the current window" +msgstr "Die Sichtbarkeit des Rasters im aktuellen Fenster ein- oder ausschalten" + - #: ../src/ui.c:452 ++#: ../src/ui.c:460 +msgid "Markup" +msgstr "Markierungen" + - #: ../src/ui.c:454 ++#: ../src/ui.c:462 +msgid "Change the visibility of markup lines in the current window" +msgstr "Die Sichtbarkeit von Markierungslinien im aktuellen Fenster ändern" + - #: ../src/ui.c:465 ++#: ../src/ui.c:473 +msgid "Main toolbar" +msgstr "Haupt-Werkzeugleiste" + - #: ../src/ui.c:467 ++#: ../src/ui.c:475 +msgid "Change the visibility of the main toolbar in the current window" +msgstr "" +"Die Sichtbarkeit der Haupt-Werkzeugleiste im aktuellen Fenster einschalten/" +"ausschalten" + - #: ../src/ui.c:473 ++#: ../src/ui.c:481 +msgid "Drawing toolbar" +msgstr "Zeichenwerkzeugleiste" + - #: ../src/ui.c:475 ++#: ../src/ui.c:483 +msgid "Change the visibility of the drawing toolbar in the current window" +msgstr "" +"Die Sichtbarkeit der Zeichenwerkzeugleiste im aktuellen Fenster einschalten/" +"ausschalten" + - #: ../src/ui-property-bar.c:279 ../src/prefs-dialog.c:328 - #: ../src/object-editor-bc-page.c:93 ../src/object-editor-text-page.c:93 - #: ../src/object-editor-shadow-page.c:93 ++#: ../src/ui.c:491 ++msgid "Show tooltips for main toolbar" ++msgstr "Minihilfen für Hauptwerkzeugleiste anzeigen" ++ ++#: ../src/ui.c:499 ++msgid "Show tooltips for drawing toolbar" ++msgstr "Minihilfen für Zeichenwerkzeugleiste anzeigen" ++ ++#: ../src/ui-property-bar.c:1232 ../src/object-editor.c:587 ++#: ../src/object-editor.c:593 +msgid "Default" +msgstr "Standard" + - #: ../src/ui-property-bar.c:291 ../src/prefs-dialog.c:334 - #: ../src/object-editor-fill-page.c:79 - msgid "No Fill" - msgstr "Keine Füllung" - - #: ../src/ui-property-bar.c:303 ../src/prefs-dialog.c:331 - #: ../src/object-editor-line-page.c:81 - msgid "No Line" ++#: ../src/ui-property-bar.c:1239 ../src/object-editor.c:599 ++msgid "No line" +msgstr "Keine Linie" + ++#: ../src/ui-property-bar.c:1247 ../src/object-editor.c:606 ++msgid "No fill" ++msgstr "Keine Füllung" ++ +#: ../src/ui-sidebar.c:152 +msgid "Object properties" +msgstr "Objekteigenschaften" + - #: ../src/ui-commands.c:1064 ++#: ../src/ui-commands.c:1084 +msgid "Glabels includes contributions from:" +msgstr "Glabels entstand unter Mitwirkung von:" + - #: ../src/ui-commands.c:1070 ++#: ../src/ui-commands.c:1090 +msgid "See the file AUTHORS for additional credits," +msgstr "Lesen die Datei AUTHORS für zusätzliche Danksagungen," + - #: ../src/ui-commands.c:1071 ++#: ../src/ui-commands.c:1091 +msgid "or visit http://glabels.sourceforge.net/" +msgstr "oder besuchen Sie http://glabels.sourceforge.net/" + - #: ../src/ui-commands.c:1083 ++#: ../src/ui-commands.c:1103 +msgid "A label and business card creation program.\n" +msgstr "Eine Anwendung zum Erstellen von Etiketten und Visitenkarten.\n" + - #: ../src/ui-commands.c:1087 ++#: ../src/ui-commands.c:1107 +msgid "translator-credits" +msgstr "" +"Marcus Bauer \n" +"Christian Neumair \n" +"Mario Blättermann " + - #: ../src/ui-commands.c:1090 ++#: ../src/ui-commands.c:1110 +msgid "" +"Glabels is free software; you can redistribute it and/or modify it\n" +"under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n" +"the GNU General Public License for more details.\n" +msgstr "" +"Glabels ist freie Software; Sie können sie weiterverteilen und/oder ändern\n" +"unter den Bedingungen der GNU General Public License, veröffentlicht von\n" +"der Free Software Foundation, entweder Version 2 der Lizenz oder (optional)\n" +"jeder späteren Version.\n" +" \n" +"Dieses Programm wird verteilt in der Hoffnung, dass es nützlich ist, aber\n" +"OHNE JEDE GARANTIE; Weitere Details in der GNU General Public License.\n" + - #: ../src/ui-commands.c:1116 ++#: ../src/ui-commands.c:1136 +msgid "glabels" +msgstr "glabels" + +#: ../src/file.c:91 +msgid "New Label or Card" +msgstr "Neues Etikett oder neue Karte" + +#: ../src/file.c:191 +msgid "Label properties" +msgstr "Etiketten-Eigenschaften" + +#: ../src/file.c:292 ../src/file.c:578 +msgid "All files" +msgstr "Alle Dateien" + +#: ../src/file.c:297 ../src/file.c:583 +msgid "gLabels documents" +msgstr "gLabels-Dokumente" + +#: ../src/file.c:343 ../src/file.c:640 +msgid "Empty file name selection" +msgstr "Auswahl des Dateinamens ist leer" + +#: ../src/file.c:346 ../src/file.c:362 +msgid "Please select a file or supply a valid file name" +msgstr "Bitte wählen Sie eine Datei oder geben Sie einen gültigen Dateinamen an" + +#: ../src/file.c:359 +msgid "File does not exist" +msgstr "Datei existiert nicht" + +#: ../src/file.c:433 +#, c-format +msgid "Could not open file \"%s\"" +msgstr "Datei »%s« konnte nicht geöffnet werden" + +#: ../src/file.c:436 +msgid "Not a supported file format" +msgstr "Kein unterstütztes Dateiformat" + +#: ../src/file.c:513 ../src/file.c:690 +#, c-format +msgid "Could not save file \"%s\"" +msgstr "Datei »%s« konnte nicht gespeichert werden" + +#: ../src/file.c:517 ../src/file.c:694 +msgid "Error encountered during save. The file is still not saved." +msgstr "Fehler während des Speicherns. Datei wurde noch nicht gespeichert." + +#: ../src/file.c:556 +#, c-format +msgid "Save \"%s\" as" +msgstr "»%s« speichern unter" + +#: ../src/file.c:643 +msgid "Please supply a valid file name" +msgstr "Bitte geben Sie einen gültigen Dateinamen an" + +#: ../src/file.c:664 +#, c-format +msgid "Overwrite file \"%s\"?" +msgstr "Datei »%s« überschreiben?" + +#: ../src/file.c:668 +msgid "File already exists." +msgstr "Datei existiert bereits." + +#: ../src/file.c:764 +#, c-format +msgid "Save changes to document \"%s\" before closing?" +msgstr "Änderungen am Dokument »%s« vor dem Schließen speichern?" + +#: ../src/file.c:768 +msgid "Your changes will be lost if you don't save them." +msgstr "Nicht gespeicherte Änderungen gehen verloren, wenn Sie nicht speichern." + +#: ../src/file.c:771 +msgid "Close without saving" +msgstr "Schließen, ohne zu speichern" + +#. Should not happen - #: ../src/prefs.c:159 ../src/prefs.c:166 - #: ../data/builder/object-editor.glade.h:43 - #: ../data/builder/prefs-dialog.glade.h:22 ++#: ../src/prefs.c:159 ../src/prefs.c:166 ../data/glade/object-editor.glade.h:43 ++#: ../data/glade/prefs-dialog.glade.h:22 +msgid "points" +msgstr "Punkte" + - #: ../src/prefs.c:161 ../data/builder/object-editor.glade.h:42 - #: ../data/builder/template-designer.glade.h:64 ++#: ../src/prefs.c:161 ../data/glade/object-editor.glade.h:42 ++#: ../data/glade/template-designer.glade.h:64 +msgid "inches" +msgstr "Zoll" + +#: ../src/prefs.c:163 +msgid "mm" +msgstr "mm" + - #: ../src/prefs-dialog.c:167 ../data/builder/prefs-dialog.glade.h:21 ++#: ../src/prefs-dialog.c:162 ../data/glade/prefs-dialog.glade.h:21 +msgid "gLabels Preferences" +msgstr "gLabels-Einstellungen" + +#. Build editor. +#: ../src/view-box.c:175 +msgid "Box object properties" +msgstr "Eigenschaften des Rechteck-Objekts" + +#. Build editor. +#: ../src/view-ellipse.c:175 +msgid "Ellipse object properties" +msgstr "Eigenschaften des Ellipsen-Objekts" + +#. Build editor. +#: ../src/view-line.c:174 +msgid "Line object properties" +msgstr "Eigenschaften des Linien-Objekts" + +#. Build editor. +#: ../src/view-image.c:174 +msgid "Image object properties" +msgstr "Eigenschaften des Bild-Objekts" + +#. Build editor. +#: ../src/view-text.c:178 +msgid "Text object properties" +msgstr "Eigenschaften des Text-Objekts" + +#. Build editor. +#: ../src/view-barcode.c:174 +msgid "Barcode object properties" +msgstr "Eigenschaften des Strichcode-Objekts" + - #: ../src/object-editor-image-page.c:267 ++#: ../src/object-editor-image-page.c:270 +msgid "All Files" +msgstr "Alle Dateien" + - #: ../src/object-editor-image-page.c:272 ++#: ../src/object-editor-image-page.c:275 +msgid "All Images" +msgstr "Alle Bilder" + - #: ../src/object-editor-image-page.c:287 ++#: ../src/object-editor-image-page.c:290 +#, c-format +msgid "%s (*.%s)" +msgstr "%s (*.%s)" + - #: ../src/merge-properties-dialog.c:271 ++#: ../src/merge-properties-dialog.c:263 +msgid "Merge Properties" +msgstr "Mischeinstellungen" + - #: ../src/merge-properties-dialog.c:297 ../src/merge-properties-dialog.c:405 ++#: ../src/merge-properties-dialog.c:289 ../src/merge-properties-dialog.c:397 +msgid "Select merge-database source" +msgstr "Wählen Sie die einzumischende Datenquelle" + - #: ../src/merge-properties-dialog.c:306 ../src/merge-properties-dialog.c:425 ++#: ../src/merge-properties-dialog.c:298 ../src/merge-properties-dialog.c:417 +msgid "N/A" +msgstr "Nicht verfügbar" + - #: ../src/merge-properties-dialog.c:332 ++#: ../src/merge-properties-dialog.c:324 +msgid "Select" +msgstr "Markieren" + - #: ../src/merge-properties-dialog.c:340 ++#: ../src/merge-properties-dialog.c:332 +msgid "Record/Field" +msgstr "Feld" + - #: ../src/merge-properties-dialog.c:348 - #: ../data/builder/object-editor.glade.h:10 ++#: ../src/merge-properties-dialog.c:340 ../data/glade/object-editor.glade.h:10 +msgid "Data" +msgstr "Wert" + - #: ../src/merge-properties-dialog.c:418 ++#: ../src/merge-properties-dialog.c:410 +msgid "Fixed" +msgstr "Fixiert" + +#. =================================================================== - #: ../src/print-op.c:242 ../src/wdgt-print-copies.c:171 ++#: ../src/print-op.c:237 ../src/wdgt-print-copies.c:171 +#: ../data/templates/misc-iso-templates.xml.h:34 +msgid "Labels" +msgstr "Labels" + - #: ../src/template-designer.c:411 ++#: ../src/template-designer.c:358 +msgid "gLabels Template Designer" +msgstr "gLabels Vorlagen-Designer" + - #: ../src/template-designer.c:481 ++#: ../src/template-designer.c:419 +msgid "Welcome" +msgstr "Willkommen" + - #: ../src/template-designer.c:534 ++#: ../src/template-designer.c:463 +msgid "Name and Description" +msgstr "Name und Beschreibung" + - #: ../src/template-designer.c:595 ++#: ../src/template-designer.c:516 +msgid "Page Size" +msgstr "Seitenformat" + - #: ../src/template-designer.c:675 ++#: ../src/template-designer.c:587 +msgid "Label or Card Shape" +msgstr "Form des neuen Etiketts oder der neuen Karte" + - #: ../src/template-designer.c:735 ++#: ../src/template-designer.c:637 +msgid "Label or Card Size" +msgstr "Größe des neuen Etiketts oder der neuen Karte" + - #: ../src/template-designer.c:844 ++#: ../src/template-designer.c:737 +msgid "Label Size (round)" +msgstr "Etikettengröße (rund)" + - #: ../src/template-designer.c:935 ++#: ../src/template-designer.c:820 +msgid "Label Size (CD/DVD)" +msgstr "Etikettengröße (CD/DVD)" + - #: ../src/template-designer.c:1036 ++#: ../src/template-designer.c:913 +msgid "Number of Layouts" +msgstr "Anzahl der Layouts" + - #: ../src/template-designer.c:1110 ++#: ../src/template-designer.c:976 +msgid "Layout(s)" +msgstr "Layout(s)" + - #: ../src/template-designer.c:1229 ++#: ../src/template-designer.c:1087 +msgid "Design Completed" +msgstr "Design ist komplett" + - #: ../src/template-designer.c:1396 ++#: ../src/template-designer.c:1253 +msgid "" +"Brand and part# match an existing " +"template!" +msgstr "" +"Für diese Marke und Nummer wurde eine " +"Vorlage gefunden!" + +#: ../src/bc.c:67 +msgid "POSTNET (any)" +msgstr "POSTNET (allgemein)" + +#: ../src/bc.c:70 +msgid "POSTNET-5 (ZIP only)" +msgstr "POSTNET-5 (nur ZIP)" + +#: ../src/bc.c:73 +msgid "POSTNET-9 (ZIP+4)" +msgstr "POSTNET-9 (ZIP+4)" + +#: ../src/bc.c:76 +msgid "POSTNET-11 (DPBC)" +msgstr "POSTNET-11 (DPBC)" + +#: ../src/bc.c:79 +msgid "CEPNET" +msgstr "CEPNET" + +#: ../src/bc.c:82 +msgid "EAN (any)" +msgstr "EAN (any)" + +#: ../src/bc.c:85 +msgid "EAN-8" +msgstr "EAN-8" + +#: ../src/bc.c:88 +msgid "EAN-8 +2" +msgstr "EAN-8 +2" + +#: ../src/bc.c:91 +msgid "EAN-8 +5" +msgstr "EAN-8 +5" + +#: ../src/bc.c:94 +msgid "EAN-13" +msgstr "EAN-13" + +#: ../src/bc.c:97 +msgid "EAN-13 +2" +msgstr "EAN-13 +2" + +#: ../src/bc.c:100 +msgid "EAN-13 +5" +msgstr "EAN-13 +5" + +#: ../src/bc.c:103 +msgid "UPC (UPC-A or UPC-E)" +msgstr "UPC (UPC-A oder UPC-E)" + +#: ../src/bc.c:106 +msgid "UPC-A" +msgstr "UPC-A" + +#: ../src/bc.c:109 +msgid "UPC-A +2" +msgstr "UPC-A +2" + +#: ../src/bc.c:112 +msgid "UPC-A +5" +msgstr "UPC-A +5" + +#: ../src/bc.c:115 +msgid "UPC-E" +msgstr "UPC-E" + +#: ../src/bc.c:118 +msgid "UPC-E +2" +msgstr "UPC-E +2" + +#: ../src/bc.c:121 +msgid "UPC-E +5" +msgstr "UPC-E +5" + +#: ../src/bc.c:124 +msgid "ISBN" +msgstr "ISBN" + +#: ../src/bc.c:127 +msgid "ISBN +5" +msgstr "ISBN +5" + +#: ../src/bc.c:130 +msgid "Code 39" +msgstr "Code 39" + +#: ../src/bc.c:133 +msgid "Code 128" +msgstr "Code 128" + +#: ../src/bc.c:136 +msgid "Code 128C" +msgstr "Code 128C" + +#: ../src/bc.c:139 +msgid "Code 128B" +msgstr "Code 128B" + +#: ../src/bc.c:142 +msgid "Interleaved 2 of 5" +msgstr "Interleaved 2 of 5" + +#: ../src/bc.c:145 +msgid "Codabar" +msgstr "Codabar" + +#: ../src/bc.c:148 +msgid "MSI" +msgstr "MSI" + +#: ../src/bc.c:151 +msgid "Plessey" +msgstr "Plessey" + +#: ../src/bc.c:154 +msgid "IEC16022 (DataMatrix)" +msgstr "IEC16022 (DataMatrix)" + +#: ../src/label.c:531 +msgid "Untitled" +msgstr "Unbenannt" + +#: ../src/label-barcode.c:426 +msgid "Barcode data empty" +msgstr "Strichcode-Daten sind leer" + +#: ../src/label-barcode.c:430 +msgid "Invalid barcode data" +msgstr "Ungültige Strichcode-Daten" + +#: ../src/xml-label.c:189 ../src/xml-label.c:226 +msgid "xmlParseFile error" +msgstr "Fehler: xmlParseFile error" + +#: ../src/xml-label.c:262 +msgid "No document root" +msgstr "Kein document root" + +#: ../src/xml-label.c:270 +msgid "Importing from glabels 0.1 format" +msgstr "Aus dem glabels 0.1-Format wird importiert" + +#: ../src/xml-label.c:279 +msgid "Importing from glabels 0.4 format" +msgstr "Aus dem glabels 0.4-Format wird importiert" + +#: ../src/xml-label.c:288 +#, c-format +msgid "Unknown glabels Namespace -- Using %s" +msgstr "Unbekannter glabels-Namensraum -- %s wird verwendet" + +#: ../src/xml-label.c:319 ../src/xml-label-04.c:79 +#, c-format +msgid "Bad root node = \"%s\"" +msgstr "Fehlerhafter root node = »%s«" + +#: ../src/xml-label.c:356 +#, c-format +msgid "bad node in Document node = \"%s\"" +msgstr "Ungültiger Node im Dokument-Node = »%s«" + +#: ../src/xml-label.c:401 ../src/xml-label-04.c:127 +#, c-format +msgid "bad node = \"%s\"" +msgstr "fehlerhafter node = »%s«" + +#: ../src/xml-label.c:840 +#, c-format +msgid "bad node in Data node = \"%s\"" +msgstr "Ungültiger Node im Daten-Node = »%s«" + +#: ../src/xml-label.c:1077 ../libglabels/xml-template.c:670 +msgid "Utf8 conversion error." +msgstr "Fehler in der UTF8-Umwandlung." + +#: ../src/xml-label.c:1084 +msgid "Problem saving xml file." +msgstr "Problem beim Speichern der xml-Datei." + +#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378 +msgid "None" +msgstr "Keine" + +#: ../src/merge-init.c:59 +msgid "Text file with comma delimeters (CSV)" +msgstr "Textdatei mit Kommata als Trennern (CSV)" + +#: ../src/merge-init.c:66 +msgid "Text file with colon delimeters" +msgstr "Textdatei mit Semikola als Trennern" + +#: ../src/merge-init.c:73 +msgid "Text file with tab delimeters" +msgstr "Textdatei mit Tabulatoren als Trennern" + +#: ../src/merge-init.c:82 +msgid "Data from default Evolution Addressbook" +msgstr "Daten aus dem vorgegebenen Evolution-Adressbuch" + +#: ../src/merge-init.c:88 +msgid "Data from a file containing VCards" +msgstr "Daten aus einer Datei, die VCards enthält" + +#: ../src/merge-evolution.c:309 +msgid "Couldn't construct query" +msgstr "Abfrage konnte nicht erstellt werden" + +#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326 +msgid "Couldn't open addressbook." +msgstr "Adressbuch konnte nicht geöffnet werden" + +#: ../src/merge-evolution.c:341 +msgid "Couldn't list available fields." +msgstr "Verfügbare Felder konnten nicht aufgelistet werden." + +#: ../src/merge-evolution.c:377 +msgid "Couldn't get contacts." +msgstr "Kontakte konnten nicht geholt werden." + - #: ../src/color-combo.c:210 - msgid "Default Color" - msgstr "Standardfarbe" - - #: ../src/color-combo-menu.c:86 - msgid "Dark Red" - msgstr "Dunkelrot" - - #: ../src/color-combo-menu.c:87 - msgid "Brown" - msgstr "Braun" - - #: ../src/color-combo-menu.c:88 - msgid "Dark Goldenrod" - msgstr "Dunkle Goldrute" - - #: ../src/color-combo-menu.c:89 - msgid "Dark Green" - msgstr "Dunkles Grün" - - #: ../src/color-combo-menu.c:90 - msgid "Dark Cyan" - msgstr "Dunkles Cyan-Blau" - - #: ../src/color-combo-menu.c:91 - msgid "Navy Blue" - msgstr "Marineblau" - - #: ../src/color-combo-menu.c:92 - msgid "Dark Violet" - msgstr "Dunkles Violett" - - #: ../src/color-combo-menu.c:94 - msgid "Red" - msgstr "Rot" - - #: ../src/color-combo-menu.c:95 - msgid "Orange" - msgstr "Orange" - - #: ../src/color-combo-menu.c:96 - msgid "Dark Yellow" - msgstr "Dunkles Gelb" - - #: ../src/color-combo-menu.c:97 - msgid "Medium green" - msgstr "Mittelgrün" - - #: ../src/color-combo-menu.c:98 - msgid "Turquoise" - msgstr "Türkis" - - #: ../src/color-combo-menu.c:99 - msgid "Blue" - msgstr "Blau" - - #: ../src/color-combo-menu.c:100 - msgid "Purple" - msgstr "Purpur" - - #: ../src/color-combo-menu.c:102 - msgid "Salmon" - msgstr "Lachs" - - #: ../src/color-combo-menu.c:103 - msgid "Gold" - msgstr "Gold" - - #: ../src/color-combo-menu.c:104 - msgid "Yellow" - msgstr "Gelb" - - #: ../src/color-combo-menu.c:105 - msgid "Green" - msgstr "Grün" - - #: ../src/color-combo-menu.c:106 - msgid "Cyan" - msgstr "Cyan-Blau" - - #: ../src/color-combo-menu.c:107 - msgid "SkyBlue" - msgstr "Himmelblau" - - #: ../src/color-combo-menu.c:108 - msgid "Violet" - msgstr "Violett" - - #: ../src/color-combo-menu.c:110 - msgid "Pink" - msgstr "Pink" - - #: ../src/color-combo-menu.c:111 - msgid "Khaki" - msgstr "Khaki" - - #: ../src/color-combo-menu.c:112 - msgid "Light Yellow" - msgstr "Helles Gelb" - - #: ../src/color-combo-menu.c:113 - msgid "Light Green" - msgstr "Helles Grün" - - #: ../src/color-combo-menu.c:114 - msgid "Light Cyan" - msgstr "Helles Cyan-Blau" - - #: ../src/color-combo-menu.c:115 - msgid "Slate Gray" - msgstr "Schiefergrau" - - #: ../src/color-combo-menu.c:116 - msgid "Thistle" - msgstr "Distle" - - #: ../src/color-combo-menu.c:118 - msgid "White" - msgstr "Weiß" - - #: ../src/color-combo-menu.c:119 - #, c-format - msgid "10% Gray" - msgstr "10% Grau" - - #: ../src/color-combo-menu.c:120 - #, c-format - msgid "25% Gray" - msgstr "25% Grau" - - #: ../src/color-combo-menu.c:121 - #, c-format - msgid "40% Gray" - msgstr "40% Grau" - - #: ../src/color-combo-menu.c:122 - #, c-format - msgid "50% Gray" - msgstr "50% Grau" - - #: ../src/color-combo-menu.c:123 - #, c-format - msgid "60% Gray" - msgstr "60% Grau" - - #: ../src/color-combo-menu.c:124 - msgid "Black" - msgstr "Schwarz" - - #: ../src/color-combo-menu.c:252 ../src/color-combo-menu.c:369 - msgid "Custom Color" - msgstr "Benutzerdefinierte Farbe" - - #: ../src/color-combo-menu.c:317 - #, c-format - msgid "Custom Color #%u" - msgstr "Benutzerdefinierte Farbe #%u" - +#: ../src/wdgt-print-copies.c:153 +msgid "Sheets:" +msgstr "Seiten:" + +#: ../src/wdgt-print-copies.c:173 +msgid "from:" +msgstr "von:" + - #: ../src/wdgt-print-copies.c:179 ++#: ../src/wdgt-print-copies.c:178 +msgid "to:" +msgstr "bis:" + +#: ../src/wdgt-print-merge.c:154 +msgid "Start on label" +msgstr "Start bei Etikett" + - #: ../src/wdgt-print-merge.c:161 ++#: ../src/wdgt-print-merge.c:159 +msgid "on 1st sheet" +msgstr "auf erster Seite" + - #: ../src/wdgt-print-merge.c:170 ++#: ../src/wdgt-print-merge.c:168 +msgid "Copies:" +msgstr "Kopien:" + - #: ../src/wdgt-print-merge.c:176 ++#: ../src/wdgt-print-merge.c:173 +msgid "Collate" +msgstr "Zuordnen" + - #: ../src/wdgt-media-select.c:290 ../src/wdgt-media-select.c:294 - #: ../src/wdgt-media-select.c:299 ../src/wdgt-media-select.c:308 - #: ../src/wdgt-media-select.c:311 ../src/wdgt-media-select.c:404 - #: ../src/wdgt-media-select.c:611 ../src/wdgt-media-select.c:620 ++#: ../src/wdgt-media-select.c:288 ../src/wdgt-media-select.c:292 ++#: ../src/wdgt-media-select.c:297 ../src/wdgt-media-select.c:306 ++#: ../src/wdgt-media-select.c:309 ../src/wdgt-media-select.c:402 ++#: ../src/wdgt-media-select.c:609 ../src/wdgt-media-select.c:618 +msgid "Any" +msgstr "Beliebig" + - #: ../src/wdgt-media-select.c:645 ++#: ../src/wdgt-media-select.c:643 +#, c-format +msgid "%d per sheet" +msgstr "%d pro Seite" + - #: ../src/wdgt-media-select.c:675 ++#: ../src/wdgt-media-select.c:673 +#, c-format +msgid "%s x %s %s" +msgstr "%s x %s %s" + - #: ../src/wdgt-media-select.c:680 ++#: ../src/wdgt-media-select.c:678 +#, c-format +msgid "%.5g x %.5g %s" +msgstr "%.5g x %.5g %s" + - #: ../src/wdgt-media-select.c:691 ../src/wdgt-media-select.c:705 ++#: ../src/wdgt-media-select.c:689 ../src/wdgt-media-select.c:703 +#, c-format +msgid "%s %s diameter" +msgstr "%s %s Durchmesser" + - #: ../src/wdgt-media-select.c:695 ../src/wdgt-media-select.c:709 ++#: ../src/wdgt-media-select.c:693 ../src/wdgt-media-select.c:707 +#, c-format +msgid "%.5g %s diameter" +msgstr "%.5g %s Durchmesser" + - #: ../src/wdgt-media-select.c:783 ++#: ../src/wdgt-media-select.c:781 +msgid "No recent templates found." +msgstr "Keine zuletzt benutzten Vorlagen gefunden." + - #: ../src/wdgt-media-select.c:784 ++#: ../src/wdgt-media-select.c:782 +msgid "Try selecting a template from the \"Search all templates\" page." +msgstr "" +"Bitte versuchen Sie, eine Vorlage in »Alle Vorlagen durchsuchen« auszuwählen." + - #: ../src/wdgt-media-select.c:863 ++#: ../src/wdgt-media-select.c:861 +msgid "No match." +msgstr "Keine Treffer." + - #: ../src/wdgt-media-select.c:864 ++#: ../src/wdgt-media-select.c:862 +msgid "Try selecting a different brand, page size or category." +msgstr "" +"Versuchen Sie eine andere Marke, Seitengröße oder Kategorie auszuwählen." + - #: ../src/wdgt-rotate-label.c:129 - msgid "Normal" - msgstr "Normal" ++#. This is the default custom color ++#: ../src/mygal/color-palette.c:389 ++msgid "custom" ++msgstr "benutzerdefiniert" ++ ++#. "Custom" color - we'll pop up a GtkColorButton ++#: ../src/mygal/color-palette.c:431 ++msgid "Custom Color:" ++msgstr "Benutzerdefinierte Farbe:" ++ ++#: ../src/mygal/color-palette.c:439 ++msgid "Choose Custom Color" ++msgstr "Benutzerdefinierte Farbe wählen" + - #: ../src/wdgt-rotate-label.c:130 - msgid "Rotated" - msgstr "Gedreht" ++#: ../src/mygal/color-palette.c:572 ++msgid "black" ++msgstr "Schwarz" ++ ++#: ../src/mygal/color-palette.c:573 ++msgid "light brown" ++msgstr "Helles Braun" ++ ++#: ../src/mygal/color-palette.c:574 ++msgid "brown gold" ++msgstr "goldbraun" ++ ++#: ../src/mygal/color-palette.c:575 ++msgid "dark green #2" ++msgstr "Dunkles Grün 2" ++ ++#: ../src/mygal/color-palette.c:576 ++msgid "navy" ++msgstr "marineblau" ++ ++#: ../src/mygal/color-palette.c:577 ../src/mygal/color-palette.c:633 ++msgid "dark blue" ++msgstr "Dunkles Blau" ++ ++#: ../src/mygal/color-palette.c:578 ++msgid "purple #2" ++msgstr "Purpur 2" ++ ++#: ../src/mygal/color-palette.c:579 ++msgid "very dark gray" ++msgstr "sehr dunkles grau" ++ ++#: ../src/mygal/color-palette.c:582 ../src/mygal/color-palette.c:638 ++msgid "dark red" ++msgstr "Dunkelrot" ++ ++#: ../src/mygal/color-palette.c:583 ++msgid "red-orange" ++msgstr "Rot-Orange" ++ ++#: ../src/mygal/color-palette.c:584 ++msgid "gold" ++msgstr "Gold" ++ ++#: ../src/mygal/color-palette.c:585 ++msgid "dark green" ++msgstr "Dunkles Grün" ++ ++#: ../src/mygal/color-palette.c:586 ../src/mygal/color-palette.c:639 ++msgid "dull blue" ++msgstr "" ++ ++#: ../src/mygal/color-palette.c:587 ../src/mygal/color-palette.c:640 ++msgid "blue" ++msgstr "Blau" ++ ++#: ../src/mygal/color-palette.c:588 ++msgid "dull purple" ++msgstr "" ++ ++#: ../src/mygal/color-palette.c:589 ++msgid "dark grey" ++msgstr "Dunkelgrau" ++ ++#: ../src/mygal/color-palette.c:592 ++msgid "red" ++msgstr "Rot" ++ ++#: ../src/mygal/color-palette.c:593 ++msgid "orange" ++msgstr "Orange" ++ ++#: ../src/mygal/color-palette.c:594 ++msgid "lime" ++msgstr "hellgrün" ++ ++#: ../src/mygal/color-palette.c:595 ++msgid "dull green" ++msgstr "Mittelgrün" ++ ++#: ../src/mygal/color-palette.c:596 ++msgid "dull blue #2" ++msgstr "Mittelblau 2" ++ ++#: ../src/mygal/color-palette.c:597 ++msgid "sky blue #2" ++msgstr "Himmelblau 2" ++ ++#: ../src/mygal/color-palette.c:598 ../src/mygal/color-palette.c:637 ++msgid "purple" ++msgstr "Purpur" ++ ++#: ../src/mygal/color-palette.c:599 ++msgid "gray" ++msgstr "grau" ++ ++#: ../src/mygal/color-palette.c:602 ../src/mygal/color-palette.c:634 ++msgid "magenta" ++msgstr "Magenta" ++ ++#: ../src/mygal/color-palette.c:603 ++msgid "bright orange" ++msgstr "Helles Orange" ++ ++#: ../src/mygal/color-palette.c:604 ../src/mygal/color-palette.c:635 ++msgid "yellow" ++msgstr "Gelb" ++ ++#: ../src/mygal/color-palette.c:605 ++msgid "green" ++msgstr "Grün" ++ ++#: ../src/mygal/color-palette.c:606 ../src/mygal/color-palette.c:636 ++msgid "cyan" ++msgstr "Cyan-Blau" ++ ++#: ../src/mygal/color-palette.c:607 ++msgid "bright blue" ++msgstr "hellblau" ++ ++#: ../src/mygal/color-palette.c:608 ../src/mygal/color-palette.c:625 ++msgid "red purple" ++msgstr "Purpurrot" ++ ++#: ../src/mygal/color-palette.c:609 ++msgid "light grey" ++msgstr "Helles Grau" ++ ++#: ../src/mygal/color-palette.c:612 ../src/mygal/color-palette.c:629 ++msgid "pink" ++msgstr "Pink" ++ ++#: ../src/mygal/color-palette.c:613 ++msgid "light orange" ++msgstr "Helles Orange" ++ ++#: ../src/mygal/color-palette.c:614 ../src/mygal/color-palette.c:626 ++msgid "light yellow" ++msgstr "Helles Gelb" ++ ++#: ../src/mygal/color-palette.c:615 ++msgid "light green" ++msgstr "Helles Grün" ++ ++#: ../src/mygal/color-palette.c:616 ++msgid "light cyan" ++msgstr "Helles Cyan-Blau" ++ ++#: ../src/mygal/color-palette.c:617 ../src/mygal/color-palette.c:627 ++msgid "light blue" ++msgstr "Hellblau" ++ ++#: ../src/mygal/color-palette.c:618 ../src/mygal/color-palette.c:631 ++msgid "light purple" ++msgstr "Helles Purpur" ++ ++#: ../src/mygal/color-palette.c:619 ++msgid "white" ++msgstr "Weiß" ++ ++#: ../src/mygal/color-palette.c:624 ++msgid "purplish blue" ++msgstr "purpurblau" ++ ++#: ../src/mygal/color-palette.c:628 ++msgid "dark purple" ++msgstr "dunkles Purpur" ++ ++#: ../src/mygal/color-palette.c:630 ++msgid "sky blue" ++msgstr "Himmelblau" + +#: ../src/critical-error-handler.c:73 +msgid "gLabels Fatal Error!" +msgstr "Schwerwiegender Fehler in gLabels!" + +#: ../src/warning-handler.c:73 +msgid "gLabels Error!" +msgstr "gLabels-Fehler!" + +#. Create and append an "Other" entry. +#: ../libglabels/db.c:118 +msgid "Other" +msgstr "Andere" + +#. Create and append a "User defined" entry. +#: ../libglabels/db.c:131 +msgid "User defined" +msgstr "Benutzerdefiniert" + +#: ../libglabels/db.c:482 +msgid "" +"Unable to locate paper size definitions. Libglabels may not be installed " +"correctly!" +msgstr "" +"Die Definitionen der Papiergrößen konnten nicht gefunden werden. Libglabels " +"ist möglicherweise nicht korrekt installiert!" + +#: ../libglabels/db.c:875 +msgid "" +"Unable to locate category definitions. Libglabels may not be installed " +"correctly!" +msgstr "" +"Es war nicht möglich, Kategorie-Definitionen zu finden. Libglabels könnte " +"möglicherweise nicht korrekt installiert sein!" + +#: ../libglabels/db.c:1461 +msgid "" +"Unable to locate any template files. Libglabels may not be installed " +"correctly!" +msgstr "" +"Es konnten keine Vorlagendateien gefunden werden. Möglicherweise ist " +"libglabels nicht korrekt installiert!" + +#: ../libglabels/db.c:1538 +#, c-format +msgid "Generic %s full page template" +msgstr "Allgemeine Ganzseitenvorlage %s" + +#: ../libglabels/xml-template.c:227 +msgid "Missing name or brand/part attributes." +msgstr "Name oder Attribute für Marke/Nummer fehlen." + +#. This should always be an id, but just in case a name +#. slips by! +#: ../libglabels/xml-template.c:244 +#, c-format +msgid "Unknown page size id \"%s\", trying as name" +msgstr "Unbekannte Kennung der Seitengröße »%s«, wird als Name versucht" + +#: ../libglabels/xml-template.c:256 +#, c-format +msgid "Unknown page size id or name \"%s\"" +msgstr "Unbekannte Kennung der Seitengröße oder Name »%s«" + +#: ../libglabels/xml-template.c:615 +msgid "" +"Missing required \"brand\" or \"part\" attribute, trying deprecated name." +msgstr "" +"Benötigte Attribute »brand« oder »part« fehlt, missbilligter Name wird " +"versucht. " + +#: ../libglabels/xml-template.c:625 +msgid "Name attribute also missing." +msgstr "Name des Attributs fehlt ebenfalls." + - #: ../data/builder/merge-properties-dialog.glade.h:1 ++#: ../data/glade/merge-properties-dialog.glade.h:1 +msgid "Record selection/preview" +msgstr "Feldauswahl/Vorschau" + - #: ../data/builder/merge-properties-dialog.glade.h:2 ++#: ../data/glade/merge-properties-dialog.glade.h:2 +msgid "Source" +msgstr "Quelle" + - #: ../data/builder/merge-properties-dialog.glade.h:3 ++#: ../data/glade/merge-properties-dialog.glade.h:3 +msgid "Format:" +msgstr "Format:" + - #: ../data/builder/merge-properties-dialog.glade.h:4 ++#: ../data/glade/merge-properties-dialog.glade.h:4 +msgid "Location:" +msgstr "Ort:" + - #: ../data/builder/merge-properties-dialog.glade.h:5 ++#: ../data/glade/merge-properties-dialog.glade.h:5 +msgid "Select all" +msgstr "Alles markieren" + - #: ../data/builder/merge-properties-dialog.glade.h:6 ++#: ../data/glade/merge-properties-dialog.glade.h:6 +msgid "Unselect all" +msgstr "Markierung aufheben" + - #: ../data/builder/merge-properties-dialog.glade.h:7 - #: ../data/builder/object-editor.glade.h:39 ++#: ../data/glade/merge-properties-dialog.glade.h:7 ++#: ../data/glade/object-editor.glade.h:39 +msgid "dialog1" +msgstr "dialog1" + - #: ../data/builder/new-label-dialog.glade.h:1 ++#: ../data/glade/new-label-dialog.glade.h:1 +msgid "Label orientation" +msgstr "Ausrichtung des Etiketts" + - #: ../data/builder/new-label-dialog.glade.h:2 ++#: ../data/glade/new-label-dialog.glade.h:2 +msgid "Media type" +msgstr "Medientyp" + - #: ../data/builder/object-editor.glade.h:2 ++#: ../data/glade/object-editor.glade.h:2 +#, no-c-format +msgid "%" +msgstr "%" + - #: ../data/builder/object-editor.glade.h:3 ++#: ../data/glade/object-editor.glade.h:3 +msgid "00000000000 00000" +msgstr "00000000000 00000" + - #: ../data/builder/object-editor.glade.h:4 ++#: ../data/glade/object-editor.glade.h:4 +msgid "Xxx object properties" +msgstr "Xxx-Objekteigenschaften" + - #: ../data/builder/object-editor.glade.h:5 - #: ../data/builder/prefs-dialog.glade.h:7 ++#: ../data/glade/object-editor.glade.h:5 ../data/glade/prefs-dialog.glade.h:7 +msgid "Alignment:" +msgstr "Ausrichtung:" + - #: ../data/builder/object-editor.glade.h:6 ++#: ../data/glade/object-editor.glade.h:6 +msgid "Allow merge to automatically shrink text" +msgstr "Automatisches Anpassen der Textgröße erlauben" + - #: ../data/builder/object-editor.glade.h:7 ++#: ../data/glade/object-editor.glade.h:7 +msgid "Angle:" +msgstr "Winkel:" + - #: ../data/builder/object-editor.glade.h:8 ++#: ../data/glade/object-editor.glade.h:8 +msgid "Checksum" +msgstr "Prüfsumme" + - #: ../data/builder/object-editor.glade.h:9 - #: ../data/builder/prefs-dialog.glade.h:8 ++#: ../data/glade/object-editor.glade.h:9 ../data/glade/prefs-dialog.glade.h:8 +msgid "Color:" +msgstr "Farbe:" + - #: ../data/builder/object-editor.glade.h:11 ++#: ../data/glade/object-editor.glade.h:11 +msgid "Enable shadow" +msgstr "Schattierung aktivieren" + - #: ../data/builder/object-editor.glade.h:12 ++#: ../data/glade/object-editor.glade.h:12 +msgid "Family:" +msgstr "Familie:" + - #: ../data/builder/object-editor.glade.h:13 ++#: ../data/glade/object-editor.glade.h:13 +msgid "File:" +msgstr "Datei:" + - #: ../data/builder/object-editor.glade.h:14 ++#: ../data/glade/object-editor.glade.h:14 +msgid "Fill" +msgstr "Füllen" + - #: ../data/builder/object-editor.glade.h:15 - #: ../data/builder/template-designer.glade.h:30 ++#: ../data/glade/object-editor.glade.h:15 ++#: ../data/glade/template-designer.glade.h:30 +msgid "Height:" +msgstr "Höhe" + - #: ../data/builder/object-editor.glade.h:17 ++#: ../data/glade/object-editor.glade.h:17 +msgid "Insert merge field" +msgstr "Datenfeld einfügen" + - #: ../data/builder/object-editor.glade.h:18 ++#: ../data/glade/object-editor.glade.h:18 +msgid "Key:" +msgstr "Schlüssel:" + - #: ../data/builder/object-editor.glade.h:19 ++#: ../data/glade/object-editor.glade.h:19 +msgid "Length:" +msgstr "Länge:" + - #: ../data/builder/object-editor.glade.h:21 - #: ../data/builder/prefs-dialog.glade.h:12 ++#: ../data/glade/object-editor.glade.h:21 ../data/glade/prefs-dialog.glade.h:12 +msgid "Line Spacing:" +msgstr "Zeilenabstand:" + - #: ../data/builder/object-editor.glade.h:22 ++#: ../data/glade/object-editor.glade.h:22 +msgid "Literal:" +msgstr "Literale:" + - #: ../data/builder/object-editor.glade.h:23 ++#: ../data/glade/object-editor.glade.h:23 +msgid "Opacity:" +msgstr "Transparenz:" + - #: ../data/builder/object-editor.glade.h:24 ++#: ../data/glade/object-editor.glade.h:24 +msgid "Position" +msgstr "Position" + - #: ../data/builder/object-editor.glade.h:25 ++#: ../data/glade/object-editor.glade.h:25 +msgid "Reset image size" +msgstr "Bildgröße zurücksetzen" + - #: ../data/builder/object-editor.glade.h:26 ++#: ../data/glade/object-editor.glade.h:26 +msgid "Select A File" +msgstr "Datei auswählen" + - #: ../data/builder/object-editor.glade.h:27 ++#: ../data/glade/object-editor.glade.h:27 +msgid "Shadow" +msgstr "Schattierung" + - #: ../data/builder/object-editor.glade.h:28 ++#: ../data/glade/object-editor.glade.h:28 +msgid "Size" +msgstr "Breite" + - #: ../data/builder/object-editor.glade.h:29 ++#: ../data/glade/object-editor.glade.h:29 +msgid "Size:" +msgstr "Größe:" + - #: ../data/builder/object-editor.glade.h:30 ++#: ../data/glade/object-editor.glade.h:30 +msgid "Style" +msgstr "Stil" + - #: ../data/builder/object-editor.glade.h:31 ++#: ../data/glade/object-editor.glade.h:31 +msgid "Style:" +msgstr "Stil:" + - #: ../data/builder/object-editor.glade.h:33 - #: ../data/builder/prefs-dialog.glade.h:20 - #: ../data/builder/template-designer.glade.h:61 ++#: ../data/glade/object-editor.glade.h:33 ../data/glade/prefs-dialog.glade.h:20 ++#: ../data/glade/template-designer.glade.h:61 +msgid "Width:" +msgstr "Breite:" + - #: ../data/builder/object-editor.glade.h:34 ++#: ../data/glade/object-editor.glade.h:34 +msgid "X Offset:" +msgstr "X-Versatz:" + - #: ../data/builder/object-editor.glade.h:35 ++#: ../data/glade/object-editor.glade.h:35 +msgid "X:" +msgstr "X:" + - #: ../data/builder/object-editor.glade.h:36 ++#: ../data/glade/object-editor.glade.h:36 +msgid "Y Offset:" +msgstr "Y-Versatz:" + - #: ../data/builder/object-editor.glade.h:37 ++#: ../data/glade/object-editor.glade.h:37 +msgid "Y:" +msgstr "Y:" + - #: ../data/builder/object-editor.glade.h:38 ++#: ../data/glade/object-editor.glade.h:38 +msgid "degrees" +msgstr "Grad" + - #: ../data/builder/object-editor.glade.h:40 ++#: ../data/glade/object-editor.glade.h:40 +msgid "digits:" +msgstr "Zeichen:" + - #: ../data/builder/object-editor.glade.h:41 ++#: ../data/glade/object-editor.glade.h:41 +msgid "format:" +msgstr "Format:" + - #: ../data/builder/prefs-dialog.glade.h:1 ++#: ../data/glade/prefs-dialog.glade.h:1 +msgid " " +msgstr " " + - #: ../data/builder/prefs-dialog.glade.h:2 ++#: ../data/glade/prefs-dialog.glade.h:2 +msgid "Default page size" +msgstr "Vorgegebene Seitengröße" + - #: ../data/builder/prefs-dialog.glade.h:3 ++#: ../data/glade/prefs-dialog.glade.h:3 +msgid "Fill" +msgstr "Füllung" + - #: ../data/builder/prefs-dialog.glade.h:4 ++#: ../data/glade/prefs-dialog.glade.h:4 +msgid "Line" +msgstr "Linie" + - #: ../data/builder/prefs-dialog.glade.h:5 ++#: ../data/glade/prefs-dialog.glade.h:5 +msgid "Text" +msgstr "Text" + - #: ../data/builder/prefs-dialog.glade.h:6 ++#: ../data/glade/prefs-dialog.glade.h:6 +msgid "Units" +msgstr "Einheiten" + - #: ../data/builder/prefs-dialog.glade.h:9 ++#: ../data/glade/prefs-dialog.glade.h:9 +msgid "Font:" +msgstr "Schrift:" + - #: ../data/builder/prefs-dialog.glade.h:10 ++#: ../data/glade/prefs-dialog.glade.h:10 +msgid "ISO A4" +msgstr "A4" + - #: ../data/builder/prefs-dialog.glade.h:11 ++#: ../data/glade/prefs-dialog.glade.h:11 +msgid "Inches" +msgstr "Zoll" + - #: ../data/builder/prefs-dialog.glade.h:13 ++#: ../data/glade/prefs-dialog.glade.h:13 +msgid "Locale" +msgstr "Spracheinstellung" + - #: ../data/builder/prefs-dialog.glade.h:14 ++#: ../data/glade/prefs-dialog.glade.h:14 +msgid "Millimeters" +msgstr "Millimeter" + - #: ../data/builder/prefs-dialog.glade.h:15 ++#: ../data/glade/prefs-dialog.glade.h:15 +msgid "Object defaults" +msgstr "Objekt-Vorgaben" + - #: ../data/builder/prefs-dialog.glade.h:16 ++#: ../data/glade/prefs-dialog.glade.h:16 +msgid "Points" +msgstr "Punkte" + - #: ../data/builder/prefs-dialog.glade.h:17 ++#: ../data/glade/prefs-dialog.glade.h:17 +msgid "Select default properties for new objects." +msgstr "Wählen Sie die vorgegebenen Eigenschaften für neue Objekte." + - #: ../data/builder/prefs-dialog.glade.h:18 ++#: ../data/glade/prefs-dialog.glade.h:18 +msgid "Select locale specific behavior." +msgstr "Wählen Sie hier Einstellungen gemäß Ihrer Sprache/Ihres Landes." + +#. Most popular (at top of list) - #: ../data/builder/prefs-dialog.glade.h:19 - #: ../data/templates/paper-sizes.xml.h:29 ++#: ../data/glade/prefs-dialog.glade.h:19 ../data/templates/paper-sizes.xml.h:29 +msgid "US Letter" +msgstr "US-Letter" + - #: ../data/builder/print-custom-widget.glade.h:1 ++#: ../data/glade/print-custom-widget.glade.h:1 +msgid "Options" +msgstr "Optionen" + - #: ../data/builder/print-custom-widget.glade.h:2 ++#: ../data/glade/print-custom-widget.glade.h:2 +msgid "Print control (Merge)" +msgstr "Drucksteuerung (Mischen)" + - #: ../data/builder/print-custom-widget.glade.h:3 ++#: ../data/glade/print-custom-widget.glade.h:3 +msgid "Print control (Simple)" +msgstr "Drucksteuerung (Einfach)" + - #: ../data/builder/property-bar.glade.h:1 ++#: ../data/glade/property-bar.glade.h:1 +msgid "Bold" +msgstr "Fett" + - #: ../data/builder/property-bar.glade.h:2 ++#: ../data/glade/property-bar.glade.h:2 +msgid "Center align" +msgstr "Zentrieren" + - #: ../data/builder/property-bar.glade.h:4 ++#: ../data/glade/property-bar.glade.h:4 +msgid "Font family" +msgstr "Schriftfamilie" + - #: ../data/builder/property-bar.glade.h:5 ++#: ../data/glade/property-bar.glade.h:5 +msgid "Font size" +msgstr "Schriftgröße" + - #: ../data/builder/property-bar.glade.h:6 ++#: ../data/glade/property-bar.glade.h:6 +msgid "Italic" +msgstr "Kursiv" + - #: ../data/builder/property-bar.glade.h:7 ++#: ../data/glade/property-bar.glade.h:7 +msgid "Left align" +msgstr "Linksbündig" + - #: ../data/builder/property-bar.glade.h:9 ++#: ../data/glade/property-bar.glade.h:9 +msgid "Line width" +msgstr "Linienbreite" + - #: ../data/builder/property-bar.glade.h:10 ++#: ../data/glade/property-bar.glade.h:10 +msgid "Right align" +msgstr "Rechtsbündig" + - #: ../data/builder/property-bar.glade.h:11 ++#: ../data/glade/property-bar.glade.h:11 +msgid "Text Color" +msgstr "Textfarbe" + - #: ../data/builder/template-designer.glade.h:1 ++#: ../data/glade/property-bar.glade.h:12 ++msgid "Text color" ++msgstr "Textfarbe" ++ ++#: ../data/glade/template-designer.glade.h:1 +msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)" +msgstr "(z.B. »Adressaufkleber«, »Visitenkarten« …)" + - #: ../data/builder/template-designer.glade.h:2 ++#: ../data/glade/template-designer.glade.h:2 +msgid "(e.g., 8163A)" +msgstr "(z.B., 8163A)" + - #: ../data/builder/template-designer.glade.h:3 ++#: ../data/glade/template-designer.glade.h:3 +msgid "(e.g., Avery, Acme, ...)" +msgstr "(z.B., Avery, Acme, ...)" + - #: ../data/builder/template-designer.glade.h:4 ++#: ../data/glade/template-designer.glade.h:4 +msgid "1. Outer radius:" +msgstr "1. Äußerer Radius:" + - #: ../data/builder/template-designer.glade.h:5 ++#: ../data/glade/template-designer.glade.h:5 +msgid "1. Radius:" +msgstr "1. Radius:" + - #: ../data/builder/template-designer.glade.h:6 ++#: ../data/glade/template-designer.glade.h:6 +msgid "1. Width:" +msgstr "1. Breite:" + - #: ../data/builder/template-designer.glade.h:7 ++#: ../data/glade/template-designer.glade.h:7 +msgid "2. Height:" +msgstr "2. Höhe:" + - #: ../data/builder/template-designer.glade.h:8 ++#: ../data/glade/template-designer.glade.h:8 +msgid "2. Inner radius:" +msgstr "2. Innerer Radius:" + - #: ../data/builder/template-designer.glade.h:9 ++#: ../data/glade/template-designer.glade.h:9 +msgid "2. Waste (overprint allowed):" +msgstr "2. Überstand (Bedrucken erlaubt):" + - #: ../data/builder/template-designer.glade.h:10 ++#: ../data/glade/template-designer.glade.h:10 +msgid "3. Clipping width:" +msgstr "3. Innere Breite:" + - #: ../data/builder/template-designer.glade.h:11 ++#: ../data/glade/template-designer.glade.h:11 +msgid "3. Margin" +msgstr "3. Ränder" + - #: ../data/builder/template-designer.glade.h:12 ++#: ../data/glade/template-designer.glade.h:12 +msgid "3. Round (radius of corner):" +msgstr "3. Rundung (Radius der Ecken):" + - #: ../data/builder/template-designer.glade.h:13 ++#: ../data/glade/template-designer.glade.h:13 +msgid "4. Clipping height:" +msgstr "4. Innere Höhe:" + - #: ../data/builder/template-designer.glade.h:14 ++#: ../data/glade/template-designer.glade.h:14 +msgid "4. Horiz. waste (overprint allowed):" +msgstr "4. Horiz. Überstand (Bedrucken erlaubt):" + - #: ../data/builder/template-designer.glade.h:15 ++#: ../data/glade/template-designer.glade.h:15 +msgid "5. Vert. waste (overprint allowed):" +msgstr "3. Vert. Überstand (Bedrucken erlaubt):" + - #: ../data/builder/template-designer.glade.h:16 ++#: ../data/glade/template-designer.glade.h:16 +msgid "5. Waste (overprint allowed):" +msgstr "5. Überstand (Bedrucken erlaubt):" + - #: ../data/builder/template-designer.glade.h:17 ++#: ../data/glade/template-designer.glade.h:17 +msgid "6. Margin" +msgstr "6. Rand" + - #: ../data/builder/template-designer.glade.h:18 ++#: ../data/glade/template-designer.glade.h:18 +msgid "Brand/Manufacturer:" +msgstr "Marke/Hersteller:" + - #: ../data/builder/template-designer.glade.h:19 ++#: ../data/glade/template-designer.glade.h:19 +msgid "CD/DVD (including credit card CDs)" +msgstr "CD/DVD (einschließlich Kreditkarten-CDs)" + - #: ../data/builder/template-designer.glade.h:20 ++#: ../data/glade/template-designer.glade.h:20 +msgid "" +"Congratulations!\n" +"\n" +"You have completed the gLabels Template Designer.\n" +"If you wish to accept and save your design, click \"Apply.\"\n" +"\n" +"Otherwise, you may click \"Cancel\" to abandon your design\n" +"or \"Back\" to continue editing this design." +msgstr "" +"Herzlichen Glückwunsch!\n" +"\n" +"Das Erzeugen der Vorlage ist abgeschlossen.\n" +"Falls Sie diese Vorlage akzeptieren und speichern wollen,\n" +"klicken Sie auf »Akzeptieren«.\n" +"\n" +"Anderenfalls klicken Sie auf »Abbrechen«, um die\n" +"Vorlage zu verwerfen, oder auf »Zurück«,\n" +"um die Vorlage erneut zu bearbeiten." + - #: ../data/builder/template-designer.glade.h:27 ++#: ../data/glade/template-designer.glade.h:27 +msgid "Description:" +msgstr "Beschreibung:" + - #: ../data/builder/template-designer.glade.h:28 ++#: ../data/glade/template-designer.glade.h:28 +msgid "Distance from left edge (x0):" +msgstr "Abstand vom linken Rand (x0):" + - #: ../data/builder/template-designer.glade.h:29 ++#: ../data/glade/template-designer.glade.h:29 +msgid "Distance from top edge (y0):" +msgstr "Abstand vom oberen Rand (x0):" + - #: ../data/builder/template-designer.glade.h:31 ++#: ../data/glade/template-designer.glade.h:31 +msgid "Horizontal pitch (dx):" +msgstr "Horizontaler Abstand (dx):" + - #: ../data/builder/template-designer.glade.h:32 ++#: ../data/glade/template-designer.glade.h:32 +msgid "" +"How many layouts will your template contain? \n" +"\n" +"A layout is a set of labels or cards that can be arranged in a simple grid.\n" +"Most templates only need one layout, as in the first example.\n" +"The second example illustrates when two layouts are needed." +msgstr "" +"Wie viele Layouts wird Ihre Vorlage enthalten?\n" +"\n" +"Ein Layout ist ein Satz von Etiketten oder Karten, die in einem einfachen " +"Raster\n" +"angeordnet sind. Die meisten Vorlagen verwenden nur ein Layout, wie im\n" +"ersten Beispiel. Das zweite Beispiel zeigt die Verwendung zweier Layouts." + - #: ../data/builder/template-designer.glade.h:37 ++#: ../data/glade/template-designer.glade.h:37 +msgid "Layout #1" +msgstr "Layout #1" + - #: ../data/builder/template-designer.glade.h:38 ++#: ../data/glade/template-designer.glade.h:38 +msgid "Layout #2" +msgstr "Layout #2" + - #: ../data/builder/template-designer.glade.h:39 ++#: ../data/glade/template-designer.glade.h:39 +msgid "Number across (nx):" +msgstr "Anzahl horizontal (nx):" + - #: ../data/builder/template-designer.glade.h:40 ++#: ../data/glade/template-designer.glade.h:40 +msgid "Number down (ny):" +msgstr "Anzahl vertikal (ny):" + - #: ../data/builder/template-designer.glade.h:41 ++#: ../data/glade/template-designer.glade.h:41 +msgid "Number of layouts:" +msgstr "Anzahl der Layouts:" + - #: ../data/builder/template-designer.glade.h:42 - #: ../data/builder/wdgt-media-select.glade.h:3 ++#: ../data/glade/template-designer.glade.h:42 ++#: ../data/glade/wdgt-media-select.glade.h:3 +msgid "Page size:" +msgstr "Seitenformat:" + - #: ../data/builder/template-designer.glade.h:43 ++#: ../data/glade/template-designer.glade.h:43 +msgid "Part #:" +msgstr "Nummer:" + - #: ../data/builder/template-designer.glade.h:44 ++#: ../data/glade/template-designer.glade.h:44 +msgid "" +"Please enter the following identifying information about the template " +"stationery." +msgstr "" +"Bitte geben Sie die folgenden Identifizierungsinformationen über die Vorlage " +"an." + - #: ../data/builder/template-designer.glade.h:45 ++#: ../data/glade/template-designer.glade.h:45 +msgid "Please enter the following layout information." +msgstr "Bitte geben Sie die folgenden Layout-Informationen ein." + - #: ../data/builder/template-designer.glade.h:46 ++#: ../data/glade/template-designer.glade.h:46 +msgid "" +"Please enter the following size parameters of a single label in your template." +msgstr "" +"Bitte geben Sie die folgenden Größenwerte des einzelnen Etiketts in Ihrer " +"Vorlage an." + - #: ../data/builder/template-designer.glade.h:47 ++#: ../data/glade/template-designer.glade.h:47 +msgid "" +"Please enter the following size parameters of a single label or card in your " +"template." +msgstr "" +"Bitte geben Sie die folgenden Größenwerte des einzelnen Etiketts oder der " +"einzelnen Karte in Ihrer Vorlage an." + - #: ../data/builder/template-designer.glade.h:48 ++#: ../data/glade/template-designer.glade.h:48 +msgid "Please select the basic shape of the labels or cards." +msgstr "Bitte wählen Sie die Grundform der Etiketten oder Karten aus." + - #: ../data/builder/template-designer.glade.h:49 ++#: ../data/glade/template-designer.glade.h:49 +msgid "Please select the page size of the template stationery." +msgstr "Bitte wählen Si das Papierformat der Vorlage aus." + - #: ../data/builder/template-designer.glade.h:50 ++#: ../data/glade/template-designer.glade.h:50 +msgid "Print test sheet" +msgstr "Textseite drucken" + - #: ../data/builder/template-designer.glade.h:51 ++#: ../data/glade/template-designer.glade.h:51 +msgid "Rectangular or square (can have rounded corners)" +msgstr "Rechteckig oder quadratisch (auch mit abgerundeten Ecken)" + - #: ../data/builder/template-designer.glade.h:52 ++#: ../data/glade/template-designer.glade.h:52 +msgid "Round" +msgstr "Rund" + - #: ../data/builder/template-designer.glade.h:53 ++#: ../data/glade/template-designer.glade.h:53 +msgid "" +"Templates needing\n" +"two layouts." +msgstr "" +"Vorlagen benötigen\n" +"zwei Layouts." + - #: ../data/builder/template-designer.glade.h:55 ++#: ../data/glade/template-designer.glade.h:55 +msgid "" +"Templates needing only\n" +"one layout." +msgstr "" +"Vorlagen benötigen nur\n" +"ein Layout." + - #: ../data/builder/template-designer.glade.h:57 ++#: ../data/glade/template-designer.glade.h:57 +msgid "Vertical pitch (dy):" +msgstr "Vertikaler Abstand (dy):" + - #: ../data/builder/template-designer.glade.h:58 ++#: ../data/glade/template-designer.glade.h:58 +msgid "" +"Welcome to the gLabels Template Designer.\n" +"\n" +"This dialog will assist you in the creation of a custom gLabels template." +msgstr "" +"Willkommen zum gLabels Vorlagen-Designer.\n" +"\n" +"Dieser Dialog wird Sie beim Erstellen einer benutzerdefinierten\n" +"gLabels-Vorlage unterstützen." + - #: ../data/builder/template-designer.glade.h:62 ++#: ../data/glade/template-designer.glade.h:62 +msgid "cd_size_page" +msgstr "cd_size_page" + - #: ../data/builder/template-designer.glade.h:63 ++#: ../data/glade/template-designer.glade.h:63 +msgid "finish_page" +msgstr "finish_page" + - #: ../data/builder/template-designer.glade.h:65 ++#: ../data/glade/template-designer.glade.h:65 +msgid "layout_page" +msgstr "layout_page" + - #: ../data/builder/template-designer.glade.h:66 ++#: ../data/glade/template-designer.glade.h:66 +msgid "name_page" +msgstr "name_page" + - #: ../data/builder/template-designer.glade.h:67 ++#: ../data/glade/template-designer.glade.h:67 +msgid "nlayouts_page" +msgstr "nlayouts_page" + - #: ../data/builder/template-designer.glade.h:68 ++#: ../data/glade/template-designer.glade.h:68 +msgid "pg_size_page" +msgstr "pg_size_page" + - #: ../data/builder/template-designer.glade.h:69 ++#: ../data/glade/template-designer.glade.h:69 +msgid "rect_size_page" +msgstr "rect_size_page" + - #: ../data/builder/template-designer.glade.h:70 ++#: ../data/glade/template-designer.glade.h:70 +msgid "round_size_page" +msgstr "round_size_page" + - #: ../data/builder/template-designer.glade.h:71 ++#: ../data/glade/template-designer.glade.h:71 +msgid "shape_page" +msgstr "shape_page" + - #: ../data/builder/template-designer.glade.h:72 ++#: ../data/glade/template-designer.glade.h:72 +msgid "start_page" +msgstr "start_page" + - #: ../data/builder/wdgt-media-select.glade.h:1 ++#: ../data/glade/wdgt-media-select.glade.h:1 +msgid "Brand:" +msgstr "Marke:" + - #: ../data/builder/wdgt-media-select.glade.h:2 ++#: ../data/glade/wdgt-media-select.glade.h:2 +msgid "Category:" +msgstr "Kategorie:" + - #: ../data/builder/wdgt-media-select.glade.h:4 ++#: ../data/glade/wdgt-media-select.glade.h:4 +msgid "Recent templates" +msgstr "Zuletzt benutzte Vorlagen" + - #: ../data/builder/wdgt-media-select.glade.h:5 ++#: ../data/glade/wdgt-media-select.glade.h:5 +msgid "Search all templates" +msgstr "Alle Vorlagen durchsuchen" + ++#: ../data/glade/wdgt-rotate-label.glade.h:1 ++msgid "Rotate" ++msgstr "Drehen" ++ +#. Other ISO A series sizes +#: ../data/templates/paper-sizes.xml.h:2 +msgid "A0" +msgstr "A0" + +#: ../data/templates/paper-sizes.xml.h:3 +msgid "A1" +msgstr "A1" + +#: ../data/templates/paper-sizes.xml.h:4 +msgid "A10" +msgstr "A10" + +#: ../data/templates/paper-sizes.xml.h:5 +msgid "A2" +msgstr "A2" + +#: ../data/templates/paper-sizes.xml.h:6 +msgid "A3" +msgstr "A3" + +#: ../data/templates/paper-sizes.xml.h:7 +msgid "A4" +msgstr "A4" + +#: ../data/templates/paper-sizes.xml.h:8 +msgid "A5" +msgstr "A5" + +#: ../data/templates/paper-sizes.xml.h:9 +msgid "A6" +msgstr "A6" + +#: ../data/templates/paper-sizes.xml.h:10 +msgid "A7" +msgstr "A7" + +#: ../data/templates/paper-sizes.xml.h:11 +msgid "A8" +msgstr "A8" + +#: ../data/templates/paper-sizes.xml.h:12 +msgid "A9" +msgstr "A9" + +#. ISO B series sizes +#: ../data/templates/paper-sizes.xml.h:14 +msgid "B0" +msgstr "B0" + +#: ../data/templates/paper-sizes.xml.h:15 +msgid "B1" +msgstr "B1" + +#: ../data/templates/paper-sizes.xml.h:16 +msgid "B10" +msgstr "B10" + +#: ../data/templates/paper-sizes.xml.h:17 +msgid "B2" +msgstr "B2" + +#: ../data/templates/paper-sizes.xml.h:18 +msgid "B3" +msgstr "B3" + +#: ../data/templates/paper-sizes.xml.h:19 +msgid "B4" +msgstr "B4" + +#: ../data/templates/paper-sizes.xml.h:20 +msgid "B5" +msgstr "B5" + +#: ../data/templates/paper-sizes.xml.h:21 +msgid "B6" +msgstr "B6" + +#: ../data/templates/paper-sizes.xml.h:22 +msgid "B7" +msgstr "B7" + +#: ../data/templates/paper-sizes.xml.h:23 +msgid "B8" +msgstr "B8" + +#: ../data/templates/paper-sizes.xml.h:24 +msgid "B9" +msgstr "B9" + +#: ../data/templates/paper-sizes.xml.h:25 +msgid "US Executive" +msgstr "US Executive" + +#. Other US paper sizes +#: ../data/templates/paper-sizes.xml.h:27 +msgid "US Legal" +msgstr "US Legal" + +#: ../data/templates/categories.xml.h:1 +msgid "Any card" +msgstr "Beliebige Karte" + +#: ../data/templates/categories.xml.h:2 +msgid "Any label" +msgstr "All Etiketten" + +#: ../data/templates/categories.xml.h:3 +msgid "Business cards" +msgstr "Visitenkarten" + +#: ../data/templates/categories.xml.h:4 +msgid "CD/DVD or other media" +msgstr "CD/DVD oder andere Medien" + +#: ../data/templates/categories.xml.h:5 +msgid "Mailing/shipping products" +msgstr "Post- und Versandprodukte" + +#: ../data/templates/categories.xml.h:6 +msgid "Rectangular labels" +msgstr "Rechteckige Etiketten" + +#: ../data/templates/categories.xml.h:7 +msgid "Round labels" +msgstr "Runde Etiketten" + +#: ../data/templates/categories.xml.h:8 +msgid "Square labels" +msgstr "Quadratische Etiketten" + +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:2 +#: ../data/templates/avery-iso-templates.xml.h:2 ++#: ../data/templates/avery-us-templates.xml.h:2 +#: ../data/templates/dymo-other-templates.xml.h:4 +#: ../data/templates/misc-iso-templates.xml.h:2 +#: ../data/templates/zweckform-iso-templates.xml.h:2 +msgid "Address Labels" +msgstr "Adressaufkleber" + +#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:4 ++msgid "Address labels" ++msgstr "Adressaufkleber" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:6 ++msgid "Allround labels" ++msgstr "Universal-Etiketten" ++ +#. ============================================================ +#. =================================================================== +#. ******************************************************************** +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:4 +#: ../data/templates/avery-iso-templates.xml.h:8 - #: ../data/templates/misc-us-templates.xml.h:4 ++#: ../data/templates/avery-us-templates.xml.h:4 +#: ../data/templates/misc-iso-templates.xml.h:12 ++#: ../data/templates/misc-us-templates.xml.h:4 +#: ../data/templates/zweckform-iso-templates.xml.h:6 +msgid "Business Cards" +msgstr "Visitenkarten" + - #. =================================================================== ++#. =============================================================== ++#: ../data/templates/avery-iso-templates.xml.h:10 ++msgid "CD Booklet" ++msgstr "CD-Einlegeheft" ++ ++#. =============================================================== ++#: ../data/templates/avery-iso-templates.xml.h:12 ++msgid "CD Inlet" ++msgstr "CD-Einleger" ++ +#. =============================================================== +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:6 +#: ../data/templates/avery-iso-templates.xml.h:14 - #: ../data/templates/misc-us-templates.xml.h:8 ++#: ../data/templates/avery-us-templates.xml.h:6 +#: ../data/templates/misc-iso-templates.xml.h:16 ++#: ../data/templates/misc-us-templates.xml.h:8 +#: ../data/templates/zweckform-iso-templates.xml.h:8 +msgid "CD/DVD Labels" +msgstr "CD/DVD-Etiketten" + ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:16 ++#: ../data/templates/avery-us-templates.xml.h:12 ++msgid "Diskette Labels" ++msgstr "Diskettenaufkleber" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:18 ++msgid "Diskette labels" ++msgstr "Diskettenaufkleber" ++ ++#. =============================================================== ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:20 ++#: ../data/templates/misc-iso-templates.xml.h:36 ++#: ../data/templates/misc-us-templates.xml.h:18 ++#: ../data/templates/zweckform-iso-templates.xml.h:16 ++msgid "Mailing Labels" ++msgstr "Adressaufkleber" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:22 ++msgid "Mailing labels" ++msgstr "Adressaufkleber" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:24 ++msgid "Mini Address Labels" ++msgstr "Mini-Adressaufkleber" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:26 ++msgid "Mini Labels" ++msgstr "Mini-Etiketten" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:28 ++msgid "Shipping labels" ++msgstr "Versandaufkleber" ++ ++#. =================================================================== ++#: ../data/templates/avery-other-templates.xml.h:2 ++msgid "File Folder Labels" ++msgstr "Aktenordner-Etiketten" ++ +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:8 +msgid "CD/DVD Labels (Disc Labels)" +msgstr "CD/DVD-Etiketten (Medienaufkleber)" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:10 +msgid "CD/DVD Labels (Spine Labels)" +msgstr "CD/DVD-Etiketten (Spine Labels)" + - #. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:12 - #: ../data/templates/avery-iso-templates.xml.h:16 - msgid "Diskette Labels" - msgstr "Diskettenaufkleber" - +#. the LSK labels can be torn in half down the center +#: ../data/templates/avery-us-templates.xml.h:14 +msgid "Divider Labels" +msgstr "Etiketten für Trennblätter" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:16 +msgid "Filing Labels" +msgstr "Ordneretiketten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:18 +msgid "Full Sheet Labels" +msgstr "Ganzseitige Etiketten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:20 +msgid "ID Labels" +msgstr "Etiketten für Archivierungsordner" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:22 +msgid "Index Cards" +msgstr "Indexkarten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:24 +msgid "Large Round Labels" +msgstr "Große runde Etiketten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:26 +msgid "Name Badge Labels" +msgstr "Namensschid-Etiketten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:28 +msgid "Post cards" +msgstr "Postkarten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:30 +#: ../data/templates/dymo-other-templates.xml.h:12 +msgid "Return Address Labels" +msgstr "Rückantwort-Adressaufkleber" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:32 ++#: ../data/templates/misc-us-templates.xml.h:28 +msgid "Round Labels" +msgstr "Runde Etiketten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:34 +msgid "Shipping Labels" +msgstr "Versandetiketten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:36 +msgid "Small Round Labels" +msgstr "Kleine runde Etiketten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:38 +msgid "Square Labels" +msgstr "Quadratische Etiketten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:40 +msgid "Tent Cards" +msgstr "Klappkarten" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:42 +msgid "Video Tape Face Labels" +msgstr "Etiketten für Videokassetten (Vorderseite)" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:44 +msgid "Video Tape Spine Labels" +msgstr "Etiketten für Videokassetten (Rückseite)" + - #. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:4 - msgid "Address labels" - msgstr "Adressaufkleber" - - #. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:6 - msgid "Allround labels" - msgstr "Universal-Etiketten" - - #. =============================================================== - #: ../data/templates/avery-iso-templates.xml.h:10 - msgid "CD Booklet" - msgstr "CD-Einlegeheft" - - #. =============================================================== - #: ../data/templates/avery-iso-templates.xml.h:12 - msgid "CD Inlet" - msgstr "CD-Einleger" - - #. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:18 - msgid "Diskette labels" - msgstr "Diskettenaufkleber" - - #. =============================================================== - #. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:20 - #: ../data/templates/misc-us-templates.xml.h:18 - #: ../data/templates/misc-iso-templates.xml.h:36 - #: ../data/templates/zweckform-iso-templates.xml.h:16 - msgid "Mailing Labels" - msgstr "Adressaufkleber" - - #. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:22 - msgid "Mailing labels" - msgstr "Adressaufkleber" - - #. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:24 - msgid "Mini Address Labels" - msgstr "Mini-Adressaufkleber" - - #. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:26 - msgid "Shipping labels" - msgstr "Versandaufkleber" - - #. =================================================================== - #: ../data/templates/avery-other-templates.xml.h:2 - msgid "File Folder Labels" - msgstr "Aktenordner-Etiketten" - +#: ../data/templates/brother-other-templates.xml.h:1 +msgid "Multi Purpose Labels 17mm x 54mm" +msgstr "Mehrzwecketiketten 17mm x 54mm" + +#: ../data/templates/brother-other-templates.xml.h:2 +msgid "Shipping Labels 62mm x 100mm" +msgstr "Versandetiketten 62mm x 100mm" + +#. +#. ********************************************************************* +#. ********************************************************************* +#. Labels for the Brother QL-500/550/650 PC Label Printers +#. +#. These templates work with the Brother Linux Printer CUPS Driver. It +#. is unknown if these work correctly with the foomatic print driver for +#. these printers. +#. +#. One difference from typical templates is that the template size is +#. not the actual media size - it is the size of the printable area, +#. which is smaller than the media size. This is because (at least with +#. the Brother driver) coordinates are relative the corner of this area. +#. +#. ********************************************************************* +#. ********************************************************************* +#. +#: ../data/templates/brother-other-templates.xml.h:20 +msgid "Standard Address Labels 29mm x 90mm" +msgstr "Standard-Adressaufkleber 29mm x 90mm" + +#. =================================================================== +#: ../data/templates/dymo-other-templates.xml.h:2 +msgid "3.5in Diskette" +msgstr "3.5-Zoll- Diskette" + +#. =================================================================== +#: ../data/templates/dymo-other-templates.xml.h:6 +msgid "File Folder" +msgstr "Aktenordner" + +#. =================================================================== +#: ../data/templates/dymo-other-templates.xml.h:8 +msgid "Hanging Folder" +msgstr "Hängemappe" + +#. =================================================================== +#: ../data/templates/dymo-other-templates.xml.h:10 +msgid "Large Address Labels" +msgstr "Große Adressaufkleber" + +#. =================================================================== +#: ../data/templates/dymo-other-templates.xml.h:14 +msgid "Shipping Address Labels" +msgstr "Versand-Adressaufkleber" + - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:2 - msgid "Business Card CD" - msgstr "Visitenkarten-CD" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:6 - msgid "CD Template Rectangles" - msgstr "CD-Vorlagen (rechteckig)" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:10 - msgid "CD/DVD Labels (Face Only)" - msgstr "CD/DVD-Etiketten (nur Vorderseite)" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:12 - #: ../data/templates/misc-iso-templates.xml.h:18 - msgid "CD/DVD Labels (face only)" - msgstr "CD/DVD-Etiketten (nur Vorderseite)" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:14 - msgid "Cassette Labels" - msgstr "Kassettenaufkleber" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:16 - msgid "DLT Labels" - msgstr "DLT-Etiketten" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:20 - msgid "Microtube labels" - msgstr "Microtube-Etiketten" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:22 - msgid "Mini-CD Labels" - msgstr "Mini-CD-Etiketten" - - #: ../data/templates/misc-us-templates.xml.h:23 - msgid "PRO CD Labels 2-up (CD spine only)" - msgstr "PRO-CD-Etiketten 2-up (nur CD-Spine)" - - #: ../data/templates/misc-us-templates.xml.h:24 - msgid "PRO CD Labels 2-up (Face only)" - msgstr "PRO-CD-Etiketten 2-up (nur Vorderseite)" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:26 - #: ../data/templates/misc-iso-templates.xml.h:42 - msgid "PRO CD Labels 2-up (face only)" - msgstr "PRO-CD-Etiketten 2-up (nur Vorderseite)" - - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:28 - msgid "Slimline CD Case (rightside up)" - msgstr "Slimline CD Case (normal)" - - #: ../data/templates/misc-us-templates.xml.h:29 - msgid "Slimline CD Case (upside down)" - msgstr "Slimline CD Case (umgekehrt)" - +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:4 +#: ../data/templates/zweckform-iso-templates.xml.h:4 +msgid "Allround Labels" +msgstr "Universal-Etiketten" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:6 +msgid "Arch File Labels" +msgstr "Etiketten für Archivierungsordner" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:8 +msgid "Arch File Labels (large)" +msgstr "Etiketten für Archivierungsordner (groß)" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:10 +msgid "Arch File Labels (small)" +msgstr "Etiketten für Archivierungsordner (klein)" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:14 +msgid "CD Labels" +msgstr "CD-Aufkleber" + ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:18 ++#: ../data/templates/misc-us-templates.xml.h:12 ++msgid "CD/DVD Labels (face only)" ++msgstr "CD/DVD-Etiketten (nur Vorderseite)" ++ +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:20 +msgid "CD/DVD Labels Standard Format (face only)" +msgstr "CD/DVD-Etiketten im Standardformat (nur Vorderseite)" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:22 +msgid "Diskette Labels (face only)" +msgstr "Diskettenaufkleber (nur Vorderseite)" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:24 +msgid "EPSON Photo Stickers 16" +msgstr "EPSON Photo Stickers 16" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:26 +msgid "Etiketten" +msgstr "Etiketten" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:28 +msgid "Fridge Magnet Stickers" +msgstr "Aufkleber für Kühlschrankmagnete" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:30 +msgid "General Labels" +msgstr "Allgemeine Etiketten" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:32 +msgid "Inkjet/Laser Labels 70x37mm" +msgstr "Inkjet/Laseretiketten 70x37mm" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:38 +msgid "Mailing Labels-2 columns" +msgstr "Adressaufkleber 2-spaltig" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:40 +msgid "Mailing Labels-3 columns" +msgstr "Adressaufkleber 3-spaltig" + ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:42 ++#: ../data/templates/misc-us-templates.xml.h:26 ++msgid "PRO CD Labels 2-up (face only)" ++msgstr "PRO-CD-Etiketten 2-up (nur Vorderseite)" ++ +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:44 +#: ../data/templates/zweckform-iso-templates.xml.h:24 +msgid "Rectangular Labels" +msgstr "Rechteckige Etiketten" + +#. =================================================================== +#: ../data/templates/misc-iso-templates.xml.h:46 +msgid "Video Labels (face only)" +msgstr "Video-Etiketten (nur Vorderseite)" + +#. =================================================================== +#: ../data/templates/misc-other-templates.xml.h:2 +msgid "Multi-Purpose Labels" +msgstr "Mehrzweck-Etiketten" + ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:2 ++msgid "Business Card CD" ++msgstr "Visitenkarten-CD" ++ ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:6 ++msgid "CD Template Rectangles" ++msgstr "CD-Vorlagen (rechteckig)" ++ ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:10 ++msgid "CD/DVD Labels (Face Only)" ++msgstr "CD/DVD-Etiketten (nur Vorderseite)" ++ ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:14 ++msgid "Cassette Labels" ++msgstr "Kassettenaufkleber" ++ ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:16 ++msgid "DLT Labels" ++msgstr "DLT-Etiketten" ++ ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:20 ++msgid "Microtube labels" ++msgstr "Microtube-Etiketten" ++ ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:22 ++msgid "Mini-CD Labels" ++msgstr "Mini-CD-Etiketten" ++ ++#: ../data/templates/misc-us-templates.xml.h:23 ++msgid "PRO CD Labels 2-up (CD spine only)" ++msgstr "PRO-CD-Etiketten 2-up (nur CD-Spine)" ++ ++#: ../data/templates/misc-us-templates.xml.h:24 ++msgid "PRO CD Labels 2-up (Face only)" ++msgstr "PRO-CD-Etiketten 2-up (nur Vorderseite)" ++ ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:30 ++msgid "Slimline CD Case (rightside up)" ++msgstr "Slimline CD Case (normal)" ++ ++#: ../data/templates/misc-us-templates.xml.h:31 ++msgid "Slimline CD Case (upside down)" ++msgstr "Slimline CD Case (umgekehrt)" ++ +#. =================================================================== +#: ../data/templates/zweckform-iso-templates.xml.h:10 +msgid "Correction and Cover-up Labels" +msgstr "Korrektur- und Abdeckaufkleber" + +#. =================================================================== +#: ../data/templates/zweckform-iso-templates.xml.h:12 +msgid "File Back Labels" +msgstr "Ordnerrücken" + +#. =================================================================== +#: ../data/templates/zweckform-iso-templates.xml.h:14 +msgid "Lever Arch File Labels" +msgstr "Lever Etiketten für Archivierungsordner" + +#. =================================================================== +#: ../data/templates/zweckform-iso-templates.xml.h:18 +msgid "Multi-purpose Stick+Lift Labels" +msgstr "Mehrzweck-Stick+Lift-Aufkleber" + +#. =================================================================== +#: ../data/templates/zweckform-iso-templates.xml.h:20 +msgid "QSL-Karten Etiketten 70mm x 50,8mm" +msgstr "QSL-Karten Etiketten 70mm x 50,8mm" + +#. =================================================================== +#: ../data/templates/zweckform-iso-templates.xml.h:22 +msgid "Rectangular Copier Labels" +msgstr "Rechteckige Kopieretiketten" + +#. =================================================================== +#: ../data/templates/zweckform-iso-templates.xml.h:26 +msgid "Video Labels (back)" +msgstr "Video-Etiketten (Rückseite)" + +#: ../data/desktop/glabels.desktop.in.h:1 +msgid "Create labels, business cards and media covers" +msgstr "Erstellen von Etiketten, Visitenkarten und Medien-Covern" + +#: ../data/desktop/glabels.desktop.in.h:2 +msgid "gLabels Label Designer" +msgstr "gLabels Etiketten-Designer" + +#: ../data/mime/glabels.keys.in.h:1 ../data/mime/glabels.xml.in.h:1 +msgid "gLabels Project File" +msgstr "gLabels-Projektdatei" + +#: ../barcode-0.98/compat/getopt.c:583 +#, c-format +msgid "%s: option `%s' is ambiguous\n" +msgstr "%s: Option `%s' ist nicht eindeutig\n" + +#: ../barcode-0.98/compat/getopt.c:607 +#, c-format +msgid "%s: option `--%s' doesn't allow an argument\n" +msgstr "%s: Option `--%s' erlaubt kein Argument\n" + +#: ../barcode-0.98/compat/getopt.c:612 +#, c-format +msgid "%s: option `%c%s' doesn't allow an argument\n" +msgstr "%s: Option `%c%s' erlaubt kein Argument\n" + +#: ../barcode-0.98/compat/getopt.c:629 +#, c-format +msgid "%s: option `%s' requires an argument\n" +msgstr "%s: Option `%s' benötigt ein Argument\n" + +#. --option +#: ../barcode-0.98/compat/getopt.c:658 +#, c-format +msgid "%s: unrecognized option `--%s'\n" +msgstr "%s: Nicht erkannte Option `--%s'\n" + +#. +option or -option +#: ../barcode-0.98/compat/getopt.c:662 +#, c-format +msgid "%s: unrecognized option `%c%s'\n" +msgstr "%s: Nicht erkannte Option `%c%s'\n" + +#. 1003.2 specifies the format of this message. +#: ../barcode-0.98/compat/getopt.c:688 +#, c-format +msgid "%s: illegal option -- %c\n" +msgstr "%s: Unerlaubte Option -- %c\n" + +#: ../barcode-0.98/compat/getopt.c:691 +#, c-format +msgid "%s: invalid option -- %c\n" +msgstr "%s: Ungültige Option -- %c\n" + +#: ../barcode-0.98/compat/getopt.c:727 +#, c-format +msgid "%s: option requires an argument -- %c\n" +msgstr "%s: Option benötigt ein Argument -- %c\n" diff --cc po/fr.po index c7476e04,00000000..3ee3a6cc mode 100644,000000..100644 --- a/po/fr.po +++ b/po/fr.po @@@ -1,3311 -1,0 +1,3508 @@@ +# French translation of glabels. +# Copyright (C) 2001 Jim Evins +# Olivier Berger +# Florent Morel , 2001, 2004 +# +msgid "" +msgstr "" +"Project-Id-Version: glabels 2.0.1\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-06-14 15:22+0200\n" - "PO-Revision-Date: 2007-06-14 16:59+0200\n" ++"POT-Creation-Date: 2009-08-26 10:07+0200\n" ++"PO-Revision-Date: 2009-08-26 11:10+0200\n" +"Last-Translator: Claude Paroz \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" - "X-Generator: KBabel 1.11.4\n" + - #: ../src/glabels.c:76 ../src/glabels-batch.c:70 ++#: ../src/glabels.c:75 ../src/glabels-batch.c:70 +msgid "[FILE...]" +msgstr "[FICHIER...]" + - #: ../src/glabels.c:92 ++#: ../src/glabels.c:91 +msgid "- gLabels label designer" +msgstr "- créateur de patrons gLabels" + +#: ../src/glabels-batch.c:54 +msgid "set output filename (default=\"output.pdf\")" +msgstr "définit le fichier de sortie (défaut=\"output.pdf\")" + +#: ../src/glabels-batch.c:54 ../src/glabels-batch.c:68 +msgid "filename" +msgstr "nom de fichier" + +#: ../src/glabels-batch.c:56 +msgid "number of sheets (default=1)" +msgstr "nombre de pages (défaut=1)" + +# src/print_copies.c:193 +# src/print_copies.c:193 +# src/print_copies.c:171 +# src/print_copies.c:170 +#: ../src/glabels-batch.c:56 +msgid "sheets" +msgstr "feuilles" + +#: ../src/glabels-batch.c:58 +msgid "number of copies (default=1)" +msgstr "nombre de copies (défaut=1)" + +# src/print.c:153 +# src/print.c:153 +# src/print.c:146 +# src/print_dialog.c:104 +#: ../src/glabels-batch.c:58 +msgid "copies" +msgstr "copies" + +#: ../src/glabels-batch.c:60 +msgid "first label on first sheet (default=1)" +msgstr "première étiquette sur la première page (défaut=1)" + +#: ../src/glabels-batch.c:60 +msgid "first" +msgstr "première" + +# src/print.c:180 +# src/print.c:180 +# src/print.c:196 +# src/print_dialog.c:152 +#: ../src/glabels-batch.c:62 ../data/glade/print-custom-widget.glade.h:6 +msgid "print outlines (to test printer alignment)" +msgstr "imprimer des bordures (pour tester l'alignement de l'imprimante)" + +# src/print_dialog.c:160 +#: ../src/glabels-batch.c:64 ../data/glade/print-custom-widget.glade.h:5 +msgid "print in reverse (i.e. a mirror image)" +msgstr "imprimer à l'envers (i.e. une image miroir)" + +#: ../src/glabels-batch.c:66 ../data/glade/print-custom-widget.glade.h:4 +msgid "print crop marks" +msgstr "imprimer les guides de coupe" + +#: ../src/glabels-batch.c:68 +msgid "input file for merging" +msgstr "fichier d'entrée pour la fusion" + +#: ../src/glabels-batch.c:96 +msgid "- batch process gLabels label files" +msgstr "- traitement par lots de fichiers d'étiquettes gLabels" + +# src/file.c:214 +# src/file.c:214 +# src/file.c:249 +# src/file.c:249 +#: ../src/glabels-batch.c:142 +#, c-format +msgid "cannot perform document merge with glabels file %s\n" - msgstr "impossible d'effectuer une fusion de document avec le fichier glabels %s\n" ++msgstr "" ++"impossible d'effectuer une fusion de document avec le fichier glabels %s\n" + +# src/file.c:214 +# src/file.c:214 +# src/file.c:249 +# src/file.c:249 +#: ../src/glabels-batch.c:164 +#, c-format +msgid "cannot open glabels file %s\n" +msgstr "impossible d'ouvrir le fichier glabels %s\n" + +#: ../src/window.c:259 +msgid "(none) - gLabels" +msgstr "(vide) - gLabels" + +#: ../src/window.c:432 +msgid "(modified)" +msgstr "(modifié)" + +# src/display.c:1157 src/display.c:1205 +# src/display.c:1160 src/display.c:1208 +# src/menu.c:94 +# src/menu.c:94 +#: ../src/stock.c:72 +msgid "_Select Mode" +msgstr "Mode _sélection" + +# src/item_text.c:442 src/item_text.c:627 +# src/item_text.c:442 src/item_text.c:627 +# src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100 +# src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100 +#: ../src/stock.c:73 +msgid "_Text" +msgstr "_Texte" + +# src/item_line.c:271 +# src/item_line.c:271 +# src/item_line.c:256 src/menu.c:106 +# src/item_line.c:256 src/menu.c:106 +#: ../src/stock.c:74 +msgid "_Line" +msgstr "_Ligne" + +# src/menu.c:103 +# src/menu.c:103 +#: ../src/stock.c:75 +msgid "_Box" +msgstr "_Boîte" + +# src/menu.c:109 +# src/menu.c:109 +#: ../src/stock.c:76 +msgid "_Ellipse" +msgstr "_Ellipse" + +# src/item_image.c:283 +# src/item_image.c:283 +# src/item_image.c:268 src/menu.c:113 +# src/item_image.c:268 src/menu.c:113 +#: ../src/stock.c:77 +msgid "_Image" +msgstr "_Image" + +# src/item_barcode.c:316 +# src/item_barcode.c:317 +# src/menu.c:116 +# src/menu.c:116 +#: ../src/stock.c:78 +msgid "Bar_code" +msgstr "_Code-barre" + +# src/item_text.c:467 +# src/item_text.c:467 +# src/menu.c:132 src/menu.c:223 +# src/menu.c:132 src/menu.c:223 +#: ../src/stock.c:79 +msgid "_Merge Properties" +msgstr "Propriétés de _fusion" + +# src/item_text.c:467 +# src/item_text.c:467 +# src/item_text.c:482 +# src/item_text.c:482 +#: ../src/stock.c:80 +msgid "Object _Properties" +msgstr "_Propriétés de l'objet" + +# src/display.c:1167 src/display.c:1215 +# src/display.c:1170 src/display.c:1218 +# src/display.c:1181 src/display.c:1229 +# src/display.c:1196 src/display.c:1244 +#: ../src/stock.c:81 +msgid "Bring to _Front" +msgstr "_Avancer au premier plan" + +# src/display.c:1173 src/display.c:1221 +# src/display.c:1176 src/display.c:1224 +# src/display.c:1187 src/display.c:1235 +# src/display.c:1202 src/display.c:1250 +#: ../src/stock.c:82 +msgid "Send to _Back" +msgstr "_Reculer à l'arrière-plan" + +# src/rotate_select.c:187 +# src/rotate_select.c:187 +# src/rotate_select.c:167 +# src/rotate_select.c:169 +#: ../src/stock.c:83 +msgid "Rotate _Left" +msgstr "Rotation _gauche" + +# src/rotate_select.c:187 +# src/rotate_select.c:187 +# src/rotate_select.c:167 +# src/rotate_select.c:169 +#: ../src/stock.c:84 +msgid "Rotate _Right" +msgstr "Rotation _droite" + +#: ../src/stock.c:85 +msgid "Flip _Horizontally" +msgstr "Retourner _horizontalement" + +#: ../src/stock.c:86 +msgid "Flip _Vertically" +msgstr "Retourner _verticalement" + +#: ../src/stock.c:87 +msgid "_Lefts" +msgstr "_Gauches" + +#: ../src/stock.c:88 +msgid "_Rights" +msgstr "_Droites" + +#: ../src/stock.c:89 +msgid "_Centers" +msgstr "_Centres" + +# src/menu.c:157 +# src/menu.c:157 +#: ../src/stock.c:90 +msgid "_Tops" +msgstr "En _haut" + +#: ../src/stock.c:91 +msgid "Bottoms" +msgstr "En _bas" + +#: ../src/stock.c:92 +msgid "Centers" +msgstr "_Centré" + +#: ../src/stock.c:93 ../src/stock.c:94 +msgid "Label Ce_nter" +msgstr "Centre de l'étiquette" + +#: ../src/stock.c:95 ../data/glade/property-bar.glade.h:3 +msgid "Fill color" +msgstr "Couleur de remplissage" + +#: ../src/stock.c:96 ../data/glade/property-bar.glade.h:8 +msgid "Line color" +msgstr "Couleur de ligne" + +# src/item_line.c:271 +# src/item_line.c:271 +# src/item_line.c:256 src/menu.c:106 +# src/item_line.c:256 src/menu.c:106 +#: ../src/stock.c:97 ../src/stock.c:99 +msgid "Linked" +msgstr "Lié" + +# src/merge.c:80 +# src/merge.c:78 +#: ../src/stock.c:98 ../src/stock.c:100 +msgid "Not Linked" +msgstr "Non lié" + +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:258 src/item_ellipse.c:260 +# src/item_box.c:258 src/item_ellipse.c:260 +#. Menu entries. +#: ../src/ui.c:93 +msgid "_File" +msgstr "_Fichier" + +#: ../src/ui.c:94 +msgid "Open Recent _Files" +msgstr "_Fichiers récents" + +#: ../src/ui.c:95 +msgid "_Edit" +msgstr "É_dition" + +# src/menu.c:50 +# src/menu.c:50 +# src/menu.c:50 +# src/menu.c:50 +#: ../src/ui.c:96 +msgid "_View" +msgstr "_Affichage" + +#: ../src/ui.c:97 +msgid "Customize Main Toolbar" +msgstr "Personnaliser le barre d'outils principale" + +#: ../src/ui.c:98 +msgid "Customize Drawing Toolbar" +msgstr "Personnaliser la barre d'outils dessin" + +#: ../src/ui.c:99 +msgid "Customize Properties Toolbar" +msgstr "Personnaliser la barre d'outils de propriétés" + +#: ../src/ui.c:100 +msgid "_Objects" +msgstr "_Objets" + +#: ../src/ui.c:101 +msgid "_Create" +msgstr "_Créer" + +#: ../src/ui.c:102 +msgid "_Order" +msgstr "_Ordre" + +# src/rotate_select.c:187 +# src/rotate_select.c:187 +# src/rotate_select.c:167 +# src/rotate_select.c:169 +#: ../src/ui.c:103 +msgid "_Rotate/Flip" +msgstr "_Rotation/Renversement" + +#: ../src/ui.c:104 +msgid "Align _Horizontal" +msgstr "Aligner _horizontalement" + +#: ../src/ui.c:105 +msgid "Align _Vertical" +msgstr "Aligner _verticalement" + +#: ../src/ui.c:106 +msgid "_Help" +msgstr "Aid_e" + +#. Popup entries. +#: ../src/ui.c:109 ../src/ui.c:110 +msgid "Context Menu" +msgstr "Menu contextuel" + +# src/menu.c:50 +# src/menu.c:50 +# src/menu.c:50 +# src/menu.c:50 +#: ../src/ui.c:115 +msgid "_New" +msgstr "_Nouveau" + +# src/tools.c:70 +# src/tools.c:70 +# src/menu.c:106 src/menu.c:197 +# src/menu.c:106 src/menu.c:197 +#: ../src/ui.c:117 +msgid "Create a new file" +msgstr "Crée un nouveau document" + +# src/file.c:178 +# src/file.c:178 +# src/file.c:211 +# src/file.c:211 +#: ../src/ui.c:122 +msgid "_Open..." +msgstr "_Ouvrir..." + +# src/menu.c:140 +# src/menu.c:140 +# src/menu.c:170 +# src/menu.c:170 +#: ../src/ui.c:124 +msgid "Open a file" +msgstr "Ouvre un fichier" + +# src/file.c:271 src/mdi.c:660 +# src/file.c:271 src/mdi.c:666 +# src/file.c:311 src/mdi.c:623 +# src/file.c:311 src/mdi.c:623 +#: ../src/ui.c:129 +msgid "_Save" +msgstr "_Enregistrer" + +# src/menu.c:142 +# src/menu.c:142 +# src/menu.c:172 +# src/menu.c:172 +#: ../src/ui.c:131 +msgid "Save current file" +msgstr "Enregistrer le fichier en cours" + +# src/file.c:271 src/mdi.c:660 +# src/file.c:271 src/mdi.c:666 +# src/file.c:311 src/mdi.c:623 +# src/file.c:311 src/mdi.c:623 +#: ../src/ui.c:136 +msgid "Save _As..." +msgstr "Enregistrer _sous..." + +#: ../src/ui.c:138 +msgid "Save the current file to a different name" +msgstr "Enregistre le fichier en cours avec un nom différent" + +# src/print.c:149 +# src/print.c:149 +# src/print.c:141 +# src/print_dialog.c:99 +#: ../src/ui.c:143 +msgid "_Print..." +msgstr "Im_primer..." + +# src/menu.c:145 +# src/menu.c:145 +# src/menu.c:175 +# src/menu.c:175 +#: ../src/ui.c:145 +msgid "Print the current file" +msgstr "Imprime le fichier en cours" + +# src/item_text.c:467 +# src/item_text.c:467 +# src/item_text.c:482 +# src/item_text.c:482 +#: ../src/ui.c:150 +msgid "Properties..." +msgstr "Propriétés..." + +# src/item_box.c:251 +# src/item_box.c:251 +# src/merge_properties.c:82 +# src/merge_properties.c:82 +#: ../src/ui.c:152 +msgid "Modify document properties" +msgstr "Modifier les propriétés du document" + +#: ../src/ui.c:157 +msgid "Template _Designer..." +msgstr "_Créateur de patrons..." + +# src/tools.c:70 +# src/tools.c:70 +# src/menu.c:106 src/menu.c:197 +# src/menu.c:106 src/menu.c:197 +#: ../src/ui.c:159 +msgid "Create a custom template" +msgstr "Créer un patron personnalisé" + +#: ../src/ui.c:164 +msgid "_Close" +msgstr "_Fermer" + +# src/menu.c:142 +# src/menu.c:142 +# src/menu.c:172 +# src/menu.c:172 +#: ../src/ui.c:166 +msgid "Close the current file" +msgstr "Ferme le fichier en cours" + +#: ../src/ui.c:171 +msgid "_Quit" +msgstr "_Quitter" + +#: ../src/ui.c:173 +msgid "Quit the program" +msgstr "Quitte le programme" + +#: ../src/ui.c:180 +msgid "Cut" +msgstr "Couper" + +#: ../src/ui.c:182 +msgid "Cut the selection" +msgstr "Coupe la sélection" + +#: ../src/ui.c:187 +msgid "Copy" +msgstr "Copier" + +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:86 +#: ../src/ui.c:189 +msgid "Copy the selection" +msgstr "Copie la sélection" + +#: ../src/ui.c:194 +msgid "Paste" +msgstr "Coller" + +#: ../src/ui.c:196 +msgid "Paste the clipboard" +msgstr "Colle le presse-papiers" + +# src/display.c:1157 src/display.c:1205 +# src/display.c:1160 src/display.c:1208 +# src/display.c:1171 src/display.c:1219 +# src/display.c:1186 src/display.c:1234 +#: ../src/ui.c:201 +msgid "Delete" +msgstr "Supprimer" + +# src/tools.c:64 +# src/tools.c:64 +# src/menu.c:100 src/menu.c:191 +# src/menu.c:100 src/menu.c:191 +#: ../src/ui.c:203 +msgid "Delete the selected objects" +msgstr "Supprime les objets sélectionnés" + +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:85 +# src/menu.c:85 +#: ../src/ui.c:208 +msgid "Select All" +msgstr "Tout sélectionner" + +# src/tools.c:59 +# src/tools.c:59 +# src/menu.c:95 src/menu.c:186 +# src/menu.c:95 src/menu.c:186 +#: ../src/ui.c:210 +msgid "Select all objects" +msgstr "Sélectionne tous les objets" + +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:85 +# src/menu.c:85 +#: ../src/ui.c:215 +msgid "Un-select All" +msgstr "Désélectionner tout" + +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:86 +#: ../src/ui.c:217 +msgid "Remove all selections" +msgstr "Annule toutes les sélections" + +# src/preferences.c:92 +# src/prefs.c:101 +# src/prefs.c:92 +# src/prefs.c:86 +#: ../src/ui.c:222 +msgid "Preferences" +msgstr "Préférences" + +#: ../src/ui.c:224 +msgid "Configure the application" +msgstr "Configure le logiciel" + +# src/tools.c:84 +# src/tools.c:84 +# src/menu.c:121 src/menu.c:211 +# src/menu.c:121 src/menu.c:211 +#: ../src/ui.c:231 +msgid "Zoom in" +msgstr "Zoom avant" + +#: ../src/ui.c:233 +msgid "Increase magnification" +msgstr "Augmente l'agrandissement" + +# src/tools.c:87 +# src/tools.c:87 +# src/menu.c:124 src/menu.c:214 +# src/menu.c:124 src/menu.c:214 +#: ../src/ui.c:238 +msgid "Zoom out" +msgstr "Zoom arrière" + +#: ../src/ui.c:240 +msgid "Decrease magnification" +msgstr "Réduit l'agrandissement" + +# src/tools.c:90 +# src/tools.c:90 +# src/menu.c:127 +# src/menu.c:127 +#: ../src/ui.c:245 +msgid "Zoom 1 to 1" +msgstr "Zoom 1:1" + +#: ../src/ui.c:247 +msgid "Restore scale to 100%" +msgstr "Remet l'échelle à 100%" + +# src/tools.c:90 +# src/tools.c:90 +# src/menu.c:127 src/menu.c:217 +# src/menu.c:127 src/menu.c:217 +#: ../src/ui.c:252 +msgid "Zoom to fit" +msgstr "Adapter le zoom à la taille de la fenêtre" + +#: ../src/ui.c:254 +msgid "Set scale to fit window" +msgstr "Adapte l'échelle à la taille de la fenêtre" + +# src/display.c:1157 src/display.c:1205 +# src/display.c:1160 src/display.c:1208 +# src/menu.c:94 +# src/menu.c:94 +#: ../src/ui.c:261 +msgid "Select Mode" +msgstr "Mode sélection" + +# src/tools.c:59 +# src/tools.c:59 +# src/menu.c:95 src/menu.c:186 +# src/menu.c:95 src/menu.c:186 +#: ../src/ui.c:263 +msgid "Select, move and modify objects" +msgstr "Sélectionne, déplace et modifie les objets" + +# src/item_text.c:442 src/item_text.c:627 +# src/item_text.c:442 src/item_text.c:627 +# src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100 +# src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100 - #: ../src/ui.c:268 ../src/view-text.c:525 ++#: ../src/ui.c:268 ../src/view-text.c:494 +#: ../data/glade/object-editor.glade.h:32 +msgid "Text" +msgstr "Texte" + +# src/tools.c:64 +# src/tools.c:64 +# src/menu.c:100 src/menu.c:191 +# src/menu.c:100 src/menu.c:191 +#: ../src/ui.c:270 +msgid "Create text object" +msgstr "Crée un objet texte" + +# src/menu.c:103 +# src/menu.c:103 +#: ../src/ui.c:275 +msgid "Box" +msgstr "Boîte" + +# src/tools.c:67 +# src/tools.c:67 +# src/menu.c:103 src/menu.c:194 +# src/menu.c:103 src/menu.c:194 +#: ../src/ui.c:277 +msgid "Create box/rectangle object" +msgstr "Crée un objet boîte/rectangle" + +# src/item_line.c:271 +# src/item_line.c:271 +# src/item_line.c:256 src/menu.c:106 +# src/item_line.c:256 src/menu.c:106 +#: ../src/ui.c:282 ../data/glade/object-editor.glade.h:20 +msgid "Line" +msgstr "Ligne" + +# src/tools.c:70 +# src/tools.c:70 +# src/menu.c:106 src/menu.c:197 +# src/menu.c:106 src/menu.c:197 +#: ../src/ui.c:284 +msgid "Create line object" +msgstr "Crée un objet ligne" + +# src/menu.c:109 +# src/menu.c:109 +#: ../src/ui.c:289 +msgid "Ellipse" +msgstr "Ellipse" + +# src/tools.c:73 +# src/tools.c:73 +# src/menu.c:110 src/menu.c:200 +# src/menu.c:110 src/menu.c:200 +#: ../src/ui.c:291 +msgid "Create ellipse/circle object" +msgstr "Crée un objet ellipse/cercle" + +# src/item_image.c:283 +# src/item_image.c:283 +# src/item_image.c:268 src/menu.c:113 +# src/item_image.c:268 src/menu.c:113 +#: ../src/ui.c:296 ../data/glade/object-editor.glade.h:16 +msgid "Image" +msgstr "Image" + +# src/tools.c:76 +# src/tools.c:76 +# src/menu.c:113 src/menu.c:203 +# src/menu.c:113 src/menu.c:203 +#: ../src/ui.c:298 +msgid "Create image object" +msgstr "Crée un objet image" + +# src/item_barcode.c:316 +# src/item_barcode.c:317 +# src/menu.c:116 +# src/menu.c:116 +#: ../src/ui.c:303 +msgid "Barcode" +msgstr "Code-barre" + +# src/tools.c:79 +# src/tools.c:79 +# src/menu.c:116 src/menu.c:206 +# src/menu.c:116 src/menu.c:206 +#: ../src/ui.c:305 +msgid "Create barcode object" +msgstr "Crée un objet code-barre" + +# src/display.c:1167 src/display.c:1215 +# src/display.c:1170 src/display.c:1218 +# src/display.c:1181 src/display.c:1229 +# src/display.c:1196 src/display.c:1244 +#: ../src/ui.c:310 +msgid "Bring to front" +msgstr "Avancer au premier plan" + +#: ../src/ui.c:312 +msgid "Raise object to top" +msgstr "Remonte l'objet au plus haut niveau" + +# src/display.c:1173 src/display.c:1221 +# src/display.c:1176 src/display.c:1224 +# src/display.c:1187 src/display.c:1235 +# src/display.c:1202 src/display.c:1250 +#: ../src/ui.c:317 +msgid "Send to back" +msgstr "Reculer à l'arrière-plan" + +#: ../src/ui.c:319 +msgid "Lower object to bottom" +msgstr "Descend l'objet à l'arrière-plan" + +# src/rotate_select.c:187 +# src/rotate_select.c:187 +# src/rotate_select.c:167 +# src/rotate_select.c:169 +#: ../src/ui.c:324 +msgid "Rotate left" +msgstr "Rotation gauche" + +#: ../src/ui.c:326 +msgid "Rotate object 90 degrees counter-clockwise" - msgstr "Tourne l'objet de 90 degrés dans le sens inverse des aiguilles d'une montre" ++msgstr "" ++"Tourne l'objet de 90 degrés dans le sens inverse des aiguilles d'une montre" + +# src/rotate_select.c:187 +# src/rotate_select.c:187 +# src/rotate_select.c:167 +# src/rotate_select.c:169 +#: ../src/ui.c:331 +msgid "Rotate right" +msgstr "Rotation droite" + +#: ../src/ui.c:333 +msgid "Rotate object 90 degrees clockwise" +msgstr "Tourne l'objet de 90 degrés dans le sens des aiguilles d'une montre" + +#: ../src/ui.c:338 +msgid "Flip horizontally" +msgstr "Retourner horizontalement" + +#: ../src/ui.c:340 +msgid "Flip object horizontally" +msgstr "Retourne l'objet horizontalement" + +#: ../src/ui.c:345 +msgid "Flip vertically" +msgstr "Retourner verticalement" + +#: ../src/ui.c:347 +msgid "Flip object vertically" +msgstr "Retourne l'objet verticalement" + +# src/prop_text.c:277 +# src/prop_text.c:264 +# src/prop_text.c:248 +# src/prop_text.c:248 +#: ../src/ui.c:352 +msgid "Align left" +msgstr "Aligner à gauche" + +#: ../src/ui.c:354 +msgid "Align objects to left edges" +msgstr "Aligne les objets sur leur bordure gauche" + +#: ../src/ui.c:359 +msgid "Align right" +msgstr "Aligner à droite" + +#: ../src/ui.c:361 +msgid "Align objects to right edges" +msgstr "Aligne les objets sur leur bordure droite" + +#: ../src/ui.c:366 +msgid "Align horizontal center" +msgstr "Aligner centré horizontalement" + +#: ../src/ui.c:368 +msgid "Align objects to horizontal centers" +msgstr "Aligne horizontalement le centre des objets" + +#: ../src/ui.c:373 +msgid "Align tops" +msgstr "Aligner au sommet" + +#: ../src/ui.c:375 +msgid "Align objects to top edges" +msgstr "Aligne les objets d'après leur sommet" + +#: ../src/ui.c:380 +msgid "Align bottoms" +msgstr "Aligner à la base" + +#: ../src/ui.c:382 +msgid "Align objects to bottom edges" +msgstr "Aligne les objets d'après leur base" + +#: ../src/ui.c:387 +msgid "Align vertical center" +msgstr "Aligner centré verticalement" + +#: ../src/ui.c:389 +msgid "Align objects to vertical centers" +msgstr "Aligne verticalement le centre des objets" + +#: ../src/ui.c:394 +msgid "Center horizontally" +msgstr "Centrer horizontalement" + +#: ../src/ui.c:396 +msgid "Center objects to horizontal label center" +msgstr "Aligne les objets horizontalement au centre de l'étiquette" + +#: ../src/ui.c:401 +msgid "Center vertically" +msgstr "Centrer verticalement" + +#: ../src/ui.c:403 +msgid "Center objects to vertical label center" +msgstr "Aligne les objets verticalement au centre de l'étiquette" + +# src/item_text.c:467 +# src/item_text.c:467 +# src/menu.c:132 src/menu.c:223 +# src/menu.c:132 src/menu.c:223 +#: ../src/ui.c:408 +msgid "Merge properties" +msgstr "Propriétés de fusion" + +# src/item_image.c:272 +# src/item_image.c:272 +# src/menu.c:133 +# src/menu.c:133 +#: ../src/ui.c:410 +msgid "Edit merge properties" +msgstr "Édite les propriétés de fusion" + +#: ../src/ui.c:417 +msgid "Contents" +msgstr "Sommaire" + +# src/file.c:183 +# src/file.c:183 +# src/file.c:213 +# src/file.c:213 +#: ../src/ui.c:419 +msgid "Open glabels manual" +msgstr "Ouvre le manuel de glabels" + +#: ../src/ui.c:424 +msgid "About..." +msgstr "À propos..." + +#: ../src/ui.c:426 +msgid "About glabels" +msgstr "À propos de glabels" + +#: ../src/ui.c:436 +msgid "Property toolbar" +msgstr "Barre d'outils de propriétés" + +#: ../src/ui.c:438 +msgid "Change the visibility of the property toolbar in the current window" - msgstr "Afficher ou non la barre d'outils de propriétés dans la fenêtre actuelle" ++msgstr "" ++"Afficher ou non la barre d'outils de propriétés dans la fenêtre actuelle" + +#: ../src/ui.c:444 ../src/ui.c:489 ../src/ui.c:497 +msgid "Show tooltips" +msgstr "Afficher les infos-bulles" + +#: ../src/ui.c:446 +msgid "Show tooltips for property toolbar" +msgstr "Afficher les info-bulles dans la barre d'outils de propriétés" + +#: ../src/ui.c:452 +msgid "Grid" +msgstr "Grille" + +#: ../src/ui.c:454 +msgid "Change the visibility of the grid in the current window" +msgstr "Afficher ou non la grille dans la fenêtre actuelle" + +# src/preferences.c:213 +#: ../src/ui.c:460 +msgid "Markup" +msgstr "Marges" + +#: ../src/ui.c:462 +msgid "Change the visibility of markup lines in the current window" +msgstr "Afficher ou non les lignes de marges dans la fenêtre actuelle" + +#: ../src/ui.c:473 +msgid "Main toolbar" +msgstr "Barre d'outils principale" + +#: ../src/ui.c:475 +msgid "Change the visibility of the main toolbar in the current window" +msgstr "Afficher ou non la barre d'outils principale dans la fenêtre actuelle" + +#: ../src/ui.c:481 +msgid "Drawing toolbar" +msgstr "Barre d'outils dessin" + +#: ../src/ui.c:483 +msgid "Change the visibility of the drawing toolbar in the current window" +msgstr "Afficher ou non la barre d'outils dessin dans la fenêtre actuelle" + +#: ../src/ui.c:491 +msgid "Show tooltips for main toolbar" +msgstr "Afficher les info-bulles dans la barre d'outils principale" + +#: ../src/ui.c:499 +msgid "Show tooltips for drawing toolbar" +msgstr "Afficher les info-bulles dans la barre d'outils de dessin" + +# src/display.c:1157 src/display.c:1205 +# src/display.c:1160 src/display.c:1208 +# src/display.c:1171 src/display.c:1219 +# src/display.c:1186 src/display.c:1234 - #: ../src/ui-property-bar.c:1235 ../src/object-editor.c:571 - #: ../src/object-editor.c:577 ++#: ../src/ui-property-bar.c:1232 ../src/object-editor.c:587 ++#: ../src/object-editor.c:593 +msgid "Default" +msgstr "Par défaut" + +# src/merge.c:80 +# src/merge.c:78 - #: ../src/ui-property-bar.c:1242 ../src/object-editor.c:583 ++#: ../src/ui-property-bar.c:1239 ../src/object-editor.c:599 +msgid "No line" +msgstr "Pas de ligne" + - #: ../src/ui-property-bar.c:1250 ../src/object-editor.c:590 ++#: ../src/ui-property-bar.c:1247 ../src/object-editor.c:606 +msgid "No fill" +msgstr "Pas de remplissage" + +# src/item_text.c:467 +# src/item_text.c:467 +# src/item_text.c:482 +# src/item_text.c:482 +#: ../src/ui-sidebar.c:152 +msgid "Object properties" +msgstr "Propriétés de l'objet" + +#: ../src/ui-commands.c:1084 +msgid "Glabels includes contributions from:" +msgstr "Glabels contient des contributions de :" + +#: ../src/ui-commands.c:1090 +msgid "See the file AUTHORS for additional credits," +msgstr "Voir le fichier AUTHORS pour des remerciements supplémentaires," + +#: ../src/ui-commands.c:1091 +msgid "or visit http://glabels.sourceforge.net/" +msgstr "ou visitez http://glabels.sourceforge.net/" + +#: ../src/ui-commands.c:1103 +msgid "A label and business card creation program.\n" +msgstr "Un logiciel de création de cartes de visite et d'étiquettes.\n" + +#: ../src/ui-commands.c:1107 +msgid "translator-credits" +msgstr "" +"Olivier Berger \n" +"Florent Morel , 2001, 2004\n" +"Claude Paroz , 2007" + +# src/menu.c:185 +# src/menu.c:185 +# src/menu.c:290 +# src/menu.c:290 +#: ../src/ui-commands.c:1110 +msgid "" +"Glabels is free software; you can redistribute it and/or modify it\n" +"under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n" +"the GNU General Public License for more details.\n" +msgstr "" +"Glabels est un logiciel libre ; vous pouvez le redistribuer et/ou le " +"modifier conformément aux dispositions de la Licence Publique Générale GNU, " +"telle que publiée par la Free Software Foundation ; version 2 de la licence, " +"ou encore (à votre choix) toute version ultérieure.\n" +" \n" +"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE " +"GARANTIE ; sans même la garantie implicite de COMMERCIALISATION ou " +"D'ADAPTATION A UN OBJET PARTICULIER. Pour plus de détails, voir la Licence " +"Publique Générale GNU.\n" + +# src/print_copies.c:210 +# src/print_copies.c:210 +# src/print_copies.c:188 +# src/print_copies.c:187 +#: ../src/ui-commands.c:1136 +msgid "glabels" +msgstr "glabels" + +# src/file.c:59 +# src/file.c:59 +# src/file.c:72 +# src/file.c:72 - #: ../src/file.c:90 ++#: ../src/file.c:91 +msgid "New Label or Card" +msgstr "Nouvelle étiquette ou carte" + +# src/item_text.c:467 +# src/item_text.c:467 +# src/item_text.c:482 +# src/item_text.c:482 - #: ../src/file.c:189 ++#: ../src/file.c:191 +msgid "Label properties" +msgstr "Propriétés de l'étiquette" + - #: ../src/file.c:288 ../src/file.c:574 ++#: ../src/file.c:292 ../src/file.c:578 +msgid "All files" +msgstr "Tous les fichiers" + +# src/preferences.c:92 +# src/prefs.c:101 +# src/prefs.c:92 +# src/prefs.c:86 - #: ../src/file.c:293 ../src/file.c:579 ++#: ../src/file.c:297 ../src/file.c:583 +msgid "gLabels documents" +msgstr "Documents gLabels" + +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:86 - #: ../src/file.c:339 ../src/file.c:636 ++#: ../src/file.c:343 ../src/file.c:640 +msgid "Empty file name selection" +msgstr "Nom de fichier sélectionné vide" + - #: ../src/file.c:342 ../src/file.c:358 ++#: ../src/file.c:346 ../src/file.c:362 +msgid "Please select a file or supply a valid file name" +msgstr "Sélectionnez un fichier ou donnez un nom de fichier valide" + - #: ../src/file.c:355 ++#: ../src/file.c:359 +msgid "File does not exist" +msgstr "Ce fichier n'existe pas" + +# src/file.c:214 +# src/file.c:214 +# src/file.c:249 +# src/file.c:249 +# c-format - #: ../src/file.c:429 ++#: ../src/file.c:433 +#, c-format +msgid "Could not open file \"%s\"" +msgstr "Impossible d'ouvrir le fichier « %s »" + - #: ../src/file.c:432 ++#: ../src/file.c:436 +msgid "Not a supported file format" +msgstr "Format de fichier non pris en charge" + +# src/file.c:248 src/mdi.c:635 +# src/file.c:248 src/mdi.c:641 +# src/file.c:288 src/mdi.c:601 +# src/file.c:288 src/mdi.c:601 - #: ../src/file.c:509 ../src/file.c:686 ++#: ../src/file.c:513 ../src/file.c:690 +#, c-format +msgid "Could not save file \"%s\"" +msgstr "Impossible d'enregistrer « %s »" + - #: ../src/file.c:513 ../src/file.c:690 ++#: ../src/file.c:517 ../src/file.c:694 +msgid "Error encountered during save. The file is still not saved." +msgstr "" +"Erreur rencontrée durant l'enregistrement. Le fichier n'est toujours pas " +"enregistré. " + +# src/file.c:278 +# src/file.c:278 +# src/file.c:316 +# src/file.c:316 - #: ../src/file.c:552 ++#: ../src/file.c:556 +#, c-format +msgid "Save \"%s\" as" +msgstr "Enregistrer « %s » sous" + +# src/file.c:319 src/mdi.c:729 +# src/file.c:319 src/mdi.c:735 +# src/file.c:362 src/mdi.c:693 +# src/file.c:362 src/mdi.c:693 - #: ../src/file.c:639 ++#: ../src/file.c:643 +msgid "Please supply a valid file name" +msgstr "Donnez un nom de fichier valide" + - #: ../src/file.c:660 ++#: ../src/file.c:664 +#, c-format +msgid "Overwrite file \"%s\"?" +msgstr "Écraser le fichier « %s » ?" + - #: ../src/file.c:664 ++#: ../src/file.c:668 +msgid "File already exists." +msgstr "Ce fichier existe déjà." + - #: ../src/file.c:760 ++#: ../src/file.c:764 +#, c-format +msgid "Save changes to document \"%s\" before closing?" +msgstr "Enregistrer les changements du document « %s » avant de fermer ?" + - #: ../src/file.c:764 ++#: ../src/file.c:768 +msgid "Your changes will be lost if you don't save them." +msgstr "Vos changements seront perdus si vous ne les enregistrez pas." + - #: ../src/file.c:767 ++#: ../src/file.c:771 +msgid "Close without saving" +msgstr "Fermer sans enregistrer" + +# src/print.c:171 +# src/prefs.c:463 src/prefs.c:470 src/prop_line.c:202 +# src/prefs.c:445 src/prefs.c:452 src/prop_line.c:183 +# src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 +#. Should not happen - #: ../src/prefs.c:158 ../src/prefs.c:165 ++#: ../src/prefs.c:159 ../src/prefs.c:166 +#: ../data/glade/object-editor.glade.h:43 +#: ../data/glade/prefs-dialog.glade.h:22 +msgid "points" +msgstr "points" + +# src/item_line.c:271 +# src/prefs.c:465 +# src/prefs.c:447 +# src/prefs.c:450 - #: ../src/prefs.c:160 ../data/glade/object-editor.glade.h:42 - #: ../data/glade/template-designer.glade.h:65 ++#: ../src/prefs.c:161 ../data/glade/object-editor.glade.h:42 ++#: ../data/glade/template-designer.glade.h:64 +msgid "inches" +msgstr "pouces" + +# src/prefs.c:467 +# src/prefs.c:449 +# src/prefs.c:452 - #: ../src/prefs.c:162 ++#: ../src/prefs.c:163 +msgid "mm" +msgstr "mm" + +# src/preferences.c:92 +# src/prefs.c:101 +# src/prefs.c:92 +# src/prefs.c:86 +#: ../src/prefs-dialog.c:162 ../data/glade/prefs-dialog.glade.h:21 +msgid "gLabels Preferences" +msgstr "Préférences de gLabels" + +# src/item_box.c:251 +# src/item_box.c:251 +# src/item_box.c:235 +# src/item_box.c:235 +#. Build editor. - #: ../src/view-box.c:178 ++#: ../src/view-box.c:175 +msgid "Box object properties" +msgstr "Propriétés de l'objet boîte" + +# src/item_ellipse.c:256 +# src/item_ellipse.c:256 +# src/item_ellipse.c:237 +# src/item_ellipse.c:237 +#. Build editor. - #: ../src/view-ellipse.c:178 ++#: ../src/view-ellipse.c:175 +msgid "Ellipse object properties" +msgstr "Propriétés de l'objet ellipse" + +# src/item_box.c:251 +# src/item_box.c:251 +# src/item_box.c:235 +# src/item_box.c:235 +#. Build editor. - #: ../src/view-line.c:177 ++#: ../src/view-line.c:174 +msgid "Line object properties" +msgstr "Propriétés de l'objet ligne" + +# src/item_image.c:272 +# src/item_image.c:272 +# src/item_image.c:257 +# src/item_image.c:257 +#. Build editor. - #: ../src/view-image.c:177 ++#: ../src/view-image.c:174 +msgid "Image object properties" +msgstr "Propriétés de l'objet image" + +# src/item_box.c:251 +# src/item_box.c:251 +# src/item_box.c:235 +# src/item_box.c:235 +#. Build editor. - #: ../src/view-text.c:181 ++#: ../src/view-text.c:178 +msgid "Text object properties" +msgstr "Propriétés de l'objet texte" + +# src/item_barcode.c:299 +# src/item_barcode.c:299 +# src/item_barcode.c:287 +# src/item_barcode.c:287 +#. Build editor. - #: ../src/view-barcode.c:177 ++#: ../src/view-barcode.c:174 +msgid "Barcode object properties" +msgstr "Propriétés de l'objet code-barre" + +#: ../src/object-editor-image-page.c:270 +msgid "All Files" +msgstr "Tous les fichiers" + +# src/item_image.c:283 +# src/item_image.c:283 +# src/item_image.c:268 src/menu.c:113 +# src/item_image.c:268 src/menu.c:113 +#: ../src/object-editor-image-page.c:275 +msgid "All Images" +msgstr "Toutes les images" + +#: ../src/object-editor-image-page.c:290 +#, c-format +msgid "%s (*.%s)" +msgstr "%s (*.%s)" + +# src/item_text.c:467 +# src/item_text.c:467 +# src/menu.c:132 src/menu.c:223 +# src/menu.c:132 src/menu.c:223 +#: ../src/merge-properties-dialog.c:263 +msgid "Merge Properties" +msgstr "Propriétés de fusion" + +# src/merge_ui_text.c:170 +# src/merge_ui_text.c:170 +#: ../src/merge-properties-dialog.c:289 ../src/merge-properties-dialog.c:397 +msgid "Select merge-database source" +msgstr "Sélection du fichier de données pour la fusion" + +# src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428 +# src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428 +#: ../src/merge-properties-dialog.c:298 ../src/merge-properties-dialog.c:417 +msgid "N/A" +msgstr "Non défini" + +# src/display.c:1157 src/display.c:1205 +# src/display.c:1160 src/display.c:1208 +# src/menu.c:94 +# src/menu.c:94 +#: ../src/merge-properties-dialog.c:324 +msgid "Select" +msgstr "Sélectionner" + +#: ../src/merge-properties-dialog.c:332 +msgid "Record/Field" +msgstr "Enregistrements/Champs" + +# src/item_barcode.c:309 +# src/item_barcode.c:308 +# src/item_barcode.c:297 +# src/item_barcode.c:297 +#: ../src/merge-properties-dialog.c:340 ../data/glade/object-editor.glade.h:10 +msgid "Data" +msgstr "Données" + +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:274 src/item_ellipse.c:279 +# src/merge_properties.c:168 +# src/merge_properties.c:168 +#: ../src/merge-properties-dialog.c:410 +msgid "Fixed" - msgstr "" ++msgstr "Fixe" + +# src/print_copies.c:210 +# src/print_copies.c:210 +# src/print_copies.c:188 +# src/print_copies.c:187 - #: ../src/print-op.c:231 ../src/wdgt-print-copies.c:171 ++#. =================================================================== ++#: ../src/print-op.c:237 ../src/wdgt-print-copies.c:171 ++#: ../data/templates/misc-iso-templates.xml.h:34 +msgid "Labels" +msgstr "Étiquettes" + - #: ../src/template-designer.c:357 ++#: ../src/template-designer.c:358 +msgid "gLabels Template Designer" +msgstr "Créateur de patrons gLabels" + - #: ../src/template-designer.c:418 ++#: ../src/template-designer.c:419 +msgid "Welcome" +msgstr "Bienvenue" + +# src/media_select.c:216 +# src/media_select.c:242 +# src/media_select.c:222 +# src/media_select.c:222 - #: ../src/template-designer.c:460 ++#: ../src/template-designer.c:463 +msgid "Name and Description" +msgstr "Nom et description" + +# src/media_select.c:221 +# src/media_select.c:247 +# src/media_select.c:227 +# src/media_select.c:227 - #: ../src/template-designer.c:513 ++#: ../src/template-designer.c:516 +msgid "Page Size" +msgstr "Taille de page" + +# src/file.c:59 +# src/file.c:59 +# src/file.c:72 +# src/file.c:72 - #: ../src/template-designer.c:584 ++#: ../src/template-designer.c:587 +msgid "Label or Card Shape" +msgstr "Forme de carte ou d'étiquette" + +# src/file.c:59 +# src/file.c:59 +# src/file.c:72 +# src/file.c:72 - #: ../src/template-designer.c:634 ++#: ../src/template-designer.c:637 +msgid "Label or Card Size" +msgstr "Taille de carte ou d'étiquette" + +# src/media_select.c:226 +# src/media_select.c:252 +# src/media_select.c:232 +# src/media_select.c:232 - #: ../src/template-designer.c:734 ++#: ../src/template-designer.c:737 +msgid "Label Size (round)" +msgstr "Taille d'étiquette (ronde)" + - #: ../src/template-designer.c:817 ++#: ../src/template-designer.c:820 +msgid "Label Size (CD/DVD)" +msgstr "Taille d'étiquette (CD/DVD)" + - #: ../src/template-designer.c:910 ++#: ../src/template-designer.c:913 +msgid "Number of Layouts" +msgstr "Nombre de dispositions" + +# src/media_select.c:231 +# src/media_select.c:257 +# src/media_select.c:237 +# src/media_select.c:237 - #: ../src/template-designer.c:973 ++#: ../src/template-designer.c:976 +msgid "Layout(s)" +msgstr "Disposition(s) :" + - #: ../src/template-designer.c:1084 ++#: ../src/template-designer.c:1087 +msgid "Design Completed" +msgstr "Création terminée" + ++#: ../src/template-designer.c:1253 ++msgid "" ++"Brand and part# match an existing " ++"template!" ++msgstr "" ++"La marque et le numéro d'article " ++"correspondent à un patron existant." ++ +#: ../src/bc.c:67 +msgid "POSTNET (any)" +msgstr "POSTNET (tous)" + +#: ../src/bc.c:70 +msgid "POSTNET-5 (ZIP only)" +msgstr "POSTNET-5 (seulement ZIP)" + +#: ../src/bc.c:73 +msgid "POSTNET-9 (ZIP+4)" +msgstr "POSTNET-9 (ZIP+4)" + +#: ../src/bc.c:76 +msgid "POSTNET-11 (DPBC)" +msgstr "POSTNET-11 (DPBC)" + +#: ../src/bc.c:79 ++msgid "CEPNET" ++msgstr "CEPNET" ++ ++#: ../src/bc.c:82 +msgid "EAN (any)" +msgstr "EAN (tous)" + - #: ../src/bc.c:82 ++#: ../src/bc.c:85 +msgid "EAN-8" +msgstr "EAN-8" + - #: ../src/bc.c:85 ++#: ../src/bc.c:88 +msgid "EAN-8 +2" +msgstr "EAN-8 +2" + - #: ../src/bc.c:88 ++#: ../src/bc.c:91 +msgid "EAN-8 +5" +msgstr "EAN-8 +5" + - #: ../src/bc.c:91 ++#: ../src/bc.c:94 +msgid "EAN-13" +msgstr "EAN-13" + - #: ../src/bc.c:94 ++#: ../src/bc.c:97 +msgid "EAN-13 +2" +msgstr "EAN-13 +2" + - #: ../src/bc.c:97 ++#: ../src/bc.c:100 +msgid "EAN-13 +5" +msgstr "EAN-13 +5" + - #: ../src/bc.c:100 ++#: ../src/bc.c:103 +msgid "UPC (UPC-A or UPC-E)" +msgstr "UPC (UPC-A ou UPC-E)" + - #: ../src/bc.c:103 ++#: ../src/bc.c:106 +msgid "UPC-A" +msgstr "UPC-A" + - #: ../src/bc.c:106 ++#: ../src/bc.c:109 +msgid "UPC-A +2" +msgstr "UPC-A +2" + - #: ../src/bc.c:109 ++#: ../src/bc.c:112 +msgid "UPC-A +5" +msgstr "UPC-A +5" + - #: ../src/bc.c:112 ++#: ../src/bc.c:115 +msgid "UPC-E" +msgstr "UPC-E" + - #: ../src/bc.c:115 ++#: ../src/bc.c:118 +msgid "UPC-E +2" +msgstr "UPC-E +2" + - #: ../src/bc.c:118 ++#: ../src/bc.c:121 +msgid "UPC-E +5" +msgstr "UPC-E +5" + - #: ../src/bc.c:121 ++#: ../src/bc.c:124 +msgid "ISBN" +msgstr "ISBN" + - #: ../src/bc.c:124 ++#: ../src/bc.c:127 +msgid "ISBN +5" +msgstr "ISBN +5" + - #: ../src/bc.c:127 ++#: ../src/bc.c:130 +msgid "Code 39" +msgstr "Code 39" + - #: ../src/bc.c:130 ++#: ../src/bc.c:133 +msgid "Code 128" +msgstr "Code 128" + - #: ../src/bc.c:133 ++#: ../src/bc.c:136 +msgid "Code 128C" +msgstr "Code 128C" + - #: ../src/bc.c:136 ++#: ../src/bc.c:139 +msgid "Code 128B" +msgstr "Code 128B" + - #: ../src/bc.c:139 ++#: ../src/bc.c:142 +msgid "Interleaved 2 of 5" +msgstr "Entrelacé 2 de 5" + - #: ../src/bc.c:142 ++#: ../src/bc.c:145 +msgid "Codabar" +msgstr "Code-barre" + - #: ../src/bc.c:145 ++#: ../src/bc.c:148 +msgid "MSI" +msgstr "MSI" + - #: ../src/bc.c:148 ++#: ../src/bc.c:151 +msgid "Plessey" +msgstr "Plessey" + - #: ../src/bc.c:151 ++#: ../src/bc.c:154 +msgid "IEC16022 (DataMatrix)" +msgstr "IEC16022 (DataMatrix)" + - #: ../src/label.c:513 ++#: ../src/label.c:531 +msgid "Untitled" +msgstr "Sans titre" + +# src/item_barcode.c:316 +# src/item_barcode.c:317 +# src/item_barcode.c:299 +# src/item_barcode.c:299 - #: ../src/label-barcode.c:415 ++#: ../src/label-barcode.c:426 +msgid "Barcode data empty" +msgstr "Données de code-barre vides" + +# src/item_barcode.c:564 src/item_barcode.c:588 src/print.c:641 +# src/item_barcode.c:570 src/item_barcode.c:594 src/print.c:641 +# src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:799 +# src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:600 - #: ../src/label-barcode.c:419 ++#: ../src/label-barcode.c:430 +msgid "Invalid barcode data" +msgstr "Données de code-barre invalides" + +# src/label.c:186 src/label.c:211 +# src/label.c:186 src/label.c:211 +# src/label.c:170 src/label.c:194 +# src/label.c:168 src/label.c:192 - #: ../src/xml-label.c:188 ../src/xml-label.c:225 ++#: ../src/xml-label.c:189 ../src/xml-label.c:226 +msgid "xmlParseFile error" +msgstr "erreur xmlParseFile" + +# src/label.c:243 +# src/label.c:244 +# src/label.c:225 +# src/label.c:223 +#: ../src/xml-label.c:262 +msgid "No document root" +msgstr "Pas de racine de document" + - #: ../src/xml-label.c:276 ++#: ../src/xml-label.c:270 +msgid "Importing from glabels 0.1 format" +msgstr "Import depuis le format glabels 0.1" + - #: ../src/xml-label.c:284 ++#: ../src/xml-label.c:279 +msgid "Importing from glabels 0.4 format" +msgstr "Import depuis le format glabels 0.4" + +# src/label.c:248 +# src/label.c:249 +# src/label.c:236 +# src/label.c:234 - #: ../src/xml-label.c:287 - msgid "bad document, unknown glabels Namespace" - msgstr "document de type erroné, espace de noms glabels inconnu" ++#: ../src/xml-label.c:288 ++#, c-format ++msgid "Unknown glabels Namespace -- Using %s" ++msgstr "Espace de nom glabels inconnu -- Utilisation de %s" + +# src/label.c:253 +# src/label.c:254 +# src/label.c:241 +# src/label.c:239 - #: ../src/xml-label.c:315 ../src/xml-label-04.c:78 ++#: ../src/xml-label.c:319 ../src/xml-label-04.c:79 +#, c-format +msgid "Bad root node = \"%s\"" +msgstr "Mauvais noeud racine = \"%s\"" + +# src/label.c:253 +# src/label.c:254 +# src/label.c:241 +# src/label.c:239 - #: ../src/xml-label.c:352 ++#: ../src/xml-label.c:356 +#, c-format +msgid "bad node in Document node = \"%s\"" +msgstr "Mauvais noeud racine = \"%s\"" + +# src/label.c:298 +# src/label.c:301 +# src/label.c:294 +# src/label.c:290 - #: ../src/xml-label.c:397 ../src/xml-label-04.c:126 ++#: ../src/xml-label.c:401 ../src/xml-label-04.c:127 +#, c-format +msgid "bad node = \"%s\"" +msgstr "mauvais noeud = \"%s\"" + +# src/label.c:298 +# src/label.c:301 +# src/label.c:294 +# src/label.c:290 - #: ../src/xml-label.c:836 ++#: ../src/xml-label.c:840 +#, c-format +msgid "bad node in Data node = \"%s\"" +msgstr "mauvais noeud de données = \"%s\"" + - #: ../src/xml-label.c:1073 ../libglabels/xml-template.c:585 ++#: ../src/xml-label.c:1077 ../libglabels/xml-template.c:670 +msgid "Utf8 conversion error." +msgstr "Erreur de conversion Utf8" + +# src/label.c:487 +# src/label.c:493 +# src/label.c:589 +# src/label.c:587 - #: ../src/xml-label.c:1080 ../libglabels/xml-template.c:592 ++#: ../src/xml-label.c:1084 +msgid "Problem saving xml file." +msgstr "Problème de sauvegarde du fichier xml." + +# src/merge.c:80 +# src/merge.c:78 +#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378 +msgid "None" +msgstr "Aucun" + +# src/merge.c:98 +# src/merge.c:94 +#: ../src/merge-init.c:59 +msgid "Text file with comma delimeters (CSV)" +msgstr "Texte séparé par des virgules (CSV)" + +# src/merge.c:107 +# src/merge.c:102 +#: ../src/merge-init.c:66 +msgid "Text file with colon delimeters" +msgstr "Texte séparé par des deux-points" + +# src/merge.c:89 +# src/merge.c:86 +#: ../src/merge-init.c:73 +msgid "Text file with tab delimeters" +msgstr "Texte avec séparateurs de tabulation" + +#: ../src/merge-init.c:82 +msgid "Data from default Evolution Addressbook" +msgstr "Données du carnet d'adresses Evolution par défaut" + +#: ../src/merge-init.c:88 +msgid "Data from a file containing VCards" +msgstr "Données d'un fichier de VCards" + - #: ../src/merge-evolution.c:278 ++#: ../src/merge-evolution.c:309 +msgid "Couldn't construct query" +msgstr "Impossible de construire la requête" + +# src/file.c:214 +# src/file.c:214 +# src/file.c:249 +# src/file.c:249 +# c-format - #: ../src/merge-evolution.c:284 ../src/merge-evolution.c:291 - #, c-format - msgid "Couldn't open addressbook: %s" - msgstr "Impossible d'ouvrir le carnet d'adresses : %s" ++#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326 ++msgid "Couldn't open addressbook." ++msgstr "Impossible d'ouvrir le carnet d'adresses." + +# src/file.c:248 src/mdi.c:635 +# src/file.c:248 src/mdi.c:641 +# src/file.c:288 src/mdi.c:601 +# src/file.c:288 src/mdi.c:601 - #: ../src/merge-evolution.c:303 - #, c-format - msgid "Couldn't list available fields: %s" - msgstr "Impossible d'énumérer les champs disponibles : %s" ++#: ../src/merge-evolution.c:341 ++msgid "Couldn't list available fields." ++msgstr "Impossible d'énumérer les champs disponibles." + - #: ../src/merge-evolution.c:335 - #, c-format - msgid "Couldn't get contacts: %s" - msgstr "Impossible d'obtenir les contacts : %s" ++#: ../src/merge-evolution.c:377 ++msgid "Couldn't get contacts." ++msgstr "Impossible d'obtenir les contacts." + +# src/print_copies.c:193 +# src/print_copies.c:193 +# src/print_copies.c:171 +# src/print_copies.c:170 +#: ../src/wdgt-print-copies.c:153 +msgid "Sheets:" +msgstr "Feuilles :" + +# src/print_copies.c:213 +# src/print_copies.c:213 +# src/print_copies.c:191 +# src/print_copies.c:190 +#: ../src/wdgt-print-copies.c:173 +msgid "from:" +msgstr "de :" + +# src/print_copies.c:221 +# src/print_copies.c:221 +# src/print_copies.c:199 +# src/print_copies.c:198 - #: ../src/wdgt-print-copies.c:179 ++#: ../src/wdgt-print-copies.c:178 +msgid "to:" +msgstr "à :" + +# src/print_copies_merge.c:197 +# src/print_merge.c:170 +#: ../src/wdgt-print-merge.c:154 +msgid "Start on label" +msgstr "Commencer par l'étiquette" + +# src/print_copies_merge.c:206 +# src/print_merge.c:179 - #: ../src/wdgt-print-merge.c:162 ++#: ../src/wdgt-print-merge.c:159 +msgid "on 1st sheet" +msgstr "en 1ère page" + +# src/print.c:153 +# src/print.c:153 +# src/print_copies_merge.c:173 +# src/print_merge.c:195 - #: ../src/wdgt-print-merge.c:171 ++#: ../src/wdgt-print-merge.c:168 +msgid "Copies:" +msgstr "Copies :" + +# src/rotate_select.c:187 +# src/rotate_select.c:187 +# src/print_copies_merge.c:186 +# src/print_merge.c:188 - #: ../src/wdgt-print-merge.c:177 ++#: ../src/wdgt-print-merge.c:173 +msgid "Collate" +msgstr "Assembler" + - #: ../src/wdgt-media-select.c:229 ../src/wdgt-media-select.c:238 - #: ../src/wdgt-media-select.c:241 ../src/wdgt-media-select.c:465 - #: ../src/wdgt-media-select.c:474 ++#: ../src/wdgt-media-select.c:288 ../src/wdgt-media-select.c:292 ++#: ../src/wdgt-media-select.c:297 ../src/wdgt-media-select.c:306 ++#: ../src/wdgt-media-select.c:309 ../src/wdgt-media-select.c:402 ++#: ../src/wdgt-media-select.c:609 ../src/wdgt-media-select.c:618 +msgid "Any" +msgstr "Tous" + +# src/media_select.c:515 +# src/media_select.c:481 +# src/media_select.c:353 - #: ../src/wdgt-media-select.c:499 ++#: ../src/wdgt-media-select.c:643 +#, c-format +msgid "%d per sheet" +msgstr "%d par feuille" + +# src/media_select.c:522 +# src/media_select.c:488 +# src/media_select.c:367 - #: ../src/wdgt-media-select.c:529 ++#: ../src/wdgt-media-select.c:673 +#, c-format +msgid "%s x %s %s" +msgstr "%s x %s %s" + +# src/media_select.c:522 +# src/media_select.c:488 +# src/media_select.c:372 - #: ../src/wdgt-media-select.c:534 ++#: ../src/wdgt-media-select.c:678 +#, c-format +msgid "%.5g x %.5g %s" +msgstr "%.5g x %.5g %s" + - #: ../src/wdgt-media-select.c:545 ../src/wdgt-media-select.c:559 ++#: ../src/wdgt-media-select.c:689 ../src/wdgt-media-select.c:703 +#, c-format +msgid "%s %s diameter" +msgstr "%s %s diamètre" + - #: ../src/wdgt-media-select.c:549 ../src/wdgt-media-select.c:563 ++#: ../src/wdgt-media-select.c:693 ../src/wdgt-media-select.c:707 +#, c-format +msgid "%.5g %s diameter" +msgstr "%.5g %s diamètre" + - #: ../src/wdgt-media-select.c:638 ++#: ../src/wdgt-media-select.c:781 ++msgid "No recent templates found." ++msgstr "Aucun patron récent trouvé." ++ ++#: ../src/wdgt-media-select.c:782 ++msgid "Try selecting a template from the \"Search all templates\" page." ++msgstr "Essayez de sélectionner un patron dans l'onglet « Tous les patrons »." ++ ++#: ../src/wdgt-media-select.c:861 +msgid "No match." +msgstr "Aucune correspondance." + - #: ../src/wdgt-media-select.c:639 - msgid "Try selecting a different page size or category." - msgstr "Essayez de sélectionner une taille ou une catégorie de page différente." ++#: ../src/wdgt-media-select.c:862 ++msgid "Try selecting a different brand, page size or category." ++msgstr "" ++"Essayez de sélectionner une marque, une taille de page ou une catégorie différente." + +# src/merge_ui_text.c:334 +# src/merge_ui_text.c:334 +#. This is the default custom color +#: ../src/mygal/color-palette.c:389 +msgid "custom" +msgstr "personnalisé" + +# src/prop_bc.c:204 src/prop_fill.c:186 src/prop_line.c:203 +# src/prop_text.c:263 +# src/prop_bc.c:210 src/prop_fill.c:184 src/prop_line.c:209 +# src/prop_text.c:247 +# src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 +# src/prop_text.c:234 +# src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 +# src/prop_text.c:234 +#. "Custom" color - we'll pop up a GtkColorButton +#: ../src/mygal/color-palette.c:431 +msgid "Custom Color:" +msgstr "Couleur personnalisée :" + +#: ../src/mygal/color-palette.c:439 +msgid "Choose Custom Color" +msgstr "Choisir une couleur personnalisée" + +#: ../src/mygal/color-palette.c:572 +msgid "black" +msgstr "noir" + +#: ../src/mygal/color-palette.c:573 +msgid "light brown" +msgstr "brun clair" + +#: ../src/mygal/color-palette.c:574 +msgid "brown gold" +msgstr "brun jaune" + +#: ../src/mygal/color-palette.c:575 +msgid "dark green #2" +msgstr "vert foncé n°2" + +#: ../src/mygal/color-palette.c:576 +msgid "navy" +msgstr "bleu marine" + +#: ../src/mygal/color-palette.c:577 ../src/mygal/color-palette.c:633 +msgid "dark blue" +msgstr "bleu foncé" + +#: ../src/mygal/color-palette.c:578 +msgid "purple #2" +msgstr "violet n°2" + +#: ../src/mygal/color-palette.c:579 +msgid "very dark gray" +msgstr "gris très foncé" + +#: ../src/mygal/color-palette.c:582 ../src/mygal/color-palette.c:638 +msgid "dark red" +msgstr "rouge foncé" + +#: ../src/mygal/color-palette.c:583 +msgid "red-orange" +msgstr "rouge orange" + +#: ../src/mygal/color-palette.c:584 +msgid "gold" +msgstr "jaune" + +#: ../src/mygal/color-palette.c:585 +msgid "dark green" +msgstr "vert foncé" + +#: ../src/mygal/color-palette.c:586 ../src/mygal/color-palette.c:639 +msgid "dull blue" +msgstr "bleu pâle" + +#: ../src/mygal/color-palette.c:587 ../src/mygal/color-palette.c:640 +msgid "blue" +msgstr "bleu" + +#: ../src/mygal/color-palette.c:588 +msgid "dull purple" +msgstr "violet pâle" + +#: ../src/mygal/color-palette.c:589 +msgid "dark grey" +msgstr "gris foncé" + +#: ../src/mygal/color-palette.c:592 +msgid "red" +msgstr "rouge" + +#: ../src/mygal/color-palette.c:593 +msgid "orange" +msgstr "orange" + +#: ../src/mygal/color-palette.c:594 +msgid "lime" +msgstr "tilleul" + +#: ../src/mygal/color-palette.c:595 +msgid "dull green" +msgstr "vert pâle" + +#: ../src/mygal/color-palette.c:596 +msgid "dull blue #2" +msgstr "bleu pâle n°2" + +#: ../src/mygal/color-palette.c:597 +msgid "sky blue #2" +msgstr "bleu ciel n°2" + +#: ../src/mygal/color-palette.c:598 ../src/mygal/color-palette.c:637 +msgid "purple" +msgstr "violet" + +#: ../src/mygal/color-palette.c:599 +msgid "gray" +msgstr "gris" + +# src/item_image.c:283 +# src/item_image.c:283 +# src/item_image.c:268 src/menu.c:113 +# src/item_image.c:268 src/menu.c:113 +#: ../src/mygal/color-palette.c:602 ../src/mygal/color-palette.c:634 +msgid "magenta" +msgstr "magenta" + +#: ../src/mygal/color-palette.c:603 +msgid "bright orange" +msgstr "orange vif" + +#: ../src/mygal/color-palette.c:604 ../src/mygal/color-palette.c:635 +msgid "yellow" +msgstr "jaune" + +# src/prop_vector.c:245 +# src/prop_vector.c:224 +# src/prop_vector.c:224 +#: ../src/mygal/color-palette.c:605 +msgid "green" +msgstr "vert" + +#: ../src/mygal/color-palette.c:606 ../src/mygal/color-palette.c:636 +msgid "cyan" +msgstr "cyan" + +#: ../src/mygal/color-palette.c:607 +msgid "bright blue" +msgstr "bleu vif" + +#: ../src/mygal/color-palette.c:608 ../src/mygal/color-palette.c:625 +msgid "red purple" +msgstr "rouge violet" + +#: ../src/mygal/color-palette.c:609 +msgid "light grey" +msgstr "gris clair" + +#: ../src/mygal/color-palette.c:612 ../src/mygal/color-palette.c:629 +msgid "pink" +msgstr "rose" + +#: ../src/mygal/color-palette.c:613 +msgid "light orange" +msgstr "orange clair" + +#: ../src/mygal/color-palette.c:614 ../src/mygal/color-palette.c:626 +msgid "light yellow" +msgstr "jaune clair" + +#: ../src/mygal/color-palette.c:615 +msgid "light green" +msgstr "vert clair" + +#: ../src/mygal/color-palette.c:616 +msgid "light cyan" +msgstr "cyan clair" + +#: ../src/mygal/color-palette.c:617 ../src/mygal/color-palette.c:627 +msgid "light blue" +msgstr "bleu clair" + +#: ../src/mygal/color-palette.c:618 ../src/mygal/color-palette.c:631 +msgid "light purple" +msgstr "violet clair" + +#: ../src/mygal/color-palette.c:619 +msgid "white" +msgstr "blanc" + +#: ../src/mygal/color-palette.c:624 +msgid "purplish blue" +msgstr "bleu violacé" + +#: ../src/mygal/color-palette.c:628 +msgid "dark purple" +msgstr "violet foncé" + +#: ../src/mygal/color-palette.c:630 +msgid "sky blue" +msgstr "bleu ciel" + +#: ../src/critical-error-handler.c:73 +msgid "gLabels Fatal Error!" +msgstr "Erreur fatale de gLabels !" + +# src/preferences.c:92 +# src/prefs.c:101 +# src/prefs.c:92 +# src/prefs.c:86 +#: ../src/warning-handler.c:73 +msgid "gLabels Error!" +msgstr "Erreur de gLabels !" + - #: ../libglabels/category.c:352 ++#. Create and append an "Other" entry. ++#: ../libglabels/db.c:118 ++msgid "Other" ++msgstr "Autre" ++ ++# src/prop_text_entry.c:196 ++# src/prop_text_entry.c:196 ++#. Create and append a "User defined" entry. ++#: ../libglabels/db.c:131 ++msgid "User defined" ++msgstr "Défini par l'utilisateur" ++ ++#: ../libglabels/db.c:482 +msgid "" - "Unable to locate category definitions. Libglabels may not be installed " ++"Unable to locate paper size definitions. Libglabels may not be installed " +"correctly!" - msgstr "Impossible de trouver les définitions de catégorie. Il se peut que Libglabels ne soit pas correctement installé." ++msgstr "" ++"Impossible de trouver les définitions de tailles de papier. Il se peut que " ++"Libglabels ne soit pas correctement installé." + - #: ../libglabels/template.c:940 - #, c-format - msgid "Generic %s full page" - msgstr "Page entière générique %s" ++#: ../libglabels/db.c:875 ++msgid "" ++"Unable to locate category definitions. Libglabels may not be installed " ++"correctly!" ++msgstr "" ++"Impossible de trouver les définitions de catégorie. Il se peut que " ++"Libglabels ne soit pas correctement installé." + - #: ../libglabels/template.c:989 ++#: ../libglabels/db.c:1461 +msgid "" +"Unable to locate any template files. Libglabels may not be installed " +"correctly!" - msgstr "Impossible de trouver les fichiers modèles. Il se peut que Libglabels ne soit pas correctement installé." ++msgstr "" ++"Impossible de trouver les fichiers modèles. Il se peut que Libglabels ne " ++"soit pas correctement installé." + - #. Create and append an "Other" entry. - #: ../libglabels/paper.c:76 - msgid "Other" - msgstr "Autre" ++#: ../libglabels/db.c:1538 ++#, c-format ++msgid "Generic %s full page template" ++msgstr "Patron générique de page entière %s" + - #: ../libglabels/paper.c:461 - msgid "" - "Unable to locate paper size definitions. Libglabels may not be installed " - "correctly!" - msgstr "Impossible de trouver les définitions de tailles de papier. Il se peut que Libglabels ne soit pas correctement installé." ++#: ../libglabels/xml-template.c:227 ++msgid "Missing name or brand/part attributes." ++msgstr "Attribut nom ou marque manquant." + +#. This should always be an id, but just in case a name +#. slips by! - #: ../libglabels/xml-template.c:217 ++#: ../libglabels/xml-template.c:244 +#, c-format +msgid "Unknown page size id \"%s\", trying as name" +msgstr "Taille de papier avec id « %s » inconnue, essai avec le nom" + - #: ../libglabels/xml-template.c:227 ++#: ../libglabels/xml-template.c:256 +#, c-format +msgid "Unknown page size id or name \"%s\"" +msgstr "Identifiant ou nom de taille de papier « %s » inconnu" + ++#: ../libglabels/xml-template.c:615 ++msgid "" ++"Missing required \"brand\" or \"part\" attribute, trying deprecated name." ++msgstr "" ++"Attribut « brand » (marque) ou « part » (article) manquant, essai avec un " ++"ancien nom." ++ ++#: ../libglabels/xml-template.c:625 ++msgid "Name attribute also missing." ++msgstr "L'attribut nom manque également." ++ +#: ../data/glade/merge-properties-dialog.glade.h:1 +msgid "Record selection/preview" +msgstr "Sélection/Aperçu des enregistrements" + +# src/merge_properties.c:131 +# src/merge_properties.c:131 +#: ../data/glade/merge-properties-dialog.glade.h:2 +msgid "Source" +msgstr "Source" + +# src/prop_text.c:214 +# src/prop_text.c:199 +# src/merge_properties.c:143 +# src/merge_properties.c:143 +#: ../data/glade/merge-properties-dialog.glade.h:3 +msgid "Format:" +msgstr "Format :" + +# src/merge_properties.c:158 +# src/merge_properties.c:158 +#: ../data/glade/merge-properties-dialog.glade.h:4 +msgid "Location:" +msgstr "Emplacement :" + +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:85 +# src/menu.c:85 +#: ../data/glade/merge-properties-dialog.glade.h:5 +msgid "Select all" +msgstr "Tout sélectionner" + +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:85 +# src/menu.c:85 +#: ../data/glade/merge-properties-dialog.glade.h:6 +msgid "Unselect all" +msgstr "Désélectionner tout" + +#: ../data/glade/merge-properties-dialog.glade.h:7 +#: ../data/glade/object-editor.glade.h:39 +msgid "dialog1" +msgstr "dialog1" + +# src/file.c:98 +# src/file.c:98 +# src/file.c:109 +# src/file.c:109 +#: ../data/glade/new-label-dialog.glade.h:1 +msgid "Label orientation" +msgstr "Orientation de l'étiquette" + +# src/file.c:87 +# src/file.c:87 +# src/file.c:98 +# src/file.c:98 +#: ../data/glade/new-label-dialog.glade.h:2 +msgid "Media type" +msgstr "Type de média" + +# src/prop_bc.c:202 +# src/prop_bc.c:182 +# src/prop_bc.c:182 +#: ../data/glade/object-editor.glade.h:2 +#, no-c-format +msgid "%" +msgstr "%" + +#: ../data/glade/object-editor.glade.h:3 +msgid "00000000000 00000" +msgstr "00000000000 00000" + +#: ../data/glade/object-editor.glade.h:4 +msgid "Xxx object properties" +msgstr "Xxx Propriétés de l'objet" + +# src/prop_text.c:277 +# src/prop_text.c:264 +# src/prop_text.c:248 +# src/prop_text.c:248 +#: ../data/glade/object-editor.glade.h:5 ../data/glade/prefs-dialog.glade.h:7 +msgid "Alignment:" +msgstr "Alignement :" + +#: ../data/glade/object-editor.glade.h:6 +msgid "Allow merge to automatically shrink text" +msgstr "Permettre à la fusion de diminuer automatiquement la taille du texte" + +# src/prop_vector.c:207 +# src/prop_vector.c:228 +# src/prop_vector.c:207 +# src/prop_vector.c:207 +#: ../data/glade/object-editor.glade.h:7 +msgid "Angle:" +msgstr "Angle :" + +#: ../data/glade/object-editor.glade.h:8 +msgid "Checksum" +msgstr "Somme de contrôle" + +# src/prop_bc.c:204 src/prop_fill.c:186 src/prop_line.c:203 +# src/prop_text.c:263 +# src/prop_bc.c:210 src/prop_fill.c:184 src/prop_line.c:209 +# src/prop_text.c:247 +# src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 +# src/prop_text.c:234 +# src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 +# src/prop_text.c:234 +#: ../data/glade/object-editor.glade.h:9 ../data/glade/prefs-dialog.glade.h:8 +msgid "Color:" +msgstr "Couleur :" + +#: ../data/glade/object-editor.glade.h:11 +msgid "Enable shadow" +msgstr "Activer l'ombrage" + +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:258 src/item_ellipse.c:260 +# src/item_box.c:258 src/item_ellipse.c:260 +#: ../data/glade/object-editor.glade.h:12 +msgid "Family:" +msgstr "Famille :" + +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:258 src/item_ellipse.c:260 +# src/item_box.c:258 src/item_ellipse.c:260 +#: ../data/glade/object-editor.glade.h:13 +msgid "File:" +msgstr "Fichier :" + +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:274 src/item_ellipse.c:279 +# src/item_box.c:258 src/item_ellipse.c:260 +# src/item_box.c:258 src/item_ellipse.c:260 +#: ../data/glade/object-editor.glade.h:14 +msgid "Fill" +msgstr "Remplissage" + +# src/prop_size.c:220 +# src/prop_size.c:198 +# src/prop_size.c:198 +#: ../data/glade/object-editor.glade.h:15 - #: ../data/glade/template-designer.glade.h:31 ++#: ../data/glade/template-designer.glade.h:30 +msgid "Height:" +msgstr "Hauteur :" + +# src/prop_text_entry.c:196 +# src/prop_text_entry.c:196 +#: ../data/glade/object-editor.glade.h:17 +msgid "Insert merge field" +msgstr "Insérer un champ de fusion" + +# src/prop_bc_data.c:196 src/prop_text_entry.c:180 +# src/prop_bc_data.c:196 src/prop_text_entry.c:180 +#: ../data/glade/object-editor.glade.h:18 +msgid "Key:" +msgstr "Clé :" + +# src/prop_vector.c:196 +# src/prop_vector.c:202 +# src/prop_vector.c:183 +# src/prop_vector.c:183 +#: ../data/glade/object-editor.glade.h:19 +msgid "Length:" +msgstr "Longueur :" + +#: ../data/glade/object-editor.glade.h:21 +#: ../data/glade/prefs-dialog.glade.h:12 +msgid "Line Spacing:" +msgstr "Espacement :" + +# src/prop_bc_data.c:176 +# src/prop_bc_data.c:176 +#: ../data/glade/object-editor.glade.h:22 +msgid "Literal:" +msgstr "Littéral :" + +#: ../data/glade/object-editor.glade.h:23 +msgid "Opacity:" +msgstr "Opacité :" + +# src/item_barcode.c:362 src/item_barcode.c:365 src/item_box.c:291 +# src/item_ellipse.c:296 src/item_image.c:315 src/item_line.c:289 +# src/item_text.c:487 src/item_text.c:490 +# src/item_barcode.c:368 src/item_barcode.c:371 src/item_box.c:291 +# src/item_ellipse.c:296 src/item_image.c:315 src/item_line.c:289 +# src/item_text.c:487 src/item_text.c:490 +# src/item_barcode.c:345 src/item_barcode.c:348 src/item_box.c:275 +# src/item_ellipse.c:277 src/item_image.c:318 src/item_line.c:274 +# src/item_text.c:500 src/item_text.c:503 +# src/item_barcode.c:345 src/item_barcode.c:348 src/item_box.c:275 +# src/item_ellipse.c:277 src/item_image.c:318 src/item_line.c:274 +# src/item_text.c:500 src/item_text.c:503 +#: ../data/glade/object-editor.glade.h:24 +msgid "Position" +msgstr "Position" + +# src/item_image.c:341 +# src/item_image.c:340 +# src/item_image.c:342 +# src/item_image.c:342 +#: ../data/glade/object-editor.glade.h:25 +msgid "Reset image size" +msgstr "Restaurer la taille d'image" + +# src/menu.c:86 +# src/menu.c:86 +# src/menu.c:85 +# src/menu.c:85 +#: ../data/glade/object-editor.glade.h:26 +msgid "Select A File" +msgstr "Sélectionner un fichier" + +#: ../data/glade/object-editor.glade.h:27 +msgid "Shadow" +msgstr "Ombre" + +# src/item_box.c:302 src/item_ellipse.c:307 src/item_image.c:326 +# src/item_line.c:300 +# src/item_box.c:302 src/item_ellipse.c:307 src/item_image.c:326 +# src/item_line.c:300 +# src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 +# src/item_line.c:285 +# src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 +# src/item_line.c:285 +#: ../data/glade/object-editor.glade.h:28 +msgid "Size" +msgstr "Taille" + +# src/item_box.c:302 src/item_ellipse.c:307 src/item_image.c:326 +# src/item_line.c:300 +# src/item_box.c:302 src/item_ellipse.c:307 src/item_image.c:326 +# src/item_line.c:300 +# src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 +# src/item_line.c:285 +# src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 +# src/item_line.c:285 +#: ../data/glade/object-editor.glade.h:29 +msgid "Size:" +msgstr "Taille :" + +# src/item_barcode.c:347 +# src/item_barcode.c:353 +# src/item_barcode.c:330 +# src/item_barcode.c:330 +#: ../data/glade/object-editor.glade.h:30 +msgid "Style" +msgstr "Style" + +# src/item_barcode.c:347 +# src/item_barcode.c:353 +# src/item_barcode.c:330 +# src/item_barcode.c:330 +#: ../data/glade/object-editor.glade.h:31 +msgid "Style:" +msgstr "Style :" + +# src/prop_line.c:188 +# src/prop_line.c:187 src/prop_size.c:202 +# src/prop_line.c:169 src/prop_size.c:182 +# src/prop_line.c:169 src/prop_size.c:182 +#: ../data/glade/object-editor.glade.h:33 +#: ../data/glade/prefs-dialog.glade.h:20 - #: ../data/glade/template-designer.glade.h:62 ++#: ../data/glade/template-designer.glade.h:61 +msgid "Width:" +msgstr "Largeur :" + +#: ../data/glade/object-editor.glade.h:34 +msgid "X Offset:" +msgstr "Décalage X :" + +# src/prop_position.c:192 +# src/prop_position.c:173 +# src/prop_position.c:173 +#: ../data/glade/object-editor.glade.h:35 +msgid "X:" +msgstr "X :" + +#: ../data/glade/object-editor.glade.h:36 +msgid "Y Offset:" +msgstr "Décalage Y :" + +# src/prop_position.c:212 +# src/prop_position.c:191 +# src/prop_position.c:191 +#: ../data/glade/object-editor.glade.h:37 +msgid "Y:" +msgstr "Y :" + +# src/prop_vector.c:245 +# src/prop_vector.c:224 +# src/prop_vector.c:224 +#: ../data/glade/object-editor.glade.h:38 +msgid "degrees" +msgstr "degrés" + +#: ../data/glade/object-editor.glade.h:40 +msgid "digits:" - msgstr "" ++msgstr "chiffres :" + +# src/prop_text.c:214 +# src/prop_text.c:199 +# src/merge_properties.c:143 +# src/merge_properties.c:143 +#: ../data/glade/object-editor.glade.h:41 +msgid "format:" +msgstr "format :" + +#: ../data/glade/prefs-dialog.glade.h:1 +msgid " " +msgstr " " + +#: ../data/glade/prefs-dialog.glade.h:2 +msgid "Default page size" +msgstr "Taille de page par défaut" + +#: ../data/glade/prefs-dialog.glade.h:3 +msgid "Fill" +msgstr "Remplissage" + +#: ../data/glade/prefs-dialog.glade.h:4 +msgid "Line" +msgstr "Ligne" + +#: ../data/glade/prefs-dialog.glade.h:5 +msgid "Text" +msgstr "Texte" + +#: ../data/glade/prefs-dialog.glade.h:6 +msgid "Units" +msgstr "Unités" + +# src/prop_text.c:214 +# src/prop_text.c:199 +# src/prop_text.c:181 +# src/prop_text.c:181 +#: ../data/glade/prefs-dialog.glade.h:9 +msgid "Font:" +msgstr "Police :" + +#: ../data/glade/prefs-dialog.glade.h:10 +msgid "ISO A4" +msgstr "ISO A4" + +# src/prefs.c:265 +# src/prefs.c:243 +# src/prefs.c:237 +#: ../data/glade/prefs-dialog.glade.h:11 +msgid "Inches" +msgstr "Pouces" + +# src/prop_bc.c:189 +# src/prop_bc.c:187 +# src/prop_bc.c:168 +# src/prop_bc.c:168 +#: ../data/glade/prefs-dialog.glade.h:13 +msgid "Locale" +msgstr "Localisation" + +# src/prefs.c:271 +# src/prefs.c:250 +# src/prefs.c:244 +#: ../data/glade/prefs-dialog.glade.h:14 +msgid "Millimeters" +msgstr "Millimètres" + +#: ../data/glade/prefs-dialog.glade.h:15 +msgid "Object defaults" +msgstr "Paramètres par défaut pour les objets" + +# src/print.c:149 +# src/prefs.c:259 +# src/prefs.c:237 +# src/prefs.c:231 +#: ../data/glade/prefs-dialog.glade.h:16 +msgid "Points" +msgstr "Points" + +#: ../data/glade/prefs-dialog.glade.h:17 +msgid "Select default properties for new objects." +msgstr "Sélectionner les propriétés par défaut pour les nouveaux objets." + +#: ../data/glade/prefs-dialog.glade.h:18 +msgid "Select locale specific behavior." +msgstr "Sélectionnez les paramètres de localisation" + +#. Most popular (at top of list) +#: ../data/glade/prefs-dialog.glade.h:19 +#: ../data/templates/paper-sizes.xml.h:29 +msgid "US Letter" +msgstr "Letter US" + +# src/print.c:171 +# src/print.c:171 +# src/print.c:186 +# src/print_dialog.c:141 +#: ../data/glade/print-custom-widget.glade.h:1 +msgid "Options" +msgstr "Options" + +#: ../data/glade/print-custom-widget.glade.h:2 +msgid "Print control (Merge)" +msgstr "Contrôle d'impression (fusion)" + +#: ../data/glade/print-custom-widget.glade.h:3 +msgid "Print control (Simple)" +msgstr "Contrôle d'impression (simple)" + +#: ../data/glade/property-bar.glade.h:1 +msgid "Bold" +msgstr "Gras" + +# src/item_barcode.c:337 +# src/item_barcode.c:343 src/prefs.c:243 +# src/item_barcode.c:320 src/prefs.c:221 +# src/item_barcode.c:320 src/prefs.c:215 +#: ../data/glade/property-bar.glade.h:2 +msgid "Center align" +msgstr "Centrer" + +# src/mdi.c:482 +# src/mdi.c:488 +# src/mdi.c:459 +# src/mdi.c:459 +#: ../data/glade/property-bar.glade.h:4 +msgid "Font family" +msgstr "Famille de police" + +# src/mdi.c:482 +# src/mdi.c:488 +# src/mdi.c:459 +# src/mdi.c:459 +#: ../data/glade/property-bar.glade.h:5 +msgid "Font size" +msgstr "Taille de police" + +#: ../data/glade/property-bar.glade.h:6 +msgid "Italic" +msgstr "Italique" + +#: ../data/glade/property-bar.glade.h:7 +msgid "Left align" +msgstr "Aligner à gauche" + +#: ../data/glade/property-bar.glade.h:9 +msgid "Line width" +msgstr "Largeur de la ligne" + +#: ../data/glade/property-bar.glade.h:10 +msgid "Right align" +msgstr "Aligner à droite" + +#: ../data/glade/property-bar.glade.h:11 +msgid "Text Color" +msgstr "Couleur du texte" + +#: ../data/glade/property-bar.glade.h:12 +msgid "Text color" +msgstr "Couleur du texte" + +#: ../data/glade/template-designer.glade.h:1 - msgid " " - msgstr " " - - #: ../data/glade/template-designer.glade.h:2 +msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)" +msgstr "(ex : « Étiquettes de publipostage », « Cartes de visite », ...)" + - #: ../data/glade/template-designer.glade.h:3 ++#: ../data/glade/template-designer.glade.h:2 +msgid "(e.g., 8163A)" +msgstr "(ex : 8163A)" + - #: ../data/glade/template-designer.glade.h:4 ++#: ../data/glade/template-designer.glade.h:3 +msgid "(e.g., Avery, Acme, ...)" +msgstr "(ex : Avery, Acme, ...)" + - #: ../data/glade/template-designer.glade.h:5 ++#: ../data/glade/template-designer.glade.h:4 +msgid "1. Outer radius:" +msgstr "1. Rayon extérieur :" + - #: ../data/glade/template-designer.glade.h:6 ++#: ../data/glade/template-designer.glade.h:5 +msgid "1. Radius:" +msgstr "1. Rayon :" + +# src/prop_line.c:188 +# src/prop_line.c:187 src/prop_size.c:202 +# src/prop_line.c:169 src/prop_size.c:182 +# src/prop_line.c:169 src/prop_size.c:182 - #: ../data/glade/template-designer.glade.h:7 ++#: ../data/glade/template-designer.glade.h:6 +msgid "1. Width:" +msgstr "1. Largeur :" + +# src/prop_size.c:220 +# src/prop_size.c:198 +# src/prop_size.c:198 - #: ../data/glade/template-designer.glade.h:8 ++#: ../data/glade/template-designer.glade.h:7 +msgid "2. Height:" +msgstr "2. Hauteur :" + - #: ../data/glade/template-designer.glade.h:9 ++#: ../data/glade/template-designer.glade.h:8 +msgid "2. Inner radius:" +msgstr "2. Rayon Intérieur :" + - #: ../data/glade/template-designer.glade.h:10 ++#: ../data/glade/template-designer.glade.h:9 +msgid "2. Waste (overprint allowed):" +msgstr "2. Déchet (impression en surcharge autorisée) :" + - #: ../data/glade/template-designer.glade.h:11 ++#: ../data/glade/template-designer.glade.h:10 +msgid "3. Clipping width:" +msgstr "3. Largeur de rognure :" + - #: ../data/glade/template-designer.glade.h:12 ++#: ../data/glade/template-designer.glade.h:11 +msgid "3. Margin" +msgstr "3. Marge" + - #: ../data/glade/template-designer.glade.h:13 ++#: ../data/glade/template-designer.glade.h:12 +msgid "3. Round (radius of corner):" +msgstr "3. Arrondi (rayon du coin) :" + - #: ../data/glade/template-designer.glade.h:14 ++#: ../data/glade/template-designer.glade.h:13 +msgid "4. Clipping height:" +msgstr "4. Hauteur de rognure :" + - #: ../data/glade/template-designer.glade.h:15 ++#: ../data/glade/template-designer.glade.h:14 +msgid "4. Horiz. waste (overprint allowed):" +msgstr "4. Déchet horiz. (impression en surcharge autorisée) :" + - #: ../data/glade/template-designer.glade.h:16 ++#: ../data/glade/template-designer.glade.h:15 +msgid "5. Vert. waste (overprint allowed):" +msgstr "5. Déchet vert. (impression en surcharge autorisée) :" + - #: ../data/glade/template-designer.glade.h:17 ++#: ../data/glade/template-designer.glade.h:16 +msgid "5. Waste (overprint allowed):" +msgstr "5. Déchet (impression en surcharge autorisée) :" + - #: ../data/glade/template-designer.glade.h:18 ++#: ../data/glade/template-designer.glade.h:17 +msgid "6. Margin" +msgstr "6. Marge" + - #: ../data/glade/template-designer.glade.h:19 ++#: ../data/glade/template-designer.glade.h:18 +msgid "Brand/Manufacturer:" +msgstr "Marque/Fabricant :" + - #: ../data/glade/template-designer.glade.h:20 ++#: ../data/glade/template-designer.glade.h:19 +msgid "CD/DVD (including credit card CDs)" +msgstr "CD/DVD (y compris CD au format carte de crédit)" + - #: ../data/glade/template-designer.glade.h:21 ++#: ../data/glade/template-designer.glade.h:20 +msgid "" +"Congratulations!\n" +"\n" +"You have completed the gLabels Template Designer.\n" +"If you wish to accept and save your design, click \"Apply.\"\n" +"\n" +"Otherwise, you may click \"Cancel\" to abandon your design\n" +"or \"Back\" to continue editing this design." +msgstr "" +"Félicitations !\n" +"Vous avez terminé la création d'un patron gLabels.\n" +"Si vous voulez accepter et sauver votre création, cliquez sur « Appliquer ».\n" +"\n" +"Dans le cas contraire, vous pouvez cliquer sur « Annuler » pour abandonner " +"votre création ou « Précédent » pour continuer d'éditer cette création." + +# src/media_select.c:216 +# src/media_select.c:242 +# src/media_select.c:222 +# src/media_select.c:222 - #: ../data/glade/template-designer.glade.h:28 ++#: ../data/glade/template-designer.glade.h:27 +msgid "Description:" +msgstr "Description :" + - #: ../data/glade/template-designer.glade.h:29 ++#: ../data/glade/template-designer.glade.h:28 +msgid "Distance from left edge (x0):" +msgstr "Distance par rapport au bord gauche (x0) :" + - #: ../data/glade/template-designer.glade.h:30 ++#: ../data/glade/template-designer.glade.h:29 +msgid "Distance from top edge (y0):" +msgstr "Distance pas rapport au bord haut (y0) :" + - #: ../data/glade/template-designer.glade.h:32 ++#: ../data/glade/template-designer.glade.h:31 +msgid "Horizontal pitch (dx):" +msgstr "Espacement horizontal (dx) :" + - #: ../data/glade/template-designer.glade.h:33 ++#: ../data/glade/template-designer.glade.h:32 +msgid "" +"How many layouts will your template contain? \n" +"\n" +"A layout is a set of labels or cards that can be arranged in a simple grid.\n" +"Most templates only need one layout, as in the first example.\n" +"The second example illustrates when two layouts are needed." +msgstr "" +"Combien de dispositions votre patron contiendra-t-il ?\n" +"\n" +"Une disposition est un ensemble d'étiquettes ou de cartes qui peuvent être " +"rangés sur une simple grille.\n" +"La plupart des patrons n'ont besoin que d'une disposition, comme pour le " +"premier exemple.\n" +"Le deuxième exemple illustre le cas où deux dispositions sont nécessaires." + +# src/media_select.c:231 +# src/media_select.c:257 +# src/media_select.c:237 +# src/media_select.c:237 - #: ../data/glade/template-designer.glade.h:38 ++#: ../data/glade/template-designer.glade.h:37 +msgid "Layout #1" +msgstr "Disposition n°1" + +# src/media_select.c:231 +# src/media_select.c:257 +# src/media_select.c:237 +# src/media_select.c:237 - #: ../data/glade/template-designer.glade.h:39 ++#: ../data/glade/template-designer.glade.h:38 +msgid "Layout #2" +msgstr "Disposition n°2" + - #: ../data/glade/template-designer.glade.h:40 ++#: ../data/glade/template-designer.glade.h:39 +msgid "Number across (nx):" +msgstr "Nombre horizontalement (nx) :" + - #: ../data/glade/template-designer.glade.h:41 ++#: ../data/glade/template-designer.glade.h:40 +msgid "Number down (ny):" +msgstr "Nombre verticalement (ny) :" + - #: ../data/glade/template-designer.glade.h:42 ++#: ../data/glade/template-designer.glade.h:41 +msgid "Number of layouts:" +msgstr "Nombre de dispositions :" + +# src/media_select.c:221 +# src/media_select.c:247 +# src/media_select.c:227 +# src/media_select.c:227 - #: ../data/glade/template-designer.glade.h:43 - #: ../data/glade/wdgt-media-select.glade.h:2 ++#: ../data/glade/template-designer.glade.h:42 ++#: ../data/glade/wdgt-media-select.glade.h:3 +msgid "Page size:" +msgstr "Taille de page :" + - #: ../data/glade/template-designer.glade.h:44 ++#: ../data/glade/template-designer.glade.h:43 +msgid "Part #:" +msgstr "N° Ref :" + - #: ../data/glade/template-designer.glade.h:45 ++#: ../data/glade/template-designer.glade.h:44 +msgid "" +"Please enter the following identifying information about the template " +"stationery." +msgstr "Entrez les informations suivantes à propos du fabricant de papier." + - #: ../data/glade/template-designer.glade.h:46 ++#: ../data/glade/template-designer.glade.h:45 +msgid "Please enter the following layout information." +msgstr "Entrez les informations suivantes sur la disposition." + - #: ../data/glade/template-designer.glade.h:47 ++#: ../data/glade/template-designer.glade.h:46 +msgid "" +"Please enter the following size parameters of a single label in your " +"template." +msgstr "Entrez les paramètres de taille suivants pour une étiquette." + - #: ../data/glade/template-designer.glade.h:48 ++#: ../data/glade/template-designer.glade.h:47 +msgid "" +"Please enter the following size parameters of a single label or card in your " +"template." - msgstr "Entrez les paramètres de taille suivant pour une carte ou une étiquette." ++msgstr "" ++"Entrez les paramètres de taille suivant pour une carte ou une étiquette." + - #: ../data/glade/template-designer.glade.h:49 ++#: ../data/glade/template-designer.glade.h:48 +msgid "Please select the basic shape of the labels or cards." +msgstr "Sélectionnez la forme de base des cartes ou des étiquettes." + - #: ../data/glade/template-designer.glade.h:50 ++#: ../data/glade/template-designer.glade.h:49 +msgid "Please select the page size of the template stationery." +msgstr "Sélectionnez la taille du papier." + +# src/print_copies_merge.c:206 +# src/print_merge.c:179 - #: ../data/glade/template-designer.glade.h:51 ++#: ../data/glade/template-designer.glade.h:50 +msgid "Print test sheet" +msgstr "Imprimer une page de tests" + - #: ../data/glade/template-designer.glade.h:52 ++#: ../data/glade/template-designer.glade.h:51 +msgid "Rectangular or square (can have rounded corners)" +msgstr "Rectangulaire ou carré (éventuellement à bords arrondis)" + - #: ../data/glade/template-designer.glade.h:53 ++#: ../data/glade/template-designer.glade.h:52 +msgid "Round" +msgstr "Rond" + - #: ../data/glade/template-designer.glade.h:54 ++#: ../data/glade/template-designer.glade.h:53 +msgid "" +"Templates needing\n" +"two layouts." +msgstr "" +"Patron nécessitant\n" +"deux dispositions." + - #: ../data/glade/template-designer.glade.h:56 ++#: ../data/glade/template-designer.glade.h:55 +msgid "" +"Templates needing only\n" +"one layout." +msgstr "" +"Patron nécessitant\n" +"une disposition." + - #: ../data/glade/template-designer.glade.h:58 ++#: ../data/glade/template-designer.glade.h:57 +msgid "Vertical pitch (dy):" +msgstr "Espacement vertical (dy) :" + - #: ../data/glade/template-designer.glade.h:59 ++#: ../data/glade/template-designer.glade.h:58 +msgid "" +"Welcome to the gLabels Template Designer.\n" +"\n" +"This dialog will assist you in the creation of a custom gLabels template." +msgstr "" +"Bienvenue dans le créateur de patrons de gLabels.\n" +"Ce questionnaire va vous aider à créer un patron personnalisé pour glabels." + - #: ../data/glade/template-designer.glade.h:63 ++#: ../data/glade/template-designer.glade.h:62 +msgid "cd_size_page" +msgstr "cd_size_page" + - #: ../data/glade/template-designer.glade.h:64 ++#: ../data/glade/template-designer.glade.h:63 +msgid "finish_page" +msgstr "finish_page" + - #: ../data/glade/template-designer.glade.h:66 ++#: ../data/glade/template-designer.glade.h:65 +msgid "layout_page" +msgstr "layout_page" + - #: ../data/glade/template-designer.glade.h:67 ++#: ../data/glade/template-designer.glade.h:66 +msgid "name_page" +msgstr "name_page" + - #: ../data/glade/template-designer.glade.h:68 ++#: ../data/glade/template-designer.glade.h:67 +msgid "nlayouts_page" +msgstr "nlayouts_page" + - #: ../data/glade/template-designer.glade.h:69 ++#: ../data/glade/template-designer.glade.h:68 +msgid "pg_size_page" +msgstr "pg_size_page" + - #: ../data/glade/template-designer.glade.h:70 ++#: ../data/glade/template-designer.glade.h:69 +msgid "rect_size_page" +msgstr "rect_size_page" + - #: ../data/glade/template-designer.glade.h:71 ++#: ../data/glade/template-designer.glade.h:70 +msgid "round_size_page" +msgstr "round_size_page" + - #: ../data/glade/template-designer.glade.h:72 ++#: ../data/glade/template-designer.glade.h:71 +msgid "shape_page" +msgstr "shape_page" + - #: ../data/glade/template-designer.glade.h:73 ++#: ../data/glade/template-designer.glade.h:72 +msgid "start_page" +msgstr "start_page" + +#: ../data/glade/wdgt-media-select.glade.h:1 ++msgid "Brand:" ++msgstr "Marque :" ++ ++#: ../data/glade/wdgt-media-select.glade.h:2 +msgid "Category:" +msgstr "Catégorie :" + ++# src/tools.c:70 ++# src/tools.c:70 ++# src/menu.c:106 src/menu.c:197 ++# src/menu.c:106 src/menu.c:197 ++#: ../data/glade/wdgt-media-select.glade.h:4 ++msgid "Recent templates" ++msgstr "Patrons récents" ++ ++#: ../data/glade/wdgt-media-select.glade.h:5 ++msgid "Search all templates" ++msgstr "Tous les patrons" ++ +# src/rotate_select.c:187 +# src/rotate_select.c:187 +# src/rotate_select.c:167 +# src/rotate_select.c:169 +#: ../data/glade/wdgt-rotate-label.glade.h:1 +msgid "Rotate" +msgstr "Rotation" + +#. Other ISO A series sizes +#: ../data/templates/paper-sizes.xml.h:2 +msgid "A0" +msgstr "A0" + +#: ../data/templates/paper-sizes.xml.h:3 +msgid "A1" +msgstr "A1" + +#: ../data/templates/paper-sizes.xml.h:4 +msgid "A10" +msgstr "A10" + +#: ../data/templates/paper-sizes.xml.h:5 +msgid "A2" +msgstr "A2" + +#: ../data/templates/paper-sizes.xml.h:6 +msgid "A3" +msgstr "A3" + +#: ../data/templates/paper-sizes.xml.h:7 +msgid "A4" +msgstr "A4" + +#: ../data/templates/paper-sizes.xml.h:8 +msgid "A5" +msgstr "A5" + +#: ../data/templates/paper-sizes.xml.h:9 +msgid "A6" +msgstr "A6" + +#: ../data/templates/paper-sizes.xml.h:10 +msgid "A7" +msgstr "A7" + +#: ../data/templates/paper-sizes.xml.h:11 +msgid "A8" +msgstr "A8" + +#: ../data/templates/paper-sizes.xml.h:12 +msgid "A9" +msgstr "A9" + +#. ISO B series sizes +#: ../data/templates/paper-sizes.xml.h:14 +msgid "B0" +msgstr "B0" + +#: ../data/templates/paper-sizes.xml.h:15 +msgid "B1" +msgstr "B1" + +#: ../data/templates/paper-sizes.xml.h:16 +msgid "B10" +msgstr "B10" + +#: ../data/templates/paper-sizes.xml.h:17 +msgid "B2" +msgstr "B2" + +#: ../data/templates/paper-sizes.xml.h:18 +msgid "B3" +msgstr "B3" + +#: ../data/templates/paper-sizes.xml.h:19 +msgid "B4" +msgstr "B4" + +#: ../data/templates/paper-sizes.xml.h:20 +msgid "B5" +msgstr "B5" + +#: ../data/templates/paper-sizes.xml.h:21 +msgid "B6" +msgstr "B6" + +#: ../data/templates/paper-sizes.xml.h:22 +msgid "B7" +msgstr "B7" + +#: ../data/templates/paper-sizes.xml.h:23 +msgid "B8" +msgstr "B8" + +#: ../data/templates/paper-sizes.xml.h:24 +msgid "B9" +msgstr "B9" + +#: ../data/templates/paper-sizes.xml.h:25 +msgid "US Executive" +msgstr "Exécutif US" + +#. Other US paper sizes +#: ../data/templates/paper-sizes.xml.h:27 +msgid "US Legal" +msgstr "Légal US" + ++#: ../data/templates/categories.xml.h:1 ++msgid "Any card" ++msgstr "Toute carte" ++ ++# src/file.c:183 ++# src/file.c:183 ++# src/file.c:213 ++# src/file.c:213 ++#: ../data/templates/categories.xml.h:2 ++msgid "Any label" ++msgstr "Toute étiquette" ++ ++#: ../data/templates/categories.xml.h:3 ++msgid "Business cards" ++msgstr "Cartes de visite" ++ ++#: ../data/templates/categories.xml.h:4 ++msgid "CD/DVD or other media" ++msgstr "CD/DVD ou autre support" ++ ++#: ../data/templates/categories.xml.h:5 ++msgid "Mailing/shipping products" ++msgstr "Produits d'expédition" ++ ++#: ../data/templates/categories.xml.h:6 ++msgid "Rectangular labels" ++msgstr "Étiquettes rectangulaires" ++ ++#: ../data/templates/categories.xml.h:7 ++msgid "Round labels" ++msgstr "Étiquettes arrondies" ++ ++# src/print_copies_merge.c:197 ++# src/print_merge.c:170 ++#: ../data/templates/categories.xml.h:8 ++msgid "Square labels" ++msgstr "Étiquettes carrées" ++ +#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:2 +#: ../data/templates/avery-us-templates.xml.h:2 ++#: ../data/templates/dymo-other-templates.xml.h:4 ++#: ../data/templates/misc-iso-templates.xml.h:2 +#: ../data/templates/zweckform-iso-templates.xml.h:2 +msgid "Address Labels" +msgstr "Étiquettes d'adresses" + +#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:4 ++msgid "Address labels" ++msgstr "Étiquettes d'adresses" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:6 ++msgid "Allround labels" ++msgstr "Étiquettes génériques" ++ +#. ============================================================ +#. =================================================================== - #. ====================================================== ++#. ******************************************************************** ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:8 +#: ../data/templates/avery-us-templates.xml.h:4 - #: ../data/templates/avery-iso-templates.xml.h:4 - #: ../data/templates/zweckform-iso-templates.xml.h:6 - #: ../data/templates/misc-us-templates.xml.h:4 +#: ../data/templates/misc-iso-templates.xml.h:12 ++#: ../data/templates/misc-us-templates.xml.h:4 ++#: ../data/templates/zweckform-iso-templates.xml.h:6 +msgid "Business Cards" +msgstr "Cartes de visite" + ++#. =============================================================== ++#: ../data/templates/avery-iso-templates.xml.h:10 ++msgid "CD Booklet" ++msgstr "Livret de CD" ++ ++#. =============================================================== ++#: ../data/templates/avery-iso-templates.xml.h:12 ++msgid "CD Inlet" ++msgstr "Jaquette de CD" ++ +# src/print_copies.c:210 +# src/print_copies.c:210 +# src/print_copies.c:188 +# src/print_copies.c:187 - #. =================================================================== +#. =============================================================== +#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:14 +#: ../data/templates/avery-us-templates.xml.h:6 - #: ../data/templates/avery-iso-templates.xml.h:10 - #: ../data/templates/zweckform-iso-templates.xml.h:8 - #: ../data/templates/misc-us-templates.xml.h:8 +#: ../data/templates/misc-iso-templates.xml.h:16 ++#: ../data/templates/misc-us-templates.xml.h:8 ++#: ../data/templates/zweckform-iso-templates.xml.h:8 +msgid "CD/DVD Labels" +msgstr "Étiquettes de CD/DVD" + ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:16 ++#: ../data/templates/avery-us-templates.xml.h:12 ++msgid "Diskette Labels" ++msgstr "Étiquettes de disquette" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:18 ++msgid "Diskette labels" ++msgstr "Étiquettes de disquette" ++ ++#. =============================================================== ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:20 ++#: ../data/templates/misc-iso-templates.xml.h:36 ++#: ../data/templates/misc-us-templates.xml.h:18 ++#: ../data/templates/zweckform-iso-templates.xml.h:16 ++msgid "Mailing Labels" ++msgstr "Étiquettes de publipostage" ++ ++# src/print_copies.c:210 ++# src/print_copies.c:210 ++# src/print_copies.c:188 ++# src/print_copies.c:187 ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:22 ++msgid "Mailing labels" ++msgstr "Étiquettes de publipostage" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:24 ++msgid "Mini Address Labels" ++msgstr "Étiquettes de mini-adresse" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:26 ++msgid "Mini Labels" ++msgstr "Mini-étiquettes" ++ ++# src/file.c:183 ++# src/file.c:183 ++# src/file.c:213 ++# src/file.c:213 ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:28 ++msgid "Shipping labels" ++msgstr "Étiquettes postales" ++ ++#. =================================================================== ++#: ../data/templates/avery-other-templates.xml.h:2 ++msgid "File Folder Labels" ++msgstr "Étiquettes de dossier d'archives" ++ +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:8 +msgid "CD/DVD Labels (Disc Labels)" +msgstr "Étiquettes de CD/DVD (étiquettes de disque)" + +#. =================================================================== +#: ../data/templates/avery-us-templates.xml.h:10 +msgid "CD/DVD Labels (Spine Labels)" +msgstr "Étiquettes de CD/DVD (étiquettes de boîtier)" + - #. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:12 - msgid "Diskette Labels" - msgstr "Étiquettes de disquette" ++# src/print_copies.c:210 ++# src/print_copies.c:210 ++# src/print_copies.c:188 ++# src/print_copies.c:187 ++#. the LSK labels can be torn in half down the center ++#: ../data/templates/avery-us-templates.xml.h:14 ++msgid "Divider Labels" ++msgstr "Étiquettes de division" + +# src/print_copies.c:210 +# src/print_copies.c:210 +# src/print_copies.c:188 +# src/print_copies.c:187 +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:14 ++#: ../data/templates/avery-us-templates.xml.h:16 +msgid "Filing Labels" - msgstr "" ++msgstr "Étiquettes pour dossiers" + +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:16 ++#: ../data/templates/avery-us-templates.xml.h:18 +msgid "Full Sheet Labels" - msgstr "" ++msgstr "Étiquettes pleine page" ++ ++# src/print_copies.c:210 ++# src/print_copies.c:210 ++# src/print_copies.c:188 ++# src/print_copies.c:187 ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:20 ++msgid "ID Labels" ++msgstr "Étiquettes d'identification" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:22 ++msgid "Index Cards" ++msgstr "Cartes d'index" + +# src/print_copies_merge.c:197 +# src/print_merge.c:170 +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:18 ++#: ../data/templates/avery-us-templates.xml.h:24 +msgid "Large Round Labels" - msgstr "" ++msgstr "Grandes étiquettes rondes" + +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:20 ++#: ../data/templates/avery-us-templates.xml.h:26 +msgid "Name Badge Labels" - msgstr "" ++msgstr "Étiquettes pour badges" + +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:22 ++#: ../data/templates/avery-us-templates.xml.h:28 ++msgid "Post cards" ++msgstr "Cartes postales" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:30 ++#: ../data/templates/dymo-other-templates.xml.h:12 +msgid "Return Address Labels" +msgstr "Étiquettes d'adresse de retour" + +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:24 ++#: ../data/templates/avery-us-templates.xml.h:32 ++#: ../data/templates/misc-us-templates.xml.h:28 ++msgid "Round Labels" ++msgstr "Étiquettes rondes" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:34 +msgid "Shipping Labels" +msgstr "Étiquettes postales" + +# src/print_copies_merge.c:197 +# src/print_merge.c:170 +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:26 ++#: ../data/templates/avery-us-templates.xml.h:36 +msgid "Small Round Labels" - msgstr "" ++msgstr "Petites étiquettes rondes" + +# src/print_copies.c:210 +# src/print_copies.c:210 +# src/print_copies.c:188 +# src/print_copies.c:187 +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:28 ++#: ../data/templates/avery-us-templates.xml.h:38 +msgid "Square Labels" +msgstr "Étiquettes carrées" + +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:30 ++#: ../data/templates/avery-us-templates.xml.h:40 ++msgid "Tent Cards" ++msgstr "Cartes chevalet" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:42 +msgid "Video Tape Face Labels" +msgstr "Étiquettes de face de cassette vidéo" + +#. =================================================================== - #: ../data/templates/avery-us-templates.xml.h:32 ++#: ../data/templates/avery-us-templates.xml.h:44 +msgid "Video Tape Spine Labels" +msgstr "Étiquettes de dos de cassette vidéo" + ++#: ../data/templates/brother-other-templates.xml.h:1 ++msgid "Multi Purpose Labels 17mm x 54mm" ++msgstr "Étiquettes multi usages 17x54 mm" ++ ++#: ../data/templates/brother-other-templates.xml.h:2 ++msgid "Shipping Labels 62mm x 100mm" ++msgstr "Étiquettes postales 62x100 mm" ++ ++#. ++#. ********************************************************************* ++#. ********************************************************************* ++#. Labels for the Brother QL-500/550/650 PC Label Printers ++#. ++#. These templates work with the Brother Linux Printer CUPS Driver. It ++#. is unknown if these work correctly with the foomatic print driver for ++#. these printers. ++#. ++#. One difference from typical templates is that the template size is ++#. not the actual media size - it is the size of the printable area, ++#. which is smaller than the media size. This is because (at least with ++#. the Brother driver) coordinates are relative the corner of this area. ++#. ++#. ********************************************************************* ++#. ********************************************************************* ++#. ++#: ../data/templates/brother-other-templates.xml.h:20 ++msgid "Standard Address Labels 29mm x 90mm" ++msgstr "Étiquettes d'adresse standard 29x90 mm" ++ +#. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:2 - msgid "Address labels" - msgstr "Étiquettes d'adresse" ++#: ../data/templates/dymo-other-templates.xml.h:2 ++msgid "3.5in Diskette" ++msgstr "Disquette 3,5 pouces" + - #. =============================================================== - #: ../data/templates/avery-iso-templates.xml.h:6 - msgid "CD Booklet" - msgstr "Livret de CD" ++#. =================================================================== ++#: ../data/templates/dymo-other-templates.xml.h:6 ++msgid "File Folder" ++msgstr "Dossier d'archives" + - #. =============================================================== - #: ../data/templates/avery-iso-templates.xml.h:8 - msgid "CD Inlet" - msgstr "" ++#. =================================================================== ++#: ../data/templates/dymo-other-templates.xml.h:8 ++msgid "Hanging Folder" ++msgstr "Dossier suspendu" + +#. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:12 - msgid "Diskette labels" - msgstr "Étiquettes de disquette" ++#: ../data/templates/dymo-other-templates.xml.h:10 ++msgid "Large Address Labels" ++msgstr "Grandes étiquettes d'adresses" + - #. =============================================================== +#. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:14 - #: ../data/templates/zweckform-iso-templates.xml.h:14 - #: ../data/templates/misc-iso-templates.xml.h:30 - msgid "Mailing Labels" - msgstr "Étiquettes de publipostage" ++#: ../data/templates/dymo-other-templates.xml.h:14 ++msgid "Shipping Address Labels" ++msgstr "Étiquettes d'adresse postale" + - # src/print_copies.c:210 - # src/print_copies.c:210 - # src/print_copies.c:188 - # src/print_copies.c:187 +#. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:16 - msgid "Mailing labels" - msgstr "Étiquettes de publipostage" ++#: ../data/templates/misc-iso-templates.xml.h:4 ++#: ../data/templates/zweckform-iso-templates.xml.h:4 ++msgid "Allround Labels" ++msgstr "Étiquettes génériques" + +#. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:18 - msgid "Mini Address Labels" - msgstr "Étiquettes de mini-adresse" ++#: ../data/templates/misc-iso-templates.xml.h:6 ++msgid "Arch File Labels" ++msgstr "Étiquettes de dossier d'archives" + - # src/file.c:183 - # src/file.c:183 - # src/file.c:213 - # src/file.c:213 +#. =================================================================== - #: ../data/templates/avery-iso-templates.xml.h:20 - msgid "Shipping labels" - msgstr "Étiquettes postales" ++#: ../data/templates/misc-iso-templates.xml.h:8 ++msgid "Arch File Labels (large)" ++msgstr "Étiquettes de dossier d'archives (grandes)" + - #: ../data/templates/categories.xml.h:1 - msgid "Any card" - msgstr "Toute carte" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:10 ++msgid "Arch File Labels (small)" ++msgstr "Étiquettes de dossier d'archives (petites)" + - # src/file.c:183 - # src/file.c:183 - # src/file.c:213 - # src/file.c:213 - #: ../data/templates/categories.xml.h:2 - msgid "Any label" - msgstr "Toute étiquette" ++# src/print_copies.c:210 ++# src/print_copies.c:210 ++# src/print_copies.c:188 ++# src/print_copies.c:187 ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:14 ++msgid "CD Labels" ++msgstr "Étiquettes de CD" + - #: ../data/templates/categories.xml.h:3 - msgid "Business cards" - msgstr "Cartes de visite" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:18 ++#: ../data/templates/misc-us-templates.xml.h:12 ++msgid "CD/DVD Labels (face only)" ++msgstr "Étiquettes de CD/DVD (face uniquement)" + - #: ../data/templates/categories.xml.h:4 - msgid "CD/DVD or other media" - msgstr "CD/DVD ou autre support" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:20 ++msgid "CD/DVD Labels Standard Format (face only)" ++msgstr "Format standard d'étiquettes de CD/DVD (face uniquement)" + - #: ../data/templates/categories.xml.h:5 - msgid "Mailing/shipping products" - msgstr "Produits d'expédition" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:22 ++msgid "Diskette Labels (face only)" ++msgstr "Étiquettes de disquette (face uniquement)" + - #: ../data/templates/categories.xml.h:6 - msgid "Rectangular labels" - msgstr "Étiquettes rectangulaires" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:24 ++msgid "EPSON Photo Stickers 16" ++msgstr "Autocollants EPSON Photo 16" + - #: ../data/templates/categories.xml.h:7 - msgid "Round labels" - msgstr "Étiquettes arrondies" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:26 ++msgid "Etiketten" ++msgstr "Étiquettes" + - # src/print_copies_merge.c:197 - # src/print_merge.c:170 - #: ../data/templates/categories.xml.h:8 - msgid "Square labels" - msgstr "Étiquettes carrées" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:28 ++msgid "Fridge Magnet Stickers" ++msgstr "Autocollants magnétiques" + +#. =================================================================== - #: ../data/templates/zweckform-iso-templates.xml.h:4 - #: ../data/templates/misc-iso-templates.xml.h:4 - msgid "Allround Labels" - msgstr "Étiquettes Allround" ++#: ../data/templates/misc-iso-templates.xml.h:30 ++msgid "General Labels" ++msgstr "Étiquettes générales" + +#. =================================================================== - #: ../data/templates/zweckform-iso-templates.xml.h:10 - msgid "Correction and Cover-up Labels" - msgstr "Étiquettes de correction et de recouvrement" ++#: ../data/templates/misc-iso-templates.xml.h:32 ++msgid "Inkjet/Laser Labels 70x37mm" ++msgstr "Étiquettes jet d'encre/laser 70x37 mm" + +#. =================================================================== - #: ../data/templates/zweckform-iso-templates.xml.h:12 - msgid "Lever Arch File Labels" - msgstr "" ++#: ../data/templates/misc-iso-templates.xml.h:38 ++msgid "Mailing Labels-2 columns" ++msgstr "Étiquettes de publipostage (2 colonnes)" + +#. =================================================================== - #: ../data/templates/zweckform-iso-templates.xml.h:16 - msgid "QSL-Karten Etiketten 70mm x 50,8mm" - msgstr "Étiquettes de cartes QSL 70mm x 50,8mm" ++#: ../data/templates/misc-iso-templates.xml.h:40 ++msgid "Mailing Labels-3 columns" ++msgstr "Étiquettes de publipostage (3 colonnes)" + +#. =================================================================== - #: ../data/templates/zweckform-iso-templates.xml.h:18 - msgid "Rectangular Copier Labels" - msgstr "" ++#: ../data/templates/misc-iso-templates.xml.h:42 ++#: ../data/templates/misc-us-templates.xml.h:26 ++msgid "PRO CD Labels 2-up (face only)" ++msgstr "Étiquettes pour CD (2 ex, face uniquement)" + +#. =================================================================== - #: ../data/templates/zweckform-iso-templates.xml.h:20 - #: ../data/templates/misc-iso-templates.xml.h:38 ++#: ../data/templates/misc-iso-templates.xml.h:44 ++#: ../data/templates/zweckform-iso-templates.xml.h:24 +msgid "Rectangular Labels" +msgstr "Étiquettes rectangulaires" + +#. =================================================================== - #: ../data/templates/zweckform-iso-templates.xml.h:22 - msgid "Video Labels (back)" - msgstr "Étiquettes vidéo (dos)" ++#: ../data/templates/misc-iso-templates.xml.h:46 ++msgid "Video Labels (face only)" ++msgstr "Étiquettes de vidéos (face uniquement)" ++ ++#. =================================================================== ++#: ../data/templates/misc-other-templates.xml.h:2 ++msgid "Multi-Purpose Labels" ++msgstr "Étiquettes multi-usages" + +#. =================================================================== +#: ../data/templates/misc-us-templates.xml.h:2 +msgid "Business Card CD" +msgstr "CD carte de visite" + +#. =================================================================== +#: ../data/templates/misc-us-templates.xml.h:6 +msgid "CD Template Rectangles" - msgstr "" ++msgstr "Modèle CD rectangle" + +#. =================================================================== +#: ../data/templates/misc-us-templates.xml.h:10 +msgid "CD/DVD Labels (Face Only)" +msgstr "Étiquettes de CD/DVD (face uniquement)" + - #. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:12 - #: ../data/templates/misc-iso-templates.xml.h:18 - msgid "CD/DVD Labels (face only)" - msgstr "Étiquettes de CD/DVD (face uniquement)" - +# src/print_copies.c:210 +# src/print_copies.c:210 +# src/print_copies.c:188 +# src/print_copies.c:187 +#. =================================================================== +#: ../data/templates/misc-us-templates.xml.h:14 +msgid "Cassette Labels" +msgstr "Étiquettes de cassette" + +# src/print_copies.c:210 +# src/print_copies.c:210 +# src/print_copies.c:188 +# src/print_copies.c:187 +#. =================================================================== +#: ../data/templates/misc-us-templates.xml.h:16 +msgid "DLT Labels" +msgstr "Étiquettes DLT" + +#. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:18 ++#: ../data/templates/misc-us-templates.xml.h:20 +msgid "Microtube labels" +msgstr "Étiquettes microtube" + +#. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:20 ++#: ../data/templates/misc-us-templates.xml.h:22 +msgid "Mini-CD Labels" +msgstr "Étiquettes mini-CD" + - #: ../data/templates/misc-us-templates.xml.h:21 ++#: ../data/templates/misc-us-templates.xml.h:23 +msgid "PRO CD Labels 2-up (CD spine only)" - msgstr "" ++msgstr "Étiquettes pour CD (2 ex, tranche uniquement)" + - #: ../data/templates/misc-us-templates.xml.h:22 - msgid "PRO CD Labels 2-up (Face only)" - msgstr "" - - #. =================================================================== +#: ../data/templates/misc-us-templates.xml.h:24 - #: ../data/templates/misc-iso-templates.xml.h:36 - msgid "PRO CD Labels 2-up (face only)" - msgstr "" ++msgid "PRO CD Labels 2-up (Face only)" ++msgstr "Étiquettes pour CD (2 ex, face uniquement)" + +#. =================================================================== - #: ../data/templates/misc-us-templates.xml.h:26 ++#: ../data/templates/misc-us-templates.xml.h:30 +msgid "Slimline CD Case (rightside up)" - msgstr "" ++msgstr "Boîtier CD mince (côté droit en haut)" + - #: ../data/templates/misc-us-templates.xml.h:27 ++#: ../data/templates/misc-us-templates.xml.h:31 +msgid "Slimline CD Case (upside down)" - msgstr "" - - #. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:2 - msgid "Agipa 119488: Business Cards" - msgstr "Agipa 119488 : Cartes de visite" - - #. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:6 - msgid "Arch File Labels" - msgstr "Étiquettes de dossier d'archives" - - #. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:8 - msgid "Arch File Labels (large)" - msgstr "Étiquettes de dossier d'archives (grandes)" - - #. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:10 - msgid "Arch File Labels (small)" - msgstr "Étiquettes de dossier d'archives (petites)" - - # src/print_copies.c:210 - # src/print_copies.c:210 - # src/print_copies.c:188 - # src/print_copies.c:187 - #. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:14 - msgid "CD Labels" - msgstr "Étiquettes de CD" - - #. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:20 - msgid "CD/DVD Labels Standard Format (face only)" - msgstr "Format standard d'étiquettes de CD/DVD (face uniquement)" ++msgstr "Boîtier CD mince (à l'envers)" + +#. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:22 - msgid "Diskette Labels (face only)" - msgstr "Étiquettes de disquette (face uniquement)" ++#: ../data/templates/zweckform-iso-templates.xml.h:10 ++msgid "Correction and Cover-up Labels" ++msgstr "Étiquettes de correction et de recouvrement" + +#. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:24 - msgid "EPSON Photo Stickers 16" - msgstr "Autocollants EPSON Photo 16" ++#: ../data/templates/zweckform-iso-templates.xml.h:12 ++msgid "File Back Labels" ++msgstr "Étiquettes de dos de dossier" + +#. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:26 - msgid "Etiketten" - msgstr "Étiquettes" ++#: ../data/templates/zweckform-iso-templates.xml.h:14 ++msgid "Lever Arch File Labels" ++msgstr "Étiquettes pour classeurs à levier" + +#. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:28 - msgid "Fridge Magnet Stickers" - msgstr "Autocollants magnétiques" ++#: ../data/templates/zweckform-iso-templates.xml.h:18 ++msgid "Multi-purpose Stick+Lift Labels" ++msgstr "Étiquettes enlevables multi-usages" + +#. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:32 - msgid "Mailing Labels-2 columns" - msgstr "Étiquettes de publipostage (2 colonnes)" ++#: ../data/templates/zweckform-iso-templates.xml.h:20 ++msgid "QSL-Karten Etiketten 70mm x 50,8mm" ++msgstr "Étiquettes de cartes QSL 70mm x 50,8mm" + +#. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:34 - msgid "Mailing Labels-3 columns" - msgstr "Étiquettes de publipostage (3 colonnes)" ++#: ../data/templates/zweckform-iso-templates.xml.h:22 ++msgid "Rectangular Copier Labels" ++msgstr "Étiquettes rectangulaires pour copieur" + +#. =================================================================== - #: ../data/templates/misc-iso-templates.xml.h:40 - msgid "Video Labels (face only)" - msgstr "Étiquettes de vidéos (face uniquement)" ++#: ../data/templates/zweckform-iso-templates.xml.h:26 ++msgid "Video Labels (back)" ++msgstr "Étiquettes vidéo (dos)" + +#: ../data/desktop/glabels.desktop.in.h:1 +msgid "Create labels, business cards and media covers" +msgstr "Crée des étiquettes et des cartes de visite" + +#: ../data/desktop/glabels.desktop.in.h:2 +msgid "gLabels Label Designer" +msgstr "Créateur d'étiquettes gLabels" + +# src/item_text.c:467 +# src/item_text.c:467 +# src/item_text.c:482 +# src/item_text.c:482 +#: ../data/mime/glabels.keys.in.h:1 ../data/mime/glabels.xml.in.h:1 +msgid "gLabels Project File" +msgstr "Fichier de projet gLabels" + +#: ../barcode-0.98/compat/getopt.c:583 +#, c-format +msgid "%s: option `%s' is ambiguous\n" +msgstr "%s : l'option « %s » ambiguë\n" + +#: ../barcode-0.98/compat/getopt.c:607 +#, c-format +msgid "%s: option `--%s' doesn't allow an argument\n" +msgstr "%s : l'option « --%s » n'autorise pas d'argument\n" + +#: ../barcode-0.98/compat/getopt.c:612 +#, c-format +msgid "%s: option `%c%s' doesn't allow an argument\n" +msgstr "%s : l'option « %c%s » n'autorise pas d'argument\n" + +#: ../barcode-0.98/compat/getopt.c:629 +#, c-format +msgid "%s: option `%s' requires an argument\n" +msgstr "%s : l'option « %s » exige un argument\n" + +#. --option +#: ../barcode-0.98/compat/getopt.c:658 +#, c-format +msgid "%s: unrecognized option `--%s'\n" +msgstr "%s : option « --%s » inconnue\n" + +#. +option or -option +#: ../barcode-0.98/compat/getopt.c:662 +#, c-format +msgid "%s: unrecognized option `%c%s'\n" +msgstr "%s : option « %c%s » inconnue\n" + +#. 1003.2 specifies the format of this message. +#: ../barcode-0.98/compat/getopt.c:688 +#, c-format +msgid "%s: illegal option -- %c\n" +msgstr "%s : option -- %c non autorisée\n" + +#: ../barcode-0.98/compat/getopt.c:691 +#, c-format +msgid "%s: invalid option -- %c\n" +msgstr "%s : option -- %c non valide\n" + +#: ../barcode-0.98/compat/getopt.c:727 +#, c-format +msgid "%s: option requires an argument -- %c\n" +msgstr "%s : l'option exige un argument -- %c\n" - diff --cc po/ru.po index 40067b12,00000000..1e5e15a4 mode 100644,000000..100644 --- a/po/ru.po +++ b/po/ru.po @@@ -1,2459 -1,0 +1,3017 @@@ +# Russian translation of glabels. +# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - # Vitaly Lipatov , 2002, 2003, 2004, 2005. - # ++# Alexandre Prokoudine , 2009, 2009. +msgid "" +msgstr "" - "Project-Id-Version: glabels 2.1.0\n" ++"Project-Id-Version: glabels 2.2.5\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-01-22 14:03-0500\n" - "PO-Revision-Date: 2005-04-10 02:18MSK\n" - "Last-Translator: Vitaly Lipatov \n" - "Language-Team: Russian \n" ++"POT-Creation-Date: 2009-09-08 15:34+0400\n" ++"PO-Revision-Date: 2009-09-08 16:34+0400\n" ++"Last-Translator: Alexandre Prokoudine \n" ++"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" ++"Content-Transfer-Encoding: UTF-8\n" +"X-Generator: KBabel 1.10\n" - "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" ++"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + - #: src/glabels.c:116 - msgid "Could not initialize Bonobo!\n" - msgstr "Невозможно инициализировать Bonobo!\n" ++#: ../src/glabels.c:75 ../src/glabels-batch.c:70 ++msgid "[FILE...]" ++msgstr "[ФАЙЛ...]" + - #: src/glabels-batch.c:52 - msgid "print this message" - msgstr "напечатать это сообщение" ++#: ../src/glabels.c:91 ++msgid "- gLabels label designer" ++msgstr "— дизайнер этикеток gLabels" + - #: src/glabels-batch.c:54 - msgid "print the version of glabels-batch being used" - msgstr "выводит версию используемого glabels-batch" ++#: ../src/glabels-batch.c:54 ++msgid "set output filename (default=\"output.pdf\")" ++msgstr "Установить название выходного файла (по умолчанию — \"output.ps\"" + - #: src/glabels-batch.c:56 - msgid "set output filename (default=\"output.ps\")" - msgstr "установить название выходного файла (по умолчанию - \"output.ps\"" - - #: src/glabels-batch.c:56 src/glabels-batch.c:70 ++#: ../src/glabels-batch.c:54 ../src/glabels-batch.c:68 +msgid "filename" +msgstr "название" + - #: src/glabels-batch.c:58 ++#: ../src/glabels-batch.c:56 +msgid "number of sheets (default=1)" - msgstr "количество страниц (по умолчанию - 1)" ++msgstr "Количество листов (по умолчанию = 1)" + - #: src/glabels-batch.c:58 ++#: ../src/glabels-batch.c:56 +msgid "sheets" +msgstr "страниц" + - #: src/glabels-batch.c:60 ++#: ../src/glabels-batch.c:58 +msgid "number of copies (default=1)" - msgstr "количество копий (по умолчанию - 1)" ++msgstr "Количество копий (по умолчанию = 1)" + - #: src/glabels-batch.c:60 ++#: ../src/glabels-batch.c:58 +msgid "copies" +msgstr "копий" + - #: src/glabels-batch.c:62 ++#: ../src/glabels-batch.c:60 +msgid "first label on first sheet (default=1)" - msgstr "первая этикетка на первой странице (по умолчанию - 1)" ++msgstr "первая этикетка на первой странице (по умолчанию = 1)" + - #: src/glabels-batch.c:62 ++#: ../src/glabels-batch.c:60 +msgid "first" +msgstr "первое" + - #: src/glabels-batch.c:64 src/print-dialog.c:336 ++#: ../src/glabels-batch.c:62 ../data/glade/print-custom-widget.glade.h:6 +msgid "print outlines (to test printer alignment)" - msgstr "печатать контуры этикеток" ++msgstr "Печатать контуры этикеток (для тестирования выравнивания)" + - #: src/glabels-batch.c:66 src/print-dialog.c:344 ++#: ../src/glabels-batch.c:64 ../data/glade/print-custom-widget.glade.h:5 +msgid "print in reverse (i.e. a mirror image)" - msgstr "печатать перевёрнуто (как отражается в зеркале)" ++msgstr "Печатать зеркальное отображение" + - #: src/glabels-batch.c:68 src/print-dialog.c:351 ++#: ../src/glabels-batch.c:66 ../data/glade/print-custom-widget.glade.h:4 +msgid "print crop marks" - msgstr "печатать метки для обрезки" ++msgstr "Печатать метки под обрез" + - #: src/glabels-batch.c:70 ++#: ../src/glabels-batch.c:68 +msgid "input file for merging" - msgstr "входной файл для объединения" ++msgstr "Входной файл для заполнения полей" + - #: src/glabels-batch.c:107 - msgid "[OPTION...] GLABELS_FILE..." - msgstr "[ПАРАМЕТРЫ...] файл_glabels..." ++#: ../src/glabels-batch.c:96 ++msgid "- batch process gLabels label files" ++msgstr "— пакетная обработка файлов этикеток gLabels" + - #: src/glabels-batch.c:127 ++#: ../src/glabels-batch.c:142 +#, c-format - msgid "missing glabels file\n" - msgstr "не указан файл glabels\n" - - #: src/glabels-batch.c:158 +msgid "cannot perform document merge with glabels file %s\n" - msgstr "невозможно выполнить объединение документа с файлом glabels %s\n" ++msgstr "Не удалось выполнить заполнение полей документа файлом gLabels %s\n" + - #: src/glabels-batch.c:182 ++#: ../src/glabels-batch.c:164 +#, c-format +msgid "cannot open glabels file %s\n" - msgstr "невозможно открыть файл %s\n" ++msgstr "Не удалось открыть файл %s\n" + - #: src/window.c:244 ++#: ../src/window.c:259 +msgid "(none) - gLabels" - msgstr "(ничего) - gLabels" ++msgstr "(нет открытых макетов) - gLabels" + - #: src/window.c:414 ++#: ../src/window.c:432 +msgid "(modified)" +msgstr "(изменено)" + - #: src/stock.c:65 data/ui/glabels-ui.xml.h:162 ++#: ../src/stock.c:72 +msgid "_Select Mode" - msgstr "_Режим выбора" ++msgstr "_Режим выделения" + - #: src/stock.c:66 data/ui/glabels-ui.xml.h:163 ++#: ../src/stock.c:73 +msgid "_Text" +msgstr "_Текст" + - #: src/stock.c:67 data/ui/glabels-ui.xml.h:148 ++#: ../src/stock.c:74 +msgid "_Line" +msgstr "_Линия" + - #: src/stock.c:68 data/ui/glabels-ui.xml.h:130 ++#: ../src/stock.c:75 +msgid "_Box" +msgstr "_Прямоугольник" + - #: src/stock.c:69 data/ui/glabels-ui.xml.h:141 ++#: ../src/stock.c:76 +msgid "_Ellipse" +msgstr "_Эллипс" + - #: src/stock.c:70 data/ui/glabels-ui.xml.h:146 ++#: ../src/stock.c:77 +msgid "_Image" +msgstr "_Изображение" + - #: src/stock.c:71 data/ui/glabels-ui.xml.h:11 ++#: ../src/stock.c:78 +msgid "Bar_code" +msgstr "_Штрих-код" + - #: src/stock.c:72 ++#: ../src/stock.c:79 +msgid "_Merge Properties" - msgstr "Свойства _объединения" ++msgstr "Заполнение полей данными" + - #: src/stock.c:73 ++#: ../src/stock.c:80 +msgid "Object _Properties" +msgstr "_Свойства объекта" + - #: src/stock.c:74 data/ui/glabels-ui.xml.h:13 ++#: ../src/stock.c:81 +msgid "Bring to _Front" +msgstr "На _передний план" + - #: src/stock.c:75 data/ui/glabels-ui.xml.h:109 ++#: ../src/stock.c:82 +msgid "Send to _Back" +msgstr "На _задний план" + - #: src/stock.c:76 data/ui/glabels-ui.xml.h:96 ++#: ../src/stock.c:83 +msgid "Rotate _Left" +msgstr "Повернуть на_лево" + - #: src/stock.c:77 data/ui/glabels-ui.xml.h:97 ++#: ../src/stock.c:84 +msgid "Rotate _Right" +msgstr "Повернуть на_право" + - #: src/stock.c:78 data/ui/glabels-ui.xml.h:52 ++#: ../src/stock.c:85 +msgid "Flip _Horizontally" +msgstr "Отразить _горизонтально" + - #: src/stock.c:79 data/ui/glabels-ui.xml.h:53 ++#: ../src/stock.c:86 +msgid "Flip _Vertically" +msgstr "Отразить _вертикально" + - #: src/stock.c:80 data/ui/glabels-ui.xml.h:147 ++#: ../src/stock.c:87 +msgid "_Lefts" +msgstr "С_лева" + - #: src/stock.c:81 data/ui/glabels-ui.xml.h:159 ++#: ../src/stock.c:88 +msgid "_Rights" +msgstr "С_права" + - #: src/stock.c:82 data/ui/glabels-ui.xml.h:131 ++#: ../src/stock.c:89 +msgid "_Centers" +msgstr "По _центру" + - #: src/stock.c:83 data/ui/glabels-ui.xml.h:164 ++#: ../src/stock.c:90 +msgid "_Tops" +msgstr "По _верху" + - #: src/stock.c:84 ++#: ../src/stock.c:91 +msgid "Bottoms" +msgstr "По низу" + - #: src/stock.c:85 ++#: ../src/stock.c:92 +msgid "Centers" +msgstr "По центру" + - #: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62 ++#: ../src/stock.c:93 ../src/stock.c:94 +msgid "Label Ce_nter" +msgstr "_Центр этикетки" + - #: src/stock.c:88 data/ui/glabels-ui.xml.h:51 ++#: ../src/stock.c:95 ../data/glade/property-bar.glade.h:3 +msgid "Fill color" +msgstr "Цвет заливки" + - #: src/stock.c:89 data/ui/glabels-ui.xml.h:64 ++#: ../src/stock.c:96 ../data/glade/property-bar.glade.h:8 +msgid "Line color" +msgstr "Цвет линии" + - #: src/stock.c:90 src/stock.c:92 ++#: ../src/stock.c:97 ../src/stock.c:99 +msgid "Linked" +msgstr "Прикреплено" + - #: src/stock.c:91 src/stock.c:93 ++#: ../src/stock.c:98 ../src/stock.c:100 +msgid "Not Linked" +msgstr "Не прикреплено" + - #: src/ui-property-bar.c:345 src/object-editor.c:587 - msgid "Default" - msgstr "По умолчанию" ++#. Menu entries. ++#: ../src/ui.c:93 ++msgid "_File" ++msgstr "_Файл" + - #: src/ui-property-bar.c:360 src/object-editor.c:600 - msgid "No fill" - msgstr "Не заполнять" ++#: ../src/ui.c:94 ++msgid "Open Recent _Files" ++msgstr "Н_едавние файлы" + - #: src/ui-property-bar.c:375 src/object-editor.c:593 - msgid "No line" - msgstr "Нет линии" ++#: ../src/ui.c:95 ++msgid "_Edit" ++msgstr "_Правка" + - #: src/ui-sidebar.c:180 - msgid "Object properties" - msgstr "Свойства объекта" ++#: ../src/ui.c:96 ++msgid "_View" ++msgstr "_Вид" + - #: src/commands.c:385 - msgid "" - "A label and business card creation program for GNOME.\n" - " \n" - "Glabels is free software; you can redistribute it and/or modify it under the " - "terms of the GNU General Public License as published by the Free Software " - "Foundation; either version 2 of the License, or (at your option) any later " - "version.\n" - " \n" - "This program is distributed in the hope that it will be useful, but WITHOUT " - "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " - "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " - "more details.\n" - msgstr "" - "Программа создания этикеток и визиток для GNOME\n" - " \n" - "Glabels является свободным программным обеспечением; вы вправе " - "распространять её и/или модифицировать в соответствии с условиями версии 2 " - "либо по вашему выбору более поздней версии Стандартной Общественной Лицензии " - "GNU, опубликованной Free Software Foundation.\n" - " \n" - "Мы распространяем данную программу в надежде на то, что она будет вам " - "полезной, однако НЕ ПРЕДОСТАВЛЯЕМ НА НЕЁ НИКАКИХ ГАРАНТИЙ, в том числе " - "ГАРАНТИИ ТОВАРНОГО СОСТОЯНИЯ ПРИ ПРОДАЖЕ и ПРИГОДНОСТИ ДЛЯ ИСПОЛЬЗОВАНИЯ В " - "КОНКРЕТНЫХ ЦЕЛЯХ. Для получения более подробной информации ознакомьтесь со " - "Стандартной Общественной Лицензией GNU.\n" ++#: ../src/ui.c:97 ++msgid "Customize Main Toolbar" ++msgstr "Панель инструментов" + - #: src/commands.c:399 - msgid "See the file AUTHORS for additional credits," - msgstr "Смотрите в файл AUTHORS для дополнительной информации," ++#: ../src/ui.c:98 ++msgid "Customize Drawing Toolbar" ++msgstr "Панель рисования" + - #: src/commands.c:400 - msgid "or visit http://glabels.sourceforge.net/" - msgstr "или посетите сайт http://glabels.sourceforge.net/" ++#: ../src/ui.c:99 ++msgid "Customize Properties Toolbar" ++msgstr "Панель свойств" + - #: src/commands.c:409 - msgid " " - msgstr "" ++#: ../src/ui.c:100 ++msgid "_Objects" ++msgstr "_Объекты" + - #: src/commands.c:424 - msgid "glabels" - msgstr "glabels" ++#: ../src/ui.c:101 ++msgid "_Create" ++msgstr "_Добавить" + - #: src/file.c:100 - msgid "New Label or Card" - msgstr "Новая этикетка или визитка" ++#: ../src/ui.c:102 ++msgid "_Order" ++msgstr "_Порядок" + - #: src/file.c:132 src/file.c:304 - msgid "Media Type" - msgstr "Размер бумаги" ++#: ../src/ui.c:103 ++msgid "_Rotate/Flip" ++msgstr "П_овернуть/Отразить" + - #: src/file.c:138 src/file.c:310 - msgid "Label orientation" - msgstr "Расположение этикетки" ++#: ../src/ui.c:104 ++msgid "Align _Horizontal" ++msgstr "Выровнять по _горизонтали" + - #: src/file.c:269 - msgid "Label properties" - msgstr "Свойства этикетки" ++#: ../src/ui.c:105 ++msgid "Align _Vertical" ++msgstr "Выровнять по _вертикали" + - #: src/file.c:452 src/file.c:870 - msgid "All files" - msgstr "Все файлы" ++#: ../src/ui.c:106 ++msgid "_Help" ++msgstr "_Справка" + - #: src/file.c:457 src/file.c:875 - msgid "gLabels documents" - msgstr "Документы gLabels" ++#. Popup entries. ++#: ../src/ui.c:109 ../src/ui.c:110 ++msgid "Context Menu" ++msgstr "Контекстное меню" + - #: src/file.c:505 src/file.c:617 src/file.c:934 src/file.c:1130 - msgid "Empty file name selection" - msgstr "Пустой выбор файла" ++#: ../src/ui.c:115 ++msgid "_New" ++msgstr "_Создать" + - #: src/file.c:506 src/file.c:520 src/file.c:618 src/file.c:632 - msgid "Please select a file or supply a valid file name" - msgstr "Выберите файл или введите корректное название файла" ++#: ../src/ui.c:117 ++msgid "Create a new file" ++msgstr "Создать новый документ" + - #: src/file.c:519 src/file.c:631 - msgid "File does not exist" - msgstr "Файл не существует" ++#: ../src/ui.c:122 ++msgid "_Open..." ++msgstr "_Открыть..." + - #: src/file.c:563 data/ui/glabels-ui.xml.h:74 - msgid "Open" - msgstr "Открыть" ++#: ../src/ui.c:124 ++msgid "Open a file" ++msgstr "Открыть документ" + - #: src/file.c:565 - msgid "Open label" - msgstr "Открыть этикетку" ++#: ../src/ui.c:129 ++msgid "_Save" ++msgstr "_Сохранить" + - #: src/file.c:707 - #, c-format - msgid "Could not open file \"%s\"" - msgstr "Невозможно открыть файл \"%s\"" ++#: ../src/ui.c:131 ++msgid "Save current file" ++msgstr "Сохранить текущий документ" + - #: src/file.c:715 - msgid "Not a supported file format" - msgstr "Файл неподдерживаемого формата" ++#: ../src/ui.c:136 ++msgid "Save _As..." ++msgstr "Сохранить _как..." + - #: src/file.c:797 src/file.c:979 src/file.c:1174 - #, c-format - msgid "Could not save file \"%s\"" - msgstr "Невозможно сохранить файл \"%s\"" ++#: ../src/ui.c:138 ++msgid "Save the current file to a different name" ++msgstr "Сохранить текущий документ под другим именем" + - #: src/file.c:805 src/file.c:987 src/file.c:1182 - msgid "Error encountered during save. The file is still not saved." - msgstr "Произошла ошибка при сохранении файла. Файл всё ещё не сохранён." ++#: ../src/ui.c:143 ++msgid "_Print..." ++msgstr "_Напечатать..." + - #: src/file.c:848 src/file.c:1048 - #, c-format - msgid "Save \"%s\" as" - msgstr "Сохранить \"%s\" как" ++#: ../src/ui.c:145 ++msgid "Print the current file" ++msgstr "Напечатать текущий файл" + - #: src/file.c:935 src/file.c:1131 - msgid "Please supply a valid file name" - msgstr "Укажите корректное название файла" ++#: ../src/ui.c:150 ++msgid "Properties..." ++msgstr "Свойства..." + - #: src/file.c:952 src/file.c:1147 - #, c-format - msgid "Overwrite file \"%s\"?" - msgstr "Перезаписать файл \"%s\"?" ++#: ../src/ui.c:152 ++msgid "Modify document properties" ++msgstr "Изменить свойства документа" + - #: src/file.c:960 src/file.c:1155 - msgid "File already exists." - msgstr "Файл уже существует." ++#: ../src/ui.c:157 ++msgid "Template _Designer..." ++msgstr "Дизайнер _шаблонов..." + - #: src/file.c:1271 - #, c-format - msgid "Save changes to document \"%s\" before closing?" - msgstr "Сохранить изменения в документе \"%s\" перед закрытием?" ++#: ../src/ui.c:159 ++msgid "Create a custom template" ++msgstr "Создать свой шаблон" + - #: src/file.c:1279 - msgid "Your changes will be lost if you don't save them." - msgstr "Все изменения будут потеряны, если вы их не сохраните." ++#: ../src/ui.c:164 ++msgid "_Close" ++msgstr "_Закрыть" + - #: src/file.c:1282 - msgid "Close without saving" - msgstr "Закрыть без сохранения" ++#: ../src/ui.c:166 ++msgid "Close the current file" ++msgstr "Закрыть текущий файл" + - #. Should not happen - #: src/prefs.c:156 src/prefs.c:163 data/glade/prefs-dialog.glade.h:23 - #: data/glade/object-editor.glade.h:37 - msgid "points" - msgstr "точек" ++#: ../src/ui.c:171 ++msgid "_Quit" ++msgstr "В_ыход" + - #: src/prefs.c:158 data/glade/object-editor.glade.h:36 - #: data/glade/template-designer.glade.h:74 - msgid "inches" - msgstr "дюймов" ++#: ../src/ui.c:173 ++msgid "Quit the program" ++msgstr "Завершить работу с программой" + - #: src/prefs.c:160 - msgid "mm" - msgstr "мм" ++#: ../src/ui.c:180 ++msgid "Cut" ++msgstr "Вырезать" + - #: src/prefs-dialog.c:248 data/glade/prefs-dialog.glade.h:22 - msgid "gLabels Preferences" - msgstr "Параметры gLabels" ++#: ../src/ui.c:182 ++msgid "Cut the selection" ++msgstr "Вырезать выделенное" + - #. - #. * Submenu: Order - #. - #: src/view.c:3574 data/ui/glabels-ui.xml.h:154 - msgid "_Order" - msgstr "_Порядок" ++#: ../src/ui.c:187 ++msgid "Copy" ++msgstr "Копировать" + - #. - #. * Submenu: Rotate/Flip - #. - #: src/view.c:3595 data/ui/glabels-ui.xml.h:160 - msgid "_Rotate/Flip" - msgstr "_Повернуть/Отразить" ++#: ../src/ui.c:189 ++msgid "Copy the selection" ++msgstr "Скопировать выделенное" + - #. - #. * Submenu: Align Horizontally - #. - #: src/view.c:3628 - msgid "Align _Horizontally" - msgstr "Выровнять _горизонтально" ++#: ../src/ui.c:194 ++msgid "Paste" ++msgstr "Вставить" + - #. - #. * Submenu: Align Vertically - #. - #: src/view.c:3667 - msgid "Align _Vertically" - msgstr "Выровнять _вертикально" ++#: ../src/ui.c:196 ++msgid "Paste the clipboard" ++msgstr "Вставить из буфера" + - #: src/view.c:3728 data/ui/glabels-ui.xml.h:137 - msgid "_Delete" - msgstr "У_далить" ++#: ../src/ui.c:201 ++msgid "Delete" ++msgstr "Удалить" + - #. Build editor. - #: src/view-box.c:236 - msgid "Box object properties" - msgstr "Свойства прямоугольника" ++#: ../src/ui.c:203 ++msgid "Delete the selected objects" ++msgstr "Удалить выбранные объекты" + - #. Build editor. - #: src/view-ellipse.c:236 - msgid "Ellipse object properties" - msgstr "Свойства эллипса" ++#: ../src/ui.c:208 ++msgid "Select All" ++msgstr "Выделить все" + - #. Build editor. - #: src/view-line.c:229 - msgid "Line object properties" - msgstr "Свойство линии" ++#: ../src/ui.c:210 ++msgid "Select all objects" ++msgstr "Выделить все объекты" + - #. Build editor. - #: src/view-image.c:223 - msgid "Image object properties" - msgstr "Свойства изображения" ++#: ../src/ui.c:215 ++msgid "Un-select All" ++msgstr "Снять выделение" + - #. Build editor. - #: src/view-text.c:251 - msgid "Text object properties" - msgstr "Свойства текста" ++#: ../src/ui.c:217 ++msgid "Remove all selections" ++msgstr "Снять выделение со всех объектов" + - #: src/view-text.c:571 data/glade/object-editor.glade.h:28 - msgid "Text" - msgstr "Текст" ++#: ../src/ui.c:222 ++msgid "Preferences" ++msgstr "Параметры" + - #. Build editor. - #: src/view-barcode.c:210 - msgid "Barcode object properties" - msgstr "Свойства объекта типа штрих-код" ++#: ../src/ui.c:224 ++msgid "Configure the application" ++msgstr "Настроить программу" + - #: src/view-barcode.c:594 src/print.c:1125 - msgid "Invalid barcode data" - msgstr "Неверные данные штрих-кода" ++#: ../src/ui.c:231 ++msgid "Zoom in" ++msgstr "Приблизить" + - #: src/merge-properties-dialog.c:231 - msgid "Merge Properties" - msgstr "Свойства объединения" ++#: ../src/ui.c:233 ++msgid "Increase magnification" ++msgstr "Уменьшить масштаб" + - #. ---- Source section ---- - #: src/merge-properties-dialog.c:237 - msgid "Source" - msgstr "Источник" ++#: ../src/ui.c:238 ++msgid "Zoom out" ++msgstr "Отдалить" + - #: src/merge-properties-dialog.c:245 - msgid "Format:" - msgstr "Формат:" ++#: ../src/ui.c:240 ++msgid "Decrease magnification" ++msgstr "Увеличить масштаб" + - #. Location line - #: src/merge-properties-dialog.c:273 - msgid "Location:" - msgstr "Расположение:" ++#: ../src/ui.c:245 ++msgid "Zoom 1 to 1" ++msgstr "Масштаб 1:1" + - #: src/merge-properties-dialog.c:282 src/merge-properties-dialog.c:393 - msgid "Select merge-database source" - msgstr "Выбрать источник данных для объединения" ++#: ../src/ui.c:247 ++msgid "Restore scale to 100%" ++msgstr "Восстановить масштаб 1:1" + - #: src/merge-properties-dialog.c:289 src/merge-properties-dialog.c:404 - msgid "N/A" - msgstr "Недоступно" ++#: ../src/ui.c:252 ++msgid "Zoom to fit" ++msgstr "Уместить целиком в окне" + - #. ---- Sample Fields section ---- - #: src/merge-properties-dialog.c:300 - msgid "Record selection/preview:" - msgstr "Просмотр и выбор записей:" ++#: ../src/ui.c:254 ++msgid "Set scale to fit window" ++msgstr "Изменить масштаб, чтобы изображение было видно полностью" + - #: src/merge-properties-dialog.c:326 - msgid "Select" - msgstr "Выбран" ++#: ../src/ui.c:261 ++msgid "Select Mode" ++msgstr "Режим выбора" + - #: src/merge-properties-dialog.c:334 - msgid "Record/Field" - msgstr "Запись/Поле" ++#: ../src/ui.c:263 ++msgid "Select, move and modify objects" ++msgstr "Выбрать, переместить или изменить объекты" + - #: src/merge-properties-dialog.c:342 data/glade/object-editor.glade.h:9 - msgid "Data" - msgstr "Данные" ++#: ../src/ui.c:268 ../src/view-text.c:494 ++#: ../data/glade/object-editor.glade.h:32 ++msgid "Text" ++msgstr "Текст" + - #: src/print-dialog.c:266 data/ui/glabels-ui.xml.h:81 - msgid "Print" - msgstr "Напечатать" ++#: ../src/ui.c:270 ++msgid "Create text object" ++msgstr "Добавить текст" + - #: src/print-dialog.c:281 - msgid "_Job" - msgstr "_Задание" ++#: ../src/ui.c:275 ++msgid "Box" ++msgstr "Прямоугольник" + - #: src/print-dialog.c:286 - msgid "P_rinter" - msgstr "П_ринтер" ++#: ../src/ui.c:277 ++msgid "Create box/rectangle object" ++msgstr "Добавить прямоугольник" + - #. ----------- Add simple-copies widget ------------ - #: src/print-dialog.c:314 - msgid "Copies" - msgstr "Копий" ++#: ../src/ui.c:282 ../data/glade/object-editor.glade.h:20 ++msgid "Line" ++msgstr "Обводка" + - #. ------- Add merge control widget ------------ - #: src/print-dialog.c:322 - msgid "Document merge control" - msgstr "Управление объединением" ++#: ../src/ui.c:284 ++msgid "Create line object" ++msgstr "Добавить линию" + - #. ----------- Add custom print options area ------------ - #: src/print-dialog.c:330 - msgid "Options" - msgstr "Параметры" ++#: ../src/ui.c:289 ++msgid "Ellipse" ++msgstr "Эллипс" + - #: src/print-dialog.c:553 src/print-dialog.c:592 - msgid "Print preview" - msgstr "Просмотреть" ++#: ../src/ui.c:291 ++msgid "Create ellipse/circle object" ++msgstr "Добавить эллипс/круг" + - #: src/template-designer.c:409 data/glade/template-designer.glade.h:73 - msgid "gLabels Template Designer" - msgstr "Дизайнер шаблонов gLabels" ++#: ../src/ui.c:296 ../data/glade/object-editor.glade.h:16 ++msgid "Image" ++msgstr "Изображение" + - #: src/bc.c:60 - msgid "POSTNET (any)" - msgstr "POSTNET (любой)" ++#: ../src/ui.c:298 ++msgid "Create image object" ++msgstr "Добавить растровое изображение" + - #: src/bc.c:63 - msgid "POSTNET-5 (ZIP only)" - msgstr "POSTNET-5 (только почтовый индекс)" ++#: ../src/ui.c:303 ++msgid "Barcode" ++msgstr "Штрих-код" + - #: src/bc.c:66 - msgid "POSTNET-9 (ZIP+4)" - msgstr "POSTNET-9 (ZIP+4)" ++#: ../src/ui.c:305 ++msgid "Create barcode object" ++msgstr "Добавить штрих-код" + - #: src/bc.c:69 - msgid "POSTNET-11 (DPBC)" - msgstr "POSTNET-11 (DPBC)" ++#: ../src/ui.c:310 ++msgid "Bring to front" ++msgstr "На передний план" + - #: src/bc.c:72 - msgid "EAN (any)" - msgstr "EAN (любой)" ++#: ../src/ui.c:312 ++msgid "Raise object to top" ++msgstr "Переместить объект на передний план" + - #: src/bc.c:75 - msgid "EAN-8" - msgstr "EAN-8" ++#: ../src/ui.c:317 ++msgid "Send to back" ++msgstr "На задний план" + - #: src/bc.c:78 - msgid "EAN-8 +2" - msgstr "EAN-8 +2" ++#: ../src/ui.c:319 ++msgid "Lower object to bottom" ++msgstr "Переместить объект на задний план" + - #: src/bc.c:81 - msgid "EAN-8 +5" - msgstr "EAN-8 +5" ++#: ../src/ui.c:324 ++msgid "Rotate left" ++msgstr "Повернуть влево" + - #: src/bc.c:84 - msgid "EAN-13" - msgstr "EAN-13" ++#: ../src/ui.c:326 ++msgid "Rotate object 90 degrees counter-clockwise" ++msgstr "Повернуть объект на 90 градусов против часовой стрелки" + - #: src/bc.c:87 - msgid "EAN-13 +2" - msgstr "EAN-13 +2" ++#: ../src/ui.c:331 ++msgid "Rotate right" ++msgstr "Повернуть вправо" + - #: src/bc.c:90 - msgid "EAN-13 +5" - msgstr "EAN-13 +5" ++#: ../src/ui.c:333 ++msgid "Rotate object 90 degrees clockwise" ++msgstr "Повернуть объект на 90 градусов по часовой стрелке" + - #: src/bc.c:93 - msgid "UPC (UPC-A or UPC-E)" - msgstr "UPC (UPC-A or UPC-E)" ++#: ../src/ui.c:338 ++msgid "Flip horizontally" ++msgstr "Отразить горизонтально" + - #: src/bc.c:96 - msgid "UPC-A" - msgstr "UPC-A" ++#: ../src/ui.c:340 ++msgid "Flip object horizontally" ++msgstr "Отразить объект горизонтально" + - #: src/bc.c:99 - msgid "UPC-A +2" - msgstr "UPC-A +2" ++#: ../src/ui.c:345 ++msgid "Flip vertically" ++msgstr "Отразить вертикально" + - #: src/bc.c:102 - msgid "UPC-A +5" - msgstr "UPC-A +5" ++#: ../src/ui.c:347 ++msgid "Flip object vertically" ++msgstr "Отразить объект вертикально" + - #: src/bc.c:105 - msgid "UPC-E" - msgstr "UPC-E" ++#: ../src/ui.c:352 ++msgid "Align left" ++msgstr "Выровнять по левому краю" + - #: src/bc.c:108 - msgid "UPC-E +2" - msgstr "UPC-E +2" ++#: ../src/ui.c:354 ++msgid "Align objects to left edges" ++msgstr "Выровнять объекты по левому краю" + - #: src/bc.c:111 - msgid "UPC-E +5" - msgstr "UPC-E +5" ++#: ../src/ui.c:359 ++msgid "Align right" ++msgstr "Выровнять по правому краю" + - #: src/bc.c:114 - msgid "ISBN" - msgstr "ISBN" ++#: ../src/ui.c:361 ++msgid "Align objects to right edges" ++msgstr "Выровнять объекты по правому краю" + - #: src/bc.c:117 - msgid "ISBN +5" - msgstr "ISBN +5" ++#: ../src/ui.c:366 ++msgid "Align horizontal center" ++msgstr "Выровнять по горизонтальным центрам" + - #: src/bc.c:120 - msgid "Code 39" - msgstr "Code 39" ++#: ../src/ui.c:368 ++msgid "Align objects to horizontal centers" ++msgstr "Выровнять объекты по горизонтальным центрам" + - #: src/bc.c:123 - msgid "Code 128" - msgstr "Code 128" ++#: ../src/ui.c:373 ++msgid "Align tops" ++msgstr "Выровнять по верхнему краю" + - #: src/bc.c:126 - msgid "Code 128C" - msgstr "Code 128C" ++#: ../src/ui.c:375 ++msgid "Align objects to top edges" ++msgstr "Выровнять объекты по верхним краям" + - #: src/bc.c:129 - msgid "Code 128B" - msgstr "Code 128B" ++#: ../src/ui.c:380 ++msgid "Align bottoms" ++msgstr "Выровнять по нижнему краю" + - #: src/bc.c:132 - msgid "Interleaved 2 of 5" - msgstr "Interleaved 2 of 5" ++#: ../src/ui.c:382 ++msgid "Align objects to bottom edges" ++msgstr "Выровнять объекты по нижним краям" + - #: src/bc.c:135 - msgid "Codabar" - msgstr "" ++#: ../src/ui.c:387 ++msgid "Align vertical center" ++msgstr "Выровнять по вертикальным центрам" + - #: src/bc.c:138 - msgid "MSI" - msgstr "MSI" ++#: ../src/ui.c:389 ++msgid "Align objects to vertical centers" ++msgstr "Выровнять объекты по вертикальным центрам" + - #: src/bc.c:141 - msgid "Plessey" - msgstr "" ++#: ../src/ui.c:394 ++msgid "Center horizontally" ++msgstr "Отцентрировать по горизонтали" + - #: src/label.c:569 - msgid "Untitled" - msgstr "Без названия" ++#: ../src/ui.c:396 ++msgid "Center objects to horizontal label center" ++msgstr "Центрировать объекты по центру горизонтальной метки" + - #: src/xml-label.c:176 src/xml-label.c:213 - msgid "xmlParseFile error" - msgstr "Ошибка при разборе файла XML" ++#: ../src/ui.c:401 ++msgid "Center vertically" ++msgstr "Отцентрировать по вертикали" + - #: src/xml-label.c:250 - msgid "No document root" - msgstr "Нет корня документа" ++#: ../src/ui.c:403 ++msgid "Center objects to vertical label center" ++msgstr "Центрировать объекты по центру вертикальной метки" + - #: src/xml-label.c:264 - msgid "Importing from glabels 0.1 format" - msgstr "Импортируем из файла glabels версии 0.1" ++#: ../src/ui.c:408 ++msgid "Merge properties" ++msgstr "Заполнить поля данными" + - #: src/xml-label.c:272 - msgid "Importing from glabels 0.4 format" - msgstr "Импортируем из файла glabels версии 0.4" ++#: ../src/ui.c:410 ++msgid "Edit merge properties" ++msgstr "Изменить параметры заполнения полей данными" + - #: src/xml-label.c:279 - msgid "Importing from glabels 1.91 format" - msgstr "Импортируем из формата glabels версии 1.91" ++#: ../src/ui.c:417 ++msgid "Contents" ++msgstr "Содержание" + - #: src/xml-label.c:282 - msgid "bad document, unknown glabels Namespace" - msgstr "документ неверного типа, неизвестное пространство имён glabels" ++#: ../src/ui.c:419 ++msgid "Open glabels manual" ++msgstr "Показать справку по gLabels" + - #: src/xml-label.c:311 src/xml-label-04.c:75 src/xml-label-191.c:131 - #, c-format - msgid "Bad root node = \"%s\"" - msgstr "Неверный корневой узел = \"%s\"" ++#: ../src/ui.c:424 ++msgid "About..." ++msgstr "О программе..." + - #: src/xml-label.c:348 src/xml-label-191.c:165 - #, c-format - msgid "bad node in Document node = \"%s\"" - msgstr "Неверный узел в узле документа= \"%s\"" ++#: ../src/ui.c:426 ++msgid "About glabels" ++msgstr "О gLabels" + - #: src/xml-label.c:393 src/xml-label-04.c:123 src/xml-label-191.c:197 - #, c-format - msgid "bad node = \"%s\"" - msgstr "неверный узел = \"%s\"" ++#: ../src/ui.c:436 ++msgid "Property toolbar" ++msgstr "Панель свойств" + - #: src/xml-label.c:855 src/xml-label-191.c:624 - #, c-format - msgid "bad node in Data node = \"%s\"" - msgstr "неверный узел в узле данных= \"%s\"" ++#: ../src/ui.c:438 ++msgid "Change the visibility of the property toolbar in the current window" ++msgstr "Изменить видимость панели свойств в текущем окне" + - #: src/xml-label.c:1030 libglabels/xml-template.c:535 - msgid "Utf8 conversion error." - msgstr "Ошибка преобразования UTF8." ++#: ../src/ui.c:444 ../src/ui.c:489 ../src/ui.c:497 ++msgid "Show tooltips" ++msgstr "Показывать подсказки" + - #: src/xml-label.c:1037 libglabels/xml-template.c:542 - msgid "Problem saving xml file." - msgstr "Проблемы при сохранении файла XML" ++#: ../src/ui.c:446 ++msgid "Show tooltips for property toolbar" ++msgstr "Показывать подсказки на панели свойств" + - #. This should always be an id, but just in case a name - #. slips by! - #: src/xml-label-191.c:699 libglabels/xml-template.c:199 - #, c-format - msgid "Unknown page size id \"%s\", trying as name" - msgstr "Неизвестный идентификатор размера страницы \"%s\", пробуем как название" ++#: ../src/ui.c:452 ++msgid "Grid" ++msgstr "Сетка" + - #: src/xml-label-191.c:709 libglabels/xml-template.c:209 - #, c-format - msgid "Unknown page size id or name \"%s\"" - msgstr "Неизвестный идентификатор размера страницы или название \"%s\"" ++#: ../src/ui.c:454 ++msgid "Change the visibility of the grid in the current window" ++msgstr "Изменить видимость сетки в текущем окне" + - #: src/merge.c:172 src/merge.c:213 src/merge.c:399 src/merge.c:402 - msgid "None" - msgstr "Ничего" ++#: ../src/ui.c:460 ++msgid "Markup" ++msgstr "Разметка" + - #: src/merge-init.c:53 - msgid "Text file with comma delimeters (CSV)" - msgstr "Текст с разделителем \"запятая\" (CSV)" ++#: ../src/ui.c:462 ++msgid "Change the visibility of markup lines in the current window" ++msgstr "Изменить видимость линии разметки в текущем окне" + - #: src/merge-init.c:60 - msgid "Text file with colon delimeters" - msgstr "Текст с разделителем \"двоеточие\"" ++#: ../src/ui.c:473 ++msgid "Main toolbar" ++msgstr "Показывать панель инструментов" + - #: src/merge-init.c:67 - msgid "Text file with tab delimeters" - msgstr "Текст с разделителем \"символ табуляции\"" ++#: ../src/ui.c:475 ++msgid "Change the visibility of the main toolbar in the current window" ++msgstr "Изменить видимость главной панели инструментов в текущем окне" + - #: src/wdgt-image-select.c:201 data/glade/object-editor.glade.h:11 - msgid "File:" - msgstr "Файл:" ++#: ../src/ui.c:481 ++msgid "Drawing toolbar" ++msgstr "Панель рисования" + - #: src/wdgt-image-select.c:245 data/glade/object-editor.glade.h:16 - msgid "Key:" - msgstr "Ключ:" ++#: ../src/ui.c:483 ++msgid "Change the visibility of the drawing toolbar in the current window" ++msgstr "Изменить видимость панели инструментов для рисования в текущем окне" + - #: src/wdgt-print-copies.c:179 - msgid "Sheets:" - msgstr "Листов:" ++#: ../src/ui.c:491 ++msgid "Show tooltips for main toolbar" ++msgstr "Показывать подсказки в главной панели инструментов" + - #: src/wdgt-print-copies.c:197 - msgid "Labels" - msgstr "Этикетки" ++#: ../src/ui.c:499 ++msgid "Show tooltips for drawing toolbar" ++msgstr "Показывать подсказки в панели рисования" + - #: src/wdgt-print-copies.c:200 - msgid "from:" - msgstr "с:" ++#: ../src/ui-property-bar.c:1232 ../src/object-editor.c:587 ++#: ../src/object-editor.c:593 ++msgid "Default" ++msgstr "По умолчанию" + - #: src/wdgt-print-copies.c:207 - msgid "to:" - msgstr "до:" ++#: ../src/ui-property-bar.c:1239 ../src/object-editor.c:599 ++msgid "No line" ++msgstr "Без обводки" + - #: src/wdgt-print-merge.c:178 - msgid "Start on label" - msgstr "Начать с этикетки" ++#: ../src/ui-property-bar.c:1247 ../src/object-editor.c:606 ++msgid "No fill" ++msgstr "Без заливки" + - #: src/wdgt-print-merge.c:186 - msgid "on 1st sheet" - msgstr "на первом листе" ++#: ../src/ui-sidebar.c:152 ++msgid "Object properties" ++msgstr "Свойства объекта" + - #: src/wdgt-print-merge.c:195 - msgid "Copies:" - msgstr "Копий:" ++#: ../src/ui-commands.c:1084 ++msgid "Glabels includes contributions from:" ++msgstr "В разработке gLabels поучаствовали:" + - #: src/wdgt-print-merge.c:201 - msgid "Collate" - msgstr "Собирать" ++#: ../src/ui-commands.c:1090 ++msgid "See the file AUTHORS for additional credits," ++msgstr "" ++"Подробная информация об участниках\n" ++"изложена в файле AUTHORS, а также" + - #: src/wdgt-media-select.c:269 data/glade/template-designer.glade.h:29 - msgid "Description:" - msgstr "Описание:" ++#: ../src/ui-commands.c:1091 ++msgid "or visit http://glabels.sourceforge.net/" ++msgstr "на сайте http://glabels.sourceforge.net/" + - #: src/wdgt-media-select.c:279 data/glade/template-designer.glade.h:53 - msgid "Page size:" - msgstr "Размер страницы:" ++#: ../src/ui-commands.c:1103 ++msgid "A label and business card creation program.\n" ++msgstr "Программа для создания этикетов и визитных карточек.\n" ++ ++#: ../src/ui-commands.c:1107 ++msgid "translator-credits" ++msgstr "" ++"Виталий Липатов , 2002-2005\n" ++"Александр Прокудин , 2008" + - #: src/wdgt-media-select.c:290 - msgid "Label size:" - msgstr "Размер этикетки:" ++#: ../src/ui-commands.c:1110 ++msgid "" ++"Glabels is free software; you can redistribute it and/or modify it\n" ++"under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation; either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++"\n" ++"This program is distributed in the hope that it will be useful, but\n" ++"WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n" ++"the GNU General Public License for more details.\n" ++msgstr "" ++"Glabels является свободным программным обеспечением;\n" ++"вы вправе распространять её и/или модифицировать в соответствии\n" ++"с условиями версии 2 либо по вашему выбору более поздней\n" ++"версии Стандартной Общественной Лицензии GNU, \n" ++"опубликованной Free Software Foundation.\n" ++" \n" ++"Мы распространяем данную программу в надежде на то, что она\n" ++"будет вам полезной, однако НЕ ПРЕДОСТАВЛЯЕМ НА НЕЁ НИКАКИХ\n" ++"ГАРАНТИЙ, в том числе ГАРАНТИИ ТОВАРНОГО СОСТОЯНИЯ ПРИ\n" ++"ПРОДАЖЕ И ПРИГОДНОСТИ ДЛЯ ИСПОЛЬЗОВАНИЯ В КОНКРЕТНЫХ\n" ++"ЦЕЛЯХ. Для получения более подробной информации ознакомьтесь\n" ++"со Стандартной Общественной Лицензией GNU.\n" ++ ++#: ../src/ui-commands.c:1136 ++msgid "glabels" ++msgstr "glabels" + - #: src/wdgt-media-select.c:301 - msgid "Layout:" - msgstr "Формат:" ++#: ../src/file.c:91 ++msgid "New Label or Card" ++msgstr "Новая этикетка или визитка" ++ ++#: ../src/file.c:191 ++msgid "Label properties" ++msgstr "Свойства этикетки" ++ ++#: ../src/file.c:292 ../src/file.c:578 ++msgid "All files" ++msgstr "Все файлы" ++ ++#: ../src/file.c:297 ../src/file.c:583 ++msgid "gLabels documents" ++msgstr "Документы gLabels" + - #: src/wdgt-media-select.c:578 ++#: ../src/file.c:343 ../src/file.c:640 ++msgid "Empty file name selection" ++msgstr "Пустой выбор файла" ++ ++#: ../src/file.c:346 ../src/file.c:362 ++msgid "Please select a file or supply a valid file name" ++msgstr "Выберите файл или введите корректное название файла" ++ ++#: ../src/file.c:359 ++msgid "File does not exist" ++msgstr "Файл не существует" ++ ++#: ../src/file.c:433 +#, c-format - msgid "%d x %d (%d per sheet)" - msgstr "%d x %d (%d на лист)" ++msgid "Could not open file \"%s\"" ++msgstr "Невозможно открыть файл \"%s\"" + - #: src/wdgt-media-select.c:582 ++#: ../src/file.c:436 ++msgid "Not a supported file format" ++msgstr "Файл неподдерживаемого формата" ++ ++#: ../src/file.c:513 ../src/file.c:690 +#, c-format - msgid "%d per sheet" - msgstr "%d на лист" ++msgid "Could not save file \"%s\"" ++msgstr "Невозможно сохранить файл \"%s\"" + - #: src/wdgt-media-select.c:614 ++#: ../src/file.c:517 ../src/file.c:694 ++msgid "Error encountered during save. The file is still not saved." ++msgstr "Произошла ошибка при сохранении файла. Файл всё ещё не сохранён." ++ ++#: ../src/file.c:556 +#, c-format - msgid "%s x %s %s" - msgstr "%s x %s %s" ++msgid "Save \"%s\" as" ++msgstr "Сохранить \"%s\" как" + - #: src/wdgt-media-select.c:619 ++#: ../src/file.c:643 ++msgid "Please supply a valid file name" ++msgstr "Укажите корректное название файла" ++ ++#: ../src/file.c:664 +#, c-format - msgid "%.5g x %.5g %s" - msgstr "%.5g x %.5g %s" ++msgid "Overwrite file \"%s\"?" ++msgstr "Перезаписать файл \"%s\"?" ++ ++#: ../src/file.c:668 ++msgid "File already exists." ++msgstr "Файл уже существует." + - #: src/wdgt-media-select.c:630 src/wdgt-media-select.c:644 ++#: ../src/file.c:764 +#, c-format - msgid "%s %s diameter" - msgstr "%s %s диаметр" ++msgid "Save changes to document \"%s\" before closing?" ++msgstr "Сохранить изменения в документе \"%s\" перед закрытием?" + - #: src/wdgt-media-select.c:634 src/wdgt-media-select.c:648 ++#: ../src/file.c:768 ++msgid "Your changes will be lost if you don't save them." ++msgstr "Все изменения будут потеряны, если вы их не сохраните." ++ ++#: ../src/file.c:771 ++msgid "Close without saving" ++msgstr "Закрыть без сохранения" ++ ++#. Should not happen ++#: ../src/prefs.c:159 ../src/prefs.c:166 ++#: ../data/glade/object-editor.glade.h:43 ++#: ../data/glade/prefs-dialog.glade.h:22 ++msgid "points" ++msgstr "пунктов" ++ ++#: ../src/prefs.c:161 ../data/glade/object-editor.glade.h:42 ++#: ../data/glade/template-designer.glade.h:64 ++msgid "inches" ++msgstr "дюймов" ++ ++#: ../src/prefs.c:163 ++msgid "mm" ++msgstr "мм" ++ ++#: ../src/prefs-dialog.c:162 ../data/glade/prefs-dialog.glade.h:21 ++msgid "gLabels Preferences" ++msgstr "Параметры gLabels" ++ ++#. Build editor. ++#: ../src/view-box.c:175 ++msgid "Box object properties" ++msgstr "Свойства прямоугольника" ++ ++#. Build editor. ++#: ../src/view-ellipse.c:175 ++msgid "Ellipse object properties" ++msgstr "Свойства эллипса" ++ ++#. Build editor. ++#: ../src/view-line.c:174 ++msgid "Line object properties" ++msgstr "Свойство линии" ++ ++#. Build editor. ++#: ../src/view-image.c:174 ++msgid "Image object properties" ++msgstr "Свойства изображения" ++ ++#. Build editor. ++#: ../src/view-text.c:178 ++msgid "Text object properties" ++msgstr "Свойства текста" ++ ++#. Build editor. ++#: ../src/view-barcode.c:174 ++msgid "Barcode object properties" ++msgstr "Свойства объекта типа штрих-код" ++ ++#: ../src/object-editor-image-page.c:270 ++msgid "All Files" ++msgstr "Все файлы" ++ ++#: ../src/object-editor-image-page.c:275 ++msgid "All Images" ++msgstr "Все изображения" ++ ++#: ../src/object-editor-image-page.c:290 +#, c-format - msgid "%.5g %s diameter" - msgstr "%.5g %s диаметр" ++msgid "%s (*.%s)" ++msgstr "%s (*.%s)" + - #: src/wdgt-rotate-label.c:193 - msgid "Rotate" - msgstr "Повернуть" ++#: ../src/merge-properties-dialog.c:263 ++msgid "Merge Properties" ++msgstr "Параметры заполнения данными" + - #. This is the default custom color - #: src/mygal/color-palette.c:396 - msgid "custom" - msgstr "выборочно" ++#: ../src/merge-properties-dialog.c:289 ../src/merge-properties-dialog.c:397 ++msgid "Select merge-database source" ++msgstr "Выбрать источник данных для заполнения данными" + - #. "Custom" color - we'll pop up a GnomeColorPicker - #: src/mygal/color-palette.c:438 - msgid "Custom Color:" - msgstr "Пользовательский цвет:" ++#: ../src/merge-properties-dialog.c:298 ../src/merge-properties-dialog.c:417 ++msgid "N/A" ++msgstr "Н/Д" + - #: src/mygal/color-palette.c:446 - msgid "Choose Custom Color" - msgstr "Выберите пользовательский цвет" ++#: ../src/merge-properties-dialog.c:324 ++msgid "Select" ++msgstr "Выбрано" + - #: src/mygal/color-palette.c:579 - msgid "black" - msgstr "чёрный" ++#: ../src/merge-properties-dialog.c:332 ++msgid "Record/Field" ++msgstr "Запись/Поле" + - #: src/mygal/color-palette.c:580 - msgid "light brown" - msgstr "светло-коричневый" ++#: ../src/merge-properties-dialog.c:340 ../data/glade/object-editor.glade.h:10 ++msgid "Data" ++msgstr "Данные" + - #: src/mygal/color-palette.c:581 - msgid "brown gold" - msgstr "золотой коричневый" ++#: ../src/merge-properties-dialog.c:410 ++msgid "Fixed" ++msgstr "" + - #: src/mygal/color-palette.c:582 - msgid "dark green #2" - msgstr "чёрно-зелёный ?2" ++#. =================================================================== ++#: ../src/print-op.c:237 ../src/wdgt-print-copies.c:171 ++#: ../data/templates/misc-iso-templates.xml.h:34 ++msgid "Labels" ++msgstr "Этикетки" + - #: src/mygal/color-palette.c:583 - msgid "navy" - msgstr "морской" ++#: ../src/template-designer.c:358 ++msgid "gLabels Template Designer" ++msgstr "Дизайнер шаблонов gLabels" + - #: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640 - msgid "dark blue" - msgstr "тёмно-синий" ++#: ../src/template-designer.c:419 ++msgid "Welcome" ++msgstr "Добро пожаловать" + - #: src/mygal/color-palette.c:585 - msgid "purple #2" - msgstr "пурпурный ?2" ++#: ../src/template-designer.c:463 ++msgid "Name and Description" ++msgstr "Название и описание" + - #: src/mygal/color-palette.c:586 - msgid "very dark gray" - msgstr "очень тёмно-серый" ++#: ../src/template-designer.c:516 ++msgid "Page Size" ++msgstr "Формат страницы" + - #: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645 - msgid "dark red" - msgstr "тёмно-красный" ++#: ../src/template-designer.c:587 ++msgid "Label or Card Shape" ++msgstr "Форма этикетки или визитки" + - #: src/mygal/color-palette.c:590 - msgid "red-orange" - msgstr "красно-оранжевый" ++#: ../src/template-designer.c:637 ++#, fuzzy ++msgid "Label or Card Size" ++msgstr "Форма этикетки или визитки" + - #: src/mygal/color-palette.c:591 - msgid "gold" - msgstr "золотой" ++#: ../src/template-designer.c:737 ++#, fuzzy ++msgid "Label Size (round)" ++msgstr "Размер метки (диаметр)" + - #: src/mygal/color-palette.c:592 - msgid "dark green" - msgstr "тёмно-зелёный" ++#: ../src/template-designer.c:820 ++msgid "Label Size (CD/DVD)" ++msgstr "Размер метки (CD/DVD)" + - #: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646 - msgid "dull blue" - msgstr "тускло-синий" ++#: ../src/template-designer.c:913 ++msgid "Number of Layouts" ++msgstr "Количество форм" + - #: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647 - msgid "blue" - msgstr "синий" ++#: ../src/template-designer.c:976 ++msgid "Layout(s)" ++msgstr "Формы" + - #: src/mygal/color-palette.c:595 - msgid "dull purple" - msgstr "тускло-пурпурный" ++#: ../src/template-designer.c:1087 ++msgid "Design Completed" ++msgstr "Оформление завершено" + - #: src/mygal/color-palette.c:596 - msgid "dark grey" - msgstr "тёмно-серый" ++#: ../src/template-designer.c:1253 ++msgid "" ++"Brand and part# match an existing " ++"template!" ++msgstr "" + - #: src/mygal/color-palette.c:599 - msgid "red" - msgstr "красный" ++#: ../src/bc.c:67 ++msgid "POSTNET (any)" ++msgstr "POSTNET (любой)" + - #: src/mygal/color-palette.c:600 - msgid "orange" - msgstr "оранжевый" ++#: ../src/bc.c:70 ++msgid "POSTNET-5 (ZIP only)" ++msgstr "POSTNET-5 (только почтовый индекс)" + - #: src/mygal/color-palette.c:601 - msgid "lime" - msgstr "лимонный" ++#: ../src/bc.c:73 ++msgid "POSTNET-9 (ZIP+4)" ++msgstr "POSTNET-9 (ZIP+4)" + - #: src/mygal/color-palette.c:602 - msgid "dull green" - msgstr "тускло-зелёный" ++#: ../src/bc.c:76 ++msgid "POSTNET-11 (DPBC)" ++msgstr "POSTNET-11 (DPBC)" + - #: src/mygal/color-palette.c:603 - msgid "dull blue #2" - msgstr "туско-синий ?2" ++#: ../src/bc.c:79 ++msgid "CEPNET" ++msgstr "CEPNET" + - #: src/mygal/color-palette.c:604 - msgid "sky blue #2" - msgstr "небесно-синий ?2" ++#: ../src/bc.c:82 ++msgid "EAN (any)" ++msgstr "EAN (любой)" + - #: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644 - msgid "purple" - msgstr "пурпурный" ++#: ../src/bc.c:85 ++msgid "EAN-8" ++msgstr "EAN-8" + - #: src/mygal/color-palette.c:606 - msgid "gray" - msgstr "серый" ++#: ../src/bc.c:88 ++msgid "EAN-8 +2" ++msgstr "EAN-8 +2" + - #: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641 - msgid "magenta" - msgstr "малиновый" ++#: ../src/bc.c:91 ++msgid "EAN-8 +5" ++msgstr "EAN-8 +5" + - #: src/mygal/color-palette.c:610 - msgid "bright orange" - msgstr "ярко-оранжевый" ++#: ../src/bc.c:94 ++msgid "EAN-13" ++msgstr "EAN-13" + - #: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642 - msgid "yellow" - msgstr "жёлтый" ++#: ../src/bc.c:97 ++msgid "EAN-13 +2" ++msgstr "EAN-13 +2" + - #: src/mygal/color-palette.c:612 - msgid "green" - msgstr "зелёный" ++#: ../src/bc.c:100 ++msgid "EAN-13 +5" ++msgstr "EAN-13 +5" + - #: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643 - msgid "cyan" - msgstr "циан" ++#: ../src/bc.c:103 ++msgid "UPC (UPC-A or UPC-E)" ++msgstr "UPC (UPC-A or UPC-E)" + - #: src/mygal/color-palette.c:614 - msgid "bright blue" - msgstr "ярко-синий" ++#: ../src/bc.c:106 ++msgid "UPC-A" ++msgstr "UPC-A" + - #: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632 - msgid "red purple" - msgstr "красно-пурпурный" ++#: ../src/bc.c:109 ++msgid "UPC-A +2" ++msgstr "UPC-A +2" + - #: src/mygal/color-palette.c:616 - msgid "light grey" - msgstr "светло-серый" ++#: ../src/bc.c:112 ++msgid "UPC-A +5" ++msgstr "UPC-A +5" + - #: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636 - msgid "pink" - msgstr "розовый" ++#: ../src/bc.c:115 ++msgid "UPC-E" ++msgstr "UPC-E" + - #: src/mygal/color-palette.c:620 - msgid "light orange" - msgstr "светло-оранжевый" ++#: ../src/bc.c:118 ++msgid "UPC-E +2" ++msgstr "UPC-E +2" + - #: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633 - msgid "light yellow" - msgstr "светло-жёлтый" ++#: ../src/bc.c:121 ++msgid "UPC-E +5" ++msgstr "UPC-E +5" + - #: src/mygal/color-palette.c:622 - msgid "light green" - msgstr "светло-зелёный" ++#: ../src/bc.c:124 ++msgid "ISBN" ++msgstr "ISBN" + - #: src/mygal/color-palette.c:623 - msgid "light cyan" - msgstr "светло-циан" ++#: ../src/bc.c:127 ++msgid "ISBN +5" ++msgstr "ISBN +5" + - #: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634 - msgid "light blue" - msgstr "светло-синий" ++#: ../src/bc.c:130 ++msgid "Code 39" ++msgstr "Code 39" + - #: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638 - msgid "light purple" - msgstr "светло-пурпурный" ++#: ../src/bc.c:133 ++msgid "Code 128" ++msgstr "Code 128" + - #: src/mygal/color-palette.c:626 - msgid "white" - msgstr "белый" ++#: ../src/bc.c:136 ++msgid "Code 128C" ++msgstr "Code 128C" + - #: src/mygal/color-palette.c:631 - msgid "purplish blue" - msgstr "пурпурно-синий" ++#: ../src/bc.c:139 ++msgid "Code 128B" ++msgstr "Code 128B" + - #: src/mygal/color-palette.c:635 - msgid "dark purple" - msgstr "тёмно-пурпурный" ++#: ../src/bc.c:142 ++msgid "Interleaved 2 of 5" ++msgstr "Interleaved 2 of 5" + - #: src/mygal/color-palette.c:637 - msgid "sky blue" - msgstr "небесно-синий" ++#: ../src/bc.c:145 ++msgid "Codabar" ++msgstr "Codabar" + - #: libglabels/template.c:848 - #, c-format - msgid "Generic %s full page" - msgstr "Основная %s полная страница" ++#: ../src/bc.c:148 ++msgid "MSI" ++msgstr "MSI" + - #: libglabels/template.c:897 - msgid "No template files found!" - msgstr "Не найдены файлы шаблона!" ++#: ../src/bc.c:151 ++msgid "Plessey" ++msgstr "Plessey" + - #. Create and append an "Other" entry. - #: libglabels/paper.c:67 - msgid "Other" - msgstr "Другой" ++#: ../src/bc.c:154 ++msgid "IEC16022 (DataMatrix)" ++msgstr "IEC16022 (DataMatrix)" + - #: libglabels/paper.c:361 - msgid "No paper files found!" - msgstr "Не найдены файлы описания бумаги!" ++#: ../src/label.c:531 ++msgid "Untitled" ++msgstr "Без названия" + - #: data/ui/glabels-ui.xml.h:1 - msgid "About glabels" - msgstr "О gLabels" ++#: ../src/label-barcode.c:426 ++msgid "Barcode data empty" ++msgstr "Данные штрих-кода не введены" + - #: data/ui/glabels-ui.xml.h:2 - msgid "About..." - msgstr "О программе..." ++#: ../src/label-barcode.c:430 ++msgid "Invalid barcode data" ++msgstr "Неверные данные штрих-кода" + - #: data/ui/glabels-ui.xml.h:3 - msgid "Align _Horizontal" - msgstr "Выровнять по _горизонтали" ++#: ../src/xml-label.c:189 ../src/xml-label.c:226 ++msgid "xmlParseFile error" ++msgstr "Ошибка при разборе файла XML" + - #: data/ui/glabels-ui.xml.h:4 - msgid "Align _Vertical" - msgstr "Выровнять по _вертикали" ++#: ../src/xml-label.c:262 ++msgid "No document root" ++msgstr "Нет корня документа" + - #: data/ui/glabels-ui.xml.h:5 - msgid "Align objects to bottoms" - msgstr "Выровнять объекты по низам" ++#: ../src/xml-label.c:270 ++msgid "Importing from glabels 0.1 format" ++msgstr "Выполняется импорт из файла gLabels версии 0.1" + - #: data/ui/glabels-ui.xml.h:6 - msgid "Align objects to horizontal centers" - msgstr "Выровнять объекты по горизонтальным центрам" ++#: ../src/xml-label.c:279 ++msgid "Importing from glabels 0.4 format" ++msgstr "Выполняется импорт из файла gLabels версии 0.4" + - #: data/ui/glabels-ui.xml.h:7 - msgid "Align objects to left edges" - msgstr "Выровнять объекты по левому краю" ++#: ../src/xml-label.c:288 ++#, fuzzy, c-format ++msgid "Unknown glabels Namespace -- Using %s" ++msgstr "документ неверного типа, неизвестное пространство имён glabels" + - #: data/ui/glabels-ui.xml.h:8 - msgid "Align objects to right edges" - msgstr "Выровнять объекты по правому краю" ++#: ../src/xml-label.c:319 ../src/xml-label-04.c:79 ++#, c-format ++msgid "Bad root node = \"%s\"" ++msgstr "Неверный корневой узел = \"%s\"" + - #: data/ui/glabels-ui.xml.h:9 - msgid "Align objects to tops" - msgstr "Выровнять объекты по верхам" ++#: ../src/xml-label.c:356 ++#, c-format ++msgid "bad node in Document node = \"%s\"" ++msgstr "Неверный узел в узле документа= \"%s\"" + - #: data/ui/glabels-ui.xml.h:10 - msgid "Align objects to vertical centers" - msgstr "Выровнять объекты по вертикальным центрам" ++#: ../src/xml-label.c:401 ../src/xml-label-04.c:127 ++#, c-format ++msgid "bad node = \"%s\"" ++msgstr "неверный узел = \"%s\"" + - #: data/ui/glabels-ui.xml.h:12 - msgid "Bold" - msgstr "Жирный" ++#: ../src/xml-label.c:840 ++#, c-format ++msgid "bad node in Data node = \"%s\"" ++msgstr "неверный узел в узле данных= \"%s\"" + - #: data/ui/glabels-ui.xml.h:14 - msgid "Center align" - msgstr "Выровнять по центру" ++#: ../src/xml-label.c:1077 ../libglabels/xml-template.c:670 ++msgid "Utf8 conversion error." ++msgstr "Ошибка преобразования UTF8." + - #: data/ui/glabels-ui.xml.h:15 - msgid "Center objects to horizontal label center" - msgstr "Центрировать объекты по центру горизонтальной метки" ++#: ../src/xml-label.c:1084 ++msgid "Problem saving xml file." ++msgstr "Неполадки при сохранении файла XML." + - #: data/ui/glabels-ui.xml.h:16 - msgid "Center objects to vertical label center" - msgstr "Центрировать объекты по центру вертикальной метки" ++#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378 ++msgid "None" ++msgstr "Нет" + - #: data/ui/glabels-ui.xml.h:17 - msgid "Change the visibility of markup lines in the current window" - msgstr "Изменить видимость линии разметки в текущем окне" ++#: ../src/merge-init.c:59 ++msgid "Text file with comma delimeters (CSV)" ++msgstr "Текст с разделителем «запятая» (CSV)" + - #: data/ui/glabels-ui.xml.h:18 - msgid "Change the visibility of the drawing toolbar in the current window" - msgstr "Изменить видимость панели инструментов для рисования в текущем окне" ++#: ../src/merge-init.c:66 ++msgid "Text file with colon delimeters" ++msgstr "Текст с разделителем «двоеточие»" + - #: data/ui/glabels-ui.xml.h:19 - msgid "Change the visibility of the grid in the current window" - msgstr "Изменить видимость сетки в текущем окне" ++#: ../src/merge-init.c:73 ++msgid "Text file with tab delimeters" ++msgstr "Текст с разделителем «символ табуляции»" + - #: data/ui/glabels-ui.xml.h:20 - msgid "Change the visibility of the main toolbar in the current window" - msgstr "Изменить видимость главной панели инструментов в текущем окне" ++#: ../src/merge-init.c:82 ++msgid "Data from default Evolution Addressbook" ++msgstr "Данные из используемой по умолчанию адресной книги Evolution" + - #: data/ui/glabels-ui.xml.h:21 - msgid "Change the visibility of the property toolbar in the current window" - msgstr "Изменить видимость панели свойств в текущем окне" ++#: ../src/merge-init.c:88 ++msgid "Data from a file containing VCards" ++msgstr "Данные из файла, содержащего VCard" + - #: data/ui/glabels-ui.xml.h:22 - msgid "Close" - msgstr "Закрыть" ++#: ../src/merge-evolution.c:309 ++msgid "Couldn't construct query" ++msgstr "Не удалось сформировать запрос." + - #: data/ui/glabels-ui.xml.h:23 - msgid "Close the current file" - msgstr "Закрыть текущий файл" ++#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326 ++msgid "Couldn't open addressbook." ++msgstr "Не удалось открыть адресную книгу." + - #: data/ui/glabels-ui.xml.h:24 - msgid "Configure the application" - msgstr "Настроить программу" ++#: ../src/merge-evolution.c:341 ++msgid "Couldn't list available fields." ++msgstr "Не удалось перечислить доступные поля." + - #: data/ui/glabels-ui.xml.h:25 - msgid "Contents" - msgstr "Содержание справки" ++#: ../src/merge-evolution.c:377 ++msgid "Couldn't get contacts." ++msgstr "Не удалось получить контактные данные." + - #: data/ui/glabels-ui.xml.h:26 - msgid "Copy" - msgstr "Запомнить" ++#: ../src/wdgt-print-copies.c:153 ++msgid "Sheets:" ++msgstr "Листов:" ++ ++#: ../src/wdgt-print-copies.c:173 ++msgid "from:" ++msgstr "с:" ++ ++#: ../src/wdgt-print-copies.c:178 ++msgid "to:" ++msgstr "по:" ++ ++#: ../src/wdgt-print-merge.c:154 ++msgid "Start on label" ++msgstr "Начать с этикетки" ++ ++#: ../src/wdgt-print-merge.c:159 ++msgid "on 1st sheet" ++msgstr "на первом листе" + - #: data/ui/glabels-ui.xml.h:27 - msgid "Copy the selection" - msgstr "Запомнить выделенное" ++#: ../src/wdgt-print-merge.c:168 ++msgid "Copies:" ++msgstr "Копий:" + - #: data/ui/glabels-ui.xml.h:28 - msgid "Create a custom template" - msgstr "Создать свой шаблон" ++#: ../src/wdgt-print-merge.c:173 ++msgid "Collate" ++msgstr "Собирать" + - #: data/ui/glabels-ui.xml.h:29 - msgid "Create a new document" - msgstr "Создать новый документ" ++#: ../src/wdgt-media-select.c:288 ../src/wdgt-media-select.c:292 ++#: ../src/wdgt-media-select.c:297 ../src/wdgt-media-select.c:306 ++#: ../src/wdgt-media-select.c:309 ../src/wdgt-media-select.c:402 ++#: ../src/wdgt-media-select.c:609 ../src/wdgt-media-select.c:618 ++msgid "Any" ++msgstr "Любой вариант" + - #: data/ui/glabels-ui.xml.h:30 - msgid "Create barcode object" - msgstr "Разместить штрих-код" ++#: ../src/wdgt-media-select.c:643 ++#, c-format ++msgid "%d per sheet" ++msgstr "%d на лист" + - #: data/ui/glabels-ui.xml.h:31 - msgid "Create box/rectangle object" - msgstr "Разместить прямоугольник" ++#: ../src/wdgt-media-select.c:673 ++#, c-format ++msgid "%s x %s %s" ++msgstr "%s x %s %s" + - #: data/ui/glabels-ui.xml.h:32 - msgid "Create ellipse/circle object" - msgstr "Разместить эллипс/круг" ++#: ../src/wdgt-media-select.c:678 ++#, c-format ++msgid "%.5g x %.5g %s" ++msgstr "%.5g x %.5g %s" + - #: data/ui/glabels-ui.xml.h:33 - msgid "Create image object" - msgstr "Разместить растровое изображение" ++#: ../src/wdgt-media-select.c:689 ../src/wdgt-media-select.c:703 ++#, c-format ++msgid "%s %s diameter" ++msgstr "%s %s диаметр" + - #: data/ui/glabels-ui.xml.h:34 - msgid "Create line object" - msgstr "Разместить линию" ++#: ../src/wdgt-media-select.c:693 ../src/wdgt-media-select.c:707 ++#, c-format ++msgid "%.5g %s diameter" ++msgstr "%.5g %s диаметр" + - #: data/ui/glabels-ui.xml.h:35 - msgid "Create text object" - msgstr "Разместить текст" ++#: ../src/wdgt-media-select.c:781 ++msgid "No recent templates found." ++msgstr "Недавно открывавшихся шаблонов не обнаружено." + - #: data/ui/glabels-ui.xml.h:36 - msgid "Cu_t" - msgstr "_Вырезать" ++#: ../src/wdgt-media-select.c:782 ++msgid "Try selecting a template from the \"Search all templates\" page." ++msgstr "Попробуйте выбрать шаблон на вкладке «Поиск по шаблонам»." + - #: data/ui/glabels-ui.xml.h:37 - msgid "Customize" - msgstr "Настроить" ++#: ../src/wdgt-media-select.c:861 ++msgid "No match." ++msgstr "Нет совпадений." + - #: data/ui/glabels-ui.xml.h:38 - msgid "Customize Drawing Toolbar" - msgstr "Настроить панель рисования" ++#: ../src/wdgt-media-select.c:862 ++msgid "Try selecting a different brand, page size or category." ++msgstr "Попробуйте выбрать другую марку, формат страницы или категорию" + - #: data/ui/glabels-ui.xml.h:39 - msgid "Customize Main Toolbar" - msgstr "Настроить панель инструментов" ++#. This is the default custom color ++#: ../src/mygal/color-palette.c:389 ++msgid "custom" ++msgstr "выборочно" + - #: data/ui/glabels-ui.xml.h:40 - msgid "Customize Property Toolbar" - msgstr "Настроить панель свойств" ++#. "Custom" color - we'll pop up a GtkColorButton ++#: ../src/mygal/color-palette.c:431 ++msgid "Custom Color:" ++msgstr "Заказной цвет:" + - #: data/ui/glabels-ui.xml.h:41 - msgid "Customize toolbars" - msgstr "Настроить панель инструментов" ++#: ../src/mygal/color-palette.c:439 ++msgid "Choose Custom Color" ++msgstr "Выберите пользовательский цвет" + - #: data/ui/glabels-ui.xml.h:42 - msgid "Cut" - msgstr "Вырезать" ++#: ../src/mygal/color-palette.c:572 ++msgid "black" ++msgstr "Чёрный" + - #: data/ui/glabels-ui.xml.h:43 - msgid "Cut the selection" - msgstr "Вырезать выделенное" ++#: ../src/mygal/color-palette.c:573 ++msgid "light brown" ++msgstr "светло-коричневый" + - #: data/ui/glabels-ui.xml.h:44 - msgid "Decrease magnification" - msgstr "Уменьшить" ++#: ../src/mygal/color-palette.c:574 ++msgid "brown gold" ++msgstr "золотой коричневый" + - #: data/ui/glabels-ui.xml.h:45 - msgid "Delete" - msgstr "Удалить" ++#: ../src/mygal/color-palette.c:575 ++msgid "dark green #2" ++msgstr "чёрно-зелёный №2" + - #: data/ui/glabels-ui.xml.h:46 - msgid "Delete the selected objects" - msgstr "Удалить выбранные объекты" ++#: ../src/mygal/color-palette.c:576 ++msgid "navy" ++msgstr "морской" + - #: data/ui/glabels-ui.xml.h:47 - msgid "Drawing toolbar" - msgstr "Панель рисования" ++#: ../src/mygal/color-palette.c:577 ../src/mygal/color-palette.c:633 ++msgid "dark blue" ++msgstr "Тёмно-синий" + - #: data/ui/glabels-ui.xml.h:48 - msgid "Dump XML" - msgstr "Дамп XML" ++#: ../src/mygal/color-palette.c:578 ++msgid "purple #2" ++msgstr "пурпурный №2" + - #: data/ui/glabels-ui.xml.h:49 - msgid "Dump the UI Xml description" - msgstr "Дамп XML-описания UI" ++#: ../src/mygal/color-palette.c:579 ++msgid "very dark gray" ++msgstr "очень тёмно-серый" + - #: data/ui/glabels-ui.xml.h:50 - msgid "Edit merge properties" - msgstr "Изменить свойства объединения" ++#: ../src/mygal/color-palette.c:582 ../src/mygal/color-palette.c:638 ++msgid "dark red" ++msgstr "Тёмно-красный" + - #: data/ui/glabels-ui.xml.h:54 - msgid "Flip object horizontally" - msgstr "Отразить объект горизонтально" ++#: ../src/mygal/color-palette.c:583 ++msgid "red-orange" ++msgstr "красно-оранжевый" + - #: data/ui/glabels-ui.xml.h:55 - msgid "Flip object vertically" - msgstr "Отразить объект вертикально" ++#: ../src/mygal/color-palette.c:584 ++msgid "gold" ++msgstr "Золотой" + - #: data/ui/glabels-ui.xml.h:56 - msgid "Font name" - msgstr "Название шрифта" ++#: ../src/mygal/color-palette.c:585 ++msgid "dark green" ++msgstr "Тёмно-зелёный" + - #: data/ui/glabels-ui.xml.h:57 - msgid "Font selector" - msgstr "Выбор шрифта" ++#: ../src/mygal/color-palette.c:586 ../src/mygal/color-palette.c:639 ++msgid "dull blue" ++msgstr "тускло-синий" + - #: data/ui/glabels-ui.xml.h:58 - msgid "Font size" - msgstr "Размер шрифта" ++#: ../src/mygal/color-palette.c:587 ../src/mygal/color-palette.c:640 ++msgid "blue" ++msgstr "Синий" + - #: data/ui/glabels-ui.xml.h:59 - msgid "Icon and _Text" - msgstr "Пиктограмма и _Текст" ++#: ../src/mygal/color-palette.c:588 ++msgid "dull purple" ++msgstr "тускло-пурпурный" + - #: data/ui/glabels-ui.xml.h:60 - msgid "Increase magnification" - msgstr "Увеличить" ++#: ../src/mygal/color-palette.c:589 ++msgid "dark grey" ++msgstr "тёмно-серый" + - #: data/ui/glabels-ui.xml.h:61 - msgid "Italic" - msgstr "Курсив" ++#: ../src/mygal/color-palette.c:592 ++msgid "red" ++msgstr "красный" + - #: data/ui/glabels-ui.xml.h:63 - msgid "Left align" - msgstr "Выровнять слева" ++#: ../src/mygal/color-palette.c:593 ++msgid "orange" ++msgstr "Оранжевый" + - #: data/ui/glabels-ui.xml.h:65 - msgid "Line width" - msgstr "Толщина линии" ++#: ../src/mygal/color-palette.c:594 ++msgid "lime" ++msgstr "лимонный" + - #: data/ui/glabels-ui.xml.h:66 - msgid "Lower object to bottom" - msgstr "Переместить объект на задний план" ++#: ../src/mygal/color-palette.c:595 ++msgid "dull green" ++msgstr "Тускло-зелёный" + - #: data/ui/glabels-ui.xml.h:67 - msgid "M_arkup" - msgstr "_Разметка" ++#: ../src/mygal/color-palette.c:596 ++msgid "dull blue #2" ++msgstr "тускло-синий №2" + - #: data/ui/glabels-ui.xml.h:68 - msgid "Main toolbar" - msgstr "Показывать панель инструментов" ++#: ../src/mygal/color-palette.c:597 ++msgid "sky blue #2" ++msgstr "небесно-синий №2" + - #: data/ui/glabels-ui.xml.h:69 - msgid "Markup" - msgstr "Разметка" ++#: ../src/mygal/color-palette.c:598 ../src/mygal/color-palette.c:637 ++msgid "purple" ++msgstr "Пурпурный" + - #: data/ui/glabels-ui.xml.h:70 - msgid "Modify document properties" - msgstr "Изменить свойства документа" ++#: ../src/mygal/color-palette.c:599 ++msgid "gray" ++msgstr "серый" + - #: data/ui/glabels-ui.xml.h:71 - msgid "New" - msgstr "Создать" ++#: ../src/mygal/color-palette.c:602 ../src/mygal/color-palette.c:634 ++msgid "magenta" ++msgstr "малиновый" + - #: data/ui/glabels-ui.xml.h:72 - msgid "Object property editor" - msgstr "Редактор свойств объекта" ++#: ../src/mygal/color-palette.c:603 ++msgid "bright orange" ++msgstr "ярко-оранжевый" + - #: data/ui/glabels-ui.xml.h:73 - msgid "Only show icons in the main toolbar" - msgstr "Показывать только картинки в главной панели инструментов" ++#: ../src/mygal/color-palette.c:604 ../src/mygal/color-palette.c:635 ++msgid "yellow" ++msgstr "Жёлтый" + - #: data/ui/glabels-ui.xml.h:75 - msgid "Open a file" - msgstr "Открыть файл" ++#: ../src/mygal/color-palette.c:605 ++msgid "green" ++msgstr "Зелёный" + - #: data/ui/glabels-ui.xml.h:76 - msgid "Open the glabels manual" - msgstr "Открыть руководство по glabels" ++#: ../src/mygal/color-palette.c:606 ../src/mygal/color-palette.c:636 ++msgid "cyan" ++msgstr "Циановый" + - #: data/ui/glabels-ui.xml.h:77 - msgid "Paste" - msgstr "Вставить" ++#: ../src/mygal/color-palette.c:607 ++msgid "bright blue" ++msgstr "ярко-синий" + - #: data/ui/glabels-ui.xml.h:78 - msgid "Paste the clipboard" - msgstr "Вставить из буфера" ++#: ../src/mygal/color-palette.c:608 ../src/mygal/color-palette.c:625 ++msgid "red purple" ++msgstr "красно-пурпурный" + - #: data/ui/glabels-ui.xml.h:79 - msgid "Pr_eferences..." - msgstr "_Настроить..." ++#: ../src/mygal/color-palette.c:609 ++msgid "light grey" ++msgstr "светло-серый" + - #: data/ui/glabels-ui.xml.h:80 - msgid "Preferences" - msgstr "Параметры" ++#: ../src/mygal/color-palette.c:612 ../src/mygal/color-palette.c:629 ++msgid "pink" ++msgstr "Розовый" + - #: data/ui/glabels-ui.xml.h:82 - msgid "Print the current file" - msgstr "Напечатать текущий файл" ++#: ../src/mygal/color-palette.c:613 ++msgid "light orange" ++msgstr "светло-оранжевый" + - #: data/ui/glabels-ui.xml.h:83 - msgid "Proper_ties..." - msgstr "Свойс_тва..." ++#: ../src/mygal/color-palette.c:614 ../src/mygal/color-palette.c:626 ++msgid "light yellow" ++msgstr "Светло-жёлтый" + - #: data/ui/glabels-ui.xml.h:84 - msgid "Properties" - msgstr "Свойства" ++#: ../src/mygal/color-palette.c:615 ++msgid "light green" ++msgstr "Светло-зеленый" + - #: data/ui/glabels-ui.xml.h:85 - msgid "Property toolbar" - msgstr "Панель свойств" ++#: ../src/mygal/color-palette.c:616 ++msgid "light cyan" ++msgstr "Светло-циановый" + - #: data/ui/glabels-ui.xml.h:86 - msgid "Quit" - msgstr "Выйти" ++#: ../src/mygal/color-palette.c:617 ../src/mygal/color-palette.c:627 ++msgid "light blue" ++msgstr "светло-синий" + - #: data/ui/glabels-ui.xml.h:87 - msgid "Quit the program" - msgstr "Выйти из программы" ++#: ../src/mygal/color-palette.c:618 ../src/mygal/color-palette.c:631 ++msgid "light purple" ++msgstr "светло-пурпурный" + - #: data/ui/glabels-ui.xml.h:88 - msgid "Raise object to top" - msgstr "Переместить объект на передний план" ++#: ../src/mygal/color-palette.c:619 ++msgid "white" ++msgstr "Белый" + - #: data/ui/glabels-ui.xml.h:89 - msgid "Recent _Files" - msgstr "Недавние _файлы" ++#: ../src/mygal/color-palette.c:624 ++msgid "purplish blue" ++msgstr "пурпурно-синий" + - #: data/ui/glabels-ui.xml.h:90 - msgid "Redo" - msgstr "Повторить" ++#: ../src/mygal/color-palette.c:628 ++msgid "dark purple" ++msgstr "тёмно-пурпурный" + - #: data/ui/glabels-ui.xml.h:91 - msgid "Redo the undone action" - msgstr "Повторить отменённое действие" ++#: ../src/mygal/color-palette.c:630 ++msgid "sky blue" ++msgstr "Небесно-синий" + - #: data/ui/glabels-ui.xml.h:92 - msgid "Remove all selections" - msgstr "Удалить всё выделенное" ++#: ../src/critical-error-handler.c:73 ++msgid "gLabels Fatal Error!" ++msgstr "Фатальная ошибка gLabels!" + - #: data/ui/glabels-ui.xml.h:94 - #, no-c-format - msgid "Restore scale to 100%" - msgstr "Масштаб 1:1" ++#: ../src/warning-handler.c:73 ++msgid "gLabels Error!" ++msgstr "Ошибка gLabels!" + - #: data/ui/glabels-ui.xml.h:95 - msgid "Right align" - msgstr "Выровнять справа" ++#. Create and append an "Other" entry. ++#: ../libglabels/db.c:118 ++msgid "Other" ++msgstr "Другой" + - #: data/ui/glabels-ui.xml.h:98 - msgid "Rotate object 90 clockwise" - msgstr "Повернуть объект на 90 градусов по часовой стрелке" ++#. Create and append a "User defined" entry. ++#: ../libglabels/db.c:131 ++msgid "User defined" ++msgstr "Определено пользователем" + - #: data/ui/glabels-ui.xml.h:99 - msgid "Rotate object 90 counter-clockwise" - msgstr "Повернуть объект на 90 градусов против часовой стрелке" ++#: ../libglabels/db.c:482 ++msgid "" ++"Unable to locate paper size definitions. Libglabels may not be installed " ++"correctly!" ++msgstr "" + - #: data/ui/glabels-ui.xml.h:100 - msgid "Save" - msgstr "Сохранить" ++#: ../libglabels/db.c:875 ++msgid "" ++"Unable to locate category definitions. Libglabels may not be installed " ++"correctly!" ++msgstr "" + - #: data/ui/glabels-ui.xml.h:101 - msgid "Save As" - msgstr "Сохранить как" ++#: ../libglabels/db.c:1461 ++msgid "" ++"Unable to locate any template files. Libglabels may not be installed " ++"correctly!" ++msgstr "" + - #: data/ui/glabels-ui.xml.h:102 - msgid "Save _As..." - msgstr "Сохранить _как..." ++#: ../libglabels/db.c:1538 ++#, fuzzy, c-format ++msgid "Generic %s full page template" ++msgstr "Основная %s полная страница" + - #: data/ui/glabels-ui.xml.h:103 - msgid "Save the current file" - msgstr "Сохранить текущий файл" ++#: ../libglabels/xml-template.c:227 ++msgid "Missing name or brand/part attributes." ++msgstr "" + - #: data/ui/glabels-ui.xml.h:104 - msgid "Save the current file with a different name" - msgstr "Сохранить текущий файл под другим именем" ++#. This should always be an id, but just in case a name ++#. slips by! ++#: ../libglabels/xml-template.c:244 ++#, c-format ++msgid "Unknown page size id \"%s\", trying as name" ++msgstr "" ++"Неизвестный идентификатор размера страницы \"%s\", пробуем как название" + - #: data/ui/glabels-ui.xml.h:105 - msgid "Select All" - msgstr "Выбрать всё" ++#: ../libglabels/xml-template.c:256 ++#, c-format ++msgid "Unknown page size id or name \"%s\"" ++msgstr "Неизвестный идентификатор размера страницы или название \"%s\"" + - #: data/ui/glabels-ui.xml.h:106 - msgid "Select _All" - msgstr "Выбрать вс_ё" ++#: ../libglabels/xml-template.c:615 ++msgid "" ++"Missing required \"brand\" or \"part\" attribute, trying deprecated name." ++msgstr "" + - #: data/ui/glabels-ui.xml.h:107 - msgid "Select all objects" - msgstr "Выбрать все объекты" ++#: ../libglabels/xml-template.c:625 ++msgid "Name attribute also missing." ++msgstr "Атрибут имени также отсутствует." + - #: data/ui/glabels-ui.xml.h:108 - msgid "Select, move and modify objects" - msgstr "Выбрать, переместить или изменить объекты" ++#: ../data/glade/merge-properties-dialog.glade.h:1 ++msgid "Record selection/preview" ++msgstr "Просмотр и выбор записей" + - #: data/ui/glabels-ui.xml.h:110 - msgid "Set main toolbar button style according to desktop default" - msgstr "" - "Установить стиль кнопок главной панели инструментов согласно настройкам " - "рабочего стола" ++#: ../data/glade/merge-properties-dialog.glade.h:2 ++msgid "Source" ++msgstr "Источник" + - #: data/ui/glabels-ui.xml.h:111 - msgid "Show _Tooltips" - msgstr "Показывать _подсказки" ++#: ../data/glade/merge-properties-dialog.glade.h:3 ++msgid "Format:" ++msgstr "Формат:" + - #: data/ui/glabels-ui.xml.h:112 - msgid "Show both icons and texts in the main toolbar" - msgstr "Показывать и пиктограммы и текст в главной панели инструментов" ++#: ../data/glade/merge-properties-dialog.glade.h:4 ++msgid "Location:" ++msgstr "Расположение:" + - #: data/ui/glabels-ui.xml.h:113 - msgid "Show tooltips in the drawing toolbar" - msgstr "Показывать подсказки в панели рисования" ++#: ../data/glade/merge-properties-dialog.glade.h:5 ++msgid "Select all" ++msgstr "Выделить всё" + - #: data/ui/glabels-ui.xml.h:114 - msgid "Show tooltips in the main toolbar" - msgstr "Показывать подсказки в главной панели инструментов" ++#: ../data/glade/merge-properties-dialog.glade.h:6 ++msgid "Unselect all" ++msgstr "Снять выделение" + - #: data/ui/glabels-ui.xml.h:115 - msgid "Show tooltips in the property toolbar" - msgstr "Показывать подсказки на панели свойств" ++#: ../data/glade/merge-properties-dialog.glade.h:7 ++#: ../data/glade/object-editor.glade.h:39 ++msgid "dialog1" ++msgstr "dialog1" + - #: data/ui/glabels-ui.xml.h:116 - msgid "Template Designer" - msgstr "Дизайнер шаблонов" ++#: ../data/glade/new-label-dialog.glade.h:1 ++msgid "Label orientation" ++msgstr "Расположение этикетки" + - #: data/ui/glabels-ui.xml.h:117 - msgid "Template _Designer..." - msgstr "Дизайнер _Шаблонов..." ++#: ../data/glade/new-label-dialog.glade.h:2 ++msgid "Media type" ++msgstr "Тип носителя" + - #: data/ui/glabels-ui.xml.h:118 - msgid "Text color" - msgstr "Цвет текста" ++#: ../data/glade/object-editor.glade.h:2 ++#, no-c-format ++msgid "%" ++msgstr "%" + - #: data/ui/glabels-ui.xml.h:119 - msgid "U_n-select All" - msgstr "_Снять выделение со всего" ++#: ../data/glade/object-editor.glade.h:3 ++msgid "00000000000 00000" ++msgstr "00000000000 00000" + - #: data/ui/glabels-ui.xml.h:120 - msgid "Un-select All" - msgstr "_Снять выделение со всего" ++#: ../data/glade/object-editor.glade.h:4 ++msgid "Xxx object properties" ++msgstr "Xxx свойства объекта" + - #: data/ui/glabels-ui.xml.h:121 - msgid "Undo" - msgstr "Отменить" ++#: ../data/glade/object-editor.glade.h:5 ../data/glade/prefs-dialog.glade.h:7 ++msgid "Alignment:" ++msgstr "Выключка:" + - #: data/ui/glabels-ui.xml.h:122 - msgid "Undo the last action" - msgstr "Отменить последнее действие" ++#: ../data/glade/object-editor.glade.h:6 ++msgid "Allow merge to automatically shrink text" ++msgstr "При заполнении данными текст обрезаем" + - #: data/ui/glabels-ui.xml.h:123 - msgid "Zoom _1:1" - msgstr "Масштаб _1:1" ++#: ../data/glade/object-editor.glade.h:7 ++msgid "Angle:" ++msgstr "Угол:" + - #: data/ui/glabels-ui.xml.h:124 - msgid "Zoom _In" - msgstr "У_величить" ++#: ../data/glade/object-editor.glade.h:8 ++msgid "Checksum" ++msgstr "Контрольная сумма" + - #: data/ui/glabels-ui.xml.h:125 - msgid "Zoom _Out" - msgstr "У_меньшить" ++#: ../data/glade/object-editor.glade.h:9 ../data/glade/prefs-dialog.glade.h:8 ++msgid "Color:" ++msgstr "Цвет:" + - #: data/ui/glabels-ui.xml.h:126 - msgid "Zoom to _fit" - msgstr "Уместить целиком в окно" ++#: ../data/glade/object-editor.glade.h:11 ++msgid "Enable shadow" ++msgstr "Отбрасывать тень" + - #: data/ui/glabels-ui.xml.h:127 - msgid "Zoom to fit window" - msgstr "Изменить масштаб, чтобы изображение было видно полностью" ++#: ../data/glade/object-editor.glade.h:12 ++msgid "Family:" ++msgstr "Семейство:" + - #: data/ui/glabels-ui.xml.h:128 - msgid "_About..." - msgstr "_О программе..." ++#: ../data/glade/object-editor.glade.h:13 ++msgid "File:" ++msgstr "Файл:" + - #: data/ui/glabels-ui.xml.h:129 - msgid "_Bottoms" - msgstr "По _низу" ++#: ../data/glade/object-editor.glade.h:14 ++msgid "Fill" ++msgstr "Заливка" + - #: data/ui/glabels-ui.xml.h:132 - msgid "_Close" - msgstr "_Закрыть" ++#: ../data/glade/object-editor.glade.h:15 ++#: ../data/glade/template-designer.glade.h:30 ++msgid "Height:" ++msgstr "Высота:" + - #: data/ui/glabels-ui.xml.h:133 - msgid "_Contents" - msgstr "_Содержание справки" ++#: ../data/glade/object-editor.glade.h:17 ++msgid "Insert merge field" ++msgstr "Вставить объединительное поле" + - #: data/ui/glabels-ui.xml.h:134 - msgid "_Copy" - msgstr "_Запомнить" ++#: ../data/glade/object-editor.glade.h:18 ++msgid "Key:" ++msgstr "Ключ:" + - #: data/ui/glabels-ui.xml.h:135 - msgid "_Create Object" - msgstr "_Создать объект" ++#: ../data/glade/object-editor.glade.h:19 ++msgid "Length:" ++msgstr "Длина:" + - #: data/ui/glabels-ui.xml.h:136 - msgid "_Debug" - msgstr "_Отладка" ++#: ../data/glade/object-editor.glade.h:21 ++#: ../data/glade/prefs-dialog.glade.h:12 ++msgid "Line Spacing:" ++msgstr "Между строк:" + - #: data/ui/glabels-ui.xml.h:138 - msgid "_Desktop Default" - msgstr "_Согласно настройкам рабочего стола" ++#: ../data/glade/object-editor.glade.h:22 ++msgid "Literal:" ++msgstr "Код:" + - #: data/ui/glabels-ui.xml.h:139 - msgid "_Drawing Toolbar" - msgstr "Показывать панель _рисования" ++#: ../data/glade/object-editor.glade.h:23 ++msgid "Opacity:" ++msgstr "Непрозрачность:" + - #: data/ui/glabels-ui.xml.h:140 - msgid "_Edit" - msgstr "_Правка" ++#: ../data/glade/object-editor.glade.h:24 ++msgid "Position" ++msgstr "Расположение" + - #: data/ui/glabels-ui.xml.h:142 - msgid "_File" - msgstr "_Файл" ++#: ../data/glade/object-editor.glade.h:25 ++msgid "Reset image size" ++msgstr "Установить размер изображения по умолчанию" + - #: data/ui/glabels-ui.xml.h:143 - msgid "_Grid" - msgstr "_Сетка" ++#: ../data/glade/object-editor.glade.h:26 ++msgid "Select A File" ++msgstr "Выберите файл" + - #: data/ui/glabels-ui.xml.h:144 - msgid "_Help" - msgstr "_Справка" ++#: ../data/glade/object-editor.glade.h:27 ++msgid "Shadow" ++msgstr "Тень" + - #: data/ui/glabels-ui.xml.h:145 - msgid "_Icon" - msgstr "_Пиктограмма" ++#: ../data/glade/object-editor.glade.h:28 ++msgid "Size" ++msgstr "Размер" + - #: data/ui/glabels-ui.xml.h:149 - msgid "_Main Toolbar" - msgstr "Показывать панель _инструментов" ++#: ../data/glade/object-editor.glade.h:29 ++msgid "Size:" ++msgstr "Размер:" + - #: data/ui/glabels-ui.xml.h:150 - msgid "_Merge Properties..." - msgstr "_Свойства объединения..." ++#: ../data/glade/object-editor.glade.h:30 ++msgid "Style" ++msgstr "Стиль" + - #: data/ui/glabels-ui.xml.h:151 - msgid "_New" - msgstr "_Создать" ++#: ../data/glade/object-editor.glade.h:31 ++msgid "Style:" ++msgstr "Стиль:" + - #: data/ui/glabels-ui.xml.h:152 - msgid "_Objects" - msgstr "_Объекты" ++#: ../data/glade/object-editor.glade.h:33 ++#: ../data/glade/prefs-dialog.glade.h:20 ++#: ../data/glade/template-designer.glade.h:61 ++msgid "Width:" ++msgstr "Ширина:" + - #: data/ui/glabels-ui.xml.h:153 - msgid "_Open..." - msgstr "_Открыть..." ++#: ../data/glade/object-editor.glade.h:34 ++msgid "X Offset:" ++msgstr "Смещение по X:" + - #: data/ui/glabels-ui.xml.h:155 - msgid "_Paste" - msgstr "Вст_авить" ++#: ../data/glade/object-editor.glade.h:35 ++msgid "X:" ++msgstr "X:" + - #: data/ui/glabels-ui.xml.h:156 - msgid "_Print..." - msgstr "_Напечатать..." ++#: ../data/glade/object-editor.glade.h:36 ++msgid "Y Offset:" ++msgstr "Смещение по Y:" + - #: data/ui/glabels-ui.xml.h:157 - msgid "_Property Toolbar" - msgstr "Показывать панель с_войств" ++#: ../data/glade/object-editor.glade.h:37 ++msgid "Y:" ++msgstr "Y:" + - #: data/ui/glabels-ui.xml.h:158 - msgid "_Quit" - msgstr "В_ыйти" ++#: ../data/glade/object-editor.glade.h:38 ++msgid "degrees" ++msgstr "градусов" + - #: data/ui/glabels-ui.xml.h:161 - msgid "_Save" - msgstr "_Сохранить" ++#: ../data/glade/object-editor.glade.h:40 ++msgid "digits:" ++msgstr "Цифр:" + - #: data/ui/glabels-ui.xml.h:165 - msgid "_View" - msgstr "_Вид" ++#: ../data/glade/object-editor.glade.h:41 ++msgid "format:" ++msgstr "Формат:" + - #: data/glade/prefs-dialog.glade.h:1 ++#: ../data/glade/prefs-dialog.glade.h:1 +msgid " " +msgstr " " + - #: data/glade/prefs-dialog.glade.h:2 data/glade/object-editor.glade.h:1 - #: data/glade/template-designer.glade.h:5 - msgid "*" - msgstr "*" - - #: data/glade/prefs-dialog.glade.h:3 ++#: ../data/glade/prefs-dialog.glade.h:2 +msgid "Default page size" +msgstr "Размер страницы по умолчанию" + - #: data/glade/prefs-dialog.glade.h:4 ++#: ../data/glade/prefs-dialog.glade.h:3 +msgid "Fill" - msgstr "Заполнение" ++msgstr "Заливка" + - #: data/glade/prefs-dialog.glade.h:5 ++#: ../data/glade/prefs-dialog.glade.h:4 +msgid "Line" - msgstr "Линия" ++msgstr "Обводка" + - #: data/glade/prefs-dialog.glade.h:6 ++#: ../data/glade/prefs-dialog.glade.h:5 +msgid "Text" +msgstr "Текст" + - #: data/glade/prefs-dialog.glade.h:7 ++#: ../data/glade/prefs-dialog.glade.h:6 +msgid "Units" +msgstr "Единицы измерения" + - #: data/glade/prefs-dialog.glade.h:8 data/glade/object-editor.glade.h:4 - msgid "Alignment:" - msgstr "Выравнивание:" - - #: data/glade/prefs-dialog.glade.h:9 data/glade/object-editor.glade.h:8 - msgid "Color:" - msgstr "Цвет:" - - #: data/glade/prefs-dialog.glade.h:10 ++#: ../data/glade/prefs-dialog.glade.h:9 +msgid "Font:" +msgstr "Шрифт:" + - #: data/glade/prefs-dialog.glade.h:11 ++#: ../data/glade/prefs-dialog.glade.h:10 +msgid "ISO A4" +msgstr "ISO A4" + - #: data/glade/prefs-dialog.glade.h:12 ++#: ../data/glade/prefs-dialog.glade.h:11 +msgid "Inches" +msgstr "Дюймы" + - #: data/glade/prefs-dialog.glade.h:13 data/glade/object-editor.glade.h:19 - msgid "Line Spacing:" - msgstr "" - "Межстрочный\n" - "интервал:" - - #: data/glade/prefs-dialog.glade.h:14 ++#: ../data/glade/prefs-dialog.glade.h:13 +msgid "Locale" - msgstr "Локаль" ++msgstr "Местные параметры" + - #: data/glade/prefs-dialog.glade.h:15 ++#: ../data/glade/prefs-dialog.glade.h:14 +msgid "Millimeters" +msgstr "Миллиметры" + - #: data/glade/prefs-dialog.glade.h:16 ++#: ../data/glade/prefs-dialog.glade.h:15 +msgid "Object defaults" - msgstr "Настройки объектов по умолчанию" ++msgstr "Свойства объектов по умолчанию" + - #: data/glade/prefs-dialog.glade.h:17 ++#: ../data/glade/prefs-dialog.glade.h:16 +msgid "Points" +msgstr "Пункты" + - #: data/glade/prefs-dialog.glade.h:18 ++#: ../data/glade/prefs-dialog.glade.h:17 +msgid "Select default properties for new objects." - msgstr "Укажите свойства новых объектов по умолчанию." ++msgstr "Укажите используемые по умолчанию свойства новых объектов " + - #: data/glade/prefs-dialog.glade.h:19 ++#: ../data/glade/prefs-dialog.glade.h:18 +msgid "Select locale specific behavior." - msgstr "Укажите ваши предпочтения." ++msgstr "Укажите местные параметры" + +#. Most popular (at top of list) - #: data/glade/prefs-dialog.glade.h:20 data/templates/paper-sizes.xml.h:29 ++#: ../data/glade/prefs-dialog.glade.h:19 ++#: ../data/templates/paper-sizes.xml.h:29 +msgid "US Letter" +msgstr "US Letter" + - #: data/glade/prefs-dialog.glade.h:21 data/glade/object-editor.glade.h:29 - #: data/glade/template-designer.glade.h:72 - msgid "Width:" - msgstr "Ширина:" - - #: data/glade/object-editor.glade.h:2 - msgid "00000000000 00000" - msgstr "00000000000 00000" - - #: data/glade/object-editor.glade.h:3 - msgid "Xxx object properties" - msgstr "Xxx свойства объекта" - - #: data/glade/object-editor.glade.h:5 - msgid "Allow merge to automatically shrink text" - msgstr "Разрешить автоматически уменьшать текст при объединении" - - #: data/glade/object-editor.glade.h:6 - msgid "Angle:" - msgstr "Угол:" - - #: data/glade/object-editor.glade.h:7 - msgid "Checksum" - msgstr "Контрольная сумма" - - #: data/glade/object-editor.glade.h:10 - msgid "Family:" - msgstr "Семейство:" - - #: data/glade/object-editor.glade.h:12 - msgid "Fill" - msgstr "Заполнение" - - #: data/glade/object-editor.glade.h:13 data/glade/template-designer.glade.h:33 - msgid "Height:" - msgstr "Высота:" - - #: data/glade/object-editor.glade.h:14 - msgid "Image" - msgstr "Изображение" ++#: ../data/glade/print-custom-widget.glade.h:1 ++msgid "Options" ++msgstr "Параметры" + - #: data/glade/object-editor.glade.h:15 - msgid "Insert merge field" - msgstr "Вставить объединительное поле" - - #: data/glade/object-editor.glade.h:17 - msgid "Length:" - msgstr "Длина:" - - #: data/glade/object-editor.glade.h:18 - msgid "Line" - msgstr "Линия" - - #: data/glade/object-editor.glade.h:20 - msgid "Literal:" - msgstr "Буквально:" - - #: data/glade/object-editor.glade.h:21 - msgid "Load image" - msgstr "Загрузить изображение" - - #: data/glade/object-editor.glade.h:22 - msgid "Position" - msgstr "Расположение" - - #: data/glade/object-editor.glade.h:23 - msgid "Reset image size" - msgstr "Установить размер изображения по умолчанию" ++#: ../data/glade/print-custom-widget.glade.h:2 ++msgid "Print control (Merge)" ++msgstr "Управление печатью (объединение)" + - #: data/glade/object-editor.glade.h:24 - msgid "Size" - msgstr "Размер" ++#: ../data/glade/print-custom-widget.glade.h:3 ++msgid "Print control (Simple)" ++msgstr "Управление печатью (простая)" + - #: data/glade/object-editor.glade.h:25 - msgid "Size:" - msgstr "Размер:" ++#: ../data/glade/property-bar.glade.h:1 ++msgid "Bold" ++msgstr "Жирный" + - #: data/glade/object-editor.glade.h:26 - msgid "Style" - msgstr "Стиль:" ++#: ../data/glade/property-bar.glade.h:2 ++msgid "Center align" ++msgstr "Выровнять по центру" + - #: data/glade/object-editor.glade.h:27 - msgid "Style:" - msgstr "Стиль:" ++#: ../data/glade/property-bar.glade.h:4 ++msgid "Font family" ++msgstr "Гарнитура" + - #: data/glade/object-editor.glade.h:30 - msgid "X:" - msgstr "X:" ++#: ../data/glade/property-bar.glade.h:5 ++msgid "Font size" ++msgstr "Размер шрифта" + - #: data/glade/object-editor.glade.h:31 - msgid "Y:" - msgstr "Y:" ++#: ../data/glade/property-bar.glade.h:6 ++msgid "Italic" ++msgstr "Курсив" + - #: data/glade/object-editor.glade.h:32 - msgid "degrees" - msgstr "градусов" ++#: ../data/glade/property-bar.glade.h:7 ++msgid "Left align" ++msgstr "Выровнять слева" + - #: data/glade/object-editor.glade.h:33 - msgid "dialog1" - msgstr "dialog1" ++#: ../data/glade/property-bar.glade.h:9 ++msgid "Line width" ++msgstr "Толщина линии" + - #: data/glade/object-editor.glade.h:34 - msgid "digits:" - msgstr "цифры:" ++#: ../data/glade/property-bar.glade.h:10 ++msgid "Right align" ++msgstr "Выровнять справа" + - #: data/glade/object-editor.glade.h:35 - msgid "format:" - msgstr "формат:" ++#: ../data/glade/property-bar.glade.h:11 ++msgid "Text Color" ++msgstr "Цвет текста" + - #: data/glade/template-designer.glade.h:1 - msgid " " - msgstr " " ++#: ../data/glade/property-bar.glade.h:12 ++msgid "Text color" ++msgstr "Цвет текста" + - #: data/glade/template-designer.glade.h:2 ++#: ../data/glade/template-designer.glade.h:1 +msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)" - msgstr "(например, \"Почтовые этикетки,\" \"Визитные карточки,\" ...)" ++msgstr "(например, «Почтовые этикетки,» «Визитные карточки,» ...)" + - #: data/glade/template-designer.glade.h:3 ++#: ../data/glade/template-designer.glade.h:2 +msgid "(e.g., 8163A)" - msgstr "(e.g., 8163A)" ++msgstr "(например, 8163A)" + - #: data/glade/template-designer.glade.h:4 ++#: ../data/glade/template-designer.glade.h:3 +msgid "(e.g., Avery, Acme, ...)" - msgstr "(e.g., Avery, Acme, ...)" ++msgstr "(например, Avery, Acme, ...)" + - #: data/glade/template-designer.glade.h:6 ++#: ../data/glade/template-designer.glade.h:4 +msgid "1. Outer radius:" +msgstr "1. Наружный радиус:" + - #: data/glade/template-designer.glade.h:7 ++#: ../data/glade/template-designer.glade.h:5 +msgid "1. Radius:" +msgstr "1. Радиус:" + - #: data/glade/template-designer.glade.h:8 ++#: ../data/glade/template-designer.glade.h:6 +msgid "1. Width:" +msgstr "1. Ширина:" + - #: data/glade/template-designer.glade.h:9 ++#: ../data/glade/template-designer.glade.h:7 +msgid "2. Height:" +msgstr "2. Высота:" + - #: data/glade/template-designer.glade.h:10 ++#: ../data/glade/template-designer.glade.h:8 +msgid "2. Inner radius:" +msgstr "2. Внутренний радиус:" + - #: data/glade/template-designer.glade.h:11 ++#: ../data/glade/template-designer.glade.h:9 +msgid "2. Waste (overprint allowed):" +msgstr "2. Пустое поле (на нём можно будет печать):" + - #: data/glade/template-designer.glade.h:12 ++#: ../data/glade/template-designer.glade.h:10 +msgid "3. Clipping width:" +msgstr "3. Ширина для обрезки:" + - #: data/glade/template-designer.glade.h:13 ++#: ../data/glade/template-designer.glade.h:11 +msgid "3. Margin" +msgstr "3. Поле" + - #: data/glade/template-designer.glade.h:14 ++#: ../data/glade/template-designer.glade.h:12 +msgid "3. Round (radius of corner):" - msgstr "3. Округлость (радиус вершины):" ++msgstr "3. Закругление (радиус вершины):" + - #: data/glade/template-designer.glade.h:15 ++#: ../data/glade/template-designer.glade.h:13 +msgid "4. Clipping height:" +msgstr "4. Высота обрезки:" + - #: data/glade/template-designer.glade.h:16 ++#: ../data/glade/template-designer.glade.h:14 +msgid "4. Horiz. waste (overprint allowed):" +msgstr "4. Пустое гориз. пространство (может быть заполнено):" + - #: data/glade/template-designer.glade.h:17 ++#: ../data/glade/template-designer.glade.h:15 +msgid "5. Vert. waste (overprint allowed):" +msgstr "5. Пустое верт. пространство (может быть заполнено):" + - #: data/glade/template-designer.glade.h:18 ++#: ../data/glade/template-designer.glade.h:16 +msgid "5. Waste (overprint allowed):" +msgstr "5. Пустое пространство (может быть заполнено):" + - #: data/glade/template-designer.glade.h:19 ++#: ../data/glade/template-designer.glade.h:17 +msgid "6. Margin" +msgstr "6. Поле" + - #: data/glade/template-designer.glade.h:20 ++#: ../data/glade/template-designer.glade.h:18 +msgid "Brand/Manufacturer:" +msgstr "Производитель или торговая марка:" + - #: data/glade/template-designer.glade.h:21 ++#: ../data/glade/template-designer.glade.h:19 +msgid "CD/DVD (including credit card CDs)" +msgstr "CD/DVD (включая CD размером с визитку)" + - #: data/glade/template-designer.glade.h:22 ++#: ../data/glade/template-designer.glade.h:20 +msgid "" +"Congratulations!\n" +"\n" +"You have completed the gLabels Template Designer.\n" +"If you wish to accept and save your design, click \"Apply.\"\n" +"\n" +"Otherwise, you may click \"Cancel\" to abandon your design\n" +"or \"Back\" to continue editing this design." +msgstr "" +"Поздравляем!\n" +"\n" +"Вы завершили создание шаблона в gLabels.\n" - "Чтобы сохранить разработку, нажмите \"Применить\"\n" ++"Для сохранения результата нажмите кнопку «Применить».\n" +"\n" - "Также вы можете нажать \"Отменить\", чтобы не сохранять, или \"Назад\", " - "чтобы продолжить редактирование." ++"Вы также можете нажать кнопку «Отменить», чтобы не сохранять,\n" ++"либо кнопку «Назад», чтобы продолжить редактирование." + - #: data/glade/template-designer.glade.h:30 - msgid "Design Completed" - msgstr "Оформление завершено" ++#: ../data/glade/template-designer.glade.h:27 ++msgid "Description:" ++msgstr "Описание:" + - #: data/glade/template-designer.glade.h:31 ++#: ../data/glade/template-designer.glade.h:28 +msgid "Distance from left edge (x0):" +msgstr "Расстояние от левого угла (x0):" + - #: data/glade/template-designer.glade.h:32 ++#: ../data/glade/template-designer.glade.h:29 +msgid "Distance from top edge (y0):" +msgstr "Расстояние от верхнего угла (y0)" + - #: data/glade/template-designer.glade.h:34 ++#: ../data/glade/template-designer.glade.h:31 +msgid "Horizontal pitch (dx):" +msgstr "Интервал по горизонтали (dx):" + - #: data/glade/template-designer.glade.h:35 ++#: ../data/glade/template-designer.glade.h:32 +msgid "" +"How many layouts will your template contain? \n" +"\n" +"A layout is a set of labels or cards that can be arranged in a simple grid.\n" +"Most templates only need one layout, as in the first example.\n" +"The second example illustrates when two layouts are needed." +msgstr "" - "Сколько форм будет содержать шаблон? \n" ++"Сколько макетов будет содержать шаблон? \n" +"\n" - "Форма - это набор этикеток или визиток, которые можут быть распределены по " ++"Макет — это набор этикеток или визиток, которые могут быть распределены по " +"простой сетке.\n" - "Большинству шаблонов требуется только одна форма, как в первом примере.\n" - "Второй пример иллюстрирует случай, когда необходимо применять две формы." - - #: data/glade/template-designer.glade.h:40 - msgid "Label Size (CD/DVD)" - msgstr "Размер метки (CD/DVD)" - - #: data/glade/template-designer.glade.h:41 - msgid "Label Size (Round)" - msgstr "Размер метки (диаметр)" - - #: data/glade/template-designer.glade.h:42 - msgid "Label or Card Shape" - msgstr "Форма этикетки или визитки" - - #: data/glade/template-designer.glade.h:43 - msgid "Label or Card Size (Rectangular)" - msgstr "Развер этикетки или визитки (прямоугольник)" ++"Большинству шаблонов требуется только один макет, как в первом примере.\n" ++"Второй пример иллюстрирует случай, когда необходимо применять два макета." + - #: data/glade/template-designer.glade.h:44 ++#: ../data/glade/template-designer.glade.h:37 +msgid "Layout #1" - msgstr "Форма #1" ++msgstr "Макет №1" + - #: data/glade/template-designer.glade.h:45 ++#: ../data/glade/template-designer.glade.h:38 +msgid "Layout #2" - msgstr "Форма #2" ++msgstr "Макет №2" + - #: data/glade/template-designer.glade.h:46 - msgid "Layout(s)" - msgstr "Формы" - - #: data/glade/template-designer.glade.h:47 - msgid "Name and Description" - msgstr "Название и Описание" - - #: data/glade/template-designer.glade.h:48 ++#: ../data/glade/template-designer.glade.h:39 +msgid "Number across (nx):" +msgstr "По горизонтали (nx):" + - #: data/glade/template-designer.glade.h:49 ++#: ../data/glade/template-designer.glade.h:40 +msgid "Number down (ny):" +msgstr "По вертикали (ny):" + - #: data/glade/template-designer.glade.h:50 - msgid "Number of Layouts" - msgstr "Количество форм" - - #: data/glade/template-designer.glade.h:51 ++#: ../data/glade/template-designer.glade.h:41 +msgid "Number of layouts:" - msgstr "Количество форм:" ++msgstr "Количество макетов:" + - #: data/glade/template-designer.glade.h:52 - msgid "Page Size" - msgstr "Размер страницы" ++#: ../data/glade/template-designer.glade.h:42 ++#: ../data/glade/wdgt-media-select.glade.h:3 ++msgid "Page size:" ++msgstr "Формат страницы:" + - #: data/glade/template-designer.glade.h:54 ++#: ../data/glade/template-designer.glade.h:43 +msgid "Part #:" - msgstr "Часть #:" ++msgstr "Часть №:" + - #: data/glade/template-designer.glade.h:55 ++#: ../data/glade/template-designer.glade.h:44 +msgid "" +"Please enter the following identifying information about the template " +"stationery." - msgstr "Укажите следующую идентификационную информацию о ." ++msgstr "Укажите следующую идентификационную информацию для бланка." + - #: data/glade/template-designer.glade.h:56 ++#: ../data/glade/template-designer.glade.h:45 +msgid "Please enter the following layout information." +msgstr "Введите следующую информацию об оформлении." + - #: data/glade/template-designer.glade.h:57 ++#: ../data/glade/template-designer.glade.h:46 +msgid "" +"Please enter the following size parameters of a single label in your " +"template." +msgstr "Введите геометрические размеры одиночной этикетки в вашем шаблоне." + - #: data/glade/template-designer.glade.h:58 ++#: ../data/glade/template-designer.glade.h:47 +msgid "" +"Please enter the following size parameters of a single label or card in your " +"template." +msgstr "" +"Введите геометрические размеры одиночной этикетки или визитки в вашем " +"шаблоне." + - #: data/glade/template-designer.glade.h:59 ++#: ../data/glade/template-designer.glade.h:48 +msgid "Please select the basic shape of the labels or cards." +msgstr "Выберите основную фигуру этикетки или карточки." + - #: data/glade/template-designer.glade.h:60 ++#: ../data/glade/template-designer.glade.h:49 +msgid "Please select the page size of the template stationery." +msgstr "Выберите размер страницы для шаблона." + - #: data/glade/template-designer.glade.h:61 ++#: ../data/glade/template-designer.glade.h:50 +msgid "Print test sheet" +msgstr "Напечатать тестовую страницу" + - #: data/glade/template-designer.glade.h:62 ++#: ../data/glade/template-designer.glade.h:51 +msgid "Rectangular or square (can have rounded corners)" +msgstr "Прямоугольник или квадрат (может иметь скруглённые края)" + - #: data/glade/template-designer.glade.h:63 ++#: ../data/glade/template-designer.glade.h:52 +msgid "Round" +msgstr "Круг" + - #: data/glade/template-designer.glade.h:64 ++#: ../data/glade/template-designer.glade.h:53 +msgid "" +"Templates needing\n" +"two layouts." +msgstr "" +"Для данного шаблона\n" +"требуется две формы." + - #: data/glade/template-designer.glade.h:66 ++#: ../data/glade/template-designer.glade.h:55 +msgid "" +"Templates needing only\n" +"one layout." +msgstr "" +"Для данного шаблона требуется\n" +"только одна форма." + - #: data/glade/template-designer.glade.h:68 ++#: ../data/glade/template-designer.glade.h:57 +msgid "Vertical pitch (dy):" +msgstr "Интервал по вертикали (dy):" + - #: data/glade/template-designer.glade.h:69 ++#: ../data/glade/template-designer.glade.h:58 +msgid "" +"Welcome to the gLabels Template Designer.\n" +"\n" +"This dialog will assist you in the creation of a custom gLabels template." +msgstr "" +"Добро пожаловать в Дизайнер шаблонов gLabels.\n" +"\n" +"Этот диалог будет сопровождать вас в создании вашего собственного шаблона " +"gLabels." + ++#: ../data/glade/template-designer.glade.h:62 ++msgid "cd_size_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:63 ++msgid "finish_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:65 ++msgid "layout_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:66 ++msgid "name_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:67 ++msgid "nlayouts_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:68 ++msgid "pg_size_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:69 ++msgid "rect_size_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:70 ++msgid "round_size_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:71 ++msgid "shape_page" ++msgstr "" ++ ++#: ../data/glade/template-designer.glade.h:72 ++msgid "start_page" ++msgstr "" ++ ++#: ../data/glade/wdgt-media-select.glade.h:1 ++msgid "Brand:" ++msgstr "Марка:" ++ ++#: ../data/glade/wdgt-media-select.glade.h:2 ++msgid "Category:" ++msgstr "Категория:" ++ ++#: ../data/glade/wdgt-media-select.glade.h:4 ++msgid "Recent templates" ++msgstr "Недавние шаблоны" ++ ++#: ../data/glade/wdgt-media-select.glade.h:5 ++msgid "Search all templates" ++msgstr "Поиск по шаблонам" ++ ++#: ../data/glade/wdgt-rotate-label.glade.h:1 ++msgid "Rotate" ++msgstr "С поворотом" ++ +#. Other ISO A series sizes - #: data/templates/paper-sizes.xml.h:2 ++#: ../data/templates/paper-sizes.xml.h:2 +msgid "A0" +msgstr "A0" + - #: data/templates/paper-sizes.xml.h:3 ++#: ../data/templates/paper-sizes.xml.h:3 +msgid "A1" +msgstr "A1" + - #: data/templates/paper-sizes.xml.h:4 ++#: ../data/templates/paper-sizes.xml.h:4 +msgid "A10" +msgstr "A10" + - #: data/templates/paper-sizes.xml.h:5 ++#: ../data/templates/paper-sizes.xml.h:5 +msgid "A2" +msgstr "A2" + - #: data/templates/paper-sizes.xml.h:6 ++#: ../data/templates/paper-sizes.xml.h:6 +msgid "A3" +msgstr "A3" + - #: data/templates/paper-sizes.xml.h:7 ++#: ../data/templates/paper-sizes.xml.h:7 +msgid "A4" +msgstr "A4" + - #: data/templates/paper-sizes.xml.h:8 ++#: ../data/templates/paper-sizes.xml.h:8 +msgid "A5" +msgstr "A5" + - #: data/templates/paper-sizes.xml.h:9 ++#: ../data/templates/paper-sizes.xml.h:9 +msgid "A6" +msgstr "A6" + - #: data/templates/paper-sizes.xml.h:10 ++#: ../data/templates/paper-sizes.xml.h:10 +msgid "A7" +msgstr "A7" + - #: data/templates/paper-sizes.xml.h:11 ++#: ../data/templates/paper-sizes.xml.h:11 +msgid "A8" +msgstr "A8" + - #: data/templates/paper-sizes.xml.h:12 ++#: ../data/templates/paper-sizes.xml.h:12 +msgid "A9" +msgstr "A9" + +#. ISO B series sizes - #: data/templates/paper-sizes.xml.h:14 ++#: ../data/templates/paper-sizes.xml.h:14 +msgid "B0" +msgstr "B0" + - #: data/templates/paper-sizes.xml.h:15 ++#: ../data/templates/paper-sizes.xml.h:15 +msgid "B1" +msgstr "B1" + - #: data/templates/paper-sizes.xml.h:16 ++#: ../data/templates/paper-sizes.xml.h:16 +msgid "B10" +msgstr "B10" + - #: data/templates/paper-sizes.xml.h:17 ++#: ../data/templates/paper-sizes.xml.h:17 +msgid "B2" +msgstr "B2" + - #: data/templates/paper-sizes.xml.h:18 ++#: ../data/templates/paper-sizes.xml.h:18 +msgid "B3" +msgstr "B3" + - #: data/templates/paper-sizes.xml.h:19 ++#: ../data/templates/paper-sizes.xml.h:19 +msgid "B4" +msgstr "B4" + - #: data/templates/paper-sizes.xml.h:20 ++#: ../data/templates/paper-sizes.xml.h:20 +msgid "B5" +msgstr "B5" + - #: data/templates/paper-sizes.xml.h:21 ++#: ../data/templates/paper-sizes.xml.h:21 +msgid "B6" +msgstr "B6" + - #: data/templates/paper-sizes.xml.h:22 ++#: ../data/templates/paper-sizes.xml.h:22 +msgid "B7" +msgstr "B7" + - #: data/templates/paper-sizes.xml.h:23 ++#: ../data/templates/paper-sizes.xml.h:23 +msgid "B8" +msgstr "B8" + - #: data/templates/paper-sizes.xml.h:24 ++#: ../data/templates/paper-sizes.xml.h:24 +msgid "B9" +msgstr "B9" + - #: data/templates/paper-sizes.xml.h:25 ++#: ../data/templates/paper-sizes.xml.h:25 +msgid "US Executive" +msgstr "US Executive" + +#. Other US paper sizes - #: data/templates/paper-sizes.xml.h:27 ++#: ../data/templates/paper-sizes.xml.h:27 +msgid "US Legal" +msgstr "US Legal" + ++#: ../data/templates/categories.xml.h:1 ++msgid "Any card" ++msgstr "Любые карточки" ++ ++#: ../data/templates/categories.xml.h:2 ++msgid "Any label" ++msgstr "Любые этикетки" ++ ++#: ../data/templates/categories.xml.h:3 ++msgid "Business cards" ++msgstr "Визитные карточки" ++ ++#: ../data/templates/categories.xml.h:4 ++msgid "CD/DVD or other media" ++msgstr "CD/DVD и прочие носители" ++ ++#: ../data/templates/categories.xml.h:5 ++msgid "Mailing/shipping products" ++msgstr "Корреспонденция" ++ ++#: ../data/templates/categories.xml.h:6 ++msgid "Rectangular labels" ++msgstr "Прямоугольные этикетки" ++ ++#: ../data/templates/categories.xml.h:7 ++msgid "Round labels" ++msgstr "Круглые этикетки" ++ ++#: ../data/templates/categories.xml.h:8 ++msgid "Square labels" ++msgstr "Квадратные этикетки" ++ +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:2 - #: data/templates/zweckform-iso-templates.xml.h:2 ++#: ../data/templates/avery-iso-templates.xml.h:2 ++#: ../data/templates/avery-us-templates.xml.h:2 ++#: ../data/templates/dymo-other-templates.xml.h:4 ++#: ../data/templates/misc-iso-templates.xml.h:2 ++#: ../data/templates/zweckform-iso-templates.xml.h:2 +msgid "Address Labels" +msgstr "Этикетка с адресом" + +#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:4 ++msgid "Address labels" ++msgstr "Адресные наклейки" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:6 ++#, fuzzy ++msgid "Allround labels" ++msgstr "Маленькие круглые этикетки" ++ +#. ============================================================ +#. =================================================================== - #. ====================================================== - #: data/templates/avery-us-templates.xml.h:4 - #: data/templates/avery-iso-templates.xml.h:4 - #: data/templates/zweckform-iso-templates.xml.h:6 - #: data/templates/misc-us-templates.xml.h:3 - #: data/templates/misc-iso-templates.xml.h:17 ++#. ******************************************************************** ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:8 ++#: ../data/templates/avery-us-templates.xml.h:4 ++#: ../data/templates/misc-iso-templates.xml.h:12 ++#: ../data/templates/misc-us-templates.xml.h:4 ++#: ../data/templates/zweckform-iso-templates.xml.h:6 +msgid "Business Cards" +msgstr "Визитные карточки" + - #: data/templates/avery-us-templates.xml.h:5 - msgid "CD/DVD Labels (Disc Labels)" - msgstr "Метки для CD/DVD (Наклейки на диск)" ++#. =============================================================== ++#: ../data/templates/avery-iso-templates.xml.h:10 ++msgid "CD Booklet" ++msgstr "Вкладыш в CD" ++ ++#. =============================================================== ++#: ../data/templates/avery-iso-templates.xml.h:12 ++msgid "CD Inlet" ++msgstr "Буклет для CD" ++ ++#. =============================================================== ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:14 ++#: ../data/templates/avery-us-templates.xml.h:6 ++#: ../data/templates/misc-iso-templates.xml.h:16 ++#: ../data/templates/misc-us-templates.xml.h:8 ++#: ../data/templates/zweckform-iso-templates.xml.h:8 ++msgid "CD/DVD Labels" ++msgstr "Этикетки для CD/DVD" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:7 ++#: ../data/templates/avery-iso-templates.xml.h:16 ++#: ../data/templates/avery-us-templates.xml.h:12 +msgid "Diskette Labels" +msgstr "Наклейки на дискеты" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:9 ++#: ../data/templates/avery-iso-templates.xml.h:18 ++msgid "Diskette labels" ++msgstr "Наклейки на дискеты" ++ ++#. =============================================================== ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:20 ++#: ../data/templates/misc-iso-templates.xml.h:36 ++#: ../data/templates/misc-us-templates.xml.h:18 ++#: ../data/templates/zweckform-iso-templates.xml.h:16 ++msgid "Mailing Labels" ++msgstr "Почтовые этикетки" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:22 ++msgid "Mailing labels" ++msgstr "Почтовые наклейки" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:24 ++msgid "Mini Address Labels" ++msgstr "Маленькие наклейки с адресом" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:26 ++#, fuzzy ++msgid "Mini Labels" ++msgstr "Этикетки для Мини-CD" ++ ++#. =================================================================== ++#: ../data/templates/avery-iso-templates.xml.h:28 ++msgid "Shipping labels" ++msgstr "Ценники" ++ ++#. =================================================================== ++#: ../data/templates/avery-other-templates.xml.h:2 ++msgid "File Folder Labels" ++msgstr "Наклейки для папок" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:8 ++msgid "CD/DVD Labels (Disc Labels)" ++msgstr "Наклейки для CD/DVD (наклейки на диск)" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:10 ++msgid "CD/DVD Labels (Spine Labels)" ++msgstr "Наклейки на CD/DVD" ++ ++#. the LSK labels can be torn in half down the center ++#: ../data/templates/avery-us-templates.xml.h:14 ++#, fuzzy ++msgid "Divider Labels" ++msgstr "Этикетки для CD" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:16 +msgid "Filing Labels" +msgstr "Заполняемые этикетки" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:11 ++#: ../data/templates/avery-us-templates.xml.h:18 +msgid "Full Sheet Labels" +msgstr "Этикетки на всю страницу" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:13 ++#: ../data/templates/avery-us-templates.xml.h:20 ++msgid "ID Labels" ++msgstr "Идентификационные этикетки" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:22 ++#, fuzzy ++msgid "Index Cards" ++msgstr "Визитные карточки" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:24 +msgid "Large Round Labels" +msgstr "Этикетки с большим закруглением" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:15 ++#: ../data/templates/avery-us-templates.xml.h:26 +msgid "Name Badge Labels" +msgstr "Именной бейджик" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:17 ++#: ../data/templates/avery-us-templates.xml.h:28 ++msgid "Post cards" ++msgstr "Почтовые открытки" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:30 ++#: ../data/templates/dymo-other-templates.xml.h:12 +msgid "Return Address Labels" +msgstr "Наклейка для обратного адреса" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:19 ++#: ../data/templates/avery-us-templates.xml.h:32 ++#: ../data/templates/misc-us-templates.xml.h:28 ++msgid "Round Labels" ++msgstr "Круглые этикетки" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:34 +msgid "Shipping Labels" +msgstr "Ценники" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:21 ++#: ../data/templates/avery-us-templates.xml.h:36 +msgid "Small Round Labels" +msgstr "Маленькие круглые этикетки" + +#. =================================================================== - #: data/templates/avery-us-templates.xml.h:23 ++#: ../data/templates/avery-us-templates.xml.h:38 +msgid "Square Labels" +msgstr "Прямоугольные этикетки" + - #: data/templates/avery-us-templates.xml.h:24 - msgid "Video Tape Face Labels" - msgstr "Лицевые наклейки на видеокассету" ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:40 ++msgid "Tent Cards" ++msgstr "" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:42 ++msgid "Video Tape Face Labels" ++msgstr "Лицевые наклейки на видеокассету" ++ ++#. =================================================================== ++#: ../data/templates/avery-us-templates.xml.h:44 ++msgid "Video Tape Spine Labels" ++msgstr "Торцевые наклейки на видеокассету" ++ ++#: ../data/templates/brother-other-templates.xml.h:1 ++msgid "Multi Purpose Labels 17mm x 54mm" ++msgstr "" ++ ++#: ../data/templates/brother-other-templates.xml.h:2 ++#, fuzzy ++msgid "Shipping Labels 62mm x 100mm" ++msgstr "Ценники" ++ ++#. ++#. ********************************************************************* ++#. ********************************************************************* ++#. Labels for the Brother QL-500/550/650 PC Label Printers ++#. ++#. These templates work with the Brother Linux Printer CUPS Driver. It ++#. is unknown if these work correctly with the foomatic print driver for ++#. these printers. ++#. ++#. One difference from typical templates is that the template size is ++#. not the actual media size - it is the size of the printable area, ++#. which is smaller than the media size. This is because (at least with ++#. the Brother driver) coordinates are relative the corner of this area. ++#. ++#. ********************************************************************* ++#. ********************************************************************* ++#. ++#: ../data/templates/brother-other-templates.xml.h:20 ++#, fuzzy ++msgid "Standard Address Labels 29mm x 90mm" ++msgstr "Этикетка с адресом" ++ ++#. =================================================================== ++#: ../data/templates/dymo-other-templates.xml.h:2 ++msgid "3.5in Diskette" ++msgstr "Дискета 3,5 дюйма" ++ ++#. =================================================================== ++#: ../data/templates/dymo-other-templates.xml.h:6 ++msgid "File Folder" ++msgstr "Папка для файлов" ++ ++#. =================================================================== ++#: ../data/templates/dymo-other-templates.xml.h:8 ++msgid "Hanging Folder" ++msgstr "" ++ ++#. =================================================================== ++#: ../data/templates/dymo-other-templates.xml.h:10 ++msgid "Large Address Labels" ++msgstr "Большие наклейки с адресом" ++ ++#. =================================================================== ++#: ../data/templates/dymo-other-templates.xml.h:14 ++#, fuzzy ++msgid "Shipping Address Labels" ++msgstr "Маленькие наклейки с адресом" + - #: data/templates/avery-us-templates.xml.h:25 - msgid "Video Tape Spine Labels" - msgstr "Торцевые наклейки на видеокассету" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:4 ++#: ../data/templates/zweckform-iso-templates.xml.h:4 ++msgid "Allround Labels" ++msgstr "" + +#. =================================================================== - #: data/templates/avery-iso-templates.xml.h:2 - msgid "Address labels" - msgstr "Адресные наклейки" ++#: ../data/templates/misc-iso-templates.xml.h:6 ++#, fuzzy ++msgid "Arch File Labels" ++msgstr "Файл" + - #. =============================================================== - #: data/templates/avery-iso-templates.xml.h:6 - msgid "CD Booklet" - msgstr "Вкладыш в CD" ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:8 ++#, fuzzy ++msgid "Arch File Labels (large)" ++msgstr "Файл большой" + - #. =============================================================== - #: data/templates/avery-iso-templates.xml.h:8 ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:10 +#, fuzzy - msgid "CD Inlet" - msgstr "CD" ++msgid "Arch File Labels (small)" ++msgstr "Файл маленький" + - #. =============================================================== +#. =================================================================== - #: data/templates/avery-iso-templates.xml.h:10 - #: data/templates/zweckform-iso-templates.xml.h:8 - #: data/templates/misc-us-templates.xml.h:5 - #: data/templates/misc-iso-templates.xml.h:21 - msgid "CD/DVD Labels" - msgstr "Этикетки для CD/DVD" ++#: ../data/templates/misc-iso-templates.xml.h:14 ++msgid "CD Labels" ++msgstr "Этикетки для CD" + +#. =================================================================== - #: data/templates/avery-iso-templates.xml.h:12 - msgid "Diskette labels" - msgstr "Наклейки на дискеты" ++#: ../data/templates/misc-iso-templates.xml.h:18 ++#: ../data/templates/misc-us-templates.xml.h:12 ++msgid "CD/DVD Labels (face only)" ++msgstr "Вкладыши CD/DVD (лицевая сторона)" + - #. =============================================================== +#. =================================================================== - #: data/templates/avery-iso-templates.xml.h:14 - #: data/templates/zweckform-iso-templates.xml.h:14 - #: data/templates/misc-iso-templates.xml.h:35 - msgid "Mailing Labels" - msgstr "Почтовые этикетки" ++#: ../data/templates/misc-iso-templates.xml.h:20 ++msgid "CD/DVD Labels Standard Format (face only)" ++msgstr "Наклейки стандартного формата для CD/DVD (лицевая сторона)" + +#. =================================================================== - #: data/templates/avery-iso-templates.xml.h:16 - msgid "Mailing labels" - msgstr "Почтовые наклейки" ++#: ../data/templates/misc-iso-templates.xml.h:22 ++msgid "Diskette Labels (face only)" ++msgstr "Наклейки для дискет (лицевая сторона)" + +#. =================================================================== - #: data/templates/avery-iso-templates.xml.h:18 - msgid "Mini Address Labels" - msgstr "Маленькие наклейки с адресом" ++#: ../data/templates/misc-iso-templates.xml.h:24 ++msgid "EPSON Photo Stickers 16" ++msgstr "EPSON Photo Stickers 16" + +#. =================================================================== - #: data/templates/avery-iso-templates.xml.h:20 - msgid "Shipping labels" - msgstr "Ценники" ++#: ../data/templates/misc-iso-templates.xml.h:26 ++msgid "Etiketten" ++msgstr "Этикетки" + +#. =================================================================== - #: data/templates/zweckform-iso-templates.xml.h:4 - msgid "Allround Labels" - msgstr "" ++#: ../data/templates/misc-iso-templates.xml.h:28 ++msgid "Fridge Magnet Stickers" ++msgstr "Магнитные стикеры для холодильника" + +#. =================================================================== - #: data/templates/zweckform-iso-templates.xml.h:10 - msgid "Correction and Cover-up Labels" - msgstr "Исправляющие и покрывающие метки" ++#: ../data/templates/misc-iso-templates.xml.h:30 ++msgid "General Labels" ++msgstr "Этикетки общего назначения" + +#. =================================================================== - #: data/templates/zweckform-iso-templates.xml.h:12 - #, fuzzy - msgid "Lever Arch File Labels" - msgstr "Файл" ++#: ../data/templates/misc-iso-templates.xml.h:32 ++msgid "Inkjet/Laser Labels 70x37mm" ++msgstr "" + +#. =================================================================== - #: data/templates/zweckform-iso-templates.xml.h:16 - #, fuzzy - msgid "QSL-Karten Etiketten 70mm x 50,8mm" - msgstr "x" ++#: ../data/templates/misc-iso-templates.xml.h:38 ++msgid "Mailing Labels-2 columns" ++msgstr "" + +#. =================================================================== - #: data/templates/zweckform-iso-templates.xml.h:18 - msgid "Rectangular Copier Labels" ++#: ../data/templates/misc-iso-templates.xml.h:40 ++msgid "Mailing Labels-3 columns" +msgstr "" + +#. =================================================================== - #: data/templates/zweckform-iso-templates.xml.h:20 - #: data/templates/misc-iso-templates.xml.h:44 ++#: ../data/templates/misc-iso-templates.xml.h:42 ++#: ../data/templates/misc-us-templates.xml.h:26 ++#, fuzzy ++msgid "PRO CD Labels 2-up (face only)" ++msgstr "CD" ++ ++#. =================================================================== ++#: ../data/templates/misc-iso-templates.xml.h:44 ++#: ../data/templates/zweckform-iso-templates.xml.h:24 +msgid "Rectangular Labels" +msgstr "Прямоугольные метки" + +#. =================================================================== - #: data/templates/zweckform-iso-templates.xml.h:22 - msgid "Video Labels (back)" - msgstr "Видеонаклейки (оборотная сторона)" ++#: ../data/templates/misc-iso-templates.xml.h:46 ++msgid "Video Labels (face only)" ++msgstr "Наклейки на видеокассеты (лицевая сторона)" ++ ++#. =================================================================== ++#: ../data/templates/misc-other-templates.xml.h:2 ++#, fuzzy ++msgid "Multi-Purpose Labels" ++msgstr "Этикетки для Microtube" + - #: data/templates/misc-us-templates.xml.h:1 ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:2 +msgid "Business Card CD" +msgstr "Визитная карточка на CD" + - #: data/templates/misc-us-templates.xml.h:4 ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:6 +msgid "CD Template Rectangles" +msgstr "Прямоугольный шаблон для CD" + - #: data/templates/misc-us-templates.xml.h:6 ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:10 +msgid "CD/DVD Labels (Face Only)" +msgstr "Наклейки для CD/DVD (лицевая сторона)" + +#. =================================================================== - #: data/templates/misc-us-templates.xml.h:7 - #: data/templates/misc-iso-templates.xml.h:23 - msgid "CD/DVD Labels (face only)" - msgstr "Вкладыши CD/DVD (лицевая сторона)" - - #. =================================================================== - #: data/templates/misc-us-templates.xml.h:9 ++#: ../data/templates/misc-us-templates.xml.h:14 +msgid "Cassette Labels" +msgstr "Наклейки на кассеты" + +#. =================================================================== - #: data/templates/misc-us-templates.xml.h:11 ++#: ../data/templates/misc-us-templates.xml.h:16 +msgid "DLT Labels" +msgstr "Этикетки на DLT" + +#. =================================================================== - #: data/templates/misc-us-templates.xml.h:13 ++#: ../data/templates/misc-us-templates.xml.h:20 +msgid "Microtube labels" +msgstr "Этикетки для Microtube" + - #: data/templates/misc-us-templates.xml.h:14 ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:22 +msgid "Mini-CD Labels" +msgstr "Этикетки для Мини-CD" + - #: data/templates/misc-us-templates.xml.h:15 ++#: ../data/templates/misc-us-templates.xml.h:23 +#, fuzzy +msgid "PRO CD Labels 2-up (CD spine only)" +msgstr "CD CD" + - #: data/templates/misc-us-templates.xml.h:16 ++#: ../data/templates/misc-us-templates.xml.h:24 +#, fuzzy +msgid "PRO CD Labels 2-up (Face only)" +msgstr "CD" + - #: data/templates/misc-us-templates.xml.h:17 - #: data/templates/misc-iso-templates.xml.h:42 - #, fuzzy - msgid "PRO CD Labels 2-up (face only)" - msgstr "CD" - - #: data/templates/misc-us-templates.xml.h:18 ++#. =================================================================== ++#: ../data/templates/misc-us-templates.xml.h:30 +msgid "Slimline CD Case (rightside up)" +msgstr "Тонкие коробки для CD (правая сторона вверху)" + - #: data/templates/misc-us-templates.xml.h:19 ++#: ../data/templates/misc-us-templates.xml.h:31 +msgid "Slimline CD Case (upside down)" +msgstr "Тонкие коробки для CD (кверх ногами)" + - #: data/templates/misc-iso-templates.xml.h:1 - msgid "Agipa 119488: Business Cards" - msgstr "" - +#. =================================================================== - #: data/templates/misc-iso-templates.xml.h:3 - msgid "Allround Labels --24" - msgstr "" ++#: ../data/templates/zweckform-iso-templates.xml.h:10 ++msgid "Correction and Cover-up Labels" ++msgstr "Исправляющие и покрывающие метки" + +#. =================================================================== - #: data/templates/misc-iso-templates.xml.h:5 - msgid "Allround Labels --44" - msgstr "" ++#: ../data/templates/zweckform-iso-templates.xml.h:12 ++#, fuzzy ++msgid "File Back Labels" ++msgstr "Заполняемые этикетки" + +#. =================================================================== - #: data/templates/misc-iso-templates.xml.h:7 - msgid "Allround Labels --64" - msgstr "" ++#: ../data/templates/zweckform-iso-templates.xml.h:14 ++#, fuzzy ++msgid "Lever Arch File Labels" ++msgstr "Файл" + +#. =================================================================== - #: data/templates/misc-iso-templates.xml.h:9 - msgid "Allround Labels --65" ++#: ../data/templates/zweckform-iso-templates.xml.h:18 ++msgid "Multi-purpose Stick+Lift Labels" +msgstr "" + +#. =================================================================== - #: data/templates/misc-iso-templates.xml.h:11 ++#: ../data/templates/zweckform-iso-templates.xml.h:20 +#, fuzzy - msgid "Arch File Labels" - msgstr "Файл" ++msgid "QSL-Karten Etiketten 70mm x 50,8mm" ++msgstr "x" + +#. =================================================================== - #: data/templates/misc-iso-templates.xml.h:13 - #, fuzzy - msgid "Arch File Labels (large)" - msgstr "Файл большой" ++#: ../data/templates/zweckform-iso-templates.xml.h:22 ++msgid "Rectangular Copier Labels" ++msgstr "" + +#. =================================================================== - #: data/templates/misc-iso-templates.xml.h:15 - #, fuzzy - msgid "Arch File Labels (small)" - msgstr "Файл маленький" ++#: ../data/templates/zweckform-iso-templates.xml.h:26 ++msgid "Video Labels (back)" ++msgstr "Видеонаклейки (оборотная сторона)" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:19 - msgid "CD Labels" - msgstr "Этикетки для CD" ++#: ../data/desktop/glabels.desktop.in.h:1 ++msgid "Create labels, business cards and media covers" ++msgstr "Создание этикеток, визитных карточек и вкладышей для дисков" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:25 - msgid "CD/DVD Labels Standard Format (face only)" - msgstr "Наклейки стандартного формата для CD/DVD (лицевая сторона)" ++#: ../data/desktop/glabels.desktop.in.h:2 ++msgid "gLabels Label Designer" ++msgstr "Дизайнер этикеток gLabels" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:27 - msgid "Diskette Labels (face only)" - msgstr "Наклейки для дискет (лицевая сторона)" ++#: ../data/mime/glabels.keys.in.h:1 ../data/mime/glabels.xml.in.h:1 ++msgid "gLabels Project File" ++msgstr "Файл проекта gLabels" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:29 - msgid "EPSON Photo Stickers 16" ++#: ../barcode-0.98/compat/getopt.c:583 ++#, c-format ++msgid "%s: option `%s' is ambiguous\n" +msgstr "" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:31 - msgid "Etiketten" ++#: ../barcode-0.98/compat/getopt.c:607 ++#, c-format ++msgid "%s: option `--%s' doesn't allow an argument\n" +msgstr "" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:33 - msgid "Fridge Magnet Stickers" ++#: ../barcode-0.98/compat/getopt.c:612 ++#, c-format ++msgid "%s: option `%c%s' doesn't allow an argument\n" +msgstr "" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:37 - msgid "Mailing Labels --14" ++#: ../barcode-0.98/compat/getopt.c:629 ++#, c-format ++msgid "%s: option `%s' requires an argument\n" +msgstr "" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:39 - msgid "Mailing Labels-2 columns" - msgstr "" ++#. --option ++#: ../barcode-0.98/compat/getopt.c:658 ++#, c-format ++msgid "%s: unrecognized option `--%s'\n" ++msgstr "%s: неизвестный ключ `--%s'\n" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:41 - msgid "Mailing Labels-3 columns" ++#. +option or -option ++#: ../barcode-0.98/compat/getopt.c:662 ++#, c-format ++msgid "%s: unrecognized option `%c%s'\n" ++msgstr "%s: неизвестный ключ `%c%s'\n" ++ ++#. 1003.2 specifies the format of this message. ++#: ../barcode-0.98/compat/getopt.c:688 ++#, c-format ++msgid "%s: illegal option -- %c\n" +msgstr "" + - #. =================================================================== - #: data/templates/misc-iso-templates.xml.h:46 - msgid "Video Labels (face only)" - msgstr "Наклейки на видеокассеты (лицевая сторона)" ++#: ../barcode-0.98/compat/getopt.c:691 ++#, c-format ++msgid "%s: invalid option -- %c\n" ++msgstr "%s: некорректный ключ -- %c\n" + - #: data/desktop/glabels.desktop.in.h:1 - msgid "Create labels, business cards and media covers" - msgstr "Создание этикеток, визитных карточек и вкладышей для дисков" ++#: ../barcode-0.98/compat/getopt.c:727 ++#, c-format ++msgid "%s: option requires an argument -- %c\n" ++msgstr "%s: ключу необходим аргумент -- %c\n" + - #: data/desktop/glabels.desktop.in.h:2 - msgid "gLabels Label Designer" - msgstr "Дизайнер этикеток gLabels" ++#, fuzzy ++#~ msgid "Launch gLabels label and business card designer." ++#~ msgstr "Программа для создания этикеток и визитных карточек\n" + - #: data/mime/glabels.keys.in.h:1 data/mime/glabels.xml.in.h:1 - msgid "gLabels Project File" - msgstr "Файл проекта gLabels" ++#~ msgid "Print files created with gLabels." ++#~ msgstr "Напечатать созданные в gLabels файлы." ++ ++#~ msgid "IEC18004 (QRCode)" ++#~ msgstr "IEC18004 (QRCode)" ++ ++#~ msgid "Default Color" ++#~ msgstr "Цвет по умолчанию" ++ ++#~ msgid "Dark Red" ++#~ msgstr "Тёмно-красный" ++ ++#~ msgid "Brown" ++#~ msgstr "Коричневый" ++ ++#~ msgid "Dark Goldenrod" ++#~ msgstr "Темный золотарник" ++ ++#~ msgid "Dark Green" ++#~ msgstr "Тёмно-зелёный" ++ ++#~ msgid "Dark Cyan" ++#~ msgstr "Темно-циановый" ++ ++#~ msgid "Navy Blue" ++#~ msgstr "Тёмно-синий" ++ ++#~ msgid "Dark Violet" ++#~ msgstr "Тёмно-фиолетовый" ++ ++#~ msgid "Red" ++#~ msgstr "Красный" ++ ++#~ msgid "Dark Yellow" ++#~ msgstr "Темно-желтый" ++ ++#~ msgid "Turquoise" ++#~ msgstr "Бирюзовый" ++ ++#~ msgid "Salmon" ++#~ msgstr "Сомон" ++ ++#~ msgid "SkyBlue" ++#~ msgstr "Небесно-синий" ++ ++#~ msgid "Violet" ++#~ msgstr "Фиолетовый" ++ ++#~ msgid "Khaki" ++#~ msgstr "Хаки" ++ ++#~ msgid "Light Green" ++#~ msgstr "Светло-зелёный" ++ ++#~ msgid "Slate Gray" ++#~ msgstr "Аспидно-серый" ++ ++#~ msgid "Thistle" ++#~ msgstr "Чертополох" ++ ++#~ msgid "10% Gray" ++#~ msgstr "10% серый" ++ ++#~ msgid "25% Gray" ++#~ msgstr "25% серый" ++ ++#~ msgid "40% Gray" ++#~ msgstr "40% серый" ++ ++#~ msgid "50% Gray" ++#~ msgstr "50% серый" ++ ++#~ msgid "60% Gray" ++#~ msgstr "60% серый" ++ ++#~ msgid "Custom Color #%u" ++#~ msgstr "Заказной цвет #%u" ++ ++#~ msgid "Normal" ++#~ msgstr "Обычное" ++ ++#~ msgid " " ++#~ msgstr " " ++ ++#~ msgid " " ++#~ msgstr " " ++ ++#~ msgid "Could not initialize Bonobo!\n" ++#~ msgstr "Невозможно инициализировать Bonobo!\n" ++ ++#~ msgid "print this message" ++#~ msgstr "напечатать это сообщение" ++ ++#~ msgid "print the version of glabels-batch being used" ++#~ msgstr "выводит версию используемого glabels-batch" ++ ++#~ msgid "[OPTION...] GLABELS_FILE..." ++#~ msgstr "[ПАРАМЕТРЫ...] файл_glabels..." ++ ++#~ msgid "missing glabels file\n" ++#~ msgstr "не указан файл glabels\n" ++ ++#~ msgid "Open" ++#~ msgstr "Открыть" ++ ++#~ msgid "Align _Horizontally" ++#~ msgstr "Выровнять _горизонтально" ++ ++#~ msgid "Align _Vertically" ++#~ msgstr "Выровнять _вертикально" ++ ++#~ msgid "_Delete" ++#~ msgstr "У_далить" ++ ++#~ msgid "Print" ++#~ msgstr "Напечатать" ++ ++#~ msgid "_Job" ++#~ msgstr "_Задание" ++ ++#~ msgid "P_rinter" ++#~ msgstr "П_ринтер" ++ ++#~ msgid "Copies" ++#~ msgstr "Копий" ++ ++#~ msgid "Document merge control" ++#~ msgstr "Управление объединением" ++ ++#~ msgid "Print preview" ++#~ msgstr "Просмотреть" ++ ++#~ msgid "Importing from glabels 1.91 format" ++#~ msgstr "Импортируем из формата glabels версии 1.91" ++ ++#~ msgid "Label size:" ++#~ msgstr "Размер этикетки:" ++ ++#~ msgid "Layout:" ++#~ msgstr "Формат:" ++ ++#~ msgid "%d x %d (%d per sheet)" ++#~ msgstr "%d x %d (%d на лист)" ++ ++#~ msgid "No paper files found!" ++#~ msgstr "Не найдены файлы описания бумаги!" ++ ++#~ msgid "Close" ++#~ msgstr "Закрыть" ++ ++#~ msgid "Cu_t" ++#~ msgstr "_Вырезать" ++ ++#~ msgid "Customize" ++#~ msgstr "Настроить" ++ ++#~ msgid "Customize toolbars" ++#~ msgstr "Настроить панель инструментов" ++ ++#~ msgid "Dump XML" ++#~ msgstr "Дамп XML" ++ ++#~ msgid "Dump the UI Xml description" ++#~ msgstr "Дамп XML-описания UI" ++ ++#~ msgid "Font selector" ++#~ msgstr "Выбор шрифта" ++ ++#~ msgid "Icon and _Text" ++#~ msgstr "Пиктограмма и _Текст" ++ ++#~ msgid "M_arkup" ++#~ msgstr "_Разметка" ++ ++#~ msgid "New" ++#~ msgstr "Создать" ++ ++#~ msgid "Object property editor" ++#~ msgstr "Редактор свойств объекта" ++ ++#~ msgid "Only show icons in the main toolbar" ++#~ msgstr "Показывать только картинки в главной панели инструментов" ++ ++#~ msgid "Pr_eferences..." ++#~ msgstr "_Настроить..." ++ ++#~ msgid "Properties" ++#~ msgstr "Свойства" ++ ++#~ msgid "Quit" ++#~ msgstr "Выйти" ++ ++#~ msgid "Redo the undone action" ++#~ msgstr "Повторить отменённое действие" ++ ++#~ msgid "Save" ++#~ msgstr "Сохранить" ++ ++#~ msgid "Save As" ++#~ msgstr "Сохранить как" ++ ++#~ msgid "Select _All" ++#~ msgstr "Выбрать вс_ё" ++ ++#~ msgid "Set main toolbar button style according to desktop default" ++#~ msgstr "" ++#~ "Установить стиль кнопок главной панели инструментов согласно настройкам " ++#~ "рабочего стола" ++ ++#~ msgid "Show both icons and texts in the main toolbar" ++#~ msgstr "Показывать и пиктограммы и текст в главной панели инструментов" ++ ++#~ msgid "Template Designer" ++#~ msgstr "Дизайнер шаблонов" ++ ++#~ msgid "U_n-select All" ++#~ msgstr "_Снять выделение со всего" ++ ++#~ msgid "Undo" ++#~ msgstr "Отменить" ++ ++#~ msgid "Undo the last action" ++#~ msgstr "Отменить последнее действие" ++ ++#~ msgid "_About..." ++#~ msgstr "_О программе..." ++ ++#~ msgid "_Bottoms" ++#~ msgstr "По _низу" ++ ++#~ msgid "_Contents" ++#~ msgstr "_Содержание справки" ++ ++#~ msgid "_Copy" ++#~ msgstr "_Запомнить" ++ ++#~ msgid "_Create Object" ++#~ msgstr "_Создать объект" ++ ++#~ msgid "_Debug" ++#~ msgstr "_Отладка" ++ ++#~ msgid "_Desktop Default" ++#~ msgstr "_Согласно настройкам рабочего стола" ++ ++#~ msgid "_Drawing Toolbar" ++#~ msgstr "Показывать панель _рисования" ++ ++#~ msgid "_Icon" ++#~ msgstr "_Пиктограмма" ++ ++#~ msgid "_Main Toolbar" ++#~ msgstr "Показывать панель _инструментов" ++ ++#~ msgid "_Merge Properties..." ++#~ msgstr "_Свойства объединения..." ++ ++#~ msgid "_Paste" ++#~ msgstr "Вст_авить" ++ ++#~ msgid "_Property Toolbar" ++#~ msgstr "Показывать панель с_войств" ++ ++#~ msgid "*" ++#~ msgstr "*" ++ ++#~ msgid "Load image" ++#~ msgstr "Загрузить изображение" + ++#~ msgid "Label or Card Size (Rectangular)" ++#~ msgstr "Развер этикетки или визитки (прямоугольник)" diff --cc src/prefs-model.c index 72b61792,00000000..1d5c2199 mode 100644,000000..100644 --- a/src/prefs-model.c +++ b/src/prefs-model.c @@@ -1,736 -1,0 +1,754 @@@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ + +/* + * (GLABELS) Label and Business Card Creation program for GNOME + * + * prefs-model.c: Application preferences model module + * + * Copyright (C) 2001-2003 Jim Evins . + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include + +#include "prefs-model.h" + +#include +#include ++#include + +#include "marshal.h" +#include "util.h" +#include "color.h" + +#include "debug.h" + +/*========================================================*/ +/* Private macros and constants. */ +/*========================================================*/ + +/* GConf keys */ +#define BASE_KEY "/apps/glabels" + +#define PREF_UNITS "/units" +#define PREF_DEFAULT_PAGE_SIZE "/default-page-size" + +#define PREF_DEFAULT_FONT_FAMILY "/default-font-family" +#define PREF_DEFAULT_FONT_SIZE "/default-font-size" +#define PREF_DEFAULT_FONT_WEIGHT "/default-font-weight" +#define PREF_DEFAULT_FONT_ITALIC_FLAG "/default-font-italic-flag" +#define PREF_DEFAULT_TEXT_COLOR "/default-text-color" +#define PREF_DEFAULT_TEXT_ALIGNMENT "/default-text-alignment" +#define PREF_DEFAULT_TEXT_LINE_SPACING "/default-text-line-spacing" + +#define PREF_DEFAULT_LINE_WIDTH "/default-line-width" +#define PREF_DEFAULT_LINE_COLOR "/default-line-color" + +#define PREF_DEFAULT_FILL_COLOR "/default-fill-color" + +#define PREF_MAIN_TOOLBAR_VISIBLE "/main-toolbar-visible" +#define PREF_MAIN_TOOLBAR_BUTTONS_STYLE "/main-toolbar-buttons-style" +#define PREF_MAIN_TOOLBAR_VIEW_TOOLTIPS "/main-toolbar-view-tooltips" + +#define PREF_DRAWING_TOOLBAR_VISIBLE "/drawing-toolbar-visible" +#define PREF_DRAWING_TOOLBAR_VIEW_TOOLTIPS "/drawing-toolbar-view-tooltips" + +#define PREF_PROPERTY_TOOLBAR_VISIBLE "/property-toolbar-visible" +#define PREF_PROPERTY_TOOLBAR_VIEW_TOOLTIPS "/property-toolbar-view-tooltips" + +#define PREF_GRID_VISIBLE "/grid-visible" +#define PREF_MARKUP_VISIBLE "/markup-visible" + +#define PREF_MAX_RECENTS "/max-recents" + +#define PREF_RECENT_TEMPLATES "/recent-templates" +#define PREF_MAX_RECENT_TEMPLATES "/max-recent-templates" + +/* Default values */ - #define DEFAULT_UNITS_STRING units_to_string (LGL_UNITS_INCH) - #define DEFAULT_PAGE_SIZE "US-Letter" ++#define DEFAULT_UNITS_STRING_US units_to_string (LGL_UNITS_INCH) ++#define DEFAULT_PAGE_SIZE_US "US-Letter" ++ ++#define DEFAULT_UNITS_STRING_METRIC units_to_string (LGL_UNITS_MM) ++#define DEFAULT_PAGE_SIZE_METRIC "A4" + +#define DEFAULT_FONT_FAMILY "Sans" +#define DEFAULT_FONT_SIZE 14.0 +#define DEFAULT_FONT_WEIGHT_STRING gl_util_weight_to_string (PANGO_WEIGHT_NORMAL) +#define DEFAULT_FONT_ITALIC_FLAG FALSE +#define DEFAULT_TEXT_ALIGN_STRING gl_util_align_to_string (PANGO_ALIGN_LEFT) +#define DEFAULT_TEXT_COLOR GL_COLOR (0,0,0) +#define DEFAULT_TEXT_LINE_SPACING 1.0 + +#define DEFAULT_LINE_WIDTH 1.0 +#define DEFAULT_LINE_COLOR GL_COLOR_A (0, 0, 0, 255) + +#define DEFAULT_FILL_COLOR GL_COLOR_A (0, 255, 0, 255) + +/*========================================================*/ +/* Private types. */ +/*========================================================*/ + +enum { + CHANGED, + LAST_SIGNAL +}; + + + +/*========================================================*/ +/* Private globals. */ +/*========================================================*/ + +static guint signals[LAST_SIGNAL] = {0}; + +/*========================================================*/ +/* Private function prototypes. */ +/*========================================================*/ + +static void gl_prefs_model_finalize (GObject *object); + +static void notify_cb (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + glPrefsModel *prefs_model); + +static gchar *get_string (GConfClient *client, + const gchar *key, + const gchar *def); + +static gboolean get_bool (GConfClient *client, + const gchar *key, + gboolean def); + +static gint get_int (GConfClient *client, + const gchar *key, + gint def); + +static gdouble get_float (GConfClient *client, + const gchar *key, + gdouble def); + +static lglUnitsType string_to_units (const gchar *string); +static const gchar *units_to_string (lglUnitsType units); + + + +/*****************************************************************************/ +/* Boilerplate object stuff. */ +/*****************************************************************************/ +G_DEFINE_TYPE (glPrefsModel, gl_prefs_model, G_TYPE_OBJECT); + +static void +gl_prefs_model_class_init (glPrefsModelClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + + gl_debug (DEBUG_PREFS, "START"); + + gl_prefs_model_parent_class = g_type_class_peek_parent (class); + + object_class->finalize = gl_prefs_model_finalize; + + signals[CHANGED] = + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (glPrefsModelClass, changed), + NULL, NULL, + gl_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + gl_debug (DEBUG_PREFS, "END"); +} + +static void +gl_prefs_model_init (glPrefsModel *prefs_model) +{ + gl_debug (DEBUG_PREFS, "START"); + + prefs_model->gconf_client = gconf_client_get_default (); + + g_return_if_fail (prefs_model->gconf_client != NULL); + + gconf_client_add_dir (prefs_model->gconf_client, + BASE_KEY, + GCONF_CLIENT_PRELOAD_ONELEVEL, + NULL); + + gconf_client_notify_add (prefs_model->gconf_client, + BASE_KEY, + (GConfClientNotifyFunc)notify_cb, prefs_model, + NULL, NULL); + + gl_debug (DEBUG_PREFS, "END"); +} + +static void +gl_prefs_model_finalize (GObject *object) +{ + glPrefsModel *prefs_model = GL_PREFS_MODEL (object); + + gl_debug (DEBUG_PREFS, "START"); + + g_return_if_fail (object && GL_IS_PREFS_MODEL (object)); + + g_object_unref (G_OBJECT(prefs_model->gconf_client)); + g_free (prefs_model->default_page_size); + g_free (prefs_model->default_font_family); + + G_OBJECT_CLASS (gl_prefs_model_parent_class)->finalize (object); + + gl_debug (DEBUG_PREFS, "END"); +} + +/*****************************************************************************/ +/* New prefs_model object. */ +/*****************************************************************************/ +glPrefsModel * +gl_prefs_model_new (void) +{ + glPrefsModel *prefs_model; + + gl_debug (DEBUG_PREFS, "START"); + + prefs_model = GL_PREFS_MODEL (g_object_new (gl_prefs_model_get_type(), NULL)); + + gl_debug (DEBUG_PREFS, "END"); + + return prefs_model; +} + + + +/*****************************************************************************/ +/* Save all settings. */ +/*****************************************************************************/ +void +gl_prefs_model_save_settings (glPrefsModel *prefs_model) +{ + gl_debug (DEBUG_PREFS, "START"); + + g_return_if_fail (prefs_model && GL_IS_PREFS_MODEL(prefs_model)); + g_return_if_fail (prefs_model->gconf_client != NULL); + + /* We are saving settings because presumably some of them have been changed. */ + g_signal_emit (G_OBJECT(prefs_model), signals[CHANGED], 0); + + /* Units */ + gconf_client_set_string (prefs_model->gconf_client, + BASE_KEY PREF_UNITS, + units_to_string(prefs_model->units), + NULL); + lgl_xml_set_default_units (prefs_model->units); + + /* Default page size */ + gconf_client_set_string (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_PAGE_SIZE, + prefs_model->default_page_size, + NULL); + + + /* Text properties */ + gconf_client_set_string (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_FONT_FAMILY, + prefs_model->default_font_family, + NULL); + + gconf_client_set_float (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_FONT_SIZE, + prefs_model->default_font_size, + NULL); + + gconf_client_set_string (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_FONT_WEIGHT, + gl_util_weight_to_string(prefs_model->default_font_weight), + NULL); + + gconf_client_set_int (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_TEXT_COLOR, + prefs_model->default_text_color, + NULL); + + gconf_client_set_string (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_TEXT_ALIGNMENT, + gl_util_align_to_string(prefs_model->default_text_alignment), + NULL); + + gconf_client_set_float (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_TEXT_LINE_SPACING, + prefs_model->default_text_line_spacing, + NULL); + + /* Line properties */ + gconf_client_set_float (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_LINE_WIDTH, + prefs_model->default_line_width, + NULL); + + gconf_client_set_int (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_LINE_COLOR, + prefs_model->default_line_color, + NULL); + + + /* Fill properties */ + gconf_client_set_int (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_FILL_COLOR, + prefs_model->default_fill_color, + NULL); + + + /* Main Toolbar */ + gconf_client_set_bool (prefs_model->gconf_client, + BASE_KEY PREF_MAIN_TOOLBAR_VISIBLE, + prefs_model->main_toolbar_visible, + NULL); + + gconf_client_set_int (prefs_model->gconf_client, + BASE_KEY PREF_MAIN_TOOLBAR_BUTTONS_STYLE, + prefs_model->main_toolbar_buttons_style, + NULL); + + gconf_client_set_bool (prefs_model->gconf_client, + BASE_KEY PREF_MAIN_TOOLBAR_VIEW_TOOLTIPS, + prefs_model->main_toolbar_view_tooltips, + NULL); + + /* Drawing Toolbar */ + gconf_client_set_bool (prefs_model->gconf_client, + BASE_KEY PREF_DRAWING_TOOLBAR_VISIBLE, + prefs_model->drawing_toolbar_visible, + NULL); + + gconf_client_set_bool (prefs_model->gconf_client, + BASE_KEY PREF_DRAWING_TOOLBAR_VIEW_TOOLTIPS, + prefs_model->drawing_toolbar_view_tooltips, + NULL); + + /* Property Toolbar */ + gconf_client_set_bool (prefs_model->gconf_client, + BASE_KEY PREF_PROPERTY_TOOLBAR_VISIBLE, + prefs_model->property_toolbar_visible, + NULL); + + gconf_client_set_bool (prefs_model->gconf_client, + BASE_KEY PREF_PROPERTY_TOOLBAR_VIEW_TOOLTIPS, + prefs_model->property_toolbar_view_tooltips, + NULL); + + /* View properties */ + gconf_client_set_bool (prefs_model->gconf_client, + BASE_KEY PREF_GRID_VISIBLE, + prefs_model->grid_visible, + NULL); + + gconf_client_set_bool (prefs_model->gconf_client, + BASE_KEY PREF_MARKUP_VISIBLE, + prefs_model->markup_visible, + NULL); + + /* Recent files */ + gconf_client_set_int (prefs_model->gconf_client, + BASE_KEY PREF_MAX_RECENTS, + prefs_model->max_recents, + NULL); + + /* Recent templates */ + gconf_client_set_list (prefs_model->gconf_client, + BASE_KEY PREF_RECENT_TEMPLATES, + GCONF_VALUE_STRING, + prefs_model->recent_templates, + NULL); + gconf_client_set_int (prefs_model->gconf_client, + BASE_KEY PREF_MAX_RECENT_TEMPLATES, + prefs_model->max_recent_templates, + NULL); + + + gconf_client_suggest_sync (prefs_model->gconf_client, NULL); + + gl_debug (DEBUG_PREFS, "END"); +} + +/*****************************************************************************/ +/* Load all settings. */ +/*****************************************************************************/ +void +gl_prefs_model_load_settings (glPrefsModel *prefs_model) +{ ++ const gchar *pgsize, *default_units_string, *default_page_size; + gchar *string; + lglPaper *paper; + GSList *p, *p_next; + + gl_debug (DEBUG_PREFS, "START"); + + g_return_if_fail (prefs_model && GL_IS_PREFS_MODEL(prefs_model)); + g_return_if_fail (prefs_model->gconf_client != NULL); + ++ /* Make educated guess about locale defaults. */ ++ pgsize = gtk_paper_size_get_default (); ++ if ( strcmp (pgsize,GTK_PAPER_NAME_LETTER) == 0 ) ++ { ++ default_units_string = DEFAULT_UNITS_STRING_US; ++ default_page_size = DEFAULT_PAGE_SIZE_US; ++ } ++ else ++ { ++ default_units_string = DEFAULT_UNITS_STRING_METRIC; ++ default_page_size = DEFAULT_PAGE_SIZE_METRIC; ++ } ++ + /* Units */ + string = + get_string (prefs_model->gconf_client, + BASE_KEY PREF_UNITS, - DEFAULT_UNITS_STRING); ++ default_units_string); + prefs_model->units = string_to_units( string ); + g_free( string ); + lgl_xml_set_default_units (prefs_model->units); + + + /* Page size */ + g_free (prefs_model->default_page_size); + prefs_model->default_page_size = + get_string (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_PAGE_SIZE, - DEFAULT_PAGE_SIZE); ++ default_page_size); + + /* Text properties */ + g_free (prefs_model->default_font_family); + prefs_model->default_font_family = + get_string (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_FONT_FAMILY, + DEFAULT_FONT_FAMILY); + + prefs_model->default_font_size = + get_float (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_FONT_SIZE, + DEFAULT_FONT_SIZE); + + string = + get_string (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_FONT_WEIGHT, + DEFAULT_FONT_WEIGHT_STRING); + prefs_model->default_font_weight = gl_util_string_to_weight( string ); + g_free( string ); + + prefs_model->default_text_color = + get_int (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_TEXT_COLOR, + DEFAULT_TEXT_COLOR); + + string = + get_string (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_TEXT_ALIGNMENT, + DEFAULT_TEXT_ALIGN_STRING); + prefs_model->default_text_alignment = gl_util_string_to_align( string ); + g_free( string ); + + prefs_model->default_text_line_spacing = + get_float (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_TEXT_LINE_SPACING, + DEFAULT_TEXT_LINE_SPACING); + + gl_debug (DEBUG_PREFS, "text_line_spacing = %f", prefs_model->default_text_line_spacing); + + /* Line properties */ + prefs_model->default_line_width = + get_float (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_LINE_WIDTH, + DEFAULT_LINE_WIDTH); + prefs_model->default_line_color = + get_int (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_LINE_COLOR, + DEFAULT_LINE_COLOR); + + /* Fill properties */ + prefs_model->default_fill_color = + get_int (prefs_model->gconf_client, + BASE_KEY PREF_DEFAULT_FILL_COLOR, + DEFAULT_FILL_COLOR); + + + /* User Inferface/Main Toolbar */ + prefs_model->main_toolbar_visible = + get_bool (prefs_model->gconf_client, + BASE_KEY PREF_MAIN_TOOLBAR_VISIBLE, + TRUE); + + prefs_model->main_toolbar_buttons_style = + get_int (prefs_model->gconf_client, + BASE_KEY PREF_MAIN_TOOLBAR_BUTTONS_STYLE, + GL_TOOLBAR_SYSTEM); + + prefs_model->main_toolbar_view_tooltips = + get_bool (prefs_model->gconf_client, + BASE_KEY PREF_MAIN_TOOLBAR_VIEW_TOOLTIPS, + TRUE); + + /* User Inferface/Drawing Toolbar */ + prefs_model->drawing_toolbar_visible = + get_bool (prefs_model->gconf_client, + BASE_KEY PREF_DRAWING_TOOLBAR_VISIBLE, + TRUE); + + prefs_model->drawing_toolbar_view_tooltips = + get_bool (prefs_model->gconf_client, + BASE_KEY PREF_DRAWING_TOOLBAR_VIEW_TOOLTIPS, + TRUE); + + /* User Inferface/Property Toolbar */ + prefs_model->property_toolbar_visible = + get_bool (prefs_model->gconf_client, + BASE_KEY PREF_PROPERTY_TOOLBAR_VISIBLE, + TRUE); + + prefs_model->property_toolbar_view_tooltips = + get_bool (prefs_model->gconf_client, + BASE_KEY PREF_PROPERTY_TOOLBAR_VIEW_TOOLTIPS, + TRUE); + + + /* View properties */ + prefs_model->grid_visible = + get_bool (prefs_model->gconf_client, + BASE_KEY PREF_GRID_VISIBLE, + TRUE); + + prefs_model->markup_visible = + get_bool (prefs_model->gconf_client, + BASE_KEY PREF_MARKUP_VISIBLE, + TRUE); + + /* Recent files */ + prefs_model->max_recents = + get_int (prefs_model->gconf_client, + BASE_KEY PREF_MAX_RECENTS, + -1); + + /* Recent templates */ + for (p=prefs_model->recent_templates; p != NULL; p=p->next) + { + g_free (p->data); + } + g_slist_free (prefs_model->recent_templates); + prefs_model->recent_templates = + gconf_client_get_list (prefs_model->gconf_client, + BASE_KEY PREF_RECENT_TEMPLATES, + GCONF_VALUE_STRING, + NULL); + prefs_model->max_recent_templates = + get_int (prefs_model->gconf_client, + BASE_KEY PREF_MAX_RECENT_TEMPLATES, + 5); + + + /* Proof read the default page size -- it must be a valid id. */ + /* (For compatability with older versions.) */ + paper = lgl_db_lookup_paper_from_id (prefs_model->default_page_size); + if ( paper == NULL ) { - prefs_model->default_page_size = g_strdup (DEFAULT_PAGE_SIZE); ++ prefs_model->default_page_size = g_strdup (DEFAULT_PAGE_SIZE_US); + } else { + lgl_paper_free (paper); + paper = NULL; + } + + /* Proof read the recent templates list. Make sure the template names */ + /* are valid. Remove from list if not. */ + for (p=prefs_model->recent_templates; p != NULL; p=p_next) + { + p_next = p->next; + + if ( !lgl_db_does_template_name_exist (p->data) ) + { + g_free (p->data); + prefs_model->recent_templates = g_slist_delete_link (prefs_model->recent_templates, p); + } + } + + gl_debug (DEBUG_PREFS, "max_recents = %d", prefs_model->max_recents); + + + g_signal_emit (G_OBJECT(prefs_model), signals[CHANGED], 0); + + gl_debug (DEBUG_PREFS, "END"); +} + +/*---------------------------------------------------------------------------*/ +/* PRIVATE. Key changed callback. */ +/*---------------------------------------------------------------------------*/ +static void +notify_cb (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + glPrefsModel *prefs_model) +{ + gl_debug (DEBUG_PREFS, "Key was changed: %s", entry->key); + + gl_prefs_model_load_settings (prefs_model); +} + +/*---------------------------------------------------------------------------*/ +/* PRIVATE. Utilities to get values with defaults. */ +/*---------------------------------------------------------------------------*/ +static gchar* +get_string (GConfClient *client, + const gchar *key, + const gchar *def) +{ + gchar* val; + + val = gconf_client_get_string (client, key, NULL); + + if (val != NULL) { + + return val; + + } else { + + return def ? g_strdup (def) : NULL; + + } +} + +static gboolean +get_bool (GConfClient *client, + const gchar *key, + gboolean def) +{ + GConfValue* val; + gboolean retval; + + val = gconf_client_get (client, key, NULL); + + if (val != NULL) { + + if ( val->type == GCONF_VALUE_BOOL ) { + retval = gconf_value_get_bool (val); + } else { + retval = def; + } + + gconf_value_free (val); + + return retval; + + } else { + + return def; + + } +} + +static gint +get_int (GConfClient *client, + const gchar *key, + gint def) +{ + GConfValue* val; + gint retval; + + val = gconf_client_get (client, key, NULL); + + if (val != NULL) { + + if ( val->type == GCONF_VALUE_INT) { + retval = gconf_value_get_int(val); + } else { + retval = def; + } + + gconf_value_free (val); + + return retval; + + } else { + + return def; + + } +} + +static gdouble +get_float (GConfClient *client, + const gchar *key, + gdouble def) +{ + GConfValue* val; + gdouble retval; + + val = gconf_client_get (client, key, NULL); + + if (val != NULL) { + + if ( val->type == GCONF_VALUE_FLOAT ) { + retval = gconf_value_get_float(val); + } else { + retval = def; + } + + gconf_value_free (val); + + return retval; + + } else { + return def; + + } +} + +/*---------------------------------------------------------------------------*/ +/* PRIVATE. Utilities to deal with units. */ +/*---------------------------------------------------------------------------*/ +static lglUnitsType +string_to_units (const gchar *string) +{ + lglUnitsType units; + + if (g_strcasecmp (string, "Points") == 0) { + units = LGL_UNITS_POINT; + } else if (g_strcasecmp (string, "Inches") == 0) { + units = LGL_UNITS_INCH; + } else if (g_strcasecmp (string, "Millimeters") == 0) { + units = LGL_UNITS_MM; + } else { + units = LGL_UNITS_INCH; + } + + return units; +} + +static const +gchar *units_to_string (lglUnitsType units) +{ + switch (units) { + case LGL_UNITS_POINT: + return "Points"; + break; + case LGL_UNITS_INCH: + return "Inches"; + break; + case LGL_UNITS_MM: + return "Millimeters"; + break; + default: + return "Inches"; + break; + } +} + + diff --cc src/stock.c index 72f1c25c,00000000..a733e5c7 mode 100644,000000..100644 --- a/src/stock.c +++ b/src/stock.c @@@ -1,221 -1,0 +1,221 @@@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ + +/* + * (GLABELS) Label and Business Card Creation program for GNOME + * + * stock.h: Stock image module header file + * + * Copyright (C) 2001-2002 Jim Evins . + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include + +#include "stock.h" + +#include +#include +#include +#include + +#include "stock-pixmaps/stockpixbufs.h" + + +/*========================================================*/ +/* Private macros and constants. */ +/*========================================================*/ + +/*========================================================*/ +/* Private types. */ +/*========================================================*/ + +/*===========================================*/ +/* Private globals */ +/*===========================================*/ + +/*===========================================*/ +/* Local function prototypes */ +/*===========================================*/ + +static void add_icons (GtkIconFactory *factory, + const gchar *stock_id, + const guchar *inline_24, + const guchar *inline_16); + +static void add_button_icon (GtkIconFactory *factory, + const gchar *stock_id, + const guchar *inline_24); + + +/****************************************************************************/ +/* Initialize our stock icons. */ +/****************************************************************************/ +void +gl_stock_init (void) +{ + GtkIconFactory *factory; + + static GtkStockItem items[] = { + { GL_STOCK_ARROW, N_("_Select Mode"), 0, 0, NULL }, + { GL_STOCK_TEXT, N_("_Text"), 0, 0, NULL }, + { GL_STOCK_LINE, N_("_Line"), 0, 0, NULL }, + { GL_STOCK_BOX, N_("_Box"), 0, 0, NULL }, + { GL_STOCK_ELLIPSE, N_("_Ellipse"), 0, 0, NULL }, + { GL_STOCK_IMAGE, N_("_Image"), 0, 0, NULL }, + { GL_STOCK_BARCODE, N_("Bar_code"), 0, 0, NULL }, + { GL_STOCK_MERGE, N_("_Merge Properties"), 0, 0, NULL }, + { GL_STOCK_PROPERTIES, N_("Object _Properties"), 0, 0, NULL }, + { GL_STOCK_ORDER_TOP, N_("Bring to _Front"), 0, 0, NULL }, + { GL_STOCK_ORDER_BOTTOM, N_("Send to _Back"), 0, 0, NULL }, + { GL_STOCK_ROTATE_LEFT, N_("Rotate _Left"), 0, 0, NULL }, + { GL_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), 0, 0, NULL }, + { GL_STOCK_FLIP_HORIZ, N_("Flip _Horizontally"), 0, 0, NULL }, + { GL_STOCK_FLIP_VERT, N_("Flip _Vertically"), 0, 0, NULL }, + { GL_STOCK_ALIGN_LEFT, N_("_Lefts"), 0, 0, NULL }, + { GL_STOCK_ALIGN_RIGHT, N_("_Rights"), 0, 0, NULL }, + { GL_STOCK_ALIGN_HCENTER, N_("_Centers"), 0, 0, NULL }, + { GL_STOCK_ALIGN_TOP, N_("_Tops"), 0, 0, NULL }, + { GL_STOCK_ALIGN_BOTTOM, N_("Bottoms"), 0, 0, NULL }, + { GL_STOCK_ALIGN_VCENTER, N_("Centers"), 0, 0, NULL }, + { GL_STOCK_CENTER_HORIZ, N_("Label Ce_nter"), 0, 0, NULL }, + { GL_STOCK_CENTER_VERT, N_("Label Ce_nter"), 0, 0, NULL }, + { GL_STOCK_BUCKET_FILL, N_("Fill color"), 0, 0, NULL }, + { GL_STOCK_PENCIL, N_("Line color"), 0, 0, NULL }, + { GL_STOCK_HCHAIN, N_("Linked"), 0, 0, NULL }, + { GL_STOCK_HCHAIN_BROKEN, N_("Not Linked"), 0, 0, NULL }, + { GL_STOCK_VCHAIN, N_("Linked"), 0, 0, NULL }, + { GL_STOCK_VCHAIN_BROKEN, N_("Not Linked"), 0, 0, NULL }, + }; + + gtk_stock_add (items, G_N_ELEMENTS (items)); + + factory = gtk_icon_factory_new (); + gtk_icon_factory_add_default (factory); + + add_icons (factory, GL_STOCK_ARROW, stock_arrow_24, stock_arrow_16); + add_icons (factory, GL_STOCK_TEXT, stock_text_24, stock_text_16); + add_icons (factory, GL_STOCK_LINE, stock_line_24, stock_line_16); + add_icons (factory, GL_STOCK_BOX, stock_box_24, stock_box_16); + add_icons (factory, GL_STOCK_ELLIPSE, stock_ellipse_24, stock_ellipse_16); + add_icons (factory, GL_STOCK_IMAGE, stock_image_24, stock_image_16); + add_icons (factory, GL_STOCK_BARCODE, stock_barcode_24, stock_barcode_16); + add_icons (factory, GL_STOCK_MERGE, stock_merge_24, stock_merge_16); + + add_icons (factory, GL_STOCK_PROPERTIES, + stock_properties_24, + stock_properties_16); + + add_icons (factory, GL_STOCK_ORDER_TOP, NULL, stock_order_top_16); + add_icons (factory, GL_STOCK_ORDER_BOTTOM, NULL, stock_order_bottom_16); + add_icons (factory, GL_STOCK_ROTATE_LEFT, NULL, stock_rotate_left_16); + add_icons (factory, GL_STOCK_ROTATE_RIGHT, NULL, stock_rotate_right_16); + add_icons (factory, GL_STOCK_FLIP_HORIZ, NULL, stock_flip_horiz_16); + add_icons (factory, GL_STOCK_FLIP_VERT, NULL, stock_flip_vert_16); + add_icons (factory, GL_STOCK_ALIGN_LEFT, NULL, stock_align_left_16); + add_icons (factory, GL_STOCK_ALIGN_RIGHT, NULL, stock_align_right_16); + add_icons (factory, GL_STOCK_ALIGN_HCENTER, NULL, stock_align_hcenter_16); + add_icons (factory, GL_STOCK_ALIGN_TOP, NULL, stock_align_top_16); + add_icons (factory, GL_STOCK_ALIGN_BOTTOM, NULL, stock_align_bottom_16); + add_icons (factory, GL_STOCK_ALIGN_VCENTER, NULL, stock_align_vcenter_16); + add_icons (factory, GL_STOCK_CENTER_HORIZ, NULL, stock_center_horiz_16); + add_icons (factory, GL_STOCK_CENTER_VERT, NULL, stock_center_vert_16); + + add_icons (factory, GL_STOCK_BUCKET_FILL, stock_bucket_fill_24, stock_bucket_fill_16); + add_icons (factory, GL_STOCK_PENCIL, stock_pencil_24, stock_pencil_16); + + add_button_icon (factory, GL_STOCK_HCHAIN, stock_hchain_24); + add_button_icon (factory, GL_STOCK_HCHAIN_BROKEN, stock_hchain_broken_24); + add_button_icon (factory, GL_STOCK_VCHAIN, stock_vchain_24); + add_button_icon (factory, GL_STOCK_VCHAIN_BROKEN, stock_vchain_broken_24); + + g_object_unref (G_OBJECT(factory)); +} + +/*--------------------------------------------------------------------------*/ +/* PRIVATE. Unpack and associate given icons with stock_id. */ +/*--------------------------------------------------------------------------*/ +static void +add_icons (GtkIconFactory *factory, + const gchar *stock_id, + const guchar *inline_24, + const guchar *inline_16) +{ + GdkPixbuf *pixbuf; + GtkIconSet *icon_set; + GtkIconSource *icon_source; + + if ( inline_24 != NULL ) { + /* Create icon set with default image */ + pixbuf = gdk_pixbuf_new_from_inline (-1, inline_24, FALSE, NULL); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (G_OBJECT(pixbuf)); + } else { + /* Create an empty icon set */ + icon_set = gtk_icon_set_new (); + } + + if ( inline_16 != NULL ) { + /* Add 16x16 icon for menus to icon set */ + icon_source = gtk_icon_source_new (); + pixbuf = gdk_pixbuf_new_from_inline (-1, inline_16, + FALSE, NULL); + gtk_icon_source_set_pixbuf (icon_source, pixbuf); + g_object_unref (G_OBJECT(pixbuf)); + gtk_icon_source_set_size_wildcarded (icon_source, FALSE); + gtk_icon_source_set_size (icon_source, GTK_ICON_SIZE_MENU); + gtk_icon_set_add_source (icon_set, icon_source); - g_free (icon_source); ++ gtk_icon_source_free (icon_source); + } + + /* Now associate icon set with stock id */ + gtk_icon_factory_add (factory, stock_id, icon_set); + gtk_icon_set_unref (icon_set); +} + +/*--------------------------------------------------------------------------*/ +/* PRIVATE. Unpack and associate given button icon with stock_id. */ +/*--------------------------------------------------------------------------*/ +static void +add_button_icon (GtkIconFactory *factory, + const gchar *stock_id, + const guchar *inline_24) +{ + GtkIconSet *icon_set; + GdkPixbuf *pixbuf; + GtkIconSource *icon_source; + + icon_set = gtk_icon_set_new (); + + icon_source = gtk_icon_source_new (); + pixbuf = gdk_pixbuf_new_from_inline (-1, inline_24, FALSE, NULL); + gtk_icon_source_set_pixbuf (icon_source, pixbuf); + g_object_unref (G_OBJECT(pixbuf)); + gtk_icon_source_set_size_wildcarded (icon_source, FALSE); + gtk_icon_source_set_size (icon_source, GTK_ICON_SIZE_BUTTON); + gtk_icon_set_add_source (icon_set, icon_source); - g_free (icon_source); ++ gtk_icon_source_free (icon_source); + + /* Now associate icon set with stock id */ + gtk_icon_factory_add (factory, stock_id, icon_set); + gtk_icon_set_unref (icon_set); +} + + + + + + +