Merged remote and local development branches.

android/res/values-da/strings.xml

@@ -155,7 +155,7 @@
 <string name="pref_search">Søgemaskine</string>
 <string name="pref_setdefault">Indstil startside</string>
 <string name="pref_url">Direkte søge URL</string>
-<string name="pref_url_info">%1$s vil blive erstattet af dine søgeord</string>
+<string name="pref_url_info">%s vil blive erstattet af dine søgeord</string>
 <string name="pref_numresults">Antal resultater</string>
 <string name="pref_sort">Resultat sorteringsrækkefølge</string>
 <string name="pref_rss_info">RSS feeds</string>

android/res/values-de/strings.xml

@@ -14,6 +14,7 @@
 <string name="no_magnet_links">Ihr Torrent-Client unterstützt keine .magnet-Links oder diese Funktion wurde noch nicht implementiert.</string>
 <string name="save">Speichern</string>
 <string name="dismiss">Ausblenden</string>
+<string name="refresh">Aktualisieren</string>
 <string name="torrent_server">Torrent-Server</string>
 <string name="no_servers">Es wurden noch keine Server konfiguriert.</string>
 
@@ -66,6 +67,7 @@
 <string name="menu_movedown">nach unten</string>
 <string name="menu_edittrackers">Tracker editieren</string>
 <string name="menu_invertselection">Auswahl umkehren</string>
+<string name="menu_altmode">Aktualisieren</string>
 
 <string name="dialog_add_torrent">Fügen Sie die URL der Torrent-Datei ein</string>
 <string name="no_valid_url">Diese Eingabe ist keine (valide) URL</string>
@@ -75,6 +77,7 @@
 <string name="oifm_nomarket">Die Anwendung Android Market ist nicht installiert</string>
 <string name="scanner_not_found">Die Anwendung Barcode Scanner konnte nicht gefunden werden. Möchten Sie diese über den Android Market installieren?</string>
 <string name="lc_install">Um einen Fehlerreport zu senden, benötigen Sie die freie und kostenlose Log Collector App. Möchten Sie diese über den Android Markt installieren?</string>
+<string name="ftpclient_not_found">Es ist kein kompatibler FTP Client installiert.\n Möchten Sie jetzt AndFTP aus dem Android Market installieren?</string>
 
 <string name="rate_download">Maximale Download-Geschwindigkeit</string>
 <string name="rate_upload">Maximale Upload-Geschwindigkeit</string>
@@ -90,6 +93,7 @@
 <string name="addfailed_retry">Erneut versuchen</string>
 <string name="addfailed_addlater">Später hinzufügen</string>
 
+<string name="search">Suchen</string>
 <string name="searching">Suche läuft …</string>
 <string name="dialog_search">Suche nach Torrents</string>
 <string name="search_name">Torrents</string>
@@ -173,6 +177,7 @@
 
 <string name="pref_interface">Interface-Einstellungen</string>
 <string name="pref_onlytransferring">Nur Übertragende (> 0KB/s)</string>
+<string name="pref_onlytransferring_info">Torrents mit 0KB/s als inaktiv anzeigen</string>
 <string name="pref_uirefresh">Aktualisierungsintervall</string>
 <string name="pref_hiderefresh">Aktualisierung verbergen</string>
 <string name="pref_clear_search_history">Suchverlauf löschen</string>
@@ -305,7 +310,12 @@
 <string name="rss_loading_feed">RSS-Feed laden</string>
 <string name="rss_no_items">Verbunden, aber leeres RSS-Feed</string>
 
+<string name="error_401">Zugriff verweigert (Bitte überprüfen Sie ihre Einstellungen)</string>
 <string name="error_torrentfile">.torrent-Datei konnte nicht eingelesen werden</string>
+<string name="error_parsingrss">Fehler beim Parsen des RSS Feed</string>
+<string name="error_invalid_url_form">Diese URL ist ungültig</string>
+<string name="error_invalid_search_url">Ihre Websuche URL ist ungültig</string>
+<string name="error_invalid_ip_or_hostname">Die Eingabe ist keine gültige IP Adresse oder Hostname</string>
 <string name="error_invalid_port_number">Portnummer ist immer numerisch</string>
 <string name="error_invalid_directory">Verzeichnispfade enden mit / oder \\</string>
 <string name="error_invalid_timeout">Timeout darf nicht leer sein und ist eine postive Zahl</string>

android/res/values-es/strings.xml

@@ -2,7 +2,7 @@
 <resources>
 <string name="description">Gestor de clientes de -torrents con búsqueda integrada, soporte para RSS y un widget de estado.</string>
 
