mirror of
https://github.com/gsantner/dandelion
synced 2025-12-08 21:31:10 +01:00
Merge preferences from AppSettings and SettingsActivy/preferences.xml
This commit is contained in:
Gregor Santner
parent
3c6558df9c
commit
ad2cb4c615
10 changed files with 226 additions and 190 deletions
|
|
@ -1,41 +1,47 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- Categories -->
|
||||
<string name="pref_category_visuals">Erscheinungsbild</string>
|
||||
<string name="pref_category_network">Netzwerk</string>
|
||||
<string name="pref_category_pod_settings">Pod Einstellungen</string>
|
||||
<string name="pref_cat__visuals">Erscheinungsbild</string>
|
||||
<string name="pref_cat__network">Netzwerk</string>
|
||||
<string name="pref_cat__pod_settings">Pod Einstellungen</string>
|
||||
|
||||
<!-- Visuals -->
|
||||
<!-- Font size -->
|
||||
<string name="pref_title_font_size">Schriftgröße</string>
|
||||
<array name="pref_entries_font_size">
|
||||
<string name="pref_title__font_size">Schriftgröße</string>
|
||||
<array name="pref_entries__font_size">
|
||||
<item>Normal</item>
|
||||
<item>Groß</item>
|
||||
<item>Riesig</item>
|
||||
</array>
|
||||
|
||||
<!-- Load images -->
|
||||
<string name="pref_title_load_images">Lade Bilder</string>
|
||||
<string name="pref_desc_load_images">Deaktiviere das Laden von Bildern, um den Datenverbrauch zu verringern</string>
|
||||
<string name="pref_title__load_images">Lade Bilder</string>
|
||||
<string name="pref_desc__load_images">Deaktiviere das Laden von Bildern, um den Datenverbrauch zu verringern</string>
|
||||
|
||||
<!-- Proxy -->
|
||||
<string name="pref_title_proxy_enabled">Aktiviere Proxy</string>
|
||||
<string name="pref_desc_proxy_enabled">Nutze einen Proxyserver um Firewalls zu umgehen</string>
|
||||
<string name="pref_title_proxy_host">Host</string>
|
||||
<string name="pref_title_proxy_port">Port</string>
|
||||
<string name="pref_title__proxy_enabled">Aktiviere Proxy</string>
|
||||
<string name="pref_desc__proxy_enabled">Nutze einen Proxyserver um Firewalls zu umgehen</string>
|
||||
<string name="pref_title__proxy_host">Host</string>
|
||||
<string name="pref_title__proxy_port">Port</string>
|
||||
|
||||
<!-- Diaspora Settings -->
|
||||
<string name="pref_title_personal_settings">Persönliche Einstellungen</string>
|
||||
<string name="pref_desc_personal_settings">Öffne die Einstellungen deines Diaspora Accounts</string>
|
||||
<string name="pref_title__personal_settings">Persönliche Einstellungen</string>
|
||||
<string name="pref_desc__personal_settings">Öffne die Einstellungen deines Diaspora Accounts</string>
|
||||
|
||||
<string name="pref_title_manage_contacts">Kontakte</string>
|
||||
<string name="pref_desc_manage_contacts">Bearbeite deine Kontaktliste</string>
|
||||
<string name="pref_title__manage_contacts">Kontakte</string>
|
||||
<string name="pref_desc__manage_contacts">Bearbeite deine Kontaktliste</string>
|
||||
|
||||
<string name="pref_title_manage_tags">Tags verwalten</string>
|
||||
<string name="pref_desc_manage_tags">Verwalte die Liste der Hashtags, denen du folgst</string>
|
||||
<string name="pref_title__manage_tags">Tags verwalten</string>
|
||||
<string name="pref_desc__manage_tags">Verwalte die Liste der Hashtags, denen du folgst</string>
|
||||
|
||||
<string name="pref_title_change_account">Account wechseln</string>
|
||||
<string name="pref_desc_change_account">Lösche lokale Sitzungsdaten und wechsle zu einem anderen Pod/Account</string>
|
||||
<string name="pref_warning_change_account">Das wird alle Cookies und Session-Daten löschen. Willst du wirklich den Account wechseln?</string>
|
||||
<string name="pref_title__change_account">Account wechseln</string>
|
||||
<string name="pref_desc__change_account">Lösche lokale Sitzungsdaten und wechsle zu einem anderen Pod/Account</string>
|
||||
<string name="pref_warning__change_account">Das wird alle Cookies und Session-Daten löschen. Willst du wirklich den Account wechseln?</string>
|
||||
|
||||
|
||||
<string name="pref_desc__clear_cache">WebView Cache leeren</string>
|
||||
<string name="pref_title__clear_cache">Cache leeren</string>
|
||||
<string name="pref_title__intellihide_toolbars">Toolbars intelligent verstecken</string>
|
||||
<string name="pref_desc__intellihide_toolbars">Obere und untere Toolbar verstecken während des Scrollens von Inhalt</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -158,9 +158,5 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br
|
|||
|
||||
<string name="toggle_desktop_page">Mobil-/Desktopansicht umschalten</string>
|
||||
<string name="all_tags">Alle Tags</string>
|
||||
<string name="pref_desc_clear_cache">WebView Cache leeren</string>
|
||||
<string name="pref_title_clear_cache">Cache leeren</string>
|
||||
<string name="pref_title_intellihide_toolbars">Toolbars intelligent verstecken</string>
|
||||
<string name="pref_desc_intellihide_toolbars">Obere und untere Toolbar verstecken während des Scrollens von Inhalt</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,43 +1,43 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- Categories -->
|
||||
<string name="pref_category_visuals">Apparance</string>
|
||||
<string name="pref_category_network">Paramètres du réseau</string>
|
||||
<string name="pref_category_pod_settings">Paramètres du pod</string>
|
||||
<string name="pref_cat__visuals">Apparance</string>
|
||||
<string name="pref_cat__network">Paramètres du réseau</string>
|
||||
<string name="pref_cat__pod_settings">Paramètres du pod</string>
|
||||
|
||||
<!-- Visuals -->
|
||||
<!-- Font size -->
|
||||
<string name="pref_title_font_size">Taille de la police</string>
|
||||
<array name="pref_entries_font_size">
|
||||
<string name="pref_title__font_size">Taille de la police</string>
|
||||
<array name="pref_entries__font_size">
|
||||
<item>Normal</item>
|
||||
<item>Grand</item>
|
||||
<item>Énorme</item>
|
||||
</array>
|
||||
|
||||
<!-- Load images -->
|
||||
<string name="pref_title_load_images">Charger les images</string>
|
||||
<string name="pref_desc_load_images">Disable image loading to safe mobile data</string>
|
||||
<string name="pref_title__load_images">Charger les images</string>
|
||||
<string name="pref_desc__load_images">Disable image loading to safe mobile data</string>
|
||||
|
||||
<!-- Proxy -->
|
||||
<string name="pref_title_proxy_enabled">Activer Proxy</string>
|
||||
<string name="pref_desc_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
|
||||
<string name="pref_title__proxy_enabled">Activer Proxy</string>
|
||||
<string name="pref_desc__proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
|
||||
|
||||
<string name="pref_title_proxy_host">Hôte</string>
|
||||
<string name="pref_title__proxy_host">Hôte</string>
|
||||
|
||||
<string name="pref_title_proxy_port">Port</string>
|
||||
<string name="pref_title__proxy_port">Port</string>
|
||||
|
||||
<!-- Diaspora Settings -->
|
||||
<string name="pref_title_personal_settings">Paramètres personnels</string>
|
||||
<string name="pref_desc_personal_settings">Open your diaspora account settings</string>
|
||||
<string name="pref_title__personal_settings">Paramètres personnels</string>
|
||||
<string name="pref_desc__personal_settings">Open your diaspora account settings</string>
|
||||
|
||||
<string name="pref_title_manage_contacts">Contacts</string>
|
||||
<string name="pref_desc_manage_contacts">Gérer votre liste des contacts</string>
|
||||
<string name="pref_title__manage_contacts">Contacts</string>
|
||||
<string name="pref_desc__manage_contacts">Gérer votre liste des contacts</string>
|
||||
|
||||
<string name="pref_title_manage_tags">Gérer les Hashtags</string>
|
||||
<string name="pref_desc_manage_tags">Add and delete the hashtags you are following</string>
|
||||
<string name="pref_title__manage_tags">Gérer les Hashtags</string>
|
||||
<string name="pref_desc__manage_tags">Add and delete the hashtags you are following</string>
|
||||
|
||||
<string name="pref_title_change_account">Changer de compte</string>
|
||||
<string name="pref_desc_change_account">Erase local session data and switch to another Diaspora pod/account</string>
|
||||
<string name="pref_warning_change_account">Cette opération va effacer les cookies et données de session. Voulez-vous vraiment changer de compte/pod?</string>
|
||||
<string name="pref_title__change_account">Changer de compte</string>
|
||||
<string name="pref_desc__change_account">Erase local session data and switch to another Diaspora pod/account</string>
|
||||
<string name="pref_warning__change_account">Cette opération va effacer les cookies et données de session. Voulez-vous vraiment changer de compte/pod?</string>
|
||||
|
||||
</resources>
|
||||
|
|
@ -1,52 +1,84 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- Categories -->
|
||||
<string name="pref_category_visuals">Appearance</string>
|
||||
<string name="pref_category_network">Network</string>
|
||||
<string name="pref_category_pod_settings">Pod settings</string>
|
||||
<!-- Key Names (Untranslateable) -->
|
||||
<string name="pref_key__poddomain" translatable="false">podDomain</string>
|
||||
<string name="pref_key__previous_podlist" translatable="false">previousPodlist</string>
|
||||
<string name="pref_key__font_size" translatable="false">pref_key_font_size</string>
|
||||
<string name="pref_key__intellihide_toolbars" translatable="false">pref_key_intellihide_toolbars</string>
|
||||
<string name="pref_catkey__pod_settings" translatable="false">pref_key_category_pod_settings</string>
|
||||
<string name="pref_catkey__category_visuals" translatable="false">pref_key_category_visuals</string>
|
||||
<string name="pref_key__personal_settings" translatable="false">pref_key_personal_settings</string>
|
||||
<string name="pref_key__manage_tags" translatable="false">pref_key_manage_tags</string>
|
||||
<string name="pref_key__manage_contacts" translatable="false">pref_key_manage_contacts</string>
|
||||
<string name="pref_key__change_account" translatable="false">pref_key_change_account</string>
|
||||
<string name="pref_catkey__network" translatable="false">pref_key_category_network</string>
|
||||
<string name="pref_key__load_images" translatable="false">pref_key_load_images</string>
|
||||
<string name="pref_key__clear_cache" translatable="false">pref_key_clear_cache</string>
|
||||
|
||||
<string name="pref_key__proxy_enabled" translatable="false">pref_key_proxy_enabled</string>
|
||||
<string name="pref_key__proxy_host" translatable="false">pref_key_proxy_host</string>
|
||||
<string name="pref_key__proxy_port" translatable="false">pref_key_proxy_port</string>
|
||||
<string name="pref_key__proxy_was_enabled" translatable="false">wasProxyEnabled</string>
|
||||
|
||||
|
||||
<string name="pref_key__podprofile_avatar_url" translatable="false">podUserProfile_avatar</string>
|
||||
<string name="pref_key__podprofile_name" translatable="false">podUserProfile_name</string>
|
||||
<string name="pref_key__podprofile_id" translatable="false">podUserProfile_guid</string>
|
||||
<string name="pref_key__podprofile_aspects" translatable="false">podUserProfile_aspects</string>
|
||||
<string name="pref_key__podprofile_followed_tags" translatable="false">podUserProfile_followedTags</string>
|
||||
|
||||
|
||||
<!-- Category Titles -->
|
||||
<string name="pref_cat__visuals">Appearance</string>
|
||||
<string name="pref_cat__network">Network</string>
|
||||
<string name="pref_cat__pod_settings">Pod settings</string>
|
||||
|
||||
<!-- Visuals -->
|
||||
<!-- Font size -->
|
||||
<string name="pref_title_font_size">Font size</string>
|
||||
<array name="pref_entries_font_size">
|
||||
<string name="pref_title__font_size">Font size</string>
|
||||
<array name="pref_entries__font_size">
|
||||
<item>Normal</item>
|
||||
<item>Large</item>
|
||||
<item>Huge</item>
|
||||
</array>
|
||||
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
|
||||
<array name="pref_entry_values_font_size" translatable="false">
|
||||
<array name="pref_entries_values__font_size" translatable="false">
|
||||
<item>normal</item>
|
||||
<item>large</item>
|
||||
<item>huge</item>
|
||||
</array>
|
||||
|
||||
<!-- Load images -->
|
||||
<string name="pref_title_load_images">Load images</string>
|
||||
<string name="pref_desc_load_images">Disable image loading to safe mobile data</string>
|
||||
<string name="pref_title__load_images">Load images</string>
|
||||
<string name="pref_desc__load_images">Disable image loading to safe mobile data</string>
|
||||
|
||||
<!-- Proxy -->
|
||||
<string name="pref_title_proxy_enabled">Enable Proxy</string>
|
||||
<string name="pref_desc_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
|
||||
<string name="pref_title__proxy_enabled">Enable Proxy</string>
|
||||
<string name="pref_desc__proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
|
||||
|
||||
<string name="pref_title_proxy_host">Host</string>
|
||||
<string name="pref_title__proxy_host">Host</string>
|
||||
|
||||
<string name="pref_title_proxy_port">Port</string>
|
||||
<string name="pref_title__proxy_port">Port</string>
|
||||
|
||||
<!-- Diaspora Settings -->
|
||||
<string name="pref_title_personal_settings">Personal settings</string>
|
||||
<string name="pref_desc_personal_settings">Open your diaspora account settings</string>
|
||||
<string name="pref_title__personal_settings">Personal settings</string>
|
||||
<string name="pref_desc__personal_settings">Open your diaspora account settings</string>
|
||||
|
||||
<string name="pref_title_manage_contacts">Contacts</string>
|
||||
<string name="pref_desc_manage_contacts">Manage your contact list</string>
|
||||
<string name="pref_title__manage_contacts">Contacts</string>
|
||||
<string name="pref_desc__manage_contacts">Manage your contact list</string>
|
||||
|
||||
<string name="pref_title_manage_tags">Manage Hashtags</string>
|
||||
<string name="pref_desc_manage_tags">Add and delete the hashtags you are following</string>
|
||||
<string name="pref_title__manage_tags">Manage Hashtags</string>
|
||||
<string name="pref_desc__manage_tags">Add and delete the hashtags you are following</string>
|
||||
|
||||
<string name="pref_title_change_account">Change Account</string>
|
||||
<string name="pref_desc_change_account">Erase local session data and switch to another Diaspora pod/account</string>
|
||||
<string name="pref_warning_change_account">This will erase all cookies and session data. Do you really want to change your account?</string>
|
||||
<string name="pref_title__change_account">Change Account</string>
|
||||
<string name="pref_desc__change_account">Erase local session data and switch to another Diaspora pod/account</string>
|
||||
<string name="pref_warning__change_account">This will erase all cookies and session data. Do you really want to change your account?</string>
|
||||
|
||||
<string name="pref_title_clear_cache">Clear cache</string>
|
||||
<string name="pref_desc_clear_cache">Clear WebView cache</string>
|
||||
<string name="pref_title__clear_cache">Clear cache</string>
|
||||
<string name="pref_desc__clear_cache">Clear WebView cache</string>
|
||||
|
||||
|
||||
<string name="pref_desc__intellihide_toolbars" translatable="false">Hide top and bottom toolbars automatically while scrolling</string>
|
||||
<string name="pref_title__intellihide_toolbars">Intellihide Toolbars</string>
|
||||
|
||||
</resources>
|
||||
|
|
@ -175,6 +175,4 @@
|
|||
<string name="toast_set_proxy_failed">Warning: Could not set network proxy…</string>
|
||||
|
||||
<string name="all_tags">All tags</string>
|
||||
<string name="pref_desc_intellihide_toolbars">Hide top and bottom toolbars automatically while scrolling</string>
|
||||
<string name="pref_title_intellihide_toolbars">Intellihide Toolbars</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2,83 +2,83 @@
|
|||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Appearance -->
|
||||
<PreferenceCategory
|
||||
android:key="pref_key_category_visuals"
|
||||
android:title="@string/pref_category_visuals">
|
||||
android:key="@string/pref_catkey__category_visuals"
|
||||
android:title="@string/pref_cat__visuals">
|
||||
<ListPreference
|
||||
android:dialogTitle="@string/pref_title_font_size"
|
||||
android:entries="@array/pref_entries_font_size"
|
||||
android:entryValues="@array/pref_entry_values_font_size"
|
||||
android:key="pref_key_font_size"
|
||||
android:dialogTitle="@string/pref_title__font_size"
|
||||
android:entries="@array/pref_entries__font_size"
|
||||
android:entryValues="@array/pref_entries_values__font_size"
|
||||
android:key="@string/pref_key__font_size"
|
||||
android:summary="%s"
|
||||
android:title="@string/pref_title_font_size"/>
|
||||
android:title="@string/pref_title__font_size"/>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="pref_key_intellihide_toolbars"
|
||||
android:summary="@string/pref_desc_intellihide_toolbars"
|
||||
android:title="@string/pref_title_intellihide_toolbars"/>
|
||||
android:key="@string/pref_key__intellihide_toolbars"
|
||||
android:summary="@string/pref_desc__intellihide_toolbars"
|
||||
android:title="@string/pref_title__intellihide_toolbars"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<!-- Diaspora Pod Settings -->
|
||||
<PreferenceCategory
|
||||
android:key="pref_key_category_pod_settings"
|
||||
android:title="@string/pref_category_pod_settings">
|
||||
android:key="@string/pref_catkey__pod_settings"
|
||||
android:title="@string/pref_cat__pod_settings">
|
||||
<Preference
|
||||
android:key="pref_key_personal_settings"
|
||||
android:summary="@string/pref_desc_personal_settings"
|
||||
android:title="@string/pref_title_personal_settings">
|
||||
android:key="@string/pref_key__personal_settings"
|
||||
android:summary="@string/pref_desc__personal_settings"
|
||||
android:title="@string/pref_title__personal_settings">
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="pref_key_manage_tags"
|
||||
android:summary="@string/pref_desc_manage_tags"
|
||||
android:title="@string/pref_title_manage_tags">
|
||||
android:key="@string/pref_key__manage_tags"
|
||||
android:summary="@string/pref_desc__manage_tags"
|
||||
android:title="@string/pref_title__manage_tags">
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="pref_key_manage_contacts"
|
||||
android:summary="@string/pref_desc_manage_contacts"
|
||||
android:title="@string/pref_title_manage_contacts">
|
||||
android:key="@string/pref_key__manage_contacts"
|
||||
android:summary="@string/pref_desc__manage_contacts"
|
||||
android:title="@string/pref_title__manage_contacts">
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="pref_key_change_account"
|
||||
android:summary="@string/pref_desc_change_account"
|
||||
android:title="@string/pref_title_change_account">
|
||||
android:key="@string/pref_key__change_account"
|
||||
android:summary="@string/pref_desc__change_account"
|
||||
android:title="@string/pref_title__change_account">
|
||||
</Preference>
|
||||
</PreferenceCategory>
|
||||
|
||||
<!-- Networking -->
|
||||
<PreferenceCategory
|
||||
android:key="pref_key_category_network"
|
||||
android:title="@string/pref_category_network">
|
||||
android:key="@string/pref_catkey__network"
|
||||
android:title="@string/pref_cat__network">
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="pref_key_load_images"
|
||||
android:summary="@string/pref_desc_load_images"
|
||||
android:title="@string/pref_title_load_images"/>
|
||||
android:key="@string/pref_key__load_images"
|
||||
android:summary="@string/pref_desc__load_images"
|
||||
android:title="@string/pref_title__load_images"/>
|
||||
|
||||
<Preference
|
||||
android:key="pref_key_clear_cache"
|
||||
android:summary="@string/pref_desc_clear_cache"
|
||||
android:title="@string/pref_title_clear_cache">
|
||||
android:key="@string/pref_key__clear_cache"
|
||||
android:summary="@string/pref_desc__clear_cache"
|
||||
android:title="@string/pref_title__clear_cache">
|
||||
</Preference>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="pref_key_proxy_enabled"
|
||||
android:summary="@string/pref_desc_proxy_enabled"
|
||||
android:title="@string/pref_title_proxy_enabled"/>
|
||||
android:key="@string/pref_key__proxy_enabled"
|
||||
android:summary="@string/pref_desc__proxy_enabled"
|
||||
android:title="@string/pref_title__proxy_enabled"/>
|
||||
<EditTextPreference
|
||||
android:dependency="pref_key_proxy_enabled"
|
||||
android:dependency="@string/pref_key__proxy_enabled"
|
||||
android:inputType="textNoSuggestions"
|
||||
android:key="pref_key_proxy_host"
|
||||
android:title="@string/pref_title_proxy_host"/>
|
||||
android:key="@string/pref_key__proxy_host"
|
||||
android:title="@string/pref_title__proxy_host"/>
|
||||
<EditTextPreference
|
||||
android:dependency="pref_key_proxy_enabled"
|
||||
android:dependency="@string/pref_key__proxy_enabled"
|
||||
android:inputType="number"
|
||||
android:key="pref_key_proxy_port"
|
||||
android:title="@string/pref_title_proxy_port"/>
|
||||
android:key="@string/pref_key__proxy_port"
|
||||
android:title="@string/pref_title__proxy_port"/>
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
Loading…
Add table
Add a link
Reference in a new issue