Skip to content

Commit

Permalink
Merge pull request #658 from wireapp/dev
Browse files Browse the repository at this point in the history
staging bump 2017-01-20#2
  • Loading branch information
herrmannplatz authored Jan 20, 2017
2 parents c29c027 + c2b97d6 commit e0e851f
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 31 deletions.
11 changes: 7 additions & 4 deletions app/script/localization/strings-de.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ z.string.de.modal_button_send = 'Senden'

# Block a user
z.string.de.modal_block_conversation_headline = '%@.name blockieren?'
z.string.de.modal_block_conversation_message = '%@.name wird dich auf Wire nicht finden können.'
z.string.de.modal_block_conversation_message = '%@.name wird dich nicht länger kontaktieren oder zu Gruppen hinzufügen können.'
z.string.de.modal_block_conversation_button = 'Blockieren'
# Cannot create the call because there is nobody to call (conversation_empty)
z.string.de.modal_call_conversation_empty_headline = 'Niemand um anzurufen'
Expand Down Expand Up @@ -186,7 +186,7 @@ z.string.de.modal_logout_message = 'Deine persönlichen Daten und Unterhaltungen
z.string.de.modal_logout_button = 'Abmelden'
# New device
z.string.de.modal_new_device_headline = '%@.name hat begonnen ein neues Gerät zu nutzen'
z.string.de.modal_new_device_headline_many = '%@.names haben begonnen ein neues Gerät zu nutzen'
z.string.de.modal_new_device_headline_many = '%@.names haben begonnen neue Geräte zu nutzen'
z.string.de.modal_new_device_headline_you = '%@.name hast begonnen ein neues Gerät zu nutzen'
z.string.de.modal_new_device_message = 'Möchtest du die Nachrichten noch senden?'
z.string.de.modal_new_device_show_device = 'Gerät anzeigen'
Expand Down Expand Up @@ -273,6 +273,9 @@ z.string.de.conversation_send_pasted_file = 'Bild eingefügt am %date'

# Collection
z.string.de.collection_show_all = 'Zeige alle %no'
z.string.de.collection_section_links = 'Links'
z.string.de.collection_section_images = 'Bilder'
z.string.de.collection_section_files = 'Dateien'

# Archive
z.string.de.archive_header = 'Archivieren'
Expand Down Expand Up @@ -351,7 +354,7 @@ z.string.de.people_verified = 'Verifiziert'

# Block user
z.string.de.people_block_headline = 'Blockieren?'
z.string.de.people_block_message = '%@.first_name wird dich auf Wire nicht finden können.'
z.string.de.people_block_message = '%@.first_name wird dich nicht länger kontaktieren oder zu Gruppen hinzufügen können.'

# Accept a pending connection dialogue
z.string.de.people_connect_headline = 'Annehmen?'
Expand All @@ -371,7 +374,7 @@ z.string.de.people_remove_message = '%@.first_name wird in dieser Unterhaltung k

# Unblock user
z.string.de.people_unblock_headline = 'Freigeben?'
z.string.de.people_unblock_message = '%@.first_name wird dich über Wire wieder finden und kontaktieren können. Du empfängst alle Nachrichten die verschickt wurden, während der Kontakt blockiert war.'
z.string.de.people_unblock_message = '%@.first_name wird dich wieder kontaktieren und zu Gruppen hinzufügen können.'

# Button labels for the actions
z.string.de.people_button_add = 'Kontakte hinzufügen'
Expand Down
8 changes: 6 additions & 2 deletions app/script/localization/strings-es.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ z.string.es.conversation_likes_caption = '%@numbero de personas'
z.string.es.conversation_send_pasted_file = 'Imagen pegada el %date'

# Collection
z.string.es.collection_show_all = 'Mostrar los %no'

