diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-04-15 13:50:45 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-04-15 13:50:45 +0200 |
| commit | b7fa77843763122e5f0355d606e265e23e3a97b6 (patch) | |
| tree | 516f2f7d161f7dd205175692639e12aafbf5398b | |
| parent | f94a9582ee6385cbb98f93a8cd7fb1213f1521e4 (diff) | |
| parent | 300476f606eee5a576453dd3ff9503fdc42fe133 (diff) | |
| download | mullvadvpn-b7fa77843763122e5f0355d606e265e23e3a97b6.tar.xz mullvadvpn-b7fa77843763122e5f0355d606e265e23e3a97b6.zip | |
Merge branch 'update-relay-locations-pot'
| -rw-r--r-- | gui/locales/de/relay-locations.po | 2 | ||||
| -rw-r--r-- | gui/locales/es/relay-locations.po | 2 | ||||
| -rw-r--r-- | gui/locales/fr/relay-locations.po | 2 | ||||
| -rw-r--r-- | gui/locales/relay-locations.pot | 2 | ||||
| -rw-r--r-- | gui/locales/sv/relay-locations.po | 2 | ||||
| -rw-r--r-- | gui/locales/zh-TW/relay-locations.po | 2 | ||||
| -rw-r--r-- | gui/scripts/integrate-into-app.py | 3 |
7 files changed, 9 insertions, 6 deletions
diff --git a/gui/locales/de/relay-locations.po b/gui/locales/de/relay-locations.po index d6723e3a68..ab9c38e389 100644 --- a/gui/locales/de/relay-locations.po +++ b/gui/locales/de/relay-locations.po @@ -299,7 +299,7 @@ msgid "Stamford, CT" msgstr "Stamford, CT" #. US STL -msgid "St. Louis , MO" +msgid "St. Louis, MO" msgstr "St. Louis, MO" #. US WAS diff --git a/gui/locales/es/relay-locations.po b/gui/locales/es/relay-locations.po index 31b0fb82e4..136e4a94a9 100644 --- a/gui/locales/es/relay-locations.po +++ b/gui/locales/es/relay-locations.po @@ -299,7 +299,7 @@ msgid "Stamford, CT" msgstr "Stamford, CT" #. US STL -msgid "St. Louis , MO" +msgid "St. Louis, MO" msgstr "San Luis, MO" #. US WAS diff --git a/gui/locales/fr/relay-locations.po b/gui/locales/fr/relay-locations.po index 971e0c2f0f..0b2a8eaa72 100644 --- a/gui/locales/fr/relay-locations.po +++ b/gui/locales/fr/relay-locations.po @@ -299,7 +299,7 @@ msgid "Stamford, CT" msgstr "Stamford, CT" #. US STL -msgid "St. Louis , MO" +msgid "St. Louis, MO" msgstr "Saint-Louis, MO" #. US WAS diff --git a/gui/locales/relay-locations.pot b/gui/locales/relay-locations.pot index ff91019be8..0d7ee61db2 100644 --- a/gui/locales/relay-locations.pot +++ b/gui/locales/relay-locations.pot @@ -299,7 +299,7 @@ msgid "Stamford, CT" msgstr "" #. US STL -msgid "St. Louis , MO" +msgid "St. Louis, MO" msgstr "" #. US WAS diff --git a/gui/locales/sv/relay-locations.po b/gui/locales/sv/relay-locations.po index fb4e0d60c0..845a794908 100644 --- a/gui/locales/sv/relay-locations.po +++ b/gui/locales/sv/relay-locations.po @@ -299,7 +299,7 @@ msgid "Stamford, CT" msgstr "Stamford, CT" #. US STL -msgid "St. Louis , MO" +msgid "St. Louis, MO" msgstr "Saint Louis, MO" #. US WAS diff --git a/gui/locales/zh-TW/relay-locations.po b/gui/locales/zh-TW/relay-locations.po index 90f63ab7b1..c99cf2de72 100644 --- a/gui/locales/zh-TW/relay-locations.po +++ b/gui/locales/zh-TW/relay-locations.po @@ -299,7 +299,7 @@ msgid "Stamford, CT" msgstr "斯坦福, CT" #. US STL -msgid "St. Louis , MO" +msgid "St. Louis, MO" msgstr "圣路易斯, MO" #. US WAS diff --git a/gui/scripts/integrate-into-app.py b/gui/scripts/integrate-into-app.py index 9a853573c7..18725fac80 100644 --- a/gui/scripts/integrate-into-app.py +++ b/gui/scripts/integrate-into-app.py @@ -38,6 +38,9 @@ def remove_common_prefix(source, destination): def run_program(args): p = Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE) + + print "Run: {}".format(' '.join(args)) + errors = p.communicate()[1] return (p.returncode, errors) |