From d3981b8fbcfa393d6e7ead8ebe4c45530bc6e5ac Mon Sep 17 00:00:00 2001
From: Salvatore Larosa <lrssvtml@gmail.com>
Date: Tue, 15 Jan 2013 16:51:35 +0100
Subject: [PATCH] Update translation for Python Console

---
 i18n/qgis_it.ts                    | 59 +++++++++++++++++----
 python/console/console_output.py   |  7 +--
 python/console/console_sci.py      |  6 +--
 python/console/console_settings.py |  6 +--
 python/console/console_settings.ui | 84 +++++++++++++++---------------
 5 files changed, 101 insertions(+), 61 deletions(-)

diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
index 01121bbac93..21f5b802bc4 100644
--- a/i18n/qgis_it.ts
+++ b/i18n/qgis_it.ts
@@ -6470,30 +6470,69 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
         <translation>Esegui comando</translation>
     </message>
     <message>
-        <source>Are you sure you want to completely
-delete the command history ?</source>
-        <translation>Sei sicuro di voler concellare completamente
-la cronologia dei comandi ?</translation>
+        <source>Session and file history cleared successfully.</source>
+        <translation>Storia dei comandi cancellata completamente.</translation>
     </message>
     <message>
-        <source>## History saved successfully ##</source>
-        <translation>## Storia comandi salvata con successo ##</translation>
+        <source>History saved successfully.</source>
+        <translation>Storia comandi salvata con successo.</translation>
     </message>
     <message>
-        <source>## History cleared successfully ##</source>
-        <translation>## Storia comandi cancellata con successo ##</translation>
+        <source>History cleared successfully.</source>
+        <translation>Storia comandi cancellata con successo.</translation>
+    </message>
+    <message>
+        <source>Script was correctly saved.</source>
+        <translation>File salvato correttamente.</translation>
+    </message>
+    <message>
+        <source>URL copied to clipboard.</source>
+        <translation>URL copiata nella clipboard</translation>
+    </message>
+    <message>
+        <source>Connection error: </source>
+        <translation>Errore di connessione: </translation>
     </message>
     <message>
         <source>## To access Quantum GIS environment from this console
-## use qgis.utils.iface object (instance of QgisInterface class). Read help for more info.
+## use iface object (instance of QgisInterface class).
+## Type help(iface) for more info and list of methods.
 
 </source>
         <translation>## Per accedere all&apos;ambiente Quantum GIS da questa console
-## usa l&apos;oggetto qgis.utils.iface (istanza della classe QgisInterface). Consulta l&apos;aiuto per ottenere più informazioni.
+## usa l&apos;oggetto iface (istanza della classe QgisInterface). 
+## Digita help(iface) per ottenere più informazioni.
 
 </translation>
     </message>
 </context>
+<context>
+    <name>SettingsDialogPythonConsole</name>
+    <message>
+        <source>Settings Python Console</source>
+        <translation>Impostazioni Python Console</translation>
+    </message>
+    <message>
+        <location filename="../python/console/console_settings.ui" line="200"/>
+        <source>Font</source>
+        <translation>Carattere</translation>
+    </message>
+    <message>
+        <location filename="../python/console/console_settings.ui" line="201"/>
+        <source>Size</source>
+        <translation>Dimensione</translation>
+    </message>
+    <message>
+        <location filename="../python/console/console_settings.ui" line="203"/>
+        <source>Browse</source>
+        <translation>Sfoglia</translation>
+    </message>
+    <message>
+        <location filename="../python/console/console_settings.ui" line="206"/>
+        <source>Using preloaded API file</source>
+        <translation>Usare il file delle API preinstallato</translation>
+    </message>
+</context>
 <context>
     <name>QGis::UnitType</name>
     <message>
diff --git a/python/console/console_output.py b/python/console/console_output.py
index c27a10f959d..d16eba89548 100644
--- a/python/console/console_output.py
+++ b/python/console/console_output.py
@@ -137,7 +137,7 @@ class EditorOutput(QsciScintilla):
     def insertInitText(self):
         txtInit = QCoreApplication.translate("PythonConsole",
                                              "## To access Quantum GIS environment from this console\n"
-                                             "## use iface object (instance of QgisInterface class). \n"
+                                             "## use iface object (instance of QgisInterface class).\n"
                                              "## Type help(iface) for more info and list of methods.\n\n")
         initText = self.setText(txtInit)
 
@@ -277,10 +277,11 @@ class EditorOutput(QsciScintilla):
                              link = i.replace('<a href="',"").strip()
             if link:
                 QApplication.clipboard().setText(link)
-                self.parent.callWidgetMessageBar('URL copied to clipboard')
+                self.parent.callWidgetMessageBar('URL copied to clipboard.')
         except urllib2.URLError, e:
             self.parent.callWidgetMessageBar('Connection error: ' + str(e.args))
 
     def widgetMessageBar(self, iface, text):
         timeout = iface.messageTimeout()
-        self.infoBar.pushMessage(text, QgsMessageBar.INFO, timeout)
+        msg = QCoreApplication.translate('PythonConsole', text)
+        self.infoBar.pushMessage(msg, QgsMessageBar.INFO, timeout)
diff --git a/python/console/console_sci.py b/python/console/console_sci.py
index 1bf0c5578da..412baf941df 100644
--- a/python/console/console_sci.py
+++ b/python/console/console_sci.py
@@ -502,14 +502,14 @@ class PythonEdit(QsciScintilla, code.InteractiveInterpreter):
         if cmd in ('_save', '_clear', '_clearAll', '_pyqgis', '_api'):
             if cmd == '_save':
                 self.writeHistoryFile()
-                self.parent.callWidgetMessageBar('History saved successfully')
+                self.parent.callWidgetMessageBar('History saved successfully.')
             elif cmd == '_clear':
                 self.clearHistoryFile()
-                self.parent.callWidgetMessageBar('History cleared successfully')
+                self.parent.callWidgetMessageBar('History cleared successfully.')
             elif cmd == '_clearAll':
                 self.history = QStringList()
                 self.clearHistoryFile()
-                self.parent.callWidgetMessageBar('Session and file history cleared successfully')
+                self.parent.callWidgetMessageBar('Session and file history cleared successfully.')
             elif cmd == '_pyqgis':
                 webbrowser.open( "http://www.qgis.org/pyqgis-cookbook/" )
             elif cmd == '_api':
diff --git a/python/console/console_settings.py b/python/console/console_settings.py
index 38488afd72a..c4615313ac1 100644
--- a/python/console/console_settings.py
+++ b/python/console/console_settings.py
@@ -22,12 +22,12 @@ Some portions of code were taken from https://code.google.com/p/pydee/
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from ui_console_settings import Ui_SettingsDialog
+from ui_console_settings import Ui_SettingsDialogPythonConsole
 
-class optionsDialog(QDialog, Ui_SettingsDialog):
+class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole):
     def __init__(self, parent):
         QDialog.__init__(self, parent)
-        self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Settings Python Console"))
+        self.setWindowTitle(QCoreApplication.translate("SettingsDialogPythonConsole", "Settings Python Console"))
         #self.iface = iface
         self.parent = parent
         self.setupUi(self)
diff --git a/python/console/console_settings.ui b/python/console/console_settings.ui
index 1c267c7227a..538def744af 100644
--- a/python/console/console_settings.ui
+++ b/python/console/console_settings.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog">
+ <class>SettingsDialogPythonConsole</class>
+ <widget class="QDialog" name="SettingsDialogPythonConsole">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
@@ -109,43 +109,6 @@
    </item>
    <item row="5" column="0">
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QTableWidget" name="tableWidget">
-       <property name="editTriggers">
-        <set>QAbstractItemView::NoEditTriggers</set>
-       </property>
-       <property name="tabKeyNavigation">
-        <bool>false</bool>
-       </property>
-       <property name="showDropIndicator" stdset="0">
-        <bool>false</bool>
-       </property>
-       <property name="dragDropOverwriteMode">
-        <bool>false</bool>
-       </property>
-       <property name="selectionMode">
-        <enum>QAbstractItemView::ExtendedSelection</enum>
-       </property>
-       <property name="selectionBehavior">
-        <enum>QAbstractItemView::SelectItems</enum>
-       </property>
-       <property name="verticalScrollMode">
-        <enum>QAbstractItemView::ScrollPerItem</enum>
-       </property>
-       <property name="horizontalScrollMode">
-        <enum>QAbstractItemView::ScrollPerPixel</enum>
-       </property>
-       <property name="rowCount">
-        <number>0</number>
-       </property>
-       <attribute name="horizontalHeaderVisible">
-        <bool>true</bool>
-       </attribute>
-       <attribute name="verticalHeaderVisible">
-        <bool>false</bool>
-       </attribute>
-      </widget>
-     </item>
      <item row="0" column="1">
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
@@ -207,6 +170,43 @@
        </item>
       </layout>
      </item>
+     <item row="0" column="0">
+      <widget class="QTableWidget" name="tableWidget">
+       <property name="editTriggers">
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="tabKeyNavigation">
+        <bool>false</bool>
+       </property>
+       <property name="showDropIndicator" stdset="0">
+        <bool>false</bool>
+       </property>
+       <property name="dragDropOverwriteMode">
+        <bool>false</bool>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectItems</enum>
+       </property>
+       <property name="verticalScrollMode">
+        <enum>QAbstractItemView::ScrollPerItem</enum>
+       </property>
+       <property name="horizontalScrollMode">
+        <enum>QAbstractItemView::ScrollPerPixel</enum>
+       </property>
+       <property name="rowCount">
+        <number>0</number>
+       </property>
+       <attribute name="horizontalHeaderVisible">
+        <bool>true</bool>
+       </attribute>
+       <attribute name="verticalHeaderVisible">
+        <bool>false</bool>
+       </attribute>
+      </widget>
+     </item>
     </layout>
    </item>
    <item row="6" column="0">
@@ -222,7 +222,7 @@
    <item row="2" column="0">
     <widget class="QCheckBox" name="preloadAPI">
      <property name="text">
-      <string>Use preloaded API file</string>
+      <string>Using preloaded API file</string>
      </property>
      <property name="checked">
       <bool>true</bool>
@@ -239,7 +239,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>SettingsDialog</receiver>
+   <receiver>SettingsDialogPythonConsole</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -255,7 +255,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>SettingsDialog</receiver>
+   <receiver>SettingsDialogPythonConsole</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">