Merge lp:~jflaker/scratch/BugFix1376573 into lp:scratch/2.x

[Jeffrey Flaker]

fixed mis-spelling. "directoy" should be "directory"

[Danielle Foré (danrabbit)]

OP, you've proposed merging into the wrong branch. Please repropose against lp:scratch

review: Disapprove

[lp:~jflaker/scratch/BugFix1376573]

1391. By Jeffrey Flaker on 2014-10-10

Backed out changes to po/

Unmerged revisions

1391. By Jeffrey Flaker on 2014-10-10

Backed out changes to po/

1390. By Jeffrey Flaker on 2014-10-05

Fix for bug#1376573 - Mis-spelling of "directory" as "directoy"

1389. By Danielle Foré on 2014-10-05

swap out "secondary-toolbar" class for "search-bar"

1388. By ffabio-96-x on 2014-10-05

* Replace deprecated Granite.LightWindow with Gtk.Dialog in TemplateManager
* Replace deprecated Granite.SearchBar with Gtk.SearchEntry in SearchManager

1387. By Launchpad Translations on behalf of elementary-apps on 2014-10-02

Launchpad automatic translations update.

1386. By Launchpad Translations on behalf of elementary-apps on 2014-09-26

Launchpad automatic translations update.

1385. By Launchpad Translations on behalf of elementary-apps on 2014-09-25

Launchpad automatic translations update.

1384. By Launchpad Translations on behalf of elementary-apps on 2014-09-24

Launchpad automatic translations update.

1383. By Launchpad Translations on behalf of elementary-apps on 2014-09-22

Launchpad automatic translations update.

1382. By Launchpad Translations on behalf of elementary-apps on 2014-09-21

Launchpad automatic translations update.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-12 18:32:19 +0000
+++ CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -38,17 +38,48 @@
 # Vala
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.17.1" MINIMUM)
+ensure_vala_version ("0.22" MINIMUM)
 include (ValaPrecompile)
 
 add_definitions(-DVALA_VERSION="${VALA_SHORTVER}")
 add_definitions(-w) # Disable gcc warnings
 
+option (USE_ZEITGEIST "Use Zeitgeist integration" ON)
+
+if (USE_ZEITGEIST)
+  message ("-- Zeitgeist integration enabled")
+  set (ZEITGEIST_DEPS zeitgeist-2.0)
+  set (ZEITGEIST_OPTIONS --define=HAVE_ZEITGEIST)
+else ()
+  message ("-- Zeitgeist integration disabled")
+endif ()
+
 # Dependencies
+<<<<<<< TREE
 set (SCRATCH_DEPS libpeas-1.0 libpeas-gtk-1.0 gtksourceview-3.0 gee-1.0 gobject-2.0 glib-2.0 gio-2.0 gtk+-3.0 granite zeitgeist-1.0)
+=======
+set (SCRATCH_DEPS
+  libpeas-1.0
+  libpeas-gtk-1.0
+  gtksourceview-3.0
+  gee-0.8
+  gobject-2.0
+  glib-2.0
+  gio-2.0
+  gtk+-3.0
+  granite>=0.3.0
+  ${ZEITGEIST_DEPS})
+
+>>>>>>> MERGE-SOURCE
 find_package (PkgConfig)
-pkg_check_modules (GTK+ REQUIRED "gtk+-3.0 >= 3.4")
-pkg_check_modules (LIBSOURCE REQUIRED libpeas-gtk-1.0 gtksourceview-3.0>=3.0 gthread-2.0)
+pkg_check_modules (GTK+ REQUIRED
+  gtk+-3.0>=3.10)
+
+pkg_check_modules (LIBSOURCE REQUIRED
+  libpeas-gtk-1.0
+  gtksourceview-3.0>=3.10
+  gthread-2.0)
+
 pkg_check_modules (DEPS REQUIRED ${SCRATCH_DEPS})
 
 set(NORMAL_CFLAGS ${DEPS_CFLAGS} ${LIBSOURCE_CFLAGS} ${GCONF_CFLAGS})

=== modified file 'README'
--- README	2013-11-30 08:48:08 +0000
+++ README	2014-10-05 21:35:48 +0000
@@ -2,7 +2,7 @@
 ------------
  - libgtk-3.0-dev
  - libgtksourceview-3.0-dev
- - libgranite
+ - libgranite >= 0.3.0
  - libgconf-2.0-dev
  - libzeitgeist-1.0
 

=== modified file 'data/scratch-text-editor.desktop'
--- data/scratch-text-editor.desktop	2013-05-02 21:04:35 +0000
+++ data/scratch-text-editor.desktop	2014-10-05 21:35:48 +0000
@@ -22,6 +22,6 @@
 
 [NewWindow Shortcut Group]
 Name=New Window
-Exec=scratch-text-editor -n
+Exec=scratch-text-editor --new-window
 TargetEnvironment=Unity
 

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2013-07-08 00:40:39 +0000
+++ plugins/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -12,3 +12,4 @@
 add_subdirectory (source-tree)
 add_subdirectory (outline)
 add_subdirectory (vim-emulation)
+add_subdirectory (highlight-word-selection)
\ No newline at end of file

=== modified file 'plugins/brackets-completion/CMakeLists.txt'
--- plugins/brackets-completion/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/brackets-completion/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -8,9 +8,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --thread
     --vapidir=${CMAKE_BINARY_DIR}

=== modified file 'plugins/browser-preview/CMakeLists.txt'
--- plugins/browser-preview/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/browser-preview/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -15,9 +15,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --thread
     --vapidir=${CMAKE_BINARY_DIR}

=== modified file 'plugins/browser-preview/browser-preview.vala'
--- plugins/browser-preview/browser-preview.vala	2013-08-06 15:21:11 +0000
+++ plugins/browser-preview/browser-preview.vala	2014-10-05 21:35:48 +0000
@@ -30,6 +30,8 @@
     Gtk.ScrolledWindow? scrolled = null;
     Scratch.Services.Document? doc = null;
 
+    Gtk.Notebook notebook;
+
     Scratch.Services.Interface plugins;
     public Object object { owned get; construct; }
 
@@ -65,10 +67,14 @@
         view.welcome_shown.connect (() => {
             this.tool_button.visible = false;
             this.tool_button.no_show_all = true;
+            if (notebook.page_num (scrolled) != -1)
+                notebook.remove (scrolled);
         });
         view.welcome_hidden.connect (() => {
             this.tool_button.visible = true;
             this.tool_button.no_show_all = false;
+            if (notebook.page_num (scrolled) == -1)
+                notebook.append_page (scrolled, new Gtk.Label (_("Web preview")));
         });
     }
     
@@ -93,24 +99,26 @@
         icon.show ();
         tool_button.show ();
 
-        toolbar.insert (tool_button, toolbar.get_item_index (toolbar.find_button) + 1);
+        toolbar.pack_start (tool_button);
     }
 
     void on_hook_context (Gtk.Notebook notebook) {
-    	if (scrolled != null)
-    	    return;
-
-    	view = new WebView ();
-    	// Enable local loading
-    	var settings = view.get_settings ();
-    	settings.enable_file_access_from_file_uris = true;
-
-    	scrolled = new Gtk.ScrolledWindow (null, null);
-    	scrolled.add (view);
-
-    	notebook.append_page (scrolled, new Gtk.Label (_("Web preview")));
-
-    	scrolled.show_all ();
+        if (scrolled != null)
+            return;
+
+        this.notebook = notebook;
+
+        view = new WebView ();
+        // Enable local loading
+        var settings = view.get_settings ();
+        settings.enable_file_access_from_file_uris = true;
+
+        scrolled = new Gtk.ScrolledWindow (null, null);
+        scrolled.add (view);
+
+        notebook.append_page (scrolled, new Gtk.Label (_("Web preview")));
+
+        scrolled.show_all ();
     }
 
 }
@@ -120,4 +128,4 @@
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (typeof (Peas.Activatable),
                                      typeof (Scratch.Plugins.BrowserPreview));
-}
+}
\ No newline at end of file

=== modified file 'plugins/contractor/CMakeLists.txt'
--- plugins/contractor/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/contractor/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -9,9 +9,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --vapidir=${CMAKE_BINARY_DIR}
     --vapidir=${CMAKE_BINARY_DIR}/src/

=== modified file 'plugins/contractor/contractor.vala'
--- plugins/contractor/contractor.vala	2013-06-07 21:00:59 +0000
+++ plugins/contractor/contractor.vala	2014-10-05 21:35:48 +0000
@@ -77,19 +77,18 @@
             Gee.List<Granite.Services.Contract> contracts = null;
             try {
                 contracts = Granite.Services.ContractorProxy.get_contracts_by_mime (doc.get_mime_type ());
+
+                for (int i = 0; i < contracts.size; i++) {
+                    var contract = contracts.get (i);
+                    Gtk.MenuItem menu_item;
+
+                    menu_item = new ContractMenuItem (contract, doc.file);
+                    menu.append (menu_item);
+                    this.list.append (menu_item);
+                }
             } catch (Error e) {
                 warning (e.message);
             }
-            
-            for (int i = 0; i < contracts.size; i++) {
-                var contract = contracts.get (i);
-                Gtk.MenuItem menu_item;
-
-                menu_item = new ContractMenuItem (contract, doc.file);
-                menu.append (menu_item);
-                this.list.append (menu_item);
-            }
-
         });
     }
     
@@ -100,4 +99,4 @@
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (typeof (Peas.Activatable),
                                      typeof (Scratch.Plugins.Contractor));
-}
+}
\ No newline at end of file

=== modified file 'plugins/filemanager/CMakeLists.txt'
--- plugins/filemanager/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/filemanager/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -7,12 +7,16 @@
     FileView.vala
 PACKAGES
     gtk+-3.0
-    gee-1.0
+    gee-0.8
     granite
     scratchcore
     libpeas-1.0
     gtksourceview-3.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --vapidir=${CMAKE_BINARY_DIR}
     --vapidir=${CMAKE_BINARY_DIR}/src/

=== modified file 'plugins/filemanager/FileManagerPlugin.vala'
--- plugins/filemanager/FileManagerPlugin.vala	2013-09-05 09:30:35 +0000
+++ plugins/filemanager/FileManagerPlugin.vala	2014-10-05 21:35:48 +0000
@@ -22,11 +22,9 @@
 public const string DESCRIPTION = N_("Basic folder manager with file browsing");
 
 namespace Scratch.Plugins {
-
-    public Scratch.Services.Interface plugins;
-    public Gee.ArrayList<Scratch.Services.Document> documents;
     
     public class FileManagerPlugin : Peas.ExtensionBase, Peas.Activatable {
+        public Scratch.Services.Interface plugins;
         
         Gtk.Box box;
         FileManager.FileView view;
@@ -38,13 +36,8 @@
         }
 
         public void activate () {
-            documents = new Gee.ArrayList<Scratch.Services.Document> ();
             plugins = (Scratch.Services.Interface) object;
             plugins.hook_notebook_sidebar.connect (on_hook_sidebar);
-            plugins.hook_document.connect ((doc) => { 
-                if (!documents.contains (doc))
-                    documents.add (doc); 
-            });
         }
 
         public void deactivate () {

=== modified file 'plugins/filemanager/FileView.vala'
--- plugins/filemanager/FileView.vala	2013-07-21 21:11:23 +0000
+++ plugins/filemanager/FileView.vala	2014-10-05 21:35:48 +0000
@@ -43,11 +43,7 @@
             
             settings = new Settings ();
 
-            this.set_sort_func ((a, b) => {
-                return File.compare ((a as Item).file, (b as Item).file);
-            });
-            
-            restore_sesttings ();
+            restore_settings ();
         }
 
         /*public void open_folder (File folder) {
@@ -131,7 +127,7 @@
             settings.opened_folder = this.folder.file.file.get_path ();
         }
         
-        private void restore_sesttings () {
+        private void restore_settings () {
             if (settings.opened_folder == "" || settings.opened_folder == null)
                 settings.opened_folder = GLib.Environment.get_home_dir ();
             open_folder (new File (settings.opened_folder));
@@ -177,25 +173,36 @@
     }
 
     /**
-     * Common interface for normal and expandable items.
+     * Common abstract class for normal and expandable items.
      */
-    internal interface Item : Granite.Widgets.SourceList.Item {
-        public abstract File file { get; construct; }
-        public abstract string path { get; }
+    internal class Item : Granite.Widgets.SourceList.ExpandableItem, Granite.Widgets.SourceListSortable {
+        public File file { get; construct; }
+        public string path { get { return file.path; } }
+
+        public int compare (Granite.Widgets.SourceList.Item a,
+                                Granite.Widgets.SourceList.Item b) {
+            if (a is FolderItem && b is FileItem) {
+                return -1;
+            } else if (a is FileItem && b is FolderItem) {
+                return 1;
+            }
+            return File.compare ((a as Item).file, (b as Item).file);
+        }
+        
+        public bool allow_dnd_sorting () {
+            return false;
+        }
     }
 
     /**
      * Normal item in the source list, represents a textfile.
      * TODO Remove, Rename
      */
-    internal class FileItem : Granite.Widgets.SourceList.Item, Item {
+    internal class FileItem : Item {
 
         //Gtk.Menu menu;
         //Gtk.MenuItem item_trash;
 
-        public File file { get; construct; }
-        public string path { get { return file.path; } }
-
         public FileItem (File file) requires (file.is_valid_textfile) {
             Object (file: file);
 
@@ -208,11 +215,6 @@
         public void rename (string new_name) {
             string new_uri = file.file.get_parent ().get_uri () + "/" + new_name;
             debug (new_uri);
-            for (int n = 0; n < documents.to_array ().length; n++) {
-                var doc = documents.to_array ()[n]; 
-                if (doc.file.get_uri () == file.file.get_uri ())
-                    doc.file = GLib.File.new_for_uri (new_uri);
-            }
             file.rename (new_name);
         }
 
@@ -231,7 +233,7 @@
      * Monitored for changes inside the directory.
      * TODO remove, rename, create new file
      */
-    internal class FolderItem : Granite.Widgets.SourceList.ExpandableItem, Item {
+    internal class FolderItem : Item {
 
         //Gtk.Menu menu;
         //Gtk.MenuItem item_trash;
@@ -242,9 +244,6 @@
         
         public FileView view { get; construct; }
         
-        public File file { get; construct; }
-        public string path { get { return file.path; } }
-        
         public signal void folder_open (GLib.File folder);
         
         public FolderItem (File file, FileView view) requires (file.is_valid_directory) {
@@ -314,9 +313,13 @@
             switch (event) {
 
                 case GLib.FileMonitorEvent.DELETED:
-                    foreach (var item in children)
-                        if ((item as Item).path == source.get_path ())
+                    var children_tmp = new Gee.ArrayList<Granite.Widgets.SourceList.Item> ();
+                    children_tmp.add_all (children);
+                    foreach (var item in children_tmp) {
+                        if ((item as Item).path == source.get_path ()) {
                             remove (item);
+                        }
+                    }
                     break;
 
                 case GLib.FileMonitorEvent.CREATED:

=== modified file 'plugins/folder-manager/CMakeLists.txt'
--- plugins/folder-manager/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/folder-manager/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -7,12 +7,16 @@
     FileView.vala
 PACKAGES
     gtk+-3.0
-    gee-1.0
+    gee-0.8
     granite
     scratchcore
     libpeas-1.0
     gtksourceview-3.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --vapidir=${CMAKE_BINARY_DIR}
     --vapidir=${CMAKE_BINARY_DIR}/src/

=== modified file 'plugins/folder-manager/FileView.vala'
--- plugins/folder-manager/FileView.vala	2013-06-02 13:07:08 +0000
+++ plugins/folder-manager/FileView.vala	2014-10-05 21:35:48 +0000
@@ -37,10 +37,6 @@
             });
 
             settings = new Settings ();
-
-            this.set_sort_func ((a, b) => {
-                return File.compare ((a as Item).file, (b as Item).file);
-            });
         }
 
         public void restore_saved_state () {
@@ -147,25 +143,36 @@
     }
 
     /**
-     * Common interface for normal and expandable items.
+     * Common abstract class for file and filder items.
      */
-    internal interface Item : Granite.Widgets.SourceList.Item {
-        public abstract File file { get; construct; }
-        public abstract string path { get; }
+    internal class Item: Granite.Widgets.SourceList.ExpandableItem, Granite.Widgets.SourceListSortable {
+        public File file { get; construct; }
+        public string path { get { return file.path; } }
+
+        public int compare (Granite.Widgets.SourceList.Item a,
+                            Granite.Widgets.SourceList.Item b) {
+            if (a is FolderItem && b is FileItem) {
+                return -1;
+            } else if (a is FileItem && b is FolderItem) {
+                return 1;
+            }
+            return File.compare ((a as Item).file, (b as Item).file);
+        }
+
+        public bool allow_dnd_sorting () { 
+            return false;
+        }
     }
 
     /**
      * Normal item in the source list, represents a textfile.
      * TODO Remove, Rename
      */
-    internal class FileItem : Granite.Widgets.SourceList.Item, Item {
+    internal class FileItem : Item {
 
         //Gtk.Menu menu;
         //Gtk.MenuItem item_trash;
 
-        public File file { get; construct; }
-        public string path { get { return file.path; } }
-
         public FileItem (File file) requires (file.is_valid_textfile) {
             Object (file: file);
 
@@ -194,7 +201,7 @@
      * Monitored for changes inside the directory.
      * TODO remove, rename, create new file
      */
-    internal class FolderItem : Granite.Widgets.SourceList.ExpandableItem, Item {
+    internal class FolderItem : Item {
 
         //Gtk.Menu menu;
         //Gtk.MenuItem item_trash;
@@ -203,9 +210,6 @@
         private GLib.FileMonitor monitor;
         private bool children_loaded = false;
 
-        public File file { get; construct; }
-        public string path { get { return file.path; } }
-
         public FolderItem (File file) requires (file.is_valid_directory) {
             Object (file: file);
 
@@ -274,9 +278,13 @@
             switch (event) {
 
                 case GLib.FileMonitorEvent.DELETED:
-                    foreach (var item in children)
-                        if ((item as Item).path == source.get_path ())
+                    var children_tmp = new Gee.ArrayList<Granite.Widgets.SourceList.Item> ();
+                    children_tmp.add_all (children);
+                    foreach (var item in children_tmp) {
+                        if ((item as Item).path == source.get_path ()) {
                             remove (item);
+                        }
+                    }
                     break;
 
                 case GLib.FileMonitorEvent.CREATED:

=== modified file 'plugins/folder-manager/FolderManagerPlugin.vala'
--- plugins/folder-manager/FolderManagerPlugin.vala	2013-06-07 21:00:59 +0000
+++ plugins/folder-manager/FolderManagerPlugin.vala	2014-10-05 21:35:48 +0000
@@ -80,7 +80,7 @@
             view.restore_saved_state ();
         }
 
-        void on_hook_toolbar (Gtk.Toolbar toolbar) {
+        void on_hook_toolbar (Gtk.HeaderBar toolbar) {
             if (tool_button != null)
                 return;
 
@@ -89,10 +89,11 @@
             tool_button = new Gtk.ToolButton (icon, _("Open a folder"));
             tool_button.tooltip_text = _("Open a folder");
             tool_button.clicked.connect (() => {
+                Gtk.Window window = plugins.manager.window;
                 Gtk.FileChooserDialog chooser = new Gtk.FileChooserDialog (
-                    "Select a folder.", null, Gtk.FileChooserAction.SELECT_FOLDER,
-                    Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                    Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT);
+                    "Select a folder.", window, Gtk.FileChooserAction.SELECT_FOLDER,
+                    _("_Cancel"), Gtk.ResponseType.CANCEL,
+                    _("_Open"), Gtk.ResponseType.ACCEPT);
                 chooser.select_multiple = true;
 
                 if (chooser.run () == Gtk.ResponseType.ACCEPT) {
@@ -109,7 +110,8 @@
             icon.show ();
             tool_button.show ();
 
-            toolbar.insert (tool_button, 1);
+            toolbar.pack_start (tool_button);
+            //toolbar.insert (tool_button, 1);
         }
     }
 }

=== added directory 'plugins/highlight-word-selection'
=== added file 'plugins/highlight-word-selection/CMakeLists.txt'
--- plugins/highlight-word-selection/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/highlight-word-selection/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -0,0 +1,28 @@
+add_definitions(${NORMAL_CFLAGS})
+include_directories(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/scratchcore/)
+link_directories(${NORMAL_LINK_DIRS})
+
+vala_precompile(VALA_C
+    highlight-word-selection.vala
+PACKAGES
+    granite
+    gtksourceview-3.0
+    scratchcore
+    gee-0.8
+    libpeas-1.0
+    ${ZEITGEIST_DEPS}
+OPTIONS
+    --thread
+    --vapidir=${CMAKE_BINARY_DIR}
+    --vapidir=${CMAKE_BINARY_DIR}/src/
+    --vapidir=${CMAKE_SOURCE_DIR}/vapi/
+    --vapidir=${CMAKE_BINARY_DIR}/scratchcore/
+)
+
+add_library(highlight-word-selection MODULE ${VALA_C})
+add_dependencies(highlight-word-selection scratchcore scratch)
+
+install(TARGETS highlight-word-selection DESTINATION lib/scratch/plugins/highlight-word-selection/)
+install(FILES highlight-word-selection.plugin DESTINATION lib/scratch/plugins/highlight-word-selection/)
+
+message("-- Highlight words plugin will be compiled")

=== added file 'plugins/highlight-word-selection/highlight-word-selection.plugin'
--- plugins/highlight-word-selection/highlight-word-selection.plugin	1970-01-01 00:00:00 +0000
+++ plugins/highlight-word-selection/highlight-word-selection.plugin	2014-10-05 21:35:48 +0000
@@ -0,0 +1,10 @@
+[Plugin]
+Module=highlight-word-selection
+Loader=C
+IAge=2
+Name=Highlight Word Selection
+Description=Highlights all occurrences of words that are selected
+Authors=Madelynn May <[e-mail]>
+Copyright=Copyright © 2014 Scratch and Euclide Developers
+Website=http://launchpad.net/scratch
+Hidden=false

=== added file 'plugins/highlight-word-selection/highlight-word-selection.vala'
--- plugins/highlight-word-selection/highlight-word-selection.vala	1970-01-01 00:00:00 +0000
+++ plugins/highlight-word-selection/highlight-word-selection.vala	2014-10-05 21:35:48 +0000
@@ -0,0 +1,97 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+  BEGIN LICENSE
+    
+  Copyright (C) 2013 Madelynn May <[e-mail]>
+  This program is free software: you can redistribute it and/or modify it   
+  under the terms of the GNU Lesser General Public License version 3, as published  
+  by the Free Software Foundation.
+    
+  This program is distributed in the hope that it will be useful, but   
+  WITHOUT ANY WARRANTY; without even the implied warranties of  
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR    
+  PURPOSE.  See the GNU General Public License for more details.
+    
+  You should have received a copy of the GNU General Public License along   
+  with this program.  If not, see <http://www.gnu.org/licenses/>    
+  
+  END LICENSE   
+***/
+
+public const string NAME = N_("Highlight Selected Words");
+public const string DESCRIPTION = N_("Highlights all occurrences of words that are selected");
+
+public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase,  Peas.Activatable { 
+    // Properties
+    List<Scratch.Widgets.SourceView> source_views;   
+    Gee.HashMap<Scratch.Widgets.SourceView, Gtk.SourceSearchContext> search_contexts;
+    Scratch.Widgets.SourceView current_source;
+    
+    // Consts
+    // Pneumonoultramicroscopicsilicovolcanoconiosis longest word in a major dictionary @ 45
+    private const uint SELECTION_HIGHLIGHT_MAX_CHARS = 45;
+        
+    Scratch.Services.Interface plugins;
+    public Object object { owned get; construct; }
+   
+    public void update_state () {
+    }
+
+    public void activate () {
+        this.source_views = new List<Scratch.Widgets.SourceView> ();
+        this.search_contexts = new Gee.HashMap<Scratch.Widgets.SourceView, Gtk.SourceSearchContext> ();
+        
+        plugins = (Scratch.Services.Interface) object;        
+        plugins.hook_document.connect ((doc) => {
+            var src = doc.source_view;
+            src.deselected.disconnect (on_deselection);
+            src.deselected.connect (on_deselection);
+            src.selection_changed.disconnect (on_selection_changed);
+            src.selection_changed.connect (on_selection_changed);
+            this.source_views.append (src);
+            this.search_contexts.set (src, new Gtk.SourceSearchContext (src.buffer,null));
+            this.current_source = src;
+        });
+    }
+    
+    public void on_selection_changed (Gtk.TextIter start,Gtk.TextIter end) {
+        if (this.current_source.buffer.get_has_selection ())
+        {
+            // Expand highlight to current word on
+            if (!start.starts_word ())
+                start.backward_word_start ();
+            if (!end.ends_word ())
+                end.forward_word_end ();
+            string selected_text = this.current_source.buffer.get_text (start,end,false);
+            if (selected_text.length > SELECTION_HIGHLIGHT_MAX_CHARS)
+                return;
+            Gtk.SourceSearchContext context = search_contexts.get (this.current_source);
+            context.settings.search_text = selected_text;
+            context.set_highlight (true);      
+        }
+    }
+    
+    public void on_deselection () {
+        Gtk.SourceSearchContext context = search_contexts.get (this.current_source);  
+        context.settings.search_text = null;
+        context.set_highlight (false);      
+    }
+    
+    public void deactivate () {
+        source_views.foreach ((src) => {
+            src.deselected.disconnect (on_deselection);
+            src.selection_changed.disconnect (on_selection_changed);
+            Gtk.SourceSearchContext context = search_contexts.get (src);
+            context.settings.search_text = null;
+            context.set_highlight (false);      
+        });
+    }
+    
+}
+
+[ModuleInit]
+public void peas_register_types (TypeModule module) {
+    var objmodule = module as Peas.ObjectModule;
+    objmodule.register_extension_type (typeof (Peas.Activatable),
+                                     typeof (Scratch.Plugins.HighlightSelectedWords));
+}

=== modified file 'plugins/open-with/CMakeLists.txt'
--- plugins/open-with/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/open-with/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -7,9 +7,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --vapidir=${CMAKE_BINARY_DIR}
     --vapidir=${CMAKE_BINARY_DIR}/src/

=== modified file 'plugins/outline/CMakeLists.txt'
--- plugins/outline/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/outline/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -1,22 +1,28 @@
 add_definitions(${NORMAL_CFLAGS})
 link_directories(${NORMAL_LINK_DIRS})
 vala_precompile(VALA_C
-	OutlinePlugin.vala
-	ValaSymbolResolver.vala
-	CtagsSymbolResolver.vala
+    OutlinePlugin.vala
+    ValaSymbolResolver.vala
+    CtagsSymbolResolver.vala
 PACKAGES
     gtk+-3.0
-    gee-1.0
+    gee-0.8
     granite
     scratchcore
     libpeas-1.0
     gtksourceview-3.0
+<<<<<<< TREE
     zeitgeist-1.0
 	libvala-${VALA_SHORTVER}
+=======
+    ${ZEITGEIST_DEPS}
+    libvala-${VALA_SHORTVER}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --vapidir=${CMAKE_BINARY_DIR}
     --vapidir=${CMAKE_BINARY_DIR}/src/
     --vapidir=${CMAKE_BINARY_DIR}/scratchcore/
+    --target-glib=2.32
 )
 
 pkg_check_modules(OUTLINE_DEPS libvala-${VALA_SHORTVER})

=== modified file 'plugins/outline/CtagsSymbolResolver.vala'
--- plugins/outline/CtagsSymbolResolver.vala	2013-07-09 14:17:42 +0000
+++ plugins/outline/CtagsSymbolResolver.vala	2014-10-05 21:35:48 +0000
@@ -1,221 +1,227 @@
 
 public class CtagsSymbol : Granite.Widgets.SourceList.ExpandableItem
 {
-	public Scratch.Services.Document doc { get; construct set; }
-	public int line { get; construct set; }
+    public Scratch.Services.Document doc { get; construct set; }
+    public int line { get; construct set; }
 
-	public CtagsSymbol (Scratch.Services.Document doc, string name, int line, Icon? _icon)
-	{
-		Object (doc: doc, name: name, line: line);
-		icon = _icon;
-	}
+    public CtagsSymbol (Scratch.Services.Document doc, string name, int line, Icon? _icon)
+    {
+        Object (doc: doc, name: name, line: line);
+        icon = _icon;
+    }
 }
 
 class CtagsSymbolIter : Object
 {
-	public string name { get; construct set; }
-	public string parent { get; construct set; }
-	public int line { get; construct set; }
-	public Icon icon { get; construct set; }
+    public string name { get; construct set; }
+    public string parent { get; construct set; }
+    public int line { get; construct set; }
+    public Icon icon { get; construct set; }
 
-	public CtagsSymbolIter (string name, string parent, int line, Icon icon)
-	{
-		Object(name: name, parent: parent, line: line, icon: icon);
-	}
+    public CtagsSymbolIter (string name, string parent, int line, Icon icon)
+    {
+        Object(name: name, parent: parent, line: line, icon: icon);
+    }
 }
 
 public class CtagsSymbolOutline : Object, SymbolOutline
 {
-	public Scratch.Services.Document doc { get; protected set; }
-	Granite.Widgets.SourceList store;
-	Granite.Widgets.SourceList.ExpandableItem root;
-
-	public CtagsSymbolOutline (Scratch.Services.Document _doc)
-	{
-		doc = _doc;
-		doc.doc_closed.connect (doc_closed);
-
-		root = new Granite.Widgets.SourceList.ExpandableItem (_("Symbols"));
-
-		store = new Granite.Widgets.SourceList ();
-		store.get_style_context ().add_class ("sidebar");
-		store.item_selected.connect ((selected) => {
-			if (selected == null) return;
-			goto (doc, (selected as CtagsSymbol).line);
-			store.selected = null;
-		});
-		store.root.add (root);
-	}
-
-	~CtagsSymbolOutline ()
-	{
-		doc.doc_closed.disconnect (doc_closed);
-	}
-
-	void doc_closed (Scratch.Services.Document doc)
-	{
-		closed ();
-	}
-
-	public void parse_symbols ()
-	{
-		var command = new Granite.Services.SimpleCommand (Environment.get_home_dir (),
-			"/usr/bin/ctags -f - --format=2 --excmd=n --fields=nsK --extra= "+
-			"--sort=no " + doc.file.get_path ());
-		command.done.connect (parse_output);
-		command.run ();
-	}
-
-	void parse_output (Granite.Services.SimpleCommand command, int status)
-	{
-		root.clear ();
-		var parent_dependent = new Gee.LinkedList<CtagsSymbolIter> ();
-
-		if (status != 0)
-			error ("Ctags failed\n");
-
-		var symbols = command.standard_output_str.split ("\n");
-		foreach (var symbol in symbols) {
-			if (symbol == "")
-				continue;
-
-			var parts = symbol.split ("\t");
-			var name = parts[0];
-			// 1 => filename
-			// 2 => line number with weird trailing chars
-			var type = parts[3];
-			int line = 0;
-			string? parent = null;
-			parse_fields (string.joinv (" ", parts[4:parts.length - 1]), out line, out parent);
-
-			Icon? icon = null;
-			switch (type) {
-				case "class":
-				case "struct":
-					icon = new ThemedIcon.from_names ({"user-home-symbolic", "go-home-symbolic", "user-home", "go-home", "home"});
-					break;
-				case "field":
-				case "constant":
-				case "enumerator":
-				case "member":
-				case "variable":
-					icon = new ThemedIcon.with_default_fallbacks ("view-grid-symbolic");
-					break;
-				case "constructor":
-					icon = new ThemedIcon.with_default_fallbacks ("media-playback-start-symbolic");
-					break;
-				case "desctructor":
-					icon = new ThemedIcon.with_default_fallbacks ("edit-delete-symbolic");
-					break;
-				case "enum":
-				case "typedef":
-					icon = new ThemedIcon.with_default_fallbacks ("view-list-compact-symbolic");
-					break;
-				case "method":
-				case "function":
-					icon = new ThemedIcon.with_default_fallbacks ("document-properties-symbolic");
-					break;
-				case "namespace":
-				case "package":
-					icon = new ThemedIcon.with_default_fallbacks ("view-fullscreen-symbolic");
-					break;
-				case "property":
-					icon = new ThemedIcon.with_default_fallbacks ("format-indent-more-symbolic");
-					break;
-				case "macro":
-					icon = new ThemedIcon.with_default_fallbacks ("mail-attachment-symbolic");
-					break;
-			}
-
-			if (parent == null) {
-				var s = new CtagsSymbol (doc, name, line, icon);
-				root.add (s);
-			} else
-				parent_dependent.add (new CtagsSymbolIter (name, parent, line, icon));
-		}
-
-		var found_something = true;
-		while (found_something && parent_dependent.size > 0) {
-			found_something = false;
-			var iter = parent_dependent.iterator ();
-			while (iter.has_next ()) {
-				iter.next ();
-				var i = iter.get ();
-
-				var parent = find_existing (i.parent, root);
-				if (parent != null) {
-					found_something = true;
-					parent.add (new CtagsSymbol (doc, i.name, i.line, i.icon));
-					iter.remove ();
-				} else {
-					// anonymous enum
-					if (i.parent.substring (0, 6) == "__anon") {
-						var e = new CtagsSymbol (doc, i.parent, i.line - 1,
-							new ThemedIcon.with_default_fallbacks ("view-list-compact-symbolic"));
-						root.add (e);
-
-						e.add (new CtagsSymbol (doc, i.name, i.line, i.icon));
-						iter.remove ();
-					}
-				}
-			}
-		}
-		// just add the rest
-		foreach (var symbol in parent_dependent) {
-			root.add (new CtagsSymbol (doc, symbol.name, symbol.line, symbol.icon));
-		}
-
-		store.root.expand_all ();
-		store.show_all ();
-		store.get_parent ().show_all ();
-	}
-
-	void parse_fields (string fields, out int line, out string parent)
-	{
-		var index = -1;
-		if ((index = fields.index_of ("line:")) > -1) {
-			line = int.parse (fields.substring (index + 5, int.max (fields.index_of (" ", index + 6) - index, -1)));
-		}
-		if ((index = fields.index_of ("class:")) > -1) {
-			parent = fields.substring (index + 6, int.max (fields.index_of (" ", index + 7) - index, -1));
-		}
-		if ((index = fields.index_of ("struct:")) > -1) {
-			parent = fields.substring (index + 7, int.max (fields.index_of (" ", index + 7) - index, -1));
-		}
-		if ((index = fields.index_of ("enum:")) > -1) {
-			parent = fields.substring (index + 5, int.max (fields.index_of (" ", index + 7) - index, -1));
-		}
-	}
-
-	CtagsSymbol? find_existing (string name, Granite.Widgets.SourceList.ExpandableItem parent)
-	{
-		CtagsSymbol match = null;
-		foreach (var child in parent.children) {
-			var child_symbol = child as CtagsSymbol;
-			if (child_symbol.name == name) {
-				match = child_symbol;
-				break;
-			} else {
-				var res = find_existing (name, child_symbol);
-				if (res != null)
-					return res;
-			}
-		}
-		return match;
-	}
-
-	public static string[] get_supported_types ()
-	{
-		string stdout;
-		try {
-		Process.spawn_sync (null, {"/usr/bin/ctags", "--list-languages"}, null, 0, null, out stdout);
-		} catch (Error e) { error (e.message); }
-		return stdout.split ("\n");
-	}
-
-	public Granite.Widgets.SourceList get_source_list ()
-	{
-		return store;
-	}
-}
-
+    public Scratch.Services.Document doc { get; protected set; }
+    Granite.Widgets.SourceList store;
+    Granite.Widgets.SourceList.ExpandableItem root;
+
+    public int n_symbols { get; protected set; }
+
+    public CtagsSymbolOutline (Scratch.Services.Document _doc)
+    {
+        doc = _doc;
+        doc.doc_closed.connect (doc_closed);
+
+        root = new Granite.Widgets.SourceList.ExpandableItem (_("Symbols"));
+
+        this.n_symbols = 0;
+
+        store = new Granite.Widgets.SourceList ();
+        store.get_style_context ().add_class ("sidebar");
+        store.item_selected.connect ((selected) => {
+            if (selected == null) return;
+            goto (doc, (selected as CtagsSymbol).line);
+            store.selected = null;
+        });
+        store.root.add (root);
+    }
+
+    ~CtagsSymbolOutline ()
+    {
+        doc.doc_closed.disconnect (doc_closed);
+    }
+
+    void doc_closed (Scratch.Services.Document doc)
+    {
+        closed ();
+    }
+
+    public void parse_symbols ()
+    {
+        var command = new Granite.Services.SimpleCommand (Environment.get_home_dir (),
+            "/usr/bin/ctags -f - --format=2 --excmd=n --fields=nsK --extra= "+
+            "--sort=no " + doc.file.get_path ());
+        command.done.connect (parse_output);
+        command.run ();
+    }
+
+    void parse_output (Granite.Services.SimpleCommand command, int status)
+    {
+        root.clear ();
+        var parent_dependent = new Gee.LinkedList<CtagsSymbolIter> ();
+
+        if (status != 0)
+            error ("Ctags failed\n");
+
+        var symbols = command.standard_output_str.split ("\n");
+        foreach (var symbol in symbols) {
+            if (symbol == "")
+                continue;
+
+            var parts = symbol.split ("\t");
+            var name = parts[0];
+            // 1 => filename
+            // 2 => line number with weird trailing chars
+            var type = parts[3];
+            int line = 0;
+            string? parent = null;
+            parse_fields (string.joinv (" ", parts[4:parts.length]), out line, out parent);
+
+            Icon? icon = null;
+            switch (type) {
+                case "class":
+                case "struct":
+                    icon = new ThemedIcon.from_names ({"user-home-symbolic", "go-home-symbolic", "user-home", "go-home", "home"});
+                    break;
+                case "field":
+                case "constant":
+                case "enumerator":
+                case "member":
+                case "variable":
+                    icon = new ThemedIcon.with_default_fallbacks ("view-grid-symbolic");
+                    break;
+                case "constructor":
+                    icon = new ThemedIcon.with_default_fallbacks ("media-playback-start-symbolic");
+                    break;
+                case "desctructor":
+                    icon = new ThemedIcon.with_default_fallbacks ("edit-delete-symbolic");
+                    break;
+                case "enum":
+                case "typedef":
+                    icon = new ThemedIcon.with_default_fallbacks ("view-list-compact-symbolic");
+                    break;
+                case "method":
+                case "function":
+                    icon = new ThemedIcon.with_default_fallbacks ("document-properties-symbolic");
+                    break;
+                case "namespace":
+                case "package":
+                    icon = new ThemedIcon.with_default_fallbacks ("view-fullscreen-symbolic");
+                    break;
+                case "property":
+                    icon = new ThemedIcon.with_default_fallbacks ("format-indent-more-symbolic");
+                    break;
+                case "macro":
+                    icon = new ThemedIcon.with_default_fallbacks ("mail-attachment-symbolic");
+                    break;
+            }
+
+            if (parent == null) {
+                var s = new CtagsSymbol (doc, name, line, icon);
+                root.add (s);
+            } else
+                parent_dependent.add (new CtagsSymbolIter (name, parent, line, icon));
+        }
+        this.n_symbols++;
+
+        var found_something = true;
+        while (found_something && parent_dependent.size > 0) {
+            found_something = false;
+            var iter = parent_dependent.iterator ();
+            while (iter.has_next ()) {
+                iter.next ();
+                var i = iter.get ();
+
+                var parent = find_existing (i.parent, root);
+                if (parent != null) {
+                    found_something = true;
+                    parent.add (new CtagsSymbol (doc, i.name, i.line, i.icon));
+                    iter.remove ();
+                } else {
+                    // anonymous enum
+                    if (i.parent.substring (0, 6) == "__anon") {
+                        var e = new CtagsSymbol (doc, i.parent, i.line - 1,
+                            new ThemedIcon.with_default_fallbacks ("view-list-compact-symbolic"));
+                        root.add (e);
+
+                        e.add (new CtagsSymbol (doc, i.name, i.line, i.icon));
+                        iter.remove ();
+                    }
+                }
+            }
+        }
+        // just add the rest
+        foreach (var symbol in parent_dependent) {
+            root.add (new CtagsSymbol (doc, symbol.name, symbol.line, symbol.icon));
+        }
+
+        store.root.expand_all ();
+        store.show_all ();
+        store.get_parent ().show_all ();
+    }
+
+    void parse_fields (string fields, out int line, out string parent)
+    {
+        var index = -1;
+        line = -1;
+        parent = null;
+        if ((index = fields.index_of ("line:")) > -1) {
+            line = int.parse (fields.substring (index + 5, int.max (fields.index_of (" ", index + 6) - index, -1)));
+        }
+        if ((index = fields.index_of ("class:")) > -1) {
+            parent = fields.substring (index + 6, int.max (fields.index_of (" ", index + 7) - index, -1));
+        }
+        if ((index = fields.index_of ("struct:")) > -1) {
+            parent = fields.substring (index + 7, int.max (fields.index_of (" ", index + 7) - index, -1));
+        }
+        if ((index = fields.index_of ("enum:")) > -1) {
+            parent = fields.substring (index + 5, int.max (fields.index_of (" ", index + 7) - index, -1));
+        }
+    }
+
+    CtagsSymbol? find_existing (string name, Granite.Widgets.SourceList.ExpandableItem parent)
+    {
+        CtagsSymbol match = null;
+        foreach (var child in parent.children) {
+            var child_symbol = child as CtagsSymbol;
+            if (child_symbol.name == name) {
+                match = child_symbol;
+                break;
+            } else {
+                var res = find_existing (name, child_symbol);
+                if (res != null)
+                    return res;
+            }
+        }
+        return match;
+    }
+
+    public static string[] get_supported_types ()
+    {
+        string stdout;
+        try {
+        Process.spawn_sync (null, {"/usr/bin/ctags", "--list-languages"}, null, 0, null, out stdout);
+        } catch (Error e) { error (e.message); }
+        return stdout.split ("\n");
+    }
+
+    public Granite.Widgets.SourceList get_source_list ()
+    {
+        return store;
+    }
+}
\ No newline at end of file

=== modified file 'plugins/outline/OutlinePlugin.vala'
--- plugins/outline/OutlinePlugin.vala	2013-07-17 09:02:47 +0000
+++ plugins/outline/OutlinePlugin.vala	2014-10-05 21:35:48 +0000
@@ -23,31 +23,33 @@
 
 public interface SymbolOutline : Object
 {
-	public abstract Scratch.Services.Document doc { get; protected set; }
-	public abstract void parse_symbols ();
-	public abstract Granite.Widgets.SourceList get_source_list ();
-	public signal void closed ();
-	public signal void goto (Scratch.Services.Document doc, int line);
+    public abstract Scratch.Services.Document doc { get; protected set; }
+    public abstract void parse_symbols ();
+    public abstract int n_symbols { get; protected set; }
+    public abstract Granite.Widgets.SourceList get_source_list ();
+    public signal void closed ();
+    public signal void goto (Scratch.Services.Document doc, int line);
 }
 
 namespace Scratch.Plugins {
     public class OutlinePlugin : Peas.ExtensionBase, Peas.Activatable {
         public Object object { owned get; construct; }
 
-		Scratch.Services.Interface scratch_interface;
-		SymbolOutline? current_view = null;
-		Gtk.EventBox? container = null;
-
-		uint refresh_timeout = 0;
-
-		Gee.List<SymbolOutline> views;
+        Scratch.Services.Interface scratch_interface;
+        SymbolOutline? current_view = null;
+        Gtk.EventBox? container = null;
+        Gtk.Notebook? notebook = null;
+
+        uint refresh_timeout = 0;
+
+        Gee.List<SymbolOutline> views;
 
         public void activate () {
-			scratch_interface = (Scratch.Services.Interface)object;
+            scratch_interface = (Scratch.Services.Interface)object;
             scratch_interface.hook_notebook_context.connect (on_hook_context);
-			scratch_interface.hook_document.connect (on_hook_document);
-			scratch_interface.hook_split_view.connect (on_hook_split_view);
-			views = new Gee.LinkedList<SymbolOutline> ();
+            scratch_interface.hook_document.connect (on_hook_document);
+            scratch_interface.hook_split_view.connect (on_hook_split_view);
+            views = new Gee.LinkedList<SymbolOutline> ();
         }
 
         public void deactivate () {
@@ -60,83 +62,102 @@
         void on_hook_context (Gtk.Notebook notebook) {
             if (container != null)
                 return;
-            
+            if (this.notebook == null)
+                this.notebook = notebook;
+                
             container = new Gtk.EventBox ();
-			container.visible = false;			
-			notebook.append_page (container, new Gtk.Label (_("Symbols")));
-			container.show_all ();
-        }
-
-		void on_hook_document (Scratch.Services.Document doc) {
-			if (current_view != null && current_view.doc == doc) 
-				return;
-
-			if (current_view != null)
-				container.remove (current_view.get_source_list ());
-
-			SymbolOutline view = null;
-			foreach (var v in views) {
-				if (v.doc == doc) {
-					view = v;
-					break;
-				}
-			}
-			if (view == null) {
-				if (doc.get_mime_type () == "text/x-vala") {
-					view = new ValaSymbolOutline (doc);
-				} else {
-					view = new CtagsSymbolOutline (doc);
-				}
-				view.closed.connect (remove_view);
-				view.goto.connect (goto);
-				views.add (view);
-				view.parse_symbols ();
-
-				doc.doc_saved.connect (update_timeout);
-			}
-
-			container.add (view.get_source_list ());
-			container.show_all ();
-			current_view = view;
-		}
+            container.visible = false;
+        }
+
+        void on_hook_document (Scratch.Services.Document doc) {
+            if (current_view != null && current_view.doc == doc) 
+                return;
+
+            if (current_view != null)
+                container.remove (current_view.get_source_list ());
+
+            SymbolOutline view = null;
+            foreach (var v in views) {
+                if (v.doc == doc) {
+                    view = v;
+                    break;
+                }
+            }
+            if (view == null && doc.file != null) {
+                if (doc.get_mime_type () == "text/x-vala") {
+                    view = new ValaSymbolOutline (doc);
+                } else {
+                    view = new CtagsSymbolOutline (doc);
+                }
+                view.closed.connect (remove_view);
+                view.goto.connect (goto);
+                views.add (view);
+                view.parse_symbols ();
+
+                doc.doc_saved.connect (update_timeout);
+            }
+
+            container.add (view.get_source_list ());
+            container.show_all ();
+            current_view = view;
+
+            if (view.n_symbols > 1) {
+                add_container ();
+            }
+            else if (doc.file == null || view.n_symbols <= 1) {
+                remove_container ();
+            }
+        }
+        
+        void add_container () {
+            if(notebook.page_num (container) == -1) {
+                notebook.append_page (container, new Gtk.Label (_("Symbols")));
+                container.show_all ();
+            }
+        }
+        
+        void remove_container () {
+            if (notebook.page_num (container) != -1)
+                notebook.remove (container);
+        }
         
         void on_hook_split_view (Scratch.Widgets.SplitView view) {
             view.welcome_shown.connect (() => {
-                container.visible = false;
+                remove_container ();
             });
             view.welcome_hidden.connect (() => {
-                container.visible = true;
+                add_container ();
             });
         }
         
-		void update_timeout () {
-			if (refresh_timeout != 0)
-				Source.remove (refresh_timeout);
-
-			refresh_timeout = Timeout.add (1000, () => {
-				current_view.parse_symbols ();
-				refresh_timeout = 0;
-				return false;
-			});
-		}
-
-		void remove_view (SymbolOutline view) {
-			views.remove (view);
-			view.doc.doc_saved.disconnect (update_timeout);
-			view.closed.disconnect (remove_view);
-			view.goto.disconnect (goto);
-		}
-
-		void goto (Scratch.Services.Document doc, int line)	{
-			scratch_interface.open_file (doc.file);
-
-			var text = doc.source_view;
-			Gtk.TextIter iter;
-			text.buffer.get_iter_at_line (out iter, line - 1);
-			text.buffer.place_cursor (iter);
-			text.scroll_to_iter (iter, 0.0, true, 0.5, 0.5);
-		}
-	}
+        void update_timeout () {
+            if (refresh_timeout != 0)
+                Source.remove (refresh_timeout);
+
+            refresh_timeout = Timeout.add (1000, () => {
+                current_view.parse_symbols ();
+                refresh_timeout = 0;
+                return false;
+            });
+        }
+
+        void remove_view (SymbolOutline view) {
+            views.remove (view);
+            view.doc.doc_saved.disconnect (update_timeout);
+            view.closed.disconnect (remove_view);
+            view.goto.disconnect (goto);
+        }
+
+        void goto (Scratch.Services.Document doc, int line)    {
+            scratch_interface.open_file (doc.file);
+
+            var text = doc.source_view;
+            Gtk.TextIter iter;
+            text.buffer.get_iter_at_line (out iter, line - 1);
+            text.buffer.place_cursor (iter);
+            text.scroll_to_iter (iter, 0.0, true, 0.5, 0.5);
+        }
+    }
 }
 
 [ModuleInit]
@@ -144,4 +165,4 @@
 {
   var objmodule = module as Peas.ObjectModule;
   objmodule.register_extension_type (typeof (Peas.Activatable), typeof (Scratch.Plugins.OutlinePlugin));
-}
+}
\ No newline at end of file

=== modified file 'plugins/outline/ValaSymbolResolver.vala'
--- plugins/outline/ValaSymbolResolver.vala	2013-07-09 09:15:52 +0000
+++ plugins/outline/ValaSymbolResolver.vala	2014-10-05 21:35:48 +0000
@@ -1,272 +1,264 @@
 
 public class Report : Vala.Report
 {
-	// just mute everything
-	public override void err (Vala.SourceReference? ref, string msg) {}
-	public override void warn (Vala.SourceReference? ref, string msg) {}
-	public override void note (Vala.SourceReference? ref, string msg) {}
-	public override void depr (Vala.SourceReference? ref, string msg) {}
+    // just mute everything
+    public override void err (Vala.SourceReference? ref, string msg) {}
+    public override void warn (Vala.SourceReference? ref, string msg) {}
+    public override void note (Vala.SourceReference? ref, string msg) {}
+    public override void depr (Vala.SourceReference? ref, string msg) {}
 }
 
 public class Symbol : Granite.Widgets.SourceList.ExpandableItem
 {
-	public Scratch.Services.Document doc { get; construct set; }
-	public Vala.Symbol symbol { get; construct set; }
+    public Scratch.Services.Document doc { get; construct set; }
+    public Vala.Symbol symbol { get; construct set; }
 
-	public Symbol (Scratch.Services.Document doc, Vala.Symbol symbol)
-	{
-		Object (symbol: symbol, name: symbol.name, doc: doc);
-	}
+    public Symbol (Scratch.Services.Document doc, Vala.Symbol symbol)
+    {
+        Object (symbol: symbol, name: symbol.name, doc: doc);
+    }
 }
 
 class SymbolIter : Object
 {
-	public Vala.Symbol? symbol { get; construct set; default = null; }
-	public Icon? icon { get; construct set; default = null; }
-	public Gee.LinkedList<SymbolIter> children { get; private set; }
+    public Vala.Symbol? symbol { get; construct set; default = null; }
+    public Icon? icon { get; construct set; default = null; }
+    public Gee.LinkedList<SymbolIter> children { get; private set; }
 
-	public SymbolIter (Vala.Symbol? symbol = null, Icon? icon = null)
-	{
-		Object(symbol: symbol, icon: icon);
-		children = new Gee.LinkedList<SymbolIter> ();
-	}
+    public SymbolIter (Vala.Symbol? symbol = null, Icon? icon = null)
+    {
+        Object(symbol: symbol, icon: icon);
+        children = new Gee.LinkedList<SymbolIter> ();
+    }
 }
 
 public class ValaSymbolOutline : Object, SymbolOutline
 {
-	public Scratch.Services.Document doc { get; protected set; }
-	public Granite.Widgets.SourceList store { get; private set; }
-	Granite.Widgets.SourceList.ExpandableItem root;
-	Vala.CodeContext context;
-	Vala.Parser parser;
-	SymbolResolver resolver;
-
-	SymbolIter cache;
-
-	Gee.List<Vala.Field> field_blacklist;
-
-	public ValaSymbolOutline (Scratch.Services.Document _doc)
-	{
-		doc = _doc;
-		doc.doc_closed.connect (doc_closed);
-
-		field_blacklist = new Gee.LinkedList<Vala.Field> ();
-		cache = new SymbolIter ();
-
-		store = new Granite.Widgets.SourceList ();
-		store.get_style_context ().add_class ("sidebar");
-		store.item_selected.connect ((selected) => {
-			if (selected == null) return;
-			goto (doc, (selected as Symbol).symbol.source_reference.begin.line);
-			store.selected = null;
-		});
-		root = new Granite.Widgets.SourceList.ExpandableItem (_("Symbols"));
-		store.root.add (root);
-
-		parser = new Vala.Parser ();
-		resolver = new SymbolResolver ();
-		resolver.add_symbol.connect (add_symbol);
-		resolver.blacklist.connect ((f) => {
-			field_blacklist.add (f);
-		});
-
-		init_context ();
-	}
-
-	void init_context ()
-	{
-		context = new Vala.CodeContext ();
-		context.profile = Vala.Profile.GOBJECT;
-		context.add_source_filename (doc.file.get_path ());
-		context.report = new Report ();
-	}
-	
-	~ValaSymbolResolver ()
-	{
-		doc.doc_closed.disconnect (doc_closed);
-	}
-
-	void doc_closed (Scratch.Services.Document doc)
-	{
-		closed ();
-	}
-
-	public Granite.Widgets.SourceList get_source_list ()
-	{
-		return store;
-	}
-
-	async void parse_symbols_async ()
-	{
-		field_blacklist.clear ();
-
-		lock (context)
-		{
-			Vala.CodeContext.push (context);
-
-			parser.parse (context);
-			resolver.resolve (context);
-
-			Vala.CodeContext.pop ();
-		}
-	}
-
-	public void parse_symbols ()
-	{
-		cache.children.clear ();
-		init_context ();
-
-		unowned Thread<void*> thread = Thread.create<void*> (() => {
-			parse_symbols_async ();
-			return null;
-		}, true);
-
-		thread.join ();
-
-		root.clear ();
-		construct_tree (cache, root);
-
-		filter_generated_fields (root);
-
-		store.root.expand_all ();
-	}
-
-	void construct_tree (SymbolIter iter_parent,
-		Granite.Widgets.SourceList.ExpandableItem tree_parent)
-	{
-		foreach (var iter_child in iter_parent.children) {
-			var tree_child = new Symbol (doc, iter_child.symbol);
-			tree_child.icon = iter_child.icon;
-			tree_parent.add (tree_child);
-
-			construct_tree (iter_child, tree_child);
-		}
-	}
-
-	SymbolIter? find_existing (Vala.Symbol symbol, SymbolIter parent = cache)
-	{
-		SymbolIter match = null;
-		foreach (var child in parent.children) {
-			if (child.symbol== symbol) {
-				match = child;
-				break;
-			} else {
-				var res = find_existing (symbol, child);
-				if (res != null)
-					return res;
-			}
-		}
-		return match;
-	}
-
-	// vala generates for each property a field which we do not want to display
-	void filter_generated_fields (Granite.Widgets.SourceList.ExpandableItem parent)
-	{
-		foreach (var child in parent.children) {
-			var child_symbol = child as Symbol;
-			if (field_blacklist.contains (child_symbol.symbol as Vala.Field)) {
-				parent.remove (child);
-			}
-			filter_generated_fields (child_symbol);
-		}
-	}
-
-	void add_symbol (Vala.Symbol symbol, string icon = "", Icon? real_icon = null)
-	{
-		if (symbol.name == null)
-			return;
-
-		SymbolIter parent;
-		if (symbol.scope.parent_scope.owner.name == null)
-			parent = cache;
-		else
-			parent = find_existing (symbol.scope.parent_scope.owner);
-
-		if (parent == null) {
-			warning ("Could not find parent scope of symbol");
-			return;
-		}
-
-		var i = real_icon != null ? real_icon : new ThemedIcon.with_default_fallbacks (icon);
-		var s = new SymbolIter (symbol, i);
-		parent.children.add (s);
-	}
+    public Scratch.Services.Document doc { get; protected set; }
+    public Granite.Widgets.SourceList store { get; private set; }
+    Granite.Widgets.SourceList.ExpandableItem root;
+    Vala.CodeContext context;
+    Vala.Parser parser;
+    SymbolResolver resolver;
+    
+    public int n_symbols { get; protected set; }
+    
+    SymbolIter cache;
+
+    Gee.List<Vala.Field> field_blacklist;
+
+    public ValaSymbolOutline (Scratch.Services.Document _doc)
+    {
+        doc = _doc;
+        doc.doc_closed.connect (doc_closed);
+
+        field_blacklist = new Gee.LinkedList<Vala.Field> ();
+        cache = new SymbolIter ();
+
+        store = new Granite.Widgets.SourceList ();
+        store.get_style_context ().add_class ("sidebar");
+        store.item_selected.connect ((selected) => {
+            if (selected == null) return;
+            goto (doc, (selected as Symbol).symbol.source_reference.begin.line);
+            store.selected = null;
+        });
+        root = new Granite.Widgets.SourceList.ExpandableItem (_("Symbols"));
+        store.root.add (root);
+
+        parser = new Vala.Parser ();
+        resolver = new SymbolResolver ();
+        resolver.add_symbol.connect (add_symbol);
+        resolver.blacklist.connect ((f) => {
+            field_blacklist.add (f);
+        });
+
+        this.n_symbols = 0;
+
+        init_context ();
+    }
+
+    void init_context ()
+    {
+        context = new Vala.CodeContext ();
+        context.profile = Vala.Profile.GOBJECT;
+        context.add_source_filename (doc.file.get_path ());
+        context.report = new Report ();
+    }
+    
+    ~ValaSymbolResolver ()
+    {
+        doc.doc_closed.disconnect (doc_closed);
+    }
+
+    void doc_closed (Scratch.Services.Document doc)
+    {
+        closed ();
+    }
+
+    public Granite.Widgets.SourceList get_source_list ()
+    {
+        return store;
+    }
+
+    async void parse_symbols_async ()
+    {
+        field_blacklist.clear ();
+
+        lock (context)
+        {
+            Vala.CodeContext.push (context);
+
+            parser.parse (context);
+            resolver.resolve (context);
+
+            Vala.CodeContext.pop ();
+        }
+    }
+
+    public void parse_symbols ()
+    {
+        cache.children.clear ();
+        init_context ();
+        
+        Thread<void*> thread = new Thread<void*>("parse-symbols", () => {
+            parse_symbols_async.begin ();
+            return null;
+        });
+
+        thread.join ();
+
+        root.clear ();
+        construct_tree (cache, root);
+
+        store.root.expand_all ();
+    }
+
+    void construct_tree (SymbolIter iter_parent,
+        Granite.Widgets.SourceList.ExpandableItem tree_parent)
+    {
+        foreach (var iter_child in iter_parent.children) {
+            if (iter_child == null)
+                continue;
+            var tree_child = new Symbol (doc, iter_child.symbol);
+            tree_child.icon = iter_child.icon;
+            tree_parent.add (tree_child);
+
+            construct_tree (iter_child, tree_child);
+            this.n_symbols++;
+        }
+    }
+
+    SymbolIter? find_existing (Vala.Symbol symbol, SymbolIter parent = cache)
+    {
+        SymbolIter match = null;
+        foreach (var child in parent.children) {
+            if (child.symbol== symbol) {
+                match = child;
+                break;
+            } else {
+                var res = find_existing (symbol, child);
+                if (res != null)
+                    return res;
+            }
+        }
+        return match;
+    }
+
+    void add_symbol (Vala.Symbol symbol, string icon = "", Icon? real_icon = null)
+    {
+        if (symbol.name == null)
+            return;
+
+        SymbolIter parent;
+        if (symbol.scope.parent_scope.owner.name == null)
+            parent = cache;
+        else
+            parent = find_existing (symbol.scope.parent_scope.owner);
+
+        if (parent == null) {
+            warning ("Could not find parent scope of symbol");
+            return;
+        }
+
+        var i = real_icon != null ? real_icon : new ThemedIcon.with_default_fallbacks (icon);
+        var s = new SymbolIter (symbol, i);
+        parent.children.add (s);
+    }
 }
 
 public class SymbolResolver : Vala.SymbolResolver
 {
-	public signal void add_symbol (Vala.Symbol s, string icon = "", Icon? real_icon = null);
-	public signal void blacklist (Vala.Field f);
-
-	public override void visit_class (Vala.Class s)
-	{
-		add_symbol (s, "user-home-symbolic",
-			new ThemedIcon.from_names ({"user-home-symbolic", "go-home-symbolic", "user-home", "go-home", "home"}));
-		base.visit_class (s);
-	}
-	public override void visit_constant (Vala.Constant s)
-	{
-		add_symbol (s, "view-grid-symbolic");
-		base.visit_constant (s);
-	}
-	public override void visit_delegate (Vala.Delegate s)
-	{
-		add_symbol (s);
-		base.visit_delegate (s);
-	}
-	//FIXME both constructor and destructor are currently not added for some reason
-	public override void visit_constructor (Vala.Constructor s)
-	{
-		add_symbol (s, "media-playback-start-symbolic");
-		base.visit_constructor (s);
-	}
-	public override void visit_destructor (Vala.Destructor s)
-	{
-		add_symbol (s, "edit-delete-symbolic");
-		base.visit_destructor (s);
-	}
-	public override void visit_enum (Vala.Enum s)
-	{
-		add_symbol (s, "view-list-compact-symbolic");
-		base.visit_enum (s);
-	}
-	public override void visit_field (Vala.Field s)
-	{
-		add_symbol (s, "view-grid-symbolic");
-		base.visit_field (s);
-	}
-	public override void visit_interface (Vala.Interface s)
-	{
-		add_symbol (s, "", 
-			new ThemedIcon.from_names ({"dialog-information-symbolic", "help-info-symbolic", "dialog-information", "help-info", "information", "info"}));
-		base.visit_interface (s);
-	}
-	public override void visit_method (Vala.Method s)
-	{
-		add_symbol (s, "document-properties-symbolic");
-		base.visit_method (s);
-	}
-	public override void visit_namespace (Vala.Namespace s)
-	{
-		add_symbol (s, "view-fullscreen-symbolic");
-		base.visit_namespace (s);
-	}
-	public override void visit_property (Vala.Property s)
-	{
-		add_symbol (s, "format-indent-more-symbolic");
-		blacklist (s.field);
-		base.visit_property (s);
-	}
-	public override void visit_signal (Vala.Signal s)
-	{
-		add_symbol (s);
-		base.visit_signal (s);
-	}
-	public override void visit_struct (Vala.Struct s)
-	{
-		add_symbol (s, "user-home-symbolic",
-			new ThemedIcon.from_names ({"user-home-symbolic", "go-home-symbolic", "user-home", "go-home", "home"}));
-		base.visit_struct (s);
-	}
-}
-
+    public signal void add_symbol (Vala.Symbol s, string icon = "", Icon? real_icon = null);
+    public signal void blacklist (Vala.Field f);
+
+    public override void visit_class (Vala.Class s)
+    {
+        add_symbol (s, "user-home-symbolic",
+            new ThemedIcon.from_names ({"user-home-symbolic", "go-home-symbolic", "user-home", "go-home", "home"}));
+        base.visit_class (s);
+    }
+    public override void visit_constant (Vala.Constant s)
+    {
+        add_symbol (s, "view-grid-symbolic");
+        base.visit_constant (s);
+    }
+    public override void visit_delegate (Vala.Delegate s)
+    {
+        add_symbol (s);
+        base.visit_delegate (s);
+    }
+    //FIXME both constructor and destructor are currently not added for some reason
+    public override void visit_constructor (Vala.Constructor s)
+    {
+        add_symbol (s, "media-playback-start-symbolic");
+        base.visit_constructor (s);
+    }
+    public override void visit_destructor (Vala.Destructor s)
+    {
+        add_symbol (s, "edit-delete-symbolic");
+        base.visit_destructor (s);
+    }
+    public override void visit_enum (Vala.Enum s)
+    {
+        add_symbol (s, "view-list-compact-symbolic");
+        base.visit_enum (s);
+    }
+    public override void visit_field (Vala.Field s)
+    {
+        add_symbol (s, "view-grid-symbolic");
+        base.visit_field (s);
+    }
+    public override void visit_interface (Vala.Interface s)
+    {
+        add_symbol (s, "", 
+            new ThemedIcon.from_names ({"dialog-information-symbolic", "help-info-symbolic", "dialog-information", "help-info", "information", "info"}));
+        base.visit_interface (s);
+    }
+    public override void visit_method (Vala.Method s)
+    {
+        add_symbol (s, "document-properties-symbolic");
+        base.visit_method (s);
+    }
+    public override void visit_namespace (Vala.Namespace s)
+    {
+        add_symbol (s, "view-fullscreen-symbolic");
+        base.visit_namespace (s);
+    }
+    public override void visit_property (Vala.Property s)
+    {
+        add_symbol (s, "format-indent-more-symbolic");
+        blacklist (s.field);
+        base.visit_property (s);
+    }
+    public override void visit_signal (Vala.Signal s)
+    {
+        add_symbol (s);
+        base.visit_signal (s);
+    }
+    public override void visit_struct (Vala.Struct s)
+    {
+        add_symbol (s, "user-home-symbolic",
+            new ThemedIcon.from_names ({"user-home-symbolic", "go-home-symbolic", "user-home", "go-home", "home"}));
+        base.visit_struct (s);
+    }
+}
\ No newline at end of file

=== modified file 'plugins/pastebin/CMakeLists.txt'
--- plugins/pastebin/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/pastebin/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -11,9 +11,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --vapidir=${CMAKE_BINARY_DIR}
     --vapidir=${CMAKE_BINARY_DIR}/src/

=== modified file 'plugins/pastebin/pastebin.vala'
--- plugins/pastebin/pastebin.vala	2013-06-07 21:00:59 +0000
+++ plugins/pastebin/pastebin.vala	2014-10-05 21:35:48 +0000
@@ -133,7 +133,8 @@
                 menuitem.destroy ();
             menuitem = new Gtk.MenuItem.with_label (_("Upload to Pastebin"));
             menuitem.activate.connect (() => {
-		        new Dialogs.PasteBinDialog (doc);
+                MainWindow window = plugins.manager.window;
+		        new Dialogs.PasteBinDialog (window, doc);
             });
             menu.append (menuitem);
             menuitem.show_all ();

=== modified file 'plugins/pastebin/pastebin_dialog.vala'
--- plugins/pastebin/pastebin_dialog.vala	2013-04-27 17:25:01 +0000
+++ plugins/pastebin/pastebin_dialog.vala	2014-10-05 21:35:48 +0000
@@ -246,9 +246,11 @@
 			private Button send_button;
 
         
-        public PasteBinDialog (Scratch.Services.Document doc) {
+        public PasteBinDialog (Gtk.Window? parent, Scratch.Services.Document doc) {
             this.doc = doc; 
             
+            if (parent != null)
+                this.set_transient_for (parent);
             this.title = _("Share via PasteBin");
             this.type_hint = Gdk.WindowTypeHint.DIALOG;
             
@@ -355,12 +357,12 @@
 			var format_others_scroll = new ScrolledWindow(null, null);
 				format_others_scroll.add(format_others_view);
 				
-			var format_others_ok = new Button.from_stock(Stock.OK);
+			var format_others_ok = new Button.from_stock ("gtk-ok");
 				format_others_ok.clicked.connect (format_others_ok_clicked);			
-			var format_others_cancel = new Button.from_stock(Stock.CANCEL);
+			var format_others_cancel = new Button.from_stock ("gtk-cancel");
 				format_others_cancel.clicked.connect (format_others_cancel_clicked);
-			var format_others_buttons = new ButtonBox(Orientation.HORIZONTAL);
-				format_others_buttons.set_layout(ButtonBoxStyle.CENTER);
+			var format_others_buttons = new ButtonBox (Orientation.HORIZONTAL);
+				format_others_buttons.set_layout (ButtonBoxStyle.CENTER);
 				format_others_buttons.pack_start (format_others_cancel);
 				format_others_buttons.pack_start (format_others_ok);
 				

=== modified file 'plugins/source-tree/CMakeLists.txt'
--- plugins/source-tree/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/source-tree/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -4,12 +4,16 @@
 	SourceTreePlugin.vala
 PACKAGES
     gtk+-3.0
-    gee-1.0
+    gee-0.8
     granite
     scratchcore
     libpeas-1.0
     gtksourceview-3.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --vapidir=${CMAKE_BINARY_DIR}
     --vapidir=${CMAKE_BINARY_DIR}/src/

=== modified file 'plugins/source-tree/SourceTreePlugin.vala'
--- plugins/source-tree/SourceTreePlugin.vala	2013-12-16 12:44:43 +0000
+++ plugins/source-tree/SourceTreePlugin.vala	2014-10-05 21:35:48 +0000
@@ -1,4 +1,3 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /***
   BEGIN LICENSE
 
@@ -22,11 +21,11 @@
 public const string DESCRIPTION = N_("Have a look at your sources organized in a nice tree");
 
 const bool HIDE_TOOLBAR = true;
-const bool DARK_THEME = true;
 
 Scratch.Services.Interface scratch_interface;
 
 public class Folder : Granite.Widgets.SourceList.ExpandableItem {
+<<<<<<< TREE
 	public File file { get; construct set; }
 	bool loaded = false;
 
@@ -87,62 +86,126 @@
 			}
 		} catch (Error e) { warning (e.message); }
 	}
+=======
+    public File file { get; construct set; }
+    bool loaded = false;
+
+    const string ATTRIBUTES = FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE + 
+        "," + FileAttribute.STANDARD_ICON;
+    const string[] IGNORED = { "pyc", "class", "pyo", "o" };
+
+
+    public Folder (File dir) {
+        file = dir;
+        name = dir.get_basename ();
+        selectable = false;
+        
+        //need to add one item to make the folder appear
+        add (new Granite.Widgets.SourceList.Item (_("Loading...")));
+        
+        toggled.connect (() => {
+            if (!expanded || loaded)
+                return;
+            
+            loaded = true;
+            
+            load ();
+            var children_tmp = new Gee.ArrayList<Granite.Widgets.SourceList.Item> ();
+            children_tmp.add_all (children);
+            foreach (var child in children_tmp) {
+                if (!(child is Document) && !(child is Folder))
+                    remove (child);
+            }
+        });
+    }
+    
+    public void load () {
+        try {
+            var enumerator = file.enumerate_children (ATTRIBUTES, FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);
+            FileInfo? file_info = null;
+            
+            while ((file_info = enumerator.next_file ()) != null) {
+                var file_name = file_info.get_name ();
+                var file_type = file_info.get_file_type ();
+                
+                if (file_type == FileType.REGULAR && !file_name.has_suffix ("~") && !file_name.has_prefix (".")) {
+                    // Ignore some kind of temporany files
+
+                    bool ignore = false;
+                    for (int n = 0; n < IGNORED.length; n++) { 
+                        string ignored_suffix = IGNORED[n];
+                        debug (ignored_suffix);
+                        var tmp = file_name.split (".");
+                        string suffix = tmp[tmp.length-1];
+                        if (suffix == ignored_suffix)
+                            ignore = true;
+                    }
+                    if (!ignore)
+                        add (new Document (file.get_child (file_name), file_info.get_icon ()));
+
+                } else if (file_type == FileType.DIRECTORY && !file_name.has_prefix (".")) {
+                    add (new Folder (file.get_child (file_name)));
+                }
+            }
+        } catch (Error e) { warning (e.message); }
+    }
+>>>>>>> MERGE-SOURCE
 }
 
 public class Document : Granite.Widgets.SourceList.Item
 {
-	public Scratch.Services.Document? doc { get; private set; }
-	public File file { get; construct set; }
+    public Scratch.Services.Document? doc { get; private set; }
+    public File file { get; construct set; }
 
-	public Document (File file, Icon icon)
-	{
-		Object (file: file, icon: icon);
-		
-		name = file.get_basename ();
-		
-		action_activated.connect (() => {
-			if (parent == null)
-				return;
-				
+    public Document (File file, Icon icon)
+    {
+        Object (file: file, icon: icon);
+        
+        name = file.get_basename ();
+        
+        action_activated.connect (() => {
+            if (parent == null)
+                return;
+                
             scratch_interface.close_document (doc);
-			parent.remove (this);
-		});
-	}
+            parent.remove (this);
+        });
+    }
 
-	public Document.scratch (Scratch.Services.Document _doc)
-	{
-		Icon icon = new FileIcon (_doc.file);
-		try {
-			icon = _doc.file.query_info (FileAttribute.STANDARD_ICON, 0).get_icon ();
-		} catch (Error e) { warning (e.message); }
-		this (_doc.file, icon);
-		doc = _doc;
-		try {
-			activatable = Gtk.IconTheme.get_default ().lookup_by_gicon (new ThemedIcon ("window-close-symbolic"), 16, 0).load_symbolic ({1, 1, 1, 1});
-		} catch (Error e) { warning (e.message); }		
-	}
+    public Document.scratch (Scratch.Services.Document _doc)
+    {
+        Icon icon = new FileIcon (_doc.file);
+        try {
+            icon = _doc.file.query_info (FileAttribute.STANDARD_ICON, 0).get_icon ();
+        } catch (Error e) { warning (e.message); }
+        this (_doc.file, icon);
+        doc = _doc;
+        try {
+            activatable = Gtk.IconTheme.get_default ().lookup_by_gicon (new ThemedIcon ("window-close-symbolic"), 16, 0).load_symbolic ({1, 1, 1, 1});
+        } catch (Error e) { warning (e.message); }      
+    }
 }
 
 public class Bookmark : Granite.Widgets.SourceList.Item
 {
-	public Scratch.Services.Document doc { get; construct set; }
-	public Gtk.TextIter iter { get; construct set; }
-
-	public Bookmark (Scratch.Services.Document doc, Gtk.TextIter iter)
-	{
-		Object(name: doc.get_basename () + ":" + (iter.get_line () + 1).to_string (),
-			doc: doc, iter: iter, icon: new ThemedIcon ("tag-new"));
-		try {
-			activatable = Gtk.IconTheme.get_default ().lookup_by_gicon (new ThemedIcon ("window-close-symbolic"), 16, 0).load_symbolic ({1, 1, 1, 1});
-		} catch (Error e) { warning (e.message); }
-
-		action_activated.connect (() => {
-			if (parent == null)
-				return;
-			
-			parent.remove (this);
-		});
-	}
+    public Scratch.Services.Document doc { get; construct set; }
+    public Gtk.TextIter iter { get; construct set; }
+
+    public Bookmark (Scratch.Services.Document doc, Gtk.TextIter iter)
+    {
+        Object(name: doc.get_basename () + ":" + (iter.get_line () + 1).to_string (),
+            doc: doc, iter: iter, icon: new ThemedIcon ("tag-new"));
+        try {
+            activatable = Gtk.IconTheme.get_default ().lookup_by_gicon (new ThemedIcon ("window-close-symbolic"), 16, 0).load_symbolic ({1, 1, 1, 1});
+        } catch (Error e) { warning (e.message); }
+
+        action_activated.connect (() => {
+            if (parent == null)
+                return;
+            
+            parent.remove (this);
+        });
+    }
 }
 
 namespace Scratch.Plugins {
@@ -152,47 +215,53 @@
         
         Gtk.ToolButton? new_button = null;
         Gtk.ToolButton? bookmark_tool_button = null;
-		Gtk.Notebook scratch_notebook;
-		Granite.Widgets.SourceList view;
-		Granite.Widgets.SourceList.ExpandableItem category_files;
-		Granite.Widgets.SourceList.ExpandableItem category_project;
-		Granite.Widgets.SourceList.ExpandableItem category_bookmarks;
-
-		File? root = null;
-
-		bool my_select = false;
+        Gtk.Notebook scratch_notebook;
+        Gtk.Notebook side_notebook;
+        Granite.Widgets.SourceList view;
+        Granite.Widgets.SourceList.ExpandableItem category_files;
+        Granite.Widgets.SourceList.ExpandableItem category_project;
+        Granite.Widgets.SourceList.ExpandableItem category_bookmarks;
+
+        File? root = null;
+
+        bool my_select = false;
 
         public void activate () {
-			if (DARK_THEME)
-				Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
-            
             plugins = (Scratch.Services.Interface) object;
             plugins.hook_notebook_sidebar.connect (on_hook_sidebar);
-			plugins.hook_document.connect (on_hook_document);
-			plugins.hook_toolbar.connect ((toolbar) => {
-				if (this.bookmark_tool_button != null && this.new_button != null) 
-				    return;
-				this.new_button = main_actions.get_action ("NewTab").create_tool_item() as Gtk.ToolButton;
-				this.bookmark_tool_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("bookmark-new", Gtk.IconSize.LARGE_TOOLBAR), _("Bookmark"));
-				bookmark_tool_button.show_all ();
-				bookmark_tool_button.clicked.connect (() => add_bookmark ());
-				toolbar.insert (bookmark_tool_button, toolbar.get_item_index (toolbar.find_button) + 1);
-				toolbar.insert (new_button, 0);
-			});
-			plugins.hook_split_view.connect ((view) => {
-			    this.bookmark_tool_button.visible = ! view.is_empty ();
+            plugins.hook_document.connect (on_hook_document);
+            plugins.hook_toolbar.connect ((toolbar) => {
+                MainWindow window = plugins.manager.window;
+                if (this.bookmark_tool_button != null && this.new_button != null) 
+                    return;
+                this.new_button = window.main_actions.get_action ("NewTab").create_tool_item() as Gtk.ToolButton;
+                this.bookmark_tool_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("bookmark-new", Gtk.IconSize.LARGE_TOOLBAR), _("Bookmark"));
+                bookmark_tool_button.show_all ();
+                bookmark_tool_button.clicked.connect (() => add_bookmark ());
+                toolbar.pack_start (bookmark_tool_button);
+                toolbar.pack_start (new_button);
+                //toolbar.insert (bookmark_tool_button, toolbar.get_item_index (toolbar.find_button) + 1);
+                //toolbar.insert (new_button, 0);
+            });
+            plugins.hook_split_view.connect ((view) => {
+                this.bookmark_tool_button.visible = ! view.is_empty ();
                 this.bookmark_tool_button.no_show_all = view.is_empty ();
                 view.welcome_shown.connect (() => {
                     this.bookmark_tool_button.visible = false;
                     this.bookmark_tool_button.no_show_all = true;
+                    int current_page = this.side_notebook.get_current_page ();
+                    if (this.side_notebook.get_nth_page (current_page) == this.view) {
+                        this.side_notebook.remove_page (current_page);
+                    }
                 });
                 view.welcome_hidden.connect (() => {
                     this.bookmark_tool_button.visible = true;
                     this.bookmark_tool_button.no_show_all = false;
+                    this.side_notebook.append_page (this.view, new Gtk.Label (_("Source Tree")));
                 });
-			});
-			
-			scratch_interface = ((Scratch.Services.Interface)object);
+            });
+            
+            scratch_interface = ((Scratch.Services.Interface)object);
         }
 
         public void deactivate () {
@@ -211,6 +280,7 @@
         void on_hook_sidebar (Gtk.Notebook notebook) {
             if (view != null)
                 return;
+<<<<<<< TREE
 
 			view = new Granite.Widgets.SourceList ();
 			view.set_sort_func ((a, b) => {
@@ -326,6 +396,122 @@
 			return dir;
 		}
 	}
+=======
+            side_notebook = notebook;
+            view = new Granite.Widgets.SourceList ();
+            view.set_sort_func ((a, b) => {
+                if (a is Folder && b is Folder)
+                    return a.name.collate (b.name);
+                if (a is Folder)
+                    return -1;
+                if (b is Folder)
+                    return 1;
+
+                return a.parent == view.root && a.name == "Bookmarks" ? 1 : a.name.collate (b.name);
+            });
+
+            view.get_style_context ().add_class ("sidebar");
+            category_files = new Granite.Widgets.SourceList.ExpandableItem (_("Files"));
+            category_project = new Granite.Widgets.SourceList.ExpandableItem (_("Project"));
+            category_bookmarks = new Granite.Widgets.SourceList.ExpandableItem (_("Bookmarks"));
+            view.root.add (category_files);
+            view.root.add (category_project);
+            view.root.add (category_bookmarks);
+            view.show_all ();
+
+            view.item_selected.connect ((new_current) => {
+                if (my_select) return;
+
+                if (new_current is Bookmark) {
+                    var bookmark = new_current as Bookmark;
+                    ((Scratch.Services.Interface)object).open_file (bookmark.doc.file);
+                    var text = bookmark.doc.source_view;
+                    text.buffer.place_cursor (bookmark.iter);
+                    text.scroll_to_iter (bookmark.iter, 0.0, true, 0.5, 0.5);
+                    return;
+                }
+
+                var doc = new_current as Document;
+                ((Scratch.Services.Interface)object).open_file (doc.file);
+            });
+
+        }
+
+        void on_hook_document (Scratch.Services.Document doc) {
+            scratch_notebook = (doc.get_parent () as Gtk.Notebook);
+            scratch_notebook.set_show_tabs (!HIDE_TOOLBAR);
+            
+            foreach (var d in category_files.children) {
+                if ((d as Document).file == doc.file) {
+                    view.selected = d;
+                    return;
+                }
+            }
+
+            if (doc.file == null) {
+                doc.doc_saved.connect (wait_for_save);
+                return;
+            }
+
+            add_doc (doc);
+        }
+
+        void wait_for_save (Scratch.Services.Document doc) {
+            doc.doc_saved.disconnect (wait_for_save);
+            add_doc (doc);
+        }
+
+        void add_doc (Scratch.Services.Document doc) {
+            var item = new Document.scratch (doc);
+            category_files.add (item);
+            my_select = true;
+            view.selected = item;
+            my_select = false;
+            
+            var new_root = detect_project (doc.file);
+            if (root == null || root.get_path () != new_root.get_path ()) {
+                root = new_root;
+                category_project.clear ();              
+                category_project.expand_all ();
+                category_project.add (new Folder (root));
+            }
+        }
+
+        void add_bookmark () {
+            var doc = (view.selected as Document).doc as Scratch.Services.Document;
+            var buffer = doc.source_view.buffer;
+            Gtk.TextIter iter;
+            buffer.get_iter_at_offset (out iter, buffer.cursor_position);
+
+            var bookmark = new Bookmark (doc, iter);
+            category_bookmarks.add (bookmark);
+            category_bookmarks.expand_all ();
+        }
+
+        const string [] vcss = {".bzr", ".git", ".hg"};
+        File? detect_project (File opened)  {
+            //go up looking for a vcs indicating folder
+            var dir = opened;
+            while ((dir = dir.get_parent ()) != null) {
+                foreach (var vcs in vcss) {
+                    if (dir.get_child (vcs).query_exists ()) {
+                        return dir;
+                    }
+                }
+            }
+
+            //checking for src, might not be under version control yet
+            dir = opened.get_parent ();
+            if (dir.get_basename () == "src") {
+                dir = dir.get_parent ();
+            } else if (dir.get_parent ().get_basename () == "src") {
+                dir = dir.get_parent ().get_parent ();
+            }
+            
+            return dir;
+        }
+    }
+>>>>>>> MERGE-SOURCE
 }
 
 [ModuleInit]

=== modified file 'plugins/spell/CMakeLists.txt'
--- plugins/spell/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/spell/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -27,9 +27,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --thread
     --vapidir=${CMAKE_BINARY_DIR}

=== modified file 'plugins/spell/spell.vala'
--- plugins/spell/spell.vala	2013-08-17 13:14:44 +0000
+++ plugins/spell/spell.vala	2014-10-05 21:35:48 +0000
@@ -53,6 +53,15 @@
                     if (info.get_module_name () == "spell")
                         spell.detach ();
                 });
+                // Deactivate Spell checker when we are editing a code file
+                var lang = d.source_view.buffer.language;
+                if (lang != null)
+                    spell.detach ();
+                // Detect language changed event
+                view.language_changed.connect ((lang) => {
+                    if (lang != null)
+                        spell.detach ();
+                });
             }
         });
     }
@@ -67,4 +76,4 @@
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (typeof(Peas.Activatable),
                                       typeof(Scratch.Plugins.Spell));
-}
+}
\ No newline at end of file

=== modified file 'plugins/strip-trailing-save/CMakeLists.txt'
--- plugins/strip-trailing-save/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/strip-trailing-save/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -8,9 +8,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --thread
     --vapidir=${CMAKE_BINARY_DIR}

=== modified file 'plugins/strip-trailing-save/strip-trailing-save.vala'
--- plugins/strip-trailing-save/strip-trailing-save.vala	2013-06-07 21:00:59 +0000
+++ plugins/strip-trailing-save/strip-trailing-save.vala	2014-10-05 21:35:48 +0000
@@ -33,8 +33,8 @@
         plugins = (Scratch.Services.Interface) object;   
         plugins.hook_window.connect ((w) => {
             this.main_window = w;
-            main_actions.pre_activate.connect (on_save);
-            action_save = main_actions.get_action ("SaveFile");
+            w.main_actions.pre_activate.connect (on_save);
+            action_save = w.main_actions.get_action ("SaveFile");
         });
     }
 
@@ -42,7 +42,7 @@
      * Deactivate plugin.
      */
     public void deactivate () {
-        main_actions.pre_activate.disconnect(on_save);
+        this.main_window.main_actions.pre_activate.disconnect(on_save);
     }
 
     /*

=== modified file 'plugins/terminal/CMakeLists.txt'
--- plugins/terminal/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/terminal/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -15,9 +15,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --thread
     --vapidir=${CMAKE_BINARY_DIR}

=== modified file 'plugins/terminal/terminal.plugin'
--- plugins/terminal/terminal.plugin	2013-09-05 09:31:34 +0000
+++ plugins/terminal/terminal.plugin	2014-10-05 21:35:48 +0000
@@ -4,7 +4,7 @@
 IAge=2
 Name=Terminal
 Description=A terminal in your text editor
-Icon=terminal
+Icon=utilities-terminal
 Authors=Mario Guerriero <[e-mail]>
 Copyright=Copyright © 2012 Scratch and Euclide Developers
 Website=http://launchpad.net/scratch

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2013-07-26 20:20:37 +0000
+++ plugins/terminal/terminal.vala	2014-10-05 21:35:48 +0000
@@ -61,6 +61,60 @@
         string font_name = system_settings.get_string ("monospace-font-name");
         this.terminal.set_font_from_string (font_name);
 
+        // Set allow-bold, audible-bell, background, foreground, and palette of pantheon-terminal
+        var schema_source = SettingsSchemaSource.get_default ();
+        var terminal_schema = schema_source.lookup ("org.pantheon.terminal.settings", true);
+        if (terminal_schema != null) {
+            var pantheon_terminal_settings = new GLib.Settings ("org.pantheon.terminal.settings");
+
+            bool allow_bold_setting = pantheon_terminal_settings.get_boolean ("allow-bold");
+            this.terminal.set_allow_bold (allow_bold_setting);
+
+            bool audible_bell_setting = pantheon_terminal_settings.get_boolean ("audible-bell");
+            this.terminal.set_audible_bell (audible_bell_setting);
+
+            this.terminal.set_background_image (null); // allows background and foreground settings to take effect
+
+            string background_setting = pantheon_terminal_settings.get_string ("background");
+            Gdk.Color background_color;
+            Gdk.Color.parse (background_setting, out background_color);
+
+            string foreground_setting = pantheon_terminal_settings.get_string ("foreground");
+            Gdk.Color foreground_color;
+            Gdk.Color.parse (foreground_setting, out foreground_color);
+
+            string palette_setting = pantheon_terminal_settings.get_string ("palette");
+
+            string[] hex_palette = {"#000000", "#FF6C60", "#A8FF60", "#FFFFCC", "#96CBFE",
+                                    "#FF73FE", "#C6C5FE", "#EEEEEE", "#000000", "#FF6C60",
+                                    "#A8FF60", "#FFFFB6", "#96CBFE", "#FF73FE", "#C6C5FE",
+                                    "#EEEEEE"};
+
+            string current_string = "";
+            int current_color = 0;
+            for (var i = 0; i < palette_setting.length; i++) {
+                if (palette_setting[i] == ':') {
+                    hex_palette[current_color] = current_string;
+                    current_string = "";
+                    current_color++;
+                } else {
+                    current_string += palette_setting[i].to_string ();
+                }
+            }
+
+            Gdk.Color[] palette = new Gdk.Color[16];
+
+            for (int i = 0; i < hex_palette.length; i++) {
+                Gdk.Color new_color;
+                Gdk.Color.parse (hex_palette[i], out new_color);
+
+                palette[i] = new_color;
+            }
+
+            this.terminal.set_colors (foreground_color, background_color, palette);
+
+        } // end pantheon-terminal settings
+
         // Popup menu
         var menu = new Gtk.Menu ();
             

=== modified file 'plugins/vim-emulation/CMakeLists.txt'
--- plugins/vim-emulation/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/vim-emulation/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -9,9 +9,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --thread
     --vapidir=${CMAKE_BINARY_DIR}

=== modified file 'plugins/word-completion/CMakeLists.txt'
--- plugins/word-completion/CMakeLists.txt	2013-11-30 08:48:08 +0000
+++ plugins/word-completion/CMakeLists.txt	2014-10-05 21:35:48 +0000
@@ -10,9 +10,13 @@
     granite
     gtksourceview-3.0
     scratchcore
-    gee-1.0
+    gee-0.8
     libpeas-1.0
+<<<<<<< TREE
     zeitgeist-1.0
+=======
+    ${ZEITGEIST_DEPS}
+>>>>>>> MERGE-SOURCE
 OPTIONS
     --thread
     --vapidir=${CMAKE_BINARY_DIR}

=== modified file 'plugins/word-completion/completion-provider.vala'
--- plugins/word-completion/completion-provider.vala	2013-06-01 23:12:09 +0000
+++ plugins/word-completion/completion-provider.vala	2014-10-05 21:35:48 +0000
@@ -18,17 +18,33 @@
  *
  */
 
-using Gtk;
-
-public class CompletionProvider : Gtk.SourceCompletionProvider, Object {
-    
-    static const unichar[] stoppers = {' ', '\n', '(', ';', '}', '{', '.'};
-    TextMark completion_mark; /* The mark at which the proposals were generated */
-    
-    Gdk.Pixbuf icon;
+public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider, Object {
     public string name;
     public int priority;
 
+    public const string COMPLETION_END_MARK_NAME = "ScratchWordCompletionEnd";
+    public const string COMPLETION_START_MARK_NAME = "ScratchWordCompletionStart";
+
+    private Gdk.Pixbuf icon;
+    private Gtk.TextView? view;
+    private Gtk.TextBuffer? buffer;
+    private Euclide.Completion.Parser parser;
+    private bool proposals_found = false;
+    private Gtk.TextMark completion_end_mark;
+    private Gtk.TextMark completion_start_mark;
+
+    public signal void can_propose (bool b);
+
+    public CompletionProvider (Scratch.Plugins.Completion completion) {
+        this.view = completion.current_view as Gtk.TextView;
+        this.buffer = completion.current_view.buffer;
+        this.parser = completion.parser;
+        Gtk.TextIter iter;
+        buffer.get_iter_at_offset (out iter, 0);
+        completion_end_mark = buffer.create_mark (COMPLETION_END_MARK_NAME, iter, false);
+        completion_start_mark = buffer.create_mark (COMPLETION_START_MARK_NAME, iter, false);
+    }
+
     public string get_name () {
         return this.name;
     }
@@ -40,22 +56,19 @@
     public bool match (Gtk.SourceCompletionContext context) {
         return true;
     }
-    
-    public void populate (Gtk.SourceCompletionContext context) {        
-        var file_props = get_file_proposals ();
-        
-        /* Get current line */
-        completion_mark = current_buffer.get_insert ();
-        TextIter iter;
-        current_buffer.get_iter_at_mark (out iter, completion_mark);
-        var line = iter.get_line () + 1;
-
-        TextIter iter_start;
-        current_buffer.get_iter_at_line (out iter_start, line - 1);
-        
-        // Proposal itself        
-        if (file_props != null)
+
+    public void populate (Gtk.SourceCompletionContext context) {
+        /*Store current insertion point for use in activate_proposal */
+        GLib.List<Gtk.SourceCompletionItem>? file_props;
+        bool no_minimum = (context.get_activation () == Gtk.SourceCompletionActivation.USER_REQUESTED);
+        proposals_found = get_proposals (out file_props, no_minimum);
+
+        if (proposals_found)
             context.add_proposals (this, file_props, true);
+
+        /* Signal to plugin whether proposals are available
+         * If none, the completion will be active but not visible */
+        can_propose (proposals_found);
     }
 
     public unowned Gdk.Pixbuf? get_icon () {
@@ -72,15 +85,22 @@
 
     public bool activate_proposal (Gtk.SourceCompletionProposal proposal,
                                    Gtk.TextIter iter) {
-
-        // Count backward from completion_mark instead of iter (avoids wrong insertion if the user is typing fast) 
-        TextIter start;
-        current_buffer.get_iter_at_mark (out start, completion_mark);
-        
-        start.backward_word_start ();
-        
-        current_buffer.delete (ref start, ref iter);
-        current_buffer.insert (ref start, proposal.get_text (), proposal.get_text ().length);
+        if (proposals_found) {
+            /* Count backward from completion_mark instead of iter
+             * (avoids wrong insertion if the user is typing fast) */
+            Gtk.TextIter start;
+            Gtk.TextIter end;
+            Gtk.TextMark mark;
+
+            mark = buffer.get_mark (COMPLETION_END_MARK_NAME);
+            buffer.get_iter_at_mark (out end, mark);
+
+            mark = buffer.get_mark (COMPLETION_START_MARK_NAME);
+            buffer.get_iter_at_mark (out start, mark);
+
+            buffer.@delete (ref start, ref end);
+            buffer.insert (ref start, proposal.get_text (), proposal.get_text ().length);
+        }
         return true;
     }
 
@@ -89,65 +109,82 @@
                Gtk.SourceCompletionActivation.USER_REQUESTED;
     }
 
-    Box box_info_frame = new Box (Orientation.VERTICAL, 0);
     public unowned Gtk.Widget? get_info_widget (Gtk.SourceCompletionProposal proposal) {
-        return box_info_frame;
+        /* As no additional info is provided no widget is needed */
+        return null;
     }
 
-    public int get_interactive_dela () {
+    public int get_interactive_delay () {
+        /* Use default delay (250 milliseconds) */
         return -1;
     }
 
-    public bool get_start_it (Gtk.SourceCompletionContext context,
+    public bool get_start_iter (Gtk.SourceCompletionContext context,
                                 Gtk.SourceCompletionProposal proposal,
                                 Gtk.TextIter iter) {
-        var mark = current_buffer.get_insert ();
-        TextIter cursor_iter;
-        current_buffer.get_iter_at_mark (out cursor_iter, mark);
-        
+        var mark = buffer.get_insert ();
+        Gtk.TextIter cursor_iter;
+        buffer.get_iter_at_mark (out cursor_iter, mark);
+
         iter = cursor_iter;
         iter.backward_word_start ();
         return true;
     }
 
     public void update_info (Gtk.SourceCompletionProposal proposal, Gtk.SourceCompletionInfo info) {
+        /* No additional info provided on proposals */
         return;
     }
-    
-    public GLib.List<Gtk.SourceCompletionItem>? get_file_proposals () {
-        /* Compute the string we want compute */
+
+    private bool get_proposals (out GLib.List<Gtk.SourceCompletionItem>? props, bool no_minimum) {
         string to_find = "";
-        string last_to_find;
         Gtk.TextIter iter;
-        Gtk.TextBuffer buffer = current_buffer;
-        buffer.get_iter_at_offset (out iter, buffer.cursor_position);
-        iter.backward_find_char ((c) => {
-            bool valid = c in stoppers;
-            if (!valid)
-                to_find += c.to_string ();
-            return valid;
-        }, null);
-
-        to_find = to_find.reverse ();
-        last_to_find = to_find;
-
-            
-        if (to_find == "")
-            return null;
-            
-        var props = new GLib.List<Gtk.SourceCompletionItem> ();
-        
-        foreach (var word in parser.get_for_word (to_find)) {
-            GLib.debug (word);
-            var item = new Gtk.SourceCompletionItem (word,
-                                                    word,
-                                                    null,
-                                                    null);
-            props.append (item);
-        }
-            
-        current_view.grab_focus ();
-        
-        return props;
+        Gtk.TextBuffer temp_buffer = buffer;
+        props = null;
+
+        Gtk.TextIter start, end;
+        buffer.get_selection_bounds (out start, out end);
+
+        to_find = temp_buffer.get_text (start, end, true);
+
+        if (to_find.length == 0) {
+            /* Find start of current word */
+            temp_buffer.get_iter_at_offset (out iter, buffer.cursor_position);
+            /* Mark current insertion point as end point for use in activate proposal */
+            buffer.move_mark_by_name (COMPLETION_END_MARK_NAME, iter);
+            /* TODO - Use iter.backward_word_start? */
+            iter.backward_find_char ((c) => {
+                bool valid = parser.is_delimiter (c);
+                if (!valid)
+                    to_find += c.to_string ();
+
+                return valid;
+            }, null);
+            iter.forward_cursor_position ();
+            /* Mark start of delimited text as start point for use in activate proposal */
+            buffer.move_mark_by_name (COMPLETION_START_MARK_NAME, iter);
+            to_find = to_find.reverse ();
+        } else {
+            /* mark start and end of the selection */
+            buffer.move_mark_by_name (COMPLETION_END_MARK_NAME, end);
+            buffer.move_mark_by_name (COMPLETION_START_MARK_NAME, start);
+        }
+
+        /* There is no minimum length of word to find if the user requested a completion */
+        if (no_minimum || to_find.length >= Euclide.Completion.Parser.MINIMUM_WORD_LENGTH) {
+            /* Get proposals, if any */
+            var prop_word_list = new GLib.List<string> ();
+            if (parser.get_for_word (to_find, out prop_word_list)) {
+                foreach (var word in prop_word_list) {
+                    var item = new Gtk.SourceCompletionItem (word,
+                                                             word,
+                                                             null,
+                                                             null);
+                    props.prepend (item);
+                }
+                return true;
+            }
+        }
+        return false;
     }
 }

=== modified file 'plugins/word-completion/engine.vala'
--- plugins/word-completion/engine.vala	2013-06-01 23:12:09 +0000
+++ plugins/word-completion/engine.vala	2014-10-05 21:35:48 +0000
@@ -19,98 +19,94 @@
  */
 
 public class Euclide.Completion.Parser : GLib.Object {
-    const char[] stoppers = {'\n', ' ', '.', ';', '\t', '(', ')', ',', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '-', '"', '\'', '&', '|'};
-    const string[] to_ignore = {"ref", "var"};
-    /* Read-only for external use */
-    public Gee.ArrayList<string> words;
-    public Gee.HashMap<Gtk.TextView,Gee.LinkedList<string>> text_views;
+    public const int MINIMUM_WORD_LENGTH = 3;
+    public const int MAX_TOKENS = 1000000;
+
+    public const string delimiters = " .,;:?{}[]()0123456789+-=&|-<>*\\/\n\t\'\"";
+    public bool is_delimiter (unichar c) {
+        return delimiters.index_of_char (c) >= 0;
+    }
+
+    public Gee.HashMap<Gtk.TextView,Gee.ArrayList<string>> text_view_words;
+    public bool parsing_cancelled = false;
+
+    private Gee.ArrayList<string> words;
+    private Mutex words_lock;
+    private string last_word = "";
+
     public Parser () {
-         words = new Gee.ArrayList<string> ();
-         text_views = new Gee.HashMap<Gtk.TextView,Gee.LinkedList<string>> ();
-    }
-    
-    public void clear () {
-        lock (words) {
-            words.clear ();
-        }
-    }
-    
-    public void parse_string (string text, Gee.List<string>? words_ = null) {
-        in_comment = false;
-        in_string = false;
-        in_single_string = false;
-        words_ = words_ ?? words;
-        lock (words) {
-            string current_word = "";
-            for (int i = 0; i < text.length; i++) {
-                var text_char = text[i];
-                if (text_char in stoppers) {
-                    if (current_word != "") {
-                        parse_word (current_word);
-                        current_word = "";
-                    }
-                    if (text_char == '\'')
-                        in_single_string = !in_single_string;
-                    if (text_char == '"')
-                        in_string = !in_string;
+         words_lock = new Mutex ();
+         text_view_words = new Gee.HashMap<Gtk.TextView,Gee.ArrayList<string>> ();
+    }
+
+    public void add_last_word () {
+        add_word (last_word);
+    }
+
+    public bool get_for_word (string to_find, out List<string> list) {
+        bool success = false;
+        uint length = to_find.length;
+
+        list = null;
+        last_word = to_find;
+
+        if (words != null && words_lock.trylock ()) {
+            foreach (var word in words) {
+                if (word.length > length && word.slice (0, length) == to_find) {
+                    success = true;
+                    list.prepend (word);
                 }
-                else
-                    current_word += text_char.to_string ();
-            }
-        }
-    }
-    
-    bool in_comment;
-    bool in_string;
-    bool in_single_string;
-    
-    void parse_word (string word, Gee.List<string>? words_ = null) {
-        if (word.contains ("/*"))
-            in_comment = true;
-        if (word.contains ("*/"))
-            in_comment = false;
-        if (in_comment || in_single_string || in_string)
-            return;
-        words_ = words_ ?? words;
-        assert (word != "");
-        if (word in to_ignore || word in words_) {
-            return;
-        }
-        words_.add (word);
-    }
-    
-    public List<string> get_for_word (string to_find) {
-        List<string> list = new List<string> ();
-        foreach (var word in words) {
-            if (word.length > to_find.length 
-                    && word.slice (0, to_find.length) == to_find) {
-                list.append (word);
-            }
-        }
-        return list;
-    }
-    
-    void add_list (Gee.LinkedList<string> list) {
-        foreach (var word in list) parse_word (word);
-    }
-    
+            }
+            words_lock.unlock ();
+        }
+        return success;
+    }
+
+    public void rebuild_word_list (Gtk.TextView view) {
+        words_lock.lock ();
+        words.clear ();
+        words_lock.unlock ();
+        parse_text_view (view);
+    }
+
     public void parse_text_view (Gtk.TextView view) {
-        if (text_views.has_key (view)) {
-            if (!view.get_data<bool> ("damaged"))
-                add_list (text_views[view]);
-            else {
-                text_views[view].clear ();
-                parse_string (view.buffer.text, text_views[view]);
-                add_list (text_views[view]);
-                view.set_data<bool> ("damaged", false);
+        /* If this view has already been parsed, restore the word list */
+        if (text_view_words.has_key (view)) {
+            words = text_view_words.@get (view);
+        } else {
+        /* Else create a new word list and parse the buffer text */
+            words = new Gee.ArrayList<string> ();
+        }
+        if (view.buffer.text.length > 0) {
+            parse_string (view.buffer.text);
+            text_view_words.@set (view, words);
+        }
+    }
+
+    private void add_word (string word) {
+        if (word.length < MINIMUM_WORD_LENGTH)
+            return;
+
+        if (!(word in words) && words_lock.trylock ()) {
+            words.add (word);
+            words_lock.unlock ();
+        }
+    }
+
+    public void cancel_parsing () {
+        parsing_cancelled = true;
+    }
+
+    private bool parse_string (string text) {
+        parsing_cancelled = false;
+        string [] word_array = text.split_set (delimiters, MAX_TOKENS);
+        foreach (var current_word  in word_array ) {
+            if (parsing_cancelled) {
+                debug ("Cancelling parse");
+                return false;
             }
-        }
-        else {
-            text_views[view] = new Gee.LinkedList<string> ();
-            parse_string (view.buffer.text, text_views[view]);
-            add_list (text_views[view]);
-            view.set_data<bool> ("damaged", false);
-            view.key_press_event.connect (() => { view.set_data<bool> ("damaged", true); return false; });
-        }
+            add_word (current_word);
+        }
+        return true;
     }
 }

=== modified file 'plugins/word-completion/plugin.vala'
--- plugins/word-completion/plugin.vala	2013-06-09 18:40:28 +0000
+++ plugins/word-completion/plugin.vala	2014-10-05 21:35:48 +0000
@@ -19,120 +19,183 @@
  */
 
 
-using Scratch;
-using Scratch.Services;
-
-public Euclide.Completion.Parser? parser = null;
-public Document? current_document = null;
-public Gtk.SourceView? current_view = null;
-public Gtk.SourceBuffer? current_buffer = null;
-
-public const string NAME = N_("Words Completion");
-public const string DESCRIPTION = N_("Show a completion dialog with most used words from your files");
-
 public class Scratch.Plugins.Completion : Peas.ExtensionBase,  Peas.Activatable {
 
     MainWindow main_window;
 
     public Object object { owned get; construct; }
     Scratch.Services.Interface plugins;
-    
-    static const unichar[] stoppers = {' ', '\n', '(', ';', '}', '{', '.'};
-
-    List<Gtk.SourceView> text_view = new List<Gtk.SourceView> ();
-    
-    uint timeout = 0;
-    uint timeout_parse = -1;
-    
+
+    private List<Gtk.SourceView> text_view_list = new List<Gtk.SourceView> ();
+    public Euclide.Completion.Parser parser {get; private set;}
+    public Gtk.SourceView? current_view {get; private set;}
+    public Scratch.Services.Document current_document {get; private set;}
+
+    private const string NAME = N_("Words Completion");
+    private const string DESCRIPTION = N_("Show a completion dialog with most used words from your files");
+
+    private const uint [] activate_keys = {Gdk.Key.Return,
+                                           Gdk.Key.KP_Enter,
+                                           Gdk.Key.ISO_Enter,
+                                           Gdk.Key.Tab,
+                                           Gdk.Key.KP_Tab,
+                                           Gdk.Key.ISO_Left_Tab,
+                                    };
+
+    private const uint USER_REQUESTED_KEY = Gdk.Key.backslash;
+
+    private uint timeout_id = 0;
+    private bool completion_visible = false;
+
     public void activate () {
         plugins = (Scratch.Services.Interface) object;
         parser = new Euclide.Completion.Parser ();
-        timeout_parse = Timeout.add (5000, on_timeout_update);
-
         plugins.hook_window.connect ((w) => {
             this.main_window = w;
         });
-        
+
         plugins.hook_document.connect (on_new_source_view);
     }
 
     public void deactivate () {
-        if (timeout_parse > 0) Source.remove (timeout_parse);
-        text_view.foreach ((v) => {
-            v.completion.get_providers ().foreach ((p) => { 
-                try {
-                    v.completion.remove_provider (p); 
-                } catch (Error e) {
-                    warning (e.message);
-                }
-            });
-        });
+        text_view_list.@foreach (cleanup);
     }
 
     public void update_state () {
-    
+
     }
 
     public void on_new_source_view (Scratch.Services.Document doc) {
-        // Globals vars
+        if (current_view != null) {
+            if (current_view == doc.source_view)
+                return;
+
+            parser.cancel_parsing ();
+
+            if (timeout_id > 0)
+                GLib.Source.remove (timeout_id);
+
+            cleanup (current_view);
+        }
+
         current_document = doc;
         current_view = doc.source_view;
-        current_buffer = doc.source_view.buffer;
-        
-        var view = doc.source_view;
-        //assert(view != null);
-        view.key_press_event.connect (on_key_press);
-        //view.focus_out_event.connect (() => { window.hide(); return false; });
-        //view.button_press_event.connect( () => { window.hide(); return false;});
-        text_view.append (view);
-        
-        // Provider
-        current_view.completion.get_providers ().foreach ((p) => { 
-            try {
-                current_view.completion.remove_provider (p); 
-            } catch (Error e) {
-                warning (e.message);
-            }
-        });
-        var comp_provider = new CompletionProvider ();
+        current_view.key_press_event.connect (on_key_press);
+        current_view.completion.show.connect (on_completion_shown);
+        current_view.completion.hide.connect (on_completion_hidden);
+
+        if (text_view_list.find (current_view) == null)
+            text_view_list.append (current_view);
+
+
+        var comp_provider = new Scratch.Plugins.CompletionProvider (this);
         comp_provider.priority = 1;
-        comp_provider.name = _("%s - Word Completion").printf (doc.get_basename ());
+        comp_provider.name = provider_name_from_document (doc);
+        comp_provider.can_propose.connect (on_propose);
+
         try {
             current_view.completion.add_provider (comp_provider);
+            current_view.completion.show_headers = true;
+            current_view.completion.show_icons = true;
+            /* Wait a bit to allow text to load then run parser*/
+            timeout_id = Timeout.add (1000, on_timeout_update);
+
         } catch (Error e) {
             warning (e.message);
         }
     }
-    
-    bool on_timeout_update () {
+
+    private bool on_timeout_update () {
         try {
-            unowned Thread<void*> thread_a = Thread.create<void*> (threaded_update, true);
-            thread_a.set_priority (ThreadPriority.LOW);
+            GLib.Thread.create<void*> (threaded_update, true);
         } catch (ThreadError e) {
             warning (e.message);
         }
-        return true;
+
+        timeout_id = 0;
+        return false;
     }
-    
+
     void* threaded_update () {
-        parser.clear ();
-        foreach (var view in text_view) {
-            if (view != null)
-                parser.parse_text_view (view);
-        }
+        if (current_view != null)
+            parser.parse_text_view (current_view as Gtk.TextView);
+
         return null;
     }
-    
-    bool on_key_press (Gtk.Widget view, Gdk.EventKey event) {
-        if (timeout > 0) Source.remove (timeout);
-        if (event.str.get_char () in stoppers) {
-            //message ("The auto completion box should hide now");
+
+    private bool on_key_press (Gtk.Widget view, Gdk.EventKey event) {
+        uint kv = event.keyval;
+        unichar uc = (unichar)(Gdk.keyval_to_unicode (kv));
+
+        /* Pass through any modified keypress except Shift or Capslock */
+        Gdk.ModifierType mods = event.state & Gdk.ModifierType.MODIFIER_MASK
+                                            & ~Gdk.ModifierType.SHIFT_MASK
+                                            & ~Gdk.ModifierType.LOCK_MASK;
+        if (mods > 0 ) {
+            /* Default key for USER_REQUESTED completion is ControlSpace
+             * but this is trapped elsewhere. Control + USER_REQUESTED_KEY acts as an
+             * alternative and also purges spelling mistakes and unused words from the list.
+             * If used when a word or part of a word is selected, the selection will be
+             * used as the word to find. */ 
+            if ((mods & Gdk.ModifierType.CONTROL_MASK) > 0 && (kv == USER_REQUESTED_KEY)) {
+                parser.rebuild_word_list (current_view);
+                current_view.show_completion ();
+                return true;
+            } else
+                return false;
+        }
+
+        bool activating = kv in activate_keys;
+            
+        if (completion_visible && activating) {
+            current_view.completion.activate_proposal ();
+            parser.add_last_word ();
+            return true;
+        }
+
+        if (activating || (uc.isprint () && parser.is_delimiter (uc) )) {
+            parser.add_last_word ();
             current_view.completion.hide ();
         }
-        //timeout = Timeout.add (100, () => { update_completion (); return false; });
+
         return false;
     }
 
+    private void on_completion_shown () {
+        completion_visible = true;
+    }
+
+    private void on_completion_hidden () {
+        completion_visible = false;
+    }
+
+    private void on_propose (bool can_propose) {
+        completion_visible = can_propose;
+    }
+
+    private string provider_name_from_document (Scratch.Services.Document doc) {
+        return _("%s - Word Completion").printf (doc.get_basename ());
+    }
+
+    private void cleanup (Gtk.SourceView view) {
+        current_view.key_press_event.disconnect (on_key_press);
+        current_view.completion.show.disconnect (on_completion_shown);
+        current_view.completion.hide.disconnect (on_completion_hidden);
+
+        current_view.completion.get_providers ().foreach ((p) => {
+            try {
+                /* Only remove provider added by this plug in */
+                if (p.get_name () == provider_name_from_document (current_document)) {
+                    debug ("removing provider %s", p.get_name ());
+                    current_view.completion.remove_provider (p);
+                }
+            } catch (Error e) {
+                warning (e.message);
+            }
+        });
+
+        completion_visible = false;
+    }
 }
 
 [ModuleInit]

=== modified file 'po/am.po'
--- po/am.po	2013-11-07 05:42:04 +0000
+++ po/am.po	2014-10-05 21:35:48 +0000
@@ -7,431 +7,441 @@
 msgstr ""
 "Project-Id-Version: scratch\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-08-02 16:03+0200\n"
-"PO-Revision-Date: 2012-11-01 00:40+0000\n"
+"POT-Creation-Date: 2014-08-30 09:08-0500\n"
+"PO-Revision-Date: 2014-03-26 16:00+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-07 05:41+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
-
-#: /home/mario/elementary/scratch/po/../src/Utils.vala:42
-msgid "All files"
-msgstr "ሁሉንም ፋይሎች"
-
-#: /home/mario/elementary/scratch/po/../src/Utils.vala:45
-msgid "Text files"
-msgstr "የጽሁፍ ፋይሎች"
-
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:85
+"X-Launchpad-Export-Date: 2014-08-31 07:11+0000\n"
+"X-Generator: Launchpad (build 17176)\n"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:52
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:722
+msgid "Preferences"
+msgstr "ምርጫዎች"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:70
+msgid "Behavior"
+msgstr "ባህሪ"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:73
+msgid "Interface"
+msgstr "ግንኙነት"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:86
+msgid "Extensions"
+msgstr "ተጨማሪዎች"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:90
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:666
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:667
+msgid "Close"
+msgstr "መዝጊያ"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:135
+msgid "Show welcome screen"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:136
+msgid "Show last open tabs"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:152
+msgid "General:"
+msgstr "ባጠቃላይ :"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:158
+msgid "When Scratch starts:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:161
+msgid "Save files when changed:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:166
+msgid "Tabs:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:171
+msgid "Automatic indentation:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:174
+msgid "Insert spaces instead of tabs:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:178
+msgid "Tab width:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:206
+msgid "Editor:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:224
+msgid "Highlight current line:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:225
+msgid "Highlight matching brackets:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:226
+msgid "Split long text in many lines:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:227
+msgid "Draw spaces:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:228
+msgid "Show line numbers:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:231
+msgid "Line width guide:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:247
+msgid "Font and Color Scheme:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:261
+msgid "Select font:"
+msgstr "ፊደል ይምረጡ :"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:264
+msgid "Color scheme:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:269
+msgid "Custom font:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:99
 msgid "Zeitgeist Datasource for Scratch"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:160
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:181
 msgid "Trash"
 msgstr "ቆሻሻ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:448
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:504
 msgid "Open some files"
-msgstr ""
+msgstr "አንዳንድ ፋይሎች መክፈቻ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:539
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:599
 msgid "Hide search bar"
 msgstr "የመፈለጊያ ባሩን መደበቂያ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:552
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:553
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:654
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:655
 msgid "Find…"
-msgstr ""
+msgstr "መፈለጊያ…"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:556
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:557
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:658
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:659
 msgid "Go to line…"
-msgstr ""
+msgstr "ወደ መስመር መሄጃ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:560
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:561
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:662
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:663
 msgid "Quit"
-msgstr "ማቋረጫ"
-
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:564
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:565
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:84
-msgid "Close"
-msgstr "መዝጊያ"
-
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:568
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:569
+msgstr "ማጥፊያ"
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:670
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:671
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:111
 msgid "Replace"
 msgstr "መቀየሪያ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:572
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:674
 msgid "Reopen closed document"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:573
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:675
 msgid "Open last closed document in a new tab"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:576
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:678
 msgid "Add New Tab"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:577
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:679
 msgid "Add a new tab"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:580
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:682
 msgid "Add New View"
 msgstr "አዲስ መመለከቻ መጨመሪያ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:581
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:683
 msgid "Add a new view"
 msgstr "አዲስ መመለከቻ መጨመሪያ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:584
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:686
 msgid "Remove Current View"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:585
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:687
 msgid "Remove this view"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:588
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:690
 msgid "Undo"
 msgstr "መተው"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:589
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:691
 msgid "Undo the last action"
 msgstr "የመጨረሻውን ተግባር መተው"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:592
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:694
 msgid "Redo"
 msgstr "እንደገና መስሪያ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:593
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:695
 msgid "Redo the last undone action"
 msgstr "መጨረሻ የተተወውን ተግባር እንደገና መስሪያ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:596
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:698
 msgid "Revert"
 msgstr "ወደ ነበረበት መመለሻ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:597
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:699
 msgid "Restore this file"
 msgstr "ይህን ፋይል እንደነበር መመለሻ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:600
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:601
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:702
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:703
 msgid "Duplicate selected strings"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:604
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileView.vala:282
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:706
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileView.vala:281
 msgid "Open"
 msgstr "መክፈቻ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:605
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:707
 msgid "Open a file"
 msgstr "ፋይል መክፈቻ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:608
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:495
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:710
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:584
 msgid "Save"
 msgstr "ማስቀመጫ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:609
-msgid "Save the current file"
-msgstr "የአሁኑን ፋይል ማስቀመጫ"
-
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:612
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:711
+msgid "Save this file"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:714
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:576
+msgid "Save As…"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:715
+msgid "Save this file with a different name"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:718
 #: /home/mario/elementary/scratch/po/../src/Services/TemplateManager.vala:230
 msgid "Templates"
 msgstr "ቴምፕሌትስ"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:613
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:719
 msgid "Project templates"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:616
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:45
-msgid "Preferences"
-msgstr "ምርጫዎች"
-
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:617
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:723
 msgid "Change Scratch settings"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:623
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:624
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:726
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:727
+msgid "Next Tab"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:730
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:731
+msgid "Previous Tab"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:747
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:748
 msgid "Fullscreen"
 msgstr "በሙሉ መመልከቻ ዘዴ"
 
-#: /home/mario/elementary/scratch/po/../src/config.vala:15
-msgid "Edit text files"
-msgstr "የጽሁፍ ፋይሎች ማረሚያ"
-
-#: /home/mario/elementary/scratch/po/../src/config.vala:16
-msgid "Text Editor"
-msgstr "የጽሁፍ ማረሚያ"
-
-#: /home/mario/elementary/scratch/po/../src/config.vala:17
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:322
-msgid "New Document"
-msgstr "አዲስ ሰነድ"
-
-#: /home/mario/elementary/scratch/po/../src/config.vala:18
-msgid "New Window"
-msgstr "አዲስ መስኮት"
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:62
-msgid "Behavior"
-msgstr "ባህሪ"
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:66
-msgid "Interface"
-msgstr "ግንኙነት"
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:74
-msgid "Extensions"
-msgstr "ተጨማሪዎች"
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:128
-msgid "Show welcome screen"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:129
-msgid "Show last open tabs"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:145
-msgid "General:"
-msgstr "ባጠቃላይ :"
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:151
-msgid "When Scratch starts:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:154
-msgid "Save files when changed:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:159
-msgid "Tabs:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:164
-msgid "Automatic indentation:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:167
-msgid "Insert spaces instead of tabs:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:171
-msgid "Tab width:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:199
-msgid "Editor:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:217
-msgid "Highlight current line:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:218
-msgid "Highlight matching brackets:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:219
-msgid "Split long text in many lines:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:220
-msgid "Draw spaces:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:221
-msgid "Show line numbers:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:224
-msgid "Line width guide:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:240
-msgid "Font and Color Scheme:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:254
-msgid "Select font:"
-msgstr "ፊደል ይምረጡ :"
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:257
-msgid "Color scheme:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:262
-msgid "Custom font:"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Scratch.vala:160
-msgid "Set of plugins"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Scratch.vala:161
-msgid "Create a new instance"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:65
-msgid "Find"
-msgstr "መፈለጊያ"
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:84
-msgid "Replace With"
-msgstr "መተኪያ በ"
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:113
-msgid "Go To Line:"
-msgstr "ወደ መስመር መሄጃ :"
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/SourceView.vala:82
-msgid "Syntax Highlighting"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/SourceView.vala:93
-msgid "Normal Text"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/LoadingView.vala:36
-msgid "Wait while restoring last session..."
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:112
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:135
-msgid "Close Tab"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:137
-msgid "Open in a new Window"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:138
-msgid "Duplicate"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:186
-msgid "Close Other Tab"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:186
-msgid "Close Other Tabs"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:474
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:501
-msgid "New Tab"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:475
-msgid "Undo Close Tab"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/DynamicNotebook.vala:510
-msgid "Closed Tabs"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Widgets/ToolBar.vala:59
+#: /home/mario/elementary/scratch/po/../src/Widgets/ToolBar.vala:57
 msgid "Share"
 msgstr "ማካፈያ"
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:42
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:46
 msgid "No Files Open"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:43
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:47
 msgid "Open a file to begin editing."
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:47
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:51
 msgid "New file"
 msgstr "አዲስ ፋይል"
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:47
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:51
 msgid "Create a new empty file."
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:48
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:52
 msgid "Open file"
 msgstr "ፋይል መክፈቻ"
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:48
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:52
 msgid "Open a saved file."
 msgstr "የተቀመጠ ፋይል መክፈቻ"
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:165
+#: /home/mario/elementary/scratch/po/../src/Widgets/SourceView.vala:97
+msgid "Syntax Highlighting"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SourceView.vala:108
+msgid "Normal Text"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/LoadingView.vala:36
+msgid "Wait while restoring last session..."
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:71
+msgid "Find"
+msgstr "መፈለጊያ"
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:90
+msgid "Replace With"
+msgstr "መተኪያ በ"
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:115
+msgid "Replace all"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:123
+msgid "Go To Line:"
+msgstr "ወደ መስመር መሄጃ :"
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:222
+msgid "New Tab"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:223
+#: /home/mario/elementary/scratch/po/../src/config.vala:18
+msgid "New Window"
+msgstr "አዲስ መስኮት"
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:224
+msgid "Print version info and exit"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:225
+msgid "Set of plugins"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:226
+msgid "Current working directory"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:248
 #, c-format
 msgid "Save changes to document %s before closing?"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:168
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:251
 msgid ""
 "If you don't save, changes from the last 4 seconds will be permanently lost."
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:170
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:253
 msgid "Close without saving"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:239
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:331
 msgid "Save File"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:477
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:419
+#: /home/mario/elementary/scratch/po/../src/config.vala:17
+msgid "New Document"
+msgstr "አዲስ ሰነድ"
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:556
 #, c-format
 msgid ""
 "File \"<b>%s</b>\" cannot be read. Maybe it is corrupt\n"
 "or you do not have the necessary permissions to read it."
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:492
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:533
-msgid "File "
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:493
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:573
+msgid "The location containing the file"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:574
+msgid "was unmounted. Do you want to save somewhere else?"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:581
+msgid "File"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:582
 msgid "was deleted. Do you want to save it anyway?"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:505
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:595
 msgid "You cannot save changes on file"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:506
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:596
 msgid "Do you want to save the changes to this file in a different location?"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:508
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:598
 msgid "Save changes elsewhere"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:534
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:623
+msgid "File "
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:624
 msgid ""
 "was modified by an external application. Do you want to load it again or "
 "continue your editing?"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:536
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:626
 msgid "Load"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:539
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:629
 msgid "Continue"
 msgstr ""
 
+#: /home/mario/elementary/scratch/po/../src/Utils.vala:42
+msgid "All files"
+msgstr "ሁሉንም ፋይሎች"
+
+#: /home/mario/elementary/scratch/po/../src/Utils.vala:45
+msgid "Text files"
+msgstr "የጽሁፍ ፋይሎች"
+
+#: /home/mario/elementary/scratch/po/../src/config.vala:15
+msgid "Edit text files"
+msgstr "የጽሁፍ ፋይሎች ማረሚያ"
+
+#: /home/mario/elementary/scratch/po/../src/config.vala:16
+msgid "Text Editor"
+msgstr "የጽሁፍ ማረሚያ"
+
 #: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin.vala:23
 msgid "Pastebin"
 msgstr ""
@@ -444,90 +454,90 @@
 msgid "Upload to Pastebin"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:252
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:254
 msgid "Share via PasteBin"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:270
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:272
 msgid "Name:"
 msgstr "ስም :"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:276
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:278
 msgid "Format: "
 msgstr "አቀራረብ : "
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:278
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:280
 msgid "Others..."
 msgstr "ሌሎች..."
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:303
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:305
 msgid "Expiry time:"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:308
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:310
 msgid "Keep this paste private"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:310
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:312
 msgid "Upload"
 msgstr "መጫኛ"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:340
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:342
 msgid "Other formats"
 msgstr "ለሎች አቀራረቦች"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:509
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:511
 msgid "Never"
 msgstr "በፍጹም"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:510
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:512
 msgid "Ten minutes"
 msgstr "አስር ደቂቃ"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:511
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:513
 msgid "One hour"
 msgstr "አንድ ሰአት"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:512
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:514
 msgid "One day"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:513
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:515
 msgid "One month"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileView.vala:94
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileView.vala:90
 msgid "/New File"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FolderManagerPlugin.vala:21
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileManagerPlugin.vala:21
 #: /home/mario/elementary/scratch/po/../plugins/folder-manager/FolderManagerPlugin.vala:21
 msgid "Folder Manager"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FolderManagerPlugin.vala:22
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileManagerPlugin.vala:22
 #: /home/mario/elementary/scratch/po/../plugins/folder-manager/FolderManagerPlugin.vala:22
 msgid "Basic folder manager with file browsing"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FolderManagerPlugin.vala:77
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileManagerPlugin.vala:71
 msgid "Go to parent"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FolderManagerPlugin.vala:88
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileManagerPlugin.vala:82
 msgid "Add file"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FolderManagerPlugin.vala:95
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileManagerPlugin.vala:89
 msgid "Remove file"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FolderManagerPlugin.vala:110
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileManagerPlugin.vala:104
 msgid "File Manager"
 msgstr ""
 
 #: /home/mario/elementary/scratch/po/../plugins/terminal/terminal.vala:23
-#: /home/mario/elementary/scratch/po/../plugins/terminal/terminal.vala:104
+#: /home/mario/elementary/scratch/po/../plugins/terminal/terminal.vala:158
 msgid "Terminal"
 msgstr ""
 
@@ -535,11 +545,11 @@
 msgid "A terminal in your text editor"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/terminal/terminal.vala:67
+#: /home/mario/elementary/scratch/po/../plugins/terminal/terminal.vala:121
 msgid "Copy"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/terminal/terminal.vala:74
+#: /home/mario/elementary/scratch/po/../plugins/terminal/terminal.vala:128
 msgid "Paste"
 msgstr ""
 
@@ -551,15 +561,16 @@
 msgid "Get a preview your work in a web page"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/browser-preview/browser-preview.vala:80
-#: /home/mario/elementary/scratch/po/../plugins/browser-preview/browser-preview.vala:81
+#: /home/mario/elementary/scratch/po/../plugins/browser-preview/browser-preview.vala:77
+#: /home/mario/elementary/scratch/po/../plugins/browser-preview/browser-preview.vala:119
+msgid "Web preview"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../plugins/browser-preview/browser-preview.vala:86
+#: /home/mario/elementary/scratch/po/../plugins/browser-preview/browser-preview.vala:87
 msgid "Get preview!"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/browser-preview/browser-preview.vala:111
-msgid "Web preview"
-msgstr ""
-
 #: /home/mario/elementary/scratch/po/../plugins/spell/spell.vala:18
 msgid "Spell Checker"
 msgstr ""
@@ -588,28 +599,24 @@
 msgid "Complete brackets while typing"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/word-completion/completion-provider.vala:67
+#: /home/mario/elementary/scratch/po/../plugins/word-completion/completion-provider.vala:80
 #, c-format
 msgid "Could not load icon theme: %s\n"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/word-completion/plugin.vala:30
+#: /home/mario/elementary/scratch/po/../plugins/word-completion/plugin.vala:34
 msgid "Words Completion"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/word-completion/plugin.vala:31
+#: /home/mario/elementary/scratch/po/../plugins/word-completion/plugin.vala:35
 msgid "Show a completion dialog with most used words from your files"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/word-completion/plugin.vala:99
+#: /home/mario/elementary/scratch/po/../plugins/word-completion/plugin.vala:177
 #, c-format
 msgid "%s - Word Completion"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/folder-manager/FileView.vala:322
-msgid "Close Folder"
-msgstr ""
-
 #: /home/mario/elementary/scratch/po/../plugins/folder-manager/FolderManagerPlugin.vala:71
 msgid "Folders"
 msgstr ""
@@ -619,6 +626,18 @@
 msgid "Open a folder"
 msgstr ""
 
+#: /home/mario/elementary/scratch/po/../plugins/folder-manager/FolderManagerPlugin.vala:95
+msgid "_Cancel"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../plugins/folder-manager/FolderManagerPlugin.vala:96
+msgid "_Open"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../plugins/folder-manager/FileView.vala:330
+msgid "Close Folder"
+msgstr ""
+
 #: /home/mario/elementary/scratch/po/../plugins/contractor/contractor.vala:21
 msgid "Share your files with Contractor"
 msgstr ""
@@ -631,32 +650,32 @@
 msgid "Strip trailing whitespace on save"
 msgstr ""
 
+#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:20
+#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:197
+msgid "Source Tree"
+msgstr ""
+
 #: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:21
-#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:231
-msgid "Source Tree"
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:22
 msgid "Have a look at your sources organized in a nice tree"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:39
+#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:42
 msgid "Loading..."
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:158
+#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:175
 msgid "Bookmark"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:207
+#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:234
 msgid "Files"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:208
+#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:235
 msgid "Project"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:209
+#: /home/mario/elementary/scratch/po/../plugins/source-tree/SourceTreePlugin.vala:236
 msgid "Bookmarks"
 msgstr ""
 
@@ -689,6 +708,9 @@
 #~ msgid "Save as"
 #~ msgstr "ማስቀመጫ እንደ"
 
+#~ msgid "Save the current file"
+#~ msgstr "የአሁኑን ፋይል ማስቀመጫ"
+
 #~ msgid "Save the current file with a different name"
 #~ msgstr "የአሁኑን ፋይል በሌላ ስም ማስቀመጫ"
 

=== modified file 'po/ar.po'
--- po/ar.po	2013-12-16 12:35:47 +0000
+++ po/ar.po	2014-10-05 21:35:48 +0000
@@ -7,13 +7,19 @@
 msgstr ""
 "Project-Id-Version: scratch\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2013-08-02 16:03+0200\n"
 "PO-Revision-Date: 2013-11-30 11:28+0000\n"
+=======
+"POT-Creation-Date: 2014-08-30 09:08-0500\n"
+"PO-Revision-Date: 2013-11-30 11:28+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: abdXelrhman <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-12-01 05:39+0000\n"
 "X-Generator: Launchpad (build 16856)\n"
 
@@ -26,34 +32,144 @@
 msgstr "ملفات نصية"
 
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:85
+=======
+"X-Launchpad-Export-Date: 2014-08-31 07:11+0000\n"
+"X-Generator: Launchpad (build 17176)\n"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:52
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:722
+msgid "Preferences"
+msgstr "اﻹعدادات"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:70
+msgid "Behavior"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:73
+msgid "Interface"
+msgstr "الواجهة"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:86
+msgid "Extensions"
+msgstr "الامتدادات"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:90
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:666
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:667
+msgid "Close"
+msgstr "اغلق"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:135
+msgid "Show welcome screen"
+msgstr "إعرض نافذه الترحيب"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:136
+msgid "Show last open tabs"
+msgstr "إعرض اخر اﻷلسنه المفتوحه"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:152
+msgid "General:"
+msgstr "عام"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:158
+msgid "When Scratch starts:"
+msgstr "عند بدأ خربشات:"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:161
+msgid "Save files when changed:"
+msgstr "إحفظ الملفات عند تغييرها:"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:166
+msgid "Tabs:"
+msgstr "الألسنة:"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:171
+msgid "Automatic indentation:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:174
+msgid "Insert spaces instead of tabs:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:178
+msgid "Tab width:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:206
+msgid "Editor:"
+msgstr "المُحرر"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:224
+msgid "Highlight current line:"
+msgstr "إبراز السطر الحالى :"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:225
+msgid "Highlight matching brackets:"
+msgstr "إبراز الاقواس :"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:226
+msgid "Split long text in many lines:"
+msgstr "إقسم النصوص الطويله على عده اسطر :"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:227
+msgid "Draw spaces:"
+msgstr "إرسم المسافات :"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:228
+msgid "Show line numbers:"
+msgstr "إعرض رقم السطر :"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:231
+msgid "Line width guide:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:247
+msgid "Font and Color Scheme:"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:261
+msgid "Select font:"
+msgstr "إختر الخط :"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:264
+msgid "Color scheme:"
+msgstr "مخطط الألوان:"
+
+#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:269
+msgid "Custom font:"
+msgstr "خط مخصص:"
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:99
+>>>>>>> MERGE-SOURCE
 msgid "Zeitgeist Datasource for Scratch"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:160
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:181
 msgid "Trash"
 msgstr "المُهملات"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:448
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:504
 msgid "Open some files"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:539
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:599
 msgid "Hide search bar"
 msgstr "اخفاء شريط البحث"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:552
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:553
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:654
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:655
 msgid "Find…"
 msgstr "إبحث..."
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:556
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:557
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:658
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:659
 msgid "Go to line…"
 msgstr "إذهب الى السطر..."
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:560
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:561
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:662
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:663
 msgid "Quit"
+<<<<<<< TREE
 msgstr "اُخرج"
 
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:564
@@ -64,82 +180,90 @@
 
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:568
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:569
+=======
+msgstr "اُخرج"
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:670
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:671
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:111
+>>>>>>> MERGE-SOURCE
 msgid "Replace"
 msgstr "إستبدال"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:572
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:674
 msgid "Reopen closed document"
 msgstr "أعد فتح المُستند المُغلق"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:573
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:675
 msgid "Open last closed document in a new tab"
 msgstr "أعد فتح اخر مُستند مُغلق ولكن فى لسان جديد"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:576
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:678
 msgid "Add New Tab"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:577
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:679
 msgid "Add a new tab"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:580
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:682
 msgid "Add New View"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:581
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:683
 msgid "Add a new view"
 msgstr "اضف منطقة عرض جديدة"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:584
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:686
 msgid "Remove Current View"
 msgstr "إحذف منطقه العرض الحاليه"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:585
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:687
 msgid "Remove this view"
 msgstr "إحذف منطقه العرض هذه"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:588
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:690
 msgid "Undo"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:589
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:691
 msgid "Undo the last action"
 msgstr "تراجع عن آخر إجراء"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:592
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:694
 msgid "Redo"
 msgstr "أعد"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:593
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:695
 msgid "Redo the last undone action"
 msgstr "أعد اخر إجراء تم التراجع عنه"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:596
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:698
 msgid "Revert"
 msgstr "إعكس"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:597
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:699
 msgid "Restore this file"
 msgstr "إستعد هذا الملف"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:600
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:601
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:702
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:703
 msgid "Duplicate selected strings"
 msgstr "كرر النصوص المحدده"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:604
-#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileView.vala:282
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:706
+#: /home/mario/elementary/scratch/po/../plugins/filemanager/FileView.vala:281
 msgid "Open"
 msgstr "إفتح"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:605
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:707
 msgid "Open a file"
 msgstr "إفتح ملفاً"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:608
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:495
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:710
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:584
 msgid "Save"
+<<<<<<< TREE
 msgstr "إحفظ"
 
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:609
@@ -147,12 +271,31 @@
 msgstr "إحفظ الملف الحالى"
 
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:612
+=======
+msgstr "إحفظ"
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:711
+msgid "Save this file"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:714
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:576
+msgid "Save As…"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:715
+msgid "Save this file with a different name"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:718
+>>>>>>> MERGE-SOURCE
 #: /home/mario/elementary/scratch/po/../src/Services/TemplateManager.vala:230
 msgid "Templates"
 msgstr "القوالب"
 
-#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:613
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:719
 msgid "Project templates"
+<<<<<<< TREE
 msgstr "قوالب المشروع"
 
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:616
@@ -161,12 +304,35 @@
 msgstr "اﻹعدادات"
 
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:617
+=======
+msgstr "قوالب المشروع"
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:723
+>>>>>>> MERGE-SOURCE
 msgid "Change Scratch settings"
+<<<<<<< TREE
 msgstr "تغيير إعدادات خربشات"
 
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:623
 #: /home/mario/elementary/scratch/po/../src/MainWindow.vala:624
+=======
+msgstr "تغيير إعدادات خربشات"
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:726
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:727
+msgid "Next Tab"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:730
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:731
+msgid "Previous Tab"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:747
+#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:748
+>>>>>>> MERGE-SOURCE
 msgid "Fullscreen"
+<<<<<<< TREE
 msgstr ""
 
 #: /home/mario/elementary/scratch/po/../src/config.vala:15
@@ -345,93 +511,185 @@
 msgstr "إغلق الالسنه"
 
 #: /home/mario/elementary/scratch/po/../src/Widgets/ToolBar.vala:59
+=======
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/ToolBar.vala:57
+>>>>>>> MERGE-SOURCE
 msgid "Share"
 msgstr "المشاركه"
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:42
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:46
 msgid "No Files Open"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:43
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:47
 msgid "Open a file to begin editing."
 msgstr "إفتح ملفاً لبدأ التحرير."
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:47
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:51
 msgid "New file"
 msgstr "ملف جديد"
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:47
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:51
 msgid "Create a new empty file."
 msgstr "انشئ ملفاً فارغاً جديداً"
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:48
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:52
 msgid "Open file"
 msgstr "إفتح ملف"
 
-#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:48
+#: /home/mario/elementary/scratch/po/../src/Widgets/SplitView.vala:52
 msgid "Open a saved file."
+<<<<<<< TREE
 msgstr "إفتح ملفاً محفوظاً"
 
 #: /home/mario/elementary/scratch/po/../src/Services/Document.vala:165
+=======
+msgstr "إفتح ملفاً محفوظاً"
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SourceView.vala:97
+msgid "Syntax Highlighting"
+msgstr "إبراز تراكيب الجمله"
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SourceView.vala:108
+msgid "Normal Text"
+msgstr "نص عادى"
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/LoadingView.vala:36
+msgid "Wait while restoring last session..."
+msgstr "يُرجى اﻹنتظار ريثما تُستعاد الجلسه السابقه..."
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:71
+msgid "Find"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:90
+msgid "Replace With"
+msgstr "استبدل بـ"
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:115
+msgid "Replace all"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Widgets/SearchManager.vala:123
+msgid "Go To Line:"
+msgstr "إذهب الى السطر :"
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:222
+msgid "New Tab"
+msgstr "لسان جديد"
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:223
+#: /home/mario/elementary/scratch/po/../src/config.vala:18
+msgid "New Window"
+msgstr "نافذه جديده"
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:224
+msgid "Print version info and exit"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:225
+msgid "Set of plugins"
+msgstr "مجموعة من الاضافات"
+
+#: /home/mario/elementary/scratch/po/../src/Scratch.vala:226
+msgid "Current working directory"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:248
+>>>>>>> MERGE-SOURCE
 #, c-format
 msgid "Save changes to document %s before closing?"
 msgstr "حفظ التغيرات الى المُستند %s قبل اﻹغلاق ؟"
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:168
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:251
 msgid ""
 "If you don't save, changes from the last 4 seconds will be permanently lost."
 msgstr "إن لم تحفظ فستختفى نهائياً جميع التغيرات الحادثه فى اخر 4 ثوانى."
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:170
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:253
 msgid "Close without saving"
 msgstr "إغلق بدون حفظ"
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:239
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:331
 msgid "Save File"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:477
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:419
+#: /home/mario/elementary/scratch/po/../src/config.vala:17
+msgid "New Document"
+msgstr "مُستند جديد"
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:556
 #, c-format
 msgid ""
 "File \"<b>%s</b>\" cannot be read. Maybe it is corrupt\n"
 "or you do not have the necessary permissions to read it."
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:492
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:533
-msgid "File "
-msgstr ""
-
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:493
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:573
+msgid "The location containing the file"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:574
+msgid "was unmounted. Do you want to save somewhere else?"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:581
+msgid "File"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:582
 msgid "was deleted. Do you want to save it anyway?"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:505
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:595
 msgid "You cannot save changes on file"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:506
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:596
 msgid "Do you want to save the changes to this file in a different location?"
 msgstr "هل تريد حفظ التغييرت في هذا الملف الي مسار جديد ؟"
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:508
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:598
 msgid "Save changes elsewhere"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:534
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:623
+msgid "File "
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:624
 msgid ""
 "was modified by an external application. Do you want to load it again or "
 "continue your editing?"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:536
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:626
 msgid "Load"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:539
+#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:629
 msgid "Continue"
 msgstr ""
 
+#: /home/mario/elementary/scratch/po/../src/Utils.vala:42
+msgid "All files"
+msgstr "كل الملفات"
+
+#: /home/mario/elementary/scratch/po/../src/Utils.vala:45
+msgid "Text files"
+msgstr "ملفات نصية"
+
+#: /home/mario/elementary/scratch/po/../src/config.vala:15
+msgid "Edit text files"
+msgstr ""
+
+#: /home/mario/elementary/scratch/po/../src/config.vala:16
+msgid "Text Editor"
+msgstr "مُحرر النصوص"
+
 #: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin.vala:23
 msgid "Pastebin"
 msgstr ""
@@ -444,90 +702,90 @@
 msgid "Upload to Pastebin"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:252
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:254
 msgid "Share via PasteBin"
 msgstr "مشاركة بواسطة PasteBin"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:270
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:272
 msgid "Name:"
 msgstr "الاسم :"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:276
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:278
 msgid "Format: "
 msgstr "الصيغة: "
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:278
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:280
 msgid "Others..."
 msgstr "أخرى..."
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:303
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:305
 msgid "Expiry time:"
 msgstr "وقت الانتهاء :"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:308
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:310
 msgid "Keep this paste private"
 msgstr ""
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:310
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:312
 msgid "Upload"
 msgstr "رفع"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:340
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:342
 msgid "Other formats"
 msgstr "صيغ اخري"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:509
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:511
 msgid "Never"
 msgstr "أبداً"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:510
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:512
 msgid "Ten minutes"
 msgstr "10 دقائق"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:511
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:513
 msgid "One hour"
 msgstr "ساعة واحدة"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:512
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:514
 msgid "One day"
 msgstr "يوم واحد"
 
-#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:513
+#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:515
 msgid "One month"
 msgstr ""