Skip to content
Permalink
Browse files

Merge branch 'master' into delimited_text_bug_fixes

  • Loading branch information
ccrook committed Apr 16, 2013
2 parents 041b9f1 + d06ab3c commit d06c3085116808d3a4fc6aa934bb9ed34932bfe3
Showing 914 changed files with 7,462 additions and 6,853 deletions.
@@ -7313,15 +7313,23 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
<translation type="obsolete">Errore di connessione: </translation>
</message>
<message>
<source>## To access Quantum GIS environment from this console
## use iface object (instance of QgisInterface class).
<source>Click on button to restore all tabs from last session.</source>
<translation>Clicca sul bottone per riaprire le schede della sessione precedente.</translation>
</message>
<message>
<source>Restore tabs</source>
<translation>Riprisitna schede</translation>
</message>
<message>
<source>Close</source>
<translation>Chiudi</translation>
</message>
<message>
<source>Python %1 on %2
## Type help(iface) for more info and list of methods.

</source>
<translation type="obsolete">## Per accedere all&apos;ambiente Quantum GIS da questa console
## usa l&apos;oggetto iface (istanza della classe QgisInterface).
<translation>Python %1 on %2
## Digita help(iface) per ottenere più informazioni.

</translation>
</message>
</context>

Large diffs are not rendered by default.

This file was deleted.

@@ -1,8 +1,6 @@
FILE (GLOB IMAGES *.png)
ADD_SUBDIRECTORY(plugins)

FILE(GLOB IMAGES *.png *.svg)

INSTALL (FILES ${IMAGES}
DESTINATION ${QGIS_DATA_DIR}/themes/default)

FILE (GLOB PLUG_IMAGES plugins/*.png)

INSTALL (FILES ${PLUG_IMAGES} DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN -552 Bytes (62%) images/themes/default/locked.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

0 comments on commit d06c308

Please sign in to comment.
You can’t perform that action at this time.