summaryrefslogtreecommitdiff
path: root/data/resources
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-30 06:52:59 +0900
committerkali <kali@leap.se>2013-01-30 06:52:59 +0900
commit570f84756b3d1f689a172a3ff0c55abf6a60b9dd (patch)
tree0f262acacf35743664c6408edbafe6ba6f119d14 /data/resources
parente60abdcb796ad9e2c44e9b37d3a68e7f159c035c (diff)
parent10a2303fe2d21999bce56940daecb78576f5b741 (diff)
Merge branch 'pre-release-0.2.0' into release-0.2.0
This merge contains today's state of develop branch, minus soledad and email components.
Diffstat (limited to 'data/resources')
-rw-r--r--data/resources/locale.qrc6
-rw-r--r--data/resources/mainwindow.qrc4
2 files changed, 9 insertions, 1 deletions
diff --git a/data/resources/locale.qrc b/data/resources/locale.qrc
new file mode 100644
index 00000000..47fb5243
--- /dev/null
+++ b/data/resources/locale.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+<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 f62c531e..58f59c9d 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -3,7 +3,9 @@
<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>
+ <file>../images/Emblem-question.png</file>
</qresource>
</RCC>