Merge remote-tracking branch 'origin/develop' into feature/support-info
# Conflicts: # app/src/main/res/values-de/strings.xml # app/src/main/res/values/strings.xml
This commit is contained in:
@ -8,6 +8,7 @@
|
||||
<color name="colorAccent">#607D8B</color>
|
||||
<color name="colorPrimaryText">#212121</color>
|
||||
<color name="colorSecondaryText">#727272</color>
|
||||
<color name="contentBackground">#FFFFFF</color>
|
||||
<color name="icons">#212121</color>
|
||||
<color name="divider">#B6B6B6</color>
|
||||
|
||||
@ -49,6 +50,7 @@
|
||||
<color name="bg_item_normal_state">#ffffffff</color>
|
||||
<color name="bg_item_swiping_state">@color/colorPrimaryLight</color>
|
||||
<color name="bg_item_swiping_active_state">@color/colorPrimary</color>
|
||||
<color name="bg_item_selected_state">@color/colorPrimaryLight</color>
|
||||
<color name="bg_swipe_item_neutral">@android:color/transparent</color>
|
||||
<color name="bg_swipe_item_trash">#fff45f30</color>
|
||||
<color name="bg_swipe_item_archive">#fff9930d</color>
|
||||
|
||||
36
app/src/main/res/values/library_fab_speed_dial_strings.xml
Normal file
36
app/src/main/res/values/library_fab_speed_dial_strings.xml
Normal file
@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright 2016 Christian Basler
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<string name="define_fab_speed_dial" translatable="false"/>
|
||||
<!-- Author section -->
|
||||
<string name="library_fab_speed_dial_author" translatable="false">Yavor Ivanov</string>
|
||||
<string name="library_fab_speed_dial_authorWebsite" translatable="false">https://github.com/yavski/</string>
|
||||
<!-- Library section -->
|
||||
<string name="library_fab_speed_dial_libraryName" translatable="false">fab-speed-dial</string>
|
||||
<string name="library_fab_speed_dial_libraryDescription">A simple library marrying together FAB + menu resources + Speed dial metaphor from Material Design.</string>
|
||||
<string name="library_fab_speed_dial_libraryWebsite" translatable="false">https://github.com/yavski/fab-speed-dial</string>
|
||||
<string name="library_fab_speed_dial_libraryVersion" translatable="false">1.0.4</string>
|
||||
<!-- OpenSource section -->
|
||||
<string name="library_fab_speed_dial_isOpenSource" translatable="false">true</string>
|
||||
<string name="library_fab_speed_dial_repositoryLink" translatable="false">https://github.com/yavski/fab-speed-dial</string>
|
||||
<!-- ClassPath for autoDetect section -->
|
||||
<string name="library_fab_speed_dial_classPath" translatable="false">io.github.yavski.fabspeeddial.FabSpeedDial</string>
|
||||
<!-- License section -->
|
||||
<string name="library_fab_speed_dial_licenseId" translatable="false">apache_2_0</string>
|
||||
<!-- Language specific section -->
|
||||
</resources>
|
||||
21
app/src/main/res/values/library_filepicker_strings.xml
Normal file
21
app/src/main/res/values/library_filepicker_strings.xml
Normal file
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<resources>
|
||||
<string name="define_int_filepicker" translatable="false"/>
|
||||
<!-- Author section -->
|
||||
<string name="library_filepicker_author" translatable="false">Angad Singh</string>
|
||||
<string name="library_filepicker_authorWebsite" translatable="false">https://github.com/Angads25</string>
|
||||
<!-- Library section -->
|
||||
<string name="library_filepicker_libraryName" translatable="false">FilePicker</string>
|
||||
<string name="library_filepicker_libraryDescription">Android Library to select files/directories from Device Storage.</string>
|
||||
<string name="library_filepicker_libraryWebsite" translatable="false">https://github.com/Angads25/android-filepicker</string>
|
||||
<string name="library_filepicker_libraryVersion" translatable="false">1.0.6</string>
|
||||
<!-- OpenSource section -->
|
||||
<string name="library_filepicker_isOpenSource" translatable="false">true</string>
|
||||
<string name="library_filepicker_repositoryLink" translatable="false">https://github.com/Angads25/android-filepicker</string>
|
||||
<!-- ClassPath for autoDetect section -->
|
||||
<string name="library_filepicker_classPath" translatable="false">com.github.angads25.filepicker.view.FilePickerDialog</string>
|
||||
<!-- License section -->
|
||||
<string name="library_filepicker_licenseId" translatable="false">apache_2_0</string>
|
||||
<!-- Custom variables section -->
|
||||
</resources>
|
||||
@ -16,5 +16,5 @@
|
||||
<string name="library_jabit_classPath" translatable="false">ch.dissem.bitmessage.BitmessageContext</string>
|
||||
<!-- License section -->
|
||||
<string name="library_jabit_licenseId" translatable="false">apache_2_0</string>
|
||||
<!-- Custom variables section -->
|
||||
</resources>
|
||||
<!-- Language specific section -->
|
||||
</resources>
|
||||
|
||||
36
app/src/main/res/values/library_zxing_strings.xml
Normal file
36
app/src/main/res/values/library_zxing_strings.xml
Normal file
@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright 2016 Christian Basler
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<string name="define_zxing" translatable="false"/>
|
||||
<!-- Author section -->
|
||||
<string name="library_zxing_author" translatable="false">Google, Inc.</string>
|
||||
<string name="library_zxing_authorWebsite" translatable="false">github.com/zxing/zxing</string>
|
||||
<!-- Library section -->
|
||||
<string name="library_zxing_libraryName" translatable="false">ZXing</string>
|
||||
<string name="library_zxing_libraryDescription">ZXing (“zebra crossing”) is an open-source, multi-format 1D/2D barcode image processing library.</string>
|
||||
<string name="library_zxing_libraryWebsite" translatable="false">https://zxing.github.io/zxing/</string>
|
||||
<string name="library_zxing_libraryVersion" translatable="false">3.3.0</string>
|
||||
<!-- OpenSource section -->
|
||||
<string name="library_zxing_isOpenSource" translatable="false">true</string>
|
||||
<string name="library_zxing_repositoryLink" translatable="false">https://github.com/zxing/zxing</string>
|
||||
<!-- ClassPath for autoDetect section -->
|
||||
<string name="library_zxing_classPath" translatable="false">com.google.zxing.BarcodeFormat</string>
|
||||
<!-- License section -->
|
||||
<string name="library_zxing_licenseId" translatable="false">apache_2_0</string>
|
||||
<!-- Language specific section -->
|
||||
</resources>
|
||||
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<resources>
|
||||
<string name="define_int_zxingandroidembedded" translatable="false"/>
|
||||
<!-- Author section -->
|
||||
<string name="library_zxingandroidembedded_author" translatable="false">JourneyApps</string>
|
||||
<string name="library_zxingandroidembedded_authorWebsite" translatable="false">github.com/journeyapps</string>
|
||||
<!-- Library section -->
|
||||
<string name="library_zxingandroidembedded_libraryName" translatable="false">ZXing Android Embedded</string>
|
||||
<string name="library_zxingandroidembedded_libraryDescription">Barcode scanning library for Android, using ZXing for decoding.</string>
|
||||
<string name="library_zxingandroidembedded_libraryWebsite" translatable="false">https://github.com/journeyapps/zxing-android-embedded</string>
|
||||
<string name="library_zxingandroidembedded_libraryVersion" translatable="false">3.3.0</string>
|
||||
<!-- OpenSource section -->
|
||||
<string name="library_zxingandroidembedded_isOpenSource" translatable="false">true</string>
|
||||
<string name="library_zxingandroidembedded_repositoryLink" translatable="false">https://github.com/journeyapps/zxing-android-embedded</string>
|
||||
<!-- ClassPath for autoDetect section -->
|
||||
<string name="library_zxingandroidembedded_classPath" translatable="false">com.journeyapps.barcodescanner.BarcodeView</string>
|
||||
<!-- License section -->
|
||||
<string name="library_zxingandroidembedded_licenseId" translatable="false">apache_2_0</string>
|
||||
<!-- Custom variables section -->
|
||||
</resources>
|
||||
@ -14,8 +14,14 @@
|
||||
<string name="manage_identity">Manage Identity</string>
|
||||
<string name="add_identity">Add Identity</string>
|
||||
<string name="add_identity_summary">Create new identity</string>
|
||||
<string name="create_identity">Create new</string>
|
||||
<string name="create_identity_description">Create a new, random identity</string>
|
||||
<string name="import_identity">Import existing</string>
|
||||
<string name="import_identity_description">Import an existing identity from PyBitmessage or from an export</string>
|
||||
<string name="add_deterministic_address">Deterministic identity</string>
|
||||
<string name="add_deterministic_address_description">Create or recreate a deterministic identity</string>
|
||||
<string name="add_chan">Add Chan</string>
|
||||
<string name="add_chan_summary">Add or create a chan</string>
|
||||
<string name="add_chan_description">Create or join a chan</string>
|
||||
<string name="title_activity_open_bitmessage_link">Import Contact</string>
|
||||
|
||||
<string name="action_settings">Settings</string>
|
||||
@ -65,7 +71,7 @@
|
||||
<string name="pubkey_available">Public key available</string>
|
||||
<string name="pubkey_not_available">Public key not yet available</string>
|
||||
<string name="alt_qr_code">QR code</string>
|
||||
<string name="add_identity_warning">Having more identities will reequire more resources. Are you sure you want to add an identity?</string>
|
||||
<string name="add_identity_warning">Having more identities will reequire more resources. If you are sure you want to add an identity, please select what exactly you want to do:</string>
|
||||
<string name="share">Share</string>
|
||||
<string name="delete_identity_warning">Are you sure you want to delete this identity? You won\'t be able to receive any messages sent to this address and can\'t undo this operation.</string>
|
||||
<string name="delete_contact_warning">Are you sure you want to delete this contact?</string>
|
||||
@ -80,11 +86,24 @@ As an alternative you could configure a trusted node in the settings, but as of
|
||||
<string name="export">Export</string>
|
||||
<string name="confirm_export">Do you really want to export your identity? The export will contain the unencrypted private keys.</string>
|
||||
<string name="compose_message">Compose</string>
|
||||
<string name="passphrase">passphrase</string>
|
||||
<string name="passphrase">Passphrase</string>
|
||||
<string name="help_out">Support Development</string>
|
||||
<string name="help_out_summary">Want to help out? Have a look here</string>
|
||||
<string name="help_out_link">https://dissem.github.io/Abit/helping-out</string>
|
||||
<string name="toast_long_running_operation">This may take a few minutes</string>
|
||||
<string name="toast_identity_created">Identity created</string>
|
||||
<string name="toast_identities_created">Identities created</string>
|
||||
<string name="toast_chan_created">Chan created</string>
|
||||
<string name="deterministic_address_warning">Be sure to remember those settings correctly when recreating a deterministic address.</string>
|
||||
<string name="number_of_identities">Number of identities to create</string>
|
||||
<string name="shorter">Search for shorter addresses</string>
|
||||
<string name="wif_string">WIF / contents of ‘keys.dat’</string>
|
||||
<string name="next">Continue</string>
|
||||
<string name="title_import_identity">Import Identity</string>
|
||||
<string name="open_file">Open File</string>
|
||||
<string name="error_loading_data">Error loading data</string>
|
||||
<string name="select_file_title">Select a File</string>
|
||||
<string name="select_identities_to_import">Please select the identities you want to import:</string>
|
||||
<string name="import_input_description">You can just paste the contents of an export or a ‘keys.dat’ file</string>
|
||||
<string name="name">Name</string>
|
||||
</resources>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
|
||||
<item name="android:activatedBackgroundIndicator">@color/colorPrimaryLight</item>
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/bg_item_activated</item>
|
||||
<item name="android:textColor">@color/colorPrimaryText</item>
|
||||
<item name="android:textColorSecondary">@color/colorSecondaryText</item>
|
||||
</style>
|
||||
@ -19,4 +19,7 @@
|
||||
<item name="android:textColor">@color/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="FixedDialog" parent="Theme.AppCompat.Light.Dialog">
|
||||
<item name="windowNoTitle">false</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user