From 8b921e36503f42b8e0633215219c089d25463fae Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Wed, 2 Mar 2011 15:08:26 +0000 Subject: [PATCH] - 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. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40777 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/processcontroller/KernelMemoryBarMenuItem.cpp | 4 ++-- src/apps/processcontroller/MemoryBarMenu.cpp | 2 +- src/apps/processcontroller/MemoryBarMenuItem.cpp | 4 ++-- src/apps/processcontroller/ProcessController.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp index 1ba76c41cd..7ea1cb2d1f 100644 --- a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp +++ b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp @@ -153,12 +153,12 @@ KernelMemoryBarMenuItem::DrawBar(bool force) 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; diff --git a/src/apps/processcontroller/MemoryBarMenu.cpp b/src/apps/processcontroller/MemoryBarMenu.cpp index d60b5c8330..704c6695a8 100644 --- a/src/apps/processcontroller/MemoryBarMenu.cpp +++ b/src/apps/processcontroller/MemoryBarMenu.cpp @@ -57,7 +57,7 @@ MemoryBarMenu::MemoryBarMenu(const char* name, info_pack* infos, system_info& sy 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); diff --git a/src/apps/processcontroller/MemoryBarMenuItem.cpp b/src/apps/processcontroller/MemoryBarMenuItem.cpp index bf91645524..1e54aa69f0 100644 --- a/src/apps/processcontroller/MemoryBarMenuItem.cpp +++ b/src/apps/processcontroller/MemoryBarMenuItem.cpp @@ -214,13 +214,13 @@ MemoryBarMenuItem::DrawBar(bool force) 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); } diff --git a/src/apps/processcontroller/ProcessController.cpp b/src/apps/processcontroller/ProcessController.cpp index 3d3c623387..0439939262 100644 --- a/src/apps/processcontroller/ProcessController.cpp +++ b/src/apps/processcontroller/ProcessController.cpp @@ -670,7 +670,7 @@ thread_popup(void *arg) } } - 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