merged with master

10 years ago · 36142a2cef
8 changed files with 6 additions and 8 deletions
--- a/app.manifest
+++ b/app.manifest
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Mon Nov 30 2015 20:44:57 GMT+0300 (MSK)
+# Time: Mon Nov 30 2015 21:51:53 GMT+0300 (MSK)


 CACHE:
--- a/css/app.css
+++ b/css/app.css
@ -1704,7 +1704,7 @@ img.chat_modal_participant_photo{width:40px;height:40px}
 .stickerset_modal_stickers_list{padding:25px}
 .stickerset_modal_sticker_wrap{margin:0 5px 5px 0;padding:0;position:relative;display:block;width:192px;height:192px;float:left;border-radius:3px;overflow:hidden}
 .stickerset_modal_sticker_wrap:hover{background:#f2f6fa}
-.stickerset_modal_sticker{width:192px;height:192px}
+.stickerset_modal_sticker{width:192px;height:192px;text-align:center}
 .stickerset_modal_sticker img{max-width:192px;max-height:192px}
 .stickerset_modal_sticker_alt{position:absolute;bottom:0;right:0}
 .stickerset_actions{padding:10px 20px;height:50px;text-align:center}
--- a/js/app.js
+++ b/js/app.js
--- a/js/locales/de-de.json
+++ b/js/locales/de-de.json
@ -300,7 +300,7 @@
    "message_action_forward": "Weiterleiten",
    "message_action_select": "Auswählen",
    "message_action_cancel": "Abbrechen",
-    "message_action_retry": "Try again",
+    "message_action_retry": "Erneut versuchen",
    "error_modal_warning_title": "Warnung",
    "error_modal_bad_request_title": "Fehler",
    "error_modal_unauthorized_title": "Nicht autorisiert",
--- a/js/locales/nl-nl.json
+++ b/js/locales/nl-nl.json
@ -300,7 +300,6 @@
    "message_action_forward": "Doorsturen",
    "message_action_select": "Selecteren",
    "message_action_cancel": "Annuleren",
-    "message_action_retry": "Try again",
    "error_modal_warning_title": "Waarschuwing",
    "error_modal_bad_request_title": "Fout",
    "error_modal_unauthorized_title": "Geen bevoegdheid",
--- a/js/locales/pt-br.json
+++ b/js/locales/pt-br.json
@ -300,7 +300,7 @@
    "message_action_forward": "Encaminhar",
    "message_action_select": "Selecionar",
    "message_action_cancel": "Cancelar",
-    "message_action_retry": "Try again",
+    "message_action_retry": "Tente Novamente",
    "error_modal_warning_title": "Advertência",
    "error_modal_bad_request_title": "Erro",
    "error_modal_unauthorized_title": "Não autorizado",
--- a/js/locales/ru-ru.json
+++ b/js/locales/ru-ru.json
@ -300,7 +300,6 @@
    "message_action_forward": "Переслать",
    "message_action_select": "Выбрать",
    "message_action_cancel": "Отмена",
-    "message_action_retry": "Try again",
    "error_modal_warning_title": "Внимание",
    "error_modal_bad_request_title": "Ошибка",
    "error_modal_unauthorized_title": "Необходима авторизация",
--- a/webogram.appcache
+++ b/webogram.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Mon Nov 30 2015 20:44:57 GMT+0300 (MSK)
+# Time: Mon Nov 30 2015 21:51:53 GMT+0300 (MSK)


 CACHE: