Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Oct 7, 2012 · 277a4b446f72bbc0b6e780875ca9cdfbfdd7c7ea · 277a4b4
2 parents 53fb95c + fccf9ac
commit 277a4b446f72bbc0b6e780875ca9cdfbfdd7c7ea
diff --git a/Doxyfile b/Doxyfile
diff --git a/cmake/FindLibPython.py b/cmake/FindLibPython.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 # Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
 # Redistribution and use is allowed according to the terms of the BSD license.

diff --git a/cmake/FindPyQt.py b/cmake/FindPyQt.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.

diff --git a/cmake/FindSIP.py b/cmake/FindSIP.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # FindSIP.py
 #
 # Copyright (c) 2007, Simon Edwards <simon@simonzone.com>

diff --git a/cmake/PythonCompile.py b/cmake/PythonCompile.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # By Simon Edwards <simon@simonzone.com>
 # This file is in the public domain.
 import py_compile

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
@@ -10269,18 +10269,8 @@ Aktueller Themenname:	%5
 Aktueller Themenpfad:	%6
 Voreingestellter-Themenpfad:	%7
 SVG-Suchpfads:		%8
-Benutzer-DB-Pfad:		%9 {1
-?} {2
-?} {3
-?} {4
-?} {5
-?} {6
-?} {7
-?} {8
-?} {9
-?} {2
- or 3
-?}</translation>
+Benutzer-DB-Pfad:		%9
+</translation>
     </message>
     <message>
         <source>Application state:

diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
@@ -6461,23 +6461,23 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
     <message>
         <source>Are you sure you want to completely
 delete the command history ?</source>
-        <translation type="obsolete">Sei sicuro di voler concellare completamente
+        <translation>Sei sicuro di voler concellare completamente
 la cronologia dei comandi ?</translation>
     </message>
     <message>
         <source>## History saved successfully ##</source>
-        <translation type="obsolete">## Storia comandi salvata con successo ##</translation>
+        <translation>## Storia comandi salvata con successo ##</translation>
     </message>
     <message>
         <source>## History cleared successfully ##</source>
-        <translation type="obsolete">## Storia comandi cancellata con successo ##</translation>
+        <translation>## Storia comandi cancellata con successo ##</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.
 
 </source>
-        <translation type="obsolete">## Per accedere all&apos;ambiente Quantum GIS da questa console
+        <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.
 
 </translation>