Changeset 438


Ignore:
Timestamp:
05/13/08 17:13:51 (12 years ago)
Author:
Eoin
Message:

Cleaned up Progress Dialog and NewTorrent? Dialog.
Ruby language script now splits up ';' strings.
More ignores for language script.

Location:
trunk
Files:
32 edited

Legend:

Unmodified
Added
Removed
  • trunk/lang/Build.bat

    r433 r438  
    1 call ruby tools\res_translator.rb ../res/ Halite Dutch German French Italian Norwegian Polish Russian "Serbian (Cyrillic)" Serbian Slovenian Spanish Turkish Swedish Portuguese Japanese 
     1call ruby tools\res_translator.rb ../res/ Halite Dutch French German Italian Japanese Norwegian NewLang Polish Portuguese Russian Serbian "Serbian (Cyrillic)" Spanish Swedish Turkish 
  • trunk/lang/Italian.txt

    r433 r438  
    1 "" ---> "" 
     1"English" ---> "Italiano" 
     2"English.rtf" ---> "../lang/Italian.rtf" 
    23"%1$.2fKB/s down - %2$.2fKB/s up" --->  ???  
    34"%1$.2fMB down - %2$.2fMB up" --->  ???  
     
    1112"(D-U) 0000.000KB/s - 0000.000KB/s" --->  ???  
    1213"(DHT will not apply to private torrents)" ---> "(il DHT non funzionerà per i torrents privati)" 
    13 "*** Disabled ***" ---> "*** Disabilitato ***" 
    14 "..." --->  ???  
    15 "2" --->  ???  
    16 "3" --->  ???  
    17 "4" --->  ???  
    18 "6" --->  ???  
    1914"About" ---> "A proposito di" 
    2015"Above Normal" ---> "Alta" 
     16"Active" --->  ???  
    2117"Add New Peer" --->  ???  
    2218"Add New Tracker" ---> "Aggiungi Nuovo Tracker" 
     
    3834"Block %2% of piece %3% finished. (%1%)" --->  ???  
    3935"Both" ---> "Entrambi" 
    40 "Button1" --->  ???  
    4136"Calculating Piece Hashes..." --->  ???  
    4237"Cancel" ---> "Annulla" 
     
    4439"Choked" --->  ???  
    4540"Clear IP database" ---> "Cancella database IP" 
     41"Client" ---> "Client" 
    4642"Close to tray" --->  ???  
    4743"Comment" --->  ???  
    4844"Comments" ---> "Commenti" 
    4945"CompanyName" --->  ???  
     46"Completed" --->  ???  
    5047"Completed:" ---> "Completato" 
    5148"Confirm on close" --->  ???  
     
    5451"Connection Policies" ---> "Comportamenti di Connessione" 
    5552"Construct a New Torrent" --->  ???  
     53"Copies" --->  ???  
     54"Country" ---> "Nazione" 
    5655"Creating Torrent..." --->  ???  
     56"Creating a New Torrent File" --->  ???  
    5757"Creator" --->  ???  
    5858"Critical" --->  ???  
     
    7373"Down" --->  ???  
    7474"Download Rate (KB/s) :" ---> "Velocità Download (KB/s) :" 
     75"Download" ---> "Download" 
    7576"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Scaricati %1$.2fMB, Inviati %2$.2fMB, Ratio %3$.2f" 
     77"Downloaded" --->  ???  
    7678"Downloading Metadata" ---> "Scaricando Metadata" 
    7779"Downloading" --->  ???  
    7880"E&xit" ---> "&Esci" 
     81"ETA" --->  ???  
    7982"ETA:" --->  ???  
     83"Edit Download Folders" --->  ???  
    8084"Edit Peer" --->  ???  
    8185"Edit Tracker" --->  ???  
     
    8791"Enabled" ---> "Abilitata" 
    8892"Encoding Level" ---> "Livello di codifica" 
    89 "English" ---> "Italiano" 
    90 "English.rtf" ---> "../lang/Italian.rtf" 
    9193"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9294"Enter the tracker URLs for the torrent." ---> "Inserisci gli indirizzi dei tracker per il torrent." 
    93 "Exception caught; %1%, from %2%." ---> "Rilevato errore; %1%, da %2%." 
     95"Exception caught: %1%, from %2%." ---> "Rilevato errore: %1%, da %2%." 
    9496"Failed, %1%" --->  ???  
    9597"Fast resume failed: %2%. (%1%)" --->  ???  
     
    9799"FileDescription" --->  ???  
    98100"FileVersion" --->  ???  
    99 "Filename;Path;Size" --->  ???  
    100 "Filename;Path;Size;Progress;Priority" ---> "Nome File;Destinazione;Dimensione;Progresso;Priorità" 
     101"Filename" ---> "Nome File" 
    101102"Files" --->  ???  
    102103"Filtering %1% range(s)" ---> "Filtrando %1% intervalli" 
     104"Finish Time" --->  ???  
    103105"Finished" ---> "Finito" 
    104106"Forced" ---> "Forzata" 
     
    111113"Halite not listening!" ---> "Halite non riceve!" 
    112114"Halite shutting down..." ---> "Halite in chiusura...." 
    113 "Halite" --->  ???  
    114 "Halite.exe" --->  ???  
    115115"Handshake" --->  ???  
    116116"Has choked us" --->  ???  
     
    131131"Limit the no. of half-open connections" ---> "Limita il n. di connessioni simultanee" 
    132132"List of Trackers." ---> "Lista dei Trackers ." 
     133"Loading IP filters..." --->  ???  
    133134"Local connection" --->  ???  
    134135"Log debug events." ---> "Log eventi di debug." 
     
    136137"Logging" --->  ???  
    137138"Maximum" ---> "Massima" 
     139"Message" ---> "Messaggio" 
    138140"Minimize to tray." ---> "Riduci nella Tray" 
    139141"Move finished torrents to :" --->  ???  
     
    141143"N/A" ---> "N/A" 
    142144"NAT-PMG" --->  ???  
     145"Name" --->  ???  
    143146"Name:" ---> "Nome" 
    144 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    145147"New" ---> "Nuovo" 
    146148"None (Managed Externally)" --->  ???  
     
    158160"Overhead:" --->  ???  
    159161"Password : " --->  ???  
     162"Path" ---> "Destinazione" 
    160163"Pause" ---> "Pausa" 
    161164"Paused" ---> "In Pausa" 
     
    164167"Peer Event: %1%." ---> "Evento Peer: %1%." 
    165168"Peer banned %2%. (%1%)" --->  ???  
    166 "Peer" --->  ???  
    167 "Peer;Country;Download;Upload;Type;Client" ---> "Peer;Nazione;Download;Upload;Tipo;Client" 
    168 "Peer;Country;Download;Upload;Type;Client;Status" ---> "Peer;Nazione;Download;Upload;Tipo;Client;Stato" 
     169"Peer" ---> "Peer" 
    169170"Peers" --->  ???  
    170171"Peers:" --->  ???  
     
    180181"Preannounce" --->  ???  
    181182"Prefer RC4" ---> "Preferisci RC4" 
     183"Priority" ---> "Priorità" 
    182184"Private" --->  ???  
    183185"ProductName" --->  ???  
    184186"ProductVersion" --->  ???  
     187"Progress" ---> "Progresso" 
    185188"Protocol Encryption" ---> "Criptazione Protocollare" 
    186189"Proxies" --->  ???  
     
    193196"Rates:" ---> "Rapporto" 
    194197"Ratio (this session):" ---> "Ratio (questa sessione):" 
     198"Ratio" --->  ???  
    195199"Ratio:" --->  ???  
     200"Reannounce" --->  ???  
    196201"Recheck Files" --->  ???  
     202"Remaining" --->  ???  
    197203"Remaining:" ---> "Rimanenti" 
    198204"Remote Control Options" ---> "Opzioni Controllo Remoto" 
     
    206212"Security" ---> "Sicurezza" 
    207213"Seeding" --->  ???  
     214"Seeds" --->  ???  
    208215"Seeds:" --->  ???  
    209216"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." ---> "Seleziona una cartella in cui salvare i files. Premi annulla per accettare la destinazione predefinita." 
     
    214221"Set Priority" ---> "Priorità" 
    215222"Set as Primary" ---> "Seleziona come Primario" 
     223"Severity" ---> "Gravità" 
    216224"Show this message in future" ---> "Mostra messaggio in futuro" 
     225"Size" ---> "Dimensione" 
    217226"Standard exception (%1%) thrown from %2%." --->  ???  
     227"Start Time" --->  ???  
     228"Status" ---> "Stato" 
    218229"Status:" ---> "Stato" 
    219230"Stop" ---> "Ferma" 
     
    231242"Tier" ---> "Priorità" 
    232243"Time left:" ---> "Al termine" 
    233 "Time;Message;Severity" ---> "Orario;Messaggio;Gravità" 
     244"Time" ---> "Orario" 
    234245"Torrent %1% finished." ---> "Torrent %1% finito" 
    235246"Torrent %1% paused." ---> "Torrent %1% in pausa" 
    236 "Torrent (%1%) exception caught; %2% from %3%." --->  ???  
     247"Torrent (%1%) exception caught: %2% from %3%." --->  ???  
    237248"Torrent Defaults" ---> "Limiti per file Torrent" 
    238249"Torrent File" ---> "File Torrent" 
     
    246257"Torrents" --->  ???  
    247258"Total max connections :" ---> "Numero massimo di connessioni" 
    248 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." ---> "Trasferimenti totali, incluso overhead del protocollo; %1$.2fMB down e %2$.2fMB up." 
     259"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." ---> "Trasferimenti totali, incluso overhead del protocollo: %1$.2fMB down e %2$.2fMB up." 
    249260"Total upload slots :" ---> "Slot di upload totali" 
    250261"Total" ---> "Totale" 
     
    252263"Tracker Event: %1%." ---> "Evento Tracker: %1%." 
    253264"Tracker warning: %2%! (%1%)" --->  ???  
    254 "Tracker" --->  ???  
     265"Tracker" ---> "Tracker" 
    255266"Tracker:" --->  ???  
    256 "Tracker;Tier" ---> "Tracker;Priorità" 
    257267"Trackers" --->  ???  
    258268"Transferred:" ---> "Trasferiti" 
    259269"Translation" --->  ???  
    260 "Type" --->  ???  
     270"Type" ---> "Tipo" 
    261271"URL Seed %2%, %3%. (%1%)" --->  ???  
    262272"URL" --->  ???  
    263 "URL;Port;Type" --->  ???  
    264273"UnPlug and Play" --->  ???  
    265274"Unicode exception: %1%." ---> "Errore Unicode: %1%." 
     
    267276"Update in:" ---> "Aggiorno tra:" 
    268277"Upload Rate (KB/s) :" ---> "Velocità Upload (KB/s) :" 
     278"Upload" ---> "Upload" 
     279"Uploaded" --->  ???  
    269280"Use Compact Allocation." ---> "Usa Allocazione Compatta" 
    270281"Use a proxy." ---> "Usa un proxy." 
     282"User canceled Torrent file creation" --->  ???  
    271283"Username : " ---> "Nome Utente :" 
    272284"Warning" --->  ???  
  • trunk/lang/Japanese.txt

    r434 r438  
    1 "" --->  ???  
     1"English" ---> "日本語" 
     2"English.rtf" --->  ???  
    23"%1$.2fKB/s down - %2$.2fKB/s up" --->  ???  
    34"%1$.2fMB down - %2$.2fMB up" --->  ???  
     
    1112"(D-U) 0000.000KB/s - 0000.000KB/s" --->  ???  
    1213"(DHT will not apply to private torrents)" --->  ???  
    13 "*** Disabled ***" ---> "***䜿甚䞍可***" 
    14 "..." --->  ???  
    15 "2" --->  ???  
    16 "3" --->  ???  
    17 "4" --->  ???  
    18 "6" --->  ???  
    1914"About" ---> "Haliteに぀いお" 
    2015"Above Normal" ---> "普通" 
     16"Active" --->  ???  
    2117"Add New Peer" --->  ???  
    2218"Add New Tracker" --->  ???  
     
    3834"Block %2% of piece %3% finished. (%1%)" --->  ???  
    3935"Both" ---> "äž¡" 
    40 "Button1" --->  ???  
    4136"Calculating Piece Hashes..." --->  ???  
    4237"Cancel" ---> "取消" 
     
    4439"Choked" --->  ???  
    4540"Clear IP database" ---> "IP デヌタベヌスを削陀" 
     41"Client" ---> "クラむアント" 
    4642"Close to tray" --->  ???  
    4743"Comment" --->  ???  
    4844"Comments" ---> "コメント" 
    4945"CompanyName" --->  ???  
     46"Completed" --->  ???  
    5047"Completed:" ---> "ダりンロヌド枈" 
    5148"Confirm on close" --->  ???  
     
    5451"Connection Policies" --->  ???  
    5552"Construct a New Torrent" --->  ???  
     53"Copies" --->  ???  
     54"Country" ---> "囜" 
    5655"Creating Torrent..." --->  ???  
     56"Creating a New Torrent File" --->  ???  
    5757"Creator" --->  ???  
    5858"Critical" --->  ???  
     
    7373"Down" ---> "äž‹ã‚Š" 
    7474"Download Rate (KB/s) :" ---> "䞋り速床 (KB/秒)" 
     75"Download" ---> "ダりンロヌド" 
    7576"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." --->  ???  
     77"Downloaded" --->  ???  
    7678"Downloading Metadata" --->  ???  
    7779"Downloading" ---> "ダりンロヌド䞭" 
    7880"E&xit" --->  ???  
     81"ETA" --->  ???  
    7982"ETA:" ---> "予想完了時間" 
     83"Edit Download Folders" --->  ???  
    8084"Edit Peer" --->  ???  
    8185"Edit Tracker" --->  ???  
     
    8791"Enabled" ---> "䜿甚する" 
    8892"Encoding Level" --->  ???  
    89 "English" ---> "日本語" 
    90 "English.rtf" --->  ???  
    9193"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9294"Enter the tracker URLs for the torrent." --->  ???  
    93 "Exception caught; %1%, from %2%." --->  ???  
     95"Exception caught: %1%, from %2%." --->  ???  
    9496"Failed, %1%" --->  ???  
    9597"Fast resume failed: %2%. (%1%)" --->  ???  
     
    9799"FileDescription" --->  ???  
    98100"FileVersion" --->  ???  
    99 "Filename;Path;Size" --->  ???  
    100 "Filename;Path;Size;Progress;Priority" ---> "名前;Path;サむズ;完了床;優å 
    101 ˆåºŠ" 
     101"Filename" ---> "名前" 
    102102"Files" ---> "ファむル" 
    103103"Filtering %1% range(s)" --->  ???  
     104"Finish Time" --->  ???  
    104105"Finished" ---> "ダりンロヌド枈" 
    105106"Forced" ---> "匷制䜿甚" 
     
    112113"Halite not listening!" --->  ???  
    113114"Halite shutting down..." --->  ???  
    114 "Halite" --->  ???  
    115 "Halite.exe" --->  ???  
    116115"Handshake" --->  ???  
    117116"Has choked us" --->  ???  
     
    132131"Limit the no. of half-open connections" --->  ???  
    133132"List of Trackers." --->  ???  
     133"Loading IP filters..." --->  ???  
    134134"Local connection" --->  ???  
    135135"Log debug events." --->  ???  
     
    137137"Logging" ---> "ログ" 
    138138"Maximum" ---> "高" 
     139"Message" ---> "メッセヌゞ" 
    139140"Minimize to tray." ---> "最小化時トレむに栌玍" 
    140141"Move finished torrents to :" --->  ???  
     
    142143"N/A" ---> "無し" 
    143144"NAT-PMG" --->  ???  
     145"Name" --->  ???  
    144146"Name:" ---> "名前:" 
    145 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    146147"New" ---> "新芏" 
    147148"None (Managed Externally)" --->  ???  
     
    159160"Overhead:" --->  ???  
    160161"Password : " ---> "パスワヌド" 
     162"Path" ---> "Path" 
    161163"Pause" ---> "䞀時停止" 
    162164"Paused" ---> "䞀時停止䞭" 
     
    166168"Peer banned %2%. (%1%)" --->  ???  
    167169"Peer" ---> "ピア" 
    168 "Peer;Country;Download;Upload;Type;Client" ---> "ピア;囜;ダりンロヌド;アップロヌド;タむプ;クラむアント" 
    169 "Peer;Country;Download;Upload;Type;Client;Status" ---> "ピア;囜;ダりンロヌド;アップロヌド;タむプ;クラむアント;状æ 
    170 ‹" 
    171170"Peers" ---> "ピア" 
    172171"Peers:" ---> "ピア数" 
     
    182181"Preannounce" --->  ???  
    183182"Prefer RC4" --->  ???  
     183"Priority" ---> "優å 
     184ˆåºŠ" 
    184185"Private" --->  ???  
    185186"ProductName" --->  ???  
    186187"ProductVersion" --->  ???  
     188"Progress" ---> "完了床" 
    187189"Protocol Encryption" ---> "プロトコル暗号化" 
    188190"Proxies" ---> "プロクシ" 
     
    196198"Ratio (this session):" ---> "å 
    197199±æœ‰æ¯” (このセッションに):" 
     200"Ratio" --->  ???  
    198201"Ratio:" ---> "å 
    199202±æœ‰æ¯”:" 
     203"Reannounce" --->  ???  
    200204"Recheck Files" --->  ???  
     205"Remaining" --->  ???  
    201206"Remaining:" ---> "残り:" 
    202207"Remote Control Options" --->  ???  
     
    210215"Security" ---> "セキュリティ" 
    211216"Seeding" --->  ???  
     217"Seeds" --->  ???  
    212218"Seeds:" ---> "シヌド数:" 
    213219"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." --->  ???  
     
    219225ˆåºŠ" 
    220226"Set as Primary" --->  ???  
     227"Severity" ---> "厳粛" 
    221228"Show this message in future" ---> "このチェックを垞に行う" 
     229"Size" ---> "サむズ" 
    222230"Standard exception (%1%) thrown from %2%." --->  ???  
     231"Start Time" --->  ???  
     232"Status" ---> "状æ 
     233‹" 
    223234"Status:" ---> "状æ 
    224235‹:" 
     
    235246"These options specify the default limits applied to new torrents." --->  ???  
    236247"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." --->  ???  
    237 "Tier" --->  ???  
     248"Tier" ---> "段" 
    238249"Time left:" ---> "残り時間" 
    239 "Time;Message;Severity" ---> "日時;メッセヌゞ;厳粛" 
     250"Time" ---> "日時" 
    240251"Torrent %1% finished." --->  ???  
    241252"Torrent %1% paused." --->  ???  
    242 "Torrent (%1%) exception caught; %2% from %3%." --->  ???  
     253"Torrent (%1%) exception caught: %2% from %3%." --->  ???  
    243254"Torrent Defaults" --->  ???  
    244255"Torrent File" --->  ???  
     
    252263"Torrents" ---> "トレント" 
    253264"Total max connections :" --->  ???  
    254 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." --->  ???  
     265"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." --->  ???  
    255266"Total upload slots :" --->  ???  
    256267"Total" ---> "サむズ" 
     
    260271"Tracker" ---> "トラッカヌ" 
    261272"Tracker:" ---> "トラッカヌ:" 
    262 "Tracker;Tier" ---> "トラッカヌ;段" 
    263273"Trackers" --->  ???  
    264274"Transferred:" --->  ???  
    265275"Translation" --->  ???  
    266 "Type" --->  ???  
     276"Type" ---> "タむプ" 
    267277"URL Seed %2%, %3%. (%1%)" --->  ???  
    268278"URL" --->  ???  
    269 "URL;Port;Type" --->  ???  
    270279"UnPlug and Play" --->  ???  
    271280"Unicode exception: %1%." --->  ???  
     
    273282"Update in:" ---> "曎新時間:" 
    274283"Upload Rate (KB/s) :" ---> "䞊り速床 (KB/秒)" 
     284"Upload" ---> "アップロヌド" 
     285"Uploaded" --->  ???  
    275286"Use Compact Allocation." --->  ???  
    276287"Use a proxy." ---> "プロクシを䜿甚" 
     288"User canceled Torrent file creation" --->  ???  
    277289"Username : " ---> "ナヌザ名" 
    278290"Warning" --->  ???  
  • trunk/lang/Norwegian.txt

    r433 r438  
    1 "" --->  ???  
     1"English" ---> "Norwegian" 
     2"English.rtf" --->  ???  
    23"%1$.2fKB/s down - %2$.2fKB/s up" --->  ???  
    34"%1$.2fMB down - %2$.2fMB up" --->  ???  
     
    1112"(D-U) 0000.000KB/s - 0000.000KB/s" --->  ???  
    1213"(DHT will not apply to private torrents)" --->  ???  
    13 "*** Disabled ***" ---> "*** Ikke aktivert ***" 
    14 "..." --->  ???  
    15 "2" --->  ???  
    16 "3" --->  ???  
    17 "4" --->  ???  
    18 "6" --->  ???  
    1914"About" ---> "Om" 
    2015"Above Normal" --->  ???  
     16"Active" --->  ???  
    2117"Add New Peer" --->  ???  
    2218"Add New Tracker" ---> "Legg til ny tracker" 
     
    3834"Block %2% of piece %3% finished. (%1%)" --->  ???  
    3935"Both" --->  ???  
    40 "Button1" --->  ???  
    4136"Calculating Piece Hashes..." --->  ???  
    4237"Cancel" ---> "Avbryt" 
     
    4439"Choked" ---> "Strypt" 
    4540"Clear IP database" ---> "Nullstill IP database" 
     41"Client" --->  ???  
    4642"Close to tray" --->  ???  
    4743"Comment" --->  ???  
    4844"Comments" ---> "Kommentarer" 
    4945"CompanyName" ---> "Firmanavn" 
     46"Completed" --->  ???  
    5047"Completed:" --->  ???  
    5148"Confirm on close" --->  ???  
     
    5451"Connection Policies" --->  ???  
    5552"Construct a New Torrent" --->  ???  
     53"Copies" --->  ???  
     54"Country" --->  ???  
    5655"Creating Torrent..." --->  ???  
     56"Creating a New Torrent File" --->  ???  
    5757"Creator" --->  ???  
    5858"Critical" ---> "Kritisk" 
     
    7373"Down" ---> "Ned" 
    7474"Download Rate (KB/s) :" ---> "Nedlasings-rate (KB/s) :" 
     75"Download" --->  ???  
    7576"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Lastet ned %1$.2fMB, Lastet opp %2$.2fMB, Ratio %3$.2f." 
     77"Downloaded" --->  ???  
    7678"Downloading Metadata" ---> "Laster ned metadata" 
    7779"Downloading" ---> "Laster ned" 
    7880"E&xit" --->  ???  
     81"ETA" --->  ???  
    7982"ETA:" --->  ???  
     83"Edit Download Folders" --->  ???  
    8084"Edit Peer" --->  ???  
    8185"Edit Tracker" --->  ???  
     
    8791"Enabled" --->  ???  
    8892"Encoding Level" --->  ???  
    89 "English" ---> "Norwegian" 
    90 "English.rtf" --->  ???  
    9193"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9294"Enter the tracker URLs for the torrent." ---> "Legg til tracker URL'er for torrenten." 
    93 "Exception caught; %1%, from %2%." ---> "Exception fanget; %1%, fra %2%." 
     95"Exception caught: %1%, from %2%." ---> "Exception fanget: %1%, fra %2%." 
    9496"Failed, %1%" --->  ???  
    9597"Fast resume failed: %2%. (%1%)" --->  ???  
     
    9799"FileDescription" ---> "Filbeskrivelse" 
    98100"FileVersion" ---> "FilVersion" 
    99 "Filename;Path;Size" --->  ???  
    100 "Filename;Path;Size;Progress;Priority" --->  ???  
     101"Filename" --->  ???  
    101102"Files" --->  ???  
    102103"Filtering %1% range(s)" ---> "Filtrerer %1% serie(r)" 
     104"Finish Time" --->  ???  
    103105"Finished" ---> "Ferdig" 
    104106"Forced" --->  ???  
     
    111113"Halite not listening!" ---> "Halite lytter ikke!" 
    112114"Halite shutting down..." ---> "Halite lukkes..." 
    113 "Halite" --->  ???  
    114 "Halite.exe" --->  ???  
    115115"Handshake" --->  ???  
    116116"Has choked us" ---> "Har strypt oss" 
     
    131131"Limit the no. of half-open connections" --->  ???  
    132132"List of Trackers." ---> "Liste over trackere." 
     133"Loading IP filters..." --->  ???  
    133134"Local connection" ---> "Lokal tilkobling" 
    134135"Log debug events." ---> "Logg debug-hendelser" 
     
    136137"Logging" --->  ???  
    137138"Maximum" --->  ???  
     139"Message" ---> "Melding" 
    138140"Minimize to tray." ---> "Minimer til systemfelt" 
    139141"Move finished torrents to :" --->  ???  
     
    141143"N/A" ---> "I/T" 
    142144"NAT-PMG" --->  ???  
     145"Name" --->  ???  
    143146"Name:" ---> "Navn:" 
    144 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    145147"New" ---> "Ny" 
    146148"None (Managed Externally)" --->  ???  
     
    160162"Overhead:" --->  ???  
    161163"Password : " ---> "Passord : " 
     164"Path" --->  ???  
    162165"Pause" --->  ???  
    163166"Paused" ---> "Pauset" 
     
    167170"Peer banned %2%. (%1%)" --->  ???  
    168171"Peer" --->  ???  
    169 "Peer;Country;Download;Upload;Type;Client" --->  ???  
    170 "Peer;Country;Download;Upload;Type;Client;Status" --->  ???  
    171172"Peers" --->  ???  
    172173"Peers:" --->  ???  
     
    182183"Preannounce" --->  ???  
    183184"Prefer RC4" --->  ???  
     185"Priority" --->  ???  
    184186"Private" --->  ???  
    185187"ProductName" ---> "Produktnavn" 
    186188"ProductVersion" ---> "Produktversjon" 
     189"Progress" --->  ???  
    187190"Protocol Encryption" --->  ???  
    188191"Proxies" --->  ???  
     
    195198"Rates:" --->  ???  
    196199"Ratio (this session):" ---> "Ratio (denne sesjonen):" 
     200"Ratio" --->  ???  
    197201"Ratio:" --->  ???  
     202"Reannounce" --->  ???  
    198203"Recheck Files" --->  ???  
     204"Remaining" --->  ???  
    199205"Remaining:" --->  ???  
    200206"Remote Control Options" ---> "Egenskaper for fjernstyring" 
     
    208214"Security" --->  ???  
    209215"Seeding" --->  ???  
     216"Seeds" --->  ???  
    210217"Seeds:" --->  ???  
    211218"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." --->  ???  
     
    216223"Set Priority" --->  ???  
    217224"Set as Primary" --->  ???  
     225"Severity" ---> "Alvorlighetsgrad" 
    218226"Show this message in future" ---> "Vis denne meldingen i fremtiden" 
     227"Size" --->  ???  
    219228"Standard exception (%1%) thrown from %2%." ---> "Standard unntak (%1%) reist av %2%." 
     229"Start Time" --->  ???  
     230"Status" --->  ???  
    220231"Status:" --->  ???  
    221232"Stop" ---> "Stopp" 
     
    233244"Tier" --->  ???  
    234245"Time left:" ---> "Tid gjenstÃ¥r:" 
    235 "Time;Message;Severity" ---> "Tid;Melding;Alvorlighetsgrad" 
     246"Time" ---> "Tid" 
    236247"Torrent %1% finished." --->  ???  
    237248"Torrent %1% paused." --->  ???  
    238 "Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) unntak fanget; %2% fra %3%." 
     249"Torrent (%1%) exception caught: %2% from %3%." ---> "Torrent (%1%) unntak fanget: %2% fra %3%." 
    239250"Torrent Defaults" --->  ???  
    240251"Torrent File" ---> "Torrent Fil" 
     
    248259"Torrents" ---> "Torrenter" 
    249260"Total max connections :" ---> "Maksimalt antall tilkoblinger :" 
    250 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." --->  ???  
     261"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." --->  ???  
    251262"Total upload slots :" ---> "Totalt opplastings-slots :" 
    252263"Total" ---> "Totalt" 
     
    256267"Tracker" --->  ???  
    257268"Tracker:" --->  ???  
    258 "Tracker;Tier" --->  ???  
    259269"Trackers" --->  ???  
    260270"Transferred:" --->  ???  
     
    263273"URL Seed %2%, %3%. (%1%)" --->  ???  
    264274"URL" --->  ???  
    265 "URL;Port;Type" --->  ???  
    266275"UnPlug and Play" --->  ???  
    267276"Unicode exception: %1%." --->  ???  
     
    269278"Update in:" ---> "Oppdater om:" 
    270279"Upload Rate (KB/s) :" ---> "Opplasings-rate (KB/s) :" 
     280"Upload" --->  ???  
     281"Uploaded" --->  ???  
    271282"Use Compact Allocation." --->  ???  
    272283"Use a proxy." ---> "Bruk en proxy." 
     284"User canceled Torrent file creation" --->  ???  
    273285"Username : " ---> "Brukernavn : " 
    274286"Warning" --->  ???  
  • trunk/lang/Portuguese.txt

    r434 r438  
    1 "" --->  ???  
     1"English" ---> "Português" 
     2"English.rtf" --->  ???  
    23"%1$.2fKB/s down - %2$.2fKB/s up" ---> "%1$.2fKB/s baixado - %2$.2fKB/s upado" 
    34"%1$.2fMB down - %2$.2fMB up" ---> "%1$.2fMB baixado - %2$.2fMB upado" 
     
    1112"(D-U) 0000.000KB/s - 0000.000KB/s" --->  ???  
    1213"(DHT will not apply to private torrents)" ---> "(DHT não será usado em torrents privados)" 
    13 "*** Disabled ***" ---> "*** Disabilitado ***" 
    14 "..." --->  ???  
    15 "2" --->  ???  
    16 "3" --->  ???  
    17 "4" --->  ???  
    18 "6" --->  ???  
    1914"About" ---> "Sobre" 
    2015"Above Normal" ---> "Acima do normal" 
     16"Active" --->  ???  
    2117"Add New Peer" --->  ???  
    2218"Add New Tracker" ---> "Adicionar novo rastreador" 
     
    3834"Block %2% of piece %3% finished. (%1%)" --->  ???  
    3935"Both" ---> "Ambos" 
    40 "Button1" --->  ???  
    4136"Calculating Piece Hashes..." --->  ???  
    4237"Cancel" ---> "Cancelar" 
     
    4439"Choked" --->  ???  
    4540"Clear IP database" ---> "Apagar todas as listas de IPs" 
     41"Client" ---> "Cliente" 
    4642"Close to tray" --->  ???  
    4743"Comment" --->  ???  
    4844"Comments" ---> "Comentários" 
    4945"CompanyName" --->  ???  
     46"Completed" --->  ???  
    5047"Completed:" ---> "Completado:" 
    5148"Confirm on close" --->  ???  
     
    5451"Connection Policies" ---> "Política de conexões" 
    5552"Construct a New Torrent" --->  ???  
     53"Copies" --->  ???  
     54"Country" ---> "País" 
    5655"Creating Torrent..." --->  ???  
     56"Creating a New Torrent File" --->  ???  
    5757"Creator" --->  ???  
    5858"Critical" ---> "Crítico" 
     
    7373"Down" ---> "Baixado" 
    7474"Download Rate (KB/s) :" ---> "Baixar com velocidade (KB/s) :" 
     75"Download" ---> "Baixando" 
    7576"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Baixado %1$.2fMB, Upado %2$.2fMB, Razão %3$.2f." 
     77"Downloaded" --->  ???  
    7678"Downloading Metadata" ---> "Baixando Metadata" 
    7779"Downloading" ---> "Baixando" 
    7880"E&xit" ---> "&Sair" 
     81"ETA" --->  ???  
    7982"ETA:" ---> "TED" 
     83"Edit Download Folders" --->  ???  
    8084"Edit Peer" --->  ???  
    8185"Edit Tracker" --->  ???  
     
    8791"Enabled" ---> "Habilitado" 
    8892"Encoding Level" ---> "Nível de codificação" 
    89 "English" ---> "Português" 
    90 "English.rtf" --->  ???  
    9193"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9294"Enter the tracker URLs for the torrent." ---> "Digite os endereços (URL) dos rastreadores para o torrent." 
    93 "Exception caught; %1%, from %2%." ---> "Exceção detectada; %1%, do %2%." 
     95"Exception caught: %1%, from %2%." ---> "Exceção detectada: %1%, do %2%." 
    9496"Failed, %1%" --->  ???  
    9597"Fast resume failed: %2%. (%1%)" --->  ???  
     
    9799"FileDescription" --->  ???  
    98100"FileVersion" --->  ???  
    99 "Filename;Path;Size" --->  ???  
    100 "Filename;Path;Size;Progress;Priority" ---> "Nome do arquivo;Caminho;Tamanho;Progresso;Prioridade" 
     101"Filename" ---> "Nome do arquivo" 
    101102"Files" ---> "Arquivos" 
    102103"Filtering %1% range(s)" ---> "Filtrando %1% intervalo(s)" 
     104"Finish Time" --->  ???  
    103105"Finished" ---> "Concluído" 
    104106"Forced" ---> "Forçado" 
     
    111113"Halite not listening!" ---> "Halite não está ouvindo!" 
    112114"Halite shutting down..." ---> "Halite encerrando...." 
    113 "Halite" --->  ???  
    114 "Halite.exe" --->  ???  
    115115"Handshake" ---> "Aperto de mão" 
    116116"Has choked us" --->  ???  
     
    131131"Limit the no. of half-open connections" ---> "Limite o número de conexões meio-abertas" 
    132132"List of Trackers." ---> "Lista de rastreadores." 
     133"Loading IP filters..." --->  ???  
    133134"Local connection" ---> "Conexão local" 
    134135"Log debug events." ---> "Escrever no log os eventos de debug." 
     
    136137"Logging" ---> "Escrevndo o log" 
    137138"Maximum" ---> "Máximo" 
     139"Message" ---> "Mensagem" 
    138140"Minimize to tray." ---> "Minimizar para a barra" 
    139141"Move finished torrents to :" --->  ???  
     
    141143"N/A" --->  ???  
    142144"NAT-PMG" --->  ???  
     145"Name" --->  ???  
    143146"Name:" ---> "Nome:" 
    144 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    145147"New" ---> "Novo" 
    146148"None (Managed Externally)" --->  ???  
     
    158160"Overhead:" ---> "Gasto:" 
    159161"Password : " ---> "senha : " 
     162"Path" ---> "Caminho" 
    160163"Pause" ---> "Pausar" 
    161164"Paused" ---> "Pausado" 
     
    165168"Peer banned %2%. (%1%)" --->  ???  
    166169"Peer" ---> "Peer" 
    167 "Peer;Country;Download;Upload;Type;Client" ---> "Peer;País;Baixando;Upando;Tipo;Cliente" 
    168 "Peer;Country;Download;Upload;Type;Client;Status" ---> "Peer;País;Baixando;Upando;Tipo;Cliente;Estado" 
    169170"Peers" --->  ???  
    170171"Peers:" --->  ???  
     
    180181"Preannounce" --->  ???  
    181182"Prefer RC4" ---> "Preferir RC4" 
     183"Priority" ---> "Prioridade" 
    182184"Private" --->  ???  
    183185"ProductName" --->  ???  
    184186"ProductVersion" --->  ???  
     187"Progress" ---> "Progresso" 
    185188"Protocol Encryption" ---> "Encriptação de Protocolo" 
    186189"Proxies" ---> "Proxies" 
     
    193196"Rates:" ---> "Razões:" 
    194197"Ratio (this session):" ---> "Razão (nessa seção):" 
     198"Ratio" --->  ???  
    195199"Ratio:" ---> "Razão:" 
     200"Reannounce" --->  ???  
    196201"Recheck Files" --->  ???  
     202"Remaining" --->  ???  
    197203"Remaining:" ---> "Faltando:" 
    198204"Remote Control Options" ---> "Opções do Controle Remoto" 
     
    206212"Security" ---> "Segurança" 
    207213"Seeding" ---> "Semeando" 
     214"Seeds" --->  ???  
    208215"Seeds:" ---> "Sementes" 
    209216"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." ---> "Selecione uma pasta para salvar os arquivos. Clique em Cancelar para salvar na pasta padrão." 
     
    214221"Set Priority" ---> "Proridades" 
    215222"Set as Primary" --->  ???  
     223"Severity" ---> "Gravidade" 
    216224"Show this message in future" ---> "Mostrar essa mensagem no futuro" 
     225"Size" ---> "Tamanho" 
    217226"Standard exception (%1%) thrown from %2%." --->  ???  
     227"Start Time" --->  ???  
     228"Status" ---> "Estado" 
    218229"Status:" ---> "estado:" 
    219230"Stop" ---> "Parar" 
     
    229240"These options specify the default limits applied to new torrents." ---> "Essas opções determinam o padrão dos limites aplicados aos novos torrents." 
    230241"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Nessa Sessão Baixou %1$.2fMB, Upou %2$.2fMB, Razão %3$.2f." 
    231 "Tier" --->  ???  
     242"Tier" ---> "Tier" 
    232243"Time left:" ---> "Tempo restando:" 
    233 "Time;Message;Severity" ---> "Hora;Mensagem;Gravidade" 
     244"Time" ---> "Hora" 
    234245"Torrent %1% finished." --->  ???  
    235246"Torrent %1% paused." --->  ???  
    236 "Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) exceção detectada; %2% do %3%." 
     247"Torrent (%1%) exception caught: %2% from %3%." ---> "Torrent (%1%) exceção detectada: %2% do %3%." 
    237248"Torrent Defaults" ---> "Padrão para os Torrents" 
    238249"Torrent File" ---> "Arquivo .torrent" 
     
    246257"Torrents" --->  ???  
    247258"Total max connections :" ---> "Total de conexões máximas :" 
    248 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." ---> "Transferência total incluindo gasto; %1$.2fMB baixado e %2$.2fMB upado." 
     259"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." ---> "Transferência total incluindo gasto: %1$.2fMB baixado e %2$.2fMB upado." 
    249260"Total upload slots :" ---> "Total de slots para upload :" 
    250261"Total" ---> "Total" 
     
    254265"Tracker" ---> "Rastreador" 
    255266"Tracker:" ---> "Rastreador:" 
    256 "Tracker;Tier" ---> "Rastreador;Tier" 
    257267"Trackers" --->  ???  
    258268"Transferred:" ---> "Transferido:" 
    259269"Translation" --->  ???  
    260 "Type" --->  ???  
     270"Type" ---> "Tipo" 
    261271"URL Seed %2%, %3%. (%1%)" --->  ???  
    262272"URL" --->  ???  
    263 "URL;Port;Type" --->  ???  
    264273"UnPlug and Play" --->  ???  
    265274"Unicode exception: %1%." ---> "Exceção Unicode: %1%." 
     
    267276"Update in:" ---> "Atualização em:" 
    268277"Upload Rate (KB/s) :" ---> "Upar com velocidade (KB/s) :" 
     278"Upload" ---> "Upando" 
     279"Uploaded" --->  ???  
    269280"Use Compact Allocation." --->  ???  
    270281"Use a proxy." ---> "Use um proxy" 
     282"User canceled Torrent file creation" --->  ???  
    271283"Username : " ---> "nome de usuário : " 
    272284"Warning" --->  ???  
  • trunk/lang/Serbian (Cyrillic).txt

    r434 r438  
    1 "" ---> "" 
     1"English" ---> "СрпскО (ћОрОлОца)" 
     2"English.rtf" ---> "../lang/Serbian (Cyrillic).rtf" 
    23"%1$.2fKB/s down - %2$.2fKB/s up" ---> "%1$.2fKB/s улазМО - %2$.2fKB/s ОзлазМО" 
    34"%1$.2fMB down - %2$.2fMB up" ---> "%1$.2fMB улазМО - %2$.2fMB ОзлазМО" 
     
    1112"(D-U) 0000.000KB/s - 0000.000KB/s" ---> "(D-U) 0000.000KB/s - 0000.000KB/s" 
    1213"(DHT will not apply to private torrents)" ---> "(ДХТ Меће се палОтО за прОватМе тПреМте)" 
    13 "*** Disabled ***" ---> "*** ДеактОвОраМ ***" 
    14 "..." ---> "..." 
    15 "2" --->  ???  
    16 "3" ---> "3" 
    17 "4" ---> "4" 
    18 "6" ---> "6" 
    1914"About" ---> "О МаЌа" 
    2015"Above Normal" ---> "ПрекП МПрЌалМПг" 
     16"Active" --->  ???  
    2117"Add New Peer" --->  ???  
    2218"Add New Tracker" ---> "УМесО Трекера" 
     
    3834"Block %2% of piece %3% finished. (%1%)" ---> "СекцОја %2% ПЎ Ўела %3% завршеМа. (%1%)" 
    3935"Both" ---> "ОбаЎве" 
    40 "Button1" ---> "ДугЌе1" 
    4136"Calculating Piece Hashes..." --->  ???  
    4237"Cancel" ---> "ПрекОМО" 
     
    4439"Choked" ---> "УспПрењеМП" 
    4540"Clear IP database" ---> "ИзбрОшО ИП-ЎатПтеку" 
     41"Client" ---> "КлОјеМт" 
    4642"Close to tray" --->  ???  
    4743"Comment" --->  ???  
    4844"Comments" ---> "КПЌеМтарО" 
    4945"CompanyName" ---> "ИЌе кПЌпаМОје" 
     46"Completed" --->  ???  
    5047"Completed:" ---> "ЗавршеМП:" 
    5148"Confirm on close" --->  ???  
     
    5451"Connection Policies" ---> "НачОМ пПвеза" 
    5552"Construct a New Torrent" --->  ???  
     53"Copies" --->  ???  
     54"Country" ---> "Држава" 
    5655"Creating Torrent..." --->  ???  
     56"Creating a New Torrent File" --->  ???  
    5757"Creator" --->  ???  
    5858"Critical" ---> "КрОтОчМП" 
     
    7575"Down" ---> "УлазМа" 
    7676"Download Rate (KB/s) :" ---> "БрзОМа улазМПг прПтПка (КБ/с):" 
     77"Download" ---> "ПреузОЌаш" 
    7778"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "ПреузеП %1$.2fMB, пПЎелОП %2$.2fMB, ПЎМПс %3$.2f." 
     79"Downloaded" --->  ???  
    7880"Downloading Metadata" ---> "ПуМО " 
    7981"Downloading" ---> "ПреузОЌа се" 
    8082"E&xit" ---> "Пр&екОМутО" 
     83"ETA" --->  ???  
    8184"ETA:" ---> "ЕТА:" 
     85"Edit Download Folders" --->  ???  
    8286"Edit Peer" --->  ???  
    8387"Edit Tracker" --->  ???  
     
    8993"Enabled" ---> "АктОвОраМ" 
    9094"Encoding Level" ---> "СтепеМ шОфрацОје" 
    91 "English" ---> "СрпскО (ћОрОлОца)" 
    92 "English.rtf" ---> "../lang/Serbian (Cyrillic).rtf" 
    9395"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9496"Enter the tracker URLs for the torrent." ---> "УМесО УРЛ ПЎ трекера" 
    95 "Exception caught; %1%, from %2%." ---> "ППјавОП се Озузетак; %1%, ПЎ %2%." 
     97"Exception caught: %1%, from %2%." --->  ???  
    9698"Failed, %1%" ---> "МеуспешМП, %1%" 
    9799"Fast resume failed: %2%. (%1%)" --->  ???  
     
    99101"FileDescription" ---> "НазОв фајла" 
    100102"FileVersion" ---> "ВерзОја" 
    101 "Filename;Path;Size" --->  ???  
    102 "Filename;Path;Size;Progress;Priority" ---> "ИЌе фајла;Пут;ВелОчОМа;НапреЎак;ВажМПстО" 
     103"Filename" ---> "ИЌе фајла" 
    103104"Files" ---> "ЀајлПвО" 
    104105"Filtering %1% range(s)" ---> "%1% ИП-секцОје фОлтрОраМе" 
     106"Finish Time" --->  ???  
    105107"Finished" ---> "ЗавршеМП" 
    106108"Forced" ---> "НатераМ" 
     
    113115"Halite not listening!" ---> "ХалОте МОје пПвезаМ са ЌрежПЌ" 
    114116"Halite shutting down..." ---> "ХалОте се треМутМП затвара" 
    115 "Halite" ---> "ХалОте" 
    116 "Halite.exe" ---> "Halite.exe" 
    117117"Handshake" ---> "РукПваМје" 
    118118"Has choked us" ---> "УспПрОП је Мас" 
     
    136136"List of Trackers." ---> "ЛОста свОѠ
    137137 Ñ‚рекера" 
     138"Loading IP filters..." --->  ???  
    138139"Local connection" ---> "ЛПкалМО пПвез" 
    139140"Log debug events." ---> "ПОшО Ўебуг резултате у " 
     
    142143"Logging" ---> "ПрПтПкПл" 
    143144"Maximum" ---> "МаксОЌалМП" 
     145"Message" ---> "ППрука" 
    144146"Minimize to tray." ---> "МОМОЌОрај у " 
    145147"Move finished torrents to :" --->  ???  
     
    147149"N/A" ---> "N/A" 
    148150"NAT-PMG" --->  ???  
     151"Name" --->  ???  
    149152"Name:" ---> "ИЌе:" 
    150 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    151153"New" ---> "НПвО" 
    152154"None (Managed Externally)" --->  ???  
     
    164166"Overhead:" ---> "НеупПребљОвП:" 
    165167"Password : " ---> "ЛПзОМка:" 
     168"Path" ---> "Пут" 
    166169"Pause" ---> "Пауза" 
    167170"Paused" ---> "ПаузОраМ" 
     
    170173"Peer Event: %1%." ---> "Пеер ЎПгађај: %1%." 
    171174"Peer banned %2%. (%1%)" ---> "Пеер %2% БаМОраМ. (%1%)" 
    172 "Peer" ---> "Пеер" 
    173 "Peer;Country;Download;Upload;Type;Client" ---> "Пеер-ПвО;Држава;ПреузОЌаш;ОЎпреЌљаш;ТОп;КлОјеМт" 
    174 "Peer;Country;Download;Upload;Type;Client;Status" ---> "Пеер-ПвО;Држава;ПреузОЌаш;ОЎпреЌљаш;ТОп;КлОјеМт;АкцОја" 
     175"Peer" ---> "Пеер-ПвО" 
    175176"Peers" ---> "Пеер-ПвО" 
    176177"Peers:" ---> "Пеер-ПвО:" 
     
    186187"Preannounce" --->  ???  
    187188"Prefer RC4" ---> "ПрОвОлегОрј RC4" 
     189"Priority" ---> "ВажМПстО" 
    188190"Private" --->  ???  
    189191"ProductName" ---> "ИЌе прПЎукта" 
    190192"ProductVersion" ---> "ВерзОја прПЎукта" 
     193"Progress" ---> "НапреЎак" 
    191194"Protocol Encryption" ---> "КОфрацОја прПтПкПла" 
    192195"Proxies" ---> "ПрПксО-сервер" 
     
    199202"Rates:" ---> "ДелПвО:" 
    200203"Ratio (this session):" ---> "ОЎМПс (Ова сеЎМОца):" 
     204"Ratio" --->  ???  
    201205"Ratio:" ---> "ОЎМПс:" 
     206"Reannounce" --->  ???  
    202207"Recheck Files" --->  ???  
     208"Remaining" --->  ???  
    203209"Remaining:" ---> "ЈПш ПсталП:" 
    204210"Remote Control Options" ---> "Уређај за ЎаљОМскП кПрОшћење" 
     
    213219"Security" ---> "СОгурМПстО" 
    214220"Seeding" ---> "НуЎОш" 
     221"Seeds" --->  ???  
    215222"Seeds:" ---> "СееЎ-ерО:" 
    216223"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." ---> "ИзаберО Ќапу у кПјПј желОш Ўа тО буЎу преузетО фајлПвО. ИзаберО \" 
     
    221228"Set Priority" ---> "ВажМПст ПбОљежОтО" 
    222229"Set as Primary" ---> "ДПЎелО ЌестП прОвОлОгацОје" 
     230"Severity" ---> "ВажМПстО" 
    223231"Show this message in future" ---> "НепПзуј ЌО Пву пПруку" 
     232"Size" ---> "ВелОчОМа" 
    224233"Standard exception (%1%) thrown from %2%." ---> "СтаМЎартМО Озузетак (%1%) ЎесОП се кПЎ (%2%)" 
     234"Start Time" --->  ???  
     235"Status" ---> "АкцОја" 
    225236"Status:" ---> "АкцОја:" 
    226237"Stop" ---> "СтПпОрај" 
     
    238249"Tier" ---> "МестП" 
    239250"Time left:" ---> "ЈПш траје:" 
    240 "Time;Message;Severity" ---> "ВреЌе;ППрука;ВажМПстО" 
     251"Time" ---> "ВреЌе" 
    241252"Torrent %1% finished." ---> "ТПреМт %1% завршеМ." 
    242253"Torrent %1% paused." ---> "ТПреМт %1% паузОра." 
    243 "Torrent (%1%) exception caught; %2% from %3%." ---> "ТПрреМт (%1%) Грешка; (%2%) ПЎ (%3%)." 
     254"Torrent (%1%) exception caught: %2% from %3%." --->  ???  
    244255"Torrent Defaults" ---> "СтаМЎартМП пПЎешавање" 
    245256"Torrent File" ---> "ТПреМт" 
     
    253264"Torrents" ---> "ТПреМтО" 
    254265"Total max connections :" ---> "МаксОЌалМО брПј пПвеза:" 
    255 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." ---> "УкупМО прПтПк (ОМклузОвМП прПтПкПлМО пПЎаткО); %1$.2fMB улазМО О %2$.2fMB ОзлазМО." 
     266"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." --->  ???  
    256267"Total upload slots :" ---> "МаксОЌалМО брПј слПтПва за ОзлазМе кПМекцОје:" 
    257268"Total" ---> "УкупМП" 
     
    261272"Tracker" ---> "Трекер" 
    262273"Tracker:" ---> "Трекер:" 
    263 "Tracker;Tier" ---> "Трекер;МестП" 
    264274"Trackers" --->  ???  
    265275"Transferred:" ---> "ПреМешеМП:" 
    266276"Translation" ---> "ПревПЎ" 
    267 "Type" --->  ???  
     277"Type" ---> "ТОп" 
    268278"URL Seed %2%, %3%. (%1%)" ---> "УРл СееЎ %2%, %3%. (%1%)" 
    269279"URL" --->  ???  
    270 "URL;Port;Type" --->  ???  
    271280"UnPlug and Play" --->  ???  
    272281"Unicode exception: %1%." ---> "УМОцПЎе Озузетак: %1%." 
     
    274283"Update in:" ---> "ОбМПва за:" 
    275284"Upload Rate (KB/s) :" ---> "БрзОМа ОзлазМг прПтПка (КБ/с):" 
     285"Upload" ---> "ОЎпреЌљаш" 
     286"Uploaded" --->  ???  
    276287"Use Compact Allocation." ---> "УпПтребО кПЌпактМП ЎПЎавање" 
    277288"Use a proxy." ---> "УпПтреебО прПксО-сервера" 
     289"User canceled Torrent file creation" --->  ???  
    278290"Username : " ---> "КПрОсМОк:" 
    279291"Warning" ---> "УпПзПрење" 
  • trunk/lang/Serbian.txt

    r434 r438  
    1 "" ---> "" 
     1"English" ---> "Srpski (Latinica)" 
     2"English.rtf" ---> "../lang/Serbian.rtf" 
    23"%1$.2fKB/s down - %2$.2fKB/s up" ---> "%1$.2fKB/s ulazni - %2$.2fKB/s izlazni" 
    34"%1$.2fMB down - %2$.2fMB up" ---> "%1$.2fMB ulazni - %2$.2fMB izlazni" 
     
    1112"(D-U) 0000.000KB/s - 0000.000KB/s" ---> "(D-U) 0000.000KB/s - 0000.000KB/s" 
    1213"(DHT will not apply to private torrents)" ---> "(DHT neće se paliti za privatne torente)" 
    13 "*** Disabled ***" ---> "*** Deaktiviran ***" 
    14 "..." ---> "..." 
    15 "2" --->  ???  
    16 "3" ---> "3" 
    17 "4" ---> "4" 
    18 "6" ---> "6" 
    1914"About" ---> "O nama" 
    2015"Above Normal" ---> "Preko Normalnog" 
     16"Active" --->  ???  
    2117"Add New Peer" --->  ???  
    2218"Add New Tracker" ---> "Unesi Trekera" 
     
    3834"Block %2% of piece %3% finished. (%1%)" ---> "Sekcija %2% od dela %3% zavrÅ¡ena. (%1%)" 
    3935"Both" ---> "Obadve" 
    40 "Button1" ---> "Dugme1" 
    4136"Calculating Piece Hashes..." --->  ???  
    4237"Cancel" ---> "Prekini" 
     
    4439"Choked" ---> "Usporenjeno" 
    4540"Clear IP database" ---> "IzbriÅ¡i IP-datoteku" 
     41"Client" ---> "Klijent" 
    4642"Close to tray" --->  ???  
    4743"Comment" --->  ???  
    4844"Comments" ---> "Komentari" 
    4945"CompanyName" ---> "Ime kompanije" 
     46"Completed" --->  ???  
    5047"Completed:" ---> "ZavrÅ¡eno:" 
    5148"Confirm on close" --->  ???  
     
    5451"Connection Policies" ---> "Način poveza" 
    5552"Construct a New Torrent" --->  ???  
     53"Copies" --->  ???  
     54"Country" ---> "DrÅŸava" 
    5655"Creating Torrent..." --->  ???  
     56"Creating a New Torrent File" --->  ???  
    5757"Creator" --->  ???  
    5858"Critical" ---> "Kritično" 
     
    7373"Down" ---> "Ulazna" 
    7474"Download Rate (KB/s) :" ---> "Brzina ulaznog protoka (KB/s):" 
     75"Download" ---> "PreuzimaÅ¡" 
    7576"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Preuzeo %1$.2fMB, podelio %2$.2fMB, odnos %3$.2f." 
     77"Downloaded" --->  ???  
    7678"Downloading Metadata" ---> "Puni " 
    7779"Downloading" ---> "Preuzima se" 
    7880"E&xit" ---> "Pr&ekinuti" 
     81"ETA" --->  ???  
    7982"ETA:" ---> "ETA:" 
     83"Edit Download Folders" --->  ???  
    8084"Edit Peer" --->  ???  
    8185"Edit Tracker" --->  ???  
     
    8791"Enabled" ---> "Aktiviran" 
    8892"Encoding Level" ---> "Stepen Å¡ifracije" 
    89 "English" ---> "Srpski (Latinica)" 
    90 "English.rtf" ---> "../lang/Serbian.rtf" 
    9193"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9294"Enter the tracker URLs for the torrent." ---> "Unesi URL od trekera" 
    93 "Exception caught; %1%, from %2%." ---> "Pojavio se izuzetak; %1%, od %2%." 
     95"Exception caught: %1%, from %2%." ---> "Pojavio se izuzetak: %1%, od %2%." 
    9496"Failed, %1%" ---> "NeuspeÅ¡no, %1%" 
    9597"Fast resume failed: %2%. (%1%)" --->  ???  
     
    9799"FileDescription" ---> "Naziv fajla" 
    98100"FileVersion" ---> "Verzija" 
    99 "Filename;Path;Size" --->  ???  
    100 "Filename;Path;Size;Progress;Priority" ---> "Ime fajla;Put;Veličina;Napredak;VaÅŸnosti" 
     101"Filename" ---> "Ime fajla" 
    101102"Files" ---> "Fajlovi" 
    102103"Filtering %1% range(s)" ---> "%1% IP-sekcije filtrirane" 
     104"Finish Time" --->  ???  
    103105"Finished" ---> "ZavrÅ¡eno" 
    104106"Forced" ---> "Nateran" 
     
    111113"Halite not listening!" ---> "Halite nije povezan s mreÅŸom" 
    112114"Halite shutting down..." ---> "Halite se trenutno zatvara" 
    113 "Halite" ---> "Halite" 
    114 "Halite.exe" ---> "Halite.exe" 
    115115"Handshake" ---> "Rukovanje" 
    116116"Has choked us" ---> "Usporio je nas" 
     
    131131"Limit the no. of half-open connections" ---> "Ograniči broj pola otvorenih mreÅŸnih poveza" 
    132132"List of Trackers." ---> "Lista svih trekera" 
     133"Loading IP filters..." --->  ???  
    133134"Local connection" ---> "Lokalni povez" 
    134135"Log debug events." ---> "PiÅ¡i debug rezultate u " 
     
    136137"Logging" ---> "Protokol" 
    137138"Maximum" ---> "Maksimalno" 
     139"Message" ---> "Poruka" 
    138140"Minimize to tray." ---> "Minimiraj u " 
    139141"Move finished torrents to :" --->  ???  
     
    141143"N/A" ---> "N/A" 
    142144"NAT-PMG" --->  ???  
     145"Name" --->  ???  
    143146"Name:" ---> "Ime:" 
    144 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    145147"New" ---> "Novi" 
    146148"None (Managed Externally)" --->  ???  
     
    158160"Overhead:" ---> "Neupotrebljivo:" 
    159161"Password : " ---> "Lozinka:" 
     162"Path" ---> "Put" 
    160163"Pause" ---> "Pauza" 
    161164"Paused" ---> "Pauziran" 
     
    164167"Peer Event: %1%." ---> "Peer događaj: %1%." 
    165168"Peer banned %2%. (%1%)" ---> "Peer %2% Baniran. (%1%)" 
    166 "Peer" ---> "Peer" 
    167 "Peer;Country;Download;Upload;Type;Client" ---> "Peer-ovi;DrÅŸava;PreuzimaÅ¡;OdpremljaÅ¡;Tip;Klijent" 
    168 "Peer;Country;Download;Upload;Type;Client;Status" ---> "Peer-ovi;DrÅŸava;PreuzimaÅ¡;OdpremljaÅ¡;Tip;Klijent;Akcija" 
     169"Peer" ---> "Peer-ovi" 
    169170"Peers" ---> "Peer-ovi" 
    170171"Peers:" ---> "Peer-ovi:" 
     
    180181"Preannounce" --->  ???  
    181182"Prefer RC4" ---> "Privilegiraj RC4" 
     183"Priority" ---> "VaÅŸnosti" 
    182184"Private" --->  ???  
    183185"ProductName" ---> "Ime produkta" 
    184186"ProductVersion" ---> "Verzija produkta" 
     187"Progress" ---> "Napredak" 
    185188"Protocol Encryption" ---> "Å ifracija protokola" 
    186189"Proxies" ---> "Proksi-server" 
     
    193196"Rates:" ---> "Delovi:" 
    194197"Ratio (this session):" ---> "Odnos (ova sednica):" 
     198"Ratio" --->  ???  
    195199"Ratio:" ---> "Odnos:" 
     200"Reannounce" --->  ???  
    196201"Recheck Files" --->  ???  
     202"Remaining" --->  ???  
    197203"Remaining:" ---> "JoÅ¡ ostalo:" 
    198204"Remote Control Options" ---> "Uređaj za daljinsko koristčenje" 
     
    206212"Security" ---> "Sigurnosti" 
    207213"Seeding" ---> "NudiÅ¡" 
     214"Seeds" --->  ???  
    208215"Seeds:" ---> "Seed-eri:" 
    209216"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." ---> "Izaberi mapu u kojoj ÅŸeliÅ¡ da ti budu preuzeti fajlovi. Izaberi \" 
     
    214221"Set Priority" ---> "VaÅŸnosti obiljeÅŸiti" 
    215222"Set as Primary" ---> "Dodeli mesto priviligacije" 
     223"Severity" ---> "VaÅŸnosti" 
    216224"Show this message in future" ---> "Nepokazuj mi ovu poruku" 
     225"Size" ---> "Veličina" 
    217226"Standard exception (%1%) thrown from %2%." ---> "Standardni izuzetak (%1%) desio se kod (%2%)" 
     227"Start Time" --->  ???  
     228"Status" ---> "Akcija" 
    218229"Status:" ---> "Akcija:" 
    219230"Stop" ---> "Stopiraj" 
     
    231242"Tier" ---> "Mesto" 
    232243"Time left:" ---> "JoÅ¡ traje:" 
    233 "Time;Message;Severity" ---> "Vreme;Poruka;VaÅŸnosti" 
     244"Time" ---> "Vreme" 
    234245"Torrent %1% finished." ---> "Torent %1% zavrÅ¡en." 
    235246"Torrent %1% paused." ---> "Torent %1% pauzira." 
    236 "Torrent (%1%) exception caught; %2% from %3%." ---> "Torent (%1%) GreÅ¡ka; (%2%) od (%3%)." 
     247"Torrent (%1%) exception caught: %2% from %3%." ---> "Torent (%1%) GreÅ¡ka: (%2%) od (%3%)." 
    237248"Torrent Defaults" ---> "Standartno podeÅ¡avanje" 
    238249"Torrent File" ---> "Torent" 
     
    246257"Torrents" ---> "Torenti" 
    247258"Total max connections :" ---> "Maksimalni broj poveza:" 
    248 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." ---> "Ukupni protok (inkluzivno protokolni podatki); %1$.2fMB ulazni i %2$.2fMB izlazni." 
     259"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." ---> "Ukupni protok (inkluzivno protokolni podatki): %1$.2fMB ulazni i %2$.2fMB izlazni." 
    249260"Total upload slots :" ---> "Maksimalni broj slotova za izlazne konekcije:" 
    250261"Total" ---> "Ukupno" 
     
    254265"Tracker" ---> "Treker" 
    255266"Tracker:" ---> "Treker:" 
    256 "Tracker;Tier" ---> "Treker;Mesto" 
    257267"Trackers" --->  ???  
    258268"Transferred:" ---> "PreneÅ¡eno:" 
    259269"Translation" ---> "Prevod" 
    260 "Type" --->  ???  
     270"Type" ---> "Tip" 
    261271"URL Seed %2%, %3%. (%1%)" ---> "URL Seed %2%, %3%. (%1%)" 
    262272"URL" --->  ???  
    263 "URL;Port;Type" --->  ???  
    264273"UnPlug and Play" --->  ???  
    265274"Unicode exception: %1%." ---> "Unicode izuzetak: %1%." 
     
    267276"Update in:" ---> "Obnova za:" 
    268277"Upload Rate (KB/s) :" ---> "Brzina izlaznog protoka (KB/s):" 
     278"Upload" ---> "OdpremljaÅ¡" 
     279"Uploaded" --->  ???  
    269280"Use Compact Allocation." ---> "Upotrebi kompaktno dodavanje" 
    270281"Use a proxy." ---> "Upotrebi Proksi-servera" 
     282"User canceled Torrent file creation" --->  ???  
    271283"Username : " ---> "Korisnik:" 
    272284"Warning" ---> "Upozorenje" 
  • trunk/lang/Slovenian.txt

    r433 r438  
    9191"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9292"Enter the tracker URLs for the torrent." ---> "VpiÅ¡i sledilnikov (announce) URL." 
    93 "Exception caught; %1%, from %2%." ---> "Izjema ujeta; %1%, od %2%." 
     93"Exception caught: %1%, from %2%." ---> "Izjema ujeta: %1%, od %2%." 
    9494"Failed, %1%" --->  ???  
    9595"Fast resume failed: %2%. (%1%)" --->  ???  
     
    234234"Torrent %1% finished." --->  ???  
    235235"Torrent %1% paused." --->  ???  
    236 "Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) zaznana izjema; %2% od %3%." 
     236"Torrent (%1%) exception caught: %2% from %3%." ---> "Torrent (%1%) zaznana izjema: %2% od %3%." 
    237237"Torrent Defaults" ---> "Privzete nastavitve torrenta:" 
    238238"Torrent File" ---> "Torrent datoteko" 
     
    246246"Torrents" ---> "Torrentov" 
    247247"Total max connections :" ---> "Max. povezav:" 
    248 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." ---> "Skupen prenos (vključno s preseÅŸki); %1$.2fMB dol in %2$.2fMB gor." 
     248"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." ---> "Skupen prenos (vključno s preseÅŸki): %1$.2fMB dol in %2$.2fMB gor." 
    249249"Total upload slots :" ---> "Max. odhodnih povezav" 
    250250"Total" ---> "Skupno" 
  • trunk/lang/Spanish.txt

    r433 r438  
    1 "" ---> "" 
     1"English" ---> "Español (España)" 
     2"English.rtf" ---> "../lang/Spanish.rtf" 
    23"%1$.2fKB/s down - %2$.2fKB/s up" --->  ???  
    34"%1$.2fMB down - %2$.2fMB up" --->  ???  
     
    1112"(D-U) 0000.000KB/s - 0000.000KB/s" ---> "(D-S) 0000.000KB/s - 0000.000KB/s" 
    1213"(DHT will not apply to private torrents)" ---> "(DHT no se aplicará a torrents privados)" 
    13 "*** Disabled ***" ---> "*** Desactivado ***" 
    14 "..." ---> "..." 
    15 "2" --->  ???  
    16 "3" ---> "3" 
    17 "4" ---> "4" 
    18 "6" ---> "6" 
    1914"About" ---> "Acerca de" 
    2015"Above Normal" ---> "Mayor de lo normal" 
     16"Active" --->  ???  
    2117"Add New Peer" --->  ???  
    2218"Add New Tracker" ---> "Añadir nuevo Tracker" 
     
    3834"Block %2% of piece %3% finished. (%1%)" --->  ???  
    3935"Both" ---> "Ambos" 
    40 "Button1" --->  ???  
    4136"Calculating Piece Hashes..." --->  ???  
    4237"Cancel" ---> "Cancelar" 
     
    4439"Choked" --->  ???  
    4540"Clear IP database" ---> "Borrar la base de datos de IPs" 
     41"Client" ---> "Cliente" 
    4642"Close to tray" --->  ???  
    4743"Comment" --->  ???  
    4844"Comments" ---> "Comentarios" 
    4945"CompanyName" --->  ???  
     46"Completed" --->  ???  
    5047"Completed:" ---> "Completado:" 
    5148"Confirm on close" --->  ???  
     
    5451"Connection Policies" ---> "Políticas de conexión" 
    5552"Construct a New Torrent" --->  ???  
     53"Copies" --->  ???  
     54"Country" ---> "País" 
    5655"Creating Torrent..." --->  ???  
     56"Creating a New Torrent File" --->  ???  
    5757"Creator" --->  ???  
    5858"Critical" --->  ???  
     
    7373"Down" --->  ???  
    7474"Download Rate (KB/s) :" ---> "Tasa de bajada (KB/s) :" 
     75"Download" ---> "Descarga" 
    7576"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Descargado %1$.2fMB, subido %2$.2fMB, ratio %3$.2f." 
     77"Downloaded" --->  ???  
    7678"Downloading Metadata" ---> "Descargando Metadata" 
    7779"Downloading" ---> "Descargando" 
    7880"E&xit" ---> "&Salir" 
     81"ETA" --->  ???  
    7982"ETA:" ---> "Tiempo restante:" 
     83"Edit Download Folders" --->  ???  
    8084"Edit Peer" --->  ???  
    8185"Edit Tracker" --->  ???  
     
    8791"Enabled" ---> "Activado" 
    8892"Encoding Level" ---> "Nivel de codificación" 
    89 "English" ---> "Español (España)" 
    90 "English.rtf" ---> "../lang/Spanish.rtf" 
    9193"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9294"Enter the tracker URLs for the torrent." ---> "Introduce las URLs de los trackers del torrent." 
    93 "Exception caught; %1%, from %2%." ---> "Excepción atrapada; %1%, de %2%." 
     95"Exception caught: %1%, from %2%." ---> "Excepción atrapada: %1%, de %2%." 
    9496"Failed, %1%" --->  ???  
    9597"Fast resume failed: %2%. (%1%)" --->  ???  
     
    9799"FileDescription" --->  ???  
    98100"FileVersion" --->  ???  
    99 "Filename;Path;Size" --->  ???  
    100 "Filename;Path;Size;Progress;Priority" ---> "Nombre de archivo;Ruta;Tamaño;Progreso;Prioridad" 
     101"Filename" ---> "Nombre de archivo" 
    101102"Files" ---> "Archivos" 
    102103"Filtering %1% range(s)" ---> "Filtrando %1% rango(s)" 
     104"Finish Time" --->  ???  
    103105"Finished" ---> "Terminado" 
    104106"Forced" ---> "Forzado" 
     
    111113"Halite not listening!" ---> "¡Halite no está escuchando!" 
    112114"Halite shutting down..." ---> "Halite se está cerrando..." 
    113 "Halite" --->  ???  
    114 "Halite.exe" --->  ???  
    115115"Handshake" --->  ???  
    116116"Has choked us" --->  ???  
     
    131131"Limit the no. of half-open connections" --->  ???  
    132132"List of Trackers." ---> "Lista de Trackers." 
     133"Loading IP filters..." --->  ???  
    133134"Local connection" ---> "Conexión local" 
    134135"Log debug events." --->  ???  
     
    136137"Logging" --->  ???  
    137138"Maximum" ---> "Máximo" 
     139"Message" --->  ???  
    138140"Minimize to tray." ---> "Minimizar a la bandeja." 
    139141"Move finished torrents to :" --->  ???  
     
    141143"N/A" --->  ???  
    142144"NAT-PMG" --->  ???  
     145"Name" --->  ???  
    143146"Name:" ---> "Nombre:" 
    144 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    145147"New" ---> "Nuevo" 
    146148"None (Managed Externally)" --->  ???  
     
    158160"Overhead:" --->  ???  
    159161"Password : " ---> "Contraseña : " 
     162"Path" ---> "Ruta" 
    160163"Pause" ---> "Pausa" 
    161164"Paused" ---> "En pausa" 
     
    165168"Peer banned %2%. (%1%)" --->  ???  
    166169"Peer" ---> "Par" 
    167 "Peer;Country;Download;Upload;Type;Client" ---> "Par;País;Descarga;Subida;Tipo;Cliente" 
    168 "Peer;Country;Download;Upload;Type;Client;Status" ---> "Par;País;Descarga;Subida;Tipo;Cliente;Estado" 
    169170"Peers" ---> "Pares" 
    170171"Peers:" ---> "Pares:" 
     
    180181"Preannounce" --->  ???  
    181182"Prefer RC4" ---> "Preferir RC4" 
     183"Priority" ---> "Prioridad" 
    182184"Private" --->  ???  
    183185"ProductName" --->  ???  
    184186"ProductVersion" --->  ???  
     187"Progress" ---> "Progreso" 
    185188"Protocol Encryption" ---> "Codificación de protocolo" 
    186189"Proxies" ---> "Proxies" 
     
    193196"Rates:" --->  ???  
    194197"Ratio (this session):" ---> "Ratio (esta sesión):" 
     198"Ratio" --->  ???  
    195199"Ratio:" ---> "Ratio:" 
     200"Reannounce" --->  ???  
    196201"Recheck Files" --->  ???  
     202"Remaining" --->  ???  
    197203"Remaining:" ---> "Restante:" 
    198204"Remote Control Options" ---> "Opciones del control remoto" 
     
    206212"Security" ---> "Seguridad" 
    207213"Seeding" --->  ???  
     214"Seeds" --->  ???  
    208215"Seeds:" ---> "Semillas:" 
    209216"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." ---> "Selecciona un directorio donde guardar las descargas. Pulsa Cancelar para aceptar el directorio por defecto." 
     
    214221"Set Priority" ---> "Ajustar prioridad" 
    215222"Set as Primary" --->  ???  
     223"Severity" --->  ???  
    216224"Show this message in future" ---> "Mostrar este mensaje en el futuro" 
     225"Size" ---> "Tamaño" 
    217226"Standard exception (%1%) thrown from %2%." ---> "Excepción estándar (%1%) lanzada desde %2%." 
     227"Start Time" --->  ???  
     228"Status" ---> "Estado" 
    218229"Status:" ---> "Estado:" 
    219230"Stop" ---> "Detener" 
     
    231242"Tier" --->  ???  
    232243"Time left:" ---> "Tiempo restante:" 
    233 "Time;Message;Severity" --->  ???  
     244"Time" --->  ???  
    234245"Torrent %1% finished." --->  ???  
    235246"Torrent %1% paused." --->  ???  
    236 "Torrent (%1%) exception caught; %2% from %3%." ---> "Se capturó una excepción del torrent (%1%); %2% de %3%." 
     247"Torrent (%1%) exception caught: %2% from %3%." ---> "Se capturó una excepción del torrent (%1%): %2% de %3%." 
    237248"Torrent Defaults" --->  ???  
    238249"Torrent File" ---> "Archivo Torrent" 
     
    246257"Torrents" ---> "Torrents" 
    247258"Total max connections :" ---> "Conexiones máximas totales :" 
    248 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." --->  ???  
     259"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." --->  ???  
    249260"Total upload slots :" ---> "Ranuras de subida totales :" 
    250261"Total" ---> "Total" 
     
    254265"Tracker" ---> "Tracker" 
    255266"Tracker:" ---> "Tracker:" 
    256 "Tracker;Tier" --->  ???  
    257267"Trackers" --->  ???  
    258268"Transferred:" ---> "Transferido:" 
    259269"Translation" --->  ???  
    260 "Type" --->  ???  
     270"Type" ---> "Tipo" 
    261271"URL Seed %2%, %3%. (%1%)" --->  ???  
    262272"URL" --->  ???  
    263 "URL;Port;Type" --->  ???  
    264273"UnPlug and Play" --->  ???  
    265274"Unicode exception: %1%." ---> "Excepción unicode: %1%." 
     
    267276"Update in:" ---> "Actualización en:" 
    268277"Upload Rate (KB/s) :" ---> "Tasa de subida (KB/s) :" 
     278"Upload" ---> "Subida" 
     279"Uploaded" --->  ???  
    269280"Use Compact Allocation." --->  ???  
    270281"Use a proxy." ---> "Usar proxy." 
     282"User canceled Torrent file creation" --->  ???  
    271283"Username : " ---> "Nombre de usuario : " 
    272284"Warning" --->  ???  
  • trunk/lang/Swedish.txt

    r434 r438  
    1 "" --->  ???  
     1"English" ---> "Svenska" 
     2"English.rtf" --->  ???  
    23"%1$.2fKB/s down - %2$.2fKB/s up" ---> "%1$.2fKB/s ned - %2$.2fKB/s upp" 
    34"%1$.2fMB down - %2$.2fMB up" ---> "%1$.2fMB ned - %2$.2fMB upp" 
     
    1213"(D-U) 0000.000KB/s - 0000.000KB/s" --->  ???  
    1314"(DHT will not apply to private torrents)" --->  ???  
    14 "*** Disabled ***" ---> "*** Deaktiverad ***" 
    15 "..." --->  ???  
    16 "2" --->  ???  
    17 "3" --->  ???  
    18 "4" --->  ???  
    19 "6" --->  ???  
    2015"About" ---> "Om" 
    2116"Above Normal" ---> "Över medel" 
     17"Active" --->  ???  
    2218"Add New Peer" --->  ???  
    2319"Add New Tracker" ---> "LÀgg till ny tracker" 
     
    3935"Block %2% of piece %3% finished. (%1%)" --->  ???  
    4036"Both" ---> "BÃ¥da" 
    41 "Button1" --->  ???  
    4237"Calculating Piece Hashes..." --->  ???  
    4338"Cancel" ---> "Avbryt" 
     
    4540"Choked" ---> "Strypt" 
    4641"Clear IP database" ---> "Rensa IP-databas" 
     42"Client" ---> "Klient" 
    4743"Close to tray" --->  ???  
    4844"Comment" --->  ???  
    4945"Comments" ---> "Kommentarer" 
    5046"CompanyName" --->  ???  
     47"Completed" --->  ???  
    5148"Completed:" ---> "FÀrdigt:" 
    5249"Confirm on close" --->  ???  
     
    5552"Connection Policies" ---> "Anslutningsvillkor" 
    5653"Construct a New Torrent" --->  ???  
     54"Copies" --->  ???  
     55"Country" ---> "Land" 
    5756"Creating Torrent..." --->  ???  
     57"Creating a New Torrent File" --->  ???  
    5858"Creator" --->  ???  
    5959"Critical" ---> "Viktig" 
     
    7474"Down" ---> "Ned" 
    7575"Download Rate (KB/s) :" ---> "Nedladdningshastighet (KB/s" 
     76"Download" ---> "Nedladdning" 
    7677"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Laddade ned  %1$.2fMB, laddade upp %2$.2fMB, Ratio: %3$.2f." 
     78"Downloaded" --->  ???  
    7779"Downloading Metadata" ---> "Laddar ned metadata" 
    7880"Downloading" ---> "Laddar ned" 
    7981"E&xit" ---> "&Avsluta" 
     82"ETA" --->  ???  
    8083"ETA:" ---> "Tid kvar:" 
     84"Edit Download Folders" --->  ???  
    8185"Edit Peer" --->  ???  
    8286"Edit Tracker" --->  ???  
     
    8892"Enabled" ---> "Aktiverade" 
    8993"Encoding Level" ---> "NivÃ¥ av kodning" 
    90 "English" ---> "Svenska" 
    91 "English.rtf" --->  ???  
    9294"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9395"Enter the tracker URLs for the torrent." ---> "Skriv in URL för torrent." 
    94 "Exception caught; %1%, from %2%." --->  ???  
     96"Exception caught: %1%, from %2%." --->  ???  
    9597"Failed, %1%" --->  ???  
    9698"Fast resume failed: %2%. (%1%)" --->  ???  
     
    98100"FileDescription" --->  ???  
    99101"FileVersion" --->  ???  
    100 "Filename;Path;Size" --->  ???  
    101 "Filename;Path;Size;Progress;Priority" ---> "Filnamn;SökvÀg;Storlek;Förlopp;Prioritet" 
     102"Filename" ---> "Filnamn" 
    102103"Files" ---> "Filer" 
    103104"Filtering %1% range(s)" ---> "Filtrerar %1% omrÃ¥de(n)" 
     105"Finish Time" --->  ???  
    104106"Finished" ---> "FÀrdig" 
    105107"Forced" ---> "Tvingade" 
     
    112114"Halite not listening!" ---> "Halite lyssnar ej!" 
    113115"Halite shutting down..." ---> "Halite avslutas..." 
    114 "Halite" --->  ???  
    115 "Halite.exe" --->  ???  
    116116"Handshake" ---> "Handslag" 
    117117"Has choked us" ---> "Har Strypt oss" 
     
    132132"Limit the no. of half-open connections" ---> "BegrÀnsa antalet halv-öppna anslutningar" 
    133133"List of Trackers." ---> "Lista pÃ¥ trackers." 
     134"Loading IP filters..." --->  ???  
    134135"Local connection" ---> "Lokal anslutning" 
    135136"Log debug events." --->  ???  
     
    137138"Logging" ---> "Loggning" 
    138139"Maximum" ---> "Max" 
     140"Message" ---> "Meddelande" 
    139141"Minimize to tray." ---> "Minimera till meddelandefÀltet." 
    140142"Move finished torrents to :" --->  ???  
     
    142144"N/A" ---> "Ej applicerbart" 
    143145"NAT-PMG" --->  ???  
     146"Name" --->  ???  
    144147"Name:" ---> "Namn:" 
    145 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    146148"New" ---> "Ny" 
    147149"None (Managed Externally)" --->  ???  
     
    159161"Overhead:" ---> "Obrukbart:" 
    160162"Password : " ---> "Lösenord :" 
     163"Path" ---> "SökvÀg" 
    161164"Pause" ---> "Pausa" 
    162165"Paused" ---> "Pausad" 
     
    165168"Peer Event: %1%." --->  ???  
    166169"Peer banned %2%. (%1%)" --->  ???  
    167 "Peer" ---> "Klient" 
    168 "Peer;Country;Download;Upload;Type;Client" ---> "AnvÀndare;Land;Nedladdning;Uppladdning;Typ;Klient" 
    169 "Peer;Country;Download;Upload;Type;Client;Status" ---> "AnvÀndare;Land;Nedladdning;Uppladdning;Typ;Klient;Status" 
     170"Peer" ---> "AnvÀndare" 
    170171"Peers" ---> "AnvÀndare" 
    171172"Peers:" ---> "Klienter:" 
     
    181182"Preannounce" --->  ???  
    182183"Prefer RC4" ---> "Föredra RC4" 
     184"Priority" ---> "Prioritet" 
    183185"Private" --->  ???  
    184186"ProductName" --->  ???  
    185187"ProductVersion" --->  ???  
     188"Progress" ---> "Förlopp" 
    186189"Protocol Encryption" ---> "Protokollkryptering" 
    187190"Proxies" ---> "Proxys" 
     
    194197"Rates:" --->  ???  
    195198"Ratio (this session):" ---> "Ratio (denna session):" 
     199"Ratio" --->  ???  
    196200"Ratio:" --->  ???  
     201"Reannounce" --->  ???  
    197202"Recheck Files" --->  ???  
     203"Remaining" --->  ???  
    198204"Remaining:" ---> "à
    199205terstÃ¥ende:" 
     
    209215"Security" ---> "SÀkerhet" 
    210216"Seeding" ---> "Skickar" 
     217"Seeds" --->  ???  
    211218"Seeds:" ---> "KÀllor:" 
    212219"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." ---> "VÀlj en plats att spara i. VÀlj avbryt för att spara till förvald plats." 
     
    217224"Set Priority" ---> "Ange prioritet" 
    218225"Set as Primary" --->  ???  
     226"Severity" ---> "NivÃ¥" 
    219227"Show this message in future" ---> "Visa alltid detta meddelande." 
     228"Size" ---> "Storlek" 
    220229"Standard exception (%1%) thrown from %2%." --->  ???  
     230"Start Time" --->  ???  
     231"Status" ---> "Status" 
    221232"Status:" --->  ???  
    222233"Stop" ---> "Stoppa" 
     
    234245"Tier" ---> "Rang" 
    235246"Time left:" ---> "Tid kvar:" 
    236 "Time;Message;Severity" ---> "Tid;Meddelande;NivÃ¥" 
     247"Time" ---> "Tid" 
    237248"Torrent %1% finished." --->  ???  
    238249"Torrent %1% paused." --->  ???  
    239 "Torrent (%1%) exception caught; %2% from %3%." --->  ???  
     250"Torrent (%1%) exception caught: %2% from %3%." --->  ???  
    240251"Torrent Defaults" --->  ???  
    241252"Torrent File" ---> "Torrent-fil" 
     
    249260"Torrents" --->  ???  
    250261"Total max connections :" ---> "Max antal anslutningar" 
    251 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." ---> "Total överföring inklusive protokolltrafik; %1$.2fMB ned och %2$.2fMB upp." 
     262"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." ---> "Total överföring inklusive protokolltrafik: %1$.2fMB ned och %2$.2fMB upp." 
    252263"Total upload slots :" ---> "Max antal uppladdningsslottar" 
    253264"Total" ---> "Totalt" 
     
    257268"Tracker" --->  ???  
    258269"Tracker:" --->  ???  
    259 "Tracker;Tier" --->  ???  
    260270"Trackers" --->  ???  
    261271"Transferred:" ---> "Överfört:" 
    262272"Translation" --->  ???  
    263 "Type" --->  ???  
     273"Type" ---> "Typ" 
    264274"URL Seed %2%, %3%. (%1%)" --->  ???  
    265275"URL" --->  ???  
    266 "URL;Port;Type" --->  ???  
    267276"UnPlug and Play" --->  ???  
    268277"Unicode exception: %1%." --->  ???  
     
    270279"Update in:" ---> "Uppdatera om:" 
    271280"Upload Rate (KB/s) :" ---> "Uppladningshastighet (KB/s)" 
     281"Upload" ---> "Uppladdning" 
     282"Uploaded" --->  ???  
    272283"Use Compact Allocation." --->  ???  
    273284"Use a proxy." ---> "AnvÀnd en proxy." 
     285"User canceled Torrent file creation" --->  ???  
    274286"Username : " ---> "AnvÀndarnamn :" 
    275287"Warning" --->  ???  
  • trunk/lang/Turkish.txt

    r433 r438  
    1 "" ---> "" 
     1"English" ---> "TÃŒrkçe" 
     2"English.rtf" --->  ???  
    23"%1$.2fKB/s down - %2$.2fKB/s up" --->  ???  
    34"%1$.2fMB down - %2$.2fMB up" --->  ???  
     
    1112"(D-U) 0000.000KB/s - 0000.000KB/s" ---> "(Ä°-G) 0000.000KB/s - 0000.000KB/s" 
    1213"(DHT will not apply to private torrents)" --->  ???  
    13 "*** Disabled ***" ---> "*** Etkisiz ***" 
    14 "..." ---> "..." 
    15 "2" --->  ???  
    16 "3" --->  ???  
    17 "4" --->  ???  
    18 "6" --->  ???  
    1914"About" ---> "Hakkında" 
    2015"Above Normal" --->  ???  
     16"Active" --->  ???  
    2117"Add New Peer" --->  ???  
    2218"Add New Tracker" ---> "Yeni Ä°zleyici Ekle" 
     
    3834"Block %2% of piece %3% finished. (%1%)" --->  ???  
    3935"Both" --->  ???  
    40 "Button1" ---> "Button1" 
    4136"Calculating Piece Hashes..." --->  ???  
    4237"Cancel" ---> "Ä°ptal" 
     
    4439"Choked" ---> "Tıkandı" 
    4540"Clear IP database" ---> "IP veritabanını temizle" 
     41"Client" --->  ???  
    4642"Close to tray" --->  ???  
    4743"Comment" --->  ???  
    4844"Comments" ---> "Yorumlar" 
    4945"CompanyName" ---> "CompanyName" 
     46"Completed" --->  ???  
    5047"Completed:" ---> "Tamamlanan:" 
    5148"Confirm on close" --->  ???  
     
    5451"Connection Policies" --->  ???  
    5552"Construct a New Torrent" --->  ???  
     53"Copies" --->  ???  
     54"Country" --->  ???  
    5655"Creating Torrent..." --->  ???  
     56"Creating a New Torrent File" --->  ???  
    5757"Creator" --->  ???  
    5858"Critical" ---> "Critical" 
     
    7373"Down" ---> "Ä°nd." 
    7474"Download Rate (KB/s) :" ---> "Ä°ndirme Hızı (KB/s) :" 
     75"Download" --->  ???  
    7576"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Ä°ndirilen %1$.2fMB, Gönderilen %2$.2fMB, Oran %3$.2f." 
     77"Downloaded" --->  ???  
    7678"Downloading Metadata" ---> "Metadata Ä°ndiriliyor" 
    7779"Downloading" ---> "Ä°ndiriliyor" 
    7880"E&xit" ---> "&Çıkış" 
     81"ETA" --->  ???  
    7982"ETA:" --->  ???  
     83"Edit Download Folders" --->  ???  
    8084"Edit Peer" --->  ???  
    8185"Edit Tracker" --->  ???  
     
    8791"Enabled" --->  ???  
    8892"Encoding Level" --->  ???  
    89 "English" ---> "TÃŒrkçe" 
    90 "English.rtf" --->  ???  
    9193"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9294"Enter the tracker URLs for the torrent." ---> "Torrent için izleyici URL'lerini girin" 
    93 "Exception caught; %1%, from %2%." ---> "Yakalanan istisna; %1%, %2%'den." 
     95"Exception caught: %1%, from %2%." ---> "Yakalanan istisna: %1%, %2%'den." 
    9496"Failed, %1%" --->  ???  
    9597"Fast resume failed: %2%. (%1%)" --->  ???  
     
    9799"FileDescription" ---> "FileDescription" 
    98100"FileVersion" ---> "FileVersion" 
    99 "Filename;Path;Size" --->  ???  
    100 "Filename;Path;Size;Progress;Priority" --->  ???  
     101"Filename" --->  ???  
    101102"Files" --->  ???  
    102103"Filtering %1% range(s)" ---> "%1% aralığı sÃŒzgeçleniyor" 
     104"Finish Time" --->  ???  
    103105"Finished" ---> "Tamamlandı" 
    104106"Forced" --->  ???  
     
    111113"Halite not listening!" ---> "Halite portu kullanamıyor!" 
    112114"Halite shutting down..." ---> "Halite kapatılıyor..." 
    113 "Halite" ---> "Halite" 
    114 "Halite.exe" ---> "Halite.exe" 
    115115"Handshake" ---> "El Sıkışma" 
    116116"Has choked us" ---> "Bize tıkadı" 
     
    131131"Limit the no. of half-open connections" --->  ???  
    132132"List of Trackers." ---> "Ä°zleyici Listesi." 
     133"Loading IP filters..." --->  ???  
    133134"Local connection" ---> "Yerel bağlantı" 
    134135"Log debug events." ---> "Hata Ayıklama olaylarını kaydet" 
     
    136137"Logging" --->  ???  
    137138"Maximum" --->  ???  
     139"Message" ---> "Mesaj" 
    138140"Minimize to tray." ---> "Simge Durumuna KÌçÌlt" 
    139141"Move finished torrents to :" --->  ???  
     
    141143"N/A" ---> "N/A" 
    142144"NAT-PMG" --->  ???  
     145"Name" --->  ???  
    143146"Name:" ---> "Ä°sim" 
    144 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    145147"New" ---> "Yeni" 
    146148"None (Managed Externally)" --->  ???  
     
    158160"Overhead:" --->  ???  
    159161"Password : " ---> "Şifre" 
     162"Path" --->  ???  
    160163"Pause" ---> "Duraklat" 
    161164"Paused" ---> "Duraklatıldı" 
     
    165168"Peer banned %2%. (%1%)" --->  ???  
    166169"Peer" --->  ???  
    167 "Peer;Country;Download;Upload;Type;Client" --->  ???  
    168 "Peer;Country;Download;Upload;Type;Client;Status" --->  ???  
    169170"Peers" --->  ???  
    170171"Peers:" --->  ???  
     
    180181"Preannounce" --->  ???  
    181182"Prefer RC4" --->  ???  
     183"Priority" --->  ???  
    182184"Private" --->  ???  
    183185"ProductName" ---> "ProductName" 
    184186"ProductVersion" ---> "ProductVersion" 
     187"Progress" --->  ???  
    185188"Protocol Encryption" --->  ???  
    186189"Proxies" --->  ???  
     
    193196"Rates:" --->  ???  
    194197"Ratio (this session):" ---> "Oran (bu oturum):" 
     198"Ratio" --->  ???  
    195199"Ratio:" --->  ???  
     200"Reannounce" --->  ???  
    196201"Recheck Files" --->  ???  
     202"Remaining" --->  ???  
    197203"Remaining:" --->  ???  
    198204"Remote Control Options" ---> "Uzak Kontrol Ayarları" 
     
    206212"Security" --->  ???  
    207213"Seeding" ---> "Gönderiliyor" 
     214"Seeds" --->  ???  
    208215"Seeds:" --->  ???  
    209216"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." --->  ???  
     
    214221"Set Priority" --->  ???  
    215222"Set as Primary" --->  ???  
     223"Severity" ---> "Öncelik" 
    216224"Show this message in future" ---> "Bu mesajı ilerde de göster" 
     225"Size" --->  ???  
    217226"Standard exception (%1%) thrown from %2%." ---> "Standart istisna (%1%) , %2% 'den." 
     227"Start Time" --->  ???  
     228"Status" --->  ???  
    218229"Status:" ---> "Durum" 
    219230"Stop" ---> "Durdur" 
     
    231242"Tier" ---> "Sıra" 
    232243"Time left:" ---> "Kalan sÃŒre:" 
    233 "Time;Message;Severity" ---> "SÃŒre;Mesaj;Öncelik" 
     244"Time" ---> "SÃŒre" 
    234245"Torrent %1% finished." --->  ???  
    235246"Torrent %1% paused." --->  ???  
    236 "Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) istisnası yakalandı; %2% 'den %3% 'e." 
     247"Torrent (%1%) exception caught: %2% from %3%." ---> "Torrent (%1%) istisnası yakalandı: %2% 'den %3% 'e." 
    237248"Torrent Defaults" ---> "Torrent Varsayılanları" 
    238249"Torrent File" ---> "Torrent Dosyası" 
     
    246257"Torrents" ---> "Torrentler" 
    247258"Total max connections :" ---> "Toplam en fazla bağlantı :" 
    248 "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." --->  ???  
     259"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." --->  ???  
    249260"Total upload slots :" ---> "Toplam göderme kanalı :" 
    250261"Total" ---> "Toplam" 
     
    254265"Tracker" ---> "Ä°zleyici" 
    255266"Tracker:" ---> "Ä°zleyici" 
    256 "Tracker;Tier" ---> "Ä°zleyici;Sıra" 
    257267"Trackers" --->  ???  
    258268"Transferred:" --->  ???  
     
    261271"URL Seed %2%, %3%. (%1%)" --->  ???  
    262272"URL" --->  ???  
    263 "URL;Port;Type" --->  ???  
    264273"UnPlug and Play" --->  ???  
    265274"Unicode exception: %1%." ---> "Unicode istisnası: %1%." 
     
    267276"Update in:" ---> "GÃŒncelleme:" 
    268277"Upload Rate (KB/s) :" ---> "Gönderme Hızı (KB/s) :" 
     278"Upload" --->  ???  
     279"Uploaded" --->  ???  
    269280"Use Compact Allocation." --->  ???  
    270281"Use a proxy." ---> "Proxy kullan" 
     282"User canceled Torrent file creation" --->  ???  
    271283"Username : " ---> "Kullanıcı Adı" 
    272284"Warning" --->  ???  
  • trunk/lang/ignore.yaml

    r434 r438  
    11---  
    22- "\"Button\"" 
     3- "\"Button1\"" 
    34- "\"180904b0\"" 
    45- "\"MS Shell Dlg\"" 
     
    1011- "\"MS Sans Serif\"" 
    1112- "\"MS Shell Dlg 2\"" 
     13- "\"1\"" 
     14- "\"2\"" 
     15- "\"3\"" 
     16- "\"4\"" 
     17- "\"5\"" 
     18- "\"6\"" 
     19- "\"...\"" 
     20- "\"*** Disabled ***\"" 
    1221- "\"Radio1\"" 
    1322- "\"RichEdit20A\"" 
     
    2231- "\"msctls_progress32\"" 
    2332- "\"toolbar.bmp\"" 
     33- "\"Halite\"" 
     34- "\"\"" 
     35- "\"Halite.exe\"" 
    2436- "\"(C) Eoin O'Callaghan 2008\"" 
    2537- "\"0000 DHT node(s)\"" 
  • trunk/lang/res_translator.rb

    r435 r438  
    66 
    77exit if RUBYSCRIPT2EXE.is_compiling? 
     8 
     9def compile_dlls(arg) 
     10 
     11        puts " - - Wrote new language file" 
     12         
     13        puts "\n - Compiling 32bit resource file\n\n" 
     14         
     15        system "call tools\\rc \"..\\res\\"+arg+".rc\"" 
     16 
     17        system "call tools\\cvtres /MACHINE:X86 \"..\\res\\"+arg+".res\"" 
     18        system "call tools\\link /NOENTRY /DLL /MACHINE:X86 /OUT:\".\\bin\\x86\\"+arg+".dll\" \"..\\res\\"+arg+".obj\"" 
     19         
     20        puts " - Compiling 64bit resource file\n\n" 
     21 
     22        system "call tools\\cvtres /MACHINE:AMD64 \"..\\res\\"+arg+".res\"" 
     23        system "call tools\\link /NOENTRY /DLL /MACHINE:AMD64 /OUT:\".\\bin\\x64\\"+arg+".dll\" \"..\\res\\"+arg+".obj\"" 
     24 
     25        puts " - Cleaning temp files\n\n" 
     26         
     27        system "del \"..\\res\\"+arg+".rc\"" 
     28        system "del \"..\\res\\"+arg+".res\"" 
     29        system "del \"..\\res\\"+arg+".obj\"" 
     30         
     31        puts " - Done\n\n"       
     32end 
    833 
    934resource_dir = ARGV.shift 
     
    4772                resource_file.gsub!(Regexp.new('\/\*.*?\*\/', Regexp::MULTILINE), "\n") 
    4873 
    49                 # Collect all string in the resource file 
     74                # Collect all strings in the resource file 
    5075                resource_file.scan(/\".*?\"/) do |text_string| 
    51                         if (not resource_array.include?(text_string)) and 
    52                                         (not ignore_array.include?(text_string)) 
    53                                 resource_array.push(text_string) 
    54                         end 
    55                 end 
     76                        if (not ignore_array.include?(text_string))                              
     77                                 
     78                                if text_string.include?(';') 
     79                                        # Split semicolon deliminated strings 
     80                                        text_string.delete('"').split(';').each {|s| resource_array.push('"'+s+'"') }                                    
     81                                else 
     82                                        resource_array.push(text_string) 
     83                                end 
     84                                 
     85                        end 
     86                end 
     87                 
     88                resource_array.uniq! 
    5689        end 
    5790 
     
    6093        exit 
    6194end      
     95 
     96#       puts resource_array 
    6297                 
    6398ARGV.each do |arg|  
     
    73108         
    74109                while lang_line = language_file.gets 
    75                         lang_line.scan(/(\".*?\")\s*--->\s*(\".*?\")/) {|original, trans| lang_map[original] = trans} 
     110                        lang_line.scan(/(\".*?\")\s*--->\s*(\".*?\")/) do |original, trans|  
     111                                 
     112                                if original.include?(';') 
     113                                        # Split semicolon deliminated strings 
     114                                         
     115                                        o = original.delete('"').split(';') 
     116                                        t = trans.delete('"').split(';') 
     117                                          
     118                                        o.each_index {|i| lang_map['"'+o[i]+'"'] = '"'+t[i]+'"' }                                
     119                                else 
     120                                        lang_map[original] = trans 
     121                                end 
     122                        end 
    76123                end 
    77124        end 
     
    79126        puts " - - Scanned"      
    80127         
    81         begin 
    82                 #res_language_file = File.open(resource_filename, "r+") 
    83          
     128#       puts lang_map 
     129         
     130        begin    
    84131                if res_lang = resource_original_file.clone 
    85132                 
    86133                        res_lang.gsub!(/\".*?\"/) do |text_string| 
    87                                 if lang_map.has_key?(text_string) 
    88                                         lang_map[text_string] 
     134 
     135                                if text_string.include?(';') 
     136                                        # Rebuild semicolon deliminated strings 
     137                                 
     138                                        tmp = '' 
     139                                         
     140                                        text_string.delete('"').split(';').each do |s|  
     141                                         
     142                                                if lang_map.has_key?('"'+s+'"') 
     143                                                        tmp = tmp+ lang_map['"'+s+'"'].delete('"') +';' 
     144                                                else             
     145                                                        tmp = tmp+s+';'  
     146                                                end                              
     147                                        end 
     148                                         
     149                                        tmp = '"'+tmp.chomp!(';')+'"' 
     150                                                                                 
    89151                                else 
    90                                         text_string 
     152                                        if lang_map.has_key?(text_string) 
     153                                                lang_map[text_string] 
     154                                        else 
     155                                                text_string 
     156                                        end 
    91157                                end 
    92158                        end 
     159                         
    93160                         
    94161                        begin 
     
    110177        begin    
    111178                lang_file = File.new(lang_filename, 'w+') 
     179                 
     180                # Special case for 'English' and 'English.rtf' to bring them to the top of list. 
     181                 
     182                resource_array.delete('"English"') 
     183                if lang_map.has_key?('"English"') 
     184                        lang_file.print('"English"' + " ---> " + lang_map['"English"'] + "\n") 
     185                else 
     186                        lang_file.print('"English"' + " --->  ??? \n") 
     187                end 
     188                         
     189                resource_array.delete('"English.rtf"') 
     190                if lang_map.has_key?('"English.rtf"') 
     191                        lang_file.print('"English.rtf"' + " ---> " + lang_map['"English.rtf"'] + "\n") 
     192                else 
     193                        lang_file.print('"English.rtf"' + " --->  ??? \n") 
     194                end      
     195                 
     196                # Process rest alphabeticially [sic]. 
    112197 
    113198                resource_array.sort.each do |value|      
     
    123208        end      
    124209         
    125         puts " - - Wrote new language file" 
    126          
    127         puts "\n - Compiling resource file\n\n" 
    128          
    129         system "call tools\\rc \"..\\res\\"+arg+".rc\"" 
    130  
    131         system "call tools\\cvtres /MACHINE:X86 \"..\\res\\"+arg+".res\"" 
    132         system "call tools\\link /NOENTRY /DLL /MACHINE:X86 /OUT:\".\\bin\\x86\\"+arg+".dll\" \"..\\res\\"+arg+".obj\"" 
    133  
    134         system "call tools\\cvtres /MACHINE:AMD64 \"..\\res\\"+arg+".res\"" 
    135         system "call tools\\link /NOENTRY /DLL /MACHINE:AMD64 /OUT:\".\\bin\\x64\\"+arg+".dll\" \"..\\res\\"+arg+".obj\"" 
    136  
    137         system "del \"..\\res\\"+arg+".rc\"" 
    138         system "del \"..\\res\\"+arg+".res\"" 
    139         system "del \"..\\res\\"+arg+".obj\"" 
    140          
    141         puts " - Done\n\n"       
     210        compile_dlls(arg) 
    142211end 
    143212 
  • trunk/res/Halite.rc

    r437 r438  
    328328BEGIN 
    329329    PUSHBUTTON      "Pause",BTNPAUSE,314,3,52,14,BS_DEFPUSHBUTTON 
    330     PUSHBUTTON      "Preannounce",BTNREANNOUNCE,314,19,52,14 
     330    PUSHBUTTON      "Reannounce",BTNREANNOUNCE,314,19,52,14 
    331331    PUSHBUTTON      "Remove",BTNREMOVE,314,35,52,14 
    332332    CONTROL         "",LISTPEERS,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,64,362,6 
     
    607607    HAL_DOWNLOAD_SUMMARY          "This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." 
    608608    HAL_DOWNLOADT_SUMMARY         "Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." 
    609     HAL_PAYLOAD_SUMMARY           "Total transfer including protocol overhead; %1$.2fMB down and %2$.2fMB up." 
     609    HAL_PAYLOAD_SUMMARY           "Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." 
    610610        HAL_NAME_STATUS                           "%1%, %2%." 
    611611    HAL_TRANSFERED                                "%1$.2fMB down - %2$.2fMB up" 
     
    633633        HAL_WINDOW_CLOSECONFRIM           "Are you sure you wish to close Halite? Doing so will stop any active torrents" 
    634634        HAL_WINDOW_SOCKETS_FAILED     "The socket infrastructure failed to start so Halite is forced to close. Please ensure no program is blocking Halites network access." 
    635  
    636  
    637         HAL_NEWT_ADD_PEERS_WEB                  "Web Seed" 
    638         HAL_INT_NEWT_ADD_PEERS_WEB              "Web Seed" 
    639         HAL_NEWT_ADD_PEERS_DHT                  "DHT Node" 
    640         HAL_INT_NEWT_ADD_PEERS_DHT              "DHT Node" 
    641  
    642         HAL_NEWT_EDIT_PEER                              "Edit Peer" 
    643         HAL_NEWT_ADD_NEW_PEER                   "Add New Peer" 
    644         HAL_NEWT_SAVING_TORRENT                 "Saving Torrent" 
    645         HAL_NEWT_EDIT_TRACKER                   "Edit Tracker" 
    646         HAL_NEWT_ADD_NEW_TRACKER                "Add New Tracker" 
    647635        HAL_SAVE_TEXT                                   "Save" 
    648636END 
     
    665653STRINGTABLE 
    666654BEGIN 
    667     HAL_TORRENT_QUEUED_CHECKING "Queued for Checking" 
    668     HAL_TORRENT_CHECKING_FILES "Checking Files" 
    669     HAL_TORRENT_CONNECTING  "Connecting to Tracker" 
    670     HAL_TORRENT_DOWNLOADING "Downloading" 
    671     HAL_TORRENT_FINISHED    "Finished" 
    672     HAL_TORRENT_SEEDING     "Seeding" 
    673     HAL_TORRENT_ALLOCATING  "Allocating" 
    674     HAL_TORRENT_QUEUED      "Queued" 
    675         HAL_TORRENT_STOPPED             "Stopped" 
    676         HAL_TORRENT_PAUSED              "Paused" 
    677         HAL_TORRENT_STOPPING    "Stopping" 
    678         HAL_TORRENT_PAUSING             "Pausing" 
    679         HAL_TORRENT_METADATA    "Downloading Metadata" 
    680  
    681         HAL_TORRENT_CREATINGTORRENT     "Creating Torrent..." 
    682         HAL_TORRENT_CAL_HASHES  "Calculating Piece Hashes..." 
    683         HAL_TORRENT_IMPORT_FILTERS "Importing IP Filters..." 
     655    HAL_TORRENT_QUEUED_CHECKING         "Queued for Checking" 
     656    HAL_TORRENT_CHECKING_FILES          "Checking Files" 
     657    HAL_TORRENT_CONNECTING                      "Connecting to Tracker" 
     658    HAL_TORRENT_DOWNLOADING                     "Downloading" 
     659    HAL_TORRENT_FINISHED                        "Finished" 
     660    HAL_TORRENT_SEEDING                         "Seeding" 
     661    HAL_TORRENT_ALLOCATING                      "Allocating" 
     662    HAL_TORRENT_QUEUED                          "Queued" 
     663        HAL_TORRENT_STOPPED                             "Stopped" 
     664        HAL_TORRENT_PAUSED                              "Paused" 
     665        HAL_TORRENT_STOPPING                    "Stopping" 
     666        HAL_TORRENT_PAUSING                             "Pausing" 
     667        HAL_TORRENT_METADATA                    "Downloading Metadata" 
     668         
     669        HAL_TORRENT_IMPORT_FILTERS              "Importing IP Filters..." 
     670        HAL_TORRENT_LOAD_FILTERS                "Loading IP filters..." 
     671 
     672        HAL_NEWT_CREATING_TORRENT               "Creating Torrent..." 
     673        HAL_NEWT_HASHING_PIECES                 "Calculating Piece Hashes..." 
     674        HAL_NEWT_DIALOG_TITLE                   "Creating a New Torrent File" 
     675        HAL_NEWT_CREATION_CANCELED              "User canceled Torrent file creation" 
     676 
     677        HAL_NEWT_ADD_PEERS_WEB                  "Web Seed" 
     678        HAL_INT_NEWT_ADD_PEERS_WEB              "Web Seed" 
     679        HAL_NEWT_ADD_PEERS_DHT                  "DHT Node" 
     680        HAL_INT_NEWT_ADD_PEERS_DHT              "DHT Node" 
     681 
     682        HAL_NEWT_EDIT_PEER                              "Edit Peer" 
     683        HAL_NEWT_ADD_NEW_PEER                   "Add New Peer" 
     684        HAL_NEWT_SAVING_TORRENT                 "Saving Torrent" 
     685        HAL_NEWT_EDIT_TRACKER                   "Edit Tracker" 
     686        HAL_NEWT_ADD_NEW_TRACKER                "Add New Tracker" 
    684687END 
    685688 
    686689STRINGTABLE 
    687690BEGIN 
    688         HAL_LISTVIEW_COLUMNS              "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" 
    689         HAL_DEBUG_LISTVIEW_COLUMNS        "Time;Message;Severity" 
    690         HAL_TRACKER_LISTVIEW_COLUMNS  "Tracker;Tier" 
    691         HAL_DIALOGPEER_LISTVIEW_COS       "Peer;Country;Download;Upload;Type;Client" 
    692         HAL_DIALOGPEER_LISTVIEW_ADV       "Peer;Country;Download;Upload;Type;Client;Status" 
    693         HAL_DIALOGFILE_LISTVIEW_ADV       "Filename;Path;Size;Progress;Priority" 
    694         HAL_FILES_LISTVIEW_ADV    "Filename;Path;Size" 
    695         HAL_NTPLVM_NAMES                          "URL;Port;Type" 
    696  
    697         HAL_FILE_PRIORITY_0     "Don't download" 
    698         HAL_FILE_PRIORITY_1     "Normal" 
    699         HAL_FILE_PRIORITY_2     "2" 
    700         HAL_FILE_PRIORITY_3     "3" 
    701         HAL_FILE_PRIORITY_4     "4" 
    702         HAL_FILE_PRIORITY_5     "Above Normal" 
    703         HAL_FILE_PRIORITY_6     "6" 
    704         HAL_FILE_PRIORITY_7     "Maximum" 
     691        HAL_LISTVIEW_COLUMNS                    "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" 
     692        HAL_DEBUG_LISTVIEW_COLUMNS              "Time;Message;Severity" 
     693        HAL_TRACKER_LISTVIEW_COLUMNS    "Tracker;Tier" 
     694        HAL_DIALOGPEER_LISTVIEW_COS             "Peer;Country;Download;Upload;Type;Client" 
     695        HAL_DIALOGPEER_LISTVIEW_ADV             "Peer;Country;Download;Upload;Type;Client;Status" 
     696        HAL_DIALOGFILE_LISTVIEW_ADV             "Filename;Path;Size;Progress;Priority" 
     697        HAL_FILES_LISTVIEW_ADV                  "Filename;Path;Size" 
     698        HAL_NTPLVM_NAMES                                "URL;Port;Type" 
     699 
     700        HAL_FILE_PRIORITY_0             "Don't download" 
     701        HAL_FILE_PRIORITY_1             "Normal" 
     702        HAL_FILE_PRIORITY_2             "2" 
     703        HAL_FILE_PRIORITY_3             "3" 
     704        HAL_FILE_PRIORITY_4             "4" 
     705        HAL_FILE_PRIORITY_5             "Above Normal" 
     706        HAL_FILE_PRIORITY_6             "6" 
     707        HAL_FILE_PRIORITY_7             "Maximum" 
    705708END 
    706709 
     
    725728IDR_MAINFRAME TOOLBAR 22,22 
    726729BEGIN 
    727     BUTTON      ID_FILE_NEW 
    728     BUTTON      ID_FILE_OPEN 
     730    BUTTON                      ID_FILE_NEW 
     731    BUTTON                      ID_FILE_OPEN 
    729732    SEPARATOR 
    730     BUTTON      ID_SETTINGS 
    731     BUTTON      ID_ADVANCED 
     733    BUTTON                      ID_SETTINGS 
     734    BUTTON                      ID_ADVANCED 
    732735    SEPARATOR 
    733     BUTTON      ID_RESUME 
    734     BUTTON      ID_PAUSE 
     736    BUTTON                      ID_RESUME 
     737    BUTTON                      ID_PAUSE 
    735738    SEPARATOR 
    736     BUTTON      ID_HELP 
    737 END 
    738  
    739 IDR_APP_ICON        ICON          "Halite.ico" 
    740 IDR_MAINFRAME       BITMAP        "toolbar.bmp" 
     739    BUTTON                      ID_HELP 
     740END 
     741 
     742IDR_APP_ICON            ICON                    "Halite.ico" 
     743IDR_MAINFRAME           BITMAP                  "toolbar.bmp" 
    741744 
    742745STRINGTABLE 
    743746BEGIN 
    744     HAL_EVENTNONE                 "None" 
    745     HAL_EVENTDEBUG                "Debug" 
    746     HAL_EVENTINFO                 "Info" 
    747     HAL_EVENTWARNING              "Warning" 
    748     HAL_EVENTCRITICAL             "Critical" 
    749  
    750     HAL_PEER_ALERT                "Peer %2%: %1%." 
    751     HAL_PEER_BAN_ALERT            "Peer banned %2%. (%1%)" 
    752         HAL_HASH_FAIL_ALERT                       "Hash failed for piece %2% of %1%." 
    753         HAL_URL_SEED_ALERT                        "URL Seed %2%, %3%. (%1%)" 
    754         HAL_TRACKER_WARNING_ALERT         "Tracker warning: %2%! (%1%)" 
    755         HAL_TRACKER_ANNOUNCE_ALERT        "Tracker Announce. (%1%)" 
    756         HAL_TRACKER_ALERT                         "Alert %2%, Status code: %4%, Times %3%. (%1%)" 
    757         HAL_TRACKER_REPLY_ALERT           "%2%. %3% Peers. (%1%)" 
     747    HAL_EVENTNONE                                       "None" 
     748    HAL_EVENTDEBUG                                      "Debug" 
     749    HAL_EVENTINFO                                       "Info" 
     750    HAL_EVENTWARNING                            "Warning" 
     751    HAL_EVENTCRITICAL                           "Critical" 
     752 
     753    HAL_PEER_ALERT                                      "Peer %2%: %1%." 
     754    HAL_PEER_BAN_ALERT                          "Peer banned %2%. (%1%)" 
     755        HAL_HASH_FAIL_ALERT                             "Hash failed for piece %2% of %1%." 
     756        HAL_URL_SEED_ALERT                              "URL Seed %2%, %3%. (%1%)" 
     757        HAL_TRACKER_WARNING_ALERT               "Tracker warning: %2%! (%1%)" 
     758        HAL_TRACKER_ANNOUNCE_ALERT              "Tracker Announce. (%1%)" 
     759        HAL_TRACKER_ALERT                               "Alert %2%, Status code: %4%, Times %3%. (%1%)" 
     760        HAL_TRACKER_REPLY_ALERT                 "%2%. %3% Peers. (%1%)" 
    758761        HAL_FAST_RESUME_ALERT                   "Fast resume failed: %2%. (%1%)" 
    759762        HAL_PIECE_FINISHED_ALERT                "Piece %2% finished. (%1%)" 
     
    765768        HAL_IPFILTER_ALERT                              "IP Filter blocked %1%, %2%." 
    766769 
    767         LBT_EVENT_TORRENT_FINISHED    "Torrent %1% finished." 
    768         LBT_EVENT_TORRENT_PAUSED      "Torrent %1% paused." 
    769     HAL_EVENT_TORRENTEXP          "Torrent (%1%) exception caught; %2% from %3%." 
    770     HAL_EVENT_INVTORRENT          "Invalid torrent (%1%) from %2%." 
    771  
    772         HAL_EVENT_EXP                 "Exception caught; %1%, from %2%." 
    773     HAL_EVENT_XML_EXP              "Xml Exception (%1%) with %2%." 
    774         HAL_EVENT_UNICODE_EXP         "Unicode exception: %1%." 
    775         HAL_EVENT_UNCLASSIFIED            "Bittorrent Event: %1%." 
    776         HAL_EVENT_PEER                            "Peer Event: %1%." 
    777         HAL_EVENT_TRACKER                         "Tracker Event: %1%." 
    778         HAL_EVENT_DEBUG                           "Debug Event: %1%." 
    779         HAL_EVENT_DEV                             "Dev Msg: %1%." 
     770        LBT_EVENT_TORRENT_FINISHED              "Torrent %1% finished." 
     771        LBT_EVENT_TORRENT_PAUSED                "Torrent %1% paused." 
     772    HAL_EVENT_TORRENTEXP                        "Torrent (%1%) exception caught: %2% from %3%." 
     773    HAL_EVENT_INVTORRENT                        "Invalid torrent (%1%) from %2%." 
     774 
     775        HAL_EVENT_EXP                                   "Exception caught: %1%, from %2%." 
     776    HAL_EVENT_XML_EXP                           "Xml Exception (%1%) with %2%." 
     777        HAL_EVENT_UNICODE_EXP                   "Unicode exception: %1%." 
     778        HAL_EVENT_UNCLASSIFIED                  "Bittorrent Event: %1%." 
     779        HAL_EVENT_PEER                                  "Peer Event: %1%." 
     780        HAL_EVENT_TRACKER                               "Tracker Event: %1%." 
     781        HAL_EVENT_DEBUG                                 "Debug Event: %1%." 
     782        HAL_EVENT_DEV                                   "Dev Msg: %1%." 
    780783END 
    781784 
  • trunk/src/ConfigOptions.cpp

    r437 r438  
    1818        { 
    1919                ProgressDialog progDlg(L"Importing IP filters...", bind( 
    20                         &hal::BitTorrent::ip_filter_import_dat, &hal::bittorrent(), path(hal::to_utf8(dlgOpen.m_ofn.lpstrFile)), _1, true)); 
     20                        &hal::bit::ip_filter_import_dat, &hal::bittorrent(), path(hal::to_utf8(dlgOpen.m_ofn.lpstrFile)), _1, true)); 
    2121                progDlg.DoModal(); 
    2222        } 
  • trunk/src/HaliteListView.cpp

    r437 r438  
    118118{ 
    119119        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    120                 bind((void (hal::BitTorrent::*)(const std::wstring&))&hal::BitTorrent::resumeTorrent,  
     120                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::resumeTorrent,  
    121121                        &hal::bittorrent(), _1)); 
    122122         
     
    127127{        
    128128        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    129                 bind((void (hal::BitTorrent::*)(const std::wstring&))&hal::BitTorrent::pauseTorrent, 
     129                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::pauseTorrent, 
    130130                        &hal::bittorrent(), _1)); 
    131131         
     
    136136{ 
    137137        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    138                 bind((void (hal::BitTorrent::*)(const std::wstring&))&hal::BitTorrent::stopTorrent,  
     138                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::stopTorrent,  
    139139                        &hal::bittorrent(), _1)); 
    140140         
     
    153153{ 
    154154        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    155                 bind((void (hal::BitTorrent::*)(const std::wstring&))&hal::BitTorrent::removeTorrent,  
     155                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::removeTorrent,  
    156156                        &hal::bittorrent(), _1)); 
    157157 
     
    163163{ 
    164164        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    165                 bind((void (hal::BitTorrent::*)(const std::wstring&))&hal::BitTorrent::recheckTorrent,  
     165                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::recheckTorrent,  
    166166                        &hal::bittorrent(), _1));        
    167167 
     
    172172{ 
    173173        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    174                 bind((void (hal::BitTorrent::*)(const std::wstring&))&hal::BitTorrent::removeTorrentWipeFiles,  
     174                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::removeTorrentWipeFiles,  
    175175                        &hal::bittorrent(), _1)); 
    176176         
     
    221221        HAL_DEV_MSG(L"OnEditFolders"); 
    222222 
    223         hal::BitTorrent::torrent t = hal::bittorrent().get(manager_.selected()); 
     223        hal::bit::torrent t = hal::bittorrent().get(manager_.selected()); 
    224224 
    225225        wstring saveDirectory = static_cast<wpath>(t.save_directory).native_file_string(); 
  • trunk/src/HaliteWindow.cpp

    r437 r438  
    472472LRESULT HaliteWindow::OnFileNew(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) 
    473473{ 
    474         NewTorrentDialog newTorrent;     
     474        wstring title = hal::app().res_wstr(HAL_NEWT_DIALOG_TITLE); 
     475 
     476        NewTorrentDialog newTorrent(title.c_str());      
    475477    newTorrent.DoModal(); 
    476  
    477 //      MessageBox(L"This feature is under development and currently disabled",  
    478 //              L"Feature not availible", 0); 
    479         return 0; 
    480          
    481         CSSFileDialog dlgOpen(TRUE, NULL, NULL, OFN_HIDEREADONLY, L"All Files|*.*|", m_hWnd); 
    482  
    483         if (dlgOpen.DoModal() != IDOK)  
    484                 return 0; 
    485          
    486         wstring files = dlgOpen.m_ofn.lpstrFile; 
    487          
    488         CSSFileDialog dlgSave(FALSE, NULL, NULL, OFN_HIDEREADONLY, L"Torrents (*.torrent)|*.torrent|", m_hWnd); 
    489          
    490         if (dlgSave.DoModal() != IDOK)  
    491                 return 0; 
    492          
    493         wstring torrent_filename = dlgSave.m_ofn.lpstrFile; 
    494          
    495         hal::bittorrent().newTorrent(wpath(torrent_filename), wpath(files)); 
    496          
    497         ui().update(); 
    498478         
    499479        return 0; 
  • trunk/src/NewTorrentDialog.cpp

    r433 r438  
    123123        filesList_.Attach(GetDlgItem(IDC_NEWT_LISTFILES));       
    124124 
     125        creator_ = L"Halite " + hal::app().res_wstr(HAL_VERSION_STRING); 
     126 
    125127        BOOL retval =  DoDataExchange(false); 
    126128        return 0; 
     
    385387 
    386388        ProgressDialog progDlg(hal::app().res_wstr(HAL_NEWT_SAVING_TORRENT), bind( 
    387                 &hal::BitTorrent::create_torrent, &hal::bittorrent(), params, fileSheet_.OutputFile(), _1)); 
    388         progDlg.DoModal(); 
     389                &hal::bit::create_torrent, &hal::bittorrent(), params, fileSheet_.OutputFile(), _1)); 
     390 
     391        int err_code = progDlg.DoModal(); 
     392 
     393        HAL_DEV_MSG(wformat(L"progDlg err_code: %1%") % err_code); 
     394 
     395        if (err_code == 0) SendMessage(WM_CLOSE); 
    389396 
    390397        } 
  • trunk/src/NewTorrentDialog.hpp

    r433 r438  
    2727#define IDC_NEWT_OUTFILE_TEXT                   ID_NEWTORRENT_BEGIN+18 
    2828#define HAL_NEWT_SAVING_TORRENT                 ID_NEWTORRENT_BEGIN+19 
     29#define HAL_NEWT_DIALOG_TITLE                   ID_NEWTORRENT_BEGIN+20 
    2930 
    3031#ifndef RC_INVOKED 
     
    316317        { 
    317318        SetMsgHandled(false); 
     319 
    318320                resizeActiveSheet(); 
    319321        } 
     
    321323        void OnClose() 
    322324        { 
     325                SetMsgHandled(false); 
     326 
    323327                OnDestroy(); 
    324328        } 
     
    326330        void OnDestroy()  
    327331        { 
     332                SetMsgHandled(false); 
     333 
    328334                GetWindowRect(rect_); 
    329335                Save(); 
  • trunk/src/ProgressDialog.hpp

    r431 r438  
    1414#define IDC_PROG_PROGRESS               ID_PROGRESS_BEGIN + 3 
    1515 
    16 #ifdef RC_INVOKED 
    17  
    18 #else // RC_INVOKED 
     16#ifndef RC_INVOKED 
    1917 
    2018#include <boost/function.hpp> 
     
    3028        typedef CDialogImpl<ProgressDialog> baseClass; 
    3129         
    32         typedef boost::function<void (hal::progress_callback fn)> threadFunction; 
     30        typedef boost::function<bool (hal::progress_callback fn)> threadFunction; 
    3331 
    3432public: 
     
    4240 
    4341    BEGIN_MSG_MAP_EX(ProgressDialog) 
    44         MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) 
     42                MSG_WM_INITDIALOG(onInitDialog) 
     43 
    4544                COMMAND_ID_HANDLER_EX(IDC_PROG_CANCEL, onCancel) 
    4645    END_MSG_MAP() 
    4746         
    48         LRESULT OnInitDialog(...) 
     47        LRESULT onInitDialog(HWND, LPARAM) 
    4948        { 
    5049                CenterWindow(); 
     
    6059        void ProgressThread() 
    6160        { 
    62                 fn_(bind(&ProgressDialog::Callback, this, _1, _2)); 
     61                int err_code = (fn_(bind(&ProgressDialog::Callback, this, _1, _2)) ? 1 : 0); 
    6362                 
    64                 EndDialog(0); 
     63                EndDialog(err_code); 
    6564        } 
    6665         
  • trunk/src/advtabs/Torrent.cpp

    r437 r438  
    111111                hal::bittorrent().setTorrentRatio(torrentName, ratio_); 
    112112 
    113 //              hal::BitTorrent::torrent t = hal::bittorrent().get(torrent->name()); 
     113//              hal::bit::torrent t = hal::bittorrent().get(torrent->name()); 
    114114 
    115115//              t.ratio = ratio_; 
  • trunk/src/halConfig.cpp

    r392 r438  
    5757        { 
    5858                ProgressDialog progDlg(L"Loading IP filters...", bind( 
    59                         &BitTorrent::ensureIpFilterOn, &bittorrent(), _1)); 
     59                        &bit::ensureIpFilterOn, &bittorrent(), _1)); 
    6060                progDlg.DoModal(); 
    6161        } 
  • trunk/src/halTorrent.cpp

    r437 r438  
    149149{ 
    150150 
    151  
    152  
    153 BitTorrent& bittorrent() 
    154 { 
    155         static BitTorrent t; 
     151bit& bittorrent() 
     152{ 
     153        static bit t; 
    156154        return t; 
    157155} 
     
    272270{} 
    273271 
    274 class BitTorrent_impl 
    275 { 
    276         friend class BitTorrent; 
     272class bit_impl 
     273{ 
     274        friend class bit; 
    277275         
    278276public: 
    279277         
    280         ~BitTorrent_impl() 
     278        ~bit_impl() 
    281279        { 
    282280                keepChecking_ = false; 
     
    328326                { 
    329327                public: 
    330                 AlertHandler(BitTorrent_impl& bit_impl) : 
     328                AlertHandler(bit_impl& bit_impl) : 
    331329                        bit_impl_(bit_impl) 
    332330                {} 
     
    524522                 
    525523                private: 
    526                         BitTorrent_impl& bit_impl_; 
     524                        bit_impl& bit_impl_; 
    527525                         
    528526                        torrent_internal_ptr get(lbt::torrent_handle h) const  
     
    575573                 
    576574                timer_.expires_from_now(boost::posix_time::seconds(5)); 
    577                 timer_.async_wait(bind(&BitTorrent_impl::alertHandler, this)); 
     575                timer_.async_wait(bind(&bit_impl::alertHandler, this)); 
    578576                } 
    579577        } 
     
    607605 
    608606private: 
    609         BitTorrent_impl() : 
     607        bit_impl() : 
    610608                theSession(lbt::fingerprint(HALITE_FINGERPRINT)), 
    611609                timer_(io_), 
     
    687685                 
    688686                timer_.expires_from_now(boost::posix_time::seconds(5)); 
    689                 timer_.async_wait(bind(&BitTorrent_impl::alertHandler, this)); 
    690         } 
    691  
    692         void create_torrent(const create_torrent_params& params, fs::wpath out_file, progress_callback fn) 
     687                timer_.async_wait(bind(&bit_impl::alertHandler, this)); 
     688        } 
     689 
     690        bool create_torrent(const create_torrent_params& params, fs::wpath out_file, progress_callback fn) 
    693691        {                
    694692        try 
     
    748746                        t_info->set_hash(i, h.final()); 
    749747 
    750                         fn(100*i / num, hal::app().res_wstr(HAL_TORRENT_CAL_HASHES)); 
     748                        if (fn(100*i / num, hal::app().res_wstr(HAL_NEWT_HASHING_PIECES))) 
     749                        { 
     750                                // User canceled torrent creation. 
     751 
     752                                hal::event().post(shared_ptr<hal::EventDetail>( 
     753                                        new hal::EventMsg(hal::app().res_wstr(HAL_NEWT_CREATION_CANCELED), hal::Event::info))); 
     754 
     755                                return true; 
     756                        } 
    751757                } 
    752758 
     
    765771                                new EventStdException(Event::fatal, e, L"create_torrent"))); 
    766772                }        
     773 
     774                return false; 
    767775        } 
    768776         
     
    801809}; 
    802810 
    803 wpath BitTorrent_impl::workingDirectory = hal::app().working_directory(); 
    804  
    805 BitTorrent::BitTorrent() : 
    806         pimpl(new BitTorrent_impl()) 
     811wpath bit_impl::workingDirectory = hal::app().working_directory(); 
     812 
     813bit::bit() : 
     814        pimpl(new bit_impl()) 
    807815{} 
    808816 
     
    824832} 
    825833 
    826 void BitTorrent::shutDownSession() 
     834void bit::shutDownSession() 
    827835{ 
    828836        pimpl.reset(); 
    829837} 
    830838 
    831 void BitTorrent::saveTorrentData() 
     839void bit::saveTorrentData() 
    832840{ 
    833841        pimpl->saveTorrentData(); 
    834842} 
    835843 
    836 void BitTorrent::create_torrent(const create_torrent_params& params, fs::wpath out_file, progress_callback fn) 
    837 { 
    838         pimpl->create_torrent(params, out_file, fn); 
    839 } 
    840  
    841 BitTorrent::torrent BitTorrent::get_wstr(const std::wstring& filename) 
    842 { 
    843         return BitTorrent::torrent(pimpl->theTorrents.get(filename)); 
    844 } 
    845  
    846 bool BitTorrent::listenOn(std::pair<int, int> const& range) 
     844bool bit::create_torrent(const create_torrent_params& params, fs::wpath out_file, progress_callback fn) 
     845{ 
     846        return pimpl->create_torrent(params, out_file, fn); 
     847} 
     848 
     849bit::torrent bit::get_wstr(const std::wstring& filename) 
     850{ 
     851        return bit::torrent(pimpl->theTorrents.get(filename)); 
     852} 
     853 
     854bool bit::listenOn(std::pair<int, int> const& range) 
    847855{ 
    848856        try 
     
    871879        { 
    872880                event().post(shared_ptr<EventDetail>( 
    873                         new EventStdException(Event::fatal, e, L"From BitTorrent::listenOn."))); 
     881                        new EventStdException(Event::fatal, e, L"From bit::listenOn."))); 
    874882 
    875883                return false; 
     
    881889} 
    882890 
    883 int BitTorrent::isListeningOn()  
     891int bit::isListeningOn()  
    884892{ 
    885893        if (!pimpl->theSession.is_listening()) 
     
    889897} 
    890898 
    891 void BitTorrent::stopListening() 
     899void bit::stopListening() 
    892900{ 
    893901        ensureDhtOff(); 
     
    895903} 
    896904 
    897 bool BitTorrent::ensureDhtOn() 
     905bool bit::ensureDhtOn() 
    898906{ 
    899907        if (!pimpl->dht_on_) 
     
    910918} 
    911919 
    912 void BitTorrent::ensureDhtOff() 
     920void bit::ensureDhtOff() 
    913921{ 
    914922        if (pimpl->dht_on_) 
     
    919927} 
    920928 
    921 void BitTorrent::setDhtSettings(int max_peers_reply, int search_branching,  
     929void bit::setDhtSettings(int max_peers_reply, int search_branching,  
    922930        int service_port, int max_fail_count) 
    923931{ 
     
    935943} 
    936944 
    937 void BitTorrent::setMapping(int mapping) 
     945void bit::setMapping(int mapping) 
    938946{ 
    939947        if (mapping != mappingNone) 
     
    964972} 
    965973 
    966 void BitTorrent::setTimeouts(int peers, int tracker) 
     974void bit::setTimeouts(int peers, int tracker) 
    967975{ 
    968976        lbt::session_settings settings = pimpl->theSession.settings(); 
     
    976984} 
    977985 
    978 void BitTorrent::setSessionLimits(int maxConn, int maxUpload) 
     986void bit::setSessionLimits(int maxConn, int maxUpload) 
    979987{                
    980988        pimpl->theSession.set_max_uploads(maxUpload); 
     
    986994} 
    987995 
    988 void BitTorrent::setSessionSpeed(float download, float upload) 
     996void bit::setSessionSpeed(float download, float upload) 
    989997{ 
    990998        int down = (download > 0) ? static_cast<int>(download*1024) : -1; 
     
    9981006} 
    9991007 
    1000 void BitTorrent_impl::ip_filter_count() 
     1008void bit_impl::ip_filter_count() 
    10011009{ 
    10021010        lbt::ip_filter::filter_tuple_t vectors = ip_filter_.export_filter(); 
     
    10091017} 
    10101018 
    1011 void BitTorrent_impl::ip_filter_load(progress_callback fn) 
     1019void bit_impl::ip_filter_load(progress_callback fn) 
    10121020{ 
    10131021        fs::ifstream ifs(workingDirectory/L"IPFilter.bin", std::ios::binary); 
     
    10251033                        { 
    10261034                                previous = i; 
    1027                                 if (fn) if (fn(size_t(i/total),L"")) break; 
     1035 
     1036                                if (fn) if (fn(size_t(i/total), hal::app().res_wstr(HAL_TORRENT_LOAD_FILTERS))) break; 
    10281037                        } 
    10291038                         
     
    10331042} 
    10341043 
    1035 void  BitTorrent_impl::ip_filter_import(std::vector<lbt::ip_range<asio::ip::address_v4> >& v4, 
     1044void  bit_impl::ip_filter_import(std::vector<lbt::ip_range<asio::ip::address_v4> >& v4, 
    10361045        std::vector<lbt::ip_range<asio::ip::address_v6> >& v6) 
    10371046{ 
     
    10501059} 
    10511060 
    1052 void BitTorrent::ensureIpFilterOn(progress_callback fn) 
     1061bool bit::ensureIpFilterOn(progress_callback fn) 
    10531062{ 
    10541063        try 
     
    10781087 
    10791088        event().post(shared_ptr<EventDetail>(new EventMsg(L"IP filters on.")));  
    1080 } 
    1081  
    1082 void BitTorrent::ensureIpFilterOff() 
     1089 
     1090        return false; 
     1091} 
     1092 
     1093void bit::ensureIpFilterOff() 
    10831094{ 
    10841095        pimpl->theSession.set_ip_filter(lbt::ip_filter()); 
     
    10891100 
    10901101#ifndef TORRENT_DISABLE_ENCRYPTION       
    1091 void BitTorrent::ensurePeOn(int enc_level, int in_enc_policy, int out_enc_policy, bool prefer_rc4) 
     1102void bit::ensurePeOn(int enc_level, int in_enc_policy, int out_enc_policy, bool prefer_rc4) 
    10921103{ 
    10931104        lbt::pe_settings pe; 
     
    11691180} 
    11701181 
    1171 void BitTorrent::ensurePeOff() 
     1182void bit::ensurePeOff() 
    11721183{ 
    11731184        lbt::pe_settings pe; 
     
    11841195#endif 
    11851196 
    1186 void BitTorrent::ip_v4_filter_block(asio::ip::address_v4 first, asio::ip::address_v4 last) 
     1197void bit::ip_v4_filter_block(asio::ip::address_v4 first, asio::ip::address_v4 last) 
    11871198{ 
    11881199        pimpl->ip_filter_.add_rule(first, last, lbt::ip_filter::blocked); 
     
    11911202} 
    11921203 
    1193 void BitTorrent::ip_v6_filter_block(asio::ip::address_v6 first, asio::ip::address_v6 last) 
     1204void bit::ip_v6_filter_block(asio::ip::address_v6 first, asio::ip::address_v6 last) 
    11941205{ 
    11951206        pimpl->ip_filter_.add_rule(first, last, lbt::ip_filter::blocked); 
     
    11981209} 
    11991210 
    1200 size_t BitTorrent::ip_filter_size() 
     1211size_t bit::ip_filter_size() 
    12011212{ 
    12021213        return pimpl->ip_filter_count_; 
    12031214} 
    12041215 
    1205 void BitTorrent::clearIpFilter() 
     1216void bit::clearIpFilter() 
    12061217{ 
    12071218        pimpl->ip_filter_ = lbt::ip_filter(); 
     
    12111222} 
    12121223 
    1213 void BitTorrent::ip_filter_import_dat(boost::filesystem::path file, progress_callback fn, bool octalFix) 
     1224bool bit::ip_filter_import_dat(boost::filesystem::path file, progress_callback fn, bool octalFix) 
    12141225{ 
    12151226        try 
     
    12881299                        new EventStdException(Event::critical, e, L"ip_filter_import_dat"))); 
    12891300        } 
    1290 } 
    1291  
    1292 const SessionDetail BitTorrent::getSessionDetails() 
     1301 
     1302        return false; 
     1303} 
     1304 
     1305const SessionDetail bit::getSessionDetails() 
    12931306{ 
    12941307        SessionDetail details; 
     
    13101323} 
    13111324 
    1312 void BitTorrent::setSessionHalfOpenLimit(int halfConn) 
     1325void bit::setSessionHalfOpenLimit(int halfConn) 
    13131326{ 
    13141327        pimpl->theSession.set_max_half_open_connections(halfConn); 
     
    13181331} 
    13191332 
    1320 void BitTorrent::setTorrentDefaults(int maxConn, int maxUpload, float download, float upload) 
     1333void bit::setTorrentDefaults(int maxConn, int maxUpload, float download, float upload) 
    13211334{ 
    13221335        pimpl->defTorrentMaxConn_ = maxConn; 
     
    13331346} 
    13341347 
    1335 std::pair<lbt::entry, lbt::entry> BitTorrent_impl::prepTorrent(wpath filename, wpath saveDirectory) 
     1348std::pair<lbt::entry, lbt::entry> bit_impl::prepTorrent(wpath filename, wpath saveDirectory) 
    13361349{ 
    13371350        lbt::entry metadata = haldecode(filename); 
     
    13811394} 
    13821395 
    1383 void BitTorrent::addTorrent(wpath file, wpath saveDirectory, bool startStopped, bool compactStorage,  
     1396void bit::addTorrent(wpath file, wpath saveDirectory, bool startStopped, bool compactStorage,  
    13841397                boost::filesystem::wpath moveToDirectory, bool useMoveTo)  
    13851398{ 
     
    14451458} 
    14461459 
    1447 void BitTorrent::newTorrent(wpath filename, wpath files) 
     1460void bit::newTorrent(wpath filename, wpath files) 
    14481461{ 
    14491462/*      try 
     
    14901503} 
    14911504 
    1492 const TorrentDetails& BitTorrent::torrentDetails() 
     1505const TorrentDetails& bit::torrentDetails() 
    14931506{ 
    14941507        return torrentDetails_; 
    14951508} 
    14961509 
    1497 const TorrentDetails& BitTorrent::updateTorrentDetails(const wstring& focused, const std::set<wstring>& selected) 
     1510const TorrentDetails& bit::updateTorrentDetails(const wstring& focused, const std::set<wstring>& selected) 
    14981511{ 
    14991512        try { 
     
    15261539} 
    15271540 
    1528 void BitTorrent::resumeAll() 
     1541void bit::resumeAll() 
    15291542{ 
    15301543        try { 
     
    15841597} 
    15851598 
    1586 void BitTorrent::closeAll() 
     1599void bit::closeAll() 
    15871600{ 
    15881601        try { 
     
    16901703} 
    16911704 
    1692 void BitTorrent::getAllPeerDetails(const std::string& filename, PeerDetails& peerContainer) 
     1705void bit::getAllPeerDetails(const std::string& filename, PeerDetails& peerContainer) 
    16931706{ 
    16941707        getAllPeerDetails(from_utf8_safe(filename), peerContainer); 
    16951708} 
    16961709 
    1697 void BitTorrent::getAllPeerDetails(const std::wstring& filename, PeerDetails& peerContainer) 
     1710void bit::getAllPeerDetails(const std::wstring& filename, PeerDetails& peerContainer) 
    16981711{ 
    16991712        try { 
     
    17041717} 
    17051718 
    1706 void BitTorrent::getAllFileDetails(const std::string& filename, FileDetails& fileDetails) 
     1719void bit::getAllFileDetails(const std::string& filename, FileDetails& fileDetails) 
    17071720{ 
    17081721        getAllFileDetails(from_utf8_safe(filename), fileDetails); 
    17091722} 
    17101723 
    1711 void BitTorrent::getAllFileDetails(const std::wstring& filename, FileDetails& fileDetails) 
     1724void bit::getAllFileDetails(const std::wstring& filename, FileDetails& fileDetails) 
    17121725{ 
    17131726        try { 
     
    17181731} 
    17191732 
    1720 bool BitTorrent::isTorrent(const std::string& filename) 
     1733bool bit::isTorrent(const std::string& filename) 
    17211734{        
    17221735        return isTorrent(hal::to_wstr_shim(filename)); 
    17231736} 
    17241737 
    1725 bool BitTorrent::isTorrent(const std::wstring& filename) 
     1738bool bit::isTorrent(const std::wstring& filename) 
    17261739{        
    17271740        try { 
     
    17341747} 
    17351748 
    1736 void BitTorrent::pauseTorrent(const std::string& filename) 
     1749void bit::pauseTorrent(const std::string& filename) 
    17371750{ 
    17381751        pauseTorrent(hal::to_wstr_shim(filename)); 
    17391752} 
    17401753 
    1741 void BitTorrent::pauseTorrent(const std::wstring& filename) 
     1754void bit::pauseTorrent(const std::wstring& filename) 
    17421755{ 
    17431756        try { 
     
    17481761} 
    17491762 
    1750 void BitTorrent::resumeTorrent(const std::string& filename) 
     1763void bit::resumeTorrent(const std::string& filename) 
    17511764{ 
    17521765        resumeTorrent(hal::to_wstr_shim(filename)); 
    17531766} 
    17541767 
    1755 void BitTorrent::resumeTorrent(const std::wstring& filename) 
     1768void bit::resumeTorrent(const std::wstring& filename) 
    17561769{ 
    17571770        try { 
     
    17621775} 
    17631776 
    1764 void BitTorrent::stopTorrent(const std::string& filename) 
     1777void bit::stopTorrent(const std::string& filename) 
    17651778{ 
    17661779        stopTorrent(hal::to_wstr_shim(filename)); 
    17671780} 
    17681781 
    1769 void BitTorrent::stopTorrent(const std::wstring& filename) 
     1782void bit::stopTorrent(const std::wstring& filename) 
    17701783{ 
    17711784        try { 
     
    17761789} 
    17771790 
    1778 bool BitTorrent::isTorrentActive(const std::string& filename) 
     1791bool bit::isTorrentActive(const std::string& filename) 
    17791792{ 
    17801793        return isTorrentActive(hal::to_wstr_shim(filename)); 
    17811794} 
    17821795 
    1783 bool BitTorrent::isTorrentActive(const std::wstring& filename) 
     1796bool bit::isTorrentActive(const std::wstring& filename) 
    17841797{ 
    17851798        try { 
     
    17921805} 
    17931806 
    1794 void BitTorrent::reannounceTorrent(const std::string& filename) 
     1807void bit::reannounceTorrent(const std::string& filename) 
    17951808{ 
    17961809        reannounceTorrent(hal::to_wstr_shim(filename)); 
    17971810} 
    17981811 
    1799 void BitTorrent::reannounceTorrent(const std::wstring& filename) 
     1812void bit::reannounceTorrent(const std::wstring& filename) 
    18001813{ 
    18011814        try { 
     
    18061819} 
    18071820 
    1808 void BitTorrent::setTorrentLogin(const std::string& filename, std::wstring username, std::wstring password) 
     1821void bit::setTorrentLogin(const std::string& filename, std::wstring username, std::wstring password) 
    18091822{ 
    18101823        setTorrentLogin(hal::to_wstr_shim(filename), username, password); 
    18111824} 
    18121825 
    1813 void BitTorrent::setTorrentLogin(const std::wstring& filename, std::wstring username, std::wstring password) 
     1826void bit::setTorrentLogin(const std::wstring& filename, std::wstring username, std::wstring password) 
    18141827{ 
    18151828        try { 
     
    18201833} 
    18211834 
    1822 std::pair<std::wstring, std::wstring> BitTorrent::getTorrentLogin(const std::string& filename) 
     1835std::pair<std::wstring, std::wstring> bit::getTorrentLogin(const std::string& filename) 
    18231836{ 
    18241837        return getTorrentLogin(hal::to_wstr_shim(filename)); 
    18251838} 
    18261839 
    1827 std::pair<std::wstring, std::wstring> BitTorrent::getTorrentLogin(const std::wstring& filename) 
     1840std::pair<std::wstring, std::wstring> bit::getTorrentLogin(const std::wstring& filename) 
    18281841{ 
    18291842        try { 
     
    18361849} 
    18371850 
    1838 void BitTorrent_impl::removalThread(torrent_internal_ptr pIT, bool wipeFiles) 
     1851void bit_impl::removalThread(torrent_internal_ptr pIT, bool wipeFiles) 
    18391852{ 
    18401853        try { 
     
    18901903} 
    18911904 
    1892 void BitTorrent::removeTorrent(const std::string& filename) 
     1905void bit::removeTorrent(const std::string& filename) 
    18931906{ 
    18941907        removeTorrent(hal::to_wstr_shim(filename)); 
    18951908} 
    18961909 
    1897 void BitTorrent::removeTorrent(const std::wstring& filename) 
     1910void bit::removeTorrent(const std::wstring& filename) 
    18981911{ 
    18991912        try { 
     
    19031916        pimpl->theTorrents.erase(filename); 
    19041917         
    1905         thread_t t(bind(&BitTorrent_impl::removalThread, &*pimpl, pTI, false));  
     1918        thread_t t(bind(&bit_impl::removalThread, &*pimpl, pTI, false));         
    19061919         
    19071920        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(filename, "removeTorrent") 
    19081921} 
    19091922 
    1910 void BitTorrent::recheckTorrent(const std::string& filename) 
     1923void bit::recheckTorrent(const std::string& filename) 
    19111924{ 
    19121925        recheckTorrent(hal::to_wstr_shim(filename)); 
    19131926} 
    19141927 
    1915 void BitTorrent::recheckTorrent(const std::wstring& filename) 
     1928void bit::recheckTorrent(const std::wstring& filename) 
    19161929{ 
    19171930        try { 
     
    19221935} 
    19231936 
    1924 void BitTorrent::removeTorrentWipeFiles(const std::string& filename) 
     1937void bit::removeTorrentWipeFiles(const std::string& filename) 
    19251938{ 
    19261939        removeTorrentWipeFiles(hal::to_wstr_shim(filename)); 
    19271940} 
    19281941 
    1929 void BitTorrent::removeTorrentWipeFiles(const std::wstring& filename) 
     1942void bit::removeTorrentWipeFiles(const std::wstring& filename) 
    19301943{ 
    19311944        try { 
     
    19351948        pimpl->theTorrents.erase(filename); 
    19361949         
    1937         thread_t t(bind(&BitTorrent_impl::removalThread, &*pimpl, pTI, true));   
     1950        thread_t t(bind(&bit_impl::removalThread, &*pimpl, pTI, true));  
    19381951         
    19391952        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(filename, "removeTorrentWipeFiles") 
    19401953} 
    19411954 
    1942 void BitTorrent::pauseAllTorrents() 
     1955void bit::pauseAllTorrents() 
    19431956{        
    19441957        try { 
     
    19541967} 
    19551968 
    1956 void BitTorrent::unpauseAllTorrents() 
     1969void bit::unpauseAllTorrents() 
    19571970{        
    19581971        try { 
     
    19681981} 
    19691982 
    1970 void BitTorrent::setTorrentLimit(const std::string& filename, int maxConn, int maxUpload) 
     1983void bit::setTorrentLimit(const std::string& filename, int maxConn, int maxUpload) 
    19711984{ 
    19721985        setTorrentLimit(hal::from_utf8_safe(filename), maxConn, maxUpload); 
    19731986} 
    19741987 
    1975 void BitTorrent::setTorrentLimit(const std::wstring& filename, int maxConn, int maxUpload) 
     1988void bit::setTorrentLimit(const std::wstring& filename, int maxConn, int maxUpload) 
    19761989{ 
    19771990        try { 
     
    19831996 
    19841997 
    1985 BitTorrent::torrent::torrent(boost::shared_ptr<torrent_internal> p) : 
     1998bit::torrent::torrent(boost::shared_ptr<torrent_internal> p) : 
    19861999        ptr(p) 
    19872000{} 
    19882001 
    1989 BitTorrent::torrent::exec_around_ptr::proxy::proxy(torrent_internal* t) :  
     2002bit::torrent::exec_around_ptr::proxy::proxy(torrent_internal* t) :  
    19902003        t_(t), 
    19912004        l_(t->mutex_) 
     
    19942007} 
    19952008 
    1996 BitTorrent::torrent::exec_around_ptr::proxy::~proxy()  
     2009bit::torrent::exec_around_ptr::proxy::~proxy()  
    19972010{ 
    19982011        HAL_DEV_MSG(L"Dtor proxy"); 
    19992012} 
    20002013 
    2001 float BitTorrent::torrent::get_ratio() const 
     2014float bit::torrent::get_ratio() const 
    20022015{ 
    20032016        try { 
     
    20102023} 
    20112024 
    2012 void BitTorrent::torrent::set_ratio(float r) 
     2025void bit::torrent::set_ratio(float r) 
    20132026{ 
    20142027        try { 
     
    20192032} 
    20202033 
    2021 wpath BitTorrent::torrent::get_save_directory() const 
     2034wpath bit::torrent::get_save_directory() const 
    20222035{ 
    20232036        try { 
     
    20302043} 
    20312044 
    2032 void BitTorrent::torrent::set_save_directory(const wpath& s) 
     2045void bit::torrent::set_save_directory(const wpath& s) 
    20332046{ 
    20342047        try { 
     
    20392052} 
    20402053 
    2041 wpath BitTorrent::torrent::get_move_to_directory() const 
     2054wpath bit::torrent::get_move_to_directory() const 
    20422055{ 
    20432056        try { 
     
    20502063} 
    20512064 
    2052 void BitTorrent::torrent::set_move_to_directory(const wpath& m) 
     2065void bit::torrent::set_move_to_directory(const wpath& m) 
    20532066{ 
    20542067        try { 
     
    20592072} 
    20602073 
    2061 void BitTorrent::setTorrentRatio(const std::string& filename, float ratio) 
     2074void bit::setTorrentRatio(const std::string& filename, float ratio) 
    20622075{ 
    20632076        setTorrentRatio(hal::from_utf8_safe(filename), ratio); 
    20642077} 
    20652078 
    2066 void BitTorrent::setTorrentRatio(const std::wstring& filename, float ratio) 
     2079void bit::setTorrentRatio(const std::wstring& filename, float ratio) 
    20672080{ 
    20682081        try { 
     
    20732086} 
    20742087 
    2075 float BitTorrent::getTorrentRatio(const std::string& filename) 
     2088float bit::getTorrentRatio(const std::string& filename) 
    20762089{ 
    20772090        return getTorrentRatio(hal::from_utf8_safe(filename)); 
    20782091} 
    20792092 
    2080 float BitTorrent::getTorrentRatio(const std::wstring& filename) 
     2093float bit::getTorrentRatio(const std::wstring& filename) 
    20812094{ 
    20822095        try { 
     
    20892102} 
    20902103 
    2091 void BitTorrent::setTorrentSpeed(const std::string& filename, float download, float upload) 
     2104void bit::setTorrentSpeed(const std::string& filename, float download, float upload) 
    20922105{ 
    20932106        setTorrentSpeed(hal::from_utf8_safe(filename), download, upload); 
    20942107} 
    20952108 
    2096 void BitTorrent::setTorrentSpeed(const std::wstring& filename, float download, float upload) 
     2109void bit::setTorrentSpeed(const std::wstring& filename, float download, float upload) 
    20972110{ 
    20982111        try { 
     
    21032116} 
    21042117 
    2105 std::pair<int, int> BitTorrent::getTorrentLimit(const std::string& filename) 
     2118std::pair<int, int> bit::getTorrentLimit(const std::string& filename) 
    21062119{ 
    21072120        return getTorrentLimit(from_utf8_safe(filename)); 
    21082121} 
    21092122 
    2110 std::pair<int, int> BitTorrent::getTorrentLimit(const std::wstring& filename) 
     2123std::pair<int, int> bit::getTorrentLimit(const std::wstring& filename) 
    21112124{ 
    21122125        try { 
     
    21192132} 
    21202133 
    2121 std::pair<float, float> BitTorrent::getTorrentSpeed(const std::string& filename) 
     2134std::pair<float, float> bit::getTorrentSpeed(const std::string& filename) 
    21222135{ 
    21232136        return getTorrentSpeed(from_utf8_safe(filename)); 
    21242137} 
    21252138 
    2126 std::pair<float, float> BitTorrent::getTorrentSpeed(const std::wstring& filename) 
     2139std::pair<float, float> bit::getTorrentSpeed(const std::wstring& filename) 
    21272140{ 
    21282141        try { 
     
    21352148} 
    21362149 
    2137 void BitTorrent::setTorrentFilePriorities(const std::string& filename,  
     2150void bit::setTorrentFilePriorities(const std::string& filename,  
    21382151        std::vector<int> fileIndices, int priority) 
    21392152{ 
     
    21412154} 
    21422155 
    2143 void BitTorrent::setTorrentFilePriorities(const std::wstring& filename,  
     2156void bit::setTorrentFilePriorities(const std::wstring& filename,  
    21442157        std::vector<int> fileIndices, int priority) 
    21452158{ 
     
    21512164} 
    21522165 
    2153 void BitTorrent::setTorrentTrackers(const std::string& filename,  
     2166void bit::setTorrentTrackers(const std::string& filename,  
    21542167        const std::vector<tracker_detail>& trackers) 
    21552168{ 
     
    21572170} 
    21582171 
    2159 void BitTorrent::setTorrentTrackers(const std::wstring& filename,  
     2172void bit::setTorrentTrackers(const std::wstring& filename,  
    21602173        const std::vector<tracker_detail>& trackers) 
    21612174{ 
     
    21672180} 
    21682181 
    2169 void BitTorrent::resetTorrentTrackers(const std::string& filename) 
     2182void bit::resetTorrentTrackers(const std::string& filename) 
    21702183{ 
    21712184        resetTorrentTrackers(from_utf8_safe(filename)); 
    21722185} 
    21732186 
    2174 void BitTorrent::resetTorrentTrackers(const std::wstring& filename) 
     2187void bit::resetTorrentTrackers(const std::wstring& filename) 
    21752188{ 
    21762189        try { 
     
    21812194} 
    21822195 
    2183 std::vector<tracker_detail> BitTorrent::getTorrentTrackers(const std::string& filename) 
     2196std::vector<tracker_detail> bit::getTorrentTrackers(const std::string& filename) 
    21842197{ 
    21852198        return getTorrentTrackers(from_utf8_safe(filename)); 
    21862199} 
    21872200 
    2188 std::vector<tracker_detail> BitTorrent::getTorrentTrackers(const std::wstring& filename) 
     2201std::vector<tracker_detail> bit::getTorrentTrackers(const std::wstring& filename) 
    21892202{ 
    21902203        try { 
     
    21972210} 
    21982211 
    2199 void BitTorrent::startEventReceiver() 
     2212void bit::startEventReceiver() 
    22002213{ 
    22012214        pimpl->keepChecking_ = true; 
     
    22032216} 
    22042217 
    2205 void BitTorrent::stopEventReceiver() 
     2218void bit::stopEventReceiver() 
    22062219{ 
    22072220        pimpl->keepChecking_ = false; 
    22082221} 
    22092222 
    2210 int BitTorrent::defTorrentMaxConn() { return pimpl->defTorrentMaxConn_; } 
    2211 int BitTorrent::defTorrentMaxUpload() { return pimpl->defTorrentMaxUpload_; } 
    2212 float BitTorrent::defTorrentDownload() { return pimpl->defTorrentDownload_; } 
    2213 float BitTorrent::defTorrentUpload() { return pimpl->defTorrentUpload_; } 
     2223int bit::defTorrentMaxConn() { return pimpl->defTorrentMaxConn_; } 
     2224int bit::defTorrentMaxUpload() { return pimpl->defTorrentMaxUpload_; } 
     2225float bit::defTorrentDownload() { return pimpl->defTorrentDownload_; } 
     2226float bit::defTorrentUpload() { return pimpl->defTorrentUpload_; } 
    22142227         
    22152228}; 
  • trunk/src/halTorrent.hpp

    r437 r438  
    302302        } 
    303303         
    304         friend class BitTorrent; 
     304        friend class bit; 
    305305 
    306306private: 
     
    410410typedef boost::function<bool (size_t, std::wstring)> progress_callback; 
    411411 
    412 class BitTorrent_impl; 
     412class bit_impl; 
    413413class torrent_internal; 
    414414 
    415 class BitTorrent 
     415class bit 
    416416{ 
    417417public:  
     
    486486        void saveTorrentData(); 
    487487 
    488         void create_torrent(const create_torrent_params& params, fs::wpath out_file, progress_callback fn); 
     488        bool create_torrent(const create_torrent_params& params, fs::wpath out_file, progress_callback fn); 
    489489 
    490490        template<typename T> 
     
    506506        void ensurePeOff(); 
    507507         
    508         void ensureIpFilterOn(progress_callback fn); 
     508        bool ensureIpFilterOn(progress_callback fn); 
    509509        void ensureIpFilterOff(); 
    510510 
     
    513513        void ip_v4_filter_block(asio::ip::address_v4 first, asio::ip::address_v4 last); 
    514514        void ip_v6_filter_block(asio::ip::address_v6 first, asio::ip::address_v6 last); 
    515         void ip_filter_import_dat(boost::filesystem::path file, progress_callback fn, bool octalFix); 
     515        bool ip_filter_import_dat(boost::filesystem::path file, progress_callback fn, bool octalFix); 
    516516        size_t ip_filter_size(); 
    517517        void clearIpFilter();    
     
    596596        void stopEventReceiver(); 
    597597         
    598         friend BitTorrent& bittorrent(); 
     598        friend bit& bittorrent(); 
    599599         
    600600        int defTorrentMaxConn(); 
     
    607607         
    608608private: 
    609         BitTorrent(); 
    610         boost::scoped_ptr<BitTorrent_impl> pimpl; 
     609        bit(); 
     610        boost::scoped_ptr<bit_impl> pimpl; 
    611611         
    612612        TorrentDetails torrentDetails_; 
    613613}; 
    614614 
    615 BitTorrent& bittorrent(); 
    616  
    617 }; 
     615bit& bittorrent(); 
     616 
     617}; 
  • trunk/src/halTorrentInternal.hpp

    r437 r438  
    77#pragma once 
    88 
    9 #define HALITE_VERSION                                  0, 3, 0, 408 
    10 #define HALITE_VERSION_STRING                   "v 0.3.0.5 dev 408" 
    11 #define HALITE_FINGERPRINT                              "HL", 0, 3, 0, 5 
     9#define HALITE_VERSION                                  0, 3, 0, 437 
     10#define HALITE_VERSION_STRING                   "v 0.3.0.6 dev 437" 
     11#define HALITE_FINGERPRINT                              "HL", 0, 3, 0, 6 
    1212 
    1313#ifndef HAL_NA 
     
    3636#define HAL_PEER_ALERT                                          HAL_TORRENT_EXT_BEGIN + 19 
    3737#define HAL_LISTEN_V6_FAILED_ALERT                      HAL_TORRENT_EXT_BEGIN + 20 
     38#define HAL_TORRENT_LOAD_FILTERS                                HAL_TORRENT_EXT_BEGIN + 21 
    3839 
    3940#define HAL_TORRENT_INT_BEGIN                           42000 
     
    6263#define HAL_TORRENT_PAUSING                                     HAL_TORRENT_INT_BEGIN + 23 
    6364#define HAL_TORRENT_METADATA                    HAL_TORRENT_INT_BEGIN + 24 
    64 #define HAL_TORRENT_CREATINGTORRENT                     HAL_TORRENT_INT_BEGIN + 25 
    65 #define HAL_TORRENT_CAL_HASHES                  HAL_TORRENT_INT_BEGIN + 26 
     65#define HAL_NEWT_CREATING_TORRENT                       HAL_TORRENT_INT_BEGIN + 25 
     66#define HAL_NEWT_HASHING_PIECES                 HAL_TORRENT_INT_BEGIN + 26 
    6667#define HAL_TORRENT_IMPORT_FILTERS              HAL_TORRENT_INT_BEGIN + 27 
    67  
    6868#define HAL_INT_NEWT_ADD_PEERS_WEB              HAL_TORRENT_INT_BEGIN + 28 
    6969#define HAL_INT_NEWT_ADD_PEERS_DHT              HAL_TORRENT_INT_BEGIN + 29 
     70#define HAL_NEWT_CREATION_CANCELED              HAL_TORRENT_INT_BEGIN + 30 
    7071 
    7172 
     
    469470        private boost::noncopyable 
    470471{ 
    471         friend class BitTorrent_impl;    
    472         friend class BitTorrent::torrent::exec_around_ptr::proxy; 
     472        friend class bit_impl;   
     473        friend class bit::torrent::exec_around_ptr::proxy; 
    473474 
    474475public: 
Note: See TracChangeset for help on using the changeset viewer.