From e648cece76b671b5b0e165acc6d14178e8de1000 Mon Sep 17 00:00:00 2001
From: auroux <auroux>
Date: Fri, 4 Sep 2009 04:57:12 +0000
Subject: [PATCH] Add internationalization support.

---
 Makefile.am        |    2 +-
 configure.in       |    9 +
 install-binary     |    7 +
 po/LINGUAS         |    2 +
 po/POTFILES.in     |   10 +
 po/ca.po           | 1276 ++++++++++++++++++++++++++++++++++++++++++++
 po/fr.po           | 1238 ++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am    |    2 +-
 src/TODO           |   19 +-
 src/main.c         |   12 +-
 src/xo-callbacks.c |   64 +--
 src/xo-file.c      |  160 +++---
 src/xo-file.h      |    4 -
 src/xo-interface.c |  476 ++++++++---------
 src/xo-misc.c      |   14 +-
 src/xo-print.c     |    9 +-
 src/xo-shapes.c    |   18 +-
 src/xo-support.c   |    6 +-
 src/xo-support.h   |   25 +
 src/xournal.h      |    2 +-
 x-xoj.desktop      |    1 +
 xournal.desktop    |    2 +
 xournal.gladep     |    1 -
 23 files changed, 2962 insertions(+), 397 deletions(-)
 create mode 100644 po/LINGUAS
 create mode 100644 po/POTFILES.in
 create mode 100644 po/ca.po
 create mode 100644 po/fr.po

diff --git a/Makefile.am b/Makefile.am
index a9303f9..d7aaa75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src
+SUBDIRS = src po
 
 EXTRA_DIST = \
 	autogen.sh \
diff --git a/configure.in b/configure.in
index 597bc6e..a83f7d3 100644
--- a/configure.in
+++ b/configure.in
@@ -15,8 +15,17 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
+GETTEXT_PACKAGE=xournal
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+
+dnl Add the languages which your application supports here.
+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
+AM_GLIB_GNU_GETTEXT
+
 AC_OUTPUT([
 Makefile
 src/Makefile
+po/Makefile.in
 ])
 
diff --git a/install-binary b/install-binary
index 3e8df6a..ff84b0f 100755
--- a/install-binary
+++ b/install-binary
@@ -27,6 +27,13 @@ if test `id -u` = 0; then
     ln -s ../pixmaps /usr/local/share/xournal/html-doc/pixmaps
   fi
 