-<string name="no_settings_short">btorrente</string>
+<string name="no_settings_short">Abre el menú de configuración para introducir los detalles de tu servidor.</string>
 <string name="no_settings">Nuevo usuario de Transdroid?\nAbre el menú de configuración para introducir los detalles de tu servidor.\n\nPara más información: www.transdroid.org/download</string>
 <string name="no_settings_button">Mostrar opciones</string>
 <string name="connecting">Intentando conectar con el servidor...</string>
@@ -14,6 +14,7 @@
 <string name="no_magnet_links">Tu cliente de torrents no soporta enlaces .magnet o esto todavía no está implementado.</string>
 <string name="save">Guardar</string>
 <string name="dismiss">Ignorar</string>
+<string name="refresh">Refrescar</string>
 <string name="torrent_server">Servidor torrent</string>
 <string name="no_servers">Ningún servidor has sido configurado</string>
 
@@ -66,6 +67,7 @@
 <string name="menu_movedown">Ir abajo</string>
 <string name="menu_edittrackers">Editar trackers</string>
 <string name="menu_invertselection">Invertir selección</string>
+<string name="menu_altmode">Modo tortuga</string>
 
 <string name="dialog_add_torrent">Pega la URL del archivo torrent</string>
 <string name="no_valid_url">La entrada introducida no es una URL (válida)</string>
@@ -93,6 +95,7 @@
 <string name="addfailed_retry">Reintentar</string>
 <string name="addfailed_addlater">Añadir más tarde</string>
 
+<string name="search">Buscar</string>
 <string name="searching">Buscando...</string>
 <string name="dialog_search">Buscar torrents en línea</string>
 <string name="search_name">Torrents</string>
@@ -156,7 +159,7 @@
 <string name="pref_search">Motor de búsqueda</string>
 <string name="pref_setdefault">Definir sitio predeterminado</string>
 <string name="pref_url">URL de búsqueda directa</string>
-<string name="pref_url_info">%1$s se sustituirá por la cadena buscada</string>
+<string name="pref_url_info">%s se sustituirá por la cadena buscada</string>
 <string name="pref_numresults">Número de resultados</string>
 <string name="pref_sort">Orden del resultado</string>
 <string name="pref_rss_info">Fuentes RSS</string>

android/res/values-fr/strings.xml

@@ -14,6 +14,7 @@
 <string name="no_magnet_links">Votre application torrent ne supporte pas les liens .magnet  ou cela n\'est pas encore implémenté.</string>
 <string name="save">Enregistrer</string>
 <string name="dismiss">Annuler</string>
+<string name="refresh">Rafraîchir </string>
 <string name="torrent_server">Serveur torrent</string>
 <string name="no_servers">Aucun serveur n\'a été configuré</string>
 
@@ -66,9 +67,10 @@
 <string name="menu_movedown">Descendre</string>
 <string name="menu_edittrackers">Editer les trackers</string>
 <string name="menu_invertselection">Insérer la sélection</string>
+<string name="menu_altmode">Mode tortue</string>
 
 <string name="dialog_add_torrent">Coller l\'URL du fichier torrent</string>
-<string name="no_valid_url">Ce n\'est pas une URL valide</string>
+<string name="no_valid_url">Ce l\'est pas une URL valide</string>
 <string name="selectfile">Sélectionner un fichier .torrent local</string>
 <string name="oifm_not_found">Aucun gestionnaire de fichier supporté n\'a pu être trouvé. Souhaitez-vous installer OI File Manager depuis l\'Android Market ?\n\nVous pouvez aussi ouvrir un gestionnaire de fichiers non supporté et envoyer un fichier .torrent à Transdroid.</string>
 <string name="oifm_install">Installer depuis l\'Android Market</string>
@@ -91,6 +93,7 @@
 <string name="addfailed_retry">Réessayer</string>
 <string name="addfailed_addlater">Ajouter ultérieurement</string>
 
+<string name="search">Rechercher</string>
 <string name="searching">Recherche en cours...</string>
 <string name="dialog_search">Rechercher des torrents</string>
 <string name="search_name">Torrents</string>
@@ -153,7 +156,7 @@
 <string name="pref_search">Moteur de recherche</string>
 <string name="pref_setdefault">Définir le site par défaut</string>
 <string name="pref_url">Adresse directe de recherche</string>
-<string name="pref_url_info">%1$s sera remplacé par la requête de recherche</string>
+<string name="pref_url_info">%s sera remplacé par la requête de recherche</string>
 <string name="pref_numresults">Nombre de résultats</string>
 <string name="pref_sort">Ordre de tri des résultats</string>
 <string name="pref_rss_info">Flux RSS</string>

