--- easychem-0.6.orig/debian/control +++ easychem-0.6/debian/control @@ -0,0 +1,24 @@ +Source: easychem +Section: science +Priority: optional +Maintainer: Debichem Team +Uploaders: Michael Banck , + Daniel Leidert (dale) +Build-Depends: debhelper (>= 5), dpatch, gettext, libgtk2.0-dev +Standards-Version: 3.8.3 +Homepage: http://easychem.sourceforge.net +Vcs-Browser: http://svn.debian.org/wsvn/debichem/ +Vcs-Svn: svn://svn.debian.org/svn/debichem/unstable/easychem/ +DM-Upload-Allowed: yes + +Package: easychem +Architecture: any +Depends: ${shlibs:Depends} +Description: Draw high-quality molecules and 2D chemical formulas + EasyChem is a program that helps you creating high quality diagrams of + molecules and 2D chemical formulas that can be exported to PDF, PS, LaTeX + and fig. + . + EasyChem was originally developed to create diagrams for chemistry books and + is now frequently used for this purpose in commercial and non-commercial + chemistry-related books. --- easychem-0.6.orig/debian/compat +++ easychem-0.6/debian/compat @@ -0,0 +1 @@ +5 --- easychem-0.6.orig/debian/easychem.docs +++ easychem-0.6/debian/easychem.docs @@ -0,0 +1 @@ +TODO --- easychem-0.6.orig/debian/changelog +++ easychem-0.6/debian/changelog @@ -0,0 +1,148 @@ +easychem (0.6-6) unstable; urgency=low + + * debian/control (Build-Depends): Dropped toolchain to produce manual page + from DocBook XML source. + (Vcs-Svn): Fixed vcs-field-uses-not-recommended-uri-format. + (Standards-Version): Bumped to 3.8.3. + * debian/copyright: Fixed copyright-refers-to-versionless-license-file. + * debian/easychem.1: Rewritten. + * debian/easychem.1.xml: Dropped in favour of debian/easychem.1. + * debian/rules: Dropped obsolete manual page related targets. Clean-up. + * debian/README.source: Added to make lintian happy. + * debian/patches/92_fix_bug_536388_fix_export_eps.dpatch: Added with thanks + to Mickael Profeta. + - postscript/preamble.ps: Fix bond positioning (closes: #536388). + * debian/patches/00list: Adjusted. + + -- Daniel Leidert (dale) Sat, 29 Aug 2009 15:15:47 +0200 + +easychem (0.6-5) unstable; urgency=low + + * debian/compat: Raised level to 5. + * debian/control: Homepage and Vcs fields transition. Added + DM-Upload-Allowed for DM status. + (Maintainer): Set the debichem team as maintainer. + (Build-Depends): Raise debhelper version. + (Standards-Version): Update to 3.7.3 (no other changes). + * debian/easychem.1.xml: Minor typo fix. + * debian/easychem.1: Ditto (updated from XML). + * debian/easychem_icon.xpm: Renamed to debian/easychem.xpm (closes: + #466999). + * debian/easychem.install: Fixed icon name. + * debian/easychem.menu (icon): Ditto. + * debian/rules: Added some LDFLAGS magic to drop some useless dependencies. + * debian/patches/90_fix_makefiles.dpatch: Updated. + - Makefile.linux: Added LDFLAGS to link target. + + -- Daniel Leidert (dale) Fri, 22 Feb 2008 16:22:15 +0100 + +easychem (0.6-4) unstable; urgency=low + + [ Daniel Leidert ] + * debian/control: Added XS-Vcs-Browser and XS-Vcs-Svn fields. + (Build-Depends): Added docbook-xml to avoid warning. + * debian/easychem.1: Added, so it will not be recreated. + * debian/easychem.1.xml: Removed date tag. Adjusted copyright. + * debian/easychem.desktop: Removed Encoding key to comply to the latest + freedesktop.org Desktop Entry Specification 1.0. + * debian/easychem.menu: Fixed section to comply to the latest Debian Menu + System 1.4. + * debian/rules: Removed some useless comments and empty lines. + (build-stamp): Moved the manpage creation into an own target with a better + dependency chain. + * debian/patches/90_fix_makefiles.dpatch: Adjusted. + - Don't strip easychem binary by default, so giving the nostrip build + option will really lead to an unstripped binary (closes: #436782). + * debian/watch: Added. + + [ LI Daobing ] + * debian/rules: lintian doesn't like "-$(MAKE) clean", see bug#325372 + + -- Daniel Leidert (dale) Thu, 09 Aug 2007 14:05:26 +0200 + +easychem (0.6-3) unstable; urgency=medium + + * Set urgency to medium to fix the broken export feature. + * debian/patches/03_fix_bond_and_arrow_fixes.dpatch: Added. Thanks to + Guillaume Burel for the patch. + - bonds.c (add_bond): Set the ending head by default, when drawing an + arrow. + - dialogs.c (edit_bond): Swap the beginning/ending arrow heads, which now + fits, what the user sees. + * debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch: + Added (closes: #380210, Malone#71118). Thanks to Guillaume Burel for the + patch. + - bonds.c (save_list_bonds, load_list_bonds): Temporarily set LC_NUMERIC + to ``C" to fix a freeze when trying to run the export function. + - export.c (eps_write, fig_export): Ditto. + (fig_pstoedit_export): Bug-fix. + - detect.c (detect_gs, detect_pstoedit): Fix buggy detection routines. + - postscript/cm_common.ps: Backported from CVS. + - postscript/preamble.ps: Ditto. + - postscript/times.ps: Ditto. + * debian/patches/91_translation_updates_and_fixes.dpatch: Added. Thanks to + Guillaume Burel for the patch. + - dialogs.c: Many strings, that were not translatble, now are now (using + gettext()). Some improvements have been made too. + - easychem.c: Ditto. + - po/fr.po: Updates to French translation (thanks to Guillaume Burel). + - po/easychem.pot: Added (closes: Malone#55010). + * patches/00list: Adjusted. + + -- Daniel Leidert (dale) Tue, 14 Nov 2006 21:37:36 +0100 + +easychem (0.6-2) unstable; urgency=low + + * New maintainer. + * debian/control (Maintainer, Uploaders): Adjusted accordingly. I'm the new + maintainer. Added Michael Banck to Uploaders field. + (Build-Depends): Adjusted. + - Dropped useless build-dependencies (using the --novalid option for + xsltproc makes docbook-xml obsolete). + - Added dpatch and gettext. + * debian/control (Depends): Adjusted. + - Dropped useless variable. + * debian/control (Description): + - Fixed several typos (closes: #363365). Thanks to Simon Waters for the + report. + - Rearranged text a bit. + * debian/control (Standards-Version): Changed to latest 3.7.2. + * debian/docs: Renamed to easychem.docs. + * debian/easychem.docs: Added. See above. + * debian/easychem.desktop: Updated. + * debian/easychem.install: Added. + - Better install .desktop file and icons here, instead of using `install' + in debian/rules. + - Ditto for the binary and translations. + * debian/easychem.menu (section, command): Fixed. + (icon): Added. + * debian/easychem.1.xml: Updated for the latest docbook-xsl packages. + * debian/easychem.xpm: Removed. + * debian/easychem_icon.xpm: Added. + * debian/rules: Many cleanups. + (patch, patch-stamp, unpatch, unpatch-stamp): Changed to dpatch. + (build): Build the manpage here using the latest docbook-xsl. + * debian/patches/01_fix_bug_380210_fix_buffer_overflow.dpatch: Added. + - export.c (eps_write): Fixes a buffer overflow that may lead to a crash + when trying to export a formula to either eps or pdf format (closes: + #380210). Thanks to Fabian Greffrath for the report. + * debian/patches/02_fix_locale_initialization.dpatch: Added. + - easychem.c (main): Should fix the setlocale call. + * debian/patches/90_fix_makefiles_install_location.dpatch: Added. + - Makes debian/patches/01_install_rule.patch obsolet and fixes several + bugs and issues. One was, that DESTDIR must not be part of PREFIX. + * debian/patches/01_install_rule.patch: Removed. + + -- Daniel Leidert (dale) Fri, 22 Sep 2006 16:57:47 +0200 + +easychem (0.6-1) unstable; urgency=low + + * Packaged for Debian Unstable (Closes: #347849) + + -- Christopher Peterman (Chris) Sun, 15 Jan 2006 19:44:37 -0500 + +easychem (0.6-0ubuntu1) dapper; urgency=low + + * Initial release + + -- Christopher Peterman (Chris) Tues, 20 Dec 2005 16:57:16 -0500 --- easychem-0.6.orig/debian/easychem.manpages +++ easychem-0.6/debian/easychem.manpages @@ -0,0 +1 @@ +debian/easychem.1 --- easychem-0.6.orig/debian/rules +++ easychem-0.6/debian/rules @@ -0,0 +1,59 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +PACKAGE = easychem + +CFLAGS = -Wall -g +LDFLAGS = -Wl,-z,defs -Wl,--as-needed + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 + LDFLAGS += -Wl,-O1 +endif + +build: patch-stamp build-stamp +build-stamp: + dh_testdir + $(MAKE) -f Makefile.linux all CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + touch $@ + +clean: clean-first unpatch +clean-first: + dh_testdir + dh_testroot + $(MAKE) -f Makefile.linux clean + dh_clean build-stamp patch-stamp + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + +binary-indep: build install +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installmenu + dh_installman + dh_install + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- easychem-0.6.orig/debian/README.source +++ easychem-0.6/debian/README.source @@ -0,0 +1,7 @@ +easychem source for Debian +-------------------------- + +This package uses the `dpatch' patch management solution. See +/usr/share/doc/dpatch/README.source.gz. + + -- Daniel Leidert (dale) , Aug 2009 --- easychem-0.6.orig/debian/easychem.1 +++ easychem-0.6/debian/easychem.1 @@ -0,0 +1,36 @@ +.TH "EASYCHEM" "1" "2009/08/29" "easychem 0.6" "User commands" + +.SH "NAME" +easychem \- draw high-quality molecules and chemical 2D formulas + +.SH "SYNOPSIS" +.B easychem + +.SH "DESCRIPTION" +\fBeasychem\fR +is a program to help you to draw high\-quality molecules and chemical 2D +formulas, which you can then export to PDF, PS, LaTeX and fig\. + +.SH "OPTIONS" +.PP +The program does not have any command line options\. + +.SH "AUTHORS" +.TP +\fBChristopher Peterman\fR <\&petermcv@clarkson\.edu\&> +Wrote this man\-page for the Debian system\. +.TP +\fBDaniel Leidert\fR <\&daniel\.leidert@wgdd\.de\&> +Edited this man\-page for the Debian system\. + +.SH "COPYRIGHT" +Copyright \(co 2005 Christopher Peterman +.br +Copyright \(co 2006-2009 Daniel Leidert +.PP +Permission is granted to copy, distribute and/or modify this document under +the terms of the GNU General Public License, Version 2 or any later version +published by the Free Software Foundation\. +.PP +On Debian systems, the GNU General Public License is available as the file +\fI/usr/share/common\-licenses/GPL\fR\. --- easychem-0.6.orig/debian/easychem.menu +++ easychem-0.6/debian/easychem.menu @@ -0,0 +1,7 @@ +?package(easychem):\ + needs="x11" \ + section="Applications/Science/Chemistry" \ + title="EasyChem" \ + icon="/usr/share/pixmaps/easychem.xpm" \ + command="/usr/bin/easychem" + --- easychem-0.6.orig/debian/easychem.xpm +++ easychem-0.6/debian/easychem.xpm @@ -0,0 +1,118 @@ +/* XPM */ +static char *easychem[] = { +/* columns rows colors chars-per-pixel */ +"32 32 80 1", +" c #000600060006", +". c #021802180218", +"X c #031F031F031F", +"o c #050205020502", +"O c #070C070C070C", +"+ c #086208620862", +"@ c #0B790B790B79", +"# c #0C6A0C6A0C6A", +"$ c #0E8F0E8F0E8F", +"% c #13E513E513E5", +"& c #145714571457", +"* c #157B157B157B", +"= c #16AC16AC16AC", +"- c #17C817C817C8", +"; c #184718471847", +": c #19D519D519D5", +"> c #1D6E1D6E1D6E", +", c #1E951E951E95", +"< c #234F234F234F", +"1 c #362836283628", +"2 c #36DE36DE36DE", +"3 c #37A737A737A7", +"4 c #393339333933", +"5 c #3A063A063A06", +"6 c #469A469A469A", +"7 c #488B488B488B", +"8 c #498D498D498D", +"9 c #509150915091", +"0 c #550555055505", +"q c #57EE57EE57EE", +"w c #58EE58EE58EE", +"e c #59B659B659B6", +"r c #5AF25AF25AF2", +"t c #664A664A664A", +"y c #679067906790", +"u c #688868886888", +"i c #706670667066", +"p c #78B878B878B8", +"a c #7DBA7DBA7DBA", +"s c #824582458245", +"d c #82FB82FB82FB", +"f c #92E992E992E9", +"g c #950B950B950B", +"h c #977797779777", +"j c #9AEA9AEA9AEA", +"k c #A50DA50DA50D", +"l c #A649A649A649", +"z c #A706A706A706", +"x c #A7F1A7F1A7F1", +"c c gray67", +"v c #AF6EAF6EAF6E", +"b c #B4C8B4C8B4C8", +"n c #B5C6B5C6B5C6", +"m c #B727B727B727", +"M c #B892B892B892", +"N c #B920B920B920", +"B c #B9D1B9D1B9D1", +"V c #C4A6C4A6C4A6", +"C c #C5F9C5F9C5F9", +"Z c #C6CCC6CCC6CC", +"A c #D24FD24FD24F", +"S c #DAA1DAA1DAA1", +"D c #DC66DC66DC66", +"F c #E04FE04FE04F", +"G c #E122E122E122", +"H c #E293E293E293", +"J c #E7CFE7CFE7CF", +"K c #E807E807E807", +"L c #E97DE97DE97D", +"P c #EA46EA46EA46", +"I c #EB58EB58EB58", +"U c #F05AF05AF05A", +"Y c #F269F269F269", +"T c #F3AAF3AAF3AA", +"R c #F7ADF7ADF7AD", +"E c #F8BEF8BEF8BE", +"W c #FAFDFAFDFAFD", +"Q c #FC3CFC3CFC3C", +"! c #FDC1FDC1FDC1", +"~ c gray100", +/* pixels */ +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~Uuqqqqqq0f~~~~~~~~~~~~~~~~~", +"~~~~~K- q~~~~~~~~~~~~~~~~~", +"~~~~~K- =---=mKKKKmV~~~~~~~~~~", +"~~~~~K==K~~S=-N~~~~~~~~~~~~~~~~~", +"~~~~~K=-K~~t j~~~~~~~~~~~~~~~~~~", +"~~~~~K-o9qq> 1h~~~~~~~~~~~~~~~~~", +"~~~~~K= q~~~~~~~~~~~~~~~~~", +"~~~~~Wa=---+ >N~~~~~~~~~~~~~~~~~", +"~~~~~~RJKKKd uW~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~K=%S~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~U8 6H~~~~HF~~~~~~~~~~", +"~~~~~~~~~~~~H4 4qqqq1z~~~~~~~~~~", +"~~~~~~~~~~~~~h1 >C~~~~~~~~~~", +"~~~~~~~~~~~~~~FzzzzzC~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +}; --- easychem-0.6.orig/debian/easychem.install +++ easychem-0.6/debian/easychem.install @@ -0,0 +1,5 @@ +easychem usr/bin +po/fr/LC_MESSAGES/easychem.mo usr/share/locale/fr/LC_MESSAGES + +debian/easychem.desktop usr/share/applications +debian/easychem.xpm usr/share/pixmaps --- easychem-0.6.orig/debian/easychem.desktop +++ easychem-0.6/debian/easychem.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=EasyChem Chemical Structures Editor +Comment=Create high-quality chemical formulas +Name[de]=EasyChem Strukturformeleditor +Comment[de]=Strukturformeln mit hoher Qualtät erstellen +Exec=easychem +Icon=easychem +Terminal=false +Type=Application +Categories=GTK;Education;Science;Chemistry; --- easychem-0.6.orig/debian/watch +++ easychem-0.6/debian/watch @@ -0,0 +1,4 @@ +# See uscan(1) for format + +version=3 +http://sf.net/easychem/easychem-([\d\.]+)\.tar\.gz --- easychem-0.6.orig/debian/copyright +++ easychem-0.6/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Christopher Peterman (Chris) on +Sat, 12 Nov 2005 16:04:32 -0500. + +It was downloaded from: + + http://easychem.sourceforge.net + +Upstream Author: + + Francois-Xavier Coudert + +Copyright: + + Copyright (C) 2003, 2004, 2005 Francois-Xavier Coudert + + +License: GNU General Public License version 2 + + This package 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; version 2 of the License. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the GNU General Public License version 2 is available as +the file `/usr/share/common-licenses/GPL-2'. --- easychem-0.6.orig/debian/patches/02_fix_locale_initialization.dpatch +++ easychem-0.6/debian/patches/02_fix_locale_initialization.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_fix_setlocale_call.dpatch by Daniel Leidert (dale) +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: * easychem.c (main): Fix setlocale call. Fix `Gtk-WARNING **: Invalid +## DP: input string' and `Pango-WARNING **: Invalid UTF-8 string passed to +## DP: pango_layout_set_text()'. + +@DPATCH@ +diff -urNad easychem-0.6~/easychem.c easychem-0.6/easychem.c +--- easychem-0.6~/easychem.c 2006-11-15 00:39:57.000000000 +0100 ++++ easychem-0.6/easychem.c 2006-11-15 00:47:36.000000000 +0100 +@@ -2963,10 +2963,11 @@ + #ifdef I18N + setlocale (LC_ALL, ""); + bindtextdomain("easychem", PREFIX "/share/locale"); ++ bind_textdomain_codeset("easychem", "UTF-8"); + textdomain ("easychem"); + #endif +- setlocale (LC_NUMERIC, "C"); + gtk_init (&argc, &argv); ++ + signal (SIGINT, handle_signal); + signal (SIGTERM, handle_signal); + signal (SIGSEGV, handle_signal); --- easychem-0.6.orig/debian/patches/90_fix_makefiles.dpatch +++ easychem-0.6/debian/patches/90_fix_makefiles.dpatch @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 90_fix_makefiles_install_location.dpatch by Daniel Leidert (dale) +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This patch simply fixes some directory values and allows a correct +## DP: installation of the binary and the translations (all done later using +## DP: dh_install). Also respect the CFLAGS set in debian/rules. +## DP: +## DP: Also fix #436782 and respect/handle nostrip build option (policy 10.1). +## DP: See . + +@DPATCH@ +diff -urNad easychem~/Makefile.linux easychem/Makefile.linux +--- easychem~/Makefile.linux 2005-05-04 10:10:07.000000000 +0200 ++++ easychem/Makefile.linux 2007-12-18 01:43:14.000000000 +0100 +@@ -1,17 +1,18 @@ + # The C compiler + CC=gcc ++C_FLAGS= + + # The following line must be uncommented if you want to specify a place + # where the 'gs' (or 'pstoedit') program is. + +-#C_FLAGS="$(C_FLAGS) -DGS_PATH=/opt/bin" +-#C_FLAGS="$(C_FLAGS) -DPSTOEDIT_PATH=/opt/bin" ++#C_FLAGS += -DGS_PATH=\"/usr/bin\" # don't enable this! ++#C_FLAGS += -DPSTOEDIT_PATH=\"/usr/bin\" # don't enable this! + + # Here we define the prefix where EasyChem will be installed +-PREFIX=/usr/local ++PREFIX=/usr + + # Optimisation and warning flags +-C_FLAGS=-Wall -W -Wpointer-arith -O2 -pedantic -std=c99 -DUNIX -DI18N -DPREFIX=\"$(PREFIX)\" ++C_FLAGS += -W -Wpointer-arith -pedantic -std=c99 -DUNIX -DI18N -DPREFIX=\"$(PREFIX)\" + + # GTK flags and librairies + GTK_FLAGS=`pkg-config --cflags gtk+-2.0` +@@ -28,8 +29,8 @@ + all: easychem po/ + + easychem: postscript/ graph/ $(OBJECTS) +- $(CC) -o easychem $(OBJECTS) $(GTK_LIBS) $(C_FLAGS) +- strip easychem ++ $(CC) $(LDFLAGS) -o easychem $(OBJECTS) $(GTK_LIBS) $(C_FLAGS) $(CFLAGS) ++ # strip easychem # don't strip, see bug #436782 + + clean: FORCE + -cd graph; make clean +@@ -38,21 +39,21 @@ + -rm $(OBJECTS) easychem + + export.o: export.c common.h bonds.h postscript/ +- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c export.c ++ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c export.c + bonds.o: bonds.c common.h bonds.h +- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c bonds.c ++ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c bonds.c + easychem.o: easychem.c common.h bonds.h export.h library.h drawing.h +- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c easychem.c ++ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c easychem.c + auxi.o: auxi.c common.h auxi.h +- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c auxi.c ++ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c auxi.c + library.o: library.c common.h library.h +- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c library.c ++ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c library.c + drawing.o: drawing.c common.h drawing.h +- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c drawing.c ++ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c drawing.c + dialogs.o: dialogs.c common.h dialogs.h graph/ +- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c dialogs.c ++ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c dialogs.c + detect.o: detect.c common.h detect.h +- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c detect.c ++ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c detect.c + + # The rules for subdirectories + graph/: FORCE +diff -urNad easychem~/po/Makefile easychem/po/Makefile +--- easychem~/po/Makefile 2005-05-04 10:10:07.000000000 +0200 ++++ easychem/po/Makefile 2007-12-18 01:41:57.000000000 +0100 +@@ -1,7 +1,8 @@ +-all: fr.mo ++all: fr/LC_MESSAGES/easychem.mo + +-%.mo: %.po +- msgfmt -o $*.mo $*.po ++%/LC_MESSAGES/easychem.mo: %.po ++ mkdir -p $*/LC_MESSAGES ++ msgfmt -o $*/LC_MESSAGES/easychem.mo $*.po + + clean: +- -rm *.mo ++ -rm -rf fr --- easychem-0.6.orig/debian/patches/01_fix_bug_380210_fix_buffer_overflow.dpatch +++ easychem-0.6/debian/patches/01_fix_bug_380210_fix_buffer_overflow.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_fix_bug_380210_fix_buffer_overflow.dpatch by Francois-Xavier Coudert. +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: * export.c (eps_write): Fixes a buffer overflow (crashes +## DP: easychem) when trying to export a formula to either eps or pdf +## DP: format. This bug was found by Fabian Greffrath. + +@DPATCH@ +diff -urNad easychem-0.6~/export.c easychem-0.6/export.c +--- easychem-0.6~/export.c 2006-11-14 22:31:38.000000000 +0100 ++++ easychem-0.6/export.c 2006-11-14 23:12:47.000000000 +0100 +@@ -984,7 +984,7 @@ + eps_write (struct Bond *list, FILE * file, const int heading, + const int bbox_atend) + { +-#define SIZE 40 ++#define SIZE 200 + struct Bond *group1, *group2, *current; + gchar *str, *str2, buff[SIZE], *left, *right; + time_t t; +@@ -1003,7 +1003,8 @@ + fprintf (file, "%%%%For: %s", str); + + #ifdef UNIX +- gethostname (buff, SIZE); ++ gethostname (buff, SIZE - 1); ++ buff[SIZE-1] = 0; + fprintf (file, "@%s", buff); + #endif + --- easychem-0.6.orig/debian/patches/03_fix_bond_and_arrow_fixes.dpatch +++ easychem-0.6/debian/patches/03_fix_bond_and_arrow_fixes.dpatch @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix_bond_and_arrow_fixes.dpatch by Guillaume Burel. +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: * bonds.c (add_bond): Set the ending head by default, when drawing an +## DP: arrow. +## DP: * dialogs.c (edit_bond): Swap the beginning/ending arrow heads, which +## DP: now fit, what the user sees. + +@DPATCH@ +diff -urNad easychem-0.6~/bonds.c easychem-0.6/bonds.c +--- easychem-0.6~/bonds.c 2005-05-04 10:10:07.000000000 +0200 ++++ easychem-0.6/bonds.c 2006-11-14 22:18:34.000000000 +0100 +@@ -676,7 +676,12 @@ + new->y2 = y2; + new->x3 = 0; + new->y3 = 0; +- new->x4 = 0; ++ switch (type) ++ { ++ case BOND_ARROW: new->x4 = 1; break; ++ ++ default: new->x4 = 0; ++ }; + new->y4 = 0; + new->width = 1.0; + new->color = black; +diff -urNad easychem-0.6~/dialogs.c easychem-0.6/dialogs.c +--- easychem-0.6~/dialogs.c 2006-11-14 22:18:00.000000000 +0100 ++++ easychem-0.6/dialogs.c 2006-11-14 22:20:29.000000000 +0100 +@@ -528,8 +528,8 @@ + + #undef ADD_MENU_ITEM + +- ADD_ROW (_("Beginning arrowhead:"), p.head1_l, p.head1); +- ADD_ROW (_("Ending arrowhead:"), p.head2_l, p.head2); ++ ADD_ROW (_("Beginning arrowhead:"), p.head2_l, p.head2); ++ ADD_ROW (_("Ending arrowhead:"), p.head1_l, p.head1); + + if (bond->type == BOND_ARROW || bond->type == BOND_ARC) + gtk_option_menu_set_history (GTK_OPTION_MENU (p.head1), bond->x4); --- easychem-0.6.orig/debian/patches/00list +++ easychem-0.6/debian/patches/00list @@ -0,0 +1,7 @@ +01_fix_bug_380210_fix_buffer_overflow +02_fix_locale_initialization +03_fix_bond_and_arrow_fixes +04_fix_bug_380210_fix_export_and_export_utils_detection +90_fix_makefiles +91_translation_updates_and_fixes +92_fix_bug_536388_fix_export_eps --- easychem-0.6.orig/debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch +++ easychem-0.6/debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch @@ -0,0 +1,313 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch by +## Guillaume Burel. +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: * bonds.c (save_list_bonds, load_list_bonds): Temporarily set LC_NUMERIC +## DP: to ``C" to fix a freeze when trying to run the export function +## DP: (closes: #380210, Malone #71118). +## DP: * export.c (eps_write, fig_export): Ditto. +## DP: (fig_pstoedit_export): Bug-fix. +## DP: * detect.c (detect_gs, detect_pstoedit): Fix buggy detection routines. +## DP: * postscript/cm_common.ps: Backported from CVS. +## DP: * postscript/preamble.ps: Ditto. +## DP: * postscript/times.ps: Ditto. + +@DPATCH@ +diff -urNad easychem-0.6~/bonds.c easychem-0.6/bonds.c +--- easychem-0.6~/bonds.c 2006-11-14 22:49:00.000000000 +0100 ++++ easychem-0.6/bonds.c 2006-11-14 22:49:00.000000000 +0100 +@@ -1513,7 +1513,11 @@ + struct Ornament *orn; + + if (!no_title) ++ { + fprintf (file, "# Save file for EasyChem (version " VERSION ")\n\n"); ++ setlocale(LC_NUMERIC, "C"); ++ gettext(""); /* to initialize */ ++ } + if (list == NULL) + return; + current = list; +@@ -1567,6 +1571,11 @@ + + } + while ((current = current->next) != NULL); ++ if (!no_title) ++ { ++ setlocale(LC_NUMERIC, ""); ++ gettext(""); /* to initialize */ ++ }; + } + + +@@ -1588,6 +1597,8 @@ + + if (!recursive) + { ++ setlocale(LC_NUMERIC, "C"); ++ gettext(""); /* to initialize */ + fgets (buf, LONG, file); + fgets (buf, LONG, file); + } +@@ -1702,6 +1713,12 @@ + } + } + ++ if (!recursive) ++ { ++ setlocale(LC_NUMERIC, ""); ++ gettext(""); /* to initialize */ ++ }; ++ + return list; + #undef LONG + #undef SHIFT +diff -urNad easychem-0.6~/detect.c easychem-0.6/detect.c +--- easychem-0.6~/detect.c 2005-05-04 10:10:07.000000000 +0200 ++++ easychem-0.6/detect.c 2006-11-14 22:49:00.000000000 +0100 +@@ -53,7 +53,7 @@ + if (pid == 0) + { + close (f[0]); +- dup2 (f[1], 1); ++ dup2 (f[1], STDOUT_FILENO); + close (f[1]); + argv[3] = temp; + if (prop.path_gs != NULL) +@@ -130,32 +130,26 @@ + if (pid == 0) + { + close (f[0]); +- dup2 (f[1], 1); ++ + fd = open ("/dev/null", O_APPEND); +- dup2 (fd, 2); +- close (fd); +- close (f[1]); +- if (prop.path_gs != NULL) ++ dup2 (fd, STDOUT_FILENO); ++ dup2 (fd, STDERR_FILENO); ++ ++ if (prop.path_pstoedit != NULL) + execv(prop.path_pstoedit, argv); +- puts ("42"); +- fflush (stdout); ++ write (f[1],"42 ",3); + #ifdef PSTOEDIT_PATH +- execv (PSTOEDIT_PATH "/pstoedit", argv); ++ execv (PSTOEDIT_PATH "/gs", argv); + #endif +- puts ("42"); +- fflush (stdout); ++ write (f[1],"42 ",3); + execvp ("pstoedit", argv); +- puts ("42"); +- fflush (stdout); ++ write (f[1],"42 ",3); + execv ("/usr/bin/pstoedit", argv); +- puts ("42"); +- fflush (stdout); ++ write (f[1],"42 ",3); + execv ("/usr/local/bin/pstoedit", argv); +- puts ("42"); +- fflush (stdout); ++ write (f[1],"42 ",3); + execv ("/sw/bin/pstoedit", argv); +- puts ("42"); +- fflush (stdout); ++ write (f[1],"42 ",3); + _exit (0); + } + close (f[1]); +@@ -164,10 +158,12 @@ + file = fdopen (f[0], "r"); + while (!feof (file)) + { +- dum = 0; + fscanf (file, "%d", &dum); + if (dum == 42) ++ { ++ dum = 0; + count++; ++ } + } + fclose (file); + if (count == 0) +diff -urNad easychem-0.6~/easychem.c easychem-0.6/easychem.c +--- easychem-0.6~/easychem.c 2006-11-14 22:49:00.000000000 +0100 ++++ easychem-0.6/easychem.c 2006-11-14 22:49:00.000000000 +0100 +@@ -390,8 +390,7 @@ + } + + +-static void +-init_everything (void) ++static void init_everything (void) + { + int i; + +@@ -672,8 +671,8 @@ + dialog = gtk_dialog_new_with_buttons (_("Choice for exporting format"), + GTK_WINDOW (window), + GTK_DIALOG_MODAL | +- GTK_DIALOG_NO_SEPARATOR, _("OK"), 1, +- _("Cancel"), 0, NULL); ++ GTK_DIALOG_NO_SEPARATOR, _("Cancel"), 0, ++ _("OK"), 1, NULL); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 20); + label = gtk_label_new (_("What kind of file do you want to produce?")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), +@@ -2966,6 +2965,10 @@ + bind_textdomain_codeset("easychem", "UTF-8"); + textdomain ("easychem"); + #endif ++ /* Seems to have no effect, probably reinitialised by gtk_init ++ * setlocale (LC_NUMERIC, "C"); ++ * Temporaly set during exportation instead (see export.c) ++ */ + gtk_init (&argc, &argv); + + signal (SIGINT, handle_signal); +diff -urNad easychem-0.6~/export.c easychem-0.6/export.c +--- easychem-0.6~/export.c 2006-11-14 22:49:00.000000000 +0100 ++++ easychem-0.6/export.c 2006-11-14 22:49:00.000000000 +0100 +@@ -994,13 +994,17 @@ + if (heading > 1) + fprintf (file, "%%!PS-Adobe-2.0 EPSF-2.0\n"); + if (heading != 0) +- { +- fprintf (file, "%%%%Title: \n"); +- fprintf (file, "%%%%Creator: EasyChem " VERSION "\n"); +- t = time (NULL); +- fprintf (file, "%%%%CreationDate: %s", ctime (&t)); +- str = (gchar *) g_get_user_name (); +- fprintf (file, "%%%%For: %s", str); ++ { ++ /* Using locales may write the float with commas, so we revert to "C" */ ++ setlocale(LC_NUMERIC, "C"); ++ gettext(""); /* to initialize */ ++ ++ fprintf (file, "%%%%Title: \n"); ++ fprintf (file, "%%%%Creator: EasyChem " VERSION "\n"); ++ t = time (NULL); ++ fprintf (file, "%%%%CreationDate: %s", ctime (&t)); ++ str = (gchar *) g_get_user_name (); ++ fprintf (file, "%%%%For: %s", str); + + #ifdef UNIX + gethostname (buff, SIZE - 1); +@@ -1282,7 +1286,11 @@ + while ((current = current->next) != NULL); + + if (heading != 0) +- fprintf (file, "\n\nshowpage\n"); ++ {fprintf (file, "\n\nshowpage\n"); ++ /* Back to user's locale. */ ++ setlocale(LC_NUMERIC, ""); ++ gettext(""); /* to initialize */ ++ } + fflush (file); + + } +@@ -1991,8 +1999,17 @@ + + fprintf (file, + "#FIG 3.2\nLandscape\nCenter\nMetric\nLetter\n100.00\nSingle\n-2\n1200 2\n"); +- ++ ++ /* Using locales may write the float with commas, so we revert to "C" */ ++ setlocale(LC_NUMERIC, "C"); ++ gettext(""); /* to initialize */ ++ + fig_write (list, file); ++ ++ /* and back */ ++ setlocale(LC_NUMERIC, ""); ++ gettext(""); /* to initialize */ ++ + fclose (file); + + } +@@ -2143,8 +2160,7 @@ + fd = mkstemp (epsfile); + file = fdopen (fd, "w"); + eps_write (list, file, 2, 1); +- fclose (file); +- eps_bbox (list, filename, parent, &i, &j, &k, &l); ++ eps_bbox (list, epsfile, parent, &i, &j, &k, &l); + + /* Now we modify the file to add the bounding box. */ + fputs ("%%Trailer\n", file); +diff -urNad easychem-0.6~/postscript/cm_common.ps easychem-0.6/postscript/cm_common.ps +--- easychem-0.6~/postscript/cm_common.ps 2005-05-04 10:10:07.000000000 +0200 ++++ easychem-0.6/postscript/cm_common.ps 2006-11-14 22:49:00.000000000 +0100 +@@ -1,6 +1,7 @@ + % This is used to set the font to the current fs/ft values + /sf{ft 0 eq{/CMFX findfont}{ft 1 eq{/CMFXi findfont}{ft 2 eq{/CMFXb +- findfont}{/CMFXbi findfont}ifelse}ifelse}ifelse fs scalefont setfont}bd ++ findfont}{/CMFXbi findfont}ifelse}ifelse}ifelse ++ fs relfs mul scalefont setfont}bd + + % We set the font + sf +diff -urNad easychem-0.6~/postscript/preamble.ps easychem-0.6/postscript/preamble.ps +--- easychem-0.6~/postscript/preamble.ps 2005-05-04 10:10:07.000000000 +0200 ++++ easychem-0.6/postscript/preamble.ps 2006-11-14 22:49:00.000000000 +0100 +@@ -179,12 +179,19 @@ + /b-down{ + /sh ste-sh 3 -1 r m def + /y2 ed /x2 ed /y1 ed /x1 ed /px x2 x1 s def /py y2 y1 s def +- px px m py py m a sqrt dup px e d /px ed py e d /py ed +- 0 1 8{/j ed /cx 2 j m 1 a x2 x1 s m 18 d x1 a def +- /cy 2 j m 1 a y2 y1 s m 18 d y1 a def +- cx sh py m j 1 a m 9 d s cy sh px m j 1 a m 9 d a +- cx sh py m j 1 a m 9 d a cy sh px m j 1 a m 9 d s +- np mv l stroke}for ++ /len px px m py py m a sqrt def /rpx px len d def /rpy py len d def ++ /n len 5 d cvi 2 m 1 a def ++ 3 n gt{/n 3 def}if ++ 0 1 n 1 s{/j ed ++ /cx1 2 j m .7 a px m 2 n m d x1 a def ++ /cy1 2 j m .7 a py m 2 n m d y1 a def ++ /cx2 2 j m 1.3 a px m 2 n m d x1 a def ++ /cy2 2 j m 1.3 a py m 2 n m d y1 a def ++ cx1 sh rpy m j .35 a m n d s cy1 sh rpx m j .35 a m n d a ++ cx1 sh rpy m j .35 a m n d a cy1 sh rpx m j .35 a m n d s ++ cx2 sh rpy m j .65 a m n d a cy2 sh rpx m j .65 a m n d s ++ cx2 sh rpy m j .65 a m n d s cy2 sh rpx m j .65 a m n d a ++ np mv l l l fill}for + }bd + + % Expects 'type width x y px py' +@@ -243,8 +250,10 @@ + 1 setlinejoin + 0.6 setlinewidth + 1 setlinecap +-% Current size of the font ++% Current size of the font (10 for normal, 7 for sub- or superscript) + /fs{10}bd ++% User relative font-size ++/relfs{1.0}bd + % Current type of the font (0: regular, 1: italic, 2: bold) + /ft{0}bd + +diff -urNad easychem-0.6~/postscript/times.ps easychem-0.6/postscript/times.ps +--- easychem-0.6~/postscript/times.ps 2005-05-04 10:10:07.000000000 +0200 ++++ easychem-0.6/postscript/times.ps 2006-11-14 22:49:00.000000000 +0100 +@@ -39,11 +39,11 @@ + /TRb/Times-Bold latin1 + /TRbi/Times-BoldItalic latin1 + +-% This is used to set the font to the current fs/ft values ++% This is used to set the font to the current fs/relfs/ft values + /sf{ft 0 eq{/TR findfont}{ft 1 eq{/TRi findfont}{ft 2 eq{/TRb findfont}{/TRbi +- findfont}ifelse}ifelse}ifelse fs scalefont setfont}bd +-% This is used to set the font to Symbol, ignoring ft and using fs +-/g{/Symbol findfont fs scalefont setfont}bd ++ findfont}ifelse}ifelse}ifelse fs relfs mul scalefont setfont}bd ++% This is used to set the font to Symbol, ignoring ft and using relfs/fs ++/g{/Symbol findfont fs relfs mul scalefont setfont}bd + + % We set the font + sf --- easychem-0.6.orig/debian/patches/92_fix_bug_536388_fix_export_eps.dpatch +++ easychem-0.6/debian/patches/92_fix_bug_536388_fix_export_eps.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 92_fix_bug_536388_fix_export_eps.dpatch by Mickael Profeta +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: when exporting to eps the position and size of some bonds +## DP: where wrongly calculated due to a swap in argument. +## DP: +## DP: + +@DPATCH@ +diff -urNad easychem-0.6~/postscript/preamble.ps easychem-0.6/postscript/preamble.ps +--- easychem-0.6~/postscript/preamble.ps 2005-05-04 10:10:07.000000000 +0200 ++++ easychem-0.6/postscript/preamble.ps 2009-07-09 17:13:05.000000000 +0200 +@@ -90,7 +90,7 @@ + % (text2) centered on (x2,y2). Returns the X1, Y1, X2 and Y2 coordinates + % of the ends of the bond. + % Returns 'X1 Y1 X2 Y2' +-/b12{6 1 r b1 5 4 r b2}bd ++/b12{e 6 1 r b1 5 4 r b2}bd + + % Expects 'x1 y1 x2 y2' + % Draws a spl bond --- easychem-0.6.orig/debian/patches/91_translation_updates_and_fixes.dpatch +++ easychem-0.6/debian/patches/91_translation_updates_and_fixes.dpatch @@ -0,0 +1,2183 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 91_translation_updates_and_fixes.dpatch by Guillaume Burel. +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: * dialogs.c, easychem.c: Many strings, that were not translatble, now +## DP: are now (using gettext()). Some improvements have been made too. +## DP: * po/fr.po: Updates to French translation (thanks to Guillaume Burel). +## DP: * po/easychem.pot: Added (closes: Malone #55010). + +@DPATCH@ +diff -urNad easychem-0.6~/dialogs.c easychem-0.6/dialogs.c +--- easychem-0.6~/dialogs.c 2006-11-15 04:48:55.000000000 +0100 ++++ easychem-0.6/dialogs.c 2006-11-15 04:48:56.000000000 +0100 +@@ -155,7 +155,7 @@ + gtk_text_buffer_insert_with_tags_by_name (txt, &iter, "2", -1, + "subscript", NULL); + gtk_text_buffer_insert (txt, &iter, "H", -1); +- gtk_text_buffer_insert (txt, &iter, _("(subscript).\n"), -1); ++ gtk_text_buffer_insert (txt, &iter, _(" (subscript).\n"), -1); + gtk_text_buffer_insert_with_tags_by_name (txt, &iter, "H_{text}", -1, + "tt", NULL); + gtk_text_buffer_insert (txt, &iter, _(" produces "), -1); +@@ -179,12 +179,14 @@ + gtk_text_buffer_insert (txt, &iter, _(" (superscript).\n\n\n"), -1); + gtk_text_buffer_insert_with_tags_by_name (txt, &iter, "\\alpha", -1, + "tt", NULL); +- gtk_text_buffer_insert (txt, &iter, +-_(" produces α (greek letter) and the same is true for all greek letters. "), -1); ++ gtk_text_buffer_insert (txt, &iter, _(" produces "), -1); ++ gtk_text_buffer_insert (txt, &iter,"α", -1); ++ gtk_text_buffer_insert (txt, &iter, _(" (greek letter) and the same is true for all greek letters. "), -1); + gtk_text_buffer_insert_with_tags_by_name (txt, &iter, "\\Omega", -1, + "tt", NULL); +- gtk_text_buffer_insert (txt, &iter, +-_(" produces Ω (capital greek letter)."), -1); ++ gtk_text_buffer_insert (txt, &iter, _(" produces "),-1); ++ gtk_text_buffer_insert (txt, &iter,"Ω",-1); ++ gtk_text_buffer_insert (txt, &iter,_(" (capital greek letter)."), -1); + /* End of the help message */ + + gtk_text_buffer_get_iter_at_offset (txt, &iter, 0); +@@ -227,7 +229,7 @@ + + /* Size controller */ + hbox = gtk_hbox_new (FALSE, 0); +- label = gtk_label_new ("Relative size:"); ++ label = gtk_label_new (_("Relative size:")); + SPIN_BUTTON_WITH_DEFAULT (size_spin, 0.1, 5.0, 0.05, *size, 2); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), size_spin, TRUE, TRUE, 0); +@@ -928,12 +930,12 @@ + entry_gs = gtk_entry_new (); + if (prop.path_gs != NULL) + gtk_entry_set_text (GTK_ENTRY (entry_gs), prop.path_gs); +- ADD_ROW ("Path to gs:", entry_gs); ++ ADD_ROW (_("Path to gs:"), entry_gs); + + entry_pstoedit = gtk_entry_new (); + if (prop.path_pstoedit != NULL) + gtk_entry_set_text (GTK_ENTRY (entry_pstoedit), prop.path_pstoedit); +- ADD_ROW ("Path to pstoedit:", entry_pstoedit); ++ ADD_ROW (_("Path to pstoedit:"), entry_pstoedit); + + adjust = gtk_adjustment_new (prop.global_width / UNITS_CM, 10000 / UNITS_CM, + 1000000 / UNITS_CM, 10000 / UNITS_CM, +@@ -942,7 +944,7 @@ + gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_width), + GTK_UPDATE_IF_VALID); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_width), TRUE); +- ADD_ROW ("Width of the drawing:", spin_width); ++ ADD_ROW (_("Width of the drawing:"), spin_width); + + adjust = gtk_adjustment_new (prop.global_height / UNITS_CM, 50000 / UNITS_CM, + 1000000 / UNITS_CM, 50000 / UNITS_CM, +@@ -951,7 +953,7 @@ + gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_height), + GTK_UPDATE_IF_VALID); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_height), TRUE); +- ADD_ROW ("Height of the drawing:", spin_height); ++ ADD_ROW (_("Height of the drawing:"), spin_height); + + #undef ADD_ROW + +diff -urNad easychem-0.6~/easychem.c easychem-0.6/easychem.c +--- easychem-0.6~/easychem.c 2006-11-15 04:48:55.000000000 +0100 ++++ easychem-0.6/easychem.c 2006-11-15 04:48:56.000000000 +0100 +@@ -283,23 +283,23 @@ + label = gtk_bin_get_child (GTK_BIN (menu_undo_widget)); + if (pos_undo >= NUM_UNDO - 1) + { +- gtk_label_set_text_with_mnemonic (GTK_LABEL (label), "_Undo"); ++ gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Undo")); + gtk_widget_set_sensitive (menu_undo_widget, FALSE); + } + else + { + if (undo_list[pos_undo + 1] == NULL) + { +- gtk_label_set_text_with_mnemonic (GTK_LABEL (label), "_Undo"); ++ gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Undo")); + gtk_widget_set_sensitive (menu_undo_widget, FALSE); + } + else + { + if (undo_list_txt[pos_undo] != NULL) + gtk_label_set_text_with_mnemonic (GTK_LABEL (label), +- g_strconcat ("_Undo ", undo_list_txt[pos_undo], NULL)); ++ g_strconcat (_("_Undo"), " ", undo_list_txt[pos_undo], NULL)); + else +- gtk_label_set_text_with_mnemonic (GTK_LABEL (label), "_Undo"); ++ gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Undo")); + gtk_widget_set_sensitive (menu_undo_widget, TRUE); + } + } +@@ -307,7 +307,7 @@ + label = gtk_bin_get_child (GTK_BIN (menu_redo_widget)); + if (pos_undo == 0) + { +- gtk_label_set_text_with_mnemonic (GTK_LABEL (label), "_Redo"); ++ gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Redo")); + gtk_widget_set_sensitive (menu_redo_widget, FALSE); + } + else +@@ -317,9 +317,9 @@ + + if (undo_list_txt[pos_undo - 1] != NULL) + gtk_label_set_text_with_mnemonic (GTK_LABEL (label), +- g_strconcat ("_Redo ", undo_list_txt[pos_undo - 1], NULL)); ++ g_strconcat (_("_Redo"), " ", undo_list_txt[pos_undo - 1], NULL)); + else +- gtk_label_set_text_with_mnemonic (GTK_LABEL (label), "_Redo"); ++ gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Redo")); + + gtk_widget_set_sensitive (menu_redo_widget, TRUE); + } +@@ -752,7 +752,7 @@ + if (old_bonds != NULL) + free_bond_list (old_bonds); + old_bonds = NULL; +- advance_undo ("grouping"); ++ advance_undo (_("grouping")); + return; + } + +@@ -769,7 +769,7 @@ + if (old_bonds != NULL) + free_bond_list (old_bonds); + old_bonds = NULL; +- advance_undo ("ungrouping"); ++ advance_undo (_("ungrouping")); + return; + } + +@@ -860,7 +860,7 @@ + return; + + align_selection (bonds, horizontal, vertical); +- advance_undo ("aligning"); ++ advance_undo (_("aligning")); + REDRAW; + } + +@@ -1346,7 +1346,7 @@ + old_bonds = NULL; + L_MSG (""); + is_drawing = DRAW_NO; +- advance_undo ("drawing arc"); ++ advance_undo (_("drawing arc")); + REDRAW; + return TRUE; + } +@@ -1402,7 +1402,7 @@ + free_bond_list (old_bonds); + old_bonds = NULL; + adjust_atom (new_bond, drawing_area, mode, zoom); +- advance_undo ("adding text"); ++ advance_undo (_("adding text")); + } + + is_drawing = DRAW_NO; +@@ -1470,7 +1470,7 @@ + delete_bond (&bonds, new, &num_sel); + L_MSG (_("You used the right button to delete an object.")); + } +- advance_undo ("delete"); ++ advance_undo (_("delete")); + REDRAW; + } + break; +@@ -1525,7 +1525,7 @@ + adjust_atom (new, drawing_area, mode, zoom); + } + +- advance_undo ("editing"); ++ advance_undo (_("editing")); + REDRAW; + } + +@@ -1773,7 +1773,7 @@ + { + new = add_bond (x_begin, y_begin, x, y, type, &bonds, 1); + if (is_drawing == DRAW_NORMAL) +- advance_undo ("drawing"); ++ advance_undo (_("drawing")); + } + if (new != NULL) + { +@@ -1824,7 +1824,7 @@ + y_old = y; + } + remove_duplicate_in_list (&bonds, &num_sel); +- advance_undo ("drawing ring"); ++ advance_undo (_("drawing ring")); + break; + + case DRAW_SEL: +@@ -1853,7 +1853,7 @@ + num_points = 0; + } + remove_duplicate_in_list (&bonds, &num_sel); +- advance_undo (is_drawing == DRAW_COPY ? "copy" : "move"); ++ advance_undo (is_drawing == DRAW_COPY ? _("copy") : _("move")); + break; + + case DRAW_ROTATE: +@@ -1863,7 +1863,7 @@ + old_bonds = NULL; + } + remove_duplicate_in_list (&bonds, &num_sel); +- advance_undo ("rotation"); ++ advance_undo (_("rotation")); + break; + } + +@@ -1931,7 +1931,7 @@ + if (old_bonds != NULL) + free_bond_list (old_bonds); + old_bonds = NULL; +- advance_undo ("delete"); ++ advance_undo (_("delete")); + REDRAW; + } + break; +@@ -2400,7 +2400,7 @@ + { + menu_copy (); + menu_del (); +- advance_undo ("cutting"); ++ advance_undo (_("cutting")); + } + + +@@ -2425,7 +2425,7 @@ + concat_bond_lists (bonds, copy_buffer, &num_sel); + + copy_buffer = tmp; +- advance_undo ("paste"); ++ advance_undo (_("paste")); + REDRAW; + } + +@@ -2464,7 +2464,7 @@ + } + while ((current = current->next) != NULL); + +- advance_undo ("horizontal flip"); ++ advance_undo (_("horizontal flip")); + REDRAW; + } + +@@ -2502,7 +2502,7 @@ + } + while ((current = current->next) != NULL); + +- advance_undo ("vertical flip"); ++ advance_undo (_("vertical flip")); + REDRAW; + } + +@@ -2546,7 +2546,7 @@ + } + while ((current = current->next) != NULL); + +- advance_undo ("inversion"); ++ advance_undo (_("inversion")); + REDRAW; + } + +@@ -2613,7 +2613,7 @@ + mode = MODE_ADJUST; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_adjust), TRUE); + gtk_object_destroy (GTK_OBJECT (filew)); +- advance_undo ("merge file"); ++ advance_undo (_("merge file")); + REDRAW; + } + +@@ -2689,7 +2689,7 @@ + + gtk_widget_destroy (dialog); + +- advance_undo ("rotation"); ++ advance_undo (_("rotation")); + REDRAW; + } + +@@ -2699,7 +2699,7 @@ + { + remove_duplicate_in_list (&bonds, &num_sel); + remove_empty_groups (&bonds, &num_sel); +- advance_undo ("clean-up"); ++ advance_undo (_("clean-up")); + REDRAW; + } + +@@ -3185,9 +3185,10 @@ + } + + menu_undo_widget = gtk_item_factory_get_widget (item_factory, +- _("/Edit/Undo")); ++ "/Edit/Undo"); + menu_redo_widget = gtk_item_factory_get_widget (item_factory, +- _("/Edit/Redo")); ++ "/Edit/Redo"); ++ if (! menu_undo_widget) bug_in("main"); + menu_undo_update (); + gtk_check_menu_item_set_active + (GTK_CHECK_MENU_ITEM (gtk_item_factory_get_widget +diff -urNad easychem-0.6~/po/easychem.pot easychem-0.6/po/easychem.pot +--- easychem-0.6~/po/easychem.pot 1970-01-01 01:00:00.000000000 +0100 ++++ easychem-0.6/po/easychem.pot 2006-11-15 04:48:56.000000000 +0100 +@@ -0,0 +1,705 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++#: bonds.c:1519 bonds.c:1577 bonds.c:1601 bonds.c:1719 export.c:1000 ++#: export.c:1292 export.c:2005 export.c:2011 ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-11-14 23:05+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: FULL NAME \n" ++"Language-Team: LANGUAGE \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=CHARSET\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: dialogs.c:62 ++msgid "Color selection" ++msgstr "" ++ ++#: dialogs.c:96 ++msgid "Richtext help" ++msgstr "" ++ ++#: dialogs.c:126 ++msgid "" ++"This is the help message for text editing. I will help you to deal with the " ++"possibilities offered by EasyChem for rich text. The syntax offered is very " ++"similar to TeX (and LaTeX).\n" ++"\n" ++"The text must be composed of regular characters (from the latin1 character " ++"set), and can include \\commands. There are 2 kinds of commands, with " ++"argument and without argument. Arguments are specified between brackets (" ++msgstr "" ++ ++#: dialogs.c:129 ++msgid "" ++" is a typical example). Commands without arguments need to be separated from " ++"the next character by a space (like in " ++msgstr "" ++ ++#: dialogs.c:134 ++msgid "" ++" being a command producing a non-latin1 character). Just like in LaTeX, if " ++"you want a space just after a command, you have to protect it (" ++msgstr "" ++ ++#: dialogs.c:136 ++msgid "it costs 10 \\euro\\ per unit" ++msgstr "" ++ ++#: dialogs.c:138 ++msgid "" ++", for an example).\n" ++"\n" ++"\n" ++"Enough small talk, what are the commands available?\n" ++"\n" ++msgstr "" ++ ++#: dialogs.c:141 dialogs.c:147 dialogs.c:153 dialogs.c:161 dialogs.c:168 ++#: dialogs.c:175 dialogs.c:183 dialogs.c:189 ++msgid " produces " ++msgstr "" ++ ++#: dialogs.c:144 ++msgid " (bold).\n" ++msgstr "" ++ ++#: dialogs.c:150 ++msgid " (italic).\n" ++msgstr "" ++ ++#: dialogs.c:158 dialogs.c:165 ++msgid " (subscript).\n" ++msgstr "" ++ ++#: dialogs.c:172 ++msgid " (superscript).\n" ++msgstr "" ++ ++#: dialogs.c:179 ++msgid "" ++" (superscript).\n" ++"\n" ++"\n" ++msgstr "" ++ ++#: dialogs.c:185 ++msgid " (greek letter) and the same is true for all greek letters. " ++msgstr "" ++ ++#: dialogs.c:191 ++msgid " (capital greek letter)." ++msgstr "" ++ ++#: dialogs.c:214 ++msgid "Edit atom or group" ++msgstr "" ++ ++#: dialogs.c:220 ++msgid "Enter the text here:" ++msgstr "" ++ ++#: dialogs.c:234 ++msgid "Relative size:" ++msgstr "" ++ ++#: dialogs.c:259 ++msgid "Type of atom or group:" ++msgstr "" ++ ++#: dialogs.c:412 ++msgid "" ++"You cannot edit a group. You need to ungroup its components and edit them." ++msgstr "" ++ ++#: dialogs.c:418 ++msgid "Edit a bond" ++msgstr "" ++ ++#: dialogs.c:454 easychem.c:3107 ++msgid "Simple" ++msgstr "" ++ ++#: dialogs.c:455 easychem.c:3108 ++msgid "Double" ++msgstr "" ++ ++#: dialogs.c:456 easychem.c:3109 ++msgid "Triple" ++msgstr "" ++ ++#: dialogs.c:457 easychem.c:3110 ++msgid "Going up" ++msgstr "" ++ ++#: dialogs.c:458 easychem.c:3111 ++msgid "Going down" ++msgstr "" ++ ++#: dialogs.c:459 easychem.c:3112 ++msgid "Dashed" ++msgstr "" ++ ++#: dialogs.c:460 easychem.c:3113 ++msgid "Arrow" ++msgstr "" ++ ++#: dialogs.c:466 easychem.c:3114 ++msgid "Arc" ++msgstr "" ++ ++#: dialogs.c:472 easychem.c:3115 ++msgid "Circle" ++msgstr "" ++ ++#: dialogs.c:479 easychem.c:3116 ++msgid "Atom/Group" ++msgstr "" ++ ++#: dialogs.c:488 ++msgid "Type of the bond:" ++msgstr "" ++ ++#: dialogs.c:501 ++msgid "Color:" ++msgstr "" ++ ++#: dialogs.c:504 ++msgid "Relative width:" ++msgstr "" ++ ++#: dialogs.c:508 ++msgid "Arrow size:" ++msgstr "" ++ ++#: dialogs.c:535 ++msgid "Beginning arrowhead:" ++msgstr "" ++ ++#: dialogs.c:536 ++msgid "Ending arrowhead:" ++msgstr "" ++ ++#: dialogs.c:771 ++msgid "Edit ornaments" ++msgstr "" ++ ++#: dialogs.c:809 ++msgid "Non-bonding pair" ++msgstr "" ++ ++#: dialogs.c:810 ++msgid "Electronic gap" ++msgstr "" ++ ++#: dialogs.c:811 ++msgid "Radical" ++msgstr "" ++ ++#: dialogs.c:812 ++msgid "Electronic gap 2" ++msgstr "" ++ ++#: dialogs.c:813 ++msgid "Non-bonding pair (dots)" ++msgstr "" ++ ++#: dialogs.c:814 ++msgid "Non-bonding electron" ++msgstr "" ++ ++#: dialogs.c:819 ++msgid "Type:" ++msgstr "" ++ ++#: dialogs.c:824 ++msgid "Size:" ++msgstr "" ++ ++#: dialogs.c:827 ++msgid "Distance:" ++msgstr "" ++ ++#: dialogs.c:830 ++msgid "Number:" ++msgstr "" ++ ++#: dialogs.c:833 ++msgid "Spacing:" ++msgstr "" ++ ++#: dialogs.c:836 ++msgid "" ++"Angle\n" ++"(from 12 AM,\n" ++"clockwise):" ++msgstr "" ++ ++#: dialogs.c:861 ++msgid "Add one" ++msgstr "" ++ ++#: dialogs.c:865 ++msgid "Remove current" ++msgstr "" ++ ++#: dialogs.c:916 ++msgid "Preferences" ++msgstr "" ++ ++#: dialogs.c:935 ++msgid "Path to gs:" ++msgstr "" ++ ++#: dialogs.c:940 ++msgid "Path to pstoedit:" ++msgstr "" ++ ++#: dialogs.c:949 ++msgid "Width of the drawing:" ++msgstr "" ++ ++#: dialogs.c:958 ++msgid "Height of the drawing:" ++msgstr "" ++ ++#: easychem.c:190 ++#, c-format ++msgid "" ++"Received signal %d.\n" ++"Whoops. Things are going a little crazy.\n" ++msgstr "" ++ ++#: easychem.c:197 ++msgid "Trying to save the current contents into '/tmp/save.ech'.\n" ++msgstr "" ++ ++#: easychem.c:201 ++msgid "Trying to save the current contents into a '.save.ech' file.\n" ++msgstr "" ++ ++#: easychem.c:244 ++msgid "About EasyChem" ++msgstr "" ++ ++#: easychem.c:245 easychem.c:675 easychem.c:793 easychem.c:2658 ++#: easychem.c:2759 ++msgid "OK" ++msgstr "" ++ ++#: easychem.c:255 ++msgid "This program is free software. See COPYING file for details." ++msgstr "" ++ ++#: easychem.c:258 ++msgid "Bug-reports, ideas and suggestions welcome!" ++msgstr "" ++ ++#: easychem.c:261 ++msgid "Please send a mail to:" ++msgstr "" ++ ++#: easychem.c:286 easychem.c:293 easychem.c:300 easychem.c:302 ++msgid "_Undo" ++msgstr "" ++ ++#: easychem.c:310 easychem.c:320 easychem.c:322 ++msgid "_Redo" ++msgstr "" ++ ++#: easychem.c:425 easychem.c:3191 ++msgid "/Options/Attraction" ++msgstr "" ++ ++#: easychem.c:484 easychem.c:588 ++msgid "This file already exists!" ++msgstr "" ++ ++#: easychem.c:485 easychem.c:589 easychem.c:2174 easychem.c:2299 ++msgid "No" ++msgstr "" ++ ++#: easychem.c:485 easychem.c:589 easychem.c:2174 easychem.c:2299 ++msgid "Yes" ++msgstr "" ++ ++#: easychem.c:486 easychem.c:590 ++msgid "Overwrite the existing file?" ++msgstr "" ++ ++#: easychem.c:503 easychem.c:564 easychem.c:2086 easychem.c:2210 ++#: easychem.c:2222 easychem.c:2568 easychem.c:2580 export.c:1406 export.c:1994 ++#, c-format ++msgid "Cannot open file '%s'" ++msgstr "" ++ ++#: easychem.c:530 ++msgid "Save file in EasyChem format" ++msgstr "" ++ ++#: easychem.c:642 ++msgid "Export file" ++msgstr "" ++ ++#: easychem.c:672 ++msgid "Choice for exporting format" ++msgstr "" ++ ++#: easychem.c:676 easychem.c:793 easychem.c:2658 easychem.c:2758 ++msgid "Cancel" ++msgstr "" ++ ++#: easychem.c:678 ++msgid "What kind of file do you want to produce?" ++msgstr "" ++ ++#: easychem.c:684 ++msgid "Encapsulated postscript (.eps)" ++msgstr "" ++ ++#: easychem.c:686 ++msgid "EPS, optimized for size (.eps)" ++msgstr "" ++ ++#: easychem.c:689 ++msgid "Encapsulated postscript with poor bounding box (.eps)" ++msgstr "" ++ ++#: easychem.c:691 ++msgid "Portable document file (.pdf)" ++msgstr "" ++ ++#: easychem.c:693 ++msgid "Xfig document (.fig)" ++msgstr "" ++ ++#: easychem.c:696 ++msgid "Enhanced xfig document (.fig) using pstoedit" ++msgstr "" ++ ++#: easychem.c:716 ++msgid "Use LaTeX fonts" ++msgstr "" ++ ++#: easychem.c:756 ++msgid "grouping" ++msgstr "" ++ ++#: easychem.c:773 ++msgid "ungrouping" ++msgstr "" ++ ++#: easychem.c:792 ++msgid "Align objects" ++msgstr "" ++ ++#: easychem.c:794 ++msgid "Horizontal alignment:" ++msgstr "" ++ ++#: easychem.c:800 easychem.c:820 ++msgid "No alignment" ++msgstr "" ++ ++#: easychem.c:802 ++msgid "Left" ++msgstr "" ++ ++#: easychem.c:804 easychem.c:824 ++msgid "Center" ++msgstr "" ++ ++#: easychem.c:806 ++msgid "Right" ++msgstr "" ++ ++#: easychem.c:814 ++msgid "Vertical alignment:" ++msgstr "" ++ ++#: easychem.c:822 ++msgid "Top" ++msgstr "" ++ ++#: easychem.c:826 ++msgid "Bottom" ++msgstr "" ++ ++#: easychem.c:864 ++msgid "aligning" ++msgstr "" ++ ++#: easychem.c:1350 ++msgid "drawing arc" ++msgstr "" ++ ++#: easychem.c:1398 easychem.c:1513 ++#, c-format ++msgid "" ++"There seems to be a syntax problem in your text : '%s'. Until you change it, " ++"it will be represented by a '(null)' block of text." ++msgstr "" ++ ++#: easychem.c:1406 ++msgid "adding text" ++msgstr "" ++ ++#: easychem.c:1432 ++msgid "" ++"Control-clicking enables you to draw a n-membered ring (n is set by the " ++"'ring size' value)." ++msgstr "" ++ ++#: easychem.c:1437 ++msgid "Release the mouse button to draw the bond." ++msgstr "" ++ ++#: easychem.c:1455 ++msgid "You clicked with the right button. Drawing canceled." ++msgstr "" ++ ++#: easychem.c:1467 ++msgid "" ++"You used the Control key and the right button to delete an entire molecule." ++msgstr "" ++ ++#: easychem.c:1472 ++msgid "You used the right button to delete an object." ++msgstr "" ++ ++#: easychem.c:1474 easychem.c:1935 ++msgid "delete" ++msgstr "" ++ ++#: easychem.c:1529 ++msgid "editing" ++msgstr "" ++ ++#: easychem.c:1730 ++msgid "" ++"You made a short click in a blank area. If you wanted to draw a bond, you " ++"need to key the mouse button pressed." ++msgstr "" ++ ++#: easychem.c:1777 ++msgid "drawing" ++msgstr "" ++ ++#: easychem.c:1791 ++msgid "" ++"To set the third point of the arc, you now need to click where you want it " ++"to be." ++msgstr "" ++ ++#: easychem.c:1828 ++msgid "drawing ring" ++msgstr "" ++ ++#: easychem.c:1857 ++msgid "copy" ++msgstr "" ++ ++#: easychem.c:1857 ++msgid "move" ++msgstr "" ++ ++#: easychem.c:1867 easychem.c:2693 ++msgid "rotation" ++msgstr "" ++ ++#: easychem.c:1921 ++msgid "Hitting the Escape key aborts the current operation." ++msgstr "" ++ ++#: easychem.c:1931 ++msgid "You used the Backspace and Delete keys to delete the selection." ++msgstr "" ++ ++#: easychem.c:2127 ++msgid "Quit" ++msgstr "" ++ ++#: easychem.c:2128 ++msgid "Save" ++msgstr "" ++ ++#: easychem.c:2128 ++msgid "Discard" ++msgstr "" ++ ++#: easychem.c:2129 easychem.c:2175 easychem.c:2300 ++msgid "Do you want to save your work first?" ++msgstr "" ++ ++#: easychem.c:2173 ++msgid "New file" ++msgstr "" ++ ++#: easychem.c:2238 easychem.c:2594 ++#, c-format ++msgid "File '%s' has incorrect format" ++msgstr "" ++ ++#: easychem.c:2262 ++msgid "Open file in EasyChem format" ++msgstr "" ++ ++#: easychem.c:2298 ++msgid "Open file" ++msgstr "" ++ ++#: easychem.c:2335 ++msgid "Yeah! Undone, boss!" ++msgstr "" ++ ++#: easychem.c:2404 ++msgid "cutting" ++msgstr "" ++ ++#: easychem.c:2429 ++msgid "paste" ++msgstr "" ++ ++#: easychem.c:2468 ++msgid "horizontal flip" ++msgstr "" ++ ++#: easychem.c:2506 ++msgid "vertical flip" ++msgstr "" ++ ++#: easychem.c:2550 ++msgid "inversion" ++msgstr "" ++ ++#: easychem.c:2617 ++msgid "merge file" ++msgstr "" ++ ++#: easychem.c:2629 ++msgid "Open file for merging" ++msgstr "" ++ ++#: easychem.c:2657 ++msgid "Rotate the selection" ++msgstr "" ++ ++#: easychem.c:2663 ++msgid "Angle of the rotation:" ++msgstr "" ++ ++#: easychem.c:2670 ++msgid "(positive is clockwise)" ++msgstr "" ++ ++#: easychem.c:2703 ++msgid "clean-up" ++msgstr "" ++ ++#: easychem.c:2757 ++msgid "Set the zoom factor" ++msgstr "" ++ ++#: easychem.c:2763 ++msgid "New zoom factor:" ++msgstr "" ++ ++#: easychem.c:2886 ++msgid "" ++"Press the left button to add a bond, and release it when you're done. Use " ++"CONTROL to add a ring." ++msgstr "" ++ ++#: easychem.c:2894 ++msgid "You can change the selection, and move things around!" ++msgstr "" ++ ++#: easychem.c:2902 ++msgid "You can change the selection, and rotate it." ++msgstr "" ++ ++#: easychem.c:2910 ++msgid "" ++"Click on a bond to edit its properties. Middle-click to change its type " ++"immediatly." ++msgstr "" ++ ++#: easychem.c:2918 ++msgid "" ++"Click on the end of a bond or an atom to add an ornament or edit existing " ++"ones." ++msgstr "" ++ ++#: easychem.c:3006 ++msgid "Welcome to EasyChem!" ++msgstr "" ++ ++#: easychem.c:3049 ++msgid "Adjust" ++msgstr "" ++ ++#: easychem.c:3052 ++msgid "Add bonds" ++msgstr "" ++ ++#: easychem.c:3055 ++msgid "Rotate" ++msgstr "" ++ ++#: easychem.c:3058 ++msgid "Edit" ++msgstr "" ++ ++#: easychem.c:3060 ++msgid "Ornaments" ++msgstr "" ++ ++#: easychem.c:3083 ++msgid "Ring size:" ++msgstr "" ++ ++#: easychem.c:3098 ++msgid "Bond type:" ++msgstr "" ++ ++#: easychem.c:3130 ++msgid "Bond size:" ++msgstr "" ++ ++#: easychem.c:3160 ++#, c-format ++msgid "Warning: cannot load file '%s'.\n" ++msgstr "" ++ ++#: export.c:773 export.c:806 export.c:832 export.c:856 ++msgid "richtext_to_eps (syntax error)" ++msgstr "" ++ ++#: export.c:1384 ++msgid "Cannot find 'gs'. Will do poor man's bouding box determination." ++msgstr "" ++ ++#: common.h:11 ++#, c-format ++msgid "Fatal error in function '%s'.\n" ++msgstr "" ++ ++#: common.h:14 ++#, c-format ++msgid "Fatal error: %s.\n" ++msgstr "" ++ ++#: common.h:19 ++#, c-format ++msgid "" ++"Strange fatal error in '%s'.\n" ++"This shouldn't happen. You've just found a bug.\n" ++"Please send a mail to \n" ++msgstr "" +diff -urNad easychem-0.6~/po/fr.po easychem-0.6/po/fr.po +--- easychem-0.6~/po/fr.po 2005-05-04 10:10:07.000000000 +0200 ++++ easychem-0.6/po/fr.po 2006-11-15 04:48:56.000000000 +0100 +@@ -5,8 +5,8 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: EasyChem pre-0.6\n" +-"Last-Translator: François-Xavier Coudert \n" ++"Project-Id-Version: EasyChem 0.6-ch\n" ++"Last-Translator: Céline Houriez \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +@@ -29,13 +29,13 @@ + "set), and can include \\commands. There are 2 kinds of commands, with " + "argument and without argument. Arguments are specified between brackets (" + msgstr "" +-"Bienvenue dans l'aide du texte enrichi. Je vais vous aider à utiliser " +-"les possibilités offertes par EasyChem en matière de text enrichi. La " +-"syntaxe offerte est très similaire à celle de TeX (et LaTeX).\n" ++"Bienvenue dans l'aide du texte enrichi. Je vais vous aider à utiliser les " ++"possibilités offertes par EasyChem en matière de texte enrichi. La syntaxe " ++"offerte est très similaire à celle de TeX (et LaTeX).\n" + "\n" + "Le texte doit être composé de caractères du jeu de code latin1, et peut " +-"inclure des \\commandes. Il existe deux types de commandes, avec ou " +-"sans paramètre. Les paramètres sont spécifiés entre accolades (" ++"inclure des \\commandes. Il existe deux types de commandes, avec ou sans " ++"paramètre. Les paramètres sont spécifiés entre accolades (" + + #: dialogs.c:129 + msgid "" +@@ -50,10 +50,13 @@ + " being a command producing a non-latin1 character). Just like in LaTeX, if " + "you want a space just after a command, you have to protect it (" + msgstr "" ++" étant une commande qui produit un caractère qui n'est pas latin1). Tout " ++"comme en LaTeX, si vous voulez un espace juste après une commande, vous " ++"devez le protéger (" + + #: dialogs.c:136 + msgid "it costs 10 \\euro\\ per unit" +-msgstr "" ++msgstr "cela coûte 10 \\euro\\ l'unité" + + #: dialogs.c:138 + msgid "" +@@ -63,31 +66,36 @@ + "Enough small talk, what are the commands available?\n" + "\n" + msgstr "" ++", par exemple).\n" ++"\n" ++"\n" ++"Assez bavardé, quelles sont les commandes disponibles ?\n" ++"\n" + + #: dialogs.c:141 dialogs.c:147 dialogs.c:153 dialogs.c:161 dialogs.c:168 + #: dialogs.c:175 + msgid " produces " +-msgstr "" ++msgstr " produit " + + #: dialogs.c:144 + msgid " (bold).\n" +-msgstr "" ++msgstr " (gras).\n" + + #: dialogs.c:150 + msgid " (italic).\n" +-msgstr "" ++msgstr " (italique).\n" + + #: dialogs.c:158 + msgid "(subscript).\n" +-msgstr "" ++msgstr "(indice).\n" + + #: dialogs.c:165 + msgid " (subscript).\n" +-msgstr "" ++msgstr " (indice).\n" + + #: dialogs.c:172 + msgid " (superscript).\n" +-msgstr "" ++msgstr " (exposant).\n" + + #: dialogs.c:179 + msgid "" +@@ -95,645 +103,709 @@ + "\n" + "\n" + msgstr "" ++" (exposant).\n" ++"\n" ++"\n" + + #: dialogs.c:183 +-msgid " produces α (greek letter) and the same is true for all greek letters. " +-msgstr "" ++msgid " (greek letter) and the same is true for all greek letters. " ++msgstr " (lettre grecque) et de même pour toutes les lettres grecques. " + + #: dialogs.c:187 +-msgid " produces Ω (capital greek letter)." +-msgstr "" ++msgid " (capital greek letter)." ++msgstr " (lettre grecque capitale)." + + #: dialogs.c:210 + msgid "Edit atom or group" +-msgstr "" ++msgstr "Éditer un atome ou un groupe" + + #: dialogs.c:216 + msgid "Enter the text here:" +-msgstr "" ++msgstr "Entrez le texte ici :" + +-#: dialogs.c:243 ++#: dialogs.c:243 dialogs.c:255 + msgid "Type of atom or group:" +-msgstr "" ++msgstr "Type d'atome ou de groupe :" + +-#: dialogs.c:395 ++#: dialogs.c:395 dialogs.c:408 + msgid "" + "You cannot edit a group. You need to ungroup its components and edit them." + msgstr "" ++"Vous ne pouvez pas éditer un groupe. Vous devez dégrouper ses composants " ++"puis les éditer." + +-#: dialogs.c:401 ++#: dialogs.c:401 dialogs.c:414 + msgid "Edit a bond" +-msgstr "" ++msgstr "Éditer une liaison" + +-#: dialogs.c:437 easychem.c:3529 ++#: dialogs.c:437 easychem.c:3529 dialogs.c:450 easychem.c:3112 easychem.c:3111 + msgid "Simple" +-msgstr "" ++msgstr "Simple" + +-#: dialogs.c:438 easychem.c:3530 ++#: dialogs.c:438 easychem.c:3530 dialogs.c:451 easychem.c:3113 easychem.c:3112 + msgid "Double" +-msgstr "" ++msgstr "Double" + +-#: dialogs.c:439 easychem.c:3531 ++#: dialogs.c:439 easychem.c:3531 dialogs.c:452 easychem.c:3114 easychem.c:3113 + msgid "Triple" +-msgstr "" ++msgstr "Triple" + +-#: dialogs.c:440 easychem.c:3532 ++#: dialogs.c:440 easychem.c:3532 dialogs.c:453 easychem.c:3115 easychem.c:3114 + msgid "Going up" +-msgstr "" ++msgstr "Vers soi" + +-#: dialogs.c:441 easychem.c:3533 ++#: dialogs.c:441 easychem.c:3533 dialogs.c:454 easychem.c:3116 easychem.c:3115 + msgid "Going down" +-msgstr "" ++msgstr "Vers le fond" + +-#: dialogs.c:442 easychem.c:3534 ++#: dialogs.c:442 easychem.c:3534 dialogs.c:455 easychem.c:3117 easychem.c:3116 + msgid "Dashed" +-msgstr "" ++msgstr "Pointillée" + +-#: dialogs.c:443 easychem.c:3535 ++#: dialogs.c:443 easychem.c:3535 dialogs.c:456 easychem.c:3118 easychem.c:3117 + msgid "Arrow" +-msgstr "" ++msgstr "Flèche" + +-#: dialogs.c:449 easychem.c:3536 ++#: dialogs.c:449 easychem.c:3536 dialogs.c:462 easychem.c:3119 easychem.c:3118 + msgid "Arc" +-msgstr "" ++msgstr "Arc" + +-#: dialogs.c:455 easychem.c:3537 ++#: dialogs.c:455 easychem.c:3537 dialogs.c:468 easychem.c:3120 easychem.c:3119 + msgid "Circle" +-msgstr "" ++msgstr "Cercle" + +-#: dialogs.c:462 easychem.c:3538 ++#: dialogs.c:462 easychem.c:3538 dialogs.c:475 easychem.c:3121 easychem.c:3120 + msgid "Atom/Group" +-msgstr "" ++msgstr "Atome/Groupe" + +-#: dialogs.c:471 ++#: dialogs.c:471 dialogs.c:484 + msgid "Type of the bond:" +-msgstr "" ++msgstr "Type de la liaison :" + +-#: dialogs.c:484 ++#: dialogs.c:484 dialogs.c:497 + msgid "Color:" +-msgstr "" ++msgstr "Couleur :" + +-#: dialogs.c:487 ++#: dialogs.c:234 ++msgid "Relative size:" ++msgstr "Taille relative :" ++ ++#: dialogs.c:487 dialogs.c:500 + msgid "Relative width:" +-msgstr "" ++msgstr "Largeur relative :" + +-#: dialogs.c:491 ++#: dialogs.c:491 dialogs.c:504 + msgid "Arrow size:" +-msgstr "" ++msgstr "Taille de la flèche :" + +-#: dialogs.c:518 ++#: dialogs.c:518 dialogs.c:531 + msgid "Beginning arrowhead:" +-msgstr "" ++msgstr "Tête de la flèche au début :" + +-#: dialogs.c:519 ++#: dialogs.c:519 dialogs.c:532 + msgid "Ending arrowhead:" +-msgstr "" ++msgstr "Tête de la flèche à la fin :" + +-#: dialogs.c:743 ++#: dialogs.c:743 dialogs.c:767 + msgid "Edit ornaments" +-msgstr "" ++msgstr "Éditer des ornements" + +-#: dialogs.c:781 ++#: dialogs.c:781 dialogs.c:805 + msgid "Non-bonding pair" +-msgstr "" ++msgstr "Paire non-liante" + +-#: dialogs.c:782 ++#: dialogs.c:782 dialogs.c:806 + msgid "Electronic gap" + msgstr "" + +-#: dialogs.c:783 ++#: dialogs.c:783 dialogs.c:807 + msgid "Radical" +-msgstr "" ++msgstr "Radical" + +-#: dialogs.c:784 ++#: dialogs.c:784 dialogs.c:808 + msgid "Electronic gap 2" + msgstr "" + +-#: dialogs.c:789 ++#: dialogs.c:789 dialogs.c:815 + msgid "Type:" +-msgstr "" ++msgstr "Type :" + +-#: dialogs.c:794 ++#: dialogs.c:794 dialogs.c:820 + msgid "Size:" +-msgstr "" ++msgstr "Taille :" + +-#: dialogs.c:797 ++#: dialogs.c:797 dialogs.c:823 + msgid "Distance:" +-msgstr "" ++msgstr "Distance :" + +-#: dialogs.c:800 ++#: dialogs.c:800 dialogs.c:826 + msgid "Number:" +-msgstr "" ++msgstr "Nombre :" + +-#: dialogs.c:803 ++#: dialogs.c:803 dialogs.c:829 + msgid "Spacing:" +-msgstr "" ++msgstr "Espacement :" + +-#: dialogs.c:806 ++#: dialogs.c:806 dialogs.c:832 + msgid "" + "Angle\n" + "(from 12 AM,\n" + "clockwise):" + msgstr "" ++"Angle\n" ++"(depuis 12h,\n" ++"sens horaire) :" + +-#: dialogs.c:832 ++#: dialogs.c:832 dialogs.c:857 + msgid "Add one" +-msgstr "" ++msgstr "Ajouter" + +-#: dialogs.c:836 ++#: dialogs.c:836 dialogs.c:861 + msgid "Remove current" +-msgstr "" ++msgstr "Supprimer" + +-#: easychem.c:170 ++#: easychem.c:170 easychem.c:190 + #, c-format + msgid "" + "Received signal %d.\n" + "Whoops. Things are going a little crazy.\n" + msgstr "" ++"Reçu le signal %d.\n" ++"Oula, ça me dépasse un peu là.\n" + +-#: easychem.c:177 ++#: easychem.c:177 easychem.c:197 + msgid "Trying to save the current contents into '/tmp/save.ech'.\n" +-msgstr "" ++msgstr "Tentative de sauvegarde du contenu actuel dans '/tmp/save.ech'.\n" + +-#: easychem.c:181 ++#: easychem.c:181 easychem.c:201 + msgid "Trying to save the current contents into a '.save.ech' file.\n" + msgstr "" ++"Tentative de sauvegarde du contenu actuel dans un fichier '.save.ech'.\n" + +-#: easychem.c:249 ++#: easychem.c:249 easychem.c:244 + msgid "About EasyChem" +-msgstr "" ++msgstr "À propos d'EasyChem" + + #: easychem.c:250 easychem.c:1030 easychem.c:1146 easychem.c:3103 +-#: easychem.c:3204 ++#: easychem.c:3204 easychem.c:245 easychem.c:675 easychem.c:793 ++#: easychem.c:2658 easychem.c:2759 easychem.c:674 easychem.c:792 ++#: easychem.c:2657 easychem.c:2758 + msgid "OK" +-msgstr "" ++msgstr "Valider" + +-#: easychem.c:260 ++#: easychem.c:260 easychem.c:255 + msgid "This program is free software. See COPYING file for details." + msgstr "" ++"Ce programme est un logiciel libre. Voir le fichier COPYING pour plus de " ++"détails." + +-#: easychem.c:263 ++#: easychem.c:263 easychem.c:258 + msgid "Bug-reports, ideas and suggestions welcome!" +-msgstr "" ++msgstr "Rapports de bugs, idées et suggestions bienvenues !" + +-#: easychem.c:266 ++#: easychem.c:266 easychem.c:261 + msgid "Please send a mail to:" +-msgstr "" +- +-#: easychem.c:326 easychem.c:785 easychem.c:2771 easychem.c:2800 +-#: easychem.c:3603 +-msgid "/Edit/Undo" +-msgstr "" +- +-#: easychem.c:328 easychem.c:787 easychem.c:2775 easychem.c:2804 +-#: easychem.c:3605 +-msgid "/Edit/Redo" +-msgstr "" ++msgstr "Envoyez un mail à :" + +-#: easychem.c:790 easychem.c:3608 ++#: easychem.c:790 easychem.c:3608 easychem.c:425 easychem.c:3195 ++#: easychem.c:424 + msgid "/Options/Attraction" +-msgstr "" ++msgstr "/Options/Attraction" + +-#: easychem.c:849 easychem.c:947 ++#: easychem.c:849 easychem.c:947 easychem.c:484 easychem.c:588 easychem.c:483 ++#: easychem.c:587 + msgid "This file already exists!" +-msgstr "" ++msgstr "Ce fichier existe déjà !" + + #: easychem.c:850 easychem.c:948 easychem.c:2614 easychem.c:2735 ++#: easychem.c:485 easychem.c:589 easychem.c:2174 easychem.c:2299 ++#: easychem.c:484 easychem.c:588 easychem.c:2173 easychem.c:2298 + msgid "No" +-msgstr "" ++msgstr "Non" + + #: easychem.c:850 easychem.c:948 easychem.c:2614 easychem.c:2735 ++#: easychem.c:485 easychem.c:589 easychem.c:2174 easychem.c:2299 ++#: easychem.c:484 easychem.c:588 easychem.c:2173 easychem.c:2298 + msgid "Yes" +-msgstr "" ++msgstr "Oui" + +-#: easychem.c:851 easychem.c:949 ++#: easychem.c:851 easychem.c:949 easychem.c:486 easychem.c:590 easychem.c:485 ++#: easychem.c:589 + msgid "Overwrite the existing file?" +-msgstr "" ++msgstr "Écraser le fichier existant ?" + + #: easychem.c:867 easychem.c:923 easychem.c:2526 easychem.c:2650 + #: easychem.c:2662 easychem.c:3017 easychem.c:3029 export.c:1022 export.c:1610 ++#: easychem.c:503 easychem.c:564 easychem.c:2086 easychem.c:2210 ++#: easychem.c:2222 easychem.c:2568 easychem.c:2580 export.c:1406 export.c:1994 ++#: easychem.c:502 easychem.c:563 easychem.c:2085 easychem.c:2209 ++#: easychem.c:2221 easychem.c:2567 easychem.c:2579 + #, c-format + msgid "Cannot open file '%s'" +-msgstr "" ++msgstr "Impossible d'ouvrir le fichier '%s'" + +-#: easychem.c:892 ++#: easychem.c:892 easychem.c:530 easychem.c:529 + msgid "Save file in EasyChem format" +-msgstr "" ++msgstr "Enregistrer dans le format EasyChem" + +-#: easychem.c:1000 ++#: easychem.c:1000 easychem.c:642 easychem.c:641 + msgid "Export file" +-msgstr "" ++msgstr "Exporter le fichier" + +-#: easychem.c:1027 ++#: easychem.c:1027 easychem.c:672 easychem.c:671 + msgid "Choice for exporting format" +-msgstr "" ++msgstr "Choix du format d'exportation" + + #: easychem.c:1031 easychem.c:1146 easychem.c:3103 easychem.c:3203 ++#: easychem.c:676 easychem.c:793 easychem.c:2658 easychem.c:2758 ++#: easychem.c:675 easychem.c:792 easychem.c:2657 easychem.c:2757 + msgid "Cancel" +-msgstr "" ++msgstr "Annuler" + +-#: easychem.c:1033 ++#: easychem.c:1033 easychem.c:678 easychem.c:677 + msgid "What kind of file do you want to produce?" +-msgstr "" ++msgstr "Quel type de fichier voulez-vous produire ?" + +-#: easychem.c:1039 ++#: easychem.c:1039 easychem.c:684 easychem.c:683 + msgid "Encapsulated postscript (.eps)" +-msgstr "" ++msgstr "Postscript encapsulé (.eps)" + +-#: easychem.c:1041 ++#: easychem.c:1041 easychem.c:686 easychem.c:685 + msgid "EPS, optimized for size (.eps)" +-msgstr "" ++msgstr "EPS, optimisé pour la taille (.eps)" + +-#: easychem.c:1044 +-msgid "Encapsulated postscript without bouding box (.eps)" +-msgstr "" ++#: easychem.c:1044 easychem.c:689 easychem.c:688 ++msgid "Encapsulated postscript with poor bounding box (.eps)" ++msgstr "Postscript encapsulé avec une boîte de bordure approximative (.eps)" + +-#: easychem.c:1046 ++#: easychem.c:1046 easychem.c:691 easychem.c:690 + msgid "Portable document file (.pdf)" +-msgstr "" ++msgstr "Format de document portable (.pdf)" + +-#: easychem.c:1048 ++#: easychem.c:1048 easychem.c:693 easychem.c:692 + msgid "Xfig document (.fig)" +-msgstr "" ++msgstr "Document Xfig (.fig)" + +-#: easychem.c:1051 ++#: easychem.c:1051 easychem.c:696 easychem.c:695 + msgid "Enhanced xfig document (.fig) using pstoedit" +-msgstr "" ++msgstr "Document Xfig amélorié (.fig) en utilisant pstoedit" + +-#: easychem.c:1069 ++#: easychem.c:1069 easychem.c:716 easychem.c:715 + msgid "Use LaTeX fonts" +-msgstr "" ++msgstr "Utiliser des polices LaTeX" + +-#: easychem.c:1145 ++#: easychem.c:1145 easychem.c:792 easychem.c:791 + msgid "Align objects" +-msgstr "" ++msgstr "Aligner les objets" + +-#: easychem.c:1147 ++#: easychem.c:1147 easychem.c:794 easychem.c:793 + msgid "Horizontal alignment:" +-msgstr "" ++msgstr "Alignement horizontal :" + +-#: easychem.c:1153 easychem.c:1173 ++#: easychem.c:1153 easychem.c:1173 easychem.c:800 easychem.c:820 ++#: easychem.c:799 easychem.c:819 + msgid "No alignment" +-msgstr "" ++msgstr "Pas d'alignement" + +-#: easychem.c:1155 ++#: easychem.c:1155 easychem.c:802 easychem.c:801 + msgid "Left" +-msgstr "" ++msgstr "À gauche" + +-#: easychem.c:1157 easychem.c:1177 ++#: easychem.c:1157 easychem.c:1177 easychem.c:804 easychem.c:824 ++#: easychem.c:803 easychem.c:823 + msgid "Center" +-msgstr "" ++msgstr "Centré" + +-#: easychem.c:1159 ++#: easychem.c:1159 easychem.c:806 easychem.c:805 + msgid "Right" +-msgstr "" ++msgstr "À droite" + +-#: easychem.c:1167 ++#: easychem.c:1167 easychem.c:814 easychem.c:813 + msgid "Vertical alignment:" +-msgstr "" ++msgstr "Alignement vertical :" + +-#: easychem.c:1175 ++#: easychem.c:1175 easychem.c:822 easychem.c:821 + msgid "Top" +-msgstr "" ++msgstr "En haut" + +-#: easychem.c:1179 ++#: easychem.c:1179 easychem.c:826 easychem.c:825 + msgid "Bottom" +-msgstr "" ++msgstr "En bas" + +-#: easychem.c:1838 easychem.c:1953 ++#: easychem.c:1838 easychem.c:1953 easychem.c:1398 easychem.c:1513 ++#: easychem.c:1397 easychem.c:1512 + #, c-format + msgid "" + "There seems to be a syntax problem in your text : '%s'. Until you change it, " + "it will be represented by a '(null)' block of text." + msgstr "" ++"Il semble qu'il y ait un problème de syntaxe dans votre texte : '%s'. " ++"Jusqu'à ce que vous le modifiez, il sera représenté par un bloc de text " ++"'(null)'." + +-#: easychem.c:1872 ++#: easychem.c:1872 easychem.c:1432 easychem.c:1431 + msgid "" + "Control-clicking enables you to draw a n-membered ring (n is set by the " + "'ring size' value)." + msgstr "" ++"Contrôle-clic vous permet de dessiner un cycle à n côtés. (n est défini en " ++"utilisant la valeur 'taille des cycles'.)" + +-#: easychem.c:1877 ++#: easychem.c:1877 easychem.c:1437 easychem.c:1436 + msgid "Release the mouse button to draw the bond." +-msgstr "" ++msgstr "Relâchez le bouton de la souris pour dessiner la liaison." + +-#: easychem.c:1895 ++#: easychem.c:1895 easychem.c:1455 easychem.c:1454 + msgid "You clicked with the right button. Drawing canceled." +-msgstr "" ++msgstr "Vous avez cliqué avec le bouton droit. Dessin annulé." + +-#: easychem.c:1907 ++#: easychem.c:1907 easychem.c:1467 easychem.c:1466 + msgid "" + "You used the Control key and the right button to delete an entire molecule." + msgstr "" ++"Vous avez utilisés la touche Contrôle et le bouton droit pour supprimer une " ++"molécule entièrement." + +-#: easychem.c:1912 ++#: easychem.c:1912 easychem.c:1472 easychem.c:1471 + msgid "You used the right button to delete an object." + msgstr "" ++"Vous avez utilisé le bouton droit pour supprimer un objet. (Oui, je suis " ++"omniscient.)" + +-#: easychem.c:2170 ++#: easychem.c:2170 easychem.c:1730 easychem.c:1729 + msgid "" + "You made a short click in a blank area. If you wanted to draw a bond, you " + "need to key the mouse button pressed." + msgstr "" ++"Vous avez cliqué rapidement dans une zone vide. Si vous voulez dessiner une " ++"liaison, vous devez laisser le bouton de la souris appuyé." + +-#: easychem.c:2231 ++#: easychem.c:2231 easychem.c:1791 easychem.c:1790 + msgid "" + "To set the third point of the arc, you now need to click where you want it " + "to be." + msgstr "" ++"Pour définir le troisième point de l'arc, vous devez maintenant cliquer où " ++"vous voulez qu'il soit." + +-#: easychem.c:2361 ++#: easychem.c:2361 easychem.c:1921 easychem.c:1920 + msgid "Hitting the Escape key aborts the current operation." + msgstr "Appuyer sur [Échap] annule l'opération en court." + +-#: easychem.c:2371 ++#: easychem.c:2371 easychem.c:1931 easychem.c:1930 + msgid "You used the Backspace and Delete keys to delete the selection." + msgstr "Vous avez utilisé la touche Suppr pour effacer la sélection." + +-#: easychem.c:2567 ++#: easychem.c:2567 easychem.c:2127 easychem.c:2126 + msgid "Quit" + msgstr "Quitter" + +-#: easychem.c:2568 ++#: easychem.c:2568 easychem.c:2128 easychem.c:2127 + msgid "Save" + msgstr "Enregistrer" + +-#: easychem.c:2568 ++#: easychem.c:2568 easychem.c:2128 easychem.c:2127 + msgid "Discard" + msgstr "Annuler" + +-#: easychem.c:2569 easychem.c:2615 easychem.c:2736 ++#: easychem.c:2569 easychem.c:2615 easychem.c:2736 easychem.c:2129 ++#: easychem.c:2175 easychem.c:2300 easychem.c:2128 easychem.c:2174 ++#: easychem.c:2299 + msgid "Do you want to save your work first?" + msgstr "Voulez-vous enregistrer votre travail ?" + +-#: easychem.c:2613 ++#: easychem.c:2613 easychem.c:2173 easychem.c:2172 + msgid "New file" + msgstr "Nouveau fichier" + +-#: easychem.c:2678 easychem.c:3042 ++#: easychem.c:2678 easychem.c:3042 easychem.c:2238 easychem.c:2594 ++#: easychem.c:2237 easychem.c:2593 + #, c-format + msgid "File '%s' has incorrect format" + msgstr "Le fichier '%s' a un format incorrect" + +-#: easychem.c:2701 ++#: easychem.c:2701 easychem.c:2262 easychem.c:2261 + msgid "Open file in EasyChem format" + msgstr "Ouvrir un fichier au format EasyChem" + +-#: easychem.c:2734 ++#: easychem.c:2734 easychem.c:2298 easychem.c:2297 + msgid "Open file" + msgstr "Ouvrir un fichier" + +-#: easychem.c:2778 ++#: easychem.c:2778 easychem.c:2335 easychem.c:2334 + msgid "Yeah! Undone, boss!" +-msgstr "" ++msgstr "Ouais ! Annulé, chef !" + +-#: easychem.c:3077 ++#: easychem.c:3077 easychem.c:2629 easychem.c:2628 + msgid "Open file for merging" + msgstr "Ouvrir pour fusion" + +-#: easychem.c:3102 ++#: easychem.c:3102 easychem.c:2657 easychem.c:2656 + msgid "Rotate the selection" + msgstr "Faire tourner la sélection" + +-#: easychem.c:3108 ++#: easychem.c:3108 easychem.c:2663 easychem.c:2662 + msgid "Angle of the rotation:" + msgstr "Angle de la rotation :" + +-#: easychem.c:3115 ++#: easychem.c:3115 easychem.c:2670 easychem.c:2669 + msgid "(positive is clockwise)" + msgstr "(positif: dans le sens horaire)" + +-#: easychem.c:3202 ++#: easychem.c:3202 easychem.c:2757 easychem.c:2756 + msgid "Set the zoom factor" + msgstr "Changer le facteur de zoom" + +-#: easychem.c:3208 ++#: easychem.c:3208 easychem.c:2763 easychem.c:2762 + msgid "New zoom factor:" + msgstr "Nouveau facteur de zoom :" + +-#: easychem.c:3247 ++#: easychem.c:3247 easychem.c:2802 + msgid "/_File" + msgstr "/_Fichier" + +-#: easychem.c:3248 ++#: easychem.c:3248 easychem.c:2803 + msgid "/_File/_New" + msgstr "/_Fichier/_Nouveau" + +-#: easychem.c:3249 ++#: easychem.c:3249 easychem.c:2804 + msgid "/_File/_Open" + msgstr "/_Fichier/_Ouvrir" + +-#: easychem.c:3250 ++#: easychem.c:3250 easychem.c:2805 + msgid "/_File/_Save" + msgstr "/_Fichier/_Enregistrer" + +-#: easychem.c:3251 ++#: easychem.c:3251 easychem.c:2806 + msgid "/_File/_Save as" + msgstr "/_Fichier/Enregistrer _sous" + +-#: easychem.c:3253 ++#: easychem.c:3253 easychem.c:2808 + msgid "/_File/_Merge" + msgstr "/_Fichier/_Fusionner" + +-#: easychem.c:3254 ++#: easychem.c:3254 easychem.c:2809 + msgid "/_File/_Export" + msgstr "/_Fichier/E_xporter" + +-#: easychem.c:3256 ++#: easychem.c:3256 easychem.c:2812 + msgid "/_File/_Debug" + msgstr "/_Fichier/_Debugguer" + +-#: easychem.c:3258 ++#: easychem.c:3258 easychem.c:2815 + msgid "/_File/_Quit" + msgstr "/_Fichier/_Quitter" + +-#: easychem.c:3259 ++#: easychem.c:3259 easychem.c:2816 + msgid "/_Edit" + msgstr "/_Édition" + +-#: easychem.c:3260 ++#: easychem.c:3260 easychem.c:2817 + msgid "/_Edit/_Undo" + msgstr "/_Édition/_Annuler" + +-#: easychem.c:3261 ++#: easychem.c:3189 ++msgid "/Edit/Undo" ++msgstr "/Édition/Annuler" ++ ++#: easychem.c:286 easychem.c:293 easychem.c:300 easychem.c:302 ++msgid "_Undo" ++msgstr "_Annuler" ++ ++#: easychem.c:3261 easychem.c:2818 + msgid "/_Edit/_Redo" +-msgstr "/_Édition/_Refaire" ++msgstr "/_Édition/_Rétablir" + +-#: easychem.c:3263 ++#: easychem.c:3191 ++msgid "/Edit/Redo" ++msgstr "/Édition/Rétablir" ++ ++#: easychem.c:310 easychem.c:320 easychem.c:322 ++msgid "_Redo" ++msgstr "_Rétablir" ++ ++#: easychem.c:3263 easychem.c:2820 + msgid "/_Edit/_Cut" + msgstr "/_Édition/_Couper" + +-#: easychem.c:3264 ++#: easychem.c:3264 easychem.c:2821 + msgid "/_Edit/_Copy" + msgstr "/_Édition/_Copier" + +-#: easychem.c:3265 ++#: easychem.c:3265 easychem.c:2822 + msgid "/_Edit/_Paste" + msgstr "/_Édition/_Coller" + +-#: easychem.c:3266 ++#: easychem.c:3266 easychem.c:2823 + msgid "/_Edit/_Delete" + msgstr "/_Édition/_Supprimer" + +-#: easychem.c:3268 ++#: easychem.c:3268 easychem.c:2825 + msgid "/_Edit/Select _all" + msgstr "/_Édition/_Tout sélectionner" + +-#: easychem.c:3269 ++#: easychem.c:3269 easychem.c:2826 + msgid "/_Transformations" + msgstr "/_Transformations" + +-#: easychem.c:3270 ++#: easychem.c:3270 easychem.c:2827 + msgid "/_Transformations/Flip _horizontally" + msgstr "/_Transformations/Miroir _horizontal" + +-#: easychem.c:3271 ++#: easychem.c:3271 easychem.c:2828 + msgid "/_Transformations/Flip _vertically" + msgstr "/_Transformations/Miroir _vertical" + +-#: easychem.c:3272 ++#: easychem.c:3272 easychem.c:2829 + msgid "/_Transformations/_Invert" + msgstr "/_Transformations/_Inversion" + +-#: easychem.c:3273 ++#: easychem.c:3273 easychem.c:2830 + msgid "/_Transformations/_Rotate x degrees" + msgstr "/_Transformations/_Rotation" + +-#: easychem.c:3275 ++#: easychem.c:3275 easychem.c:2832 + msgid "/_Transformations/_Clean-up buffer" + msgstr "/_Transformations/_Nettoyer le dessin" + +-#: easychem.c:3277 ++#: easychem.c:3277 easychem.c:2834 + msgid "/_Transformations/_Group" + msgstr "/_Transformations/_Grouper" + +-#: easychem.c:3278 ++#: easychem.c:3278 easychem.c:2835 + msgid "/_Transformations/_Ungroup" + msgstr "/_Transformations/_Dégrouper" + +-#: easychem.c:3279 ++#: easychem.c:3279 easychem.c:2836 + msgid "/_Transformations/_Align" + msgstr "/_Transformations/_Aligner" + +-#: easychem.c:3280 ++#: easychem.c:3280 easychem.c:2837 + msgid "/_Options" + msgstr "/_Options" + +-#: easychem.c:3281 ++#: easychem.c:3281 easychem.c:2838 + msgid "/_Options/_Attraction" + msgstr "/_Options/_Attraction" + +-#: easychem.c:3282 ++#: easychem.c:3282 easychem.c:2839 + msgid "/_Options/_Learning messages" + msgstr "/_Options/_Messages d'apprentissage" + +-#: easychem.c:3284 ++#: easychem.c:3283 easychem.c:2842 ++msgid "/_Options/_Preferences" ++msgstr "/_Options/_Préférences" ++ ++#: easychem.c:3284 easychem.c:2843 + msgid "/_View" + msgstr "/Afficha_ge" + +-#: easychem.c:3285 ++#: easychem.c:3285 easychem.c:2844 + msgid "/_View/Zoom _1:1" + msgstr "/Afficha_ge/Zoom _1:1" + +-#: easychem.c:3286 ++#: easychem.c:3286 easychem.c:2845 + msgid "/_View/Zoom _in" +-msgstr "/Afficha_ge/Zoom a_rrière" ++msgstr "/Afficha_ge/Zoom a_vant" + +-#: easychem.c:3287 ++#: easychem.c:3287 easychem.c:2846 + msgid "/_View/Zoom _out" +-msgstr "/Afficha_ge/Zoom a_vant" ++msgstr "/Afficha_ge/Zoom a_rrière" + +-#: easychem.c:3288 ++#: easychem.c:3288 easychem.c:2847 + msgid "/_View/Precise _zoom" + msgstr "/Afficha_ge/_Zoom contrôlé" + +-#: easychem.c:3289 ++#: easychem.c:3289 easychem.c:2848 + msgid "/_Help" + msgstr "/_Aide" + +-#: easychem.c:3290 ++#: easychem.c:3290 easychem.c:2849 + msgid "/_Help/_About EasyChem" + msgstr "/_Aide/À _propos d'EasyChem" + +-#: easychem.c:3327 ++#: easychem.c:3327 easychem.c:2886 easychem.c:2885 + msgid "" + "Press the left button to add a bond, and release it when you're done. Use " + "CONTROL to add a ring." +-msgstr "Cliquez pour ajouter un liaison, en relâchant le bouton au point" +-" final. [Ctrl] permet de dessiner un cycle." ++msgstr "" ++"Cliquez pour ajouter un liaison, en relâchant le bouton au point final. " ++"[Ctrl] permet de dessiner un cycle." + +-#: easychem.c:3335 ++#: easychem.c:3335 easychem.c:2894 easychem.c:2893 + msgid "You can change the selection, and move things around!" + msgstr "Vous pouvez changer la sélection, et la déplacer !" + +-#: easychem.c:3343 ++#: easychem.c:3343 easychem.c:2902 easychem.c:2901 + msgid "You can change the selection, and rotate it." +-msgstr "Vous pouvez changer la sélection, et lui faire subir des " +-"rotations." ++msgstr "Vous pouvez changer la sélection, et lui faire subir des rotations." + +-#: easychem.c:3351 ++#: easychem.c:3351 easychem.c:2910 easychem.c:2909 + msgid "" + "Click on a bond to edit its properties. Middle-click to change its type " + "immediatly." +-msgstr "Cliquez sur une liaison pour la modifier. Un clic du bouton du" +-" milieu prend effet immédiatement." ++msgstr "" ++"Cliquez sur une liaison pour la modifier. Un clic du bouton du milieu prend " ++"effet immédiatement." + +-#: easychem.c:3359 ++#: easychem.c:3359 easychem.c:2918 easychem.c:2917 + msgid "" + "Click on the end of a bond or an atom to add an ornament or edit existing " + "ones." +-msgstr "Cliquez sur l'extrêmité d'une liaison ou sur un atome pour " +-" modifier les ornements." ++msgstr "" ++"Cliquez sur l'extrêmité d'une liaison ou sur un atome pour modifier les " ++"ornements." + +-#: easychem.c:3428 ++#: easychem.c:3428 easychem.c:3011 easychem.c:3010 + msgid "Welcome to EasyChem!" + msgstr "Bienvenue dans EasyChem !" + +-#: easychem.c:3471 ++#: easychem.c:3471 easychem.c:3054 easychem.c:3053 + msgid "Adjust" + msgstr "Ajustements" + +-#: easychem.c:3474 ++#: easychem.c:3474 easychem.c:3057 easychem.c:3056 + msgid "Add bonds" + msgstr "Ajouts" + +-#: easychem.c:3477 ++#: easychem.c:3477 easychem.c:3060 easychem.c:3059 + msgid "Rotate" + msgstr "Rotations" + +-#: easychem.c:3480 ++#: easychem.c:3480 easychem.c:3063 easychem.c:3062 + msgid "Edit" + msgstr "Modifications" + +-#: easychem.c:3482 ++#: easychem.c:3482 easychem.c:3065 easychem.c:3064 + msgid "Ornaments" + msgstr "Ornements" + +-#: easychem.c:3505 ++#: easychem.c:3505 easychem.c:3088 easychem.c:3087 + msgid "Ring size:" + msgstr "Taille des cycles :" + +-#: easychem.c:3520 ++#: easychem.c:3520 easychem.c:3103 easychem.c:3102 + msgid "Bond type:" + msgstr "Type de liaison :" + +-#: easychem.c:3552 ++#: easychem.c:3552 easychem.c:3135 easychem.c:3134 + msgid "Bond size:" + msgstr "Taille de liaison :" + +-#: easychem.c:3582 ++#: easychem.c:3582 easychem.c:3165 easychem.c:3164 + #, c-format + msgid "Warning: cannot load file '%s'.\n" + msgstr "Attention: je ne peux pas charger le fichier '%s'.\n" + +-#: export.c:449 export.c:482 export.c:508 export.c:532 ++#: export.c:449 export.c:482 export.c:508 export.c:532 export.c:773 ++#: export.c:806 export.c:832 export.c:856 + msgid "richtext_to_eps (syntax error)" + msgstr "richtext_to_eps (erreur de syntaxe)" + +-#: export.c:999 ++#: export.c:999 export.c:1384 + msgid "Cannot find 'gs'. Will do poor man's bouding box determination." +-msgstr "Je n'arrive pas à trouver 'gs'. " +-"Je vais déterminer la bounding box à la main." ++msgstr "" ++"Je n'arrive pas à trouver 'gs'. Je vais déterminer la bounding box à la main." + + #: common.h:11 + #, c-format +@@ -753,5 +825,109 @@ + "Please send a mail to \n" + msgstr "" + "Erreur fatale pour le moins bizarre dans '%s'.\n" +-"Ceci ne devrait pas arriver. Vosu venez de découvrir un bug.\n" ++"Ceci ne devrait pas arriver. Vous venez de découvrir un bug.\n" + "Merci de m'envoyer un mail : Francois-Xavier.Coudert@ens.fr\n" ++ ++#: dialogs.c:809 ++msgid "Non-bonding pair (dots)" ++msgstr "Paire non-liante (points)" ++ ++#: dialogs.c:810 ++msgid "Non-bonding electron" ++msgstr "Electron non-liant" ++ ++#: dialogs.c:912 ++msgid "Preferences" ++msgstr "Préférences" ++ ++#: dialogs.c:931 ++msgid "Path to gs:" ++msgstr "Chemin vers gs :" ++ ++#: dialogs.c:936 ++msgid "Path to pstoedit:" ++msgstr "Chemin vers pstoedit :" ++ ++#: dialogs.c:945 ++msgid "Width of the drawing:" ++msgstr "Largeur du dessin :" ++ ++#: dialogs.c:954 ++msgid "Height of the drawing:" ++msgstr "Hauteur du dessin :" ++ ++#: easychem.c:755 ++msgid "grouping" ++msgstr "le groupement" ++ ++#: easychem.c:772 ++msgid "ungrouping" ++msgstr "le dégroupement" ++ ++#: easychem.c:863 ++msgid "aligning" ++msgstr "l'alignement" ++ ++#: easychem.c:1349 ++msgid "drawing arc" ++msgstr "l'arc" ++ ++#: easychem.c:1405 ++msgid "adding text" ++msgstr "l'ajout de texte" ++ ++#: easychem.c:1473 easychem.c:1934 ++msgid "delete" ++msgstr "la suppression" ++ ++#: easychem.c:1528 ++msgid "editing" ++msgstr "l'édition" ++ ++#: easychem.c:1776 ++msgid "drawing" ++msgstr "le dessin" ++ ++#: easychem.c:1827 ++msgid "drawing ring" ++msgstr "le cycle" ++ ++#: easychem.c:1856 ++msgid "copy" ++msgstr "la copie" ++ ++#: easychem.c:1856 ++msgid "move" ++msgstr "le déplacement" ++ ++#: easychem.c:1866 easychem.c:2692 ++msgid "rotation" ++msgstr "la rotation" ++ ++#: easychem.c:2403 ++msgid "cutting" ++msgstr "la coupure" ++ ++#: easychem.c:2428 ++msgid "paste" ++msgstr "le collage" ++ ++#: easychem.c:2467 ++msgid "horizontal flip" ++msgstr "le miroir horizontal" ++ ++#: easychem.c:2505 ++msgid "vertical flip" ++msgstr "le miroir vertical" ++ ++#: easychem.c:2549 ++msgid "inversion" ++msgstr "l'inversion" ++ ++#: easychem.c:2616 ++msgid "merge file" ++msgstr "la fusion" ++ ++#: easychem.c:2702 ++msgid "clean-up" ++msgstr "le nettoyage"