Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginDictionary.cpp

Issue 10800100: Show better instructions to IE9+ users (Closed)
Patch Set: Only one message Created June 7, 2013, 9:16 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « files/dictionary_w.ini ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 right click the title or menu bar and enable the status bar.";
Wladimir Palant 2013/06/07 13:17:08 I would change the order: menu first, then title.
267 m_dictionary["ERROR_CAN_NOT_ENABLE_STATUS_BAR_TITLE"] = "Please enable sta tus bar"; 267 m_dictionary["ERROR_CAN_NOT_ENABLE_STATUS_BAR_TITLE"] = "Please enable the status bar";
268
268 269
269 #endif 270 #endif
270 // General texts 271 // General texts
271 m_dictionary["GENERAL_YES"] = "Yes"; 272 m_dictionary["GENERAL_YES"] = "Yes";
272 m_dictionary["GENERAL_NO"] = "No"; 273 m_dictionary["GENERAL_NO"] = "No";
273 m_dictionary["GENERAL_CANCEL"] = "Cancel"; 274 m_dictionary["GENERAL_CANCEL"] = "Cancel";
274 m_dictionary["GENERAL_CLOSE"] = "Close"; 275 m_dictionary["GENERAL_CLOSE"] = "Close";
275 276
276 iniFile.UpdateSection("en", m_dictionary); 277 iniFile.UpdateSection("en", m_dictionary);
277 } 278 }
278 s_criticalSectionDictionary.Unlock(); 279 s_criticalSectionDictionary.Unlock();
279 280
280 if (iniFile.Write()) 281 if (iniFile.Write())
281 { 282 {
282 CPluginSettings* settings = CPluginSettings::GetInstance(); 283 CPluginSettings* settings = CPluginSettings::GetInstance();
283 284
284 settings->SetValue(SETTING_DICTIONARY_VERSION, dictionaryVersion); 285 settings->SetValue(SETTING_DICTIONARY_VERSION, dictionaryVersion);
285 settings->Write(); 286 settings->Write();
286 } 287 }
287 else 288 else
288 { 289 {
289 DEBUG_ERROR_LOG(iniFile.GetLastError(), PLUGIN_ERROR_DICTIONARY, PLUGIN_ER ROR_DICTIONARY_CREATE_FILE, L"Dictionary::Create - Write") 290 DEBUG_ERROR_LOG(iniFile.GetLastError(), PLUGIN_ERROR_DICTIONARY, PLUGIN_ER ROR_DICTIONARY_CREATE_FILE, L"Dictionary::Create - Write")
290 } 291 }
291 #ifdef PRODUCT_ADBLOCKPLUS 292 #ifdef PRODUCT_ADBLOCKPLUS
292 // Delete old 293 // Delete old
293 ::DeleteFile(CPluginSettings::GetDataPath(L"dictionary.ini")); 294 ::DeleteFile(CPluginSettings::GetDataPath(L"dictionary.ini"));
294 #endif 295 #endif
295 } 296 }
296 } 297 }
OLDNEW
« no previous file with comments | « files/dictionary_w.ini ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld