diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2014-12-30 09:36:17 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2014-12-30 09:36:17 +0100 |
| commit | b71740f0d40ed3fb3e5b790d80ed6cb235f97d04 (patch) | |
| tree | 99367303fb7b92cb1f34d8c236ad53c31c1d4bb4 /src/main/res/values/strings.xml | |
| parent | 8f93f9c314d1bf731eac64007f3c9459fa92de1f (diff) | |
| parent | cacddef75668c1811d951795c2276c20255c9142 (diff) | |
Merge remote-tracking branch 'origin/development' into development
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f75a698b..34c574ee 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> + <string name="app_name" translatable="false">Conversations</string> <string name="action_settings">Settings</string> <string name="action_add">New conversation</string> <string name="action_accounts">Manage accounts</string> @@ -279,7 +279,7 @@ <string name="pref_expert_options_summary">Please be careful with these</string> <string name="title_activity_about">About Conversations</string> <string name="pref_about_conversations_summary">Build and licensing information</string> - <string name="pref_about_message" translatable="false"> + <string name="pref_about_message" translatable="false"> Conversations • the very last word in instant messaging. \n\nCopyright © 2014 Daniel Gultsch \n\nThis program is free software: you can redistribute it and/or modify |