Merge lp:~liampwhite/inkscape/inkscape-cppify into lp:inkscape/experimental

[Liam P. White]

This change C++ifies the interface to the main application. It replaces g_signal[s] with sigc++ signals, pointers to void with pointers to objects, removes many callback functions that call member functions, and replaces an old-style GSList with a std::vector.

[lp:~liampwhite/inkscape/inkscape-cppify]

13415. By Liam P. White on 2014-06-26

Convert accidental member accesses into static function accesses

[Liam P. White (liampwhite)]

From IRC:

<johan_e> the calls to Application::init in some parts of the codebase are weird. (you noticed it too)
<johan_e> perhaps you can rename init to something like "create" or someth
<johan_e> why does the code check if instance() is returning NULL?
<johan_e> shouldn't that be an impossibility?
<johan_e> as in, if init() fails, the program should abort
<LiamW> I believe it actually happens a few times
<LiamW> It's not that init() fails
<LiamW> But instance() is called before init()
<johan_e> ?!
<LiamW> Or during init
<johan_e> ????????????!!!!!!!!!!!!!!!!!!!
<LiamW> When instance() == 0, in the constructor
<johan_e> buggy code
<johan_e> (not your fault)
<johan_e> that "_S_inst = this;" in the constructor is necessary means someone is accessing an incompletely constructed version of Application :S :S :S
<johan_e> that is very bugprone
<johan_e> what about deletion? who deletes Application?
<LiamW> inkscape_unref()
<LiamW> desktop.cpp I believe
<johan_e> ah yeah, that's the other thing i don't understand, why there is refcounting of that object
<LiamW> Maybe for how many desktops are attached to it
<johan_e> if desktop unrefs inkscape, which may delete it, then...
<johan_e> Application::remove_desktop has code that does stuff when the last desktop is removed, but upon removing the last desktop, Application is already destroyed? so then the code continuous with a destroyed object.. nice.. :(
<johan_e> btw please combine the private and protected sections of Application into one private section
<johan_e> (protected is not useful here, no-one should inherit Application, and may only be confusing)
<johan_e> why is "std::vector<SPDesktop *> * _desktops;" a pointer and not a member?
<LiamW> A bug
<johan_e> ok :)
<LiamW> sp_ui_something about closing views
<johan_e> i guess a remnant from old code
<LiamW> johan_e: the referencing is in document.cpp not desktop.cpp
<LiamW> In the destructor
<LiamW> So I think it works out
<johan_e> so what happens when i close a document?
<LiamW> The document is removed from the list, the the inkscape instance gets unref'd — if it's the last one, the destructor is called

[lp:~liampwhite/inkscape/inkscape-cppify]

13416. By Liam P. White on 2014-06-27

Move constructor/destructor into private section, remove protected section. Rename init(). Add to-do list.

[Liam P. White (liampwhite)]

Took Johan Englen's suggestions into account. Changed a few names and added this to-do list into inkscape.cpp:

/** C++ification TODO list
 * - _S_inst should NOT need to be assigned inside the constructor, but if it isn't the Filters+Extensions menus break.
 * - Application::_deskops has to be a pointer because of a signal bug somewhere else. Basically, it will attempt to access a deleted object in sp_ui_close_all(),
 * but if it's a pointer we can stop and return NULL in Application::active_desktop()
 * - These functions are calling Application::create for no good reason I can determine:
 *
 * Inkscape::UI::Dialog::SVGPreview::SVGPreview()
 * src/ui/dialog/filedialogimpl-gtkmm.cpp:542:9
 * void Inkscape::UI::Widget::ImageIcon::init()
 * src/ui/widget/imageicon.cpp:93:9
 */

[Johan Engelen (johanengelen)]

Note that implementing a Singleton is somewhat tricky, and to prevent the client code from introducing nasty bugs, here some additional comments about Application:

- privatize and don't implement dangerous functions of Application:
  assignment operator, copy constructor, address-of operator (more on this later),
  This prevents the client from doing something bad.

- Application::instance() should return a reference (Application&). Otherwise, the client can store the pointer and use it at a later moment when perhaps the singleton has been deleted. Nasty bugs would arise. The upside of returning a reference to Application& is that the client can rest assured that the object exists. instance() should include a check for if _S_inst is nullptr and throw an exception / abort / whatever if that's the case.
In a few locations, the code relies on being able to check instance()==nullptr. These checks should instead call bool Application::exists() (find better name), that returns true if the singleton is alive.
Note that this is the reason that Application::operator& should be made private, to give a compile-time error when the client is doing something bad.

- destructor ~Application() should set _S_inst to nullptr!

review: Needs Fixing

[Liam P. White (liampwhite)]

@Johan:

I'll do what you ask. There seems to be this small problem, though:
Many files are forward declaring "struct Application", and according to ISO:

    The address of an object of incomplete type can be taken, but if the complete type of that object is a class type that declares operator&() as a member function, then the behavior is undefined (and no diagnostic is required).

