Changeset 314


Ignore:
Timestamp:
10/09/07 18:26:14 (13 years ago)
Author:
Eoin
Message:

UI adjustments.

Files:
2 added
1 deleted
34 edited

Legend:

Unmodified
Added
Removed
  • Halite.iss

    r285 r314  
    22 
    33#define MyAppName "Halite" 
    4 #define MyAppVerName "Halite 0.2.9 dev 283" 
     4#define MyAppVerName "Halite 0.2.9 dev 313" 
    55#define MyAppPublisher "BinaryNotions.com" 
    66#define MyAppURL "http://www.binarynotions.com/halite.php" 
     
    1919AllowNoIcons=yes 
    2020LicenseFile=LICENSE_1_0.txt 
    21 OutputBaseFilename=Halite.0_2_9_dev283.setup 
     21OutputBaseFilename=Halite.0_2_9_dev313.setup 
    2222Compression=lzma 
    2323SolidCompression=true 
     
    4646Source: lang\bin\x86\Russian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    4747Source: lang\bin\x86\Slovenian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     48Source: lang\bin\x86\Spanish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    4849Source: lang\bin\x86\Turkish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    4950 
     
    5859Source: lang\bin\x64\Russian.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    5960Source: lang\bin\x64\Slovenian.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
     61Source: lang\bin\x64\Spanish.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6062Source: lang\bin\x64\Turkish.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6163 
  • Halite.pnproj

    r311 r314  
    1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="About.rtf"></File><File path="afxres.h"></File><File path="English.rtf"></File><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Manifest.xml"></File><File path="resource.h"></File><File path="toolbar.bmp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="advtabs" path="advtabs\"><File path="Debug.cpp"></File><File path="Debug.hpp"></File><File path="Files.cpp"></File><File path="Files.hpp"></File><File path="Peers.cpp"></File><File path="Peers.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="Torrent.cpp"></File><File path="Torrent.hpp"></File><File path="Tracker.cpp"></File><File path="Tracker.hpp"></File><File path="TrackerAddDialog.hpp"></File><File path="TrackerListView.cpp"></File><File path="TrackerListView.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="global" path="global\"><File path="InheritEnum.hpp"></File><File path="ini.cpp"></File><File path="ini.hpp"></File><File path="ini_adapter.cpp"></File><File path="ini_adapter.hpp"></File><File path="logger.cpp"></File><File path="logger.hpp"></File><File path="string_conv.cpp"></File><File path="string_conv.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.hpp"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="unicode.hpp"></File><File path="utf8.hpp"></File><File path="wtl_app.cpp"></File><File path="wtl_app.hpp"></File></MagicFolder><File path="AddTorrentDialog.hpp"></File><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="AtlAutosizeDlg.h"></File><File path="ConfigOptions.cpp"></File><File path="ConfigOptions.hpp"></File><File path="CSSFileDialog.hpp"></File><File path="DdxEx.hpp"></File><File path="DebugDialog.hpp"></File><File path="DropFileTarget.h"></File><File path="halConfig.cpp"></File><File path="halConfig.hpp"></File><File path="halEvent.cpp"></File><File path="halEvent.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteDialogBase.hpp"></File><File path="HaliteEditCtrl.hpp"></File><File path="HaliteIni.hpp"></File><File path="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteUpdateLock.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halTorrentInternal.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="ProgressDialog.hpp"></File><File path="SimpleHtml.h"></File><File path="SplashDialog.hpp"></File><File path="SSFileDialog.hpp"></File><File path="stdAfx.cpp"></File><File path="stdAfx.hpp"></File><File path="UxthemeWrapper.cpp"></File><File path="UxthemeWrapper.hpp"></File><File path="WinAPIMutex.hpp"></File><File path="WinAPIWaitableTimer.hpp"></File></MagicFolder><File path="Jamfile.v2"></File></Project> 
     1<Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res24" path="res24\"><File path="ad.ico"></File><File path="ae.ico"></File><File path="af.ico"></File><File path="ag.ico"></File><File path="ai.ico"></File><File path="al.ico"></File><File path="am.ico"></File><File path="an.ico"></File><File path="ao.ico"></File><File path="ar.ico"></File><File path="as.ico"></File><File path="at.ico"></File><File path="au.ico"></File><File path="aw.ico"></File><File path="ax.ico"></File><File path="az.ico"></File><File path="ba.ico"></File><File path="bb.ico"></File><File path="bd.ico"></File><File path="be.ico"></File><File path="bf.ico"></File><File path="bg.ico"></File><File path="bh.ico"></File><File path="bi.ico"></File><File path="bj.ico"></File><File path="bm.ico"></File><File path="bn.ico"></File><File path="bo.ico"></File><File path="br.ico"></File><File path="bs.ico"></File><File path="bt.ico"></File><File path="bw.ico"></File><File path="by.ico"></File><File path="bz.ico"></File><File path="ca.ico"></File><File path="cc.ico"></File><File path="cd.ico"></File><File path="cf.ico"></File><File path="cg.ico"></File><File path="ch.ico"></File><File path="ci.ico"></File><File path="ck.ico"></File><File path="cl.ico"></File><File path="cm.ico"></File><File path="cn.ico"></File><File path="co.ico"></File><File path="cr.ico"></File><File path="cu.ico"></File><File path="cv.ico"></File><File path="cx.ico"></File><File path="cy.ico"></File><File path="cz.ico"></File><File path="de.ico"></File><File path="dj.ico"></File><File path="dk.ico"></File><File path="dm.ico"></File><File path="do.ico"></File><File path="dz.ico"></File><File path="ec.ico"></File><File path="ee.ico"></File><File path="eg.ico"></File><File path="eh.ico"></File><File path="er.ico"></File><File path="es.ico"></File><File path="et.ico"></File><File path="fi.ico"></File><File path="fj.ico"></File><File path="fk.ico"></File><File path="fm.ico"></File><File path="fo.ico"></File><File path="fr.ico"></File><File path="ga.ico"></File><File path="gb.ico"></File><File path="gd.ico"></File><File path="ge.ico"></File><File path="gg.ico"></File><File path="gh.ico"></File><File path="gi.ico"></File><File path="gk.ico"></File><File path="gl.ico"></File><File path="gm.ico"></File><File path="gn.ico"></File><File path="gp.ico"></File><File path="gq.ico"></File><File path="gr.ico"></File><File path="gs.ico"></File><File path="gt.ico"></File><File path="gu.ico"></File><File path="gw.ico"></File><File path="gy.ico"></File><File path="hk.ico"></File><File path="hn.ico"></File><File path="hr.ico"></File><File path="ht.ico"></File><File path="hu.ico"></File><File path="Icons.h"></File><File path="Icons.rc"></File><File path="id.ico"></File><File path="ie.ico"></File><File path="il.ico"></File><File path="im.ico"></File><File path="in.ico"></File><File path="io.ico"></File><File path="iq.ico"></File><File path="ir.ico"></File><File path="is.ico"></File><File path="it.ico"></File><File path="je.ico"></File><File path="jm.ico"></File><File path="jo.ico"></File><File path="jp.ico"></File><File path="ke.ico"></File><File path="kg.ico"></File><File path="kh.ico"></File><File path="ki.ico"></File><File path="km.ico"></File><File path="kn.ico"></File><File path="kp.ico"></File><File path="kr.ico"></File><File path="kw.ico"></File><File path="ky.ico"></File><File path="kz.ico"></File><File path="la.ico"></File><File path="lb.ico"></File><File path="lc.ico"></File><File path="li.ico"></File><File path="lk.ico"></File><File path="lr.ico"></File><File path="ls.ico"></File><File path="lt.ico"></File><File path="lu.ico"></File><File path="lv.ico"></File><File path="ly.ico"></File><File path="ma.ico"></File><File path="mc.ico"></File><File path="md.ico"></File><File path="me.ico"></File><File path="mg.ico"></File><File path="mh.ico"></File><File path="mk.ico"></File><File path="ml.ico"></File><File path="mm.ico"></File><File path="mn.ico"></File><File path="mo.ico"></File><File path="mp.ico"></File><File path="mq.ico"></File><File path="mr.ico"></File><File path="ms.ico"></File><File path="mt.ico"></File><File path="mu.ico"></File><File path="mv.ico"></File><File path="mw.ico"></File><File path="mx.ico"></File><File path="my.ico"></File><File path="mz.ico"></File><File path="na.ico"></File><File path="nc.ico"></File><File path="ne.ico"></File><File path="nf.ico"></File><File path="ng.ico"></File><File path="ni.ico"></File><File path="nl.ico"></File><File path="no.ico"></File><File path="not.ico"></File><File path="np.ico"></File><File path="nr.ico"></File><File path="nu.ico"></File><File path="nz.ico"></File><File path="om.ico"></File><File path="pa.ico"></File><File path="pe.ico"></File><File path="pf.ico"></File><File path="pg.ico"></File><File path="ph.ico"></File><File path="pk.ico"></File><File path="pl.ico"></File><File path="pm.ico"></File><File path="pn.ico"></File><File path="pr.ico"></File><File path="ps.ico"></File><File path="pt.ico"></File><File path="pw.ico"></File><File path="py.ico"></File><File path="qa.ico"></File><File path="ro.ico"></File><File path="rs.ico"></File><File path="ru.ico"></File><File path="rw.ico"></File><File path="sa.ico"></File><File path="sb.ico"></File><File path="sc.ico"></File><File path="sd.ico"></File><File path="se.ico"></File><File path="sg.ico"></File><File path="sh.ico"></File><File path="si.ico"></File><File path="sk.ico"></File><File path="sl.ico"></File><File path="sm.ico"></File><File path="sn.ico"></File><File path="so.ico"></File><File path="sr.ico"></File><File path="st.ico"></File><File path="sv.ico"></File><File path="sy.ico"></File><File path="sz.ico"></File><File path="tc.ico"></File><File path="td.ico"></File><File path="Template.rc"></File><File path="tf.ico"></File><File path="tg.ico"></File><File path="th.ico"></File><File path="tj.ico"></File><File path="tk.ico"></File><File path="tl.ico"></File><File path="tm.ico"></File><File path="tn.ico"></File><File path="to.ico"></File><File path="tr.ico"></File><File path="tt.ico"></File><File path="tv.ico"></File><File path="tw.ico"></File><File path="tz.ico"></File><File path="ua.ico"></File><File path="ug.ico"></File><File path="us.ico"></File><File path="uy.ico"></File><File path="uz.ico"></File><File path="va.ico"></File><File path="vc.ico"></File><File path="ve.ico"></File><File path="vg.ico"></File><File path="vi.ico"></File><File path="vn.ico"></File><File path="vu.ico"></File><File path="wf.ico"></File><File path="ws.ico"></File><File path="ye.ico"></File><File path="yu.ico"></File><File path="za.ico"></File><File path="zm.ico"></File><File path="zw.ico"></File></MagicFolder><File path="afxres.h"></File><File path="English.rtf"></File><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Icons.rc"></File><File path="Manifest.xml"></File><File path="resource.h"></File><File path="toolbar.bmp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="advtabs" path="advtabs\"><File path="Debug.cpp"></File><File path="Debug.hpp"></File><File path="Files.cpp"></File><File path="Files.hpp"></File><File path="Peers.cpp"></File><File path="Peers.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="Torrent.cpp"></File><File path="Torrent.hpp"></File><File path="Tracker.cpp"></File><File path="Tracker.hpp"></File><File path="TrackerAddDialog.hpp"></File><File path="TrackerListView.cpp"></File><File path="TrackerListView.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="global" path="global\"><File path="InheritEnum.hpp"></File><File path="ini.cpp"></File><File path="ini.hpp"></File><File path="ini_adapter.cpp"></File><File path="ini_adapter.hpp"></File><File path="logger.cpp"></File><File path="logger.hpp"></File><File path="string_conv.cpp"></File><File path="string_conv.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.hpp"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="unicode.hpp"></File><File path="utf8.hpp"></File><File path="wtl_app.cpp"></File><File path="wtl_app.hpp"></File></MagicFolder><File path="AddTorrentDialog.hpp"></File><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="AtlAutosizeDlg.h"></File><File path="ConfigOptions.cpp"></File><File path="ConfigOptions.hpp"></File><File path="CSSFileDialog.hpp"></File><File path="DdxEx.hpp"></File><File path="DebugDialog.hpp"></File><File path="DropFileTarget.h"></File><File path="halConfig.cpp"></File><File path="halConfig.hpp"></File><File path="halEvent.cpp"></File><File path="halEvent.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteDialogBase.hpp"></File><File path="HaliteEditCtrl.hpp"></File><File path="HaliteIni.hpp"></File><File path="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteUpdateLock.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halTorrentInternal.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="ProgressDialog.hpp"></File><File path="SimpleHtml.h"></File><File path="SplashDialog.hpp"></File><File path="SSFileDialog.hpp"></File><File path="stdAfx.cpp"></File><File path="stdAfx.hpp"></File><File path="UxthemeWrapper.cpp"></File><File path="UxthemeWrapper.hpp"></File><File path="WinAPIMutex.hpp"></File><File path="WinAPIWaitableTimer.hpp"></File></MagicFolder><File path="Jamfile.v2"></File></Project> 
  • Halite.pnps

    r311 r314  
    1 <pd><ViewState><e p="Halite\src\advtabs" x="true"></e><e p="Halite" x="true"></e><e p="Halite\res" x="true"></e><e p="Halite\src" x="true"></e><e p="Halite\src\global" x="false"></e></ViewState></pd> 
     1<pd><ViewState><e p="Halite\src\advtabs" x="true"></e><e p="Halite" x="true"></e><e p="Halite\res" x="true"></e><e p="Halite\res\res24" x="false"></e><e p="Halite\src" x="true"></e><e p="Halite\src\global" x="false"></e></ViewState></pd> 
  • Readme.txt

    r272 r314  
    11Halite: A Free Open-Source BitTorrent client 
    22 
    3 Version: 0.2.9 Revision 270 Snapshot released 25th August 2007 
     3Version: 0.2.9 Revision 313 Snapshot released 8th October 2007 
    44 
    55NOTE! This is a snapshot build, as such there are incomplete features. 
  • lang/Italian.txt

    r309 r314  
    1 "English" ---> "Italiano" 
    2 "English.rtf" --->  "../lang/Italiano.rtf"  
     1"English" ---> "Italiano" 
     2"English.rtf" ---> "../lang/Italian.rtf" 
    33"MS Shell Dlg" --->  ???  
    44"Torrent" --->  ???  
     
    77"msctls_progress32" --->  ???  
    88"Torrent connection limits:" ---> "Limiti connessioni torrent:" 
    9 "Torrent transfer rates (KB/s):" ---> "Velocità trasferimento torrent (KB/s):" 
     9"Torrent transfer rates (KB/s):" ---> "Velocità trasferimento torrent (KB/s):" 
    1010"Total" ---> "Totale" 
    1111"Up" --->  ???  
     
    1616"Torrent:" --->  ???  
    1717"Peers:" --->  ???  
    18 "Transferred:" --->  "Trasferiti"  
     18"Transferred:" ---> "Trasferiti" 
    1919"Remaining:" ---> "Rimanenti" 
    2020"Rates:" ---> "Rapporto" 
     
    3131"Distributed Hash Tables" --->  ???  
    3232"Port (UDP) : " ---> "Porta (UDP) :" 
    33 "(DHT will not apply to private torrents)" --->  "(il DHT non funzionerà per i torrents privati)"  
     33"(DHT will not apply to private torrents)" ---> "(il DHT non funzionerà per i torrents privati)" 
    3434"General Settings" ---> "Opzioni Generali" 
    3535"Limit the no. of half-open connections" ---> "Limita il n. di connessioni simultanee" 
     
    4444"DHT" --->  ???  
    4545"Proxy Settings" ---> "Settaggi Proxy" 
    46 "Security" --->  "Sicurezza"  
     46"Security" ---> "Sicurezza" 
    4747"IP Filtering" ---> "Filtraggio IP" 
    4848"Enable IP filtering." ---> "Abilita filtro IP." 
     
    5353"Connection Policies" ---> "Comportamenti di Connessione" 
    5454"Incoming" ---> "Entrante" 
    55 "Outgoing" --->  "Uscente"  
     55"Outgoing" ---> "Uscente" 
    5656"Forced" ---> "Forzata" 
    5757"Enabled" ---> "Abilitata" 
    58 "Disabled" --->  "Disabilitata"  
     58"Disabled" ---> "Disabilitata" 
    5959"Encoding Level" ---> "Livello di codifica" 
    6060"Plaintext" --->  ???  
     
    7979"Total max connections :" ---> "Numero massimo di connessioni" 
    8080"Total upload slots :" ---> "Slot di upload totali" 
    81 "Download Rate (KB/s) :" ---> "Velocità Download (KB/s) :" 
    82 "Upload Rate (KB/s) :" ---> "Velocità Upload (KB/s) :" 
     81"Download Rate (KB/s) :" ---> "Velocità Download (KB/s) :" 
     82"Upload Rate (KB/s) :" ---> "Velocità Upload (KB/s) :" 
    8383"Torrent Defaults" ---> "Limiti per file Torrent" 
    8484"These options set global maximums which will always be honoured." ---> "Queste opzioni definiscono i limiti massimi che saranno sempre rispettati." 
     
    8888"Prompt for alternate save folder." ---> "Consenti di scegliere una cartella alternativa." 
    8989"Halite shutting down..." ---> "Halite in chiusura...." 
    90 "It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Ci vorrà qualche momento per la chiusura corretta della sessione BitTorrent, al termine della quale questo messaggio sparirà." 
     90"It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Ci vorrà qualche momento per la chiusura corretta della sessione BitTorrent, al termine della quale questo messaggio sparirà." 
    9191"Show this message in future" ---> "Mostra messaggio in futuro" 
    9292"Create new torrent" ---> "Crea nuovo torrent" 
     
    109109"RichEdit20A" --->  ???  
    110110"SysTabControl32" --->  ???  
     111"Add Torrent" --->  ???  
     112"Ok" --->  ???  
     113"Use Compact Allocation." --->  ???  
     114"Start Paused" --->  ???  
     115"Note. Compact Allocation is incompatible with File Selection" --->  ???  
    111116"General" ---> "Generale" 
    112117"Allow only one instance to run." ---> "Consenti un solo avvio per volta" 
     
    123128"MS Shell Dlg 2" --->  ???  
    124129"OK" --->  ???  
    125 "Tracker URL" --->  "URL Tracker"  
    126 "Tier" ---> "Priorità" 
     130"Tracker URL" ---> "URL Tracker" 
     131"Tier" ---> "Priorità" 
    127132"_POPUP_" --->  ???  
    128133"Open &Halite" ---> "Apri &Halite" 
     
    160165"0000 DHT node(s)" --->  ???  
    161166"Filtering 0000000 ranges." ---> "Filtrando 0000000 intervalli." 
    162 "The BitTorrent session could not start. Try selecting another port in the settings." ---> "La sessione BitTorrent non si è avviata. Prova a selezionare un'altra porta nelle Opzioni." 
    163 "DHT session could not start. Try selecting another port in the settings." ---> "La sessione DHT non si è avviata. Prova a selezionare un'altra porta nelle Opzioni." 
     167"The BitTorrent session could not start. Try selecting another port in the settings." ---> "La sessione BitTorrent non si Ú avviata. Prova a selezionare un'altra porta nelle Opzioni." 
     168"DHT session could not start. Try selecting another port in the settings." ---> "La sessione DHT non si Ú avviata. Prova a selezionare un'altra porta nelle Opzioni." 
    164169"Select a directory to save the files to or cancel to not download torrent at all." ---> "Seleziona una directory in cui salvare i files, o annulla per non scaricare il torrent." 
    165 "None" --->  ???  
    166 "Debug" --->  ???  
    167 "Info" --->  ???  
    168 "Critical" --->  ???  
    169 "Libtorrent Peer Alert: %1%." --->  ???  
    170 "Xml Exception (%1%) with %2%." --->  ???  
    171 "Torrent (%1%) exception caught; %2% from %3%." --->  ???  
    172 "Invalid torrent (%1%) from %2%." --->  ???  
    173 "%1$.2fMB of %2$.2fMB" --->  "%1$.2fMB su %2$.2fMB"  
    174 "This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." --->  "In questa Sessione: Scaricati %1$.2fMB, Inviati %2$.2fMB, Ratio %3$.2f."  
     170"%1$.2fMB of %2$.2fMB" ---> "%1$.2fMB su %2$.2fMB" 
     171"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "In questa Sessione: Scaricati %1$.2fMB, Inviati %2$.2fMB, Ratio %3$.2f." 
    175172"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Scaricati %1$.2fMB, Inviati %2$.2fMB, Ratio %3$.2f" 
    176 "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."  
     173"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." 
    177174"%1%, %2%." --->  ???  
    178175"%1$.2fMB down - %2$.2fMB up" --->  ???  
     
    186183"Halite not listening!" ---> "Halite non riceve" 
    187184"Port %1% open" ---> "Porta %1% aperta" 
    188 "Exception caught; %1%, from %2%." --->  "Rilevato errore; %1%, da %2%."  
    189 "XML exception: %1%." --->  "Errore XML: %1%."  
    190 "Unicode exception: %1%." --->  "Errore Unicode: %1%."  
    191 "Bittorrent Event: %1%." --->  "Evento Bittorrent: %1%."  
    192 "Peer Event: %1%." --->  "Evento Peer: %1%."   
    193 "Tracker Event: %1%." --->  "Evento Tracker: %1%."  
    194 "Debug Event: %1%." --->  "Evento Debug: %1%."  
    195 "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."  
     185"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." 
    196186"Peers" --->  ???  
    197187"Files" --->  ???  
    198188"Logging" --->  ???  
    199 "An invalid encoding level, %1%, was passed as an encryption setting." --->  "Un livello di codifica non valido, %1%, è stato inserito nella configurazione di criptaggio."  
    200 "An invalid connection policy, %1%, was passed as an encryption setting." --->  "Un comportamento di connessione non valido, %1%, è stato inserito nella configurazione di criptaggio."  
    201 "Auto Sort" --->  "Ordina Automaticamente"  
    202 "Torrent Root" --->  "Cartella base del Torrent"  
     189"An invalid encoding level, %1%, was passed as an encryption setting." ---> "Un livello di codifica non valido, %1%, Ú stato inserito nella configurazione di criptaggio." 
     190"An invalid connection policy, %1%, was passed as an encryption setting." ---> "Un comportamento di connessione non valido, %1%, Ú stato inserito nella configurazione di criptaggio." 
     191"Auto Sort" ---> "Ordina Automaticamente" 
     192"Torrent Root" ---> "Cartella base del Torrent" 
    203193"Interesting" --->  ???  
    204194"Choked" --->  ???  
     
    210200"Connecting" ---> "In Connessione" 
    211201"Queued" ---> "In Coda" 
    212 "RC4 Encrypted" --->  "Criptato RC4"  
    213 "Plaintext Encrypted" --->  "Criptato Plaintext"  
     202"RC4 Encrypted" ---> "Criptato RC4" 
     203"Plaintext Encrypted" ---> "Criptato Plaintext" 
    214204"Queued for Checking" ---> "In Coda per Controllo" 
    215205"Checking Files" ---> "Controllo i Files" 
     
    221211"Stopped" ---> "Fermato" 
    222212"Paused" ---> "In Pausa" 
     213"Stopping" --->  ???  
     214"Pausing" --->  ???  
    223215"Downloading Metadata" ---> "Scaricando Metadata" 
    224 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time" --->  "Nome;Stato;Progresso;Download;Upload;Peers;Seeds;ETA;Copie;Tracker;Riannuncia;Ratio;Totali;Completati;Rimanenti;Downloaded;Uploaded;Attivo;Seeding;Orario Avvio"  
    225 "Time;Message;Severity" ---> "Orario;Messaggio;Gravità" 
    226 "Tracker;Tier" ---> "Tracker;Priorità" 
     216"Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
     217"Time;Message;Severity" ---> "Orario;Messaggio;Gravità" 
     218"Tracker;Tier" ---> "Tracker;Priorità" 
    227219"Peer;Country;Download;Upload;Type;Client" ---> "Peer;Nazione;Download;Upload;Tipo;Client" 
    228220"Peer;Country;Download;Upload;Type;Client;Status" ---> "Peer;Nazione;Download;Upload;Tipo;Client;Stato" 
    229 "Filename;Path;Size;Progress;Priority" --->  "Nome File;Destinazione;Dimensione;Progresso;Priorità"  
    230 "Don't download" --->  "Non scalicare"  
    231 "Normal" --->  "Normale"  
    232 "Above Normal" --->  "Alta"  
     221"Filename;Path;Size;Progress;Priority" ---> "Nome File;Destinazione;Dimensione;Progresso;Priorità" 
     222"Don't download" ---> "Non scalicare" 
     223"Normal" ---> "Normale" 
     224"Above Normal" ---> "Alta" 
    233225"3" --->  ???  
    234226"4" --->  ???  
    235227"5" --->  ???  
    236228"6" --->  ???  
    237 "Maximum" --->  "Massima"  
    238 "Set Priority" --->  "Priorità"  
     229"Maximum" ---> "Massima" 
     230"Set Priority" ---> "Priorità" 
    239231"Halite.ico" --->  ???  
    240232"toolbar.bmp" --->  ???  
     233"None" --->  ???  
     234"Debug" --->  ???  
     235"Info" --->  ???  
     236"Warning" --->  ???  
     237"Critical" --->  ???  
     238"Peer %2%: %1%." --->  ???  
     239"Peer banned %2%. (%1%)" --->  ???  
     240"Hash failed for piece %2% of %1%." --->  ???  
     241"URL Seed %2%, %3%. (%1%)" --->  ???  
     242"Tracker warning: %2%! (%1%)" --->  ???  
     243"Tracker Announce. (%1%)" --->  ???  
     244"Alert %2%, Status code: %4%, Times %3%. (%1%)" --->  ???  
     245"%2%. %3% Peers. (%1%)" --->  ???  
     246"Fast rusume failed: %2%. (%1%)" --->  ???  
     247"Piece %2% finished. (%1%)" --->  ???  
     248"Block %2% of piece %3% finished. (%1%)" --->  ???  
     249"Block %2% of piece %3% downloading. (%1%)" --->  ???  
     250"Successfully %1%." --->  ???  
     251"Failed, %1%." --->  ???  
     252"IP Filter blocked %1%, %2%." --->  ???  
     253"Xml Exception (%1%) with %2%." --->  ???  
     254"Torrent %1% finished." --->  ???  
     255"Torrent %1% paused." --->  ???  
     256"Torrent (%1%) exception caught; %2% from %3%." --->  ???  
     257"Invalid torrent (%1%) from %2%." --->  ???  
     258"Exception caught; %1%, from %2%." ---> "Rilevato errore; %1%, da %2%." 
     259"XML exception: %1%." ---> "Errore XML: %1%." 
     260"Unicode exception: %1%." ---> "Errore Unicode: %1%." 
     261"Bittorrent Event: %1%." ---> "Evento Bittorrent: %1%." 
     262"Peer Event: %1%." ---> "Evento Peer: %1%." 
     263"Tracker Event: %1%." ---> "Evento Tracker: %1%." 
     264"Debug Event: %1%." ---> "Evento Debug: %1%." 
  • lang/Norwegian.txt

    r283 r314  
    110110"RichEdit20A" --->  ???  
    111111"SysTabControl32" --->  ???  
     112"Add Torrent" --->  ???  
     113"Ok" --->  ???  
     114"Use Compact Allocation." --->  ???  
     115"Start Paused" --->  ???  
     116"Note. Compact Allocation is incompatible with File Selection" --->  ???  
    112117"General" ---> "Generelt" 
    113118"Allow only one instance to run." ---> "Tillat kun en instans Ã¥ kjÞre." 
     
    165170"DHT session could not start. Try selecting another port in the settings." ---> "DHT sesjonen kunne ikke starte. PrÞv en annen port i instillingene." 
    166171"Select a directory to save the files to or cancel to not download torrent at all." ---> "Velg en mappe for lagring av filene eller avbryt for ikke Ã¥ laste ned torrenten." 
    167 "None" ---> "Ingen" 
    168 "Debug" --->  ???  
    169 "Info" --->  ???  
    170 "Critical" ---> "Kritisk" 
    171 "Libtorrent Peer Alert: %1%." ---> "Libtorrent Peer Varsel: %1%." 
    172 "Xml Exception (%1%) with %2%." ---> "Xml unntak (%1%) med %2%." 
    173 "Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) unntak fanget; %2% fra %3%." 
    174 "Invalid torrent (%1%) from %2%." ---> "Ugyldig torrent (%1%) fra %2%." 
    175172"%1$.2fMB of %2$.2fMB" --->  ???  
    176173"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." --->  ???  
     
    188185"Halite not listening!" ---> "Halite lytter ikke!" 
    189186"Port %1% open" ---> "Port %1% Ã¥pen" 
    190 "Exception caught; %1%, from %2%." ---> "Exception fanget; %1%, fra %2%." 
    191 "XML exception: %1%." --->  ???  
    192 "Unicode exception: %1%." --->  ???  
    193 "Bittorrent Event: %1%." ---> "Bittorrent Hendelse: %1%." 
    194 "Peer Event: %1%." ---> "Peer Hendelse: %1%." 
    195 "Tracker Event: %1%." ---> "Tracker Hendelse: %1%." 
    196 "Debug Event: %1%." ---> "Debug Hendelse: %1%." 
    197187"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." --->  ???  
    198188"Peers" --->  ???  
     
    223213"Stopped" ---> "Stoppet" 
    224214"Paused" ---> "Pauset" 
     215"Stopping" --->  ???  
     216"Pausing" --->  ???  
    225217"Downloading Metadata" ---> "Laster ned metadata" 
    226 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time" --->  ???  
     218"Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    227219"Time;Message;Severity" ---> "Tid;Melding;Alvorlighetsgrad" 
    228220"Tracker;Tier" --->  ???  
     
    241233"Halite.ico" --->  ???  
    242234"toolbar.bmp" --->  ???  
     235"None" ---> "Ingen" 
     236"Debug" --->  ???  
     237"Info" --->  ???  
     238"Warning" --->  ???  
     239"Critical" ---> "Kritisk" 
     240"Peer %2%: %1%." --->  ???  
     241"Peer banned %2%. (%1%)" --->  ???  
     242"Hash failed for piece %2% of %1%." --->  ???  
     243"URL Seed %2%, %3%. (%1%)" --->  ???  
     244"Tracker warning: %2%! (%1%)" --->  ???  
     245"Tracker Announce. (%1%)" --->  ???  
     246"Alert %2%, Status code: %4%, Times %3%. (%1%)" --->  ???  
     247"%2%. %3% Peers. (%1%)" --->  ???  
     248"Fast rusume failed: %2%. (%1%)" --->  ???  
     249"Piece %2% finished. (%1%)" --->  ???  
     250"Block %2% of piece %3% finished. (%1%)" --->  ???  
     251"Block %2% of piece %3% downloading. (%1%)" --->  ???  
     252"Successfully %1%." --->  ???  
     253"Failed, %1%." --->  ???  
     254"IP Filter blocked %1%, %2%." --->  ???  
     255"Xml Exception (%1%) with %2%." ---> "Xml unntak (%1%) med %2%." 
     256"Torrent %1% finished." --->  ???  
     257"Torrent %1% paused." --->  ???  
     258"Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) unntak fanget; %2% fra %3%." 
     259"Invalid torrent (%1%) from %2%." ---> "Ugyldig torrent (%1%) fra %2%." 
     260"Exception caught; %1%, from %2%." ---> "Exception fanget; %1%, fra %2%." 
     261"XML exception: %1%." --->  ???  
     262"Unicode exception: %1%." --->  ???  
     263"Bittorrent Event: %1%." ---> "Bittorrent Hendelse: %1%." 
     264"Peer Event: %1%." ---> "Peer Hendelse: %1%." 
     265"Tracker Event: %1%." ---> "Tracker Hendelse: %1%." 
     266"Debug Event: %1%." ---> "Debug Hendelse: %1%." 
  • lang/Slovenian.txt

    r300 r314  
    11"English" ---> "Slovenian" 
    2 "English.rtf" --->  "Slovenian.rtf"  
     2"English.rtf" ---> "Slovenian.rtf" 
    33"MS Shell Dlg" --->  ???  
    44"Torrent" ---> "Torrent" 
     
    1414"Update in:" ---> "Posodobitev čez:" 
    1515"Ratio (this session):" ---> "Delino razmerje seje:" 
    16 "Torrent:" --->  "Torrent:"  
    17 "Peers:" --->  "Sejalci+Pijavke:"  
    18 "Transferred:" --->  "PreneÅ¡eno:" 
    19 "Remaining:" --->  "Do konca:"  
    20 "Rates:" --->  "Hitrosti:" 
    21 "Seeds:" --->  "Sejalcev:" 
    22 "Overhead:" --->  "PreseÅŸek:"  
    23 "ETA:" --->  "ETA:" 
    24 "Ratio:" --->  "Delilno razmerje:" 
     16"Torrent:" ---> "Torrent:" 
     17"Peers:" ---> "Sejalci+Pijavke:" 
     18"Transferred:" ---> "PreneÅ¡eno:" 
     19"Remaining:" ---> "Do konca:" 
     20"Rates:" ---> "Hitrosti:" 
     21"Seeds:" ---> "Sejalcev:" 
     22"Overhead:" ---> "PreseÅŸek:" 
     23"ETA:" ---> "ETA:" 
     24"Ratio:" ---> "Delilno razmerje:" 
    2525"BitTorrent" ---> "BitTorrent" 
    2626"Open a (single) port between : " ---> "Odpri posamičen port v rangu:" 
    27 "Enable DHT" --->  "Omogoči DHT" 
    28 "Button" --->  "Gumb"  
    29 "to" --->  "v"  
    30 "Select the (TCP) port (or range) on which to listen for incomming connections." --->  "Določite dohodni TCP port." 
    31 "Distributed Hash Tables" --->  "DHT"  
     27"Enable DHT" ---> "Omogoči DHT" 
     28"Button" ---> "Gumb" 
     29"to" ---> "v" 
     30"Select the (TCP) port (or range) on which to listen for incomming connections." ---> "Določite dohodni TCP port." 
     31"Distributed Hash Tables" ---> "DHT" 
    3232"Port (UDP) : " ---> "Port (UDP) : " 
    33 "(DHT will not apply to private torrents)" --->  "(DHT se uporablja samo pri t.i. "public" trackerjih)" 
     33"(DHT will not apply to private torrents)" ---> "(DHT se uporablja samo pri t.i. " 
    3434"General Settings" ---> "SploÅ¡ne nastavitve" 
    35 "Limit the no. of half-open connections" --->  "Omejitev Å¡tevila pol-odprtih povezav" 
    36 "Proxies" --->  "Proxji"  
     35"Limit the no. of half-open connections" ---> "Omejitev Å¡tevila pol-odprtih povezav" 
     36"Proxies" ---> "Proxji" 
    3737"Proxy Host/IP : " ---> "Proxy IP : " 
    3838"Use a proxy." ---> "Uporabi proxy." 
     
    4040"Username : " ---> "Uporabnik : " 
    4141"Password : " ---> "Geslo : " 
    42 "Peer" --->  "Peer" 
    43 "Web Seed" --->  "Spletni sejalec"  
    44 "DHT" --->  "DHT"  
     42"Peer" ---> "Peer" 
     43"Web Seed" ---> "Spletni sejalec" 
     44"DHT" ---> "DHT" 
    4545"Proxy Settings" ---> "Nastavitve proxyja" 
    46 "Security" --->  "Varnost"  
    47 "IP Filtering" --->  "Filtriranje IP naslovov" 
     46"Security" ---> "Varnost" 
     47"IP Filtering" ---> "Filtriranje IP naslovov" 
    4848"Enable IP filtering." ---> "Uporabi filtriranje IP naslovov" 
    4949"Import ipfilter.dat" ---> "Uvozi ipfilter.dat" 
    5050"Clear IP database" ---> "Počisti bazo IP naslovov" 
    51 "Protocol Encryption" --->  "Å ifriranje protokola"  
    52 "Enable Protocol Encryption." --->  "Uporabi Å¡ifriranje protokola"  
    53 "Connection Policies" --->  "Nadzor povezave"  
    54 "Incoming" --->  "Dohodna povezava"  
    55 "Outgoing" --->  "Odhodna povezava" 
    56 "Forced" --->  "Prisiljeno"  
    57 "Enabled" --->  "Omogočena" 
    58 "Disabled" --->  "Onemogočena" 
    59 "Encoding Level" --->  "Stopnja zaščite" 
     51"Protocol Encryption" ---> "Å ifriranje protokola" 
     52"Enable Protocol Encryption." ---> "Uporabi Å¡ifriranje protokola" 
     53"Connection Policies" ---> "Nadzor povezave" 
     54"Incoming" ---> "Dohodna povezava" 
     55"Outgoing" ---> "Odhodna povezava" 
     56"Forced" ---> "Prisiljeno" 
     57"Enabled" ---> "Omogočena" 
     58"Disabled" ---> "Onemogočena" 
     59"Encoding Level" ---> "Stopnja zaščite" 
    6060"Plaintext" ---> "Plaintext" 
    61 "RC4" --->  "RC4" 
    62 "Both" --->  "Oboje" 
    63 "Prefer RC4" --->  "Uporabljaj raje RC4" 
     61"RC4" ---> "RC4" 
     62"Both" ---> "Oboje" 
     63"Prefer RC4" ---> "Uporabljaj raje RC4" 
    6464"Remote Control" ---> "Oddaljeni nadzor" 
    6565"Remote Control Options" ---> "Nastavitve oddaljenega nadzora" 
     
    6767"Port to listen on : " ---> "Port:" 
    6868"*** Disabled ***" ---> "*** Onemogočeno ***" 
    69 "Check1" --->  "Check1"  
    70 "Button1" --->  "Button1"  
    71 "Radio1" --->  "Radio1"  
     69"Check1" ---> "Check1" 
     70"Button1" ---> "Button1" 
     71"Radio1" ---> "Radio1" 
    7272"Static" ---> "Statičen" 
    7373"Halite Debug Dialog" ---> "Halite Debug" 
    74 "MS Sans Serif" --->  "MS Sans Serif"   
     74"MS Sans Serif" ---> "MS Sans Serif" 
    7575"Halite importing IP ranges..." ---> "UvaÅŸam IP naslove..." 
    7676"Cancel" ---> "Prekliči" 
     
    8484"These options set global maximums which will always be honoured." ---> "Nastavi globalne spremenljivke." 
    8585"These options specify the default limits applied to new torrents." ---> "Nastavi moÅŸnosti za nove torrente." 
    86 "Default save folder :" --->  "Privzeta mapa za shranjevanje :"  
    87 "..." --->  "..."   
     86"Default save folder :" ---> "Privzeta mapa za shranjevanje :" 
     87"..." ---> "..." 
    8888"Prompt for alternate save folder." ---> "VpraÅ¡aj kam naj shranim." 
    8989"Halite shutting down..." ---> "Halite se izklaplja..." 
     
    9999"Reannounce" ---> "Posodobi sledilnik" 
    100100"Remove" ---> "Odstrani" 
    101 "SysListView32" --->  "SysListView32"  
     101"SysListView32" ---> "SysListView32" 
    102102"Name:" ---> "Ime:" 
    103103"Tracker:" ---> "Tracker" 
     
    107107"About" ---> "O programu" 
    108108"Program Information" ---> "Informacije o programu" 
    109 "RichEdit20A" --->  "RichEdit20A"  
    110 "SysTabControl32" --->  "SysTabControl32" 
     109"RichEdit20A" ---> "RichEdit20A" 
     110"SysTabControl32" ---> "SysTabControl32" 
     111"Add Torrent" --->  ???  
     112"Ok" --->  ???  
     113"Use Compact Allocation." --->  ???  
     114"Start Paused" --->  ???  
     115"Note. Compact Allocation is incompatible with File Selection" --->  ???  
    111116"General" ---> "SploÅ¡no" 
    112117"Allow only one instance to run." ---> "Dovoli le enkratni zagon programa" 
     
    121126"Log debug events." ---> "Shranjuj debug log." 
    122127"Add New Tracker" ---> "Dodaj nov tracker" 
    123 "MS Shell Dlg 2" --->  "MS Shell Dlg 2" 
     128"MS Shell Dlg 2" ---> "MS Shell Dlg 2" 
    124129"OK" ---> "V redu" 
    125130"Tracker URL" ---> "Tracker URL" 
    126131"Tier" ---> "Pomol" 
    127 "_POPUP_" --->  "_POPUP_"   
     132"_POPUP_" ---> "_POPUP_" 
    128133"Open &Halite" ---> "Odpri" 
    129134"&Pause All" ---> "Premor vseh" 
     
    137142"Edit" ---> "Uredi" 
    138143"Delete" ---> "IzbriÅ¡i" 
    139 "StringFileInfo" --->  "StringFileInfo"  
    140 "180904b0" --->  "180904b0"   
     144"StringFileInfo" ---> "StringFileInfo" 
     145"180904b0" ---> "180904b0" 
    141146"Comments" ---> "Komentarji" 
    142 "libTorrrent based client." --->  "libTorrrent based client." 
    143 "CompanyName" --->  "CompanyName" 
    144 "BinaryNotions.com" --->  "BinaryNotions.com"  
    145 "FileDescription" --->  "FileDescription"   
     147"libTorrrent based client." ---> "libTorrrent based client." 
     148"CompanyName" ---> "CompanyName" 
     149"BinaryNotions.com" ---> "BinaryNotions.com" 
     150"FileDescription" ---> "FileDescription" 
    146151"Halite BitTorrent Client" ---> "Halite BitTorrent Client" 
    147 "FileVersion" --->  "FileVersion"   
    148 "InternalName" --->  "InternalName"  
    149 "Halite" --->  "Halite"  
    150 "LegalCopyright" --->  "LegalCopyright" 
    151 "(C) Eoin O'Callaghan 2007" --->  "(C) Eoin O'Callaghan 2007" 
    152 "OriginalFilename" --->  "OriginalFilename" 
    153 "Halite.exe" --->  "Halite.exe"  
    154 "ProductName" --->  "ProductName"  
    155 "ProductVersion" --->  "ProductVersion" 
    156 "VarFileInfo" --->  "VarFileInfo" 
     152"FileVersion" ---> "FileVersion" 
     153"InternalName" ---> "InternalName" 
     154"Halite" ---> "Halite" 
     155"LegalCopyright" ---> "LegalCopyright" 
     156"(C) Eoin O'Callaghan 2007" ---> "(C) Eoin O'Callaghan 2007" 
     157"OriginalFilename" ---> "OriginalFilename" 
     158"Halite.exe" ---> "Halite.exe" 
     159"ProductName" ---> "ProductName" 
     160"ProductVersion" ---> "ProductVersion" 
     161"VarFileInfo" ---> "VarFileInfo" 
    157162"Translation" ---> "Prevod" 
    158 "(D-U) 0000.000KB/s - 0000.000KB/s" --->  "(D-U) 0000.000KB/s - 0000.000KB/s" 
     163"(D-U) 0000.000KB/s - 0000.000KB/s" ---> "(D-U) 0000.000KB/s - 0000.000KB/s" 
    159164"CAPS" ---> "CAPS" 
    160165"0000 DHT node(s)" ---> "0000 DHT soleÅŸnikov" 
     
    163168"DHT session could not start. Try selecting another port in the settings." ---> "Napaka DHT vtičnika, prosimo spremenite port." 
    164169"Select a directory to save the files to or cancel to not download torrent at all." ---> "Izberite mapo za shrambo datotek." 
    165 "None" ---> "Nobeno" 
    166 "Debug" ---> "Debug" 
    167 "Info" ---> "Info" 
    168 "Critical" ---> "Kritično" 
    169 "Libtorrent Peer Alert: %1%." ---> "Libtorrent Peer Napaka: %1%." 
    170 "Xml Exception (%1%) with %2%." ---> "Xml izjema (%1%) pri %2%." 
    171 "Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) zaznana izjema; %2% od %3%." 
    172 "Invalid torrent (%1%) from %2%." ---> "Neveljaven torrent (%1%) od %2%." 
    173 "%1$.2fMB of %2$.2fMB" --->  "%1$.2fMB od %2$.2fMB" 
    174 "This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." --->  "V tej seji ste prenesli  %1$.2fMB podatkov in oddali %2$.2fMB podatkov. Delilno razmerje seje: %3$.2f."  
     170"%1$.2fMB of %2$.2fMB" ---> "%1$.2fMB od %2$.2fMB" 
     171"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "V tej seji ste prenesli  %1$.2fMB podatkov in oddali %2$.2fMB podatkov. Delilno razmerje seje: %3$.2f." 
    175172"Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "PreneÅ¡eno %1$.2fMB, Oddano %2$.2fMB, Delilno razmerje %3$.2f." 
    176 "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." 
    177 "%1%, %2%." --->  "%1%, %2%."   
    178 "%1$.2fMB down - %2$.2fMB up" --->  "%1$.2fMB dol - %2$.2fMB gor" 
    179 "%1$.2fKB/s down - %2$.2fKB/s up" --->  "%1$.2fKB/s dol - %2$.2fKB/s gor" 
     173"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." 
     174"%1%, %2%." ---> "%1%, %2%." 
     175"%1$.2fMB down - %2$.2fMB up" ---> "%1$.2fMB dol - %2$.2fMB gor" 
     176"%1$.2fKB/s down - %2$.2fKB/s up" ---> "%1$.2fKB/s dol - %2$.2fKB/s gor" 
    180177"%1% DHT node(s)" ---> "%1% DHT povezav" 
    181178"DHT disabled" ---> "DHT onemogočen" 
     
    184181"Standard exception (%1%) thrown from %2%." ---> "Standardna izjema (%1%) prejeta od %2%." 
    185182"(D-U) %1$.2fKB/s - %2$.2fKB/s" ---> "(D-G) %1$.2fKB/s - %2$.2fKB/s" 
    186 "Halite not listening!" --->  "Halite ne more prisluÅ¡kovati!" 
     183"Halite not listening!" ---> "Halite ne more prisluÅ¡kovati!" 
    187184"Port %1% open" ---> "Port %1% odprt" 
    188 "Exception caught; %1%, from %2%." ---> "Izjema ujeta; %1%, od %2%." 
    189 "XML exception: %1%." ---> "XML izjema: %1%." 
    190 "Unicode exception: %1%." ---> "Unicode izjema: %1%." 
    191 "Bittorrent Event: %1%." ---> "Bittorrent dogodek: %1%." 
    192 "Peer Event: %1%." ---> "Peer dogodek: %1%." 
    193 "Tracker Event: %1%." ---> "Tracker dogodek: %1%." 
    194 "Debug Event: %1%." ---> "Debug dogodek: %1%." 
    195 "Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." --->  "Izberite mapo, kjer se bodo shranjevali preosi. Kliknite prekliči, če ste zadovoljni z privzeto nastavitvijo."  
    196 "Peers" --->  "Peerov"  
    197 "Files" --->  "Datotek"  
    198 "Logging" --->  "Shranjevanje"  
    199 "An invalid encoding level, %1%, was passed as an encryption setting." --->  "Neveljavna nastavitev Å¡ifriranja %1%." 
    200 "An invalid connection policy, %1%, was passed as an encryption setting." --->  "Neveljavna nastavitev povezabe %1%." 
    201 "Auto Sort" --->  "Avtomatsko razvrsti" 
    202 "Torrent Root" --->  "Izvor torrenta"   
     185"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." ---> "Izberite mapo, kjer se bodo shranjevali preosi. Kliknite prekliči, če ste zadovoljni z privzeto nastavitvijo." 
     186"Peers" ---> "Peerov" 
     187"Files" ---> "Datotek" 
     188"Logging" ---> "Shranjevanje" 
     189"An invalid encoding level, %1%, was passed as an encryption setting." ---> "Neveljavna nastavitev Å¡ifriranja %1%." 
     190"An invalid connection policy, %1%, was passed as an encryption setting." ---> "Neveljavna nastavitev povezabe %1%." 
     191"Auto Sort" ---> "Avtomatsko razvrsti" 
     192"Torrent Root" ---> "Izvor torrenta" 
    203193"Interesting" ---> "Zanimanje" 
    204194"Choked" ---> "ZaduÅ¡eno" 
     
    210200"Connecting" ---> "Povezujem" 
    211201"Queued" ---> "V vrsti" 
    212 "RC4 Encrypted" --->  "RC4 Å¡ifrirano"  
    213 "Plaintext Encrypted" --->  "Plaintext Å¡ifrirano"  
     202"RC4 Encrypted" ---> "RC4 Å¡ifrirano" 
     203"Plaintext Encrypted" ---> "Plaintext Å¡ifrirano" 
    214204"Queued for Checking" ---> "V vrsti za pregled" 
    215205"Checking Files" ---> "Preverjam datoteke" 
     
    221211"Stopped" ---> "Prekinjen" 
    222212"Paused" ---> "Na pavzi" 
     213"Stopping" --->  ???  
     214"Pausing" --->  ???  
    223215"Downloading Metadata" ---> "PrenaÅ¡am metadata" 
    224 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time" --->  "Ime;Stanje;Napredek;Hitrost dol;Hitrost gor;Peerov;Sejalcev;ETA;Kopij;Tracker;Posodobi sledilnik;Delilno razmerje;Skupaj;Končano;Preostalo;Prenos dol;Prenos gor;Aktiven;Sejem;Čas nastanka"  
     216"Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    225217"Time;Message;Severity" ---> "Čas;Sporočilo;Kritičnost" 
    226218"Tracker;Tier" ---> "Tracker;Pomol" 
    227 "Peer;Country;Download;Upload;Type;Client" --->  "Peer;DrÅŸava;Dol;Gor;Katgorija;BT odjemalec" 
    228 "Peer;Country;Download;Upload;Type;Client;Status" --->  "Peer;DrÅŸava;Dol;Gor;Katgorija;BT odjemalec;Stanje" 
    229 "Filename;Path;Size;Progress;Priority" --->  "Ime;Pot;Velikost;Napredek;Prioriteta"  
     219"Peer;Country;Download;Upload;Type;Client" ---> "Peer;DrÅŸava;Dol;Gor;Katgorija;BT odjemalec" 
     220"Peer;Country;Download;Upload;Type;Client;Status" ---> "Peer;DrÅŸava;Dol;Gor;Katgorija;BT odjemalec;Stanje" 
     221"Filename;Path;Size;Progress;Priority" ---> "Ime;Pot;Velikost;Napredek;Prioriteta" 
    230222"Don't download" ---> "Ne prenesi" 
    231 "Normal" --->  "Navadna" 
    232 "Above Normal" --->  "Nad običajno" 
    233 "3" --->  "3" 
    234 "4" --->  "4"  
    235 "5" --->  "5" 
    236 "6" --->  "6"  
    237 "Maximum" --->  "Najvčja"  
    238 "Set Priority" --->  "Nastavi prioriteto"  
    239 "Halite.ico" --->  "Halite.ico"  
    240 "toolbar.bmp" --->  "toolbar.bmp" 
     223"Normal" ---> "Navadna" 
     224"Above Normal" ---> "Nad običajno" 
     225"3" ---> "3" 
     226"4" ---> "4" 
     227"5" ---> "5" 
     228"6" ---> "6" 
     229"Maximum" ---> "Najvčja" 
     230"Set Priority" ---> "Nastavi prioriteto" 
     231"Halite.ico" ---> "Halite.ico" 
     232"toolbar.bmp" ---> "toolbar.bmp" 
     233"None" ---> "Nobeno" 
     234"Debug" ---> "Debug" 
     235"Info" ---> "Info" 
     236"Warning" --->  ???  
     237"Critical" ---> "Kritično" 
     238"Peer %2%: %1%." --->  ???  
     239"Peer banned %2%. (%1%)" --->  ???  
     240"Hash failed for piece %2% of %1%." --->  ???  
     241"URL Seed %2%, %3%. (%1%)" --->  ???  
     242"Tracker warning: %2%! (%1%)" --->  ???  
     243"Tracker Announce. (%1%)" --->  ???  
     244"Alert %2%, Status code: %4%, Times %3%. (%1%)" --->  ???  
     245"%2%. %3% Peers. (%1%)" --->  ???  
     246"Fast rusume failed: %2%. (%1%)" --->  ???  
     247"Piece %2% finished. (%1%)" --->  ???  
     248"Block %2% of piece %3% finished. (%1%)" --->  ???  
     249"Block %2% of piece %3% downloading. (%1%)" --->  ???  
     250"Successfully %1%." --->  ???  
     251"Failed, %1%." --->  ???  
     252"IP Filter blocked %1%, %2%." --->  ???  
     253"Xml Exception (%1%) with %2%." ---> "Xml izjema (%1%) pri %2%." 
     254"Torrent %1% finished." --->  ???  
     255"Torrent %1% paused." --->  ???  
     256"Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) zaznana izjema; %2% od %3%." 
     257"Invalid torrent (%1%) from %2%." ---> "Neveljaven torrent (%1%) od %2%." 
     258"Exception caught; %1%, from %2%." ---> "Izjema ujeta; %1%, od %2%." 
     259"XML exception: %1%." ---> "XML izjema: %1%." 
     260"Unicode exception: %1%." ---> "Unicode izjema: %1%." 
     261"Bittorrent Event: %1%." ---> "Bittorrent dogodek: %1%." 
     262"Peer Event: %1%." ---> "Peer dogodek: %1%." 
     263"Tracker Event: %1%." ---> "Tracker dogodek: %1%." 
     264"Debug Event: %1%." ---> "Debug dogodek: %1%." 
  • lang/Turkish.txt

    r283 r314  
    109109"RichEdit20A" --->  ???  
    110110"SysTabControl32" ---> "SysTabControl32" 
     111"Add Torrent" --->  ???  
     112"Ok" --->  ???  
     113"Use Compact Allocation." --->  ???  
     114"Start Paused" --->  ???  
     115"Note. Compact Allocation is incompatible with File Selection" --->  ???  
    111116"General" ---> "Genel" 
    112117"Allow only one instance to run." ---> "Programın sadece bir kopyası çalıssın." 
     
    163168"DHT session could not start. Try selecting another port in the settings." ---> "DHT oturumu başlatılamadı. Ayarlardan başka bir port seçin." 
    164169"Select a directory to save the files to or cancel to not download torrent at all." ---> "Dosyaları kaydetmek için bir dizin seçin veya torrenti indirmemek için iptal edin." 
    165 "None" ---> "Hiçbiri" 
    166 "Debug" ---> "Hata Ayıkla" 
    167 "Info" ---> "Bilgi" 
    168 "Critical" ---> "Critical" 
    169 "Libtorrent Peer Alert: %1%." ---> "Libtorrent Eş Uyarısı: %1%." 
    170 "Xml Exception (%1%) with %2%." ---> "Xml Ä°stisnası (%1%) ile %2%." 
    171 "Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) istisnası yakalandı; %2% 'den %3% 'e." 
    172 "Invalid torrent (%1%) from %2%." ---> "Geçersiz torrent (%1%) 'den %2%'ye." 
    173170"%1$.2fMB of %2$.2fMB" --->  ???  
    174171"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." --->  ???  
     
    186183"Halite not listening!" ---> "Halite portu kullanamıyor!" 
    187184"Port %1% open" ---> "%1% portu açık" 
    188 "Exception caught; %1%, from %2%." ---> "Yakalanan istisna; %1%, %2%'den." 
    189 "XML exception: %1%." ---> "XML istisnası %1%." 
    190 "Unicode exception: %1%." ---> "Unicode istisnası: %1%." 
    191 "Bittorrent Event: %1%." ---> "Bittorrent ile Ä°lgili Durum: %1%." 
    192 "Peer Event: %1%." ---> "Eş ile Ä°lgili Durum: %1%." 
    193 "Tracker Event: %1%." ---> "Ä°zleyici ile Ä°lgili Durum: %1%." 
    194 "Debug Event: %1%." ---> "Hata Ayıklama ile Ä°lgili Durum: %1%." 
    195185"Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." --->  ???  
    196186"Peers" --->  ???  
     
    221211"Stopped" ---> "Durduruldu" 
    222212"Paused" ---> "Duraklatıldı" 
     213"Stopping" --->  ???  
     214"Pausing" --->  ???  
    223215"Downloading Metadata" ---> "Metadata Ä°ndiriliyor" 
    224 "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time" --->  ???  
     216"Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ???  
    225217"Time;Message;Severity" ---> "SÃŒre;Mesaj;Öncelik" 
    226218"Tracker;Tier" ---> "Ä°zleyici;Sıra" 
     
    239231"Halite.ico" --->  ???  
    240232"toolbar.bmp" --->  ???  
     233"None" ---> "Hiçbiri" 
     234"Debug" ---> "Hata Ayıkla" 
     235"Info" ---> "Bilgi" 
     236"Warning" --->  ???  
     237"Critical" ---> "Critical" 
     238"Peer %2%: %1%." --->  ???  
     239"Peer banned %2%. (%1%)" --->  ???  
     240"Hash failed for piece %2% of %1%." --->  ???  
     241"URL Seed %2%, %3%. (%1%)" --->  ???  
     242"Tracker warning: %2%! (%1%)" --->  ???  
     243"Tracker Announce. (%1%)" --->  ???  
     244"Alert %2%, Status code: %4%, Times %3%. (%1%)" --->  ???  
     245"%2%. %3% Peers. (%1%)" --->  ???  
     246"Fast rusume failed: %2%. (%1%)" --->  ???  
     247"Piece %2% finished. (%1%)" --->  ???  
     248"Block %2% of piece %3% finished. (%1%)" --->  ???  
     249"Block %2% of piece %3% downloading. (%1%)" --->  ???  
     250"Successfully %1%." --->  ???  
     251"Failed, %1%." --->  ???  
     252"IP Filter blocked %1%, %2%." --->  ???  
     253"Xml Exception (%1%) with %2%." ---> "Xml Ä°stisnası (%1%) ile %2%." 
     254"Torrent %1% finished." --->  ???  
     255"Torrent %1% paused." --->  ???  
     256"Torrent (%1%) exception caught; %2% from %3%." ---> "Torrent (%1%) istisnası yakalandı; %2% 'den %3% 'e." 
     257"Invalid torrent (%1%) from %2%." ---> "Geçersiz torrent (%1%) 'den %2%'ye." 
     258"Exception caught; %1%, from %2%." ---> "Yakalanan istisna; %1%, %2%'den." 
     259"XML exception: %1%." ---> "XML istisnası %1%." 
     260"Unicode exception: %1%." ---> "Unicode istisnası: %1%." 
     261"Bittorrent Event: %1%." ---> "Bittorrent ile Ä°lgili Durum: %1%." 
     262"Peer Event: %1%." ---> "Eş ile Ä°lgili Durum: %1%." 
     263"Tracker Event: %1%." ---> "Ä°zleyici ile Ä°lgili Durum: %1%." 
     264"Debug Event: %1%." ---> "Hata Ayıklama ile Ä°lgili Durum: %1%." 
  • res/Halite.rc

    r311 r314  
    33#include "afxres.h" 
    44 
     5#include "../src/advtabs/Tracker.hpp" 
     6#include "../res/ConfigDefines.h" 
    57#include "../src/halTorrent.cpp" 
    68#include "../src/halTorrentInternal.hpp" 
     
    112114FONT 8, "MS Shell Dlg", 400, 0, 0x1 
    113115BEGIN 
    114     GROUPBOX        "IP Filtering",IDC_STATIC,5,6,315,30 
    115     CONTROL         "Enable IP filtering.",IDC_BC_FILTERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,105,12 
     116    GROUPBOX        "IP Filtering",IDC_SECURITY_IPF_GB,5,6,315,30 
     117    CONTROL         "Enable IP filtering.",IDC_BC_FILTERCHECK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,12,18,105,12 
    116118    PUSHBUTTON      "Import ipfilter.dat",IDC_BC_FILTERLOAD,220,17,95,14,WS_DISABLED 
    117119    PUSHBUTTON      "Clear IP database",IDC_BC_FILTERCLEAR,120,17,95,14,WS_DISABLED 
    118120    GROUPBOX        "Protocol Encryption",IDC_STATIC,5,39,315,75 
    119     CONTROL         "Enable Protocol Encryption.",IDC_SC_ENABLE_PE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,50,175,10 
     121    CONTROL         "Enable Protocol Encryption.",IDC_SC_ENABLE_PE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,12,50,175,10 
    120122    GROUPBOX        "Connection Policies",IDC_STATIC,194,49,120,58 
    121123    LTEXT           "Incoming",IDC_STATIC,200,61,50,9 
    122124    RTEXT           "Outgoing",IDC_STATIC,255,61,50,9 
    123     CONTROL         "",IDC_SC_PE_CP_IN_FORCED,"Button",BS_AUTORADIOBUTTON | WS_GROUP,205,73,16,10 
     125    CONTROL         "",IDC_SC_PE_CP_IN_FORCED,"Button",BS_AUTORADIOBUTTON|WS_GROUP,205,73,16,10 
    124126    CONTROL         "",IDC_SC_PE_CP_IN_ENABLED,"Button",BS_AUTORADIOBUTTON,205,83,16,10 
    125127    CONTROL         "",IDC_SC_PE_CP_IN_DISABLED,"Button",BS_AUTORADIOBUTTON,205,93,16,10 
     
    127129    CTEXT           "Enabled",IDC_STATIC,225,83,55,8 
    128130    CTEXT           "Disabled",IDC_STATIC,225,93,55,8 
    129     CONTROL         "",IDC_SC_PE_CP_OUT_FORCED,"Button",BS_AUTORADIOBUTTON | WS_GROUP,284,73,16,10,WS_EX_RIGHT 
     131    CONTROL         "",IDC_SC_PE_CP_OUT_FORCED,"Button",BS_AUTORADIOBUTTON|WS_GROUP,284,73,16,10,WS_EX_RIGHT 
    130132    CONTROL         "",IDC_SC_PE_CP_OUT_ENABLED,"Button",BS_AUTORADIOBUTTON,284,83,16,10,WS_EX_RIGHT 
    131133    CONTROL         "",IDC_SC_PE_CP_OUT_DISABLED,"Button",BS_AUTORADIOBUTTON,284,93,16,10,WS_EX_RIGHT 
    132134    GROUPBOX        "Encoding Level",IDC_STATIC,12,63,175,44 
    133     CONTROL         "Plaintext",IDC_SC_PE_ENC_PLAIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,18,73,160,10 
     135    CONTROL         "Plaintext",IDC_SC_PE_ENC_PLAIN,"Button",BS_AUTORADIOBUTTON|WS_GROUP,18,73,160,10 
    134136    CONTROL         "RC4",IDC_SC_PE_ENC_RC4,"Button",BS_AUTORADIOBUTTON,18,84,160,10 
    135137    CONTROL         "Both",IDC_SC_PE_ENC_BOTH,"Button",BS_AUTORADIOBUTTON,18,95,75,10 
    136     CONTROL         "Prefer RC4",IDC_SC_PE_ENC_RC4_PERFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,95,80,10 
     138    CONTROL         "Prefer RC4",IDC_SC_PE_ENC_RC4_PERFER,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,100,95,80,10 
    137139//    LTEXT           "Need Help?",IDC_SC_HELP_LINK,7,138,255,8 
    138140END 
     
    293295BEGIN 
    294296    CONTROL         "",IDC_TAB,"SysTabControl32",0,1,0,315,71 
    295     RTEXT           "Static",IDC_ADVDLG_VERSION,235,2,78,10 
     297    RTEXT           "Static",IDC_ADVDLG_VERSION,235,2,78,8,SS_CENTERIMAGE 
    296298END 
    297299 
     
    331333FONT 8,"MS Shell Dlg",400,0,1 
    332334BEGIN 
    333     LTEXT           "List of Trackers.",-1,7,6,95,8 
     335    LTEXT           "List of Trackers.",IDC_TRACKER_LABEL,7,6,95,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    334336    EDITTEXT        IDC_TRACKER_USER,208,18,92,12,ES_AUTOHSCROLL 
    335337    EDITTEXT        IDC_TRACKER_PASS,208,32,92,12,ES_AUTOHSCROLL | ES_PASSWORD 
    336     RTEXT           "Username : ",IDC_TRACKER_USER_S,164,20,42,8 
    337     RTEXT           "Password : ",IDC_TRACKER_PASS_S,164,34,42,8 
     338    RTEXT           "Username : ",IDC_TRACKER_USER_S,164,20,42,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
     339    RTEXT           "Password : ",IDC_TRACKER_PASS_S,164,34,42,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    338340    AUTOCHECKBOX    "Send login info to trackers.",IDC_TRACKER_LOGINCHECK,166,4,101,12 
    339341    CONTROL         "",IDC_TRACKERLIST,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,19,154,47 
     
    592594        HAL_BLOCK_FINISHED_ALERT                "Block %2% of piece %3% finished. (%1%)" 
    593595        HAL_BLOCK_DOWNLOADING_ALERT             "Block %2% of piece %3% downloading. (%1%)" 
     596        HAL_LISTEN_SUCCEEDED_ALERT              "Successfully %1%." 
     597        HAL_LISTEN_FAILED_ALERT                 "Failed, %1%" 
     598        HAL_IPFILTER_ALERT                              "IP Filter blocked %1%, %2%." 
    594599         
    595600    HAL_EVENT_XMLEXP              "Xml Exception (%1%) with %2%." 
  • src/AtlAutosizeDlg.h

    r311 r314  
    8787                return TRUE; \ 
    8888        } 
    89          
     89 
    9090/// The main "facility" to control the positioning and sizing of the ctrls. 
    9191/** The BEGIN_WINDOW_MAP() MUST be paired by a END_WINDOW_MAP().  
     
    9393 *  \param ... In order: LeftRightBorder, TopBottomBorder, HorizontalGap, VerticalGap. Positive if DLGUnits, negative for Pixels 
    9494 */ 
     95  
     96#define BEGIN_WINDOW_MAP_INLINE(theClass, /*LeftRightBorder, TopBottomBorder, HGap, VGap*/...) \ 
     97        ATLASSERT(sizeof(int) == sizeof(theClass::CCtrlCounter) && "\"Strange\" compiler. The library is not compatible"); \ 
     98                CRowsIndex *p = NULL; p; \ 
     99                const int _auto = WMSRC_AUTO, _exp = WMSRC_EXPANDABLE, _contr = WMSRC_CONTRACTABLE, _eq = WMSRC_EQUAL, _gap = WMSRC_GAP, _gapm = WMSRC_GAPM, _nog = WMSRC_NOGAP, _ = WMSCTRL_EMPTY, __ = WMSCTRL_EMPTY, _r = WMSCTRL_EXPRIGHT, _d = WMSCTRL_EXPDOWN; \ 
     100                _auto; _exp; _contr; _eq; _gap, _gapm, _nog; _; __; _r; _d; \ 
     101                static CCtrlCounter s_iCtrls[] = {0, _FirstParam(__VA_ARGS__), _SecondParam(__VA_ARGS__), _ThirdParam(__VA_ARGS__), _FourthParam(__VA_ARGS__),  
     102 
    95103#define BEGIN_WINDOW_MAP(theClass, /*LeftRightBorder, TopBottomBorder, HGap, VGap*/...) \ 
    96104        static CWindowMapStruct* GetWindowMap() \ 
     
    103111 
    104112/// "Footer" of the Window Map. 
     113#define END_WINDOW_MAP_INLINE() \ 
     114                }; ATLASSERT(!p); \ 
     115                return (CWindowMapStruct*)s_iCtrls;  
     116                 
     117                 
     118/// "Footer" of the Window Map. 
    105119#define END_WINDOW_MAP() \ 
    106120                }; ATLASSERT(!p); \ 
    107121                return (CWindowMapStruct*)s_iCtrls; \ 
    108122        } 
     123 
    109124 
    110125/*@}*/ 
     
    223238 *  \param ... Comma separated list of IDs if ctrls (or WMB_HEAD()/WMB_END() ctrl groups, or WMSCTRL_EMPTY/_/__ or WMSCTRL_EXPRIGHT/_r or WMSCTRL_EXPDOWN/_d) 
    224239 */ 
    225 #define WMB_ROWNOMIN(_size)                                             (_IncRow(p), WMR_BEGIN), _size, 0, WMSRCMM_SIZECALC, __VA_ARGS__, WMR_END 
     240#define WMB_ROWNOMIN(_size, ...)                                                (_IncRow(p), WMR_BEGIN), _size, 0, WMSRCMM_SIZECALC, __VA_ARGS__, WMR_END 
    226241 
    227242/// Auto-min and infinite-max row. To be used with WMB_HEAD() 
     
    229244 *  \param ... Comma separated list of IDs if ctrls (or WMB_HEAD()/WMB_END() ctrl groups, or WMSCTRL_EMPTY/_/__ or WMSCTRL_EXPRIGHT/_r or WMSCTRL_EXPDOWN/_d) 
    230245 */ 
    231 #define WMB_ROWNOMAX(_size)                                             (_IncRow(p), WMR_BEGIN), _size, WMSRCMM_SIZECALC, WMSRCMM_MAXVAL, __VA_ARGS__, WMR_END 
     246#define WMB_ROWNOMAX(_size, ...)                                                (_IncRow(p), WMR_BEGIN), _size, WMSRCMM_SIZECALC, WMSRCMM_MAXVAL, __VA_ARGS__, WMR_END 
    232247 
    233248/// 0-min and infinite-max row. To be used with WMB_HEAD() 
     
    235250 *  \param ... Comma separated list of IDs if ctrls (or WMB_HEAD()/WMB_END() ctrl groups, or WMSCTRL_EMPTY/_/__ or WMSCTRL_EXPRIGHT/_r or WMSCTRL_EXPDOWN/_d) 
    236251 */ 
    237 #define WMB_ROWNOMINNOMAX(_size)                                (_IncRow(p), WMR_BEGIN), _size, 0, WMSRCMM_MAXVAL, __VA_ARGS__, WMR_END 
     252#define WMB_ROWNOMINNOMAX(_size, ...)                           (_IncRow(p), WMR_BEGIN), _size, 0, WMSRCMM_MAXVAL, __VA_ARGS__, WMR_END 
    238253 
    239254/// Fixed-min and infinite-max row. To be used with WMB_HEAD() 
     
    242257 *  \param ... Comma separated list of IDs if ctrls (or WMB_HEAD()/WMB_END() ctrl groups, or WMSCTRL_EMPTY/_/__ or WMSCTRL_EXPRIGHT/_r or WMSCTRL_EXPDOWN/_d) 
    243258 */ 
    244 #define WMB_ROWMINNOMAX(_size, _min)                    (_IncRow(p), WMR_BEGIN), _size, _min, WMSRCMM_MAXVAL, __VA_ARGS__, WMR_END 
     259#define WMB_ROWMINNOMAX(_size, _min, ...)                       (_IncRow(p), WMR_BEGIN), _size, _min, WMSRCMM_MAXVAL, __VA_ARGS__, WMR_END 
    245260 
    246261/// 0-min and fixed-max row. To be used with WMB_HEAD() 
     
    249264 *  \param ... Comma separated list of IDs if ctrls (or WMB_HEAD()/WMB_END() ctrl groups, or WMSCTRL_EMPTY/_/__ or WMSCTRL_EXPRIGHT/_r or WMSCTRL_EXPDOWN/_d) 
    250265 */ 
    251 #define WMB_ROWNOMINMAX(_size, _max)                    (_IncRow(p), WMR_BEGIN), _size, 0, _max, __VA_ARGS__, WMR_END 
     266#define WMB_ROWNOMINMAX(_size, _max, ...)                       (_IncRow(p), WMR_BEGIN), _size, 0, _max, __VA_ARGS__, WMR_END 
    252267 
    253268/*@}*/ 
  • src/ConfigOptions.hpp

    r291 r314  
    66 
    77#pragma once 
     8 
     9#include "../res/ConfigDefines.h" 
    810 
    911#include "stdAfx.hpp" 
     
    260262class SecurityOptions : 
    261263    public CPropertyPageImpl<SecurityOptions>, 
     264        public CAutoSizeWindow<SecurityOptions, false>, 
    262265    public CWinDataExchangeEx<SecurityOptions> 
    263266{ 
    264267        typedef SecurityOptions thisClass; 
     268        typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     269         
    265270public: 
    266271    enum { IDD = IDD_CONFIGSECURITY }; 
    267  
    268         SecurityOptions() 
    269         {} 
    270  
    271         ~SecurityOptions() 
    272         {} 
    273272 
    274273    BEGIN_MSG_MAP_EX(thisClass) 
     
    282281                 
    283282        CHAIN_MSG_MAP(CPropertyPageImpl<thisClass>) 
     283        CHAIN_MSG_MAP(autosizeClass) 
    284284    END_MSG_MAP() 
    285285 
     
    292292        DDX_RADIO(IDC_SC_PE_CP_OUT_FORCED, hal::config().peConOutPolicy) 
    293293    END_DDX_MAP() 
     294         
     295        #define SECURITY_IPF_LAYOUT \ 
     296        WMB_HEAD(WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp)), \ 
     297                WMB_ROW(_auto,  IDC_BC_FILTERCHECK,     IDC_BC_FILTERCLEAR, IDC_BC_FILTERLOAD), \ 
     298        WMB_END() 
     299 
     300#define TORRENT_STATUS_LAYOUT \ 
     301        WMB_HEAD(WMB_COL(45), WMB_COLNOMIN(_exp|150), WMB_COL(_eq|0), WMB_COL(_exp|100)), \ 
     302                WMB_ROW(10,     IDC_NAME_STATUS_LABEL, IDC_NAME_STATUS, _r, _r), \ 
     303                WMB_ROW(10,     IDC_PEERS_LABEL, IDC_PEERS, IDC_SEEDS_LABEL, IDC_SEEDS), \ 
     304                WMB_ROW(10,     IDC_TRANSFERED_LABEL, IDC_TRANSFERED, IDC_OVERHEAD_LABEL, IDC_OVERHEAD), \ 
     305                WMB_ROW(10,     IDC_REMAINING_LABEL, IDC_REMAINING, IDC_ETA_LABEL, IDC_ETA), \ 
     306                WMB_ROW(10,     IDC_RATE_LABEL, IDC_RATE, IDC_RATIO_LABEL, IDC_RATIO), \ 
     307        WMB_END() 
     308                 
     309#define TORRENT_REANNOUNCE_LAYOUT \ 
     310        WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp)), \ 
     311                WMB_ROW(10,     IDC_UPDATESTAT, IDC_UPDATE), \ 
     312        WMB_END()        
     313 
     314        BEGIN_WINDOW_MAP(thisClass, 6, 6, 3, 3) 
     315                WMB_HEAD(WMB_COL(_gap), WMB_COLNOMAX(_exp), WMB_COL(_gap)),  
     316                        WMB_ROW(_gap|3, IDC_SECURITY_IPF_GB, _r, _r),  
     317                        WMB_ROW(_auto,  _d, SECURITY_IPF_LAYOUT),  
     318                        WMB_ROW(_gap,   _d),  
     319                WMB_END() 
     320        END_WINDOW_MAP()         
    294321 
    295322    BOOL OnInitDialog (HWND hwndFocus, LPARAM lParam) 
     
    517544        if (wParam == TRUE) 
    518545            Center(); 
    519  
    520         bHandled = FALSE; 
     546                 
     547                bHandled = FALSE; 
     548                 
    521549        return 0; 
    522550    } 
     
    538566        AboutOptions aboutOptions; 
    539567}; 
     568 
  • src/Halite.cpp

    r312 r314  
    1010 
    1111#include "stdAfx.hpp" 
    12 #include <vld.h> 
     12// #include <vld.h> 
    1313 
    1414#include "WinAPIMutex.hpp" 
  • src/Halite.hpp

    r312 r314  
    5151        bool logDebug() { return logDebug_; } 
    5252        const wstring& dll() { return dll_; } 
    53         const size_t logListLen() { return logListLen_; } 
     53        const int logListLen() { return logListLen_; } 
    5454         
    5555        friend class GeneralOptions; 
  • src/HaliteDialogBase.hpp

    r306 r314  
    3232        END_MSG_MAP() 
    3333         
    34         void OnShow(bool show, int flags) 
     34        void OnShow(BOOL show, int flags) 
    3535        { 
    3636                if (show) 
  • src/HaliteSortListViewCtrl.hpp

    r303 r314  
    467467                header_.ModifyStyle(0, HDS_DRAGDROP|HDS_FULLDRAG); 
    468468                 
    469                 for (int i = header_.GetItemCount(); i<listNames_.size(); i = header_.GetItemCount()) 
     469                for (int i = header_.GetItemCount(); i<int(listNames_.size()); i = header_.GetItemCount()) 
    470470                { 
    471471                        //if (listVisible_[i]) 
  • src/WinAPIWaitableTimer.hpp

    r268 r314  
    3030                fn_ = fn; 
    3131                 
    32                 return ::CreateTimerQueueTimer( 
     32                return (::CreateTimerQueueTimer( 
    3333                        &timer_, 
    3434                        NULL, 
     
    3737                        dueTime,  
    3838                        period,  
    39                         WT_EXECUTEINTIMERTHREAD); 
     39                        WT_EXECUTEINTIMERTHREAD) == TRUE); 
    4040        } 
    4141 
  • src/advtabs/Files.cpp

    r310 r314  
    254254                        if (iter == range_.second || !(FileLinkNamesEqual((*iter), file))) 
    255255                        { 
    256                                 if (iter == range_.second) 
     256/*                              if (iter == range_.second) 
    257257                                        hal::event().post(shared_ptr<hal::EventDetail>(new hal::EventDebug(hal::Event::info, (wformat(L"Deleting %1%") % file.filename).str().c_str()))); 
    258258                                else 
    259259                                        hal::event().post(shared_ptr<hal::EventDetail>(new hal::EventDebug(hal::Event::info, (wformat(L"Deleting %1% != %2%") % file.filename % (*iter).filename).str().c_str()))); 
    260                                  
     260        */                       
    261261                                list_.DeleteItem(i); 
    262262                        } 
  • src/advtabs/Files.hpp

    r312 r314  
    139139                        case 7: 
    140140                                return hal::app().res_wstr(HAL_FILE_PRIORITY_7); 
     141                        default: 
     142                                return hal::app().res_wstr(HAL_FILE_PRIORITY_0); 
    141143                        }        
    142144                }                
     
    233235                 
    234236                COMMAND_RANGE_HANDLER_EX(ID_HAL_FILE_PRIORITY_0, ID_HAL_FILE_PRIORITY_7, OnMenuPriority) 
    235 //              CHAIN_MSG_MAP(treeClass) 
    236237                DEFAULT_REFLECTION_HANDLER() 
    237238        END_MSG_MAP() 
     
    420421 
    421422        BEGIN_DLGRESIZE_MAP(thisClass) 
    422                 DLGRESIZE_CONTROL(IDC_CONTAINER, DLSZ_SIZE_X|DLSZ_SIZE_Y) 
     423                DLGRESIZE_CONTROL(IDC_CONTAINER, DLSZ_SIZE_X|DLSZ_SIZE_Y|DLSZ_REPAINT) 
    423424        END_DLGRESIZE_MAP() 
    424425 
  • src/advtabs/Torrent.cpp

    r311 r314  
    1818{ 
    1919        dialogBaseClass::InitializeHalDialogBase();      
    20 //      resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN); 
    21          
    22 {       m_prog.Attach(GetDlgItem(TORRENTPROG)); 
    23         m_prog.SetRange(0, 100); 
    24 }        
     20         
     21        m_prog.Attach(GetDlgItem(TORRENTPROG)); 
     22        m_prog.SetRange(0, 100);         
    2523         
    2624        NoConnDown = -1; 
     
    3331} 
    3432 
     33AdvTorrentDialog::CWindowMapStruct* AdvTorrentDialog::GetWindowMap() 
     34{ 
     35        #define TORRENT_LIMITS_LAYOUT \ 
     36        WMB_HEAD(WMB_COL(_exp|20), WMB_COL(_exp|30), WMB_COL(_exp|20), WMB_COL(_exp|30)), \ 
     37                WMB_ROW(10,     IDC_TL, _r, _r, _r), \ 
     38                WMB_ROW(11,     IDC_TLD, IDC_EDITTLD, IDC_TLU, IDC_EDITTLU), \ 
     39                WMB_ROW(10,     IDC_NC, _r, _r, _r), \ 
     40                WMB_ROW(11,     IDC_NCD, IDC_EDITNCD, IDC_NCU, IDC_EDITNCU), \ 
     41                WMB_ROW(11,     IDC_RATIOESTATIC, _r, _r, IDC_EDITRATIO), \ 
     42        WMB_END() 
     43 
     44#define TORRENT_STATUS_LAYOUT \ 
     45        WMB_HEAD(WMB_COL(45), WMB_COLNOMIN(_exp|150), WMB_COL(_eq|0), WMB_COL(_exp|100)), \ 
     46                WMB_ROW(10,     IDC_NAME_STATUS_LABEL, IDC_NAME_STATUS, _r, _r), \ 
     47                WMB_ROW(10,     IDC_PEERS_LABEL, IDC_PEERS, IDC_SEEDS_LABEL, IDC_SEEDS), \ 
     48                WMB_ROW(10,     IDC_TRANSFERED_LABEL, IDC_TRANSFERED, IDC_OVERHEAD_LABEL, IDC_OVERHEAD), \ 
     49                WMB_ROW(10,     IDC_REMAINING_LABEL, IDC_REMAINING, IDC_ETA_LABEL, IDC_ETA), \ 
     50                WMB_ROW(10,     IDC_RATE_LABEL, IDC_RATE, IDC_RATIO_LABEL, IDC_RATIO), \ 
     51        WMB_END() 
     52                 
     53#define TORRENT_REANNOUNCE_LAYOUT \ 
     54        WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp)), \ 
     55                WMB_ROW(10,     IDC_UPDATESTAT, IDC_UPDATE), \ 
     56        WMB_END()        
     57 
     58        BEGIN_WINDOW_MAP_INLINE(AdvTorrentDialog, 6, 6, 3, 3) 
     59                WMB_HEAD(WMB_COL(_gap), WMB_COL(_exp), WMB_COL(120), WMB_COL(_gap)),  
     60                        WMB_ROW(_gap|3, IDC_GROUP_TORRENT, _r, _r, _r),  
     61                        WMB_ROW(_auto,  _d, TORRENT_STATUS_LAYOUT, TORRENT_LIMITS_LAYOUT),  
     62                        WMB_ROWMIN(_exp, 8,     _d, TORRENTPROG, _r),  
     63                        WMB_ROW(_gap,   _d),  
     64                        WMB_ROW(_gap|3, IDC_GROUP_TRACKER, _r, _r, _r),  
     65                        WMB_ROW(_auto,  _d, IDC_TRACKER, TORRENT_REANNOUNCE_LAYOUT),  
     66                        WMB_ROW(_gap,   _d),  
     67                WMB_END()  
     68        END_WINDOW_MAP_INLINE()  
     69} 
     70         
    3571void AdvTorrentDialog::onClose() 
    3672{ 
     
    155191                                % (static_cast<float>(torrent->totalWanted()-torrent->totalWantedDone())/(1024*1024)) 
    156192                                % (static_cast<float>(torrent->totalWanted())/(1024*1024))); 
    157                                  
     193                 
    158194                wstring eta = L"∞";                      
    159195                if (!torrent->estimatedTimeLeft().is_special()) 
     
    171207                                / static_cast<float>(torrent->totalPayloadDownloaded()) 
    172208                        : 0; 
    173                          
     209                 
    174210                SetDlgItemInfo(IDC_RATIO,  
    175211                        wformat(L"%1$.2f") % ratio);             
  • src/advtabs/Torrent.hpp

    r311 r314  
    6161    END_DDX_MAP() 
    6262         
    63         TRANSPARENT_LIST(thisClass, IDC_GROUP_TORRENT, IDC_GROUP_TRACKER) 
    64  
    65 #define TORRENT_LIMITS_LAYOUT \ 
    66         WMB_HEAD(WMB_COL(_exp|20), WMB_COL(_exp|30), WMB_COL(_exp|20), WMB_COL(_exp|30)), \ 
    67                 WMB_ROW(10,     IDC_TL, _r, _r, _r), \ 
    68                 WMB_ROW(11,     IDC_TLD, IDC_EDITTLD, IDC_TLU, IDC_EDITTLU), \ 
    69                 WMB_ROW(10,     IDC_NC, _r, _r, _r), \ 
    70                 WMB_ROW(11,     IDC_NCD, IDC_EDITNCD, IDC_NCU, IDC_EDITNCU), \ 
    71                 WMB_ROW(11,     IDC_RATIOESTATIC, _r, _r, IDC_EDITRATIO), \ 
    72         WMB_END() 
    73  
    74 #define TORRENT_STATUS_LAYOUT \ 
    75         WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp|150), WMB_COL(_eq|0), WMB_COL(_exp|100)), \ 
    76                 WMB_ROW(10,     IDC_NAME_STATUS_LABEL, IDC_NAME_STATUS, _r, _r), \ 
    77                 WMB_ROW(10,     IDC_PEERS_LABEL, IDC_PEERS, IDC_SEEDS_LABEL, IDC_SEEDS), \ 
    78                 WMB_ROW(10,     IDC_TRANSFERED_LABEL, IDC_TRANSFERED, IDC_OVERHEAD_LABEL, IDC_OVERHEAD), \ 
    79                 WMB_ROW(10,     IDC_REMAINING_LABEL, IDC_REMAINING, IDC_ETA_LABEL, IDC_ETA), \ 
    80                 WMB_ROW(10,     IDC_RATE_LABEL, IDC_RATE, IDC_RATIO_LABEL, IDC_RATIO), \ 
    81         WMB_END() 
    82                  
    83 #define TORRENT_REANNOUNCE_LAYOUT \ 
    84         WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp)), \ 
    85                 WMB_ROW(10,     IDC_UPDATESTAT, IDC_UPDATE), \ 
    86         WMB_END()        
    87  
    88         BEGIN_WINDOW_MAP(thisClass, 6, 6, 3, 3) 
    89                 WMB_HEAD(WMB_COL(_gap), WMB_COL(_exp), WMB_COL(120), WMB_COL(_gap)),  
    90                         WMB_ROW(_gap|3, IDC_GROUP_TORRENT, _r, _r, _r),  
    91                         WMB_ROW(_auto,  _d, TORRENT_STATUS_LAYOUT, TORRENT_LIMITS_LAYOUT),  
    92                         WMB_ROWMIN(_exp, 8,     _d, TORRENTPROG, _r),  
    93                         WMB_ROW(_gap,   _d),  
    94                         WMB_ROW(_gap|3, IDC_GROUP_TRACKER, _r, _r, _r),  
    95                         WMB_ROW(_auto,  _d, IDC_TRACKER, TORRENT_REANNOUNCE_LAYOUT),  
    96                         WMB_ROW(_gap,   _d),  
    97                 WMB_END()                
    98         END_WINDOW_MAP()         
    99  
    100 /*      BEGIN_DLGRESIZE_MAP(thisClass) 
    101 //              BEGIN_DLGRESIZE_GROUP() 
    102                         DLGRESIZE_CONTROL(IDC_TL, (DLSZ_MOVE_X)) 
    103                         DLGRESIZE_CONTROL(IDC_NC, (DLSZ_MOVE_X)) 
    104                         DLGRESIZE_CONTROL(IDC_TLD, (DLSZ_MOVE_X)) 
    105                         DLGRESIZE_CONTROL(IDC_TLU, (DLSZ_MOVE_X)) 
    106                         DLGRESIZE_CONTROL(IDC_NCU, (DLSZ_MOVE_X)) 
    107                         DLGRESIZE_CONTROL(IDC_NCD, (DLSZ_MOVE_X)) 
    108                         DLGRESIZE_CONTROL(IDC_RATIOESTATIC, (DLSZ_MOVE_X)) 
    109                         DLGRESIZE_CONTROL(IDC_EDITRATIO, (DLSZ_MOVE_X)) 
    110                         DLGRESIZE_CONTROL(IDC_EDITNCD, (DLSZ_MOVE_X)) 
    111                         DLGRESIZE_CONTROL(IDC_EDITTLD, (DLSZ_MOVE_X)) 
    112                         DLGRESIZE_CONTROL(IDC_EDITTLU, (DLSZ_MOVE_X)) 
    113                         DLGRESIZE_CONTROL(IDC_EDITNCU, (DLSZ_MOVE_X)) 
    114 //              END_DLGRESIZE_GROUP() 
    115                  
    116 //              DLGRESIZE_CONTROL(IDC_RATIO, (DLSZ_MOVE_X)) 
    117 //              DLGRESIZE_CONTROL(IDC_RATIOSTAT, (DLSZ_MOVE_X)) 
    118  
    119                 DLGRESIZE_CONTROL(IDC_UPDATESTAT, (DLSZ_MOVE_X)) 
    120                 DLGRESIZE_CONTROL(IDC_UPDATE, (DLSZ_MOVE_X)) 
    121  
    122  
    123                 DLGRESIZE_CONTROL(IDC_GROUP_TORRENT, (DLSZ_SIZE_X)) 
    124                 DLGRESIZE_CONTROL(IDC_GROUP_TRACKER, (DLSZ_SIZE_X)) 
    125                 DLGRESIZE_CONTROL(TORRENTPROG, (DLSZ_SIZE_X)) 
    126  
    127                 DLGRESIZE_CONTROL(IDC_NAME_STATUS_LABEL, (0)) 
    128                 DLGRESIZE_CONTROL(IDC_NAME_STATUS, (DLSZ_SIZE_X)) 
    129  
    130                 BEGIN_DLGRESIZE_GROUP()                  
    131                         DLGRESIZE_CONTROL(IDC_PEERS_LABEL, (0)) 
    132                         DLGRESIZE_CONTROL(IDC_TRANSFERED_LABEL, (0)) 
    133                         DLGRESIZE_CONTROL(IDC_REMAINING_LABEL, (0)) 
    134                         DLGRESIZE_CONTROL(IDC_RATE_LABEL, (0)) 
    135                          
    136                         DLGRESIZE_CONTROL(IDC_SEEDS_LABEL, (DLSZ_MOVE_X)) 
    137                         DLGRESIZE_CONTROL(IDC_OVERHEAD_LABEL, (DLSZ_MOVE_X)) 
    138                         DLGRESIZE_CONTROL(IDC_ETA_LABEL, (DLSZ_MOVE_X)) 
    139                         DLGRESIZE_CONTROL(IDC_RATIO_LABEL, (DLSZ_MOVE_X)) 
    140                 END_DLGRESIZE_GROUP() 
    141  
    142                 BEGIN_DLGRESIZE_GROUP()                  
    143                         DLGRESIZE_CONTROL(IDC_PEERS, (DLSZ_SIZE_X)) 
    144                         DLGRESIZE_CONTROL(IDC_SEEDS, (DLSZ_MOVE_X|DLSZ_SIZE_X)) 
    145                 END_DLGRESIZE_GROUP() 
    146                  
    147                 BEGIN_DLGRESIZE_GROUP()          
    148                         DLGRESIZE_CONTROL(IDC_TRANSFERED, (DLSZ_SIZE_X)) 
    149                         DLGRESIZE_CONTROL(IDC_OVERHEAD, (DLSZ_MOVE_X|DLSZ_SIZE_X)) 
    150                 END_DLGRESIZE_GROUP() 
    151                  
    152                 BEGIN_DLGRESIZE_GROUP()          
    153                         DLGRESIZE_CONTROL(IDC_REMAINING, (DLSZ_SIZE_X)) 
    154                         DLGRESIZE_CONTROL(IDC_ETA, (DLSZ_MOVE_X|DLSZ_SIZE_X)) 
    155                 END_DLGRESIZE_GROUP() 
    156                  
    157                 BEGIN_DLGRESIZE_GROUP()          
    158                         DLGRESIZE_CONTROL(IDC_RATE, (DLSZ_SIZE_X)) 
    159                         DLGRESIZE_CONTROL(IDC_RATIO, (DLSZ_MOVE_X|DLSZ_SIZE_X))  
    160                 END_DLGRESIZE_GROUP() 
    161                  
    162                 DLGRESIZE_CONTROL(IDC_TRACKER, (DLSZ_SIZE_X)) 
    163         END_DLGRESIZE_MAP() 
    164 */ 
     63        TRANSPARENT_LIST(thisClass, IDC_GROUP_TORRENT, IDC_GROUP_TRACKER, IDC_TL, IDC_NAME_STATUS_LABEL) 
     64         
     65        static CWindowMapStruct* GetWindowMap(); 
     66         
    16567        LRESULT onInitDialog(HWND, LPARAM); 
    16668        void onClose(); 
    16769 
    16870        LRESULT OnEditKillFocus(UINT uCode, int nCtrlID, HWND hwndCtrl); 
     71//      void DlgResize_UpdateLayout(int cxWidth, int cyHeight); 
    16972 
    17073        void uiUpdate(const hal::TorrentDetails& tD); 
  • src/advtabs/Tracker.cpp

    r268 r314  
    5252} 
    5353 
     54AdvTrackerDialog::CWindowMapStruct* AdvTrackerDialog::GetWindowMap() 
     55{ 
     56#define TRACKER_LOGIN_LAYOUT \ 
     57        WMB_HEAD(WMB_COL(_exp|50), WMB_COL(_exp|66), WMB_COL(_exp|33)), \ 
     58                WMB_ROW(_auto,  IDC_TRACKER_LOGINCHECK, _r,     _r), \ 
     59                WMB_ROW(_auto,  IDC_TRACKER_USER_S, IDC_TRACKER_USER, _r), \ 
     60                WMB_ROW(_auto,  IDC_TRACKER_PASS_S,     IDC_TRACKER_PASS, _r), \ 
     61                WMB_ROW(_auto,  _, BTNREANNOUNCE), \ 
     62        WMB_END() 
     63 
     64#define TRACKER_LIST_LAYOUT \ 
     65        WMB_HEAD(WMB_COL(_exp), WMB_COLNOMIN(_exp|25), WMB_COL(_exp|25)), \ 
     66                WMB_ROW(_auto,  IDC_TRACKER_LABEL, IDC_TRACKER_RESET, IDC_TRACKER_APPLY), \ 
     67                WMB_ROW(_exp,   IDC_TRACKERLIST, _r, _r), \ 
     68        WMB_END() 
     69 
     70        BEGIN_WINDOW_MAP_INLINE(AdvTrackerDialog, 6, 6, 3, 3) 
     71                WMB_HEAD(WMB_COL(_exp|160), WMB_COL(_exp)), 
     72                        WMB_ROWNOMINNOMAX(_exp, TRACKER_LIST_LAYOUT, TRACKER_LOGIN_LAYOUT), 
     73                WMB_END()  
     74        END_WINDOW_MAP_INLINE()  
     75} 
     76 
    5477void AdvTrackerDialog::onLoginCheck(UINT, int, HWND hWnd) 
    5578{ 
     
    7093                 
    7194                if (hal::bittorrent().torrentDetails().selectedTorrent()) 
    72                         hal::bittorrent().setTorrentLogin(hal::to_utf8(hal::bittorrent().torrentDetails().selectedTorrent()->filename()), 
     95                        hal::bittorrent().setTorrentLogin( 
     96                                hal::to_utf8(hal::bittorrent().torrentDetails().selectedTorrent()->filename()), 
    7397                                username_, password_); 
    7498                 
     
    80104{ 
    81105        dialogBaseClass::InitializeHalDialogBase();      
    82         resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN); 
    83106         
    84107        m_list.Attach(GetDlgItem(IDC_TRACKERLIST));      
     
    208231        ::EnableWindow(GetDlgItem(IDC_TRACKER_APPLY), false); 
    209232} 
     233 
  • src/advtabs/Tracker.hpp

    r268 r314  
    44//    (See accompanying file LICENSE_1_0.txt or copy at 
    55//          http://www.boost.org/LICENSE_1_0.txt) 
     6 
     7#define IDC_TRACKER_LABEL       100001 
     8 
     9#ifndef RC_INVOKED 
    610 
    711#pragma once 
     
    2024class AdvTrackerDialog : 
    2125        public CHalTabPageImpl<AdvTrackerDialog>, 
    22         public CDialogResize<AdvTrackerDialog>, 
     26        public CAutoSizeWindow<AdvTrackerDialog, false>, 
    2327        public CHaliteDialogBase<AdvTrackerDialog>, 
    2428        public CWinDataExchangeEx<AdvTrackerDialog> 
     
    2630protected: 
    2731        typedef AdvTrackerDialog thisClass; 
    28         typedef CHalTabPageImpl<AdvTrackerDialog> baseClass; 
    29         typedef CDialogResize<AdvTrackerDialog> resizeClass; 
    30         typedef CHaliteDialogBase<AdvTrackerDialog> dialogBaseClass; 
     32        typedef CHalTabPageImpl<thisClass> baseClass; 
     33        typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     34        typedef CHaliteDialogBase<thisClass> dialogBaseClass; 
    3135 
    3236public: 
     
    5660                        if (PreTranslateMessage((LPMSG)lParam)) return TRUE; 
    5761 
    58                 CHAIN_MSG_MAP(resizeClass) 
     62                CHAIN_MSG_MAP(autosizeClass) 
    5963                CHAIN_MSG_MAP(baseClass) 
    6064                REFLECT_NOTIFICATIONS() 
     
    6569                DDX_EX_STDWSTRING(IDC_TRACKER_PASS, password_); 
    6670    END_DDX_MAP() 
     71         
     72        static CWindowMapStruct* GetWindowMap(); 
    6773 
    68         BEGIN_DLGRESIZE_MAP(thisClass) 
    69                 DLGRESIZE_CONTROL(IDC_TRACKERLIST, DLSZ_SIZE_X|DLSZ_SIZE_Y) 
    70                 DLGRESIZE_CONTROL(IDC_TRACKER_RESET, DLSZ_MOVE_X) 
    71                 DLGRESIZE_CONTROL(IDC_TRACKER_APPLY, DLSZ_MOVE_X) 
    72  
    73                 DLGRESIZE_CONTROL(IDC_TRACKER_LOGINCHECK, DLSZ_MOVE_X) 
    74                 DLGRESIZE_CONTROL(IDC_TRACKER_USER_S, DLSZ_MOVE_X) 
    75                 DLGRESIZE_CONTROL(IDC_TRACKER_USER, DLSZ_MOVE_X) 
    76                 DLGRESIZE_CONTROL(IDC_TRACKER_PASS_S, DLSZ_MOVE_X) 
    77                 DLGRESIZE_CONTROL(IDC_TRACKER_PASS, DLSZ_MOVE_X) 
    78                 DLGRESIZE_CONTROL(BTNREANNOUNCE, DLSZ_MOVE_X) 
    79         END_DLGRESIZE_MAP() 
    8074 
    8175        LRESULT onInitDialog(HWND, LPARAM); 
     
    10094        wstring password_; 
    10195}; 
     96 
     97#endif // RC_INVOKED 
  • src/halTorrent.cpp

    r311 r314  
    66 
    77 
    8 #define HALITE_VERSION                                  0,2,9,310 
    9 #define HALITE_VERSION_STRING                   "v 0.2.9 dev 310" 
     8#define HALITE_VERSION                                  0,2,9,313 
     9#define HALITE_VERSION_STRING                   "v 0.2.9 dev 313" 
    1010 
    1111#define LBT_EVENT_TORRENT_FINISHED                                      80001 
     
    2222#define HAL_BLOCK_FINISHED_ALERT                                        80012 
    2323#define HAL_BLOCK_DOWNLOADING_ALERT                                     80013 
     24#define HAL_LISTEN_SUCCEEDED_ALERT                                      80014 
     25#define HAL_LISTEN_FAILED_ALERT                                         80015 
     26#define HAL_IPFILTER_ALERT                                                      80016 
    2427 
    2528#ifndef RC_INVOKED 
     
    6164#include <boost/algorithm/string/find.hpp> 
    6265 
     66#define TORRENT_MAX_ALERT_TYPES 20 
     67 
    6368#include <libtorrent/file.hpp> 
    6469#include <libtorrent/hasher.hpp> 
     
    476481                } 
    477482                 
     483                void operator()(lbt::listen_failed_alert const& a) const 
     484                { 
     485                        event().post(shared_ptr<EventDetail>( 
     486                                new EventGeneral(Event::info, a.timestamp(), 
     487                                        wformat(hal::app().res_wstr(HAL_LISTEN_FAILED_ALERT)) 
     488                                                % hal::from_utf8_safe(a.msg())) 
     489                        )       );                               
     490                } 
     491                 
     492                void operator()(lbt::listen_succeeded_alert const& a) const 
     493                { 
     494                        event().post(shared_ptr<EventDetail>( 
     495                                new EventGeneral(Event::info, a.timestamp(), 
     496                                        wformat(hal::app().res_wstr(HAL_LISTEN_SUCCEEDED_ALERT)) 
     497                                                % hal::from_utf8_safe(a.msg())) 
     498                        )       );                               
     499                } 
     500                 
     501                void operator()(lbt::peer_blocked_alert const& a) const 
     502                { 
     503                        event().post(shared_ptr<EventDetail>( 
     504                                new EventGeneral(Event::debug, a.timestamp(), 
     505                                        wformat(hal::app().res_wstr(HAL_IPFILTER_ALERT)) 
     506                                                % hal::from_utf8_safe(a.ip.to_string()) 
     507                                                % hal::from_utf8_safe(a.msg())) 
     508                        )       );                               
     509                } 
     510                 
    478511                void operator()(lbt::alert const& a) const 
    479512                { 
     
    513546                                lbt::block_finished_alert, 
    514547                                lbt::block_downloading_alert, 
     548                                lbt::listen_failed_alert, 
     549                                lbt::listen_succeeded_alert, 
     550                                lbt::peer_blocked_alert, 
    515551                                lbt::alert 
    516552                        >::handle_alert(p_alert, handler);                       
Note: See TracChangeset for help on using the changeset viewer.