changeset 30581:19c14f0fa669

merge of '1ea3865b477734411bc371709c1d29d4a4be04ab' and '2ac6557a402c32c1c9cc902a500058eb824f0795'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 03 Jun 2010 03:24:05 +0000
parents c43570e34d81 (diff) 7a28e9b12038 (current diff)
children 98de21a2aa9a 844181ded506
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.mingw	Thu Jun 03 03:22:09 2010 +0000
+++ b/Makefile.mingw	Thu Jun 03 03:24:05 2010 +0000
@@ -107,7 +107,7 @@
 	rm -f pidgin/win32/nsis/pidgin-translations.nsh pidgin/win32/nsis/pidgin-spellcheck.nsh pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
 	find $(STRIPPED_RELEASE_DIR)/locale -maxdepth 1 -mindepth 1 \
 	 -exec basename {} ';' \
-	 | sed -e s/^/\!insertmacro\ LANG_SECTION\ \"/ -e s/$$/\"/ \
+	 | LC_ALL=C sort | sed -e s/^/\!insertmacro\ LANG_SECTION\ \"/ -e s/$$/\"/ \
 	 > pidgin/win32/nsis/pidgin-translations.nsh
 	#Convert the available.lst lines to "!insertmacro SPELLCHECK_SECTION lang lang_name lang_file"
 	sed -e "/^#/d" -e "s/^[^,]\{1,\},[^,]\{1,\},/\"/" \