From 2cdfb0ca467d7d94a2ca70a29732ce91387a7f08 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Fri, 10 Jul 2015 21:11:08 +0300 Subject: [PATCH] merged with master --- app.manifest | 2 +- js/locales/es-es.json | 11 +---------- js/locales/nl-nl.json | 11 +---------- js/locales/pt-br.json | 11 +---------- webogram.appcache | 2 +- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/app.manifest b/app.manifest index 6a9d61be..c86a125e 100644 --- a/app.manifest +++ b/app.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -# Time: Fri Jul 10 2015 21:03:45 GMT+0300 (MSK) +# Time: Fri Jul 10 2015 21:10:45 GMT+0300 (MSK) CACHE: diff --git a/js/locales/es-es.json b/js/locales/es-es.json index 51a08b56..35262660 100644 --- a/js/locales/es-es.json +++ b/js/locales/es-es.json @@ -103,12 +103,8 @@ "user_modal_block_user": "Bloquear usuario", "user_modal_unblock_user": "Desbloquear usuario", "user_modal_delete_chat": "Eliminar chat", - "user_modal_add_to_group": "Add to group", "user_modal_info": "Información", "user_modal_phone": "Teléfono", - "user_modal_about": "About", - "user_modal_bot_settings": "Settings", - "user_modal_bot_help": "Help", "user_modal_username": "Alias", "user_modal_settings": "Ajustes", "user_modal_notifications": "Notificaciones", @@ -132,9 +128,6 @@ "user_status_last_week": "última vez hace unos días", "user_status_last_month": "última vez hace unas semanas", "user_status_long_ago": "última vez hace mucho tiempo", - "user_status_bot": "bot", - "user_status_bot_noprivacy": "has access to messages", - "user_status_bot_privacy": "has no access to messages", "chat_title_deleted": "ELIMINADO", "format_size_progress_mulitple": "{done} de {total} {parts}", "format_size_progress": "{done} de {total}", @@ -251,8 +244,7 @@ "message_service_kicked_user": "expulsó a {user}", "message_service_left_group": "dejó el grupo", "message_service_joined_by_link": "se unió al grupo con un enlace de invitación", - "message_service_unsupported_action": "unsupported action {action}", - "message_service_bot_intro_header": "What can this bot do?", + "message_service_unsupported_action": "Acción no soportada: {action}", "error_modal_warning_title": "Advertencia", "error_modal_bad_request_title": "Error", "error_modal_unauthorized_title": "No autorizado", @@ -360,7 +352,6 @@ "im_delete": "Eliminar {count}", "im_forward": "Reenviar {count}", "im_reply": "Responder", - "im_start": "Start", "im_reply_loading": "Cargando{dots}", "im_photos_drop_text": "Suelta las fotos aquí para enviarlas", "im_message_field_placeholder": "Escribe un mensaje...", diff --git a/js/locales/nl-nl.json b/js/locales/nl-nl.json index 9fa7d79a..b9708d46 100644 --- a/js/locales/nl-nl.json +++ b/js/locales/nl-nl.json @@ -103,12 +103,8 @@ "user_modal_block_user": "Blokkeer gebruiker", "user_modal_unblock_user": "Deblokkeer gebruiker", "user_modal_delete_chat": "Chat verwijderen", - "user_modal_add_to_group": "Add to group", "user_modal_info": "Info", "user_modal_phone": "Telefoon", - "user_modal_about": "About", - "user_modal_bot_settings": "Settings", - "user_modal_bot_help": "Help", "user_modal_username": "Gebruikersnaam", "user_modal_settings": "Instellingen", "user_modal_notifications": "Meldingen", @@ -132,9 +128,6 @@ "user_status_last_week": "afgelopen week gezien", "user_status_last_month": "afgelopen maand gezien", "user_status_long_ago": "lang geleden gezien", - "user_status_bot": "bot", - "user_status_bot_noprivacy": "has access to messages", - "user_status_bot_privacy": "has no access to messages", "chat_title_deleted": "VERWIJDERD", "format_size_progress_mulitple": "{done} van {total} {parts}", "format_size_progress": "{done} van {total}", @@ -251,8 +244,7 @@ "message_service_kicked_user": "{user} verwijderd", "message_service_left_group": "heeft de groep verlaten", "message_service_joined_by_link": "Neemt deel aan de groep via uitnodigingslink", - "message_service_unsupported_action": "unsupported action {action}", - "message_service_bot_intro_header": "What can this bot do?", + "message_service_unsupported_action": "Actie is niet ondersteund {action}", "error_modal_warning_title": "Waarschuwing", "error_modal_bad_request_title": "Fout", "error_modal_unauthorized_title": "Geen bevoegdheid", @@ -360,7 +352,6 @@ "im_delete": "Verwijder {count}", "im_forward": "Doorsturen {count}", "im_reply": "Antwoord", - "im_start": "Start", "im_reply_loading": "Laden{dots}", "im_photos_drop_text": "Sleep foto's hierheen om te versturen.", "im_message_field_placeholder": "Bericht schrijven", diff --git a/js/locales/pt-br.json b/js/locales/pt-br.json index 95be81c8..03804371 100644 --- a/js/locales/pt-br.json +++ b/js/locales/pt-br.json @@ -103,12 +103,8 @@ "user_modal_block_user": "Bloquear usuário", "user_modal_unblock_user": "Desbloquear usuário", "user_modal_delete_chat": "Apagar conversa", - "user_modal_add_to_group": "Add to group", "user_modal_info": "Informação", "user_modal_phone": "Telefone", - "user_modal_about": "About", - "user_modal_bot_settings": "Settings", - "user_modal_bot_help": "Help", "user_modal_username": "Nome de usuário", "user_modal_settings": "Configurações", "user_modal_notifications": "Notificações", @@ -132,9 +128,6 @@ "user_status_last_week": "visto na última semana", "user_status_last_month": "visto no último mês", "user_status_long_ago": "visto há muito tempo", - "user_status_bot": "bot", - "user_status_bot_noprivacy": "has access to messages", - "user_status_bot_privacy": "has no access to messages", "chat_title_deleted": "APAGADO", "format_size_progress_mulitple": "{done} de {total} {parts}", "format_size_progress": "{done} de {total}", @@ -251,8 +244,7 @@ "message_service_kicked_user": "{user} removido", "message_service_left_group": "saiu do grupo", "message_service_joined_by_link": "entrou para o grupo via link de convite", - "message_service_unsupported_action": "unsupported action {action}", - "message_service_bot_intro_header": "What can this bot do?", + "message_service_unsupported_action": "Ação não suportada {action}", "error_modal_warning_title": "Advertência", "error_modal_bad_request_title": "Erro", "error_modal_unauthorized_title": "Não autorizado", @@ -360,7 +352,6 @@ "im_delete": "Apagar {count}", "im_forward": "Encaminhar {count}", "im_reply": "Responder", - "im_start": "Start", "im_reply_loading": "Carregando{dots}", "im_photos_drop_text": "Solte as fotos aqui para enviar", "im_message_field_placeholder": "Escreva uma mensagem...", diff --git a/webogram.appcache b/webogram.appcache index 6a9d61be..c86a125e 100644 --- a/webogram.appcache +++ b/webogram.appcache @@ -1,5 +1,5 @@ CACHE MANIFEST -# Time: Fri Jul 10 2015 21:03:45 GMT+0300 (MSK) +# Time: Fri Jul 10 2015 21:10:45 GMT+0300 (MSK) CACHE: