diff options
| author | drebs <drebs@leap.se> | 2013-02-09 22:27:22 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-02-09 22:27:22 -0200 |
| commit | 46a3373295a683db9b66c233b07a7a948b8147bc (patch) | |
| tree | 410a47871bfd8654ddabbb53f3c29a89c1550e71 /data/resources | |
| parent | e726f3df7c7efbe4069846468ffdbed6829ccfc4 (diff) | |
| parent | b376948ccd59aa02022123102eaae359a536e4e6 (diff) | |
Merge branch 'develop' into feature/soledad-api
Diffstat (limited to 'data/resources')
| -rw-r--r-- | data/resources/locale.qrc | 3 | ||||
| -rw-r--r-- | data/resources/mainwindow.qrc | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/resources/locale.qrc b/data/resources/locale.qrc index 53576b49..47fb5243 100644 --- a/data/resources/locale.qrc +++ b/data/resources/locale.qrc @@ -1,5 +1,6 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> -<file>../translations/leap_client_es.qm</file> +<file>../translations/es.qm</file> +<file>../translations/de.qm</file> </qresource> </RCC> diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc index 59abdbcd..58f59c9d 100644 --- a/data/resources/mainwindow.qrc +++ b/data/resources/mainwindow.qrc @@ -3,7 +3,6 @@ <file>../images/conn_error.png</file> <file>../images/conn_connecting.png</file> <file>../images/conn_connected.png</file> - <file>../images/leapfrog.jpg</file> <file>../images/leap-color-small.png</file> <file>../images/Dialog-accept.png</file> <file>../images/Dialog-error.png</file> |