bitmessage/Abit
bitmessage
/
Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/support-info' into develop

This commit is contained in:
Christian Basler 2016-10-07 23:13:32 +02:00
parent a1fb11357b 30bb407bbf
commit 9e8067cda5
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/values-de/strings.xml
View File

@ -88,6 +88,9 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
<string name="confirm_export">Identität wirklich exportieren? Der Export wird die privaten Schlüssel unverschlüsselt enthalten.</string>
<string name="compose_message">Schreiben</string>
<string name="passphrase">Passphrase</string>
<string name="help_out">Entwicklung unterstützen</string>
<string name="help_out_summary">Erfahre wie du die Entwicklung von Abit unterstützen kannst</string>
<string name="help_out_link">https://dissem.github.io/Abit/mithelfen</string>
<string name="toast_long_running_operation">Dies kann einige Minuten dauern</string>
<string name="toast_identity_created">Identität erstellt</string>
<string name="toast_identities_created">Identitäten erstellt</string>

3
app/src/main/res/values/strings.xml
View File

@ -87,6 +87,9 @@ As an alternative you could configure a trusted node in the settings, but as of
<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="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>

24
app/src/main/res/xml/preferences.xml
View File

@ -12,33 +12,41 @@
android:defaultValue="true"
android:key="wifi_only"
android:summary="@string/wifi_only_summary"
android:title="@string/wifi_only" />
android:title="@string/wifi_only"/>
<EditTextPreference
android:inputType="textUri"
android:key="trusted_node"
android:summary="@string/trusted_node_summary"
android:title="@string/trusted_node" />
android:title="@string/trusted_node"/>
<EditTextPreference
android:defaultValue="120"
android:inputType="number"
android:key="sync_timeout"
android:summary="@string/sync_timeout_summary"
android:title="@string/sync_timeout" />
android:title="@string/sync_timeout"/>
<SwitchPreference
android:defaultValue="false"
android:key="server_pow"
android:dependency="trusted_node"
android:title="@string/server_pow"
android:key="server_pow"
android:summary="@string/server_pow_summary"
android:title="@string/server_pow"
/>
<Preference
android:key="about"
android:title="@string/about"
android:summary="@string/about_summary"
android:title="@string/about"
/>
<Preference
android:key="help_out"
android:summary="@string/help_out_summary"
android:title="@string/help_out">
<intent
android:action="android.intent.action.VIEW"
android:data="@string/help_out_link"/>
</Preference>
<Preference
android:key="status"
android:title="@string/status"
android:summary="@string/status_summary"
android:title="@string/status"
/>
</PreferenceScreen>
</PreferenceScreen>