[loc] fix Russian translation for KB/MB/GB...

* Closes #1660
* Also update GPT partition types and set UTF-8 codepage in .rc

res/loc/po/ru-RU.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.5\n"
 "Report-Msgid-Bugs-To: pete@akeo.ie\n"
-"POT-Creation-Date: 2020-04-17 12:18+0100\n"
+"POT-Creation-Date: 2020-12-11 17:07+0000\n"
-"PO-Revision-Date: 2020-04-17 12:25+0100\n"
+"PO-Revision-Date: 2020-12-11 17:08+0000\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -13,7 +13,7 @@ msgstr ""
 "X-Rufus-LCID: 0x0419, 0x0819\n"
 "Last-Translator: \n"
 "Language-Team: \n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #. • IDD_DIALOG → IDS_DRIVE_PROPERTIES_TXT
 msgid "Drive Properties"
@@ -288,31 +288,31 @@ msgstr "байт"
 #.
 #. *Short* version of the kilobyte size suffix
 msgid "KB"
-msgstr "Кб"
+msgstr "КБ"
 
 #. • MSG_022
 #.
 #. *Short* version of the megabyte size suffix
 msgid "MB"
-msgstr "Мб"
+msgstr "МБ"
 
 #. • MSG_023
 #.
 #. *Short* version of the gigabyte size suffix
 msgid "GB"
-msgstr "Гб"
+msgstr "ГБ"
 
 #. • MSG_024
 #.
 #. *Short* version of the terabyte size suffix
 msgid "TB"
-msgstr "Тб"
+msgstr "ТБ"
 
 #. • MSG_025
 #.
 #. *Short* version of the pentabyte size suffix
 msgid "PB"
-msgstr "Пб"
+msgstr "ПБ"
 
 #. • MSG_027
 msgid "kilobytes"
@@ -1312,8 +1312,8 @@ msgid "Formatting (%s) - estimated duration %d:%02d..."
 msgstr "Форматирование (%s) - Окончание через %d:%02d..."
 
 #. • MSG_221
-msgid "Setting Label (This may take a while)..."
+msgid "Setting label (%s)..."
-msgstr "Установка метки (Это может занять время)..."
+msgstr "Установка метки (%s)..."
 
 #. • MSG_222
 #.
@@ -1358,8 +1358,8 @@ msgid "Copying ISO files: %s"
 msgstr "Копирование ISO-файлов: %s"
 
 #. • MSG_232
-msgid "Win7 EFI boot setup (This may take a while)..."
+msgid "Win7 EFI boot setup (%s)..."
-msgstr "Настройка Win7 EFI boot (Это может занять время)..."
+msgstr "Настройка Win7 EFI boot (%s)..."
 
 #. • MSG_233
 msgid "Finalizing, please wait..."
@@ -1394,8 +1394,8 @@ msgid "Partitioning (%s)..."
 msgstr "Разметка раздела (%s)..."
 
 #. • MSG_239
-msgid "Deleting partitions..."
+msgid "Deleting partitions (%s)..."
-msgstr "Удаление разделов..."
+msgstr "Удаление разделов (%s)..."
 
 #. • MSG_240
 #.
@@ -1725,3 +1725,7 @@ msgstr "Используйте этот параметр, чтобы указа
 #. It's the same as MSG_286 but with a process that *may* be faster, hence the name.
 msgid "Fast-zeroing drive: %s"
 msgstr "Быстрое обнуление диска: %s"
+
+#. • MSG_307
+msgid "This may take a while"
+msgstr "Это может занять время"

res/loc/rufus.loc

@@ -10392,11 +10392,11 @@ t MSG_017 "По выбору"
 t MSG_018 "Ваша версия: %d.%d (Build %d)"
 t MSG_019 "Последняя версия: %d.%d (Build %d)"
 t MSG_020 "байт"
-t MSG_021 "Кб"
+t MSG_021 "КБ"
-t MSG_022 "Мб"
+t MSG_022 "МБ"
-t MSG_023 "Гб"
+t MSG_023 "ГБ"
-t MSG_024 "Тб"
+t MSG_024 "ТБ"
-t MSG_025 "Пб"
+t MSG_025 "ПБ"
 t MSG_026 "байт"
 t MSG_027 "КБ"
 t MSG_028 "МБ"

src/gpt_types.h

@@ -76,7 +76,7 @@ DEFINE_GUID(PARTITION_FREEBSD_SWAP, 0x516E7CB5, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00
 DEFINE_GUID(PARTITION_FREEBSD_UFS, 0x516E7CB6, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00, 0x02, 0x2D, 0x09, 0x71, 0x2B);
 DEFINE_GUID(PARTITION_FREEBSD_ZFS, 0x516E7CBA, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00, 0x02, 0x2D, 0x09, 0x71, 0x2B);
 DEFINE_GUID(PARTITION_GENERIC_BIOS_BOOT, 0x21686148, 0x6449, 0x6E6F, 0x74, 0x4E, 0x65, 0x65, 0x64, 0x45, 0x46, 0x49);
-DEFINE_GUID(PARTITION_GENERIC_BOOT_LOADER, 0xBC13C2FF, 0x59E6, 0x4262, 0xA3, 0x52, 0xB2, 0x75, 0xFD, 0x6F, 0x71, 0x72);
+DEFINE_GUID(PARTITION_GENERIC_XBOOTLDR, 0xBC13C2FF, 0x59E6, 0x4262, 0xA3, 0x52, 0xB2, 0x75, 0xFD, 0x6F, 0x71, 0x72);
 DEFINE_GUID(PARTITION_GENERIC_ESP, 0xC12A7328, 0xF81F, 0x11D2, 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B);
 DEFINE_GUID(PARTITION_GENERIC_MBR, 0x024DEE41, 0x33E7, 0x11D3, 0x9D, 0x69, 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F);
 DEFINE_GUID(PARTITION_GENERIC_UNUSED, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
@@ -189,7 +189,7 @@ gpt_type_t gpt_type[] = {
     { &PARTITION_FREEBSD_UFS, "FreeBSD UFS Partition" },
     { &PARTITION_FREEBSD_ZFS, "FreeBSD ZFS Partition" },
     { &PARTITION_GENERIC_BIOS_BOOT, "BIOS Boot Partition" },
-    { &PARTITION_GENERIC_BOOT_LOADER, "Bootloader Partition" },
+    { &PARTITION_GENERIC_XBOOTLDR, "Extended Boot Loader Partition" },
     { &PARTITION_GENERIC_ESP, "EFI System Partition" },
     { &PARTITION_GENERIC_MBR, "MBR Partition" },
     { &PARTITION_GENERIC_UNUSED, "Unused Partition" },

src/rufus.rc

@@ -1,5 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
+#pragma code_page(65001)
+
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -33,7 +35,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.13.1730"
+CAPTION "Rufus 3.13.1731"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +397,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,13,1730,0
+ FILEVERSION 3,13,1731,0
- PRODUCTVERSION 3,13,1730,0
+ PRODUCTVERSION 3,13,1731,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +416,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.13.1730"
+            VALUE "FileVersion", "3.13.1731"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.13.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.13.1730"
+            VALUE "ProductVersion", "3.13.1731"
         END
     END
     BLOCK "VarFileInfo"