v0.2 - Add localization

README.md

 # Create new folder from selected files
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 ## Dolphin service menu addon 
-=======
-## Dolphin service menu addon
->>>>>>> 43a562e... Update README.md
-=======
-## Dolphin service menu addon
->>>>>>> 43a562e... Update README.md
 
-=======
->>>>>>> ecdacf6... Add localization
-=======
-## Dolphin service menu addon 
-
->>>>>>> d248411... readme
-[Addon on Pling](https://www.pling.com/p/1560212/)
-
-### Feature:
-
-- Written on bash with kdialog
-<<<<<<< HEAD
-<<<<<<< HEAD
-- Auto detect exists folder
-- Localizable
-
-### Install:
-
-Copy files `s2fLocalization.sh`, `selected2folder.desktop` and `selected2folder.s` to `~/.local/share/kservices5/ServiceMenus/selected2folder.sh`
-=======
-=======
->>>>>>> 77132b0... Up readme
-Written on bash with kdialog and detect existed folder.
-
-### Install:
-
-Copy files s2fLocalization.sh, selected2folder.desktop and selected2folder.sh to ~/.local/share/kservices5/ServiceMenus/selected2folder.sh
-<<<<<<< HEAD
->>>>>>> 77132b0... Up readme
-=======
-=======
-=======
-## Dolphin service menu addon 
-
->>>>>>> 51ce04e... readme
-[Addon on Pling](https://www.pling.com/p/1560212/)
-
->>>>>>> 0b9a51d... Up readme
-### Feature:
-
-- Written on bash with kdialog
-- Auto detect exists folder
-=======
-
-- Auto detect exists folder
-
->>>>>>> ecdacf6... Add localization
-=======
-- Auto detect exists folder
->>>>>>> d248411... readme
-- Localizable
-
-### Install:
-
-Copy files `s2fLocalization.sh`, `selected2folder.desktop` and `selected2folder.s` to `~/.local/share/kservices5/ServiceMenus/selected2folder.sh`
-<<<<<<< HEAD
->>>>>>> 8f70121... Up readme
-=======
->>>>>>> ecdacf6... Add localization
-=======
->>>>>>> 77132b0... Up readme
-=======
-=======
-=======
-## Dolphin service menu addon 
-
->>>>>>> 51ce04e... readme
 [Addon on Pling](https://www.pling.com/p/1560212/)
 
->>>>>>> 0b9a51d... Up readme
 ### Feature:
 
 - Written on bash with kdialog
@@ -99,4 +13,3 @@ Copy files `s2fLocalization.sh`, `selected2folder.desktop` and `selected2folder.
 ### Install:
 
 Copy files `s2fLocalization.sh`, `selected2folder.desktop` and `selected2folder.s` to `~/.local/share/kservices5/ServiceMenus/selected2folder.sh`
->>>>>>> 8f70121... Up readme

selected2folder/s2fLocalization.sh

@@ -23,28 +23,8 @@ function set_name()
     esac
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Standart system name for new folder
-=======
->>>>>>> 17a6744... Add localization
-=======
-#Standart system name for new folder
->>>>>>> 51ce04e... readme
-=======
->>>>>>> ecdacf6... Add localization
-=======
-#Standart system name for new folder
->>>>>>> d248411... readme
-=======
->>>>>>> 17a6744... Add localization
-=======
+
 #Standart system name for new folder
->>>>>>> 51ce04e... readme
 function def_name()
 {
     case "$first_locale" in

selected2folder/selected2folder.desktop

@@ -8,17 +8,5 @@ Actions=selected2newfolder
 Name=Create folder from selected
 Name[nl]=Map aanmaken met selectie
 Name[ru]=Переместить в новую папку
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 Exec=$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh %F .
-=======
-Exec=DIR=`sh "$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh"` && cd "$DIR" && mv %F .
->>>>>>> d77db7f... fix home folder
-=======
-Exec=$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh %F .
->>>>>>> ecdacf6... Add localization
-=======
-Exec=$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh %F .
->>>>>>> 17a6744... Add localization
 Icon=folder

selected2folder/selected2folder.sh

 #!/bin/bash
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 . $HOME/.local/share/kservices5/ServiceMenus/s2fLocalization.sh
 
 NAME="$(def_name)"
@@ -11,50 +8,11 @@ then
 NAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NAME" --geometry 450x300`
 # mkdir "$NAME" && printf "$NAME"
 mkdir "$NAME" && cd "$NAME" && mv "$@"
-=======
-NAME="New folder"
-if [ ! -d "$NAME" ]
-then
-NAME=`kdialog --title "$NAME" --inputbox "Folder name" "$NAME" --geometry 450x300`
-mkdir "$NAME" && printf "$NAME"
->>>>>>> 125161b... optim
-=======
-. $HOME/.local/share/kservices5/ServiceMenus/s2fLocalization.sh
-
-NAME="$(def_name)"
-if [ ! -d "$NAME" ]
-then
-NAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NAME" --geometry 450x300`
-# mkdir "$NAME" && printf "$NAME"
-mkdir "$NAME" && cd "$NAME" && mv "$@"
->>>>>>> ecdacf6... Add localization
-=======
-. $HOME/.local/share/kservices5/ServiceMenus/s2fLocalization.sh
-
-NAME="$(def_name)"
-if [ ! -d "$NAME" ]
-then
-NAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NAME" --geometry 450x300`
-# mkdir "$NAME" && printf "$NAME"
-mkdir "$NAME" && cd "$NAME" && mv "$@"
->>>>>>> 17a6744... Add localization
 else
 NEWNAME=$NAME
 if [ ! -d "$NEWNAME" ]
 then
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-mkdir "$NAME" && cd "$NAME" && mv "$@"
-=======
-mkdir "$NAME" && printf "$NAME"
->>>>>>> 125161b... optim
-=======
 mkdir "$NAME" && cd "$NAME" && mv "$@"
->>>>>>> ecdacf6... Add localization
-=======
-mkdir "$NAME" && cd "$NAME" && mv "$@"
->>>>>>> 17a6744... Add localization
 else
 while [ -d "$NEWNAME" ]
 do
@@ -64,38 +22,10 @@ do
 NUM="$(($NUM+1))"
 NEWNAME="$NAME"\ "($NUM)"
 done
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-NEWNAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NEWNAME" --geometry 450x300`
-NAME=$NEWNAME
-done
-NAME=$NEWNAME
-mkdir "$NAME" && cd "$NAME" && mv "$@"
-=======
-NEWNAME=`kdialog --title "$NAME" --inputbox "3Folder $NEWNAME exist" "$NEWNAME" --geometry 450x300`
-=======
-NEWNAME=`kdialog --title "$NAME" --inputbox "Folder $NEWNAME exist" "$NEWNAME" --geometry 450x300`
->>>>>>> 238b5d7... optim
-NAME=$NEWNAME
-done
-NAME=$NEWNAME
-mkdir "$NAME" && printf "$NAME"
->>>>>>> 125161b... optim
-=======
-NEWNAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NEWNAME" --geometry 450x300`
-NAME=$NEWNAME
-done
-NAME=$NEWNAME
-mkdir "$NAME" && cd "$NAME" && mv "$@"
->>>>>>> ecdacf6... Add localization
-=======
 NEWNAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NEWNAME" --geometry 450x300`
 NAME=$NEWNAME
 done
 NAME=$NEWNAME
 mkdir "$NAME" && cd "$NAME" && mv "$@"
->>>>>>> 17a6744... Add localization
 fi
 fi