Merge remote-tracking branch 'origin/develop' into feature/SyncAdapter
Conflicts: app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java app/src/main/res/values-de/strings.xml app/src/main/res/values/strings.xml
This commit is contained in:
@ -3,6 +3,7 @@
|
||||
<resources>
|
||||
<color name="primary">#FFC107</color>
|
||||
<color name="primary_dark">#FFA000</color>
|
||||
<color name="primary_dark_text">#DEFFFFFF</color>
|
||||
<color name="primary_light">#FFECB3</color>
|
||||
<color name="accent">#607D8B</color>
|
||||
<color name="primary_text">#212121</color>
|
||||
|
@ -16,6 +16,8 @@
|
||||
<string name="title_activity_open_bitmessage_link">Import Contact</string>
|
||||
|
||||
<string name="action_settings">Settings</string>
|
||||
<string name="connection_info_1">Stream #%1$d: one connection</string>
|
||||
<string name="connection_info_n">Stream #%1$d: %2$d connections</string>
|
||||
<string name="import_address">Import Address</string>
|
||||
<string name="import_contact">Add to contacts</string>
|
||||
<string name="label">Label</string>
|
||||
@ -38,4 +40,6 @@
|
||||
<string name="write_message">Write message</string>
|
||||
<string name="full_node">Full node</string>
|
||||
<string name="send">Send</string>
|
||||
<string name="connection_info_disconnected">Disconnected</string>
|
||||
<string name="connection_info_pending">Connecting…</string>
|
||||
</resources>
|
||||
|
Reference in New Issue
Block a user