From 5760eb12b4b8f7e598820902d8423e23fd74f0f3 Mon Sep 17 00:00:00 2001
From: kprkpr <kevin01010@gmail.com>
Date: Tue, 7 Jun 2016 16:08:08 +0200
Subject: [PATCH] Fixes

---
 jka-toolkit/apw              |   5 ++--
 jka-toolkit/i18n/apw/apw.pot |  54 ++++++++++++++++-------------------
 jka-toolkit/i18n/apw/es.mo   | Bin 4810 -> 4730 bytes
 jka-toolkit/i18n/apw/es.po   |  54 ++++++++++++++++-------------------
 4 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/jka-toolkit/apw b/jka-toolkit/apw
index bfd60c4..1af6720 100755
--- a/jka-toolkit/apw
+++ b/jka-toolkit/apw
@@ -22,7 +22,7 @@ case "$1" in
 		echo
 		echo "$(gettext "	Usage: apw <option> [packages]")"
 		echo "$(gettext "	{-h | h} 	Show this help")"
-		echo "$(gettext "	{-U | U}	Update system")"
+		echo "$(gettext "	{-U | U}	Update system. If errors, you can do -Uf to force it")"
 		echo "$(gettext "	{-I | I}	Install packages (Updates system also for preventing problems)")"
 		echo "$(gettext "	{-Ir | Ir}	Reinstall packages (Updates system also for preventing problems)")"
 		echo "$(gettext "	{-R | R}	Removes a package")"
@@ -32,7 +32,6 @@ case "$1" in
 		echo "$(gettext "	{-S | S}	Search in package database")"
 		echo "$(gettext "	{-F | F}	Install file (distro family dependent, e.g. .deb , .pkg.tar.xz,...)")"
 		echo "$(gettext "	Append y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations")"
-		echo "$(gettext "	Append f to -U (-Uf) to force system update and ignore errors")"
 		exit
 		;;
 	"")
@@ -86,7 +85,7 @@ SO=$(cat /etc/apw.conf)
 #Reading packages to install/remove.. (The rest of $) , it has to be done before the option echo, logically
 packages=$2
 #Control the incompleted arguments
-if [ -z $package ];then
+if [[ -z $package && ( $1 != "*u" || $1 != "*c*" ) ]];then
 	echo "$(gettext "No package specified, aborting")"
 	exit
 fi
diff --git a/jka-toolkit/i18n/apw/apw.pot b/jka-toolkit/i18n/apw/apw.pot
index 1820b76..b332d68 100644
--- a/jka-toolkit/i18n/apw/apw.pot
+++ b/jka-toolkit/i18n/apw/apw.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 15:38+0200\n"
+"POT-Creation-Date: 2016-06-07 16:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgid "\t{-h | h} \tShow this help"
 msgstr ""
 
 #: apw:25
-msgid "\t{-U | U}\tUpdate system"
+msgid "\t{-U | U}\tUpdate system. If errors, you can do -Uf to force it"
 msgstr ""
 
 #: apw:26
@@ -78,102 +78,98 @@ msgstr ""
 msgid "\tAppend y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations"
 msgstr ""
 
-#: apw:35
-msgid "\tAppend f to -U (-Uf) to force system update and ignore errors"
-msgstr ""
-
-#: apw:39
+#: apw:38
 msgid "apw - A Packager Wrapper"
 msgstr ""
 
-#: apw:40 apw:275
+#: apw:39 apw:274
 msgid "Use apw -h for help"
 msgstr ""
 
-#: apw:48
+#: apw:47
 msgid "apw has to run as root, please run as root/with sudo"
 msgstr ""
 
-#: apw:53
+#: apw:52
 msgid "It's the first run of the program, we need a thing before continue"
 msgstr ""
 
-#: apw:54
+#: apw:53
 msgid "What, or in what is based your Linux?"
 msgstr ""
 
