From 3571648675092ddfe21a5ebeb6c838db7b1a5a4d Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 30 Oct 2015 18:43:34 -0200
Subject: [PATCH] Ajustes no empacotamento windows.

---
 .gitignore                   | 10 ++++++++++
 install-cross.sh             |  6 +++---
 nsi/main-begin-i686.nsi.in   |  1 -
 nsi/main-begin-x86_64.nsi.in |  1 -
 nsi/main-end.nsi.in          |  8 ++++++++
 po/pt_BR.po                  |  2 +-
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore
 mode change 100644 => 100755 install-cross.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e378241
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+ChangeLog
+ChangeLog.new
+Makefile
+aclocal.m4
+.bin
+*.log
+*.status
+configure
+*.pc
+
diff --git a/install-cross.sh b/install-cross.sh
old mode 100644
new mode 100755
index 3e9b66a..577fd87
--- a/install-cross.sh
+++ b/install-cross.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PREFIX="mingw64"
+PREFIX="mingw32"
 
 TEMPFILE=$(mktemp)
 
@@ -34,11 +34,11 @@ gdk-pixbuf-query-loaders
 EOF
 
 # Instala o tema usado no pacote windows
-sudo zypper in adwaita-icon-theme
+sudo zypper --non-interactive in adwaita-icon-theme
 
 while read FILE
 do
-	sudo zypper in ${PREFIX}-${FILE}
+	sudo zypper --non-interactive in ${PREFIX}-${FILE}
 done < ${TEMPFILE}
 
 rm -f ${TEMPFILE}
diff --git a/nsi/main-begin-i686.nsi.in b/nsi/main-begin-i686.nsi.in
index c53bba2..5ef2c86 100644
--- a/nsi/main-begin-i686.nsi.in
+++ b/nsi/main-begin-i686.nsi.in
@@ -34,7 +34,6 @@ SubSection "@PACKAGE@" SecMain
 		CreateDirectory "$INSTDIR\ui"
 
 		file "/oname=$INSTDIR\ui\00default.xml" 	"ui\00default.xml"
-		file "/oname=$INSTDIR\ui\10keypad.xml" 		"ui\10keypad.xml"
 
 		# Locale files
 		CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
diff --git a/nsi/main-begin-x86_64.nsi.in b/nsi/main-begin-x86_64.nsi.in
index e56c15c..b756f64 100644
--- a/nsi/main-begin-x86_64.nsi.in
+++ b/nsi/main-begin-x86_64.nsi.in
@@ -37,7 +37,6 @@ SubSection "@PACKAGE@" SecMain
 		CreateDirectory "$INSTDIR\ui"
 
 		file "/oname=$INSTDIR\ui\00default.xml" 	"ui\00default.xml"
-		file "/oname=$INSTDIR\ui\10keypad.xml" 		"ui\10keypad.xml"
 
 		# Locale files
 		CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
diff --git a/nsi/main-end.nsi.in b/nsi/main-end.nsi.in
index c1b5b15..5f8bb5d 100644
--- a/nsi/main-end.nsi.in
+++ b/nsi/main-end.nsi.in
@@ -3,6 +3,14 @@
 
 	SubSection "Menus, Keypads & Toolbars" SecMenu
 
+		Section "Keypad" TraceMenu
+			file "/oname=$INSTDIR\ui\10keypad.xml" "ui\10keypad.xml"
+		sectionEnd
+
+		Section "Functions" TraceMenu
+			file "/oname=$INSTDIR\ui\10functions.xml" "ui\10functions.xml"
+		sectionEnd
+
 		Section /o "View trace Menu" TraceMenu
 			file "/oname=$INSTDIR\ui\98trace.xml" "ui\98trace.xml"
 		sectionEnd
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a01bdeb..70b32c0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-28 15:01-0300\n"
+"POT-Creation-Date: 2015-10-30 18:26-0200\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
--
libgit2 0.21.2