diff options
Diffstat (limited to 'app/res')
| -rw-r--r-- | app/res/drawable/fil_logo.png | bin | 0 -> 21529 bytes | |||
| -rw-r--r-- | app/res/layout/activity_credits.xml | 36 | ||||
| -rw-r--r-- | app/res/layout/activity_ipv4_settings.xml | 126 | ||||
| -rw-r--r-- | app/res/layout/activity_long_task.xml | 1 | ||||
| -rw-r--r-- | app/res/layout/activity_network_details.xml | 27 | ||||
| -rw-r--r-- | app/res/layout/activity_vpn_settings.xml | 55 | ||||
| -rw-r--r-- | app/res/menu/activity_ipv4_settings.xml | 9 | ||||
| -rw-r--r-- | app/res/menu/activity_main.xml | 10 | ||||
| -rw-r--r-- | app/res/menu/activity_vpn_settings.xml | 9 | ||||
| -rw-r--r-- | app/res/values-fr/strings.xml | 106 | ||||
| -rw-r--r-- | app/res/values-fr/strings_activity_input_password.xml | 29 | ||||
| -rw-r--r-- | app/res/values-fr/strings_activity_settings.xml | 56 | ||||
| -rw-r--r-- | app/res/values/strings.xml | 81 | ||||
| -rw-r--r-- | app/res/values/strings_activity_input_password.xml | 11 | ||||
| -rw-r--r-- | app/res/values/strings_activity_settings.xml | 43 | ||||
| -rw-r--r-- | app/res/values/styles.xml | 2 | ||||
| -rw-r--r-- | app/res/xml/debug_settings.xml | 9 | ||||
| -rw-r--r-- | app/res/xml/general_settings.xml | 26 | ||||
| -rw-r--r-- | app/res/xml/settings_headers.xml | 8 |
19 files changed, 481 insertions, 163 deletions
diff --git a/app/res/drawable/fil_logo.png b/app/res/drawable/fil_logo.png Binary files differnew file mode 100644 index 0000000..d862888 --- /dev/null +++ b/app/res/drawable/fil_logo.png diff --git a/app/res/layout/activity_credits.xml b/app/res/layout/activity_credits.xml index 04280d4..d114ce1 100644 --- a/app/res/layout/activity_credits.xml +++ b/app/res/layout/activity_credits.xml @@ -1,16 +1,44 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/ThemeDark" - android:orientation="vertical" > + android:background="@color/black" + android:padding="15dp" > + + <TextView + android:id="@+id/txt_credits_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:padding="2dp" + android:text="@string/text_presented_by" + android:textColor="@color/ThemeLight" + android:textColorLink="@color/ThemeLight" + android:textIsSelectable="true" + android:textSize="9pt" /> + + <ImageView + android:id="@+id/img_logo_fil" + android:layout_width="100dp" + android:layout_height="110dp" + android:layout_below="@id/txt_credits_title" + android:layout_centerHorizontal="true" + android:layout_margin="1dp" + android:contentDescription="fil\'s logo" + android:src="@drawable/fil_logo" > + </ImageView> <TextView android:id="@+id/txt_credits" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_below="@id/img_logo_fil" + android:layout_centerHorizontal="true" + android:padding="15dp" android:scrollbars="vertical" + android:fadeScrollbars="false" android:textColor="@color/ThemeLight" android:textColorLink="@color/ThemeLight" + android:textIsSelectable="true" android:textSize="7pt" /> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/app/res/layout/activity_ipv4_settings.xml b/app/res/layout/activity_ipv4_settings.xml new file mode 100644 index 0000000..5c0887c --- /dev/null +++ b/app/res/layout/activity_ipv4_settings.xml @@ -0,0 +1,126 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/black" + android:padding="15dp" + tools:context=".Ipv4SettingsActivity" > + + <TextView + android:id="@+id/lbl_ip_settings" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:background="@color/black" + android:text="@string/text_ipv4_settings" + android:textColor="@color/ThemeLight" + android:textSize="12pt" /> + + <CheckBox + android:id="@+id/chk_use_dhcp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/lbl_ip_settings" + android:layout_margin="10dp" + android:text="@string/text_use_dhcp" + android:textColor="@color/ThemeLight" + android:textSize="9pt" /> + + <TextView + android:id="@+id/lbl_static_ip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/chk_use_dhcp" + android:layout_margin="10dp" + android:background="@color/black" + android:text="@string/text_ip_address" + android:textColor="@color/ThemeLight" + android:textSize="9pt" /> + + <EditText + android:id="@+id/txt_static_ip" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/chk_use_dhcp" + android:layout_margin="10dp" + android:layout_toRightOf="@id/lbl_static_ip" + android:background="@drawable/button_bg" + android:inputType="text" + android:padding="5pt" + android:textColor="@color/ThemeLight" + android:textSize="9pt" /> + + <TextView + android:id="@+id/lbl_netmask" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/txt_static_ip" + android:layout_margin="10dp" + android:background="@color/black" + android:text="@string/text_subnet_mask" + android:textColor="@color/ThemeLight" + android:textSize="9pt" /> + + <EditText + android:id="@+id/txt_netmask" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/txt_static_ip" + android:layout_margin="10dp" + android:layout_toRightOf="@id/lbl_netmask" + android:background="@drawable/button_bg" + android:inputType="text" + android:padding="5pt" + android:textColor="@color/ThemeLight" + android:textSize="9pt" /> + + <TextView + android:id="@+id/lbl_gateway" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/txt_netmask" + android:layout_margin="10dp" + android:background="@color/black" + android:text="@string/text_gateway" + android:textColor="@color/ThemeLight" + android:textSize="9pt" /> + + <EditText + android:id="@+id/txt_gateway" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/txt_netmask" + android:layout_margin="10dp" + android:layout_toRightOf="@id/lbl_gateway" + android:background="@drawable/button_bg" + android:inputType="text" + android:padding="5pt" + android:textColor="@color/ThemeLight" + android:textSize="9pt" /> + + <Button + android:id="@+id/btn_save_ip_settings" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/txt_gateway" + android:layout_centerHorizontal="true" + android:layout_marginTop="25dp" + android:background="@drawable/repwifi_button" + android:onClick="btnSaveClick" + android:text="@string/txt_save_ip_settings" + android:textColor="@color/ThemeLight" /> + + <Button + android:id="@+id/btn_back" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/btn_save_ip_settings" + android:layout_centerHorizontal="true" + android:layout_marginTop="15dp" + android:background="@drawable/repwifi_button" + android:onClick="btnBackClick" + android:text="@string/txt_back" + android:textColor="@color/ThemeLight" /> + + +</RelativeLayout>
\ No newline at end of file diff --git a/app/res/layout/activity_long_task.xml b/app/res/layout/activity_long_task.xml index a17ba32..46d0a12 100644 --- a/app/res/layout/activity_long_task.xml +++ b/app/res/layout/activity_long_task.xml @@ -22,6 +22,7 @@ android:layout_centerHorizontal="true" android:layout_centerVertical="true" android:padding="10dp" + android:textIsSelectable="false" android:textColor="@color/ThemeLight" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/res/layout/activity_network_details.xml b/app/res/layout/activity_network_details.xml index 6442585..225e59d 100644 --- a/app/res/layout/activity_network_details.xml +++ b/app/res/layout/activity_network_details.xml @@ -13,6 +13,7 @@ android:layout_margin="10dp" android:background="@color/black" android:textColor="@color/ThemeLight" + android:textIsSelectable="true" android:textSize="7pt" /> <CheckBox @@ -25,13 +26,37 @@ android:textSize="10pt" /> <Button - android:id="@+id/btn_delete" + android:id="@+id/btn_ip_settings" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/chk_show_pass_details" android:layout_centerHorizontal="true" android:layout_marginTop="15dp" android:background="@drawable/repwifi_button" + android:onClick="btnIpSettingsClick" + android:text="@string/text_ipv4_settings" + android:textColor="@color/ThemeLight" /> + + <Button + android:id="@+id/btn_vpn_settings" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/btn_ip_settings" + android:layout_centerHorizontal="true" + android:layout_marginTop="15dp" + android:background="@drawable/repwifi_button" + android:onClick="btnVpnSettingsClick" + android:text="@string/title_activity_vpn_settings" + android:textColor="@color/ThemeLight" /> + + <Button + android:id="@+id/btn_delete" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/btn_vpn_settings" + android:layout_centerHorizontal="true" + android:layout_marginTop="15dp" + android:background="@drawable/repwifi_button" android:onClick="btnDeleteClick" android:text="@string/delete" android:textColor="@color/ThemeLight" /> diff --git a/app/res/layout/activity_vpn_settings.xml b/app/res/layout/activity_vpn_settings.xml new file mode 100644 index 0000000..4378baa --- /dev/null +++ b/app/res/layout/activity_vpn_settings.xml @@ -0,0 +1,55 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/black" + android:padding="15dp" + tools:context=".Ipv4SettingsActivity" > + + <TextView + android:id="@+id/lbl_vpn_settings" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:background="@color/black" + android:textColor="@color/ThemeLight" + android:textIsSelectable="false" + android:textSize="9pt" /> + + <Spinner + android:id="@+id/spin_vpn_profile" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/lbl_vpn_settings" + android:layout_margin="10dp" + android:background="@drawable/button_bg" + android:inputType="text" + android:padding="1pt" + android:textColor="@color/ThemeLight" + android:textSize="10pt" /> + + <Button + android:id="@+id/btn_save_vpn_settings" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/spin_vpn_profile" + android:layout_centerHorizontal="true" + android:layout_marginTop="25dp" + android:background="@drawable/repwifi_button" + android:onClick="btnSaveClick" + android:text="@string/txt_save" + android:textColor="@color/ThemeLight" /> + + <Button + android:id="@+id/btn_back" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/btn_save_vpn_settings" + android:layout_centerHorizontal="true" + android:layout_marginTop="15dp" + android:background="@drawable/repwifi_button" + android:onClick="btnBackClick" + android:text="@string/txt_back" + android:textColor="@color/ThemeLight" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/app/res/menu/activity_ipv4_settings.xml b/app/res/menu/activity_ipv4_settings.xml new file mode 100644 index 0000000..77f358b --- /dev/null +++ b/app/res/menu/activity_ipv4_settings.xml @@ -0,0 +1,9 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/menu_settings"/> + +</menu>
\ No newline at end of file diff --git a/app/res/menu/activity_main.xml b/app/res/menu/activity_main.xml index e9a1624..430a0b0 100644 --- a/app/res/menu/activity_main.xml +++ b/app/res/menu/activity_main.xml @@ -4,14 +4,20 @@ android:textColor="@color/ThemeLight" > <item - android:id="@+id/menu_config" + android:id="@+id/menu_btn_closeapp" android:orderInCategory="1" android:showAsAction="never" android:textColor="@color/ThemeLight" + android:title="@string/menu_closeapp"/> + <item + android:id="@+id/menu_config" + android:orderInCategory="2" + android:showAsAction="never" + android:textColor="@color/ThemeLight" android:title="@string/menu_config"/> <item android:id="@+id/menu_credits" - android:orderInCategory="2" + android:orderInCategory="3" android:showAsAction="never" android:textColor="@color/ThemeLight" android:title="@string/menu_credits"/> diff --git a/app/res/menu/activity_vpn_settings.xml b/app/res/menu/activity_vpn_settings.xml new file mode 100644 index 0000000..77f358b --- /dev/null +++ b/app/res/menu/activity_vpn_settings.xml @@ -0,0 +1,9 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/menu_settings"/> + +</menu>
\ No newline at end of file diff --git a/app/res/values-fr/strings.xml b/app/res/values-fr/strings.xml index 0801a44..ad561bf 100644 --- a/app/res/values-fr/strings.xml +++ b/app/res/values-fr/strings.xml @@ -2,26 +2,27 @@ <resources> <!-- - RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo <fil.bergamo@riseup.net> - French translation is Copyright (C) 2017 Nicola Spanti + This file is part of RepWifiApp. + RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo <fil.bergamo@riseup.net> + French translation is Copyright (C) 2017 Nicola Spanti - This file is part of RepWifiApp. - RepWifiApp is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - RepWifiApp is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with RepWifiApp. If not, see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <string name="app_name">RepWifi</string> <string name="menu_credits">Info et crédits</string> + <string name="menu_closeapp">Tuer RepWifi</string> <string name="scan_networks">Scan des réseaux</string> <string name="title_activity_select_network">Selectionner un réseau</string> <string name="rescan">Répéter le scan</string> @@ -29,9 +30,8 @@ <string name="insert_nets_password">Fournisser un mot de passe pour se connecter à :</string> <string name="show_password">Montrer le mot de passe</string> <string name="title_activity_connect">ActivitéDeConnexion</string> - <string name="hello_world">Bonjour le monde !</string> - <string name="title_activity_show_status">Statur de connexion</string> - <!--<string name="back_main">Revenir au main</string>--> + <string name="title_activity_show_status">Statut de connexion</string> + <string name="back_main">Revenir au menu principal</string> <string name="disconnect">Déconnecter</string> <string name="force_disconnect">Forcer la déconnection</string> <string name="title_activity_long_task">ActivitéDeTâcheLongue</string> @@ -39,7 +39,7 @@ <string name="delete">Supprimer les informations sur le réseau</string> <string name="manage_networks">Gérer les réseaux</string> <string name="title_activity_credits">Crédits</string> - <string name="credit_text">Copyright 2017 Filippo \"Fil\" Bergamo<br/><br/>Cette app est du logiciel libre.<br/>Elle est sous licence <a href="https://www.gnu.org/licenses/gpl.txt">GPL v3</a><br/><br/>Cette app est développé en tant que contribution au <br/><a href="https://www.replicant.us">projet Replicant</a><br/><br/><b><u><big>Merci GNUs:</big></u></b><br/><br/><b>Tiberiu - Technoethical</b><br/>pour avoir fait le travail initial de porter le Wi-Fi sur Replicant 4.2.<br/><br/><b>Wolfgang Wiedmeyer</b><br/>pour le portage du Wi-Fi libre sur Replicant 6.0 et pour l\'aide sur les scripts.<br/><br/>Pour reporter des bogues, demander des fonctionnalités, ou n\'importe quelle demande d\'aide, veuillez vous adresser à:<br/><a href="https://redmine.replicant.us/projects/replicant/boards">Le forum de Replicant</a><br/><br/>Le code source est hébergé sur : <br/><a href="https://git.replicant.us/contrib/Fil/RepWifiApp/">https://git.replicant.us/contrib/Fil/RepWifiApp/</a><br/></string> + <string name="credit_text">Copyright 2017 Filippo \"Fil\" Bergamo<br/><br/>Cette app est du logiciel libre.<br/>Elle est sous licence <a href="https://www.gnu.org/licenses/gpl.txt">GPL v3</a><br/><br/>Cette app est développé en tant que contribution au <br/><a href="https://www.replicant.us">projet Replicant</a><br/>Pour signaler des bogues, demander des fonctionnalités, ou n\'importe quelle autre demande d\'aide, veuillez vous référer à :<br/><a href="https://redmine.replicant.us/projects/replicant/boards">Forum de Replicant</a><br/><br/>Le code source est hébergé sur : <br/><a href="https://git.replicant.us/contrib/Fil/RepWifiApp/">https://git.replicant.us/contrib/Fil/RepWifiApp/</a><br/><br/><b><u><big>Merci GNUs:</big></u></b><br/><br/><b>Tiberiu - Technoethical</b><br/>pour avoir fait le travail initial de porter le Wi-Fi sur Replicant 4.2.<br/><br/><b>Wolfgang Wiedmeyer</b><br/>pour le portage du Wi-Fi libre sur Replicant 6.0 et pour l\'aide sur les scripts.<br/><br/><b>Nicola Spanti</b><br/>pour la traduction en français.<br/><br/><b>Nichlas Severinsen</b><br/>pour la publication de cette app sur F-Droid.<br/><br/></string> <string name="menu_config">Paramètres</string> <string name="msg_interface_not_found">Pas d\'adaptateur Wi-Fi trouvé !\nVeuillez connecter un adaptateur Wi-Fi géréet réessayer.</string> <string name="msg_confirm_delete_network">Êtes vous sûr de vouloir supprimer ce réseau ?</string> @@ -52,9 +52,87 @@ <string name="input_ssid">Ou.. Fournisser le nom du réseau (SSID)</string> <string name="title_activity_input_ssid">Fournisser le nom du réseau</string> <string name="menu_settings">Paramètres</string> - <string name="select_saved_net">Utiliser le réseau sauvegardé</string> + <string name="select_saved_net">Utiliser le réseau enregistré</string> <string name="receiver_description">RepWifi est attentif à l\'événement de démarrage. Cela lui permet d\'avoir une fonctionnalité de démarrage automatique et une autre lié aux notifications.</string> <string name="confirm_reset_settings">Êtes vous sûr de vouloir de remettre tous les paramètres aux valeurs par défaut ?</string> + <string name="confirm_exit_app">Êtes vous sûr de vouloir tuer RepWifi ? Cela vous déconnectera du Wi-Fi.</string> <string name="confirm_kill_backend">Êtes vous sûr de vouloir tuer les processus d\'arrière-plan ?</string> <string name="summary_kill_backend">Des fois les programmes d\'arrière-plan restent coincés dans des états incohérents.\nCliquer sur le boutton restaure le comportement normal en tuant les instances en cours de wpa_supplicant et dhcpcd.</string> + <string name="text_presented_by">Fait par :</string> + <string name="title_input_password">Saisir le mot de passe</string> + <string name="msg_password_empty">Le mot de passe ne peut pas être nul !</string> + <string name="title_input_ssid">Saisir les paramètres du réseau</string> + <string name="msg_network_name_empty">Le nom du réseau ne peut pas être nul !</string> + <string name="msg_connecting_to">Connexion à </string> + <string name="title_scanning">Scan...</string> + <string name="msg_scanning_for_nets">Scan pour trouver des réseaux...</string> + <string name="msg_checking_status">Vérification du statut...</string> + <string name="msg_please_wait">Veuillez attendre...</string> + <string name="msg_network_saved">Réseau enregistré !</string> + <string name="msg_network_save_fail">ÉCHEC à l\'enregistrement du réseau !</string> + <string name="msg_connect_fail">ÉCHEC à la connexion !</string> + <string name="msg_netinfo_deleted">Informations sur le réseau supprimées !</string> + <string name="msg_netinfo_delete_fail">ÉCHEC à la suppresion des informations sur le réseau !</string> + <string name="msg_autoconnect_error">Il y a eu une erreur pendant la tentative d\'auto-connexion</string> + <string name="text_netinfo_last_used">Dernier utilisé</string> + <string name="text_password">Mot de passe</string> + <string name="msg_network_list_fail">Impossible d\'avoir la liste des réseaux !</string> + <string name="msg_no_network">Aucun réseau trouvé.</string> + <string name="msg_select_network_connect">Choisir le réseau auquel vous voulez vous connecter :</string> + <string name="msg_select_network_manage">Choisir les informations de réseau à gérer :</string> + <string name="msg_log_saved">Journaux enregistrés dans un ficher</string> + <string name="msg_log_save_fail">Échec à l\'enregistrement du journal dans un fichier !</string> + <string name="msg_error_ip_format">ERREUR :\nMauvais format d\'IP !</string> + <string name="msg_connected_to">Connecté à</string> + <string name="text_ip_address">Adresse IP</string> + <string name="msg_disconnected">Déconnecté.</string> + <string name="msg_disconnect_fail">Échec à la déconnexion !</string> + <string name="text_status">Statut</string> + <string name="msg_no_saved_network">Aucun réseau enregistré</string> + <string name="msg_touch_open">Cliquer pour ouvrir.</string> + <string name="msg_os_unsupported">VERSION DE SYSTÈME D\'EXPLOITATION NON SUPPORTÉ\nLa version actuelle de Replicant n\'est pas supportée par RepWifi.\nVeuillez mettre à jour à la dernière version aussitôt que possible !</string> + <string name="title_log_prio">Priorité du journal</string> + <string name="title_dump_logs">Enregistrer les journaux dans un fichier</string> + <string name="title_reset_backend">Réinitialiser le moteur en arrière-plan</string> + <string name="title_dns_1">Serveur DNS #1</string> + <string name="title_dns_2">Serveur DNS #2</string> + <string name="summary_dns1">Définir l\'adresse IPv4 du serveur DNS primaire.\nSi c\'est laissé vide, RepWifi va essayer d\'utiliser la passerelle par défaut comme résolveur DNS.</string> + <string name="summary_dns2">Définir l\'adresse IPv4 du serveur DNS secondaire.\nSi la première adresse est vide, la valeur de ce champ va être ignorée.</string> + <string name="title_autoconnect">Activer l\'auto-connexion</string> + <string name="summary_autoconnect">Quand l\'adaptateur Wi-Fi est connecté, RepWifi se connecte automatiquement aux réseaux connus atteignables.\n(Expérimental).</string> + <string name="title_progbar">Barre de progression animée</string> + <string name="summary_progbar">Affiche une barre de progression animée pendant que des tâches de fond sont réalisées.\nGarder la désactivée pour (à priori) économiser de l\'énergie pour l\'adaptateur Wi-Fi.</string> + <string name="title_start_at_boot">Activer le démarrage automatique au démarrage du système</string> + <string name="summary_start_at_boot">Si coché, RepWifi démarre automatiquement quand le système démarre.</string> + <string name="title_restore_default">Rétablir les paramètres par défaut</string> + <string name="summary_restore_default">cliquer pour rétablir les paramètres par défaut\n(ensuite revenez à l\'écran principal pour appliquer la réinitialisation)</string> + <string name="title_advanced_settings">Avancé & Débogage</string> + <string name="title_general_settings">Options</string> + <string name="summary_advanced_settings">définir les options avancées et variables de débogage</string> + <string name="summary_general_settings">définir les options générales</string> + <string name="text_use_dhcp">Utiliser DHCP</string> + <string name="text_ipv4_settings">Paramètres IPv4</string> + <string name="text_static_ip">IP statique</string> + <string name="text_subnet_mask">Masque de sous-réseau</string> + <string name="text_gateway">Passerelle</string> + <string name="title_activity_ipv4_settings">ActivitéDesParamètresIpv4</string> + <string name="txt_save_ip_settings">Enregistrer les paramètres IP</string> + <string name="txt_back">Retour</string> + <string name="msg_invalid_ip">Adresse IP invalide !</string> + <string name="msg_invalid_netmask">Sous-réseau invalide !</string> + <string name="msg_invalid_gateway">Passerelle invalide !</string> + <string name="msg_vpn_disconnect_error">ERREUR pendant la déconnexion du VPN !</string> + <string name="msg_vpn_disconnect">Déconnecté du VPN</string> + <string name="msg_vpn_launched">Démarrage de la connexion au VPN</string> + <string name="msg_vpn_wrong_profile">Nom de profil invalide !</string> + <string name="title_vpn_settings">Paramètres du VPN</string> + <string name="text_vpn_package_missing">Il semble que l\'app VPN nécessaire n\'est pas installée.\nRepWifi a besoin que l\'app "[VPN_EXT_APP]" soit installée, pour pouvoir fournir la fonctionnalité VPN.\nVeuillez installer "[VPN_EXT_APP]" et réessayer.</string> + <string name="msg_vpn_no_permission">Permission VPN refusée.\nVous devez accorder à RepWifi la permission d\'utiliser l\'app "[VPN_EXT_APP]" quand cela vous est demandé.\nRepWifi ne sera pas capable de démarrer le VPN tant que vous ne l\'aurez pas fait.</string> + <string name="msg_vpn_connect_error">** ERREUR pendant la connexion au VPN **</string> + <string name="title_activity_vpn_settings">Paramètres du VPN</string> + <string name="hello_world">Bonjour le monde !</string> + <string name="txt_save">Enregistrer</string> + <string name="summary_vpn_settings">Choisir le nom du profil VPN que vous voulez qui soit lancé automatiquement quand vous vous connecter à ce réseau.\nLaisser vide pour désactiver la connexion automatique au VPN.\nPour utiliser la fonction VPN, l\'app "[VPN_EXT_APP]" doit être installée sur le système.</string> + <string name="msg_vpn_no_profile">Aucun profil trouvé.\nVeuillez ajouter un profil VPN dans l\'app [VPN_EXT_APP] avant d\'utiliser cette fonctionnalité.</string> + </resources> diff --git a/app/res/values-fr/strings_activity_input_password.xml b/app/res/values-fr/strings_activity_input_password.xml index 17f78cd..c27ca7a 100644 --- a/app/res/values-fr/strings_activity_input_password.xml +++ b/app/res/values-fr/strings_activity_input_password.xml @@ -2,35 +2,24 @@ <resources> <!-- - RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo <fil.bergamo@riseup.net> - French translation is Copyright (C) 2017 Nicola Spanti + This file is part of RepWifiApp. + RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo <fil.bergamo@riseup.net> + French translation is Copyright (C) 2017 Nicola Spanti - This file is part of RepWifiApp. - RepWifiApp is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - RepWifiApp is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with RepWifiApp. If not, see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <string name="title_activity_input_password">Entrer le mot de passe pour le réseau</string> - <!-- Strings related to login --> - <string name="prompt_email">Email</string> - <string name="prompt_password">Mot de passe</string> - <string name="action_sign_in_register"><b>S\'identifier</b> ou s\'enregistrer</string> - <string name="action_sign_in_short">S\'identifier</string> - <string name="menu_forgot_password">Récupérer un mot de passe perdu</string> - <string name="login_progress_signing_in">Identification…</string> - <string name="error_invalid_email">Cette adresse email est invalide</string> - <string name="error_invalid_password">Ce mot de passe est trop court</string> - <string name="error_incorrect_password">Ce mot de passe est incorrect</string> - <string name="error_field_required">Ce champ est obligatoire</string> </resources> diff --git a/app/res/values-fr/strings_activity_settings.xml b/app/res/values-fr/strings_activity_settings.xml index 6e8610b..260bcb0 100644 --- a/app/res/values-fr/strings_activity_settings.xml +++ b/app/res/values-fr/strings_activity_settings.xml @@ -2,62 +2,24 @@ <resources> <!-- - RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo <fil.bergamo@riseup.net> - French translation is Copyright (C) 2017 Nicola Spanti + This file is part of RepWifiApp. + RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo <fil.bergamo@riseup.net> + French translation is Copyright (C) 2017 Nicola Spanti - This file is part of RepWifiApp. - RepWifiApp is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - RepWifiApp is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with RepWifiApp. If not, see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <string name="title_activity_settings">Paramètres</string> - <!-- Strings related to Settings --> - - - <!-- Example General settings --> - <string name="pref_header_general">Général</string> - <string name="pref_title_social_recommendations">Activer les recommendations sociales</string> - <string name="pref_description_social_recommendations">Recommendations pour que les gens puissent vous contacter en se basant sur votre historique de messages</string> - <string name="pref_title_display_name">Afficher le nom</string> - <string name="pref_default_display_name">John Smith</string> - <string name="pref_title_add_friends_to_messages">Ajouter des ami·e·s aux messages</string> - - <string-array name="pref_example_list_titles"> - <item>Toujours</item> - <item>Quand c\'est possible</item> - <item>Jamais</item> - </string-array> - - <!-- Example settings for Data & Sync --> - <string name="pref_header_data_sync">Données & synchronisation</string> - <string name="pref_title_sync_frequency">Fréquence de la synchronisation</string> - - <string-array name="pref_sync_frequency_titles"> - <item>15 minutes</item> - <item>30 minutes</item> - <item>1 heure</item> - <item>3 heures</item> - <item>6 heures</item> - <item>Jamais</item> - </string-array> - - <string name="pref_title_system_sync_settings">Paramètres de la synchronisation système</string> - - <!-- Example settings for Notifications --> - <string name="pref_header_notifications">Notifications</string> - <string name="pref_title_new_message_notifications">Nouveaux messages de notifications</string> - <string name="pref_title_ringtone">Sonnerie</string> - <string name="pref_ringtone_silent">Muet</string> - <string name="pref_title_vibrate">Vibrer</string> </resources> diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml index dccbe44..8e8cd36 100644 --- a/app/res/values/strings.xml +++ b/app/res/values/strings.xml @@ -3,6 +3,7 @@ <string name="app_name">RepWifi</string> <string name="menu_credits">Info and Credits</string> + <string name="menu_closeapp">Kill RepWifi</string> <string name="scan_networks">Scan for Networks</string> <string name="title_activity_select_network">Select Network</string> <string name="rescan">Repeat Scan</string> @@ -10,7 +11,6 @@ <string name="insert_nets_password">Insert a Password to connect to:</string> <string name="show_password">Show password</string> <string name="title_activity_connect">ConnectActivity</string> - <string name="hello_world">Hello world!</string> <string name="title_activity_show_status">Connection status</string> <string name="back_main">Back to main</string> <string name="disconnect">Disconnect</string> @@ -20,7 +20,7 @@ <string name="delete">Delete network info</string> <string name="manage_networks">Manage Networks</string> <string name="title_activity_credits">Credits</string> - <string name="credit_text">Copyright 2017 Filippo \"Fil\" Bergamo<br/><br/>This app is Free Software.<br/>It\'s licensed under the terms of <a href="https://www.gnu.org/licenses/gpl.txt">GPL v3</a><br/><br/>This app is developed as a contribution to <br/><a href="http://www.replicant.us">The Replicant Project</a><br/><br/><b><u><big>Thank GNUs:</big></u></b><br/><br/><b>Tiberiu - Technoethical</b><br/>for having done the initial job of porting libre WiFi to Replicant 4.2.<br/><br/><b>Wolfgang Wiedmeyer</b><br/>for porting libre WiFi to Replicant 6.0 and for helping with the scripts.<br/><br/>To report on bugs, request features, or any help request, please refer to:<br/><a href="http://redmine.replicant.us/projects/replicant/boards">Replicant\'s Forum</a><br/><br/>Source code is hosted at: <br/><a href="https://git.replicant.us/contrib/Fil/RepWifiApp/">https://git.replicant.us/contrib/Fil/RepWifiApp/</a><br/></string> + <string name="credit_text">Copyright 2017 Filippo \"Fil\" Bergamo<br/><br/>This app is Free Software.<br/>It\'s licensed under the terms of <a href="https://www.gnu.org/licenses/gpl.txt">GPL v3</a><br/><br/>This app is developed as a contribution to <br/><a href="http://www.replicant.us">The Replicant Project</a><br/>To report on bugs, request features, or any help request, please refer to:<br/><a href="http://redmine.replicant.us/projects/replicant/boards">Replicant\'s Forum</a><br/><br/>Source code is hosted at: <br/><a href="https://git.replicant.us/contrib/Fil/RepWifiApp/">https://git.replicant.us/contrib/Fil/RepWifiApp/</a><br/><br/><b><u><big>Thank GNUs:</big></u></b><br/><br/><b>Tiberiu - Technoethical</b><br/>for having done the initial job of porting libre WiFi to Replicant 4.2.<br/><br/><b>Wolfgang Wiedmeyer</b><br/>for porting libre WiFi to Replicant 6.0 and for helping with the scripts.<br/><br/><b>Nicola Spanti</b><br/>for the French translation.<br/><br/><b>Nichlas Severinsen</b><br/>for publishing this app on F-Droid.<br/><br/></string> <string name="menu_config">Settings</string> <string name="msg_interface_not_found">WiFi adapter not found!\nPlease plug in a supported WiFi adapter and retry.</string> <string name="msg_confirm_delete_network">Are you sure you want to delete this network?</string> @@ -38,7 +38,84 @@ <string name="dns2_default">169.239.202.202</string> <string name="receiver_description">RepWifi\'s listener for startup event. Provides auto-start and notification features to RepWifi.</string> <string name="confirm_reset_settings">Are you sure you want to reset all settings to default?</string> + <string name="confirm_exit_app">Are you sure you want to kill RepWifi? This will disconnect you from WiFi.</string> <string name="confirm_kill_backend">Are you sure you want to kill the back-end processes?</string> <string name="summary_kill_backend">Sometimes back-end programs get stuck in inconsistent states.\nClicking this button restores normal behaviour by killing running instances of wpa_supplicant and dhcpcd."</string> + <string name="text_presented_by">Brought to you by:</string> + <string name="title_input_password">Input Password</string> + <string name="msg_password_empty">Password can\'t be empty!</string> + <string name="title_input_ssid">Insert Network\'s parameters</string> + <string name="msg_network_name_empty">Network name can\'t be empty!</string> + <string name="msg_connecting_to">Connecting to </string> + <string name="title_scanning">Scanning...</string> + <string name="msg_scanning_for_nets">Scanning for Networks...</string> + <string name="msg_checking_status">Checking status...</string> + <string name="msg_please_wait">Please wait...</string> + <string name="msg_network_saved">Network saved!</string> + <string name="msg_network_save_fail">FAILED to save network!</string> + <string name="msg_connect_fail">FAILED to connect!</string> + <string name="msg_netinfo_deleted">Network Info deleted!</string> + <string name="msg_netinfo_delete_fail">FAILED to delete Network Info!</string> + <string name="msg_autoconnect_error">An error occurred while trying to auto-connect</string> + <string name="text_netinfo_last_used">Last Used</string> + <string name="text_password">Password</string> + <string name="msg_network_list_fail">Unable to retrieve network list!</string> + <string name="msg_no_network">No network found.</string> + <string name="msg_select_network_connect">Select the network you want to connect to:</string> + <string name="msg_select_network_manage">Select network info to manage:</string> + <string name="msg_log_saved">Logs saved to file</string> + <string name="msg_log_save_fail">Failed to dump logs!</string> + <string name="msg_error_ip_format">ERROR:\nWrong IP format!</string> + <string name="msg_connected_to">Connected to</string> + <string name="text_ip_address">IP Address</string> + <string name="msg_disconnected">Disconnected.</string> + <string name="msg_disconnect_fail">FAILED to disconnect!</string> + <string name="text_status">Status</string> + <string name="msg_no_saved_network">No saved network</string> + <string name="msg_touch_open">Touch to open.</string> + <string name="msg_os_unsupported">UNSUPPORTED OS VERSION\nThe current version of Replicant is not supported by RepWifi.\nPlease upgrade to the latest version as soon as possible!</string> + <string name="title_log_prio">Log priority</string> + <string name="title_dump_logs">Dump logs to file</string> + <string name="title_reset_backend">Reset back-end engine</string> + <string name="title_dns_1">DNS server #1</string> + <string name="title_dns_2">DNS server #2</string> + <string name="summary_dns1">Set the IPv4 address of the primary DNS server.\nIf left blank, RepWifi will try to use the default gateway as a DNS resolver.</string> + <string name="summary_dns2">Set the IPv4 address of the secondary DNS server.\nIf the primary address is blank, this will be ignored.</string> + <string name="title_autoconnect">Enable Autoconnect</string> + <string name="summary_autoconnect">When the WiFi dongle is attached, RepWifi connects automatically to reachable known networks.\n(Experimental).</string> + <string name="title_progbar">Animated progress bar</string> + <string name="summary_progbar">Show an animated progress bar while doing long background tasks.\nKeep it disabled to (hopefully) save some extra power for the WiFi dongle.</string> + <string name="title_start_at_boot">Enable Start at Boot</string> + <string name="summary_start_at_boot">If checked, RepWifi is started automatically on system\'s startup.</string> + <string name="title_restore_default">Restore Defaults</string> + <string name="summary_restore_default">click to restore default settings\n(then return to main screen to apply the reset)</string> + <string name="title_advanced_settings">Advanced & Debug</string> + <string name="title_general_settings">Options</string> + <string name="summary_advanced_settings">set advanced options and debug variables</string> + <string name="summary_general_settings">set general options</string> + <string name="text_use_dhcp">Use DHCP</string> + <string name="text_ipv4_settings">IPv4 settings</string> + <string name="text_static_ip">Static IP</string> + <string name="text_subnet_mask">Subnet Mask</string> + <string name="text_gateway">Gateway</string> + <string name="title_activity_ipv4_settings">Ipv4SettingsActivity</string> + <string name="txt_save_ip_settings">Save IP settings</string> + <string name="txt_back">Back</string> + <string name="msg_invalid_ip">Invalid IP address!</string> + <string name="msg_invalid_netmask">Invalid Subnet Mask!</string> + <string name="msg_invalid_gateway">Invalid Gateway!</string> + <string name="msg_vpn_disconnect_error">ERROR while disconnecting from VPN!</string> + <string name="msg_vpn_disconnect">Disconnected from VPN</string> + <string name="msg_vpn_launched">Launched VPN connection</string> + <string name="msg_vpn_wrong_profile">Invalid profile name!</string> + <string name="title_vpn_settings">VPN settings</string> + <string name="text_vpn_package_missing">Seems like the required VPN app is not installed.\nRepWifi needs "[VPN_EXT_APP]" to be installed, in order to provide VPN features.\nPlease install "[VPN_EXT_APP]" and retry.</string> + <string name="msg_vpn_no_permission">VPN permission denied.\nYou need to grant RepWifi permission to use "[VPN_EXT_APP]" when you are prompted for it.\nRepWifi won\'t be able to start VPN until you do so.</string> + <string name="msg_vpn_connect_error">** ERROR while connecting to VPN **</string> + <string name="title_activity_vpn_settings">VPN Settings</string> + <string name="hello_world">Hello world!</string> + <string name="txt_save">Save</string> + <string name="summary_vpn_settings">Select the name of a VPN profile that you want to be launched automatically when you connect to this network.\nLeave blank to disable automatic VPN connection.\nTo use VPN capability, "[VPN_EXT_APP]" must be installed in the system.</string> + <string name="msg_vpn_no_profile">No profile found.\nPlease add a VPN profile inside [VPN_EXT_APP] before using this feature.</string> </resources>
\ No newline at end of file diff --git a/app/res/values/strings_activity_input_password.xml b/app/res/values/strings_activity_input_password.xml index 4770a51..31b8865 100644 --- a/app/res/values/strings_activity_input_password.xml +++ b/app/res/values/strings_activity_input_password.xml @@ -3,15 +3,6 @@ <string name="title_activity_input_password">Insert passwrod for network</string> <!-- Strings related to login --> - <string name="prompt_email">Email</string> - <string name="prompt_password">Password</string> - <string name="action_sign_in_register"><b>Sign in</b> or register</string> - <string name="action_sign_in_short">Sign in</string> - <string name="menu_forgot_password">Recover lost password</string> - <string name="login_progress_signing_in">Signing in…</string> - <string name="error_invalid_email">This email address is invalid</string> - <string name="error_invalid_password">This password is too short</string> - <string name="error_incorrect_password">This password is incorrect</string> - <string name="error_field_required">This field is required</string> + </resources>
\ No newline at end of file diff --git a/app/res/values/strings_activity_settings.xml b/app/res/values/strings_activity_settings.xml index d7bab93..dfc25ca 100644 --- a/app/res/values/strings_activity_settings.xml +++ b/app/res/values/strings_activity_settings.xml @@ -6,52 +6,9 @@ <!-- Example General settings --> - <string name="pref_header_general">General</string> - <string name="pref_title_social_recommendations">Enable social recommendations</string> - <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string> - <string name="pref_title_display_name">Display name</string> - <string name="pref_default_display_name">John Smith</string> - <string name="pref_title_add_friends_to_messages">Add friends to messages</string> - - <string-array name="pref_example_list_titles"> - <item>Always</item> - <item>When possible</item> - <item>Never</item> - </string-array> - <string-array name="pref_example_list_values"> - <item>1</item> - <item>0</item> - <item>-1</item> - </string-array> <!-- Example settings for Data & Sync --> - <string name="pref_header_data_sync">Data & sync</string> - <string name="pref_title_sync_frequency">Sync frequency</string> - - <string-array name="pref_sync_frequency_titles"> - <item>15 minutes</item> - <item>30 minutes</item> - <item>1 hour</item> - <item>3 hours</item> - <item>6 hours</item> - <item>Never</item> - </string-array> - <string-array name="pref_sync_frequency_values"> - <item>15</item> - <item>30</item> - <item>60</item> - <item>180</item> - <item>360</item> - <item>-1</item> - </string-array> - - <string name="pref_title_system_sync_settings">System sync settings</string> <!-- Example settings for Notifications --> - <string name="pref_header_notifications">Notifications</string> - <string name="pref_title_new_message_notifications">New message notifications</string> - <string name="pref_title_ringtone">Ringtone</string> - <string name="pref_ringtone_silent">Silent</string> - <string name="pref_title_vibrate">Vibrate</string> </resources>
\ No newline at end of file diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml index 18e186b..2a431aa 100644 --- a/app/res/values/styles.xml +++ b/app/res/values/styles.xml @@ -42,7 +42,7 @@ <item name="android:textColor">@color/ThemeLight</item> <item name="android:cacheColorHint">@color/Anthracite</item> </style> - + <style name="RepWifi.BorderlessButton" parent="@android:style/Widget.Holo.Button.Borderless"> <item name="android:textColor">@color/ThemeLight</item> <item name="android:background">@drawable/repwifi_button</item> diff --git a/app/res/xml/debug_settings.xml b/app/res/xml/debug_settings.xml index 8aa09f4..f7be0f0 100644 --- a/app/res/xml/debug_settings.xml +++ b/app/res/xml/debug_settings.xml @@ -6,10 +6,15 @@ android:entries="@array/debug_priority_names" android:entryValues="@array/debug_priority" android:key="debug_priority" - android:title="Log priority" + android:title="@string/title_log_prio" android:divider="@drawable/divider_shape" /> - <Preference android:title="Reset back-end engine" + <Preference android:title="@string/title_dump_logs" + android:key="pref_dump_log" + android:background="@drawable/button_bg" + android:textColor="@color/ThemeLight"/> + + <Preference android:title="@string/title_reset_backend" android:key="pref_kill_backend" android:summary="@string/summary_kill_backend" android:background="@drawable/button_bg" diff --git a/app/res/xml/general_settings.xml b/app/res/xml/general_settings.xml index d836b67..bd9fdf9 100644 --- a/app/res/xml/general_settings.xml +++ b/app/res/xml/general_settings.xml @@ -5,8 +5,8 @@ android:id="@+id/pref_dns1" android:defaultValue="@string/dns1_default" android:key="dns1" - android:summary="Set the IPv4 address of the primary DNS server.\nIf left blank, RepWifi will try to use the default gateway as a DNS resolver." - android:title="DNS server #1" + android:summary="@string/summary_dns1" + android:title="@string/title_dns_1" android:textColor="@color/ThemeLight" android:background="@color/ThemeDark" android:padding="5dp"/> @@ -16,8 +16,8 @@ android:id="@+id/pref_dns2" android:defaultValue="@string/dns2_default" android:key="dns2" - android:summary="Set the IPv4 address of the secondary DNS server.\nIf the primary address is blank, this will be ignored." - android:title="DNS server #2" + android:summary="@string/summary_dns2" + android:title="@string/title_dns_2" android:textColor="@color/ThemeLight" android:background="@color/ThemeDark" android:padding="5dp"/> @@ -26,26 +26,26 @@ android:id="@+id/pref_autoconnect" android:defaultValue="false" android:key="enable_autoconnect" - android:summary="When the WiFi dongle is attached, RepWifi connects automatically to reachable known networks.\n(Experimental)." - android:title="Enable Autoconnect" /> - + android:summary="@string/summary_autoconnect" + android:title="@string/title_autoconnect" /> + <CheckBoxPreference android:id="@+id/pref_progbar" android:defaultValue="true" android:key="enable_progbar" - android:summary="Show an animated progress bar while doing long background tasks.\nKeep it disabled to (hopefully) save some extra power for the WiFi dongle." - android:title="Animated progress bar" /> + android:summary="@string/summary_progbar" + android:title="@string/title_progbar" /> <CheckBoxPreference android:id="@+id/pref_autostart" android:defaultValue="false" android:key="enable_autostart" - android:summary="If checked, RepWifi is started automatically on system's startup." - android:title="Enable Start at Boot" /> + android:summary="@string/summary_start_at_boot" + android:title="@string/title_start_at_boot" /> - <Preference android:title="Restore Defaults" + <Preference android:title="@string/title_restore_default" android:key="pref_restore_default" - android:summary="click to restore default settings\n(then return to main screen to apply the reset)" + android:summary="@string/summary_restore_default" android:background="@drawable/button_bg" android:textColor="@color/ThemeLight" /> diff --git a/app/res/xml/settings_headers.xml b/app/res/xml/settings_headers.xml index 50f7436..d33ae33 100644 --- a/app/res/xml/settings_headers.xml +++ b/app/res/xml/settings_headers.xml @@ -3,12 +3,12 @@ <header android:fragment="fil.libre.repwifiapp.activities.SettingsActivity$GeneralSettingFragment" - android:summary="set general options" - android:title="Options" /> + android:summary="@string/summary_general_settings" + android:title="@string/title_general_settings" /> <header android:fragment="fil.libre.repwifiapp.activities.SettingsActivity$DebugSettingFragment" - android:summary="set advanced options and debug variables" - android:title="Advanced & Debug" /> + android:summary="@string/summary_advanced_settings" + android:title="@string/title_advanced_settings" /> </preference-headers>
\ No newline at end of file |
