diff options
| author | lookshe <github@lookshe.org> | 2016-03-08 10:49:47 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-08 10:49:47 +0100 |
| commit | 2b86b686c52c3d82ad01a8ff81c5766d64050b62 (patch) | |
| tree | ad7cfd62d79e06fea673bf601c9f0823842559ce /src/main/res/values-zh-rTW | |
| parent | f767a068423c50dde60bf570d6a05683ed6d76d7 (diff) | |
| parent | 1e75283250aee20b0fd2a73b7b3407801391f953 (diff) | |
Merge tag '1.11.0' into trz/merge_1.11.0
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/entities/Conversation.java
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/res/values-bg/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pl/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sr/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-tr-rTR/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/values-zh-rTW')
| -rw-r--r-- | src/main/res/values-zh-rTW/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 9a59cfe6..20202624 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -188,7 +188,6 @@ <string name="bookmark_already_exists">該書籤已存在</string> <string name="you">你</string> <string name="action_edit_subject">編輯群組主題</string> - <string name="conference_not_found">群組未找到</string> <string name="leave">離開</string> <string name="contact_added_you">聯絡人已新增你到聯絡人列表</string> <string name="add_back">新增為聯絡人</string> |