changeset 19289:6d8d5d9f2264

maint: periodic merge of gui-release to default
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 15 Oct 2014 11:54:04 -0400
parents 79d4783a9978 (current diff) 82c329619836 (diff)
children 1f2a16d41ba2
files libgui/graphics/QtHandlesUtils.cc libgui/src/settings-dialog.cc libgui/src/shortcut-manager.cc libinterp/corefcn/pr-output.cc scripts/miscellaneous/fact.m
diffstat 11 files changed, 2889 insertions(+), 1561 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/QtHandlesUtils.cc	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/graphics/QtHandlesUtils.cc	Wed Oct 15 11:54:04 2014 -0400
@@ -220,8 +220,8 @@
 
   if (dv.length () == 3 && dv(2) == 3)
     {
-      int w = qMin (dv(1), width);
-      int h = qMin (dv(0), height);
+      int w = qMin (dv(1), static_cast<octave_idx_type> (width));
+      int h = qMin (dv(0), static_cast<octave_idx_type> (height));
 
       int x_off = (w < width ? (width - w) / 2 : 0);
       int y_off = (h < height ? (height - h) / 2 : 0);
--- a/libgui/languages/it_IT.ts	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/languages/it_IT.ts	Wed Oct 15 11:54:04 2014 -0400
@@ -12,413 +12,330 @@
 <context>
     <name>QColorDialog</name>
     <message>
-        <location filename="../../../octave-qt/qcolordialog.cpp" line="+1378"/>
         <source>Hu&amp;e:</source>
-        <translation>Tinta:</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Tinta:</translation>
+    </message>
+    <message>
         <source>&amp;Sat:</source>
-        <translation>Saturazione:</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Saturazione:</translation>
+    </message>
+    <message>
         <source>&amp;Val:</source>
-        <translation>Luminosità:</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Luminosità:</translation>
+    </message>
+    <message>
         <source>&amp;Red:</source>
-        <translation>Rosso:</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Rosso:</translation>
+    </message>
+    <message>
         <source>&amp;Green:</source>
-        <translation>Verde:</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Verde:</translation>
+    </message>
+    <message>
         <source>Bl&amp;ue:</source>
-        <translation>Blu:</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Blu:</translation>
+    </message>
+    <message>
         <source>A&amp;lpha channel:</source>
-        <translation>Canale alpha:</translation>
-    </message>
-    <message>
-        <location line="+101"/>
+        <translation type="obsolete">Canale alfa:</translation>
+    </message>
+    <message>
         <source>Select Color</source>
-        <translation>Seleziona Colore</translation>
-    </message>
-    <message>
-        <location line="+183"/>
+        <translation type="obsolete">Seleziona Colore</translation>
+    </message>
+    <message>
         <source>&amp;Basic colors</source>
-        <translation>Colori di base</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Colori di base</translation>
+    </message>
+    <message>
         <source>&amp;Custom colors</source>
-        <translation>Colori personalizzati</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Colori personalizzati</translation>
+    </message>
+    <message>
         <source>&amp;Add to Custom Colors</source>
-        <translation>Aggiungi ai Colori Personalizzati</translation>
+        <translation type="obsolete">Aggiungi ai Colori Personalizzati</translation>
     </message>
 </context>
 <context>
     <name>QDialog</name>
     <message>
-        <location filename="../../../octave-qt/qdialog.cpp" line="+528"/>
         <source>Done</source>
-        <translation>Fatto</translation>
-    </message>
-    <message>
-        <location line="+133"/>
+        <translation type="obsolete">Fatto</translation>
+    </message>
+    <message>
         <source>What&apos;s This?</source>
-        <translation>Cos'è questo?</translation>
+        <translation type="obsolete">Cos&apos;è questo?</translation>
     </message>
 </context>
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../../../octave-qt/qmessagebox.cpp" line="+1937"/>
-        <location line="+446"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
 </context>
 <context>
     <name>QErrorMessage</name>
     <message>
-        <location filename="../../../octave-qt/qerrormessage.cpp" line="+208"/>
         <source>Debug Message:</source>
-        <translation>Messaggio di Debug:</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Messaggio di Debug:</translation>
+    </message>
+    <message>
         <source>Warning:</source>
-        <translation>Avviso:</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Avviso:</translation>
+    </message>
+    <message>
         <source>Fatal Error:</source>
-        <translation>Errore Fatale:</translation>
-    </message>
-    <message>
-        <location line="+208"/>
+        <translation type="obsolete">Errore Fatale:</translation>
+    </message>
+    <message>
         <source>&amp;Show this message again</source>
-        <translation>Mostra di nuovo questo messaggio</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Mostra di nuovo questo messaggio</translation>
+    </message>
+    <message>
         <source>&amp;OK</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
 </context>
 <context>
     <name>QFileDialog</name>
     <message>
-        <location filename="../../../octave-qt/qfiledialog.cpp" line="+557"/>
-        <location filename="../../../octave-qt/qfiledialog_symbian.cpp" line="+192"/>
         <source>Find Directory</source>
-        <translation>Trova Cartella</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">Trova Cartella</translation>
+    </message>
+    <message>
         <source>Open</source>
-        <translation>Apri</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">Apri</translation>
+    </message>
+    <message>
         <source>Save As</source>
-        <translation>Salva come</translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <location line="+550"/>
+        <translation type="obsolete">Salva come</translation>
+    </message>
+    <message>
         <source>All Files (*)</source>
-        <translation>Tutti i File (*)</translation>
-    </message>
-    <message>
-        <location line="-540"/>
+        <translation type="obsolete">Tutti i File (*)</translation>
+    </message>
+    <message>
         <source>Show </source>
-        <translation>Mostra </translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <translation type="obsolete">Mostra </translation>
+    </message>
+    <message>
         <source>&amp;Rename</source>
-        <translation>&amp;Rinomina</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">&amp;Rinomina</translation>
+    </message>
+    <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Elimina</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">&amp;Elimina</translation>
+    </message>
+    <message>
         <source>Show &amp;hidden files</source>
-        <translation>Mostra &amp;file nascosti</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Mostra &amp;file nascosti</translation>
+    </message>
+    <message>
         <source>&amp;New Folder</source>
-        <translation>&amp;Nuova cartella</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location line="+750"/>
+        <translation type="obsolete">&amp;Nuova cartella</translation>
+    </message>
+    <message>
         <source>Directory:</source>
-        <translation>Cartella:</translation>
-    </message>
-    <message>
-        <location line="-748"/>
-        <location line="+754"/>
+        <translation type="obsolete">Cartella:</translation>
+    </message>
+    <message>
         <source>File &amp;name:</source>
-        <translation>Nome &amp;file:</translation>
-    </message>
-    <message>
-        <location line="-13"/>
-        <location line="+55"/>
-        <location line="+1582"/>
+        <translation type="obsolete">Nome &amp;file:</translation>
+    </message>
+    <message>
         <source>&amp;Open</source>
-        <translation>&amp;Apri</translation>
-    </message>
-    <message>
-        <location line="-1637"/>
-        <location line="+55"/>
+        <translation type="obsolete">&amp;Apri</translation>
+    </message>
+    <message>
         <source>&amp;Save</source>
-        <translation>&amp;Salva</translation>
-    </message>
-    <message>
-        <location line="-52"/>
+        <translation type="obsolete">&amp;Salva</translation>
+    </message>
+    <message>
         <source>Directories</source>
-        <translation>Cartelle</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+43"/>
+        <translation type="obsolete">Cartelle</translation>
+    </message>
+    <message>
         <source>&amp;Choose</source>
-        <translation>&amp;Seleziona</translation>
-    </message>
-    <message>
-        <location line="+789"/>
-        <location line="+866"/>
+        <translation type="obsolete">&amp;Seleziona</translation>
+    </message>
+    <message>
         <source>%1
 Directory not found.
 Please verify the correct directory name was given.</source>
-        <translation>%1
+        <translation type="obsolete">%1
 Nessuna cartella trovata.
 Verificare la corretta ortografia del nome inserito.</translation>
     </message>
     <message>
-        <location line="-832"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
-        <translation>%1 esiste già.
+        <translation type="obsolete">%1 esiste già.
 Si desidera sostituirlo?</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>%1
 File not found.
 Please verify the correct file name was given.</source>
-        <translation>%1
+        <translation type="obsolete">%1
 File non trovato.
 Verificare la corretta ortografia del nome inserito.</translation>
     </message>
     <message>
-        <location line="+462"/>
         <source>New Folder</source>
-        <translation>Nuova Cartella</translation>
-    </message>
-    <message>
-        <location line="+128"/>
+        <translation type="obsolete">Nuova Cartella</translation>
+    </message>
+    <message>
         <source>&apos;%1&apos; is write protected.
 Do you want to delete it anyway?</source>
-        <translation>&apos;%1&apos; è protetto da scrittura.
+        <translation type="obsolete">&apos;%1&apos; è protetto da scrittura.
 Si è certi di volerlo eliminare?</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Are sure you want to delete &apos;%1&apos;?</source>
-        <translation>Si è certi di voler eliminare &apos;%1&apos;?</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <translation type="obsolete">Si è certi di voler eliminare &apos;%1&apos;?</translation>
+    </message>
+    <message>
         <source>Could not delete directory.</source>
-        <translation>Impossibile eliminare la cartella.</translation>
-    </message>
-    <message>
-        <location line="+409"/>
+        <translation type="obsolete">Impossibile eliminare la cartella.</translation>
+    </message>
+    <message>
         <source>Recent Places</source>
-        <translation>Percorsi Recenti</translation>
-    </message>
-    <message>
-        <location filename="../../../octave-qt/qfiledialog_win.cpp" line="+131"/>
+        <translation type="obsolete">Percorsi Recenti</translation>
+    </message>
+    <message>
         <source>All Files (*.*)</source>
-        <translation>Tutti i File (*.*)</translation>
+        <translation type="obsolete">Tutti i File (*.*)</translation>
     </message>
 </context>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../../../octave-qt/qfilesystemmodel.cpp" line="+763"/>
         <source>%1 TB</source>
-        <translation>%1 TB</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">%1 TB</translation>
+    </message>
+    <message>
         <source>%1 GB</source>
-        <translation>%1 GB</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">%1 GB</translation>
+    </message>
+    <message>
         <source>%1 MB</source>
-        <translation>%1 MB</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">%1 MB</translation>
+    </message>
+    <message>
         <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">%1 KB</translation>
+    </message>
+    <message>
         <source>%1 bytes</source>
-        <translation>%1 byte</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <translation type="obsolete">%1 byte</translation>
+    </message>
+    <message>
         <source>Invalid filename</source>
-        <translation>Nome del file non valido</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Nome del file non valido</translation>
+    </message>
+    <message>
         <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
-        <translation>&lt;b&gt;Il nome &quot;%1&quot; non può essere utilizzato.&lt;/b&gt;&lt;p&gt;Si consiglia di utilizzarne uno con meno caratteri o senza segni di punteggiatura.</translation>
-    </message>
-    <message>
-        <location line="+64"/>
+        <translation type="obsolete">&lt;b&gt;Il nome &quot;%1&quot; non può essere utilizzato.&lt;/b&gt;&lt;p&gt;Si consiglia di utilizzarne uno con meno caratteri o senza segni di punteggiatura.</translation>
+    </message>
+    <message>
         <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">Nome</translation>
+    </message>
+    <message>
         <source>Size</source>
-        <translation>Dimensione</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <translation type="obsolete">Dimensione</translation>
+    </message>
+    <message>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">Tipo</translation>
+    </message>
+    <message>
         <source>Type</source>
         <comment>All other platforms</comment>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <translation type="obsolete">Tipo</translation>
+    </message>
+    <message>
         <source>Date Modified</source>
-        <translation>Data Ultima Modifica</translation>
+        <translation type="obsolete">Data Ultima Modifica</translation>
     </message>
 </context>
 <context>
     <name>QFontDialog</name>
     <message>
-        <location filename="../../../octave-qt/qfontdialog.cpp" line="+183"/>
         <source>Select Font</source>
-        <translation>Seleziona Tipo di Carattere</translation>
-    </message>
-    <message>
-        <location line="+585"/>
+        <translation type="obsolete">Seleziona Tipo di Carattere</translation>
+    </message>
+    <message>
         <source>&amp;Font</source>
-        <translation>&amp;Tipo</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">&amp;Tipo</translation>
+    </message>
+    <message>
         <source>Font st&amp;yle</source>
-        <translation>&amp;Stile</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">&amp;Stile</translation>
+    </message>
+    <message>
         <source>&amp;Size</source>
-        <translation>&amp;Dimensione</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <translation type="obsolete">&amp;Dimensione</translation>
+    </message>
+    <message>
         <source>Effects</source>
-        <translation>Effetti</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">Effetti</translation>
+    </message>
+    <message>
         <source>Stri&amp;keout</source>
-        <translation>Bar&amp;rato</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Bar&amp;rato</translation>
+    </message>
+    <message>
         <source>&amp;Underline</source>
-        <translation>&amp;Sottolineato</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">&amp;Sottolineato</translation>
+    </message>
+    <message>
         <source>Sample</source>
-        <translation>Colore</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Colore</translation>
+    </message>
+    <message>
         <source>Wr&amp;iting System</source>
-        <translation>Sistema di Scrittura</translation>
+        <translation type="obsolete">Sistema di Scrittura</translation>
     </message>
 </context>
 <context>
     <name>QInputDialog</name>
     <message>
-        <location filename="../../../octave-qt/qinputdialog.cpp" line="+223"/>
         <source>Enter a value:</source>
-        <translation>Inserire un valore:</translation>
+        <translation type="obsolete">Inserire un valore:</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="../../../octave-qt/qmessagebox.cpp" line="-2244"/>
         <source>Show Details...</source>
-        <translation>Mostra Dettagli...</translation>
-    </message>
-    <message>
-        <location line="+0"/>
+        <translation type="obsolete">Mostra Dettagli...</translation>
+    </message>
+    <message>
         <source>Hide Details...</source>
-        <translation>Nascondi Dettagli...</translation>
-    </message>
-    <message>
-        <location line="+288"/>
-        <location line="+845"/>
+        <translation type="obsolete">Nascondi Dettagli...</translation>
+    </message>
+    <message>
         <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">OK</translation>
+    </message>
+    <message>
         <source>Help</source>
-        <translation>Aiuto</translation>
-    </message>
-    <message>
-        <location line="+488"/>
+        <translation type="obsolete">Aiuto</translation>
+    </message>
+    <message>
         <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;A proposito Qt&lt;/h3&gt;&lt;p&gt;Questo programma utilizza Qt versione %1.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <translation type="obsolete">&lt;h3&gt;A proposito Qt&lt;/h3&gt;&lt;p&gt;Questo programma utilizza Qt versione %1.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qt.digia.com/product/licensing&quot;&gt;qt.digia.com/product/licensing&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Digia product. See &lt;a href=&quot;http://qt.digia.com/&quot;&gt;qt.digia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qt.digia.com/product/licensing&quot;&gt;qt.digia.com/product/licensing&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Digia product. See &lt;a href=&quot;http://qt.digia.com/&quot;&gt;qt.digia.com&lt;/a&gt; for more information.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <translation type="obsolete">&lt;p&gt;Qt è uno strumento per lo sviluppo di applicazioni multipiattaforma.&lt;/p&gt;&lt;p&gt;Fornisce portabilità completa fra MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux e tutte le principali varianti commerciali di Unix, ed è disponibile per dispositivi embedded come Qt for Embedded Linux e Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Tre opzioni di liceza sono disponibili per rispondede alle esigenze eterogenee dei nostri utenti.&lt;/p&gt;&lt;p&gt;La licenza commerciale è adatta allo sviluppo di software proprietario e/o commerciale, quando non si desidera condividere codice sorgente con terze parti o si è in altro modo impossibilitati a rispettare i termini delle licenze GNU LGPL versione 2.1 o GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;La licenza GNU LGPL versione 2.1 si presta allo sviluppo di allpicazioni Qt (proprietarie o a sorgente aperto), qualora si sia in condizione di rispettare i termini e le condizioni della licenza GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;La licenza GNU GPL versione 3.0 è adatta allo sviluppo di applicazioni Qt che si desidera utilizzare in combinazione con software soggetto ai termini della licenza GNU GPL version 3.0 o quando si desidera rispettare i termini della licenza GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Si faccia riferimento a &lt;a href=&quot;http://qt.digia.com/product/licensing&quot;&gt;qt.digia.com/product/licensing&lt;/a&gt; per una panoramica delle opzioni di licenza di Qt. &lt;/p&gt;&lt;p&gt;Copyright (C) 2013 Digia Plc e/o sussidiarie.&lt;/p&gt;&lt;p&gt;Qt è un prodotto Digia. Si veda &lt;a href=&quot;http://qt.digia.com/&quot;&gt;qt.digia.com&lt;/a&gt; per maggiori informazioni.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <source>About Qt</source>
-        <translation>A proposito di Qt</translation>
+        <translation type="obsolete">A proposito di Qt</translation>
     </message>
 </context>
 <context>
@@ -474,477 +391,385 @@
         <translation>cursore</translation>
     </message>
     <message>
-        <location filename="../src/main-window.cc" line="+1963"/>
+        <location filename="../src/main-window.cc" line="+1948"/>
         <source>&lt;p&gt;&lt;strong&gt;A Note about Octave&apos;s New GUI&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;One of the biggest new features for Octave 3.8 is a graphical user interface.  It is the one thing that users have requested most often over the last few years and now it is almost ready.  But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.&lt;/p&gt;&lt;p&gt;Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI.  So please enjoy the 3.8 release of Octave and the preview of the new GUI.  We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;We Need Your Help&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):&lt;/p&gt;&lt;p&gt;&lt;ul&gt;&lt;li&gt;If you are a skilled software developer, you can help by contributing your time to help &lt;a href=&quot;http://octave.org/get-involved.html&quot;&gt;develop Octave&lt;/a&gt;.&lt;/li&gt;&lt;li&gt;If Octave does not work properly, you are encouraged to &lt;a href=&quot;http://octave.org/bugs.html&quot;&gt;report problems &lt;/a&gt; that you find.&lt;/li&gt;&lt;li&gt;Whether you are a user or developer, you can &lt;a href=&quot;http://octave.org/donate.html&quot;&gt;help to fund the project&lt;/a&gt;.  Octave development takes a lot of time and expertise.  Your contributions help to ensure that Octave will continue to improve.&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&lt;p&gt;We hope you find Octave to be useful.  Please help us make it even better for the future!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;strong&gt;Nota sulla nuova interfaccia grafica di Octave&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Una delle maggiori novità di Octave 3.8 è l'interfaccia grafica utente.  Si tratta della caratteristica più richiesta dagli utenti negli ultimi anni, ed ora è quasi pronta. Tuttavia, poiché essa non è ancora rifinita come vorremmo, abbiamo deciso di attendere fino alle serie di rilascio 4.0.x prima di renderla l'interfaccia di default.&lt;/p&gt;&lt;p&gt;D'altro canto, considerato il lasso di tempo trascorso, i bug risolti ed i miglioramenti dall'ultima "major release", abbiamo deciso di non ritardare ulteriormente un nuovo rilascio soltanto per perfezionare l'interfaccia grafica: è con piacere che presentiamo la versione 3.8 di Octave ed un'anteprima della nuova interfaccia grafica. Crediamo che essi funzioni sufficientemente bene, pur avendo ancora qualche problema ed aspetti che potrebbero essere migliorati.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Abbiamo bisogno del tuo aiuto&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Sono molti i modi in cui puoi aiutare a risolvere i problemi restanti, a completare l'interfaccia grafica e a migliorare in generale l'esperienza di utilizzo, tanto per i principianti quanto per gli utenti esperti:&lt;/p&gt;&lt;p&gt;&lt;ul&gt;&lt;li&gt;Se sei uno programmatore esperto, puoi aiutare contribuendo allo &lt;a href=&quot;http://octave.org/get-involved.html&quot;&gt;sviluppo di Octave&lt;/a&gt;.&lt;/li&gt;&lt;li&gt;Se Octave non funziona correttamente, ti incoraggiamo a &lt;a href=&quot;http://octave.org/bugs.html&quot;&gt;segnalare i problemi&lt;/a&gt; che incontri.&lt;/li&gt;&lt;li&gt;Che tu sia un utente o uno sviluppatore, puoi aiutare a &lt;a href=&quot;http://octave.org/donate.html&quot;&gt;finanziare il progetto&lt;/a&gt;.  Lo sviluppo di Octave richiede molto tempo e molte competenze.  I tuoi contributi aiutano ad assicurare il continuo miglioramento del software.&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&lt;p&gt;Speriamo che troverai Octave utile.  Perfavore, aiutaci a renderlo ancora migliore per il futuro!&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;&lt;strong&gt;Nota sulla nuova interfaccia grafica di Octave&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Una delle maggiori novità di Octave 3.8 è l&apos;interfaccia grafica utente. Si tratta della caratteristica più richiesta dagli utenti negli ultimi anni, ed ora è quasi pronta. Tuttavia, poiché essa non è ancora rifinita come vorremmo, abbiamo deciso di attendere fino alle serie di rilascio 4.0.x prima di renderla l&apos;interfaccia predefinita.&lt;/p&gt;&lt;p&gt;D&apos;altro canto, considerato il lasso di tempo trascorso, i problemi risolti ed i miglioramenti dall&apos;ultima &apos;major release&apos;, abbiamo deciso di non ritardare ulteriormente un nuovo rilascio soltanto per perfezionare l&apos;interfaccia grafica ed è pertanto con piacere che presentiamo la versione 3.8 di Octave con un&apos;anteprima dell&apos;interfaccia grafica. Crediamo che funzioni sufficientemente bene, pur avendo ancora qualche problema ed aspetti che potrebbero essere migliorati.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Abbiamo bisogno del tuo aiuto&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Sono molti i modi in cui puoi aiutare a risolvere i problemi restanti, a completare l&apos;interfaccia grafica e a migliorare in generale l&apos;esperienza di utilizzo, tanto per i principianti quanto per gli utenti esperti:&lt;/p&gt;&lt;p&gt;&lt;ul&gt;&lt;li&gt;Se sei un programmatore esperto, puoi aiutare contribuendo allo &lt;a href=&quot;http://octave.org/get-involved.html&quot;&gt;sviluppo di Octave&lt;/a&gt;.&lt;/li&gt;&lt;li&gt;Se Octave non funziona correttamente, ti incoraggiamo inoltre a &lt;a href=&quot;http://octave.org/bugs.html&quot;&gt;segnalare i problemi&lt;/a&gt; che incontri.&lt;/li&gt;&lt;li&gt;Che tu sia un utente o uno sviluppatore, puoi aiutare a &lt;a href=&quot;http://octave.org/donate.html&quot;&gt;finanziare il progetto&lt;/a&gt;. Lo sviluppo di questo software richiede molto tempo e molte competenze.  I tuoi contributi aiutano ad assicurare il continuo miglioramento del software.&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&lt;p&gt;Speriamo che troverai Octave utile. Perfavore, aiutaci a renderlo ancora migliore per il futuro!&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
     <message>
-        <location filename="../../../octave-qt/qprintdialog_unix.cpp" line="+1238"/>
         <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation type="obsolete">Nome</translation>
+    </message>
+    <message>
         <source>Value</source>
-        <translation>Valore</translation>
+        <translation type="obsolete">Valore</translation>
     </message>
 </context>
 <context>
     <name>QPageSetupWidget</name>
     <message>
-        <location filename="../../../octave-qt/qpagesetupdialog_unix.cpp" line="+304"/>
         <source>Centimeters (cm)</source>
-        <translation>Centimetri (cm)</translation>
-    </message>
-    <message>
-        <location line="+0"/>
+        <translation type="obsolete">Centimetri (cm)</translation>
+    </message>
+    <message>
         <source>Millimeters (mm)</source>
-        <translation>Millimetri (mm)</translation>
-    </message>
-    <message>
-        <location line="+0"/>
+        <translation type="obsolete">Millimetri (mm)</translation>
+    </message>
+    <message>
         <source>Inches (in)</source>
-        <translation>Pollici (in)</translation>
-    </message>
-    <message>
-        <location line="+0"/>
+        <translation type="obsolete">Pollici (in)</translation>
+    </message>
+    <message>
         <source>Points (pt)</source>
-        <translation>Punti (pt)</translation>
+        <translation type="obsolete">Punti (pt)</translation>
     </message>
 </context>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../../../octave-qt/qabstractprintdialog.cpp" line="+116"/>
-        <location line="+13"/>
-        <location filename="../../../octave-qt/qprintdialog_win.cpp" line="+270"/>
         <source>Print</source>
-        <translation>Stampa</translation>
-    </message>
-    <message>
-        <location filename="../../../octave-qt/qpagesetupdialog_unix.cpp" line="-232"/>
+        <translation type="obsolete">Stampa</translation>
+    </message>
+    <message>
         <source>A0</source>
-        <translation>A0</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A0</translation>
+    </message>
+    <message>
         <source>A1</source>
-        <translation>A1</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A1</translation>
+    </message>
+    <message>
         <source>A2</source>
-        <translation>A2</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A2</translation>
+    </message>
+    <message>
         <source>A3</source>
-        <translation>A3</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A3</translation>
+    </message>
+    <message>
         <source>A4</source>
-        <translation>A4</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A4</translation>
+    </message>
+    <message>
         <source>A5</source>
-        <translation>A5</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A5</translation>
+    </message>
+    <message>
         <source>A6</source>
-        <translation>A6</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A6</translation>
+    </message>
+    <message>
         <source>A7</source>
-        <translation>A7</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A7</translation>
+    </message>
+    <message>
         <source>A8</source>
-        <translation>A8</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A8</translation>
+    </message>
+    <message>
         <source>A9</source>
-        <translation>A9</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A9</translation>
+    </message>
+    <message>
         <source>B0</source>
-        <translation>B0</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B0</translation>
+    </message>
+    <message>
         <source>B1</source>
-        <translation>B1</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B1</translation>
+    </message>
+    <message>
         <source>B2</source>
-        <translation>B2</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B2</translation>
+    </message>
+    <message>
         <source>B3</source>
-        <translation>B3</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B3</translation>
+    </message>
+    <message>
         <source>B4</source>
-        <translation>B4</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B4</translation>
+    </message>
+    <message>
         <source>B5</source>
-        <translation>B5</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B5</translation>
+    </message>
+    <message>
         <source>B6</source>
-        <translation>B6</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B6</translation>
+    </message>
+    <message>
         <source>B7</source>
-        <translation>B7</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B7</translation>
+    </message>
+    <message>
         <source>B8</source>
-        <translation>B8</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B8</translation>
+    </message>
+    <message>
         <source>B9</source>
-        <translation>B9</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B9</translation>
+    </message>
+    <message>
         <source>B10</source>
-        <translation>B10</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B10</translation>
+    </message>
+    <message>
         <source>C5E</source>
-        <translation>C5E</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">C5E</translation>
+    </message>
+    <message>
         <source>DLE</source>
-        <translation>DLE</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">DLE</translation>
+    </message>
+    <message>
         <source>Executive</source>
-        <translation>Executive</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Executive</translation>
+    </message>
+    <message>
         <source>Folio</source>
-        <translation>Folio</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Folio</translation>
+    </message>
+    <message>
         <source>Ledger</source>
-        <translation>Ledger</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Ledger</translation>
+    </message>
+    <message>
         <source>Legal</source>
-        <translation>Legal</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Legal</translation>
+    </message>
+    <message>
         <source>Letter</source>
-        <translation>Letter</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Letter</translation>
+    </message>
+    <message>
         <source>Tabloid</source>
-        <translation>tabloid</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Tabloid</translation>
+    </message>
+    <message>
         <source>US Common #10 Envelope</source>
-        <translation>US Common #10 Envelope</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">US Common #10 Envelope</translation>
+    </message>
+    <message>
         <source>Custom</source>
-        <translation>Personalizzato</translation>
-    </message>
-    <message>
-        <location filename="../../../octave-qt/qprintdialog_qws.cpp" line="+148"/>
+        <translation type="obsolete">Personalizzato</translation>
+    </message>
+    <message>
         <source>File exists</source>
-        <translation>Il file esiste</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Il file esiste</translation>
+    </message>
+    <message>
         <source>&lt;qt&gt;Do you want to overwrite it?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Si desidera sovrascriverlo?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <translation type="obsolete">&lt;qt&gt;Si desidera sovrascriverlo?&lt;/qt&gt;</translation>
+    </message>
+    <message>
         <source>A0 (841 x 1189 mm)</source>
-        <translation>A0 (841 x 1189 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A0 (841 x 1189 mm)</translation>
+    </message>
+    <message>
         <source>A1 (594 x 841 mm)</source>
-        <translation>A1 (594 x 841 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A1 (594 x 841 mm)</translation>
+    </message>
+    <message>
         <source>A2 (420 x 594 mm)</source>
-        <translation>A2 (420 x 594 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A2 (420 x 594 mm)</translation>
+    </message>
+    <message>
         <source>A3 (297 x 420 mm)</source>
-        <translation>A3 (297 x 420 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A3 (297 x 420 mm)</translation>
+    </message>
+    <message>
         <source>A4 (210 x 297 mm, 8.26 x 11.7 inches)</source>
-        <translation>A4 (210 x 297 mm, 8.26 x 11.7 inches)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A4 (210 x 297 mm, 8.26 x 11.7 inches)</translation>
+    </message>
+    <message>
         <source>A5 (148 x 210 mm)</source>
-        <translation>A5 (148 x 210 mm)&gt;A5 (148 x 210 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A5 (148 x 210 mm)&gt;A5 (148 x 210 mm)</translation>
+    </message>
+    <message>
         <source>A6 (105 x 148 mm)</source>
-        <translation>A6 (105 x 148 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A6 (105 x 148 mm)</translation>
+    </message>
+    <message>
         <source>A7 (74 x 105 mm)</source>
-        <translation>A7 (74 x 105 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A7 (74 x 105 mm)</translation>
+    </message>
+    <message>
         <source>A8 (52 x 74 mm)</source>
-        <translation>A8 (52 x 74 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A8 (52 x 74 mm)</translation>
+    </message>
+    <message>
         <source>A9 (37 x 52 mm)</source>
-        <translation>A9 (37 x 52 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">A9 (37 x 52 mm)</translation>
+    </message>
+    <message>
         <source>B0 (1000 x 1414 mm)</source>
-        <translation>B0 (1000 x 1414 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B0 (1000 x 1414 mm)</translation>
+    </message>
+    <message>
         <source>B1 (707 x 1000 mm)</source>
-        <translation>B1 (707 x 1000 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B1 (707 x 1000 mm)</translation>
+    </message>
+    <message>
         <source>B2 (500 x 707 mm)</source>
-        <translation>B2 (500 x 707 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B2 (500 x 707 mm)</translation>
+    </message>
+    <message>
         <source>B3 (353 x 500 mm)</source>
-        <translation>B3 (353 x 500 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B3 (353 x 500 mm)</translation>
+    </message>
+    <message>
         <source>B4 (250 x 353 mm)</source>
-        <translation>B4 (250 x 353 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B4 (250 x 353 mm)</translation>
+    </message>
+    <message>
         <source>B5 (176 x 250 mm, 6.93 x 9.84 inches)</source>
-        <translation>B5 (176 x 250 mm, 6.93 x 9.84 pollici)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B5 (176 x 250 mm, 6.93 x 9.84 pollici)</translation>
+    </message>
+    <message>
         <source>B6 (125 x 176 mm)</source>
-        <translation>B6 (125 x 176 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B6 (125 x 176 mm)</translation>
+    </message>
+    <message>
         <source>B7 (88 x 125 mm)</source>
-        <translation>B7 (88 x 125 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B7 (88 x 125 mm)</translation>
+    </message>
+    <message>
         <source>B8 (62 x 88 mm)</source>
-        <translation>B8 (62 x 88 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B8 (62 x 88 mm)</translation>
+    </message>
+    <message>
         <source>B9 (44 x 62 mm)</source>
-        <translation>B9 (44 x 62 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B9 (44 x 62 mm)</translation>
+    </message>
+    <message>
         <source>B10 (31 x 44 mm)</source>
-        <translation>B10 (31 x 44 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">B10 (31 x 44 mm)</translation>
+    </message>
+    <message>
         <source>C5E (163 x 229 mm)</source>
-        <translation>C5E (163 x 229 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">C5E (163 x 229 mm)</translation>
+    </message>
+    <message>
         <source>DLE (110 x 220 mm)</source>
-        <translation>DLE (110 x 220 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">DLE (110 x 220 mm)</translation>
+    </message>
+    <message>
         <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source>
-        <translation>Executive (7.5 x 10 pollici, 191 x 254 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Executive (7.5 x 10 pollici, 191 x 254 mm)</translation>
+    </message>
+    <message>
         <source>Folio (210 x 330 mm)</source>
-        <translation>Folio (210 x 330 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Folio (210 x 330 mm)</translation>
+    </message>
+    <message>
         <source>Ledger (432 x 279 mm)</source>
-        <translation>Ledger (432 x 279 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Ledger (432 x 279 mm)</translation>
+    </message>
+    <message>
         <source>Legal (8.5 x 14 inches, 216 x 356 mm)</source>
-        <translation>Legal (8.5 x 14 pollici, 216 x 356 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Legal (8.5 x 14 pollici, 216 x 356 mm)</translation>
+    </message>
+    <message>
         <source>Letter (8.5 x 11 inches, 216 x 279 mm)</source>
-        <translation>Letter (8.5 x 11 pollici, 216 x 279 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Letter (8.5 x 11 pollici, 216 x 279 mm)</translation>
+    </message>
+    <message>
         <source>Tabloid (279 x 432 mm)</source>
-        <translation>Tabloid (279 x 432 mm)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Tabloid (279 x 432 mm)</translation>
+    </message>
+    <message>
         <source>US Common #10 Envelope (105 x 241 mm)</source>
-        <translation>US Common #10 Busta (105 x 241 mm)</translation>
-    </message>
-    <message>
-        <location line="+17"/>
+        <translation type="obsolete">US Common #10 Busta (105 x 241 mm)</translation>
+    </message>
+    <message>
         <source>Print all</source>
-        <translation>Stampa tutto</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Stampa tutto</translation>
+    </message>
+    <message>
         <source>Print selection</source>
-        <translation>Stampa selezione</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Stampa selezione</translation>
+    </message>
+    <message>
         <source>Print range</source>
-        <translation>Stampa intervallo</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Stampa intervallo</translation>
+    </message>
+    <message>
         <source>Print current page</source>
-        <translation>Stampa la pagina corrente</translation>
-    </message>
-    <message>
-        <location filename="../../../octave-qt/qprintdialog_unix.cpp" line="-844"/>
-        <location line="+68"/>
+        <translation type="obsolete">Stampa la pagina corrente</translation>
+    </message>
+    <message>
         <source>&amp;Options &gt;&gt;</source>
-        <translation>&amp;Opzioni&gt;&gt;</translation>
-    </message>
-    <message>
-        <location line="-63"/>
+        <translation type="obsolete">&amp;Opzioni&gt;&gt;</translation>
+    </message>
+    <message>
         <source>&amp;Print</source>
-        <translation>&amp;Stampa</translation>
-    </message>
-    <message>
-        <location line="+67"/>
+        <translation type="obsolete">&amp;Stampa</translation>
+    </message>
+    <message>
         <source>&amp;Options &lt;&lt;</source>
-        <translation>&amp;Opzioni</translation>
-    </message>
-    <message>
-        <location line="+260"/>
+        <translation type="obsolete">&amp;Opzioni</translation>
+    </message>
+    <message>
         <source>Print to File (PDF)</source>
-        <translation>Stampa su file (PDF)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Stampa su file (PDF)</translation>
+    </message>
+    <message>
         <source>Print to File (Postscript)</source>
-        <translation>Stampa su file (Postscript)</translation>
-    </message>
-    <message>
-        <location line="+47"/>
+        <translation type="obsolete">Stampa su file (Postscript)</translation>
+    </message>
+    <message>
         <source>Local file</source>
-        <translation>File locale</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">File locale</translation>
+    </message>
+    <message>
         <source>Write %1 file</source>
-        <translation>Scrivi %1 file</translation>
-    </message>
-    <message>
-        <location line="+71"/>
+        <translation type="obsolete">Scrivi %1 file</translation>
+    </message>
+    <message>
         <source>Print To File...</source>
-        <translation>Stampa su file...</translation>
-    </message>
-    <message>
-        <location line="+78"/>
+        <translation type="obsolete">Stampa su file...</translation>
+    </message>
+    <message>
         <source>%1 is a directory.
 Please choose a different file name.</source>
-        <translation>%1 è una cartella.
+        <translation type="obsolete">%1 è una cartella.
 Si prega di scegliere un altro nome.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>File %1 is not writable.
 Please choose a different file name.</source>
-        <translation>%1 non è scrivibile.
+        <translation type="obsolete">%1 non è scrivibile.
 Si prega di scegliere un altro nome.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 already exists.
 Do you want to overwrite it?</source>
-        <translation>%1 esiste già.
+        <translation type="obsolete">%1 esiste già.
 Si desidera sovrascriverlo?</translation>
     </message>
     <message>
-        <location filename="../../../octave-qt/qprintdialog_win.cpp" line="+1"/>
         <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
-        <translation>Il valore &apos;Da&apos; non può superare il valore &apos;A&apos;.</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Il valore &apos;Da&apos; non può superare il valore &apos;A&apos;.</translation>
+    </message>
+    <message>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
 </context>
 <context>
     <name>QPrintPreviewDialog</name>
     <message>
-        <location filename="../../../octave-qt/qabstractpagesetupdialog.cpp" line="+68"/>
-        <location line="+12"/>
         <source>Page Setup</source>
-        <translation>Formato Pagina</translation>
+        <translation type="obsolete">Formato Pagina</translation>
     </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+121"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+125"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -954,7 +779,12 @@
         <translation>Incolla</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
+        <source>Select All</source>
+        <translation>Seleziona Tutto</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Clear All</source>
         <translation>Pulisci tutto</translation>
     </message>
@@ -962,7 +792,7 @@
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1667"/>
         <source>copied selection to clipboard</source>
         <translation>selezione copiata negli appunti</translation>
     </message>
@@ -970,667 +800,649 @@
 <context>
     <name>QsciLexerBash</name>
     <message>
-        <location filename="../../../qsci/qscilexerbash.cpp" line="+208"/>
         <source>Default</source>
-        <translation>Default</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Default</translation>
+    </message>
+    <message>
         <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Errore</translation>
+    </message>
+    <message>
         <source>Comment</source>
-        <translation>Commento</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento</translation>
+    </message>
+    <message>
         <source>Number</source>
-        <translation>Numero</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Numero</translation>
+    </message>
+    <message>
         <source>Keyword</source>
-        <translation>Parola chiave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parola chiave</translation>
+    </message>
+    <message>
         <source>Double-quoted string</source>
-        <translation>Stringa con doppi apici</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con doppi apici</translation>
+    </message>
+    <message>
         <source>Single-quoted string</source>
-        <translation>Stringa con singoli apici</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con singoli apici</translation>
+    </message>
+    <message>
         <source>Operator</source>
-        <translation>Operatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Operatore</translation>
+    </message>
+    <message>
         <source>Identifier</source>
-        <translation>Identificatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Identificatore</translation>
+    </message>
+    <message>
         <source>Scalar</source>
-        <translation>Scalare</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Scalare</translation>
+    </message>
+    <message>
         <source>Parameter expansion</source>
-        <translation>Espansione dei parametri</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Espansione dei parametri</translation>
+    </message>
+    <message>
         <source>Backticks</source>
-        <translation>Apici inversi</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Apici inversi</translation>
+    </message>
+    <message>
         <source>Here document delimiter</source>
-        <translation>Delimitatore dello "here document"</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Delimitatore dello &quot;here document&quot;</translation>
+    </message>
+    <message>
         <source>Single-quoted here document</source>
-        <translation>"Here document" delimitato da singoli apici</translation>
+        <translation type="obsolete">&quot;Here document&quot; delimitato da singoli apici</translation>
     </message>
 </context>
 <context>
     <name>QsciLexerBatch</name>
     <message>
-        <location filename="../../../qsci/qscilexerbatch.cpp" line="+179"/>
         <source>Default</source>
-        <translation>Default</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Default</translation>
+    </message>
+    <message>
         <source>Comment</source>
-        <translation>Commento</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento</translation>
+    </message>
+    <message>
         <source>Keyword</source>
-        <translation>Parola chiave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parola chiave</translation>
+    </message>
+    <message>
         <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Etichetta</translation>
+    </message>
+    <message>
         <source>Hide command character</source>
-        <translation>Nascondi caratteri di comando</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Nascondi caratteri di comando</translation>
+    </message>
+    <message>
         <source>External command</source>
-        <translation>Comando esterno</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Comando esterno</translation>
+    </message>
+    <message>
         <source>Variable</source>
-        <translation>Variabile</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Variabile</translation>
+    </message>
+    <message>
         <source>Operator</source>
-        <translation>Operatore</translation>
+        <translation type="obsolete">Operatore</translation>
     </message>
 </context>
 <context>
     <name>QsciLexerCPP</name>
     <message>
-        <location filename="../../../qsci/qscilexercpp.cpp" line="+352"/>
         <source>Default</source>
-        <translation>Default</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Default</translation>
+    </message>
+    <message>
         <source>Inactive default</source>
-        <translation>Default inattivo</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Default inattivo</translation>
+    </message>
+    <message>
         <source>C comment</source>
-        <translation>Commento C</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento C</translation>
+    </message>
+    <message>
         <source>Inactive C comment</source>
-        <translation>Commento C inattivo</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento C inattivo</translation>
+    </message>
+    <message>
         <source>C++ comment</source>
-        <translation>Commento C++</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento C++</translation>
+    </message>
+    <message>
         <source>Inactive C++ comment</source>
-        <translation>Commento C++ inattivo</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento C++ inattivo</translation>
+    </message>
+    <message>
         <source>JavaDoc style C comment</source>
-        <translation>Commento C in stile JavaDoc</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento C in stile JavaDoc</translation>
+    </message>
+    <message>
         <source>Inactive JavaDoc style C comment</source>
-        <translation>Commento C inattivo in stile JavaDoc</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento C inattivo in stile JavaDoc</translation>
+    </message>
+    <message>
         <source>Number</source>
-        <translation>Numero</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Numero</translation>
+    </message>
+    <message>
         <source>Inactive number</source>
-        <translation>Numero inattivo</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Numero inattivo</translation>
+    </message>
+    <message>
         <source>Keyword</source>
-        <translation>Parola chiave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parola chiave</translation>
+    </message>
+    <message>
         <source>Inactive keyword</source>
-        <translation>Parola chiave inattiva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parola chiave inattiva</translation>
+    </message>
+    <message>
         <source>Double-quoted string</source>
-        <translation>Stringa con doppi apici</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con doppi apici</translation>
+    </message>
+    <message>
         <source>Inactive double-quoted string</source>
-        <translation>Stringa con doppi apici inattiva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con doppi apici inattiva</translation>
+    </message>
+    <message>
         <source>Single-quoted string</source>
-        <translation>Stringa con singoli apici</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con singoli apici</translation>
+    </message>
+    <message>
         <source>Inactive single-quoted string</source>
-        <translation>Stringa con singoli apici inattiva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con singoli apici inattiva</translation>
+    </message>
+    <message>
         <source>IDL UUID</source>
-        <translation>UUID IDL</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">UUID IDL</translation>
+    </message>
+    <message>
         <source>Inactive IDL UUID</source>
-        <translation>UUID IDL inattivo</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">UUID IDL inattivo</translation>
+    </message>
+    <message>
         <source>Pre-processor block</source>
-        <translation>Blocco per il precompilatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Blocco per il precompilatore</translation>
+    </message>
+    <message>
         <source>Inactive pre-processor block</source>
-        <translation>Blocco inattivo per il precompilatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Blocco inattivo per il precompilatore</translation>
+    </message>
+    <message>
         <source>Operator</source>
-        <translation>Operatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Operatore</translation>
+    </message>
+    <message>
         <source>Inactive operator</source>
-        <translation>Operatore inattivo</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Operatore inattivo</translation>
+    </message>
+    <message>
         <source>Identifier</source>
-        <translation>Identificatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Identificatore</translation>
+    </message>
+    <message>
         <source>Inactive identifier</source>
-        <translation>Identificatore inattivo</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Identificatore inattivo</translation>
+    </message>
+    <message>
         <source>Unclosed string</source>
-        <translation>Stringa non terminata</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa non terminata</translation>
+    </message>
+    <message>
         <source>Inactive unclosed string</source>
-        <translation>Stringa non terminata inattiva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa non terminata inattiva</translation>
+    </message>
+    <message>
         <source>C# verbatim string</source>
-        <translation>Stringa senza formattazione C#</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa senza formattazione C#</translation>
+    </message>
+    <message>
         <source>Inactive C# verbatim string</source>
-        <translation>Stringa senza formattazione C# inattiva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa senza formattazione C# inattiva</translation>
+    </message>
+    <message>
         <source>JavaScript regular expression</source>
-        <translation>Espressione regolare JavaScript</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Espressione regolare JavaScript</translation>
+    </message>
+    <message>
         <source>Inactive JavaScript regular expression</source>
-        <translation>Espressione regolare JavaScript inattiva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Espressione regolare JavaScript inattiva</translation>
+    </message>
+    <message>
         <source>JavaDoc style C++ comment</source>
-        <translation>Commento C++ in stile JavaDoc</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento C++ in stile JavaDoc</translation>
+    </message>
+    <message>
         <source>Inactive JavaDoc style C++ comment</source>
-        <translation>Commento C++ inattivo in stile JavaDoc</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento C++ inattivo in stile JavaDoc</translation>
+    </message>
+    <message>
         <source>Secondary keywords and identifiers</source>
-        <translation>Parole chiave ed identificatori secondari</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parole chiave ed identificatori secondari</translation>
+    </message>
+    <message>
         <source>Inactive secondary keywords and identifiers</source>
-        <translation>Parole chiave ed identificatori secondari inattivi</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parole chiave ed identificatori secondari inattivi</translation>
+    </message>
+    <message>
         <source>JavaDoc keyword</source>
-        <translation>Parola chiave JavaDoc</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parola chiave JavaDoc</translation>
+    </message>
+    <message>
         <source>Inactive JavaDoc keyword</source>
-        <translation>Parola chiave JavaDoc inattiva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parola chiave JavaDoc inattiva</translation>
+    </message>
+    <message>
         <source>JavaDoc keyword error</source>
-        <translation>Errore in una parola chiave JavaDoc</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Errore in una parola chiave JavaDoc</translation>
+    </message>
+    <message>
         <source>Inactive JavaDoc keyword error</source>
-        <translation>Errore in una parola chiave JavaDoc inattiva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Errore in una parola chiave JavaDoc inattiva</translation>
+    </message>
+    <message>
         <source>Global classes and typedefs</source>
-        <translation>Classi e typedef globali</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Classi e typedef globali</translation>
+    </message>
+    <message>
         <source>Inactive global classes and typedefs</source>
-        <translation>Classi e typedef globali inattivi</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Classi e typedef globali inattivi</translation>
+    </message>
+    <message>
         <source>Stringa C++ </source>
-        <translation>Stringa "raw" C++</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa &quot;raw&quot; C++</translation>
+    </message>
+    <message>
         <source>Inactive C++ raw string</source>
-        <translation>Stringa "raw" C++ inattiva</translation>
+        <translation type="obsolete">Stringa &quot;raw&quot; C++ inattiva</translation>
     </message>
 </context>
 <context>
     <name>QsciLexerDiff</name>
     <message>
-        <location filename="../../../qsci/qscilexerdiff.cpp" line="+107"/>
         <source>Default</source>
-        <translation>Default</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Default</translation>
+    </message>
+    <message>
         <source>Comment</source>
-        <translation>Commento</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento</translation>
+    </message>
+    <message>
         <source>Command</source>
-        <translation>Comando</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Comando</translation>
+    </message>
+    <message>
         <source>Header</source>
-        <translation>Intestazione</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Intestazione</translation>
+    </message>
+    <message>
         <source>Position</source>
-        <translation>Posizione</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Posizione</translation>
+    </message>
+    <message>
         <source>Removed line</source>
-        <translation>Riga rimossa</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Riga rimossa</translation>
+    </message>
+    <message>
         <source>Added line</source>
-        <translation>Riga aggiunta</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Riga aggiunta</translation>
+    </message>
+    <message>
         <source>Changed line</source>
-        <translation>Riga modificata</translation>
+        <translation type="obsolete">Riga modificata</translation>
     </message>
 </context>
 <context>
     <name>QsciLexerMatlab</name>
     <message>
-        <location filename="../../../qsci/qscilexermatlab.cpp" line="+138"/>
         <source>Default</source>
-        <translation>Default</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Default</translation>
+    </message>
+    <message>
         <source>Comment</source>
-        <translation>Commento</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento</translation>
+    </message>
+    <message>
         <source>Command</source>
-        <translation>Comando</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Comando</translation>
+    </message>
+    <message>
         <source>Number</source>
-        <translation>Numero</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Numero</translation>
+    </message>
+    <message>
         <source>Keyword</source>
-        <translation>Parola chiave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parola chiave</translation>
+    </message>
+    <message>
         <source>Single-quoted string</source>
-        <translation>Stringa con singoli apici</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con singoli apici</translation>
+    </message>
+    <message>
         <source>Operator</source>
-        <translation>Operatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Operatore</translation>
+    </message>
+    <message>
         <source>Identifier</source>
-        <translation>Identificatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Identificatore</translation>
+    </message>
+    <message>
         <source>Double-quoted string</source>
-        <translation>Stringa con doppi apici</translation>
+        <translation type="obsolete">Stringa con doppi apici</translation>
     </message>
 </context>
 <context>
     <name>QsciLexerPerl</name>
     <message>
-        <location filename="../../../qsci/qscilexerperl.cpp" line="+333"/>
         <source>Default</source>
-        <translation>Default</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Default</translation>
+    </message>
+    <message>
         <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Errore</translation>
+    </message>
+    <message>
         <source>Comment</source>
-        <translation>Commento</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Commento</translation>
+    </message>
+    <message>
         <source>POD</source>
-        <translation>POD</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">POD</translation>
+    </message>
+    <message>
         <source>Number</source>
-        <translation>Numero</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Numero</translation>
+    </message>
+    <message>
         <source>Keyword</source>
-        <translation>Parola chiave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Parola chiave</translation>
+    </message>
+    <message>
         <source>Double-quoted string</source>
-        <translation>Stringa con doppi apici</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con doppi apici</translation>
+    </message>
+    <message>
         <source>Single-quoted string</source>
-        <translation>Stringa con apici singoli</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con apici singoli</translation>
+    </message>
+    <message>
         <source>Operator</source>
-        <translation>Operatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Operatore</translation>
+    </message>
+    <message>
         <source>Identifier</source>
-        <translation>Identificatore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Identificatore</translation>
+    </message>
+    <message>
         <source>Scalar</source>
-        <translation>Scalare</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Scalare</translation>
+    </message>
+    <message>
         <source>Array</source>
-        <translation>Vettore</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Vettore</translation>
+    </message>
+    <message>
         <source>Hash</source>
-        <translation>Hash</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Hash</translation>
+    </message>
+    <message>
         <source>Symbol table</source>
-        <translation>Tabella dei simboli</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Tabella dei simboli</translation>
+    </message>
+    <message>
         <source>Regular expression</source>
-        <translation>Espressione regolare</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Espressione regolare</translation>
+    </message>
+    <message>
         <source>Substitution</source>
-        <translation>Sostituzione</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Sostituzione</translation>
+    </message>
+    <message>
         <source>Backticks</source>
-        <translation>Apici inversi</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Apici inversi</translation>
+    </message>
+    <message>
         <source>Data section</source>
-        <translation>Sezione dati</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Sezione dati</translation>
+    </message>
+    <message>
         <source>Here document delimiter</source>
-        <translation>Delimitatore dello "here document"</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Delimitatore dello &quot;here document&quot;</translation>
+    </message>
+    <message>
         <source>Single-quoted here document</source>
-        <translation>"Here document" delimitato da apici singoli</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">&quot;Here document&quot; delimitato da apici singoli</translation>
+    </message>
+    <message>
         <source>Double-quoted here document</source>
-        <translation>"Here document" delimitato da doppi apici</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">&quot;Here document&quot; delimitato da doppi apici</translation>
+    </message>
+    <message>
         <source>Backtick here document</source>
-        <translation>"Here document" delimitato da apici inversi</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">&quot;Here document&quot; delimitato da apici inversi</translation>
+    </message>
+    <message>
         <source>Quoted string (q)</source>
-        <translation>Stringa delimitata da apici (q)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa delimitata da apici (q)</translation>
+    </message>
+    <message>
         <source>Quoted string (qq)</source>
-        <translation>Stringa delimitata da apici (qq)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa delimitata da apici (qq)</translation>
+    </message>
+    <message>
         <source>Quoted string (qx)</source>
-        <translation>Stringa delimitata da apici (qx)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa delimitata da apici (qx)</translation>
+    </message>
+    <message>
         <source>Quoted string (qr)</source>
-        <translation>Stringa delimitata da apici (qr)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa delimitata da apici (qr)</translation>
+    </message>
+    <message>
         <source>Quoted string (qw)</source>
-        <translation>Stringa delimitata da apici (qw)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa delimitata da apici (qw)</translation>
+    </message>
+    <message>
         <source>POD verbatim</source>
-        <translation>POD senza formattazione</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">POD senza formattazione</translation>
+    </message>
+    <message>
         <source>Subroutine prototype</source>
-        <translation>Prototipo di subroutine</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Prototipo di subroutine</translation>
+    </message>
+    <message>
         <source>Format identifier</source>
-        <translation>Identificatore del formato</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Identificatore del formato</translation>
+    </message>
+    <message>
         <source>Format body</source>
-        <translation>Corpo del formato</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Corpo del formato</translation>
+    </message>
+    <message>
         <source>Double-quoted string (interpolated variable)</source>
-        <translation>Stringa con doppi apici (variabile interpolata)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa con doppi apici (variabile interpolata)</translation>
+    </message>
+    <message>
         <source>Translation</source>
-        <translation>Traduzione</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Traduzione</translation>
+    </message>
+    <message>
         <source>Regular expression (interpolated variable)</source>
-        <translation>Espressione regolare (variabile interpolata)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Espressione regolare (variabile interpolata)</translation>
+    </message>
+    <message>
         <source>Substitution (interpolated variable)</source>
-        <translation>Sostituzione (variabile interpolata)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Sostituzione (variabile interpolata)</translation>
+    </message>
+    <message>
         <source>Backticks (interpolated variable)</source>
-        <translation>Apici inversi (variabile interpolata)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Apici inversi (variabile interpolata)</translation>
+    </message>
+    <message>
         <source>Double-quoted here document (interpolated variable)</source>
-        <translation>"Here document" delimitato da doppi apici (variabile interpolata)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">&quot;Here document&quot; delimitato da doppi apici (variabile interpolata)</translation>
+    </message>
+    <message>
         <source>Backtick here document (interpolated variable)</source>
-        <translation>Here document" delimitato da apici inversi (variabile interpolata)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Here document&quot; delimitato da apici inversi (variabile interpolata)</translation>
+    </message>
+    <message>
         <source>Quoted string (qq, interpolated variable)</source>
-        <translation>Stringa delimitata da apici (qq, variabile interpolata)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa delimitata da apici (qq, variabile interpolata)</translation>
+    </message>
+    <message>
         <source>Quoted string (qx, interpolated variable)</source>
-        <translation>Stringa delimitata da apici (qx, variabile interpolata)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Stringa delimitata da apici (qx, variabile interpolata)</translation>
+    </message>
+    <message>
         <source>Quoted string (qr, interpolated variable)</source>
-        <translation>Stringa delimitata da apici (qr, variabile interpolata)</translation>
+        <translation type="obsolete">Stringa delimitata da apici (qr, variabile interpolata)</translation>
     </message>
 </context>
 <context>
     <name>QsciScintilla</name>
     <message>
-        <location filename="../../../qsci/qsciscintilla.cpp" line="+4201"/>
         <source>&amp;Undo</source>
-        <translation>&amp;Annulla</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <translation type="obsolete">&amp;Annulla</translation>
+    </message>
+    <message>
         <source>&amp;Redo</source>
-        <translation>&amp;Ripeti</translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <translation type="obsolete">&amp;Ripeti</translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation type="obsolete">&amp;Taglia</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Copia</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation type="obsolete">&amp;Incolla</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">&amp;Cancella</translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation type="obsolete">Seleziona Tutto</translation>
+    </message>
+</context>
+<context>
+    <name>QtHandles::Figure</name>
+    <message>
+        <location filename="../graphics/Figure.cc" line="+170"/>
+        <source>Figure ToolBar</source>
+        <translation>Barra degli strumenti delle figure</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;File</source>
+        <translation>&amp;File</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;New Figure</source>
+        <translation>&amp;Nuova Figura</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Open...</source>
+        <translation>&amp;Apri...</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Salva</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save &amp;As</source>
+        <translation>Salva &amp;Come</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Close Figure</source>
+        <translation>&amp;Chiudi Figura</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Modifica</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cop&amp;y</source>
+        <translation>Co&amp;pia</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Taglia</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Incolla</translation>
+    </message>
+    <message>
         <location line="+5"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copia</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Incolla</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Delete</source>
-        <translation>&amp;Cancella</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Select All</source>
-        <translation>Seleziona Tutto</translation>
+        <source>&amp;Help</source>
+        <translation>Ai&amp;uto</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;About QtHandles</source>
+        <translation>A Proposito di Qt&amp;Handles</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>About &amp;Qt</source>
+        <translation>A Proposito di &amp;Qt</translation>
+    </message>
+    <message>
+        <location line="+391"/>
+        <source>About QtHandles</source>
+        <translation>A Proposito di QtHandles</translation>
+    </message>
+</context>
+<context>
+    <name>QtHandles::MouseModeActionGroup</name>
+    <message>
+        <location filename="../graphics/MouseModeActionGroup.cc" line="+40"/>
+        <source>Rotate</source>
+        <translation>Ruota</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Zoom</source>
+        <translation>Zoom</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pan</source>
+        <translation>Panoramica</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select</source>
+        <translation>Seleziona</translation>
+    </message>
+</context>
+<context>
+    <name>S:</name>
+    <message>
+        <location filename="../../gnulib-hg/lib/quotearg.c" line="+291"/>
+        <source></source>
+        <comment>Get translations for open and closing quotation marks. The message catalog should translate &quot;`&quot; to a left quotation mark suitable for the locale, and similarly for &quot;&apos;&quot;. For example, a French Unicode local should translate these to U+00AB (LEFT-POINTING DOUBLE ANGLE QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK), respectively. If the catalog has no translation, we will try to use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the current locale is not Unicode, locale_quoting_style will quote &apos;like this&apos;, and clocale_quoting_style will quote &quot;like this&quot;. You should always include translations for &quot;`&quot; and &quot;&apos;&quot; even if U+2018 and U+2019 are appropriate for your locale. If you don&apos;t know what to put here, please see &lt;http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages&gt; and use glyphs suitable for your language.</comment>
+        <translatorcomment>TODO</translatorcomment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1649,16 +1461,17 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+346"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+270"/>
+        <location line="+125"/>
         <location line="+22"/>
         <location line="+18"/>
-        <location line="+59"/>
+        <location line="+62"/>
         <location line="+28"/>
         <source>Octave Editor</source>
         <translation>Editor di Octave</translation>
     </message>
     <message>
-        <location line="-269"/>
+        <location line="-314"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>File di Octave (*.m);;Tutti i File (*)</translation>
     </message>
@@ -1674,48 +1487,46 @@
         <translation>Nome della nuova funzione:</translation>
     </message>
     <message>
-        <location line="+281"/>
+        <location line="+326"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
-        <translation>File non alvato! Un file chiamato
+        <translation>File non salvato! Un file chiamato
 %1
-è già aperto nell'editor</translation>
-    </message>
-    <message>
-        <location line="+268"/>
+è già aperto nell&apos;editor</translation>
+    </message>
+    <message>
+        <location line="+376"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+207"/>
+        <location line="+380"/>
         <source>&amp;Save File</source>
-        <translation>&amp;Salva</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <translation>&amp;Salva File</translation>
+    </message>
+    <message>
         <source>&amp;Open File...</source>
-        <translation>&amp;Apri...</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <translation type="obsolete">&amp;Apri...</translation>
+    </message>
+    <message>
         <source>&amp;New Script</source>
-        <translation>&amp;Nuovo Script</translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <translation type="obsolete">&amp;Nuovo Script</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Save File &amp;As...</source>
         <translation>Salva &amp;Come...</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+17"/>
         <source>Print...</source>
         <translation>Stampa...</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>&amp;Undo</source>
-        <translation>&amp;Annulla</translation>
+        <translation>Annu&amp;lla</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1723,42 +1534,187 @@
         <translation>&amp;Ripeti</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copia</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <source>Cu&amp;t</source>
+        <translation>&amp;Taglia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste</source>
+        <translation>Incolla</translation>
+    </message>
+    <message>
         <location line="+4"/>
-        <source>Cu&amp;t</source>
-        <translation>&amp;Taglia</translation>
+        <source>Select All</source>
+        <translation>Seleziona Tutto</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Commands</source>
+        <translation>Co&amp;mandi</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete Line</source>
+        <translation>Cancella riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy Line</source>
+        <translation>Copia riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cut Line</source>
+        <translation>Taglia riga</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete to Start of Word</source>
+        <translation>Cancella fino a inizio parola</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to End of Word</source>
+        <translation>Cancella fino a fine parola</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to Start of Line</source>
+        <translation>Cancella fino a inizio riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to End of Line</source>
+        <translation>Cancella fino a fine riga</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Paste</source>
-        <translation>Incolla</translation>
+        <source>Duplicate Selection/Line</source>
+        <translation>Duplica selezion/riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose Line</source>
+        <translation>Trasponi riga</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Show Completion List</source>
+        <translation>Mostra &amp;lista di completamento</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Format</source>
+        <translation>&amp;Formatta</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Uppercase Selection</source>
+        <translation>Rendi &amp;Maiuscola la selezione</translation>
     </message>
     <message>
         <location line="+2"/>
+        <source>&amp;Lowercase Selection</source>
+        <translation>Rendi Mi&amp;nuscola la selezione</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Convert Line Endings to &amp;Windows (CRLF)</source>
+        <translation>A Capo in Stile &amp;Windows (CRLF)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Convert Line Endings to &amp;Unix (LF)</source>
+        <translation>A Capo in Stile &amp;Unix (LF)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Convert Line Endings to &amp;Mac (CR)</source>
+        <translation>A Capo in Stile &amp;Mac (CR)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Navi&amp;gation</source>
+        <translation>Navi&amp;gazione</translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&amp;Next Bookmark</source>
-        <translation>&amp;Segnalibro Successivo</translation>
+        <translation>Segnalibro &amp;Successivo</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
-        <translation>Seg&amp;nalibro Precedente</translation>
+        <translation>Segnalibro &amp;Precedente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Toggle &amp;Bookmark</source>
+        <translation>Attiva/disattiva &amp;Segnalibro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation>&amp;Elimina Tutti i Segnalibri</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;View</source>
+        <translation>&amp;Vista</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Editor</source>
+        <translation>&amp;Editor</translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Toggle &amp;Bookmark</source>
-        <translation>Attiva/disattiva &amp;Segnalibro</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>&amp;Remove All Bookmarks</source>
-        <translation>Elimina Tutti i Segnalibri</translation>
+        <source>Show &amp;Line Numbers</source>
+        <translation>Mostra Numeri di &amp;Riga</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;White Spaces</source>
+        <translation>Mostra &amp;Spazi</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Mostra a &amp;Capo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Indentation Guides</source>
+        <translation>Mostre Guide &amp;Indentazione</translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show Long Line &amp;Marker</source>
+        <translation>Mostra &amp;Marcatori di Linea Lunga</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Zoom &amp;In</source>
+        <translation>&amp;Ingrandisci</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Zoom &amp;Out</source>
+        <translation>&amp;Riduci</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Normal Size</source>
+        <translation>Dimensione &amp;Normale</translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>&amp;Next Breakpoint</source>
         <translation>&amp;Breakpoint Successivo</translation>
     </message>
@@ -1768,17 +1724,17 @@
         <translation>&amp;Breakpoint Precedente</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-6"/>
         <source>Toggle &amp;Breakpoint</source>
-        <translation>Attiva/disattiva &amp;Breakpoint</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation>Attiva/Disattiva &amp;Breakpoint</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>&amp;Remove All Breakpoints</source>
         <translation>&amp;Rimuovi Tutti i Breakpoint</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-99"/>
         <source>&amp;Comment</source>
         <translation>&amp;Commenta</translation>
     </message>
@@ -1788,67 +1744,74 @@
         <translation>&amp;Decommenta</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+5"/>
         <source>&amp;Indent</source>
         <translation>&amp;Indenta</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Unindent</source>
-        <translation>&amp;Rimuovi indentazione</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation>&amp;Rimuovi Indentazione</translation>
+    </message>
+    <message>
+        <location line="-55"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Trova e Sostituisci...</translation>
     </message>
     <message>
+        <location line="+157"/>
+        <source>Save File and Run</source>
+        <translation>Salva ed Esegui</translation>
+    </message>
+    <message>
+        <location line="-85"/>
+        <source>Go &amp;to Line...</source>
+        <translation>Vai &amp;alla Riga...</translation>
+    </message>
+    <message>
+        <location line="-1106"/>
+        <source>Could not start custom file editor
+%1</source>
+        <translation>Impossibile avviare l&apos;editor di file personalizzato
+%1</translation>
+    </message>
+    <message>
+        <location line="+970"/>
+        <source>&amp;Recent Editor Files</source>
+        <translation>&amp;Documenti Recenti</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit Function</source>
+        <translation>&amp;Modifica Funzione</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Chiudi</translation>
+    </message>
+    <message>
         <location line="+3"/>
-        <source>Save File and Run</source>
-        <translation>Salva ed Esegui</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Go &amp;to Line...</source>
-        <translation>Vai &amp;alla Riga...</translation>
-    </message>
-    <message>
-        <location line="+57"/>
-        <source>&amp;Recent Editor Files</source>
-        <translation>&amp;Documenti Recenti</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>&amp;Edit Function</source>
-        <translation>&amp;Modifica Funzione</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Chiudi</translation>
-    </message>
-    <message>
-        <location line="+4"/>
         <source>Close All</source>
-        <translation>&amp;Chiudi Tutto</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <translation>Chiudi Tutto</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Close Other Files</source>
         <translation>Chiudi gli Altri File</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+126"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferenze...</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>&amp;Styles Preferences...</source>
         <translation>&amp;Preferenze di stile...</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+67"/>
         <source>Run &amp;Selection</source>
         <translation>Esegui &amp;Selezione</translation>
     </message>
@@ -1858,17 +1821,17 @@
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>&amp;Help on Keyword</source>
         <translation>&amp;Aiuto su Parola Chiave</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>&amp;Documentation on Keyword</source>
-        <translation>&amp;Documentaizone sulla Parola Chiave</translation>
-    </message>
-    <message>
-        <location line="-790"/>
+        <translation>&amp;Documentazione sulla Parola Chiave</translation>
+    </message>
+    <message>
+        <location line="-1078"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -1895,32 +1858,31 @@
 in scrittura: %2.</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+90"/>
         <source>The associated file editor tab has disappeared.</source>
-        <translation>La scheda corrispondente nell'editor è scomparsa.</translation>
-    </message>
-    <message>
-        <location line="+567"/>
+        <translation>La scheda corrispondente nell&apos;editor è scomparsa.</translation>
+    </message>
+    <message>
+        <location line="+712"/>
         <source>&amp;File</source>
-        <translation>File</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <translation>&amp;File</translation>
+    </message>
+    <message>
         <source>New &amp;Function...</source>
-        <translation>Nuova &amp;Funzione...</translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <translation type="obsolete">Nuova &amp;Funzione...</translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>&amp;Edit</source>
         <translation>&amp;Modifica</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+161"/>
         <source>&amp;Debug</source>
         <translation>&amp;Debug</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+21"/>
         <source>&amp;Run</source>
         <translation>&amp;Esegui</translation>
     </message>
@@ -1928,7 +1890,42 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+106"/>
+        <source>eol:</source>
+        <translation>fine della riga:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>line:</source>
+        <translation>riga:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>col:</source>
+        <translation>riga:</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>%1 is a built-in function</source>
+        <translation>%1 è una funzione built-in</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Can not find function %1</source>
+        <translation>Impossibile trovare la funzione %1</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+953"/>
+        <location line="+228"/>
+        <location line="+117"/>
+        <location line="+75"/>
+        <location line="+23"/>
+        <source>Octave Editor</source>
+        <translation>Editor di Octave</translation>
+    </message>
+    <message>
+        <location line="-651"/>
         <source>Goto line</source>
         <translation>Vai alla riga</translation>
     </message>
@@ -1938,8 +1935,8 @@
         <translation>Numero riga</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location line="+69"/>
+        <location line="+134"/>
+        <location line="+70"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;senza nome&gt;</translation>
     </message>
@@ -1951,19 +1948,10 @@
     <message>
         <location line="+5"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
-        <translation>Si desidera annullare l'operazione di chiusura, salvare o annullare le modifiche?</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+123"/>
-        <location line="+112"/>
-        <location line="+69"/>
-        <location line="+22"/>
-        <source>Editor di Octave</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="-325"/>
+        <translation>Si desidera annullare l&apos;operazione di chiusura, salvare o annullare le modifiche?</translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>The file
 %1
 is about to be closed but has been modified.
@@ -1974,17 +1962,18 @@
 %2</translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+313"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>File di Octave (*.m);;Tutti i File (*)</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+123"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
         <translation>
-Attenzione: il contenuto nell'editor è modificato!</translation>
+
+Attenzione: il contenuto nell&apos;editor è modificato!</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -1996,24 +1985,22 @@
 sia stato rinominato o rimosso. Si desidera salvarlo ora?%2</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-215"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Impossibile aprire  %1 in scrittura:
 %2.</translation>
     </message>
     <message>
-        <location line="-1032"/>
         <source>Line:</source>
-        <translation>Riga:</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="obsolete">Riga:</translation>
+    </message>
+    <message>
         <source>Col:</source>
-        <translation>Car:</translation>
-    </message>
-    <message>
-        <location line="+1141"/>
+        <translation type="obsolete">Car:</translation>
+    </message>
+    <message>
+        <location line="+117"/>
         <source>&quot;%1&quot;
 is not a valid identifier.
 
@@ -2030,9 +2017,9 @@
 Si desidera scegliere un altro nome?</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+75"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
-        <translation>Sembra che &apos;%1&apos; Sia stato modificato da un'altra applicazione. Si desidera ricaricarlo?</translation>
+        <translation>Sembra che &apos;%1&apos; sia stato modificato da un&apos;altra applicazione. Si desidera ricaricarlo?</translation>
     </message>
 </context>
 <context>
@@ -2068,25 +2055,24 @@
         <translation>Scegliere la Cartella del Gestore...</translation>
     </message>
     <message>
-        <location line="+379"/>
+        <location line="+4"/>
+        <location line="+387"/>
         <source>Find Files...</source>
         <translation>Cerca File...</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>New File</source>
-        <translation>Nuovo File</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+333"/>
+        <translation type="obsolete">Nuovo File</translation>
+    </message>
+    <message>
+        <location line="+357"/>
         <source>New Directory</source>
         <translation>Nuova Cartella</translation>
     </message>
     <message>
-        <location line="-656"/>
+        <location line="-676"/>
         <source>Double-click a file to open it</source>
-        <translation>Fai doppio click su un file per aprirlo</translation>
+        <translation>Fare doppio click su un file per aprirlo</translation>
     </message>
     <message>
         <location line="-100"/>
@@ -2111,30 +2097,26 @@
     <message>
         <location line="+7"/>
         <source>Show Home Directory</source>
-        <translation>Mostra la cartella personale</translation>
-    </message>
-    <message>
-        <location line="+16"/>
+        <translation>Mostra la Cartella Personale</translation>
+    </message>
+    <message>
         <source>Search Directory...</source>
-        <translation>Cerca Cartella...</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Find Files...</source>
-        <translation>Cerca File...</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <translation type="obsolete">Cerca Cartella...</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+396"/>
         <source>New File...</source>
         <translation>Nuovo File...</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-393"/>
+        <location line="+396"/>
         <source>New Directory...</source>
         <translation>Nuova Cartella...</translation>
     </message>
     <message>
-        <location line="+297"/>
+        <location line="-99"/>
         <source>File size</source>
         <translation>Dimensione</translation>
     </message>
@@ -2154,14 +2136,14 @@
         <translation>Mostra file nascosti</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+35"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open in Default Application</source>
-        <translation>Apri con l'Applicazione Predefinita</translation>
+        <translation>Apri con l&apos;Applicazione Predefinita</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2184,17 +2166,25 @@
         <translation>Seleziona la Cartella Corrente</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
+        <source>Rename...</source>
+        <translation>Rinomina...</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete...</source>
+        <translation>Elimina...</translation>
+    </message>
+    <message>
         <source>Rename</source>
-        <translation>Rinomina</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation type="obsolete">Rinomina</translation>
+    </message>
+    <message>
         <source>Delete</source>
-        <translation>Elimina</translation>
-    </message>
-    <message>
-        <location line="+108"/>
+        <translation type="obsolete">Elimina</translation>
+    </message>
+    <message>
+        <location line="+115"/>
         <source>Rename file/directory</source>
         <translation>Rinomina file/cartella</translation>
     </message>
@@ -2202,7 +2192,7 @@
         <location line="+1"/>
         <source>Rename file/directory:
 </source>
-        <translation>Rinomina file/cartella
+        <translation>Rinomina file/cartella:
 </translation>
     </message>
     <message>
@@ -2251,7 +2241,7 @@
     <message>
         <location line="+1"/>
         <source>New File.txt</source>
-        <translation>nuovo.txt</translation>
+        <translation>Nuovo.txt</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -2324,8 +2314,8 @@
 &lt;p&gt;Per maggiori informazioni su Octave:&lt;/p&gt;
 &lt;ul&gt;
 &lt;li&gt;visita &lt;a href=&quot;http://octave.org&quot;&gt;http://octave.org&lt;/a&gt; (utilizza un browser esterno)&lt;/li&gt;
-&lt;li&gt;Puoi trovare la documentazione online agl'indirizzi &lt;a href=&quot;http://www.gnu.org/software/octave/doc/interpreter/index.html&quot;&gt;html&lt;/a&gt;- o &lt;a href=&quot;http://www.gnu.org/software/octave/octave.pdf&quot;&gt;pdf&lt;/span&gt;&lt;/a&gt;-document (utilizza un browser esterno)&lt;/li&gt;
-&lt;li&gt;Apri la documentazione dell'interfaccia grafica di Octave utilizzando il meno help&lt;/li&gt;
+&lt;li&gt;Puoi trovare la documentazione online agli indirizzi &lt;a href=&quot;http://www.gnu.org/software/octave/doc/interpreter/index.html&quot;&gt;html&lt;/a&gt;- o &lt;a href=&quot;http://www.gnu.org/software/octave/octave.pdf&quot;&gt;pdf&lt;/span&gt;&lt;/a&gt; (utilizza un browser esterno)&lt;/li&gt;
+&lt;li&gt;Apri la documentazione dell&apos;interfaccia grafica di Octave utilizzando il menu help&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -2340,12 +2330,12 @@
     <message>
         <location line="+3"/>
         <source>Find &amp;what:</source>
-        <translation>Trova:</translation>
+        <translation>T&amp;rova:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Re&amp;place with:</source>
-        <translation>Sostituisci con:</translation>
+        <translation>Sos&amp;tituisci con:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -2355,7 +2345,7 @@
     <message>
         <location line="+1"/>
         <source>Search from &amp;start</source>
-        <translation>Cerca dall'&amp;inizio</translation>
+        <translation>Cerca dall&apos;i&amp;nizio</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2380,7 +2370,7 @@
     <message>
         <location line="+1"/>
         <source>Replace &amp;All</source>
-        <translation>&amp;Sostituisci Tutto</translation>
+        <translation>S&amp;ostituisci Tutto</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2390,35 +2380,35 @@
     <message>
         <location line="+13"/>
         <source>&amp;Whole words</source>
-        <translation>Parole &amp;intere</translation>
+        <translation>Paro&amp;le intere</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Regular E&amp;xpressions</source>
-        <translation>Espressioni &amp;Regolari</translation>
+        <translation>Espressioni Re&amp;golari</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search &amp;backward</source>
-        <translation>Cerca indietro</translation>
+        <translation>Cerca &amp;indietro</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search se&amp;lection</source>
-        <translation>Cerca nella selezione</translation>
-    </message>
-    <message>
-        <location line="+72"/>
+        <translation>Cerca nella sele&amp;zione</translation>
+    </message>
+    <message>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Cerca dalla fine</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Search from start</source>
-        <translation>Cerca dall'inizio</translation>
-    </message>
-    <message>
-        <location line="+119"/>
+        <translation>Cerca dall&apos;inizio</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <source>Replace Result</source>
         <translation>Sostituisci Risultato</translation>
     </message>
@@ -2428,14 +2418,14 @@
         <translation>%1 occorrenze sostituite</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Find Result</source>
         <translation>Trova Risultato</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>No more matches found</source>
-        <translation>Nessun'altra corrispondenza</translation>
+        <translation>Nessun&apos;altra corrispondenza trovata</translation>
     </message>
 </context>
 <context>
@@ -2488,7 +2478,7 @@
     <message>
         <location line="+3"/>
         <source>Set matching name is case insensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessuna distinzione maiuscole/minuscole per le corrispendenze fra nomi</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2498,7 +2488,7 @@
     <message>
         <location line="-35"/>
         <source>Enter the filename search expression</source>
-        <translation>Inserire una espressione di ricerca per il nome del file</translation>
+        <translation>Inserire una espressione da ricercare nel nome del file</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -2513,7 +2503,7 @@
     <message>
         <location line="+12"/>
         <source>Enter the file content search expression</source>
-        <translation>Inserisci una espressione di ricerca nel contenuto del file</translation>
+        <translation>Inserisci un&apos;espressione da ricercare nel contenuto del file</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2523,12 +2513,12 @@
     <message>
         <location line="+4"/>
         <source>Text case insensitive</source>
-        <translation>Testo senza distinzione maisucol/minuscole</translation>
+        <translation>Testo senza distinzione maisucole/minuscole</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set text content is case insensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessuna distinzione maiuscole/minuscole nel contenuto del testo</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -2604,7 +2594,7 @@
     <message>
         <location filename="../src/history-dock-widget.cc" line="+43"/>
         <source>Browse and search the command history.</source>
-        <translation>Naviga lo storico dei comandi.</translation>
+        <translation>Naviga nello storico dei comandi.</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -2622,7 +2612,7 @@
         <translation>Storico dei comandi</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+29"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -2662,7 +2652,7 @@
 &lt;p&gt;The configuration file is stored in&lt;br&gt;%1.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;body&gt;
-&lt;p&gt;Sembra che si stia usando l'interfaccia grafica di Octave per la prima volta su questo computer.
+&lt;p&gt;Sembra che si stia utilizzando l&apos;interfaccia grafica di Octave per la prima volta su questo computer.
 Fare click su &apos;Successivo&apos; per creare un file di configurazione e lanciare Octave.&lt;/p&gt;
 &lt;p&gt;Il file di configurazione verrà salvato in&lt;br&gt;%1.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
@@ -2671,38 +2661,37 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="-1758"/>
+        <location filename="../src/main-window.cc" line="-1739"/>
         <source>Load Workspace</source>
         <translation>Carica lo Spazio di Lavoro</translation>
     </message>
     <message>
-        <location line="+678"/>
-        <location line="+905"/>
+        <location line="+699"/>
+        <location line="+895"/>
         <source>About Octave</source>
         <translation>A proposito di Octave</translation>
     </message>
     <message>
-        <location line="-371"/>
+        <location line="-297"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+58"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Figure</source>
-        <translation>Figura</translation>
-    </message>
-    <message>
-        <location line="-59"/>
+        <translation type="obsolete">Figura</translation>
+    </message>
+    <message>
+        <location line="-52"/>
         <source>Open...</source>
         <translation>Apri...</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Preferences...</source>
         <translation>Preferenze...</translation>
     </message>
@@ -2722,17 +2711,17 @@
         <translation>Annulla</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
-        <location line="-1327"/>
+        <location line="-1413"/>
         <source>Save Workspace As</source>
         <translation>Salva lo Spazio di Lavoro Come</translation>
     </message>
@@ -2769,12 +2758,32 @@
         <translation>Note di Rilascio di Octave</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+192"/>
         <source>Octave Community News</source>
         <translation>Notizie dalla Comunità di Octave</translation>
     </message>
     <message>
-        <location line="+968"/>
+        <location line="+953"/>
+        <source>Open an existing file in editor</source>
+        <translation>Apri file esistente nell&apos;editor</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>New Function...</source>
+        <translation>Nuova Funzione...</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>New Figure</source>
+        <translation>Nuova Figura</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Select All</source>
+        <translation>Seleziona Tutto</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Clear Clipboard</source>
         <translation>Pulisci Appunti</translation>
     </message>
@@ -2799,14 +2808,14 @@
         <translation>Pulisci lo Spazio di Lavoro</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <source>De&amp;bug</source>
         <translation>De&amp;bug</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Step</source>
-        <translation>Un'istruzione alla volta</translation>
+        <translation>Un&apos;istruzione alla volta</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -2814,37 +2823,42 @@
         <translation>Continua</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+749"/>
+        <source>Are you sure you want to exit Octave?</source>
+        <translation>Si è sicuri di voler uscire da Octave?</translation>
+    </message>
+    <message>
         <source>Exit Debug Mode</source>
-        <translation>Abbandona la Modalità di Debug</translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <translation type="obsolete">Abbandona la Modalità di Debug</translation>
+    </message>
+    <message>
+        <location line="-693"/>
         <source>Show File Browser</source>
-        <translation>Nostra l'Esploratore di Risorse</translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <translation>Nostra l&apos;Esploratore di Risorse</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>File Browser</source>
         <translation>Esploratore di Risorse</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+99"/>
         <source>&lt;strong&gt;You are using a release candidate of Octave&apos;s experimental GUI.&lt;/strong&gt;  Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release.  For more information, select the &quot;Release Notes&quot; item in the &quot;News&quot; menu of the GUI, or visit &lt;a href=&quot;http://octave.org&quot;&gt;http://octave.org&lt;/a&gt;.</source>
-        <translation>&lt;strong&gt;Stai utilizzando una &apos;release candidate&apos; dell'interfaccia grafica sperimentale di Octave.&lt;/strong&gt; Octave è in continuo miglioramenteo e l'interfaccia grafica sarà l'interfaccia di default per la versione 4.0. Per maggiori informazioni, seleziona la voce &quot;Note di Rilascio&quot; nel menu &quot;Notizie&quot; dell'interfaccia grafica o visita &lt;a href=&quot;http://octave.org&quot;&gt;http://octave.org&lt;/a&gt;.</translation>
-    </message>
-    <message>
-        <location line="-288"/>
+        <translation>&lt;strong&gt;Stai utilizzando un &apos;candidato al rilascio&apos; dell&apos;interfaccia grafica sperimentale.&lt;/strong&gt; Octave è in continuo miglioramento e l&apos;interfaccia grafica sarà l&apos;interfaccia di default per la versione 4.0. Per maggiori informazioni, seleziona la voce &quot;Note di Rilascio&quot; nel menu &quot;Notizie&quot; dell&apos;interfaccia grafica o visita &lt;a href=&quot;http://octave.org&quot;&gt;http://octave.org&lt;/a&gt;.</translation>
+    </message>
+    <message>
+        <location line="-183"/>
         <source>Step In</source>
         <translation>Entra</translation>
     </message>
     <message>
-        <location line="-1311"/>
+        <location line="-1397"/>
+        <location line="+2153"/>
         <source>Octave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1160"/>
+        <translation>Octave</translation>
+    </message>
+    <message>
+        <location line="-904"/>
         <source>Load Workspace...</source>
         <translation>Apri Spazio di Lavoro...</translation>
     </message>
@@ -2859,9 +2873,8 @@
         <translation>Nuovo Script</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Function...</source>
-        <translation>Funzione...</translation>
+        <translation type="obsolete">Funzione...</translation>
     </message>
     <message>
         <location line="+111"/>
@@ -2869,12 +2882,17 @@
         <translation>Esci</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+13"/>
+        <source>Quit Debug Mode</source>
+        <translation>Esci dalla modalità di Debug</translation>
+    </message>
+    <message>
+        <location line="+81"/>
         <source>Reset Default Window Layout</source>
         <translation>Ripristina il Layout della Finestra</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+16"/>
         <source>Octave Packages</source>
         <translation>Octave Packages</translation>
     </message>
@@ -2894,7 +2912,7 @@
         <translation>Risorse per Sviluppatori</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+14"/>
         <source>On Disk</source>
         <translation>Su Disco</translation>
     </message>
@@ -2904,7 +2922,7 @@
         <translation>In Linea</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+6"/>
         <source>&amp;News</source>
         <translation>&amp;Notizie</translation>
     </message>
@@ -2919,7 +2937,7 @@
         <translation>Notizie dalla Comunità</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+44"/>
         <source>More Info</source>
         <translation>Maggiori Informazioni</translation>
     </message>
@@ -2932,10 +2950,10 @@
         <location line="+47"/>
         <location line="+66"/>
         <source>Experimental GUI Info</source>
-        <translation>Informazioni sull'Interfaccia Grafica Sperimentale</translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <translation>Informazioni sull&apos;Interfaccia Grafica Sperimentale</translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Enter directory name</source>
         <translation>Inserisci nome cartella</translation>
     </message>
@@ -2950,69 +2968,69 @@
         <translation>Livello precedente</translation>
     </message>
     <message>
-        <location line="-1312"/>
-        <location line="+1315"/>
+        <location line="-1280"/>
+        <location line="+1283"/>
         <source>Browse directories</source>
         <translation>Naviga cartelle</translation>
     </message>
     <message>
-        <location line="-405"/>
+        <location line="-305"/>
         <source>&amp;Window</source>
         <translation>&amp;Finestra</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+3"/>
         <source>Show Command Window</source>
         <translation>Mostra la Finestra dei Comandi</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Show Command History</source>
         <translation>Mostra lo Storico dei Comandi</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Show Workspace</source>
-        <translation>Mostra lo Spazio di Lavoro</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Show Editor</source>
-        <translation>Mostra l'Editor</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Show Documentation</source>
-        <translation>Mostra la Documentazione</translation>
-    </message>
-    <message>
         <location line="+6"/>
+        <source>Show Workspace</source>
+        <translation>Mostra lo Spazio di Lavoro</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show Editor</source>
+        <translation>Mostra l&apos;Editor</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show Documentation</source>
+        <translation>Mostra la Documentazione</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Command Window</source>
         <translation>Finestra dei Comandi</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Command History</source>
         <translation>Storico dei Comandi</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Workspace</source>
         <translation>Spazio di lavoro</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+121"/>
+        <location line="+3"/>
+        <location line="+41"/>
         <source>Documentation</source>
         <translation>Documentazione</translation>
     </message>
     <message>
-        <location line="-48"/>
+        <location line="-30"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
@@ -3025,7 +3043,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1311"/>
+        <location line="-1319"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -3075,7 +3093,7 @@
 Per le ultime novità, si prega di controllare
 &lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;
 avendo a disposizione una connesione ad internet (utilizza un browser esterno)
-o di abilitare la connessione ad internet per le notizie nella finestra delle impostazioni di rete di Octave.
+o di abilitare, nella finestra delle impostazioni di rete di Octave, la connessione ad internet per le notizie.
 &lt;/p&gt;
 &lt;p&gt;
 &lt;small&gt;&lt;em&gt;&amp;mdash; Gli Sviluppatori di Octave, </translation>
@@ -3085,17 +3103,17 @@
     <name>octave_dock_widget</name>
     <message>
         <location filename="../src/octave-dock-widget.cc" line="+60"/>
-        <location line="+170"/>
+        <location line="+172"/>
         <source>Undock widget</source>
         <translation>Rimuovi widget dal lanciatore</translation>
     </message>
     <message>
-        <location line="-160"/>
+        <location line="-162"/>
         <source>Hide widget</source>
         <translation>Nascondi widget</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+109"/>
         <source>Dock widget</source>
         <translation>Ancora widget al lanciatore</translation>
     </message>
@@ -3103,14 +3121,14 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+130"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
         <source>Help on</source>
         <translation>Aiuto su</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Documentation on</source>
-        <translation>Documentaizone su</translation>
+        <translation>Documentazione su</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3118,9 +3136,8 @@
         <translation>Modifica</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Run Selection</source>
-        <translation>&amp;Esegui Selezione</translation>
+        <translation type="obsolete">&amp;Esegui Selezione</translation>
     </message>
 </context>
 <context>
@@ -3154,7 +3171,7 @@
     <message>
         <location line="+211"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
-        <translation>Il file %1 non esiste nelle cartelle di esecuzione. Per lanciare o eseguire il debug della funzione in corso di modifica, è necessario passare alla cartella %2 o aggiungerla tale cartella alle cartelle di esecuzione.</translation>
+        <translation>Il file %1 non esiste nelle cartelle di esecuzione. Per lanciare o eseguire il debug della funzione in corso di modifica, è necessario passare alla cartella %2 o aggiungere tale cartella alle cartelle di esecuzione.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3174,7 +3191,7 @@
     <message>
         <location line="+1"/>
         <source>Add Directory to Load Path</source>
-        <translation>Aggiungi Cartella alle Cartelle di esecuzione.</translation>
+        <translation>Aggiungi Cartella alle Cartelle di esecuzione</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3199,7 +3216,7 @@
 Assicurasi di avere permesso di lettura e scrittura in
 %2
 
-L'inerfaccia grafica deve essere chiusa.</translation>
+L&apos;inerfaccia grafica verrà chiusa.</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3211,395 +3228,680 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1591"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <location line="+19"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+19"/>
         <source>General</source>
         <translation>Genrale</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+198"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-10"/>
         <source>Octave logo only</source>
         <translation>Logo di Octave solamente</translation>
     </message>
     <message>
         <location line="+10"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Icone testuali</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Graphic icons</source>
         <translation>Icone grafiche</translation>
     </message>
     <message>
-        <location line="-179"/>
+        <location line="-186"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-9"/>
         <source>Dock widget title bar</source>
         <translation>Barra del titolo del lanciatore di widget</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+2"/>
+        <source>Confirm before exiting</source>
+        <translation>Conferma prima di uscire</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Custom style</source>
         <translation>Stile personalizzato</translation>
     </message>
     <message>
         <location line="+26"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Background color</source>
         <translation>Colore dello sfondo</translation>
     </message>
     <message>
         <location line="+29"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Text color</source>
         <translation>Colore del testo</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+113"/>
+        <location line="+388"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+6"/>
+        <location line="+21"/>
+        <source>Show status bar</source>
+        <translation>Mostra barra di stato</translation>
+    </message>
+    <message>
+        <location line="-279"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+29"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+30"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-31"/>
+        <source>After Column</source>
+        <translation>Numero di colonne</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-7"/>
         <source>Color</source>
         <translation>Colore</translation>
     </message>
     <message>
-        <location line="+170"/>
+        <location line="+130"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+4"/>
+        <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
+        <translation>Questa impostazione è adatta a tipi di caratteri monospaced. La linea è posta in una posizione basata sulla larghezza di uno spazio bianco del tipo di carattere predefinito. Può non funzionare bene se gli stili usano stili di caratteri proporzionali o se diverse dimensioni di carattere, grassetto, corsivo sono utilizzati.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+2"/>
+        <source>Draw a long  line marker</source>
+        <translation>Disegna un marcatore di linea lungo</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+2"/>
+        <source>Enable Code Folding</source>
+        <translation>Attiva espansione del codice</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Show eol characters</source>
+        <translation>Mostra terminatore di riga</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Default eol mode</source>
+        <translation>Terminatore predefinito</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Windows (CRLF)</source>
+        <translation>Windows (CRLF)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mac (CR)</source>
+        <translation>Mac (CR)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Unix (LF)</source>
+        <translation>Unix (LF)</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+2"/>
         <source>Indent width</source>
         <translation>Ampiezza indentazione</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
-        <translation>Tasto Tab per l'indentazione</translation>
+        <translation>Tasto Tab per l&apos;indentazione</translation>
     </message>
     <message>
         <location line="+23"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Indentazione automatica</translation>
     </message>
     <message>
         <location line="+20"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Ampiezza tabulazione</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
-        <translation>Mostra guide per l'indentazione</translation>
+        <translation>Mostra guide per l&apos;indentazione</translation>
     </message>
     <message>
         <location line="+17"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
-        <translation>Tasto Backspace per rimuove l'indentazione</translation>
-    </message>
-    <message>
-        <location line="+155"/>
+        <translation>Tasto Backspace per rimuove l&apos;indentazione</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <source>Auto completion</source>
+        <translation>Completamento automatico</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation>Abbina parole chiave</translation>
     </message>
     <message>
         <location line="+13"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Distinzione maiuscole/minuscole</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Replace word by suggested one</source>
-        <translation>Sostituisci una parola con quella suggerita</translation>
-    </message>
-    <message>
         <location line="+23"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+2"/>
+        <source>Replace word by suggested one</source>
+        <translation>Sostituisci una parola con quella suggerita</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Abbina parole nel documento</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+173"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+13"/>
         <source>Restore editor tabs from previous session on startup</source>
-        <translation>Ripristina le schede dell'editor dalla sessione precedente all'avvio</translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <translation>Ripristina le schede dell&apos;editor dalla sessione precedente all&apos;avvio</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+3"/>
         <source>Use custom file editor</source>
         <translation>Utilizza editor personalizzato</translation>
     </message>
     <message>
         <location line="+20"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+2"/>
         <source>emacs +%l %f </source>
-        <translation type="unfinished"></translation>
+        <translation>emacs +%l %f</translation>
     </message>
     <message>
         <location line="+35"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+3"/>
         <source>Editor Styles</source>
-        <translation>Stili dell'Editor</translation>
+        <translation>Stili dell&apos;Editor</translation>
     </message>
     <message>
         <location line="+17"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-1"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Seleziona stile di carattere, dimensione carattere (come differenza dalla dimensione iniziale), stile del carattere (&lt;b&gt;g&lt;/b&gt;rassetto, &lt;b&gt;c&lt;/b&gt;orsivo, &lt;b&gt;s&lt;/b&gt;ottolinea), colore del testo e colore dello sfondo (per il quale il colore rosa (255, 0, 255) indica il colore di default).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+240"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+9"/>
         <source>Terminal Colors</source>
         <translation>Colori del Terminale</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-143"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-4"/>
         <source>Font</source>
         <translation>Stile di carattere</translation>
     </message>
     <message>
-        <location line="-770"/>
+        <location line="-865"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-48"/>
         <source>Show line numbers</source>
         <translation>Mostra numero di riga</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+33"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+3"/>
         <source>Highlight current line</source>
         <translation>Evidenzia la riga corrente</translation>
     </message>
     <message>
-        <location line="+328"/>
         <source>Code completion</source>
-        <translation>Completamento del codice</translation>
-    </message>
-    <message>
-        <location line="-361"/>
+        <translation type="obsolete">Completamento del codice</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-2"/>
         <source>Show complete path in window title</source>
         <translation>Mostra il percorso completo nel titolo della finestra</translation>
     </message>
     <message>
         <location line="-23"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-2"/>
         <source>Show whitespace</source>
         <translation>Mostra spazi</translation>
     </message>
     <message>
         <location line="+33"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+3"/>
         <source>Do not show whitespace used for indentation</source>
-        <translation>Non mostrare gli spazi utilizzati per l'indentazione</translation>
-    </message>
-    <message>
-        <location line="+369"/>
+        <translation>Non mostrare gli spazi utilizzati per l&apos;indentazione</translation>
+    </message>
+    <message>
         <source># of characters typed before completion list displayed</source>
-        <translation>Numero i caratteri da digitare prima che la lista di completamento appaia</translation>
-    </message>
-    <message>
-        <location line="+194"/>
+        <translation type="obsolete">Numero i caratteri da digitare prima che la lista di completamento appaia</translation>
+    </message>
+    <message>
+        <location line="+645"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+35"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Crea file inesistenti senza chiedere conferma</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+38"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+3"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>linea di comando (%f=file, %l=riga):</translation>
     </message>
     <message>
         <location line="+94"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+14"/>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+51"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-7"/>
         <source>Cursor type:</source>
         <translation>Tipo di cursore:</translation>
     </message>
     <message>
         <location line="-11"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Lampeggiamento del cursore</translation>
     </message>
     <message>
         <location line="-7"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Usa colore di primo piano</translation>
     </message>
     <message>
         <location line="+53"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Dimensione carattere</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+142"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+4"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Rendi il terminale la finestra attiva quando un comando è eseguito da uno widget</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+37"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+13"/>
         <source>File Browser</source>
         <translation>Gestore dei file</translation>
     </message>
     <message>
         <location line="+46"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-8"/>
         <source>Show file size</source>
         <translation>Mostra dimensione del file</translation>
     </message>
     <message>
         <location line="-14"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-2"/>
         <source>Show file type</source>
         <translation>Mostra tipo del file</translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+3"/>
         <source>Show date of last modification</source>
         <translation>Mostra la data di ultima modifica</translation>
     </message>
     <message>
         <location line="-14"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-2"/>
         <source>Show hidden files</source>
         <translation>Mostra i file nascosti</translation>
     </message>
     <message>
-        <location line="-1316"/>
+        <location line="-1511"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-77"/>
         <source>Interface</source>
         <translation>Interfaccia</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+238"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+13"/>
         <source>Octave Startup</source>
         <translation>Avvio di Octave</translation>
     </message>
     <message>
         <location line="+6"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>These preferences are applied after the startup files like .octaverc.</source>
-        <translation>Queste preferenze sono applicate dopo l'esecuzione del file di avvio .octaverc.</translation>
+        <translation>Queste preferenze sono applicate dopo l&apos;esecuzione del file di avvio .octaverc.</translation>
     </message>
     <message>
         <location line="+35"/>
-        <location line="+1104"/>
+        <location line="+1282"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <location line="+68"/>
         <source>Startup path</source>
         <translation>Percorso di avvio</translation>
     </message>
     <message>
-        <location line="-1091"/>
-        <location line="+1108"/>
+        <location line="-1269"/>
+        <location line="+1286"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-67"/>
+        <location line="+69"/>
         <source>Browse</source>
         <translation>Naviga</translation>
     </message>
     <message>
-        <location line="-1101"/>
+        <location line="-1279"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-68"/>
         <source>Restore last Octave directory of previous session</source>
         <translation>Ripristina la cartella Octave della sessione precedente</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+212"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+8"/>
         <source>Tab width min.</source>
         <translation>Ampiezza tabulazione min.</translation>
     </message>
     <message>
         <location line="+52"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
-        <translation>max</translation>
-    </message>
-    <message>
-        <location line="+750"/>
+        <translation>max.</translation>
+    </message>
+    <message>
+        <location line="+374"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+19"/>
+        <source>With Octave builtins</source>
+        <translation>Con built-in di Octave</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <source>With Octave functions</source>
+        <translation>Con funzioni di Octave</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <source>Number of characters before list is shwon: </source>
+        <translation>Numero di caratteri da digitare prima che la lista appaia: </translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+8"/>
+        <source>Show completion list automatically</source>
+        <translation>Mostra lista di completamento automaticamente</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+3"/>
+        <source>Reload externally changed files without prompt</source>
+        <translation>Ricarica file modificati esternamente senza chiedere</translation>
+    </message>
+    <message>
+        <location line="+267"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+12"/>
+        <source>(Changing buffer size clears history)</source>
+        <translation>(Il cambio della dimensione della lista svuota lo storico comandi)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <source>History buffer Size</source>
+        <translation>Dimensione storico comandi</translation>
+    </message>
+    <message>
+        <location line="+116"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+4"/>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra</translation>
     </message>
     <message>
         <location line="+39"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+5"/>
         <source>Alternating row colors</source>
         <translation>Colori alternati per le righe</translation>
     </message>
     <message>
         <location line="+12"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Behavior</source>
         <translation>Comportamento</translation>
     </message>
     <message>
         <location line="+27"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+3"/>
         <source>Restore last directory of previous session</source>
-        <translation>Ripristina l'ultima cartella della sessione precedente</translation>
+        <translation>Ripristina l&apos;ultima cartella della sessione precedente</translation>
     </message>
     <message>
         <location line="+65"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Spazio di lavoro</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Storage Class Colors</source>
-        <translation>Colori della Storage Class</translation>
-    </message>
-    <message>
-        <location line="+40"/>
+        <translation type="obsolete">Colori della Storage Class</translation>
+    </message>
+    <message>
+        <location line="+338"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+33"/>
         <source>Network</source>
         <translation>Rete</translation>
     </message>
     <message>
         <location line="+23"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Pemetti ad Octave di connettersi al sito web di Octave per mostrare notizie ed informazioni aggiornate</translation>
     </message>
     <message>
         <location line="+46"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Usa server proxy</translation>
     </message>
     <message>
         <location line="-23"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HttpProxy</translation>
     </message>
     <message>
-        <location line="-1356"/>
+        <location line="-1804"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-103"/>
         <source>Icon set for dock widgets</source>
         <translation>Icone per il lanciatore degli widget</translation>
     </message>
     <message>
         <location line="-48"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Lingua (richiede riavvio)</translation>
     </message>
     <message>
-        <location line="-122"/>
+        <location line="-129"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Dimensione icona</translation>
     </message>
     <message>
-        <location line="+1318"/>
+        <location line="+1513"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+80"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Sincronizza la cartella di lavoro di Octave con il gestore dei file</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+125"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+5"/>
+        <source>Colors for variable attributes </source>
+        <translation>Colori per attributi variabili </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <source>Hide tool tip</source>
+        <translation>Nascondi tooltip</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+21"/>
+        <source>Shortcuts</source>
+        <translation>Scorciatoie</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-18"/>
+        <source>Select this option to prevent conflicts with readline shortcuts</source>
+        <translation>Seleziona questa opzione per evitrare conflitti con le scorciatoie readline</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+2"/>
+        <source>Disable global shortcuts when terminal window has focus</source>
+        <translation>Disabilita le scorciatoie globali quando il terminale è selezionato</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+28"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <location line="+4"/>
+        <source>Use this set</source>
+        <translation>Utilizza questo insieme</translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-3"/>
+        <source>Set 1:</source>
+        <translation>Insieme 1:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+37"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <location line="+3"/>
+        <source>Export</source>
+        <translation>Esporta</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+37"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-2"/>
+        <location line="+3"/>
+        <source>Import</source>
+        <translation>Importa</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <source>Set 2:</source>
+        <translation>Insieme 2:</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
+        <source>Edit an actual shortcut by double clicking into the related cell</source>
+        <translation>Modifica una scorciatoia facendo doppio click nella relativa cella</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+6"/>
+        <source>Action</source>
+        <translation>Azione</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-1"/>
+        <source>Set 1 Default</source>
+        <translation>Insieme 1 predefinito</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-1"/>
+        <source>Set 1 Actual</source>
+        <translation>Ineieme 1 attuale</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-1"/>
+        <source>Set 2 Default</source>
+        <translation>Insieme 2 predefinito</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-1"/>
+        <source>Set 2 Actual</source>
+        <translation>Insieme 2 attuale</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+11"/>
         <source>Socks5Proxy</source>
         <translation>Socks5Proxy</translation>
     </message>
     <message>
         <location line="-16"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Nome host:</translation>
     </message>
     <message>
         <location line="+44"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Tipo di proxy:</translation>
     </message>
     <message>
         <location line="+10"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Porta:</translation>
     </message>
     <message>
         <location line="-27"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Nome utente:</translation>
     </message>
     <message>
         <location line="+37"/>
+        <location filename="../../build/libgui/src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+74"/>
+        <location filename="../src/settings-dialog.cc" line="+76"/>
         <location line="+4"/>
-        <location line="+437"/>
+        <location line="+508"/>
         <source>System setting</source>
         <translation>Parametri di sistema</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-312"/>
         <source>IBeam Cursor</source>
         <translation>Cursore IBeam</translation>
     </message>
@@ -3614,7 +3916,7 @@
         <translation>Cursore testo sottolineato</translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+170"/>
         <source>Difference to the default size</source>
         <translation>Differenza rispetto alla dimensione di default</translation>
     </message>
@@ -3642,7 +3944,7 @@
         <translation>s</translation>
     </message>
     <message>
-        <location line="+419"/>
+        <location line="+460"/>
         <source>Set Octave Startup Directory</source>
         <translation>Scegli la Cartella di Avvio di Octave</translation>
     </message>
@@ -3667,7 +3969,7 @@
     <message>
         <location line="+1"/>
         <source>Next</source>
-        <translation>Successiva</translation>
+        <translation>Successivo</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3683,8 +3985,8 @@
 &lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;body&gt;
-&lt;p&gt;Quando l'interfaccia grafica di Octave si avvia, l'applicazione controllerà il sito web di Octave per ottenere notizie ed informazioni recenti riguardo alla comunità di Octave. Tale controllo averrà non più di una volta al giorno e la finestra delle notizie verrà aperta soltanto nel caso in cui ci sia qualcosa di nuovo rispetto all'ultima consultazione&lt;/p&gt;
-&lt;p&gt;Le notizie possono essere raggiunte  anche selezionando &quot;Notizie dalla Comunità&quot; nel menu &quot;Aiuto&quot; dell'interfaccia grafica, o visitando
+&lt;p&gt;Ad ogni avvio dell&apos;interfaccia grafica, l&apos;applicazione controllerà il sito web di Octave per ottenere notizie ed informazioni recenti dalla comunità. Tale controllo averrà non più di una volta al giorno e la finestra delle notizie verrà aperta soltanto nel caso in cui ci sia qualcosa di nuovo rispetto all&apos;ultima consultazione&lt;/p&gt;
+&lt;p&gt;Le notizie possono essere raggiunte anche selezionando &quot;Notizie dalla Comunità&quot; nel menu &quot;Aiuto&quot; dell&apos;interfaccia grafica, o visitando
 &lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -3702,11 +4004,621 @@
 a:link { text-decoration: underline; color: #0000ff; }
 &lt;/style&gt;
 &lt;head/&gt;&lt;body&gt;
-&lt;p&gt;Permetti ad Octave di connettersi ad sito web di Octave all'avvio per mostrare notizie ed informazione recenti riguardo alla comunità di Octave.&lt;/p&gt;
+&lt;p&gt;Permetti all&apos;applicazione di connettersi all&apos;avvio al sito web di Octave per mostrare notizie ed informazione recenti dalla comunità.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
+    <name>shortcut_manager</name>
+    <message>
+        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <source>New File</source>
+        <translation>Nuovo File</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New Function</source>
+        <translation>Nuova Funzione</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New Figure</source>
+        <translation>Nuova Figura</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open File</source>
+        <translation>Apri File</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Load Workspace</source>
+        <translation>Carica lo Spazio di Lavoro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save Workspace As</source>
+        <translation>Salva lo Spazio di Lavoro Come</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+151"/>
+        <source>Preferences</source>
+        <translation>Preferenze</translation>
+    </message>
+    <message>
+        <location line="-150"/>
+        <source>Exit Octave</source>
+        <translation>Esci da Octave</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+81"/>
+        <source>Copy</source>
+        <translation>Copia</translation>
+    </message>
+    <message>
+        <location line="-80"/>
+        <location line="+82"/>
+        <source>Paste</source>
+        <translation>Incolla</translation>
+    </message>
+    <message>
+        <location line="-81"/>
+        <location line="+77"/>
+        <source>Undo</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <location line="-76"/>
+        <location line="+81"/>
+        <source>Select All</source>
+        <translation>Seleziona Tutto</translation>
+    </message>
+    <message>
+        <location line="-80"/>
+        <source>Clear Clipboard</source>
+        <translation>Pulisci Appunti</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find in Files</source>
+        <translation>Cerca nei file</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Command Window</source>
+        <translation>Pulisci la Finestra dei Comandi</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Command History</source>
+        <translation>Pulisci lo Storico dei Comandi</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Workspace</source>
+        <translation>Pulisci lo Spazio di Lavoro</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Step Over</source>
+        <translation>Scavalca</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Step Into</source>
+        <translation>Livello Successivo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Step Out</source>
+        <translation>Livello Precedente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Continue</source>
+        <translation>Continua</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quit Debug Mode</source>
+        <translation>Esci dalla modalità di Debug</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show Command Window</source>
+        <translation>Mostra la Finestra dei Comandi</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Command History</source>
+        <translation>Mostra lo Storico dei Comandi</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show File Browser</source>
+        <translation>Nostra l&apos;Esploratore di Risorse</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Workspace</source>
+        <translation>Mostra lo Spazio di Lavoro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Editor</source>
+        <translation>Mostra l&apos;Editor</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Documentation</source>
+        <translation>Mostra la Documentazione</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Command Window</source>
+        <translation>Finestra dei Comandi</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Command History</source>
+        <translation>Storico dei comandi</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>File Browser</source>
+        <translation>Gestore dei File</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Workspace</source>
+        <translation>Spazio di lavoro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+199"/>
+        <source>Editor</source>
+        <translation>Editor</translation>
+    </message>
+    <message>
+        <location line="-197"/>
+        <source>Documentation</source>
+        <translation>Documentazione</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reset Window Layout</source>
+        <translation>Ripristina il Layout della Finestra</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show Ondisk Documentation</source>
+        <translation>Mostra la Documentazione su Disco</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Online Documentation</source>
+        <translation>Mostra la Documentazione in Linea</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Report a Bug</source>
+        <translation>Segnala un Problema</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Octave Packages</source>
+        <translation>Octave Packages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Share Code</source>
+        <translation>Condividi Codice</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Contribute to Octave</source>
+        <translation>Contribuisci</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Octave Developer Resources</source>
+        <translation>Risorse per Sviluppatori</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>About Octave</source>
+        <translation>A proposito di Octave</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Release Notes</source>
+        <translation>Note di Rilascio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Community News</source>
+        <translation>Notizie dalla Comunità</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit Function</source>
+        <translation>Modifica Funzione</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Save File</source>
+        <translation>Salva File</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save File As</source>
+        <translation>Salva File Come</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close All</source>
+        <translation>Chiudi Tutto</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close Other</source>
+        <translation>Chiudi Altro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print</source>
+        <translation>Stampa</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redo</source>
+        <translation>Ripeti</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cuy</source>
+        <translation>Taglia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find and Replace</source>
+        <translation>Trova e Sostituisci</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to Start of Word</source>
+        <translation>Cancella fino a inizio parola</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to End of Word</source>
+        <translation>Cancella fino a fine parola</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to Start of Line</source>
+        <translation>Cancella fino a inizio riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to End of Line</source>
+        <translation>Cancella fino a fine riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete Line</source>
+        <translation>Cancella riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy Line</source>
+        <translation>Copia riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cut Line</source>
+        <translation>Taglia riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate Selection/Line</source>
+        <translation>Duplica selezione/riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose Line</source>
+        <translation>Trasponi riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Completion List</source>
+        <translation>Lista di completamento</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment Selection</source>
+        <translation>Commenta selezione</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Uncomment Selection</source>
+        <translation>Decommenta selezione</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Uppercase Selection</source>
+        <translation>Rendi la selezione in maisucolo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Lowercase Selection</source>
+        <translation>Rendi la selezione in minuscolo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+5"/>
+        <source>Indent Selection</source>
+        <translation>Indenta selezione</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+5"/>
+        <source>Unindent Selection</source>
+        <translation>Deindenta selezione</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Convert Line Ednings to Windows</source>
+        <translation>Converti terminatore di riga a Windows</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Convert Line Ednings to Unix</source>
+        <translation>Converti terminatore di riga a Unix</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Convert Line Ednings to Mac</source>
+        <translation>Converti terminatore di riga a Mac</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Goto Line</source>
+        <translation>Vai alla riga</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Toggle Bookmark</source>
+        <translation>Attiva/disattiva Segnalibro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Next Bookmark</source>
+        <translation>Segnalibro Successivo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Previous Bookmark</source>
+        <translation>Segnalibro Precedente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove All Bookmark</source>
+        <translation>Elimina Tutti i Segnalibri</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Styles Preferences</source>
+        <translation>Preferenze di stile</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show Line Numbers</source>
+        <translation>Mostra numeri di riga</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show White Spaces</source>
+        <translation>Mostra spazi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Line Endings</source>
+        <translation>Mostra terminatori di riga</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Indentation Guides</source>
+        <translation>Mostra guide per l&apos;indentazione</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Long Line Marker</source>
+        <translation>Mostra marcatori linea lunga</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom In</source>
+        <translation>Ingrandisci</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom Out</source>
+        <translation>Riduci</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+3"/>
+        <source>Zoom Normal</source>
+        <translation>Dimensione normale</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Toggle Breakpoint</source>
+        <translation>Attiva/disattiva Breakpoint</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Next Breakpoint</source>
+        <translation>Breakpoint Successivo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Previous Breakpoint</source>
+        <translation>Breakpoint Precedente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove All Breakpoints</source>
+        <translation>Rimuovi Tutti i Breakpoint</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Run File</source>
+        <translation>Esegui File</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Run Selection</source>
+        <translation>Esegui Selezione</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Help on Keyword</source>
+        <translation>Aiuto su Parola Chiave</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Document on Keyword</source>
+        <translation>Documentazione sulla Parola Chiave</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Main</source>
+        <translation>Principale</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+23"/>
+        <source>File</source>
+        <translation>File</translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location line="+23"/>
+        <source>Edit</source>
+        <translation>Modifica</translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location line="+25"/>
+        <source>Debug</source>
+        <translation>Debug</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Window</source>
+        <translation>Finestra</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+25"/>
+        <source>Help</source>
+        <translation>Aiuto</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>News</source>
+        <translation>Novità</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>View</source>
+        <translation>Vista</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Run</source>
+        <translation>Esegui</translation>
+    </message>
+    <message>
+        <location line="+118"/>
+        <source>Enter new Shortcut for Set %1</source>
+        <translation>Inserisci nuova Scorciatoia per l&apos;Insieme %1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
+        <translation>Applica la scorciatoia desiderata o clicca con il tasto destro del mouse per ripristinare la scorciatoia predefinita.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Enter shortcut directly by performing it</source>
+        <translation>Inserici una scorciatoia eseguendola direttamente</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Actual shortcut</source>
+        <translation>Scorciatoia attuale</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Default shortcut</source>
+        <translation>Scorciatoia predefinita</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Set to default</source>
+        <translation>Imposta al valore predefinito</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Double Shortcut</source>
+        <translation>Doppia Scorciatoia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The chosen shortcut
+  &quot;%1&quot;
+is already used for the action
+  &quot;%2&quot;.
+Do you want to use the shortcut anyhow removing it from the previous action?</source>
+        <translation>La scorciatoia
+&quot;%1&quot;
+è già utilizzata per un l&apos;azione
+&quot;%2&quot;
+Si desidera utilizzare comunque la scorciatoia rimuovendola dall&apos;azione cui era precedentemente associata?</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Import shortcut set %1 from file ...</source>
+        <translation>Importa l&apos;insieme di  scorciatoie %1 dal file...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+6"/>
+        <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
+        <translation>File Scorciatoia di Octave (*.osc);;Tutti i File (*)</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>Export shortcut set %1 into file ...</source>
+        <translation>Esporta l&apos;insieme di  scorciatoie %1 nel file...</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Failed to open %1 as octave shortcut file</source>
+        <translation>Impossibile aprire il file %1 come file di scorciatoie di Octave</translation>
+    </message>
+</context>
+<context>
     <name>terminal_dock_widget</name>
     <message>
         <location filename="../src/terminal-dock-widget.cc" line="+38"/>
@@ -3717,7 +4629,7 @@
 <context>
     <name>webinfo</name>
     <message>
-        <location filename="../src/qtinfo/webinfo.cc" line="+83"/>
+        <location filename="../src/qtinfo/webinfo.cc" line="+82"/>
         <source>Type here and press &apos;Return&apos; to search</source>
         <translation>Scrivi qui e premi &apos;Invio&apos; per cercare</translation>
     </message>
@@ -3755,7 +4667,7 @@
     <message>
         <location line="+1"/>
         <source>Class</source>
-        <translation>Tipo</translation>
+        <translation>Classe</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3775,7 +4687,7 @@
     <message>
         <location line="+109"/>
         <source>Right click to copy, rename, or display</source>
-        <translation>Fai click con il tasto destro del mouse per copiare, rinominare o mostrare</translation>
+        <translation>Cliccare con il tasto destro del mouse per copiare, rinominare o mostrare</translation>
     </message>
     <message>
         <location line="+37"/>
@@ -3794,10 +4706,10 @@
     <message>
         <location line="+1"/>
         <source>View the variables in the active workspace.</source>
-        <translation>Mostra le variabili nello spazio di lavoro.</translation>
-    </message>
-    <message>
-        <location line="+76"/>
+        <translation>Mostra le variabili nello spazio di lavoro attivo.</translation>
+    </message>
+    <message>
+        <location line="+78"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -3812,9 +4724,9 @@
         <translation>Solamente i simboli di primo livello possono essere rinominati.</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+128"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
-        <translation>Mostra le variabili nello spazio di lavoro attivo. </translation>
+        <translation>Mostra le variabili nello spazio di lavoro attivo.&lt;br&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
--- a/libgui/src/m-editor/file-editor-tab.cc	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/src/m-editor/file-editor-tab.cc	Wed Oct 15 11:54:04 2014 -0400
@@ -99,15 +99,23 @@
   connect (_edit_area, SIGNAL (context_menu_edit_signal (const QString&)),
            this, SLOT (handle_context_menu_edit (const QString&)));
 
-  // create statusbar for row/col indicator
+  // create statusbar for row/col indicator and eol mode
   _status_bar = new QStatusBar (this);
 
+  // eol mode
+  QLabel *eol_label = new QLabel (tr ("eol:"), this);
+  _eol_indicator = new QLabel ("",this);
+  _eol_indicator->setMinimumSize (35,0);
+  _status_bar->addPermanentWidget (eol_label, 0);
+  _status_bar->addPermanentWidget (_eol_indicator, 0);
+
+  // row- and col-indicator
   _row_indicator = new QLabel ("", this);
   _row_indicator->setMinimumSize (30,0);
-  QLabel *row_label = new QLabel (tr ("Line:"), this);
+  QLabel *row_label = new QLabel (tr ("line:"), this);
   _col_indicator = new QLabel ("", this);
   _col_indicator->setMinimumSize (25,0);
-  QLabel *col_label = new QLabel (tr ("Col:"), this);
+  QLabel *col_label = new QLabel (tr ("col:"), this);
   _status_bar->addPermanentWidget (row_label, 0);
   _status_bar->addPermanentWidget (_row_indicator, 0);
   _status_bar->addPermanentWidget (col_label, 0);
@@ -939,6 +947,16 @@
   do_indent_selected_text (false);
 }
 
+void
+file_editor_tab::convert_eol (const QWidget *ID, QsciScintilla::EolMode eol_mode)
+{
+  if (ID != this)
+    return;
+
+  _edit_area->convertEols (eol_mode);
+  _edit_area->setEolMode (eol_mode);
+  update_eol_indicator ();
+}
 
 void
 file_editor_tab::zoom_in (const QWidget *ID)
@@ -1304,6 +1322,7 @@
   in.setCodec("UTF-8");
   QApplication::setOverrideCursor (Qt::WaitCursor);
   _edit_area->setText (in.readAll ());
+  _edit_area->setEolMode (detect_eol_mode ());
   QApplication::restoreOverrideCursor ();
 
   _copy_available = false;     // no selection yet available
@@ -1311,13 +1330,117 @@
   update_window_title (false); // window title (no modification)
   _edit_area->setModified (false); // loaded file is not modified yet
 
+  update_eol_indicator ();
+
   return QString ();
 }
 
+QsciScintilla::EolMode
+file_editor_tab::detect_eol_mode ()
+{
+  char *text = _edit_area->text ().toAscii ().data ();
+  int text_size = _edit_area->text ().length ();
+
+  char eol_lf = 0x0a;
+  char eol_cr = 0x0d;
+
+  int count_lf = 0;
+  int count_cr = 0;
+  int count_crlf = 0;
+
+  for (int i = 0; i < text_size; i++)
+    {
+      if (text[i] == eol_lf)
+        {
+          count_lf++;
+        }
+      else
+        {
+          if (text[i] == eol_cr)
+            {
+              if ((i < text_size -1) && text[i+1] == eol_lf)
+                {
+                  count_crlf++;
+                  i++;
+                }
+              else
+                count_cr++;
+            }
+        }
+    }
+
+  // get default from OS or from settings
+#if defined (Q_OS_WIN32)
+  int os_eol_mode = QsciScintilla::EolWindows;
+#elif defined (Q_OS_MAC)
+  int os_eol_mode = QsciScintilla::EolMac;
+#else
+  int os_eol_mode = QsciScintilla::EolUnix;
+#endif
+QSettings *settings = resource_manager::get_settings ();
+QsciScintilla::EolMode eol_mode = static_cast<QsciScintilla::EolMode> (
+      settings->value("editor/default_eol_mode",os_eol_mode).toInt ());
+
+  int count_max = 0;
+
+  if (count_crlf > count_max)
+    {
+      eol_mode = QsciScintilla::EolWindows;
+      count_max = count_crlf;
+    }
+  if (count_cr > count_max)
+    {
+      eol_mode = QsciScintilla::EolMac;
+      count_max = count_cr;
+    }
+  if (count_lf > count_max)
+    {
+      eol_mode = QsciScintilla::EolUnix;
+      count_max = count_lf;
+    }
+
+  return eol_mode;
+}
+
+void
+file_editor_tab::update_eol_indicator ()
+{
+  switch (_edit_area->eolMode ())
+    {
+      case QsciScintilla::EolWindows:
+        _eol_indicator->setText ("CRLF");
+        break;
+      case QsciScintilla::EolMac:
+        _eol_indicator->setText ("CR");
+        break;
+      case QsciScintilla::EolUnix:
+        _eol_indicator->setText ("LF");
+        break;
+    }
+}
+
 void
 file_editor_tab::new_file (const QString &commands)
 {
   update_window_title (false); // window title (no modification)
+
+  QSettings *settings = resource_manager::get_settings ();
+
+  // set the eol mode from the settings or depending on the OS if the entry is
+  // missing in the settings
+#if defined (Q_OS_WIN32)
+  int eol_mode = QsciScintilla::EolWindows;
+#elif defined (Q_OS_MAC)
+  int eol_mode = QsciScintilla::EolMac;
+#else
+  int eol_mode = QsciScintilla::EolUnix;
+#endif
+  _edit_area->setEolMode (
+    static_cast<QsciScintilla::EolMode> (
+      settings->value("editor/default_eol_mode",eol_mode).toInt ()));
+
+  update_eol_indicator ();
+
   _edit_area->setText (commands);
   _edit_area->setModified (false); // new file is not modified yet
 }
@@ -1420,6 +1543,41 @@
   // it had/has no effect on Windows, though)
   fileDialog->setOption(QFileDialog::DontUseNativeDialog, true);
 
+  // get the dialog's layout for adding extra elements
+  QGridLayout *dialog_layout = dynamic_cast<QGridLayout*> (fileDialog->layout ());
+  int rows = dialog_layout->rowCount ();
+
+  // define a new grid layout with the extra elements
+  QGridLayout *extra = new QGridLayout (fileDialog);
+  QSpacerItem *spacer = new QSpacerItem (1,1,QSizePolicy::Expanding,
+                                             QSizePolicy::Fixed);
+  QFrame *separator = new QFrame (fileDialog);
+  separator->setFrameShape (QFrame::HLine);   // horizontal line as separator
+  separator->setFrameStyle (QFrame::Sunken);
+
+  // combo box for choosing new line ending chars
+  QLabel *label_eol = new QLabel (tr ("Line Endings:"));
+  QComboBox *combo_eol = new QComboBox ();
+  combo_eol->addItem ("Windows (CRLF)");  // ensure the same order as in
+  combo_eol->addItem ("Mac (CR)");        // the settings dialog
+  combo_eol->addItem ("Unix (LF)");
+  _save_as_desired_eol = _edit_area->eolMode ();      // init with current eol
+  combo_eol->setCurrentIndex (_save_as_desired_eol);
+
+  // track changes in the combo box
+  connect (combo_eol, SIGNAL (currentIndexChanged (int)),
+           this, SLOT (handle_combo_eol_current_index (int)));
+
+  // build the extra grid layout
+  extra->addWidget (separator,0,0,1,3);
+  extra->addWidget (label_eol,1,0);
+  extra->addWidget (combo_eol,1,1);
+  extra->addItem   (spacer,   1,2);
+
+  // and add the extra grid layout to the dialog's layout
+  dialog_layout->addLayout (extra,rows,0,1,dialog_layout->columnCount ());
+
+
   if (valid_file_name ())
     {
       fileDialog->selectFile (_file_name);
@@ -1465,6 +1623,12 @@
   show_dialog (fileDialog);
 }
 
+void
+file_editor_tab::handle_combo_eol_current_index (int index)
+{
+  _save_as_desired_eol = static_cast<QsciScintilla::EolMode> (index);
+}
+
 bool
 file_editor_tab::check_valid_identifier (QString file_name)
 {
@@ -1492,6 +1656,9 @@
 void
 file_editor_tab::handle_save_file_as_answer (const QString& saveFileName)
 {
+  if (_save_as_desired_eol != _edit_area->eolMode ())
+    convert_eol (this,_save_as_desired_eol);
+
   if (saveFileName == _file_name)
     {
       // same name as actual file, save it as "save" would do
@@ -1510,6 +1677,13 @@
 void
 file_editor_tab::handle_save_file_as_answer_close (const QString& saveFileName)
 {
+  if (_save_as_desired_eol != _edit_area->eolMode ())
+    {
+      _edit_area->setReadOnly (false);  // was set to read-only in save_file_as
+      convert_eol (this,_save_as_desired_eol);
+      _edit_area->setReadOnly (true);   // restore read-only mode
+    }
+
   // saveFileName == _file_name can not happen, because we only can get here
   // when we close a tab and _file_name is not a valid file name yet
 
@@ -1656,6 +1830,9 @@
   else
     _edit_area->setWhitespaceVisibility (QsciScintilla::WsInvisible);
 
+  _edit_area->setEolVisibility (
+              settings->value("editor/show_eol_chars",false).toBool ());
+
   if (settings->value ("editor/showLineNumbers", true).toBool ())
     {
       _edit_area->setMarginLineNumbers (2, true);
--- a/libgui/src/m-editor/file-editor-tab.h	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/src/m-editor/file-editor-tab.h	Wed Oct 15 11:54:04 2014 -0400
@@ -31,6 +31,7 @@
 #include <Qsci/qsciapis.h>
 #include <QStatusBar>
 #include <QLabel>
+#include <QComboBox>
 
 #include "find-dialog.h"
 #include "octave-qscintilla.h"
@@ -96,6 +97,7 @@
 
   void indent_selected_text (const QWidget *ID);
   void unindent_selected_text (const QWidget *ID);
+  void convert_eol (const QWidget *ID, QsciScintilla::EolMode);
 
   void zoom_in (const QWidget *ID);
   void zoom_out (const QWidget *ID);
@@ -160,6 +162,7 @@
   void handle_save_file_as_answer (const QString& fileName);
   void handle_save_file_as_answer_close (const QString& fileName);
   void handle_save_file_as_answer_cancel ();
+  void handle_combo_eol_current_index (int index);
 
   // When apis preparation has finished and is ready to save
   void save_apis_info ();
@@ -211,11 +214,17 @@
   void add_octave_apis (octave_value_list key_ovl);
   QString get_function_name ();
 
+  QsciScintilla::EolMode detect_eol_mode ();
+  void update_eol_indicator ();
+
   octave_qscintilla *_edit_area;
 
   QStatusBar *_status_bar;
   QLabel *_row_indicator;
   QLabel *_col_indicator;
+  QLabel *_eol_indicator;
+
+  QsciScintilla::EolMode _save_as_desired_eol;
 
   QString _file_name;
   QString _file_name_short;
--- a/libgui/src/m-editor/file-editor.cc	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/src/m-editor/file-editor.cc	Wed Oct 15 11:54:04 2014 -0400
@@ -812,6 +812,25 @@
   emit fetab_unindent_selected_text (_tab_widget->currentWidget ());
 }
 
+void
+file_editor::request_conv_eol_windows (bool)
+{
+  emit fetab_convert_eol (_tab_widget->currentWidget (),
+                          QsciScintilla::EolWindows);
+}
+void
+file_editor::request_conv_eol_unix (bool)
+{
+  emit fetab_convert_eol (_tab_widget->currentWidget (),
+                          QsciScintilla::EolUnix);
+}
+void
+file_editor::request_conv_eol_mac (bool)
+{
+  emit fetab_convert_eol (_tab_widget->currentWidget (),
+                          QsciScintilla::EolMac);
+}
+
 
 void
 file_editor::request_find (bool)
@@ -988,6 +1007,41 @@
 }
 
 void
+file_editor::toggle_preference (const QString& preference, bool def)
+{
+  QSettings *settings = resource_manager::get_settings ();
+  bool old = settings->value (preference,def).toBool ();
+  settings->setValue (preference,!old);
+  notice_settings (settings);
+}
+
+void
+file_editor::show_line_numbers (bool)
+{
+  toggle_preference ("editor/showLineNumbers",true);
+}
+void
+file_editor::show_white_space (bool)
+{
+  toggle_preference ("editor/show_white_space",false);
+}
+void
+file_editor::show_eol_chars (bool)
+{
+  toggle_preference ("editor/show_eol_chars",false);
+}
+void
+file_editor::show_indent_guides (bool)
+{
+  toggle_preference ("editor/show_indent_guides",false);
+}
+void
+file_editor::show_long_line (bool)
+{
+  toggle_preference ("editor/long_line_marker",true);
+}
+
+void
 file_editor::zoom_in (bool)
 {
   emit fetab_zoom_in (_tab_widget->currentWidget ());
@@ -1065,6 +1119,18 @@
 
   _tab_widget->setUsesScrollButtons (true);
 
+  bool show_it;
+  show_it = settings->value ("editor/showLineNumbers",true).toBool ();
+  _show_linenum_action->setChecked (show_it);
+  show_it = settings->value ("editor/show_white_space",false).toBool ();
+  _show_whitespace_action->setChecked (show_it);
+  show_it = settings->value ("editor/show_eol_chars",false).toBool ();
+  _show_eol_action->setChecked (show_it);
+  show_it = settings->value ("editor/show_indent_guides",false).toBool ();
+  _show_indguide_action->setChecked (show_it);
+  show_it = settings->value ("editor/long_line_marker",true).toBool ();
+  _show_longline_action->setChecked (show_it);
+
   set_shortcuts ();
 
   // Relay signal to file editor tabs.
@@ -1278,15 +1344,33 @@
           tr ("&Uppercase Selection"), SLOT (request_upper_case (bool)));
   _lower_case_action = add_action (_edit_fmt_menu, QIcon (),
           tr ("&Lowercase Selection"), SLOT (request_lower_case (bool)));
+
+  _edit_fmt_menu->addSeparator ();
+
   _comment_selection_action = add_action (_edit_fmt_menu, QIcon (),
           tr ("&Comment"), SLOT (request_comment_selected_text (bool)));
   _uncomment_selection_action = add_action (_edit_fmt_menu, QIcon (),
           tr ("&Uncomment"), SLOT (request_uncomment_selected_text (bool)));
+
+  _edit_fmt_menu->addSeparator ();
+
   _indent_selection_action = add_action (_edit_fmt_menu, QIcon (),
           tr ("&Indent"), SLOT (request_indent_selected_text (bool)));
   _unindent_selection_action = add_action (_edit_fmt_menu, QIcon (),
           tr ("&Unindent"), SLOT (request_unindent_selected_text (bool)));
 
+  _edit_fmt_menu->addSeparator ();
+
+  _conv_eol_windows_action = add_action (_edit_fmt_menu, QIcon (),
+          tr ("Convert Line Endings to &Windows (CRLF)"),
+          SLOT (request_conv_eol_windows (bool)));
+  _conv_eol_unix_action = add_action (_edit_fmt_menu, QIcon (),
+          tr ("Convert Line Endings to &Unix (LF)"),
+          SLOT (request_conv_eol_unix (bool)));
+  _conv_eol_mac_action = add_action (_edit_fmt_menu, QIcon (),
+          tr ("Convert Line Endings to &Mac (CR)"),
+          SLOT (request_conv_eol_mac (bool)));
+
   _edit_nav_menu = editMenu->addMenu (tr ("Navi&gation"));
 
   _goto_line_action = add_action (_edit_nav_menu, QIcon (),
@@ -1316,6 +1400,30 @@
 
   QMenu *view_menu = m_add_menu (_menu_bar, tr ("&View"));
 
+  _view_editor_menu = view_menu->addMenu (tr ("&Editor"));
+
+  _show_linenum_action = add_action (_view_editor_menu, QIcon (),
+          tr ("Show &Line Numbers"), SLOT (show_line_numbers (bool)));
+  _show_linenum_action->setCheckable (true);
+
+  _show_whitespace_action = add_action (_view_editor_menu, QIcon (),
+          tr ("Show &White Spaces"), SLOT (show_white_space (bool)));
+  _show_whitespace_action->setCheckable (true);
+
+  _show_eol_action = add_action (_view_editor_menu, QIcon (),
+          tr ("Show Line &Endings"), SLOT (show_eol_chars (bool)));
+  _show_eol_action->setCheckable (true);
+
+  _show_indguide_action = add_action (_view_editor_menu, QIcon (),
+          tr ("Show &Indentation Guides"), SLOT (show_indent_guides (bool)));
+  _show_indguide_action->setCheckable (true);
+
+  _show_longline_action = add_action (_view_editor_menu, QIcon (),
+          tr ("Show Long Line &Marker"), SLOT (show_long_line (bool)));
+  _show_longline_action->setCheckable (true);
+
+  view_menu->addSeparator ();
+
   _zoom_in_action = add_action (view_menu, QIcon (),
           tr ("Zoom &In"), SLOT (zoom_in (bool)));
   _zoom_out_action = add_action (view_menu, QIcon (),
@@ -1565,6 +1673,9 @@
   connect (this, SIGNAL (fetab_unindent_selected_text (const QWidget*)),
            f, SLOT (unindent_selected_text (const QWidget*)));
 
+  connect (this, SIGNAL (fetab_convert_eol (const QWidget*, QsciScintilla::EolMode)),
+           f, SLOT (convert_eol (const QWidget*, QsciScintilla::EolMode)));
+
   connect (this, SIGNAL (fetab_find (const QWidget*)),
            f, SLOT (find (const QWidget*)));
 
@@ -1669,7 +1780,16 @@
   shortcut_manager::set_shortcut (_preferences_action, "editor_edit:preferences");
   shortcut_manager::set_shortcut (_styles_preferences_action, "editor_edit:styles_preferences");
 
+  shortcut_manager::set_shortcut (_conv_eol_windows_action, "editor_edit:conv_eol_winows");
+  shortcut_manager::set_shortcut (_conv_eol_unix_action,    "editor_edit:conv_eol_unix");
+  shortcut_manager::set_shortcut (_conv_eol_mac_action,     "editor_edit:conv_eol_mac");
+
   // View menu
+  shortcut_manager::set_shortcut (_show_linenum_action, "editor_view:show_line_numbers");
+  shortcut_manager::set_shortcut (_show_whitespace_action, "editor_view:show_white_spaces");
+  shortcut_manager::set_shortcut (_show_eol_action, "editor_view:show_eol_chars");
+  shortcut_manager::set_shortcut (_show_indguide_action, "editor_view:show_ind_guides");
+  shortcut_manager::set_shortcut (_show_longline_action, "editor_view:show_long_line");
   shortcut_manager::set_shortcut (_zoom_in_action, "editor_view:zoom_in");
   shortcut_manager::set_shortcut (_zoom_out_action, "editor_view:zoom_out");
   shortcut_manager::set_shortcut (_zoom_normal_action, "editor_view:zoom_normal");
@@ -1708,6 +1828,7 @@
   _context_help_action->setEnabled (have_tabs);
   _context_doc_action->setEnabled (have_tabs);
 
+  _view_editor_menu->setEnabled (have_tabs);
   _zoom_in_action->setEnabled (have_tabs);
   _zoom_out_action->setEnabled (have_tabs);
   _zoom_normal_action->setEnabled (have_tabs);
--- a/libgui/src/m-editor/file-editor.h	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/src/m-editor/file-editor.h	Wed Oct 15 11:54:04 2014 -0400
@@ -96,6 +96,7 @@
   void fetab_uncomment_selected_text (const QWidget* ID);
   void fetab_indent_selected_text (const QWidget* ID);
   void fetab_unindent_selected_text (const QWidget* ID);
+  void fetab_convert_eol (const QWidget* ID, QsciScintilla::EolMode eol_mode);
   void fetab_find (const QWidget* ID);
   void fetab_goto_line (const QWidget* ID, int line = -1);
   void fetab_completion (const QWidget*);
@@ -167,6 +168,9 @@
   void request_lower_case (bool);
   void request_indent_selected_text (bool);
   void request_unindent_selected_text (bool);
+  void request_conv_eol_windows (bool);
+  void request_conv_eol_unix (bool);
+  void request_conv_eol_mac (bool);
 
   void request_find (bool);
 
@@ -214,6 +218,11 @@
   void request_styles_preferences (bool);
   void restore_create_file_setting ();
 
+  void show_line_numbers (bool);
+  void show_white_space (bool);
+  void show_eol_chars (bool);
+  void show_indent_guides (bool);
+  void show_long_line (bool);
   void zoom_in (bool);
   void zoom_out (bool);
   void zoom_normal (bool);
@@ -235,6 +244,8 @@
   void mru_menu_update (void);
   bool call_custom_editor (const QString& file_name = QString (), int line = -1);
 
+  void toggle_preference (const QString& preference, bool def);
+
   QWidget *find_tab_widget (const QString& openFileName) const;
   QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text,
                        const char *member);
@@ -260,6 +271,9 @@
   QAction *_uncomment_selection_action;
   QAction *_indent_selection_action;
   QAction *_unindent_selection_action;
+  QAction *_conv_eol_windows_action;
+  QAction *_conv_eol_unix_action;
+  QAction *_conv_eol_mac_action;
 
   QAction *_copy_action;
   QAction *_cut_action;
@@ -268,6 +282,11 @@
   QAction *_context_help_action;
   QAction *_context_doc_action;
 
+  QAction *_show_linenum_action;
+  QAction *_show_whitespace_action;
+  QAction *_show_eol_action;
+  QAction *_show_indguide_action;
+  QAction *_show_longline_action;
   QAction *_zoom_in_action;
   QAction *_zoom_out_action;
   QAction *_zoom_normal_action;
@@ -317,6 +336,7 @@
   QMenu *_edit_fmt_menu;
   QMenu *_edit_nav_menu;
   QMenu *_fileMenu;
+  QMenu *_view_editor_menu;
 
   QTabWidget *_tab_widget;
 
--- a/libgui/src/settings-dialog.cc	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/src/settings-dialog.cc	Wed Oct 15 11:54:04 2014 -0400
@@ -36,6 +36,7 @@
 #include <QHash>
 
 #ifdef HAVE_QSCINTILLA
+#include "octave-qscintilla.h"
 #include <QScrollArea>
 
 #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
@@ -184,6 +185,21 @@
     settings->value ("editor/show_white_space", false).toBool ());
   ui->editor_ws_indent_checkbox->setChecked (
     settings->value ("editor/show_white_space_indent",false).toBool ());
+  ui->cb_show_eol->setChecked (
+    settings->value ("editor/show_eol_chars",false).toBool () );
+#ifdef HAVE_QSCINTILLA
+#if defined (Q_OS_WIN32)
+  int eol_mode = QsciScintilla::EolWindows;
+#elif defined (Q_OS_MAC)
+  int eol_mode = QsciScintilla::EolMac;
+#else
+  int eol_mode = QsciScintilla::EolUnix;
+#endif
+#else
+  int eol_mode = 2;
+#endif
+  ui->combo_eol_mode->setCurrentIndex (
+    settings->value ("editor/default_eol_mode",eol_mode).toInt () );
   ui->editor_auto_ind_checkbox->setChecked (
     settings->value ("editor/auto_indent", true).toBool ());
   ui->editor_tab_ind_checkbox->setChecked (
@@ -633,6 +649,10 @@
                       ui->editor_ws_checkbox->isChecked ());
   settings->setValue ("editor/show_white_space_indent",
                       ui->editor_ws_indent_checkbox->isChecked ());
+  settings->setValue ("editor/show_eol_chars",
+                      ui->cb_show_eol->isChecked ());
+  settings->setValue ("editor/default_eol_mode",
+                      ui->combo_eol_mode->currentIndex ());
   settings->setValue ("editor/auto_indent",
                       ui->editor_auto_ind_checkbox->isChecked ());
   settings->setValue ("editor/tab_indents_line",
--- a/libgui/src/settings-dialog.ui	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/src/settings-dialog.ui	Wed Oct 15 11:54:04 2014 -0400
@@ -32,7 +32,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>5</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab_general">
       <property name="enabled">
@@ -52,8 +52,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>560</width>
+            <height>353</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_17">
@@ -406,7 +406,7 @@
             <x>0</x>
             <y>0</y>
             <width>662</width>
-            <height>580</height>
+            <height>613</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_16">
@@ -417,6 +417,43 @@
                <property name="horizontalSpacing">
                 <number>6</number>
                </property>
+               <item row="6" column="2">
+                <layout class="QHBoxLayout" name="horizontalLayout_3">
+                 <item>
+                  <widget class="QLabel" name="editor_long_line_column_text">
+                   <property name="text">
+                    <string>After Column</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSpinBox" name="editor_long_line_column">
+                   <property name="minimum">
+                    <number>2</number>
+                   </property>
+                   <property name="maximum">
+                    <number>256</number>
+                   </property>
+                   <property name="value">
+                    <number>80</number>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <spacer name="horizontalSpacer_7">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>40</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                </layout>
+               </item>
                <item row="3" column="0">
                 <widget class="QCheckBox" name="editor_ws_checkbox">
                  <property name="text">
@@ -457,7 +494,7 @@
                  </property>
                 </widget>
                </item>
-               <item row="4" column="0">
+               <item row="5" column="0">
                 <widget class="QCheckBox" name="editor_highlightCurrentLine">
                  <property name="enabled">
                   <bool>true</bool>
@@ -467,7 +504,7 @@
                  </property>
                 </widget>
                </item>
-               <item row="4" column="2">
+               <item row="5" column="2">
                 <layout class="QGridLayout" name="editor_grid_current_line" rowstretch="0" columnstretch="0,0,0,0,0">
                  <property name="horizontalSpacing">
                   <number>12</number>
@@ -608,7 +645,7 @@
                  </property>
                 </spacer>
                </item>
-               <item row="5" column="0">
+               <item row="6" column="0">
                 <widget class="QCheckBox" name="editor_long_line_marker">
                  <property name="toolTip">
                   <string>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</string>
@@ -621,30 +658,69 @@
                  </property>
                 </widget>
                </item>
-               <item row="5" column="2">
-                <layout class="QHBoxLayout" name="horizontalLayout_3">
+               <item row="7" column="0">
+                <widget class="QCheckBox" name="cb_code_folding">
+                 <property name="text">
+                  <string>Enable Code Folding</string>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="8" column="0">
+                <widget class="QCheckBox" name="cb_edit_status_bar">
+                 <property name="text">
+                  <string>Show status bar</string>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="0">
+                <widget class="QCheckBox" name="cb_show_eol">
+                 <property name="text">
+                  <string>Show eol characters</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="2">
+                <layout class="QHBoxLayout" name="horizontalLayout_17">
                  <item>
-                  <widget class="QLabel" name="editor_long_line_column_text">
+                  <widget class="QLabel" name="label_22">
                    <property name="text">
-                    <string>After Column</string>
+                    <string>Default eol mode</string>
                    </property>
                   </widget>
                  </item>
                  <item>
-                  <widget class="QSpinBox" name="editor_long_line_column">
-                   <property name="minimum">
-                    <number>2</number>
+                  <widget class="QComboBox" name="combo_eol_mode">
+                   <property name="sizeAdjustPolicy">
+                    <enum>QComboBox::AdjustToContents</enum>
+                   </property>
+                   <property name="minimumContentsLength">
+                    <number>7</number>
                    </property>
-                   <property name="maximum">
-                    <number>256</number>
-                   </property>
-                   <property name="value">
-                    <number>80</number>
-                   </property>
+                   <item>
+                    <property name="text">
+                     <string>Windows (CRLF)</string>
+                    </property>
+                   </item>
+                   <item>
+                    <property name="text">
+                     <string>Mac (CR)</string>
+                    </property>
+                   </item>
+                   <item>
+                    <property name="text">
+                     <string>Unix (LF)</string>
+                    </property>
+                   </item>
                   </widget>
                  </item>
                  <item>
-                  <spacer name="horizontalSpacer_7">
+                  <spacer name="horizontalSpacer_17">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -658,26 +734,6 @@
                  </item>
                 </layout>
                </item>
-               <item row="6" column="0">
-                <widget class="QCheckBox" name="cb_code_folding">
-                 <property name="text">
-                  <string>Enable Code Folding</string>
-                 </property>
-                 <property name="checked">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="7" column="0">
-                <widget class="QCheckBox" name="cb_edit_status_bar">
-                 <property name="text">
-                  <string>Show status bar</string>
-                 </property>
-                 <property name="checked">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
               </layout>
              </item>
              <item>
@@ -1224,8 +1280,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>488</width>
+            <height>262</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -1489,8 +1545,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>474</width>
+            <height>318</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_18">
@@ -1653,8 +1709,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>203</width>
+            <height>134</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -1728,8 +1784,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>368</width>
+            <height>244</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_25">
@@ -1991,8 +2047,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>529</width>
+            <height>204</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_20">
--- a/libgui/src/shortcut-manager.cc	Mon Oct 13 13:40:44 2014 +0100
+++ b/libgui/src/shortcut-manager.cc	Wed Oct 15 11:54:04 2014 -0400
@@ -199,7 +199,7 @@
   init (tr ("Undo"), "editor_edit:undo", QKeySequence::Undo);
   init (tr ("Redo"), "editor_edit:redo", QKeySequence::Redo);
   init (tr ("Copy"), "editor_edit:copy", QKeySequence::Copy);
-  init (tr ("Cuy"), "editor_edit:cut", QKeySequence::Cut);
+  init (tr ("Cut"), "editor_edit:cut", QKeySequence::Cut);
   init (tr ("Paste"), "editor_edit:paste", QKeySequence::Paste);
   init (tr ("Select All"), "editor_edit:select_all", QKeySequence::SelectAll);
   init (tr ("Find and Replace"), "editor_edit:find_replace",
@@ -246,6 +246,13 @@
         QKeySequence (ctrl_shift + Qt::Key_Tab));
 #endif
 
+  init (tr ("Convert Line Ednings to Windows"), "editor_edit:conv_eol_winows",
+        QKeySequence ());
+  init (tr ("Convert Line Ednings to Unix"), "editor_edit:conv_eol_unix",
+        QKeySequence ());
+  init (tr ("Convert Line Ednings to Mac"), "editor_edit:conv_eol_mac",
+        QKeySequence ());
+
   init (tr ("Goto Line"), "editor_edit:goto_line",  
         QKeySequence (ctrl + Qt::Key_G));
   init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark",
@@ -262,6 +269,11 @@
         QKeySequence ());
 
   // view
+  init (tr ("Show Line Numbers"), "editor_view:show_line_numbers", QKeySequence ());
+  init (tr ("Show White Spaces"), "editor_view:show_white_spaces", QKeySequence ());
+  init (tr ("Show Line Endings"), "editor_view:show_eol_chars", QKeySequence ());
+  init (tr ("Show Indentation Guides"), "editor_view:show_ind_guides", QKeySequence ());
+  init (tr ("Show Long Line Marker"), "editor_view:show_long_line", QKeySequence ());
   init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn);
   init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut);
 #if defined (Q_OS_MAC)
--- a/libinterp/corefcn/pr-output.cc	Mon Oct 13 13:40:44 2014 +0100
+++ b/libinterp/corefcn/pr-output.cc	Wed Oct 15 11:54:04 2014 -0400
@@ -85,7 +85,7 @@
 static bool plus_format = false;
 
 // First char for > 0, second for < 0, third for == 0.
-static std::string plus_format_chars = "+  ";
+static std::string plus_format_chars = "+- ";
 
 // TRUE means always print in a rational approximation
 static bool rat_format = false;
@@ -3815,7 +3815,7 @@
                 }
             }
           else
-            plus_format_chars = "+  ";
+            plus_format_chars = "+- ";
 
           init_format_state ();
           plus_format = true;
@@ -3964,13 +3964,14 @@
 @itemx \"+\" @var{chars}\n\
 @itemx plus\n\
 @itemx plus @var{chars}\n\
-Print a @samp{+} symbol for nonzero matrix elements and a space for zero\n\
-matrix elements.  This format can be very useful for examining the\n\
-structure of a large sparse matrix.\n\
+Print a @samp{+} symbol for matrix elements greater than zero, a\n\
+@samp{-} symbol for elements less than zero and a space for zero matrix\n\
+elements.  This format can be very useful for examining the structure\n\
+of a large sparse matrix.\n\
 \n\
 The optional argument @var{chars} specifies a list of 3 characters to use\n\
 for printing values greater than zero, less than zero and equal to zero.\n\
-For example, with the @samp{+ \"+-.\"} format, @code{[1, 0, -1; -1, 0, 1]}\n\
+For example, with the @samp{\"+\" \"+-.\"} format, @code{[1, 0, -1; -1, 0, 1]}\n\
 is displayed as\n\
 \n\
 @example\n\
--- a/scripts/miscellaneous/fact.m	Mon Oct 13 13:40:44 2014 +0100
+++ b/scripts/miscellaneous/fact.m	Wed Oct 15 11:54:04 2014 -0400
@@ -75,13 +75,13 @@
       "Richard Stallman needs neither mouse nor keyboard to operate his computer. He just stares it down until it does what he wants.";
       "Richard Stallman didn't write the GPL. He is the GPL.";
       "Richard Stallman's pinky finger is really a USB memory stick.";
-      "Richard Stallman called his operating system GNU because he created it before computers existed, when actual gnus were used for calcuations.";
+      "Richard Stallman called his operating system GNU because he created it before computers existed, when actual gnus were used for calculations.";
       "In Soviet Russia, Richard Stallman is still Richard Stallman!";
       "Richard Stallman's flute only plays free music.";
       "When Richard Stallman uses floats, there are no rounding errors.";
       "Richard Stallman wrote a program so powerful it knows the question to 42.";
       "Richard Stallman released his own DNA under GNU FDL.";
-      "Richard Stallman knows the entire wikipedia by heart, markup included.";
+      "Richard Stallman knows the entire Wikipedia by heart, markup included.";
       "Richard Stallman wrote the HAL9000 OS.";
       "Richard Stallman's laser pointer is a lightsaber.";
       "Richard Stallman never steps down; he shifts the universe up.";
@@ -129,7 +129,7 @@
       "Richard Stallman's uptime is over 53 years. And counting up.";
       "Richard Stallman's portable music player can play ogg and WMA, but is too afraid to invoke Richard Stallman's wrath by playing WMA. Ogg it is, then.";
       "Richard Stallman will never die, but may some day go to /dev/null.";
-      "Richard Stallman once got swine flu, but it got cleansed by hereditay GPL and thus got assimilated.";
+      "Richard Stallman once got swine flu, but it got cleansed by hereditary GPL and thus got assimilated.";
       "Richard Stallman don't cut his hair because there are no GNU/Scissors.";
       "Richard Stallman is the one who trims Chuck Norris beard. And he does it freely, of course.";
       "Richard Stallman does not take bath, for the hydroelectric company uses proprietary software.";
@@ -146,7 +146,7 @@
       "Richard Stallman is so zealous about privacy he has /dev/null as his home.";
       "When Richard Stallman runs /bin/false, it returns \"true\".";
       "Richard Stallman doesn't like money, because banks don't run on free software.";
-      "Richard Stallman user GNU tar to compress air.";
+      "Richard Stallman uses GNU tar to compress air.";
       "When Richard Stallman reports a bug, the bug prefers to squash itself instead of facing Richard Stallman's wrath.";
       "There are no Windows in Richard Stallman's house... only Doors...";
       "Richard Stallman doesn't like neither PCs-Intel nor Burger King... He prefers e-Macs...";
@@ -210,7 +210,7 @@
       "C is actually written in RMS.";
       "Richard Stallman can write software that does not have a buffer overflow when counting money lost by Jerome Kerviel.";
       "There were no double rainbows before Richard Stallman.";
-      "Chuck Norris had to shorten his beard in the presence of Richard Stallman because two beards that awsome, so close would segfault the universe (again).";
+      "Chuck Norris had to shorten his beard in the presence of Richard Stallman because two beards that awesome, so close would segfault the universe (again).";
       "RMS is Titanic.";
       "Richard Stallman is the answer to the Turing Test.";
       "Richard Stallman's beard makes ads for Gillette and Braun appear.";
@@ -218,7 +218,7 @@
       "\"RMS\" stands for \"RMS Makes Software\"";
       "Whenever someone writes a \"Hello, world\" program, Richard Stallman says \"Hello\" back.";
       "Richard Stallman wasn't born. He was compiled from source.";
-      "Richard Stallman has a URL tatooed on the left side of his chest where you can download his genetic code.";
+      "Richard Stallman has a URL tattooed on the left side of his chest where you can download his genetic code.";
       "The GNU command line idiom that Richard Stallman never needs: \"date | more\"";
       "Richard Stallman's toe cheese is aged to perfection.";
       "Richard Stallman doesn't always run an OS kernel, but when he does he prefers GNU/Hurd. He is... the most interesting hacker in the world. Stay free, my friends.";