+  echo "Installing translation files in /usr/local/share/locale/*/LC_MESSAGES/xournal.mo..."
+  for gmofile in po/*.gmo; do
+    lang=`basename $gmofile .gmo`
+    install -d /usr/local/share/locale/$lang/LC_MESSAGES
+    install -c -m 644 $gmofile /usr/local/share/locale/$lang/LC_MESSAGES/xournal.mo
+  done
+
   echo "Installing desktop files and MIME info in /usr/local/share and /usr/share/mimelnk..."
   install -d /usr/local/share/icons/hicolor/scalable/apps
   install -d /usr/local/share/icons/hicolor/scalable/mimetypes
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..3f5b3e5
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,2 @@
+ca
+fr
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..013c8a7
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,10 @@
+# List of source files containing translatable strings.
+
+src/main.c
+src/xo-interface.c
+src/xo-callbacks.c
+src/xo-support.c
+src/xo-file.c
+src/xo-misc.c
+src/xo-print.c
+src/xo-paint.c
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 0000000..4ce2e9d
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,1276 @@
+# Catalan translations for xournal package
+# Traduccions al català del paquet «xournal».
+# Copyright (C) 2009 THE xournal'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xournal package.
+# David Planella <david.planella@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xournal 0.4.2.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-09 21:51+0200\n"
+"PO-Revision-Date: 2009-05-09 21:36+0200\n"
+"Last-Translator: David Planella <david.planella@gmail.com>\n"
+"Language-Team: Catalan\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../xournal.xml.in.h:1 ../x-xoj.desktop.in.h:1
+msgid "Xournal note file"
+msgstr "Fitxers de nota del Xournal"
+
+#: ../xournal.desktop.in.h:1
+msgid "Take handwritten notes"
+msgstr "Preneu notes a mà"
+
+#: ../xournal.desktop.in.h:2 ../maemo/xournal.desktop.in.h:1
+#: ../src/xo-misc.c:1344
+msgid "Xournal"
+msgstr "Xournal"
+
+#: ../maemo/xournal.service.in.h:1
+msgid "com.nokia.xournal"
+msgstr "com.nokia.xournal"
+
+#: ../src/main.c:68
+#, c-format
+msgid ""
+"Invalid command line parameters.\n"
+"Usage: %s [filename.xoj]\n"
+msgstr ""
+
+#: ../src/main.c:241 ../src/xo-callbacks.c:107 ../src/xo-callbacks.c:156
+#: ../src/xo-callbacks.c:3077
+#, c-format
+msgid "Error opening file '%s'"
+msgstr "S'ha produït un error en obrir el fitxer «%s»"
+
+#. user aborted on save confirmation
+#: ../src/xo-callbacks.c:56 ../src/xo-file.c:669
+msgid "Open PDF"
+msgstr "Obre un fitxer PDF"
+
+#: ../src/xo-callbacks.c:61 ../src/xo-callbacks.c:132
+#: ../src/xo-callbacks.c:230 ../src/xo-callbacks.c:413
+#: ../src/xo-callbacks.c:1489 ../src/xo-file.c:674
+msgid "All files"
+msgstr "Tots els fitxers"
+
+#: ../src/xo-callbacks.c:64 ../src/xo-callbacks.c:416 ../src/xo-file.c:677
+msgid "PDF files"
+msgstr "Fitxers PDF"
+
+#: ../src/xo-callbacks.c:72 ../src/xo-callbacks.c:1512
+msgid "Attach file to the journal"
+msgstr "Adjunta el fitxer al diari"
+
+#. user aborted on save confirmation
+#: ../src/xo-callbacks.c:127
+msgid "Open Journal"
+msgstr "Obre un diari"
+
+#: ../src/xo-callbacks.c:135 ../src/xo-callbacks.c:233
+msgid "Xournal files"
+msgstr "Fitxers del Xournal"
+
+#: ../src/xo-callbacks.c:185 ../src/xo-callbacks.c:278
+#, c-format
+msgid "Error saving file '%s'"
+msgstr "S'ha produït un error en desar el fitxer «%s»"
+
+#: ../src/xo-callbacks.c:205
+msgid "Save Journal"
+msgstr "Desa el diari"
+
+#: ../src/xo-callbacks.c:259 ../src/xo-callbacks.c:434
+#, c-format
+msgid "Should the file %s be overwritten?"
+msgstr "Voleu sobreescriure el fitxer %s?"
+
+#: ../src/xo-callbacks.c:390
+msgid "Export to PDF"
+msgstr "Exporta a PDF"
+
+#: ../src/xo-callbacks.c:447
+#, c-format
+msgid "Error creating file '%s'"
+msgstr "S'ha produït un error en crear el fitxer «%s»"
+
+#: ../src/xo-callbacks.c:1484
+msgid "Open Background"
+msgstr "Obre un fons"
+
+#: ../src/xo-callbacks.c:1497
+msgid "Bitmap files"
+msgstr "Fitxers de mapa de bits"
+
+#: ../src/xo-callbacks.c:1505
+msgid "PS/PDF files (as bitmaps)"
+msgstr "Fitxers PS/PDF (com a mapes de bits)"
+
+#: ../src/xo-callbacks.c:1535
+#, c-format
+msgid "Error opening background '%s'"
+msgstr "S'ha produït un error en obrir el fons «%s»"
+
+#: ../src/xo-callbacks.c:2087
+msgid "Select Font"
+msgstr "Seleccioneu el tipus de lletra"
+
+#: ../src/xo-callbacks.c:2448
+msgid ""
+"Drawing is not allowed on the background layer.\n"
+" Switching to Layer 1."
+msgstr ""
+"No es pot dibuixar a la capa de fons.\n"
+" Es commutarà a la capa 1."
+
+#: ../src/xo-file.c:125 ../src/xo-file.c:159
+#, c-format
+msgid "Could not write background '%s'. Continuing anyway."
+msgstr ""
+
+#: ../src/xo-file.c:256
+#, c-format
+msgid "Invalid file contents"
+msgstr "Els continguts del fitxer no són vàlids"
+
+#: ../src/xo-file.c:406
+#, c-format
+msgid "Could not open background '%s'. Setting background to white."
+msgstr ""
+
+#: ../src/xo-file.c:664
+#, c-format
+msgid ""
+"Could not open background '%s'.\n"
+"Select another file?"
+msgstr ""
+
+#: ../src/xo-file.c:777
+#, c-format
+msgid "Could not open background '%s'."
+msgstr ""
+
+#: ../src/xo-file.c:1082
+#, c-format
+msgid "Unable to start PDF loader %s."
+msgstr "No s'ha pogut iniciar el carregador PDF %s."
+
+#: ../src/xo-file.c:1470
+msgid " the display resolution, in pixels per inch"
+msgstr ""
+
+#: ../src/xo-file.c:1473
+msgid " the initial zoom level, in percent"
+msgstr ""
+
+#: ../src/xo-file.c:1476
+msgid " maximize the window at startup (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1479
+msgid " start in full screen mode (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1482
+msgid " the window width in pixels (when not maximized)"
+msgstr ""
+
+#: ../src/xo-file.c:1485
+msgid " the window height in pixels"
+msgstr ""
+
+#: ../src/xo-file.c:1488
+msgid " scrollbar step increment (in pixels)"
+msgstr ""
+
+#: ../src/xo-file.c:1491
+msgid " the step increment in the zoom dialog box"
+msgstr ""
+
+#: ../src/xo-file.c:1494
+msgid " the multiplicative factor for zoom in/out"
+msgstr ""
+
+#: ../src/xo-file.c:1497
+msgid " document view (true = continuous, false = single page)"
+msgstr ""
+
+#: ../src/xo-file.c:1500
+msgid " use XInput extensions (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1503
+msgid " discard Core Pointer events in XInput mode (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1506
+msgid " always map eraser tip to eraser (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1509
+msgid " default path for open/save (leave blank for current directory)"
+msgstr ""
+
+#: ../src/xo-file.c:1512
+msgid " use pressure sensitivity to control pen stroke width (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1515
+msgid " minimum width multiplier"
+msgstr ""
+
+#: ../src/xo-file.c:1518
+msgid " maximum width multiplier"
+msgstr ""
+
+#: ../src/xo-file.c:1521
+msgid ""
+" interface components from top to bottom\n"
+" valid values: drawarea menu main_toolbar pen_toolbar statusbar"
+msgstr ""
+
+#: ../src/xo-file.c:1524
+msgid " interface components in fullscreen mode, from top to bottom"
+msgstr ""
+
+#: ../src/xo-file.c:1527
+msgid " interface has left-handed scrollbar (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1530
+msgid " hide some unwanted menu or toolbar items (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1533
+msgid ""
+" interface items to hide (customize at your own risk!)\n"
+" see source file xo-interface.c for a list of item names"
+msgstr ""
+
+#: ../src/xo-file.c:1536
+msgid ""
+" highlighter opacity (0 to 1, default 0.5)\n"
+" warning: opacity level is not saved in xoj files!"
+msgstr ""
+
+#: ../src/xo-file.c:1539
+msgid " auto-save preferences on exit (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1543
+msgid " the default page width, in points (1/72 in)"
+msgstr ""
+
+#: ../src/xo-file.c:1546
+msgid " the default page height, in points (1/72 in)"
+msgstr ""
+
+#: ../src/xo-file.c:1549
+msgid " the default paper color"
+msgstr ""
+
+#: ../src/xo-file.c:1552
+msgid " the default paper style (plain, lined, ruled, or graph)"
+msgstr ""
+
+#: ../src/xo-file.c:1555
+msgid " apply paper style changes to all pages (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1558
+msgid " preferred unit (cm, in, px, pt)"
+msgstr ""
+
+#: ../src/xo-file.c:1561
+msgid " include paper ruling when printing or exporting to PDF (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1564
+msgid " antialiased bitmap backgrounds (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1567
+msgid " progressive scaling of bitmap backgrounds (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1570
+msgid ""
+" bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)"
+msgstr ""
+
+#: ../src/xo-file.c:1573
+msgid ""
+" bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)"
+msgstr ""
+
+#: ../src/xo-file.c:1577
+msgid ""
+" selected tool at startup (pen, eraser, highlighter, selectrect, vertspace, "
+"hand)"
+msgstr ""
+
+#: ../src/xo-file.c:1580
+msgid " default pen color"
+msgstr ""
+
+#: ../src/xo-file.c:1583
+msgid " default pen thickness (fine = 1, medium = 2, thick = 3)"
+msgstr ""
+
+#: ../src/xo-file.c:1586
+msgid " default pen is in ruler mode (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1589
+msgid " default pen is in shape recognizer mode (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1592
+msgid " default eraser thickness (fine = 1, medium = 2, thick = 3)"
+msgstr ""
+
+#: ../src/xo-file.c:1595
+msgid " default eraser mode (standard = 0, whiteout = 1, strokes = 2)"
+msgstr ""
+
+#: ../src/xo-file.c:1598
+msgid " default highlighter color"
+msgstr ""
+
+#: ../src/xo-file.c:1601
+msgid " default highlighter thickness (fine = 1, medium = 2, thick = 3)"
+msgstr ""
+
+#: ../src/xo-file.c:1604
+msgid " default highlighter is in ruler mode (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1607
+msgid " default highlighter is in shape recognizer mode (true/false)"
+msgstr ""
+
+#: ../src/xo-file.c:1610
+msgid ""
+" button 2 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
+msgstr ""
+
+#: ../src/xo-file.c:1613
+msgid ""
+" button 2 brush linked to primary brush (true/false) (overrides all other "
+"settings)"
+msgstr ""
+
+#: ../src/xo-file.c:1616
+msgid " button 2 brush color (for pen or highlighter only)"
+msgstr ""
+
+#: ../src/xo-file.c:1620
+msgid " button 2 brush thickness (pen, eraser, or highlighter only)"
+msgstr ""
+
+#: ../src/xo-file.c:1624
+msgid " button 2 ruler mode (true/false) (for pen or highlighter only)"
+msgstr ""
+
+#: ../src/xo-file.c:1628
+msgid " button 2 shape recognizer mode (true/false) (pen or highlighter only)"
+msgstr ""
+
+#: ../src/xo-file.c:1632
+msgid " button 2 eraser mode (eraser only)"
+msgstr ""
+
+#: ../src/xo-file.c:1635
+msgid ""
+" button 3 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
+msgstr ""
+
+#: ../src/xo-file.c:1638
+msgid ""
+" button 3 brush linked to primary brush (true/false) (overrides all other "
+"settings)"
+msgstr ""
+
+#: ../src/xo-file.c:1641
+msgid " button 3 brush color (for pen or highlighter only)"
+msgstr ""
+
+#: ../src/xo-file.c:1645
+msgid " button 3 brush thickness (pen, eraser, or highlighter only)"
+msgstr ""
+
+#: ../src/xo-file.c:1649
+msgid " button 3 ruler mode (true/false) (for pen or highlighter only)"
+msgstr ""
+
+#: ../src/xo-file.c:1653
+msgid " button 3 shape recognizer mode (true/false) (pen or highlighter only)"
+msgstr ""
+
+#: ../src/xo-file.c:1657
+msgid " button 3 eraser mode (eraser only)"
+msgstr ""
+
+#: ../src/xo-file.c:1661
+msgid " thickness of the various pens (in points, 1 pt = 1/72 in)"
+msgstr ""
+
+#: ../src/xo-file.c:1667
+msgid " thickness of the various erasers (in points, 1 pt = 1/72 in)"
+msgstr ""
+
+#: ../src/xo-file.c:1672
+msgid " thickness of the various highlighters (in points, 1 pt = 1/72 in)"
+msgstr ""
+
+#: ../src/xo-file.c:1677
+msgid " name of the default font"
+msgstr ""
+
+#: ../src/xo-file.c:1680
+msgid " default font size"
+msgstr ""
+
+#: ../src/xo-file.c:1836
+msgid ""
+" Xournal configuration file.\n"
+" This file is generated automatically upon saving preferences.\n"
+" Use caution when editing this file manually.\n"
+msgstr ""
+
+#. TRANSLATORS: %d refers to the number of pages
+#: ../src/xo-misc.c:1215
+#, c-format
+msgid " of %d"
+msgstr " de %d"
+
+#: ../src/xo-misc.c:1220
+msgid "Background"
+msgstr "Fons"
+
+#: ../src/xo-misc.c:1228
+#, c-format
+msgid "Layer %d"
+msgstr "Capa %d"
+
+#: ../src/xo-misc.c:1350
+#, c-format
+msgid "Xournal - %s"
+msgstr "Xournal - %s"
+
+#: ../src/xo-misc.c:1583
+#, c-format
+msgid "Save changes to '%s'?"
+msgstr "Voleu desar els canvis al fitxer «%s»?"
+
+#: ../src/xo-misc.c:1584
+msgid "Untitled"
+msgstr "Sense títol"
+
+#: ../src/xo-print.c:1577
+msgid "Preparing print job"
+msgstr "S'està preparant la tasca d'impressió"
+
+#: ../src/xo-print.c:1585
+#, c-format
+msgid "Page %d"
+msgstr "Pàgina %d"
+
+#: ../src/xo-print.c:1595
+msgid "Finalizing..."
+msgstr "S'està finalitzant..."
+
+#: ../src/xo-support.c:92 ../src/xo-support.c:116
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "No s'ha trobat el fitxer de mapa de píxels: %s"
+
+#: ../src/xo-support.c:123
+#, c-format
+msgid "Failed to load pixbuf file: %s: %s\n"
+msgstr "No s'ha pogut carregar la memòria intermèdia de píxels: %s: %s\n"
+
+#. TRANSLATORS: This is a top menu
+#: ../src/xo-interface.c:361
+msgid "_File"
+msgstr "_Fitxer"
+
+#: ../src/xo-interface.c:372
+msgid "Annotate PD_F"
+msgstr "Fes notes a un fitxer PD_F"
+
+#: ../src/xo-interface.c:397
+msgid "Recent Doc_uments"
+msgstr "Doc_uments recents"
+
+#: ../src/xo-interface.c:404
+msgid "0"
+msgstr "0"
+
+#: ../src/xo-interface.c:408
+msgid "1"
+msgstr "1"
+
+#: ../src/xo-interface.c:412
+msgid "2"
+msgstr "2"
+
+#: ../src/xo-interface.c:416
+msgid "3"
+msgstr "3"
+
+#: ../src/xo-interface.c:420
+msgid "4"
+msgstr "4"
+
+#: ../src/xo-interface.c:424
+msgid "5"
+msgstr "5"
+
+#: ../src/xo-interface.c:428
+msgid "6"
+msgstr "6"
+
+#: ../src/xo-interface.c:432
+msgid "7"
+msgstr "7"
+
+#: ../src/xo-interface.c:441
+msgid "Print Options"
+msgstr "Opcions d'impressió"
+
+#: ../src/xo-interface.c:456
+msgid "_Export to PDF"
+msgstr "_Exporta a PDF"
+
+#. TRANSLATORS: This is a top menu
+#: ../src/xo-interface.c:473
+msgid "_Edit"
+msgstr "_Edita"
+
+#. TRANSLATORS: This is a top menu
+#: ../src/xo-interface.c:519
+msgid "_View"
+msgstr "_Visualitza"
+
+#: ../src/xo-interface.c:526
+msgid "_Continuous"
+msgstr "_Continu"
+
+#: ../src/xo-interface.c:532
+msgid "_One Page"
+msgstr "Pàgina ú_nica"
+
+#: ../src/xo-interface.c:543
+msgid "Full Screen"
+msgstr "Pantalla completa"
+
+#: ../src/xo-interface.c:555
+msgid "_Zoom"
+msgstr "_Ampliació"
+
+#: ../src/xo-interface.c:583
+msgid "Page _Width"
+msgstr "Amplada de la _pàgina"
+
+#: ../src/xo-interface.c:594
+msgid "_Set Zoom"
+msgstr "_Defineix l'ampliació"
+
+#: ../src/xo-interface.c:603
+msgid "_First Page"
+msgstr "Pàgina _inicial"
+
+#: ../src/xo-interface.c:614
+msgid "_Previous Page"
+msgstr "Pàgina an_terior"
+
+#: ../src/xo-interface.c:625
+msgid "_Next Page"
+msgstr "Pàgina _següent"
+
+#: ../src/xo-interface.c:636
+msgid "_Last Page"
+msgstr "Pàgina _final"
+
+#: ../src/xo-interface.c:652
+msgid "_Show Layer"
+msgstr "_Mostra la capa"
+
+#: ../src/xo-interface.c:660
+msgid "_Hide Layer"
+msgstr "_Oculta la capa"
+
+#. TRANSLATORS: This is a top menu
+#: ../src/xo-interface.c:669
+msgid "_Journal"
+msgstr "_Diari"
+
+#: ../src/xo-interface.c:676
+msgid "New Page _Before"
+msgstr "Pàgina nova a_bans"
+
+#: ../src/xo-interface.c:680
+msgid "New Page _After"
+msgstr "Pàgina nova _després"
+
+#: ../src/xo-interface.c:684
+msgid "New Page At _End"
+msgstr "Pàgina nova al _final"
+
+#: ../src/xo-interface.c:688
+msgid "_Delete Page"
+msgstr "_Suprimeix la pàgina"
+
+#: ../src/xo-interface.c:697
+msgid "_New Layer"
+msgstr "_Capa nova"
+
+#: ../src/xo-interface.c:701
+msgid "Delete La_yer"
+msgstr "Suprimeix la ca_pa"
+
+#: ../src/xo-interface.c:705
+msgid "_Flatten"
+msgstr "A_plana"
+
+#: ../src/xo-interface.c:714
+msgid "Paper Si_ze"
+msgstr "Mida del _paper"
+
+#: ../src/xo-interface.c:718
+msgid "Paper _Color"
+msgstr "_Color del paper"
+
+#: ../src/xo-interface.c:725
+msgid "_white paper"
+msgstr "paper _blanc"
+
+#: ../src/xo-interface.c:731
+msgid "_yellow paper"
+msgstr "paper _groc"
+
+#: ../src/xo-interface.c:737
+msgid "_pink paper"
+msgstr "paper _rosa"
+
+#: ../src/xo-interface.c:743
+msgid "_orange paper"
+msgstr "paper _taronja"
+
+#: ../src/xo-interface.c:749
+msgid "_blue paper"
+msgstr "paper _blau"
+
+#: ../src/xo-interface.c:755
+msgid "_green paper"
+msgstr "paper _verd"
+
+#: ../src/xo-interface.c:761 ../src/xo-interface.c:1032
+msgid "other..."
+msgstr "un altre..."
+
+#: ../src/xo-interface.c:772
+msgid "Paper _Style"
+msgstr "E_stil del paper"
+
+#: ../src/xo-interface.c:779
+msgid "_plain"
+msgstr "_llis"
+
+#: ../src/xo-interface.c:785
+msgid "_lined"
+msgstr "_pautat"
+
+#: ../src/xo-interface.c:791
+msgid "_ruled"
+msgstr "_reglat"
+
+#: ../src/xo-interface.c:797
+msgid "_graph"
+msgstr "_quadriculat"
+
+#: ../src/xo-interface.c:803 ../src/xo-interface.c:1038
+#: ../src/xo-interface.c:1287 ../src/xo-interface.c:1363
+msgid "NA"
+msgstr ""
+
+#: ../src/xo-interface.c:808
+msgid "Apply _To All Pages"
+msgstr "Apli_ca a totes les pàgines"
+
+#: ../src/xo-interface.c:817
+msgid "_Load Background"
+msgstr "_Carrega un fons"
+
+#: ../src/xo-interface.c:825
+msgid "Background Screens_hot"
+msgstr "Ca_ptura de pantalla del fons"
+
+#: ../src/xo-interface.c:834
+msgid "Default _Paper"
+msgstr "Paper p_redeterminat"
+
+#: ../src/xo-interface.c:838
+msgid "Set As De_fault"
+msgstr "Defineix com a _predeterminat"
+
+#. TRANSLATORS: This is a top menu
+#: ../src/xo-interface.c:843
+msgid "_Tools"
+msgstr "Ei_nes"
+
+#: ../src/xo-interface.c:850 ../src/xo-interface.c:1223
+#: ../src/xo-interface.c:1299
+msgid "_Pen"
+msgstr "_Llapis"
+
+#: ../src/xo-interface.c:859 ../src/xo-interface.c:1229
+#: ../src/xo-interface.c:1305
+msgid "_Eraser"
+msgstr "_Esborrador"
+
+#: ../src/xo-interface.c:868 ../src/xo-interface.c:1235
+#: ../src/xo-interface.c:1311
+msgid "_Highlighter"
+msgstr "_Marcador fluorescent"
+
+#: ../src/xo-interface.c:877 ../src/xo-interface.c:1241
+#: ../src/xo-interface.c:1317
+msgid "_Text"
+msgstr "_Text"
+
+#: ../src/xo-interface.c:891
+msgid "_Shape Recognizer"
+msgstr "_Reconeixedor de formes"
+
+#: ../src/xo-interface.c:898
+msgid "Ru_ler"
+msgstr "Reg_le"
+
+#: ../src/xo-interface.c:910 ../src/xo-interface.c:1247
+#: ../src/xo-interface.c:1323
+msgid "Select Re_gion"
+msgstr "Selecciona una re_gió"
+
+#: ../src/xo-interface.c:919 ../src/xo-interface.c:1253
+#: ../src/xo-interface.c:1329
+msgid "Select _Rectangle"
+msgstr "Selecciona un _rectangle"
+
+#: ../src/xo-interface.c:928 ../src/xo-interface.c:1259
+#: ../src/xo-interface.c:1335
+msgid "_Vertical Space"
+msgstr "Espai _vertical"
+
+#: ../src/xo-interface.c:937 ../src/xo-interface.c:1265
+#: ../src/xo-interface.c:1341
+msgid "H_and Tool"
+msgstr "_Eina de mà"
+
+#: ../src/xo-interface.c:950
+msgid "_Color"
+msgstr "_Color"
+
+#: ../src/xo-interface.c:961
+msgid "blac_k"
+msgstr "_negre"
+
+#: ../src/xo-interface.c:967
+msgid "_blue"
+msgstr "_blau"
+
+#: ../src/xo-interface.c:973
+msgid "_red"
+msgstr "_vermell"
+
+#: ../src/xo-interface.c:979
+msgid "_green"
+msgstr "v_erd"
+
+#: ../src/xo-interface.c:985
+msgid "gr_ay"
+msgstr "gri_s"
+
+#: ../src/xo-interface.c:996
+msgid "light bl_ue"
+msgstr "blau _cel"
+
+#: ../src/xo-interface.c:1002
+msgid "light gr_een"
+msgstr "ve_rd clar"
+
+#: ../src/xo-interface.c:1008
+msgid "_magenta"
+msgstr "_magenta"
+
+#: ../src/xo-interface.c:1014
+msgid "_orange"
+msgstr "taron_ja"
+
+#: ../src/xo-interface.c:1020
+msgid "_yellow"
+msgstr "gro_c"
+
+#: ../src/xo-interface.c:1026
+msgid "_white"
+msgstr "b_lanc"
+
+#: ../src/xo-interface.c:1043
+msgid "Pen _Options"
+msgstr "_Opcions del llapis"
+
+#: ../src/xo-interface.c:1050
+msgid "_very fine"
+msgstr "mol_t prim"
+
+#: ../src/xo-interface.c:1056 ../src/xo-interface.c:1087
+#: ../src/xo-interface.c:1135
+msgid "_fine"
+msgstr "_prim"
+
+#: ../src/xo-interface.c:1062 ../src/xo-interface.c:1093
+#: ../src/xo-interface.c:1141
+msgid "_medium"
+msgstr "_mitjà"
+
+#: ../src/xo-interface.c:1068 ../src/xo-interface.c:1099
+#: ../src/xo-interface.c:1147
+msgid "_thick"
+msgstr "_gruixut"
+
+#: ../src/xo-interface.c:1074
+msgid "ver_y thick"
+msgstr "_molt gruixut"
+
+#: ../src/xo-interface.c:1080
+msgid "Eraser Optio_ns"
+msgstr "Opcions de l'_esborrador"
+
+#: ../src/xo-interface.c:1110
+msgid "_standard"
+msgstr "e_stàndard"
+
+#: ../src/xo-interface.c:1116
+msgid "_whiteout"
+msgstr "nete_ja"
+
+#: ../src/xo-interface.c:1122
+msgid "_delete strokes"
+msgstr "su_primeix els traços"
+
+#: ../src/xo-interface.c:1128
+msgid "Highlighter Opt_ions"
+msgstr "Opc_ions del marcador fluorescent"
+
+#: ../src/xo-interface.c:1153
+msgid "Text _Font..."
+msgstr "_Tipus de lletra del text..."
+
+#: ../src/xo-interface.c:1169
+msgid "_Default Pen"
+msgstr "_Llapis predeterminat"
+
+#: ../src/xo-interface.c:1173
+msgid "Default Eraser"
+msgstr "Esborrador predeterminat"
+
+#: ../src/xo-interface.c:1177
+msgid "Default Highlighter"
+msgstr "Marcador fluorescent predeterminat"
+
+#: ../src/xo-interface.c:1181
+msgid "Default Te_xt"
+msgstr "Te_xt predeterminat"
+
+#: ../src/xo-interface.c:1185
+msgid "Set As Default"
+msgstr "Defineix-lo com a predeterminat"
+
+#. TRANSLATORS: This is a top menu
+#: ../src/xo-interface.c:1190
+msgid "_Options"
+msgstr "_Opcions"
+
+#: ../src/xo-interface.c:1197
+msgid "Use _XInput"
+msgstr "Utilitza l'_XInput"
+
+#: ../src/xo-interface.c:1201
+msgid "Discard _Core Events"
+msgstr "Descarta els esdeveniments _primaris"
+
+#. TRANSLATORS: If this option is turned on and the XInput extensions are
+#. enabled, then the eraser tip of the tablet's stylus will automatically be
+#. remapped to the eraser tool
+#: ../src/xo-interface.c:1208
+msgid "_Eraser Tip"
+msgstr "Utilitza la goma del _llapis"
+
+#: ../src/xo-interface.c:1212
+msgid "_Pressure sensitivity"
+msgstr "Sensibilitat de la _pressió"
+
+#: ../src/xo-interface.c:1216
+msgid "Button _2 Mapping"
+msgstr "Mapatge del botó _2"
+
+#: ../src/xo-interface.c:1275 ../src/xo-interface.c:1351
+msgid "_Link to Primary Brush"
+msgstr "_Vincula al pinzell primari"
+
+#: ../src/xo-interface.c:1281 ../src/xo-interface.c:1357
+msgid "_Copy of Current Brush"
+msgstr "_Copia el pinzell actual"
+
+#: ../src/xo-interface.c:1292
+msgid "Button _3 Mapping"
+msgstr "Mapatge del botó _3"
+
+#: ../src/xo-interface.c:1373
+msgid "_Antialiased Bitmaps"
+msgstr "Mapes de bits amb antialiàsin_g"
+
+#: ../src/xo-interface.c:1377
+msgid "_Progressive Backgrounds"
+msgstr "Fons _progressius"
+
+#: ../src/xo-interface.c:1381
+msgid "Print Paper _Ruling"
+msgstr "Imprimeix les _línies del paper"
+
+#: ../src/xo-interface.c:1385
+msgid "Left-Handed Scrollbar"
+msgstr "Barra de desplaçament per a esquerrans"
+
+#: ../src/xo-interface.c:1389
+msgid "Shorten _Menus"
+msgstr "Escurça els _menús"
+
+#: ../src/xo-interface.c:1398
+msgid "A_uto-Save Preferences"
+msgstr "Desa les preferències a_utomàticament"
+
+#: ../src/xo-interface.c:1402
+msgid "_Save Preferences"
+msgstr "_Desa les preferències"
+
+#. TRANSLATORS: This is a top menu
+#: ../src/xo-interface.c:1407
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../src/xo-interface.c:1418
+msgid "_About"
+msgstr "_Quant a"
+
+#: ../src/xo-interface.c:1431
+msgid "Save"
+msgstr "Desa"
+
+#: ../src/xo-interface.c:1436
+msgid "New"
+msgstr "Nova"
+
+#: ../src/xo-interface.c:1441
+msgid "Open"
+msgstr "Obre"
+
+#: ../src/xo-interface.c:1454
+msgid "Cut"
+msgstr "Retalla"
+
+#: ../src/xo-interface.c:1459
+msgid "Copy"
+msgstr "Copia"
+
+#: ../src/xo-interface.c:1464
+msgid "Paste"
+msgstr "Enganxa"
+
+#: ../src/xo-interface.c:1477
+msgid "Undo"
+msgstr "Desfés"
+
+#: ../src/xo-interface.c:1482
+msgid "Redo"
+msgstr "Refés"
+
+#: ../src/xo-interface.c:1495
+msgid "First Page"
+msgstr "Primera pàgina"
+
+#: ../src/xo-interface.c:1500
+msgid "Previous Page"
+msgstr "Pàgina anterior"
+
+#: ../src/xo-interface.c:1505
+msgid "Next Page"
+msgstr "Pàgina següent"
+
+#: ../src/xo-interface.c:1510
+msgid "Last Page"
+msgstr "Pàgina final"
+
+#: ../src/xo-interface.c:1523
+msgid "Zoom Out"
+msgstr "Redueix"
+
+#: ../src/xo-interface.c:1528 ../src/xo-interface.c:3046
+msgid "Page Width"
+msgstr "Amplada de la pàgina"
+
+#: ../src/xo-interface.c:1534
+msgid "Zoom In"
+msgstr "Amplia"
+
+#: ../src/xo-interface.c:1539
+msgid "Normal Size"
+msgstr "Mida normal"
+
+#: ../src/xo-interface.c:1544 ../src/xo-interface.c:3005
+msgid "Set Zoom"
+msgstr "Definiu l'ampliació"
+
+#: ../src/xo-interface.c:1553
+msgid "Toggle Fullscreen"
+msgstr "Commuta la pantalla completa"
+
+#: ../src/xo-interface.c:1562 ../src/xo-interface.c:1568
+msgid "Pen"
+msgstr "Llapis"
+
+#: ../src/xo-interface.c:1573 ../src/xo-interface.c:1579
+msgid "Eraser"
+msgstr "Esborrador"
+
+#: ../src/xo-interface.c:1584 ../src/xo-interface.c:1590
+msgid "Highlighter"
+msgstr "Marcador fluorescent"
+
+#: ../src/xo-interface.c:1595 ../src/xo-interface.c:1601
+msgid "Text"
+msgstr "Text"
+
+#: ../src/xo-interface.c:1606 ../src/xo-interface.c:1612
+msgid "Shape Recognizer"
+msgstr "Reconeixedor de formes"
+
+#: ../src/xo-interface.c:1615 ../src/xo-interface.c:1621
+msgid "Ruler"
+msgstr "Regle"
+
+#: ../src/xo-interface.c:1632 ../src/xo-interface.c:1638
+msgid "Select Region"
+msgstr "Selecciona una regió"
+
+#: ../src/xo-interface.c:1643 ../src/xo-interface.c:1649
+msgid "Select Rectangle"
+msgstr "Selecciona un rectangle"
+
+#: ../src/xo-interface.c:1654 ../src/xo-interface.c:1660
+msgid "Vertical Space"
+msgstr "Espai vertical"
+
+#: ../src/xo-interface.c:1665 ../src/xo-interface.c:1671
+msgid "Hand Tool"
+msgstr "Eina de mà"
+
+#: ../src/xo-interface.c:1685 ../src/xo-interface.c:1689
+msgid "Default"
+msgstr "Predeterminat"
+
+#: ../src/xo-interface.c:1693 ../src/xo-interface.c:1696
+msgid "Default Pen"
+msgstr "Llapis predeterminat"
+
+#: ../src/xo-interface.c:1707 ../src/xo-interface.c:1715
+msgid "Fine"
+msgstr "Prim"
+
+#: ../src/xo-interface.c:1720 ../src/xo-interface.c:1728
+msgid "Medium"
+msgstr "Mitjà"
+
+#: ../src/xo-interface.c:1733 ../src/xo-interface.c:1741
+msgid "Thick"
+msgstr "Gruixut"
+
+#: ../src/xo-interface.c:1760 ../src/xo-interface.c:1767
+msgid "Black"
+msgstr "Negre"
+
+#: ../src/xo-interface.c:1772 ../src/xo-interface.c:1779
+msgid "Blue"
+msgstr "Blau"
+
+#: ../src/xo-interface.c:1784 ../src/xo-interface.c:1791
+msgid "Red"
+msgstr "Vermell"
+
+#: ../src/xo-interface.c:1796 ../src/xo-interface.c:1803
+msgid "Green"
+msgstr "Verd"
+
+#: ../src/xo-interface.c:1808 ../src/xo-interface.c:1815
+msgid "Gray"
+msgstr "Gris"
+
+#: ../src/xo-interface.c:1820 ../src/xo-interface.c:1827
+msgid "Light Blue"
+msgstr "Blau cel"
+
+#: ../src/xo-interface.c:1832 ../src/xo-interface.c:1839
+msgid "Light Green"
+msgstr "Verd clar"
+
+#: ../src/xo-interface.c:1844 ../src/xo-interface.c:1851
+msgid "Magenta"
+msgstr "Magenta"
+
+#: ../src/xo-interface.c:1856 ../src/xo-interface.c:1863
+msgid "Orange"
+msgstr "Taronja"
+
+#: ../src/xo-interface.c:1868 ../src/xo-interface.c:1875
+msgid "Yellow"
+msgstr "Groc"
+
+#: ../src/xo-interface.c:1880 ../src/xo-interface.c:1887
+msgid "White"
+msgstr "Blanc"
+
+#: ../src/xo-interface.c:1923
+msgid "  Page  "
+msgstr "  Pàgina  "
+
+#: ../src/xo-interface.c:1932
+msgid "Set page number"
+msgstr "Defineix el número de pàgina"
+
+#. TRANSLATORS: This text refers to 'Page m of n', where n is the total
+#. number of pages
+#: ../src/xo-interface.c:1938
+msgid " of n"
+msgstr " de n"
+
+#: ../src/xo-interface.c:1946
+msgid "  Layer:  "
+msgstr "  Capa:  "
+
+#: ../src/xo-interface.c:2827
+msgid "Set Paper Size"
+msgstr "Estableix la mida del paper"
+
+#: ../src/xo-interface.c:2839
+msgid "Standard paper sizes:"
+msgstr "Mides de paper estàndard:"
+
+#: ../src/xo-interface.c:2847
+msgid "A4"
+msgstr "A4"
+
+#: ../src/xo-interface.c:2848
+msgid "A4 (landscape)"
+msgstr "A4 (apaïsat)"
+
+#: ../src/xo-interface.c:2849
+msgid "US Letter"
+msgstr "Carta nord-americana"
+
+#: ../src/xo-interface.c:2850
+msgid "US Letter (landscape)"
+msgstr "Carta nord-americana (apaïsat)"
+
+#: ../src/xo-interface.c:2851
+msgid "Custom"
+msgstr "Personalitzada"
+
+#: ../src/xo-interface.c:2878
+msgid "cm"
+msgstr "cm"
+
+#: ../src/xo-interface.c:2879
+msgid "in"
+msgstr "in"
+
+#: ../src/xo-interface.c:2880
+msgid "pixels"
+msgstr "píxels"
+
+#: ../src/xo-interface.c:2881
+msgid "points"
+msgstr "punts"
+
+#: ../src/xo-interface.c:2941
+msgid "About Xournal"
+msgstr "Quant al Xournal"
+
+#: ../src/xo-interface.c:2957
+msgid ""
+"Written by Denis Auroux\n"
+"       http://xournal.sourceforge.net/       "
+msgstr ""
+"Creat per Denis Auroux\n"
+"       http://xournal.sourceforge.net/       "
+
+#: ../src/xo-interface.c:3021
+msgid "Zoom: "
+msgstr "Ampliació: "
+
+#: ../src/xo-interface.c:3039
+msgid "Normal size (100%)"
+msgstr "Mida normal (100%)"
+
+#: ../src/xo-interface.c:3053
+msgid "Page Height"
+msgstr "Alçada de la pàgina"
+
+#: ../src/xo-shapes.c:413
+#, c-format
+msgid "arrow: alpha[%d] = %.1f degrees\n"
+msgstr ""
+
+#: ../src/xo-shapes.c:429
+#, c-format
+msgid "linear tolerance: tip[%d] = %.2f\n"
+msgstr ""
+
+#: ../src/xo-shapes.c:436
+#, c-format
+msgid "sideways gap tolerance = %.2f\n"
+msgstr ""
+
+#: ../src/xo-shapes.c:442
+#, c-format
+msgid "main linear gap = %.2f\n"
+msgstr ""
+
+#: ../src/xo-shapes.c:539
+#, c-format
+msgid ""
+"Mass=%.0f, Center=(%.1f,%.1f), I=(%.0f,%.0f, %.0f), Rad=%.2f, Det=%.4f \n"
+msgstr ""
+
+#: ../src/xo-shapes.c:549
+#, c-format
+msgid "Polygon, %d edges: "
+msgstr ""
+
+#: ../src/xo-shapes.c:551
+#, c-format
+msgid "%d-%d (M=%.0f, det=%.4f) "
+msgstr ""
+
+#: ../src/xo-shapes.c:564
+#, c-format
+msgid "Queue now has %d + %d edges\n"
+msgstr ""
+
+#: ../src/xo-shapes.c:605
+#, c-format
+msgid "Circle score: %.2f\n"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..0034cf5
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,1238 @@
+# French translations for xournal package
+# This file is distributed under the same license as the xournal package.
+# Denis Auroux <auroux@math.mit.edu>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xournal 0.4.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-30 17:00-0700\n"
+"PO-Revision-Date: 2009-08-30 17:00-0700\n"
+"Last-Translator: Denis Auroux <auroux@math.mit.edu\n"
+"Language-Team: French\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/main.c:80
+#, c-format
+msgid ""
+"Invalid command line parameters.\n"
+"Usage: %s [filename.xoj]\n"
+msgstr ""
+"Paramètres de ligne de commande incorrects.\n"
+"Usage: %s [fichier.xoj]\n"
+
+#: src/main.c:286 src/xo-callbacks.c:105 src/xo-callbacks.c:154
+#: src/xo-callbacks.c:3067
+#, c-format
+msgid "Error opening file '%s'"
+msgstr "Erreur lors de l'ouverture du fichier «%s»"
+
+#: src/xo-interface.c:348 src/xo-interface.c:2937 src/xo-misc.c:1373
+msgid "Xournal"
+msgstr ""
+
+#: src/xo-interface.c:358
+msgid "_File"
+msgstr "_Fichier"
+
+#: src/xo-interface.c:369
+msgid "Annotate PD_F"
+msgstr "Annoter PD_F"
+
+#: src/xo-interface.c:394
+msgid "Recent Doc_uments"
+msgstr "Doc_uments récents"
+
+#: src/xo-interface.c:401
+msgid "0"
+msgstr ""
+
+#: src/xo-interface.c:405
+msgid "1"
+msgstr ""
+
+#: src/xo-interface.c:409
+msgid "2"
+msgstr ""
+
+#: src/xo-interface.c:413
+msgid "3"
+msgstr ""
+
+#: src/xo-interface.c:417
+msgid "4"
+msgstr ""
+
+#: src/xo-interface.c:421
+msgid "5"
+msgstr ""
+
+#: src/xo-interface.c:425
+msgid "6"
+msgstr ""
+
+#: src/xo-interface.c:429
+msgid "7"
+msgstr ""
+
+#: src/xo-interface.c:438
+msgid "Print Options"
+msgstr "Options d'impression"
+
+#: src/xo-interface.c:453
+msgid "_Export to PDF"
+msgstr "E_xporter PDF"
+
+#: src/xo-interface.c:469
+msgid "_Edit"
+msgstr "_Edition"
+
+#: src/xo-interface.c:514
+msgid "_View"
+msgstr "_Affichage"
+
+#: src/xo-interface.c:521
+msgid "_Continuous"
+msgstr "_Continu"
+
+#: src/xo-interface.c:527
+msgid "_One Page"
+msgstr "_Une page"
+
+#: src/xo-interface.c:538
+msgid "Full Screen"
+msgstr "Plein écran"
+
+#: src/xo-interface.c:550
+msgid "_Zoom"
+msgstr ""
+
+#: src/xo-interface.c:578
+msgid "Page _Width"
+msgstr "Largeur page"
+
+#: src/xo-interface.c:589
+msgid "_Set Zoom"
+msgstr "Changer zoom"
+
+#: src/xo-interface.c:598
+msgid "_First Page"
+msgstr "Première page"
+
+#: src/xo-interface.c:609
+msgid "_Previous Page"
+msgstr "Page _précédente"
+
+#: src/xo-interface.c:620
+msgid "_Next Page"
+msgstr "Page _suivante"
+
+#: src/xo-interface.c:631
+msgid "_Last Page"
+msgstr "_Dernière page"
+
+#: src/xo-interface.c:647
+msgid "_Show Layer"
+msgstr "Afficher calque"
+
+#: src/xo-interface.c:655
+msgid "_Hide Layer"
+msgstr "Cacher calque"
+
+#: src/xo-interface.c:663
+msgid "_Journal"
+msgstr ""
+
+#: src/xo-interface.c:670
+msgid "New Page _Before"
+msgstr "Nouvelle page a_vant"
+
+#: src/xo-interface.c:674
+msgid "New Page _After"
+msgstr "Nouvelle page _après"
+
+#: src/xo-interface.c:678
+msgid "New Page At _End"
+msgstr "Nouvelle page à la _fin"
+
+#: src/xo-interface.c:682
+msgid "_Delete Page"
+msgstr "Supprimer page"
+
+#: src/xo-interface.c:691
+msgid "_New Layer"
+msgstr "Nouveau calque"
+
+#: src/xo-interface.c:695
+msgid "Delete La_yer"
+msgstr "Supprimer calque"
+
+#: src/xo-interface.c:699
+msgid "_Flatten"
+msgstr "_Aplatir"
+
+#: src/xo-interface.c:708
+msgid "Paper Si_ze"
+msgstr "_Taille du papier"
+
+#: src/xo-interface.c:712
+msgid "Paper _Color"
+msgstr "_Couleur du papier"
+
+#: src/xo-interface.c:719
+msgid "_white paper"
+msgstr "papier _blanc"
+
+#: src/xo-interface.c:725
+msgid "_yellow paper"
+msgstr "papier _jaune"
+
+#: src/xo-interface.c:731
+msgid "_pink paper"
+msgstr "papier _rose"
+
+#: src/xo-interface.c:737
+msgid "_orange paper"
+msgstr "papier _orange"
+
+#: src/xo-interface.c:743
+msgid "_blue paper"
+msgstr "papier b_leu"
+
+#: src/xo-interface.c:749
+msgid "_green paper"
+msgstr "papier _vert"
+
+#: src/xo-interface.c:755 src/xo-interface.c:1025
+msgid "other..."
+msgstr "autre..."
+
+#: src/xo-interface.c:761 src/xo-interface.c:797 src/xo-interface.c:1031
+#: src/xo-interface.c:1276 src/xo-interface.c:1352
+msgid "NA"
+msgstr ""
+
+#: src/xo-interface.c:766
+msgid "Paper _Style"
+msgstr "_Style de papier "
+
+#: src/xo-interface.c:773
+msgid "_plain"
+msgstr "_vierge"
+
+#: src/xo-interface.c:779
+msgid "_lined"
+msgstr "_lignes"
+
+#: src/xo-interface.c:785
+msgid "_ruled"
+msgstr "_marge"
+
+#: src/xo-interface.c:791
+msgid "_graph"
+msgstr "_carreaux"
+
+#: src/xo-interface.c:802
+msgid "Apply _To All Pages"
+msgstr "Appliquer à toutes les pages"
+
+#: src/xo-interface.c:811
+msgid "_Load Background"
+msgstr "_Ouvrir fond de page"
+
+#: src/xo-interface.c:819
+msgid "Background Screens_hot"
+msgstr "Ca_pture écran"
+
+#: src/xo-interface.c:828
+msgid "Default _Paper"
+msgstr "Papier par défaut"
+
+#: src/xo-interface.c:832
+msgid "Set As De_fault"
+msgstr "Définir papier par défaut"
+
+#: src/xo-interface.c:836
+msgid "_Tools"
+msgstr "_Outils"
+
+#: src/xo-interface.c:843 src/xo-interface.c:1212 src/xo-interface.c:1288
+msgid "_Pen"
+msgstr "St_ylo"
+
+#: src/xo-interface.c:852 src/xo-interface.c:1218 src/xo-interface.c:1294
+msgid "_Eraser"
+msgstr "_Gomme"
+
+#: src/xo-interface.c:861 src/xo-interface.c:1224 src/xo-interface.c:1300
+msgid "_Highlighter"
+msgstr "_Surligneur"
+
+#: src/xo-interface.c:870 src/xo-interface.c:1230 src/xo-interface.c:1306
+msgid "_Text"
+msgstr "_Texte"
+
+#: src/xo-interface.c:884
+msgid "_Shape Recognizer"
+msgstr "_Détection de formes"
+
+#: src/xo-interface.c:891
+msgid "Ru_ler"
+msgstr "Règle"
+
+#: src/xo-interface.c:903 src/xo-interface.c:1236 src/xo-interface.c:1312
+msgid "Select Re_gion"
+msgstr "Sé_lection région"
+
+#: src/xo-interface.c:912 src/xo-interface.c:1242 src/xo-interface.c:1318
+msgid "Select _Rectangle"
+msgstr "Sélection _rectangle"
+
+#: src/xo-interface.c:921 src/xo-interface.c:1248 src/xo-interface.c:1324
+msgid "_Vertical Space"
+msgstr "Espace _vertical"
+
+#: src/xo-interface.c:930 src/xo-interface.c:1254 src/xo-interface.c:1330
+msgid "H_and Tool"
+msgstr "Outil main"
+
+#: src/xo-interface.c:943
+msgid "_Color"
+msgstr "_Couleur"
+
+#: src/xo-interface.c:954
+msgid "blac_k"
+msgstr "_noir"
+
+#: src/xo-interface.c:960
+msgid "_blue"
+msgstr "_bleu"
+
+#: src/xo-interface.c:966
+msgid "_red"
+msgstr "_rouge"
+
+#: src/xo-interface.c:972
+msgid "_green"
+msgstr "_vert"
+
+#: src/xo-interface.c:978
+msgid "gr_ay"
+msgstr "_gris"
+
+#: src/xo-interface.c:989
+msgid "light bl_ue"
+msgstr "bleu _clair"
+
+#: src/xo-interface.c:995
+msgid "light gr_een"
+msgstr "vert c_lair"
+
+#: src/xo-interface.c:1001
+msgid "_magenta"
+msgstr "_magenta"
+
+#: src/xo-interface.c:1007
+msgid "_orange"
+msgstr ""
+
+#: src/xo-interface.c:1013
+msgid "_yellow"
+msgstr "_jaune"
+
+#: src/xo-interface.c:1019
+msgid "_white"
+msgstr "_blanc"
+
+#: src/xo-interface.c:1036
+msgid "Pen _Options"
+msgstr "_Options du stylo"
+
+#: src/xo-interface.c:1043
+msgid "_very fine"
+msgstr "_très fin"
+
+#: src/xo-interface.c:1049 src/xo-interface.c:1080 src/xo-interface.c:1128
+msgid "_fine"
+msgstr "_fin"
+
+#: src/xo-interface.c:1055 src/xo-interface.c:1086 src/xo-interface.c:1134
+msgid "_medium"
+msgstr "_moyen"
+
+#: src/xo-interface.c:1061 src/xo-interface.c:1092 src/xo-interface.c:1140
+msgid "_thick"
+msgstr "é_pais"
+
+#: src/xo-interface.c:1067
+msgid "ver_y thick"
+msgstr "t_rès épais"
+
+#: src/xo-interface.c:1073
+msgid "Eraser Optio_ns"
+msgstr "Optio_ns de la gomme"
+
+#: src/xo-interface.c:1103
+msgid "_standard"
+msgstr ""
+
+#: src/xo-interface.c:1109
+msgid "_whiteout"
+msgstr "_blanc"
+
+#: src/xo-interface.c:1115
+msgid "_delete strokes"
+msgstr "_effacer traits entiers"
+
+#: src/xo-interface.c:1121
+msgid "Highlighter Opt_ions"
+msgstr "Options du surligneur"
+
+#: src/xo-interface.c:1146
+msgid "Text _Font..."
+msgstr "_Police de texte..."
+
+#: src/xo-interface.c:1162
+msgid "_Default Pen"
+msgstr "Stylo par défaut"
+
+#: src/xo-interface.c:1166
+msgid "Default Eraser"
+msgstr "Gomme par défaut"
+
+#: src/xo-interface.c:1170
+msgid "Default Highlighter"
+msgstr "Surligneur par défaut"
+
+#: src/xo-interface.c:1174
+msgid "Default Te_xt"
+msgstr "Texte par défaut"
+
+#: src/xo-interface.c:1178
+msgid "Set As Default"
+msgstr "Définir outil par défaut"
+
+#: src/xo-interface.c:1182
+msgid "_Options"
+msgstr "O_ptions"
+
+#: src/xo-interface.c:1189
+msgid "Use _XInput"
+msgstr "Utiliser XInput"
+
+#: src/xo-interface.c:1193
+msgid "Discard _Core Events"
+msgstr "Ignorer le pointeur principal"
+
+#: src/xo-interface.c:1197
+msgid "_Eraser Tip"
+msgstr "Pointe gomme"
+
+#: src/xo-interface.c:1201
+msgid "_Pressure sensitivity"
+msgstr "Sensible à la pression"
+
+#: src/xo-interface.c:1205
+msgid "Button _2 Mapping"
+msgstr "Bouton _2"
+
+#: src/xo-interface.c:1264 src/xo-interface.c:1340
+msgid "_Link to Primary Brush"
+msgstr "_Lié au pinceau principal"
+
+#: src/xo-interface.c:1270 src/xo-interface.c:1346
+msgid "_Copy of Current Brush"
+msgstr "_Copie du pinceau actuel"
+
+#: src/xo-interface.c:1281
+msgid "Button _3 Mapping"
+msgstr "Bouton _3"
+
+#: src/xo-interface.c:1362
+msgid "_Antialiased Bitmaps"
+msgstr "Anticrénelage des bitmaps"
+
+#: src/xo-interface.c:1366
+msgid "_Progressive Backgrounds"
+msgstr "Fonds progressifs"
+
+#: src/xo-interface.c:1370
+msgid "Print Paper _Ruling"
+msgstr "Imprimer les lignes du papier"
+
+#: src/xo-interface.c:1374
+msgid "Left-Handed Scrollbar"
+msgstr "Barre de défilement à gauche"
+
+#: src/xo-interface.c:1378
+msgid "Shorten _Menus"
+msgstr "Raccourcir les menus"
+
+#: src/xo-interface.c:1387
+msgid "A_uto-Save Preferences"
+msgstr "Enregistrement automatique des préférences"
+
+#: src/xo-interface.c:1391
+msgid "_Save Preferences"
+msgstr "_Enregistrer les préférences"
+
+#: src/xo-interface.c:1395
+msgid "_Help"
+msgstr "_Aide"
+
+#: src/xo-interface.c:1406
+msgid "_About"
+msgstr "_A propos de"
+
+#: src/xo-interface.c:1419
+msgid "Save"
+msgstr "Enregistrer"
+
+#: src/xo-interface.c:1424
+msgid "New"
+msgstr "Nouveau"
+
+#: src/xo-interface.c:1429
+msgid "Open"
+msgstr "Ouvrir"
+
+#: src/xo-interface.c:1442
+msgid "Cut"
+msgstr "Couper"
+
+#: src/xo-interface.c:1447
+msgid "Copy"
+msgstr "Copier"
+
+#: src/xo-interface.c:1452
+msgid "Paste"
+msgstr "Coller"
+
+#: src/xo-interface.c:1465
+msgid "Undo"
+msgstr "Annuler"
+
+#: src/xo-interface.c:1470
+msgid "Redo"
+msgstr "Répéter"
+
+#: src/xo-interface.c:1483
+msgid "First Page"
+msgstr "Première page"
+
+#: src/xo-interface.c:1488
+msgid "Previous Page"
+msgstr "Page précédente"
+
+#: src/xo-interface.c:1493
+msgid "Next Page"
+msgstr "Page suivante"
+
+#: src/xo-interface.c:1498
+msgid "Last Page"
+msgstr "Dernière page"
+
+#: src/xo-interface.c:1511
+msgid "Zoom Out"
+msgstr "Zoom arrière"
+
+#: src/xo-interface.c:1516 src/xo-interface.c:3031
+msgid "Page Width"
+msgstr "Largeur page"
+
+#: src/xo-interface.c:1522
+msgid "Zoom In"
+msgstr "Zoom avant"
+
+#: src/xo-interface.c:1527
+msgid "Normal Size"
+msgstr "Taille normale"
+
+#: src/xo-interface.c:1532 src/xo-interface.c:2990
+msgid "Set Zoom"
+msgstr "Réglage zoom"
+
+#: src/xo-interface.c:1541
+msgid "Toggle Fullscreen"
+msgstr "Plein écran"
+
+#: src/xo-interface.c:1550
+msgid "Pencil"
+msgstr "Stylo"
+
+#: src/xo-interface.c:1556
+msgid "Pen"
+msgstr "Stylo"
+
+#: src/xo-interface.c:1561 src/xo-interface.c:1567
+msgid "Eraser"
+msgstr "Gomme"
+
+#: src/xo-interface.c:1572 src/xo-interface.c:1578
+msgid "Highlighter"
+msgstr "Surligneur"
+
+#: src/xo-interface.c:1583 src/xo-interface.c:1589
+msgid "Text"
+msgstr "Texte"
+
+#: src/xo-interface.c:1594 src/xo-interface.c:1600
+msgid "Shape Recognizer"
+msgstr "Détection de formes"
+
+#: src/xo-interface.c:1603 src/xo-interface.c:1609
+msgid "Ruler"
+msgstr "Règle"
+
+#: src/xo-interface.c:1620 src/xo-interface.c:1626
+msgid "Select Region"
+msgstr "Sélection région"
+
+#: src/xo-interface.c:1631 src/xo-interface.c:1637
+msgid "Select Rectangle"
+msgstr "Sélection rectangle"
+
+#: src/xo-interface.c:1642 src/xo-interface.c:1648
+msgid "Vertical Space"
+msgstr "Espace vertical"
+
+#: src/xo-interface.c:1653
+msgid "Hand Tool"
+msgstr "Outil main"
+
+#: src/xo-interface.c:1672 src/xo-interface.c:1676
+msgid "Default"
+msgstr "Réglages par défaut"
+
+#: src/xo-interface.c:1680 src/xo-interface.c:1683
+msgid "Default Pen"
+msgstr "Stylo par défaut"
+
+#: src/xo-interface.c:1694 src/xo-interface.c:1702
+msgid "Fine"
+msgstr "Fin"
+
+#: src/xo-interface.c:1707 src/xo-interface.c:1715
+msgid "Medium"
+msgstr "Moyen"
+
+#: src/xo-interface.c:1720 src/xo-interface.c:1728
+msgid "Thick"
+msgstr "Epais"
+
+#: src/xo-interface.c:1747 src/xo-interface.c:1754
+msgid "Black"
+msgstr "Noir"
+
+#: src/xo-interface.c:1759 src/xo-interface.c:1766
+msgid "Blue"
+msgstr "Bleu"
+
+#: src/xo-interface.c:1771 src/xo-interface.c:1778
+msgid "Red"
+msgstr "Rouge"
+
+#: src/xo-interface.c:1783 src/xo-interface.c:1790
+msgid "Green"
+msgstr "Vert"
+
+#: src/xo-interface.c:1795 src/xo-interface.c:1802
+msgid "Gray"
+msgstr "Gris"
+
+#: src/xo-interface.c:1807 src/xo-interface.c:1814
+msgid "Light Blue"
+msgstr "Bleu clair"
+
+#: src/xo-interface.c:1819 src/xo-interface.c:1826
+msgid "Light Green"
+msgstr "Vert clair"
+
+#: src/xo-interface.c:1831 src/xo-interface.c:1838
+msgid "Magenta"
+msgstr ""
+
+#: src/xo-interface.c:1843 src/xo-interface.c:1850
+msgid "Orange"
+msgstr ""
+
+#: src/xo-interface.c:1855 src/xo-interface.c:1862
+msgid "Yellow"
+msgstr "Jaune"
+
+#: src/xo-interface.c:1867 src/xo-interface.c:1874
+msgid "White"
+msgstr "Blanc"
+
+#: src/xo-interface.c:1910
+msgid "  Page  "
+msgstr ""
+
+#: src/xo-interface.c:1918
+msgid "Set page number"
+msgstr "Changer de page"
+
+#: src/xo-interface.c:1922
+msgid " of n"
+msgstr " de n"
+
+#: src/xo-interface.c:1930
+msgid "  Layer:  "
+msgstr "  Calque :  "
+
+#: src/xo-interface.c:2812
+msgid "Set Paper Size"
+msgstr "Taille du papier"
+
+#: src/xo-interface.c:2824
+msgid "Standard paper sizes:"
+msgstr "Tailles de papier standard:"
+
+#: src/xo-interface.c:2832
+msgid "A4"
+msgstr ""
+
+#: src/xo-interface.c:2833
+msgid "A4 (landscape)"
+msgstr "A4 (paysage)"
+
+#: src/xo-interface.c:2834
+msgid "US Letter"
+msgstr "Lettre (US)"
+
+#: src/xo-interface.c:2835
+msgid "US Letter (landscape)"
+msgstr "Lettre (US) (paysage)"
+
+#: src/xo-interface.c:2836
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: src/xo-interface.c:2842
+msgid "Width:"
+msgstr "Largeur:"
+
+#: src/xo-interface.c:2851
+msgid "Height:"
+msgstr "Hauteur:"
+
+#: src/xo-interface.c:2863
+msgid "cm"
+msgstr ""
+
+#: src/xo-interface.c:2864
+msgid "in"
+msgstr ""
+
+#: src/xo-interface.c:2865
+msgid "pixels"
+msgstr ""
+
+#: src/xo-interface.c:2866
+msgid "points"
+msgstr ""
+
+#: src/xo-interface.c:2926
+msgid "About Xournal"
+msgstr "A propos de Xournal"
+
+#: src/xo-interface.c:2942
+msgid ""
+"Written by Denis Auroux\n"
+"       http://xournal.sourceforge.net/       "
+msgstr ""
+"Ecrit par Denis Auroux\n"
+"       http://xournal.sourceforge.net/       "
+
+#: src/xo-interface.c:3006
+msgid "Zoom: "
+msgstr ""
+
+#: src/xo-interface.c:3019
+msgid "%"
+msgstr ""
+
+#: src/xo-interface.c:3024
+msgid "Normal size (100%)"
+msgstr "Taille normale (100%)"
+
+#: src/xo-interface.c:3038
+msgid "Page Height"
+msgstr "Hauteur page"
+
+#. user aborted on save confirmation
+#: src/xo-callbacks.c:54 src/xo-file.c:664
+msgid "Open PDF"
+msgstr "Ouvrir PDF"
+
+#: src/xo-callbacks.c:59 src/xo-callbacks.c:130 src/xo-callbacks.c:228
+#: src/xo-callbacks.c:411 src/xo-callbacks.c:1482 src/xo-file.c:669
+msgid "All files"
+msgstr "Tous"
+
+#: src/xo-callbacks.c:62 src/xo-callbacks.c:414 src/xo-file.c:672
+msgid "PDF files"
+msgstr "Fichiers PDF"
+
+#: src/xo-callbacks.c:70 src/xo-callbacks.c:1505
+msgid "Attach file to the journal"
+msgstr "Attacher le fichier au journal"
+
+#. user aborted on save confirmation
+#: src/xo-callbacks.c:125
+msgid "Open Journal"
+msgstr "Ouvrir le journal"
+
+#: src/xo-callbacks.c:133 src/xo-callbacks.c:231
+msgid "Xournal files"
+msgstr "Fichiers Xournal"
+
+#: src/xo-callbacks.c:183 src/xo-callbacks.c:276
+#, c-format
+msgid "Error saving file '%s'"
+msgstr "Erreur lors de l'enregistrement du fichier «%s»"
+
+#: src/xo-callbacks.c:203
+msgid "Save Journal"
+msgstr "Enregistrer le journal"
+
+#: src/xo-callbacks.c:257 src/xo-callbacks.c:432
+#, c-format
+msgid "Should the file %s be overwritten?"
+msgstr "Ecraser le contenu du fichier %s ?"
+
+#. end
+#: src/xo-callbacks.c:329
+msgid "Print"
+msgstr "Imprimer"
+
+#: src/xo-callbacks.c:332
+msgid "Current page"
+msgstr "Page actuelle"
+
+#: src/xo-callbacks.c:332
+msgid "Pages"
+msgstr "Pages"
+
+#: src/xo-callbacks.c:388
+msgid "Export to PDF"
+msgstr "Exporter PDF"
+
+#: src/xo-callbacks.c:445
+#, c-format
+msgid "Error creating file '%s'"
+msgstr "Erreur de création du fichier «%s»"
+
+#: src/xo-callbacks.c:1477
+msgid "Open Background"
+msgstr "Ouvrir un fond de page"
+
+#: src/xo-callbacks.c:1490
+msgid "Bitmap files"
+msgstr "Fichiers bitmap"
+
+#: src/xo-callbacks.c:1498
+msgid "PS/PDF files (as bitmaps)"
+msgstr "Fichiers PS/PDF (comme bitmaps)"
+
+#: src/xo-callbacks.c:1528
+#, c-format
+msgid "Error opening background '%s'"
+msgstr "Erreur d'ouverture du fond «%s»"
+
+#: src/xo-callbacks.c:2080
+msgid "Select Font"
+msgstr "Choisir une police"
+
+#: src/xo-callbacks.c:2439
+msgid ""
+"Drawing is not allowed on the background layer.\n"
+" Switching to Layer 1."
+msgstr ""
+"Impossible de dessiner sur le calque de fond.\n"
+" Affichage du calque 1."
+
+#: src/xo-support.c:90 src/xo-support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Fichier pixmap non trouvé: %s"
+
+#: src/xo-support.c:121
+#, c-format
+msgid "Failed to load pixbuf file: %s: %s\n"
+msgstr "Erreur de chargement du fichier pixmap: %s: %s\n"
+
+#: src/xo-file.c:122 src/xo-file.c:154
+#, c-format
+msgid "Could not write background '%s'. Continuing anyway."
+msgstr "Impossible d'écrire le fond «%s». Poursuite de l'enregistrement."
+
+#: src/xo-file.c:251
+#, c-format
+msgid "Invalid file contents"
+msgstr "Contenu du fichier invalide"
+
+#: src/xo-file.c:401
+#, c-format
+msgid "Could not open background '%s'. Setting background to white."
+msgstr "Impossible d'ouvrir le fond «%s». Le fond restera blanc."
+
+#: src/xo-file.c:659
+#, c-format
+msgid ""
+"Could not open background '%s'.\n"
+"Select another file?"
+msgstr ""
+"Impossible d'ouvrir le fond «%s».\n"
+"Choisir un autre fichier ?"
+
+#: src/xo-file.c:772
+#, c-format
+msgid "Could not open background '%s'."
+msgstr "Impossible d'ouvrir le fond «%s»."
+
+#: src/xo-file.c:999
+msgid "Unable to render one or more PDF pages."
+msgstr "Impossible d'afficher une ou plusieurs pages du fichier PDF."
+
+#: src/xo-file.c:1382
+msgid " the display resolution, in pixels per inch"
+msgstr " la résolution d'affichage, en pixels par pouce"
+
+#: src/xo-file.c:1385
+msgid " the initial zoom level, in percent"
+msgstr " le niveau de zoom initial, en %"
+
+#: src/xo-file.c:1388
+msgid " maximize the window at startup (true/false)"
+msgstr " maximiser la fenêtre au démarrage (true/false)"
+
+#: src/xo-file.c:1391
+msgid " start in full screen mode (true/false)"
+msgstr " démarrer en mode plein écran (true/false)"
+
+#: src/xo-file.c:1394
+msgid " the window width in pixels (when not maximized)"
+msgstr " largeur de la fenêtre en pixels (si non maximisée)"
+
+#: src/xo-file.c:1397
+msgid " the window height in pixels"
+msgstr " hauteur de la fenêtre en pixels"
+
+#: src/xo-file.c:1400
+msgid " scrollbar step increment (in pixels)"
+msgstr " incrément de la barre de défilement (en pixels)"
+
+#: src/xo-file.c:1403
+msgid " the step increment in the zoom dialog box"
+msgstr " incrément dans la boîte de dialogue zoom"
+
+#: src/xo-file.c:1406
+msgid " the multiplicative factor for zoom in/out"
+msgstr " facteur multiplicatif du zoom avant/arrière"
+
+#: src/xo-file.c:1409
+msgid " document view (true = continuous, false = single page)"
+msgstr " affichage du document (true = continu, false = une seule page)"
+
+#: src/xo-file.c:1412
+msgid " use XInput extensions (true/false)"
+msgstr " utiliser les extensions XInput (true/false)"
+
+#: src/xo-file.c:1415
+msgid " discard Core Pointer events in XInput mode (true/false)"
+msgstr " supprimer les évènements du pointeur principal en mode XInput (true/false)"
+
+#: src/xo-file.c:1418
+msgid " always map eraser tip to eraser (true/false)"
+msgstr " toujours utiliser la pointe gomme comme gomme (true/false)"
+
+#: src/xo-file.c:1421
+msgid " default path for open/save (leave blank for current directory)"
+msgstr " dossier d'ouverture/enregistrement par défaut (laisser vierge pour dossier courant)"
+
+#: src/xo-file.c:1424
+msgid " use pressure sensitivity to control pen stroke width (true/false)"
+msgstr " utiliser la sensibilité à la pression pour contrôler la largeur des traits de stylo (true/false)"
+
+#: src/xo-file.c:1427
+msgid " minimum width multiplier"
+msgstr " multiplicateur de largeur minimum"
+
+#: src/xo-file.c:1430
+msgid " maximum width multiplier"
+msgstr " multiplicateur de largeur maximum"
+
+#: src/xo-file.c:1433
+msgid ""
+" interface components from top to bottom\n"
+" valid values: drawarea menu main_toolbar pen_toolbar statusbar"
+msgstr ""
+" composants d'interface de haut en bas\n"
+" valeurs permises: drawarea menu main_toolbar pen_toolbar statusbar"
+
+#: src/xo-file.c:1436
+msgid " interface components in fullscreen mode, from top to bottom"
+msgstr " composants d'interface en mode plein écran, de haut en bas"
+
+#: src/xo-file.c:1439
+msgid " interface has left-handed scrollbar (true/false)"
+msgstr " barre de défilement à gauche (true/false)"
+
+#: src/xo-file.c:1442
+msgid " hide some unwanted menu or toolbar items (true/false)"
+msgstr " cacher certains éléments d'interface (true/false)"
+
+#: src/xo-file.c:1445
+msgid ""
+" interface items to hide (customize at your own risk!)\n"
+" see source file xo-interface.c for a list of item names"
+msgstr ""
+" éléments d'interface à cacher (personnaliser avec précaution!)\n"
+" voir le fichier source xo-interface.c pour une liste de noms d'éléments"
+
+#: src/xo-file.c:1448
+msgid ""
+" highlighter opacity (0 to 1, default 0.5)\n"
+" warning: opacity level is not saved in xoj files!"
+msgstr ""
+" opacité du surligneur (entre 0 et 1, défaut 0.5)\n"
+" attention: le niveau d'opacité n'est pas enregistré dans les fichiers xoj !"
+
+#: src/xo-file.c:1451
+msgid " auto-save preferences on exit (true/false)"
+msgstr " sauvegarde automatique des préférences en fin de session (true/false)"
+
+#: src/xo-file.c:1455
+msgid " the default page width, in points (1/72 in)"
+msgstr " largeur de page par défaut, en points (1/72 pouce)"
+
+#: src/xo-file.c:1458
+msgid " the default page height, in points (1/72 in)"
+msgstr " hauteur de page par défaut, en points"
+
+#: src/xo-file.c:1461
+msgid " the default paper color"
+msgstr " couleur de papier par défaut"
+
+#: src/xo-file.c:1464
+msgid " the default paper style (plain, lined, ruled, or graph)"
+msgstr " style de papier par défaut (plain, lined, ruled, ou graph)"
+
+#: src/xo-file.c:1467
+msgid " apply paper style changes to all pages (true/false)"
+msgstr " appliquer les changements de style de papier à toutes les pages (true/false)"
+
+#: src/xo-file.c:1470
+msgid " preferred unit (cm, in, px, pt)"
+msgstr " unité préférée (cm, in, px, pt)"
+
+#: src/xo-file.c:1473
+msgid " include paper ruling when printing or exporting to PDF (true/false)"
+msgstr " inclure les lignes du papier lors de l'impression ou exportation vers PDF (true/false)"
+
+#: src/xo-file.c:1476
+msgid " antialiased bitmap backgrounds (true/false)"
+msgstr " anticrénelage des fonds bitmap (true/false)"
+
+#: src/xo-file.c:1479
+msgid " just-in-time update of page backgrounds (true/false)"
+msgstr " mise à jour en temps réel des fonds de page (true/false)"
+
+#: src/xo-file.c:1482
+msgid ""
+" bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)"
+msgstr ""
+" résolution bitmap des fonds PS/PDF produits via ghostscript (dpi)"
+
+#: src/xo-file.c:1485
+msgid ""
+" bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)"
+msgstr ""
+" résolution bitmap des fonds PDF lors de l'impression via libgnomeprint (dpi)"
+
+#: src/xo-file.c:1489
+msgid ""
+" selected tool at startup (pen, eraser, highlighter, selectrect, vertspace, "
+"hand)"
+msgstr ""
+" outil sélectionné au démarrage (pen, eraser, highlighter, selectrect, vertspace, hand)"  
+
+#: src/xo-file.c:1492
+msgid " default pen color"
+msgstr " couleur du stylo par défaut"
+
+#: src/xo-file.c:1495
+msgid " default pen thickness (fine = 1, medium = 2, thick = 3)"
+msgstr " épaisseur du stylo par défaut (fin = 1, moyen = 2, épais = 3)"
+
+#: src/xo-file.c:1498
+msgid " default pen is in ruler mode (true/false)"
+msgstr " stylo par défaut est en mode règle (true/false)"
+
+#: src/xo-file.c:1501
+msgid " default pen is in shape recognizer mode (true/false)"
+msgstr " stylo par défaut est en mode détection de formes (true/false)"
+
+#: src/xo-file.c:1504
+msgid " default eraser thickness (fine = 1, medium = 2, thick = 3)"
+msgstr " épaisseur de la gomme par défaut (fin = 1, moyen = 2, épais = 3)"
+
+#: src/xo-file.c:1507
+msgid " default eraser mode (standard = 0, whiteout = 1, strokes = 2)"
+msgstr " mode de la gomme par défaut (standard = 0, blanc = 1, traits entiers = 2)"
+
+#: src/xo-file.c:1510
+msgid " default highlighter color"
+msgstr " couleur du surligneur par défaut"
+
+#: src/xo-file.c:1513
+msgid " default highlighter thickness (fine = 1, medium = 2, thick = 3)"
+msgstr " épaisseur du surligneur par défaut (fin = 1, moyen = 2, épais = 3)"
+
+#: src/xo-file.c:1516
+msgid " default highlighter is in ruler mode (true/false)"
+msgstr " surligneur par défaut est en mode règle (true/false)"
+
+#: src/xo-file.c:1519
+msgid " default highlighter is in shape recognizer mode (true/false)"
+msgstr " surligneur par défaut est en mode détection de formes (true/false)"
+
+#: src/xo-file.c:1522
+msgid ""
+" button 2 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
+msgstr " outil bouton 2 (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
+
+#: src/xo-file.c:1525
+msgid ""
+" button 2 brush linked to primary brush (true/false) (overrides all other "
+"settings)"
+msgstr " outil bouton 2 lié à l'outil principal (true/false) (remplace tous "
+"les autres réglages)"
+
+#: src/xo-file.c:1528
+msgid " button 2 brush color (for pen or highlighter only)"
+msgstr " couleur de brosse bouton 2 (stylo ou surligneur seulement)"
+
+#: src/xo-file.c:1532
+msgid " button 2 brush thickness (pen, eraser, or highlighter only)"
+msgstr " épaisseur de brosse bouton 2 (stylo, gomme, surligneur seulement)"
+
+#: src/xo-file.c:1536
+msgid " button 2 ruler mode (true/false) (for pen or highlighter only)"
+msgstr " bouton 2 en mode règle (true/false) (stylo ou surligneur seulement)"
+
+#: src/xo-file.c:1540
+msgid " button 2 shape recognizer mode (true/false) (pen or highlighter only)"
+msgstr " bouton 2 en mode détection de formes (true/false) (stylo ou surligneur seulement)"
+
+#: src/xo-file.c:1544
+msgid " button 2 eraser mode (eraser only)"
+msgstr " options de la gomme bouton 2 (gomme seulement)"
+
+#: src/xo-file.c:1547
+msgid ""
+" button 3 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
+msgstr ""
+" outil bouton 3 (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
+
+#: src/xo-file.c:1550
+msgid ""
+" button 3 brush linked to primary brush (true/false) (overrides all other "
+"settings)"
+msgstr ""
+" outil bouton 3 lié à l'outil principal (true/false) (remplace tous "
+"les autres réglages)"
+
+#: src/xo-file.c:1553
+msgid " button 3 brush color (for pen or highlighter only)"
+msgstr " couleur de brosse bouton 3 (stylo ou surligneur seulement)"
+
+#: src/xo-file.c:1557
+msgid " button 3 brush thickness (pen, eraser, or highlighter only)"
+msgstr " épaisseur de brosse bouton 3 (stylo, gomme, surligneur seulement)"
+
+#: src/xo-file.c:1561
+msgid " button 3 ruler mode (true/false) (for pen or highlighter only)"
+msgstr " bouton 3 en mode règle (true/false) (stylo ou surligneur seulement)"
+
+#: src/xo-file.c:1565
+msgid " button 3 shape recognizer mode (true/false) (pen or highlighter only)"
+msgstr " bouton 3 en mode détection de formes (true/false) (stylo ou surligneur seulement)"
+
+#: src/xo-file.c:1569
+msgid " button 3 eraser mode (eraser only)"
+msgstr " options de la gomme bouton 3 (gomme seulement)"
+
+#: src/xo-file.c:1573
+msgid " thickness of the various pens (in points, 1 pt = 1/72 in)"
+msgstr " épaisseurs des divers stylos (en points, 1 pt = 1/72 pouce)"
+
+#: src/xo-file.c:1579
+msgid " thickness of the various erasers (in points, 1 pt = 1/72 in)"
+msgstr " épaisseurs des diverses gommes (en points, 1 pt = 1/72 pouce)"
+
+#: src/xo-file.c:1584
+msgid " thickness of the various highlighters (in points, 1 pt = 1/72 in)"
+msgstr " épaisseurs des divers surligneurs (en points, 1 pt = 1/72 pouce)"
+
+#: src/xo-file.c:1589
+msgid " name of the default font"
+msgstr " nom de la police par défaut"
+
+#: src/xo-file.c:1592
+msgid " default font size"
+msgstr " taille de la police par défaut"
+
+#: src/xo-file.c:1748
+msgid ""
+" Xournal configuration file.\n"
+" This file is generated automatically upon saving preferences.\n"
+" Use caution when editing this file manually.\n"
+msgstr ""
+" Fichier de configuration de Xournal.\n"
+" Ce fichier est généré automatiquement lors de l'enregistrement des préférences.\n"
+" La plus grande prudence est recommandée lors de l'édition manuelle de ce fichier.\n"
+
+#: src/xo-misc.c:1244
+#, c-format
+msgid " of %d"
+msgstr " de %d"
+
+#: src/xo-misc.c:1249
+msgid "Background"
+msgstr "Fond"
+
+#: src/xo-misc.c:1257
+#, c-format
+msgid "Layer %d"
+msgstr "Calque %d"
+
+#: src/xo-misc.c:1379
+#, c-format
+msgid "Xournal - %s"
+msgstr ""
+
+#: src/xo-misc.c:1612
+#, c-format
+msgid "Save changes to '%s'?"
+msgstr "Enregistrer les modifications de '%s' ?"
+
+#: src/xo-misc.c:1613
+msgid "Untitled"
+msgstr "Sans titre"
+
+#: src/xo-print.c:1493 src/xo-print.c:1592
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: src/xo-print.c:1584
+msgid "Preparing print job"
+msgstr "Préparation du travail d'impression"
+
+#: src/xo-print.c:1602
+msgid "Finalizing..."
+msgstr "Finalisation..."
diff --git a/src/Makefile.am b/src/Makefile.am
index 69636d5..2fd92b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,5 +18,5 @@ xournal_SOURCES = \
 	xo-callbacks.c xo-callbacks.h \
 	xo-shapes.c xo-shapes.h
 
-xournal_LDADD = @PACKAGE_LIBS@
+xournal_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
 
diff --git a/src/TODO b/src/TODO
index fe2b777..e2a8d39 100644
--- a/src/TODO
+++ b/src/TODO
@@ -17,7 +17,7 @@ List of features to be implemented (not in any particular order)
    or see if removing the GTK bugfix would help? -- e.g. by recalling an
    internal gtk init function?
 
-DONE: fix GTK+ 2.16 XInput issues with scrollbars and menus
+DONE: fix GTK+ 2.16/2.17 XInput issues with scrollbars and menus
 DONE: fix bug 2826845 (shape recognizer accel doesn't work in fullscreen mode)
 DONE: bug affecting resize zone in statusbar
 DONE: page spinbutton wide enough for 3 digits; avoid "deprecated" warning
@@ -29,17 +29,16 @@ DONE: device with "eraser" at the end of its name is of type ERASER
       (Edward Yang)
 DONE: fix_xinput_coords() replaces buggy xinput events by core pointer 
       coordinates
-DONE: use poppler to render PDF bakgrounds (after patches contributed
+DONE: use poppler to render PDF backgrounds (after patches contributed
       by Mike Ter Louw and Bob McElrath)
-
-
-
-****** gnu-gettext patch?
+DONE: gettext internationalization (contributed by David Planella)
+DONE: Catalan translation (by David Planella); French translation
 
 ****** URGENT: gtkprint; new release by November end for Debian!
   nb: libgnomeprint produces many warnings (spinbutton; gpa assertions)
 
-
+- prerelease: update help file (remove references to pdftoppm/libgnomeprint
+  to poppler/gtkprint
 - remove "antialias bg" flag, useless... see McElrath
 - PDF bg memory usage throttling / delete oldest pdf backgrounds
 - fix fix_xinput_coords so it works ok without ENABLE_XINPUT_BUGFIX ?
@@ -52,10 +51,6 @@ DONE: use poppler to render PDF bakgrounds (after patches contributed
       and only (un)hide stuff at the correct edge!)
 ** if bg pdf not found in absolute path, look in path of xoj file before
    prompting user.
-** GETTEXT i18n patch (sourceforge)
-** PATCH TO WORK AROUND PPM LOADING ISSUE - see tracker
-   (make gdk_pixbuf_ref and g_object_unref(loader) as in the gv_bg 
-   loading) or... switch to poppler?
 ** patch to fix focus + allow up/dn in single page mode (Bob McElrath)
    also comment out contents of reset_focus() ? (tracker patch #2494022)
 ** patch to fix underscores in MRU filename display (McElrath) (tracker)
@@ -115,8 +110,6 @@ DONE: use poppler to render PDF bakgrounds (after patches contributed
 
 - smoothing of strokes (for users without tablets / with deficient drivers)
 - lasso tool
-- internationalization / translation of interface
-- switch to poppler instead of pdftoppm; with exact float dpi settings
 - load PDF pages only on demand (create empty pixmaps at first if can
    parse PDF geometry ourselves, else try pdfinfo ??)
    (and config option to limit total memory usage for PDF bitmaps)
diff --git a/src/main.c b/src/main.c
index ac6e3eb..b900ed7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -77,8 +77,8 @@ void init_stuff (int argc, char *argv[])
   ui.layerbox_length = 0;
 
   if (argc > 2 || (argc == 2 && argv[1][0] == '-')) {
-    printf("Invalid command line parameters.\n"
-           "Usage: %s [filename.xoj]\n", argv[0]);
+    printf(_("Invalid command line parameters.\n"
+           "Usage: %s [filename.xoj]\n"), argv[0]);
     gtk_exit(0);
   }
    
@@ -283,7 +283,7 @@ void init_stuff (int argc, char *argv[])
   set_cursor_busy(FALSE);
   if (!success) {
     w = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-       GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", argv[1]);
+       GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), argv[1]);
     gtk_dialog_run(GTK_DIALOG(w));
     gtk_widget_destroy(w);
   }
@@ -295,6 +295,12 @@ main (int argc, char *argv[])
 {
   gchar *path, *path1, *path2;
   
+#ifdef ENABLE_NLS
+  bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+#endif
+  
   gtk_set_locale ();
   gtk_init (&argc, &argv);
 
diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c
index 6c087d3..c382996 100644
--- a/src/xo-callbacks.c
+++ b/src/xo-callbacks.c
@@ -51,15 +51,15 @@ on_fileNewBackground_activate          (GtkMenuItem     *menuitem,
   reset_focus();
   if (!ok_to_close()) return; // user aborted on save confirmation
   
-  dialog = gtk_file_chooser_dialog_new("Open PDF", GTK_WINDOW (winMain),
+  dialog = gtk_file_chooser_dialog_new(_("Open PDF"), GTK_WINDOW (winMain),
      GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
      GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
      
   filt_all = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_all, "All files");
+  gtk_file_filter_set_name(filt_all, _("All files"));
   gtk_file_filter_add_pattern(filt_all, "*");
   filt_pdf = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_pdf, "PDF files");
+  gtk_file_filter_set_name(filt_pdf, _("PDF files"));
   gtk_file_filter_add_pattern(filt_pdf, "*.pdf");
   gtk_file_filter_add_pattern(filt_pdf, "*.PDF");
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf);
@@ -67,7 +67,7 @@ on_fileNewBackground_activate          (GtkMenuItem     *menuitem,
 
   if (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path);
 
-  attach_opt = gtk_check_button_new_with_label("Attach file to the journal");
+  attach_opt = gtk_check_button_new_with_label(_("Attach file to the journal"));
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE);
   gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt);
   
@@ -102,7 +102,7 @@ on_fileNewBackground_activate          (GtkMenuItem     *menuitem,
   
   /* open failed */
   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", filename);
+    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), filename);
   gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
   g_free(filename);
@@ -122,15 +122,15 @@ on_fileOpen_activate                   (GtkMenuItem     *menuitem,
   reset_focus();
   if (!ok_to_close()) return; // user aborted on save confirmation
   
-  dialog = gtk_file_chooser_dialog_new("Open Journal", GTK_WINDOW (winMain),
+  dialog = gtk_file_chooser_dialog_new(_("Open Journal"), GTK_WINDOW (winMain),
      GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
      GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
      
   filt_all = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_all, "All files");
+  gtk_file_filter_set_name(filt_all, _("All files"));
   gtk_file_filter_add_pattern(filt_all, "*");
   filt_xoj = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_xoj, "Xournal files");
+  gtk_file_filter_set_name(filt_xoj, _("Xournal files"));
   gtk_file_filter_add_pattern(filt_xoj, "*.xoj");
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_xoj);
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
@@ -151,7 +151,7 @@ on_fileOpen_activate                   (GtkMenuItem     *menuitem,
   
   /* open failed */
   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", filename);
+    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), filename);
   gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
   g_free(filename);
@@ -180,7 +180,7 @@ on_fileSave_activate                   (GtkMenuItem     *menuitem,
   set_cursor_busy(FALSE);
   /* save failed */
   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error saving file '%s'", ui.filename);
+    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error saving file '%s'"), ui.filename);
   gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
 }
