diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 17:37:43 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 17:37:43 +0200 |
| commit | ad6208e53095e3a9870cdc0eae9b7c068a42829a (patch) | |
| tree | d5216f567722d4d6a959ab262c6cbef22f1931e7 /src/main/res/values-vi/strings.xml | |
| parent | 1f81683d26eba69d7e4373bbda6295d5d7843777 (diff) | |
| parent | de7631e300eb9e578336d642dd279faecdb09391 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
build.gradle
src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
src/main/res/values-bg/strings.xml
src/main/res/values-cs/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/values-vi/strings.xml')
| -rw-r--r-- | src/main/res/values-vi/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 6108286d..0db01a4d 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -105,9 +105,6 @@ <string name="pref_notifications">Thông báo</string> <string name="pref_notifications_summary">Thông báo khi có tin nhắn mới</string> <string name="pref_vibrate">Rung</string> - <string name="pref_vibrate_summary">Rung khi có tin nhắn mới</string> - <string name="pref_sound">Âm báo</string> - <string name="pref_sound_summary">Chơi nhạc chuông cùng với thông báo</string> <string name="pref_notification_grace_period">Thời gian gia hạn thông báo</string> <string name="pref_notification_grace_period_summary">Tắt thông báo trong một thời gian ngắn sau khi nhận được bản sao giấy than</string> <string name="pref_never_send_crash">Không bao giờ gửi báo cáo dừng chạy</string> |