Browse Source

merged with master

gh-pages
Igor Zhukov 10 years ago
parent
commit
1d40cfa222
  1. 2
      app.manifest
  2. 12
      css/desktop.css
  3. 22
      js/app.js
  4. 2
      js/background.js
  5. 2
      js/lib/bin_utils.js
  6. 2
      js/lib/crypto_worker.js
  7. 6
      js/locales/de-de.json
  8. 17
      js/locales/es-es.json
  9. 6
      js/locales/it-it.json
  10. 17
      js/locales/nl-nl.json
  11. 17
      js/locales/pt-br.json
  12. 2
      manifest.json
  13. 2
      manifest.webapp
  14. 2
      webogram.appcache

2
app.manifest

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Fri Jul 10 2015 21:10:45 GMT+0300 (MSK)
# Time: Mon Jul 13 2015 19:59:16 GMT+0300 (EEST)
CACHE:

12
css/desktop.css

@ -774,7 +774,7 @@ a.footer_link.active:active {
.icon-select-tick {
display: none;
}
@media (min-width: 1024px) {
@media (min-width: 900px) {
.im_message_wrap {
position: relative;
}
@ -1126,7 +1126,15 @@ a.im_panel_peer_photo .peer_initials {
.composer_emoji_insert_btn {
top: 0;
right: 0px;
margin-top: -3px;
margin-top: -1px;
}
.composer_command_btn {
top: 2px;
right: 35px;
}
.composer_keyboard_btn {
top: 2px;
right: 35px;
}
.composer_emoji_panel {
display: none;

22
js/app.js

File diff suppressed because one or more lines are too long

2
js/background.js

@ -1,5 +1,5 @@
/*!
* Webogram v0.4.6 - messaging web application for MTProto
* Webogram v0.4.7 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

2
js/lib/bin_utils.js

@ -1,5 +1,5 @@
/*!
* Webogram v0.4.6 - messaging web application for MTProto
* Webogram v0.4.7 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

2
js/lib/crypto_worker.js

@ -1,5 +1,5 @@
/*!
* Webogram v0.4.6 - messaging web application for MTProto
* Webogram v0.4.7 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

6
js/locales/de-de.json

@ -173,6 +173,7 @@
"confirm_modal_forward_to_peer": "An {peer} weiterleiten?",
"confirm_modal_send_to_peer": "An {peer} senden?",
"confirm_modal_share_file_peer": "Mit {peer} teilen?",
"confirm_modal_invite_peer": "In {peer} einladen?",
"confirm_modal_apply_lang_with_reload_md": "App neu laden, um die neue Sprache zu verwenden?",
"confirm_modal_migrate_to_https_md": "Telegram Web unterstützt nun zusätzlich SSL-Verschlüsselung. Möchtest du zur HTTPS-Version wechseln?\nDie HTTP-Version wird bald deaktiviert werden.",
"confirm_modal_resize_desktop_md": "Möchtest du zur Desktopansicht wechseln?",
@ -253,6 +254,11 @@
"message_service_joined_by_link": "ist per Einladungslink der Gruppe beigetreten",
"message_service_unsupported_action": "nicht unterstützte Aktion: {action}",
"message_service_bot_intro_header": "Was kann dieser Bot?",
"message_action_reply": "Antworten",
"message_action_delete": "Löschen",
"message_action_forward": "Weiterleiten",
"message_action_select": "Auswählen",
"message_action_cancel": "Abbrechen",
"error_modal_warning_title": "Warnung",
"error_modal_bad_request_title": "Fehler",
"error_modal_unauthorized_title": "Nicht autorisiert",

17
js/locales/es-es.json

@ -103,8 +103,12 @@
"user_modal_block_user": "Bloquear usuario",
"user_modal_unblock_user": "Desbloquear usuario",
"user_modal_delete_chat": "Eliminar chat",
"user_modal_add_to_group": "Añadir al grupo",
"user_modal_info": "Información",
"user_modal_phone": "Teléfono",
"user_modal_about": "Acerca de",
"user_modal_bot_settings": "Ajustes",
"user_modal_bot_help": "Ayuda",
"user_modal_username": "Alias",
"user_modal_settings": "Ajustes",
"user_modal_notifications": "Notificaciones",
@ -128,6 +132,9 @@
"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": "tiene acceso a los mensajes",
"user_status_bot_privacy": "no tiene acceso a los mensajes",
"chat_title_deleted": "ELIMINADO",
"format_size_progress_mulitple": "{done} de {total} {parts}",
"format_size_progress": "{done} de {total}",
@ -166,6 +173,7 @@
"confirm_modal_forward_to_peer": "¿Reenviar a {peer}?",
"confirm_modal_send_to_peer": "¿Enviar a {peer}?",
"confirm_modal_share_file_peer": "¿Compartir con {peer}?",
"confirm_modal_invite_peer": "¿Invitar a {peer}?",
"confirm_modal_apply_lang_with_reload_md": "¿Quieres recargar la aplicación para usar el nuevo idioma?",
"confirm_modal_migrate_to_https_md": "Telegram Web soporta ahora encriptación SSL adicional. ¿Deseas cambiar a HTTPS?\nLa versión HTTP será inhabilitada pronto.",
"confirm_modal_resize_desktop_md": "¿Deseas cambiar a la versión de escritorio?",
@ -244,7 +252,13 @@
"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": "Acción no soportada: {action}",
"message_service_unsupported_action": "acción no soportada {action}",
"message_service_bot_intro_header": "¿Qué puede hacer este bot?",
"message_action_reply": "Responder",
"message_action_delete": "Eliminar",
"message_action_forward": "Reenviar",
"message_action_select": "Elegir",
"message_action_cancel": "Cancelar",
"error_modal_warning_title": "Advertencia",
"error_modal_bad_request_title": "Error",
"error_modal_unauthorized_title": "No autorizado",
@ -352,6 +366,7 @@
"im_delete": "Eliminar {count}",
"im_forward": "Reenviar {count}",
"im_reply": "Responder",
"im_start": "Iniciar",
"im_reply_loading": "Cargando{dots}",
"im_photos_drop_text": "Suelta las fotos aquí para enviarlas",
"im_message_field_placeholder": "Escribe un mensaje...",

6
js/locales/it-it.json

@ -173,6 +173,7 @@
"confirm_modal_forward_to_peer": "Inoltra a {peer}?",
"confirm_modal_send_to_peer": "Invia a {peer}?",
"confirm_modal_share_file_peer": "Condividi con {peer}?",
"confirm_modal_invite_peer": "Invitare in {peer}?",
"confirm_modal_apply_lang_with_reload_md": "Riavviare l'app per impostare la lingua?",
"confirm_modal_migrate_to_https_md": "Telegram Web supporta un ulteriore tipo di crittografia SSL. Vuoi passare alla versione HTTPS?\nLa versione HTTP sarà disabilitata presto.",
"confirm_modal_resize_desktop_md": "Vuoi passare alla modalità desktop?",
@ -253,6 +254,11 @@
"message_service_joined_by_link": "si è unito al gruppo tramite link di invito",
"message_service_unsupported_action": "azione non supportata {action}",
"message_service_bot_intro_header": "Cosa può fare questo bot?",
"message_action_reply": "Rispondi",
"message_action_delete": "Elimina",
"message_action_forward": "Inoltra",
"message_action_select": "Seleziona",
"message_action_cancel": "Annulla",
"error_modal_warning_title": "Attenzione",
"error_modal_bad_request_title": "Errore",
"error_modal_unauthorized_title": "Non autorizzato",

17
js/locales/nl-nl.json

@ -103,8 +103,12 @@
"user_modal_block_user": "Blokkeer gebruiker",
"user_modal_unblock_user": "Deblokkeer gebruiker",
"user_modal_delete_chat": "Chat verwijderen",
"user_modal_add_to_group": "Groepslid maken",
"user_modal_info": "Info",
"user_modal_phone": "Telefoon",
"user_modal_about": "Over",
"user_modal_bot_settings": "Instellingen",
"user_modal_bot_help": "Help",
"user_modal_username": "Gebruikersnaam",
"user_modal_settings": "Instellingen",
"user_modal_notifications": "Meldingen",
@ -128,6 +132,9 @@
"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": "toegang tot berichten",
"user_status_bot_privacy": "geen toegang tot berichten",
"chat_title_deleted": "VERWIJDERD",
"format_size_progress_mulitple": "{done} van {total} {parts}",
"format_size_progress": "{done} van {total}",
@ -166,6 +173,7 @@
"confirm_modal_forward_to_peer": "Doorsturen naar {peer}?",
"confirm_modal_send_to_peer": "Versturen naar {peer}?",
"confirm_modal_share_file_peer": "Delen met {peer}?",
"confirm_modal_invite_peer": "Toevoegen aan {peer}?",
"confirm_modal_apply_lang_with_reload_md": "App herladen om de taal toe te passen?",
"confirm_modal_migrate_to_https_md": "Telegram Web heeft nu ondersteuning voor extra SSL-encryptie. Wil je naar HTTPS overschakelen?\nDe HTTP-versie zal binnenkort worden uitgeschakeld.",
"confirm_modal_resize_desktop_md": "Wil je omschakelen naar de desktopversie?",
@ -244,7 +252,13 @@
"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": "Actie is niet ondersteund {action}",
"message_service_unsupported_action": "Ongeldige actie {action}",
"message_service_bot_intro_header": "Wat kan deze bot? ",
"message_action_reply": "Antwoord",
"message_action_delete": "Verwijder",
"message_action_forward": "Doorsturen",
"message_action_select": "Selecteren",
"message_action_cancel": "Annuleren",
"error_modal_warning_title": "Waarschuwing",
"error_modal_bad_request_title": "Fout",
"error_modal_unauthorized_title": "Geen bevoegdheid",
@ -352,6 +366,7 @@
"im_delete": "Verwijder {count}",
"im_forward": "Doorsturen {count}",
"im_reply": "Antwoord",
"im_start": "Begin",
"im_reply_loading": "Laden{dots}",
"im_photos_drop_text": "Sleep foto's hierheen om te versturen.",
"im_message_field_placeholder": "Bericht schrijven",

17
js/locales/pt-br.json

@ -103,8 +103,12 @@
"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": "Adicionar ao grupo",
"user_modal_info": "Informação",
"user_modal_phone": "Telefone",
"user_modal_about": "Sobre",
"user_modal_bot_settings": "Configurações",
"user_modal_bot_help": "Ajuda",
"user_modal_username": "Nome de usuário",
"user_modal_settings": "Configurações",
"user_modal_notifications": "Notificações",
@ -128,6 +132,9 @@
"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": "tem acesso às mensagens",
"user_status_bot_privacy": "não tem acesso às mensagens",
"chat_title_deleted": "APAGADO",
"format_size_progress_mulitple": "{done} de {total} {parts}",
"format_size_progress": "{done} de {total}",
@ -166,6 +173,7 @@
"confirm_modal_forward_to_peer": "Encaminhar para {peer}?",
"confirm_modal_send_to_peer": "Enviar para {peer}?",
"confirm_modal_share_file_peer": "Compartilhar com {peer}?",
"confirm_modal_invite_peer": "Convidar para {peer}?",
"confirm_modal_apply_lang_with_reload_md": "Recarregar o aplicativo para aplicar a linguagem?",
"confirm_modal_migrate_to_https_md": "Telegram Web agora suporta adicionais encriptações SSL. Você deseja alterar para HTTPS?\nA versão HTTP será desabilitada em breve.",
"confirm_modal_resize_desktop_md": "Você deseja alterar para a versão desktop?",
@ -244,7 +252,13 @@
"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": "Ação não suportada {action}",
"message_service_unsupported_action": "ação sem suporte {action}",
"message_service_bot_intro_header": "O que esse bot pode fazer?",
"message_action_reply": "Responder",
"message_action_delete": "Apagar",
"message_action_forward": "Encaminhar",
"message_action_select": "Selecionar",
"message_action_cancel": "Cancelar",
"error_modal_warning_title": "Advertência",
"error_modal_bad_request_title": "Erro",
"error_modal_unauthorized_title": "Não autorizado",
@ -352,6 +366,7 @@
"im_delete": "Apagar {count}",
"im_forward": "Encaminhar {count}",
"im_reply": "Responder",
"im_start": "Começar",
"im_reply_loading": "Carregando{dots}",
"im_photos_drop_text": "Solte as fotos aqui para enviar",
"im_message_field_placeholder": "Escreva uma mensagem...",

2
manifest.json

@ -1,7 +1,7 @@
{
"name": "Telegram",
"description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
"version": "0.4.6",
"version": "0.4.7",
"short_name": "Telegram",
"manifest_version": 2,
"app": {

2
manifest.webapp

@ -1,7 +1,7 @@
{
"name": "Telegram",
"description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
"version": "0.4.6",
"version": "0.4.7",
"type": "privileged",
"launch_path": "/index.html",
"developer": {

2
webogram.appcache

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Fri Jul 10 2015 21:10:45 GMT+0300 (MSK)
# Time: Mon Jul 13 2015 19:59:16 GMT+0300 (EEST)
CACHE:

Loading…
Cancel
Save