Author: siarzhuk Date: 2011-03-02 16:08:26 +0100 (Wed, 02 Mar 2011) New Revision: 40777 Changeset: http://dev.haiku-os.org/changeset/40777 Modified: haiku/trunk/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp haiku/trunk/src/apps/processcontroller/MemoryBarMenu.cpp haiku/trunk/src/apps/processcontroller/MemoryBarMenuItem.cpp haiku/trunk/src/apps/processcontroller/ProcessController.cpp Log: - Localization of the global popup menu name is removed as invidible to the end-user; - In consistency with other applications, following units were replaced: MB -> MiB, KB -> KiB; Pointed out by Jean-Loic Charroud. Thanks. Modified: haiku/trunk/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp =================================================================== --- haiku/trunk/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp 2011-03-02 11:17:19 UTC (rev 40776) +++ haiku/trunk/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp 2011-03-02 15:08:26 UTC (rev 40777) @@ -153,12 +153,12 @@ char infos[128]; snprintf(infos, sizeof(infos), - B_TRANSLATE("%.1f MB"), fCachedMemory / 1024.f); + B_TRANSLATE("%.1f MiB"), fCachedMemory / 1024.f); BPoint loc(cadre.left, cadre.bottom + 1); loc.x -= kMargin + gMemoryTextWidth / 2 + menu->StringWidth(infos); menu->DrawString(infos, loc); snprintf(infos, sizeof(infos), - B_TRANSLATE("%.1f MB"), fCommittedMemory / 1024.f); + B_TRANSLATE("%.1f MiB"), fCommittedMemory / 1024.f); loc.x = cadre.left - kMargin - menu->StringWidth(infos); menu->DrawString(infos, loc); fLastSum = sum; Modified: haiku/trunk/src/apps/processcontroller/MemoryBarMenu.cpp =================================================================== --- haiku/trunk/src/apps/processcontroller/MemoryBarMenu.cpp 2011-03-02 11:17:19 UTC (rev 40776) +++ haiku/trunk/src/apps/processcontroller/MemoryBarMenu.cpp 2011-03-02 15:08:26 UTC (rev 40777) @@ -57,7 +57,7 @@ fTeamList[k++] = -1; } - gMemoryTextWidth = 2 * StringWidth(B_TRANSLATE("99999 KB")) + 20; + gMemoryTextWidth = 2 * StringWidth(B_TRANSLATE("99999 KiB")) + 20; fRecycleCount = EXTRA; fRecycleList = (MRecycleItem*)malloc(sizeof(MRecycleItem) * fRecycleCount); Modified: haiku/trunk/src/apps/processcontroller/MemoryBarMenuItem.cpp =================================================================== --- haiku/trunk/src/apps/processcontroller/MemoryBarMenuItem.cpp 2011-03-02 11:17:19 UTC (rev 40776) +++ haiku/trunk/src/apps/processcontroller/MemoryBarMenuItem.cpp 2011-03-02 15:08:26 UTC (rev 40777) @@ -214,13 +214,13 @@ menu->SetHighColor(kBlack); char infos[128]; - snprintf(infos, sizeof(infos), B_TRANSLATE("%d KB"), fWriteMemory); + snprintf(infos, sizeof(infos), B_TRANSLATE("%d KiB"), fWriteMemory); BPoint loc(rect.left - kMargin - gMemoryTextWidth / 2 - menu->StringWidth(infos), rect.bottom + 1); menu->DrawString(infos, loc); - snprintf(infos, sizeof(infos), B_TRANSLATE("%d KB"), fAllMemory); + snprintf(infos, sizeof(infos), B_TRANSLATE("%d KiB"), fAllMemory); loc.x = rect.left - kMargin - menu->StringWidth(infos); menu->DrawString(infos, loc); } Modified: haiku/trunk/src/apps/processcontroller/ProcessController.cpp =================================================================== --- haiku/trunk/src/apps/processcontroller/ProcessController.cpp 2011-03-02 11:17:19 UTC (rev 40776) +++ haiku/trunk/src/apps/processcontroller/ProcessController.cpp 2011-03-02 15:08:26 UTC (rev 40777) @@ -670,7 +670,7 @@ } } - BPopUpMenu* popup = new BPopUpMenu(B_TRANSLATE("Global Popup"), false, false); + BPopUpMenu* popup = new BPopUpMenu("Global Popup", false, false); popup->SetFont(be_plain_font); // Quit section