@@ -200,7 +200,7 @@ on_fileSaveAs_activate                 (GtkMenuItem     *menuitem,
   
   end_text();
   reset_focus();
-  dialog = gtk_file_chooser_dialog_new("Save Journal", GTK_WINDOW (winMain),
+  dialog = gtk_file_chooser_dialog_new(_("Save Journal"), GTK_WINDOW (winMain),
      GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
      GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL);
      
@@ -225,10 +225,10 @@ on_fileSaveAs_activate                 (GtkMenuItem     *menuitem,
   }
      
   filt_all = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_all, "All files");
+  gtk_file_filter_set_name(filt_all, _("All files"));
   gtk_file_filter_add_pattern(filt_all, "*");
   filt_xoj = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_xoj, "Xournal files");
+  gtk_file_filter_set_name(filt_xoj, _("Xournal files"));
   gtk_file_filter_add_pattern(filt_xoj, "*.xoj");
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_xoj);
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
@@ -254,7 +254,7 @@ on_fileSaveAs_activate                 (GtkMenuItem     *menuitem,
     if (warn) {
       warning_dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), 
         GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-        "Should the file %s be overwritten?", filename);
+        _("Should the file %s be overwritten?"), filename);
       if (gtk_dialog_run(GTK_DIALOG(warning_dialog)) == GTK_RESPONSE_YES)
         warn = FALSE;
       gtk_widget_destroy(warning_dialog);
@@ -273,7 +273,7 @@ on_fileSaveAs_activate                 (GtkMenuItem     *menuitem,
   set_cursor_busy(FALSE);
   /* save failed */
   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error saving file '%s'", filename);
+    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error saving file '%s'"), filename);
   gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
   g_free(filename);
@@ -326,10 +326,10 @@ on_filePrint_activate                  (GtkMenuItem     *menuitem,
   gpj = gnome_print_job_new(config); /* was NULL */
   gnome_print_config_unref(config);
 /* end */
-  printDialog = gnome_print_dialog_new(gpj, (guchar *)"Print", GNOME_PRINT_DIALOG_RANGE);
+  printDialog = gnome_print_dialog_new(gpj, (guchar *) _("Print"), GNOME_PRINT_DIALOG_RANGE);
   gnome_print_dialog_construct_range_page(GNOME_PRINT_DIALOG(printDialog),
     GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_RANGE,
-    1, journal.npages, (guchar *)"Current page", (guchar *)"Pages");
+    1, journal.npages, (guchar *) _("Current page"), (guchar *) _("Pages"));
   /* don't have "Current page" as option, else it becomes the default!! */
   
   gtk_dialog_set_response_sensitive(GTK_DIALOG(printDialog),
@@ -385,7 +385,7 @@ on_filePrintPDF_activate               (GtkMenuItem     *menuitem,
   
   end_text();
   reset_focus();
-  dialog = gtk_file_chooser_dialog_new("Export to PDF", GTK_WINDOW (winMain),
+  dialog = gtk_file_chooser_dialog_new(_("Export to PDF"), GTK_WINDOW (winMain),
      GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
      GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL);
      
@@ -408,10 +408,10 @@ on_filePrintPDF_activate               (GtkMenuItem     *menuitem,
   }
      
   filt_all = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_all, "All files");
+  gtk_file_filter_set_name(filt_all, _("All files"));
   gtk_file_filter_add_pattern(filt_all, "*");
   filt_pdf = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_pdf, "PDF files");
+  gtk_file_filter_set_name(filt_pdf, _("PDF files"));
   gtk_file_filter_add_pattern(filt_pdf, "*.pdf");
   gtk_file_filter_add_pattern(filt_pdf, "*.PDF");
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf);
@@ -429,7 +429,7 @@ on_filePrintPDF_activate               (GtkMenuItem     *menuitem,
     if (warn) {
       warning_dialog = gtk_message_dialog_new(GTK_WINDOW(winMain),
         GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-        "Should the file %s be overwritten?", filename);
+        _("Should the file %s be overwritten?"), filename);
       if (gtk_dialog_run(GTK_DIALOG(warning_dialog)) == GTK_RESPONSE_YES)
         warn = FALSE;
       gtk_widget_destroy(warning_dialog);
@@ -442,7 +442,7 @@ on_filePrintPDF_activate               (GtkMenuItem     *menuitem,
   if (!print_to_pdf(filename)) {
     set_cursor_busy(FALSE);
     dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-      GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error creating file '%s'", filename);
+      GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error creating file '%s'"), filename);
     gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(dialog);
   }
@@ -1474,12 +1474,12 @@ on_journalLoadBackground_activate      (GtkMenuItem     *menuitem,
   
   end_text();
   reset_focus();
-  dialog = gtk_file_chooser_dialog_new("Open Background", GTK_WINDOW (winMain),
+  dialog = gtk_file_chooser_dialog_new(_("Open Background"), GTK_WINDOW (winMain),
      GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
      GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
 
   filt_all = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_all, "All files");
+  gtk_file_filter_set_name(filt_all, _("All files"));
   gtk_file_filter_add_pattern(filt_all, "*");
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
 
@@ -1487,7 +1487,7 @@ on_journalLoadBackground_activate      (GtkMenuItem     *menuitem,
 
   if (!gtk_check_version(2, 6, 0)) {
     filt_pix = gtk_file_filter_new();
-    gtk_file_filter_set_name(filt_pix, "Bitmap files");
+    gtk_file_filter_set_name(filt_pix, _("Bitmap files"));
     gtk_file_filter_add_pixbuf_formats(filt_pix);
     gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pix);
   }
@@ -1495,14 +1495,14 @@ on_journalLoadBackground_activate      (GtkMenuItem     *menuitem,
 #endif
 
   filt_pspdf = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_pspdf, "PS/PDF files (as bitmaps)");
+  gtk_file_filter_set_name(filt_pspdf, _("PS/PDF files (as bitmaps)"));
   gtk_file_filter_add_pattern(filt_pspdf, "*.ps");
   gtk_file_filter_add_pattern(filt_pspdf, "*.PS");
   gtk_file_filter_add_pattern(filt_pspdf, "*.pdf");
   gtk_file_filter_add_pattern(filt_pspdf, "*.PDF");
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pspdf);
 
-  attach_opt = gtk_check_button_new_with_label("Attach file to the journal");
+  attach_opt = gtk_check_button_new_with_label(_("Attach file to the journal"));
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE);
   gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt);
 
@@ -1525,7 +1525,7 @@ on_journalLoadBackground_activate      (GtkMenuItem     *menuitem,
   if (bglist == NULL) {
     dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
       GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-      "Error opening background '%s'", filename);
+      _("Error opening background '%s'"), filename);
     gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(dialog);
     g_free(filename);
@@ -2077,7 +2077,7 @@ on_toolsTextFont_activate              (GtkMenuItem     *menuitem,
   GtkWidget *dialog;
   gchar *str;
   
-  dialog = gtk_font_selection_dialog_new("Select Font");
+  dialog = gtk_font_selection_dialog_new(_("Select Font"));
   str = make_cur_font_name();
   gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(dialog), str);
   g_free(str);
@@ -2436,8 +2436,8 @@ on_canvas_button_press_event           (GtkWidget       *widget,
   if (ui.cur_layer == NULL) {
     /* warn */
     dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
-      GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "Drawing is not allowed on the "
-      "background layer.\n Switching to Layer 1.");
+      GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Drawing is not allowed on the "
+      "background layer.\n Switching to Layer 1."));
     gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(dialog);
     on_viewShowLayer_activate(NULL, NULL);
@@ -3064,7 +3064,7 @@ on_mru_activate                        (GtkMenuItem     *menuitem,
 
   /* open failed */
   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", ui.mru[which]);
+    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), ui.mru[which]);
   gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
   delete_mru_entry(which);
diff --git a/src/xo-file.c b/src/xo-file.c
index 2b3f361..7d27860 100644
--- a/src/xo-file.c
+++ b/src/xo-file.c
@@ -119,7 +119,7 @@ gboolean save_journal(const char *filename)
           if (!gdk_pixbuf_save(pg->bg->pixbuf, tmpfn, "png", NULL, NULL)) {
             dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
               GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
-              "Could not write background '%s'. Continuing anyway.", tmpfn);
+              _("Could not write background '%s'. Continuing anyway."), tmpfn);
             gtk_dialog_run(GTK_DIALOG(dialog));
             gtk_widget_destroy(dialog);
           }
@@ -151,7 +151,7 @@ gboolean save_journal(const char *filename)
           if (!success) {
             dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
               GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
-              "Could not write background '%s'. Continuing anyway.", tmpfn);
+              _("Could not write background '%s'. Continuing anyway."), tmpfn);
             gtk_dialog_run(GTK_DIALOG(dialog));
             gtk_widget_destroy(dialog);
           }
@@ -248,7 +248,7 @@ struct Background *tmpBg_pdf;
 
 GError *xoj_invalid(void)
 {
-  return g_error_new(G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, "Invalid file contents");
+  return g_error_new(G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, _("Invalid file contents"));
 }
 
 void xoj_parser_start_element(GMarkupParseContext *context,
@@ -398,7 +398,7 @@ void xoj_parser_start_element(GMarkupParseContext *context,
             if (tmpPage->bg->pixbuf == NULL) {
               dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
                 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, 
-                "Could not open background '%s'. Setting background to white.",
+                _("Could not open background '%s'. Setting background to white."),
                 tmpbg_filename);
               gtk_dialog_run(GTK_DIALOG(dialog));
               gtk_widget_destroy(dialog);
@@ -656,20 +656,20 @@ gboolean user_wants_second_chance(char **filename)
 
   dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
     GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, 
-    "Could not open background '%s'.\nSelect another file?",
+    _("Could not open background '%s'.\nSelect another file?"),
     *filename);
   response = gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
   if (response != GTK_RESPONSE_YES) return FALSE;
-  dialog = gtk_file_chooser_dialog_new("Open PDF", GTK_WINDOW (winMain),
+  dialog = gtk_file_chooser_dialog_new(_("Open PDF"), GTK_WINDOW (winMain),
      GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
      GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
 
   filt_all = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_all, "All files");
+  gtk_file_filter_set_name(filt_all, _("All files"));
   gtk_file_filter_add_pattern(filt_all, "*");
   filt_pdf = gtk_file_filter_new();
-  gtk_file_filter_set_name(filt_pdf, "PDF files");
+  gtk_file_filter_set_name(filt_pdf, _("PDF files"));
   gtk_file_filter_add_pattern(filt_pdf, "*.pdf");
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf);
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
@@ -769,7 +769,7 @@ gboolean open_journal(char *filename)
       bgpdf.filename = refstring_ref(tmpBg_pdf->filename);
     } else {
       dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
-        GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Could not open background '%s'.",
+        GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not open background '%s'."),
         tmpfn);
       gtk_dialog_run(GTK_DIALOG(dialog));
       gtk_widget_destroy(dialog);
@@ -956,7 +956,7 @@ gboolean bgpdf_scheduler_callback(gpointer data)
   // if all requests have been cancelled, remove ourselves from main loop
   if (bgpdf.requests == NULL) { bgpdf.pid = 0; return FALSE; }
   if (bgpdf.status == STATUS_NOT_INIT)
-    { printf("BGPDF not initialized??\n"); bgpdf.pid = 0; return FALSE; }
+    { printf("DEBUG: BGPDF not initialized??\n"); bgpdf.pid = 0; return FALSE; }
 
   req = (struct BgPdfRequest *)bgpdf.requests->data;
 
@@ -964,7 +964,7 @@ gboolean bgpdf_scheduler_callback(gpointer data)
   pixbuf = NULL;
   pdfpage = poppler_document_get_page(bgpdf.document, req->pageno-1);
   if (pdfpage) {
-//    printf("Processing request for page %d at %f dpi\n", req->pageno, req->dpi);
+//    printf("DEBUG: Processing request for page %d at %f dpi\n", req->pageno, req->dpi);
     set_cursor_busy(TRUE);
     poppler_page_get_size(pdfpage, &width, &height);
     scaled_width = (int) (req->dpi * width/72);
@@ -996,7 +996,7 @@ gboolean bgpdf_scheduler_callback(gpointer data)
   } else { // failure
     if (!bgpdf.has_failed) {
       dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
-        GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Unable to render one or more PDF pages.");
+        GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Unable to render one or more PDF pages."));
       gtk_dialog_run(GTK_DIALOG(dialog));
       gtk_widget_destroy(dialog);
     }
@@ -1021,7 +1021,7 @@ void add_bgpdf_request(int pageno, double zoom)
   req = g_new(struct BgPdfRequest, 1);
   req->pageno = pageno;
   req->dpi = 72*zoom;
-//  printf("Enqueuing request for page %d at %f dpi\n", pageno, req->dpi);
+//  printf("DEBUG: Enqueuing request for page %d at %f dpi\n", pageno, req->dpi);
 
   // cancel any request this may supersede
   for (list = bgpdf.requests; list != NULL; ) {
@@ -1379,217 +1379,217 @@ void save_config_to_file(void)
       &ui.window_default_width, &ui.window_default_height);
 
   update_keyval("general", "display_dpi",
-    " the display resolution, in pixels per inch",
+    _(" the display resolution, in pixels per inch"),
     g_strdup_printf("%.2f", DEFAULT_ZOOM*72));
   update_keyval("general", "initial_zoom",
-    " the initial zoom level, in percent",
+    _(" the initial zoom level, in percent"),
     g_strdup_printf("%.2f", 100*ui.zoom/DEFAULT_ZOOM));
   update_keyval("general", "window_maximize",
-    " maximize the window at startup (true/false)",
+    _(" maximize the window at startup (true/false)"),
     g_strdup(ui.maximize_at_start?"true":"false"));
   update_keyval("general", "window_fullscreen",
-    " start in full screen mode (true/false)",
+    _(" start in full screen mode (true/false)"),
     g_strdup(ui.fullscreen?"true":"false"));
   update_keyval("general", "window_width",
-    " the window width in pixels (when not maximized)",
+    _(" the window width in pixels (when not maximized)"),
     g_strdup_printf("%d", ui.window_default_width));
   update_keyval("general", "window_height",
-    " the window height in pixels",
+    _(" the window height in pixels"),
     g_strdup_printf("%d", ui.window_default_height));
   update_keyval("general", "scrollbar_speed",
-    " scrollbar step increment (in pixels)",
+    _(" scrollbar step increment (in pixels)"),
     g_strdup_printf("%d", ui.scrollbar_step_increment));
   update_keyval("general", "zoom_dialog_increment",
-    " the step increment in the zoom dialog box",
+    _(" the step increment in the zoom dialog box"),
     g_strdup_printf("%d", ui.zoom_step_increment));
   update_keyval("general", "zoom_step_factor",
-    " the multiplicative factor for zoom in/out",
+    _(" the multiplicative factor for zoom in/out"),
     g_strdup_printf("%.3f", ui.zoom_step_factor));
   update_keyval("general", "view_continuous",
-    " document view (true = continuous, false = single page)",
+    _(" document view (true = continuous, false = single page)"),
     g_strdup(ui.view_continuous?"true":"false"));
   update_keyval("general", "use_xinput",
-    " use XInput extensions (true/false)",
+    _(" use XInput extensions (true/false)"),
     g_strdup(ui.allow_xinput?"true":"false"));
   update_keyval("general", "discard_corepointer",
-    " discard Core Pointer events in XInput mode (true/false)",
+    _(" discard Core Pointer events in XInput mode (true/false)"),
     g_strdup(ui.discard_corepointer?"true":"false"));
   update_keyval("general", "use_erasertip",
-    " always map eraser tip to eraser (true/false)",
+    _(" always map eraser tip to eraser (true/false)"),
     g_strdup(ui.use_erasertip?"true":"false"));
   update_keyval("general", "default_path",
-    " default path for open/save (leave blank for current directory)",
+    _(" default path for open/save (leave blank for current directory)"),
     g_strdup((ui.default_path!=NULL)?ui.default_path:""));
   update_keyval("general", "pressure_sensitivity",
-     " use pressure sensitivity to control pen stroke width (true/false)",
+     _(" use pressure sensitivity to control pen stroke width (true/false)"),
      g_strdup(ui.pressure_sensitivity?"true":"false"));
   update_keyval("general", "width_minimum_multiplier",
-     " minimum width multiplier",
+     _(" minimum width multiplier"),
      g_strdup_printf("%.2f", ui.width_minimum_multiplier));
   update_keyval("general", "width_maximum_multiplier",
-     " maximum width multiplier",
+     _(" maximum width multiplier"),
      g_strdup_printf("%.2f", ui.width_maximum_multiplier));
   update_keyval("general", "interface_order",
-    " interface components from top to bottom\n valid values: drawarea menu main_toolbar pen_toolbar statusbar",
+    _(" interface components from top to bottom\n valid values: drawarea menu main_toolbar pen_toolbar statusbar"),
     verbose_vertical_order(ui.vertical_order[0]));
   update_keyval("general", "interface_fullscreen",
-    " interface components in fullscreen mode, from top to bottom",
+    _(" interface components in fullscreen mode, from top to bottom"),
     verbose_vertical_order(ui.vertical_order[1]));
   update_keyval("general", "interface_lefthanded",
-    " interface has left-handed scrollbar (true/false)",
+    _(" interface has left-handed scrollbar (true/false)"),
     g_strdup(ui.left_handed?"true":"false"));
   update_keyval("general", "shorten_menus",
-    " hide some unwanted menu or toolbar items (true/false)",
+    _(" hide some unwanted menu or toolbar items (true/false)"),
     g_strdup(ui.shorten_menus?"true":"false"));
   update_keyval("general", "shorten_menu_items",
-    " interface items to hide (customize at your own risk!)\n see source file xo-interface.c for a list of item names",
+    _(" interface items to hide (customize at your own risk!)\n see source file xo-interface.c for a list of item names"),
     g_strdup(ui.shorten_menu_items));
   update_keyval("general", "highlighter_opacity",
-    " highlighter opacity (0 to 1, default 0.5)\n warning: opacity level is not saved in xoj files!",
+    _(" highlighter opacity (0 to 1, default 0.5)\n warning: opacity level is not saved in xoj files!"),
     g_strdup_printf("%.2f", ui.hiliter_opacity));
   update_keyval("general", "autosave_prefs",
-    " auto-save preferences on exit (true/false)",
+    _(" auto-save preferences on exit (true/false)"),
     g_strdup(ui.auto_save_prefs?"true":"false"));
 
   update_keyval("paper", "width",
-    " the default page width, in points (1/72 in)",
+    _(" the default page width, in points (1/72 in)"),
     g_strdup_printf("%.2f", ui.default_page.width));
   update_keyval("paper", "height",
-    " the default page height, in points (1/72 in)",
+    _(" the default page height, in points (1/72 in)"),
     g_strdup_printf("%.2f", ui.default_page.height));
   update_keyval("paper", "color",
-    " the default paper color",
+    _(" the default paper color"),
     g_strdup(bgcolor_names[ui.default_page.bg->color_no]));
   update_keyval("paper", "style",
-    " the default paper style (plain, lined, ruled, or graph)",
+    _(" the default paper style (plain, lined, ruled, or graph)"),
     g_strdup(bgstyle_names[ui.default_page.bg->ruling]));
   update_keyval("paper", "apply_all",
-    " apply paper style changes to all pages (true/false)",
+    _(" apply paper style changes to all pages (true/false)"),
     g_strdup(ui.bg_apply_all_pages?"true":"false"));
   update_keyval("paper", "default_unit",
-    " preferred unit (cm, in, px, pt)",
+    _(" preferred unit (cm, in, px, pt)"),
     g_strdup(unit_names[ui.default_unit]));
   update_keyval("paper", "print_ruling",
-    " include paper ruling when printing or exporting to PDF (true/false)",
+    _(" include paper ruling when printing or exporting to PDF (true/false)"),
     g_strdup(ui.print_ruling?"true":"false"));
   update_keyval("paper", "antialias_bg",
-    " antialiased bitmap backgrounds (true/false)",
+    _(" antialiased bitmap backgrounds (true/false)"),
     g_strdup(ui.antialias_bg?"true":"false"));
   update_keyval("paper", "progressive_bg",
-    " just-in-time update of page backgrounds (true/false)",
+    _(" just-in-time update of page backgrounds (true/false)"),
     g_strdup(ui.progressive_bg?"true":"false"));
   update_keyval("paper", "gs_bitmap_dpi",
-    " bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)",
+    _(" bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)"),
     g_strdup_printf("%d", GS_BITMAP_DPI));
   update_keyval("paper", "pdftoppm_printing_dpi",
-    " bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)",
+    _(" bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)"),
     g_strdup_printf("%d", PDFTOPPM_PRINTING_DPI));
 
   update_keyval("tools", "startup_tool",
-    " selected tool at startup (pen, eraser, highlighter, selectrect, vertspace, hand)",
+    _(" selected tool at startup (pen, eraser, highlighter, selectrect, vertspace, hand)"),
     g_strdup(tool_names[ui.startuptool]));
   update_keyval("tools", "pen_color",
-    " default pen color",
+    _(" default pen color"),
     g_strdup(color_names[ui.default_brushes[TOOL_PEN].color_no]));
   update_keyval("tools", "pen_thickness",
-    " default pen thickness (fine = 1, medium = 2, thick = 3)",
+    _(" default pen thickness (fine = 1, medium = 2, thick = 3)"),
     g_strdup_printf("%d", ui.default_brushes[TOOL_PEN].thickness_no));
   update_keyval("tools", "pen_ruler",
-    " default pen is in ruler mode (true/false)",
+    _(" default pen is in ruler mode (true/false)"),
     g_strdup(ui.default_brushes[TOOL_PEN].ruler?"true":"false"));
   update_keyval("tools", "pen_recognizer",
-    " default pen is in shape recognizer mode (true/false)",
+    _(" default pen is in shape recognizer mode (true/false)"),
     g_strdup(ui.default_brushes[TOOL_PEN].recognizer?"true":"false"));
   update_keyval("tools", "eraser_thickness",
-    " default eraser thickness (fine = 1, medium = 2, thick = 3)",
+    _(" default eraser thickness (fine = 1, medium = 2, thick = 3)"),
     g_strdup_printf("%d", ui.default_brushes[TOOL_ERASER].thickness_no));
   update_keyval("tools", "eraser_mode",
-    " default eraser mode (standard = 0, whiteout = 1, strokes = 2)",
+    _(" default eraser mode (standard = 0, whiteout = 1, strokes = 2)"),
     g_strdup_printf("%d", ui.default_brushes[TOOL_ERASER].tool_options));
   update_keyval("tools", "highlighter_color",
-    " default highlighter color",
+    _(" default highlighter color"),
     g_strdup(color_names[ui.default_brushes[TOOL_HIGHLIGHTER].color_no]));
   update_keyval("tools", "highlighter_thickness",
-    " default highlighter thickness (fine = 1, medium = 2, thick = 3)",
+    _(" default highlighter thickness (fine = 1, medium = 2, thick = 3)"),
     g_strdup_printf("%d", ui.default_brushes[TOOL_HIGHLIGHTER].thickness_no));
   update_keyval("tools", "highlighter_ruler",
-    " default highlighter is in ruler mode (true/false)",
+    _(" default highlighter is in ruler mode (true/false)"),
     g_strdup(ui.default_brushes[TOOL_HIGHLIGHTER].ruler?"true":"false"));
   update_keyval("tools", "highlighter_recognizer",
-    " default highlighter is in shape recognizer mode (true/false)",
+    _(" default highlighter is in shape recognizer mode (true/false)"),
     g_strdup(ui.default_brushes[TOOL_HIGHLIGHTER].recognizer?"true":"false"));
   update_keyval("tools", "btn2_tool",
-    " button 2 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)",
+    _(" button 2 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)"),
     g_strdup(tool_names[ui.toolno[1]]));
   update_keyval("tools", "btn2_linked",
-    " button 2 brush linked to primary brush (true/false) (overrides all other settings)",
+    _(" button 2 brush linked to primary brush (true/false) (overrides all other settings)"),
     g_strdup((ui.linked_brush[1]==BRUSH_LINKED)?"true":"false"));
   update_keyval("tools", "btn2_color",
-    " button 2 brush color (for pen or highlighter only)",
+    _(" button 2 brush color (for pen or highlighter only)"),
     g_strdup((ui.toolno[1]<NUM_STROKE_TOOLS)?
                color_names[ui.brushes[1][ui.toolno[1]].color_no]:"white"));
   update_keyval("tools", "btn2_thickness",
-    " button 2 brush thickness (pen, eraser, or highlighter only)",
+    _(" button 2 brush thickness (pen, eraser, or highlighter only)"),
     g_strdup_printf("%d", (ui.toolno[1]<NUM_STROKE_TOOLS)?
                             ui.brushes[1][ui.toolno[1]].thickness_no:0));
   update_keyval("tools", "btn2_ruler",
-    " button 2 ruler mode (true/false) (for pen or highlighter only)",
+    _(" button 2 ruler mode (true/false) (for pen or highlighter only)"),
     g_strdup(((ui.toolno[1]<NUM_STROKE_TOOLS)?
               ui.brushes[1][ui.toolno[1]].ruler:FALSE)?"true":"false"));
   update_keyval("tools", "btn2_recognizer",
-    " button 2 shape recognizer mode (true/false) (pen or highlighter only)",
+    _(" button 2 shape recognizer mode (true/false) (pen or highlighter only)"),
     g_strdup(((ui.toolno[1]<NUM_STROKE_TOOLS)?
               ui.brushes[1][ui.toolno[1]].recognizer:FALSE)?"true":"false"));
   update_keyval("tools", "btn2_erasermode",
-    " button 2 eraser mode (eraser only)",
+    _(" button 2 eraser mode (eraser only)"),
     g_strdup_printf("%d", ui.brushes[1][TOOL_ERASER].tool_options));
   update_keyval("tools", "btn3_tool",
-    " button 3 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)",
+    _(" button 3 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)"),
     g_strdup(tool_names[ui.toolno[2]]));
   update_keyval("tools", "btn3_linked",
-    " button 3 brush linked to primary brush (true/false) (overrides all other settings)",
+    _(" button 3 brush linked to primary brush (true/false) (overrides all other settings)"),
     g_strdup((ui.linked_brush[2]==BRUSH_LINKED)?"true":"false"));
   update_keyval("tools", "btn3_color",
-    " button 3 brush color (for pen or highlighter only)",
+    _(" button 3 brush color (for pen or highlighter only)"),
     g_strdup((ui.toolno[2]<NUM_STROKE_TOOLS)?
                color_names[ui.brushes[2][ui.toolno[2]].color_no]:"white"));
   update_keyval("tools", "btn3_thickness",
-    " button 3 brush thickness (pen, eraser, or highlighter only)",
+    _(" button 3 brush thickness (pen, eraser, or highlighter only)"),
     g_strdup_printf("%d", (ui.toolno[2]<NUM_STROKE_TOOLS)?
                             ui.brushes[2][ui.toolno[2]].thickness_no:0));
   update_keyval("tools", "btn3_ruler",
-    " button 3 ruler mode (true/false) (for pen or highlighter only)",
+    _(" button 3 ruler mode (true/false) (for pen or highlighter only)"),
     g_strdup(((ui.toolno[2]<NUM_STROKE_TOOLS)?
               ui.brushes[2][ui.toolno[2]].ruler:FALSE)?"true":"false"));
   update_keyval("tools", "btn3_recognizer",
-    " button 3 shape recognizer mode (true/false) (pen or highlighter only)",
+    _(" button 3 shape recognizer mode (true/false) (pen or highlighter only)"),
     g_strdup(((ui.toolno[2]<NUM_STROKE_TOOLS)?
               ui.brushes[2][ui.toolno[2]].recognizer:FALSE)?"true":"false"));
   update_keyval("tools", "btn3_erasermode",
-    " button 3 eraser mode (eraser only)",
+    _(" button 3 eraser mode (eraser only)"),
     g_strdup_printf("%d", ui.brushes[2][TOOL_ERASER].tool_options));
 
   update_keyval("tools", "pen_thicknesses",
-    " thickness of the various pens (in points, 1 pt = 1/72 in)",
+    _(" thickness of the various pens (in points, 1 pt = 1/72 in)"),
     g_strdup_printf("%.2f;%.2f;%.2f;%.2f;%.2f", 
       predef_thickness[TOOL_PEN][0], predef_thickness[TOOL_PEN][1],
       predef_thickness[TOOL_PEN][2], predef_thickness[TOOL_PEN][3],
       predef_thickness[TOOL_PEN][4]));
   update_keyval("tools", "eraser_thicknesses",
-    " thickness of the various erasers (in points, 1 pt = 1/72 in)",
+    _(" thickness of the various erasers (in points, 1 pt = 1/72 in)"),
     g_strdup_printf("%.2f;%.2f;%.2f", 
       predef_thickness[TOOL_ERASER][1], predef_thickness[TOOL_ERASER][2],
       predef_thickness[TOOL_ERASER][3]));
   update_keyval("tools", "highlighter_thicknesses",
-    " thickness of the various highlighters (in points, 1 pt = 1/72 in)",
+    _(" thickness of the various highlighters (in points, 1 pt = 1/72 in)"),
     g_strdup_printf("%.2f;%.2f;%.2f", 
       predef_thickness[TOOL_HIGHLIGHTER][1], predef_thickness[TOOL_HIGHLIGHTER][2],
       predef_thickness[TOOL_HIGHLIGHTER][3]));
   update_keyval("tools", "default_font",
-    " name of the default font",
+    _(" name of the default font"),
     g_strdup(ui.default_font_name));
   update_keyval("tools", "default_font_size",
-    " default font size",
+    _(" default font size"),
     g_strdup_printf("%.1f", ui.default_font_size));
 
   buf = g_key_file_to_data(ui.config_data, NULL, NULL);
@@ -1745,9 +1745,9 @@ void load_config_from_file(void)
     g_key_file_free(ui.config_data);
     ui.config_data = g_key_file_new();
     g_key_file_set_comment(ui.config_data, NULL, NULL, 
-           " Xournal configuration file.\n"
+         _(" Xournal configuration file.\n"
            " This file is generated automatically upon saving preferences.\n"
-           " Use caution when editing this file manually.\n", NULL);
+           " Use caution when editing this file manually.\n"), NULL);
     return;
   }
 
diff --git a/src/xo-file.h b/src/xo-file.h
index fab3139..54bcdeb 100644
--- a/src/xo-file.h
+++ b/src/xo-file.h
@@ -9,10 +9,6 @@ extern int GS_BITMAP_DPI, PDFTOPPM_PRINTING_DPI;
 
 #define TMPDIR_TEMPLATE "/tmp/xournalpdf.XXXXXX"
 
-#define PDFTOPPM_ARGV \
-     { "pdftoppm", "-q", "-f", pageno_str, "-l", pageno_str, \
-       "-r", dpi_str, pdf_filename, ppm_root, NULL }
-
 void new_journal(void);
 gboolean save_journal(const char *filename);
 gboolean close_journal(void);
diff --git a/src/xo-interface.c b/src/xo-interface.c
index 3f761e1..31ceb88 100644
--- a/src/xo-interface.c
+++ b/src/xo-interface.c
@@ -345,7 +345,7 @@ create_winMain (void)
   accel_group = gtk_accel_group_new ();
 
   winMain = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (winMain), "Xournal");
+  gtk_window_set_title (GTK_WINDOW (winMain), _("Xournal"));
 
   vboxMain = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vboxMain);
@@ -355,7 +355,7 @@ create_winMain (void)
   gtk_widget_show (menubar);
   gtk_box_pack_start (GTK_BOX (vboxMain), menubar, FALSE, FALSE, 0);
 
-  menuFile = gtk_menu_item_new_with_mnemonic ("_File");
+  menuFile = gtk_menu_item_new_with_mnemonic (_("_File"));
   gtk_widget_show (menuFile);
   gtk_container_add (GTK_CONTAINER (menubar), menuFile);
 
@@ -366,7 +366,7 @@ create_winMain (void)
   gtk_widget_show (fileNew);
   gtk_container_add (GTK_CONTAINER (menuFile_menu), fileNew);
 
-  fileNewBackground = gtk_image_menu_item_new_with_mnemonic ("Annotate PD_F");
+  fileNewBackground = gtk_image_menu_item_new_with_mnemonic (_("Annotate PD_F"));
   gtk_widget_show (fileNewBackground);
   gtk_container_add (GTK_CONTAINER (menuFile_menu), fileNewBackground);
 
@@ -391,42 +391,42 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1);
   gtk_widget_set_sensitive (separator1, FALSE);
 
-  fileRecentFiles = gtk_menu_item_new_with_mnemonic ("Recent Doc_uments");
+  fileRecentFiles = gtk_menu_item_new_with_mnemonic (_("Recent Doc_uments"));
   gtk_widget_show (fileRecentFiles);
   gtk_container_add (GTK_CONTAINER (menuFile_menu), fileRecentFiles);
 
   fileRecentFiles_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (fileRecentFiles), fileRecentFiles_menu);
 
-  mru0 = gtk_menu_item_new_with_mnemonic ("0");
+  mru0 = gtk_menu_item_new_with_mnemonic (_("0"));
   gtk_widget_show (mru0);
   gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru0);
 
-  mru1 = gtk_menu_item_new_with_mnemonic ("1");
+  mru1 = gtk_menu_item_new_with_mnemonic (_("1"));
   gtk_widget_show (mru1);
   gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru1);
 
-  mru2 = gtk_menu_item_new_with_mnemonic ("2");
+  mru2 = gtk_menu_item_new_with_mnemonic (_("2"));
   gtk_widget_show (mru2);
   gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru2);
 
-  mru3 = gtk_menu_item_new_with_mnemonic ("3");
+  mru3 = gtk_menu_item_new_with_mnemonic (_("3"));
   gtk_widget_show (mru3);
   gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru3);
 
-  mru4 = gtk_menu_item_new_with_mnemonic ("4");
+  mru4 = gtk_menu_item_new_with_mnemonic (_("4"));
   gtk_widget_show (mru4);
   gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru4);
 
-  mru5 = gtk_menu_item_new_with_mnemonic ("5");
+  mru5 = gtk_menu_item_new_with_mnemonic (_("5"));
   gtk_widget_show (mru5);
   gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru5);
 
-  mru6 = gtk_menu_item_new_with_mnemonic ("6");
+  mru6 = gtk_menu_item_new_with_mnemonic (_("6"));
   gtk_widget_show (mru6);
   gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru6);
 
-  mru7 = gtk_menu_item_new_with_mnemonic ("7");
+  mru7 = gtk_menu_item_new_with_mnemonic (_("7"));
   gtk_widget_show (mru7);
   gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru7);
 
@@ -435,7 +435,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator22);
   gtk_widget_set_sensitive (separator22, FALSE);
 
-  filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options");
+  filePrintOptions = gtk_image_menu_item_new_with_mnemonic (_("Print Options"));
   gtk_widget_show (filePrintOptions);
   gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions);
 
@@ -450,7 +450,7 @@ create_winMain (void)
                               GDK_P, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  filePrintPDF = gtk_menu_item_new_with_mnemonic ("_Export to PDF");
+  filePrintPDF = gtk_menu_item_new_with_mnemonic (_("_Export to PDF"));
   gtk_widget_show (filePrintPDF);
   gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintPDF);
   gtk_widget_add_accelerator (filePrintPDF, "activate", accel_group,
@@ -466,7 +466,7 @@ create_winMain (void)
   gtk_widget_show (fileQuit);
   gtk_container_add (GTK_CONTAINER (menuFile_menu), fileQuit);
 
-  menuEdit = gtk_menu_item_new_with_mnemonic ("_Edit");
+  menuEdit = gtk_menu_item_new_with_mnemonic (_("_Edit"));
   gtk_widget_show (menuEdit);
   gtk_container_add (GTK_CONTAINER (menubar), menuEdit);
 
@@ -511,20 +511,20 @@ create_winMain (void)
                               GDK_Delete, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  menuView = gtk_menu_item_new_with_mnemonic ("_View");
+  menuView = gtk_menu_item_new_with_mnemonic (_("_View"));
   gtk_widget_show (menuView);
   gtk_container_add (GTK_CONTAINER (menubar), menuView);
 
   menuView_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuView), menuView_menu);
 
-  viewContinuous = gtk_radio_menu_item_new_with_mnemonic (viewContinuous_group, "_Continuous");
+  viewContinuous = gtk_radio_menu_item_new_with_mnemonic (viewContinuous_group, _("_Continuous"));
   viewContinuous_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (viewContinuous));
   gtk_widget_show (viewContinuous);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewContinuous);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (viewContinuous), TRUE);
 
-  viewOnePage = gtk_radio_menu_item_new_with_mnemonic (viewContinuous_group, "_One Page");
+  viewOnePage = gtk_radio_menu_item_new_with_mnemonic (viewContinuous_group, _("_One Page"));
   viewContinuous_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (viewOnePage));
   gtk_widget_show (viewOnePage);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewOnePage);
