merged with master

app.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Fri Nov 28 2014 15:39:36 GMT+0000 (GMT)
+# Time: Sun Nov 30 2014 14:59:35 GMT-0800 (PST)
 
 
 CACHE:

css/desktop.css

@@ -1089,6 +1089,7 @@ div.im_panel_own_photo {
   max-width: 1000px;
   margin: 0 auto;
   color: rgba(255, 255, 255, 0.6);
+  position: relative;
 }
 
 .media_modal_title_wrap {
@@ -1106,6 +1107,8 @@ div.im_panel_own_photo {
 .media_modal_info_wrap {
   line-height: 16px;
   padding: 24px 20px;
+  position: absolute;
+  left: 0;
 }
 .media_modal_author {
   font-size: 13px;
@@ -1130,6 +1133,8 @@ a.media_modal_date:hover {
 }
 .media_modal_bottom_actions {
   width: 204px;
+  position: absolute;
+  right: 0;
 }
 .media_modal_action_btn {
   float: left;

js/locales/de-de.json

@@ -61,7 +61,7 @@
     "user_modal_delete_contact": "Kontakt entfernen",
     "user_modal_add_contact": "Zu Kontakten hinzufügen",
     "user_modal_share_contact": "Kontakt teilen",
-    "user_modal_block_user": "Benutzer blockieren",
+    "user_modal_block_user": "Kontakt blockieren",
     "user_modal_unblock_user": "Benutzer nicht mehr blockieren",
     "user_modal_delete_chat": "Chat löschen",
     "user_modal_info": "Info",
@@ -85,9 +85,9 @@
     "user_first_name_deleted": "GELÖSCHT",
     "user_status_online": "online",
     "user_status_last_seen": "zuletzt gesehen: {0}",
-    "user_status_recently": "kürzlich zuletzt gesehen",
-    "user_status_last_week": "zuletzt gesehen innerhalb einer Woche",
-    "user_status_last_month": "zuletzt gesehen innerhalb eines Monats",
+    "user_status_recently": "zuletzt kürzlich gesehen",
+    "user_status_last_week": "innerhalb einer Woche gesehen",
+    "user_status_last_month": "diesen Monat gesehen",
     "user_status_long_ago": "vor langer Zeit zuletzt gesehen",
     "chat_title_deleted": "GELÖSCHT",
     "format_size_progress_mulitple": "{done} von {total} {parts}",

js/locales/es-es.json

@@ -70,9 +70,9 @@
     "user_modal_settings": "Ajustes",
     "user_modal_notifications": "Notificaciones",
     "user_modal_contact_info": "Información",
-    "media_modal_photo": "Photo",
-    "media_modal_photo_index": "Photo {pos} of {count}",
-    "media_modal_video": "Video",
+    "media_modal_photo": "Foto",
+    "media_modal_photo_index": "Foto {pos} de {count}",
+    "media_modal_video": "Vídeo",
     "media_modal_forward": "Reenviar",
     "media_modal_download": "Descargar",
     "media_modal_delete": "Eliminar",

js/locales/nl-nl.json

@@ -329,7 +329,7 @@
     "welcome_easy_sharing_header": "Makkelijk bestanden delen",
     "welcome_easy_sharing_text": "Deel bestanden van een willekeurig type door middel van slepen en neerzetten of het bijlage-icoon.",
     "welcome_powerful_tools_header": "Krachtige hulpmiddelen",
-    "welcome_powerful_tools_text_md": "Blader door gedeelde media en bestanden\nen stel aangepaste meldingen in,",
+    "welcome_powerful_tools_text_md": "Blader door gedeelde media en bestanden\nen stel aangepaste meldingen in. ",
     "country_select_modal_country_ab": "Abchazië",
     "country_select_modal_country_af": "Afghanistan",
     "country_select_modal_country_ax": "Åland",

js/locales/pt-br.json

@@ -70,9 +70,9 @@
     "user_modal_settings": "Configurações",
     "user_modal_notifications": "Notificações",
     "user_modal_contact_info": "Informação do contato",
-    "media_modal_photo": "Photo",
-    "media_modal_photo_index": "Photo {pos} of {count}",
-    "media_modal_video": "Video",
+    "media_modal_photo": "Foto",
+    "media_modal_photo_index": "Foto {pos} de {count}",
+    "media_modal_video": "Vídeo",
     "media_modal_forward": "Encaminhar",
     "media_modal_download": "Baixar",
     "media_modal_delete": "Apagar",
@@ -120,7 +120,7 @@
     "confirm_modal_send_to_peer": "Enviar para {peer}?",
     "confirm_modal_share_file_peer": "Compartilhar com {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?%s\nA versão HTTP será desabilitada em breve.",
+    "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?",
     "confirm_modal_resize_mobile_md": "Você deseja alterar para a versão mobile?",
     "confirm_modal_are_u_sure": "Você tem certeza?",

webogram.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Fri Nov 28 2014 15:39:36 GMT+0000 (GMT)
+# Time: Sun Nov 30 2014 14:59:35 GMT-0800 (PST)
 
 
 CACHE: