Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kontalk devteam committed May 8, 2016
2 parents 19b3f45 + 9f0f3f5 commit bbdbbc8
Show file tree
Hide file tree
Showing 12 changed files with 180 additions and 26 deletions.
3 changes: 3 additions & 0 deletions app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -453,4 +453,7 @@
<string name="pref_show_blocked_users">Mostra els usuaris bloquejats</string>
<string name="button_load_next_page">Carregar més missatges</string>

<string name="text_search_results_empty">No s\'han trobat missatges.</string>
<string name="chooser_error_no_gallery_app">No hi ha aplicacions de galeria disponibles.</string>

</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -455,4 +455,6 @@
<string name="pref_media_autodownload_label_always">Vždy</string>

<string name="text_search_results_empty">Nebyly nalezeny žádné zprávy.</string>
<string name="chooser_error_no_gallery_app">Není dostupná žádná aplikace typu galerie.</string>

</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -455,4 +455,8 @@
<string name="pref_media_autodownload_label_always">Immer</string>

<string name="text_search_results_empty">Keine Nachrichten gefunden.</string>
<string name="chooser_error_no_gallery_app">Keine Galerie-App verfügbar.</string>

<string name="learn_more">Nähere Infos</string>

</resources>
119 changes: 103 additions & 16 deletions app/src/main/res/values-el/strings.xml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -453,4 +453,7 @@
<string name="pref_media_autodownload_label_wifi">Solamente con Wi-Fi</string>
<string name="pref_media_autodownload_label_always">Siempre</string>

<string name="text_search_results_empty">No se han encontrado mensajes.</string>
<string name="chooser_error_no_gallery_app">No hay aplicaciones de galería disponibles.</string>

</resources>
23 changes: 13 additions & 10 deletions app/src/main/res/values-gl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
<string name="hint_validation_number">O teu número</string>
<string name="hint_validation_code">Código de verificación</string>
<string name="warn_invalid_number">Por favor, insire un número de teléfono válido.</string>
<string name="msg_validating_phone">Solicitando un SMS cun código de verificación…</string>
<string name="msg_validating_phone">Solicitando o rexistro…</string>
<string name="msg_initializing">Rexistrándose na rede Kontalk…</string>
<string name="msg_authenticated">Rexistrado na rede!</string>
<string name="share">Compartir</string>
<string name="resend">Enviar outra vez</string>
<string name="copy_message_text">Copiar o texto da mensaxe</string>
<string name="copy_message_text">Copiar o texto</string>
<string name="delete_message">Eliminar a mensaxe</string>
<string name="confirm_delete_all">Eliminar todas as conversas</string>
<string name="confirm_delete_all">Eliminar todo</string>
<string name="confirm_will_delete_all">Todas as conversas serán eliminadas.</string>
<string name="sending_message">Enviando a mensaxe…</string>
<string name="message_text_copied">Texto da mensaxe copiado.</string>
<string name="call">Chamar</string>
<string name="view_contact">Ver o contacto</string>
<string name="view_conversation">Ver a conversa</string>
<string name="view_conversation">Ollar a conversa</string>
<string name="delete_thread">Eliminar a conversa</string>
<string name="confirm_delete_thread">Eliminar a conversa</string>
<string name="confirm_will_delete_thread">Toda a conversa será eliminada.</string>
Expand All @@ -65,7 +65,7 @@
<string name="hint_open_kbd_to_compose">Abre o teclado para redactar a mensaxe</string>
<string name="view_image">Ver a imaxe</string>
<string name="title_message_options">Opcións da mensaxe</string>
<string name="menu_message_details">Ver detalles da mensaxe</string>
<string name="menu_message_details">Detalles</string>
<string name="title_message_details">Detalles da mensaxe</string>
<string name="message_type_label">Tipo:\u0020</string>
<string name="text_message">Mensaxe de texto</string>
Expand All @@ -85,7 +85,7 @@
<string name="size_unknown">(descoñecido)</string>
<string name="title_file_info">Información do ficheiro</string>
<string name="pref_restart_msgcenter">Reiniciar a área de mensaxe</string>
<string name="pref_title_restart_msgcenter">Usa isto se a área de mensaxe non está funcionando correctamente</string>
<string name="pref_title_restart_msgcenter">Usa isto se Kontalk non está funcionando correctamente</string>
<string name="pref_idle_time">Desconectar ao permanecer inactivo</string>
<string name="pref_title_idle_time">Tempo de espera antes de desconectar por inactividade</string>
<string name="pref_wakeup_time">Reconectar ao servidor</string>
Expand Down Expand Up @@ -142,7 +142,7 @@
<string name="peer_unknown">(descoñecido)</string>
<string name="msg_draft_saved">Mensaxe gardada como borrador.</string>
<string name="send_mime_not_supported">Tipo de ficheiro non soportado.</string>
<string name="button_validate">Solicitar un código de verificación</string>
<string name="button_validate">Rexistro</string>
<string name="button_validation_register">Verificar</string>
<string name="notify_ticker_download_completed">Descarga completada</string>
<string name="notify_title_download_completed">Descarga completada</string>
Expand All @@ -164,7 +164,7 @@
<string name="menu_refresh">Recargar</string>
<string name="menu_invite">Convidar usuarios</string>
<string name="title_error">Erro</string>
<string name="msg_do_refresh">Usa o botón actualizar para actualizar a lista de contactos.</string>
<string name="msg_do_refresh">Usa o botón de abaixo para actualizar a lista de contactos.</string>
<string name="msg_sync_progress">Recargando a lista de contactos…</string>
<string name="err_sync_failed">Non foi posible recargar a lista de contactos. Por favor, téntao máis tarde.</string>
<string name="err_sync_nonetwork">Rede non dispoñible. Por favor, téntao máis tarde.</string>
Expand All @@ -189,7 +189,7 @@
<string name="attachment_download">Descarga de anexos</string>
<string name="attachment_upload">Envío de anexos</string>
<string name="seen_moment_ago_label">hai un intre</string>
<string name="seen_online_label">conectado/a</string>
<string name="seen_online_label">activo</string>
<string name="seen_typing_label">escribindo…</string>
<string name="pref_custom_background">Fondo personalizado</string>
<string name="pref_background_uri">Fondo</string>
Expand Down Expand Up @@ -461,4 +461,7 @@
<item quantity="other">%d seleccionado</item>
</plurals>

</resources>
<string name="text_search_results_empty">Non se atoparon menxases.</string>
<string name="chooser_error_no_gallery_app">Non hai unha aplicación de galería disponible.</string>

</resources>
9 changes: 9 additions & 0 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -455,4 +455,13 @@
<string name="pref_media_autodownload_label_always">Sempre</string>

<string name="text_search_results_empty">Nessun messaggio trovato.</string>
<string name="chooser_error_no_gallery_app">Nessuna applicazione galleria di foto trovata.</string>

<string name="learn_more">Informazioni</string>

<string name="title_huawei_protected_apps">Huawei App Protette</string>
<string name="msg_huawei_protected_apps">Kontalk richiede di essere abilitata come app protetta per funzionare.\n</string>
<string name="btn_huawei_protected_apps">App protette</string>
<string name="check_do_not_show_again">Non mostrare più</string>

</resources>
9 changes: 9 additions & 0 deletions app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -454,4 +454,13 @@
<string name="pref_media_autodownload_label_always">Altijd</string>

<string name="text_search_results_empty">Geen berichten gevonden.</string>
<string name="chooser_error_no_gallery_app">Geen gallerij-app beschikbaar.</string>

<string name="learn_more">Meer info</string>

<string name="title_huawei_protected_apps">Huawei Beschermde Apps</string>
<string name="msg_huawei_protected_apps">Kontalk moet in Beschermde Apps geactiveerd zijn voor correcte werking.\n</string>
<string name="btn_huawei_protected_apps">Beschermde Apps</string>
<string name="check_do_not_show_again">Niet opnieuw tonen</string>

</resources>
10 changes: 10 additions & 0 deletions app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -468,4 +468,14 @@
<string name="pref_media_autodownload_label_wifi">Apenas com Wi-Fi</string>
<string name="pref_media_autodownload_label_always">Sempre</string>

<string name="text_search_results_empty">Não foi encontrada nenhuma mensagem.</string>
<string name="chooser_error_no_gallery_app">Não existe nenhum aplicativo de galeria disponível.</string>

<string name="learn_more">Saiba mais</string>

<string name="title_huawei_protected_apps">Aplicativos Protegidos do Huawei</string>
<string name="msg_huawei_protected_apps">É necessário habilitar o Kontalk nos Aplicativos Protegidos para que ele possa funcionar corretamente.\n</string>
<string name="btn_huawei_protected_apps">Aplicativos Protegidos</string>
<string name="check_do_not_show_again">Não exibir novamente</string>

</resources>
12 changes: 12 additions & 0 deletions app/src/main/res/values-sr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -454,4 +454,16 @@
<string name="warning_public_key_unknown">Лични кључ овог корисника је непоуздан!</string>
<string name="title_public_key_unknown_warning">Непоуздан лични кључ</string>
<string name="text_search_results_empty">Нема порука.</string>
<string name="chooser_error_no_gallery_app">Нема апликације за галерију.</string>

<string name="msg_public_key_changed_warning">Уверите се да је корисник реинсталирао Контак или је регенерисао кључ намерно, у супротном комуникација је можда компромитована!</string>
<string name="msg_public_key_unknown_warning">Уверите се да корисников отисак одговара оном приказаном у дијалогу <b>идентитета</b>, у супротном комуникација је можда компромитована!</string>

<string name="learn_more">Сазнајте више</string>

<string name="title_huawei_protected_apps">Huawei заштићене апликације</string>
<string name="msg_huawei_protected_apps">Контак мора бити омогућен у Заштићеним апликацијама да би исправно функционисао.\n</string>
<string name="btn_huawei_protected_apps">Заштићене апликације</string>
<string name="check_do_not_show_again">Не приказуј поново</string>

</resources>
9 changes: 9 additions & 0 deletions app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,13 @@
<string name="pref_idle_time">Meşgul olduğunda bağlantıyı kes</string>
<string name="pref_title_idle_time">Etkinlik olmadığında bağlantıyı kesmek için ne kadar bekleneceği</string>
<string name="pref_wakeup_time">Sunucuya yeniden bağlan</string>
<string name="button_load_next_page">Daha fazla mesaj yükle</string>

<string name="about_credits_translators"><b>Çevirmenler</b></string>

<string name="pref_show_blocked_users">Engellenmiş kullanıcıları göster</string>
<string name="warning_public_key_unknown">Bu kullanıcının kişisel anahtarı güvenilmez!</string>
<string name="title_public_key_unknown_warning">Güvenilmez kişisel anahtar</string>
<string name="warning_user_blocked">Kullanıcı sizin tarafınızdan engellendi.</string>

</resources>
3 changes: 3 additions & 0 deletions app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -493,4 +493,7 @@
<string name="pref_media_autodownload_label_wifi">仅在Wi-Fi</string>
<string name="pref_media_autodownload_label_always">总是</string>

<string name="text_search_results_empty">找不到消息。</string>
<string name="chooser_error_no_gallery_app">没有图库应用。</string>

</resources>

0 comments on commit bbdbbc8

Please sign in to comment.