@@ -535,7 +535,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuView_menu), separator20);
   gtk_widget_set_sensitive (separator20, FALSE);
 
-  viewFullscreen = gtk_check_menu_item_new_with_mnemonic ("Full Screen");
+  viewFullscreen = gtk_check_menu_item_new_with_mnemonic (_("Full Screen"));
   gtk_widget_show (viewFullscreen);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewFullscreen);
   gtk_widget_add_accelerator (viewFullscreen, "activate", accel_group,
@@ -547,7 +547,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuView_menu), separator4);
   gtk_widget_set_sensitive (separator4, FALSE);
 
-  menuViewZoom = gtk_menu_item_new_with_mnemonic ("_Zoom");
+  menuViewZoom = gtk_menu_item_new_with_mnemonic (_("_Zoom"));
   gtk_widget_show (menuViewZoom);
   gtk_container_add (GTK_CONTAINER (menuView_menu), menuViewZoom);
 
@@ -575,7 +575,7 @@ create_winMain (void)
                               GDK_0, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  viewPageWidth = gtk_image_menu_item_new_with_mnemonic ("Page _Width");
+  viewPageWidth = gtk_image_menu_item_new_with_mnemonic (_("Page _Width"));
   gtk_widget_show (viewPageWidth);
   gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewPageWidth);
   gtk_widget_add_accelerator (viewPageWidth, "activate", accel_group,
@@ -586,7 +586,7 @@ create_winMain (void)
   gtk_widget_show (image625);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewPageWidth), image625);
 
-  viewSetZoom = gtk_menu_item_new_with_mnemonic ("_Set Zoom");
+  viewSetZoom = gtk_menu_item_new_with_mnemonic (_("_Set Zoom"));
   gtk_widget_show (viewSetZoom);
   gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewSetZoom);
 
@@ -595,7 +595,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuView_menu), separator5);
   gtk_widget_set_sensitive (separator5, FALSE);
 
-  viewFirstPage = gtk_image_menu_item_new_with_mnemonic ("_First Page");
+  viewFirstPage = gtk_image_menu_item_new_with_mnemonic (_("_First Page"));
   gtk_widget_show (viewFirstPage);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewFirstPage);
   gtk_widget_add_accelerator (viewFirstPage, "activate", accel_group,
@@ -606,7 +606,7 @@ create_winMain (void)
   gtk_widget_show (image626);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewFirstPage), image626);
 
-  viewPreviousPage = gtk_image_menu_item_new_with_mnemonic ("_Previous Page");
+  viewPreviousPage = gtk_image_menu_item_new_with_mnemonic (_("_Previous Page"));
   gtk_widget_show (viewPreviousPage);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewPreviousPage);
   gtk_widget_add_accelerator (viewPreviousPage, "activate", accel_group,
@@ -617,7 +617,7 @@ create_winMain (void)
   gtk_widget_show (image627);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewPreviousPage), image627);
 
-  viewNextPage = gtk_image_menu_item_new_with_mnemonic ("_Next Page");
+  viewNextPage = gtk_image_menu_item_new_with_mnemonic (_("_Next Page"));
   gtk_widget_show (viewNextPage);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewNextPage);
   gtk_widget_add_accelerator (viewNextPage, "activate", accel_group,
@@ -628,7 +628,7 @@ create_winMain (void)
   gtk_widget_show (image628);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewNextPage), image628);
 
-  viewLastPage = gtk_image_menu_item_new_with_mnemonic ("_Last Page");
+  viewLastPage = gtk_image_menu_item_new_with_mnemonic (_("_Last Page"));
   gtk_widget_show (viewLastPage);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewLastPage);
   gtk_widget_add_accelerator (viewLastPage, "activate", accel_group,
@@ -644,7 +644,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuView_menu), separator6);
   gtk_widget_set_sensitive (separator6, FALSE);
 
-  viewShowLayer = gtk_image_menu_item_new_with_mnemonic ("_Show Layer");
+  viewShowLayer = gtk_image_menu_item_new_with_mnemonic (_("_Show Layer"));
   gtk_widget_show (viewShowLayer);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewShowLayer);
 
@@ -652,7 +652,7 @@ create_winMain (void)
   gtk_widget_show (image630);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewShowLayer), image630);
 
-  viewHideLayer = gtk_image_menu_item_new_with_mnemonic ("_Hide Layer");
+  viewHideLayer = gtk_image_menu_item_new_with_mnemonic (_("_Hide Layer"));
   gtk_widget_show (viewHideLayer);
   gtk_container_add (GTK_CONTAINER (menuView_menu), viewHideLayer);
 
@@ -660,26 +660,26 @@ create_winMain (void)
   gtk_widget_show (image631);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewHideLayer), image631);
 
-  menuJournal = gtk_menu_item_new_with_mnemonic ("_Journal");
+  menuJournal = gtk_menu_item_new_with_mnemonic (_("_Journal"));
   gtk_widget_show (menuJournal);
   gtk_container_add (GTK_CONTAINER (menubar), menuJournal);
 
   menuJournal_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuJournal), menuJournal_menu);
 
-  journalNewPageBefore = gtk_menu_item_new_with_mnemonic ("New Page _Before");
+  journalNewPageBefore = gtk_menu_item_new_with_mnemonic (_("New Page _Before"));
   gtk_widget_show (journalNewPageBefore);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalNewPageBefore);
 
-  journalNewPageAfter = gtk_menu_item_new_with_mnemonic ("New Page _After");
+  journalNewPageAfter = gtk_menu_item_new_with_mnemonic (_("New Page _After"));
   gtk_widget_show (journalNewPageAfter);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalNewPageAfter);
 
-  journalNewPageEnd = gtk_menu_item_new_with_mnemonic ("New Page At _End");
+  journalNewPageEnd = gtk_menu_item_new_with_mnemonic (_("New Page At _End"));
   gtk_widget_show (journalNewPageEnd);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalNewPageEnd);
 
-  journalDeletePage = gtk_menu_item_new_with_mnemonic ("_Delete Page");
+  journalDeletePage = gtk_menu_item_new_with_mnemonic (_("_Delete Page"));
   gtk_widget_show (journalDeletePage);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalDeletePage);
 
@@ -688,15 +688,15 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), separator7);
   gtk_widget_set_sensitive (separator7, FALSE);
 
-  journalNewLayer = gtk_menu_item_new_with_mnemonic ("_New Layer");
+  journalNewLayer = gtk_menu_item_new_with_mnemonic (_("_New Layer"));
   gtk_widget_show (journalNewLayer);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalNewLayer);
 
-  journalDeleteLayer = gtk_menu_item_new_with_mnemonic ("Delete La_yer");
+  journalDeleteLayer = gtk_menu_item_new_with_mnemonic (_("Delete La_yer"));
   gtk_widget_show (journalDeleteLayer);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalDeleteLayer);
 
-  journalFlatten = gtk_menu_item_new_with_mnemonic ("_Flatten");
+  journalFlatten = gtk_menu_item_new_with_mnemonic (_("_Flatten"));
   gtk_widget_show (journalFlatten);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalFlatten);
 
@@ -705,101 +705,101 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), separator8);
   gtk_widget_set_sensitive (separator8, FALSE);
 
-  journalPaperSize = gtk_menu_item_new_with_mnemonic ("Paper Si_ze");
+  journalPaperSize = gtk_menu_item_new_with_mnemonic (_("Paper Si_ze"));
   gtk_widget_show (journalPaperSize);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalPaperSize);
 
-  journalPaperColor = gtk_menu_item_new_with_mnemonic ("Paper _Color");
+  journalPaperColor = gtk_menu_item_new_with_mnemonic (_("Paper _Color"));
   gtk_widget_show (journalPaperColor);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalPaperColor);
 
   journalPaperColor_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (journalPaperColor), journalPaperColor_menu);
 
-  papercolorWhite = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_white paper");
+  papercolorWhite = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("_white paper"));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorWhite));
   gtk_widget_show (papercolorWhite);
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorWhite);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorWhite), TRUE);
 
-  papercolorYellow = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_yellow paper");
+  papercolorYellow = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("_yellow paper"));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorYellow));
   gtk_widget_show (papercolorYellow);
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorYellow);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorYellow), TRUE);
 
-  papercolorPink = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_pink paper");
+  papercolorPink = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("_pink paper"));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorPink));
   gtk_widget_show (papercolorPink);
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorPink);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorPink), TRUE);
 
-  papercolorOrange = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_orange paper");
+  papercolorOrange = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("_orange paper"));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorOrange));
   gtk_widget_show (papercolorOrange);
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorOrange);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorOrange), TRUE);
 
-  papercolorBlue = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_blue paper");
+  papercolorBlue = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("_blue paper"));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorBlue));
   gtk_widget_show (papercolorBlue);
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorBlue);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorBlue), TRUE);
 
-  papercolorGreen = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_green paper");
+  papercolorGreen = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("_green paper"));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorGreen));
   gtk_widget_show (papercolorGreen);
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorGreen);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorGreen), TRUE);
 
-  papercolorOther = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "other...");
+  papercolorOther = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("other..."));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorOther));
   gtk_widget_show (papercolorOther);
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorOther);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorOther), TRUE);
 
-  papercolorNA = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "NA");
+  papercolorNA = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("NA"));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorNA));
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorNA);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorNA), TRUE);
 
-  journalPaperStyle = gtk_menu_item_new_with_mnemonic ("Paper _Style");
+  journalPaperStyle = gtk_menu_item_new_with_mnemonic (_("Paper _Style"));
   gtk_widget_show (journalPaperStyle);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalPaperStyle);
 
   journalPaperStyle_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (journalPaperStyle), journalPaperStyle_menu);
 
-  paperstylePlain = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "_plain");
+  paperstylePlain = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, _("_plain"));
   paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstylePlain));
   gtk_widget_show (paperstylePlain);
   gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstylePlain);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstylePlain), TRUE);
 
-  paperstyleLined = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "_lined");
+  paperstyleLined = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, _("_lined"));
   paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstyleLined));
   gtk_widget_show (paperstyleLined);
   gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstyleLined);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstyleLined), TRUE);
 
-  paperstyleRuled = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "_ruled");
+  paperstyleRuled = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, _("_ruled"));
   paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstyleRuled));
   gtk_widget_show (paperstyleRuled);
   gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstyleRuled);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstyleRuled), TRUE);
 
-  paperstyleGraph = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "_graph");
+  paperstyleGraph = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, _("_graph"));
   paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstyleGraph));
   gtk_widget_show (paperstyleGraph);
   gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstyleGraph);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstyleGraph), TRUE);
 
-  paperstyleNA = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "NA");
+  paperstyleNA = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, _("NA"));
   paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstyleNA));
   gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstyleNA);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstyleNA), TRUE);
 
-  journalApplyAllPages = gtk_check_menu_item_new_with_mnemonic ("Apply _To All Pages");
+  journalApplyAllPages = gtk_check_menu_item_new_with_mnemonic (_("Apply _To All Pages"));
   gtk_widget_show (journalApplyAllPages);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalApplyAllPages);
 
@@ -808,7 +808,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), separator23);
   gtk_widget_set_sensitive (separator23, FALSE);
 
-  journalLoadBackground = gtk_image_menu_item_new_with_mnemonic ("_Load Background");
+  journalLoadBackground = gtk_image_menu_item_new_with_mnemonic (_("_Load Background"));
   gtk_widget_show (journalLoadBackground);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalLoadBackground);
 
@@ -816,7 +816,7 @@ create_winMain (void)
   gtk_widget_show (image632);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (journalLoadBackground), image632);
 
-  journalScreenshot = gtk_menu_item_new_with_mnemonic ("Background Screens_hot");
+  journalScreenshot = gtk_menu_item_new_with_mnemonic (_("Background Screens_hot"));
   gtk_widget_show (journalScreenshot);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalScreenshot);
 
@@ -825,22 +825,22 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), separator19);
   gtk_widget_set_sensitive (separator19, FALSE);
 
-  journalDefaultBackground = gtk_menu_item_new_with_mnemonic ("Default _Paper");
+  journalDefaultBackground = gtk_menu_item_new_with_mnemonic (_("Default _Paper"));
   gtk_widget_show (journalDefaultBackground);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalDefaultBackground);
 
-  journalSetAsDefault = gtk_menu_item_new_with_mnemonic ("Set As De_fault");
+  journalSetAsDefault = gtk_menu_item_new_with_mnemonic (_("Set As De_fault"));
   gtk_widget_show (journalSetAsDefault);
   gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalSetAsDefault);
 
-  menuTools = gtk_menu_item_new_with_mnemonic ("_Tools");
+  menuTools = gtk_menu_item_new_with_mnemonic (_("_Tools"));
   gtk_widget_show (menuTools);
   gtk_container_add (GTK_CONTAINER (menubar), menuTools);
 
   menuTools_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuTools), menuTools_menu);
 
-  toolsPen = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Pen");
+  toolsPen = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("_Pen"));
   toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsPen));
   gtk_widget_show (toolsPen);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsPen);
@@ -849,7 +849,7 @@ create_winMain (void)
                               GTK_ACCEL_VISIBLE);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsPen), TRUE);
 
-  toolsEraser = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Eraser");
+  toolsEraser = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("_Eraser"));
   toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsEraser));
   gtk_widget_show (toolsEraser);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsEraser);
@@ -858,7 +858,7 @@ create_winMain (void)
                               GTK_ACCEL_VISIBLE);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsEraser), TRUE);
 
-  toolsHighlighter = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Highlighter");
+  toolsHighlighter = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("_Highlighter"));
   toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsHighlighter));
   gtk_widget_show (toolsHighlighter);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsHighlighter);
@@ -867,7 +867,7 @@ create_winMain (void)
                               GTK_ACCEL_VISIBLE);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsHighlighter), TRUE);
 
-  toolsText = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Text");
+  toolsText = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("_Text"));
   toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsText));
   gtk_widget_show (toolsText);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsText);
@@ -881,14 +881,14 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuTools_menu), separator15);
   gtk_widget_set_sensitive (separator15, FALSE);
 
-  toolsReco = gtk_check_menu_item_new_with_mnemonic ("_Shape Recognizer");
+  toolsReco = gtk_check_menu_item_new_with_mnemonic (_("_Shape Recognizer"));
   gtk_widget_show (toolsReco);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsReco);
   gtk_widget_add_accelerator (toolsReco, "activate", accel_group,
                               GDK_S, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  toolsRuler = gtk_check_menu_item_new_with_mnemonic ("Ru_ler");
+  toolsRuler = gtk_check_menu_item_new_with_mnemonic (_("Ru_ler"));
   gtk_widget_show (toolsRuler);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsRuler);
   gtk_widget_add_accelerator (toolsRuler, "activate", accel_group,
@@ -900,7 +900,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuTools_menu), separator9);
   gtk_widget_set_sensitive (separator9, FALSE);
 
-  toolsSelectRegion = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "Select Re_gion");
+  toolsSelectRegion = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("Select Re_gion"));
   toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsSelectRegion));
   gtk_widget_show (toolsSelectRegion);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsSelectRegion);
@@ -909,7 +909,7 @@ create_winMain (void)
                               GTK_ACCEL_VISIBLE);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsSelectRegion), TRUE);
 
-  toolsSelectRectangle = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "Select _Rectangle");
+  toolsSelectRectangle = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("Select _Rectangle"));
   toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsSelectRectangle));
   gtk_widget_show (toolsSelectRectangle);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsSelectRectangle);
@@ -918,7 +918,7 @@ create_winMain (void)
                               GTK_ACCEL_VISIBLE);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsSelectRectangle), TRUE);
 
-  toolsVerticalSpace = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Vertical Space");
+  toolsVerticalSpace = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("_Vertical Space"));
   toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsVerticalSpace));
   gtk_widget_show (toolsVerticalSpace);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsVerticalSpace);
@@ -927,7 +927,7 @@ create_winMain (void)
                               GTK_ACCEL_VISIBLE);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsVerticalSpace), TRUE);
 
-  toolsHand = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "H_and Tool");
+  toolsHand = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("H_and Tool"));
   toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsHand));
   gtk_widget_show (toolsHand);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsHand);
@@ -940,7 +940,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuTools_menu), separator16);
   gtk_widget_set_sensitive (separator16, FALSE);
 
-  toolsColor = gtk_image_menu_item_new_with_mnemonic ("_Color");
+  toolsColor = gtk_image_menu_item_new_with_mnemonic (_("_Color"));
   gtk_widget_show (toolsColor);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsColor);
 
@@ -951,31 +951,31 @@ create_winMain (void)
   toolsColor_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (toolsColor), toolsColor_menu);
 
-  colorBlack = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "blac_k");
+  colorBlack = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("blac_k"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorBlack));
   gtk_widget_show (colorBlack);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorBlack);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorBlack), TRUE);
 
-  colorBlue = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_blue");
+  colorBlue = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("_blue"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorBlue));
   gtk_widget_show (colorBlue);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorBlue);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorBlue), TRUE);
 
-  colorRed = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_red");
+  colorRed = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("_red"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorRed));
   gtk_widget_show (colorRed);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorRed);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorRed), TRUE);
 
-  colorGreen = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_green");
+  colorGreen = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("_green"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorGreen));
   gtk_widget_show (colorGreen);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorGreen);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorGreen), TRUE);
 
-  colorGray = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "gr_ay");
+  colorGray = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("gr_ay"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorGray));
   gtk_widget_show (colorGray);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorGray);
@@ -986,110 +986,110 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), separator17);
   gtk_widget_set_sensitive (separator17, FALSE);
 
-  colorLightBlue = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "light bl_ue");
+  colorLightBlue = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("light bl_ue"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorLightBlue));
   gtk_widget_show (colorLightBlue);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorLightBlue);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorLightBlue), TRUE);
 
-  colorLightGreen = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "light gr_een");
+  colorLightGreen = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("light gr_een"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorLightGreen));
   gtk_widget_show (colorLightGreen);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorLightGreen);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorLightGreen), TRUE);
 
-  colorMagenta = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_magenta");
+  colorMagenta = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("_magenta"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorMagenta));
   gtk_widget_show (colorMagenta);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorMagenta);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorMagenta), TRUE);
 
-  colorOrange = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_orange");
+  colorOrange = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("_orange"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorOrange));
   gtk_widget_show (colorOrange);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorOrange);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorOrange), TRUE);
 
-  colorYellow = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_yellow");
+  colorYellow = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("_yellow"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorYellow));
   gtk_widget_show (colorYellow);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorYellow);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorYellow), TRUE);
 
-  colorWhite = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_white");
+  colorWhite = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("_white"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorWhite));
   gtk_widget_show (colorWhite);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorWhite);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorWhite), TRUE);
 
-  colorOther = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "other...");
+  colorOther = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("other..."));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorOther));
   gtk_widget_show (colorOther);
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorOther);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorOther), TRUE);
 
-  colorNA = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "NA");
+  colorNA = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("NA"));
   colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorNA));
   gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorNA);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorNA), TRUE);
 
-  toolsPenOptions = gtk_menu_item_new_with_mnemonic ("Pen _Options");
+  toolsPenOptions = gtk_menu_item_new_with_mnemonic (_("Pen _Options"));
   gtk_widget_show (toolsPenOptions);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsPenOptions);
 
   toolsPenOptions_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (toolsPenOptions), toolsPenOptions_menu);
 
-  penthicknessVeryFine = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "_very fine");
+  penthicknessVeryFine = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, _("_very fine"));
   penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessVeryFine));
   gtk_widget_show (penthicknessVeryFine);
   gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessVeryFine);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessVeryFine), TRUE);
 
-  penthicknessFine = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "_fine");
+  penthicknessFine = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, _("_fine"));
   penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessFine));
   gtk_widget_show (penthicknessFine);
   gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessFine);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessFine), TRUE);
 
-  penthicknessMedium = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "_medium");
+  penthicknessMedium = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, _("_medium"));
   penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessMedium));
   gtk_widget_show (penthicknessMedium);
   gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessMedium);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessMedium), TRUE);
 
-  penthicknessThick = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "_thick");
+  penthicknessThick = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, _("_thick"));
   penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessThick));
   gtk_widget_show (penthicknessThick);
   gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessThick);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessThick), TRUE);
 
-  penthicknessVeryThick = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "ver_y thick");
+  penthicknessVeryThick = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, _("ver_y thick"));
   penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessVeryThick));
   gtk_widget_show (penthicknessVeryThick);
   gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessVeryThick);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessVeryThick), TRUE);
 
-  toolsEraserOptions = gtk_menu_item_new_with_mnemonic ("Eraser Optio_ns");
+  toolsEraserOptions = gtk_menu_item_new_with_mnemonic (_("Eraser Optio_ns"));
   gtk_widget_show (toolsEraserOptions);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsEraserOptions);
 
   toolsEraserOptions_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (toolsEraserOptions), toolsEraserOptions_menu);
 
-  eraserFine = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "_fine");
+  eraserFine = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, _("_fine"));
   eraserFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserFine));
   gtk_widget_show (eraserFine);
   gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserFine);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserFine), TRUE);
 
-  eraserMedium = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "_medium");
+  eraserMedium = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, _("_medium"));
   eraserFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserMedium));
   gtk_widget_show (eraserMedium);
   gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserMedium);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserMedium), TRUE);
 
-  eraserThick = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "_thick");
+  eraserThick = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, _("_thick"));
   eraserFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserThick));
   gtk_widget_show (eraserThick);
   gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserThick);
@@ -1100,50 +1100,50 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), separator14);
   gtk_widget_set_sensitive (separator14, FALSE);
 
-  eraserStandard = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "_standard");
+  eraserStandard = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, _("_standard"));
   eraserStandard_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserStandard));
   gtk_widget_show (eraserStandard);
   gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserStandard);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserStandard), TRUE);
 
-  eraserWhiteout = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "_whiteout");
+  eraserWhiteout = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, _("_whiteout"));
   eraserStandard_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserWhiteout));
   gtk_widget_show (eraserWhiteout);
   gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserWhiteout);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserWhiteout), TRUE);
 
-  eraserDeleteStrokes = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "_delete strokes");
+  eraserDeleteStrokes = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, _("_delete strokes"));
   eraserStandard_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserDeleteStrokes));
   gtk_widget_show (eraserDeleteStrokes);
   gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserDeleteStrokes);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserDeleteStrokes), TRUE);
 
-  toolsHighlighterOptions = gtk_menu_item_new_with_mnemonic ("Highlighter Opt_ions");
+  toolsHighlighterOptions = gtk_menu_item_new_with_mnemonic (_("Highlighter Opt_ions"));
   gtk_widget_show (toolsHighlighterOptions);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsHighlighterOptions);
 
   toolsHighlighterOptions_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (toolsHighlighterOptions), toolsHighlighterOptions_menu);
 
-  highlighterFine = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "_fine");
+  highlighterFine = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, _("_fine"));
   highlighterFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (highlighterFine));
   gtk_widget_show (highlighterFine);
   gtk_container_add (GTK_CONTAINER (toolsHighlighterOptions_menu), highlighterFine);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (highlighterFine), TRUE);
 
-  highlighterMedium = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "_medium");
+  highlighterMedium = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, _("_medium"));
   highlighterFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (highlighterMedium));
   gtk_widget_show (highlighterMedium);
   gtk_container_add (GTK_CONTAINER (toolsHighlighterOptions_menu), highlighterMedium);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (highlighterMedium), TRUE);
 
-  highlighterThick = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "_thick");
+  highlighterThick = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, _("_thick"));
   highlighterFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (highlighterThick));
   gtk_widget_show (highlighterThick);
   gtk_container_add (GTK_CONTAINER (toolsHighlighterOptions_menu), highlighterThick);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (highlighterThick), TRUE);
 
-  toolsTextFont = gtk_image_menu_item_new_with_mnemonic ("Text _Font...");
+  toolsTextFont = gtk_image_menu_item_new_with_mnemonic (_("Text _Font..."));
   gtk_widget_show (toolsTextFont);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsTextFont);
   gtk_widget_add_accelerator (toolsTextFont, "activate", accel_group,
@@ -1159,99 +1159,99 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuTools_menu), separator10);
   gtk_widget_set_sensitive (separator10, FALSE);
 
-  toolsDefaultPen = gtk_menu_item_new_with_mnemonic ("_Default Pen");
+  toolsDefaultPen = gtk_menu_item_new_with_mnemonic (_("_Default Pen"));
   gtk_widget_show (toolsDefaultPen);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsDefaultPen);
 
-  toolsDefaultEraser = gtk_menu_item_new_with_mnemonic ("Default Eraser");
+  toolsDefaultEraser = gtk_menu_item_new_with_mnemonic (_("Default Eraser"));
   gtk_widget_show (toolsDefaultEraser);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsDefaultEraser);
 
-  toolsDefaultHighlighter = gtk_menu_item_new_with_mnemonic ("Default Highlighter");
+  toolsDefaultHighlighter = gtk_menu_item_new_with_mnemonic (_("Default Highlighter"));
   gtk_widget_show (toolsDefaultHighlighter);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsDefaultHighlighter);
 
