diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e449b4de..7478a843 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -16,14 +16,14 @@
     <string name="about_version">O wersji</string>
     <string name="next">Następny</string>
     <string name="create_one">Stwórz jeden</string>
-    <string name="don_t_have_a_account">Nie masz konta na XWiki \?</string>
-    <string name="learn_more_dialog">Naucz więcej</string>
+    <string name="don_t_have_a_account">Nie masz konta na XWiki?</string>
+    <string name="learn_more_dialog">Dowiedz się więcej</string>
     <string name="login_sub_head">Zaloguj się do swojej instancji XWiki.</string>
-    <string name="grant_permission_button">Autoryzować</string>
+    <string name="grant_permission_button">Autoryzuj</string>
     <string name="cancel">Anuluj</string>
-    <string name="account_name">Nazwa konta</string>
+    <string name="account_name">Nazwa Konta</string>
     <string name="authorize_activity_package_label">Nazwa paczki</string>
-    <string name="authorize_activity_note">"Kliknij, aby zezwolić  aplikacji trzeciej na dostęp do Twojego konta."</string>
+    <string name="authorize_activity_note">Kliknij, aby zezwolić aplikacji trzeciej na dostęp do Twojego konta.</string>
     <string name="view_profile">Edycja kontaktu</string>
     <string name="profile_action">Profil XWiki</string>
     <string name="view_group_action_label">Pokaż szczegóły przykładowej grupy</string>
@@ -70,7 +70,26 @@
     <string name="askToGrantPermissions">Przyznaj uprawnienia w ustawieniach aplikacji</string>
     <string name="xwikiAccount">Konto XWiki</string>
     <string name="authenticationError">Błąd uwierzytelniania</string>
-    <string name="haveNoPermission">Nie masz pozwolenia</string>
+    <string name="haveNoPermission">Nie masz uprawnień</string>
     <string name="updateSuccess">Zaktualizowano pomyślnie</string>
     <string name="versionTemplate" formatted="false">Wersja %s</string>
+    <string name="admin">Admin</string>
+    <string name="accounts">Konta</string>
+    <string name="openIdConnect">Połączenie OpenID</string>
+    <string name="dataSaver">Oszczędzanie danych</string>
+    <string name="chooseAccount">Wybierz konto</string>
+    <string name="syncAccount">Synchronizacja konta</string>
+    <string name="anotherAccount">Użyj innego konta</string>
+    <string name="error">Błąd</string>
+    <string name="creatorXwiki">kreator:xwiki</string>
+    <string name="chooseLoginMethod">Wybierz metodę logowania</string>
+    <string name="lastUpdateInfo">Ostatnia aktualizacja:2015.06.03</string>
+    <string name="continueWith">Lub kontynuuj z</string>
+    <string name="error_no_internet">Sprawdź połączenie internetowe</string>
+    <string name="wrongEmail">E-mail musi wyglądać tak, jak ten@przykladowy-email.pl</string>
+    <string name="wrongPhone">Telefon musi wyglądać tak: +48-(700)-800-900</string>
+    <string name="unchangedSettings">Nic do zapisania: ustawienia nie zostały zmienione</string>
+    <string name="empty_notifications">Nie znaleziono powiadomień</string>
+    <string name="experimental_feature">Ta strona jest obecnie w fazie eksperymentalnej</string>
+    <string name="xwikiCredentialShare">Aby kontynuować, XWiki udostępni Twoje imię i nazwisko, adres e-mail i zdjęcie profilowe aplikacji żądającej</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index d5c44923..eae5705f 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -3,7 +3,7 @@
     <string name="signIn">登录</string>
     <string name="login_activity_username_label">用户名</string>
     <string name="password">密码</string>
-    <string name="user_id">用户ID</string>
+    <string name="user_id">用户ID（必填）</string>
     <string name="email">邮箱</string>
     <string name="confirm_password">确认密码</string>
     <string name="phone">手机号</string>
@@ -11,4 +11,85 @@
     <string name="login_activity_password_label">密码</string>
     <string name="logIn">登录</string>
     <string name="signUp">注册</string>
-</resources>
\ No newline at end of file
+    <string name="create_one">创建一个</string>
+    <string name="error">错误</string>
+    <string name="save">保存</string>
+    <string name="error_field_required">此字段为必填项</string>
+    <string name="sign_up_authenticating">注册…</string>
+    <string name="error_invalid_password">此密码太短</string>
+    <string name="error_no_internet">请检查互联网连接</string>
+    <string name="tryAgain">再试一次</string>
+    <string name="unchangedSettings">没有要保存的内容：设置未更改</string>
+    <string name="sign_in_authenticating">登录…</string>
+    <string name="authorize_activity_note">请点击授权第三方应用访问您的账户。</string>
+    <string name="next">下一个</string>
+    <string name="company">公司</string>
+    <string name="somethingWentWrong">出错了</string>
+    <string name="login_sub_head">登录到您的 XWiki 实例。</string>
+    <string name="success">成功</string>
+    <string name="title_activity_setting">设置</string>
+    <string name="loginError">错误的服务器 URL 或凭据</string>
+    <string name="authenticationError">身份验证错误</string>
+    <string name="userName">用户名</string>
+    <string name="error_invalid_server">此服务器地址无效</string>
+    <string name="xwikiAccount">XWiki 账户</string>
+    <string name="chooseAccount">选择一个账户</string>
+    <string name="last_name">姓氏</string>
+    <string name="cancel">取消</string>
+    <string name="cantGetGroups">无法获取组</string>
+    <string name="country">国家</string>
+    <string name="address">地址</string>
+    <string name="wrongEmail">电子邮件必须类似于 it-is@email-example.proof</string>
+    <string name="learn_more_dialog">了解更多</string>
+    <string name="updateSuccess">更新成功</string>
+    <string name="haveNoPermission">您没有权限</string>
+    <string name="wrongPhone">电话必须类似于 +123-(456)-789</string>
+    <string name="prohibitedAction">检查您是否具有必要的权限</string>
+    <string name="experimental_feature">此页面目前处于实验阶段</string>
+    <string name="anotherAccount">使用其他帐户</string>
+    <string name="first_name">名字</string>
+    <string name="error_invalid_email">无效的电子邮件</string>
+    <string name="don_t_have_a_account">还没有 XWiki 帐户？</string>
+    <string name="complete">完成</string>
+    <string name="serverAddress">服务器地址</string>
+    <string name="chooseLoginMethod">选择登录方式</string>
+    <string name="error_incorrect_password">此密码不正确</string>
+    <string name="cantGetAllUsers">无法获取所有用户，请重试</string>
+    <string name="login_activity_server_label">服务器</string>
+    <string name="login_activity_port_label">端口</string>
+    <string name="title_activity_authorize">授权</string>
+    <string name="view_group_action_label">显示示例组详细信息</string>
+    <string name="title_activity_select_groups">选择群组</string>
+    <string name="dataSaver">数据节省器</string>
+    <string name="title_activity_edit_contact">编辑联系人</string>
+    <string name="account_name">账户名</string>
+    <string name="pleaseWait">请等待</string>
+    <string name="admin">Admin管理员</string>
+    <string name="accounts">账户</string>
+    <string name="versionTemplate" formatted="false">版本 %s</string>
+    <string name="synchronizationType">同步类型</string>
+    <string name="checkErrors">检查错误</string>
+    <string name="openIdConnect">连接OpenID账户</string>
+    <string name="authorize_activity_package_label">包名称</string>
+    <string name="version">版本 1.0</string>
+    <string name="cantSyncContact">无法与服务器同步联系人数据。系统稍后会自动同步</string>
+    <string name="grant_permission_button">授权</string>
+    <string name="syncAccount">同步账号</string>
+    <string name="editXWikiContactInfo">编辑XWiki联系信息</string>
+    <string name="syncTypeGetListErrorMessage">在尝试获取当前同步类型的表格时出了点问题</string>
+    <string name="signUpOfferMessage">创建 XWiki 账户以享受如联系人同步等功能，并为其他安卓应用提供凭据</string>
+    <string name="xwikiCredentialShare">为了继续，XWiki 将与请求的应用程序共享您的姓名、电子邮件地址和账户头像</string>
+    <string name="creatorXwiki">创建者：xwiki</string>
+    <string name="additionalInfo">附加信息</string>
+    <string name="empty_notifications">未找到通知</string>
+    <string name="continueWith">或者继续使用</string>
+    <string name="note">备注</string>
+    <string name="profile_action">XWiki个人资料</string>
+    <string name="about_version">关于版本</string>
+    <string name="userExists">用户已存在</string>
+    <string name="view_profile">编辑联系方式</string>
+    <string name="askToGrantPermissions">请在应用设置中授予相关权限</string>
+    <string name="userContactInfo">用户联系信息</string>
+    <string name="syncContactInfoWithServer">将联系信息与服务器同步</string>
+    <string name="lastUpdateInfo">最后更新：2015.06.03</string>
+</resources>