From 38e3ec8d500e3d22c286932a065f2a0c0b8f0e1c Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 3 Sep 2014 10:38:22 -0500
Subject: add /es/ locale to resources

---
 data/resources/locale.qrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'data/resources')

diff --git a/data/resources/locale.qrc b/data/resources/locale.qrc
index ba466c36..787b0025 100644
--- a/data/resources/locale.qrc
+++ b/data/resources/locale.qrc
@@ -2,5 +2,6 @@
 <qresource>
 <file>../translations/vi.qm</file>
 <file>../translations/en_GB.qm</file>
+<file>../translations/es.qm</file>
 </qresource>
 </RCC>
-- 
cgit v1.2.3


From c7304e54e40cd9151e6d00a8441aaf48b68c9bcc Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 3 Sep 2014 15:50:08 -0700
Subject: single pref win: move eip preferences to new combined preference
 window.

---
 data/resources/flags.qrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'data/resources')

diff --git a/data/resources/flags.qrc b/data/resources/flags.qrc
index 8bdc9c4c..aeecc54f 100644
--- a/data/resources/flags.qrc
+++ b/data/resources/flags.qrc
@@ -58,6 +58,7 @@
     <file>../images/countries/us.png</file>
     <file>../images/countries/ve.png</file>
     <file>../images/countries/vn.png</file>
+    <file>../images/countries/xx.png</file>
     <file>../images/countries/za.png</file>
   </qresource>
 </RCC>
\ No newline at end of file
-- 
cgit v1.2.3