android/res/values-he/strings.xml

@@ -102,7 +102,7 @@
 
 <string name="pref_search">מנוע חיפוש</string>
 <string name="pref_url">כתובת שאילתת חיפוש</string>
-<string name="pref_url_info">%1$s יוחלף במילות החיפוש</string>
+<string name="pref_url_info">%s יוחלף במילות החיפוש</string>
 <string name="pref_numresults">מספר תוצאות</string>
 <string name="pref_sort">צורת סידור תוצאות</string>
 <string name="pref_rss_info">מקורות RSS</string>

android/res/values-it/strings.xml

@@ -156,7 +156,7 @@
 <string name="pref_search">Motore di ricerca</string>
 <string name="pref_setdefault">Imposta sito predefinito</string>
 <string name="pref_url">Ricerca diretta da URL</string>
-<string name="pref_url_info">%1$s sarà sostituito con la domanda di ricerca</string>
+<string name="pref_url_info">%s sarà sostituito con la domanda di ricerca</string>
 <string name="pref_numresults">Numero di risultati</string>
 <string name="pref_sort">Ordine risultati</string>
 <string name="pref_rss_info">Feed RSS</string>

android/res/values-pl/strings.xml

@@ -13,6 +13,7 @@
 <string name="no_magnet_links">Twój klient Torrent nie obsługuje linków typu .magnet bądź ta funkcjonalność jeszcze nie została zaimplementowana</string>
 <string name="save">Zapisz</string>
 <string name="dismiss">Pomiń</string>
+<string name="refresh">Odśwież</string>
 <string name="torrent_server">Serwer Torrent</string>
 <string name="no_servers">Serwery nie zostały jeszcze skonfigurowane</string>
 
@@ -21,12 +22,14 @@
 <string name="labels_newlabel">Nowa etykieta</string>
 <string name="labels_no_support">Ustawianie etykiet nie jest wspierane przez twojego klienta.</string>
 
+<string name="view_switchview">Przełącz widok</string>
 <string name="view_showall">Pokazano wszystkie torrenty</string>
 <string name="view_showdl">Pokazano pobierane pliki torrent</string>
 <string name="view_showul">Pokazano seedowane pliki torrent</string>
 <string name="view_showinactive">Pokazano nieaktywne pliki torrent</string>
 
 <string name="menu_add">Dodaj</string>
+<string name="menu_scanbarcode">Skanuj kod kreskowy</string>
 <string name="menu_rss">RSS</string>
 <string name="menu_servers">Zmień serwer</string>
 <string name="menu_speeds">Ustaw limit transferu</string>
@@ -49,6 +52,7 @@
 <string name="menu_errorreport">Raport błędów</string>
 <string name="menu_remove">Usuń</string>
 <string name="menu_remove_data">Usuń dane i torrent</string>
+<string name="menu_also_data">Skasuj również dane</string>
 <string name="menu_pause">Wstrzymaj</string>
 <string name="menu_resume">Wznów</string>
 <string name="menu_stop">Zatrzymaj</string>
@@ -60,6 +64,7 @@
 <string name="menu_default_site_set_to">Domyślna strona ustawiona na</string>
 <string name="menu_moveup">Do góry</string>
 <string name="menu_movedown">Do dołu</string>
+<string name="menu_altmode">Tryb żółwia</string>
 
 <string name="dialog_add_torrent">Wklej adres URL lub pliku torrent.</string>
 <string name="no_valid_url">Wprowadzony link jest nieprawidłowy.</string>
@@ -85,6 +90,7 @@
 <string name="addfailed_retry">Ponów</string>
 <string name="addfailed_addlater">Dodaj później</string>
 
+<string name="search">Szukaj</string>
 <string name="searching">Wyszukiwanie...</string>
 <string name="dialog_search">Szukaj torrentów on-line</string>
 <string name="search_name">Torrenty</string>
@@ -184,6 +190,7 @@
 <string name="pref_export_settings_info">Transdroid wyeksportuje serwer (z hasłami), wyszukiwanie w internecie i ustawienia RSS do następującego pliku tekstowego:</string>
 <string name="pref_export_settings_success">Ustawienia zostały wyeksportowane</string>
 <string name="pref_export_settings_pick">Wybierz folder</string>
+<string name="pref_enableads">Włącz reklamy</string>
 
 <string name="pref_alarm">Alarm ustaweień </string>
 <string name="pref_enablealarm">Włącz powiadomienia ustawień</string>
@@ -210,6 +217,7 @@
 <string name="status_waiting">Czekam na sprwadzenie</string>
 <string name="status_checking">Weryfikacja danych</string>
 <string name="status_waitingtodl">Czekam na pobieranie %s</string>