# Archive
z.string.es.archive_header = 'Archivar'
Expand Down Expand Up @@ -304,8 +305,8 @@ z.string.es.invite_meta_key_pc = 'Ctrl'
z.string.es.invite_hint_selected = 'Pulse %meta_key + C para copiar'
z.string.es.invite_hint_unselected = 'Seleccione y pulse %meta_key + C'
z.string.es.invite_headline = 'Invitar amigos a Wire'
z.string.es.invite_message = 'Estoy en Wire, búscame como %username o visita wire.com/download.'
z.string.es.invite_message_no_email = 'Estoy en Wire. Visita https://get.wire.com para conectar conmigo.'
z.string.es.invite_message = 'Estoy en Wire, búscame como %username o visita get.wire.com.'
z.string.es.invite_message_no_email = 'Estoy en Wire. Visita get.wire.com para conectar conmigo.'

# Extensions
z.string.es.extensions_bubble_button_gif = 'Gif'
Expand All @@ -329,6 +330,7 @@ z.string.es.people_no_matches = 'No hay resultados coincidentes. Intente con un
z.string.es.people_invite = 'Invitar gente'
z.string.es.people_share = 'Compartir contactos'
z.string.es.people_bring_your_friends = 'Invita a tus amigos a Wire'
z.string.es.people_invite_detail = 'Compartir tus contactos te ayuda a conectar con otros. Anonimizamos toda la información y no la compartimos con nadie.'
z.string.es.people_invite_button_contacts = 'Desde los contactos'
z.string.es.people_invite_button_gmail = 'Desde Gmail'
z.string.es.people_invite_headline = 'Tráete a tus amigos'
Expand Down Expand Up @@ -475,6 +477,7 @@ z.string.es.upload_google_message_error = 'No recibimos tu información. Por fav
z.string.es.upload_google_button_again = 'Vuelve a intentarlo'

# URLs
z.string.es.url_password_reset = 'forgot/?hl=es'
z.string.es.url_legal = 'https://wire.com/legal/'
z.string.es.url_privacy = 'https://wire.com/privacy/'
z.string.es.url_privacy_why = 'https://wire.com/privacy/why/'
Expand Down Expand Up @@ -522,6 +525,7 @@ z.string.es.warning_connectivity_no_internet = 'No hay Internet. No podrás envi
# Browser notifications
z.string.es.system_notification_asset_add = 'Compartió una foto'
z.string.es.system_notification_connection_accepted = 'Aceptó tu solicitud de conexión'
z.string.es.system_notification_connection_connected = 'Están conectados'
z.string.es.system_notification_connection_request = 'Quiere conectar'
z.string.es.system_notification_conversation_create = '%s.first_name inició una conversación'
z.string.es.system_notification_conversation_rename = '%s.first_name renombró la conversación a %name'
Expand Down
19 changes: 16 additions & 3 deletions app/script/localization/strings-fi.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@ z.string.fi.conversation_context_menu_unlike = 'Poista tykkäys'
z.string.fi.conversation_delete_timestamp = 'Poistettu %@timestamp'
z.string.fi.conversation_edit_timestamp = 'Muokattu %@timestamp'
z.string.fi.conversation_likes_caption = '%@number henkeä'
z.string.fi.conversation_send_pasted_file = 'Liitti kuvan %date'

# Collection
z.string.fi.collection_show_all = 'Näytä kaikki %no'
z.string.fi.collection_section_links = 'Linkit'
z.string.fi.collection_section_images = 'Kuvat'
z.string.fi.collection_section_files = 'Tiedostot'

# Archive
z.string.fi.archive_header = 'Arkistoi'
Expand Down Expand Up @@ -301,8 +308,8 @@ z.string.fi.invite_meta_key_pc = 'Ctrl'
z.string.fi.invite_hint_selected = 'Paina %meta_key + C kopioidaksesi'
z.string.fi.invite_hint_unselected = 'Valitse ja paina %meta_key + C'
z.string.fi.invite_headline = 'Kutsu ihmisiä Wireen'
z.string.fi.invite_message = 'Olen Wiressä, etsi %username tai mene osoitteeseen wire.com/download.'
z.string.fi.invite_message_no_email = 'Olen Wiressä. Mene osoitteeseen https://get.wire.com ottaaksesi yhteyttä minuun.'
z.string.fi.invite_message = 'Olen Wiressä, etsi %username tai mene osoitteeseen get.wire.com.'
z.string.fi.invite_message_no_email = 'Olen Wiressä. Mene osoitteeseen get.wire.com ottaaksesi minuun yhteyttä.'

# Extensions
z.string.fi.extensions_bubble_button_gif = 'Gif'
Expand All @@ -326,6 +333,7 @@ z.string.fi.people_no_matches = 'Ei vastaavia tuloksia. Yritä toisella nimellä
z.string.fi.people_invite = 'Kutsu ihmisiä'
z.string.fi.people_share = 'Jaa yhteystietoja'
z.string.fi.people_bring_your_friends = 'Tuo ystäväsi Wireen'
z.string.fi.people_invite_detail = 'Yhteystietojesi jakaminen auttaa sinua löytämään uusia kontakteja. Anonymisoimme kaiken tiedon ja emme jaa sitä ulkopuolisille.'
z.string.fi.people_invite_button_contacts = 'Kontakteista'
z.string.fi.people_invite_button_gmail = 'Gmailista'
z.string.fi.people_invite_headline = 'Kutsu kavereitasi'
Expand Down Expand Up @@ -447,15 +455,19 @@ z.string.fi.preferences_options_data_checkbox = 'Käyttö- ja vikaraportit'
z.string.fi.preferences_options_data_detail = 'Tee Wirestä parempi lähetämällä anonyymiä tietoa.'
z.string.fi.preferences_options_notifications = 'Ilmoitukset'
z.string.fi.preferences_options_notifications_none = 'Pois päältä'
z.string.fi.preferences_options_notifications_obfuscate = 'Piilota viestin tiedot'
z.string.fi.preferences_options_notifications_obfuscate = 'Piilota yksityiskohdat'
z.string.fi.preferences_options_notifications_obfuscate_message = 'Näytä lähettäjä'
z.string.fi.preferences_options_notifications_on = 'Näytä lähettäjä ja viesti'

# Search
z.string.fi.search_group_hint = 'Jatka kirjoittamista tai valitse lisää ihmisiä luodaksesi ryhmän'
z.string.fi.search_connect = 'Yhdistä'
z.string.fi.search_connections = 'Yhteydet'
z.string.fi.search_groups = 'Ryhmät'
z.string.fi.search_placeholder = 'Etsi nimellä tai käyttäjänimellä'
z.string.fi.search_top_people = 'Eniten käytetyt kontaktit'
z.string.fi.search_try_search = 'Etsi käyttäjiä nimellä tai käyttäjänimellä'
z.string.fi.search_no_contacts_on_wire = 'Sinulla ei ole kontakteja Wiressä. Yritä etsiä muita käyttäjiä nimellä tai käyttäjänimellä.'
z.string.fi.search_others = 'Yhdistä'
z.string.fi.search_friend_in_common = '%n yhteinen käyttäjä molemmilla'
z.string.fi.search_friends_in_common = '%n yhteistä käyttäjää molemmilla'
Expand Down Expand Up @@ -515,6 +527,7 @@ z.string.fi.warning_connectivity_no_internet = 'Ei Internetiä. Et pysty lähett
# Browser notifications
z.string.fi.system_notification_asset_add = 'Jakoi kuvan'
z.string.fi.system_notification_connection_accepted = 'Hyväksyi yhteyspyyntösi'
z.string.fi.system_notification_connection_connected = 'Yhteys muodostettu'
z.string.fi.system_notification_connection_request = 'Haluaa luoda kontaktin'
z.string.fi.system_notification_conversation_create = '%s.first_name aloitti keskustelun'
z.string.fi.system_notification_conversation_rename = '%s.first_name nimesi keskustelun uudelleen %nameksi'
Expand Down
7 changes: 5 additions & 2 deletions app/script/localization/strings-fr.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@ z.string.fr.invite_meta_key_pc = 'Ctrl'
z.string.fr.invite_hint_selected = 'Appuyez sur %meta_key + C pour copier'
z.string.fr.invite_hint_unselected = 'Sélectionnez et appuyez sur %meta_key + C'
z.string.fr.invite_headline = 'Invitez des gens sur Wire'
z.string.fr.invite_message_no_email = 'Je suis sur Wire. Visitez https://get.wire.com afin de vous connecter avec moi.'
z.string.fr.invite_message = 'Je suis sur Wire, cherche %username ou va voir get.wire.com .'
z.string.fr.invite_message_no_email = 'Je suis sur Wire. Va voir get.wire.com pour te connecter avec moi.'

# Extensions
z.string.fr.extensions_bubble_button_gif = 'Gif'
Expand All @@ -328,6 +329,7 @@ z.string.fr.people_no_matches = 'Pas de résultats.\nEssayez avec un nom différ
z.string.fr.people_invite = 'Inviter des personnes'
z.string.fr.people_share = 'Partagez vos contacts'
z.string.fr.people_bring_your_friends = 'Amenez vos amis sur Wire'
z.string.fr.people_invite_detail = 'Le fait de partager vos contacts vous aide à vous connecter à d’autres personnes. Nous gardons anonyme toute information et ne le partageons avec personne d’autre.'
z.string.fr.people_invite_button_contacts = 'Depuis vos Contacts'
z.string.fr.people_invite_button_gmail = 'Depuis Gmail'
z.string.fr.people_invite_headline = 'Amenez vos amis'
Expand Down Expand Up @@ -458,7 +460,7 @@ z.string.fr.search_group_hint = 'Continuez d’écrire ou ajoutez plus de person
z.string.fr.search_connect = 'Connecter'
z.string.fr.search_connections = 'Connexions'
z.string.fr.search_groups = 'Groupes'
z.string.fr.search_placeholder = 'Rechercher par nom ou par identifiant'
z.string.fr.search_placeholder = 'Chercher par nom ou par identifiant'
z.string.fr.search_top_people = 'Personnes favorites'
z.string.fr.search_try_search = 'Trouver des personnes par\nnom ou nom d’utilisateur'
z.string.fr.search_no_contacts_on_wire = 'Vous n’avez pas de contacts sur Wire.\nEssayez de trouver des gens par\nleur nom ou leur nom d’utilisateur.'
Expand Down Expand Up @@ -521,6 +523,7 @@ z.string.fr.warning_connectivity_no_internet = 'Pas d’Internet. Vous ne pourre
# Browser notifications
z.string.fr.system_notification_asset_add = 'A partagé une photo'
z.string.fr.system_notification_connection_accepted = 'A accepté votre demande de connexion'
z.string.fr.system_notification_connection_connected = 'Sont maintenant connectés'
z.string.fr.system_notification_connection_request = 'Souhaite se connecter'
z.string.fr.system_notification_conversation_create = '%s.first_name a démarré une conversation'
z.string.fr.system_notification_conversation_rename = '%s.first_name a renommé la conversation en %name'
Expand Down
2 changes: 2 additions & 0 deletions app/script/localization/strings-hr.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ z.string.hr.conversation_edit_timestamp = 'Promijenjeno na %@timestamp'
z.string.hr.conversation_likes_caption = '%@number ljudi'
z.string.hr.conversation_send_pasted_file = 'Slika zaljepljena na %date'

# Collection

# Archive
z.string.hr.archive_header = 'Arhiviraj'

Expand Down
2 changes: 2 additions & 0 deletions app/script/localization/strings-it.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ z.string.it.conversation_edit_timestamp = 'Modificato il %@timestamp'
z.string.it.conversation_likes_caption = '%@number persone'
z.string.it.conversation_send_pasted_file = 'Immagine incollata alle %date'

# Collection

# Archive
z.string.it.archive_header = 'Archivia'

Expand Down
9 changes: 7 additions & 2 deletions app/script/localization/strings-pt.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ z.string.pt.conversation_edit_timestamp = 'Editado em %@timestamp'
z.string.pt.conversation_likes_caption = '%@number pessoas'
z.string.pt.conversation_send_pasted_file = 'Imagem postada em %date'

# Collection
z.string.pt.collection_show_all = 'Mostrar todas %no'

# Archive
z.string.pt.archive_header = 'Arquivar'

Expand Down Expand Up @@ -302,8 +305,8 @@ z.string.pt.invite_meta_key_pc = 'Ctrl'
z.string.pt.invite_hint_selected = 'Pressione % meta_key + C para copiar'
z.string.pt.invite_hint_unselected = 'Selecione e pressione % meta_key + C'
z.string.pt.invite_headline = 'Convidar pessoas para o Wire'
z.string.pt.invite_message = 'Eu estou no Wire, pesquise por %username ou visite wire.com/download.'
z.string.pt.invite_message_no_email = 'Estou no Wire. Visite https://get.wire.com para se conectar comigo.'
z.string.pt.invite_message = 'Eu estou no Wire, pesquise por %username ou visite get.wire.com.'
z.string.pt.invite_message_no_email = 'Estou no Wire. Visite get.wire.com para se conectar comigo.'

# Extensions
z.string.pt.extensions_bubble_button_gif = 'Gif'
Expand All @@ -327,6 +330,7 @@ z.string.pt.people_no_matches = 'Nenhum resultado correspondente. \nTente digita
z.string.pt.people_invite = 'Convidar pessoas'
z.string.pt.people_share = 'Compartilhar Contatos'
z.string.pt.people_bring_your_friends = 'Traga seus amigos para o Wire'
z.string.pt.people_invite_detail = 'Compartilhar seus contatos ajuda a se conectar com outras pessoas. Nós tornamos anônimas todas as informações e não compartilhamos com ninguém.'
z.string.pt.people_invite_button_contacts = 'Dos contatos'
z.string.pt.people_invite_button_gmail = 'Do Gmail'
z.string.pt.people_invite_headline = 'Traga os seus amigos'
Expand Down Expand Up @@ -520,6 +524,7 @@ z.string.pt.warning_connectivity_no_internet = 'Sem Internet. Não será capaz d
# Browser notifications
z.string.pt.system_notification_asset_add = 'Compartilhou uma imagem'
z.string.pt.system_notification_connection_accepted = 'Aceitou seu pedido de conexão'
z.string.pt.system_notification_connection_connected = 'Agora estão conectados'
z.string.pt.system_notification_connection_request = 'Quer se conectar'
z.string.pt.system_notification_conversation_create = '%s.first_name começou uma conversa'
z.string.pt.system_notification_conversation_rename = '%s.first_name mudou o nome da conversa para %name'
Expand Down
12 changes: 10 additions & 2 deletions app/script/localization/strings-ro.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,12 @@ z.string.ro.conversation_edit_timestamp = 'A fost editat la %@timestamp'
z.string.ro.conversation_likes_caption = '%@number persoane'
z.string.ro.conversation_send_pasted_file = 'A postat o imagine pe %date'

# Collection
z.string.ro.collection_show_all = 'Arată toate %no'
z.string.ro.collection_section_links = 'Legături'
z.string.ro.collection_section_images = 'Imagini'
z.string.ro.collection_section_files = 'Fișiere'

# Archive
z.string.ro.archive_header = 'Arhivă'

Expand Down Expand Up @@ -302,8 +308,8 @@ z.string.ro.invite_meta_key_pc = 'Ctrl'
z.string.ro.invite_hint_selected = 'Apasă %meta_key + C pentru a copia'
z.string.ro.invite_hint_unselected = 'Selectează și apasă %meta_key + C'
z.string.ro.invite_headline = 'Invită persoane pe Wire'
z.string.ro.invite_message = 'Sunt pe Wire, caută pe %username sau vizitează wire.com/download.'
z.string.ro.invite_message_no_email = 'Sunt pe Wire. Vizitează https://get.wire.com pentru a te conecta cu mine.'
z.string.ro.invite_message = 'Bună, sunt pe Wire. Caută-mă cu numele %username sau vizitează get.wire.com.'
z.string.ro.invite_message_no_email = 'Sunt pe Wire. Vizitează get.wire.com pentru a te conecta cu mine.'

# Extensions
z.string.ro.extensions_bubble_button_gif = 'Gif'
Expand All @@ -327,6 +333,7 @@ z.string.ro.people_no_matches = 'Nu s-a găsit nimic.\nÎncearcă să scrii un a
z.string.ro.people_invite = 'Invită persoane'
z.string.ro.people_share = 'Împărtășește contacte'
z.string.ro.people_bring_your_friends = 'Invită prietenii pe Wire'
z.string.ro.people_invite_detail = 'Împărtășirea contactelor ne ajută să te conectăm cu alții. Noi anonimizăm toate informațiile și nu le împărtășim cu terți.'
z.string.ro.people_invite_button_contacts = 'Din Contacte'
z.string.ro.people_invite_button_gmail = 'Din Gmail'
z.string.ro.people_invite_headline = 'Invită prietenii'
Expand Down Expand Up @@ -520,6 +527,7 @@ z.string.ro.warning_connectivity_no_internet = 'Nu este conexiune la internet. N
# Browser notifications
z.string.ro.system_notification_asset_add = 'A împărtășit o imagine'
z.string.ro.system_notification_connection_accepted = 'A acceptat cererea de conectare a ta'
z.string.ro.system_notification_connection_connected = 'Acum ești conectat'
z.string.ro.system_notification_connection_request = 'Așteaptă conectarea'
z.string.ro.system_notification_conversation_create = '%s.first_name a început o conversație'
z.string.ro.system_notification_conversation_rename = '%s.first_name a redenumit conversația în %name'
Expand Down
10 changes: 8 additions & 2 deletions app/script/localization/strings-ru.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,10 @@ z.string.ru.conversation_likes_caption = '%@number участникам'
z.string.ru.conversation_send_pasted_file = 'Изображение добавлено %date'

# Collection
z.string.ru.collection_show_all = 'Показать все %no'
z.string.ru.collection_section_links = 'Ссылки'
z.string.ru.collection_section_images = 'Изображения'
z.string.ru.collection_section_files = 'Файлы'

# Archive
z.string.ru.archive_header = 'Архив'
Expand Down Expand Up @@ -304,8 +308,8 @@ z.string.ru.invite_meta_key_pc = 'Ctrl'
z.string.ru.invite_hint_selected = 'Нажмите %meta_key + C для копирования'
z.string.ru.invite_hint_unselected = 'Выделите и нажмите %meta_key + C'
z.string.ru.invite_headline = 'Пригласите людей в Wire'
z.string.ru.invite_message = 'Я использую Wire, введи в поиске %username или перейди на wire.com/download.'
z.string.ru.invite_message_no_email = 'Я использую Wire. Перейди на https://get.wire.com, чтобы связаться со мной.'
z.string.ru.invite_message = 'Я использую Wire, ищите меня там по имени %username или посетите сайт get.wire.com.'
z.string.ru.invite_message_no_email = 'Я использую Wire. Перейдите на get.wire.com, чтобы связаться со мной.'

# Extensions
z.string.ru.extensions_bubble_button_gif = 'Gif'
Expand All @@ -329,6 +333,7 @@ z.string.ru.people_no_matches = 'Совпадений не найдено.\nПо
z.string.ru.people_invite = 'Пригласить людей'
z.string.ru.people_share = 'Поделиться контактами'
z.string.ru.people_bring_your_friends = 'Приведите друзей в Wire'
z.string.ru.people_invite_detail = 'Предоставление доступа к вашим контактам поможет вам связаться с другими людьми. Вся информация анонимна, мы не предоставляем её третьим лицам.'
z.string.ru.people_invite_button_contacts = 'Из контактов'
z.string.ru.people_invite_button_gmail = 'Из Gmail'
z.string.ru.people_invite_headline = 'Приведите друзей'
Expand Down Expand Up @@ -475,6 +480,7 @@ z.string.ru.upload_google_message_error = 'Мы не получили вашу
z.string.ru.upload_google_button_again = 'Повторить'

# URLs
z.string.ru.url_password_reset = 'forgot/?hl=ru'
z.string.ru.url_legal = 'https://wire.com/legal/'
z.string.ru.url_privacy = 'https://wire.com/privacy/'
z.string.ru.url_privacy_why = 'https://wire.com/privacy/why/'
Expand Down
Loading

0 comments on commit e0e851f

Please sign in to comment.