Rename pt_PT help dir to pt. Fix make files in tips dirs.

Add support for pt/pt_BR help in windows installer.

32 files changed, 30 insertions, 16 deletions

diff --git a/configure.ac b/configure.ac
index 3e69f6523..cb82f570c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -238,6 +238,10 @@ data/themes/wood/Makefile
 data/help/Makefile
 data/help/es/Makefile
 data/help/fr/Makefile
+data/help/pt/Makefile
+data/help/pt/tips/Makefile
+data/help/pt_BR/Makefile
+data/help/pt_BR/tips/Makefile
 data/help/ru/Makefile
 data/help/tips/Makefile
 data/icons/Makefile
diff --git a/data/help/CMakeLists.txt b/data/help/CMakeLists.txt
index c2ed62d3a..66118f461 100644
--- a/data/help/CMakeLists.txt
+++ b/data/help/CMakeLists.txt
@@ -14,6 +14,8 @@ SET(FILES
 ADD_SUBDIRECTORY(es)
 ADD_SUBDIRECTORY(fr)
 ADD_SUBDIRECTORY(ru)
+ADD_SUBDIRECTORY(pt)
+ADD_SUBDIRECTORY(pt_BR)
 ADD_SUBDIRECTORY(tips)
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help)
diff --git a/data/help/Makefile.am b/data/help/Makefile.am
index 6b3205929..59b1cf082 100644
--- a/data/help/Makefile.am
+++ b/data/help/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = es fr ru tips
+SUBDIRS = es fr ru tips pt pt_BR
 
 helpdir = $(pkgdatadir)/data/help
 
diff --git a/data/help/pt/CMakeLists.txt b/data/help/pt/CMakeLists.txt
new file mode 100644
index 000000000..afe7f1f69
--- /dev/null
+++ b/data/help/pt/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(tips)
diff --git a/data/help/pt/Makefile.am b/data/help/pt/Makefile.am
new file mode 100644
index 000000000..87886992e
--- /dev/null
+++ b/data/help/pt/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = tips
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/data/help/pt_PT/tips/1.txt b/data/help/pt/tips/1.txt
index be5fa7169..be5fa7169 100644
--- a/data/help/pt_PT/tips/1.txt
+++ b/data/help/pt/tips/1.txt
diff --git a/data/help/pt_PT/tips/10.txt b/data/help/pt/tips/10.txt
index c5f692f81..c5f692f81 100644
--- a/data/help/pt_PT/tips/10.txt
+++ b/data/help/pt/tips/10.txt
diff --git a/data/help/pt_PT/tips/11.txt b/data/help/pt/tips/11.txt
index dc575ff12..dc575ff12 100644
--- a/data/help/pt_PT/tips/11.txt
+++ b/data/help/pt/tips/11.txt
diff --git a/data/help/pt_PT/tips/12.txt b/data/help/pt/tips/12.txt
index b96cf4bc1..b96cf4bc1 100644
--- a/data/help/pt_PT/tips/12.txt
+++ b/data/help/pt/tips/12.txt
diff --git a/data/help/pt_PT/tips/13.txt b/data/help/pt/tips/13.txt
index cd0aba76a..cd0aba76a 100644
--- a/data/help/pt_PT/tips/13.txt
+++ b/data/help/pt/tips/13.txt
diff --git a/data/help/pt_PT/tips/14.txt b/data/help/pt/tips/14.txt
index 475fc358f..475fc358f 100644
--- a/data/help/pt_PT/tips/14.txt
+++ b/data/help/pt/tips/14.txt
diff --git a/data/help/pt_PT/tips/2.txt b/data/help/pt/tips/2.txt
index 4c449afcc..4c449afcc 100644
--- a/data/help/pt_PT/tips/2.txt
+++ b/data/help/pt/tips/2.txt
diff --git a/data/help/pt_PT/tips/3.txt b/data/help/pt/tips/3.txt
index ad40058a8..ad40058a8 100644
--- a/data/help/pt_PT/tips/3.txt
+++ b/data/help/pt/tips/3.txt
diff --git a/data/help/pt_PT/tips/4.txt b/data/help/pt/tips/4.txt
index 7f2229f97..7f2229f97 100644
--- a/data/help/pt_PT/tips/4.txt
+++ b/data/help/pt/tips/4.txt
diff --git a/data/help/pt_PT/tips/5.txt b/data/help/pt/tips/5.txt
index 83e18a4dd..83e18a4dd 100644
--- a/data/help/pt_PT/tips/5.txt
+++ b/data/help/pt/tips/5.txt
diff --git a/data/help/pt_PT/tips/6.txt b/data/help/pt/tips/6.txt
index d244eefd6..d244eefd6 100644
--- a/data/help/pt_PT/tips/6.txt
+++ b/data/help/pt/tips/6.txt
diff --git a/data/help/pt_PT/tips/7.txt b/data/help/pt/tips/7.txt
index 9a1b68169..9a1b68169 100644
--- a/data/help/pt_PT/tips/7.txt
+++ b/data/help/pt/tips/7.txt
diff --git a/data/help/pt_PT/tips/8.txt b/data/help/pt/tips/8.txt
index c0c608348..c0c608348 100644
--- a/data/help/pt_PT/tips/8.txt
+++ b/data/help/pt/tips/8.txt
diff --git a/data/help/pt_PT/tips/9.txt b/data/help/pt/tips/9.txt
index cc8612d07..cc8612d07 100644
--- a/data/help/pt_PT/tips/9.txt
+++ b/data/help/pt/tips/9.txt
diff --git a/data/help/pt_PT/tips/CMakeLists.txt b/data/help/pt/tips/CMakeLists.txt
index c50349ea4..0afc7ba0c 100644
--- a/data/help/pt_PT/tips/CMakeLists.txt
+++ b/data/help/pt/tips/CMakeLists.txt
@@ -1,7 +1,5 @@
 SET(FILES
     1.txt
-    1-1.jpg
-    1-2.jpg
     2.txt
     3.txt
     4.txt
@@ -17,4 +15,4 @@ SET(FILES
     14.txt
     )
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help/pt_PT/tips)
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help/pt/tips)
diff --git a/data/help/pt_PT/tips/Makefile.am b/data/help/pt/tips/Makefile.am
index 86e81fe46..50cc9810a 100644
--- a/data/help/pt_PT/tips/Makefile.am
+++ b/data/help/pt/tips/Makefile.am
@@ -1,10 +1,8 @@
 
-helptipsdir = $(pkgdatadir)/data/help/pt_PT/tips
+helppttipsdir = $(pkgdatadir)/data/help/pt/tips
 
-helptips_DATA =				\
+helppttips_DATA =				\
 	1.txt			\
-	1-1.jpg			\
-	1-2.jpg			\
 	2.txt			\
 	3.txt			\
 	4.txt			\