-  toolsDefaultText = gtk_menu_item_new_with_mnemonic ("Default Te_xt");
+  toolsDefaultText = gtk_menu_item_new_with_mnemonic (_("Default Te_xt"));
   gtk_widget_show (toolsDefaultText);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsDefaultText);
 
-  toolsSetAsDefault = gtk_menu_item_new_with_mnemonic ("Set As Default");
+  toolsSetAsDefault = gtk_menu_item_new_with_mnemonic (_("Set As Default"));
   gtk_widget_show (toolsSetAsDefault);
   gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsSetAsDefault);
 
-  menuOptions = gtk_menu_item_new_with_mnemonic ("_Options");
+  menuOptions = gtk_menu_item_new_with_mnemonic (_("_Options"));
   gtk_widget_show (menuOptions);
   gtk_container_add (GTK_CONTAINER (menubar), menuOptions);
 
   menuOptions_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuOptions), menuOptions_menu);
 
-  optionsUseXInput = gtk_check_menu_item_new_with_mnemonic ("Use _XInput");
+  optionsUseXInput = gtk_check_menu_item_new_with_mnemonic (_("Use _XInput"));
   gtk_widget_show (optionsUseXInput);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsUseXInput);
 
-  optionsDiscardCoreEvents = gtk_check_menu_item_new_with_mnemonic ("Discard _Core Events");
+  optionsDiscardCoreEvents = gtk_check_menu_item_new_with_mnemonic (_("Discard _Core Events"));
   gtk_widget_show (optionsDiscardCoreEvents);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsDiscardCoreEvents);
 
-  optionsButtonMappings = gtk_check_menu_item_new_with_mnemonic ("_Eraser Tip");
+  optionsButtonMappings = gtk_check_menu_item_new_with_mnemonic (_("_Eraser Tip"));
   gtk_widget_show (optionsButtonMappings);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsButtonMappings);
 
-  optionsPressureSensitive = gtk_check_menu_item_new_with_mnemonic ("_Pressure sensitivity");
+  optionsPressureSensitive = gtk_check_menu_item_new_with_mnemonic (_("_Pressure sensitivity"));
   gtk_widget_show (optionsPressureSensitive);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsPressureSensitive);
 
-  button2_mapping = gtk_menu_item_new_with_mnemonic ("Button _2 Mapping");
+  button2_mapping = gtk_menu_item_new_with_mnemonic (_("Button _2 Mapping"));
   gtk_widget_show (button2_mapping);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), button2_mapping);
 
   button2_mapping_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (button2_mapping), button2_mapping_menu);
 
-  button2Pen = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Pen");
+  button2Pen = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("_Pen"));
   button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Pen));
   gtk_widget_show (button2Pen);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Pen);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Pen), TRUE);
 
-  button2Eraser = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Eraser");
+  button2Eraser = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("_Eraser"));
   button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Eraser));
   gtk_widget_show (button2Eraser);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Eraser);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Eraser), TRUE);
 
-  button2Highlighter = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Highlighter");
+  button2Highlighter = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("_Highlighter"));
   button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Highlighter));
   gtk_widget_show (button2Highlighter);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Highlighter);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Highlighter), TRUE);
 
-  button2Text = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Text");
+  button2Text = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("_Text"));
   button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Text));
   gtk_widget_show (button2Text);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Text);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Text), TRUE);
 
-  button2SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Select Re_gion");
+  button2SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("Select Re_gion"));
   button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2SelectRegion));
   gtk_widget_show (button2SelectRegion);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2SelectRegion);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2SelectRegion), TRUE);
 
-  button2SelectRectangle = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Select _Rectangle");
+  button2SelectRectangle = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("Select _Rectangle"));
   button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2SelectRectangle));
   gtk_widget_show (button2SelectRectangle);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2SelectRectangle);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2SelectRectangle), TRUE);
 
-  button2VerticalSpace = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Vertical Space");
+  button2VerticalSpace = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("_Vertical Space"));
   button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2VerticalSpace));
   gtk_widget_show (button2VerticalSpace);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2VerticalSpace);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2VerticalSpace), TRUE);
 
-  button2Hand = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "H_and Tool");
+  button2Hand = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("H_and Tool"));
   button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Hand));
   gtk_widget_show (button2Hand);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Hand);
@@ -1261,73 +1261,73 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), separator24);
   gtk_widget_set_sensitive (separator24, FALSE);
 
-  button2LinkBrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, "_Link to Primary Brush");
+  button2LinkBrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, _("_Link to Primary Brush"));
   button2LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2LinkBrush));
   gtk_widget_show (button2LinkBrush);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2LinkBrush);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2LinkBrush), TRUE);
 
-  button2CopyBrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, "_Copy of Current Brush");
+  button2CopyBrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, _("_Copy of Current Brush"));
   button2LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2CopyBrush));
   gtk_widget_show (button2CopyBrush);
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2CopyBrush);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2CopyBrush), TRUE);
 
-  button2NABrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, "NA");
+  button2NABrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, _("NA"));
   button2LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2NABrush));
   gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2NABrush);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2NABrush), TRUE);
 
-  button3_mapping = gtk_menu_item_new_with_mnemonic ("Button _3 Mapping");
+  button3_mapping = gtk_menu_item_new_with_mnemonic (_("Button _3 Mapping"));
   gtk_widget_show (button3_mapping);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), button3_mapping);
 
   button3_mapping_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (button3_mapping), button3_mapping_menu);
 
-  button3Pen = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Pen");
+  button3Pen = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("_Pen"));
   button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Pen));
   gtk_widget_show (button3Pen);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Pen);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Pen), TRUE);
 
-  button3Eraser = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Eraser");
+  button3Eraser = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("_Eraser"));
   button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Eraser));
   gtk_widget_show (button3Eraser);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Eraser);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Eraser), TRUE);
 
-  button3Highlighter = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Highlighter");
+  button3Highlighter = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("_Highlighter"));
   button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Highlighter));
   gtk_widget_show (button3Highlighter);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Highlighter);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Highlighter), TRUE);
 
-  button3Text = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Text");
+  button3Text = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("_Text"));
   button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Text));
   gtk_widget_show (button3Text);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Text);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Text), TRUE);
 
-  button3SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Select Re_gion");
+  button3SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("Select Re_gion"));
   button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3SelectRegion));
   gtk_widget_show (button3SelectRegion);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3SelectRegion);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3SelectRegion), TRUE);
 
-  button3SelectRectangle = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Select _Rectangle");
+  button3SelectRectangle = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("Select _Rectangle"));
   button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3SelectRectangle));
   gtk_widget_show (button3SelectRectangle);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3SelectRectangle);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3SelectRectangle), TRUE);
 
-  button3VerticalSpace = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Vertical Space");
+  button3VerticalSpace = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("_Vertical Space"));
   button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3VerticalSpace));
   gtk_widget_show (button3VerticalSpace);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3VerticalSpace);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3VerticalSpace), TRUE);
 
-  button3Hand = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "H_and Tool");
+  button3Hand = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("H_and Tool"));
   button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Hand));
   gtk_widget_show (button3Hand);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Hand);
@@ -1337,19 +1337,19 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), separator25);
   gtk_widget_set_sensitive (separator25, FALSE);
 
-  button3LinkBrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, "_Link to Primary Brush");
+  button3LinkBrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, _("_Link to Primary Brush"));
   button3LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3LinkBrush));
   gtk_widget_show (button3LinkBrush);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3LinkBrush);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3LinkBrush), TRUE);
 
-  button3CopyBrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, "_Copy of Current Brush");
+  button3CopyBrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, _("_Copy of Current Brush"));
   button3LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3CopyBrush));
   gtk_widget_show (button3CopyBrush);
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3CopyBrush);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3CopyBrush), TRUE);
 
-  button3NABrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, "NA");
+  button3NABrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, _("NA"));
   button3LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3NABrush));
   gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3NABrush);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3NABrush), TRUE);
@@ -1359,23 +1359,23 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), separator18);
   gtk_widget_set_sensitive (separator18, FALSE);
 
-  optionsAntialiasBG = gtk_check_menu_item_new_with_mnemonic ("_Antialiased Bitmaps");
+  optionsAntialiasBG = gtk_check_menu_item_new_with_mnemonic (_("_Antialiased Bitmaps"));
   gtk_widget_show (optionsAntialiasBG);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsAntialiasBG);
 
-  optionsProgressiveBG = gtk_check_menu_item_new_with_mnemonic ("_Progressive Backgrounds");
+  optionsProgressiveBG = gtk_check_menu_item_new_with_mnemonic (_("_Progressive Backgrounds"));
   gtk_widget_show (optionsProgressiveBG);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsProgressiveBG);
 
-  optionsPrintRuling = gtk_check_menu_item_new_with_mnemonic ("Print Paper _Ruling");
+  optionsPrintRuling = gtk_check_menu_item_new_with_mnemonic (_("Print Paper _Ruling"));
   gtk_widget_show (optionsPrintRuling);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsPrintRuling);
 
-  optionsLeftHanded = gtk_check_menu_item_new_with_mnemonic ("Left-Handed Scrollbar");
+  optionsLeftHanded = gtk_check_menu_item_new_with_mnemonic (_("Left-Handed Scrollbar"));
   gtk_widget_show (optionsLeftHanded);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsLeftHanded);
 
-  optionsShortenMenus = gtk_check_menu_item_new_with_mnemonic ("Shorten _Menus");
+  optionsShortenMenus = gtk_check_menu_item_new_with_mnemonic (_("Shorten _Menus"));
   gtk_widget_show (optionsShortenMenus);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsShortenMenus);
 
@@ -1384,15 +1384,15 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), separator21);
   gtk_widget_set_sensitive (separator21, FALSE);
 
-  optionsAutoSavePrefs = gtk_check_menu_item_new_with_mnemonic ("A_uto-Save Preferences");
+  optionsAutoSavePrefs = gtk_check_menu_item_new_with_mnemonic (_("A_uto-Save Preferences"));
   gtk_widget_show (optionsAutoSavePrefs);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsAutoSavePrefs);
 
-  optionsSavePreferences = gtk_menu_item_new_with_mnemonic ("_Save Preferences");
+  optionsSavePreferences = gtk_menu_item_new_with_mnemonic (_("_Save Preferences"));
   gtk_widget_show (optionsSavePreferences);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsSavePreferences);
 
-  menuHelp = gtk_menu_item_new_with_mnemonic ("_Help");
+  menuHelp = gtk_menu_item_new_with_mnemonic (_("_Help"));
   gtk_widget_show (menuHelp);
   gtk_container_add (GTK_CONTAINER (menubar), menuHelp);
 
@@ -1403,7 +1403,7 @@ create_winMain (void)
   gtk_widget_show (helpIndex);
   gtk_container_add (GTK_CONTAINER (menuHelp_menu), helpIndex);
 
-  helpAbout = gtk_menu_item_new_with_mnemonic ("_About");
+  helpAbout = gtk_menu_item_new_with_mnemonic (_("_About"));
   gtk_widget_show (helpAbout);
   gtk_container_add (GTK_CONTAINER (menuHelp_menu), helpAbout);
 
@@ -1416,17 +1416,17 @@ create_winMain (void)
   saveButton = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-save");
   gtk_widget_show (saveButton);
   gtk_container_add (GTK_CONTAINER (toolbarMain), saveButton);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (saveButton), tooltips, "Save", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (saveButton), tooltips, _("Save"), NULL);
 
   newButton = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-new");
   gtk_widget_show (newButton);
   gtk_container_add (GTK_CONTAINER (toolbarMain), newButton);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (newButton), tooltips, "New", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (newButton), tooltips, _("New"), NULL);
 
   openButton = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-open");
   gtk_widget_show (openButton);
   gtk_container_add (GTK_CONTAINER (toolbarMain), openButton);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (openButton), tooltips, "Open", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (openButton), tooltips, _("Open"), NULL);
 
   toolitem11 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem11);
@@ -1439,17 +1439,17 @@ create_winMain (void)
   buttonCut = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-cut");
   gtk_widget_show (buttonCut);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonCut);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonCut), tooltips, "Cut", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonCut), tooltips, _("Cut"), NULL);
 
   buttonCopy = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-copy");
   gtk_widget_show (buttonCopy);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonCopy);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonCopy), tooltips, "Copy", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonCopy), tooltips, _("Copy"), NULL);
 
   buttonPaste = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-paste");
   gtk_widget_show (buttonPaste);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonPaste);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonPaste), tooltips, "Paste", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonPaste), tooltips, _("Paste"), NULL);
 
   toolitem12 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem12);
@@ -1462,12 +1462,12 @@ create_winMain (void)
   buttonUndo = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-undo");
   gtk_widget_show (buttonUndo);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonUndo);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonUndo), tooltips, "Undo", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonUndo), tooltips, _("Undo"), NULL);
 
   buttonRedo = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-redo");
   gtk_widget_show (buttonRedo);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonRedo);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonRedo), tooltips, "Redo", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonRedo), tooltips, _("Redo"), NULL);
 
   toolitem13 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem13);
@@ -1480,22 +1480,22 @@ create_winMain (void)
   buttonFirstPage = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-goto-first");
   gtk_widget_show (buttonFirstPage);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonFirstPage);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonFirstPage), tooltips, "First Page", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonFirstPage), tooltips, _("First Page"), NULL);
 
   buttonPreviousPage = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-go-back");
   gtk_widget_show (buttonPreviousPage);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonPreviousPage);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonPreviousPage), tooltips, "Previous Page", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonPreviousPage), tooltips, _("Previous Page"), NULL);
 
   buttonNextPage = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-go-forward");
   gtk_widget_show (buttonNextPage);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonNextPage);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonNextPage), tooltips, "Next Page", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonNextPage), tooltips, _("Next Page"), NULL);
 
   buttonLastPage = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-goto-last");
   gtk_widget_show (buttonLastPage);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonLastPage);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonLastPage), tooltips, "Last Page", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonLastPage), tooltips, _("Last Page"), NULL);
 
   toolitem14 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem14);
@@ -1508,28 +1508,28 @@ create_winMain (void)
   buttonZoomOut = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-zoom-out");
   gtk_widget_show (buttonZoomOut);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonZoomOut);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonZoomOut), tooltips, "Zoom Out", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonZoomOut), tooltips, _("Zoom Out"), NULL);
 
   buttonPageWidth = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-zoom-fit");
   gtk_widget_show (buttonPageWidth);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonPageWidth);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonPageWidth), tooltips, "Page Width", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonPageWidth), tooltips, _("Page Width"), NULL);
   gtk_tool_item_set_visible_vertical (GTK_TOOL_ITEM (buttonPageWidth), FALSE);
 
   buttonZoomIn = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-zoom-in");
   gtk_widget_show (buttonZoomIn);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonZoomIn);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonZoomIn), tooltips, "Zoom In", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonZoomIn), tooltips, _("Zoom In"), NULL);
 
   buttonNormalSize = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-zoom-100");
   gtk_widget_show (buttonNormalSize);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonNormalSize);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonNormalSize), tooltips, "Normal Size", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonNormalSize), tooltips, _("Normal Size"), NULL);
 
   buttonZoomSet = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-find");
   gtk_widget_show (buttonZoomSet);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonZoomSet);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonZoomSet), tooltips, "Set Zoom", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonZoomSet), tooltips, _("Set Zoom"), NULL);
 
   buttonFullscreen = (GtkWidget*) gtk_toggle_tool_button_new ();
   gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonFullscreen), "");
@@ -1538,7 +1538,7 @@ create_winMain (void)
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonFullscreen), tmp_image);
   gtk_widget_show (buttonFullscreen);
   gtk_container_add (GTK_CONTAINER (toolbarMain), buttonFullscreen);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonFullscreen), tooltips, "Toggle Fullscreen", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonFullscreen), tooltips, _("Toggle Fullscreen"), NULL);
 
   toolbarPen = gtk_toolbar_new ();
   gtk_widget_show (toolbarPen);
@@ -1547,66 +1547,66 @@ create_winMain (void)
   tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbarPen));
 
   buttonPen = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonPen), "Pencil");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonPen), _("Pencil"));
   tmp_image = create_pixmap (winMain, "pencil.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonPen), tmp_image);
   gtk_widget_show (buttonPen);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonPen);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonPen), tooltips, "Pen", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonPen), tooltips, _("Pen"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonPen), buttonPen_group);
   buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonPen));
 
   buttonEraser = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonEraser), "Eraser");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonEraser), _("Eraser"));
   tmp_image = create_pixmap (winMain, "eraser.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonEraser), tmp_image);
   gtk_widget_show (buttonEraser);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonEraser);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonEraser), tooltips, "Eraser", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonEraser), tooltips, _("Eraser"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonEraser), buttonPen_group);
   buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonEraser));
 
   buttonHighlighter = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonHighlighter), "Highlighter");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonHighlighter), _("Highlighter"));
   tmp_image = create_pixmap (winMain, "highlighter.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonHighlighter), tmp_image);
   gtk_widget_show (buttonHighlighter);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonHighlighter);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonHighlighter), tooltips, "Highlighter", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonHighlighter), tooltips, _("Highlighter"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonHighlighter), buttonPen_group);
   buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonHighlighter));
 
   buttonText = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonText), "Text");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonText), _("Text"));
   tmp_image = create_pixmap (winMain, "text-tool.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonText), tmp_image);
   gtk_widget_show (buttonText);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonText);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonText), tooltips, "Text", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonText), tooltips, _("Text"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonText), buttonPen_group);
   buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonText));
 
   buttonReco = (GtkWidget*) gtk_toggle_tool_button_new ();
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonReco), "Shape Recognizer");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonReco), _("Shape Recognizer"));
   tmp_image = create_pixmap (winMain, "shapes.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonReco), tmp_image);
   gtk_widget_show (buttonReco);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonReco);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonReco), tooltips, "Shape Recognizer", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonReco), tooltips, _("Shape Recognizer"), NULL);
 
   buttonRuler = (GtkWidget*) gtk_toggle_tool_button_new ();
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonRuler), "Ruler");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonRuler), _("Ruler"));
   tmp_image = create_pixmap (winMain, "ruler.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonRuler), tmp_image);
   gtk_widget_show (buttonRuler);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonRuler);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonRuler), tooltips, "Ruler", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonRuler), tooltips, _("Ruler"), NULL);
 
   toolitem15 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem15);
@@ -1617,40 +1617,40 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (toolitem15), vseparator5);
 
   buttonSelectRegion = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonSelectRegion), "Select Region");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonSelectRegion), _("Select Region"));
   tmp_image = create_pixmap (winMain, "lasso.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonSelectRegion), tmp_image);
   gtk_widget_show (buttonSelectRegion);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonSelectRegion);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonSelectRegion), tooltips, "Select Region", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonSelectRegion), tooltips, _("Select Region"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonSelectRegion), buttonPen_group);
   buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonSelectRegion));
 
   buttonSelectRectangle = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonSelectRectangle), "Select Rectangle");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonSelectRectangle), _("Select Rectangle"));
   tmp_image = create_pixmap (winMain, "rect-select.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonSelectRectangle), tmp_image);
   gtk_widget_show (buttonSelectRectangle);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonSelectRectangle);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonSelectRectangle), tooltips, "Select Rectangle", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonSelectRectangle), tooltips, _("Select Rectangle"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonSelectRectangle), buttonPen_group);
   buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonSelectRectangle));
 
   buttonVerticalSpace = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonVerticalSpace), "Vertical Space");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonVerticalSpace), _("Vertical Space"));
   tmp_image = create_pixmap (winMain, "stretch.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonVerticalSpace), tmp_image);
   gtk_widget_show (buttonVerticalSpace);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonVerticalSpace);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonVerticalSpace), tooltips, "Vertical Space", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonVerticalSpace), tooltips, _("Vertical Space"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonVerticalSpace), buttonPen_group);
   buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonVerticalSpace));
 
   buttonHand = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonHand), "Hand Tool");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonHand), _("Hand Tool"));
   tmp_image = create_pixmap (winMain, "hand.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonHand), tmp_image);
@@ -1669,18 +1669,18 @@ create_winMain (void)
 
   tmp_image = create_pixmap (winMain, "recycled.png");
   gtk_widget_show (tmp_image);
-  buttonToolDefault = (GtkWidget*) gtk_tool_button_new (tmp_image, "Default");
+  buttonToolDefault = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Default"));
   gtk_widget_show (buttonToolDefault);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonToolDefault), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonToolDefault);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonToolDefault), tooltips, "Default", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonToolDefault), tooltips, _("Default"), NULL);
 
   tmp_image = create_pixmap (winMain, "default-pen.png");
   gtk_widget_show (tmp_image);
-  buttonDefaultPen = (GtkWidget*) gtk_tool_button_new (tmp_image, "Default Pen");
+  buttonDefaultPen = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Default Pen"));
   gtk_widget_show (buttonDefaultPen);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonDefaultPen);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonDefaultPen), tooltips, "Default Pen", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonDefaultPen), tooltips, _("Default Pen"), NULL);
 
   toolitem18 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem18);
@@ -1691,7 +1691,7 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (toolitem18), vseparator8);
 
   buttonFine = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonFine), "Fine");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonFine), _("Fine"));
   tmp_image = create_pixmap (winMain, "thin.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonFine), tmp_image);
@@ -1699,12 +1699,12 @@ create_winMain (void)
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonFine), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonFine);
   gtk_widget_set_size_request (buttonFine, 24, -1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonFine), tooltips, "Fine", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonFine), tooltips, _("Fine"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonFine), buttonFine_group);
   buttonFine_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonFine));
 
   buttonMedium = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonMedium), "Medium");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonMedium), _("Medium"));
   tmp_image = create_pixmap (winMain, "medium.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonMedium), tmp_image);
@@ -1712,12 +1712,12 @@ create_winMain (void)
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonMedium), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonMedium);
   gtk_widget_set_size_request (buttonMedium, 24, -1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonMedium), tooltips, "Medium", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonMedium), tooltips, _("Medium"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonMedium), buttonFine_group);
   buttonFine_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonMedium));
 
   buttonThick = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonThick), "Thick");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonThick), _("Thick"));
   tmp_image = create_pixmap (winMain, "thick.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonThick), tmp_image);
@@ -1725,7 +1725,7 @@ create_winMain (void)
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonThick), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonThick);
   gtk_widget_set_size_request (buttonThick, 24, -1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonThick), tooltips, "Thick", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonThick), tooltips, _("Thick"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonThick), buttonFine_group);
   buttonFine_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonThick));
 
@@ -1744,134 +1744,134 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (toolitem17), vseparator7);
 
   buttonBlack = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonBlack), "Black");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonBlack), _("Black"));
   tmp_image = create_pixmap (winMain, "black.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonBlack), tmp_image);
   gtk_widget_show (buttonBlack);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonBlack), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonBlack);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonBlack), tooltips, "Black", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonBlack), tooltips, _("Black"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonBlack), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonBlack));
 
   buttonBlue = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonBlue), "Blue");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonBlue), _("Blue"));
   tmp_image = create_pixmap (winMain, "blue.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonBlue), tmp_image);
   gtk_widget_show (buttonBlue);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonBlue), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonBlue);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonBlue), tooltips, "Blue", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonBlue), tooltips, _("Blue"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonBlue), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonBlue));
 
   buttonRed = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonRed), "Red");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonRed), _("Red"));
   tmp_image = create_pixmap (winMain, "red.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonRed), tmp_image);
   gtk_widget_show (buttonRed);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonRed), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonRed);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonRed), tooltips, "Red", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonRed), tooltips, _("Red"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonRed), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonRed));
 
   buttonGreen = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonGreen), "Green");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonGreen), _("Green"));
   tmp_image = create_pixmap (winMain, "green.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonGreen), tmp_image);
   gtk_widget_show (buttonGreen);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonGreen), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonGreen);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonGreen), tooltips, "Green", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonGreen), tooltips, _("Green"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonGreen), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonGreen));
 
   buttonGray = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonGray), "Gray");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonGray), _("Gray"));
   tmp_image = create_pixmap (winMain, "gray.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonGray), tmp_image);
   gtk_widget_show (buttonGray);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonGray), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonGray);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonGray), tooltips, "Gray", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonGray), tooltips, _("Gray"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonGray), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonGray));
 
   buttonLightBlue = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonLightBlue), "Light Blue");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonLightBlue), _("Light Blue"));
   tmp_image = create_pixmap (winMain, "lightblue.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonLightBlue), tmp_image);
   gtk_widget_show (buttonLightBlue);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonLightBlue), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonLightBlue);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonLightBlue), tooltips, "Light Blue", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonLightBlue), tooltips, _("Light Blue"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonLightBlue), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonLightBlue));
 
   buttonLightGreen = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonLightGreen), "Light Green");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonLightGreen), _("Light Green"));
   tmp_image = create_pixmap (winMain, "lightgreen.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonLightGreen), tmp_image);
   gtk_widget_show (buttonLightGreen);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonLightGreen), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonLightGreen);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonLightGreen), tooltips, "Light Green", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonLightGreen), tooltips, _("Light Green"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonLightGreen), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonLightGreen));
 
   buttonMagenta = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonMagenta), "Magenta");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonMagenta), _("Magenta"));
   tmp_image = create_pixmap (winMain, "magenta.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonMagenta), tmp_image);
   gtk_widget_show (buttonMagenta);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonMagenta), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonMagenta);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonMagenta), tooltips, "Magenta", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonMagenta), tooltips, _("Magenta"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonMagenta), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonMagenta));
 
   buttonOrange = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonOrange), "Orange");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonOrange), _("Orange"));
   tmp_image = create_pixmap (winMain, "orange.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonOrange), tmp_image);
   gtk_widget_show (buttonOrange);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonOrange), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonOrange);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonOrange), tooltips, "Orange", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonOrange), tooltips, _("Orange"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonOrange), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonOrange));
 
   buttonYellow = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonYellow), "Yellow");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonYellow), _("Yellow"));
   tmp_image = create_pixmap (winMain, "yellow.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonYellow), tmp_image);
   gtk_widget_show (buttonYellow);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonYellow), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonYellow);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonYellow), tooltips, "Yellow", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonYellow), tooltips, _("Yellow"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonYellow), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonYellow));
 
   buttonWhite = (GtkWidget*) gtk_radio_tool_button_new (NULL);