+<string name="status_error">Błąd...</string>
 <string name="status_size1">%1$s z %2$s (%3$s)</string>
 <string name="status_size2">%1$s, wysłano %2$s</string>
 <string name="status_eta">~ %1$s</string>
@@ -239,6 +247,8 @@
 <string name="task_setfileprop">Ustawienie właściwości pliku...</string>
 <string name="task_settransrates">Ustawienie szybkości transferu...</string>
 <string name="task_setlabel">Przypisywanie etykiet...</string>
+<string name="task_setlocation">Przenoszę torrent...</string>
+<string name="task_setalternativemode">Przełączam tryb...</string>
 
 <string name="list_refreshed">Lista torrentów odświeżona</string>
 <string name="torrent_added">Torrent dodany (odświeżanie)</string>
@@ -264,6 +274,9 @@
 <string name="details_availability">Dostępność:</string>
 <string name="details_peers">Pobierający:</string>
 <string name="details_label">Etykieta:</string>
+<string name="details_trackers_expand">%1$s (rozwiń)</string>
+<string name="details_trackers_collapse">(zwiń)</string>
+<string name="details_errors">Blędy:</string>
 <string name="details_notsupported">Listowanie plików nie jest wspieranie przez klienta torrenta lub nie zostało zaimplementowane</string>
 <string name="details_priorities_updated">Priorytety zostały zaaktualizowane</string>
 

android/res/values-ru/strings.xml

@@ -14,6 +14,7 @@
 <string name="no_magnet_links">Ваш торрент клиент не поддерживает ссылки .magnet или это еще не реализовано.</string>
 <string name="save">Сохранить</string>
 <string name="dismiss">Отменить</string>
+<string name="refresh">Обновить</string>
 <string name="torrent_server">Торрент сервер</string>
 <string name="no_servers">Серверы еще не настроены</string>
 
@@ -93,6 +94,7 @@
 <string name="addfailed_retry">Повторить</string>
 <string name="addfailed_addlater">Добавить позже</string>
 
+<string name="search">Искать</string>
 <string name="searching">Поиск...</string>
 <string name="dialog_search">Искать торренты он-лайн</string>
 <string name="search_name">Торренты</string>

android/res/values-sl/strings.xml

@@ -41,9 +41,18 @@
 <string name="menu_sort_added">Datum </string>
 <string name="menu_sort_upspeed">Hitrost oddajanja</string>
 <string name="menu_sort_ratio">Razmerje</string>
+<string name="menu_settings">Nastavitve</string>
+<string name="menu_errorreport">Porocilo o napaki</string>
+<string name="menu_pause">Pavziraj</string>
+<string name="menu_resume">Nadaljuj </string>
+<string name="menu_stop">Ustavi</string>
+<string name="menu_start">Zacni</string>
+<string name="menu_moveup">Premakni navzgor</string>
+<string name="menu_movedown">Premakni navzdol</string>
 
 
 
+<string name="search">Isci</string>
 
 
 

android/res/values-sv/strings.xml

@@ -14,6 +14,7 @@
 <string name="no_magnet_links">Din torrentklient stödjer inte .magnet-länkar</string>
 <string name="save">Spara</string>
 <string name="dismiss">Ångra</string>
+<string name="refresh">Uppdatera</string>
 <string name="torrent_server">Torrentserver</string>
 <string name="no_servers">Inga servrar har blivit konfigurerade</string>
 
@@ -66,6 +67,7 @@
 <string name="menu_movedown">Flytta ner</string>
 <string name="menu_edittrackers">Redigera trackers</string>
 <string name="menu_invertselection">Invertera val</string>
+<string name="menu_altmode">Sköldpaddsläge</string>
 
 <string name="dialog_add_torrent">Klistra in URLen för torrentfilen</string>
 <string name="no_valid_url">Det är inte en (giltig) URL</string>
@@ -93,6 +95,7 @@
 <string name="addfailed_retry">Försök igen</string>
 <string name="addfailed_addlater">Lägg till senare</string>
 
+<string name="search">Sök</string>
 <string name="searching">Söker...</string>
 <string name="dialog_search">Sök efter torrents online</string>
 <string name="search_name">Torrenter</string>

android/res/values-zh/strings.xml

@@ -4,7 +4,7 @@
 
 <string name="no_settings_short">打开设置菜单进入服务器详细信息。</string>
 <string name="no_settings">打开设置菜单输入您的服务器详细信息.\n\n安装帮助:www.transdroid.org/download</string>
