Changeset 2730

Show
Ignore:
Timestamp:
06/14/08 22:44:02 (7 months ago)
Author:
edmanm
Message:

Default to the language chosen by the user during install (Windows-only) rather
than the system language. (Ticket #246)

Location:
vidalia/trunk/pkg/win32
Files:
18 modified

Legend:

Unmodified
Added
Removed

  • vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in

    r2725 r2730  
    195195      Pop $R0 ; contains the modified version of $INSTDIR 
    196196      WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}" 
     197      WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General LanguageCode "$(LanguageCode)" 
    197198 
    198199      ; Write the uninstall keys for Windows   

  • vidalia/trunk/pkg/win32/vidalia.nsi.in

    r2725 r2730  
    153153  SetOutPath "$APPDATA\Vidalia" 
    154154  File "@CMAKE_CURRENT_SOURCE_DIR@\geoip-cache" 
     155   
     156  ; Save the chosen language code 
     157  WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General LanguageCode "$(LanguageCode)" 
    155158 
    156159  ; Write the uninstall keys for Windows 

  • vidalia/trunk/pkg/win32/vidalia_cs.nsh

    r2668 r2730  
    5757LangString AppData                    ${LANG_CZECH} "Application Data" 
    5858LangString AppDataUninstDesc          ${LANG_CZECH} "Remove saved application data and configuration files." 
     59LangString LanguageCode               ${LANG_CZECH} "cz" 

  • vidalia/trunk/pkg/win32/vidalia_de.nsh

    r2668 r2730  
    5555LangString AppData                    ${LANG_GERMAN} "Anwendungsdaten" 
    5656LangString AppDataUninstDesc          ${LANG_GERMAN} "Entferne gespeicherte Anwendungsdaten und Konfigurationsdateien." 
     57LangString LanguageCode               ${LANG_GERMAN} "de" 

  • vidalia/trunk/pkg/win32/vidalia_en.nsh

    r2668 r2730  
    7777LangString AppData                    ${LANG_ENGLISH} "Application Data" 
    7878LangString AppDataUninstDesc          ${LANG_ENGLISH} "Remove saved application data and configuration files." 
    79  
     79LangString LanguageCode               ${LANG_ENGLISH} "en" 

  • vidalia/trunk/pkg/win32/vidalia_es.nsh

    r2668 r2730  
    5555LangString AppData                    ${LANG_SPANISH} "Application Data" 
    5656LangString AppDataUninstDesc          ${LANG_SPANISH} "Remove saved application data and configuration files." 
     57LangString LanguageCode               ${LANG_SPANISH} "es" 

  • vidalia/trunk/pkg/win32/vidalia_fa.nsh

    r2668 r2730  
    5656LangString AppData                    ${LANG_FARSI} "Application Data" 
    5757LangString AppDataUninstDesc          ${LANG_FARSI} "Remove saved application data and configuration files." 
     58LangString LanguageCode               ${LANG_FARSI} "fa" 

  • vidalia/trunk/pkg/win32/vidalia_fi.nsh

    r2672 r2730  
    5959LangString AppData                    ${LANG_FINNISH} "Ohjelmatiedot" 
    6060LangString AppDataUninstDesc          ${LANG_FINNISH} "Poista tallennetut ohjelmatiedot ja asetustiedostot." 
     61LangString LanguageCode               ${LANG_FINNISH} "fi" 

  • vidalia/trunk/pkg/win32/vidalia_fr.nsh

    r2668 r2730  
    5757LangString AppData                    ${LANG_FRENCH} "Application Data" 
    5858LangString AppDataUninstDesc          ${LANG_FRENCH} "Remove saved application data and configuration files." 
     59LangString LanguageCode               ${LANG_FRENCH} "fr" 

  • vidalia/trunk/pkg/win32/vidalia_he.nsh

    r2668 r2730  
    6161LangString AppData                    ${LANG_HEBREW} "���" 
    6262LangString AppDataUninstDesc          ${LANG_HEBREW} "� ��� ����� 
    63  
     63LangString LanguageCode               ${LANG_HEBREW} "he" 

  • vidalia/trunk/pkg/win32/vidalia_it.nsh

    r2668 r2730  
    6060LangString AppData                    ${LANG_ITALIAN} "Application Data" 
    6161LangString AppDataUninstDesc          ${LANG_ITALIAN} "Remove saved application data and configuration files." 
     62LangString LanguageCode               ${LANG_ITALIAN} "it" 

  • vidalia/trunk/pkg/win32/vidalia_nl.nsh

    r2668 r2730  
    5656LangString AppData                    ${LANG_DUTCH} "Application Data" 
    5757LangString AppDataUninstDesc          ${LANG_DUTCH} "Remove saved application data and configuration files." 
     58LangString LanguageCode               ${LANG_DUTCH} "nl" 

  • vidalia/trunk/pkg/win32/vidalia_pl.nsh

    r2668 r2730  
    5757LangString AppData                    ${LANG_POLISH} "Dane Aplikacji" 
    5858LangString AppDataUninstDesc          ${LANG_POLISH} "Usu�zystkie dane aplikacji i pliki konfiguracyjne." 
     59LangString LanguageCode               ${LANG_POLISH} "pl" 

  • vidalia/trunk/pkg/win32/vidalia_pt-br.nsh

    r2668 r2730  
    5757LangString AppData                    ${LANG_PORTUGUESEBR} "Application Data" 
    5858LangString AppDataUninstDesc          ${LANG_PORTUGUESEBR} "Remove saved application data and configuration files." 
     59LangString LanguageCode               ${LANG_PORTUGUESEBR} "pt-br" 

  • vidalia/trunk/pkg/win32/vidalia_ru.nsh

    r2668 r2730  
    5757LangString AppData                    ${LANG_RUSSIAN} "Application Data" 
    5858LangString AppDataUninstDesc          ${LANG_RUSSIAN} "������������� 
     59LangString LanguageCode               ${LANG_RUSSIAN} "ru" 

  • vidalia/trunk/pkg/win32/vidalia_sv.nsh

    r2668 r2730  
    5757LangString AppData                    ${LANG_SWEDISH} "Application Data" 
    5858LangString AppDataUninstDesc          ${LANG_SWEDISH} "Remove saved application data and configuration files." 
     59LangString LanguageCode               ${LANG_SWEDISH} "svn" 

  • vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh

    r2668 r2730  
    5353LangString AppData                    ${LANG_SIMPCHINESE} "Application Data" 
    5454LangString AppDataUninstDesc          ${LANG_SIMPCHINESE} "Remove saved application data and configuration files." 
     55LangString LanguageCode               ${LANG_SIMPCHINESE} "zh-cn" 

  • vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh

    r2668 r2730  
    5555LangString AppData                    ${LANG_TRADCHINESE} "Application Data" 
    5656LangString AppDataUninstDesc          ${LANG_TRADCHINESE} "Remove saved application data and configuration files." 
     57LangString LanguageCode               ${LANG_TRADCHINESE} "zh-tw" 
    5758