From 71719dc6bd76b25390fddb6c9db5a977725f64e1 Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Tue, 19 Feb 2008 21:31:09 +0000 Subject: [PATCH] Okokok, I dont know why someone should feel the urge to translate MB, KB, and GB (Except specific languages...), but here they are. svn path=/trunk/; revision=32427 --- reactos/base/setup/usetup/interface/usetup.c | 22 ++++++++++---------- reactos/base/setup/usetup/lang/bg-BG.h | 6 ++++++ reactos/base/setup/usetup/lang/de-DE.h | 6 ++++++ reactos/base/setup/usetup/lang/el-GR.h | 6 ++++++ reactos/base/setup/usetup/lang/en-US.h | 6 ++++++ reactos/base/setup/usetup/lang/es-ES.h | 6 ++++++ reactos/base/setup/usetup/lang/fr-FR.h | 6 ++++++ reactos/base/setup/usetup/lang/it-IT.h | 6 ++++++ reactos/base/setup/usetup/lang/lt-LT.h | 6 ++++++ reactos/base/setup/usetup/lang/pl-PL.h | 6 ++++++ reactos/base/setup/usetup/lang/ru-RU.h | 6 ++++++ reactos/base/setup/usetup/lang/sk-SK.h | 6 ++++++ reactos/base/setup/usetup/lang/sv-SE.h | 6 ++++++ reactos/base/setup/usetup/lang/uk-UA.h | 6 ++++++ reactos/base/setup/usetup/mui.h | 3 +++ reactos/base/setup/usetup/partlist.c | 16 +++++++------- 16 files changed, 100 insertions(+), 19 deletions(-) diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index eb13b9408a5..4445942f644 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -1612,7 +1612,7 @@ CreatePartitionPage (PINPUT_RECORD Ir) if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1622,7 +1622,7 @@ CreatePartitionPage (PINPUT_RECORD Ir) if (DiskSize == 0) DiskSize = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0) @@ -1780,19 +1780,19 @@ DeletePartitionPage (PINPUT_RECORD Ir) if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } if (PartType == NULL) @@ -1820,7 +1820,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1830,7 +1830,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) if (DiskSize == 0) DiskSize = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0) @@ -1913,24 +1913,24 @@ SelectFileSystemPage (PINPUT_RECORD Ir) if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - DiskUnit = "GB"; + DiskUnit = MUIGetString(STRING_GB); } else { DiskSize = (DiskEntry->DiskSize + (1 << 19)) >> 20; - DiskUnit = "MB"; + DiskUnit = MUIGetString(STRING_MB); } /* adjust partition size */ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - PartUnit = "GB"; + PartUnit = MUIGetString(STRING_GB); } else { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - PartUnit = "MB"; + PartUnit = MUIGetString(STRING_MB); } /* adjust partition type */ diff --git a/reactos/base/setup/usetup/lang/bg-BG.h b/reactos/base/setup/usetup/lang/bg-BG.h index b14b28f4350..670bc070e84 100644 --- a/reactos/base/setup/usetup/lang/bg-BG.h +++ b/reactos/base/setup/usetup/lang/bg-BG.h @@ -1683,6 +1683,12 @@ MUI_STRING bgBGStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/de-DE.h b/reactos/base/setup/usetup/lang/de-DE.h index 1aa47209508..c84bf1e7260 100644 --- a/reactos/base/setup/usetup/lang/de-DE.h +++ b/reactos/base/setup/usetup/lang/de-DE.h @@ -1680,6 +1680,12 @@ MUI_STRING deDEStrings[] = "Ungenutzt"}, {STRING_FORMATUNKNOWN, "Unbekannt"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/el-GR.h b/reactos/base/setup/usetup/lang/el-GR.h index b378bf74bee..5a557f84a00 100644 --- a/reactos/base/setup/usetup/lang/el-GR.h +++ b/reactos/base/setup/usetup/lang/el-GR.h @@ -1674,6 +1674,12 @@ MUI_STRING elGRStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/en-US.h b/reactos/base/setup/usetup/lang/en-US.h index e478db894dc..686bb5c3fe9 100644 --- a/reactos/base/setup/usetup/lang/en-US.h +++ b/reactos/base/setup/usetup/lang/en-US.h @@ -1674,6 +1674,12 @@ MUI_STRING enUSStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/es-ES.h b/reactos/base/setup/usetup/lang/es-ES.h index b5eb372cde1..8737dc2ca9f 100644 --- a/reactos/base/setup/usetup/lang/es-ES.h +++ b/reactos/base/setup/usetup/lang/es-ES.h @@ -1673,6 +1673,12 @@ MUI_STRING esESStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/fr-FR.h b/reactos/base/setup/usetup/lang/fr-FR.h index 45886a1d046..81af0fa39a6 100644 --- a/reactos/base/setup/usetup/lang/fr-FR.h +++ b/reactos/base/setup/usetup/lang/fr-FR.h @@ -1686,6 +1686,12 @@ MUI_STRING frFRStrings[] = "Non utilisВ"}, {STRING_FORMATUNKNOWN, "Inconnu"}, + {STRING_KB, + "Ko"}, + {STRING_MB, + "Mo"}, + {STRING_GB, + "Go"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/it-IT.h b/reactos/base/setup/usetup/lang/it-IT.h index 1735c7d78db..ead1f535e3a 100644 --- a/reactos/base/setup/usetup/lang/it-IT.h +++ b/reactos/base/setup/usetup/lang/it-IT.h @@ -1674,6 +1674,12 @@ MUI_STRING itITStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/lt-LT.h b/reactos/base/setup/usetup/lang/lt-LT.h index ea0a2987c63..c8053c81509 100644 --- a/reactos/base/setup/usetup/lang/lt-LT.h +++ b/reactos/base/setup/usetup/lang/lt-LT.h @@ -1683,6 +1683,12 @@ MUI_STRING ltLTStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/pl-PL.h b/reactos/base/setup/usetup/lang/pl-PL.h index 675745f5871..ce9c3b78d3e 100644 --- a/reactos/base/setup/usetup/lang/pl-PL.h +++ b/reactos/base/setup/usetup/lang/pl-PL.h @@ -1682,6 +1682,12 @@ MUI_STRING plPLStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/ru-RU.h b/reactos/base/setup/usetup/lang/ru-RU.h index 1ccebfed004..44eb1540e19 100644 --- a/reactos/base/setup/usetup/lang/ru-RU.h +++ b/reactos/base/setup/usetup/lang/ru-RU.h @@ -1674,6 +1674,12 @@ MUI_STRING ruRUStrings[] = "Не использовано"}, {STRING_FORMATUNKNOWN, "Неизвестный"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/sk-SK.h b/reactos/base/setup/usetup/lang/sk-SK.h index 8eaa3ca1161..1cb608594b9 100644 --- a/reactos/base/setup/usetup/lang/sk-SK.h +++ b/reactos/base/setup/usetup/lang/sk-SK.h @@ -1679,6 +1679,12 @@ MUI_STRING skSKStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/sv-SE.h b/reactos/base/setup/usetup/lang/sv-SE.h index e4dca1f1187..c5c7da340d2 100644 --- a/reactos/base/setup/usetup/lang/sv-SE.h +++ b/reactos/base/setup/usetup/lang/sv-SE.h @@ -1673,6 +1673,12 @@ MUI_STRING svSEStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/uk-UA.h b/reactos/base/setup/usetup/lang/uk-UA.h index f57891c45f3..893e648e657 100644 --- a/reactos/base/setup/usetup/lang/uk-UA.h +++ b/reactos/base/setup/usetup/lang/uk-UA.h @@ -1674,6 +1674,12 @@ MUI_STRING ukUAStrings[] = "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/mui.h b/reactos/base/setup/usetup/mui.h index 03c61f5d4bb..08b8803cd3d 100644 --- a/reactos/base/setup/usetup/mui.h +++ b/reactos/base/setup/usetup/mui.h @@ -121,4 +121,7 @@ MUIGetString(ULONG Number); #define STRING_UNFORMATTED 50 #define STRING_FORMATUNUSED 51 #define STRING_FORMATUNKNOWN 52 +#define STRING_KB 53 +#define STRING_MB 54 +#define STRING_GB 55 #endif diff --git a/reactos/base/setup/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c index e42caa028ec..a199be27d61 100644 --- a/reactos/base/setup/usetup/partlist.c +++ b/reactos/base/setup/usetup/partlist.c @@ -1120,19 +1120,19 @@ PrintPartitionData (PPARTLIST List, if (PartEntry->UnpartitionledLength >= 0x280000000ULL) /* 10 GB */ { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->UnpartitionedLength >= 0xA00000ULL) /* 10 MB */ { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } sprintf (LineBuffer, @@ -1176,19 +1176,19 @@ PrintPartitionData (PPARTLIST List, if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } if (PartType == NULL) @@ -1274,7 +1274,7 @@ PrintDiskData (PPARTLIST List, if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize.QuadPart = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1282,7 +1282,7 @@ PrintDiskData (PPARTLIST List, DiskSize.QuadPart = (DiskEntry->DiskSize + (1 << 19)) >> 20; if (DiskSize.QuadPart == 0) DiskSize.QuadPart = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0)