From 7f45cbcd7d47e8de9fccbecd28b823ec81229ead Mon Sep 17 00:00:00 2001
From: Kevin Puertas <kevin01010@gmail.com>
Date: Sat, 25 Feb 2017 13:15:30 +0100
Subject: [PATCH] Translate, for internationalize

---
 jka-toolkit/.gitdit.swp | Bin 20480 -> 0 bytes
 jka-toolkit/gitdit      |  28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 jka-toolkit/.gitdit.swp

diff --git a/jka-toolkit/.gitdit.swp b/jka-toolkit/.gitdit.swp
deleted file mode 100644
index 6074d3bf85727447acadb42799d88c8e629c0f01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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
SEb00|R>pMkV5xX7<o7?(7sWgP

diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit
index 230ebd3..96cec83 100755
--- a/jka-toolkit/gitdit
+++ b/jka-toolkit/gitdit
@@ -2,13 +2,13 @@
 # gitdit, a dialog interface to manage git repositories
 # Author: JKA Network - contacto@jkanetwork.com
 
-VERSION="1.0.3"
+VERSION="1.0.4"
 #First check if the user is in a git repository
 preOption=$(git status 2>/dev/stdout | sed -n 1p | cut -f2 -d" ")
 if [ $preOption = "Not" ];then #When it isn't only it can do git clone
-gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface $VERSION" 0 0 6 c "Descargar un nuevo repo (Hacer clone)" i "Inicializar nuevo repo"`
+gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface $VERSION" 0 0 6 c "Download new repository (Do clone)" i "Make a new empty repo"`
 else #Else, all other options
-	gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" t "Confirmar cambios sin subida" s "Subir actualizaciones al git (Hacer push)" n "Crear nueva rama" b "Cambiar de rama " m "Unir ramas (Hacer merge)"`
+	gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Download repo updates (git pull)" t "Make commit without upload" s "Make commit if necc. and upload changes (git push)" n "Create new branch" b "Change branch" m "Merge branch (Do in branch you want to merge)"`
 	actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")" #Current branch
 	actual2=$(git branch --list | grep "^*" | cut -f2 -d" ") #Current branch name
 fi
@@ -16,7 +16,7 @@ if [ ! -z $gitopt ];then #No canceled
 case $gitopt in
 	#Not staying in a git repo
 	"i")
-	gitdir=`dialog --stdout --inputbox  "Directorio del repositorio" 10 60 "."`
+	gitdir=`dialog --stdout --inputbox  "Repo directory" 10 60 "."`
 	if [ $(echo $gitdir | cut -f1 -d"/") = "~" ];then #~ don't understand like $HOME
 	gitdirdef="$HOME"
 	for (( i=2; i<=$cant; i++ ))
@@ -34,7 +34,7 @@ if [ ! -d $gitdir ];then
 	mkdir -p $gitdirdef
 fi
 if [ $? -eq 1 ];then
-	echo "No tienes permiso para escribir en ese directorio" >> /dev/stderr
+	echo "You dont have permission to write in this directory" >> /dev/stderr
 else
 	cd $gitdirdef
 	git init
@@ -43,7 +43,7 @@ fi
 "c")
 giturl=`dialog --stdout --inputbox  "URL del git" 10 60`
 if [ -z $giturl ];then
-	echo "Ningún repositorio especificado"
+	echo "No repository there."
 	exit
 fi
 git clone $giturl
@@ -54,24 +54,24 @@ git pull $actual;;
 "s")
 estado=$(git status | grep -E '(^Changes|^Untracked)' ) #It need to commit something?
 if [ "$estado" ];then #When is necesary commit
-commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
+commit=`dialog --stdout --inputbox  "Changes text: " 10 50 "changes"`
 if [[ -z $commit ]];then
 	commit="changes"
 fi
-git add . && git commit -m "$commit" && git push $actual
+git add -A && git commit -m "$commit" && git push $actual
 else #Nothing to commit, only push
 	git push $actual
 fi
 ;;
 "t")
-commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
+commit=`dialog --stdout --inputbox  "Changes text: " 10 50 "changes"`
 if [[ -z $commit ]];then
 	commit="changes"
 fi
-git add . && git commit -m "$commit"
+git add -A && git commit -m "$commit"
 ;;
 "b")
-howopt=`dialog --stdout --scrollbar --menu "Cambiar de rama" 0 0 6 c "Solo cambiar de rama" u "Cambiar de rama y actualizarla"`
+howopt=`dialog --stdout --scrollbar --menu "Change branch" 0 0 6 c "Only change branch" u "Change branch and update it"`
 if [ -z $howopt ];then
 	exit
 fi
@@ -103,7 +103,7 @@ do
 		let j++
 	fi
 done
-ramificacion=`dialog --stdout --scrollbar --menu "Selecione la rama a saltar" 0 0 6 $rama`
+ramificacion=`dialog --stdout --scrollbar --menu "Select branch to goto" 0 0 6 $rama`
 if [ ! -z $ramificacion ];then
 	git checkout ${lista[$ramificacion]}
 	if [ $howopt = "u" ];then
@@ -112,7 +112,7 @@ if [ ! -z $ramificacion ];then
 fi
 ;;
 "n")
-NewBranch=`dialog --stdout --inputbox  "Nombre de la nueva rama" 10 50 "new branch"`
+NewBranch=`dialog --stdout --inputbox  "Name of the new branch" 10 50 "New branch"`
 if [ ! -z $NewBranch ];then
 	git checkout -b $NewBranch
 fi
@@ -128,7 +128,7 @@ do
 		let j++
 	fi
 done
-merges=`dialog --stdout --scrollbar --menu "Selecione la rama a unir a $(git branch --list | grep "^*" | cut -f2 -d" ")" 0 0 6 $rama`
+merges=`dialog --stdout --scrollbar --menu "Select branch for merge to $(git branch --list | grep "^*" | cut -f2 -d" ")" 0 0 6 $rama`
 if [ ! -z $merges ];then
 	git merge ${lista[$merges]}
 	git push $actual