Skip to content

Commit 277a4b4

Browse files
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents 53fb95c + fccf9ac commit 277a4b4

File tree

183 files changed

+5652
-940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+5652
-940
lines changed

Doxyfile

Lines changed: 263 additions & 99 deletions
Large diffs are not rendered by default.

cmake/FindLibPython.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# -*- coding: utf-8 -*-
12

23
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
34
# Redistribution and use is allowed according to the terms of the BSD license.

cmake/FindPyQt.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
13
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
24
# Redistribution and use is allowed according to the terms of the BSD license.
35
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.

cmake/FindSIP.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
13
# FindSIP.py
24
#
35
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>

cmake/PythonCompile.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
13
# By Simon Edwards <simon@simonzone.com>
24
# This file is in the public domain.
35
import py_compile

doc/TRANSLATORS

100644100755
Lines changed: 27 additions & 27 deletions
Large diffs are not rendered by default.

i18n/qgis_de.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10269,18 +10269,8 @@ Aktueller Themenname: %5
1026910269
Aktueller Themenpfad: %6
1027010270
Voreingestellter-Themenpfad: %7
1027110271
SVG-Suchpfads: %8
10272-
Benutzer-DB-Pfad: %9 {1
10273-
?} {2
10274-
?} {3
10275-
?} {4
10276-
?} {5
10277-
?} {6
10278-
?} {7
10279-
?} {8
10280-
?} {9
10281-
?} {2
10282-
or 3
10283-
?}</translation>
10272+
Benutzer-DB-Pfad: %9
10273+
</translation>
1028410274
</message>
1028510275
<message>
1028610276
<source>Application state:

i18n/qgis_it.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6461,23 +6461,23 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
64616461
<message>
64626462
<source>Are you sure you want to completely
64636463
delete the command history ?</source>
6464-
<translation type="obsolete">Sei sicuro di voler concellare completamente
6464+
<translation>Sei sicuro di voler concellare completamente
64656465
la cronologia dei comandi ?</translation>
64666466
</message>
64676467
<message>
64686468
<source>## History saved successfully ##</source>
6469-
<translation type="obsolete">## Storia comandi salvata con successo ##</translation>
6469+
<translation>## Storia comandi salvata con successo ##</translation>
64706470
</message>
64716471
<message>
64726472
<source>## History cleared successfully ##</source>
6473-
<translation type="obsolete">## Storia comandi cancellata con successo ##</translation>
6473+
<translation>## Storia comandi cancellata con successo ##</translation>
64746474
</message>
64756475
<message>
64766476
<source>## To access Quantum GIS environment from this console
64776477
## use qgis.utils.iface object (instance of QgisInterface class). Read help for more info.
64786478

64796479
</source>
6480-
<translation type="obsolete">## Per accedere all&apos;ambiente Quantum GIS da questa console
6480+
<translation>## Per accedere all&apos;ambiente Quantum GIS da questa console
64816481
## usa l&apos;oggetto qgis.utils.iface (istanza della classe QgisInterface). Consulta l&apos;aiuto per ottenere più informazioni.
64826482

64836483
</translation>

0 commit comments

Comments
 (0)