=== modified file 'debian/changelog'
--- debian/changelog 2016-04-29 17:48:59 +0000
+++ debian/changelog 2016-07-18 10:24:30 +0000
@@ -1,3 +1,14 @@
+ubiquity (2.21.63.2) UNRELEASED; urgency=high
+
+ [ Shih-Yuan Lee (FourDollars) ]
+ * Some places doesn't have the location information. (LP: #1584417)
+
+ [ Dimitri John Ledkov ]
+ * Fix substitution variables syntax from $() -> ${} in
+ translations. (LP: #1603926)
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Tue, 28 Jun 2016 17:13:47 -0400
+
ubiquity (2.21.63.1) xenial; urgency=medium
[ Iain Lane ]
=== modified file 'debian/real-po/af.po'
--- debian/real-po/af.po 2016-04-12 20:09:40 +0000
+++ debian/real-po/af.po 2016-07-18 10:25:46 +0000
@@ -78,8 +78,8 @@
"You can try ${RELEASE} without making any changes to your computer, directly "
"from this ${MEDIUM}."
msgstr ""
-"Jy kan $(RELEASE) probeer sonder om enige veranderings op jou rekenaar aan "
-"te bring, direk vanaf hierdie $(MEDIUM)."
+"Jy kan ${RELEASE} probeer sonder om enige veranderings op jou rekenaar aan "
+"te bring, direk vanaf hierdie ${MEDIUM}."
#. Type: text
#. Description
@@ -437,7 +437,7 @@
msgid ""
"You will need to manually install a bootloader in order to start ${RELEASE}."
msgstr ""
-"Jy sal 'n selflaaier handmatig moet installeer om ${RELEASE) gevolglik te "
+"Jy sal 'n selflaaier handmatig moet installeer om ${RELEASE} gevolglik te "
"laat laai."
#. Type: text
@@ -1516,14 +1516,14 @@
#: ../ubiquity.templates:222001
msgid "You need at least ${SIZE} disk space to install ${RELEASE}."
msgstr ""
-"Jy benodig ten minste $(SIZE) disketspasie om $(RELEASE) te installeer."
+"Jy benodig ten minste ${SIZE} disketspasie om ${RELEASE} te installeer."
#. Type: text
#. Description
#. SIZE is a variable substituted into this string, and may be '3.7 GB'
#: ../ubiquity.templates:223001
msgid "This computer has only ${SIZE}."
-msgstr "Hierdie rekenaar het slegs $(SIZE)."
+msgstr "Hierdie rekenaar het slegs ${SIZE}."
#. Type: text
#. Description
=== modified file 'debian/real-po/bg.po'
--- debian/real-po/bg.po 2016-04-12 20:09:40 +0000
+++ debian/real-po/bg.po 2016-07-18 10:23:43 +0000
@@ -1880,7 +1880,7 @@
#. Description
#: ../ubiquity.templates:263001
msgid "Encrypt the new ${RELEASE} installation for security"
-msgstr "Криптирай новото инсталиране на $(RELEASE) с цел за безопасност"
+msgstr "Криптирай новото инсталиране на ${RELEASE} с цел за безопасност"
#. Type: text
#. Description
=== modified file 'debian/real-po/de.po'
--- debian/real-po/de.po 2016-04-12 20:09:40 +0000
+++ debian/real-po/de.po 2016-07-18 10:23:43 +0000
@@ -1595,7 +1595,7 @@
#: ../ubiquity.templates:229001
msgid "Download updates while installing ${RELEASE}"
msgstr ""
-"Herunterladen der Aktualisierungen, während $(RELEASE) aktualisiert wird"
+"Herunterladen der Aktualisierungen, während ${RELEASE} aktualisiert wird"
#. Type: text
#. Description
=== modified file 'ubiquity/plugins/ubi-timezone.py'
--- ubiquity/plugins/ubi-timezone.py 2014-06-30 13:09:16 +0000
+++ ubiquity/plugins/ubi-timezone.py 2016-07-18 10:22:54 +0000
@@ -142,8 +142,9 @@
# United States (New York) (United States)
# Might want to match the debconf format.
name, loc = result
- model.append([name, '', loc.human_country,
- str(loc.latitude), str(loc.longitude)])
+ if loc:
+ model.append([name, '', loc.human_country,
+ str(loc.latitude), str(loc.longitude)])
def geoname_timeout(self, user_data):
text, model = user_data