| OLD | NEW | 
|---|
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" | 
| 2 | 2 | 
| 3 #include "PluginDictionary.h" | 3 #include "PluginDictionary.h" | 
| 4 #include "PluginClient.h" | 4 #include "PluginClient.h" | 
| 5 #include "PluginSettings.h" | 5 #include "PluginSettings.h" | 
| 6 #include "PluginMutex.h" | 6 #include "PluginMutex.h" | 
| 7 | 7 | 
| 8 | 8 | 
| 9 class CPluginDictionaryLock : public CPluginMutex | 9 class CPluginDictionaryLock : public CPluginMutex | 
| 10 { | 10 { | 
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 254       m_dictionary["UPDATE_DO_YOU_WISH_TO_DOWNLOAD"] = "Do you wish to download 
     it now?"; | 254       m_dictionary["UPDATE_DO_YOU_WISH_TO_DOWNLOAD"] = "Do you wish to download 
     it now?"; | 
| 255 | 255 | 
| 256       // Download update dialog | 256       // Download update dialog | 
| 257       m_dictionary["DOWNLOAD_UPDATE_TITLE"] = "Download Adblock Plus"; | 257       m_dictionary["DOWNLOAD_UPDATE_TITLE"] = "Download Adblock Plus"; | 
| 258       m_dictionary["DOWNLOAD_UPDATE_BUTTON"] = "Update"; | 258       m_dictionary["DOWNLOAD_UPDATE_BUTTON"] = "Update"; | 
| 259       m_dictionary["DOWNLOAD_PLEASE_WAIT"] = "Please wait..."; | 259       m_dictionary["DOWNLOAD_PLEASE_WAIT"] = "Please wait..."; | 
| 260       m_dictionary["DOWNLOAD_UPDATE_ERROR_TEXT"] = "Error downloading installer"
     ; | 260       m_dictionary["DOWNLOAD_UPDATE_ERROR_TEXT"] = "Error downloading installer"
     ; | 
| 261       m_dictionary["DOWNLOAD_UPDATE_SUCCESS_TEXT"] = "If you choose to update Ad
     block Plus, your Internet Explorer will close before installation"; | 261       m_dictionary["DOWNLOAD_UPDATE_SUCCESS_TEXT"] = "If you choose to update Ad
     block Plus, your Internet Explorer will close before installation"; | 
| 262 | 262 | 
| 263       // Various dialogs | 263       // Various dialogs | 
| 264       m_dictionary["ERROR_STATUS_BAR_DISABLED"] = "The plugin menu is located in
      the statusbar, would you like to enable Internet Explorer's statusbar?"; | 264       m_dictionary["ERROR_STATUS_BAR_DISABLED"] = "The Adblock Plus menu is loca
     ted in the status bar, would you like to enable it?"; | 
| 265       m_dictionary["ERROR_STATUS_BAR_DISABLED_TITLE"] = "Enable status bar?"; | 265       m_dictionary["ERROR_STATUS_BAR_DISABLED_TITLE"] = "Enable status bar?"; | 
| 266       m_dictionary["ERROR_CAN_NOT_ENABLE_STATUS_BAR"] = "The plugin menu is loca
     ted in the statusbar. Please enable it under View->Toolbars->Status bar"; | 266       m_dictionary["ERROR_CAN_NOT_ENABLE_STATUS_BAR"] = "The Adblock Plus menu i
     s located in the status bar. Please enable it under View->Toolbars->Status bar"; | 
| 267       m_dictionary["ERROR_CAN_NOT_ENABLE_STATUS_BAR_TITLE"] = "Please enable sta
     tus bar"; | 267       m_dictionary["ERROR_CAN_NOT_ENABLE_STATUS_BAR_IE9"] = "The Adblock Plus me
     nu is located in the status bar. Please enable it by right clicking the title ba
     r and selecting \"Status bar\""; | 
|  | 268       m_dictionary["ERROR_CAN_NOT_ENABLE_STATUS_BAR_TITLE"] = "Please enable the
      status bar"; | 
|  | 269 | 
| 268 | 270 | 
| 269 #endif | 271 #endif | 
| 270       // General texts | 272       // General texts | 
| 271       m_dictionary["GENERAL_YES"] = "Yes"; | 273       m_dictionary["GENERAL_YES"] = "Yes"; | 
| 272       m_dictionary["GENERAL_NO"] = "No"; | 274       m_dictionary["GENERAL_NO"] = "No"; | 
| 273       m_dictionary["GENERAL_CANCEL"] = "Cancel"; | 275       m_dictionary["GENERAL_CANCEL"] = "Cancel"; | 
| 274       m_dictionary["GENERAL_CLOSE"] = "Close"; | 276       m_dictionary["GENERAL_CLOSE"] = "Close"; | 
| 275 | 277 | 
| 276       iniFile.UpdateSection("en", m_dictionary); | 278       iniFile.UpdateSection("en", m_dictionary); | 
| 277     } | 279     } | 
| 278     s_criticalSectionDictionary.Unlock(); | 280     s_criticalSectionDictionary.Unlock(); | 
| 279 | 281 | 
| 280     if (iniFile.Write()) | 282     if (iniFile.Write()) | 
| 281     { | 283     { | 
| 282       CPluginSettings* settings = CPluginSettings::GetInstance(); | 284       CPluginSettings* settings = CPluginSettings::GetInstance(); | 
| 283 | 285 | 
| 284       settings->SetValue(SETTING_DICTIONARY_VERSION, dictionaryVersion); | 286       settings->SetValue(SETTING_DICTIONARY_VERSION, dictionaryVersion); | 
| 285       settings->Write(); | 287       settings->Write(); | 
| 286     } | 288     } | 
| 287     else | 289     else | 
| 288     { | 290     { | 
| 289       DEBUG_ERROR_LOG(iniFile.GetLastError(), PLUGIN_ERROR_DICTIONARY, PLUGIN_ER
     ROR_DICTIONARY_CREATE_FILE, L"Dictionary::Create - Write") | 291       DEBUG_ERROR_LOG(iniFile.GetLastError(), PLUGIN_ERROR_DICTIONARY, PLUGIN_ER
     ROR_DICTIONARY_CREATE_FILE, L"Dictionary::Create - Write") | 
| 290     } | 292     } | 
| 291 #ifdef PRODUCT_ADBLOCKPLUS | 293 #ifdef PRODUCT_ADBLOCKPLUS | 
| 292     // Delete old | 294     // Delete old | 
| 293     ::DeleteFile(CPluginSettings::GetDataPath(L"dictionary.ini")); | 295     ::DeleteFile(CPluginSettings::GetDataPath(L"dictionary.ini")); | 
| 294 #endif | 296 #endif | 
| 295   } | 297   } | 
| 296 } | 298 } | 
| OLD | NEW | 
|---|