-#: apw:55
+#: apw:54
 msgid ""
 "(The answer will be recorded in /etc/apw.conf, if you want to reset apw, "
 "delete this file)"
 msgstr ""
 
-#: apw:90
+#: apw:89
 msgid "No package specified, aborting"
 msgstr ""
 
-#: apw:108
+#: apw:107
 msgid "Updating system"
 msgstr ""
 
-#: apw:121
+#: apw:120
 msgid "Force updating system"
 msgstr ""
 
-#: apw:128 apw:139
+#: apw:127 apw:138
 msgid "Not supported on your distribution. Doing -U instead"
 msgstr ""
 
-#: apw:143 apw:154
+#: apw:142 apw:153
 msgid "You are going to install %s and dependencies"
 msgstr ""
 
-#: apw:162
+#: apw:161
 msgid "Not supported on your distribution. Doing -I instead"
 msgstr ""
 
-#: apw:166 apw:177
+#: apw:165 apw:176
 msgid "You are going to reinstall %s"
 msgstr ""
 
-#: apw:184
+#: apw:183
 msgid "Not supported on your distribution. Doing -Ir instead"
 msgstr ""
 
-#: apw:188 apw:198
+#: apw:187 apw:197
 msgid "You are going to remove %s"
 msgstr ""
 
-#: apw:205
+#: apw:204
 msgid "Not supported on your distribution. Doing -R instead"
 msgstr ""
 
-#: apw:209 apw:218
+#: apw:208 apw:217
 msgid "Removing %s along with his dependencies that are not more in use"
 msgstr ""
 
-#: apw:215 apw:224 apw:241 apw:251
+#: apw:214 apw:223 apw:240 apw:250
 msgid "Not supported on your distribution"
 msgstr ""
 
-#: apw:227
+#: apw:226
 msgid "Cleaning package manager"
 msgstr ""
 
-#: apw:244
+#: apw:243
 msgid ""
 "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY "
 "ADVANCED)"
 msgstr ""
 
-#: apw:254
+#: apw:253
 msgid "Searching %s"
 msgstr ""
 
-#: apw:263
+#: apw:262
 msgid "Installing files: %s"
 msgstr ""
 
-#: apw:274
+#: apw:273
 msgid "Invalid option especified"
 msgstr ""
