Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
pka committed Oct 7, 2012
2 parents 53fb95c + fccf9ac commit 277a4b4
Show file tree
Hide file tree
Showing 183 changed files with 5,652 additions and 940 deletions.
362 changes: 263 additions & 99 deletions Doxyfile

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cmake/FindLibPython.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 2 additions & 0 deletions cmake/FindPyQt.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 2 additions & 0 deletions cmake/FindSIP.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-

# FindSIP.py
#
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
Expand Down
2 changes: 2 additions & 0 deletions cmake/PythonCompile.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-

# By Simon Edwards <simon@simonzone.com>
# This file is in the public domain.
import py_compile
Expand Down
54 changes: 27 additions & 27 deletions doc/TRANSLATORS
100644 → 100755

Large diffs are not rendered by default.

14 changes: 2 additions & 12 deletions i18n/qgis_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions i18n/qgis_it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 277a4b4

Please sign in to comment.