Skip to content

Commit

Permalink
Merge pull request #1419 from wireapp/dev
Browse files Browse the repository at this point in the history
staging bump 2017-06-21
  • Loading branch information
Gregor Herdmann authored Jun 21, 2017
2 parents a4cabd5 + 6f207fd commit 78899f7
Show file tree
Hide file tree
Showing 20 changed files with 918 additions and 306 deletions.
304 changes: 153 additions & 151 deletions app/page/template/_dist/app.htm

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/page/template/_dist/vendor.htm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<script src="/ext/js/cs.js"></script>
<script src="/ext/js/da.js"></script>
<script src="/ext/js/de.js"></script>
<script src="/ext/js/el.js"></script>
<script src="/ext/js/es.js"></script>
<script src="/ext/js/fi.js"></script>
<script src="/ext/js/fr.js"></script>
Expand Down
12 changes: 6 additions & 6 deletions app/script/auth/AccessTokenError.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@ z.auth.AccessTokenError = class AccessTokenError extends Error {
super();
this.name = this.constructor.name;
this.stack = (new Error()).stack;
this.type = type || z.audio.AccessTokenError.TYPE.UNKNOWN;
this.type = type || AccessTokenError.TYPE.UNKNOWN;

switch (this.type) {
case z.auth.AccessTokenError.TYPE.NOT_FOUND_IN_CACHE:
case AccessTokenError.TYPE.NOT_FOUND_IN_CACHE:
this.message = 'No cached access token found in Local Storage';
break;
case z.auth.AccessTokenError.TYPE.REFRESH_IN_PROGRESS:
case AccessTokenError.TYPE.REFRESH_IN_PROGRESS:
this.message = 'Access Token request already in progress';
break;
case z.auth.AccessTokenError.TYPE.RETRIES_EXCEEDED:
case AccessTokenError.TYPE.RETRIES_EXCEEDED:
this.message = 'No. of retries to get Access Token exceeded';
break;
case z.auth.AccessTokenError.TYPE.REQUEST_FAILED:
case AccessTokenError.TYPE.REQUEST_FAILED:
this.message = 'Request to POST for access token failed';
break;
case z.auth.AccessTokenError.TYPE.REQUEST_FORBIDDEN:
case AccessTokenError.TYPE.REQUEST_FORBIDDEN:
this.message = 'Request to POST for access token forbidden';
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion app/script/calling/entities/Flow.js
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ z.calling.entities.Flow = class Flow {
*/
_create_additional_payload() {
const payload = z.calling.CallMessageBuilder.create_payload(this.id, this.self_user_id, this.remote_user_id, this.remote_client_id);
const additional_payload = $.extend({remote_user: this.remote_user, sdp: this.local_sdp().sdp}, payload);
const additional_payload = Object.assign({remote_user: this.remote_user, sdp: this.local_sdp().sdp}, payload);

return z.calling.CallMessageBuilder.create_payload_prop_sync(this.call_et.self_state, this.call_et.self_state.video_send(), false, additional_payload);
}
Expand Down
4 changes: 2 additions & 2 deletions app/script/calling/entities/FlowAudio.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ z.calling.entities.FlowAudio = class FlowAudio {
this.audio_remote = audio_context.createMediaStreamDestination();
this._hookup_audio();

$.extend(true, media_stream, this.audio_remote.stream);
Object.assign(media_stream, this.audio_remote.stream);
this.logger.debug('Wrapped audio stream from microphone', media_stream);
}

Expand All @@ -135,7 +135,7 @@ z.calling.entities.FlowAudio = class FlowAudio {
remote_source.connect(this.pan_node);
this.pan_node.connect(audio_output_device);

$.extend(true, media_stream, audio_output_device.stream);
Object.assign(media_stream, audio_output_device.stream);
this.logger.debug(`Wrapped audio stream to speaker to create stereo. Initial panning set to '${this.panning()}'.`, media_stream);
}
}
Expand Down
1 change: 1 addition & 0 deletions app/script/localization/strings-init.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ z.string = z.string || {};
z.string.da = z.string.da || {};
z.string.cs = z.string.cs || {};
z.string.de = z.string.de || {};
z.string.el = z.string.el || {};
z.string.es = z.string.es || {};
z.string.fi = z.string.fi || {};
z.string.fr = z.string.fr || {};
Expand Down
565 changes: 565 additions & 0 deletions app/script/localization/translations/webapp-el.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions app/script/localization/translations/webapp-hu.js
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,14 @@ z.string.hu.conversations_secondary_line_ping = '{{number}} kopogás';
z.string.hu.conversations_secondary_line_pings = '{{number}} kopogás';
z.string.hu.conversations_secondary_line_people_left = '{{number}} partner elhagyta a beszélgetést';
z.string.hu.conversations_secondary_line_person_left = '{{user}} kilépett';
z.string.hu.conversations_secondary_line_person_removed = '{{user}} eltávolított';
z.string.hu.conversations_secondary_line_people_added = '{{user}} partnerek lettek hozzáadva';
z.string.hu.conversations_secondary_line_person_added = '{{user}} hozzáadott';
z.string.hu.conversations_secondary_line_person_added_you = '{{user}} hozzáadta Önt';
z.string.hu.conversations_secondary_line_renamed = '{{user}} átnevezte a beszélgetést';
z.string.hu.conversations_secondary_line_timed_message = 'Időzített üzenet';
z.string.hu.conversations_secondary_line_you_left = 'Ön kilépett';
z.string.hu.conversations_secondary_line_you_were_removed = 'Ön eltávolította';

z.string.hu.takeover_headline = 'Felhasználónevek itt találhatóak.';
z.string.hu.takeover_sub = 'Igényeljen egyedei nevet a Wire-ön.';
Expand Down Expand Up @@ -432,6 +436,8 @@ z.string.hu.preferences_options_data = 'Használati adatok és hibajelentések';
z.string.hu.preferences_options_data_checkbox = 'Használati adatok és hibajelentések';
z.string.hu.preferences_options_data_detail = 'Segítsen nekünk, hogy a Wire-t anonim információk küldésével javíthassuk.';
z.string.hu.preferences_options_popular = 'Közkívánatra';
z.string.hu.preferences_options_emoji_replace_checkbox = 'Cserélje ki a hangulatjeleket emojikra';
z.string.hu.preferences_options_previews_send_checkbox = 'Készítsen előnézetet az elküldendő linkeknek';
z.string.hu.preferences_options_notifications = 'Értesítések';
z.string.hu.preferences_options_notifications_none = 'Kikapcsolás';
z.string.hu.preferences_options_notifications_obfuscate = 'Részletek elrejtése';
Expand Down
4 changes: 3 additions & 1 deletion app/script/localization/translations/webapp-pl.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ z.string.pl.conversation_rename_you = ' %@ zmienił nazwę konwersacji';
z.string.pl.conversation_resume = 'Rozpoczął rozmowę z {{users}}';
z.string.pl.conversation_team_leave = ' został/a usunięty/a z zespołu';
z.string.pl.conversation_ping = ' zaczepiony';
z.string.pl.conversation_ping_you = ' zaczepiony';
z.string.pl.conversation_ping_you = ' zaczepiłeś/aś';
z.string.pl.conversation_today = 'dzisiaj';
z.string.pl.conversation_verified = 'Zweryfikowano';
z.string.pl.conversation_voice_channel_deactivate = ' połączono';
Expand Down Expand Up @@ -436,6 +436,8 @@ z.string.pl.preferences_options_data_checkbox = 'Wysyłanie anonimowych danych';
z.string.pl.preferences_options_data_detail = 'Ulepsz Wire przesyłając anonimowe informacje.';
z.string.pl.preferences_options_popular = 'Różne';
z.string.pl.preferences_options_emoji_replace_checkbox = 'Zastępuj tekstowe emotikony ikonkami';
z.string.pl.preferences_options_previews_send_checkbox = 'Twórz podglądy wysyłanych linków';
z.string.pl.preferences_options_previews_send_detail = 'Podglądy linków otrzymanych od innych osób mogą być nadal wyświetlane.';
z.string.pl.preferences_options_notifications = 'Powiadomienia';
z.string.pl.preferences_options_notifications_none = 'Wyłącz';
z.string.pl.preferences_options_notifications_obfuscate = 'Ukryj szczegóły';
Expand Down
16 changes: 16 additions & 0 deletions app/script/localization/translations/webapp-pt.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ z.string.pt.auth_account_sign_in_phone = 'Telefone';
z.string.pt.auth_account_terms_of_use = 'Termos de uso';
z.string.pt.auth_account_terms_of_use_detail = 'Eu aceito';

z.string.pt.auth_blocked_database = 'Wire precisa do acesso ao armazenamento local para exibir suas mensagens. O armazenamento local não está disponível no modo privado.';
z.string.pt.auth_blocked_tabs = 'O Wire já está aberto em outra guia.';

z.string.pt.auth_verify_account_add = 'Adicionar';
z.string.pt.auth_verify_account_detail = 'Isso permite que você use Wire em vários dispositivos.';
z.string.pt.auth_verify_account_headline = 'Adicionar o endereço de e-mail e senha.';
Expand Down Expand Up @@ -276,8 +279,15 @@ z.string.pt.conversations_secondary_line_new_messages = '{{number}} novas mensag
z.string.pt.conversations_secondary_line_ping = '{{number}} ping';
z.string.pt.conversations_secondary_line_pings = '{{number}} pings';
z.string.pt.conversations_secondary_line_people_left = '{{number}} pessoas saíram';
z.string.pt.conversations_secondary_line_person_left = '{{user}} saiu';
z.string.pt.conversations_secondary_line_person_removed = '{{user}} foi removido';
z.string.pt.conversations_secondary_line_people_added = '{{user}} adicionou pessoas';
z.string.pt.conversations_secondary_line_person_added = '{{user}} foi adicionado';
z.string.pt.conversations_secondary_line_person_added_you = '{{user}} adicionou você';
z.string.pt.conversations_secondary_line_renamed = '{{user}} remomeou uma conversa';
z.string.pt.conversations_secondary_line_timed_message = 'Mensagem temporizada';
z.string.pt.conversations_secondary_line_you_left = 'Você saiu';
z.string.pt.conversations_secondary_line_you_were_removed = 'Você foi removido';

z.string.pt.takeover_headline = 'Nomes de usuário estão aqui.';
z.string.pt.takeover_sub = 'Revindicar seu nome único no Wire.';
Expand Down Expand Up @@ -424,6 +434,10 @@ z.string.pt.preferences_options_contacts_detail = 'Usamos seus dados de contato
z.string.pt.preferences_options_data = 'Relatórios de uso e erro';
z.string.pt.preferences_options_data_checkbox = 'Relatórios de uso e erro';
z.string.pt.preferences_options_data_detail = 'Faça o Wire melhorar mandando informações de uso anônimas.';
z.string.pt.preferences_options_popular = 'Por demanda popular';
z.string.pt.preferences_options_emoji_replace_checkbox = 'Substituir o tipo emoticons com emojis';
z.string.pt.preferences_options_previews_send_checkbox = 'Criar pré-visualizações para links que você envia';
z.string.pt.preferences_options_previews_send_detail = 'Pré-Visualizações ainda serão mostradas para links de outras pessoas.';
z.string.pt.preferences_options_notifications = 'Notificações';
z.string.pt.preferences_options_notifications_none = 'Desligar';
z.string.pt.preferences_options_notifications_obfuscate = 'Ocultar detalhes';
Expand Down Expand Up @@ -504,6 +518,7 @@ z.string.pt.system_notification_conversation_create = '{{user}} começou uma con
z.string.pt.system_notification_conversation_rename = '{{user}} mudou o nome da conversa para {{name}}';
z.string.pt.system_notification_member_join_many = '{{user}} adicionou {{number}} pessoas à conversa';
z.string.pt.system_notification_member_join_one = '{{user1}} adicionou {{user2}} para a conversa';
z.string.pt.system_notification_member_leave_removed_you = '{{user}} removeu você da conversa';
z.string.pt.system_notification_obfuscated = 'Te enviou uma mensagem';
z.string.pt.system_notification_obfuscated_title = 'Alguém';
z.string.pt.system_notification_ping = 'Pingou';
Expand All @@ -529,6 +544,7 @@ z.string.pt.tooltip_conversations_archive = 'Arquivo ({{shortcut}})';
z.string.pt.tooltip_conversations_archived = 'Mostrar arquivo ({{number}})';
z.string.pt.tooltip_conversations_more = 'Ver mais';
z.string.pt.tooltip_conversations_notify = 'Tirar do silencioso ({{shortcut}})';
z.string.pt.tooltip_conversations_preferences = 'Abrir preferências';
z.string.pt.tooltip_conversations_silence = 'Silenciar ({{shortcut}})';
z.string.pt.tooltip_conversations_start = 'Iniciar conversa ({{shortcut}})';

Expand Down
10 changes: 6 additions & 4 deletions app/script/localization/translations/webapp-ru.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ z.string.ru.auth_account_terms_of_use = 'Условия использовани
z.string.ru.auth_account_terms_of_use_detail = 'Я принимаю';

z.string.ru.auth_blocked_database = 'Для отображения сообщений Wire необходим доступ к локальному хранилищу. Локальное хранилище недоступно в приватном режиме.';
z.string.ru.auth_blocked_tabs = 'Wire уже открыто в другой вкладке.';

z.string.ru.auth_verify_account_add = 'Добавить';
z.string.ru.auth_verify_account_detail = 'Это позволит использовать Wire на нескольких устройствах.';
Expand Down Expand Up @@ -213,7 +214,7 @@ z.string.ru.conversation_message_delivered = 'Доставлено';
z.string.ru.conversation_rename = ' переименовал(а) разговор';
z.string.ru.conversation_rename_you = ' переименовал(а) разговор';
z.string.ru.conversation_resume = 'Начать разговор с {{users}}';
z.string.ru.conversation_team_leave = ' был исключён из команды';
z.string.ru.conversation_team_leave = ' был удален из команды';
z.string.ru.conversation_ping = ' отправил(а) пинг';
z.string.ru.conversation_ping_you = ' отправил(а) пинг';
z.string.ru.conversation_today = 'сегодня';
Expand Down Expand Up @@ -279,13 +280,14 @@ z.string.ru.conversations_secondary_line_new_messages = '{{number}} новых
z.string.ru.conversations_secondary_line_ping = '{{number}} пинг';
z.string.ru.conversations_secondary_line_pings = '{{number}} пинга';
z.string.ru.conversations_secondary_line_people_left = '{{number}} человек(а) покинули';
z.string.ru.conversations_secondary_line_person_left = '{{user}} покинул разговор';
z.string.ru.conversations_secondary_line_person_removed = '{{user}} был удален';
z.string.ru.conversations_secondary_line_people_added = '{{user}} человек были добавлены';
z.string.ru.conversations_secondary_line_person_added = '{{user}} был добавлен';
z.string.ru.conversations_secondary_line_person_added_you = '{{user}} добавил вас';
z.string.ru.conversations_secondary_line_renamed = '{{user}} переименовал беседу';
z.string.ru.conversations_secondary_line_renamed = '{{user}} переименовал разговор';
z.string.ru.conversations_secondary_line_timed_message = 'Временное сообщение';
z.string.ru.conversations_secondary_line_you_left = 'Вы покинули беседу';
z.string.ru.conversations_secondary_line_you_left = 'Вы покинули разговор';
z.string.ru.conversations_secondary_line_you_were_removed = 'Вы были удалены';

z.string.ru.takeover_headline = 'Имена пользователей уже здесь.';
Expand Down Expand Up @@ -446,7 +448,7 @@ z.string.ru.search_connect = 'Связаться';
z.string.ru.search_connections = 'Контакты';
z.string.ru.search_groups = 'Группы';
z.string.ru.search_placeholder = 'Поиск по имени или имени пользователя';
z.string.ru.search_team_groups = 'Беседы команды';
z.string.ru.search_team_groups = 'Разговоры команды';
z.string.ru.search_team_members = 'Члены команды';
z.string.ru.search_top_people = 'Топ-контакты';
z.string.ru.search_try_search = 'Найдите людей по имени\nили имени пользователя';
Expand Down
9 changes: 9 additions & 0 deletions app/script/localization/translations/webapp-tr.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ z.string.tr.auth_account_sign_in_phone = 'Telefon';
z.string.tr.auth_account_terms_of_use = 'Kullanım Şartları';
z.string.tr.auth_account_terms_of_use_detail = 'Kabul ediyorum';

z.string.tr.auth_blocked_database = 'Wire’ın mesajları gösterebilmek için yerel diske erişmesi lazım. Gizli modda yerel disk kullanılamaz.';
z.string.tr.auth_blocked_tabs = 'Wire zaten başka bir sekmede açık.';

z.string.tr.auth_verify_account_add = 'Ekle';
z.string.tr.auth_verify_account_detail = 'Bu sizin Wire’ı birden fazla cihazda kullanmanıza olanak sağlar.';
z.string.tr.auth_verify_account_headline = 'Bir e-posta adresi ve şifre ekleyin.';
Expand Down Expand Up @@ -254,6 +257,7 @@ z.string.tr.archive_header = 'Arşivle';

z.string.tr.conversations_all_archived = 'Her şey arşivlendi';
z.string.tr.conversations_contacts = 'Kişiler';
z.string.tr.conversations_connection_request_many = '{{number}} kişi bekliyor';
z.string.tr.conversations_connection_request_one = 'Bir kişi bekliyor';
z.string.tr.conversations_empty_conversation = 'Grup sohbeti';
z.string.tr.conversations_empty_conversation_description = 'Herkes ayrıldı';
Expand Down Expand Up @@ -430,6 +434,10 @@ z.string.tr.preferences_options_contacts_detail = 'İletişim verilerinizi sizi
z.string.tr.preferences_options_data = 'Kullanım ve kilitlenme raporları';
z.string.tr.preferences_options_data_checkbox = 'Kullanım ve kilitlenme raporları';
z.string.tr.preferences_options_data_detail = 'Anonim bilgiler göndererek Wire’ın daha iyi olmasını sağlayabilirsiniz.';
z.string.tr.preferences_options_popular = 'Yoğun istek üzerine';
z.string.tr.preferences_options_emoji_replace_checkbox = 'Yazı halindeki emojileri, gerçek emojiler ile değiştir';
z.string.tr.preferences_options_previews_send_checkbox = 'Gönderdiğin bağlantılar için ön izlemeler oluştur';
z.string.tr.preferences_options_previews_send_detail = 'Ön izlemeler hala başkalarından gelen bağlantılar için görüntülenebilir olabilir.';
z.string.tr.preferences_options_notifications = 'Bildirimler';
z.string.tr.preferences_options_notifications_none = 'Yok';
z.string.tr.preferences_options_notifications_obfuscate = 'Ayrıntıyı gizle';
Expand Down Expand Up @@ -536,6 +544,7 @@ z.string.tr.tooltip_conversations_archive = 'Arşivle ({{shortcut}})';
z.string.tr.tooltip_conversations_archived = 'Arşivi göster ({{number}})';
z.string.tr.tooltip_conversations_more = 'Daha';
z.string.tr.tooltip_conversations_notify = 'Sesi aç ({{shortcut}})';
z.string.tr.tooltip_conversations_preferences = 'Seçenekleri aç';
z.string.tr.tooltip_conversations_silence = 'Sessize al ({{shortcut}})';
z.string.tr.tooltip_conversations_start = 'Konuşma başlat ({{shortcut}})';

Expand Down
Loading

0 comments on commit 78899f7

Please sign in to comment.