diff --git a/data/help/pt_BR/.placeholder b/data/help/pt_BR/.placeholder
deleted file mode 100644
index e69de29bb..000000000
--- a/data/help/pt_BR/.placeholder
+++ /dev/null
diff --git a/data/help/pt_BR/CMakeLists.txt b/data/help/pt_BR/CMakeLists.txt
new file mode 100644
index 000000000..afe7f1f69
--- /dev/null
+++ b/data/help/pt_BR/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(tips)
diff --git a/data/help/pt_BR/Makefile.am b/data/help/pt_BR/Makefile.am
new file mode 100644
index 000000000..87886992e
--- /dev/null
+++ b/data/help/pt_BR/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = tips
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/data/help/pt_BR/tips/1-1.jpg b/data/help/pt_BR/tips/1-1.jpg
deleted file mode 100644
index 855e72315..000000000
--- a/data/help/pt_BR/tips/1-1.jpg
+++ /dev/null
diff --git a/data/help/pt_BR/tips/1-2.jpg b/data/help/pt_BR/tips/1-2.jpg
deleted file mode 100644
index 3028e6ce6..000000000
--- a/data/help/pt_BR/tips/1-2.jpg
+++ /dev/null
diff --git a/data/help/pt_BR/tips/CMakeLists.txt b/data/help/pt_BR/tips/CMakeLists.txt
index f97db0cc0..8ebbca23c 100644
--- a/data/help/pt_BR/tips/CMakeLists.txt
+++ b/data/help/pt_BR/tips/CMakeLists.txt
@@ -1,7 +1,5 @@
 SET(FILES
     1.txt
-    1-1.jpg
-    1-2.jpg
     2.txt
     3.txt
     4.txt
diff --git a/data/help/pt_BR/tips/Makefile.am b/data/help/pt_BR/tips/Makefile.am
index 189fca54d..480f0f23c 100644
--- a/data/help/pt_BR/tips/Makefile.am
+++ b/data/help/pt_BR/tips/Makefile.am
@@ -1,10 +1,8 @@
 
-helptipsdir = $(pkgdatadir)/data/help/pt_BR/tips
+helpptbrtipsdir = $(pkgdatadir)/data/help/pt_BR/tips
 
-helptips_DATA =				\
+helpptbrtips_DATA =				\
 	1.txt			\
-	1-1.jpg			\
-	1-2.jpg			\
 	2.txt			\
 	3.txt			\
 	4.txt			\
diff --git a/data/help/pt_PT/.placeholder b/data/help/pt_PT/.placeholder
deleted file mode 100644
index e69de29bb..000000000
--- a/data/help/pt_PT/.placeholder
+++ /dev/null
diff --git a/data/help/pt_PT/tips/1-1.jpg b/data/help/pt_PT/tips/1-1.jpg
deleted file mode 100644
index 855e72315..000000000
--- a/data/help/pt_PT/tips/1-1.jpg
+++ /dev/null
diff --git a/data/help/pt_PT/tips/1-2.jpg b/data/help/pt_PT/tips/1-2.jpg
deleted file mode 100644
index 3028e6ce6..000000000
--- a/data/help/pt_PT/tips/1-2.jpg
+++ /dev/null
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 0d5bd3329..8ffae0d06 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -184,6 +184,10 @@ Section "Core files (required)" SecCore
   CreateDirectory "$INSTDIR\data\graphics"
   CreateDirectory "$INSTDIR\data\help"
   CreateDirectory "$INSTDIR\data\help\fr"
+  CreateDirectory "$INSTDIR\data\help\pt"
+  CreateDirectory "$INSTDIR\data\help\pt\tips"
+  CreateDirectory "$INSTDIR\data\help\pt_BR"
+  CreateDirectory "$INSTDIR\data\help\pt_BR\tips"
   CreateDirectory "$INSTDIR\data\help\ru"
   CreateDirectory "$INSTDIR\data\help\tips"
   CreateDirectory "$INSTDIR\data\icons"
@@ -259,10 +263,14 @@ Section "Core files (required)" SecCore
   File "${SRCDIR}\data\themes\wood\*.xml"
   SetOutPath "$INSTDIR\data\help"
   File "${SRCDIR}\data\help\*.txt"
-  SetOutPath "$INSTDIR\data\help\ru"
-  File "${SRCDIR}\data\help\ru\*.txt"
   SetOutPath "$INSTDIR\data\help\fr"
   File "${SRCDIR}\data\help\fr\*.txt"
+  SetOutPath "$INSTDIR\data\help\pt\tips"
+  File "${SRCDIR}\data\help\pt\tips\*.txt"
+  SetOutPath "$INSTDIR\data\help\pt_BR\tips"
+  File "${SRCDIR}\data\help\pt_BR\tips\*.txt"
+  SetOutPath "$INSTDIR\data\help\ru"
+  File "${SRCDIR}\data\help\ru\*.txt"
   SetOutPath "$INSTDIR\data\help\tips"
   File "${SRCDIR}\data\help\tips\*.txt"
   File "${SRCDIR}\data\help\tips\*.jpg"