-<string name="no_settings_button">打开设置iory</string>
+<string name="no_settings_button">打开设置</string>
 <string name="connecting">尝试连接到服务器...</string>
 <string name="no_torrents">已连接,但是服务器上没有种子.</string>
 <string name="no_downloading_torrents">已连接,但是服务器上没有正在下载的种子.</string>
@@ -14,6 +14,7 @@
 <string name="no_magnet_links">你的BT程序不支持磁性链接或者还没被实行</string>
 <string name="save">保存</string>
 <string name="dismiss">忽略</string>
+<string name="refresh">刷新</string>
 <string name="torrent_server">Torrent服务器</string>
 <string name="no_servers">当前没有配置服务器</string>
 
@@ -68,7 +69,7 @@
 <string name="menu_invertselection">反向选择</string>
 
 <string name="dialog_add_torrent">粘贴种子文件地址</string>
-<string name="no_valid_url">URL地址格式不对</string>
+<string name="no_valid_url">URL地址格式错误</string>
 <string name="selectfile">选择一个本地.torrent种子文件</string>
 <string name="oifm_not_found">没有发现支持的文件管理器,比如OI文件管理器.您想从Android市场安装它吗?\n\n或者,你可以打开一个不支持的文件管理器并发送一个.torrent格式的种子文件到Transdroid.</string>
 <string name="oifm_install">从市场安装</string>
@@ -81,7 +82,7 @@
 
 <string name="rate_download">最大下载速率</string>
 <string name="rate_upload">最大上传速率</string>
-<string name="rate_inkbs">只允许数字,已KB/s为单位</string>
+<string name="rate_inkbs">只允许数字,以KB/s为单位</string>
 <string name="rate_reset">重置</string>
 <string name="rate_no_support">您的BT客户端不支持设定传输速率,或者这个功能还未部署.</string>
 <string name="rate_updated">传输速率已更新</string>
@@ -93,6 +94,7 @@
 <string name="addfailed_retry">重试</string>
 <string name="addfailed_addlater">稍后添加</string>
 
+<string name="search">搜索</string>
 <string name="searching">搜索中...</string>
 <string name="dialog_search">搜索在线种子文件</string>
 <string name="search_name">种子</string>

android/src/org/transdroid/gui/DetailsFragment.java

@@ -213,7 +213,8 @@ public class DetailsFragment extends Fragment implements IDaemonCallback, OnSele
 			&& file.getMimeType() != null) {
 			menu.add(FILEMENU_REMOTESTART_ID, FILEMENU_REMOTESTART_ID, 0, R.string.file_remotestart);
 		}
-		if (daemon.getSettings().getFtpUrl() != null && !daemon.getSettings().getFtpUrl().equals("")) {
+		if (Daemon.supportsFilePaths(daemon.getType()) && daemon.getSettings().getFtpUrl() != null && 
+			!daemon.getSettings().getFtpUrl().equals("") && file.getRelativePath() != null) {
 			menu.add(FILEMENU_FTPDOWNLOAD_ID, FILEMENU_FTPDOWNLOAD_ID, 0, R.string.file_ftpdownload);
 		}
 

android/src/org/transdroid/gui/TorrentsFragment.java

@@ -128,7 +128,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 	
 	private static final int ACTIVITY_PREFERENCES = 0;
 	private static final int ACTIVITY_DETAILS = 1;
-	private static final int ACTIVITY_BARCODE = 0x0ba7c0de; // get it?
+	private static final int ACTIVITY_BARCODE = 0x0000c0de;
 	
 	private static final int DIALOG_SERVERS = 0;
 	private static final int DIALOG_RATES = 1;

android/src/org/transdroid/gui/rss/RssListingFragment.java

@@ -501,7 +501,9 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
 
 	private void setProgressBar(boolean b) {
 		inProgress = b;
-		getSupportActivity().invalidateOptionsMenu();
+		if (getSupportActivity() != null) {
+			getSupportActivity().invalidateOptionsMenu();
+		}
 	}
 
     /*@Override

android/src/org/transdroid/preferences/Preferences.java

@@ -590,9 +590,7 @@ public class Preferences {
     }
 
     public static SiteSettings getSupportedSiteSetting(String preferencesKey) {
-    	if (preferencesKey.equals("site_btjunkie")) {
-    		return new SiteSettings(preferencesKey, "BTJunkie");
-    	} else if (preferencesKey.equals("site_extratorrent")) {
+    	if (preferencesKey.equals("site_extratorrent")) {
     		return new SiteSettings(preferencesKey, "ExtraTorrent");
     	} else if (preferencesKey.equals("site_ezrss")) {
     		return new SiteSettings(preferencesKey, "EzRss");