grim/guifications2

merge of '3e4c0fecca21aefb9d5989c524a501f69bda07e8'
org.guifications.gf2
2007-12-15, John Bailey
265904ec91ac
merge of '3e4c0fecca21aefb9d5989c524a501f69bda07e8'
and '6a3046ffeccfa602f2b909bec51ab09d38f91c16'
--- a/AUTHORS Tue Oct 09 04:56:33 2007 -0400
+++ b/AUTHORS Sat Dec 15 03:56:35 2007 -0500
@@ -37,3 +37,4 @@
Accepted Patches
================
Eduard Carreras i Nadal
+Alexander Orlov
--- a/ChangeLog Tue Oct 09 04:56:33 2007 -0400
+++ b/ChangeLog Sat Dec 15 03:56:35 2007 -0500
@@ -1,3 +1,6 @@
+Version 2.15 :
+ * Use large PRPL icons for scalling (alxorlov)
+
Version 2.14 5/5/07:
* Fixed a brokenness in configure.ac that caused configure to fail
--- a/VERSION Tue Oct 09 04:56:33 2007 -0400
+++ b/VERSION Sat Dec 15 03:56:35 2007 -0500
@@ -1,1 +1,1 @@
-2.14
+2.15mtn4
--- a/configure.ac Tue Oct 09 04:56:33 2007 -0400
+++ b/configure.ac Sat Dec 15 03:56:35 2007 -0500
@@ -3,7 +3,7 @@
# pidgin-encryption configure script, thanks guys ;)
#
-AC_INIT([pidgin-guifications], [2.14], [guifications-devel@lists.guifications.org])
+AC_INIT([pidgin-guifications], [2.15mtn4], [guifications-devel@lists.guifications.org])
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(pre_config.h)
--- a/doc/QUOTES Tue Oct 09 04:56:33 2007 -0400
+++ b/doc/QUOTES Sat Dec 15 03:56:35 2007 -0500
@@ -150,3 +150,9 @@
ever to exist i'd have to wonder which of you is worse
20:49 < grim> rofl
+17:01 < bleeter> if you think about it, some of our forebears must've been real sickos
+17:02 < esquilax> chicken ass
+17:02 < bleeter> 'oh, look what just fell out of this chicken's bum.. I think I'll eat it'
+17:02 < bleeter> 'hey, I wonder what'll happen if *I* squeeze that cow's tits'
+17:02 < bleeter> and so forth
+
--- a/guifications-installer.nsi Tue Oct 09 04:56:33 2007 -0400
+++ b/guifications-installer.nsi Sat Dec 15 03:56:35 2007 -0500
@@ -7,6 +7,11 @@
;Include Modern UI
!include "MUI.nsh"
+!include "FileFunc.nsh"
+!insertmacro GetParameters
+!insertmacro GetOptions
+
+
;--------------------------------
;General
Name "Pidgin Guifications ${GUIFICATIONS_VERSION}"
@@ -25,11 +30,13 @@
ShowUnInstDetails show
SetCompressor /SOLID lzma
+;Reserve files used in .onInit for faster start-up
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
!define GUIFICATIONS_UNINST_EXE "pidgin-guifications-uninst.exe"
!define GUIFICATIONS_DLL "guifications.dll"
!define GUIFICATIONS_UNINSTALL_LNK "Guifications Uninstall.lnk"
-
;--------------------------------
; Registry keys:
!define GUIFICATIONS_REG_KEY "SOFTWARE\pidgin-guifications"
@@ -47,8 +54,11 @@
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "nsis\header.bmp"
!define MUI_CUSTOMFUNCTION_GUIINIT gf_checkPidginVersion
- !define MUI_ABORTWARNING
+ !define MUI_ABORTWARNING
+ !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
+ !define MUI_LANGDLL_REGISTRY_KEY ${GUIFICATIONS_REG_KEY}
+ !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
;--------------------------------
; Pages
@@ -78,11 +88,13 @@
;--------------------------------
; Languages
!insertmacro MUI_LANGUAGE "English"
+ !insertmacro MUI_LANGUAGE "French"
!insertmacro MUI_LANGUAGE "Italian"
!insertmacro MUI_LANGUAGE "Spanish"
;Translations
!include "nsis\translations\english.nsh"
+ !include "nsis\translations\french.nsh"
!include "nsis\translations\italian.nsh"
!include "nsis\translations\spanish.nsh"
@@ -153,6 +165,10 @@
done:
SectionEnd
+!macro INSTALL_GMO LANG
+ SetOutPath "$INSTDIR\locale\${LANG}\LC_MESSAGES"
+ File /oname=guifications.mo po\${LANG}.gmo
+!macroend
Section "Install"
Call CheckUserInstallRights
@@ -205,36 +221,31 @@
File "themes\Penguins\penguin.png"
; translations - if there is a way to automate this, i can't find it
- SetOutPath "$INSTDIR\locale\de\LC_MESSAGES"
- File /oname=guifications.mo po\de.gmo
- SetOutPath "$INSTDIR\locale\en_AU\LC_MESSAGES"
- File /oname=guifications.mo po\en_AU.gmo
- SetOutPath "$INSTDIR\locale\en_GB\LC_MESSAGES"
- File /oname=guifications.mo po\en_GB.gmo
- SetOutPath "$INSTDIR\locale\es\LC_MESSAGES"
- File /oname=guifications.mo po\es.gmo
- SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES"
- File /oname=guifications.mo po\fr.gmo
- SetOutPath "$INSTDIR\locale\he\LC_MESSAGES"
- File /oname=guifications.mo po\he.gmo
- SetOutPath "$INSTDIR\locale\it\LC_MESSAGES"
- File /oname=guifications.mo po\it.gmo
- SetOutPath "$INSTDIR\locale\ja\LC_MESSAGES"
- File /oname=guifications.mo po\ja.gmo
- SetOutPath "$INSTDIR\locale\nl\LC_MESSAGES"
- File /oname=guifications.mo po\nl.gmo
- SetOutPath "$INSTDIR\locale\no\LC_MESSAGES"
- File /oname=guifications.mo po\no.gmo
- SetOutPath "$INSTDIR\locale\pt\LC_MESSAGES"
- File /oname=guifications.mo po\pt.gmo
- SetOutPath "$INSTDIR\locale\sk\LC_MESSAGES"
- file /oname=guifications.mo po\sk.gmo
- SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES"
- File /oname=guifications.mo po\sv.gmo
- SetOutPath "$INSTDIR\locale\zh_CN\LC_MESSAGES"
- File /oname=guifications.mo po\zh_CN.gmo
- SetOutPath "$INSTDIR\locale\zh_TW\LC_MESSAGES"
- File /oname=guifications.mo po\zh_TW.gmo
+ !insertmacro INSTALL_GMO "bn"
+ !insertmacro INSTALL_GMO "cs"
+ !insertmacro INSTALL_GMO "de"
+ !insertmacro INSTALL_GMO "en_AU"
+ !insertmacro INSTALL_GMO "en_GB"
+ !insertmacro INSTALL_GMO "es"
+ !insertmacro INSTALL_GMO "fr"
+ !insertmacro INSTALL_GMO "gl"
+ !insertmacro INSTALL_GMO "he"
+ !insertmacro INSTALL_GMO "hu"
+ !insertmacro INSTALL_GMO "it"
+ !insertmacro INSTALL_GMO "ja"