diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index 0a9aa4d9..ee98f0d0 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -3749,7 +3749,7 @@ t MSG_173 "Spauskite pasirinkti..." # The following will appear in the about dialog t MSG_174 "Rufus - patikima USB formatavimo priemonė" t MSG_175 "Versija %d.%d.%d (sąranka %d)" -t MSG_176 "Lietuviškas vertimas: Gintaras Venslovas (gintaras.venslovas@gmail.com)" +t MSG_176 "Lietuviškas vertimas: Gintaras Venslovas " t MSG_177 "Dėl pastebėtų klaidų ar pageidaujamų patobulinimų kreipkitės:" t MSG_178 "Kitos autorių teisės:" t MSG_179 "Naujinių politika:" @@ -5679,7 +5679,7 @@ t MSG_173 "Kliknite, da izberete…" # The following will appear in the about dialog t MSG_174 "Rufus - zanesljivi pripomoček za USB formatiranje" t MSG_175 "Verzija %d.%d.%d (izgradnja %d)" -t MSG_176 "V slovenščino prevedel Matej Horvat (mailto:matej.horvat@guest.arnes.si)" +t MSG_176 "V slovenščino prevedel Matej Horvat " t MSG_177 "Prijavite hrošče ali zahtevajte izboljšave na:" t MSG_178 "Dodatne avtorske pravice:" t MSG_179 "Politika posodobitev:" diff --git a/src/license.h b/src/license.h index 2bce1166..96145084 100644 --- a/src/license.h +++ b/src/license.h @@ -24,13 +24,13 @@ const char* about_blurb_format = "\\line\n" "Copyright © 2011-2014 Pete Batard / Akeo\\line\n" RUFUS_URL "\\line\n" -"\\fs6 \\line\n" +"\\fs3 \\line\n" "\\fs18%s\\line\n" "\\line\n" "%s\\line\n" "https://github.com/pbatard/rufus/issues\\line\n" "\\line\n" -"{\\b %s}}"; +"{\\b\\fs19 %s}}"; const char* additional_copyrights = "{\\rtf1\\ansi\n" diff --git a/src/parser.c b/src/parser.c index ba38da6e..6850fe70 100644 --- a/src/parser.c +++ b/src/parser.c @@ -363,7 +363,7 @@ BOOL get_loc_data_file(const char* filename, loc_cmd* lcmd) size_t i = 0; int r = 0, line_nr_incr = 1; int c = 0, eol_char = 0; - int start_line, old_loc_line_nr; + int start_line, old_loc_line_nr = 0; BOOL ret = FALSE, eol = FALSE, escape_sequence = FALSE, reentrant = (fd != NULL); long offset, cur_offset = -1, end_offset; // The default locale is always the first one @@ -383,7 +383,12 @@ BOOL get_loc_data_file(const char* filename, loc_cmd* lcmd) populate_default = FALSE; } - if (!reentrant) { + if (reentrant) { + // Called, from a 'b' command - no need to reopen the file, + // just save the current offset and current line number + cur_offset = ftell(fd); + old_loc_line_nr = loc_line_nr; + } else { if ((filename == NULL) || (filename[0] == 0)) return FALSE; if (!populate_default) { @@ -398,11 +403,6 @@ BOOL get_loc_data_file(const char* filename, loc_cmd* lcmd) fd = open_loc_file(filename); if (fd == NULL) goto out; - } else { - // Called, from a 'b' command - no need to reopen the file, - // just save the current offset and current line number - cur_offset = ftell(fd); - old_loc_line_nr = loc_line_nr; } offset = (long)lcmd->num[0]; diff --git a/src/rufus.rc b/src/rufus.rc index 335ff10b..e9482491 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.4.2.368" +CAPTION "Rufus v1.4.2.369" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 @@ -71,17 +71,17 @@ BEGIN PUSHBUTTON "",IDC_LANG,183,2,15,13,BS_TOP | BS_FLAT END -IDD_ABOUTBOX DIALOGEX 0, 0, 287, 204 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_ABOUTBOX DIALOGEX 0, 0, 319, 229 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About Rufus" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN ICON IDI_ICON,IDC_ABOUT_ICON,11,8,21,20 - DEFPUSHBUTTON "OK",IDOK,231,183,50,14,WS_GROUP - PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,183,50,14,WS_GROUP - CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,103,235,74,WS_EX_STATICEDGE - CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,46,7,235,95 - PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,183,50,14,NOT WS_VISIBLE | WS_GROUP + DEFPUSHBUTTON "OK",IDOK,251,207,50,14,WS_GROUP + PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,207,50,14,WS_GROUP + CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,107,267,90,WS_EX_STATICEDGE + CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,45,7,268,99 + PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,207,50,14,NOT WS_VISIBLE | WS_GROUP END IDD_ISO_EXTRACT DIALOGEX 0, 0, 262, 66 @@ -289,8 +289,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,2,368 - PRODUCTVERSION 1,4,2,368 + FILEVERSION 1,4,2,369 + PRODUCTVERSION 1,4,2,369 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -307,13 +307,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.4.2.368" + VALUE "FileVersion", "1.4.2.369" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", " 2011-2014 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.4.2.368" + VALUE "ProductVersion", "1.4.2.369" END END BLOCK "VarFileInfo"