diff --git a/Turbo Editor/build.gradle b/Turbo Editor/build.gradle
index 92114cb..c389acc 100644
--- a/Turbo Editor/build.gradle	
+++ b/Turbo Editor/build.gradle	
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
+        classpath 'com.android.tools.build:gradle:0.6.+'
     }
 }
 apply plugin: 'android'
@@ -17,14 +17,15 @@ android {
     buildToolsVersion "18.1.0"
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 18
+        minSdkVersion 15
     }
 }
 
 dependencies {
     compile 'com.github.gabrielemariotti.changeloglib:library:1.2.0'
+    compile 'commons-io:commons-io:2.4'
     compile 'com.android.support:support-v13:18.0.0'
-    compile "commons-io:commons-io:2.4"
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile ('de.greenrobot:eventbus:2.1.0-beta-1') {
+        exclude module: 'support-v4'
+    }
 }
diff --git a/Turbo Editor/libs/eventbus-2.0.2.jar b/Turbo Editor/libs/eventbus-2.0.2.jar
deleted file mode 100644
index 183228f..0000000
Binary files a/Turbo Editor/libs/eventbus-2.0.2.jar and /dev/null differ
diff --git a/Turbo Editor/src/main/AndroidManifest.xml b/Turbo Editor/src/main/AndroidManifest.xml
index 62520f4..14c8b02 100644
--- a/Turbo Editor/src/main/AndroidManifest.xml	
+++ b/Turbo Editor/src/main/AndroidManifest.xml	
@@ -20,12 +20,12 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.vmihalachi.turboeditor"
-    android:versionCode="6"
-    android:versionName="1.2"
+    android:versionCode="7"
+    android:versionName="1.3"
     android:installLocation="auto">
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="15"
         android:targetSdkVersion="18" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditorFragment.java b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditorFragment.java
index 863d85c..c714e61 100644
--- a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditorFragment.java	
+++ b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditorFragment.java	
@@ -75,7 +75,7 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
     private Editor mEditor;
 
     // Editor Variables
-    static boolean sWrapText;
+    static boolean sLineNumbers;
     static boolean sColorSyntax;
     static int sFontSize;
     //
@@ -104,7 +104,7 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
         this.mCurrentEncoding = PreferenceHelper.getEncoding(getActivity());
         this.mUseMonospace = PreferenceHelper.getUseMonospace(getActivity());
         this.sColorSyntax = PreferenceHelper.getSyntaxHiglight(getActivity());
-        this.sWrapText = PreferenceHelper.getWrapText(getActivity());
+        this.sLineNumbers = PreferenceHelper.getLineNumbers(getActivity());
         this.sFontSize = PreferenceHelper.getFontSize(getActivity());
     }
 
@@ -116,8 +116,7 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_editor, container, false);
         mEditor = (Editor) rootView.findViewById(R.id.editor);