So those will all need to be changed (forward declarations into #include[s]).

[Liam P. White (liampwhite)]

@Johan

Additionally, some classes are depending on pointer behavior of the Application class (widgets/sp-widget.[cpp,h]).

[Johan Engelen (johanengelen)]

> @Johan:
>
> I'll do what you ask. There seems to be this small problem, though:
> Many files are forward declaring "struct Application", and according to ISO:
>
> The address of an object of incomplete type can be taken, but if the
> complete type of that object is a class type that declares operator&() as a
> member function, then the behavior is undefined (and no diagnostic is
> required).
>
> So those will all need to be changed (forward declarations into #include[s]).

This is still better than exposing operator& at all.

A number of case of "struct Application" should be removed:
Probably should be removed. Stuff like document-undo.cpp, line 115:
Inkscape::DocumentUndo::resetKey( Inkscape::Application * /*inkscape*/, SPDesktop * /*desktop*/, GObject *base )
should not have Application* as argument at all. It's even unused!
In document.h, the fwd decl is not used.
In dialog-events.h, "sp_transientize_callback ( Inkscape::Application *inkscape, " does not use that argument either...
err.. all cases of Application appearing in fwd declarations or as function arguments are actually completely unused.......!

All this passing around of pointers to Application seems pretty bad, if Application is meant to be a singleton.

[Johan Engelen (johanengelen)]

Thanks for working on this. As you can see, it's about time someone does.

[lp:~liampwhite/inkscape/inkscape-cppify]

13417. By Liam P. White on 2014-06-27

5. Refactoring of Application class: make copy/assignment operators private, disallow pointers to Application

[Liam P. White (liampwhite)]

Done. Nobody carries any pointers to Application anymore.

[Liam P. White (liampwhite)]

I took notes while making r13417 compile, and recalled this:

WARNING: static void sp_gradient_vector_dialog_destroy(GtkWidget * /*object*/, gpointer /*data*/) needs to disconnect signals it might not be able to.

How should I go about doing this?

[Johan Engelen (johanengelen)]

> I took notes while making r13417 compile, and recalled this:
>
> WARNING: static void sp_gradient_vector_dialog_destroy(GtkWidget * /*object*/,
> gpointer /*data*/) needs to disconnect signals it might not be able to.
>
> How should I go about doing this?

Which compiler generates such a warning?

[Liam P. White (liampwhite)]

No compiler generates that warning.

I took note of that when the destructor I modified no longer disconnected
signals it probably should have.

On Sat, Jun 28, 2014 at 6:37 PM, Johan Engelen <email address hidden>
wrote:

> > I took notes while making r13417 compile, and recalled this:
> >
> > WARNING: static void sp_gradient_vector_dialog_destroy(GtkWidget *
> /*object*/,
> > gpointer /*data*/) needs to disconnect signals it might not be able to.
> >
> > How should I go about doing this?
>
> Which compiler generates such a warning?
> --
>
> https://code.launchpad.net/~inkscapebrony/inkscape/inkscape-cppify/+merge/224699
> You are the owner of lp:~inkscapebrony/inkscape/inkscape-cppify.
>

[lp:~liampwhite/inkscape/inkscape-cppify]

13418. By Liam P. White on 2014-07-01

Fix build with DBUS (thanks ~suv)

[Martin Owens (doctormo)]

review: Approve (code)

[lp:~liampwhite/inkscape/inkscape-cppify]

13419. By Liam P. White on 2014-07-24

Fix typo in dbus api files

13420. By Liam P. White on 2014-07-24

Fix crash bug when exporting PNG from CLI

13421. By Liam P. White on 2014-07-24

Update to experimental r13440

13422. By Liam P. White on 2014-08-08

Update to experimental r13464

13423. By Liam P. White on 2014-08-30

Update to experimental r13527

13424. By Liam P. White on 2014-09-27

Update to experimental r13565

13425. By Liam P. White on 2014-10-08

Update to experimental r13598

13426. By Liam P. White on 2014-10-18

Update to experimental r13619

13427. By Liam P. White on 2014-10-31

Update to trunk r13648

13428. By Liam P. White on 2014-10-31

Fix pofiles (what happened here?)

13429. By Liam P. White on 2014-10-31

Remove FIXME from refactoring

13430. By Liam P. White on 2014-11-09

Update to trunk r13690

13431. By Liam P. White on 2014-11-24

Update to trunk r13750

13432. By Liam P. White on 2014-11-26

Update to trunk r13766

Unmerged revisions

13432. By Liam P. White on 2014-11-26

Update to trunk r13766

13431. By Liam P. White on 2014-11-24

Update to trunk r13750

13430. By Liam P. White on 2014-11-09

Update to trunk r13690

13429. By Liam P. White on 2014-10-31

Remove FIXME from refactoring

13428. By Liam P. White on 2014-10-31

Fix pofiles (what happened here?)

13427. By Liam P. White on 2014-10-31

Update to trunk r13648

13426. By Liam P. White on 2014-10-18

Update to experimental r13619

13425. By Liam P. White on 2014-10-08

Update to experimental r13598

13424. By Liam P. White on 2014-09-27

Update to experimental r13565

13423. By Liam P. White on 2014-08-30

Update to experimental r13527

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-02 23:51:04 +0000
+++ CMakeLists.txt	2014-10-31 00:22:45 +0000
@@ -13,7 +13,7 @@
 
 project(inkscape)
 
-set(INKSCAPE_VERSION 0.91pre2)
+set(INKSCAPE_VERSION 0.91+devel)
 set(PROJECT_NAME inkscape)
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 

=== modified file 'build-lx.xml'
--- build-lx.xml	2014-09-02 23:51:04 +0000
+++ build-lx.xml	2014-10-31 00:22:45 +0000
@@ -39,7 +39,7 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.91pre2"/>
+  <property name="version"       value="0.91+devel"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>

=== modified file 'build-x64.xml'
--- build-x64.xml	2014-09-02 23:51:04 +0000
+++ build-x64.xml	2014-10-31 00:22:45 +0000
@@ -42,7 +42,7 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.91pre2_64bit"/>
+  <property name="version"       value="0.91+devel_64bit"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>

=== modified file 'build.xml'
--- build.xml	2014-10-06 00:18:46 +0000
+++ build.xml	2014-10-31 00:22:45 +0000
@@ -42,7 +42,7 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.91pre2"/>
+  <property name="version"       value="0.91+devel"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>

=== modified file 'configure.ac'
--- configure.ac	2014-10-17 20:03:14 +0000
+++ configure.ac	2014-10-31 00:22:45 +0000
@@ -7,7 +7,7 @@
 # `dpkg --compare-versions'.  (ii) We don't always know what the next
 # version is going to be called until about the time we release it
 # (whereas we always know what the previous version was called).
-AC_INIT([inkscape], [0.91pre2],
+AC_INIT([inkscape], [0.91+devel],
         [http://bugs.launchpad.net/inkscape/+filebug],
         [inkscape],
         [http://inkscape.org/])

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-10-16 22:05:08 +0000
+++ po/POTFILES.in	2014-10-31 00:22:45 +0000
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-# Generated by ./generate_POTFILES.sh at Thu Apr 10 00:15:41 CEST 2014
+# Generated by ./generate_POTFILES.sh at Thu Oct 30 04:58:01 CET 2014
 [encoding: UTF-8]
 inkscape.desktop.in
 share/filters/filters.svg.h
@@ -111,7 +111,6 @@
 src/gradient-chemistry.cpp
 src/gradient-drag.cpp
 src/inkscape.cpp
-src/interface.cpp
 src/knot.cpp
 src/knotholder.cpp
 src/libgdl/gdl-dock-bar.c
@@ -129,59 +128,55 @@
 src/libgdl/gdl-switcher.c
 src/libnrtype/FontFactory.cpp
 src/live_effects/effect.cpp
+src/live_effects/lpe-attach-path.cpp
 src/live_effects/lpe-bendpath.cpp
+src/live_effects/lpe-bounding-box.cpp
 src/live_effects/lpe-bspline.cpp
 src/live_effects/lpe-clone-original.cpp
 src/live_effects/lpe-constructgrid.cpp
 src/live_effects/lpe-curvestitch.cpp
+src/live_effects/lpe-ellipse_5pts.cpp
 src/live_effects/lpe-envelope.cpp
-src/live_effects/lpe-perspective-envelope.cpp
 src/live_effects/lpe-extrude.cpp
+src/live_effects/lpe-fill-between-many.cpp
+src/live_effects/lpe-fill-between-strokes.cpp
 src/live_effects/lpe-fillet-chamfer.cpp
 src/live_effects/lpe-gears.cpp
 src/live_effects/lpe-interpolate.cpp
 src/live_effects/lpe-interpolate_points.cpp
+src/live_effects/lpe-jointype.cpp
 src/live_effects/lpe-knot.cpp
 src/live_effects/lpe-lattice2.cpp
 src/live_effects/lpe-patternalongpath.cpp
+src/live_effects/lpe-perspective-envelope.cpp
 src/live_effects/lpe-powerstroke.cpp
 src/live_effects/lpe-rough-hatches.cpp
 src/live_effects/lpe-roughen.cpp
 src/live_effects/lpe-ruler.cpp
+src/live_effects/lpe-show_handles.cpp
 src/live_effects/lpe-simplify.cpp
-src/live_effects/lpe-show_handles.cpp
-src/live_effects/lpe-skeleton.cpp
 src/live_effects/lpe-sketch.cpp
+src/live_effects/lpe-taperstroke.cpp
 src/live_effects/lpe-vonkoch.cpp
-src/live_effects/lpe-perspective-envelope.cpp
-src/live_effects/lpe-attach-path.cpp
-src/live_effects/lpe-bounding-box.cpp
-src/live_effects/lpe-ellipse_5pts.cpp
-src/live_effects/lpe-fill-between-many.cpp
-src/live_effects/lpe-fill-between-strokes.cpp
-src/live_effects/lpe-jointype.cpp
-src/live_effects/lpe-taperstroke.cpp
-src/live_effects/lpe-fillet-chamfer.cpp
-src/live_effects/parameter/filletchamferpointarray.cpp
-src/live_effects/parameter/originalpatharray.cpp
-src/live_effects/parameter/transformedpoint.cpp
-src/live_effects/parameter/pointreseteable.cpp
-src/live_effects/parameter/togglebutton.cpp
 src/live_effects/parameter/bool.cpp
 src/live_effects/parameter/enum.h
+src/live_effects/parameter/filletchamferpointarray.cpp
 src/live_effects/parameter/originalpath.cpp
+src/live_effects/parameter/originalpatharray.cpp
 src/live_effects/parameter/parameter.cpp
 src/live_effects/parameter/path.cpp
 src/live_effects/parameter/point.cpp
+src/live_effects/parameter/pointreseteable.cpp
 src/live_effects/parameter/powerstrokepointarray.cpp
 src/live_effects/parameter/random.cpp
 src/live_effects/parameter/text.cpp
+src/live_effects/parameter/togglebutton.cpp
+src/live_effects/parameter/transformedpoint.cpp
 src/live_effects/parameter/unit.cpp
 src/live_effects/parameter/vector.cpp
 src/main-cmdlineact.cpp
 src/main.cpp
 src/menus-skeleton.h
-src/object-edit.cpp
 src/path-chemistry.cpp
 src/persp3d.cpp
 src/preferences-skeleton.h
@@ -219,7 +214,6 @@
 src/splivarot.cpp
 src/text-chemistry.cpp
 src/text-editing.cpp
-src/tools-switch.cpp
 src/trace/potrace/inkscape-potrace.cpp
 src/trace/trace.cpp
 src/ui/clipboard.cpp
@@ -250,11 +244,13 @@
 src/ui/dialog/livepatheffect-add.cpp
 src/ui/dialog/livepatheffect-editor.cpp
 src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+src/ui/dialog/lpe-powerstroke-properties.cpp
 src/ui/dialog/memory.cpp
 src/ui/dialog/messages.cpp
 src/ui/dialog/new-from-template.cpp
 src/ui/dialog/object-attributes.cpp
 src/ui/dialog/object-properties.cpp
+src/ui/dialog/objects.cpp
 src/ui/dialog/ocaldialogs.cpp
 src/ui/dialog/pixelartdialog.cpp
 src/ui/dialog/polar-arrange-tab.cpp
@@ -264,6 +260,7 @@
 src/ui/dialog/svg-fonts-dialog.cpp
 src/ui/dialog/swatches.cpp
 src/ui/dialog/symbols.cpp
+src/ui/dialog/tags.cpp
 src/ui/dialog/template-load-tab.cpp
 src/ui/dialog/template-widget.cpp
 src/ui/dialog/text-edit.cpp
@@ -271,15 +268,14 @@
 src/ui/dialog/tracedialog.cpp
 src/ui/dialog/transformation.cpp
 src/ui/dialog/xml-tree.cpp
-src/ui/dialog/lpe-fillet-chamfer-properties.cpp
-src/ui/dialog/lpe-powerstroke-properties.cpp
-src/ui/dialog/objects.cpp
-src/ui/dialog/tags.cpp
+src/ui/interface.cpp
+src/ui/object-edit.cpp
 src/ui/tool/curve-drag-point.cpp
 src/ui/tool/multi-path-manipulator.cpp
 src/ui/tool/node.cpp
 src/ui/tool/path-manipulator.cpp
 src/ui/tool/transform-handle-set.cpp
+src/ui/tools-switch.cpp
 src/ui/tools/arc-tool.cpp
 src/ui/tools/box3d-tool.cpp
 src/ui/tools/calligraphic-tool.cpp
@@ -456,7 +452,13 @@
 [type: gettext/xml] share/extensions/edge3d.inx
 [type: gettext/xml] share/extensions/embedimage.inx
 [type: gettext/xml] share/extensions/embedselectedimages.inx
+[type: gettext/xml] share/extensions/empty_business_card.inx
+[type: gettext/xml] share/extensions/empty_desktop.inx
+[type: gettext/xml] share/extensions/empty_dvd_cover.inx
+[type: gettext/xml] share/extensions/empty_generic.inx
+[type: gettext/xml] share/extensions/empty_icon.inx
 [type: gettext/xml] share/extensions/empty_page.inx
+[type: gettext/xml] share/extensions/empty_video.inx
 [type: gettext/xml] share/extensions/eps_input.inx
 [type: gettext/xml] share/extensions/eqtexsvg.inx
 [type: gettext/xml] share/extensions/export_gimp_palette.inx
@@ -549,6 +551,8 @@
 [type: gettext/xml] share/extensions/rtree.inx
 [type: gettext/xml] share/extensions/rubberstretch.inx
 [type: gettext/xml] share/extensions/scour.inx
+[type: gettext/xml] share/extensions/seamless_pattern.inx
+[type: gettext/xml] share/extensions/seamless_pattern_procedural.inx
 [type: gettext/xml] share/extensions/setup_typography_canvas.inx
 [type: gettext/xml] share/extensions/sk1_input.inx
 [type: gettext/xml] share/extensions/sk1_output.inx

=== modified file 'po/cs.po'
--- po/cs.po	2014-10-25 18:36:10 +0000
+++ po/cs.po	2014-10-31 00:22:45 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: inkscape\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2014-10-20 08:08+0200\n"
+"POT-Creation-Date: 2014-10-02 10:03+0200\n"
 "PO-Revision-Date: 2014-10-20 21:54+0100\n"
 "Last-Translator: Ivan Řihošek <[e-mail]>\n"
 "Language-Team:  <none>\n"
@@ -4328,11 +4328,7 @@
 msgstr ""
 
 #. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220
-msgctxt "Symbol"
-msgid "Four Wheel Drive Road"
-msgstr ""
-
+#. Symbols: ./MapSymbolsNPS.svg
 #. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222
 #, fuzzy
@@ -4527,6 +4523,13 @@
 msgid "Wind Surfing"
 msgstr ""
 
+#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./MapSymbolsNPS.svg
+#: ../share/symbols/symbols.h:220 ../share/symbols/symbols.h:219
+msgctxt "Symbol"
+msgid "Four Wheel Drive Road),"
+msgstr ""
+
 #: ../share/templates/templates.h:1
 msgid "A4 Landscape Page"
 msgstr "A4 naležato"
@@ -4895,7 +4898,7 @@
 msgstr ""
 
 #. 3D box
-#: ../src/box3d.cpp:260 ../src/box3d.cpp:1313
+#: ../src/box3d.cpp:259 ../src/box3d.cpp:1310
 #: ../src/ui/dialog/inkscape-preferences.cpp:400
 msgid "3D Box"
 msgstr "Kvádr"
@@ -5375,7 +5378,7 @@
 msgid "Memory document %1"
 msgstr "Dokument v paměti %d"
 
-#: ../src/document.cpp:786
+#: ../src/document.cpp:787
 #, c-format
 msgid "Unnamed document %d"
 msgstr "Nepojmenovaný dokument %d"
@@ -5528,7 +5531,7 @@
 "this extension."
 msgstr ""
 
-#: ../src/extension/implementation/script.cpp:1057
+#: ../src/extension/implementation/script.cpp:1037
 msgid ""
 "Inkscape has received additional data from the script executed.  The script "
 "did not return an error, but this may indicate the results will not be as "
@@ -6363,74 +6366,74 @@
 msgid "Output page size:"
 msgstr "Nastavit velikost strany"
 
-#: ../src/extension/internal/cdr-input.cpp:116
+#: ../src/extension/internal/cdr-input.cpp:102
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:87
-#: ../src/extension/internal/vsd-input.cpp:116
+#: ../src/extension/internal/vsd-input.cpp:101
 #, fuzzy
 msgid "Select page:"
 msgstr "Vybrat další"
 
 #. Display total number of pages
-#: ../src/extension/internal/cdr-input.cpp:128
+#: ../src/extension/internal/cdr-input.cpp:114
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:106
-#: ../src/extension/internal/vsd-input.cpp:128
+#: ../src/extension/internal/vsd-input.cpp:113
 #, fuzzy, c-format
 msgid "out of %i"
 msgstr "Množství zvíření"
 
-#: ../src/extension/internal/cdr-input.cpp:159
-#: ../src/extension/internal/vsd-input.cpp:159
+#: ../src/extension/internal/cdr-input.cpp:145
+#: ../src/extension/internal/vsd-input.cpp:144
 #, fuzzy
 msgid "Page Selector"
 msgstr "Výběr"
 
-#: ../src/extension/internal/cdr-input.cpp:294
+#: ../src/extension/internal/cdr-input.cpp:274
 msgid "Corel DRAW Input"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:299
+#: ../src/extension/internal/cdr-input.cpp:279
 msgid "Corel DRAW 7-X4 files (*.cdr)"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:300
+#: ../src/extension/internal/cdr-input.cpp:280
 #, fuzzy
 msgid "Open files saved in Corel DRAW 7-X4"
 msgstr "Otevřít soubory uložené s XFIG"
 
-#: ../src/extension/internal/cdr-input.cpp:307
+#: ../src/extension/internal/cdr-input.cpp:287
 msgid "Corel DRAW templates input"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:312
+#: ../src/extension/internal/cdr-input.cpp:292
 msgid "Corel DRAW 7-13 template files (*.cdt)"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:313
+#: ../src/extension/internal/cdr-input.cpp:293
 #, fuzzy
 msgid "Open files saved in Corel DRAW 7-13"
 msgstr "Otevřít soubory uložené s XFIG"
 
-#: ../src/extension/internal/cdr-input.cpp:320
+#: ../src/extension/internal/cdr-input.cpp:300
 msgid "Corel DRAW Compressed Exchange files input"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:325
+#: ../src/extension/internal/cdr-input.cpp:305
 msgid "Corel DRAW Compressed Exchange files (*.ccx)"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:326
+#: ../src/extension/internal/cdr-input.cpp:306
 msgid "Open compressed exchange files saved in Corel DRAW"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:333
+#: ../src/extension/internal/cdr-input.cpp:313
 msgid "Corel DRAW Presentation Exchange files input"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:338
+#: ../src/extension/internal/cdr-input.cpp:318
 msgid "Corel DRAW Presentation Exchange files (*.cmx)"
 msgstr ""
 
-#: ../src/extension/internal/cdr-input.cpp:339
+#: ../src/extension/internal/cdr-input.cpp:319
 msgid "Open presentation exchange files saved in Corel DRAW"
 msgstr ""
 
@@ -8797,27 +8800,27 @@
 msgid "very fine"
 msgstr "velmi vysoká"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:901
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:877
 msgid "PDF Input"
 msgstr "Vstup PDF"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:906
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:882
 msgid "Adobe PDF (*.pdf)"
 msgstr "Adobe DXF (*.pdf)"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:907
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:883
 msgid "Adobe Portable Document Format"
 msgstr "Přenosný dokument Adobe (PDF)"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:914
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:890
 msgid "AI Input"
 msgstr "Vstup AI"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:919
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:895
 msgid "Adobe Illustrator 9.0 and above (*.ai)"
 msgstr "Adobe Illustrator 9.0 a výše (*.ai)"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:920
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:896
 msgid "Open files saved in Adobe Illustrator 9.0 and newer versions"
 msgstr "Otevřít soubory uložené Adobe Illustratorem 9.0 a novějším"
 
@@ -8897,48 +8900,48 @@
 msgid "Scalable Vector Graphics format compressed with GZip"
 msgstr "Formát Škálovatelné vektorové grafiky SVG komprimovaný pomocí GZip"
 
-#: ../src/extension/internal/vsd-input.cpp:295
+#: ../src/extension/internal/vsd-input.cpp:274
 msgid "VSD Input"
 msgstr "Vstup VSD"
 
-#: ../src/extension/internal/vsd-input.cpp:300
+#: ../src/extension/internal/vsd-input.cpp:279
 msgid "Microsoft Visio Diagram (*.vsd)"
 msgstr "Diagram Microsoftu Visio (*.vsd)"
 
-#: ../src/extension/internal/vsd-input.cpp:301
+#: ../src/extension/internal/vsd-input.cpp:280
 msgid "File format used by Microsoft Visio 6 and later"
 msgstr "Souborový formát používaný programem Microsoft Visio 6 a novějším"
 
-#: ../src/extension/internal/vsd-input.cpp:308
+#: ../src/extension/internal/vsd-input.cpp:287
 msgid "VDX Input"
 msgstr "Vstup VDX"
 
-#: ../src/extension/internal/vsd-input.cpp:313
+#: ../src/extension/internal/vsd-input.cpp:292
 msgid "Microsoft Visio XML Diagram (*.vdx)"
 msgstr "Diagram XML programu Microsoft Visio (*.vdx)"
 
-#: ../src/extension/internal/vsd-input.cpp:314
+#: ../src/extension/internal/vsd-input.cpp:293
 msgid "File format used by Microsoft Visio 2010 and later"
 msgstr "Souborový formát používaný programem Microsoft Visio 2010 a novějším"
 
-#: ../src/extension/internal/vsd-input.cpp:321
+#: ../src/extension/internal/vsd-input.cpp:300
 msgid "VSDM Input"
 msgstr "Vstup VSDM"
 
-#: ../src/extension/internal/vsd-input.cpp:326
+#: ../src/extension/internal/vsd-input.cpp:305
 msgid "Microsoft Visio 2013 drawing (*.vsdm)"
 msgstr "Kresba Microsoft Visia 2013 (*.vsdm)"
 
-#: ../src/extension/internal/vsd-input.cpp:327
-#: ../src/extension/internal/vsd-input.cpp:340
+#: ../src/extension/internal/vsd-input.cpp:306
+#: ../src/extension/internal/vsd-input.cpp:319
 msgid "File format used by Microsoft Visio 2013 and later"
 msgstr "Souborový formát používaný programem Microsoft Visio 2013 a novějším"
 
-#: ../src/extension/internal/vsd-input.cpp:334
+#: ../src/extension/internal/vsd-input.cpp:313
 msgid "VSDX Input"
 msgstr "Vstup VSDX"
 
-#: ../src/extension/internal/vsd-input.cpp:339
+#: ../src/extension/internal/vsd-input.cpp:318
 msgid "Microsoft Visio 2013 drawing (*.vsdx)"
 msgstr "Kresba Microsoft Visio 2013 (*.vsdx)"
 
@@ -8973,15 +8976,15 @@
 msgid "Windows Metafile"
 msgstr "Vstup Windows Metafile"
 
-#: ../src/extension/internal/wpg-input.cpp:144
+#: ../src/extension/internal/wpg-input.cpp:129
 msgid "WPG Input"
 msgstr "WPG Vstup"
 
-#: ../src/extension/internal/wpg-input.cpp:149
+#: ../src/extension/internal/wpg-input.cpp:134
 msgid "WordPerfect Graphics (*.wpg)"
 msgstr "WordPerfect grafika (*.wpg)"
 
-#: ../src/extension/internal/wpg-input.cpp:150
+#: ../src/extension/internal/wpg-input.cpp:135
 msgid "Vector graphics format used by Corel WordPerfect"
 msgstr "Formát vektorové grafiky užívaný aplikací Corel WordPerfect"
 
@@ -9862,7 +9865,7 @@
 
 #. Name
 #: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:191
-#: ../src/widgets/text-toolbar.cpp:1418
+#: ../src/widgets/text-toolbar.cpp:1416
 #: ../share/extensions/gcodetools_graffiti.inx.h:9
 #: ../share/extensions/gcodetools_orientation_points.inx.h:2
 #, fuzzy
@@ -10231,7 +10234,7 @@
 msgid "Dock #%d"
 msgstr ""
 
-#: ../src/libnrtype/FontFactory.cpp:617
+#: ../src/libnrtype/FontFactory.cpp:891
 msgid "Ignoring font without family that will crash Pango"
 msgstr "Ignoruji font bez rodiny, který by způsobil pád Panga"
 
@@ -12134,60 +12137,60 @@
 msgid "Combining paths..."
 msgstr "Kombinuji křivky..."
 
-#: ../src/path-chemistry.cpp:171
+#: ../src/path-chemistry.cpp:170
 msgid "Combine"
 msgstr "Kombinovat"
 
-#: ../src/path-chemistry.cpp:178
+#: ../src/path-chemistry.cpp:177
 msgid "<b>No path(s)</b> to combine in the selection."
 msgstr "Nevybrány <b>žádné křivky</b> ke zkombinování."
 
-#: ../src/path-chemistry.cpp:190
+#: ../src/path-chemistry.cpp:189
 msgid "Select <b>path(s)</b> to break apart."
 msgstr "Vyberte <b>křivku(y)</b> k rozbití."
 
-#: ../src/path-chemistry.cpp:194
+#: ../src/path-chemistry.cpp:193
 msgid "Breaking apart paths..."
 msgstr "Rozbíjím křivky..."
 
-#: ../src/path-chemistry.cpp:285
+#: ../src/path-chemistry.cpp:284
 msgid "Break apart"
 msgstr "Rozbít"
 
-#: ../src/path-chemistry.cpp:287
+#: ../src/path-chemistry.cpp:286
 msgid "<b>No path(s)</b> to break apart in the selection."
 msgstr "<b>Žádné křivky</b> k rozbití nebyly vybrány."
 
-#: ../src/path-chemistry.cpp:297
+#: ../src/path-chemistry.cpp:296
 msgid "Select <b>object(s)</b> to convert to path."
 msgstr "Vyberte <b>objekt(y)</b> k převodu na křivky."
 
-#: ../src/path-chemistry.cpp:303
+#: ../src/path-chemistry.cpp:302
 msgid "Converting objects to paths..."
 msgstr "Převádím objekty na křivky..."
 
-#: ../src/path-chemistry.cpp:325
+#: ../src/path-chemistry.cpp:324
 msgid "Object to path"
 msgstr "Objekt na křivku"
 
-#: ../src/path-chemistry.cpp:327
+#: ../src/path-chemistry.cpp:326
 msgid "<b>No objects</b> to convert to path in the selection."
 msgstr "Ve výběru nejsou <b>žádné objekty</b> k převodu na křivku."
 
-#: ../src/path-chemistry.cpp:604
+#: ../src/path-chemistry.cpp:603
 msgid "Select <b>path(s)</b> to reverse."
 msgstr "Vyberte <b>křivky</b> k převrácení."
 
-#: ../src/path-chemistry.cpp:613
+#: ../src/path-chemistry.cpp:612
 #, fuzzy
 msgid "Reversing paths..."
 msgstr "Převrátit křivku"
 
-#: ../src/path-chemistry.cpp:648
+#: ../src/path-chemistry.cpp:647
 msgid "Reverse path"
 msgstr "Převrátit křivku"
 
-#: ../src/path-chemistry.cpp:650
+#: ../src/path-chemistry.cpp:649
 msgid "<b>No paths</b> to reverse in the selection."
 msgstr "<b>Žádné křivky</b> k převrácení nebyly vybrány."
 
@@ -12434,8 +12437,9 @@
 msgstr "Popis:"
 
 #: ../src/rdf.cpp:280
+#, fuzzy
 msgid "An account of the resource"
-msgstr ""
+msgstr "Krátký popis obsahu tohoto dokumentu."
 
 #. FIXME: need to handle 1 agent per line of input
 #: ../src/rdf.cpp:284
@@ -13142,7 +13146,7 @@
 msgid "Linked Flowed Text"
 msgstr "Propojený rámový text"
 
-#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:341
+#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:352
 #: ../src/ui/tools/text-tool.cpp:1566
 #, fuzzy
 msgid " [truncated]"
@@ -13223,26 +13227,26 @@
 msgid "of <b>%d</b> objects"
 msgstr "<b>Skupina</b> <b>%d</b> objektů"
 
-#: ../src/sp-item.cpp:1035 ../src/verbs.cpp:213
+#: ../src/sp-item.cpp:970 ../src/verbs.cpp:213
 msgid "Object"
 msgstr "Objekt"
 
-#: ../src/sp-item.cpp:1052
+#: ../src/sp-item.cpp:987
 #, c-format
 msgid "%s; <i>clipped</i>"
 msgstr "%s; <i>oříznuto</i>"
 
-#: ../src/sp-item.cpp:1058
+#: ../src/sp-item.cpp:993
 #, c-format
 msgid "%s; <i>masked</i>"
 msgstr "%s;  <i>zamaskováno</i>"
 
-#: ../src/sp-item.cpp:1068
+#: ../src/sp-item.cpp:1003
 #, fuzzy, c-format
 msgid "%s; <i>filtered (%s)</i>"
 msgstr "%s; <i>oříznuto</i>"
 
-#: ../src/sp-item.cpp:1070
+#: ../src/sp-item.cpp:1005
 #, fuzzy, c-format
 msgid "%s; <i>filtered</i>"
 msgstr "%s; <i>oříznuto</i>"
@@ -13366,12 +13370,17 @@
 msgid "Text"
 msgstr "Text"
 
-#: ../src/sp-text.cpp:345
+#. TRANSLATORS: For description of font with no name.
+#: ../src/sp-text.cpp:342
+msgid "&lt;no name found&gt;"
+msgstr "&lt;nebylo nalezeno jméno&gt;"
+
+#: ../src/sp-text.cpp:356
 #, fuzzy, c-format
 msgid "on path%s (%s, %s)"
 msgstr "<b>Text na křivce</b> (%s, %s)"
 
-#: ../src/sp-text.cpp:346
+#: ../src/sp-text.cpp:357
 #, fuzzy, c-format
 msgid "%s (%s, %s)"
 msgstr "<b>Text</b> (%s, %s)"
@@ -14928,19 +14937,19 @@
 msgid "<small>Creating tiled clones...</small>"
 msgstr "<small>Objekt nemá dlážděné klony.</small>"
 
-#: ../src/ui/dialog/clonetiler.cpp:2645
+#: ../src/ui/dialog/clonetiler.cpp:2640
 msgid "Create tiled clones"
 msgstr "Dláždit pomocí klonů"
 
-#: ../src/ui/dialog/clonetiler.cpp:2878
+#: ../src/ui/dialog/clonetiler.cpp:2873
 msgid "<small>Per row:</small>"
 msgstr "<small>Na řádek:</small>"
 
-#: ../src/ui/dialog/clonetiler.cpp:2896
+#: ../src/ui/dialog/clonetiler.cpp:2891
 msgid "<small>Per column:</small>"
 msgstr "<small>Na sloupec:</small>"
 
-#: ../src/ui/dialog/clonetiler.cpp:2904
+#: ../src/ui/dialog/clonetiler.cpp:2899
 msgid "<small>Randomize:</small>"
 msgstr "<small>Náhodně:</small>"
 
@@ -16966,8 +16975,9 @@
 msgstr "etiopská"
 
 #: ../src/ui/dialog/glyphs.cpp:73 ../src/ui/dialog/glyphs.cpp:185
+#, fuzzy
 msgid "Georgian"
-msgstr ""
+msgstr "Barva �áry vodítka"
 
 #: ../src/ui/dialog/glyphs.cpp:74
 msgid "Gothic"
@@ -21891,79 +21901,79 @@
 msgstr "Adresář pro palety (%s) je nedostupný"
 
 #. ******************* Symbol Sets ************************
-#: ../src/ui/dialog/symbols.cpp:139
+#: ../src/ui/dialog/symbols.cpp:127
 msgid "Symbol set: "
 msgstr ""
 
 #. Fill in later
-#: ../src/ui/dialog/symbols.cpp:148 ../src/ui/dialog/symbols.cpp:149
+#: ../src/ui/dialog/symbols.cpp:136 ../src/ui/dialog/symbols.cpp:137
 #, fuzzy
 msgid "Current Document"
 msgstr "Tisknout dokument"
 
-#: ../src/ui/dialog/symbols.cpp:216
+#: ../src/ui/dialog/symbols.cpp:204
 #, fuzzy
 msgid "Add Symbol from the current document."
 msgstr "Přesunout vrstvu výš"
 
-#: ../src/ui/dialog/symbols.cpp:225
+#: ../src/ui/dialog/symbols.cpp:213
 #, fuzzy
 msgid "Remove Symbol from the current document."
 msgstr "Upravit zarážky barevného přechodu"
 
-#: ../src/ui/dialog/symbols.cpp:239
+#: ../src/ui/dialog/symbols.cpp:227
 #, fuzzy
 msgid "Display more icons in row."
 msgstr "Režim zobrazení"
 
-#: ../src/ui/dialog/symbols.cpp:248
+#: ../src/ui/dialog/symbols.cpp:236
 #, fuzzy
 msgid "Display fewer icons in row."
 msgstr "Režim zobrazení"
 
+#: ../src/ui/dialog/symbols.cpp:246
+msgid "Toggle 'fit' symbols in icon space."
+msgstr ""
+
 #: ../src/ui/dialog/symbols.cpp:258
-msgid "Toggle 'fit' symbols in icon space."
-msgstr ""
-
-#: ../src/ui/dialog/symbols.cpp:270
 msgid "Make symbols smaller by zooming out."
 msgstr ""
 
-#: ../src/ui/dialog/symbols.cpp:280
+#: ../src/ui/dialog/symbols.cpp:268
 msgid "Make symbols bigger by zooming in."
 msgstr ""
 
-#: ../src/ui/dialog/symbols.cpp:640
+#: ../src/ui/dialog/symbols.cpp:622
 #, fuzzy
 msgid "Unnamed Symbols"
 msgstr "khmerština (km)"
 
-#: ../src/ui/dialog/template-widget.cpp:37
+#: ../src/ui/dialog/template-widget.cpp:36
 #, fuzzy
 msgid "More info"
 msgstr "Více jasu"
 
-#: ../src/ui/dialog/template-widget.cpp:39
+#: ../src/ui/dialog/template-widget.cpp:38
 #, fuzzy
 msgid "no template selected"
 msgstr "Není vybrán žádný dokument"
 
-#: ../src/ui/dialog/template-widget.cpp:123
+#: ../src/ui/dialog/template-widget.cpp:119
 #, fuzzy
 msgid "Path: "
 msgstr "Křivka"
 
-#: ../src/ui/dialog/template-widget.cpp:126
+#: ../src/ui/dialog/template-widget.cpp:122
 #, fuzzy
 msgid "Description: "
 msgstr "Popis"
 
-#: ../src/ui/dialog/template-widget.cpp:128
+#: ../src/ui/dialog/template-widget.cpp:124
 #, fuzzy
 msgid "Keywords: "
 msgstr "Klí�ová slova"
 
-#: ../src/ui/dialog/template-widget.cpp:135
+#: ../src/ui/dialog/template-widget.cpp:131
 msgid "By: "
 msgstr ""
 
@@ -21978,32 +21988,32 @@
 msgstr "AaBbCcIiPpQq�áÉéČ�ŠšřŘřŽž12369$€c?.;/()"
 
 #. Align buttons
-#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1346
-#: ../src/widgets/text-toolbar.cpp:1347
+#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1344
+#: ../src/widgets/text-toolbar.cpp:1345
 msgid "Align left"
 msgstr "Zarovnat doleva"
 
-#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1354
-#: ../src/widgets/text-toolbar.cpp:1355
+#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1352
+#: ../src/widgets/text-toolbar.cpp:1353
 #, fuzzy
 msgid "Align center"
 msgstr "Zarovnat doleva"
 
-#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1362
-#: ../src/widgets/text-toolbar.cpp:1363
+#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1360
+#: ../src/widgets/text-toolbar.cpp:1361
 msgid "Align right"
 msgstr "Zarovnat doprava"
 
-#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1371
+#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1369
 msgid "Justify (only flowed text)"
 msgstr "Zarovnat do bloku (pouze rámový text)"
 
 #. Direction buttons
-#: ../src/ui/dialog/text-edit.cpp:108 ../src/widgets/text-toolbar.cpp:1406
+#: ../src/ui/dialog/text-edit.cpp:108 ../src/widgets/text-toolbar.cpp:1404
 msgid "Horizontal text"
 msgstr "Vodorovný text"
 
-#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1413
+#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1411
 msgid "Vertical text"
 msgstr "Svislý text"
 
@@ -23954,7 +23964,7 @@
 msgid "Type text"
 msgstr "Napsat text"
 
-#: ../src/ui/tools/tool-base.cpp:704
+#: ../src/ui/tools/tool-base.cpp:703
 msgid "<b>Space+mouse move</b> to pan canvas"
 msgstr "<b>Mezerníkem + pohybem myši</b> posunete výkres"
 
@@ -24132,7 +24142,7 @@
 
 #: ../src/ui/widget/object-composite-settings.cpp:220
 #: ../src/ui/widget/selected-style.cpp:931
-#: ../src/ui/widget/selected-style.cpp:1227
+#: ../src/ui/widget/selected-style.cpp:1225
 msgid "Change opacity"
 msgstr "Změnit průhlednost"
 
@@ -24640,11 +24650,11 @@
 msgid "100% (opaque)"
 msgstr "100 % (neprůhledný)"
 
-#: ../src/ui/widget/selected-style.cpp:1368
+#: ../src/ui/widget/selected-style.cpp:1366
 msgid "Adjust alpha"
 msgstr "Nastavit poloprůhlednost"
 
-#: ../src/ui/widget/selected-style.cpp:1370
+#: ../src/ui/widget/selected-style.cpp:1368
 #, c-format
 msgid ""
 "Adjusting <b>alpha</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Ctrl</"
@@ -24655,11 +24665,11 @@
 "s <b>Ctrl</b> nastavíte jas, s <b>Shiftem</b> nastavíte sytost, bez "
 "přeřa�ova�ů nastavíte odstín."
 
-#: ../src/ui/widget/selected-style.cpp:1374
+#: ../src/ui/widget/selected-style.cpp:1372
 msgid "Adjust saturation"
 msgstr "Nastavit sytost"
 
-#: ../src/ui/widget/selected-style.cpp:1376
+#: ../src/ui/widget/selected-style.cpp:1374
 #, c-format
 msgid ""
 "Adjusting <b>saturation</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with "
@@ -24670,11 +24680,11 @@
 "<b>Ctrl</b> nastavíte jas, s <b>Altem</b> nastavíte průhlednost, bez "
 "přeřa�ova�ů nastavíte odstín."
 
-#: ../src/ui/widget/selected-style.cpp:1380
+#: ../src/ui/widget/selected-style.cpp:1378
 msgid "Adjust lightness"
 msgstr "Nastavit jas"
 
-#: ../src/ui/widget/selected-style.cpp:1382
+#: ../src/ui/widget/selected-style.cpp:1380
 #, c-format
 msgid ""
 "Adjusting <b>lightness</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with "
@@ -24685,11 +24695,11 @@
 "<b>Shiftem</b> nastavíte sytost, s <b>Altem</b> nastavíte průhlednost, bez "
 "přeřa�ova�ů nastavíte odstín."
 
-#: ../src/ui/widget/selected-style.cpp:1386
+#: ../src/ui/widget/selected-style.cpp:1384
 msgid "Adjust hue"
 msgstr "Nastavit odstín"
 
-#: ../src/ui/widget/selected-style.cpp:1388
+#: ../src/ui/widget/selected-style.cpp:1386
 #, c-format
 msgid ""
 "Adjusting <b>hue</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Shift</"
@@ -24700,12 +24710,12 @@
 "<b>Shiftem</b> nastavíte sytost, s <b>Altem</b> nastavíte průhlednost, <b>s "
 "Ctrl</b> nastavíte jas."
 
-#: ../src/ui/widget/selected-style.cpp:1506
-#: ../src/ui/widget/selected-style.cpp:1520
+#: ../src/ui/widget/selected-style.cpp:1504
+#: ../src/ui/widget/selected-style.cpp:1518
 msgid "Adjust stroke width"
 msgstr "Nastavit tloušťku obrysu"
 
-#: ../src/ui/widget/selected-style.cpp:1507
+#: ../src/ui/widget/selected-style.cpp:1505
 #, c-format
 msgid "Adjusting <b>stroke width</b>: was %.3g, now <b>%.3g</b> (diff %.3g)"
 msgstr ""
@@ -24796,8 +24806,8 @@
 msgid ""
 "shared by <b>%d</b> box; drag with <b>Shift</b> to separate selected box(es)"
 msgid_plural ""
-"shared by <b>%d</b> boxes; drag with <b>Shift</b> to separate selected box"
-"(es)"
+"shared by <b>%d</b> boxes; drag with <b>Shift</b> to separate selected "
+"box(es)"
 msgstr[0] ""
 "Bod přechodu je sdílen s dalším <b>%d</b> barevným přechodem; přesunem za "
 "držení <b>Shift</b> jej oddělíte"
@@ -27908,8 +27918,8 @@
 msgid "Set pattern on stroke"
 msgstr "Nastavit obrys vzorkem"
 
-#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:958
-#: ../src/widgets/text-toolbar.cpp:1272
+#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:956
+#: ../src/widgets/text-toolbar.cpp:1270
 #, fuzzy
 msgid "Font size"
 msgstr "Velikost písma:"
@@ -28086,10 +28096,10 @@
 "(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite "
 "directions (spreadMethod=\"reflect\")"
 msgstr ""
-"Zda po ukon�ení výplně barevným přechodem vyplňovat plnou barvou"
-"(spreadMethod=\"pad\"), opakovat barevný přechod stejným směrem vykreslení "
-"(spreadMethod=\"repeat\") nebo opakovat barevný přechod se střídáním směru "
-"vykreslení (spreadMethod=\"reflect\")"
+"Zda po ukon�ení výplně barevným přechodem vyplňovat plnou "
+"barvou(spreadMethod=\"pad\"), opakovat barevný přechod stejným směrem "
+"vykreslení (spreadMethod=\"repeat\") nebo opakovat barevný přechod se "
+"střídáním směru vykreslení (spreadMethod=\"reflect\")"
 
 #: ../src/widgets/gradient-toolbar.cpp:1127
 msgid "Repeat:"
@@ -28276,7 +28286,7 @@
 msgid "Open LPE dialog (to adapt parameters numerically)"
 msgstr ""
 
-#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1275
+#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1273
 #, fuzzy
 msgid "Font Size"
 msgstr "Velikost písma"
@@ -29793,11 +29803,11 @@
 msgid "Set markers"
 msgstr "Nastavit zna�ky"
 
-#: ../src/widgets/stroke-style.cpp:1030 ../src/widgets/stroke-style.cpp:1115
+#: ../src/widgets/stroke-style.cpp:1024 ../src/widgets/stroke-style.cpp:1109
 msgid "Set stroke style"
 msgstr "Nastavit styl obrysu"
 
-#: ../src/widgets/stroke-style.cpp:1203
+#: ../src/widgets/stroke-style.cpp:1197
 msgid "Set marker color"
 msgstr "Nastavit barvu zna�ky"
 
@@ -29855,201 +29865,201 @@
 msgid "Text: Change orientation"
 msgstr "Text: Změnit orientaci"
 
-#: ../src/widgets/text-toolbar.cpp:1223
+#: ../src/widgets/text-toolbar.cpp:1221
 msgid "Font Family"
 msgstr "Písmo"
 
-#: ../src/widgets/text-toolbar.cpp:1224
+#: ../src/widgets/text-toolbar.cpp:1222
 msgid "Select Font Family (Alt-X to access)"
 msgstr "Vyberte font (Alt-X)"
 
 #. Focus widget
 #. Enable entry completion
-#: ../src/widgets/text-toolbar.cpp:1234
+#: ../src/widgets/text-toolbar.cpp:1232
 msgid "Select all text with this font-family"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1238
+#: ../src/widgets/text-toolbar.cpp:1236
 msgid "Font not found on system"
 msgstr "Font nenalezen v systému"
 
-#: ../src/widgets/text-toolbar.cpp:1297
+#: ../src/widgets/text-toolbar.cpp:1295
 msgid "Font Style"
 msgstr "Řez písma"
 
-#: ../src/widgets/text-toolbar.cpp:1298
+#: ../src/widgets/text-toolbar.cpp:1296
 msgid "Font style"
 msgstr "Řez písma"
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1315
+#: ../src/widgets/text-toolbar.cpp:1313
 msgid "Toggle Superscript"
 msgstr "Přepnout horní index"
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1316
+#: ../src/widgets/text-toolbar.cpp:1314
 msgid "Toggle superscript"
 msgstr "Přepnout horní index"
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1328
+#: ../src/widgets/text-toolbar.cpp:1326
 msgid "Toggle Subscript"
 msgstr "Přepnout dolní index"
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1329
+#: ../src/widgets/text-toolbar.cpp:1327
 msgid "Toggle subscript"
 msgstr "Přepnout dolní index"
 
-#: ../src/widgets/text-toolbar.cpp:1370
+#: ../src/widgets/text-toolbar.cpp:1368
 msgid "Justify"
 msgstr "Blokové zarovnání"
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1377
+#: ../src/widgets/text-toolbar.cpp:1375
 msgid "Alignment"
 msgstr "Zarovnání"
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1378
+#: ../src/widgets/text-toolbar.cpp:1376
 msgid "Text alignment"
 msgstr "Zarovnání textu"
 
-#: ../src/widgets/text-toolbar.cpp:1405
+#: ../src/widgets/text-toolbar.cpp:1403
 #, fuzzy
 msgid "Horizontal"
 msgstr "VodorovnÄ›"
 
-#: ../src/widgets/text-toolbar.cpp:1412
+#: ../src/widgets/text-toolbar.cpp:1410
 #, fuzzy
 msgid "Vertical"
 msgstr "Svisle"
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1419
+#: ../src/widgets/text-toolbar.cpp:1417
 msgid "Text orientation"
 msgstr "Orientace textu:"
 
 #. Drop down menu
-#: ../src/widgets/text-toolbar.cpp:1442
+#: ../src/widgets/text-toolbar.cpp:1440
 msgid "Smaller spacing"
 msgstr "Zmenšit prostrkání"
 
-#: ../src/widgets/text-toolbar.cpp:1442 ../src/widgets/text-toolbar.cpp:1473
-#: ../src/widgets/text-toolbar.cpp:1504
+#: ../src/widgets/text-toolbar.cpp:1440 ../src/widgets/text-toolbar.cpp:1471
+#: ../src/widgets/text-toolbar.cpp:1502
 #, fuzzy
 msgctxt "Text tool"
 msgid "Normal"
 msgstr "Normální"
 
-#: ../src/widgets/text-toolbar.cpp:1442
+#: ../src/widgets/text-toolbar.cpp:1440
 #, fuzzy
 msgid "Larger spacing"
 msgstr "Mezery mezi řádky:"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1447
+#: ../src/widgets/text-toolbar.cpp:1445
 #, fuzzy
 msgid "Line Height"
 msgstr "Výška:"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1448
+#: ../src/widgets/text-toolbar.cpp:1446
 #, fuzzy
 msgid "Line:"
 msgstr "Přímka"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1449
+#: ../src/widgets/text-toolbar.cpp:1447
 msgid "Spacing between lines (times font size)"
 msgstr "Mezery mezi řádky (násobky velikosti písma)"
 
 #. Drop down menu
-#: ../src/widgets/text-toolbar.cpp:1473 ../src/widgets/text-toolbar.cpp:1504
+#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502
 msgid "Negative spacing"
 msgstr "Záporné prostrkání"
 
-#: ../src/widgets/text-toolbar.cpp:1473 ../src/widgets/text-toolbar.cpp:1504
+#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502
 msgid "Positive spacing"
 msgstr "Kladné prostrkání"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1478
+#: ../src/widgets/text-toolbar.cpp:1476
 msgid "Word spacing"
 msgstr "Mezislovní mezery"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1479
+#: ../src/widgets/text-toolbar.cpp:1477
 #, fuzzy
 msgid "Word:"
 msgstr "Režim"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1480
+#: ../src/widgets/text-toolbar.cpp:1478
 msgid "Spacing between words (px)"
 msgstr "Mezislovní mezery (px)"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1509
+#: ../src/widgets/text-toolbar.cpp:1507
 msgid "Letter spacing"
 msgstr "Prostrkání znaků"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1510
+#: ../src/widgets/text-toolbar.cpp:1508
 #, fuzzy
 msgid "Letter:"
 msgstr "Délka:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1511
+#: ../src/widgets/text-toolbar.cpp:1509
 msgid "Spacing between letters (px)"
 msgstr "Prostrkání písmen (px)"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1540
+#: ../src/widgets/text-toolbar.cpp:1538
 msgid "Kerning"
 msgstr "Párování znaků"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1541
+#: ../src/widgets/text-toolbar.cpp:1539
 msgid "Kern:"
 msgstr "Kerning nahoru"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1542
+#: ../src/widgets/text-toolbar.cpp:1540
 msgid "Horizontal kerning (px)"
 msgstr "Vodorovné párování znaků (px)"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1571
+#: ../src/widgets/text-toolbar.cpp:1569
 #, fuzzy
 msgid "Vertical Shift"
 msgstr "Svislý text"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1572
+#: ../src/widgets/text-toolbar.cpp:1570
 #, fuzzy
 msgid "Vert:"
 msgstr "Invertovat:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1573
+#: ../src/widgets/text-toolbar.cpp:1571
 msgid "Vertical shift (px)"
 msgstr "Svislé posununutí (px)"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1602
+#: ../src/widgets/text-toolbar.cpp:1600
 msgid "Letter rotation"
 msgstr "Nato�ení znaků"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1603
+#: ../src/widgets/text-toolbar.cpp:1601
 #, fuzzy
 msgid "Rot:"
 msgstr "Role:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1604
+#: ../src/widgets/text-toolbar.cpp:1602
 msgid "Character rotation (degrees)"
 msgstr "Nato�ení znaků (stupně)"
 
@@ -30609,8 +30619,7 @@
 msgstr "Nevybrány žádné cesty! Zkouším zpracovat všechny dostupné."
 
 #: ../share/extensions/gcodetools.py:3324
-#, fuzzy
-msgid "Nothing is selected. Please select something."
+msgid "Noting is selected. Please select something."
 msgstr "Nic nevybráno. Prosím vyberte něco."
 
 #: ../share/extensions/gcodetools.py:3864
@@ -30717,11 +30726,10 @@
 msgstr ""
 
 #: ../share/extensions/gcodetools.py:4667
-#, fuzzy
 msgid ""
-"Nothing is selected. Please select something to convert to drill point "
+"Noting is selected. Please select something to convert to drill point "
 "(dxfpoint) or clear point sign."
-msgstr "Nic nevybráno. Prosím vyberte něco."
+msgstr ""
 
 #: ../share/extensions/gcodetools.py:4750
 #: ../share/extensions/gcodetools.py:4996
@@ -35651,8 +35659,9 @@
 msgstr ""
 
 #: ../share/extensions/polyhedron_3d.inx.h:10
+#, fuzzy
 msgid "Cuboctahedron"
-msgstr ""
+msgstr "Další"
 
 #: ../share/extensions/polyhedron_3d.inx.h:11
 msgid "Tetrahedron"
@@ -37384,6 +37393,16 @@
 msgid "XAML Input"
 msgstr "Vstup XAML"
 
+#, fuzzy
+#~ msgid "Nothing is selected. Please select something."
+#~ msgstr "Nic nevybráno. Prosím vyberte něco."
+
+#, fuzzy
+#~ msgid ""
+#~ "Nothing is selected. Please select something to convert to drill point "
+#~ "(dxfpoint) or clear point sign."
+#~ msgstr "Nic nevybráno. Prosím vyberte něco."
+
 #~ msgid "3D wood"
 #~ msgstr "Trojrozměrné dřevo"
 
@@ -37574,9 +37593,6 @@
 #~ msgid "Disabled Parking"
 #~ msgstr "Titulek"
 
-#~ msgid "&lt;no name found&gt;"
-#~ msgstr "&lt;nebylo nalezeno jméno&gt;"
-
 #~ msgctxt "Select toolbar"
 #~ msgid "W"
 #~ msgstr "Å "

=== modified file 'po/it.po'
--- po/it.po	2014-10-29 22:25:28 +0000
+++ po/it.po	2014-10-31 00:22:45 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Inkscape 0.91\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2014-10-26 18:38+0100\n"
+"POT-Creation-Date: 2014-10-02 10:03+0200\n"
 "PO-Revision-Date: 2009-10-11 17:07+0100\n"
 "Last-Translator: Firas Hanife <[e-mail]>\n"
 "Language-Team: \n"
@@ -3351,1019 +3351,1022 @@
 msgid "Old paint (bitmap)"
 msgstr "Dipinto antico (bitmap)"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:2
 msgctxt "Symbol"
-msgid "United States National Park Service Map Symbols"
-msgstr "Simboli mappa parchi nazionali Stati Uniti"
+msgid "AIGA Symbol Signs"
+msgstr "Segni simboli AIGA"
 
+#. Symbols: ./AigaSymbols.svg
 #. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4
+#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278
 msgctxt "Symbol"
-msgid "Airport"
-msgstr "Aereoporto"
+msgid "Telephone"
+msgstr "Telefono"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6
 msgctxt "Symbol"
-msgid "Amphitheatre"
-msgstr "Anfiteatro"
+msgid "Mail"
+msgstr "Posta"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8
 msgctxt "Symbol"
-msgid "Bicycle Trail"
-msgstr "Pista ciclabile"
+msgid "Currency Exchange"
+msgstr "Cambiavalute"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10
 msgctxt "Symbol"
-msgid "Boat Launch"
-msgstr "Rampa di alaggio barca"
+msgid "Currency Exchange - Euro"
+msgstr "Cambiavalute - Euro"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12
 msgctxt "Symbol"
-msgid "Boat Tour"
-msgstr "Viaggio in barca"
+msgid "Cashier"
+msgstr "Cassiere"
 
+#. Symbols: ./AigaSymbols.svg
 #. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14
+#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214
 msgctxt "Symbol"
-msgid "Bus Stop"
-msgstr "Fermata dell'autobus"
+msgid "First Aid"
+msgstr "Primo soccorso"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16
 msgctxt "Symbol"
-msgid "Campfire"
-msgstr "Fuoco da campo"
+msgid "Lost and Found"
+msgstr "Oggetti smarriti"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18
 msgctxt "Symbol"
-msgid "Campground"
-msgstr "Campeggio"
+msgid "Coat Check"
+msgstr "Guardaroba"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20
 msgctxt "Symbol"
-msgid "CanoeAccess"
-msgstr "Accesso canoa"
+msgid "Baggage Lockers"
+msgstr "Armadietti per bagaglio"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22
 msgctxt "Symbol"
-msgid "Crosscountry Ski Trail"
-msgstr "Pista di sci di fondo"
+msgid "Escalator"
+msgstr "Scala mobile"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24
 msgctxt "Symbol"
-msgid "Downhill Skiing"
-msgstr "Discesa libera"
+msgid "Escalator Down"
+msgstr "Scala mobile giù"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26
 msgctxt "Symbol"
-msgid "Drinking Water"
-msgstr "Acqua potabile"
+msgid "Escalator Up"
+msgstr "Scala mobile su"
 
-#. Symbols: ./MapSymbolsNPS.svg
 #. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28
-#: ../share/symbols/symbols.h:167 ../share/symbols/symbols.h:168
 msgctxt "Symbol"
-msgid "First Aid"
-msgstr "Primo soccorso"
+msgid "Stairs"
+msgstr "Scale"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30
 msgctxt "Symbol"
-msgid "Fishing"
-msgstr "Pesca"
+msgid "Stairs Down"
+msgstr "Scale giù"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32
 msgctxt "Symbol"
-msgid "Food Service"
-msgstr "Servizio di ristorazione"
+msgid "Stairs Up"
+msgstr "Scale su"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34
 msgctxt "Symbol"
-msgid "Four Wheel Drive Road"
-msgstr "Strada per veicoli a quattro ruote motrici"
+msgid "Elevator"
+msgstr "Ascensore"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36
 msgctxt "Symbol"
-msgid "Gas Station"
-msgstr "Distributore di benzina"
+msgid "Toilets - Men"
+msgstr "Servizi - Uomo"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38
 msgctxt "Symbol"
-msgid "Golfing"
-msgstr "Golf"
+msgid "Toilets - Women"
+msgstr "Servizi - Donna"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40
 msgctxt "Symbol"
-msgid "Horseback Riding"
-msgstr "Equitazione"
+msgid "Toilets"
+msgstr "Servizi"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42
 msgctxt "Symbol"
-msgid "Hospital"
-msgstr "Ospedale"
+msgid "Nursery"
+msgstr "Asilo nido"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44
 msgctxt "Symbol"
-msgid "Ice Skating"
-msgstr "Pattinaggio sul ghiaccio"
+msgid "Drinking Fountain"
+msgstr "Fontanella"
 
-#. Symbols: ./MapSymbolsNPS.svg
 #. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46
-#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202
 msgctxt "Symbol"
-msgid "Information"
-msgstr "Informazioni"
+msgid "Waiting Room"
+msgstr "Sala di attesa"
 
+#. Symbols: ./AigaSymbols.svg
 #. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48
+#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232
 msgctxt "Symbol"
-msgid "Litter Receptacle"
-msgstr "Cestino dei rifiuti"
+msgid "Information"
+msgstr "Informazioni"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50
 msgctxt "Symbol"
-msgid "Lodging"
-msgstr "Alloggio"
+msgid "Hotel Information"
+msgstr "Informazioni hotel"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52
 msgctxt "Symbol"
-msgid "Marina"
-msgstr "Marina"
+msgid "Air Transportation"
+msgstr "Trasporto aereo"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54
 msgctxt "Symbol"
-msgid "Recycling"
-msgstr "Riciclaggio"
+msgid "Heliport"
+msgstr "Eliporto"
 
-#. Symbols: ./MapSymbolsNPS.svg
 #. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56
-#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254
 msgctxt "Symbol"
-msgid "Parking"
-msgstr "Parcheggio"
+msgid "Taxi"
+msgstr "Taxi"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58
 msgctxt "Symbol"
-msgid "Pets On Leash"
-msgstr "Animali al guinzaglio"
+msgid "Bus"
+msgstr "Autobus"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60
 msgctxt "Symbol"
-msgid "Picnic Area"
-msgstr "Area picnic"
+msgid "Ground Transportation"
+msgstr "Trasporto via terra"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62
 msgctxt "Symbol"
-msgid "Post Office"
-msgstr "Ufficio postale"
+msgid "Rail Transportation"
+msgstr "Trasporto ferroviario"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64
 msgctxt "Symbol"
-msgid "Ranger Station"
-msgstr "Stazione dei ranger"
+msgid "Water Transportation"
+msgstr "Trasporto via mare"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66
 msgctxt "Symbol"
-msgid "RV Campground"
-msgstr "Campeggio camper"
+msgid "Car Rental"
+msgstr "Autonoleggio"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68
 msgctxt "Symbol"
-msgid "Restrooms"
-msgstr "Servizi"
+msgid "Restaurant"
+msgstr "Ristorante"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70
 msgctxt "Symbol"
-msgid "Sailing"
-msgstr "Vela"
+msgid "Coffeeshop"
+msgstr "Caffè"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72
 msgctxt "Symbol"
-msgid "Sanitary Disposal Station"
-msgstr "Stazione di smaltimento sanitario"
+msgid "Bar"
+msgstr "Bar"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74
 msgctxt "Symbol"
-msgid "Scuba Diving"
-msgstr "Immersione subacquea"
+msgid "Shops"
+msgstr "Negozi"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76
 msgctxt "Symbol"
-msgid "Self Guided Trail"
-msgstr "Sentiero guidato"
+msgid "Barber Shop - Beauty Salon"
+msgstr "Barbiere - Salone di bellezza"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78
 msgctxt "Symbol"
-msgid "Shelter"
-msgstr "Rifugio"
+msgid "Barber Shop"
+msgstr "Barbiere"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80
 msgctxt "Symbol"
-msgid "Showers"
-msgstr "Docce"
+msgid "Beauty Salon"
+msgstr "Salone di bellezza"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82
 msgctxt "Symbol"
-msgid "Sledding"
-msgstr "Slitta"
+msgid "Ticket Purchase"
+msgstr "Acquisto biglietti"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84
 msgctxt "Symbol"
-msgid "SnowmobileTrail"
-msgstr "Sentiero motoslitta"
+msgid "Baggage Check In"
+msgstr "Check in bagagli"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86
 msgctxt "Symbol"
-msgid "Stable"
-msgstr "Stalla"
+msgid "Baggage Claim"
+msgstr "Ritiro bagagli"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88
 msgctxt "Symbol"
-msgid "Store"
-msgstr "Negozio"
+msgid "Customs"
+msgstr "Dogana"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90
 msgctxt "Symbol"
-msgid "Swimming"
-msgstr "Nuoto"
+msgid "Immigration"
+msgstr "Immigrazione"
 
-#. Symbols: ./MapSymbolsNPS.svg
 #. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92
-#: ../share/symbols/symbols.h:157 ../share/symbols/symbols.h:158
 msgctxt "Symbol"
-msgid "Telephone"
-msgstr "Telefono"
+msgid "Departing Flights"
+msgstr "Voli in partenza"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94
 msgctxt "Symbol"
-msgid "Emergency Telephone"
-msgstr "Telefono di emergenza"
+msgid "Arriving Flights"
+msgstr "Voli in arrivo"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96
 msgctxt "Symbol"
-msgid "Trailhead"
-msgstr "Sentiero"
+msgid "Smoking"
+msgstr "Fumare"
 
-#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./AigaSymbols.svg
 #: ../share/symbols/symbols.h:97 ../share/symbols/symbols.h:98
 msgctxt "Symbol"
-msgid "Wheelchair Accessible"
-msgstr "Accessibile alle sedie a rotelle"
+msgid "No Smoking"
+msgstr "Vietato fumare"
 
+#. Symbols: ./AigaSymbols.svg
 #. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100
-msgctxt "Symbol"
-msgid "Wind Surfing"
-msgstr "Windsurf"
+#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242
+msgctxt "Symbol"
+msgid "Parking"
+msgstr "Parcheggio"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102
+msgctxt "Symbol"
+msgid "No Parking"
+msgstr "Divieto di parcheggio"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104
+msgctxt "Symbol"
+msgid "No Dogs"
+msgstr "Divieto per i cani"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106
+msgctxt "Symbol"
+msgid "No Entry"
+msgstr "Divieto di ingresso"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108
+msgctxt "Symbol"
+msgid "Exit"
+msgstr "Uscita"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:109 ../share/symbols/symbols.h:110
+msgctxt "Symbol"
+msgid "Fire Extinguisher"
+msgstr "Estintore"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:111 ../share/symbols/symbols.h:112
+msgctxt "Symbol"
+msgid "Right Arrow"
+msgstr "Freccia destra"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114
+msgctxt "Symbol"
+msgid "Forward and Right Arrow"
+msgstr "Freccia avanti e destra"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116
+msgctxt "Symbol"
+msgid "Up Arrow"
+msgstr "Freccia su"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118
+msgctxt "Symbol"
+msgid "Forward and Left Arrow"
+msgstr "Freccia avanti e sinistra"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120
+msgctxt "Symbol"
+msgid "Left Arrow"
+msgstr "Freccia sinistra"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122
+msgctxt "Symbol"
+msgid "Left and Down Arrow"
+msgstr "Freccia sinistra e giù"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124
+msgctxt "Symbol"
+msgid "Down Arrow"
+msgstr "Freccia giù"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126
+msgctxt "Symbol"
+msgid "Right and Down Arrow"
+msgstr "Freccia destra e giù"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128
+msgctxt "Symbol"
+msgid "NPS Wheelchair Accessible - 1996"
+msgstr "NPS Accessibile alle sedie a rotelle - 1996"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130
+msgctxt "Symbol"
+msgid "NPS Wheelchair Accessible"
+msgstr "NPS Accessibile alle sedie a rotelle"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:131 ../share/symbols/symbols.h:132
+msgctxt "Symbol"
+msgid "New Wheelchair Accessible"
+msgstr "Nuovo Accessibile alle sedie a rotelle"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:133
+msgctxt "Symbol"
+msgid "Word Balloons"
+msgstr "Nuvolette"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:134
+msgctxt "Symbol"
+msgid "Thought Balloon"
+msgstr "Nuvoletta di pensiero"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:135
+msgctxt "Symbol"
+msgid "Dream Speaking"
+msgstr "Discorso sognante"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:136
+msgctxt "Symbol"
+msgid "Rounded Balloon"
+msgstr "Nuvoletta arrotondata"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:137
+msgctxt "Symbol"
+msgid "Squared Balloon"
+msgstr "Nuvoletta squadrata"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:138
+msgctxt "Symbol"
+msgid "Over the Phone"
+msgstr "Al telefono"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:139
+msgctxt "Symbol"
+msgid "Hip Balloon"
+msgstr "Nuvoletta sfiancata"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:140
+msgctxt "Symbol"
+msgid "Circle Balloon"
+msgstr "Nuvoletta rotonda"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:141
+msgctxt "Symbol"
+msgid "Exclaim Balloon"
+msgstr "Nuvoletta di esclamazione"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:101
+#: ../share/symbols/symbols.h:142
 msgctxt "Symbol"
 msgid "Flow Chart Shapes"
 msgstr "Diagramma di flusso"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:102
+#: ../share/symbols/symbols.h:143
 msgctxt "Symbol"
 msgid "Process"
 msgstr "Processo"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:103
+#: ../share/symbols/symbols.h:144
 msgctxt "Symbol"
 msgid "Input/Output"
 msgstr "Input/Output"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:104
+#: ../share/symbols/symbols.h:145
 msgctxt "Symbol"
 msgid "Document"
 msgstr "Documento"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:105
+#: ../share/symbols/symbols.h:146
 msgctxt "Symbol"
 msgid "Manual Operation"
 msgstr "Operazione manuale"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:106
+#: ../share/symbols/symbols.h:147
 msgctxt "Symbol"
 msgid "Preparation"
 msgstr "Preparazione"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:107
+#: ../share/symbols/symbols.h:148
 msgctxt "Symbol"
 msgid "Merge"
 msgstr "Fusione"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:108
+#: ../share/symbols/symbols.h:149
 msgctxt "Symbol"
 msgid "Decision"
 msgstr "Decisione"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:109
+#: ../share/symbols/symbols.h:150
 msgctxt "Symbol"
 msgid "Magnetic Tape"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:110
+#: ../share/symbols/symbols.h:151
 #, fuzzy
 msgctxt "Symbol"
 msgid "Display"
 msgstr "Modalità visualizzazione"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:111
+#: ../share/symbols/symbols.h:152
 msgctxt "Symbol"
 msgid "Auxiliary Operation"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:112
+#: ../share/symbols/symbols.h:153
 msgctxt "Symbol"
 msgid "Manual Input"
 msgstr "Input manuale"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:113
+#: ../share/symbols/symbols.h:154
 msgctxt "Symbol"
 msgid "Extract"
 msgstr "Estrai"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:114
+#: ../share/symbols/symbols.h:155
 msgctxt "Symbol"
 msgid "Terminal/Interrupt"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:115
+#: ../share/symbols/symbols.h:156
 msgctxt "Symbol"
 msgid "Punched Card"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:116
+#: ../share/symbols/symbols.h:157
 #, fuzzy
 msgctxt "Symbol"
 msgid "Punch Tape"
 msgstr "Buca"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:117
+#: ../share/symbols/symbols.h:158
 msgctxt "Symbol"
 msgid "Online Storage"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:118
+#: ../share/symbols/symbols.h:159
 msgctxt "Symbol"
 msgid "Keying"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:119
+#: ../share/symbols/symbols.h:160
 msgctxt "Symbol"
 msgid "Sort"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:120
+#: ../share/symbols/symbols.h:161
 msgctxt "Symbol"
 msgid "Connector"
 msgstr "Connettore"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:121
+#: ../share/symbols/symbols.h:162
 #, fuzzy
 msgctxt "Symbol"
 msgid "Off-Page Connector"
 msgstr "Connettore"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:122
+#: ../share/symbols/symbols.h:163
 msgctxt "Symbol"
 msgid "Transmittal Tape"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:123
+#: ../share/symbols/symbols.h:164
 msgctxt "Symbol"
 msgid "Communication Link"
 msgstr "Collegamento di comunicazione"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:124
+#: ../share/symbols/symbols.h:165
 #, fuzzy
 msgctxt "Symbol"
 msgid "Collate"
 msgstr "Modula"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:125
+#: ../share/symbols/symbols.h:166
 msgctxt "Symbol"
 msgid "Comment/Annotation"
 msgstr "Commento/Annotazione"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:126
+#: ../share/symbols/symbols.h:167
 msgctxt "Symbol"
 msgid "Core"
 msgstr "Nucleo"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:127
+#: ../share/symbols/symbols.h:168
 msgctxt "Symbol"
 msgid "Predefined Process"
 msgstr "Processo predefinito"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:128
+#: ../share/symbols/symbols.h:169
 msgctxt "Symbol"
 msgid "Magnetic Disk (Database)"
 msgstr "Disco magnetico (Database)"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:129
+#: ../share/symbols/symbols.h:170
 msgctxt "Symbol"
 msgid "Magnetic Drum (Direct Access)"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:130
+#: ../share/symbols/symbols.h:171
 msgctxt "Symbol"
 msgid "Offline Storage"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:131
+#: ../share/symbols/symbols.h:172
 msgctxt "Symbol"
 msgid "Logical Or"
 msgstr "Or logico"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:132
+#: ../share/symbols/symbols.h:173
 msgctxt "Symbol"
 msgid "Logical And"
 msgstr "And logico"
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:133
+#: ../share/symbols/symbols.h:174
 msgctxt "Symbol"
 msgid "Delay"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:134
+#: ../share/symbols/symbols.h:175
 msgctxt "Symbol"
 msgid "Loop Limit Begin"
 msgstr ""
 
 #. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:135
+#: ../share/symbols/symbols.h:176
 msgctxt "Symbol"
 msgid "Loop Limit End"
 msgstr ""
 
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:136
-msgctxt "Symbol"
-msgid "Word Balloons"
-msgstr "Nuvolette"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:137
-msgctxt "Symbol"
-msgid "Thought Balloon"
-msgstr "Nuvoletta di pensiero"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:138
-msgctxt "Symbol"
-msgid "Dream Speaking"
-msgstr "Discorso sognante"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:139
-msgctxt "Symbol"
-msgid "Rounded Balloon"
-msgstr "Nuvoletta arrotondata"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:140
-msgctxt "Symbol"
-msgid "Squared Balloon"
-msgstr "Nuvoletta squadrata"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:141
-msgctxt "Symbol"
-msgid "Over the Phone"
-msgstr "Al telefono"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:142
-msgctxt "Symbol"
-msgid "Hip Balloon"
-msgstr "Nuvoletta sfiancata"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:143
-msgctxt "Symbol"
-msgid "Circle Balloon"
-msgstr "Nuvoletta rotonda"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:144
-msgctxt "Symbol"
-msgid "Exclaim Balloon"
-msgstr "Nuvoletta di esclamazione"
-
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:145
+#: ../share/symbols/symbols.h:177
 msgctxt "Symbol"
 msgid "Logic Symbols"
 msgstr "Simboli logici"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:146
+#: ../share/symbols/symbols.h:178
 msgctxt "Symbol"
 msgid "Xnor Gate"
 msgstr "Xnor Gate"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:147
+#: ../share/symbols/symbols.h:179
 msgctxt "Symbol"
 msgid "Xor Gate"
 msgstr "Xor Gate"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:148
+#: ../share/symbols/symbols.h:180
 msgctxt "Symbol"
 msgid "Nor Gate"
 msgstr "Nor Gate"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:149
+#: ../share/symbols/symbols.h:181
 msgctxt "Symbol"
 msgid "Or Gate"
 msgstr "Or Gate"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:150
+#: ../share/symbols/symbols.h:182
 msgctxt "Symbol"
 msgid "Nand Gate"
 msgstr "Nand Gate"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:151
+#: ../share/symbols/symbols.h:183
 msgctxt "Symbol"
 msgid "And Gate"
 msgstr "And Gate"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:152
+#: ../share/symbols/symbols.h:184
 msgctxt "Symbol"
 msgid "Buffer"
 msgstr "Buffer"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:153
+#: ../share/symbols/symbols.h:185
 msgctxt "Symbol"
 msgid "Not Gate"
 msgstr "Not Gate"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:154
+#: ../share/symbols/symbols.h:186
 msgctxt "Symbol"
 msgid "Buffer Small"
 msgstr "Buffer piccolo"
 
 #. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:155
+#: ../share/symbols/symbols.h:187
 msgctxt "Symbol"
 msgid "Not Gate Small"
 msgstr "Not Gate piccolo"
 
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:156
-msgctxt "Symbol"
-msgid "AIGA Symbol Signs"
-msgstr "Segni simboli AIGA"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:159 ../share/symbols/symbols.h:160
-msgctxt "Symbol"
-msgid "Mail"
-msgstr "Posta"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:161 ../share/symbols/symbols.h:162
-msgctxt "Symbol"
-msgid "Currency Exchange"
-msgstr "Cambiavalute"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:163 ../share/symbols/symbols.h:164
-msgctxt "Symbol"
-msgid "Currency Exchange - Euro"
-msgstr "Cambiavalute - Euro"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:165 ../share/symbols/symbols.h:166
-msgctxt "Symbol"
-msgid "Cashier"
-msgstr "Cassiere"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:169 ../share/symbols/symbols.h:170
-msgctxt "Symbol"
-msgid "Lost and Found"
-msgstr "Oggetti smarriti"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:171 ../share/symbols/symbols.h:172
-msgctxt "Symbol"
-msgid "Coat Check"
-msgstr "Guardaroba"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:173 ../share/symbols/symbols.h:174
-msgctxt "Symbol"
-msgid "Baggage Lockers"
-msgstr "Armadietti per bagaglio"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:175 ../share/symbols/symbols.h:176
-msgctxt "Symbol"
-msgid "Escalator"
-msgstr "Scala mobile"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:177 ../share/symbols/symbols.h:178
-msgctxt "Symbol"
-msgid "Escalator Down"
-msgstr "Scala mobile giù"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:179 ../share/symbols/symbols.h:180
-msgctxt "Symbol"
-msgid "Escalator Up"
-msgstr "Scala mobile su"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:181 ../share/symbols/symbols.h:182
-msgctxt "Symbol"
-msgid "Stairs"
-msgstr "Scale"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:183 ../share/symbols/symbols.h:184
-msgctxt "Symbol"
-msgid "Stairs Down"
-msgstr "Scale giù"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:185 ../share/symbols/symbols.h:186
-msgctxt "Symbol"
-msgid "Stairs Up"
-msgstr "Scale su"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:187 ../share/symbols/symbols.h:188
-msgctxt "Symbol"
-msgid "Elevator"
-msgstr "Ascensore"
-
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
+#: ../share/symbols/symbols.h:188
+msgctxt "Symbol"
+msgid "United States National Park Service Map Symbols"
+msgstr "Simboli mappa parchi nazionali Stati Uniti"
+
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190
 msgctxt "Symbol"
-msgid "Toilets - Men"
-msgstr "Servizi - Uomo"
+msgid "Airport"
+msgstr "Aereoporto"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192
 msgctxt "Symbol"
-msgid "Toilets - Women"
-msgstr "Servizi - Donna"
+msgid "Amphitheatre"
+msgstr "Anfiteatro"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194
 msgctxt "Symbol"
-msgid "Toilets"
-msgstr "Servizi"
+msgid "Bicycle Trail"
+msgstr "Pista ciclabile"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196
 msgctxt "Symbol"
-msgid "Nursery"
-msgstr "Asilo nido"
+msgid "Boat Launch"
+msgstr "Rampa di alaggio barca"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198
 msgctxt "Symbol"
-msgid "Drinking Fountain"
-msgstr "Fontanella"
+msgid "Boat Tour"
+msgstr "Viaggio in barca"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200
 msgctxt "Symbol"
-msgid "Waiting Room"
-msgstr "Sala di attesa"
-
-#. Symbols: ./AigaSymbols.svg
+msgid "Bus Stop"
+msgstr "Fermata dell'autobus"
+
+#. Symbols: ./MapSymbolsNPS.svg
+#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202
+msgctxt "Symbol"
+msgid "Campfire"
+msgstr "Fuoco da campo"
+
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204
 msgctxt "Symbol"
-msgid "Hotel Information"
-msgstr "Informazioni hotel"
+msgid "Campground"
+msgstr "Campeggio"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206
 msgctxt "Symbol"
-msgid "Air Transportation"
-msgstr "Trasporto aereo"
+msgid "CanoeAccess"
+msgstr "Accesso canoa"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208
 msgctxt "Symbol"
-msgid "Heliport"
-msgstr "Eliporto"
+msgid "Crosscountry Ski Trail"
+msgstr "Pista di sci di fondo"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210
 msgctxt "Symbol"
-msgid "Taxi"
-msgstr "Taxi"
+msgid "Downhill Skiing"
+msgstr "Discesa libera"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212
 msgctxt "Symbol"
-msgid "Bus"
-msgstr "Autobus"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214
-msgctxt "Symbol"
-msgid "Ground Transportation"
-msgstr "Trasporto via terra"
-
-#. Symbols: ./AigaSymbols.svg
+msgid "Drinking Water"
+msgstr "Acqua potabile"
+
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216
 msgctxt "Symbol"
-msgid "Rail Transportation"
-msgstr "Trasporto ferroviario"
+msgid "Fishing"
+msgstr "Pesca"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218
 msgctxt "Symbol"
-msgid "Water Transportation"
-msgstr "Trasporto via mare"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220
-msgctxt "Symbol"
-msgid "Car Rental"
-msgstr "Autonoleggio"
-
-#. Symbols: ./AigaSymbols.svg
+msgid "Food Service"
+msgstr "Servizio di ristorazione"
+
+#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222
 msgctxt "Symbol"
-msgid "Restaurant"
-msgstr "Ristorante"
+msgid "Gas Station"
+msgstr "Distributore di benzina"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224
 msgctxt "Symbol"
-msgid "Coffeeshop"
-msgstr "Caffè"
+msgid "Golfing"
+msgstr "Golf"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226
 msgctxt "Symbol"
-msgid "Bar"
-msgstr "Bar"
+msgid "Horseback Riding"
+msgstr "Equitazione"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228
 msgctxt "Symbol"
-msgid "Shops"
-msgstr "Negozi"
+msgid "Hospital"
+msgstr "Ospedale"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230
 msgctxt "Symbol"
-msgid "Barber Shop - Beauty Salon"
-msgstr "Barbiere - Salone di bellezza"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232
-msgctxt "Symbol"
-msgid "Barber Shop"
-msgstr "Barbiere"
-
-#. Symbols: ./AigaSymbols.svg
+msgid "Ice Skating"
+msgstr "Pattinaggio sul ghiaccio"
+
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234
 msgctxt "Symbol"
-msgid "Beauty Salon"
-msgstr "Salone di bellezza"
+msgid "Litter Receptacle"
+msgstr "Cestino dei rifiuti"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236
 msgctxt "Symbol"
-msgid "Ticket Purchase"
-msgstr "Acquisto biglietti"
+msgid "Lodging"
+msgstr "Alloggio"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238
 msgctxt "Symbol"
-msgid "Baggage Check In"
-msgstr "Check in bagagli"
+msgid "Marina"
+msgstr "Marina"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240
 msgctxt "Symbol"
-msgid "Baggage Claim"
-msgstr "Ritiro bagagli"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242
-msgctxt "Symbol"
-msgid "Customs"
-msgstr "Dogana"
-
-#. Symbols: ./AigaSymbols.svg
+msgid "Recycling"
+msgstr "Riciclaggio"
+
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244
 msgctxt "Symbol"
-msgid "Immigration"
-msgstr "Immigrazione"
+msgid "Pets On Leash"
+msgstr "Animali al guinzaglio"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246
 msgctxt "Symbol"
-msgid "Departing Flights"
-msgstr "Voli in partenza"
+msgid "Picnic Area"
+msgstr "Area picnic"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248
 msgctxt "Symbol"
-msgid "Arriving Flights"
-msgstr "Voli in arrivo"
+msgid "Post Office"
+msgstr "Ufficio postale"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250
 msgctxt "Symbol"
-msgid "Smoking"
-msgstr "Fumare"
+msgid "Ranger Station"
+msgstr "Stazione dei ranger"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252
 msgctxt "Symbol"
-msgid "No Smoking"
-msgstr "Vietato fumare"
-
-#. Symbols: ./AigaSymbols.svg
+msgid "RV Campground"
+msgstr "Campeggio camper"
+
+#. Symbols: ./MapSymbolsNPS.svg
+#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254
+msgctxt "Symbol"
+msgid "Restrooms"
+msgstr "Servizi"
+
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256
 msgctxt "Symbol"
-msgid "No Parking"
-msgstr "Divieto di parcheggio"
+msgid "Sailing"
+msgstr "Vela"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258
 msgctxt "Symbol"
-msgid "No Dogs"
-msgstr "Divieto per i cani"
+msgid "Sanitary Disposal Station"
+msgstr "Stazione di smaltimento sanitario"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260
 msgctxt "Symbol"
-msgid "No Entry"
-msgstr "Divieto di ingresso"
+msgid "Scuba Diving"
+msgstr "Immersione subacquea"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262
 msgctxt "Symbol"
-msgid "Exit"
-msgstr "Uscita"
+msgid "Self Guided Trail"
+msgstr "Sentiero guidato"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264
 msgctxt "Symbol"
-msgid "Fire Extinguisher"
-msgstr "Estintore"
+msgid "Shelter"
+msgstr "Rifugio"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266
 msgctxt "Symbol"
-msgid "Right Arrow"
-msgstr "Freccia destra"
+msgid "Showers"
+msgstr "Docce"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268
 msgctxt "Symbol"
-msgid "Forward and Right Arrow"
-msgstr "Freccia avanti e destra"
+msgid "Sledding"
+msgstr "Slitta"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270
 msgctxt "Symbol"
-msgid "Up Arrow"
-msgstr "Freccia su"
+msgid "SnowmobileTrail"
+msgstr "Sentiero motoslitta"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272
 msgctxt "Symbol"
-msgid "Forward and Left Arrow"
-msgstr "Freccia avanti e sinistra"
+msgid "Stable"
+msgstr "Stalla"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274
 msgctxt "Symbol"
-msgid "Left Arrow"
-msgstr "Freccia sinistra"
+msgid "Store"
+msgstr "Negozio"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276
 msgctxt "Symbol"
-msgid "Left and Down Arrow"
-msgstr "Freccia sinistra e giù"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278
-msgctxt "Symbol"
-msgid "Down Arrow"
-msgstr "Freccia giù"
-
-#. Symbols: ./AigaSymbols.svg
+msgid "Swimming"
+msgstr "Nuoto"
+
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280
 msgctxt "Symbol"
-msgid "Right and Down Arrow"
-msgstr "Freccia destra e giù"
+msgid "Emergency Telephone"
+msgstr "Telefono di emergenza"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282
 msgctxt "Symbol"
-msgid "NPS Wheelchair Accessible - 1996"
-msgstr "NPS Accessibile alle sedie a rotelle - 1996"
+msgid "Trailhead"
+msgstr "Sentiero"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284
 msgctxt "Symbol"
-msgid "NPS Wheelchair Accessible"
-msgstr "NPS Accessibile alle sedie a rotelle"
+msgid "Wheelchair Accessible"
+msgstr "Accessibile alle sedie a rotelle"
 
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286
 msgctxt "Symbol"
-msgid "New Wheelchair Accessible"
-msgstr "Nuovo Accessibile alle sedie a rotelle"
+msgid "Wind Surfing"
+msgstr "Windsurf"
+
+#. Symbols: ./MapSymbolsNPS.svg
+#. Symbols: ./MapSymbolsNPS.svg
+#: ../share/symbols/symbols.h:220 ../share/symbols/symbols.h:219
+msgctxt "Symbol"
+msgid "Four Wheel Drive Road),"
+msgstr ""
 
 #: ../share/templates/templates.h:1
 msgid "A4 Landscape Page"
@@ -4730,7 +4733,7 @@
 msgstr "guide tipografia tipografico canvas"
 
 #. 3D box
-#: ../src/box3d.cpp:260 ../src/box3d.cpp:1313
+#: ../src/box3d.cpp:259 ../src/box3d.cpp:1310
 #: ../src/ui/dialog/inkscape-preferences.cpp:400
 msgid "3D Box"
 msgstr "Solido 3D"
@@ -5170,7 +5173,7 @@
 msgid "Memory document %1"
 msgstr "Documento memoria %1"
 
-#: ../src/document.cpp:786
+#: ../src/document.cpp:787
 #, c-format
 msgid "Unnamed document %d"
 msgstr "Documento senza nome %d"
@@ -5328,7 +5331,7 @@
 "informazioni, consultare il sito web di Inkscape o rivolgersi alle mailing "
 "list."
 
-#: ../src/extension/implementation/script.cpp:1057
+#: ../src/extension/implementation/script.cpp:1037
 msgid ""
 "Inkscape has received additional data from the script executed.  The script "
 "did not return an error, but this may indicate the results will not be as "
@@ -6122,70 +6125,70 @@
 msgid "Output page size:"
 msgstr "Imposta dimensione pagina:"
 
-#: ../src/extension/internal/cdr-input.cpp:116
+#: ../src/extension/internal/cdr-input.cpp:102
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:87
-#: ../src/extension/internal/vsd-input.cpp:116
+#: ../src/extension/internal/vsd-input.cpp:101
 msgid "Select page:"
 msgstr "Seleziona pagina:"
 
 #. Display total number of pages
-#: ../src/extension/internal/cdr-input.cpp:128
+#: ../src/extension/internal/cdr-input.cpp:114
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:106
-#: ../src/extension/internal/vsd-input.cpp:128
+#: ../src/extension/internal/vsd-input.cpp:113
 #, c-format
 msgid "out of %i"
 msgstr "su %i"
 
-#: ../src/extension/internal/cdr-input.cpp:159
-#: ../src/extension/internal/vsd-input.cpp:159
+#: ../src/extension/internal/cdr-input.cpp:145
+#: ../src/extension/internal/vsd-input.cpp:144
 msgid "Page Selector"
 msgstr "Selettore pagina"
 
-#: ../src/extension/internal/cdr-input.cpp:294
+#: ../src/extension/internal/cdr-input.cpp:274
 msgid "Corel DRAW Input"
 msgstr "Input Corel DRAW"
 
-#: ../src/extension/internal/cdr-input.cpp:299
+#: ../src/extension/internal/cdr-input.cpp:279
 msgid "Corel DRAW 7-X4 files (*.cdr)"
 msgstr "File Corel DRAW 7-X4 (*.cdr)"
 
-#: ../src/extension/internal/cdr-input.cpp:300
+#: ../src/extension/internal/cdr-input.cpp:280
 msgid "Open files saved in Corel DRAW 7-X4"
 msgstr "Apre file salvati con Corel DRAW 7-X4"
 
-#: ../src/extension/internal/cdr-input.cpp:307
+#: ../src/extension/internal/cdr-input.cpp:287
 msgid "Corel DRAW templates input"
 msgstr "Input modello Corel DRAW"
 
-#: ../src/extension/internal/cdr-input.cpp:312
+#: ../src/extension/internal/cdr-input.cpp:292
 msgid "Corel DRAW 7-13 template files (*.cdt)"
 msgstr "File modello Corel DRAW 7-13 (*.cdt)"
 
-#: ../src/extension/internal/cdr-input.cpp:313
+#: ../src/extension/internal/cdr-input.cpp:293
 msgid "Open files saved in Corel DRAW 7-13"
 msgstr "Apre file salvati con Corel DRAW 7-13"
 
-#: ../src/extension/internal/cdr-input.cpp:320
+#: ../src/extension/internal/cdr-input.cpp:300
 msgid "Corel DRAW Compressed Exchange files input"
 msgstr "File input Corel DRAW Compressed Exchange"
 
-#: ../src/extension/internal/cdr-input.cpp:325
+#: ../src/extension/internal/cdr-input.cpp:305
 msgid "Corel DRAW Compressed Exchange files (*.ccx)"
 msgstr "File Corel DRAW Compressed Exchang (*.ccx)"
 
-#: ../src/extension/internal/cdr-input.cpp:326
+#: ../src/extension/internal/cdr-input.cpp:306
 msgid "Open compressed exchange files saved in Corel DRAW"
 msgstr "File Open compressed exchange salvato con Corel DRAW"
 
-#: ../src/extension/internal/cdr-input.cpp:333
+#: ../src/extension/internal/cdr-input.cpp:313
 msgid "Corel DRAW Presentation Exchange files input"
 msgstr "File input Corel DRAW Presentation Exchange"
 
-#: ../src/extension/internal/cdr-input.cpp:338
+#: ../src/extension/internal/cdr-input.cpp:318
 msgid "Corel DRAW Presentation Exchange files (*.cmx)"
 msgstr "File Corel DRAW Presentation Exchange (*.cmx)"
 
-#: ../src/extension/internal/cdr-input.cpp:339
+#: ../src/extension/internal/cdr-input.cpp:319
 msgid "Open presentation exchange files saved in Corel DRAW"
 msgstr "File Open presentation exchange salvato con Corel DRAW"
 
@@ -6346,7 +6349,6 @@
 #: ../src/extension/internal/filter/transparency.h:214
 #: ../src/extension/internal/filter/transparency.h:287
 #: ../src/extension/internal/filter/transparency.h:349
-#, c-format
 msgid "Filters"
 msgstr "Filtri"
 
@@ -8062,12 +8064,10 @@
 msgstr "Importa immagine bitmap %s"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:191
-#, c-format
 msgid "Image Import Type:"
 msgstr "Modalità importazione immagine:"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:191
-#, c-format
 msgid ""
 "Embed results in stand-alone, larger SVG files. Link references a file "
 "outside this SVG document and all files must be moved together."
@@ -8078,23 +8078,19 @@
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:192
 #: ../src/ui/dialog/inkscape-preferences.cpp:1449
-#, c-format
 msgid "Embed"
 msgstr "Incorpora"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:193 ../src/sp-anchor.cpp:119
 #: ../src/ui/dialog/inkscape-preferences.cpp:1449
-#, c-format
 msgid "Link"
 msgstr "Collega"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:196
-#, c-format
 msgid "Image DPI:"
 msgstr "DPI immagine:"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:196
-#, c-format
 msgid ""
 "Take information from file or use default bitmap import resolution as "
 "defined in the preferences."
@@ -8103,22 +8099,18 @@
 "preferenze per l'importazione bitmap."
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:197
-#, c-format
 msgid "From file"
 msgstr "Da file"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:198
-#, c-format
 msgid "Default import resolution"
 msgstr "Risoluzione predefinita per l'importazione"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:201
-#, c-format
 msgid "Image Rendering Mode:"
 msgstr "Modalità rendering immagine:"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:201
-#, c-format
 msgid ""
 "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will "
 "not work in all browsers.)"
@@ -8128,30 +8120,25 @@
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:202
 #: ../src/ui/dialog/inkscape-preferences.cpp:1456
-#, c-format
 msgid "None (auto)"
 msgstr "Nessuna (auto)"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:203
 #: ../src/ui/dialog/inkscape-preferences.cpp:1456
-#, c-format
 msgid "Smooth (optimizeQuality)"
 msgstr "Fluida (optimizeQuality)"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:204
 #: ../src/ui/dialog/inkscape-preferences.cpp:1456
-#, c-format
 msgid "Blocky (optimizeSpeed)"
 msgstr "Grezza (optimizeSpeed)"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:207
-#, c-format
 msgid "Hide the dialog next time and always apply the same actions."
 msgstr ""
 "Nasconde questa finestra la prossima volta e applica le stesse opzioni."
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:207
-#, c-format
 msgid "Don't ask again"
 msgstr "Non chiedere più"
 
@@ -8369,27 +8356,27 @@
 msgid "very fine"
 msgstr "ottima"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:901
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:877
 msgid "PDF Input"
 msgstr "Input PDF"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:906
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:882
 msgid "Adobe PDF (*.pdf)"
 msgstr "PDF Adobe (*.pdf)"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:907
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:883
 msgid "Adobe Portable Document Format"
 msgstr "Documento Adobe Portable Format"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:914
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:890
 msgid "AI Input"
 msgstr "Input AI"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:919
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:895
 msgid "Adobe Illustrator 9.0 and above (*.ai)"
 msgstr "Adobe Illustrator 9.0 e superiori (*.ai)"
 
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:920
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:896
 msgid "Open files saved in Adobe Illustrator 9.0 and newer versions"
 msgstr "Apre file salvati con Adobe Illustrator 9.0 o più recenti"
 
@@ -8469,48 +8456,48 @@
 msgid "Scalable Vector Graphics format compressed with GZip"
 msgstr "Formato Scalable Vector Graphics compresso con GZip"
 
-#: ../src/extension/internal/vsd-input.cpp:295
+#: ../src/extension/internal/vsd-input.cpp:274
 msgid "VSD Input"
 msgstr "Input VSD"
 
-#: ../src/extension/internal/vsd-input.cpp:300
+#: ../src/extension/internal/vsd-input.cpp:279
 msgid "Microsoft Visio Diagram (*.vsd)"
 msgstr "Microsoft Visio Diagram (*.vsd)"
 
-#: ../src/extension/internal/vsd-input.cpp:301
+#: ../src/extension/internal/vsd-input.cpp:280
 msgid "File format used by Microsoft Visio 6 and later"
 msgstr "Formato file usato da Microsoft Visio 6 e successivi"
 
-#: ../src/extension/internal/vsd-input.cpp:308
+#: ../src/extension/internal/vsd-input.cpp:287
 msgid "VDX Input"
 msgstr "Input VDX"
 
-#: ../src/extension/internal/vsd-input.cpp:313
+#: ../src/extension/internal/vsd-input.cpp:292
 msgid "Microsoft Visio XML Diagram (*.vdx)"
 msgstr "Microsoft Visio XML Diagram (*.vdx)"
 
-#: ../src/extension/internal/vsd-input.cpp:314
+#: ../src/extension/internal/vsd-input.cpp:293
 msgid "File format used by Microsoft Visio 2010 and later"
 msgstr "Formato file usato da Microsoft Visio 2010 e successivi"
 
-#: ../src/extension/internal/vsd-input.cpp:321
+#: ../src/extension/internal/vsd-input.cpp:300
 msgid "VSDM Input"
 msgstr "Input VSDM"
 
-#: ../src/extension/internal/vsd-input.cpp:326
+#: ../src/extension/internal/vsd-input.cpp:305
 msgid "Microsoft Visio 2013 drawing (*.vsdm)"
 msgstr "Disegno Microsoft Visio 2013 (*.vsdm)"
 
-#: ../src/extension/internal/vsd-input.cpp:327
-#: ../src/extension/internal/vsd-input.cpp:340
+#: ../src/extension/internal/vsd-input.cpp:306
+#: ../src/extension/internal/vsd-input.cpp:319
 msgid "File format used by Microsoft Visio 2013 and later"
 msgstr "Formato file usato da Microsoft Visio 2013 e successivi"
 
-#: ../src/extension/internal/vsd-input.cpp:334
+#: ../src/extension/internal/vsd-input.cpp:313
 msgid "VSDX Input"
 msgstr "Input VSDX"
 
-#: ../src/extension/internal/vsd-input.cpp:339
+#: ../src/extension/internal/vsd-input.cpp:318
 msgid "Microsoft Visio 2013 drawing (*.vsdx)"
 msgstr "Disegno Microsoft Visio 2013 (*.vsdx)"
 
@@ -8544,15 +8531,15 @@
 msgid "Windows Metafile"
 msgstr "Windows Metafile"
 
-#: ../src/extension/internal/wpg-input.cpp:144
+#: ../src/extension/internal/wpg-input.cpp:129
 msgid "WPG Input"
 msgstr "Input WPG"
 
-#: ../src/extension/internal/wpg-input.cpp:149
+#: ../src/extension/internal/wpg-input.cpp:134
 msgid "WordPerfect Graphics (*.wpg)"
 msgstr "WordPerfect Graphic (*.wpg)"
 
-#: ../src/extension/internal/wpg-input.cpp:150
+#: ../src/extension/internal/wpg-input.cpp:135
 msgid "Vector graphics format used by Corel WordPerfect"
 msgstr "Formato grafico vettoriale usato da Corel WordPerfect"
 
@@ -8769,8 +8756,9 @@
 msgstr "Barra colori"
 
 #: ../src/filter-enums.cpp:60
+#, fuzzy
 msgid "Hard Light"
-msgstr ""
+msgstr "Altezza barre:"
 
 #: ../src/filter-enums.cpp:61
 #, fuzzy
@@ -9393,7 +9381,7 @@
 
 #. Name
 #: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:191
-#: ../src/widgets/text-toolbar.cpp:1418
+#: ../src/widgets/text-toolbar.cpp:1416
 #: ../share/extensions/gcodetools_graffiti.inx.h:9
 #: ../share/extensions/gcodetools_orientation_points.inx.h:2
 msgid "Orientation"
@@ -9765,7 +9753,7 @@
 msgid "Dock #%d"
 msgstr "Pannello #%d"
 
-#: ../src/libnrtype/FontFactory.cpp:617
+#: ../src/libnrtype/FontFactory.cpp:891
 msgid "Ignoring font without family that will crash Pango"
 msgstr "I font senza famiglia che fanno andare in crash Pango vengono ignorati"
 
@@ -11038,8 +11026,8 @@
 msgid "Change point parameter"
 msgstr "Modifica parametri del punto"
 
-#: ../src/live_effects/parameter/powerstrokepointarray.cpp:243
-#: ../src/live_effects/parameter/powerstrokepointarray.cpp:255
+#: ../src/live_effects/parameter/powerstrokepointarray.cpp:229
+#: ../src/live_effects/parameter/powerstrokepointarray.cpp:241
 msgid ""
 "<b>Stroke width control point</b>: drag to alter the stroke width. <b>Ctrl"
 "+click</b> adds a control point, <b>Ctrl+Alt+click</b> deletes it."
@@ -11617,59 +11605,59 @@
 msgid "Combining paths..."
 msgstr "Combinazione tracciati..."
 
-#: ../src/path-chemistry.cpp:171
+#: ../src/path-chemistry.cpp:170
 msgid "Combine"
 msgstr "Combina"
 
-#: ../src/path-chemistry.cpp:178
+#: ../src/path-chemistry.cpp:177
 msgid "<b>No path(s)</b> to combine in the selection."
 msgstr "<b>Nessun tracciato</b> da combinare nella selezione."
 
-#: ../src/path-chemistry.cpp:190
+#: ../src/path-chemistry.cpp:189
 msgid "Select <b>path(s)</b> to break apart."
 msgstr "Seleziona il <b>tracciato</b> da separare."
 
-#: ../src/path-chemistry.cpp:194
+#: ../src/path-chemistry.cpp:193
 msgid "Breaking apart paths..."
 msgstr "Separazione tracciati..."
 
-#: ../src/path-chemistry.cpp:285
+#: ../src/path-chemistry.cpp:284
 msgid "Break apart"
 msgstr "Separa"
 
-#: ../src/path-chemistry.cpp:287
+#: ../src/path-chemistry.cpp:286
 msgid "<b>No path(s)</b> to break apart in the selection."
 msgstr "<b>Nessun tracciato</b> da separare nella selezione."
 
-#: ../src/path-chemistry.cpp:297
+#: ../src/path-chemistry.cpp:296
 msgid "Select <b>object(s)</b> to convert to path."
 msgstr "Seleziona l'<b>oggetto</b> da convertire in tracciato."
 
-#: ../src/path-chemistry.cpp:303
+#: ../src/path-chemistry.cpp:302
 msgid "Converting objects to paths..."
 msgstr "Conversione oggetti in tracciati..."
 
-#: ../src/path-chemistry.cpp:325
+#: ../src/path-chemistry.cpp:324
 msgid "Object to path"
 msgstr "Da oggetto a tracciato"
 
-#: ../src/path-chemistry.cpp:327
+#: ../src/path-chemistry.cpp:326
 msgid "<b>No objects</b> to convert to path in the selection."
 msgstr "<b>Nessun oggetto</b> nella selezione da convertire in tracciato."
 
-#: ../src/path-chemistry.cpp:604
+#: ../src/path-chemistry.cpp:603
 msgid "Select <b>path(s)</b> to reverse."
 msgstr "Seleziona il <b>tracciato</b> da invertire."
 
-#: ../src/path-chemistry.cpp:613
+#: ../src/path-chemistry.cpp:612
 msgid "Reversing paths..."
 msgstr "Inversione tracciati..."
 
-#: ../src/path-chemistry.cpp:648
+#: ../src/path-chemistry.cpp:647
 msgid "Reverse path"
 msgstr "Inverti tracciato"
 
-#: ../src/path-chemistry.cpp:650
+#: ../src/path-chemistry.cpp:649
 msgid "<b>No paths</b> to reverse in the selection."
 msgstr "<b>Nessun tracciato</b> nella selezione da invertire."
 
@@ -12617,7 +12605,7 @@
 msgid "Linked Flowed Text"
 msgstr "Testo dinamico collegato"
 
-#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:341
+#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:352
 #: ../src/ui/tools/text-tool.cpp:1566
 msgid " [truncated]"
 msgstr " [troncato]"
@@ -12693,26 +12681,26 @@
 msgid "of <b>%d</b> objects"
 msgstr "di <b>%d</b> oggetti"
 
-#: ../src/sp-item.cpp:1035 ../src/verbs.cpp:213
+#: ../src/sp-item.cpp:970 ../src/verbs.cpp:213
 msgid "Object"
 msgstr "Oggetto"
 
-#: ../src/sp-item.cpp:1052
+#: ../src/sp-item.cpp:987
 #, c-format
 msgid "%s; <i>clipped</i>"
 msgstr "%s; <i>con fissaggio</i>"
 
-#: ../src/sp-item.cpp:1058
+#: ../src/sp-item.cpp:993
 #, c-format
 msgid "%s; <i>masked</i>"
 msgstr "%s; <i>con maschera</i>"
 
-#: ../src/sp-item.cpp:1068
+#: ../src/sp-item.cpp:1003
 #, c-format
 msgid "%s; <i>filtered (%s)</i>"
 msgstr "%s; <i>con filtro (%s)</i>"
 
-#: ../src/sp-item.cpp:1070
+#: ../src/sp-item.cpp:1005
 #, c-format
 msgid "%s; <i>filtered</i>"
 msgstr "%s; <i>con filtro</i>"
@@ -12835,19 +12823,25 @@
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/sp-text.cpp:345
+#. TRANSLATORS: For description of font with no name.
+#: ../src/sp-text.cpp:342
+msgid "&lt;no name found&gt;"
+msgstr "&lt;nessun nome trovato&gt;"
+
+#: ../src/sp-text.cpp:356
 #, c-format
 msgid "on path%s (%s, %s)"
 msgstr "su tracciato%s (%s, %s)"
 
-#: ../src/sp-text.cpp:346
+#: ../src/sp-text.cpp:357
 #, c-format
 msgid "%s (%s, %s)"
 msgstr "%s (%s, %s)"
 
 #: ../src/sp-tref.cpp:230
+#, fuzzy
 msgid "Cloned Character Data"
-msgstr ""
+msgstr "<b>Carattere clonato</b> %s%s"
 
 #: ../src/sp-tref.cpp:246
 msgid " from "
@@ -14385,19 +14379,19 @@
 msgid "<small>Creating tiled clones...</small>"
 msgstr "<small>Creazione cloni in serie...</small>"
 
-#: ../src/ui/dialog/clonetiler.cpp:2645
+#: ../src/ui/dialog/clonetiler.cpp:2640
 msgid "Create tiled clones"
 msgstr "Crea cloni in serie"
 
-#: ../src/ui/dialog/clonetiler.cpp:2878
+#: ../src/ui/dialog/clonetiler.cpp:2873
 msgid "<small>Per row:</small>"
 msgstr "<small>Per riga:</small>"
 
-#: ../src/ui/dialog/clonetiler.cpp:2896
+#: ../src/ui/dialog/clonetiler.cpp:2891
 msgid "<small>Per column:</small>"
 msgstr "<small>Per colonna:</small>"
 
-#: ../src/ui/dialog/clonetiler.cpp:2904
+#: ../src/ui/dialog/clonetiler.cpp:2899
 msgid "<small>Randomize:</small>"
 msgstr "<small>Casualità:</small>"
 
@@ -21170,68 +21164,68 @@
 msgstr "La cartella delle palette (%s) non è disponibile."
 
 #. ******************* Symbol Sets ************************
-#: ../src/ui/dialog/symbols.cpp:139
+#: ../src/ui/dialog/symbols.cpp:127
 msgid "Symbol set: "
 msgstr "Set simboli: "
 
 #. Fill in later
-#: ../src/ui/dialog/symbols.cpp:148 ../src/ui/dialog/symbols.cpp:149
+#: ../src/ui/dialog/symbols.cpp:136 ../src/ui/dialog/symbols.cpp:137
 msgid "Current Document"
 msgstr "Documento attuale"
 
-#: ../src/ui/dialog/symbols.cpp:216
+#: ../src/ui/dialog/symbols.cpp:204
 msgid "Add Symbol from the current document."
 msgstr "Aggiunge simbolo dal documento attuale."
 
-#: ../src/ui/dialog/symbols.cpp:225
+#: ../src/ui/dialog/symbols.cpp:213
 msgid "Remove Symbol from the current document."
 msgstr "Rimuove simbolo dal documento attuale."
 
-#: ../src/ui/dialog/symbols.cpp:239
+#: ../src/ui/dialog/symbols.cpp:227
 msgid "Display more icons in row."
 msgstr "Visualizza più icone per riga."
 
-#: ../src/ui/dialog/symbols.cpp:248
+#: ../src/ui/dialog/symbols.cpp:236
 msgid "Display fewer icons in row."
 msgstr "Visualizza meno icone per riga."
 
-#: ../src/ui/dialog/symbols.cpp:258
+#: ../src/ui/dialog/symbols.cpp:246
 msgid "Toggle 'fit' symbols in icon space."
 msgstr "Imposta adattamento simboli in spazio icona."
 
-#: ../src/ui/dialog/symbols.cpp:270
+#: ../src/ui/dialog/symbols.cpp:258
 msgid "Make symbols smaller by zooming out."
 msgstr "Rende i simboli più piccoli riducendo l'ingrandimento."
 
-#: ../src/ui/dialog/symbols.cpp:280
+#: ../src/ui/dialog/symbols.cpp:268
 msgid "Make symbols bigger by zooming in."
 msgstr "Rende i simboli più grandi aumentando l'ingrandimento."
 
-#: ../src/ui/dialog/symbols.cpp:640
+#: ../src/ui/dialog/symbols.cpp:622
 msgid "Unnamed Symbols"
 msgstr "Simboli senza nome"
 
-#: ../src/ui/dialog/template-widget.cpp:37
+#: ../src/ui/dialog/template-widget.cpp:36
 msgid "More info"
 msgstr "Più informazioni"
 
-#: ../src/ui/dialog/template-widget.cpp:39
+#: ../src/ui/dialog/template-widget.cpp:38
 msgid "no template selected"
 msgstr "nessun modello selezionato"
 
-#: ../src/ui/dialog/template-widget.cpp:123
+#: ../src/ui/dialog/template-widget.cpp:119
 msgid "Path: "
 msgstr "Percorso: "
 
-#: ../src/ui/dialog/template-widget.cpp:126
+#: ../src/ui/dialog/template-widget.cpp:122
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: ../src/ui/dialog/template-widget.cpp:128
+#: ../src/ui/dialog/template-widget.cpp:124
 msgid "Keywords: "
 msgstr "Parole chiave: "
 
-#: ../src/ui/dialog/template-widget.cpp:135
+#: ../src/ui/dialog/template-widget.cpp:131
 msgid "By: "
 msgstr "By: "
 
@@ -21244,31 +21238,31 @@
 msgstr "AaBbCcIiPpQq12369$€¢?.;/()"
 
 #. Align buttons
-#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1346
-#: ../src/widgets/text-toolbar.cpp:1347
+#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1344
+#: ../src/widgets/text-toolbar.cpp:1345
 msgid "Align left"
 msgstr "Allinea a sinistra"
 
-#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1354
-#: ../src/widgets/text-toolbar.cpp:1355
+#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1352
+#: ../src/widgets/text-toolbar.cpp:1353
 msgid "Align center"
 msgstr "Allinea al centro"
 
-#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1362
-#: ../src/widgets/text-toolbar.cpp:1363
+#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1360
+#: ../src/widgets/text-toolbar.cpp:1361
 msgid "Align right"
 msgstr "Allinea a destra"
 
-#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1371
+#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1369
 msgid "Justify (only flowed text)"
 msgstr "Giustificato (solo testo dinamico)"
 
 #. Direction buttons
-#: ../src/ui/dialog/text-edit.cpp:108 ../src/widgets/text-toolbar.cpp:1406
+#: ../src/ui/dialog/text-edit.cpp:108 ../src/widgets/text-toolbar.cpp:1404
 msgid "Horizontal text"
 msgstr "Testo orizzontale"
 
-#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1413
+#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1411
 msgid "Vertical text"
 msgstr "Testo verticale"
 
@@ -23212,7 +23206,7 @@
 msgid "Type text"
 msgstr "Inserimento testo"
 
-#: ../src/ui/tools/tool-base.cpp:704
+#: ../src/ui/tools/tool-base.cpp:703
 msgid "<b>Space+mouse move</b> to pan canvas"
 msgstr "<b>Spazio+spostamento puntatore</b> per muovere la tela"
 
@@ -23393,7 +23387,7 @@
 
 #: ../src/ui/widget/object-composite-settings.cpp:220
 #: ../src/ui/widget/selected-style.cpp:931
-#: ../src/ui/widget/selected-style.cpp:1227
+#: ../src/ui/widget/selected-style.cpp:1225
 msgid "Change opacity"
 msgstr "Modifica opacità"
 
@@ -23897,11 +23891,11 @@
 msgid "100% (opaque)"
 msgstr "100% (opaco)"
 
-#: ../src/ui/widget/selected-style.cpp:1368
+#: ../src/ui/widget/selected-style.cpp:1366
 msgid "Adjust alpha"
 msgstr "Modifica alpha"
 
-#: ../src/ui/widget/selected-style.cpp:1370
+#: ../src/ui/widget/selected-style.cpp:1368
 #, fuzzy, c-format
 msgid ""
 "Adjusting <b>alpha</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Ctrl</"
@@ -23911,11 +23905,11 @@
 "Modifica <b>luminosità</b>: prima era %.3g, ora <b>%.3g</b> (diff %.3g); con "
 "<b>Maiusc</b> per modificare la saturazione, con <b>Ctrl</b> per il colore"
 
-#: ../src/ui/widget/selected-style.cpp:1374
+#: ../src/ui/widget/selected-style.cpp:1372
 msgid "Adjust saturation"
 msgstr "Modifica saturazione"
 
-#: ../src/ui/widget/selected-style.cpp:1376
+#: ../src/ui/widget/selected-style.cpp:1374
 #, fuzzy, c-format
 msgid ""
 "Adjusting <b>saturation</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with "
@@ -23926,11 +23920,11 @@
 "con <b>Ctrl</b> per modificare la luminosità, senza modificatori per il "
 "colore"
 
-#: ../src/ui/widget/selected-style.cpp:1380
+#: ../src/ui/widget/selected-style.cpp:1378
 msgid "Adjust lightness"
 msgstr "Modifica luminosità"
 
-#: ../src/ui/widget/selected-style.cpp:1382
+#: ../src/ui/widget/selected-style.cpp:1380
 #, fuzzy, c-format
 msgid ""
 "Adjusting <b>lightness</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with "
@@ -23940,11 +23934,11 @@
 "Modifica <b>luminosità</b>: prima era %.3g, ora <b>%.3g</b> (diff %.3g); con "
 "<b>Maiusc</b> per modificare la saturazione, con <b>Ctrl</b> per il colore"
 
-#: ../src/ui/widget/selected-style.cpp:1386
+#: ../src/ui/widget/selected-style.cpp:1384
 msgid "Adjust hue"
 msgstr "Modifica colore"
 
-#: ../src/ui/widget/selected-style.cpp:1388
+#: ../src/ui/widget/selected-style.cpp:1386
 #, fuzzy, c-format
 msgid ""
 "Adjusting <b>hue</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Shift</"
@@ -23955,12 +23949,12 @@
 "<b>Maiusc</b> per modificare la saturazione, con <b>Ctrl</b> per la "
 "luminosità"
 
-#: ../src/ui/widget/selected-style.cpp:1506
-#: ../src/ui/widget/selected-style.cpp:1520
+#: ../src/ui/widget/selected-style.cpp:1504
+#: ../src/ui/widget/selected-style.cpp:1518
 msgid "Adjust stroke width"
 msgstr "Modifica larghezza contorno"
 
-#: ../src/ui/widget/selected-style.cpp:1507
+#: ../src/ui/widget/selected-style.cpp:1505
 #, c-format
 msgid "Adjusting <b>stroke width</b>: was %.3g, now <b>%.3g</b> (diff %.3g)"
 msgstr ""
@@ -27131,8 +27125,8 @@
 msgid "Set pattern on stroke"
 msgstr "Imposta motivo per il contorno"
 
-#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:958
-#: ../src/widgets/text-toolbar.cpp:1272
+#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:956
+#: ../src/widgets/text-toolbar.cpp:1270
 msgid "Font size"
 msgstr "Dimensione carattere"
 
@@ -27462,7 +27456,7 @@
 msgid "Open LPE dialog (to adapt parameters numerically)"
 msgstr "Apri finestra LPE (per la modifica dei parametri numerici)"
 
-#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1275
+#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1273
 msgid "Font Size"
 msgstr "Dimensione carattere"
 
@@ -28867,11 +28861,11 @@
 msgid "Set markers"
 msgstr "Imposta delimitatori"
 
-#: ../src/widgets/stroke-style.cpp:1030 ../src/widgets/stroke-style.cpp:1115
+#: ../src/widgets/stroke-style.cpp:1024 ../src/widgets/stroke-style.cpp:1109
 msgid "Set stroke style"
 msgstr "Imposta stile contorno"
 
-#: ../src/widgets/stroke-style.cpp:1203
+#: ../src/widgets/stroke-style.cpp:1197
 msgid "Set marker color"
 msgstr "Imposta colore delimitatore"
 
@@ -28929,196 +28923,196 @@
 msgid "Text: Change orientation"
 msgstr "Testo: Cambia orientamento"
 
-#: ../src/widgets/text-toolbar.cpp:1223
+#: ../src/widgets/text-toolbar.cpp:1221
 msgid "Font Family"
 msgstr "Carattere"
 
-#: ../src/widgets/text-toolbar.cpp:1224
+#: ../src/widgets/text-toolbar.cpp:1222
 msgid "Select Font Family (Alt-X to access)"
 msgstr "Seleziona famiglia carattere (Alt+X per accedervi)"
 
 #. Focus widget
 #. Enable entry completion
-#: ../src/widgets/text-toolbar.cpp:1234
+#: ../src/widgets/text-toolbar.cpp:1232
 msgid "Select all text with this font-family"
 msgstr "Seleziona tutti i testi con questa famiglia carattere"
 
-#: ../src/widgets/text-toolbar.cpp:1238
+#: ../src/widgets/text-toolbar.cpp:1236
 msgid "Font not found on system"
 msgstr "Carattere non trovato nel sistema"
 
-#: ../src/widgets/text-toolbar.cpp:1297
+#: ../src/widgets/text-toolbar.cpp:1295
 msgid "Font Style"
 msgstr "Stile carattere"
 
-#: ../src/widgets/text-toolbar.cpp:1298
+#: ../src/widgets/text-toolbar.cpp:1296
 msgid "Font style"
 msgstr "Stile carattere"
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1315
+#: ../src/widgets/text-toolbar.cpp:1313
 msgid "Toggle Superscript"
 msgstr "Abilita apice"
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1316
+#: ../src/widgets/text-toolbar.cpp:1314
 msgid "Toggle superscript"
 msgstr "Abilita apice"
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1328
+#: ../src/widgets/text-toolbar.cpp:1326
 msgid "Toggle Subscript"
 msgstr "Abilita pedice"
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1329
+#: ../src/widgets/text-toolbar.cpp:1327
 msgid "Toggle subscript"
 msgstr "Abilita pedice"
 
-#: ../src/widgets/text-toolbar.cpp:1370
+#: ../src/widgets/text-toolbar.cpp:1368
 msgid "Justify"
 msgstr "Giustifica"
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1377
+#: ../src/widgets/text-toolbar.cpp:1375
 msgid "Alignment"
 msgstr "Allineamento"
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1378
+#: ../src/widgets/text-toolbar.cpp:1376
 msgid "Text alignment"
 msgstr "Allineamento testo"
 
-#: ../src/widgets/text-toolbar.cpp:1405
+#: ../src/widgets/text-toolbar.cpp:1403
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: ../src/widgets/text-toolbar.cpp:1412
+#: ../src/widgets/text-toolbar.cpp:1410
 msgid "Vertical"
 msgstr "Verticale"
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1419
+#: ../src/widgets/text-toolbar.cpp:1417
 msgid "Text orientation"
 msgstr "Orientamento testo"
 
 #. Drop down menu
-#: ../src/widgets/text-toolbar.cpp:1442
+#: ../src/widgets/text-toolbar.cpp:1440
 msgid "Smaller spacing"
 msgstr "Spaziatura minore"
 
-#: ../src/widgets/text-toolbar.cpp:1442 ../src/widgets/text-toolbar.cpp:1473
-#: ../src/widgets/text-toolbar.cpp:1504
+#: ../src/widgets/text-toolbar.cpp:1440 ../src/widgets/text-toolbar.cpp:1471
+#: ../src/widgets/text-toolbar.cpp:1502
 msgctxt "Text tool"
 msgid "Normal"
 msgstr "Normale"
 
-#: ../src/widgets/text-toolbar.cpp:1442
+#: ../src/widgets/text-toolbar.cpp:1440
 msgid "Larger spacing"
 msgstr "Spaziatura maggiore"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1447
+#: ../src/widgets/text-toolbar.cpp:1445
 msgid "Line Height"
 msgstr "Spaziatura linee"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1448
+#: ../src/widgets/text-toolbar.cpp:1446
 #, fuzzy
 msgid "Line:"
 msgstr "Linea:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1449
+#: ../src/widgets/text-toolbar.cpp:1447
 msgid "Spacing between lines (times font size)"
 msgstr "Spaziatura tra le linee (volte dimensione carattere)"
 
 #. Drop down menu
-#: ../src/widgets/text-toolbar.cpp:1473 ../src/widgets/text-toolbar.cpp:1504
+#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502
 msgid "Negative spacing"
 msgstr "Spaziatura negativa"
 
-#: ../src/widgets/text-toolbar.cpp:1473 ../src/widgets/text-toolbar.cpp:1504
+#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502
 msgid "Positive spacing"
 msgstr "Spaziatura positiva"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1478
+#: ../src/widgets/text-toolbar.cpp:1476
 msgid "Word spacing"
 msgstr "Spaziatura parole"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1479
+#: ../src/widgets/text-toolbar.cpp:1477
 #, fuzzy
 msgid "Word:"
 msgstr "Parola:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1480
+#: ../src/widgets/text-toolbar.cpp:1478
 msgid "Spacing between words (px)"
 msgstr "Spaziatura tra le parole (px)"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1509
+#: ../src/widgets/text-toolbar.cpp:1507
 msgid "Letter spacing"
 msgstr "Spaziatura lettere"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1510
+#: ../src/widgets/text-toolbar.cpp:1508
 #, fuzzy
 msgid "Letter:"
 msgstr "Sinistra:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1511
+#: ../src/widgets/text-toolbar.cpp:1509
 msgid "Spacing between letters (px)"
 msgstr "Spaziatura tra le lettere (px)"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1540
+#: ../src/widgets/text-toolbar.cpp:1538
 msgid "Kerning"
 msgstr "Crenatura"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1541
+#: ../src/widgets/text-toolbar.cpp:1539
 #, fuzzy
 msgid "Kern:"
 msgstr "Nucleo:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1542
+#: ../src/widgets/text-toolbar.cpp:1540
 msgid "Horizontal kerning (px)"
 msgstr "Crenatura orizzontale (px)"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1571
+#: ../src/widgets/text-toolbar.cpp:1569
 msgid "Vertical Shift"
 msgstr "Spostamento verticale"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1572
+#: ../src/widgets/text-toolbar.cpp:1570
 #, fuzzy
 msgid "Vert:"
 msgstr "Inverti:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1573
+#: ../src/widgets/text-toolbar.cpp:1571
 msgid "Vertical shift (px)"
 msgstr "Spostamento verticale (px)"
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1602
+#: ../src/widgets/text-toolbar.cpp:1600
 msgid "Letter rotation"
 msgstr "Rotazione lettere"
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1603
+#: ../src/widgets/text-toolbar.cpp:1601
 #, fuzzy
 msgid "Rot:"
 msgstr "Ruolo:"
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1604
+#: ../src/widgets/text-toolbar.cpp:1602
 msgid "Character rotation (degrees)"
 msgstr "Rotazione carattere (gradi)"
 
@@ -29644,8 +29638,8 @@
 msgstr ""
 
 #: ../share/extensions/gcodetools.py:3324
-msgid "Nothing is selected. Please select something."
-msgstr "Nessun oggetto selezionato. Seleziona un oggetto"
+msgid "Noting is selected. Please select something."
+msgstr ""
 
 #: ../share/extensions/gcodetools.py:3864
 #, fuzzy
@@ -29752,7 +29746,7 @@
 
 #: ../share/extensions/gcodetools.py:4667
 msgid ""
-"Nothing is selected. Please select something to convert to drill point "
+"Noting is selected. Please select something to convert to drill point "
 "(dxfpoint) or clear point sign."
 msgstr ""
 
@@ -29968,7 +29962,6 @@
 "\n"
 
 #: ../share/extensions/jessyInk_autoTexts.py:54
-#, python-brace-format
 msgid ""
 "Node with id '{0}' is not a suitable text node and was therefore ignored.\n"
 "\n"
@@ -29997,7 +29990,6 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:69
-#, python-brace-format
 msgid "JessyInk script version {0} installed."
 msgstr ""
 
@@ -30019,7 +30011,6 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:94
-#, python-brace-format
 msgid "{0}Layer name: {1}"
 msgstr "{0}Nome del livello: {1}"
 
@@ -30028,7 +30019,7 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:104
-#, fuzzy, python-brace-format
+#, fuzzy
 msgid "{0}Transition in: {1}"
 msgstr "Trasformazione"
 
@@ -30037,24 +30028,21 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:113
-#, fuzzy, python-brace-format
+#, fuzzy
 msgid "{0}Transition out: {1}"
 msgstr "Incolla effetto su tracciato"
 
 #: ../share/extensions/jessyInk_summary.py:120
-#, python-brace-format
 msgid ""
 "\n"
 "{0}Auto-texts:"
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:123
-#, python-brace-format
 msgid "{0}\t\"{1}\" (object id \"{2}\") will be replaced by \"{3}\"."
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:168
-#, python-brace-format
 msgid ""
 "\n"
 "{0}Initial effect (order number {1}):"
@@ -30067,12 +30055,10 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:174
-#, python-brace-format
 msgid "{0}\tView will be set according to object \"{1}\""
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:176
-#, python-brace-format
 msgid "{0}\tObject \"{1}\""
 msgstr ""
 
@@ -30086,7 +30072,6 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:184
-#, python-brace-format
 msgid " using effect \"{0}\""
 msgstr ""
 
@@ -30240,14 +30225,7 @@
 msgstr ""
 
 #: ../share/extensions/plotter.py:143
-msgid ""
-"pySerial is not installed.\n"
-"\n"
-"1. Download pySerial here (not the \".exe\"!): http://pypi.python.org/pypi/"
-"pyserial\n"
-"2. Extract the \"serial\" subfolder from the zip to the following folder: C:"
-"\\[Program files]\\inkscape\\python\\Lib\\\n"
-"3. Restart Inkscape."
+msgid "pySerial is not installed."
 msgstr ""
 
 #: ../share/extensions/plotter.py:163
@@ -30389,13 +30367,8 @@
 
 #: ../share/extensions/uniconv-ext.py:56
 #: ../share/extensions/uniconv_output.py:122
-msgid ""
-"You need to install the UniConvertor software.\n"
-"For GNU/Linux: install the package python-uniconvertor.\n"
-"For Windows: download it from\n"
-"http://sk1project.org/modules.php?name=Products&product=uniconvertor\n"
-"and install into your Inkscape's Python location\n"
-msgstr ""
+msgid "You need to install the UniConvertor software.\n"
+msgstr "È necessario installare il programma UniConvertor.\n"
 
 #: ../share/extensions/voronoi2svg.py:215
 #, fuzzy
@@ -36296,6 +36269,13 @@
 msgstr "Input XAML"
 
 #~ msgctxt "Symbol"
+#~ msgid "Four Wheel Drive Road"
+#~ msgstr "Strada per veicoli a quattro ruote motrici"
+
+#~ msgid "Nothing is selected. Please select something."
+#~ msgstr "Nessun oggetto selezionato. Seleziona un oggetto"
+
+#~ msgctxt "Symbol"
 #~ msgid "Map Symbols"
 #~ msgstr "Simboli mappa"
 
@@ -36763,16 +36743,10 @@
 #~ msgid "Bike Parking"
 #~ msgstr "Parcheggio biciclette"
 
-#~ msgid "&lt;no name found&gt;"
-#~ msgstr "&lt;nessun nome trovato&gt;"
-
 #, fuzzy
 #~ msgid "Extrapolated"
 #~ msgstr "Interpola"
 
-#~ msgid "You need to install the UniConvertor software.\n"
-#~ msgstr "È necessario installare il programma UniConvertor.\n"
-
 #, fuzzy
 #~ msgid "Set Resolution"
 #~ msgstr "Relazione:"

=== modified file 'share/extensions/empty_business_card.inx'
--- share/extensions/empty_business_card.inx	2014-10-10 18:56:07 +0000
+++ share/extensions/empty_business_card.inx	2014-10-31 00:22:45 +0000
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
     <_name>Business Card</_name>
     <id>org.inkscape.render.empty_business_card</id>
-    <dependency type="executable" location="extensions">business_card.py</dependency>
+    <dependency type="executable" location="extensions">empty_business_card.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     
     <param name="size" _gui-text="Business card size:" type="enum">
@@ -27,6 +27,6 @@
       <inkscape:_keywords>business card</inkscape:_keywords>
     </inkscape:_templateinfo>
     <script>
-        <command reldir="extensions" interpreter="python">business_card.py</command>
+        <command reldir="extensions" interpreter="python">empty_business_card.py</command>
     </script>
 </inkscape-extension>

=== modified file 'share/ui/units.xml'
--- share/ui/units.xml	2014-10-25 18:36:10 +0000
+++ share/ui/units.xml	2014-10-31 00:22:45 +0000
@@ -77,6 +77,20 @@
     <factor>57.296</factor>
     <description>Radians (57.296 deg/rad)</description>
 </unit>
+<unit type="RADIAL" pri="n">
+    <name>gradian</name>
+    <plural>gradians</plural>
+    <abbr>grad</abbr>
+    <factor>1.111</factor>
+    <description>Gradians (1.111 deg/grad)</description>
+</unit>
+<unit type="RADIAL" pri="n">
+    <name>turn</name>
+    <plural>turns</plural>
+    <abbr>turn</abbr>
+    <factor>360</factor>
+    <description>Turns (360 deg/turn)</description>
+</unit>
 <unit type="FONT_HEIGHT" pri="y">
     <name>font-height</name>
     <plural>font-heights</plural>

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-17 20:03:14 +0000
+++ src/CMakeLists.txt	2014-10-31 00:22:45 +0000
@@ -336,7 +336,6 @@
 	icon-size.h
 	id-clash.h
 	# ige-mac-menu.h
-	inkscape-private.h
 	inkscape-version.h
 	inkscape.h
 	interface.h

=== modified file 'src/Makefile_insert'
--- src/Makefile_insert	2014-10-17 20:03:14 +0000
+++ src/Makefile_insert	2014-10-31 00:22:45 +0000
@@ -63,7 +63,7 @@
 	helper/pixbuf-ops.h						\
 	icon-size.h							\
 	id-clash.cpp id-clash.h						\
-	inkscape.cpp inkscape.h inkscape-private.h			\
+	inkscape.cpp inkscape.h						\
 	isinf.h								\
 	knot.cpp knot.h							\
 	knot-enums.h							\

=== modified file 'src/box3d.cpp'
--- src/box3d.cpp	2014-10-24 02:33:47 +0000
+++ src/box3d.cpp	2014-10-31 00:22:45 +0000
@@ -401,7 +401,7 @@
         snap_pts[3] = diag2.closest_to (pt);
     }
 
-    gdouble const zoom = inkscape_active_desktop()->current_zoom();
+    gdouble const zoom = INKSCAPE.active_desktop()->current_zoom();
 
     // determine the distances to all potential snapping points
     double snap_dists[MAX_POINT_COUNT];

=== modified file 'src/conn-avoid-ref.cpp'
--- src/conn-avoid-ref.cpp	2014-03-27 01:33:44 +0000
+++ src/conn-avoid-ref.cpp	2014-10-31 00:22:45 +0000
@@ -87,7 +87,7 @@
 
 void SPAvoidRef::handleSettingChange(void)
 {
-    SPDesktop *desktop = inkscape_active_desktop();
+    SPDesktop *desktop = INKSCAPE.active_desktop();
     if (desktop == NULL) {
         return;
     }
@@ -277,7 +277,7 @@
 }
 static Avoid::Polygon avoid_item_poly(SPItem const *item)
 {
-    SPDesktop *desktop = inkscape_active_desktop();
+    SPDesktop *desktop = INKSCAPE.active_desktop();
     g_assert(desktop != NULL);
     double spacing = desktop->namedview->connector_spacing;
 

=== modified file 'src/desktop.cpp'
--- src/desktop.cpp	2014-10-05 23:24:27 +0000
+++ src/desktop.cpp	2014-10-31 00:22:45 +0000
@@ -56,7 +56,6 @@
 #include "event-log.h"
 #include "helper/action-context.h"
 #include "ui/interface.h"
-#include "inkscape-private.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
 #include "layer-model.h"
@@ -94,28 +93,28 @@
 static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop);
 
 SPDesktop::SPDesktop() :
-    _dlg_mgr( 0 ),
-    namedview( 0 ),
-    canvas( 0 ),
-    layers( 0 ),
-    selection( 0 ),
-    event_context( 0 ),
-    layer_manager( 0 ),
-    event_log( 0 ),
-    temporary_item_list( 0 ),
-    snapindicator( 0 ),
-    acetate( 0 ),
-    main( 0 ),
-    gridgroup( 0 ),
-    guides( 0 ),
-    drawing( 0 ),
-    sketch( 0 ),
-    controls( 0 ),
-    tempgroup ( 0 ),
-    table( 0 ),
-    page( 0 ),
-    page_border( 0 ),
-    current( 0 ),
+    _dlg_mgr( NULL ),
+    namedview( NULL ),
+    canvas( NULL ),
+    layers( NULL ),
+    selection( NULL ),
+    event_context( NULL ),
+    layer_manager( NULL ),
+    event_log( NULL ),
+    temporary_item_list( NULL ),
+    snapindicator( NULL ),
+    acetate( NULL ),
+    main( NULL ),
+    gridgroup( NULL ),
+    guides( NULL ),
+    drawing( NULL ),
+    sketch( NULL ),
+    controls( NULL ),
+    tempgroup ( NULL ),
+    table( NULL ),
+    page( NULL ),
+    page_border( NULL ),
+    current( NULL ),
     _focusMode(false),
     dkey( 0 ),
     number( 0 ),
@@ -124,16 +123,15 @@
     waiting_cursor( false ),
     showing_dialogs ( false ),
     guides_active( false ),
-    gr_item( 0 ),
+    gr_item( NULL ),
     gr_point_type( POINT_LG_BEGIN ),
     gr_point_i( 0 ),
     gr_fill_or_stroke( Inkscape::FOR_FILL ),
     _reconstruction_old_layer_id(), // an id attribute is not allowed to be the empty string
     _display_mode(Inkscape::RENDERMODE_NORMAL),
     _display_color_mode(Inkscape::COLORMODE_NORMAL),
-    _widget( 0 ),
-    _inkscape( 0 ),
-    _guides_message_context( 0 ),
+    _widget( NULL ),
+    _guides_message_context( NULL ),
     _active( false ),
     _w2d(),
     _d2w(),
@@ -299,7 +297,6 @@
 
     // ?
     // sp_active_desktop_set (desktop);
-    _inkscape = INKSCAPE;
 
     _activate_connection = _activate_signal.connect(
         sigc::bind(
@@ -385,10 +382,6 @@
         layer_manager = NULL;
     }
 
-    if (_inkscape) {
-        _inkscape = NULL;
-    }
-
     if (drawing) {
         doc()->getRoot()->invoke_hide(dkey);
         g_object_unref(drawing);
@@ -1431,7 +1424,7 @@
 SPDesktop::emitToolSubselectionChanged(gpointer data)
 {
     _tool_subselection_changed.emit(data);
-    inkscape_subselection_changed (this);
+    INKSCAPE.subselection_changed (this);
 }
 
 void SPDesktop::updateNow()

=== modified file 'src/desktop.h'
--- src/desktop.h	2014-08-26 10:55:28 +0000
+++ src/desktop.h	2014-10-31 00:22:45 +0000
@@ -424,7 +424,6 @@
 
 private:
     Inkscape::UI::View::EditWidgetInterface       *_widget;
-    InkscapeApplication     *_inkscape;
     Inkscape::MessageContext  *_guides_message_context;
     bool _active;
     Geom::Affine _w2d;

=== modified file 'src/display/drawing-item.cpp'
--- src/display/drawing-item.cpp	2014-10-17 20:03:14 +0000
+++ src/display/drawing-item.cpp	2014-10-31 00:22:45 +0000
@@ -870,10 +870,9 @@
 {
     // Sometimes there's no BBOX in state, reason unknown (bug 992817)
     // I made this not an assert to remove the warning
-    // This warning clutters the console output, so commented out
     if (!(_state & STATE_BBOX) || !(_state & STATE_PICK)) {
-        /*g_warning("Invalid state when picking: STATE_BBOX = %d, STATE_PICK = %d",
-                  _state & STATE_BBOX, _state & STATE_PICK);*/
+        g_warning("Invalid state when picking: STATE_BBOX = %d, STATE_PICK = %d",
+                  _state & STATE_BBOX, _state & STATE_PICK);
         return NULL;
     }
     // ignore invisible and insensitive items unless sticky

=== modified file 'src/document-private.h'
--- src/document-private.h	2014-08-31 18:17:26 +0000
+++ src/document-private.h	2014-10-31 00:22:45 +0000
@@ -75,6 +75,8 @@
 	Inkscape::ConsoleOutputUndoObserver console_output_undo_observer;
 
 	bool seeking;
+    sigc::connection selChangeConnection;
+    sigc::connection desktopActivatedConnection;
 };
 
 #endif // SEEN_SP_DOCUMENT_PRIVATE_H

=== modified file 'src/document-undo.cpp'
--- src/document-undo.cpp	2014-10-06 00:18:46 +0000
+++ src/document-undo.cpp	2014-10-31 00:22:45 +0000
@@ -99,9 +99,8 @@
     maybeDone(doc, NULL, event_type, event_description);
 }
 
-void Inkscape::DocumentUndo::resetKey( InkscapeApplication * /*inkscape*/, SPDesktop * /*desktop*/, GObject *base )
+void Inkscape::DocumentUndo::resetKey( SPDocument *doc )
 {
-    SPDocument *doc = reinterpret_cast<SPDocument *>(base);
     doc->actionkey.clear();
 }
 
@@ -259,7 +258,7 @@
         doc->priv->seeking = false;
 
 	if (ret)
-		inkscape_external_change();
+		INKSCAPE.external_change();
 
 	return ret;
 }
@@ -304,7 +303,7 @@
         doc->priv->seeking = false;
 
 	if (ret)
-		inkscape_external_change();
+		INKSCAPE.external_change();
 
 	return ret;
 }

=== modified file 'src/document-undo.h'
--- src/document-undo.h	2014-08-26 10:55:28 +0000
+++ src/document-undo.h	2014-10-31 00:22:45 +0000
@@ -41,7 +41,7 @@
 
     static void maybeDone(SPDocument *document, const gchar *keyconst, unsigned int event_type, Glib::ustring const &event_description);
 
-    static void resetKey(InkscapeApplication *inkscape, SPDesktop *desktop, GObject *base);
+    static void resetKey(SPDocument *doc);
 
     static void cancel(SPDocument *document);
 

=== modified file 'src/document.cpp'
--- src/document.cpp	2014-10-25 18:36:10 +0000
+++ src/document.cpp	2014-10-31 00:22:45 +0000
@@ -50,7 +50,7 @@
 #include "document-private.h"
 #include "document-undo.h"
 #include "id-clash.h"
-#include "inkscape-private.h"
+#include "inkscape.h"
 #include "inkscape-version.h"
 #include "libavoid/router.h"
 #include "persp3d.h"
@@ -154,6 +154,14 @@
         router = NULL;
     }
 
+    if (oldSignalsConnected) {
+        priv->selChangeConnection.disconnect();
+        priv->desktopActivatedConnection.disconnect();
+    } else {
+        _selection_changed_connection.disconnect();
+        _desktop_activated_connection.disconnect();
+    }
+
     if (priv) {
         if (priv->partial) {
             sp_repr_free_log(priv->partial);
@@ -208,17 +216,8 @@
         rerouting_handler_id = 0;
     }
 
-    if (oldSignalsConnected) {
-        g_signal_handlers_disconnect_by_func(G_OBJECT(INKSCAPE),
-                                             reinterpret_cast<gpointer>(DocumentUndo::resetKey),
-                                             static_cast<gpointer>(this));
-    } else {
-        _selection_changed_connection.disconnect();
-        _desktop_activated_connection.disconnect();
-    }
-
     if (keepalive) {
-        inkscape_unref();
+        inkscape_unref(INKSCAPE);
         keepalive = FALSE;
     }
 
@@ -447,7 +446,7 @@
     rdf_set_defaults( document );
 
     if (keepalive) {
-        inkscape_ref();
+        inkscape_ref(INKSCAPE);
     }
 
     // Check if the document already has a perspective (e.g., when opening an existing
@@ -462,10 +461,14 @@
     DocumentUndo::setUndoSensitive(document, true);
 
     // reset undo key when selection changes, so that same-key actions on different objects are not coalesced
-    g_signal_connect(G_OBJECT(INKSCAPE), "change_selection",
-                     G_CALLBACK(DocumentUndo::resetKey), document);
-    g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop",
-                     G_CALLBACK(DocumentUndo::resetKey), document);
+    document->priv->selChangeConnection = INKSCAPE.signal_selection_changed.connect(
+                sigc::hide(sigc::bind(
+                sigc::ptr_fun(&DocumentUndo::resetKey), document)
+    ));
+    document->priv->desktopActivatedConnection = INKSCAPE.signal_activate_desktop.connect(
+                sigc::hide(sigc::bind(
+                sigc::ptr_fun(&DocumentUndo::resetKey), document)
+    ));
     document->oldSignalsConnected = true;
 
     return document;

=== modified file 'src/document.h'
--- src/document.h	2014-08-31 18:17:26 +0000
+++ src/document.h	2014-10-31 00:22:45 +0000
@@ -38,7 +38,6 @@
 class SPRoot;
 
 namespace Inkscape {
-    struct Application;
     class Selection; 
     class UndoStackObserver;
     class EventLog;

=== modified file 'src/extension/dbus/application-interface.cpp'
--- src/extension/dbus/application-interface.cpp	2014-03-27 01:33:44 +0000
+++ src/extension/dbus/application-interface.cpp	2014-10-31 00:22:45 +0000
@@ -49,7 +49,7 @@
 static bool
 ensure_desktop_valid(GError **error)
 {
-    if (!inkscape_use_gui()) {
+    if (!INKSCAPE.use_gui()) {
         g_set_error(error, INKSCAPE_ERROR, INKSCAPE_ERROR_OTHER, "Application interface action requires a GUI");
         return false;
     }
@@ -59,7 +59,7 @@
 static bool
 ensure_desktop_not_present(GError **error)
 {
-    if (inkscape_use_gui()) {
+    if (INKSCAPE.use_gui()) {
         g_set_error(error, INKSCAPE_ERROR, INKSCAPE_ERROR_OTHER, "Application interface action requires non-GUI (command line) mode");
         return false;
     }

=== modified file 'src/extension/dbus/dbus-init.cpp'
--- src/extension/dbus/dbus-init.cpp	2014-03-27 01:33:44 +0000
+++ src/extension/dbus/dbus-init.cpp	2014-10-31 00:22:45 +0000
@@ -153,23 +153,23 @@
 init_document (void)
 {
     // This is for command-line use only
-    g_assert(!inkscape_use_gui());
+    g_assert(!INKSCAPE.use_gui());
 
     // Create a blank document and get its selection model etc in an ActionContext
     SPDocument *doc = SPDocument::createNewDoc(NULL, 1, TRUE);
-    inkscape_add_document(doc);
-    return dbus_register_document(inkscape_action_context_for_document(doc));
+    INKSCAPE.add_document(doc);
+    return dbus_register_document(INKSCAPE.action_context_for_document(doc));
 }
 
 gchar *
 init_active_document()
 {
-    SPDocument *doc = inkscape_active_document();
+    SPDocument *doc = INKSCAPE.active_document();
     if (!doc) {
         return NULL;
     }
     
-    return dbus_register_document(inkscape_active_action_context());
+    return dbus_register_document(INKSCAPE.active_action_context());
 }
 
 gchar *

=== modified file 'src/extension/dbus/document-interface.cpp'
--- src/extension/dbus/document-interface.cpp	2014-05-06 12:44:42 +0000
+++ src/extension/dbus/document-interface.cpp	2014-10-31 00:22:45 +0000
@@ -156,7 +156,7 @@
 void
 desktop_ensure_active (SPDesktop* desk) {
     if (desk != SP_ACTIVE_DESKTOP)
-        inkscape_activate_desktop (desk);
+        INKSCAPE.activate_desktop (desk);
     return;
 }
 

=== modified file 'src/extension/effect.cpp'
--- src/extension/effect.cpp	2014-03-27 01:33:44 +0000
+++ src/extension/effect.cpp	2014-10-31 00:22:45 +0000
@@ -9,7 +9,7 @@
  */
 
 #include "prefdialog.h"
-#include "inkscape-private.h"
+#include "inkscape.h"
 #include "helper/action.h"
 #include "ui/view/view.h"
 #include "desktop-handles.h"
@@ -89,11 +89,13 @@
         } // children of "inkscape-extension"
     } // if we have an XML file
 
-    if (INKSCAPE != NULL && inkscape_use_gui()) {
+    // \TODO this gets called from the Inkscape::Application constructor, where it initializes the menus.
+    // But in the constructor, our object isn't quite there yet!
+    if (Inkscape::Application::exists() && INKSCAPE.use_gui()) {
         if (_effects_list == NULL)
-            _effects_list = find_menu(inkscape_get_menus(INKSCAPE), EFFECTS_LIST);
+            _effects_list = find_menu(INKSCAPE.get_menus(), EFFECTS_LIST);
         if (_filters_list == NULL)
-            _filters_list = find_menu(inkscape_get_menus(INKSCAPE), FILTERS_LIST);
+            _filters_list = find_menu(INKSCAPE.get_menus(), FILTERS_LIST);
     }
 
     if ((_effects_list != NULL || _filters_list != NULL)) {

=== modified file 'src/extension/error-file.cpp'
--- src/extension/error-file.cpp	2014-03-27 01:33:44 +0000
+++ src/extension/error-file.cpp	2014-10-31 00:22:45 +0000
@@ -48,9 +48,10 @@
         )
 
 {
+    // \FIXME change this
     /* This is some filler text, needs to change before relase */
     Glib::ustring dialog_text(_("<span weight=\"bold\" size=\"larger\">One or more extensions failed to load</span>\n\nThe failed extensions have been skipped.  Inkscape will continue to run normally but those extensions will be unavailable.  For details to troubleshoot this problem, please refer to the error log located at: "));
-    gchar * ext_error_file = profile_path(EXTENSION_ERROR_LOG_FILENAME);
+    gchar * ext_error_file = Inkscape::Application::profile_path(EXTENSION_ERROR_LOG_FILENAME);
     dialog_text += ext_error_file;
     g_free(ext_error_file);
     set_message(dialog_text, true);

=== modified file 'src/extension/extension.cpp'
--- src/extension/extension.cpp	2014-09-23 06:43:33 +0000
+++ src/extension/extension.cpp	2014-10-31 00:22:45 +0000
@@ -667,7 +667,7 @@
 void
 Extension::error_file_open (void)
 {
-    gchar * ext_error_file = profile_path(EXTENSION_ERROR_LOG_FILENAME);
+    gchar * ext_error_file = Inkscape::Application::profile_path(EXTENSION_ERROR_LOG_FILENAME);
     gchar * filename = g_filename_from_utf8( ext_error_file, -1, NULL, NULL, NULL );
     error_file.open(filename);
     if (!error_file.is_open()) {

=== modified file 'src/extension/implementation/script.cpp'
--- src/extension/implementation/script.cpp	2014-10-17 20:03:14 +0000
+++ src/extension/implementation/script.cpp	2014-10-31 00:22:45 +0000
@@ -1051,7 +1051,7 @@
 
     Glib::ustring stderr_data = fileerr.string();
     if (stderr_data.length() != 0 &&
-        inkscape_use_gui()
+        INKSCAPE.use_gui()
        ) {
         checkStderr(stderr_data, Gtk::MESSAGE_INFO,
                                  _("Inkscape has received additional data from the script executed.  "

=== modified file 'src/extension/init.cpp'
--- src/extension/init.cpp	2014-06-06 21:56:26 +0000
+++ src/extension/init.cpp	2014-10-31 00:22:45 +0000
@@ -243,7 +243,7 @@
     /* Load search path for extensions */
     if (Inkscape::Extension::Extension::search_path.size() == 0)
     {
-        Inkscape::Extension::Extension::search_path.push_back(profile_path("extensions"));
+        Inkscape::Extension::Extension::search_path.push_back(Inkscape::Application::profile_path("extensions"));
 
         Inkscape::Extension::Extension::search_path.push_back(g_strdup(INKSCAPE_EXTENSIONDIR));
 

=== modified file 'src/extension/internal/cdr-input.cpp'
--- src/extension/internal/cdr-input.cpp	2014-10-17 20:03:14 +0000
+++ src/extension/internal/cdr-input.cpp	2014-10-31 00:22:45 +0000
@@ -263,7 +263,7 @@
      // If only one page is present, import that one without bothering user
      if (tmpSVGOutput.size() > 1) {
           CdrImportDialog *dlg = 0;
-          if (inkscape_use_gui()) {
+          if (INKSCAPE.use_gui()) {
                dlg = new CdrImportDialog(tmpSVGOutput);
                if (!dlg->showDialog()) {
                     delete dlg;

=== modified file 'src/extension/internal/filter/filter-file.cpp'
--- src/extension/internal/filter/filter-file.cpp	2014-03-27 01:33:44 +0000
+++ src/extension/internal/filter/filter-file.cpp	2014-10-31 00:22:45 +0000
@@ -29,7 +29,7 @@
 
 void Filter::filters_all_files(void)
 {
-	gchar *filtersProfilePath = profile_path("filters");
+	gchar *filtersProfilePath = Inkscape::Application::profile_path("filters");
 
 	filters_load_dir(INKSCAPE_FILTERDIR, _("Bundled"));
 	filters_load_dir(filtersProfilePath, _("Personal"));

=== modified file 'src/extension/internal/pdfinput/pdf-input.cpp'
--- src/extension/internal/pdfinput/pdf-input.cpp	2014-10-17 20:03:14 +0000
+++ src/extension/internal/pdfinput/pdf-input.cpp	2014-10-31 00:22:45 +0000
@@ -720,7 +720,7 @@
     }
 
     PdfImportDialog *dlg = NULL;
-    if (inkscape_use_gui()) {
+    if (INKSCAPE.use_gui()) {
         dlg = new PdfImportDialog(pdf_doc, uri);
         if (!dlg->showDialog()) {
             _cancelled = true;

=== modified file 'src/extension/internal/vsd-input.cpp'
--- src/extension/internal/vsd-input.cpp	2014-10-17 20:03:14 +0000
+++ src/extension/internal/vsd-input.cpp	2014-10-31 00:22:45 +0000
@@ -263,7 +263,7 @@
      // If only one page is present, import that one without bothering user
      if (tmpSVGOutput.size() > 1) {
           VsdImportDialog *dlg = 0;
-          if (inkscape_use_gui()) {
+          if (INKSCAPE.use_gui()) {
                dlg = new VsdImportDialog(tmpSVGOutput);
                if (!dlg->showDialog()) {
                     delete dlg;

=== modified file 'src/extension/system.cpp'
--- src/extension/system.cpp	2014-10-06 00:18:46 +0000
+++ src/extension/system.cpp	2014-10-31 00:22:45 +0000
@@ -121,7 +121,7 @@
     }
 
     if (last_chance_svg) {
-        if ( inkscape_use_gui() ) {
+        if ( INKSCAPE.use_gui() ) {
             sp_ui_error_dialog(_("Format autodetect failed. The file is being opened as SVG."));
         } else {
             g_warning("%s", _("Format autodetect failed. The file is being opened as SVG."));

=== modified file 'src/file.cpp'
--- src/file.cpp	2014-10-05 16:38:15 +0000
+++ src/file.cpp	2014-10-31 00:22:45 +0000
@@ -177,7 +177,7 @@
 Glib::ustring sp_file_default_template_uri()
 {
     std::list<gchar *> sources;
-    sources.push_back( profile_path("templates") ); // first try user's local dir
+    sources.push_back( Inkscape::Application::profile_path("templates") ); // first try user's local dir
     sources.push_back( g_strdup(INKSCAPE_TEMPLATESDIR) ); // then the system templates dir
     std::list<gchar const*> baseNames;
     gchar const* localized = _("default.svg");
@@ -316,7 +316,7 @@
             sp_file_add_recent( doc->getURI() );
         }
 
-        if ( inkscape_use_gui() ) {
+        if ( INKSCAPE.use_gui() ) {
             // Perform a fixup pass for hrefs.
             if ( Inkscape::ResourceManager::getManager().fixupBrokenLinks(doc) ) {
                 Glib::ustring msg = _("Broken links have been changed to point to existing files.");

=== modified file 'src/graphlayout.cpp'
--- src/graphlayout.cpp	2014-04-24 12:53:30 +0000
+++ src/graphlayout.cpp	2014-10-31 00:22:45 +0000
@@ -117,7 +117,7 @@
 
     // add the connector spacing to the size of node bounding boxes
     // so that connectors can always be routed between shapes
-    SPDesktop* desktop = inkscape_active_desktop();
+    SPDesktop* desktop = INKSCAPE.active_desktop();
     double spacing = 0;
     if(desktop) spacing = desktop->namedview->connector_spacing+0.1;
 

=== modified file 'src/helper/stock-items.cpp'
--- src/helper/stock-items.cpp	2014-10-05 16:58:19 +0000
+++ src/helper/stock-items.cpp	2014-10-31 00:22:45 +0000
@@ -195,7 +195,7 @@
         
         gchar * base = g_strndup(e, a);
 
-        SPDesktop *desktop = inkscape_active_desktop();
+        SPDesktop *desktop = INKSCAPE.active_desktop();
         SPDocument *doc = sp_desktop_document(desktop);
         SPDefs *defs = doc->getDefs();
         if (!defs) {
@@ -265,7 +265,7 @@
     
     else {
         
-        SPDesktop *desktop = inkscape_active_desktop();
+        SPDesktop *desktop = INKSCAPE.active_desktop();
         SPDocument *doc = sp_desktop_document(desktop);
         SPObject *object = doc->getObjectById(urn);
 

=== removed file 'src/inkscape-private.h'
--- src/inkscape-private.h	2014-03-30 22:08:13 +0000
+++ src/inkscape-private.h	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-#ifndef SEEN_INKSCAPE_PRIVATE_H
-#define SEEN_INKSCAPE_PRIVATE_H
-
-/*
- * Some forward declarations
- *
- * Authors:
- *   Lauris Kaplinski <[e-mail]>
- *
- * Copyright (C) 1999-2002 Lauris Kaplinski
- * Copyright (C) 2001-2002 Ximian, Inc.
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-#include <glib-object.h>
-
-#define SP_TYPE_INKSCAPE (inkscape_get_type ())
-#define SP_INKSCAPE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_INKSCAPE, Inkscape))
-#define SP_INKSCAPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_INKSCAPE, InkscapeClass))
-#define SP_IS_INKSCAPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_INKSCAPE))
-#define SP_IS_INKSCAPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_INKSCAPE))
-
-#include "inkscape.h"
-
-struct SPColor;
-namespace Inkscape { class Selection; }
-
-GType inkscape_get_type (void);
-
-void inkscape_ref (void);
-void inkscape_unref (void);
-
-guint inkscape_mapalt();
-void inkscape_mapalt(guint);
-
-guint inkscape_trackalt();
-void inkscape_trackalt(guint);
-
-/*
- * These are meant solely for desktop, document etc. implementations
- */
-
-void inkscape_selection_modified (Inkscape::Selection *selection, guint flags);
-void inkscape_selection_changed (Inkscape::Selection * selection);
-void inkscape_selection_set (Inkscape::Selection * selection);
-void inkscape_eventcontext_set (Inkscape::UI::Tools::ToolBase * eventcontext);
-void inkscape_add_desktop (SPDesktop * desktop);
-void inkscape_remove_desktop (SPDesktop * desktop);
-void inkscape_activate_desktop (SPDesktop * desktop);
-void inkscape_reactivate_desktop (SPDesktop * desktop);
-
-void inkscape_set_color (SPColor *color, float opacity);
-
-#endif // SEEN_INKSCAPE_PRIVATE_H
-
-
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :

=== modified file 'src/inkscape-x64.rc'
--- src/inkscape-x64.rc	2014-08-17 17:54:40 +0000
+++ src/inkscape-x64.rc	2014-10-31 00:22:45 +0000
@@ -3,8 +3,8 @@
 1                   24            DISCARDABLE     "./inkscape-manifest-x64.xml"
 
 1 VERSIONINFO
-    FILEVERSION     0,91,0,0
-    PRODUCTVERSION  0,91,0,0
+    FILEVERSION     0,91,0,9
+    PRODUCTVERSION  0,91,0,9
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -13,11 +13,11 @@
             VALUE "Comments", "Published under the GNU GPL"
             VALUE "CompanyName", "inkscape.org"
             VALUE "FileDescription", "Inkscape"
-            VALUE "FileVersion", "0.91pre2"
+            VALUE "FileVersion", "0.91+devel"
             VALUE "InternalName", "Inkscape"
             VALUE "LegalCopyright", "© 2014 Inkscape"
             VALUE "ProductName", "Inkscape"
-            VALUE "ProductVersion", "0.91pre2"
+            VALUE "ProductVersion", "0.91+devel"
         END
     END
     BLOCK "VarFileInfo"

=== modified file 'src/inkscape.cpp'
--- src/inkscape.cpp	2014-10-06 00:18:46 +0000
+++ src/inkscape.cpp	2014-10-31 00:22:45 +0000
@@ -1,13 +1,15 @@
 /**
  * @file
- * Legacy interface to main application.
+ * Interface to main application.
  */
 /* Authors:
  *   Lauris Kaplinski <[e-mail]>
  *   bulia byak <[e-mail]>
+ *   Liam P. White <[e-mail]>
  *
- * Copyright (C) 1999-2005 authors
- * g++ port Copyright (C) 2003 Nathan Hurst
+ * Copyright (C) 1999-2014 authors
+ * c++ port Copyright (C) 2003 Nathan Hurst 
+ * c++ification Copyright (C) 2014 Liam P. White
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -50,110 +52,36 @@
 #include <gtk/gtk.h>
 #include <signal.h>
 #include <string>
+
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "device-manager.h"
 #include "document.h"
-#include "ui/tools/tool-base.h"
 #include "extension/db.h"
 #include "extension/init.h"
 #include "extension/output.h"
 #include "extension/system.h"
-#include "inkscape-private.h"
+#include "helper/action-context.h"
+#include "helper/sp-marshal.h"
+#include "inkscape.h"
 #include "io/sys.h"
 #include "layer-model.h"
 #include "message-stack.h"
 #include "preferences.h"
 #include "resource-manager.h"
 #include "selection.h"
+#include "ui/tools/tool-base.h"
 #include "ui/dialog/debug.h"
 #include "xml/repr.h"
-#include "helper/action-context.h"
-#include "helper/sp-marshal.h"
-
-static InkscapeApplication *inkscape = NULL;
 
 /* Backbones of configuration xml data */
 #include "menus-skeleton.h"
 
-enum {
-    MODIFY_SELECTION, // global: one of selections modified
-    CHANGE_SELECTION, // global: one of selections changed
-    CHANGE_SUBSELECTION, // global: one of subselections (text selection, gradient handle, etc) changed
-    SET_SELECTION, // global: one of selections set
-    SET_EVENTCONTEXT, // tool switched
-    ACTIVATE_DESKTOP, // some desktop got focus
-    DEACTIVATE_DESKTOP, // some desktop lost focus
-    SHUTDOWN_SIGNAL, // inkscape is quitting
-    DIALOGS_HIDE, // user pressed F12
-    DIALOGS_UNHIDE, // user pressed F12
-    EXTERNAL_CHANGE, // a document was changed by some external means (undo or XML editor); this
-                     // may not be reflected by a selection change and thus needs a separate signal
-    LAST_SIGNAL
-};
-
-#define DESKTOP_IS_ACTIVE(d) (inkscape->desktops && ((d) == inkscape->desktops->data))
-
-
-/*################################
-# FORWARD DECLARATIONS
-################################*/
-
-static void inkscape_dispose (GObject *object);
-
-static void inkscape_activate_desktop_private (InkscapeApplication *inkscape, SPDesktop *desktop);
-static void inkscape_deactivate_desktop_private (InkscapeApplication *inkscape, SPDesktop *desktop);
-
-class AppSelectionModel {
-    Inkscape::LayerModel _layer_model;
-    Inkscape::Selection *_selection;
-
-public:
-    AppSelectionModel(SPDocument *doc) {
-        _layer_model.setDocument(doc);
-        // TODO: is this really how we should manage the lifetime of the selection?
-        // I just copied this from the initialization of the Selection in SPDesktop.
-        // When and how is it actually released?
-        _selection = Inkscape::GC::release(new Inkscape::Selection(&_layer_model, NULL));
-    }
-
-    Inkscape::Selection *getSelection() const { return _selection; }
-};
-
-struct InkscapeApplication {
-    GObject object;
-    Inkscape::XML::Document *menus;
-    std::map<SPDocument *, int> document_set;
-    std::map<SPDocument *, AppSelectionModel *> selection_models;
-    GSList *desktops;
-    gchar *argv0;
-    gboolean dialogs_toggle;
-    gboolean use_gui;         // may want to consider a virtual function
-                              // for overriding things like the warning dlg's
-    guint mapalt;
-    guint trackalt;
-};
-
-struct InkscapeApplicationClass {
-    GObjectClass object_class;
-
-    /* Signals */
-    void (* change_selection) (InkscapeApplication * inkscape, Inkscape::Selection * selection);
-    void (* change_subselection) (InkscapeApplication * inkscape, SPDesktop *desktop);
-    void (* modify_selection) (InkscapeApplication * inkscape, Inkscape::Selection * selection, guint flags);
-    void (* set_selection) (InkscapeApplication * inkscape, Inkscape::Selection * selection);
-    void (* set_eventcontext) (InkscapeApplication * inkscape, Inkscape::UI::Tools::ToolBase * eventcontext);
-    void (* activate_desktop) (InkscapeApplication * inkscape, SPDesktop * desktop);
-    void (* deactivate_desktop) (InkscapeApplication * inkscape, SPDesktop * desktop);
-    void (* destroy_document) (InkscapeApplication *inkscape, SPDocument *doc);
-    void (* color_set) (InkscapeApplication *inkscape, SPColor *color, double opacity);
-    void (* shut_down) (InkscapeApplication *inkscape);
-    void (* dialogs_hide) (InkscapeApplication *inkscape);
-    void (* dialogs_unhide) (InkscapeApplication *inkscape);
-    void (* external_change) (InkscapeApplication *inkscape);
-};
-
-static guint inkscape_signals[LAST_SIGNAL] = {0};
+// Inkscape::Application static members
+Inkscape::Application * Inkscape::Application::_S_inst = NULL;
+bool Inkscape::Application::_crashIsHappening = false;
+
+#define DESKTOP_IS_ACTIVE(d) (!INKSCAPE._desktops->empty() && ((d) == INKSCAPE._desktops->front()))
 
 static void (* segv_handler) (int) = SIG_DFL;
 static void (* abrt_handler) (int) = SIG_DFL;
@@ -168,122 +96,130 @@
 #define INKSCAPE_LEGACY_PROFILE_DIR ".inkscape"
 #define MENUS_FILE "menus.xml"
 
-G_DEFINE_TYPE(InkscapeApplication, inkscape, G_TYPE_OBJECT);
-
-/**
- *  Initializes the inkscape class, registering all of its signal handlers
- *  and virtual functions
- */
-static void
-inkscape_class_init (InkscapeApplicationClass * klass)
-{
-    GObjectClass * object_class = G_OBJECT_CLASS(klass);
-
-    inkscape_signals[MODIFY_SELECTION] = g_signal_new ("modify_selection",
-                               G_TYPE_FROM_CLASS (klass),
-                               G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (InkscapeApplicationClass, modify_selection),
-                               NULL, NULL,
-                               sp_marshal_VOID__POINTER_UINT,
-                               G_TYPE_NONE, 2,
-                               G_TYPE_POINTER, G_TYPE_UINT);
-    inkscape_signals[CHANGE_SELECTION] = g_signal_new ("change_selection",
-                               G_TYPE_FROM_CLASS (klass),
-                               G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (InkscapeApplicationClass, change_selection),
-                               NULL, NULL,
-                               g_cclosure_marshal_VOID__POINTER,
-                               G_TYPE_NONE, 1,
-                               G_TYPE_POINTER);
-    inkscape_signals[CHANGE_SUBSELECTION] = g_signal_new ("change_subselection",
-                               G_TYPE_FROM_CLASS (klass),
-                               G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (InkscapeApplicationClass, change_subselection),
-                               NULL, NULL,
-                               g_cclosure_marshal_VOID__POINTER,
-                               G_TYPE_NONE, 1,
-                               G_TYPE_POINTER);
-    inkscape_signals[SET_SELECTION] =    g_signal_new ("set_selection",
-                               G_TYPE_FROM_CLASS (klass),
-                               G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (InkscapeApplicationClass, set_selection),
-                               NULL, NULL,
-                               g_cclosure_marshal_VOID__POINTER,
-                               G_TYPE_NONE, 1,
-                               G_TYPE_POINTER);
-    inkscape_signals[SET_EVENTCONTEXT] = g_signal_new ("set_eventcontext",
-                               G_TYPE_FROM_CLASS (klass),
-                               G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (InkscapeApplicationClass, set_eventcontext),
-                               NULL, NULL,
-                               g_cclosure_marshal_VOID__POINTER,
-                               G_TYPE_NONE, 1,
-                               G_TYPE_POINTER);
-    inkscape_signals[ACTIVATE_DESKTOP] = g_signal_new ("activate_desktop",
-                               G_TYPE_FROM_CLASS (klass),
-                               G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (InkscapeApplicationClass, activate_desktop),
-                               NULL, NULL,
-                               g_cclosure_marshal_VOID__POINTER,
-                               G_TYPE_NONE, 1,
-                               G_TYPE_POINTER);