From e3dfed002e1f7707246959146dd024434e60e75b Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Thu, 2 Feb 2017 22:45:07 +0100
Subject: [PATCH] i18n

---
 umap/locale/pt/LC_MESSAGES/django.mo    | Bin 3158 -> 4397 bytes
 umap/locale/pt/LC_MESSAGES/django.po    |  89 +++++++++++-------------
 umap/locale/zh_TW/LC_MESSAGES/django.mo | Bin 3046 -> 4111 bytes
 umap/locale/zh_TW/LC_MESSAGES/django.po |  77 +++++++++-----------
 4 files changed, 73 insertions(+), 93 deletions(-)

diff --git a/umap/locale/pt/LC_MESSAGES/django.mo b/umap/locale/pt/LC_MESSAGES/django.mo
index 6805ae1e45cda7308aa5890decdbab7d4ce80b50..74bffddd6862505f078c08d637d93d8d15f4e275 100644
GIT binary patch
literal 4397
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

delta 1186
zcmYk)TS!zv7zgmrQg>T-H@lmfPKIUWik4Ar3HcyhunXP5Bw{=}+APO2%eg2O<U>95
z;M-vIsDz1B5E&E%Qtd<Z5WPh8QqV&X5>d}Z^#2xvhMoPLxty8rn>qKJ-qnnKT3J3p
zC=ICfsL3*-t?)PGGP#7P0#3nZI0M_^Yq$^of&6ZEDbWVl2L&93Nq7s^z-btV^Kd<U
z2`h=l=rbN-==chGfgi97rpt+{VK2mw&f|~g4Zt+a!<Fz7<PF9l7Nlud1@A$g{{$|;
zXRr?5MK&DROSlC4(_1`@qT@Y$fUJ*W6<&zL<xFF+1MYzbVIDTahmbe^09)Wsn1Z#-
zh#FxF#E%Z)k5Bd_<iHI?EOZq%VSl=YhaPxmal*I73BMpONC~2KAPu>_8S+VWLhMN=
zAurqyIrBVRgG5H)HnhjlxdJ|hI9z%KZ@|}ZjIWs&U5m<vj~x5ba#W6zH{#7pCjx6x
z`S`f-qP*ZLZY&ngl&=M!Md`cXZoY30@Lxe(r9fBX07^&51Dpxp&l+x^@ZE8#upgJs
z+xhYd+gEWVWkNA53u4ejUarj^uFTkmSpD3oSY=uAtX88Uyr_7Bos2J>>CCk6&Ftt9
z9Xqq_d$+fvBzk2KW={Lk3tSl*KP!$HX~YTRIZEV|=vCa3k!vE~i2ZpCwiS5L#lV4~
zVX0mFVp)H(S9(K{98y_P2yK0$-(F9&Hg-G8cO-S^w4;qDePIUjDl|bB0r`%xZxVG$
zBb?$~P7fJToV9-vHMXJZ^2VOPG44f$7dUjufea!&L;nWs_o@qJ(jH5$-PIk1$_uq4
zi!;UBhE7TC(@~StgXr>wV|<}R@xEg`<YR)x5bVulS1gE%Q@%F#YjTV2POY;~Q=8%i
z-;Ai7@$J)ev;Cd^lKMYBQ3^0#z5Co*9YoUAmpP|Wh*U5>MMrTF1rr2%K)X7W8RXC^
zyl7YqYcC2-t8jdcS2(9Y$k3M~#o2(fbLA!F<H-p7JifhFi9+#F#znZE5rK-ts2T`#
HsM_c+v}@_`

diff --git a/umap/locale/pt/LC_MESSAGES/django.po b/umap/locale/pt/LC_MESSAGES/django.po
index 5e96f271..dfaa6eea 100644
--- a/umap/locale/pt/LC_MESSAGES/django.po
+++ b/umap/locale/pt/LC_MESSAGES/django.po
@@ -1,27 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Joao Ponce de Leao Paulouro <joao.ponceleao@gmail.com>, 2014
+# Rui <xymarior@yandex.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-09 21:37+0200\n"
-"PO-Revision-Date: 2014-09-21 13:09+0000\n"
-"Last-Translator: Joao Ponce de Leao Paulouro <joao.ponceleao@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.com/yohanboniface/umap/"
-"language/pt/)\n"
-"Language: pt\n"
+"PO-Revision-Date: 2016-12-22 10:03+0000\n"
+"Last-Translator: Rui <xymarior@yandex.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/yohanboniface/umap/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/404.html:7
 msgid "Take me to the home page"
-msgstr ""
+msgstr "Ir para a página principal"
 
 #: templates/auth/user_detail.html:7
 #, python-format
@@ -33,10 +33,8 @@ msgid "Type editors nick to add…"
 msgstr "Para adicionar, digite o nome do editor..."
 
 #: templates/leaflet_storage/map_detail.html:27
-#, fuzzy
-#| msgid "Type editors nick to add…"
 msgid "Type new owner nick…"
-msgstr "Para adicionar, digite o nome do editor..."
+msgstr "Escreva a nova alcunha do proprietário..."
 
 #: templates/leaflet_storage/map_list.html:7 views.py:184
 msgid "by"
@@ -48,48 +46,46 @@ msgstr "Mais"
 
 #: templates/registration/login.html:4
 msgid "Please log in with your account"
-msgstr ""
+msgstr "Por favor entre na sua conta"
 
 #: templates/registration/login.html:18
 msgid "Username"
-msgstr ""
+msgstr "Nome de utilizador"
 
 #: templates/registration/login.html:20
 msgid "Password"
-msgstr ""
+msgstr "Palavra-passe"
 
 #: templates/registration/login.html:21
 msgid "Login"
-msgstr ""
+msgstr "Entrar"
 
 #: templates/registration/login.html:27
 msgid "Please choose a provider"
-msgstr "Por favor escolha um provedor"
+msgstr "Por favor escolha um fornecedor"
 
 #: templates/umap/about_summary.html:6
 #, python-format
 msgid ""
 "uMap let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
 "layers in a minute and embed them in your site."
-msgstr ""
-"uMap possibilita-lhe, num minuto, criar mapas através de layers do  <a href="
-"\"%(osm_url)s\" />OpenStreetMap</a> e pô-los no seu website."
+msgstr "uMap permite criar mapas através de camadas do <a href=\"%(osm_url)s\" />OpenStreetMap</a> num minuto e mostrá-los no seu site."
 
 #: templates/umap/about_summary.html:11
 msgid "Choose the layers of your map"
-msgstr "Escolher o mapa de fundo"
+msgstr "Escolha as camadas do mapa"
 
 #: templates/umap/about_summary.html:12
 msgid "Add POIs: markers, lines, polygons..."
-msgstr "Adicionar objetos: marcos, linhas, polígonos..."
+msgstr "Adicionar POIs: marcadores, linhas, polígonos..."
 
 #: templates/umap/about_summary.html:13
 msgid "Manage POIs colours and icons"
-msgstr "Modificar cor e ícone dos objetos"
+msgstr "Gerir as cores dos POI e ícones"
 
 #: templates/umap/about_summary.html:14
 msgid "Manage map options: display a minimap, locate user on load…"
-msgstr "Gerir diversas opções: mostrar um minimapa, localizar o usuário..."
+msgstr "Gerir diversas opções: mostrar um minimapa, localizar o utilizador ao carregar..."
 
 #: templates/umap/about_summary.html:15
 msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
@@ -97,7 +93,7 @@ msgstr "Importação em massa de dados geográficos (geojson, gpx, kml, osm...)"
 
 #: templates/umap/about_summary.html:16
 msgid "Choose the license for your data"
-msgstr "Escolher uma licença para os seus dados"
+msgstr "Escolha uma licença para os seus dados"
 
 #: templates/umap/about_summary.html:17
 msgid "Embed and share your map"
@@ -106,7 +102,7 @@ msgstr "Exportar e partilhar o seu mapa"
 #: templates/umap/about_summary.html:23
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
-msgstr "E o código é <a href=\"%(repo_url)s\">aberto</a>!"
+msgstr "E está disponível em <a href=\"%(repo_url)s\">código aberto</a>!"
 
 #: templates/umap/about_summary.html:32 templates/umap/navigation.html:31
 msgid "Create a map"
@@ -120,14 +116,10 @@ msgstr "Testar a demo"
 #, python-format
 msgid ""
 "This is a demo instance, used for tests and pre-rolling releases. If you "
-"need a stable instance, please use <a href=\"%(stable_url)s\">"
-"%(stable_url)s</a>. You can also host your own instance, it's <a href="
-"\"%(repo_url)s\">open source</a>!"
-msgstr ""
-"Esta é uma versão de demonstração, utilizada para testes e pré-lançamentos. "
-"Se precisar de uma versão estável, por favor utilize <a href=\"%(stable_url)s"
-"\">%(stable_url)s</a>. Pode também alojar a sua própria instância, o código "
-"é  <a href=\"%(repo_url)s\">aberto</a>!"
+"need a stable instance, please use <a "
+"href=\"%(stable_url)s\">%(stable_url)s</a>. You can also host your own "
+"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
+msgstr "Esta é uma versão de demonstração, utilizada para testes e pré-lançamentos. Se precisar de uma versão estável, por favor utilize <a href=\"%(stable_url)s\">%(stable_url)s</a>. Pode também alojar a sua própria instância, e é em <a href=\"%(repo_url)s\">código aberto</a>!"
 
 #: templates/umap/home.html:17
 msgid "Map of the uMaps"
@@ -135,7 +127,7 @@ msgstr "Mapa dos uMaps"
 
 #: templates/umap/home.html:24
 msgid "Get inspired, browse maps"
-msgstr "Inspira-se, explore os mapas"
+msgstr "Inspire-se, explore os mapas"
 
 #: templates/umap/navigation.html:12
 msgid "My maps"
@@ -143,7 +135,7 @@ msgstr "Os meus mapas"
 
 #: templates/umap/navigation.html:14
 msgid "Log in"
-msgstr "Autenticação"
+msgstr "Entrar"
 
 #: templates/umap/navigation.html:14
 msgid "Sign in"
@@ -151,7 +143,7 @@ msgstr "Criar conta"
 
 #: templates/umap/navigation.html:16
 msgid "About"
-msgstr "Acerca"
+msgstr "Sobre"
 
 #: templates/umap/navigation.html:17
 msgid "Feedback"
@@ -159,7 +151,7 @@ msgstr "Contactar"
 
 #: templates/umap/navigation.html:20
 msgid "Change password"
-msgstr ""
+msgstr "Alterar palavra-passe"
 
 #: templates/umap/navigation.html:22
 msgid "Log out"
@@ -167,37 +159,37 @@ msgstr "Sair"
 
 #: templates/umap/password_change.html:6
 msgid "Password change"
-msgstr ""
+msgstr "Alterar palavra-passe"
 
 #: templates/umap/password_change.html:7
 msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
-msgstr ""
+"Please enter your old password, for security's sake, and then enter your new"
+" password twice so we can verify you typed it in correctly."
+msgstr "Por favor introduza a sua palavra-passe antiga, por motivos de segurança, e então introduza a sua nova palavra-passe 2 vezes para que possamos verificar se a digitou corretamente."
 
 #: templates/umap/password_change.html:12
 msgid "Old password"
-msgstr ""
+msgstr "Palavra-passe antiga"
 
 #: templates/umap/password_change.html:14
 msgid "New password"
-msgstr ""
+msgstr "Nova palavra-passe"
 
 #: templates/umap/password_change.html:16
 msgid "New password confirmation"
-msgstr ""
+msgstr "Confirmação da palavra-passe"
 
 #: templates/umap/password_change.html:18
 msgid "Change my password"
-msgstr ""
+msgstr "Alterar a minha palavra-passe"
 
 #: templates/umap/password_change_done.html:6
 msgid "Password change successful"
-msgstr ""
+msgstr "Alteração da palavra-passe bem sucedida"
 
 #: templates/umap/password_change_done.html:7
 msgid "Your password was changed."
-msgstr ""
+msgstr "A sua palavra-passe foi alterada"
 
 #: templates/umap/search.html:13
 msgid "Not map found."
@@ -213,7 +205,4 @@ msgstr "Procurar"
 
 #: views.py:190
 msgid "View the map"
-msgstr "Visualizar o mapa"
-
-#~ msgid "Map settings"
-#~ msgstr "Parâmetros"
+msgstr "Ver o mapa"
diff --git a/umap/locale/zh_TW/LC_MESSAGES/django.mo b/umap/locale/zh_TW/LC_MESSAGES/django.mo
index 73603256902f0a4cf71afa55651bbd3a65403c20..f9b9c015c15392803d24ce18b59e4c8aabc4046a 100644
GIT binary patch
delta 2108
zcmZ9LYfKzf6vuB16j+L_Rf}SU3$*sdYmHV*TT5e;CW=@EmBv@b*<p9=GDBu&yV=%c
zDFNhBB05M4r7vt7`h>Pxu~10V^ow6i_-0bm>dx%am^6(sF_;+tXJ;s+CwuSj-ZS@}
z^S|fbwR1k_(cf02e#KxVXsgg#7BRLB{Bton*zFX?(!e|58ZZu)gW0K!Z2?~f^T7S!
z3a}qs23`Q40VhBX{t7My{{^1}GY~X`u_!CR;3+sZfJ?xgU^@63h##v#M}hW$BrFUr
z2fqaoi`@ii{m&pJm<B1{ZSWCr*7av1I1;jzAPLL|bCI8wVL-}X1xeWl;Ah}IFdzI6
z#E<16OBT2Wq=a5{w0<*q7kmqR8r+5~E5SV=C2T}T!XjWU*alK@Pl93OXQwbYj<T=H
zbP`Q?5FGv=K`Qaz;0vG^*$Y5FNP;^+3OopskhAXhA6$P7BtiGxc{Uc)Rpo+opv_>E
z29>U37g&UOHMkwrK>XMhbhK{Do!<nZl}&?BfVV&r^q1>jlI^Tt4#LH9K>EJgoxcdu
z73|DL{SRPJ>wfqJq(ryedCZ;P2Wi7U;4GMdi(L(-z)2@x2h#T)=qTZvuKz<2@0Eo?
z6FdN-(8($Qcvn<^*hVzEn`dbPTZe{Qd0<qPIpY}6!&`$!$>}cXos^)FJ?bDS2zrx7
z?}d!2_Bh&lG`bp(4;`I^jQ)P~V#yvuqe{?e=(W=+sMLjMc+klgP9>eQ4H)F0(ZgGd
zR*Z&gPg;R_bnzq?6u-n9BD_)1^{}e>*eijgYi@4Vr5sMHQvI@G-b?v3Duw4)Rxg-v
zQB~??twAtkRbkbt!5f4|Uay7}UnzSd=$qfQdoI!3fQ!kD?4dc=L!v0@dVMI!b_azB
z56ectY)&nT?hZ<VE^$dQB#lSZkjB*o35t<b<GLh<G}(x()wwS0m5OmrA2$M$vT&QS
z@Bl_w7A3B$JS=fhQ20Jclj|cCpBs@z$;V}b%L>l<zNSf{5sZ{VR#He%_0t#9=g1L6
z5eGL|jU;Gdzy%dVXEm~4!D3bmQM^IohDxe<K*hLG@Jm;xQZp9qszpLh>eR4;Gb*yU
z_xGkV>}_4r6rn+4@5uN@`w)}up$as*RpntpcMIw(HK)_=Zr@bmeXgYZdG7UAcwgFB
z4)atAx=~WA35p&R3{|V(5UOy*QT%)>0?`A|D`hdLhJ5DilFFipiYxk9Rpfd>l*&TL
zS{B5j5CoU)4}4VnZrOVCll1qNRk_Xzp7feOrAwym*<{vb)aBbpzOj41x7)vn542b#
zZSkQA=D3`RIg+6*wL2zf#*bMSd+tpfG7B;b)B4A)*3;&WOf8DF)~NyJ?jIbr2K$)Z
zH|j>R+PduvCleE6SU&GXxY$^?)sDrq{*R_+mT2#s+u~?&W{FFkNPy@)R_F1BvY7ql
zMZ0&>GVf%rjK-U<$A_-Rrj91AUa;H8tV<nM>oBAy&Uaa@?N0XCjT1N^(%6F?PHd!&
zw_LL(4?QH$YCQ|h*d7}{9h;m&<ixq|2jbnu7r%x-Dg1ob79@!$E5huaL2I<jg>yQV
z7#_FUI+-<g4Mnn!9E**O&zv~OW}5o#!y{&%r`ps!d(GRPttp6Y=4TaFyE)8*(3)s!
xwFfT8hcB0wma^E5sd(=&TvksvT+BW<lsMDp=5bEwoXz^~ic>8}G+)o^{~wJ9Vle;!

delta 1009
zcmXxiUr19?90%~9Zcg{dYnf$#Os-mn*xDBMhpD9XQXmdWD#?hOPN&Un>DI6w9N~kZ
z_J@O};)4kqR?xr#DHy#CAA%l&ASj63-(Kpe9zy#5?ruMJ_Bp?E&;6Zy&$$oeWcldV
zQvEa`D$y#?EO|tA@Gs<8%qJ><PvAlL6x!i?*a){E-|N&7?T4LEhGA%dvv4<DhD9(2
z_rN$b5RK9|bP6$$hFst$Y=)AaXd7&U_|aAT@x1F$f&;J=jzC^u5~3h2Lo<8<dHy=g
z!gp{Ve2%x_2aCgetWO`&31i?BoX1<cP=yO+akm5hf(@_+kADnahE?!B<b|VJz5%)L
z56BDs(eg55?m?>{*KN>jgf&>7PNQ=Q_ChYOqD@%S@;8v*G_K{JVF~gS<buDo@hvSk
zn~02fky3a7*DJ6cT(=csbEzE)cpi>o9u=eQLgU~qM;&zm?3j8a<&YQR*o(%+IJTp4
z!5y4v!QT)+EIteMyWn9yZ$7gBf#*_>sEnvu-9o;A-BP!0CnpF#JB|YJMHdq>{j}&T
zxKr#8%7aQk?)8U!Jx9bjgH==(R;*npG~`(>_PfJ!(BtL_VzDUO++ekzv>tWHjuTFY
zz21&6wJF0vYsZk{8}=$e|BzGe3@JYO%-L3#+%$r2w@2}}^bIQgUa?_pu?L3y1McqN
zuq|K<p{mWR`1(RhpWAlZbFJf&tq%2a15Q~T5r<7z#A8#B_#o8_tGP?8ns16)OSN!W
z0=4PYwbZL9CC4A7=Eo8X(Zs?GCGW*H*QXNWNI3r<xhswrR~||}Tu4MGD2FyRHTO0%
zIYybtTypm1=6WO%nGllHZqT}2(hVK1iMZ6H%S^o%hLUPa^4U^)WhQsOxK%Ru4;T2t
ABme*a

diff --git a/umap/locale/zh_TW/LC_MESSAGES/django.po b/umap/locale/zh_TW/LC_MESSAGES/django.po
index d7ba5920..94927669 100644
--- a/umap/locale/zh_TW/LC_MESSAGES/django.po
+++ b/umap/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,28 +1,29 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Supaplex <bejokeup@gmail.com>, 2014
 # Hsin-lin Cheng <lancetw@gmail.com>, 2014
+# Sean Young <assanges@icloud.com>, 2016
 # Yuan CHAO <yuanchao@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-09 21:37+0200\n"
-"PO-Revision-Date: 2014-08-21 17:10+0000\n"
-"Last-Translator: Yuan CHAO <yuanchao@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/umap/"
-"language/zh_TW/)\n"
-"Language: zh_TW\n"
+"PO-Revision-Date: 2016-12-04 11:18+0000\n"
+"Last-Translator: Sean Young <assanges@icloud.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/yohanboniface/umap/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/404.html:7
 msgid "Take me to the home page"
-msgstr ""
+msgstr "帶我回主頁"
 
 #: templates/auth/user_detail.html:7
 #, python-format
@@ -31,13 +32,11 @@ msgstr "瀏覽 %(current_user)s 的地圖"
 
 #: templates/leaflet_storage/map_detail.html:24
 msgid "Type editors nick to add…"
-msgstr "鍵入編輯者的暱稱以加入..."
+msgstr "輸入編輯者的暱稱以加入..."
 
 #: templates/leaflet_storage/map_detail.html:27
-#, fuzzy
-#| msgid "Type editors nick to add…"
 msgid "Type new owner nick…"
-msgstr "鍵入編輯者的暱稱以加入..."
+msgstr "輸入擁有者暱稱..."
 
 #: templates/leaflet_storage/map_list.html:7 views.py:184
 msgid "by"
@@ -45,23 +44,23 @@ msgstr "由"
 
 #: templates/leaflet_storage/map_list.html:11
 msgid "More"
-msgstr "詳細"
+msgstr "更多"
 
 #: templates/registration/login.html:4
 msgid "Please log in with your account"
-msgstr ""
+msgstr "請先登入"
 
 #: templates/registration/login.html:18
 msgid "Username"
-msgstr ""
+msgstr "使用者名稱"
 
 #: templates/registration/login.html:20
 msgid "Password"
-msgstr ""
+msgstr "密碼"
 
 #: templates/registration/login.html:21
 msgid "Login"
-msgstr ""
+msgstr "登入"
 
 #: templates/registration/login.html:27
 msgid "Please choose a provider"
@@ -72,9 +71,7 @@ msgstr "選擇服務商"
 msgid ""
 "uMap let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
 "layers in a minute and embed them in your site."
-msgstr ""
-"uMap 讓您使用 <a href=\"%(osm_url)s\" />OpenStreetMap</a> 圖層來建立您的地"
-"圖﹐只需要幾分鐘就可以完成並嵌入您的網頁。"
+msgstr "uMap 讓您使用 <a href=\"%(osm_url)s\" />OpenStreetMap</a> 圖層來建立您的地圖﹐只需要幾分鐘就可以完成並嵌入您的網頁。"
 
 #: templates/umap/about_summary.html:11
 msgid "Choose the layers of your map"
@@ -107,7 +104,7 @@ msgstr "內嵌並分享您的地圖"
 #: templates/umap/about_summary.html:23
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
-msgstr "而且 <a href=\"%(repo_url)s\">開放原始碼</a>！"
+msgstr "而且是 <a href=\"%(repo_url)s\">開放原始碼</a> 的！"
 
 #: templates/umap/about_summary.html:32 templates/umap/navigation.html:31
 msgid "Create a map"
@@ -121,13 +118,10 @@ msgstr "播放展示"
 #, python-format
 msgid ""
 "This is a demo instance, used for tests and pre-rolling releases. If you "
-"need a stable instance, please use <a href=\"%(stable_url)s\">"
-"%(stable_url)s</a>. You can also host your own instance, it's <a href="
-"\"%(repo_url)s\">open source</a>!"
-msgstr ""
-"這是一個範例服務﹐提供測試與正式版發行前驗證使用。如果您需要一個穩定的服務，"
-"請使用 <a href=\"%(stable_url)s\">%(stable_url)s</a>。您也可以自行架設服務﹐"
-"這完全是 <a href=\"%(repo_url)s\">開放原始碼</a> 的！"
+"need a stable instance, please use <a "
+"href=\"%(stable_url)s\">%(stable_url)s</a>. You can also host your own "
+"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
+msgstr "這是範例服務﹐提供測試與正式版發行前驗證使用。如果您需要穩定的服務，請使用 <a href=\"%(stable_url)s\">%(stable_url)s</a>。您也可以自行架設服務﹐完全是 <a href=\"%(repo_url)s\">開放原始碼</a> 的！"
 
 #: templates/umap/home.html:17
 msgid "Map of the uMaps"
@@ -135,7 +129,7 @@ msgstr "uMaps 地圖"
 
 #: templates/umap/home.html:24
 msgid "Get inspired, browse maps"
-msgstr "瀏覽其他地圖"
+msgstr "找點子，瀏覽其他地圖"
 
 #: templates/umap/navigation.html:12
 msgid "My maps"
@@ -147,7 +141,7 @@ msgstr "登入"
 
 #: templates/umap/navigation.html:14
 msgid "Sign in"
-msgstr "登錄"
+msgstr "註冊"
 
 #: templates/umap/navigation.html:16
 msgid "About"
@@ -159,7 +153,7 @@ msgstr "回報問題"
 
 #: templates/umap/navigation.html:20
 msgid "Change password"
-msgstr ""
+msgstr "更改密碼"
 
 #: templates/umap/navigation.html:22
 msgid "Log out"
@@ -167,37 +161,37 @@ msgstr "登出"
 
 #: templates/umap/password_change.html:6
 msgid "Password change"
-msgstr ""
+msgstr "密碼變更"
 
 #: templates/umap/password_change.html:7
 msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
-msgstr ""
+"Please enter your old password, for security's sake, and then enter your new"
+" password twice so we can verify you typed it in correctly."
+msgstr "為確保賬戸安全，請先輸入你的舊有密碼。然後輸入新密碼兩次，以便確認新密碼輸入正確。"
 
 #: templates/umap/password_change.html:12
 msgid "Old password"
-msgstr ""
+msgstr "舊密碼"
 
 #: templates/umap/password_change.html:14
 msgid "New password"
-msgstr ""
+msgstr "新密碼"
 
 #: templates/umap/password_change.html:16
 msgid "New password confirmation"
-msgstr ""
+msgstr "再次輸入新密碼"
 
 #: templates/umap/password_change.html:18
 msgid "Change my password"
-msgstr ""
+msgstr "更改我的密碼"
 
 #: templates/umap/password_change_done.html:6
 msgid "Password change successful"
-msgstr ""
+msgstr "成功更改密碼"
 
 #: templates/umap/password_change_done.html:7
 msgid "Your password was changed."
-msgstr ""
+msgstr "你的密碼已更改。"
 
 #: templates/umap/search.html:13
 msgid "Not map found."
@@ -214,6 +208,3 @@ msgstr "搜尋"
 #: views.py:190
 msgid "View the map"
 msgstr "檢視地圖"
-
-#~ msgid "Map settings"
-#~ msgstr "地圖設定"