-  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonWhite), "White");
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonWhite), _("White"));
   tmp_image = create_pixmap (winMain, "white.png");
   gtk_widget_show (tmp_image);
   gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonWhite), tmp_image);
   gtk_widget_show (buttonWhite);
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (buttonWhite), FALSE);
   gtk_container_add (GTK_CONTAINER (toolbarPen), buttonWhite);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonWhite), tooltips, "White", NULL);
+  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonWhite), tooltips, _("White"), NULL);
   gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonWhite), buttonBlack_group);
   buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonWhite));
 
@@ -1907,7 +1907,7 @@ create_winMain (void)
   gtk_widget_show (hbox1);
   gtk_box_pack_start (GTK_BOX (vboxMain), hbox1, FALSE, FALSE, 0);
 
-  labelPage = gtk_label_new ("  Page  ");
+  labelPage = gtk_label_new (_("  Page  "));
   gtk_widget_show (labelPage);
   gtk_box_pack_start (GTK_BOX (hbox1), labelPage, FALSE, FALSE, 0);
 
@@ -1915,11 +1915,11 @@ create_winMain (void)
   spinPageNo = gtk_spin_button_new (GTK_ADJUSTMENT (spinPageNo_adj), 1, 0);
   gtk_widget_show (spinPageNo);
   gtk_box_pack_start (GTK_BOX (hbox1), spinPageNo, FALSE, TRUE, 0);
-  gtk_tooltips_set_tip (tooltips, spinPageNo, "Set page number", NULL);
+  gtk_tooltips_set_tip (tooltips, spinPageNo, _("Set page number"), NULL);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinPageNo), TRUE);
   gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (spinPageNo), TRUE);
 
-  labelNumpages = gtk_label_new (" of n");
+  labelNumpages = gtk_label_new (_(" of n"));
   gtk_widget_show (labelNumpages);
   gtk_box_pack_start (GTK_BOX (hbox1), labelNumpages, FALSE, FALSE, 0);
 
@@ -1927,7 +1927,7 @@ create_winMain (void)
   gtk_widget_show (vseparator9);
   gtk_box_pack_start (GTK_BOX (hbox1), vseparator9, FALSE, TRUE, 6);
 
-  labelLayer = gtk_label_new ("  Layer:  ");
+  labelLayer = gtk_label_new (_("  Layer:  "));
   gtk_widget_show (labelLayer);
   gtk_box_pack_start (GTK_BOX (hbox1), labelLayer, FALSE, FALSE, 0);
 
@@ -2809,7 +2809,7 @@ create_papersizeDialog (void)
   GtkWidget *okbutton1;
 
   papersizeDialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (papersizeDialog), "Set Paper Size");
+  gtk_window_set_title (GTK_WINDOW (papersizeDialog), _("Set Paper Size"));
   gtk_window_set_modal (GTK_WINDOW (papersizeDialog), TRUE);
   gtk_window_set_resizable (GTK_WINDOW (papersizeDialog), FALSE);
   gtk_window_set_type_hint (GTK_WINDOW (papersizeDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -2821,7 +2821,7 @@ create_papersizeDialog (void)
   gtk_widget_show (hbox2);
   gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox2, TRUE, TRUE, 10);
 
-  labelStdSizes = gtk_label_new ("Standard paper sizes:");
+  labelStdSizes = gtk_label_new (_("Standard paper sizes:"));
   gtk_widget_show (labelStdSizes);
   gtk_box_pack_start (GTK_BOX (hbox2), labelStdSizes, FALSE, FALSE, 0);
   gtk_misc_set_padding (GTK_MISC (labelStdSizes), 10, 0);
@@ -2829,17 +2829,17 @@ create_papersizeDialog (void)
   comboStdSizes = gtk_combo_box_new_text ();
   gtk_widget_show (comboStdSizes);
   gtk_box_pack_start (GTK_BOX (hbox2), comboStdSizes, TRUE, TRUE, 5);
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), "A4");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), "A4 (landscape)");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), "US Letter");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), "US Letter (landscape)");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), "Custom");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("A4"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("A4 (landscape)"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("US Letter"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("US Letter (landscape)"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("Custom"));
 
   hbox3 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox3);
   gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox3, TRUE, TRUE, 8);
 
-  labelWidth = gtk_label_new ("Width:");
+  labelWidth = gtk_label_new (_("Width:"));
   gtk_widget_show (labelWidth);
   gtk_box_pack_start (GTK_BOX (hbox3), labelWidth, FALSE, FALSE, 10);
 
@@ -2848,7 +2848,7 @@ create_papersizeDialog (void)
   gtk_box_pack_start (GTK_BOX (hbox3), entryWidth, TRUE, TRUE, 0);
   gtk_entry_set_width_chars (GTK_ENTRY (entryWidth), 5);
 
-  labelHeight = gtk_label_new ("Height:");
+  labelHeight = gtk_label_new (_("Height:"));
   gtk_widget_show (labelHeight);
   gtk_box_pack_start (GTK_BOX (hbox3), labelHeight, FALSE, FALSE, 10);
 
@@ -2860,10 +2860,10 @@ create_papersizeDialog (void)
   comboUnit = gtk_combo_box_new_text ();
   gtk_widget_show (comboUnit);
   gtk_box_pack_start (GTK_BOX (hbox3), comboUnit, FALSE, TRUE, 8);
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboUnit), "cm");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboUnit), "in");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboUnit), "pixels");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (comboUnit), "points");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboUnit), _("cm"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboUnit), _("in"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboUnit), _("pixels"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (comboUnit), _("points"));
 
   dialog_action_area1 = GTK_DIALOG (papersizeDialog)->action_area;
   gtk_widget_show (dialog_action_area1);
@@ -2923,7 +2923,7 @@ create_aboutDialog (void)
   GtkWidget *closebutton1;
 
   aboutDialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (aboutDialog), "About Xournal");
+  gtk_window_set_title (GTK_WINDOW (aboutDialog), _("About Xournal"));
   gtk_window_set_resizable (GTK_WINDOW (aboutDialog), FALSE);
   gtk_window_set_type_hint (GTK_WINDOW (aboutDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
@@ -2934,12 +2934,12 @@ create_aboutDialog (void)
   gtk_widget_show (image387);
   gtk_box_pack_start (GTK_BOX (dialog_vbox2), image387, FALSE, TRUE, 12);
 
-  labelTitle = gtk_label_new ("Xournal");
+  labelTitle = gtk_label_new (_("Xournal"));
   gtk_widget_show (labelTitle);
   gtk_box_pack_start (GTK_BOX (dialog_vbox2), labelTitle, FALSE, FALSE, 3);
   gtk_label_set_justify (GTK_LABEL (labelTitle), GTK_JUSTIFY_CENTER);
 
-  labelInfo = gtk_label_new ("Written by Denis Auroux\n       http://xournal.sourceforge.net/       ");
+  labelInfo = gtk_label_new (_("Written by Denis Auroux\n       http://xournal.sourceforge.net/       "));
   gtk_widget_show (labelInfo);
   gtk_box_pack_start (GTK_BOX (dialog_vbox2), labelInfo, FALSE, FALSE, 0);
   gtk_label_set_justify (GTK_LABEL (labelInfo), GTK_JUSTIFY_CENTER);
@@ -2987,7 +2987,7 @@ create_zoomDialog (void)
   GtkWidget *button2;
 
   zoomDialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (zoomDialog), "Set Zoom");
+  gtk_window_set_title (GTK_WINDOW (zoomDialog), _("Set Zoom"));
   gtk_window_set_modal (GTK_WINDOW (zoomDialog), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (zoomDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
@@ -3003,7 +3003,7 @@ create_zoomDialog (void)
   gtk_widget_show (hbox4);
   gtk_box_pack_start (GTK_BOX (vbox1), hbox4, FALSE, FALSE, 0);
 
-  radioZoom = gtk_radio_button_new_with_mnemonic (NULL, "Zoom: ");
+  radioZoom = gtk_radio_button_new_with_mnemonic (NULL, _("Zoom: "));
   gtk_widget_show (radioZoom);
   gtk_box_pack_start (GTK_BOX (hbox4), radioZoom, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (radioZoom), 4);
@@ -3016,26 +3016,26 @@ create_zoomDialog (void)
   gtk_box_pack_start (GTK_BOX (hbox4), spinZoom, FALSE, TRUE, 5);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinZoom), TRUE);
 
-  label1 = gtk_label_new ("%");
+  label1 = gtk_label_new (_("%"));
   gtk_widget_show (label1);
   gtk_box_pack_start (GTK_BOX (hbox4), label1, FALSE, TRUE, 0);
   gtk_misc_set_alignment (GTK_MISC (label1), 0.48, 0.5);
 
-  radioZoom100 = gtk_radio_button_new_with_mnemonic (NULL, "Normal size (100%)");
+  radioZoom100 = gtk_radio_button_new_with_mnemonic (NULL, _("Normal size (100%)"));
   gtk_widget_show (radioZoom100);
   gtk_box_pack_start (GTK_BOX (vbox1), radioZoom100, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (radioZoom100), 4);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioZoom100), radioZoom_group);
   radioZoom_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioZoom100));
 
-  radioZoomWidth = gtk_radio_button_new_with_mnemonic (NULL, "Page Width");
+  radioZoomWidth = gtk_radio_button_new_with_mnemonic (NULL, _("Page Width"));
   gtk_widget_show (radioZoomWidth);
   gtk_box_pack_start (GTK_BOX (vbox1), radioZoomWidth, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (radioZoomWidth), 4);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioZoomWidth), radioZoom_group);
   radioZoom_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioZoomWidth));
 
-  radioZoomHeight = gtk_radio_button_new_with_mnemonic (NULL, "Page Height");
+  radioZoomHeight = gtk_radio_button_new_with_mnemonic (NULL, _("Page Height"));
   gtk_widget_show (radioZoomHeight);
   gtk_box_pack_start (GTK_BOX (vbox1), radioZoomHeight, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (radioZoomHeight), 4);
diff --git a/src/xo-misc.c b/src/xo-misc.c
index a5329c3..0d4abc2 100644
--- a/src/xo-misc.c
+++ b/src/xo-misc.c
@@ -1241,12 +1241,12 @@ void update_page_stuff(void)
   gtk_spin_button_set_range(spin, 1, journal.npages+1);
     /* npages+1 will be used to create a new page at end */
   gtk_spin_button_set_value(spin, ui.pageno+1);
-  g_snprintf(tmp, 10, " of %d", journal.npages);
+  g_snprintf(tmp, 10, _(" of %d"), journal.npages);
   gtk_label_set_text(GTK_LABEL(GET_COMPONENT("labelNumpages")), tmp);
 
   layerbox = GTK_COMBO_BOX(GET_COMPONENT("comboLayer"));
   if (ui.layerbox_length == 0) {
-    gtk_combo_box_prepend_text(layerbox, "Background");
+    gtk_combo_box_prepend_text(layerbox, _("Background"));
     ui.layerbox_length++;
   }
   while (ui.layerbox_length > ui.cur_page->nlayers+1) {
@@ -1254,7 +1254,7 @@ void update_page_stuff(void)
     ui.layerbox_length--;
   }
   while (ui.layerbox_length < ui.cur_page->nlayers+1) {
-    g_snprintf(tmp, 10, "Layer %d", ui.layerbox_length++);
+    g_snprintf(tmp, 10, _("Layer %d"), ui.layerbox_length++);
     gtk_combo_box_prepend_text(layerbox, tmp);
   }
   gtk_combo_box_set_active(layerbox, ui.cur_page->nlayers-1-ui.layerno);
@@ -1370,13 +1370,13 @@ void update_file_name(char *filename)
   if (ui.filename != NULL) g_free(ui.filename);
   ui.filename = filename;
   if (filename == NULL) {
-    gtk_window_set_title(GTK_WINDOW (winMain), "Xournal");
+    gtk_window_set_title(GTK_WINDOW (winMain), _("Xournal"));
     return;
   }
   p = g_utf8_strrchr(filename, -1, '/');
   if (p == NULL) p = filename; 
   else p = g_utf8_next_char(p);
-  g_snprintf(tmp, 100, "Xournal - %s", p);
+  g_snprintf(tmp, 100, _("Xournal - %s"), p);
   gtk_window_set_title(GTK_WINDOW (winMain), tmp);
   new_mru_entry(filename);
 }
@@ -1609,8 +1609,8 @@ gboolean ok_to_close(void)
 
   if (ui.saved) return TRUE;
   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-    GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "Save changes to '%s'?",
-    (ui.filename!=NULL) ? ui.filename:"Untitled");
+    GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("Save changes to '%s'?"),
+    (ui.filename!=NULL) ? ui.filename:_("Untitled"));
   gtk_dialog_add_button(GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
   response = gtk_dialog_run(GTK_DIALOG (dialog));
   gtk_widget_destroy(dialog);
diff --git a/src/xo-print.c b/src/xo-print.c
index cb480b1..dc14d4e 100644
--- a/src/xo-print.c
+++ b/src/xo-print.c
@@ -19,6 +19,7 @@
 #include "sft.h" /* Sun Font Tools, embedded in libgnomeprint */
 
 #include "xournal.h"
+#include "xo-support.h"
 #include "xo-misc.h"
 #include "xo-paint.h"
 #include "xo-print.h"
@@ -1490,7 +1491,7 @@ void print_page(GnomePrintContext *gpc, struct Page *pg, int pageno,
   
   if (pg==NULL) return;
   
-  g_snprintf(tmp, 10, "Page %d", pageno);
+  g_snprintf(tmp, 10, _("Page %d"), pageno);
   gnome_print_beginpage(gpc, (guchar *)tmp);
   gnome_print_gsave(gpc);
   
@@ -1581,7 +1582,7 @@ void print_job_render(GnomePrintJob *gpj, int fromPage, int toPage)
 
   abort = FALSE;
   wait_dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL,
-     GTK_MESSAGE_INFO, GTK_BUTTONS_CANCEL, "Preparing print job");
+     GTK_MESSAGE_INFO, GTK_BUTTONS_CANCEL, _("Preparing print job"));
   gtk_widget_show(wait_dialog);
   g_signal_connect(wait_dialog, "response", G_CALLBACK (cb_print_abort), &abort);
   
@@ -1589,7 +1590,7 @@ void print_job_render(GnomePrintJob *gpj, int fromPage, int toPage)
 #if GTK_CHECK_VERSION(2,6,0)
     if (!gtk_check_version(2, 6, 0))
       gtk_message_dialog_format_secondary_text(
-             GTK_MESSAGE_DIALOG(wait_dialog), "Page %d", i+1); 
+             GTK_MESSAGE_DIALOG(wait_dialog), _("Page %d"), i+1); 
 #endif
     while (gtk_events_pending()) gtk_main_iteration();
     print_page(gpc, (struct Page *)g_list_nth_data(journal.pages, i), i+1,
@@ -1599,7 +1600,7 @@ void print_job_render(GnomePrintJob *gpj, int fromPage, int toPage)
 #if GTK_CHECK_VERSION(2,6,0)
   if (!gtk_check_version(2, 6, 0))
     gtk_message_dialog_format_secondary_text(
-              GTK_MESSAGE_DIALOG(wait_dialog), "Finalizing...");
+              GTK_MESSAGE_DIALOG(wait_dialog), _("Finalizing..."));
 #endif
   while (gtk_events_pending()) gtk_main_iteration();
 
diff --git a/src/xo-shapes.c b/src/xo-shapes.c
index 0efdf69..01f9073 100644
--- a/src/xo-shapes.c
+++ b/src/xo-shapes.c
@@ -408,7 +408,7 @@ gboolean try_arrow(void)
     while (alpha[i]<-M_PI/2) { alpha[i]+=M_PI; rs[i].reversed = !rs[i].reversed; }
     while (alpha[i]>M_PI/2) { alpha[i]-=M_PI; rs[i].reversed = !rs[i].reversed; }
 #ifdef RECOGNIZER_DEBUG
-    printf("arrow: alpha[%d] = %.1f degrees\n", i, alpha[i]*180/M_PI);
+    printf("DEBUG: arrow: alpha[%d] = %.1f degrees\n", i, alpha[i]*180/M_PI);
 #endif
     if (fabs(alpha[i])<ARROW_ANGLE_MIN || fabs(alpha[i])>ARROW_ANGLE_MAX) return FALSE;
   }
@@ -424,20 +424,20 @@ gboolean try_arrow(void)
     dist = hypot(pt[0]-(rs[j].reversed?rs[j].x1:rs[j].x2),
                  pt[1]-(rs[j].reversed?rs[j].y1:rs[j].y2));
 #ifdef RECOGNIZER_DEBUG
-    printf("linear tolerance: tip[%d] = %.2f\n", j, dist/rs[j].radius);
+    printf("DEBUG: linear tolerance: tip[%d] = %.2f\n", j, dist/rs[j].radius);
 #endif
     if (dist>ARROW_TIP_LINEAR_TOLERANCE*rs[j].radius) return FALSE;
   }
   dist = (pt[0]-x2)*sin(angle)-(pt[1]-y2)*cos(angle);
   dist /= rs[1].radius + rs[2].radius;
 #ifdef RECOGNIZER_DEBUG
-  printf("sideways gap tolerance = %.2f\n", dist);
+  printf("DEBUG: sideways gap tolerance = %.2f\n", dist);
 #endif
   if (fabs(dist)>ARROW_SIDEWAYS_GAP_TOLERANCE) return FALSE;
   dist = (pt[0]-x2)*cos(angle)+(pt[1]-y2)*sin(angle);
   dist /= rs[1].radius + rs[2].radius;
 #ifdef RECOGNIZER_DEBUG
-  printf("main linear gap = %.2f\n", dist);
+  printf("DEBUG: main linear gap = %.2f\n", dist);
 #endif
   if (dist<ARROW_MAIN_LINEAR_GAP_MIN || dist>ARROW_MAIN_LINEAR_GAP_MAX) return FALSE;
 
@@ -534,7 +534,7 @@ void recognize_patterns(void)
   it = undo->item;
   calc_inertia(it->path->coords, 0, it->path->num_points-1, &s);
 #ifdef RECOGNIZER_DEBUG
-  printf("Mass=%.0f, Center=(%.1f,%.1f), I=(%.0f,%.0f, %.0f), "
+  printf("DEBUG: Mass=%.0f, Center=(%.1f,%.1f), I=(%.0f,%.0f, %.0f), "
      "Rad=%.2f, Det=%.4f \n", 
      s.mass, center_x(s), center_y(s), I_xx(s), I_yy(s), I_xy(s), I_rad(s), I_det(s));
 #endif
@@ -544,9 +544,9 @@ void recognize_patterns(void)
   if (n>0) {
     optimize_polygonal(it->path->coords, n, brk, ss);
 #ifdef RECOGNIZER_DEBUG
-    printf("Polygon, %d edges: ", n);
+    printf("DEBUG: Polygon, %d edges: ", n);
     for (i=0; i<n; i++)
-      printf("%d-%d (M=%.0f, det=%.4f) ", brk[i], brk[i+1], ss[i].mass, I_det(ss[i]));
+      printf("DEBUG: %d-%d (M=%.0f, det=%.4f) ", brk[i], brk[i+1], ss[i].mass, I_det(ss[i]));
     printf("\n");
 #endif
     /* update recognizer segment queue (most recent at end) */
@@ -559,7 +559,7 @@ void recognize_patterns(void)
               recognizer_queue_length * sizeof(struct RecoSegment));
     }
 #ifdef RECOGNIZER_DEBUG
-    printf("Queue now has %d + %d edges\n", recognizer_queue_length, n);
+    printf("DEBUG: Queue now has %d + %d edges\n", recognizer_queue_length, n);
 #endif
     rs = recognizer_queue + recognizer_queue_length;
     recognizer_queue_length += n;
@@ -600,7 +600,7 @@ void recognize_patterns(void)
   if (I_det(s)>CIRCLE_MIN_DET) {
     score = score_circle(it->path->coords, 0, it->path->num_points-1, &s);
 #ifdef RECOGNIZER_DEBUG
-    printf("Circle score: %.2f\n", score);
+    printf("DEBUG: Circle score: %.2f\n", score);
 #endif
     if (score < CIRCLE_MAX_SCORE) {
       make_circle_shape(center_x(s), center_y(s), I_rad(s));
diff --git a/src/xo-support.c b/src/xo-support.c
index aaa8f1f..5d2689f 100644
--- a/src/xo-support.c
+++ b/src/xo-support.c
@@ -87,7 +87,7 @@ create_pixmap                          (GtkWidget       *widget,
 
   if (!pathname)
     {
-      g_warning ("Couldn't find pixmap file: %s", filename);
+      g_warning (_("Couldn't find pixmap file: %s"), filename);
       return gtk_image_new ();
     }
 
@@ -111,14 +111,14 @@ create_pixbuf                          (const gchar     *filename)
 
   if (!pathname)
     {
-      g_warning ("Couldn't find pixmap file: %s", filename);
+      g_warning (_("Couldn't find pixmap file: %s"), filename);
       return NULL;
     }
 
   pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
   if (!pixbuf)
     {
-      fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
+      fprintf (stderr, _("Failed to load pixbuf file: %s: %s\n"),
                pathname, error->message);
       g_error_free (error);
     }
diff --git a/src/xo-support.h b/src/xo-support.h
index 2dea079..a32649e 100644
--- a/src/xo-support.h
+++ b/src/xo-support.h
@@ -8,6 +8,31 @@
 
 #include <gtk/gtk.h>
 
+/*
+ * Standard gettext macros.
+ */
+#ifdef ENABLE_NLS
+#  include <libintl.h>
+#  undef _
+#  define _(String) dgettext (PACKAGE, String)
+#  define Q_(String) g_strip_context ((String), gettext (String))
+#  ifdef gettext_noop
+#    define N_(String) gettext_noop (String)
+#  else
+#    define N_(String) (String)
+#  endif
+#else
+#  define textdomain(String) (String)
+#  define gettext(String) (String)
+#  define dgettext(Domain,Message) (Message)
+#  define dcgettext(Domain,Message,Type) (Message)
+#  define bindtextdomain(Domain,Directory) (Domain)
+#  define _(String) (String)
+#  define Q_(String) g_strip_context ((String), (String))
+#  define N_(String) (String)
+#endif
+
+
 /*
  * Public Functions.
  */
diff --git a/src/xournal.h b/src/xournal.h
index f6cc967..8e2aff6 100644
--- a/src/xournal.h
+++ b/src/xournal.h
@@ -134,7 +134,7 @@ struct UndoErasureData;
 typedef struct Item {
   int type;
   struct Brush brush; // the brush to use, if ITEM_STROKE
-  // 'brush" also contains color info for text items
+  // 'brush' also contains color info for text items
   GnomeCanvasPoints *path;
   gdouble *widths;
   GnomeCanvasItem *canvas_item; // the corresponding canvas item, or NULL
diff --git a/x-xoj.desktop b/x-xoj.desktop
index 56097f1..2288565 100644
--- a/x-xoj.desktop
+++ b/x-xoj.desktop
@@ -7,3 +7,4 @@ Patterns=*.xoj;*.XOJ;*.Xoj;
 
 Comment=Xournal note file
 Comment[fr]=Fichier Xournal
+Comment[ca]=Fitxers de nota del Xournal
diff --git a/xournal.desktop b/xournal.desktop
index 4ff6c08..b593707 100644
--- a/xournal.desktop
+++ b/xournal.desktop
@@ -6,6 +6,8 @@ Name=Xournal
 Comment=Take handwritten notes
 Name[fr]=Xournal
 Comment[fr]=Prise de notes manuscrites
+Name[ca]=Xournal
+Comment[ca]=Preneu notes a mà
 
 Exec=xournal %f
 Terminal=false
diff --git a/xournal.gladep b/xournal.gladep
index c5d37e7..ad54b36 100644
--- a/xournal.gladep
+++ b/xournal.gladep
@@ -5,7 +5,6 @@
   <name>Xournal</name>
   <program_name>xournal</program_name>
   <gnome_support>FALSE</gnome_support>
-  <gettext_support>FALSE</gettext_support>
   <gnome_help_support>TRUE</gnome_help_support>
   <main_source_file>xo-interface.c</main_source_file>
   <main_header_file>xo-interface.h</main_header_file>
-- 
2.39.2