diff options
-rw-r--r-- | AndroidManifest.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge-port/main.xml | 1 | ||||
-rw-r--r-- | res/values-de/strings.xml | 118 | ||||
-rw-r--r-- | res/values-fr/strings.xml | 120 | ||||
-rw-r--r-- | res/values/strings.xml | 32 | ||||
-rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 2 |
6 files changed, 10 insertions, 265 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 72181c18..f928ff61 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionCode="73" android:versionName="0.6.0" > - <uses-sdk android:minSdkVersion="8" /> + <uses-sdk android:minSdkVersion="11" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/res/layout-xlarge-port/main.xml b/res/layout-xlarge-port/main.xml index 980cbe47..37553326 100644 --- a/res/layout-xlarge-port/main.xml +++ b/res/layout-xlarge-port/main.xml @@ -7,7 +7,6 @@ android:id="@+id/loading_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_weight="0" android:gravity="center" android:orientation="vertical" > diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml deleted file mode 100644 index 1bd63831..00000000 --- a/res/values-de/strings.xml +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <string name="login_session_error">Anmeldung vom Server zurückgewiesen</string> - <string name="login_in_progress">Anmelden...</string> - <string name="login_failed">Anmeldung fehlgeschlagen...</string> - <string name="app_name">Tiny Tiny RSS</string> - <string name="login_need_configure">Bitte erst Einstellungen überprüfen.</string> - <string name="login_ready">Bereit zur Anmeldung</string> - <string name="login_login">Anmelden</string> - <string name="logout">Abmelden</string> - <string name="login">Benutzername</string> - <string name="debugging">Debugging</string> - <string name="password">Passwort</string> - <string name="default_url">http://example.domain/tt-rss/</string> - <string name="authentication">Anmeldung</string> - <string name="look_and_feel">Oberfläche</string> - <string name="pref_theme">Theme</string> - <string name="pref_theme_long">Ändert die Farbeinstellungen</string> - <string name="ttrss_url">Tiny Tiny RSS URL</string> - <string name="auto_login">automatisch Anmelden</string> - <string name="theme_dark">Dunkel</string> - <string name="preferences">Einstellungen</string> - <string name="theme_light">Hell</string> - <string name="connection">Verbindung</string> - <string name="headline_context_multiple">Ausgewählte Artikel</string> - <string name="http_authentication">HTTP Authentifizierung</string> - <string name="login_success">Anmeldung erfolgreich.</string> - <string name="no_unread_feeds">Keine ungelesenen Feeds</string> - <string name="no_unread_headlines">Keine ungelesenen Artikel</string> - <string name="loading_message">Lade, bitte warten...</string> - <string name="menu_unread_feeds">Zeige ungelesene Feeds</string> - <string name="menu_all_feeds">Zeige alle Feeds</string> - <string name="update_feeds">Feeds neu laden</string> - <string name="close_article">Artikel schließen</string> - <string name="share_article">Artikel teilen</string> - <string name="catchup">Gelesen markieren</string> - <string name="sort_feeds_by_unread">Sort feeds by unread count</string> - <string name="load_more_articles">Mehr laden</string> - <string name="show_all_articles">Alle Artikel anzeigen</string> - <string name="show_unread_articles">Show unread articles</string> - <string name="ssl_trust_any">Alle SSL Zertifikate akzeptieren</string> - <string name="category_browse_feeds">Feeds anzeigen</string> - <string name="category_browse_articles">Browse articles</string> - <string name="blank"></string> - <string name="transport_debugging">Log sent and received data</string> - <string name="article_toggle_marked">(Un)Star</string> - <string name="article_toggle_published">(Un)Publish</string> - <string name="headlines_select">Artikel auswählen</string> - <string name="headlines_select_dialog">Artikel auswählen</string> - <string name="headlines_select_all">Alle</string> - <string name="headlines_select_unread">Ungelesen</string> - <string name="headlines_select_none">Alle Abwählen</string> - <string name="selection_toggle_marked">(Un)Star</string> - <string name="selection_toggle_published">(Un)Publish</string> - <string name="selection_toggle_unread">(Un)Read</string> - <string name="selection_select_none">Alle abwählen</string> - <string name="context_selection_toggle_marked">(Un)Star</string> - <string name="context_selection_toggle_published">(Un)Publish</string> - <string name="context_selection_toggle_unread">(Un)Read</string> - <string name="article_set_unread">Set unread</string> - <string name="article_mark_read_above">Mark above read</string> - <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string> - <string name="login_summary">Deine tt-rss Anmeldung. Nicht notwendig für single user mode</string> - <string name="enable_ads">Enable ads</string> - <string name="enable_ads_summary">Showing ads to you supports the project</string> - <string name="ttrss_url_summary">URLdeiner tt-rss Installation, Bsp.: http://site.com/tt-rss/</string> - <string name="download_feed_icons">Herunderladen der Feed-Symbole</string> - <string name="enable_cats">Anzeigen der Feedkategorien</string> - <string name="back_to_categories">Kategory schließen</string> - <string name="no_feeds_to_display">Keine Feeds zum anzeigen</string> - <string name="no_headlines_to_display">Keine Überschriften zum anzeigen.</string> - <string name="browse_cats_like_feeds">Browse categories like feeds</string> - <string name="browse_cats_like_feeds_summary">Kann im Kontexdtmenu jeder Kategorie angepasst werden.</string> - <string name="headlines_mark_as_read">Als gelesen markieren</string> - <string name="error_no_error">Kein Fehler</string> - <string name="error_unknown">Fehler: Unbekannter Fehler (siehe Log)</string> - <string name="error_http_unauthorized">Fehler: 401 Nicht Authorisiert</string> - <string name="error_http_forbidden">Fehler: 403 Zugriff verweigert</string> - <string name="error_http_not_found">Fehler: 404 Nicht gefunden</string> - <string name="error_http_server_error">Fehler: 500 Server Fehler</string> - <string name="error_http_other_error">Fehler: anderer HTTP Fehler (siehe Log)</string> - <string name="error_ssl_rejected">Fehler: SSL Zertifikat zurückgewiesen</string> - <string name="error_parse_error">Fehler: JSON parsen fehlgeschlagen</string> - <string name="error_io_error">Fehler: I/O Fehler (Server nicht erreichbar?)</string> - <string name="error_other_error">Fehler: Unbekannter Fehler (siehe Log)</string> - <!-- <string name="error_api_disabled">Fehler: API für diesen Benutzer abgeschlatet</string> --> - <string name="error_api_unknown">Fehler: unbekannter API Fehler (siehe Log)</string> - <string name="error_api_incorrect_usage">Fehler: falsche API Benutzung</string> - <string name="error_login_failed">Fehler: Benutzername und Passwort falsch</string> - <string name="error_invalid_api_url">Fehler: API URL ungültig</string> - <string name="combined_mode_summary">Zeigt Artikelinhalt in der gleichen Spalte statt in einer eigenen.</string> - <string name="combined_mode">Kombinierte Anzeige</string> - <string name="go_offline">Gehe Offline</string> - <string name="go_online">Gehe Online</string> - <string name="offline_downloading">Bereite Offlinemodus vor...</string> - <string name="offline_switch_error">Vorbereitung für Offlinemodus fehlgeschlagen (siehe Log)</string> - <string name="no_feeds">Keine Feeds zum Anzeigen</string> - <string name="no_headlines">Keine Artikel zum Anzeigen</string> - <string name="dialog_offline_prompt">Anmeldung fehlgeschlagen, Offlinedaten vorhanden. Möchten sie in den Offlinemodus wechseln?</string> - <string name="dialog_offline_success">Offlinemodus bereit</string> - <string name="dialog_offline_go">Offlinemodus</string> - <string name="dialog_cancel">Abbrechen</string> - <string name="syncing_offline_data">Synchronisiere Offlinedaten...</string> - <string name="dialog_offline_switch_prompt">Ungelesene Artikel herunterladen und in den Offlinemodus wechseln?</string> - <string name="notify_downloading_articles">Lade Artikel herunter (%1$d)...</string> - <string name="notify_downloading_init">Starte Download...</string> - <string name="notify_downloading_feeds">Feeds herunterladen...</string> - <string name="notify_uploading_sending_data">Sende Daten zum Server...</string> - <string name="notify_downloading_title">Bereite Offlinemodus vor...</string> - <string name="notify_uploading_title">Synchronisiere Offlinedaten...</string> - <string name="offline_sync_success">Synchronisierung der Offlinedaten erfolgreich abgeschlossen...</string> - <string name="offline_mode">Offlinemodus</string> - <string name="offline_image_cache_enabled">Bilder herunterladen</string> - <string name="offline_image_cache_enabled_summary">Herunterladen von Bildern. Dies kann die Zeit zum um inden Offlinemodus zu wechseln deutlich verlängern.</string> - <string name="notify_downloading_images">Bilder herunterladen (%1$d)...</string> - <string name="article_set_labels">Lables setzen</string> -</resources>
\ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml deleted file mode 100644 index 5185c770..00000000 --- a/res/values-fr/strings.xml +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <string name="login_session_error">Session de connexion refusée par le serveur</string> - <string name="login_in_progress">Connexion...</string> - <string name="login_failed">Echec de la connexion.</string> - <string name="app_name">Tiny Tiny RSS</string> - <string name="login_need_configure">Configurer l\'application d\'abord</string> - <string name="login_ready">Prêt à se connecter</string> - <string name="login_login">Connexion</string> - <string name="logout">Déconnexion</string> - <string name="login">Connexion</string> - <string name="debugging">Débogage</string> - <string name="password">Mot de passe</string> - <string name="default_url">http://example.domain/tt-rss/</string> - <string name="authentication">Authentification</string> - <string name="look_and_feel">Interface</string> - <string name="pref_theme">Thème</string> - <string name="pref_theme_long">Changer la couleur du thème de l\'application</string> - <string name="ttrss_url">Tiny Tiny RSS URL</string> - <string name="auto_login">Se connecter automatiquement</string> - <string name="theme_dark">Sombre</string> - <string name="preferences">Préférences</string> - <string name="theme_light">Clair</string> - <string name="connection">Connexion</string> - <string name="headline_context_multiple">Articles sélectionnés</string> - <string name="http_authentication">HTTP Authentification</string> - <string name="login_success">Connecté</string> - <string name="no_unread_feeds">Pas de flux non-lus</string> - <string name="no_unread_headlines">Pas d\'articles non-lus</string> - <string name="loading_message">Chargement, patientez s\'il-vous-plaît...</string> - <string name="menu_unread_feeds">Montrer les flux non-lus</string> - <string name="menu_all_feeds">Montrer tous les flux</string> - <string name="update_feeds">Rafraichir les flux</string> - <string name="close_article">Fermer l\'article</string> - <string name="share_article">Partager l\'article</string> - <string name="catchup">Marquer comme lu</string> - <string name="sort_feeds_by_unread">Trier les flux par compte non-lu</string> - <string name="load_more_articles">Charger plus</string> - <string name="show_all_articles">Montrer tous les articles</string> - <string name="show_unread_articles">Montrer les articles non-lus</string> - <string name="ssl_trust_any">Accepter n\'importe quel certificat SSL</string> - <string name="category_browse_feeds">Parcourir les flux</string> - <string name="category_browse_articles">Parcourir les articles</string> - <string name="blank"></string> - <string name="transport_debugging">Enregistrement envoyé et données reçues</string> - <string name="article_toggle_marked">(Non)Etoilé</string> - <string name="article_toggle_published">(Non)Publié</string> - <string name="headlines_select">Selectionner les articles</string> - <string name="headlines_select_dialog">Selectionner les articles</string> - <string name="headlines_select_all">Tout</string> - <string name="headlines_select_unread">Non-lu</string> - <string name="headlines_select_none">Deselectionner tout</string> - <string name="selection_toggle_marked">(Non)Etoilé</string> - <string name="selection_toggle_published">(Non)Publié</string> - <string name="selection_toggle_unread">(Non)Lu</string> - <string name="selection_select_none">Désélectionner tout</string> - <string name="context_selection_toggle_marked">(Non)Etoilé</string> - <string name="context_selection_toggle_published">(Non)Publié</string> - <string name="context_selection_toggle_unread">(Non)Lu</string> - <string name="article_set_unread">Marqué non-lu</string> - <string name="article_mark_read_above">Marquer les articles ci-dessus lus</string> - <string name="http_login_summary">Optional. Remplissez ceci si votre installation tt-rss est protégée par une authentification HTTP Basic</string> - <string name="login_summary">Votre connexion tt-rss n\'est pas nécessaire en mode utilisateur unique</string> - <string name="enable_ads">Activer les pubs</string> - <string name="enable_ads_summary">Montrer les pubs pour soutenir le projet</string> - <string name="ttrss_url_summary">L\'URL de votre répertoire d\'installation de votre tt-rss, c\'est-à-dire http://site.com/tt-rss/</string> - <string name="download_feed_icons">Télécharger et afficher les icônes des flux</string> - <string name="enable_cats">Activer les catégories des flux</string> - <string name="back_to_categories">Catégories fermées</string> - <string name="no_feeds_to_display">Aucun flux à afficher</string> - <string name="no_headlines_to_display">Aucun titre à afficher</string> - <string name="browse_cats_like_feeds">Parcourir les categories comme les flux</string> - <string name="browse_cats_like_feeds_summary">Use category context menu to override this setting</string> - <string name="headlines_mark_as_read">Marqué comme lu</string> - <string name="error_no_error">Aucune erreur</string> - <string name="error_unknown">Error: Erreur inconnue (Voir enregistrement)</string> - <string name="error_http_unauthorized">Erreur: 401 non-authorisée</string> - <string name="error_http_forbidden">Erreur: 403 interdit</string> - <string name="error_http_not_found">Erreur: 404 pas trouvé</string> - <string name="error_http_server_error">Erreur: 500 erreur du serveur</string> - <string name="error_http_other_error">Erreur: autre erreur HTTP (voir enregistrement)</string> - <string name="error_ssl_rejected">Erreur: certificat SSL rejeté</string> - <string name="error_parse_error">Erreur: Echec de l\'analyse JSON</string> - <string name="error_io_error">Erreur: I/O Echec (serveur en panne?)</string> - <string name="error_other_error">Erreur: erreur inconnue (voir enregistrement)</string> - <!-- <string name="error_api_disabled">Erreur: API désactivé pour cet usager</string> --> - <string name="error_api_unknown">Erreur: API inconnu erreur (voir enregistrement)</string> - <string name="error_api_incorrect_usage">Erreur: utilisation incorrecte de l\'API</string> - <string name="error_login_failed">Erreur: nom d\'utilisateur ou mot de passe incorrect</string> - <string name="error_invalid_api_url">Erreur: API URL invalide</string> - <string name="combined_mode_summary">Afficher l\'article complet en un seul block au lieu d\'un panneau séparé</string> - <string name="combined_mode">Mode combiné</string> - <string name="go_offline">Se déconnecter</string> - <string name="go_online">Se connecter</string> - <string name="offline_downloading">Mode hors connexion en préparation...</string> - <string name="offline_switch_error">Echec de la préparation en mode hors connexion (voir enregistrement)</string> - <string name="no_feeds">Aucun flux à afficher</string> - <string name="no_headlines">Aucun article à afficher</string> - <string name="dialog_offline_prompt">Echec de la connexion, mais vous avec conserver des données hors connexion. Voulez-vous vous déconnecter?</string> - <string name="dialog_offline_success">Le mode hors connexion est prêt</string> - <string name="dialog_offline_go">Se déconnecter</string> - <string name="dialog_cancel">Annuler</string> - <string name="syncing_offline_data">Synchroniser les données hors connexion...</string> - <string name="dialog_offline_switch_prompt">Télécharger les articles non lus et se déconnecter ?</string> - <string name="notify_downloading_articles">Télécharger les articles (%1$d)...</string> - <string name="notify_downloading_init">Commencer le téléchargement...</string> - <string name="notify_downloading_feeds">Télécharger les flux...</string> - <string name="notify_uploading_sending_data">Envoyer les données vers le serveur...</string> - <string name="notify_downloading_title">Préparation du mode hors connexion</string> - <string name="notify_uploading_title">Synchroniser les données hors connexion</string> - <string name="offline_sync_success">Synchronisation de vos données hors connexion terminée</string> - <string name="offline_mode">Mode hors connexion</string> - <string name="offline_image_cache_enabled">Mise en antémémoire des images</string> - <string name="offline_image_cache_enabled_summary">Télécharger les images sur la carte sd. Cela pourrait augmenter de manière significative le temps de déconnexion</string> - <string name="notify_downloading_images">Téléchargement des images (%1$d)...</string> - <string name="article_set_labels">Préparer les étiquettes</string> - <string name="search">Rechercher</string> - <string name="cancel">Annuler</string> -</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 280aaf78..c686a2a3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="login_session_error">Login session refused by server</string> - <string name="login_in_progress">Logging in...</string> - <string name="login_failed">Login failed.</string> + <string name="login_in_progress">Logging in…</string> <string name="app_name">Tiny Tiny RSS</string> <string name="login_need_configure">Please configure the application first.</string> <string name="login_ready">Ready to login.</string> @@ -13,32 +11,23 @@ <string name="debugging">Debugging</string> <string name="password">Password</string> <string name="default_url">http://example.domain/tt-rss/</string> - <string name="authentication">Authentication</string> <string name="look_and_feel">Interface</string> <string name="pref_theme">Theme</string> <string name="pref_theme_long">Changes color theme of the application</string> <string name="ttrss_url">Tiny Tiny RSS URL</string> - <string name="auto_login">Login automatically</string> <string name="theme_dark">Dark</string> <string name="preferences">Preferences</string> <string name="theme_light">Light</string> <string name="connection">Connection</string> <string name="headline_context_multiple">Selected articles</string> <string name="http_authentication">HTTP Authentication</string> - <string name="login_success">Logged in.</string> - <string name="no_unread_feeds">No unread feeds</string> - <string name="no_unread_headlines">No unread articles</string> - <string name="loading_message">Loading, please wait...</string> + <string name="loading_message">Loading, please wait…</string> <string name="menu_unread_feeds">Show unread feeds</string> <string name="menu_all_feeds">Show all feeds</string> <string name="update_feeds">Refresh feeds</string> - <string name="close_article">Close article</string> <string name="share_article">Share article</string> <string name="catchup">Mark read</string> <string name="sort_feeds_by_unread">Sort feeds by unread count</string> - <string name="load_more_articles">Load more</string> - <string name="show_all_articles">Show all articles</string> - <string name="show_unread_articles">Show unread articles</string> <string name="ssl_trust_any">Accept any SSL certificate</string> <string name="category_browse_feeds">Browse feeds</string> <string name="category_browse_articles">Browse articles</string> @@ -62,18 +51,14 @@ <string name="article_mark_read_above">Mark above read</string> <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string> <string name="login_summary">Your tt-rss login. Not needed for single user mode</string> - <string name="enable_ads">Enable ads</string> - <string name="enable_ads_summary">Showing ads to you supports the project</string> <string name="ttrss_url_summary">URL of your tt-rss installation directory, e.g. http://site.com/tt-rss/</string> <string name="download_feed_icons">Download and display feed icons</string> <string name="enable_cats">Enable feed categories</string> - <string name="back_to_categories">Close category</string> <string name="no_feeds_to_display">No feeds to display</string> <string name="no_headlines_to_display">No headlines to display</string> <string name="browse_cats_like_feeds">Browse categories like feeds</string> <string name="browse_cats_like_feeds_summary">Use category context menu to override this setting</string> <string name="headlines_mark_as_read">Mark read</string> - <string name="error_no_error">No error</string> <string name="error_unknown">Error: Unknown error (see log)</string> <string name="error_http_unauthorized">Error: 401 unauthorized</string> <string name="error_http_forbidden">Error: 403 forbidden</string> @@ -93,7 +78,6 @@ <string name="combined_mode">Combined mode</string> <string name="go_offline">Go offline</string> <string name="go_online">Go online</string> - <string name="offline_downloading">Preparing offline mode...</string> <string name="offline_switch_error">Failed to prepare offline mode (see log)</string> <string name="no_feeds">No feeds to display</string> <string name="no_headlines">No articles to display</string> @@ -101,23 +85,21 @@ <string name="dialog_offline_success">Offline mode is ready</string> <string name="dialog_offline_go">Go offline</string> <string name="dialog_cancel">Cancel</string> - <string name="syncing_offline_data">Synchronizing offline data...</string> <string name="dialog_offline_switch_prompt">Download unread articles and go offline?</string> - <string name="notify_downloading_articles">Downloading articles (%1$d)...</string> - <string name="notify_downloading_init">Starting download...</string> - <string name="notify_downloading_feeds">Downloading feeds...</string> - <string name="notify_uploading_sending_data">Sending data to server...</string> + <string name="notify_downloading_articles">Downloading articles (%1$d)…</string> + <string name="notify_downloading_init">Starting download…</string> + <string name="notify_downloading_feeds">Downloading feeds…</string> + <string name="notify_uploading_sending_data">Sending data to server…</string> <string name="notify_downloading_title">Preparing offline mode</string> <string name="notify_uploading_title">Synchronizing offline data</string> <string name="offline_sync_success">Finished synchronizing your offline data</string> <string name="offline_mode">Offline mode</string> <string name="offline_image_cache_enabled">Cache images</string> <string name="offline_image_cache_enabled_summary">Download images to sdcard. This might significantly increase time it takes to go offline.</string> - <string name="notify_downloading_images">Downloading images (%1$d)...</string> + <string name="notify_downloading_images">Downloading images (%1$d)…</string> <string name="article_set_labels">Set labels</string> <string name="search">Search</string> <string name="cancel">Cancel</string> - <string name="attachments">Attachments:</string> <string name="font_size_small">Small</string> <string name="font_size_medium">Medium</string> <string name="font_size_large">Large</string> diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index a4149fdc..f6d03915 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -20,6 +20,7 @@ import org.fox.ttrss.util.AppRater; import org.fox.ttrss.util.DatabaseHelper; import android.animation.LayoutTransition; +import android.annotation.SuppressLint; import android.app.AlertDialog; import android.app.Dialog; import android.content.BroadcastReceiver; @@ -1201,6 +1202,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices { initMainMenu(); } + @SuppressLint({ "NewApi", "NewApi", "NewApi" }) @Override public void initMainMenu() { if (m_menu != null) { |