From 8415f27cac83176971cd39300673686fdad89d26 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 10 Jul 2017 10:06:08 +0200
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-ja/strings.xml     |  2 ++
 src/main/res/values-nb-rNO/strings.xml |  8 ++++++++
 src/main/res/values-pt-rBR/strings.xml |  2 ++
 src/main/res/values-zh-rCN/strings.xml | 10 ++++++++++
 4 files changed, 22 insertions(+)

diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 47da80c1b..3ab67c3ea 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -718,4 +718,6 @@
   <string name="application_found_to_open_website">Webサイトを開くアプリケーションが見つかりません</string>
   <string name="pref_headsup_notifications">Heads-up 通知</string>
   <string name="pref_headsup_notifications_summary">Heads-up 通知を表示</string>
+  <string name="today">今日</string>
+  <string name="yesterday">昨日</string>
 </resources>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 7386e2a19..e62d17d87 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -526,7 +526,10 @@
   <string name="pref_presence_settings">Tilstedeværelse</string>
   <string name="pref_away_when_screen_off">Borte når skjermen er av</string>
   <string name="pref_away_when_screen_off_summary">Markerer din ressurs som borte når skjermen er avskrudd</string>
+  <string name="pref_dnd_on_silent_mode">“Ikke forstyrr” i stillemodus.</string>
+  <string name="pref_dnd_on_silent_mode_summary">Merker din ressurs som \"Ikke forstyrr\" når enheten er i stillemodus.</string>
   <string name="pref_treat_vibrate_as_silent">Behandle vibrering som stille-modus</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">Merker din ressurs som \"Ikke forstyrr\" når enheten er skrudd til vibrering</string>
   <string name="pref_show_connection_options">Utvidede tilkoblingsinnst.</string>
   <string name="pref_show_connection_options_summary">Vis vertsnavn og portinnstillinger når du setter opp en ny konto</string>
   <string name="hostname_example">xmpp.eksempel.no</string>
@@ -713,4 +716,9 @@
   <string name="retry_decryption">Prøv å dekryptere igjen</string>
   <string name="session_failure">Økt-feil</string>
   <string name="sasl_downgrade">Nedgradert SASL-mekanisme</string>
+  <string name="account_status_regis_web">Tjeneren krever registrering på nettsiden</string>
+  <string name="open_website">Åpne nettside</string>
+  <string name="application_found_to_open_website">Fant inget program til åpning av nettside</string>
+  <string name="today">I dag</string>
+  <string name="yesterday">I går</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 0338ce87e..5b114061b 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -721,4 +721,6 @@
   <string name="application_found_to_open_website">Não foi encontrado nenhum aplicativo para abrir o site web</string>
   <string name="pref_headsup_notifications">Notificações Heads-up</string>
   <string name="pref_headsup_notifications_summary">Exibe as notificações Heads-up</string>
+  <string name="today">Hoje</string>
+  <string name="yesterday">Ontem</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 52ff5a9ff..48516e445 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -524,7 +524,10 @@
   <string name="pref_presence_settings">存在</string>
   <string name="pref_away_when_screen_off">关闭屏幕时离开</string>
   <string name="pref_away_when_screen_off_summary">当屏幕关闭时将标记您的资源为离开状态</string>
+  <string name="pref_dnd_on_silent_mode">静音模式时设为“请勿打扰”</string>
+  <string name="pref_dnd_on_silent_mode_summary">当设备进入静音模式时把资源标识改为“请勿打扰”</string>
   <string name="pref_treat_vibrate_as_silent">静音模式开启振动</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">当设备进入震动模式时把资源标识改为“请勿打扰”</string>
   <string name="pref_show_connection_options">高级连接设置</string>
   <string name="pref_show_connection_options_summary">注册账户时显示主机名和端口</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -712,4 +715,11 @@
   <string name="retry_decryption">重试解密</string>
   <string name="session_failure">会话失败</string>
   <string name="sasl_downgrade">已降级的 SASL 机制</string>
+  <string name="account_status_regis_web">服务器要求在网站上注册</string>
+  <string name="open_website">打开网站</string>
+  <string name="application_found_to_open_website">没有可以打开网站的应用</string>
+  <string name="pref_headsup_notifications">顶部通知</string>
+  <string name="pref_headsup_notifications_summary">显示顶部通知</string>
+  <string name="today">今天</string>
+  <string name="yesterday">昨天</string>
 </resources>