Merge branch '2.5.x' into saas

2015-02-24 12:04:11 -05:00 · 2015-02-24 12:04:11 -05:00 · b2a2153572
commit b2a2153572
parent 8aaf300491 8a88b4b733
11 changed files with 8666 additions and 1 deletions
--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
--- a/python_apps/pypo/pypofetch.py
+++ b/python_apps/pypo/pypofetch.py
@ -37,7 +37,7 @@ signal.signal(signal.SIGINT, keyboardInterruptHandler)
 #need to wait for Python 2.7 for this..
 #logging.captureWarnings(True)

-POLL_INTERVAL = 1800
+POLL_INTERVAL = 480

 class PypoFetch(Thread):