# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1191016188 0
# Node ID 4b91ac9fa5490f6288be359437c1d7da2dc41b4a
# Parent  045e4f2459a9172043f40d08009aec986a4c21b0# Parent  d9e391c08e0843678fdd167475d7ea098a7edffc
propagate from branch 'im.pidgin.pidgin.2.2.1' (head e7d234a12dbb89fdfd195e4597018a80f2c541f5)
            to branch 'im.pidgin.pidgin' (head a695ddc8921e9705ecd1e680473d692e73449845)

diff -r 045e4f2459a9 -r 4b91ac9fa549 libpurple/protocols/myspace/markup.c
diff -r 045e4f2459a9 -r 4b91ac9fa549 pidgin/Makefile.am
--- a/pidgin/Makefile.am	Fri Sep 28 20:58:48 2007 +0000
+++ b/pidgin/Makefile.am	Fri Sep 28 21:49:48 2007 +0000
@@ -29,6 +29,7 @@
 		win32/nsis/langmacros.nsh \
 		win32/nsis/translations/afrikaans.nsh \
 		win32/nsis/translations/albanian.nsh \
+		win32/nsis/translations/arabic.nsh \
 		win32/nsis/translations/basque.nsh \
 		win32/nsis/translations/bulgarian.nsh \
 		win32/nsis/translations/catalan.nsh \
diff -r 045e4f2459a9 -r 4b91ac9fa549 pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Fri Sep 28 20:58:48 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Fri Sep 28 21:49:48 2007 +0000
@@ -167,6 +167,7 @@
 
   !insertmacro MUI_LANGUAGE "Afrikaans"
   !insertmacro MUI_LANGUAGE "Albanian"
+  !insertmacro MUI_LANGUAGE "Arabic"
   !insertmacro MUI_LANGUAGE "Basque"
   !insertmacro MUI_LANGUAGE "Bulgarian"
   !insertmacro MUI_LANGUAGE "Catalan"
@@ -207,6 +208,7 @@
 
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "AFRIKAANS"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\afrikaans.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ALBANIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\albanian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ARABIC"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\arabic.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BASQUE"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\basque.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BULGARIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CATALAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\catalan.nsh"
diff -r 045e4f2459a9 -r 4b91ac9fa549 pidgin/win32/nsis/translations/arabic.nsh