diff --git a/ChangeLog.txt b/ChangeLog.txt
index c834af9e..e14183c1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,9 +2,11 @@ o Version 2.5 (2015.10.??)
     Add SHA-256 checksum verification
     Add a cheat mode to disable exclusive USB drive locking (Alt-,)
     Add digital signature check on update downloads
-    Fix an where the update settings dialog may not display properly
+    Add Azerbaijani translation, courtesy of Elvin Məlikov
+    Add Persian translation, courtesy of سید ضیاءالدین عظیمی (ziaa)
+    Fix an issue where the update settings dialog may not display properly
     Report Windows build number in the log (Windows 8 or later)
-    Localization improvements
+    Many localization improvements and fixes, especially for right-to-left languages
     Additional translation updates
 
 o Version 2.4 (2015.09.27)
diff --git a/src/iso.c b/src/iso.c
index 9792ca9d..ad6d89f5 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -76,7 +76,7 @@ static const char* install_wim_path = "/sources";
 static const char* install_wim_name[] = { "install.wim", "install.swm" };
 static const char* grub_dirname = "/boot/grub"; // NB: We don't support nonstandard config dir such as AROS' "/boot/pc/grub/"
 static const char* grub_cfg = "grub.cfg";
-static const char* syslinux_cfg[] = { "isolinux.cfg", "syslinux.cfg", "extlinux.conf"};
+static const char* syslinux_cfg[] = { "isolinux.cfg", "syslinux.cfg", "extlinux.conf" };
 static const char dot_isolinux_bin[] = ".\\isolinux.bin";
 static const char* isolinux_bin = &dot_isolinux_bin[2];
 static const char* pe_dirname[] = { "/i386", "/minint" };
@@ -228,7 +228,7 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t i_file_length, cons
 		// Compute projected size needed
 		total_blocks += i_file_length/UDF_BLOCKSIZE;
 		// NB: ISO_BLOCKSIZE = UDF_BLOCKSIZE
-		if ((i_file_length != 0) && (i_file_length%ISO_BLOCKSIZE == 0))	// 
+		if ((i_file_length != 0) && (i_file_length%ISO_BLOCKSIZE == 0))
 			total_blocks++;
 		return TRUE;
 	}
@@ -649,7 +649,7 @@ BOOL ExtractISO(const char* src_iso, const char* dest_dir, BOOL scan)
 	FILE* fd;
 	int r = 1;
 	iso9660_t* p_iso = NULL;
-	udf_t* p_udf = NULL; 
+	udf_t* p_udf = NULL;
 	udf_dirent_t* p_udf_root;
 	char *tmp, *buf, *ext;
 	char path[MAX_PATH], path2[16];
@@ -829,7 +829,7 @@ out:
 			// In case we have a WinPE 1.x based iso, we extract and parse txtsetup.sif
 			// during scan, to see if /minint was provided for OsLoadOptions, as it decides
 			// whether we should use 0x80 or 0x81 as the disk ID in the MBR
-			safe_sprintf(path, sizeof(path), "/%s/txtsetup.sif", 
+			safe_sprintf(path, sizeof(path), "/%s/txtsetup.sif",
 				basedir[((img_report.winpe&WINPE_I386) == WINPE_I386)?0:1]);
 			ExtractISOFile(src_iso, path, tmp_sif, FILE_ATTRIBUTE_NORMAL);
 			tmp = get_token_data_file("OsLoadOptions", tmp_sif);
@@ -920,7 +920,7 @@ int64_t ExtractISOFile(const char* iso, const char* iso_file, const char* dest_f
 	DWORD buf_size, wr_size;
 	BOOL s;
 	iso9660_t* p_iso = NULL;
-	udf_t* p_udf = NULL; 
+	udf_t* p_udf = NULL;
 	udf_dirent_t *p_udf_root = NULL, *p_udf_file = NULL;
 	iso9660_stat_t *p_statbuf = NULL;
 	lsn_t lsn;
@@ -1065,7 +1065,7 @@ try_iso:
 		goto out;
 	}
 	r = wim_header[3];
-	
+
 out:
 	if (p_statbuf != NULL)
 		safe_free(p_statbuf->rr.psz_symlink);
diff --git a/src/localization.c b/src/localization.c
index eb8d6fc4..dcce1822 100644
--- a/src/localization.c
+++ b/src/localization.c
@@ -381,9 +381,10 @@ char* lmprintf(uint32_t msg_id, ...)
 	static char buf[LOC_MESSAGE_NB][LOC_MESSAGE_SIZE];
 	char *format = NULL;
 	va_list args;
+	BOOL needs_rtf_rtl_marks = (msg_id & MSG_RTF) && right_to_left_mode;
+
 	buf_id %= LOC_MESSAGE_NB;
 	buf[buf_id][0] = 0;
-	BOOL needs_rtf_rtl_marks = (msg_id & MSG_RTF) && right_to_left_mode;
 
 	msg_id &= MSG_MASK;
 	if ((msg_id > MSG_000) && (msg_id < MSG_MAX)) {
diff --git a/src/rufus.rc b/src/rufus.rc
index 654522ba..f5d77c78 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.5.792"
+CAPTION "Rufus 2.5.793"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -319,8 +319,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,792,0
- PRODUCTVERSION 2,5,792,0
+ FILEVERSION 2,5,793,0
+ PRODUCTVERSION 2,5,793,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -337,13 +337,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.5.792"
+            VALUE "FileVersion", "2.5.793"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.5.792"
+            VALUE "ProductVersion", "2.5.793"
         END
     END
     BLOCK "VarFileInfo"