Changeset 452 for trunk


Ignore:
Timestamp:
05/19/08 10:53:51 (12 years ago)
Author:
Eoin
Message:

Update libtorrent fixed +4GB bug.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/lang/Japanese.txt

    r444 r452  
    1313"(D-U) 0000.000KB/s - 0000.000KB/s" --->  ???  
    1414"(DHT will not apply to private torrents)" --->  ???  
    15 "About" ---> "Haliteに぀いお" 
     15"About" --->  ???  
    1616"Above Normal" ---> "普通" 
    1717"Active" --->  ???  
     
    195195"Ratio:" ---> "å 
    196196±æœ‰æ¯”:" 
    197 "Reannounce" --->  ???  
     197"Reannounce" ---> "Reannounce" 
    198198"Recheck Files" --->  ???  
    199199"Remaining" --->  ???  
     
    205205"Resume" --->  ???  
    206206"Review settings when adding torrent." --->  ???  
    207 "Save" ---> "" 
     207"Save" --->  ???  
    208208"Saving Torrent" --->  ???  
    209209"Security" ---> "セキュリティ" 
  • trunk/lang/Portuguese.txt

    r444 r452  
    9292"Enter any Web Seed URLs and DHT Nodes." --->  ???  
    9393"Enter the tracker URLs for the torrent." ---> "Digite os endereços (URL) dos rastreadores para o torrent." 
    94 "Exception caught: %1%, from %2%." ---> "Exceção detectada: %1%, do %2%." 
     94"Exception caught: %1%, from %2%." --->  ???  
    9595"Failed, %1%" --->  ???  
    9696"Fast resume failed: %2%. (%1%)" --->  ???  
     
    192192"Ratio" --->  ???  
    193193"Ratio:" ---> "Razão:" 
    194 "Reannounce" --->  ???  
     194"Reannounce" ---> "Reanunciar" 
    195195"Recheck Files" --->  ???  
    196196"Remaining" --->  ???  
     
    202202"Resume" ---> "Continuar" 
    203203"Review settings when adding torrent." --->  ???  
    204 "Save" ---> "Salvar" 
     204"Save" --->  ???  
    205205"Saving Torrent" --->  ???  
    206206"Security" ---> "Segurança" 
     
    241241"Torrent %1% finished." --->  ???  
    242242"Torrent %1% paused." --->  ???  
    243 "Torrent (%1%) exception caught: %2% from %3%." ---> "Torrent (%1%) exceção detectada: %2% do %3%." 
     243"Torrent (%1%) exception caught: %2% from %3%." --->  ???  
    244244"Torrent Defaults" ---> "Padrão para os Torrents" 
    245245"Torrent File" ---> "Arquivo .torrent" 
     
    253253"Torrents" --->  ???  
    254254"Total max connections :" ---> "Total de conexões máximas :" 
    255 "Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." ---> "Transferência total incluindo gasto: %1$.2fMB baixado e %2$.2fMB upado." 
     255"Total transfer including protocol overhead: %1$.2fMB down and %2$.2fMB up." --->  ???  
    256256"Total upload slots :" ---> "Total de slots para upload :" 
    257257"Total" ---> "Total" 
  • trunk/sln/HalWiX/HalWiX.wixproj

    r382 r452  
    2222            /> 
    2323        </Configurations> 
    24         <WixlibReferences /> 
     24        <WixlibReferences> 
     25            <WixlibReference 
     26                RelativePath="..\..\..\..\..\..\..\Program%20Files%20(x86)\Windows%20Installer%20XML\bin\sca.wixlib" 
     27            /> 
     28            <WixlibReference 
     29                RelativePath="..\..\..\..\..\..\..\Program%20Files%20(x86)\Windows%20Installer%20XML\bin\wixca.wixlib" 
     30            /> 
     31            <WixlibReference 
     32                RelativePath="..\..\..\..\..\..\..\Program%20Files%20(x86)\Windows%20Installer%20XML\bin\WixUI.wixlib" 
     33            /> 
     34        </WixlibReferences> 
    2535        <Files> 
    2636            <File 
  • trunk/sln/HalWiX/Product.wxs

    r385 r452  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> 
    3 <Product Id="E3A8BF7D-962F-476E-886B-FECEDD2F0FC7" Name="Halite BitTorrent Client" Language="1033" Version="0.3.0.3" Manufacturer="BinaryNotions.com"> 
    4     <Package Id="????????-????-????-????-????????????" Description="Description of your product" Comments="This will appear in the file summary stream." InstallerVersion="200" Compressed="yes" /> 
     3  <Product Id="E3A8BF7D-962F-476E-886B-FECEDD2F0FC7" Name="Halite BitTorrent Client" 
     4           Language="1033" Version="0.3.0.3" Manufacturer="BinaryNotions.com"> 
     5    <Package Id="????????-????-????-????-????????????" Description="Description of your product" 
     6             Comments="This will appear in the file summary stream." InstallerVersion="200" Compressed="yes" /> 
    57 
    68    <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" /> 
     
    810    <Directory Id="TARGETDIR" Name="SourceDir"> 
    911 
    10         <Directory Id="ProgramFilesFolder"> 
    11             <Directory Id="INSTALLDIR" Name="Halite"> 
     12      <Directory Id="ProgramFilesFolder"> 
     13        <Directory Id="INSTALLDIR" Name="Halite"> 
    1214 
    13                 <Component Id='HaliteBinary' Guid='E3A8BF7D-962F-476E-886B-FECEDD2F0FC7'> 
    14                      
    15                     <File Id='MAINEXE' Name='Halite.exe' LongName='Halite.exe' DiskId='1' 
    16                             Source='..\..\Release\Halite.exe' Vital='yes'> 
    17                         <Shortcut Id="STARTMENUSCUT" Directory="ProgramMenuDir" Name="Halite10" 
    18                                 LongName="Halite 1.0" WorkingDirectory='INSTALLDIR' 
    19                                 Icon="Halite10.exe" IconIndex="0" /> 
    20                         <Shortcut Id="DESKTOPSCUT" Directory="DesktopFolder" Name="Halite10" 
    21                                 LongName="Halite 1.0" WorkingDirectory='INSTALLDIR' 
    22                                 Icon="Halite10.exe" IconIndex="0" /> 
    23                     </File> 
    24                      
    25                 </Component> 
    26                  
    27             </Directory> 
     15          <Component Id='HaliteBinary' Guid='E3A8BF7D-962F-476E-886B-FECEDD2F0FC7'> 
     16 
     17            <File Id='HaliteExe' Name='Halite.exe' DiskId='1' 
     18                    Source='..\..\Release\Halite.exe' Vital='yes'> 
     19              <Shortcut Id="STARTMENUSCUT" Directory="ProgramMenuDir" Name="Halite" 
     20                      LongName="Halite" WorkingDirectory='INSTALLDIR' 
     21                      Icon="HaliteIcon" IconIndex="0" /> 
     22              <Shortcut Id="DESKTOPSCUT" Directory="DesktopFolder" Name="Halite10" 
     23                      LongName="Halite" WorkingDirectory='INSTALLDIR' 
     24                      Icon="HaliteIcon" IconIndex="0" /> 
     25            </File> 
     26 
     27          </Component> 
     28 
    2829        </Directory> 
     30      </Directory> 
    2931 
    30         <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs"> 
    31             <Directory Id="ProgramMenuDir" Name='Halite' LongName="Halite 1.0" /> 
    32         </Directory> 
     32      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs"> 
     33        <Directory Id="ProgramMenuDir" Name='Halite' /> 
     34      </Directory> 
    3335 
    34         <Directory Id="DesktopFolder" Name="Desktop" /> 
     36      <Directory Id="DesktopFolder" Name="Desktop" /> 
    3537    </Directory> 
    36      
     38 
    3739    <Feature Id='Complete' Level='1'> 
    38         <ComponentRef Id='HaliteBinary' /> 
     40      <ComponentRef Id='HaliteBinary' /> 
    3941    </Feature> 
    40      
    41     <Icon Id="Halite10.exe" SourceFile='..\..\Release\Halite.exe' /> 
     42 
     43    <Icon Id="HaliteIcon" SourceFile='..\..\Release\Halite.exe' /> 
     44    <UIRef Id="WixUI_Mondo" /> 
     45    <UIRef Id="WixUI_ErrorProgressText" /> 
    4246 
    4347</Product> 
  • trunk/src/advtabs/Files.cpp

    r447 r452  
    2222        wstring column_names = hal::app().res_wstr(LISTVIEW_ID_COLUMNNAMES); 
    2323 
    24         // "Filename;Path;Size;Progress;Priority" 
    2524        boost::split(names, column_names, boost::is_any_of(L";")); 
    2625         
  • trunk/src/halTorrentInternal.hpp

    r447 r452  
    16481648        }        
    16491649         
    1650         boost::tuple<size_t, size_t, size_t, size_t> connections = updatePeers();                
     1650        boost::tuple<size_t, size_t, size_t, size_t> connections = updatePeers();        
     1651 
     1652        wstring wanted = lexical_cast<wstring>(statusMemory_.total_wanted); 
     1653        HAL_DEV_MSG(wformat(L"**** wanted: %1%") % wanted);      
    16511654 
    16521655        return TorrentDetail_ptr(new TorrentDetail(name_, filename_, saveDirectory().string(), state, hal::from_utf8(statusMemory_.current_tracker),  
Note: See TracChangeset for help on using the changeset viewer.