-        mEditor.setHorizontallyScrolling(!this.sWrapText);
-        if (!this.sWrapText) {
+        if (this.sLineNumbers) {
             int paddingLeft = (int) PixelDipConverter.convertDpToPixel(sFontSize * 1.5f, getActivity());
             mEditor.setPadding(paddingLeft, 0, 0, 0);
         } else {
@@ -159,7 +158,7 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.fragment_editor, menu);
-        menu.findItem(R.id.im_wrap_text).setChecked(this.sWrapText);
+        menu.findItem(R.id.im_line_numbers).setChecked(this.sLineNumbers);
         menu.findItem(R.id.im_syntax_highlight).setChecked(this.sColorSyntax);
         menu.findItem(R.id.im_use_monospace).setChecked(this.mUseMonospace);
         super.onCreateOptionsMenu(menu, inflater);
@@ -195,9 +194,9 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
             item.setChecked(!item.isChecked());
             PreferenceHelper.setSyntaxHiglight(getActivity(), item.isChecked());
             updateTextEditor();
-        } else if (i == R.id.im_wrap_text) {
+        } else if (i == R.id.im_line_numbers) {
             item.setChecked(!item.isChecked());
-            PreferenceHelper.setWrapText(getActivity(), item.isChecked());
+            PreferenceHelper.setLineNumbers(getActivity(), item.isChecked());
             updateTextEditor();
         } else if (i == R.id.im_use_monospace) {
             item.setChecked(!item.isChecked());
@@ -228,17 +227,16 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
     }
 
     private void updateTextEditor() {
-        final boolean wrapText = PreferenceHelper.getWrapText(getActivity());
+        final boolean wrapText = PreferenceHelper.getLineNumbers(getActivity());
         final boolean syntaxHighlight = PreferenceHelper.getSyntaxHiglight(getActivity());
         final boolean useMonospace = PreferenceHelper.getUseMonospace(getActivity());
         final String encoding = PreferenceHelper.getEncoding(getActivity());
         final int fontSize = PreferenceHelper.getFontSize(getActivity());
 
-        if (this.sWrapText != wrapText) {
-            this.sWrapText = wrapText;
+        if (this.sLineNumbers != wrapText) {
+            this.sLineNumbers = wrapText;
             this.mEditor.setText(this.mEditor.getText().toString());
-            this.mEditor.setHorizontallyScrolling(!this.sWrapText);
-            if (!this.sWrapText) {
+            if (this.sLineNumbers) {
                 int paddingLeft = (int) PixelDipConverter.convertDpToPixel(sFontSize * 1.5f, getActivity());
                 mEditor.setPadding(paddingLeft, 0, 0, 0);
             } else {
@@ -311,15 +309,11 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
                 ID_PASTE = android.R.id.paste,
                 ID_UNDO = R.id.im_undo,
                 ID_REDO = R.id.im_redo;
-        private static final int SYNTAX_DELAY_MILLIS =
-                0;
-        private final Handler updateHandler =
-                new Handler();
-        private final TextPaint mPaintNumbers =
-                new TextPaint();
-        //private final Rect mLineBounds = new Rect();
-        private final float mScale;
+        private static final int SYNTAX_DELAY_MILLIS = 800;
+        private final Handler updateHandler = new Handler();
+        private final TextPaint mPaintNumbers = new TextPaint();
         private boolean modified = true;
+        private boolean firstTimeColoring = true;
 
         /**
          * Is undo/redo being performed? This member
@@ -348,31 +342,23 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
                      */
                     @Override
                     public void run() {
-                        replaceTextKeepCursor(getText());
+                            replaceTextKeepCursor(getText());
                     }
                 };
 
         public Editor(Context context,
                       AttributeSet attrs) {
             super(context, attrs);
-            this.mScale = context.getResources()
-                    .getDisplayMetrics().density;
             init();
         }
 
         // Init the class
         private void init() {
             mEditHistory = new EditHistory();
-            mChangeListener =
-                    new EditTextChangeListener();
+            mChangeListener = new EditTextChangeListener();
             addTextChangedListener(mChangeListener);
 
-            this.mPaintNumbers
-                    .setColor(
-                            getTextColors().getDefaultColor());
-            this.mPaintNumbers
-                    .setTextSize(
-                           sFontSize);
+            this.mPaintNumbers.setColor(getTextColors().getDefaultColor());
             this.mPaintNumbers.setAntiAlias(true);
 
             // Syntax editor
@@ -407,7 +393,8 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
         @Override
         public void setTextSize(float size) {
             super.setTextSize(size);
-            this.mPaintNumbers.setTextSize(sFontSize);
+            final float scale = getContext().getResources().getDisplayMetrics().density;
+            this.mPaintNumbers.setTextSize((int) (size * scale * 0.5f));
         }
 
         /**
@@ -463,7 +450,7 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
          */
         @Override
         public void onDraw(final Canvas canvas) {
-            if (!EditorFragment.sWrapText) {
+            if (EditorFragment.sLineNumbers) {
                 final int max = getLineCount();
                 final TextPaint paint = mPaintNumbers;
                 for (int min = 0; min < max; min++) {
@@ -559,22 +546,19 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
         private void replaceTextKeepCursor(
                 Editable e) {
             int p = getSelectionStart();
+            disconnect();
+            modified = false;
 
-            replaceText(e);
+            setText(highlight(e));
+
+            modified = true;
+            addTextChangedListener(mChangeListener);
 
             if (p > -1) {
                 setSelection(p);
             }
         }
 
-        private void replaceText(Editable e) {
-            disconnect();
-            modified = false;
-            setText(highlight(e));
-            modified = true;
-            addTextChangedListener(mChangeListener);
-        }
-
         private CharSequence highlight(Editable editable) {
             final String fileExtension = FilenameUtils.getExtension(EditorFragment.sFilePath);
             editable.clearSpans();
@@ -599,6 +583,13 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
                 color(Patterns.GENERAL_KEYWORDS, editable);
                 color(Patterns.NUMBERS, editable);
                 color(Patterns.GENERAL_COMMENTS, editable);
+            } else if (fileExtension.equals("php")){
+                color(Patterns.HTML_OPEN_TAGS, editable);
+                color(Patterns.HTML_CLOSE_TAGS, editable);
+                color(Patterns.HTML_ATTRS, editable);
+                color(Patterns.GENERAL_KEYWORDS, editable);
+                color(Patterns.NUMBERS, editable);
+                color(Patterns.GENERAL_COMMENTS, editable);
             } else {
                 color(Patterns.GENERAL_KEYWORDS, editable);
                 color(Patterns.NUMBERS, editable);
@@ -1035,10 +1026,13 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD
                 if (!EditorFragment.sColorSyntax || !modified) {
                     return;
                 }
-
-                updateHandler.postDelayed(
-                        updateRunnable,
-                        SYNTAX_DELAY_MILLIS);
+                if(firstTimeColoring){
+                    firstTimeColoring = false;
+                    updateHandler.post(updateRunnable);
+                } else {
+                    updateHandler.removeCallbacks(updateRunnable);
+                    updateHandler.postDelayed(updateRunnable, SYNTAX_DELAY_MILLIS);
+                }
             }
         }
     }
diff --git a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/NavigationDrawerListFragment.java b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/NavigationDrawerListFragment.java
index 2af0c14..d3dd7d9 100644
--- a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/NavigationDrawerListFragment.java	
+++ b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/NavigationDrawerListFragment.java	
@@ -46,6 +46,7 @@ import java.util.List;
 
 import de.greenrobot.event.EventBus;
 
+
 public class NavigationDrawerListFragment extends ListFragment implements AbsListView.MultiChoiceModeListener {
 
     private List<String> fileNames;
diff --git a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/SeekbarDialogFragment.java b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/SeekbarDialogFragment.java
index 62c7b17..04e70d5 100644
--- a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/SeekbarDialogFragment.java	
+++ b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/SeekbarDialogFragment.java	
@@ -57,7 +57,7 @@ public class SeekbarDialogFragment extends DialogFragment {
         final String title;
         switch (action) {
             case FileSize:
-                title = getString(R.string.text_size);
+                title = getString(R.string.font_size);
                 break;
             default:
                 title = null;
diff --git a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/helper/PreferenceHelper.java b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/helper/PreferenceHelper.java
index ca615db..7a3bca0 100644
--- a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/helper/PreferenceHelper.java	
+++ b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/helper/PreferenceHelper.java	
@@ -45,8 +45,8 @@ public final class PreferenceHelper {
         return getPrefs(context).getBoolean("use_monospace", false);
     }
 
-    public static boolean getWrapText(Context context) {
-        return getPrefs(context).getBoolean("editor_wrap_text", true);
+    public static boolean getLineNumbers(Context context) {
+        return getPrefs(context).getBoolean("editor_line_numbers", true);
     }
 
     public static boolean getSyntaxHiglight(Context context) {
@@ -75,8 +75,8 @@ public final class PreferenceHelper {
         getEditor(context).putBoolean("use_monospace", value).commit();
     }
 
-    public static void setWrapText(Context context, boolean value) {
-        getEditor(context).putBoolean("editor_wrap_text", value).commit();
+    public static void setLineNumbers(Context context, boolean value) {
+        getEditor(context).putBoolean("editor_line_numbers", value).commit();
     }
 
     public static void setSyntaxHiglight(Context context, boolean value) {
diff --git a/Turbo Editor/src/main/res/layout/fragment_editor.xml b/Turbo Editor/src/main/res/layout/fragment_editor.xml
index d4edf33..732a3b6 100644
--- a/Turbo Editor/src/main/res/layout/fragment_editor.xml	
+++ b/Turbo Editor/src/main/res/layout/fragment_editor.xml	
@@ -24,18 +24,22 @@
         android:scrollbars="vertical"
         android:fillViewport="true">
 
+    <HorizontalScrollView
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:scrollbars="horizontal"
+        android:fillViewport="true">
+
         <view
             class="com.vmihalachi.turboeditor.fragment.EditorFragment$Editor"
             android:id="@id/editor"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:background="@null"
             android:bufferType="normal"
             android:gravity="top|left"
-            android:imeOptions="actionDone|flagNoFullscreen"
-            android:inputType="textMultiLine|textImeMultiLine|textNoSuggestions"
-            android:maxLength="@integer/editor_max_file_size"
+            android:inputType="textMultiLine|textNoSuggestions|textImeMultiLine"
             android:singleLine="false"
             android:text="@null" />
-    </ScrollView>
-
+    </HorizontalScrollView>
+</ScrollView>
diff --git a/Turbo Editor/src/main/res/menu/fragment_editor.xml b/Turbo Editor/src/main/res/menu/fragment_editor.xml
index e167ea6..04d5dc2 100644
--- a/Turbo Editor/src/main/res/menu/fragment_editor.xml	
+++ b/Turbo Editor/src/main/res/menu/fragment_editor.xml	
@@ -41,9 +41,9 @@
             android:showAsAction="ifRoom|withText">
         <menu>
             <item
-                    android:id="@id/im_wrap_text"
+                    android:id="@id/im_line_numbers"
                     android:showAsAction="ifRoom"
-                    android:title="@string/wrap_the_text"
+                    android:title="@string/line_numbers"
                     android:checkable="true"/>
             <item
                     android:id="@id/im_syntax_highlight"
@@ -62,7 +62,7 @@
             <item
                 android:id="@id/im_text_size"
                 android:showAsAction="ifRoom"
-                android:title="@string/text_size"/>
+                android:title="@string/font_size"/>
         </menu>
     </item>
 </menu>
diff --git a/Turbo Editor/src/main/res/raw/changelog.xml b/Turbo Editor/src/main/res/raw/changelog.xml
index cd08156..f34b152 100644
--- a/Turbo Editor/src/main/res/raw/changelog.xml	
+++ b/Turbo Editor/src/main/res/raw/changelog.xml	
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
 
+    <changelogversion versionName="1.3" changeDate="Oct 31, 2013">
+        <changelogtext>Various optimizations</changelogtext>
+        <changelogtext>Fixed some bugs</changelogtext>
+        <changelogtext>[b]Note[/b] in the future will add better syntax support</changelogtext>
+    </changelogversion>
+
     <changelogversion versionName="1.2" changeDate="Oct 10, 2013">
         <changelogtext>Now you can change the font size</changelogtext>
     </changelogversion>
diff --git a/Turbo Editor/src/main/res/values-de-rDE/strings.xml b/Turbo Editor/src/main/res/values-de-rDE/strings.xml
index 96c2212..fd3ae7a 100644
--- a/Turbo Editor/src/main/res/values-de-rDE/strings.xml	
+++ b/Turbo Editor/src/main/res/values-de-rDE/strings.xml	
@@ -34,7 +34,7 @@
   <string name="passiva">Passiver Modus</string>
   <string name="passphrase">Passphrase</string>
   <string name="password">Kennwort</string>
-  <string name="password_summary">Leave it empty to prompt for it every session</string>
+  <string name="password_summary">Leer lassen, um die Eingabe für jede Sitzung zu veranlassen</string>
   <string name="porta">Port</string>
   <string name="preferenze">Einstellungen</string>
   <string name="remoto">Remote</string>
@@ -46,7 +46,7 @@
   <string name="seleziona">Auswählen</string>
   <string name="seleziona_account">Benutzerkonto auswählen</string>
   <string name="sicuro">Sind sie sicher?</string>
-  <string name="something_failed">Something failed</string>
+  <string name="something_failed">Ups. Etwas ist schief gelaufen</string>
   <string name="skip_same_file">Dieselbe Datei nicht übertragen</string>
   <string name="tema_app">Design</string>
   <string name="tipo_connessione">Verbindungsart</string>
@@ -56,7 +56,6 @@
   <string name="upload">Hochladen</string>
   <string name="upload_completato">Hochladen abgeschlossen</string>
   <string name="what_to_do">Was möchten Sie tun?</string>
-  <string name="wrap_the_text">Zeilenumbruch</string>
   <string name="menu_syntax_highlight">Syntax Hervorhebung</string>
   <string name="testo_indietro">Ungeschehen machen</string>
   <string name="testo_rifai">Rückgängig machen</string>
@@ -76,9 +75,9 @@
   <string name="inapp_unlock_features">Premium Funktionen freischalten</string>
   <string name="inapp_seconditem_description">Ich mag diese App!</string>
   <string name="inapp_thirditem_description">Ich liebe diese App!</string>
-  <string name="backup_accounts">Backup the accounts</string>
+  <string name="backup_accounts">Konten sichern</string>
   <string name="restore_accounts">Accounts wiederherstellen</string>
-  <string name="share_accounts">Backup and share the accounts</string>
+  <string name="share_accounts">Sichern Sie und teilen Sie die Konten</string>
   <string name="importing_accounts">Konten werden importiert...</string>
   <string name="exporting_accounts">Konten werden exportiert...</string>
   <string name="backup_not_found">Keine Sicherungen gefunden</string>
@@ -95,8 +94,7 @@
   <string name="open">Öffnen</string>
   <string name="file_modified">Die Datei %1$s wurde geändert? Möchten Sie sie hochladen?</string>
   <string name="file_saved_with_success">Die Datei %1$s wurde erfolgreich gespeichert!</string>
-  <string name="number_of_things_selected">%1$d ausgewählt</string>
-  <string name="crea_file_remoto">New remote file</string>
+  <string name="crea_file_remoto">Neue Remote-Datei</string>
   <string name="new_local_file">Neue lokale Datei</string>
   <string name="create_new_account">Erstelle ein neues Benutzerkonto</string>
   <string name="create_new_account_to_start">Erstellen Sie ein neues Konto um zu starten.</string>
@@ -111,12 +109,14 @@
   <string name="unit_measurement_for_file_size">Maßeinheit für Dateigröße</string>
   <string name="open_source_license">Open Source Lizenzen</string>
   <string name="open_source_license_summary">Open-Source-Lizenzen anzeigen</string>
-  <string name="show_navigation_breadcrumb">Show navigation breadcrumb</string>
   <string name="open_a_file">Datei öffnen</string>
   <string name="open_this_time_only">Nur dieses Mal öffnen</string>
-  <string name="advise_editor_title">Are you missing Turbo Editor?</string>
+  <string name="advise_editor_title">Fehlt Turbo-Editor?</string>
   <string name="advise_editor_subtitle">Der beste freie und Open Source Dateieditor!</string>
-  <string name="change_list_type">Change the list type</string>
-  <string name="use_monospace">Use monospace</string>
-  <string name="recent_files">Recent files</string>
+  <string name="change_list_type">Ändern Sie den Typ der Liste</string>
+  <string name="use_monospace">Verwenden Sie Monospace</string>
+  <string name="recent_files">Zuletzt geöffnete Dateien</string>
+  <string name="font_size">Schriftgröße</string>
+  <string name="connection_name">Connection Name</string>
+  <string name="line_numbers">Line Numbers</string>
 </resources>
diff --git a/Turbo Editor/src/main/res/values-el-rGR/strings.xml b/Turbo Editor/src/main/res/values-el-rGR/strings.xml
index bf92969..3cafab5 100644
--- a/Turbo Editor/src/main/res/values-el-rGR/strings.xml	
+++ b/Turbo Editor/src/main/res/values-el-rGR/strings.xml	
@@ -56,7 +56,6 @@
   <string name="upload">Αποστολή</string>
   <string name="upload_completato">Το ανέβασμα ολοκληρώθηκε</string>
   <string name="what_to_do">Τι θέλετε να κάνετε;</string>
-  <string name="wrap_the_text">Αναδίπλωση κειμένου</string>
   <string name="menu_syntax_highlight">Επισήμανση σύνταξης</string>
   <string name="testo_indietro">Αναίρεση</string>
   <string name="testo_rifai">Ακύρωση αναίρεσης</string>
@@ -95,7 +94,6 @@
   <string name="open">Άνοιγμα</string>
   <string name="file_modified">Το αρχείο %1$s τροποποιήθηκε, θέλετε να το ανεβάσετε;</string>
   <string name="file_saved_with_success">Το αρχείο %1$s αποθηκεύτηκε με επιτυχία!</string>
-  <string name="number_of_things_selected">%1$d επιλέχθηκε</string>
   <string name="crea_file_remoto">Νέα απομακρυσμένο αρχείο</string>
   <string name="new_local_file">Νέο τοπικό αρχείο</string>
   <string name="create_new_account">Δημιουργία νέου λογαριασμού</string>
@@ -111,7 +109,6 @@
   <string name="unit_measurement_for_file_size">Μονάδα μέτρησης για το μέγεθος του αρχείου</string>
   <string name="open_source_license">Άδειες χρήσης ανοιχτού κώδικα</string>
   <string name="open_source_license_summary">Προβολή αδειών χρήσης ανοιχτού κώδικα</string>
-  <string name="show_navigation_breadcrumb">Εμφάνιση βοηθού πλοήγησης</string>
   <string name="open_a_file">Άνοιγμα αρχείου</string>
   <string name="open_this_time_only">Open this time only</string>
   <string name="advise_editor_title">Are you missing Turbo Editor?</string>
@@ -119,4 +116,7 @@
   <string name="change_list_type">Change the list type</string>
   <string name="use_monospace">Use monospace</string>
   <string name="recent_files">Recent files</string>
+  <string name="font_size">Font size</string>
+  <string name="connection_name">Connection Name</string>
+  <string name="line_numbers">Line Numbers</string>
 </resources>
diff --git a/Turbo Editor/src/main/res/values-es-rES/strings.xml b/Turbo Editor/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 0000000..52bbab0
--- /dev/null
+++ b/Turbo Editor/src/main/res/values-es-rES/strings.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string name="aggiungi_account">New account</string>
+  <string name="attiva">Activo</string>
+  <string name="cancella">Borrar</string>
+  <string name="cancellazione">Borrando ficheros…</string>
+  <string name="caricamento">Cargando…</string>
+  <string name="cartella_locale_corrente">Carpeta local actual</string>
+  <string name="chiave_privata">Clave privada</string>
+  <string name="chiaro">Claro</string>
+  <string name="codifica">Codificación</string>
+  <string name="condividi">Share</string>
+  <string name="crea_cartella_locale">New local folder</string>
+  <string name="crea_cartella_remota">New remote folder</string>
+  <string name="disconneti">Desconectar</string>
+  <string name="default_local_folder">Carpeta local por defecto</string>
+  <string name="dove_scaricare">Where to download?</string>
+  <string name="download">Descargar</string>
+  <string name="download_completato">Download completed</string>
+  <string name="duplicate">Duplicate</string>
+  <string name="fatto">Done</string>
+  <string name="home">Home</string>
+  <string name="host">Servidor</string>
+  <string name="info">Información</string>
+  <string name="locale">Local</string>
+  <string name="log_in">Iniciando sesión…</string>
+  <string name="modifica">Editar</string>
+  <string name="muovi">Mover</string>
+  <string name="nascondi">Ocultar</string>
+  <string name="nome_app">Turbo Client</string>
+  <string name="nome_app_turbo_editor">Turbo Editor</string>
+  <string name="nome_utente">Usuario</string>
+  <string name="passiva">Pasivo</string>
+  <string name="passphrase">Contraseña</string>
+  <string name="password">Contraseña</string>
+  <string name="password_summary">Déjelo en blanco para rellenarlo cada sesión</string>
+  <string name="porta">Puerto</string>
+  <string name="preferenze">Preferencias</string>
+  <string name="remoto">Remoto</string>
+  <string name="riavva_per_tema">Para cambiar el tema, reinicie la aplicación</string>
+  <string name="rinomina">Renombrar</string>
+  <string name="root">Raíz</string>
+  <string name="salva">Guardar</string>
+  <string name="scuro">Oscuro</string>
+  <string name="seleziona">Seleccionar</string>
+  <string name="seleziona_account">Elija una cuenta</string>
+  <string name="sicuro">¿Está seguro?</string>
+  <string name="something_failed">Algo falló</string>
+  <string name="skip_same_file">Do not transfer same file</string>
+  <string name="tema_app">Tema de la aplicación</string>
+  <string name="tipo_connessione">Tipo de conexión</string>
+  <string name="tipo_protocollo">Tipo de protocolo</string>
+  <string name="un_altra_cartella">Otra carpeta</string>
+  <string name="use_passphrase">Usa una contraseña</string>
+  <string name="upload">Enviar</string>
+  <string name="upload_completato">Subida completada</string>
+  <string name="what_to_do">What do you want todo?</string>
+  <string name="menu_syntax_highlight">Resaltado de sintaxis</string>
+  <string name="testo_indietro">Deshacer</string>
+  <string name="testo_rifai">Rehacer</string>
+  <string name="sync">Sincronizar</string>
+  <string name="remote_folder_to_sync">Carpeta remota a sincronizar</string>
+  <string name="local_folder_to_sync">Carpeta local a sincronizar</string>
+  <string name="vota">Vota</string>
+  <string name="inapp_unavailable">no podemos contactar a Google Play</string>
+  <string name="inapp_description">y apoyo del crecimiento de otras gran funciones</string>
+  <string name="upgrade_premium">Suba a Premium</string>
+  <string name="upgrade_premium_summary">Actualizar a Premium y apoyar el desarrollo de Turbo Client!</string>
+  <string name="download_unlocked_version">Download unlocked version</string>
+  <string name="inapp_second_description">¿Que es Turbo Client? ¿Vale la pena? Fije su precio!</string>
+  <string name="inapp_first_description">Actualice para desbloquear estas características:</string>
+  <string name="inapp_item_openandeditfiles">habilidad de abrir y modificar cualquier tipo de archivo</string>
+  <string name="inapp_item_backup_service">Backup service to backup and restore your data safely. </string>
+  <string name="inapp_unlock_features">Unlock the Premium features</string>
+  <string name="inapp_seconditem_description">I really like this app!</string>
+  <string name="inapp_thirditem_description">I love this app!</string>
+  <string name="backup_accounts">Backup the accounts</string>
+  <string name="restore_accounts">Restore the accounts</string>
+  <string name="share_accounts">Backup and share the accounts</string>
+  <string name="importing_accounts">Importing the accounts…</string>
+  <string name="exporting_accounts">Exporting the accounts...</string>
+  <string name="backup_not_found">No backups found</string>
+  <string name="err_cant_open_the_file">Cannot open the file</string>
+  <string name="err_temp_folder_doesnt_exist">Temporary folder does not exist</string>
+  <string name="err_occured">An error occurred</string>
+  <string name="ui_ux">Ui</string>
+  <string name="folder">archivo</string>
+  <string name="remove">remover</string>
+  <string name="modification_date">fecha de modificación</string>
+  <string name="name">nombre</string>
+  <string name="size">tamaño</string>
+  <string name="sort">Organizar</string>
+  <string name="open">Abrir</string>
+  <string name="file_modified">el archivo %1$s fue modificado quiere subirlo? </string>
+  <string name="file_saved_with_success">The file %1$s was saved with success!</string>
+  <string name="crea_file_remoto">New remote file</string>
+  <string name="new_local_file">New local file</string>
+  <string name="create_new_account">Create a new account</string>
+  <string name="create_new_account_to_start">Create a new account to start.</string>
+  <string name="type">Type</string>
+  <string name="send_feedback">Send feedback</string>
+  <string name="copy_url">Copy URL</string>
+  <string name="cut">Cut</string>
+  <string name="paste">paste</string>
+  <string name="advanced">Advanced</string>
+  <string name="auto">Auto</string>
+  <string name="bytes">Bytes</string>
+  <string name="unit_measurement_for_file_size">Unit of measurement for file size</string>
+  <string name="open_source_license">Open Source licenses</string>
+  <string name="open_source_license_summary">Show open source licenses</string>
+  <string name="open_a_file">Open a file</string>
+  <string name="open_this_time_only">Open this time only</string>
+  <string name="advise_editor_title">Are you missing Turbo Editor?</string>
+  <string name="advise_editor_subtitle">The best free and open source file editor!</string>
+  <string name="change_list_type">Change the list type</string>
+  <string name="use_monospace">Use monospace</string>
+  <string name="recent_files">Recent files</string>
+  <string name="font_size">Font size</string>
+  <string name="connection_name">Connection Name</string>
+  <string name="line_numbers">Line Numbers</string>
+</resources>
diff --git a/Turbo Editor/src/main/res/values-es-rES/strings_aboutactivity.xml b/Turbo Editor/src/main/res/values-es-rES/strings_aboutactivity.xml
new file mode 100644
index 0000000..263f6ad
--- /dev/null
+++ b/Turbo Editor/src/main/res/values-es-rES/strings_aboutactivity.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string name="aboutactivity_info_category">Información</string>
+  <string name="aboutactivity_app_category">Información sobre la aplicación</string>
+  <string name="aboutactivity_miscellaneous_category">Misceláneos</string>
+  <string name="aboutactivity_version">Versión %1$s</string>
+  <string name="aboutactivity_author">Autor</string>
+  <string name="aboutactivity_authorsite">Site del autor</string>
+  <string name="aboutactivity_authorsite_summary">Abrir el site del autor</string>
+  <string name="aboutactivity_authoremail">Correo del autor</string>
+  <string name="aboutactivity_authoremail_summary">Enviar correo al autor</string>
+  <string name="aboutactivity_authortwitter">Twitter</string>
+  <string name="aboutactivity_authortwitter_summary">Abrir el twitter</string>
+  <string name="aboutactivity_authorgoogleplus">Google Plus</string>
+  <string name="aboutactivity_authorgoogleplus_summary">Show Google Plus page</string>
+  <string name="aboutactivity_betatester">Become a beta tester</string>
+  <string name="aboutactivity_betatester_summary">Be a part of the community to receive beta updates</string>
+  <string name="aboutactivity_helptranslate">Translate the Application</string>
+  <string name="aboutactivity_helptranslate_summary">Correct some mistakes or add a new translation</string>
+  <string name="aboutactivity_readme">Leeme</string>
+  <string name="aboutactivity_readme_summary">Leer la referencia</string>
+  <string name="aboutactivity_faq">FAQ</string>
+  <string name="aboutactivity_faq_summary">Mostrar las faqs</string>
+  <string name="aboutactivity_changelog">Log de cambios</string>
+  <string name="aboutactivity_changelog_summary">Mostrar el log de cambios</string>
+  <string name="aboutactivity_license">Términos del servicio</string>
+  <string name="aboutactivity_license_summary">Leer los términos del servicio</string>
+  <string name="aboutactivity_license_accept">Aceptar</string>
+  <string name="aboutactivity_license_refuse">Declinar</string>
+  <string name="aboutactivity_privacy">Políticas de privacidad</string>
+  <string name="aboutactivity_privacy_summary">Leer las políticas de privacidad</string>
+  <string name="aboutactivity_todo">Cosas pendientes</string>
+  <string name="aboutactivity_todo_summary">Ver los cambios pendientes</string>
+  <string name="aboutactivity_donate">Donar</string>
+  <string name="aboutactivity_donate_summary">¡Gracias por el soporte!</string>
+  <string name="aboutactivity_market">Market de Android</string>
+  <string name="aboutactivity_market_summary">¡Envía feedback y puntúa!</string>
+  <string name="aboutactivity_authormarket">Market del autor</string>
+  <string name="aboutactivity_authormarket_summary">¡Ver las aplicaciones del autor!</string>
+</resources>
diff --git a/Turbo Editor/src/main/res/values-fi-rFI/strings.xml b/Turbo Editor/src/main/res/values-fi-rFI/strings.xml
new file mode 100644
index 0000000..605ff94
--- /dev/null
+++ b/Turbo Editor/src/main/res/values-fi-rFI/strings.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string name="aggiungi_account">Uusi tili</string>
+  <string name="attiva">Aktiivinen</string>
+  <string name="cancella">Poista</string>
+  <string name="cancellazione">Poistetaan tiedostoja...</string>
+  <string name="caricamento">Ladataan...</string>
+  <string name="cartella_locale_corrente">Nykyinen paikallinen kansio</string>
+  <string name="chiave_privata">Yksityinen avain</string>
+  <string name="chiaro">Vaalea</string>
+  <string name="codifica">Koodaus</string>
+  <string name="condividi">Jaa</string>
+  <string name="crea_cartella_locale">Uusi paikallinen kansio</string>
+  <string name="crea_cartella_remota">Uusi etäkansio</string>
+  <string name="disconneti">Katkaise yhteys</string>
+  <string name="default_local_folder">Oletus paikallinen kansio</string>
+  <string name="dove_scaricare">Mistä haluat ladata?</string>
+  <string name="download">Lataa</string>
+  <string name="download_completato">Laataaminen suoritettu</string>
+  <string name="duplicate">Kahdenna</string>
+  <string name="fatto">Valmis</string>
+  <string name="home">Etusivu</string>
+  <string name="host">Osoite</string>
+  <string name="info">Tiedot</string>
+  <string name="locale">Paikallinen</string>
+  <string name="log_in">Kirjaudutaan...</string>
+  <string name="modifica">Muokkaa</string>
+  <string name="muovi">Siirrä</string>
+  <string name="nascondi">Piilota</string>
+  <string name="nome_app">Turbo Client</string>
+  <string name="nome_app_turbo_editor">Turbo Editor</string>
+  <string name="nome_utente">Käyttäjätunnus</string>
+  <string name="passiva">Passiivinen</string>
+  <string name="passphrase">Sanalause</string>
+  <string name="password">Salasana</string>
+  <string name="password_summary">Jätä tyhjäksi, jolloin sitä kysytään jokaisen istunnon yhteydessä</string>
+  <string name="porta">Portti</string>
+  <string name="preferenze">Asetukset</string>
+  <string name="remoto">Etä</string>
+  <string name="riavva_per_tema">Vaihda teemaa, käynnistä sovellus uudelleen</string>
+  <string name="rinomina">Nimeä uudelleen</string>
+  <string name="root">Oletusetäkansio</string>
+  <string name="salva">Tallenna</string>
+  <string name="scuro">Tumma</string>
+  <string name="seleziona">Valitse</string>
+  <string name="seleziona_account">Valitse tili</string>
+  <string name="sicuro">Oletko varma?</string>
+  <string name="something_failed">Jokin meni pieleen</string>
+  <string name="skip_same_file">Älä siirrä samoja tiedostoja</string>
+  <string name="tema_app">Sovelluksen teema</string>
+  <string name="tipo_connessione">Yhteyden tyyppi</string>
+  <string name="tipo_protocollo">Protokollatyyppi</string>
+  <string name="un_altra_cartella">Toinen kansio</string>
+  <string name="use_passphrase">Käytä salalausetta</string>
+  <string name="upload">Lähetä</string>
+  <string name="upload_completato">Lähetys onnistui</string>
+  <string name="what_to_do">Mitä haluaisit tehdä?</string>
+  <string name="menu_syntax_highlight">Syntaksinkorostus</string>
+  <string name="testo_indietro">Kumoa</string>
+  <string name="testo_rifai">Tee uudelleen</string>
+  <string name="sync">Synkronointi</string>
+  <string name="remote_folder_to_sync">Synkronoitava etäkansio</string>
+  <string name="local_folder_to_sync">Synkronoitava paikallinen kansio</string>
+  <string name="vota">Arvostele</string>
+  <string name="inapp_unavailable">Ei voitu muodostaa yhteyttä Play-kauppaan</string>
+  <string name="inapp_description">Tue huippuominaisuuksien kehitystä.</string>
+  <string name="upgrade_premium">Päivitä Premium-versioon</string>
+  <string name="upgrade_premium_summary">Päivitä premiumiin ja tue Turbo Client:n kehitystä!</string>
+  <string name="download_unlocked_version">Lataa lukitsematon versio</string>
+  <string name="inapp_second_description">Kuinka arvokas Turbo Client on sinulle? Määritä sille hinta!</string>
+  <string name="inapp_first_description">Päivitä avataksesi ominaisuudet:</string>
+  <string name="inapp_item_openandeditfiles">Valtuudet avata ja muokata kaikentyyppisiä tiedostoja.</string>
+  <string name="inapp_item_backup_service">Tietojen varmuuskopiointi ja palauttaminen turvallisesti.</string>
+  <string name="inapp_unlock_features">Avata Premium-ominaisuudet</string>
+  <string name="inapp_seconditem_description">Pidän todella tästä sovelluksesta!</string>
+  <string name="inapp_thirditem_description">Rakastan tätä sovellusta!</string>
+  <string name="backup_accounts">Tilien varmuuskopiointi</string>
+  <string name="restore_accounts">Tilien palautus</string>
+  <string name="share_accounts">Varmuuskopioi ja jaa tilit</string>
+  <string name="importing_accounts">Tilien tuominen...</string>
+  <string name="exporting_accounts">Tilien vieminen...</string>
+  <string name="backup_not_found">Varmuuskopioita ei löytynyt</string>
+  <string name="err_cant_open_the_file">Tiedoston avaaminen ei onnistu</string>
+  <string name="err_temp_folder_doesnt_exist">Tilapäistä kansiota ei ole</string>
+  <string name="err_occured">Tapahtui virhe</string>
+  <string name="ui_ux">Käyttöliittymä</string>
+  <string name="folder">Kansio</string>
+  <string name="remove">Poista</string>
+  <string name="modification_date">Muokkauspäivä</string>
+  <string name="name">Nimi</string>
+  <string name="size">Koko</string>
+  <string name="sort">Lajittele</string>
+  <string name="open">Avaa</string>
+  <string name="file_modified">%1$s tiedosto on muokattu, haluatko lähettää sen?</string>
+  <string name="file_saved_with_success">%1$s tiedosto tallennettu onnistuneesti!</string>
+  <string name="crea_file_remoto">Uusi etätiedosto</string>
+  <string name="new_local_file">Uusi paikallinen tiedosto</string>
+  <string name="create_new_account">Luo uusi tili</string>
+  <string name="create_new_account_to_start">Luo uusi tili aloittaaksesi.</string>
+  <string name="type">Tyyppi</string>
+  <string name="send_feedback">Lähetä palautetta</string>
+  <string name="copy_url">Kopioi URL-osoite</string>
+  <string name="cut">Leikkaa</string>
+  <string name="paste">Liitä</string>
+  <string name="advanced">Lisäasetukset</string>
+  <string name="auto">Automaattinen</string>
+  <string name="bytes">Tavua</string>
+  <string name="unit_measurement_for_file_size">Tiedostokokon mittäyksikkö</string>
+  <string name="open_source_license">Avoimen lähdekoodin lisenssit</string>
+  <string name="open_source_license_summary">Näytä avoimen lähdekoodin lisenssit</string>
+  <string name="open_a_file">Avaa tiedosto</string>
+  <string name="open_this_time_only">Avaa vain tällä kertaa</string>
+  <string name="advise_editor_title">Puuttuuko sinulta Turbo Editor?</string>
+  <string name="advise_editor_subtitle">Paras ilmainen ja avoimen lähdekoodiin perustava tiedostoeditori!</string>
+  <string name="change_list_type">Muuta luettelotyyliä</string>
+  <string name="use_monospace">Käytä tasalevyistä fonttia</string>
+  <string name="recent_files">Viimeisimmät tiedostot</string>
+  <string name="font_size">Fonttikoko</string>
+  <string name="connection_name">Yhteyden nimi</string>
+  <string name="line_numbers">Line Numbers</string>
+</resources>
diff --git a/Turbo Editor/src/main/res/values-fi-rFI/strings_aboutactivity.xml b/Turbo Editor/src/main/res/values-fi-rFI/strings_aboutactivity.xml
new file mode 100644
index 0000000..4f1dce1
--- /dev/null
+++ b/Turbo Editor/src/main/res/values-fi-rFI/strings_aboutactivity.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string name="aboutactivity_info_category">Tiedot</string>
+  <string name="aboutactivity_app_category">Sovelluksen tiedot</string>
+  <string name="aboutactivity_miscellaneous_category">Sekalaiset</string>
+  <string name="aboutactivity_version">Versio %1$s</string>
+  <string name="aboutactivity_author">Kehittäjä</string>
+  <string name="aboutactivity_authorsite">Kotisivut</string>
+  <string name="aboutactivity_authorsite_summary">Näytä kehittäjän kotisivut</string>
+  <string name="aboutactivity_authoremail">Sähköposti</string>
+  <string name="aboutactivity_authoremail_summary">Lähetä sähköpostia kehittäjälle</string>
+  <string name="aboutactivity_authortwitter">Twitter</string>
+  <string name="aboutactivity_authortwitter_summary">Näytä kehittäjän Twitter-sivu</string>
+  <string name="aboutactivity_authorgoogleplus">Google+</string>
+  <string name="aboutactivity_authorgoogleplus_summary">Näytä kehittäjän Google+-sivu</string>
+  <string name="aboutactivity_betatester">Tule beetatestaajana</string>
+  <string name="aboutactivity_betatester_summary">Ole osa yhteisöä vastaanottamalla beetapäivityksiä</string>
+  <string name="aboutactivity_helptranslate">Käännä sovellus</string>
+  <string name="aboutactivity_helptranslate_summary">Korjaa virheitä tai lisää uusia käännöksiä</string>
+  <string name="aboutactivity_readme">Lue minut</string>
+  <string name="aboutactivity_readme_summary">Lue viite</string>
+  <string name="aboutactivity_faq">UKK</string>
+  <string name="aboutactivity_faq_summary">Näytä usein kysytyt kysymykset</string>
+  <string name="aboutactivity_changelog">Muutosloki</string>
+  <string name="aboutactivity_changelog_summary">Näytä sovelluksen muutosloki</string>
+  <string name="aboutactivity_license">Käyttöehdot</string>
+  <string name="aboutactivity_license_summary">Lue käyttöehdot</string>
+  <string name="aboutactivity_license_accept">Hyväksy</string>
+  <string name="aboutactivity_license_refuse">Hylkää</string>
+  <string name="aboutactivity_privacy">Yksityisyyskäytäntö</string>
+  <string name="aboutactivity_privacy_summary">Lue yksityisyyskäytäntö</string>
+  <string name="aboutactivity_todo">Tehtävälista</string>
+  <string name="aboutactivity_todo_summary">Lue tehtävälista</string>
+  <string name="aboutactivity_donate">Tee lahjoitus</string>
+  <string name="aboutactivity_donate_summary">Kiitos tuestanne!</string>
+  <string name="aboutactivity_market">Play-kauppa</string>
+  <string name="aboutactivity_market_summary">Lähetä palautetta ja arvostele!</string>
+  <string name="aboutactivity_authormarket">Muut sovellukset</string>
+  <string name="aboutactivity_authormarket_summary">Näytä kehittäjän muut sovellukset</string>
+</resources>
diff --git a/Turbo Editor/src/main/res/values-ms-rMY/strings.xml b/Turbo Editor/src/main/res/values-ms-rMY/strings.xml
index fe0770c..391ee8d 100644
--- a/Turbo Editor/src/main/res/values-ms-rMY/strings.xml	
+++ b/Turbo Editor/src/main/res/values-ms-rMY/strings.xml	
@@ -56,7 +56,6 @@
   <string name="upload">Muat naik</string>
   <string name="upload_completato">Muat naik selesai</string>
   <string name="what_to_do">What do you want todo?</string>
-  <string name="wrap_the_text">Word wrap</string>
   <string name="menu_syntax_highlight">Syntax highlight</string>
   <string name="testo_indietro">Batal edit</string>
   <string name="testo_rifai">Buat semula edit</string>
@@ -95,7 +94,6 @@
   <string name="open">Buka</string>
   <string name="file_modified">Fail %1$s telah berubah. Adakah anda mahu memuat naik?</string>
   <string name="file_saved_with_success">The file %1$s was saved with success!</string>
-  <string name="number_of_things_selected">%1$d selected</string>
   <string name="crea_file_remoto">New remote file</string>
   <string name="new_local_file">New local file</string>
   <string name="create_new_account">Cipta akaun baru</string>
@@ -111,7 +109,6 @@
   <string name="unit_measurement_for_file_size">Unit of measurement for file size</string>
   <string name="open_source_license">Open Source licenses</string>
   <string name="open_source_license_summary">Show open source licenses</string>
-  <string name="show_navigation_breadcrumb">Show navigation breadcrumb</string>
   <string name="open_a_file">Open a file</string>
   <string name="open_this_time_only">Open this time only</string>
   <string name="advise_editor_title">Are you missing Turbo Editor?</string>
@@ -119,4 +116,7 @@
   <string name="change_list_type">Change the list type</string>
   <string name="use_monospace">Use monospace</string>
   <string name="recent_files">Recent files</string>
+  <string name="font_size">Font size</string>
+  <string name="connection_name">Connection Name</string>
+  <string name="line_numbers">Line Numbers</string>
 </resources>
diff --git a/Turbo Editor/src/main/res/values-nl-rNL/strings.xml b/Turbo Editor/src/main/res/values-nl-rNL/strings.xml
index 666cc8c..004f347 100644
--- a/Turbo Editor/src/main/res/values-nl-rNL/strings.xml	
+++ b/Turbo Editor/src/main/res/values-nl-rNL/strings.xml	
@@ -56,7 +56,6 @@
   <string name="upload">Uploaden</string>
   <string name="upload_completato">Uploaden voltooid</string>
   <string name="what_to_do">Wat wil je doen?</string>
-  <string name="wrap_the_text">Comprimeer de tekst</string>
   <string name="menu_syntax_highlight">Gekleurde code</string>
   <string name="testo_indietro">Ongedaan maken</string>
   <string name="testo_rifai">Opnieuw uitvoeren</string>
@@ -95,7 +94,6 @@
   <string name="open">Openen</string>
   <string name="file_modified">Het bestand %1$s is aangepast, wilt u het uploaden?</string>
   <string name="file_saved_with_success">Het bestand %1$s is met succes opgeslagen!</string>
-  <string name="number_of_things_selected">%1$d geselecteerd</string>
   <string name="crea_file_remoto">Nieuw extern bestand</string>
   <string name="new_local_file">Nieuw lokaal bestand</string>
   <string name="create_new_account">Nieuwe account toevoegen</string>
@@ -111,12 +109,14 @@
   <string name="unit_measurement_for_file_size">Maateenheid voor bestandsgrootte</string>
   <string name="open_source_license">Open Source-licenties</string>
   <string name="open_source_license_summary">Toon open source-licenties</string>
-  <string name="show_navigation_breadcrumb">Toon navigatie breadcrumb</string>
   <string name="open_a_file">Open een bestand</string>
   <string name="open_this_time_only">Alleen deze keer openen</string>
   <string name="advise_editor_title">Waar is Turbo Editor?</string>
   <string name="advise_editor_subtitle">De beste gratis en open source file editor!</string>
   <string name="change_list_type">Wijzig het type lijst</string>
-  <string name="use_monospace">Use monospace</string>
-  <string name="recent_files">Recent files</string>
+  <string name="use_monospace">Gebruik monospace</string>
+  <string name="recent_files">Recente bestanden</string>
+  <string name="font_size">Font size</string>
+  <string name="connection_name">Connection Name</string>
+  <string name="line_numbers">Line Numbers</string>
 </resources>
diff --git a/Turbo Editor/src/main/res/values-pl-rPL/strings.xml b/Turbo Editor/src/main/res/values-pl-rPL/strings.xml
index 309feb8..61c2e96 100644
--- a/Turbo Editor/src/main/res/values-pl-rPL/strings.xml	
+++ b/Turbo Editor/src/main/res/values-pl-rPL/strings.xml	
@@ -56,7 +56,6 @@
   <string name="upload">Prześlij</string>
   <string name="upload_completato">Przesyłanie zakończone</string>
   <string name="what_to_do">Co chcesz zrobić?</string>
-  <string name="wrap_the_text">Zawijanie wyrazów</string>
   <string name="menu_syntax_highlight">Podświetlenie składni</string>
   <string name="testo_indietro">Cofnij</string>
   <string name="testo_rifai">Powtórz</string>
@@ -95,7 +94,6 @@
   <string name="open">Otwórz</string>
   <string name="file_modified">Plik %1$s został zmodyfikowany, czy chcesz go wysłać?</string>
   <string name="file_saved_with_success">Plik %1$s został pomyślnie zapisany!</string>
-  <string name="number_of_things_selected">%1$d wybranych</string>
   <string name="crea_file_remoto">Nowy plik zdalny</string>
   <string name="new_local_file">Nowy plik lokalny</string>
   <string name="create_new_account">Utwórz nowe konto</string>
@@ -111,12 +109,14 @@
   <string name="unit_measurement_for_file_size">Jednostka rozmiaru dla pliku</string>
   <string name="open_source_license">Licencje Open Source</string>
   <string name="open_source_license_summary">Pokaż licencje open source</string>
-  <string name="show_navigation_breadcrumb">Pokaż ścieżkę folderu nadrzędnego</string>
   <string name="open_a_file">Otwórz plik</string>
   <string name="open_this_time_only">Otwórz tylko tym razem</string>
   <string name="advise_editor_title">Brakuje ci Turbo Editor?</string>
   <string name="advise_editor_subtitle">Najlepszy, darmowy edytor plików na bazie open source!</string>
   <string name="change_list_type">Zmień typ listy</string>
-  <string name="use_monospace">Use monospace</string>
-  <string name="recent_files">Recent files</string>
+  <string name="use_monospace">Użyj stałej szerokości</string>
+  <string name="recent_files">Najnowsze pliki</string>
+  <string name="font_size">Rozmiar czcionki</string>
+  <string name="connection_name">Connection Name</string>
+  <string name="line_numbers">Line Numbers</string>
 </resources>
diff --git a/Turbo Editor/src/main/res/values-pt-rBR/strings.xml b/Turbo Editor/src/main/res/values-pt-rBR/strings.xml
index 9491555..899696d 100644
--- a/Turbo Editor/src/main/res/values-pt-rBR/strings.xml	
+++ b/Turbo Editor/src/main/res/values-pt-rBR/strings.xml	
@@ -56,7 +56,6 @@
   <string name="upload">Upload</string>
   <string name="upload_completato">Upload concluído</string>
   <string name="what_to_do">What do you want todo?</string>
-  <string name="wrap_the_text">Quebra de linha</string>
   <string name="menu_syntax_highlight">Syntax highlight</string>
   <string name="testo_indietro">Desfazer</string>
   <string name="testo_rifai">Refazer</string>
@@ -95,7 +94,6 @@
   <string name="open">Open</string>
   <string name="file_modified">The file %1$s was modified, do you want to upload it?</string>
   <string name="file_saved_with_success">The file %1$s was saved with success!</string>
-  <string name="number_of_things_selected">%1$d selected</string>
   <string name="crea_file_remoto">New remote file</string>
   <string name="new_local_file">New local file</string>
   <string name="create_new_account">Create a new account</string>
@@ -111,7 +109,6 @@
   <string name="unit_measurement_for_file_size">Unit of measurement for file size</string>
   <string name="open_source_license">Open Source licenses</string>
   <string name="open_source_license_summary">Show open source licenses</string>
-  <string name="show_navigation_breadcrumb">Show navigation breadcrumb</string>
   <string name="open_a_file">Open a file</string>
   <string name="open_this_time_only">Open this time only</string>
   <string name="advise_editor_title">Are you missing Turbo Editor?</string>
@@ -119,4 +116,7 @@
   <string name="change_list_type">Change the list type</string>
   <string name="use_monospace">Use monospace</string>
   <string name="recent_files">Recent files</string>
+  <string name="font_size">Font size</string>
+  <string name="connection_name">Connection Name</string>
+  <string name="line_numbers">Line Numbers</string>
 </resources>
diff --git a/Turbo Editor/src/main/res/values-ru-rRU/strings.xml b/Turbo Editor/src/main/res/values-ru-rRU/strings.xml
index 537dc90..4d0fc74 100644
--- a/Turbo Editor/src/main/res/values-ru-rRU/strings.xml	
+++ b/Turbo Editor/src/main/res/values-ru-rRU/strings.xml	
@@ -56,7 +56,6 @@
   <string name="upload">Закачка</string>
   <string name="upload_completato">Загрузка завершена</string>
   <string name="what_to_do">What do you want todo?</string>
-  <string name="wrap_the_text">Перенос строк</string>
   <string name="menu_syntax_highlight">Подсветка синтаксиса</string>
   <string name="testo_indietro">Отменить</string>
   <string name="testo_rifai">Повторить</string>
@@ -95,7 +94,6 @@
   <string name="open">открыть</string>
   <string name="file_modified">Файл %1$s был изменен, загрузить на сервер?</string>
   <string name="file_saved_with_success">Файл %1$s успешно сохранен!</string>
-  <string name="number_of_things_selected">%1$d выделено</string>
   <string name="crea_file_remoto">Новый файл на сервере</string>
   <string name="new_local_file">Новый локальный файл</string>
   <string name="create_new_account">Создать новый аккаунт</string>
@@ -111,7 +109,6 @@
   <string name="unit_measurement_for_file_size">Единица измерения размера файла</string>
   <string name="open_source_license">Open Source licenses</string>
   <string name="open_source_license_summary">Show open source licenses</string>
-  <string name="show_navigation_breadcrumb">Показывать цепочку навигации</string>
   <string name="open_a_file">Открыть файл</string>
   <string name="open_this_time_only">Open this time only</string>
   <string name="advise_editor_title">Are you missing Turbo Editor?</string>
@@ -119,4 +116,7 @@
   <string name="change_list_type">Внешний вид списка</string>
   <string name="use_monospace">Use monospace</string>
   <string name="recent_files">Recent files</string>
+  <string name="font_size">Font size</string>
+  <string name="connection_name">Connection Name</string>
+  <string name="line_numbers">Line Numbers</string>
 </resources>
diff --git a/Turbo Editor/src/main/res/values/ids.xml b/Turbo Editor/src/main/res/values/ids.xml
index a76911f..9b93474 100644
--- a/Turbo Editor/src/main/res/values/ids.xml	
+++ b/Turbo Editor/src/main/res/values/ids.xml	
@@ -28,7 +28,7 @@
     <item type="id" name="im_button"/>
     <item type="id" name="im_save"/>
     <item type="id" name="im_editor_encoding"/>
-    <item type="id" name="im_wrap_text"/>
+    <item type="id" name="im_line_numbers"/>
     <item type="id" name="im_syntax_highlight"/>
     <item type="id" name="im_use_monospace"/>
     <item type="id" name="im_new_file"/>
diff --git a/Turbo Editor/src/main/res/values/strings.xml b/Turbo Editor/src/main/res/values/strings.xml
index 611bc59..5d98a03 100644
--- a/Turbo Editor/src/main/res/values/strings.xml	
+++ b/Turbo Editor/src/main/res/values/strings.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
     <string name="aggiungi_account">New account</string>
@@ -56,7 +56,6 @@
     <string name="upload">Upload</string>
     <string name="upload_completato">Upload completed</string>
     <string name="what_to_do">What do you want todo?</string>
-    <string name="wrap_the_text">Word wrap</string>
     <string name="menu_syntax_highlight">Syntax highlight</string>
     <string name="testo_indietro">Undo</string>
     <string name="testo_rifai">Redo</string>
@@ -95,7 +94,6 @@
     <string name="open">Open</string>
     <string name="file_modified">The file %1$s was modified, do you want to upload it?</string>
     <string name="file_saved_with_success">The file %1$s was saved with success!</string>
-    <string name="number_of_things_selected">%1$d selected</string>
     <string name="crea_file_remoto">New remote file</string>
     <string name="new_local_file">New local file</string>
     <string name="create_new_account">Create a new account</string>
@@ -111,13 +109,14 @@
     <string name="unit_measurement_for_file_size">Unit of measurement for file size</string>
     <string name="open_source_license">Open Source licenses</string>
     <string name="open_source_license_summary">Show open source licenses</string>
-    <string name="show_navigation_breadcrumb">Show navigation breadcrumb</string>
     <string name="open_a_file">Open a file</string>
     <string name="open_this_time_only">Open this time only</string>
     <string name="advise_editor_title">Are you missing Turbo Editor?</string>
     <string name="advise_editor_subtitle">The best free and open source file editor!</string>
-    <string name="change_list_type">Change The List Type</string>
-    <string name="use_monospace">Use Monospace</string>
-    <string name="recent_files">Recent Files</string>
-    <string name="text_size">Text Size</string>
+    <string name="change_list_type">Change the list type</string>
+    <string name="use_monospace">Use monospace</string>
+    <string name="recent_files">Recent files</string>
+    <string name="font_size">Font size</string>
+    <string name="connection_name">Connection Name</string>
+    <string name="line_numbers">Line Numbers</string>
 </resources>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b979729..667288a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a80fe65..fad6e59 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Oct 06 11:27:48 CEST 2013
+#Wed Oct 30 17:16:51 CET 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip