diff options
| author | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
| commit | 95e2a539517c27b3235acd582f17968c8e301e81 (patch) | |
| tree | 213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/res/values-ru/strings.xml | |
| parent | 48717dd7d37c066ab626fc626a2ced626ef21d42 (diff) | |
| parent | 4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff) | |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/Config.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-ru/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 2aa26b0b..efc5ba6c 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Настройки</string> <string name="action_add">Новая беседа</string> <string name="action_accounts">Управление аккаунтами</string> |