diff --git a/jka-toolkit/i18n/apw/es.mo b/jka-toolkit/i18n/apw/es.mo
index 0ddd0ab8a70ec5d6db26794a24fe344b354f651c..2d427a52d98e87618d1d44af9b88e99ec21aa6a2 100644
GIT binary patch
delta 932
zcmX}qO=uHA6u|M<ZCb6>R_jOntkarUkfwT2(nFP4D^{o!ziJf~)^uYF)m=7?P%pXE
zix&|Is6C4Xp$BuQ3W8_7v{%uRAU%uV#d?VUHyeB~`OVH|cHX?1&&l;fakV2>5+X_4
zPaA3wIf2s-KSZWc<P4t1gZK#d;wv1(Pj~_2F_B^Pa0C}|AO6ML`o2jdfe-K$&f^}D
zqI{)ugMr_;8%LW(F5)Ea#1FUwmyrpwhJ#qcP8{4I(v2=2$2rsuystn1tee=#W*EPY
zoAD*Kv%b8hvz>t@OyU>p#b0;;J6ob151=M^4Nqc#y5J%PRP6^2@qDE<O6&#p@ca(7
zA{D%eDOSIPk8y<c<vSfM{gEvqSv-eYsyC>mT}GQoo5(oN1E~Kmp&r3oJd7>vlo^kq
zR%RGS@h<B7B{aB-X{=$fpH6yfG!WEXzzpLRBx&i|7JWE{y6{=l65l~h^f_t;KO*0h
z71TtksFnJIdSvMi5eg+SntqoUvzLhi*w|H<4NDhI&s}%UQ47@-uE_sz=;?jXJEB3Z
z_JZoAi$AM6@o`N_)6qla64=878(JUAX6w-%4GCEax7luqvzJY@Lo^NDHrd-KKWPk|
zo<4IvXS^`<!+fuq^$RBJ-ZvAzNnOpE8Q<jmFzcDAnQ}w(TvPd5>r>}wpSe6`Cf(U+
gmdCW9;7xdWQ^>oaofo*Ft1}<E;j~}A*LExR4|H*9fB*mh

delta 977
zcmY+?%WD%+6u{x*G_l4sjg8tQ+SXfb>jNtaO5G^&fv7}cm5NGLhGs?-&5Sb<Q7Tao
zir}J93Wfd!g|3X?Rs>zR5wQqv6a_)t>Y@mOzcUjA58Qk=cV73LbAJ!K8EkyYC1!;f
zV)QV|D@69;q{R<$x=rLDj^YuV#!a|{8}JvN!)!w26uNjEpJ5sQ;6^-|6uGR|aR6Uo
zUZf#Em=syCR*GE29xUJ;9K~r|k6&>eE~DO`X%{(+Td@zX<7Rw}dvOspkuR<P`Bm|H
z8B44`#16hMFPUUnc#CWCGY;ZU+=<1MNG~2k&A5uX!3G|{In)n+K%eTRSH~5ZOp6?4
z{XOai3mt40M^Gzs1;_cmEHXKRsZ4xf9JLh-IDxNGOSYpkeo+N=Lp3~)Pf+jwhS~~?
zY=-axQet_4x`8>Y;B(aL?Q2NFFxkaq1S_~7r&|ACv|Pp#>$|(i4sW5p_&(}~XHiT2
z6m_HDQ7f6r#g*+xy?+mC#ZI8MZYn3PP%+^M(2F?quxNj`F!Uh}5{r7P=Rh-|r9zd3
zqwp^{hhj0hTPy5A3_~|qn0aUA8+v-kB+8xMMxhPW&?8M*q@O{#qhObkVCZ3>w^8bv
zo`%+6Q;Z^Y$oHLE)wrhanc*?BZFtPxu5;H5CL9yq4eQQLQ@HI{?Yd)Z?!0!j<^_&%
zg1`&HW~nW(nje#olEweu;M;+%@3?0NGhNxfZsWuc+JU*@h4Ir)*gTt_x0=13mlA&g
Df0Az=

diff --git a/jka-toolkit/i18n/apw/es.po b/jka-toolkit/i18n/apw/es.po
index 1deb808..f9f7fdf 100644
--- a/jka-toolkit/i18n/apw/es.po
+++ b/jka-toolkit/i18n/apw/es.po
@@ -31,8 +31,8 @@ msgid "\t{-h | h} \tShow this help"
 msgstr "\t{-h | h} \tMuestra esta ayuda"
 
 #: apw:25
-msgid "\t{-U | U}\tUpdate system"
-msgstr "\t{-U | U}\tActualiza el sistema"
+msgid "\t{-U | U}\tUpdate system. If errors, you can do -Uf to force it"
+msgstr "\t{-U | U}\tActualiza el sistema. Si hay errores, puedes usar -Uf para forzarlo"
 
 #: apw:26
 msgid ""
@@ -88,33 +88,29 @@ msgstr ""
 msgid "\tAppend y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations"
 msgstr "\tAñadir y a -U o -I (-Uy -Iy -Iry) para autoconfirmar la operación"
 
-#: apw:35
-msgid "\tAppend f to -U (-Uf) to force system update and ignore errors"
-msgstr "\tAñadir f to -U (-Uf) para forzar la actualización del sistema e ignorar los errores"
-
-#: apw:39
+#: apw:38
 msgid "apw - A Packager Wrapper"
 msgstr "apw - A Package Wrapper"
 
-#: apw:40 apw:275
+#: apw:39 apw:274
 msgid "Use apw -h for help"
 msgstr "Usa apw -h para ver la ayuda"
 
-#: apw:48
+#: apw:47
 msgid "apw has to run as root, please run as root/with sudo"
 msgstr "apw tiene que ejecutarse como root, por favor usalo como root/sudo"
 
-#: apw:53
+#: apw:52
 msgid "It's the first run of the program, we need a thing before continue"
 msgstr ""
 "Esta es la primera ejecución del programa, necesitamos algo antes de "
 "continuar"
 
-#: apw:54
+#: apw:53
 msgid "What, or in what is based your Linux?"
 msgstr "¿Qué o en qué está basado tu distribución Linux?"
 
-#: apw:55
+#: apw:54
 msgid ""
 "(The answer will be recorded in /etc/apw.conf, if you want to reset apw, "
 "delete this file)"
@@ -122,59 +118,59 @@ msgstr ""
 "(La respuesta será guardada en /etc/apw.conf, si quieres resetear apw borra "
 "el fichero)"
 
-#: apw:90
+#: apw:89
 msgid "No package specified, aborting"
 msgstr "Ningún paquete especificado, cerrando"
 
-#: apw:108
+#: apw:107
 msgid "Updating system"
 msgstr "Actualizando el sistema"
 
-#: apw:121
+#: apw:120
 msgid "Force updating system"
 msgstr "Forzando la actualización del sistema"
 
-#: apw:128 apw:139
+#: apw:127 apw:138
 msgid "Not supported on your distribution. Doing -U instead"
 msgstr "No soportado en tu distribución. Usando -U en su lugar"
 
-#: apw:143 apw:154
+#: apw:142 apw:153
 msgid "You are going to install %s and dependencies"
 msgstr "Vas a instalar %s y sus dependencias"
 
-#: apw:162
+#: apw:161
 msgid "Not supported on your distribution. Doing -I instead"
 msgstr "No soportado en tu distribución. Usando -I en su lugar"
 
-#: apw:166 apw:177
+#: apw:165 apw:176
 msgid "You are going to reinstall %s"
 msgstr "Vas a reinstalar %s"
 
-#: apw:184
+#: apw:183
 msgid "Not supported on your distribution. Doing -Ir instead"
 msgstr "No soportado en tu distribución. Usando -Ir en su lugar"
 
-#: apw:188 apw:198
+#: apw:187 apw:197
 msgid "You are going to remove %s"
 msgstr "Vas a borrar %s"
 
-#: apw:205
+#: apw:204
 msgid "Not supported on your distribution. Doing -R instead"
 msgstr "No soportado en tu distribución. Usando -R en su lugar"
 
-#: apw:209 apw:218
+#: apw:208 apw:217
 msgid "Removing %s along with his dependencies that are not more in use"
 msgstr "Quitando %s junto con las dependencias que no están más en uso"
 
-#: apw:215 apw:224 apw:241 apw:251
+#: apw:214 apw:223 apw:240 apw:250
 msgid "Not supported on your distribution"
 msgstr "No soportado en tu distribución"
 
-#: apw:227
+#: apw:226
 msgid "Cleaning package manager"
 msgstr "Limpiando gestor de paquetes"
 
-#: apw:244
+#: apw:243
 msgid ""
 "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY "
 "ADVANCED)"
@@ -182,14 +178,14 @@ msgstr ""
 "Limpiar el sistema de dependencias que no están en uso (CUIDADO, SOLO "
 "EXPERIMENTADOS)"
 
-#: apw:254
+#: apw:253
 msgid "Searching %s"
 msgstr "Buscando %s"
 
-#: apw:263
+#: apw:262
 msgid "Installing files: %s"
 msgstr "Instalando archivos: %s"
 
-#: apw:274
+#: apw:273
 msgid "Invalid option especified"
 msgstr "Opción inválida seleccionada"