diff --git a/umap/locale/es/LC_MESSAGES/django.mo b/umap/locale/es/LC_MESSAGES/django.mo index c37930e4..f030120e 100644 Binary files a/umap/locale/es/LC_MESSAGES/django.mo and b/umap/locale/es/LC_MESSAGES/django.mo differ diff --git a/umap/locale/es/LC_MESSAGES/django.po b/umap/locale/es/LC_MESSAGES/django.po index a566201d..f7b75419 100644 --- a/umap/locale/es/LC_MESSAGES/django.po +++ b/umap/locale/es/LC_MESSAGES/django.po @@ -1,29 +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: # Igor Támara , 2013 -# Marco Antonio Frias Butrón , 2014 +# Marco Antonio , 2014 +# Marco Antonio , 2016 # Rafael Ávila Coya , 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-09 04:08+0000\n" -"Last-Translator: Marco Antonio Frias Butrón \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/umap/language/" -"es/)\n" -"Language: es\n" +"PO-Revision-Date: 2016-09-28 03:51+0000\n" +"Last-Translator: Marco Antonio \n" +"Language-Team: Spanish (http://www.transifex.com/yohanboniface/umap/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/404.html:7 msgid "Take me to the home page" -msgstr "" +msgstr "Llévame a la página principal" #: templates/auth/user_detail.html:7 #, python-format @@ -35,10 +35,8 @@ msgid "Type editors nick to add…" msgstr "Teclea el apodo del editor para añadir..." #: templates/leaflet_storage/map_detail.html:27 -#, fuzzy -#| msgid "Type editors nick to add…" msgid "Type new owner nick…" -msgstr "Teclea el apodo del editor para añadir..." +msgstr "Escriba el apodo del nuevo dueño..." #: templates/leaflet_storage/map_list.html:7 views.py:184 msgid "by" @@ -50,19 +48,19 @@ msgstr "Más" #: templates/registration/login.html:4 msgid "Please log in with your account" -msgstr "" +msgstr "Inicie sesión con su cuenta" #: templates/registration/login.html:18 msgid "Username" -msgstr "" +msgstr "Nombre de usuario" #: templates/registration/login.html:20 msgid "Password" -msgstr "" +msgstr "Contraseña" #: templates/registration/login.html:21 msgid "Login" -msgstr "" +msgstr "Usuario" #: templates/registration/login.html:27 msgid "Please choose a provider" @@ -73,9 +71,7 @@ msgstr "Elige un proveedor" msgid "" "uMap let you create maps with OpenStreetMap " "layers in a minute and embed them in your site." -msgstr "" -"uMap te permite crear mapas con capas de OpenStreetMap en un minuto y embeber en tu sitio." +msgstr "uMap te permite crear mapas con capas de OpenStreetMap en un minuto y embeber en tu sitio." #: templates/umap/about_summary.html:11 msgid "Choose the layers of your map" @@ -91,9 +87,7 @@ msgstr "Elige los colores y los iconos de los PDIs" #: templates/umap/about_summary.html:14 msgid "Manage map options: display a minimap, locate user on load…" -msgstr "" -"Gestiona opciones del mapa: mostrar un minimapa, localizar al usuario al " -"cargar..." +msgstr "Gestiona opciones del mapa: mostrar un minimapa, localizar al usuario al cargar..." #: templates/umap/about_summary.html:15 msgid "Batch import geostructured data (geojson, gpx, kml, osm...)" @@ -124,14 +118,10 @@ msgstr "Juega con el demo" #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " -"need a stable instance, please use " -"%(stable_url)s. You can also host your own instance, it's open source!" -msgstr "" -"Esta es una instancia de demostración, usada para pruebas y lanzamientos " -"previos. Si necesitas una instancia estable, usa " -"%(stable_url)s. También puedes instalar tu propia instancia en tu " -"servidor; ¡es código abierto!" +"need a stable instance, please use %(stable_url)s. You can also host your own " +"instance, it's open source!" +msgstr "Esta es una instancia de demostración, usada para pruebas y lanzamientos previos. Si necesitas una instancia estable, usa %(stable_url)s. También puedes instalar tu propia instancia en tu servidor; ¡es código abierto!" #: templates/umap/home.html:17 msgid "Map of the uMaps" @@ -163,7 +153,7 @@ msgstr "Contacto" #: templates/umap/navigation.html:20 msgid "Change password" -msgstr "" +msgstr "Cambiar contraseña" #: templates/umap/navigation.html:22 msgid "Log out" @@ -171,37 +161,37 @@ msgstr "Salir" #: templates/umap/password_change.html:6 msgid "Password change" -msgstr "" +msgstr "Contraseña cambiada" #: 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 "Introduzca su contraseña antigua, por seguridad, y luego introduzca su nueva contraseña dos veces para que podamos verificar si ha escrito correctamente." #: templates/umap/password_change.html:12 msgid "Old password" -msgstr "" +msgstr "Contraseña antigua" #: templates/umap/password_change.html:14 msgid "New password" -msgstr "" +msgstr "Nueva contraseña" #: templates/umap/password_change.html:16 msgid "New password confirmation" -msgstr "" +msgstr "Confirmar nueva contraseña" #: templates/umap/password_change.html:18 msgid "Change my password" -msgstr "" +msgstr "Cambiar mi contraseña" #: templates/umap/password_change_done.html:6 msgid "Password change successful" -msgstr "" +msgstr "Contraseña cambiada con éxito" #: templates/umap/password_change_done.html:7 msgid "Your password was changed." -msgstr "" +msgstr "Su contraseña fue guardada." #: templates/umap/search.html:13 msgid "Not map found." @@ -218,6 +208,3 @@ msgstr "Buscar" #: views.py:190 msgid "View the map" msgstr "Ver el mapa" - -#~ msgid "Map settings" -#~ msgstr "Ajustes del mapa" diff --git a/umap/locale/ja/LC_MESSAGES/django.mo b/umap/locale/ja/LC_MESSAGES/django.mo index 989d32e5..9998dc0c 100644 Binary files a/umap/locale/ja/LC_MESSAGES/django.mo and b/umap/locale/ja/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ja/LC_MESSAGES/django.po b/umap/locale/ja/LC_MESSAGES/django.po index 45c64352..b3972602 100644 --- a/umap/locale/ja/LC_MESSAGES/django.po +++ b/umap/locale/ja/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: -# nyampire , 2013-2014 +# Satoshi IIDA , 2013-2014 +# tomoya muramoto , 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-03-20 13:12+0000\n" -"Last-Translator: nyampire \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/umap/language/" -"ja/)\n" -"Language: ja\n" +"PO-Revision-Date: 2016-10-02 07:23+0000\n" +"Last-Translator: tomoya muramoto \n" +"Language-Team: Japanese (http://www.transifex.com/yohanboniface/umap/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\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 @@ -33,10 +33,8 @@ msgid "Type editors nick to add…" 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" @@ -48,19 +46,19 @@ 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" @@ -71,9 +69,7 @@ msgstr "連携アカウント選択" msgid "" "uMap let you create maps with OpenStreetMap " "layers in a minute and embed them in your site." -msgstr "" -"uMapは OpenStreetMap のレイヤを使い、サイト埋め" -"込み用の地図を即座に作成することが可能なサービスです" +msgstr "uMapは OpenStreetMap のレイヤを使い、サイト埋め込み用の地図を即座に作成することが可能なサービスです" #: templates/umap/about_summary.html:11 msgid "Choose the layers of your map" @@ -120,13 +116,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 " -"%(stable_url)s. You can also host your own instance, it's open source!" -msgstr "" -"これはリリース前テストと試運転用のデモサーバです。安定したサーバは%(stable_url)sを利用してください。uMapはOpen Sourceですので、自分でサーバを作ることも可能です！" +"need a stable instance, please use %(stable_url)s. You can also host your own " +"instance, it's open source!" +msgstr "これはリリース前テストと試運転用のデモサーバです。安定したサーバは%(stable_url)sを利用してください。uMapはOpen Sourceですので、自分でサーバを作ることも可能です！" #: templates/umap/home.html:17 msgid "Map of the uMaps" @@ -158,7 +151,7 @@ msgstr "フィードバック" #: templates/umap/navigation.html:20 msgid "Change password" -msgstr "" +msgstr "パスワードを変更" #: templates/umap/navigation.html:22 msgid "Log out" @@ -166,37 +159,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 "セキュリティ確認のため、古いパスワードを入力してください。次に、入力ミスがないように、新しいパスワードを2回入力してください。" #: 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." @@ -213,6 +206,3 @@ msgstr "検索" #: views.py:190 msgid "View the map" msgstr "マップ表示" - -#~ msgid "Map settings" -#~ msgstr "マップ設定" diff --git a/umap/locale/ru/LC_MESSAGES/django.mo b/umap/locale/ru/LC_MESSAGES/django.mo index 74774394..919eb1df 100644 Binary files a/umap/locale/ru/LC_MESSAGES/django.mo and b/umap/locale/ru/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ru/LC_MESSAGES/django.po b/umap/locale/ru/LC_MESSAGES/django.po index a4868472..1ba5919c 100644 --- a/umap/locale/ru/LC_MESSAGES/django.po +++ b/umap/locale/ru/LC_MESSAGES/django.po @@ -1,28 +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: -# ilis_krou , 2014 +# Кругликов Илья , 2014 +# Кругликов Илья , 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-07-15 05:24+0000\n" -"Last-Translator: ilis_krou \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/umap/language/" -"ru/)\n" -"Language: ru\n" +"PO-Revision-Date: 2016-10-20 07:57+0000\n" +"Last-Translator: Кругликов Илья \n" +"Language-Team: Russian (http://www.transifex.com/yohanboniface/umap/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #: templates/404.html:7 msgid "Take me to the home page" -msgstr "" +msgstr "Перейти на заглавную страницу" #: templates/auth/user_detail.html:7 #, python-format @@ -34,10 +33,8 @@ msgid "Type editors nick to add…" 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" @@ -49,19 +46,19 @@ 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,10 +69,7 @@ msgstr "Выберите провайдера аутентификации" msgid "" "uMap let you create maps with OpenStreetMap " "layers in a minute and embed them in your site." -msgstr "" -"uMap даёт вам возможность создавать карты, основанные на данных OpenStreetMap, в считанные минуты, и публиковать их на " -"своём сайте." +msgstr "uMap даёт вам возможность создавать карты, основанные на данных OpenStreetMap, в считанные минуты, и публиковать их на своём сайте." #: templates/umap/about_summary.html:11 msgid "Choose the layers of your map" @@ -91,9 +85,7 @@ msgstr "Выбирайте нужные цвета и изображения д #: templates/umap/about_summary.html:14 msgid "Manage map options: display a minimap, locate user on load…" -msgstr "" -"Меняйте свойства карты: отображение миникарты и других элементов " -"управления..." +msgstr "Меняйте свойства карты: отображение миникарты и других элементов управления..." #: templates/umap/about_summary.html:15 msgid "Batch import geostructured data (geojson, gpx, kml, osm...)" @@ -124,14 +116,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 " -"%(stable_url)s. You can also host your own instance, it's open source!" -msgstr "" -"Это демонстрационный сайт, использующийся для тестов и подготовки стабильных " -"выпусков. Если вам нужна стабильная версия, перейдите на %(stable_url)s. Вы можете создать свою версию, потому " -"что это открытое ПО!" +"need a stable instance, please use %(stable_url)s. You can also host your own " +"instance, it's open source!" +msgstr "Это демонстрационный сайт, использующийся для тестов и подготовки стабильных выпусков. Если вам нужна стабильная версия, перейдите на %(stable_url)s. Вы можете создать свою версию, потому что это открытое ПО!" #: templates/umap/home.html:17 msgid "Map of the uMaps" @@ -163,7 +151,7 @@ msgstr "Обратная связь" #: templates/umap/navigation.html:20 msgid "Change password" -msgstr "" +msgstr "Сменить пароль" #: templates/umap/navigation.html:22 msgid "Log out" @@ -171,37 +159,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." @@ -218,6 +206,3 @@ msgstr "Найти" #: views.py:190 msgid "View the map" msgstr "Посмотреть карту" - -#~ msgid "Map settings" -#~ msgstr "Настройки карты"