From 2aafa6a197e68f0185885f72c95807f950c81765 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Tue, 11 Oct 2011 23:58:38 +0200
Subject: [PATCH 01/70] Improve the part about committing in HACKING

---
 HACKING | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/HACKING b/HACKING
index c6916dae..0967b8ab 100644
--- a/HACKING
+++ b/HACKING
@@ -262,26 +262,40 @@ Example::
 Committing
 ----------
 
-Commit one thing at a time, do small commits.  Commits should be
-meaningful and not too big when possible; multiple small commits are
-good if there is no good reason to group them.
-
-When working on a new feature, create a new branch for it.  When merging
-it, use the --no-ff option to make sure a merge commit will be created
-to better track what happened.  However, if the feature only took one
-commit you might merge it fast-forward since there is not history to
-keep together.
+* Commit one thing at a time, do small commits.  Commits should be
+  meaningful and not too big when possible; multiple small commits are
+  good if there is no good reason to group them.
+* Use meaningful name and email in the Author and Committer fields.
+  This helps knowing who did what and allows to contact the author if
+  there is a good reason to do so (unlikely, but can happen).
+* When working on a new feature, create a new branch for it.  When
+  merging it, use the --no-ff option to make sure a merge commit will
+  be created to better track what happened.  However, if the feature
+  only took one commit you might merge it fast-forward since there is
+  not history to keep together.
 
 Commit messages
 ^^^^^^^^^^^^^^^
 Follow the standard Git formatting:
 
-* First line is the commit's summary and should use less than about 80
-  characters, and is followed by an empty line.  See it like the subject
-  of an email: keep it concise and as precise as you can, but not tool
-  long.
+* No line should use more than about 80 characters (around 72 is best).
+* The first line is the commit's summary and is followed by an empty
+  line.  This summary should be one line and one line only, thus less
+  than 80 characters.  This summary should not include any punctuation
+  unless really needed.  See it as the subject of an email: keep it
+  concise and as precise as you can, but not tool long.
 * Following lines are optional detailed commit information, with
-  paragraphs separated by blank lines.
+  paragraphs separated by blank lines.  This part should be as long as
+  needed to describe the commit in depth, should use proper
+  punctuation and should include any useful information, like the
+  motivation for the patch and/or any valuable details the diff itself
+  don't provide or don't make clear.  Make it as complete as you think
+  it makes sense, but don't include an information that is better
+  explained by the commit's diff.
+
+  It is OK to use ASCII formatting like bullet list using "*" or "-",
+  etc. if useful, but emphasis (bold, italic, underline) should be
+  avoided.
 
 Example::
 

From 182bdc3b1784287725026c6423f9a1ca5471af39 Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Tue, 11 Oct 2011 21:30:28 -0700
Subject: [PATCH 02/70] Replace GTK_BIN(...)->child with gtk_bin_get_child(...)

---
 plugins/filebrowser.c |  6 +++---
 src/dialogs.c         |  2 +-
 src/search.c          | 10 +++++-----
 src/ui_utils.c        |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/filebrowser.c b/plugins/filebrowser.c
index b7654f81..c18c07ca 100644
--- a/plugins/filebrowser.c
+++ b/plugins/filebrowser.c
@@ -791,7 +791,7 @@ static void ui_combo_box_changed(GtkComboBox *combo, gpointer user_data)
 {
 	/* we get this callback on typing as well as choosing an item */
 	if (gtk_combo_box_get_active(combo) >= 0)
-		gtk_widget_activate(GTK_BIN(combo)->child);
+		gtk_widget_activate(gtk_bin_get_child(GTK_BIN(combo)));
 }
 
 
@@ -909,7 +909,7 @@ static GtkWidget *make_filterbar(void)
 	label = gtk_label_new(_("Filter:"));
 
 	filter_combo = gtk_combo_box_entry_new_text();
-	filter_entry = GTK_BIN(filter_combo)->child;
+	filter_entry = gtk_bin_get_child(GTK_BIN(filter_combo));
 
 	if (gtk_check_version(2, 15, 2) == NULL)
 	{
@@ -1107,7 +1107,7 @@ void plugin_init(GeanyData *data)
 	path_combo = gtk_combo_box_entry_new_text();
 	gtk_box_pack_start(GTK_BOX(file_view_vbox), path_combo, FALSE, FALSE, 2);
 	g_signal_connect(path_combo, "changed", G_CALLBACK(ui_combo_box_changed), NULL);
-	path_entry = GTK_BIN(path_combo)->child;
+	path_entry = gtk_bin_get_child(GTK_BIN(path_combo));
 	g_signal_connect(path_entry, "activate", G_CALLBACK(on_path_entry_activate), NULL);
 
 	file_view = gtk_tree_view_new();
diff --git a/src/dialogs.c b/src/dialogs.c
index 9d013980..7e84a8f6 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -1000,7 +1000,7 @@ static void add_input_widgets(GtkWidget *dialog, GtkWidget *vbox,
 	{
 		GtkWidget *combo = gtk_combo_box_entry_new_text();
 
-		entry = GTK_BIN(combo)->child;
+		entry = gtk_bin_get_child(GTK_BIN(combo));
 		ui_entry_add_clear_icon(GTK_ENTRY(entry));
 		g_object_set_data(G_OBJECT(dialog), "combo", combo);
 		gtk_container_add(GTK_CONTAINER(vbox), combo);
diff --git a/src/search.c b/src/search.c
index 4ee8a9b8..1627835a 100644
--- a/src/search.c
+++ b/src/search.c
@@ -484,7 +484,7 @@ static void create_find_dialog(void)
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 248);
 	gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 50);
-	find_dlg.entry = GTK_BIN(entry)->child;
+	find_dlg.entry = gtk_bin_get_child(GTK_BIN(entry));
 	ui_hookup_widget(find_dlg.dialog, entry, "entry");
 
 	g_signal_connect(gtk_bin_get_child(GTK_BIN(entry)), "activate",
@@ -650,7 +650,7 @@ static void create_replace_dialog(void)
 	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 248);
 	gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 50);
 	ui_hookup_widget(replace_dlg.dialog, entry_find, "entry_find");
-	replace_dlg.find_entry = GTK_BIN(entry_find)->child;
+	replace_dlg.find_entry = gtk_bin_get_child(GTK_BIN(entry_find));
 
 	entry_replace = gtk_combo_box_entry_new_text();
 	ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))));
@@ -658,7 +658,7 @@ static void create_replace_dialog(void)
 	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 248);
 	gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 50);
 	ui_hookup_widget(replace_dlg.dialog, entry_replace, "entry_replace");
-	replace_dlg.replace_entry = GTK_BIN(entry_replace)->child;
+	replace_dlg.replace_entry = gtk_bin_get_child(GTK_BIN(entry_replace));
 
 	/* tab from find to the replace entry */
 	g_signal_connect(gtk_bin_get_child(GTK_BIN(entry_find)),
@@ -1060,7 +1060,7 @@ void search_show_find_in_files_dialog(const gchar *dir)
 	if (doc && ! sel && ! GTK_WIDGET_VISIBLE(fif_dlg.dialog))
 		sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL);
 
-	entry = GTK_BIN(fif_dlg.search_combo)->child;
+	entry = gtk_bin_get_child(GTK_BIN(fif_dlg.search_combo));
 	if (sel)
 		gtk_entry_set_text(GTK_ENTRY(entry), sel);
 	g_free(sel);
@@ -1073,7 +1073,7 @@ void search_show_find_in_files_dialog(const gchar *dir)
 			app->project->base_path);
 	}
 
-	entry = GTK_BIN(fif_dlg.dir_combo)->child;
+	entry = gtk_bin_get_child(GTK_BIN(fif_dlg.dir_combo));
 	if (NZV(dir))
 		cur_dir = g_strdup(dir);	/* custom directory argument passed */
 	else
diff --git a/src/ui_utils.c b/src/ui_utils.c
index 1930457d..0c7248ec 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1159,9 +1159,9 @@ gchar *ui_menu_item_get_text(GtkMenuItem *menu_item)
 {
 	const gchar *text = NULL;
 
-	if (GTK_BIN(menu_item)->child)
+	if (gtk_bin_get_child(GTK_BIN(menu_item)))
 	{
-		GtkWidget *child = GTK_BIN(menu_item)->child;
+		GtkWidget *child = gtk_bin_get_child(GTK_BIN(menu_item));
 
 		if (GTK_IS_LABEL(child))
 			text = gtk_label_get_text(GTK_LABEL(child));
@@ -1534,7 +1534,7 @@ void ui_combo_box_add_to_history(GtkComboBoxEntry *combo_entry,
 	if (history_len <= 0)
 		history_len = 10;
 	if (!text)
-		text = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(combo)->child));
+		text = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo))));
 
 	model = gtk_combo_box_get_model(combo);
 

From bd5fba7eb57063c5f7d387d7cd36b21c6d3591bf Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Tue, 11 Oct 2011 21:52:58 -0700
Subject: [PATCH 03/70] Remove extra whitespace at end of lines in all source
 files.

* Processed with rstrip-whitespace.py script added to scripts/ directory.
* Script run on all .c and .h files in src/ and plugins/ directories.
* Also remove more than one newline at the end of files.
---
 plugins/htmlchars.c          |  2 --
 scripts/rstrip-whitespace.py | 23 +++++++++++++++++++++++
 src/build.c                  |  4 +---
 src/dialogs.c                |  4 +---
 src/editor.c                 |  4 ++--
 src/filetypes.c              |  1 -
 src/gb.c                     |  2 --
 src/geanyentryaction.c       |  1 -
 src/geanyobject.c            |  1 -
 src/highlighting.c           |  1 -
 src/images.c                 |  1 -
 src/interface.c              |  1 -
 src/keyfile.c                |  2 +-
 src/msgwindow.c              |  2 --
 src/notebook.c               |  2 --
 src/printing.c               |  1 -
 src/socket.c                 |  2 --
 src/symbols.c                |  2 --
 src/toolbar.c                |  2 --
 src/tools.c                  |  2 --
 src/utils.c                  |  4 ++--
 src/win32.c                  |  2 +-
 22 files changed, 31 insertions(+), 35 deletions(-)
 create mode 100755 scripts/rstrip-whitespace.py

diff --git a/plugins/htmlchars.c b/plugins/htmlchars.c
index 4010733e..e0ad4bac 100644
--- a/plugins/htmlchars.c
+++ b/plugins/htmlchars.c
@@ -805,5 +805,3 @@ void plugin_cleanup(void)
 	if (config_file != NULL)
 		g_free(config_file);
 }
-
-
diff --git a/scripts/rstrip-whitespace.py b/scripts/rstrip-whitespace.py
new file mode 100755
index 00000000..523d9509
--- /dev/null
+++ b/scripts/rstrip-whitespace.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+
+import sys
+
+filenames = sys.argv[1:]
+
+def backup_file (fn):
+    open ("%s~" % fn, "w").write (open (fn, "r").read ())
+
+for fn in filenames:
+  #backup_file (fn)
+  contents = open (fn, "r").read ()
+  lines = contents.split ('\n')
+  with open (fn, "w") as fobj:
+    for line in lines:
+      line = line.rstrip ()
+      fobj.write ("%s\n" % line)
+  contents = open (fn, "r").read ()
+  contents.rstrip ()
+  while contents[-1] in " \t\r\n":
+    contents = contents[:-1]
+  open (fn, "w").write ("%s\n" % contents)
+
diff --git a/src/build.c b/src/build.c
index ef8c83ad..e9bed765 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1272,7 +1272,7 @@ static void on_build_menu_item(GtkWidget *w, gpointer user_data)
 	{
 		if (document_need_save_as(doc) && !dialogs_show_save_as())
 			return;
-			
+
 		if (!document_save_file(doc, FALSE))
 			return;
 	}
@@ -2767,5 +2767,3 @@ void build_init(void)
 	/* set the submenu to the toolbar item */
 	geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION(widgets.build_action), toolmenu);
 }
-
-
diff --git a/src/dialogs.c b/src/dialogs.c
index 7e84a8f6..7b394113 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -863,7 +863,7 @@ gboolean dialogs_show_unsaved_file(GeanyDocument *doc)
 		}
 		case GTK_RESPONSE_NO:
 			return TRUE;
-		
+
 		case GTK_RESPONSE_CANCEL: /* fall through to default and leave the function */
 		default:
 			return FALSE;
@@ -1703,5 +1703,3 @@ gint dialogs_show_prompt(GtkWidget *parent,
 	g_free(string);
 	return result;
 }
-
-
diff --git a/src/editor.c b/src/editor.c
index d396ed30..c14015fe 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -2358,7 +2358,7 @@ void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint inser
 	{
 		const gchar *nl = replace_newlines ? "\n" : eol;
 		gchar *whitespace;
-		
+
 		whitespace = g_strnfill(newline_indent_size, ' ');
 		setptr(whitespace, g_strconcat(nl, whitespace, NULL));
 		utils_string_replace_all(buf, nl, whitespace);
@@ -3911,7 +3911,7 @@ void editor_finalize()
 
 /* wordchars: NULL or a string containing characters to match a word.
  * Returns: the current selection or the current word.
- * 
+ *
  * Passing NULL as wordchars is NOT the same as passing GEANY_WORDCHARS: NULL means
  * using Scintillas's word boundaries. */
 gchar *editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word,
diff --git a/src/filetypes.c b/src/filetypes.c
index 70dbf254..1d044f77 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -1736,4 +1736,3 @@ const gchar *filetypes_get_display_name(GeanyFiletype *ft)
 {
 	return ft->id == GEANY_FILETYPES_NONE ? _("None") : ft->name;
 }
-
diff --git a/src/gb.c b/src/gb.c
index 4c4ed752..08c41254 100644
--- a/src/gb.c
+++ b/src/gb.c
@@ -1811,5 +1811,3 @@ static gboolean gb_on_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointe
 		}
 	}
 }
-
-
diff --git a/src/geanyentryaction.c b/src/geanyentryaction.c
index 476024a6..9d0573d6 100644
--- a/src/geanyentryaction.c
+++ b/src/geanyentryaction.c
@@ -184,4 +184,3 @@ GtkAction *geany_entry_action_new(const gchar *name, const gchar *label,
 
 	return action;
 }
-
diff --git a/src/geanyobject.c b/src/geanyobject.c
index f6765662..23e8af04 100644
--- a/src/geanyobject.c
+++ b/src/geanyobject.c
@@ -369,4 +369,3 @@ GObject *geany_object_new(void)
 {
 	return g_object_new(GEANY_OBJECT_TYPE, NULL);
 }
-
diff --git a/src/highlighting.c b/src/highlighting.c
index 74074765..c7d8238b 100644
--- a/src/highlighting.c
+++ b/src/highlighting.c
@@ -3978,4 +3978,3 @@ gboolean highlighting_is_code_style(gint lexer, gint style)
 	return !(highlighting_is_comment_style(lexer, style) ||
 		highlighting_is_string_style(lexer, style));
 }
-
diff --git a/src/images.c b/src/images.c
index be31c88c..14f07a7e 100644
--- a/src/images.c
+++ b/src/images.c
@@ -1689,4 +1689,3 @@ static const guint8 save_all_tango_inline[] =
   "\0\0\0\12\0\0\0\12\0\0\0\12\0\0\0\12\0\0\0\12\0\0\0\12\0\0\0\12\0\0\0"
   "\7\0\0\0\4\0\0\0\2\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
   "\377\0"};
-
diff --git a/src/interface.c b/src/interface.c
index d742e03a..ce9fbff7 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -5816,4 +5816,3 @@ create_project_dialog (void)
 
   return project_dialog;
 }
-
diff --git a/src/keyfile.c b/src/keyfile.c
index 2982af07..14dee75b 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -690,7 +690,7 @@ static void load_dialog_prefs(GKeyFile *config)
 		g_key_file_set_boolean(config, PACKAGE, atomic_file_saving_key,
 			utils_get_setting_boolean(config, PACKAGE, "use_safe_file_saving", FALSE));
 	}
-	
+
 	/* read stash prefs */
 	settings_action(config, SETTING_READ);
 
diff --git a/src/msgwindow.c b/src/msgwindow.c
index 02616baf..0b7ab395 100644
--- a/src/msgwindow.c
+++ b/src/msgwindow.c
@@ -1209,5 +1209,3 @@ void msgwin_clear_tab(gint tabnum)
 		return;
 	gtk_list_store_clear(store);
 }
-
-
diff --git a/src/notebook.c b/src/notebook.c
index 92c7df99..24bbeba5 100644
--- a/src/notebook.c
+++ b/src/notebook.c
@@ -505,5 +505,3 @@ on_window_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context,
 	}
 	gtk_drag_finish(drag_context, success, FALSE, event_time);
 }
-
-
diff --git a/src/printing.c b/src/printing.c
index ff6fa995..d12d4792 100644
--- a/src/printing.c
+++ b/src/printing.c
@@ -917,4 +917,3 @@ void printing_print_doc(GeanyDocument *doc)
 	else
 		print_external(doc);
 }
-
diff --git a/src/socket.c b/src/socket.c
index 34a5927d..bf0dea16 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -788,5 +788,3 @@ gint socket_fd_write(gint fd, const gchar *buf, gint len)
 
 
 #endif
-
-
diff --git a/src/symbols.c b/src/symbols.c
index 0ca18396..4048fc3c 100644
--- a/src/symbols.c
+++ b/src/symbols.c
@@ -2202,5 +2202,3 @@ void symbols_finalize(void)
 	g_strfreev(html_entities);
 	g_strfreev(c_tags_ignore);
 }
-
-
diff --git a/src/toolbar.c b/src/toolbar.c
index f6562179..4eb38369 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1114,5 +1114,3 @@ void toolbar_configure(GtkWindow *parent)
 	tb_editor_free_path(tbw);
 	g_free(tbw);
 }
-
-
diff --git a/src/tools.c b/src/tools.c
index f349b3bf..4e8fe191 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -960,5 +960,3 @@ void tools_color_chooser(const gchar *color)
 	gtk_window_present(GTK_WINDOW(ui_widgets.open_colorsel));
 #endif
 }
-
-
diff --git a/src/utils.c b/src/utils.c
index cd066412..eaf14754 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1621,12 +1621,12 @@ guint utils_string_regex_replace_all(GString *haystack, GRegex *regex,
 	while (g_regex_match_full(regex, haystack->str, -1, start, 0, &minfo, NULL))
 	{
 		gint end, len;
-		
+
 		g_match_info_fetch_pos(minfo, match_num, &start, &end);
 		len = end - start;
 		utils_string_replace(haystack, start, len, replace);
 		ret++;
-		
+
 		/* skip past whole match */
 		g_match_info_fetch_pos(minfo, 0, NULL, &end);
 		start = end - len + strlen(replace);
diff --git a/src/win32.c b/src/win32.c
index 18667d78..db0821f3 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -533,7 +533,7 @@ void win32_show_font_dialog(void)
 
 	memset(&lf, 0, sizeof lf);
 	/* TODO: init lf members */
-	
+
 	memset(&cf, 0, sizeof cf);
 	cf.lStructSize = sizeof cf;
 	cf.hwndOwner = GDK_WINDOW_HWND(main_widgets.window->window);

From cc045b6736a4475d0123542a43306340a2f28ac4 Mon Sep 17 00:00:00 2001
From: Lex Trotman <elextr@gmail.com>
Date: Wed, 12 Oct 2011 17:40:36 +1100
Subject: [PATCH 04/70] Document building plugins for hacked Geany

---
 HACKING | 49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/HACKING b/HACKING
index 0967b8ab..eee9bcd0 100644
--- a/HACKING
+++ b/HACKING
@@ -144,18 +144,18 @@ And then simply apply it like so::
 
 GTK versions & API documentation
 --------------------------------
-Geany requires GTK >= 2.12 and GLib >= 2.16. API symbols from newer 
-GTK/GLib versions should be avoided or made optional to keep the source 
+Geany requires GTK >= 2.12 and GLib >= 2.16. API symbols from newer
+GTK/GLib versions should be avoided or made optional to keep the source
 code building on older systems.
 
-The official GTK 2.12 API documentation may not be available online 
-anymore, so we put it on http://www.geany.org/manual/gtk/. There 
-is also a tarball with all available files for download and use with 
+The official GTK 2.12 API documentation may not be available online
+anymore, so we put it on http://www.geany.org/manual/gtk/. There
+is also a tarball with all available files for download and use with
 devhelp.
 
-Using the 2.12 API documentation of the GTK libs (including GLib, GDK 
-and Pango) has the advantages that you don't get confused by any 
-newer API additions and you don't have to take care about whether 
+Using the 2.12 API documentation of the GTK libs (including GLib, GDK
+and Pango) has the advantages that you don't get confused by any
+newer API additions and you don't have to take care about whether
 you can use them or not.
 
 Coding
@@ -467,13 +467,13 @@ http://sf.net/projects/ctags - see the tracker.
 (You can also try the Anjuta project's tagmanager codebase.)
 
 .. note::
-    From Geany 1.22 GLib's GRegex engine is used instead of POSIX 
-    regex, unlike CTags. It should be close enough to POSIX to work 
+    From Geany 1.22 GLib's GRegex engine is used instead of POSIX
+    regex, unlike CTags. It should be close enough to POSIX to work
     OK.
-    We no longer support regex parsers with the "b" regex flag 
-    option set and Geany will print debug warnings if it's used. 
-    CTags supports it but doesn't currently (2011) include any 
-    parsers that use it. It should be easy to convert to extended 
+    We no longer support regex parsers with the "b" regex flag
+    option set and Geany will print debug warnings if it's used.
+    CTags supports it but doesn't currently (2011) include any
+    parsers that use it. It should be easy to convert to extended
     regex syntax anyway.
 
 Method
@@ -552,3 +552,24 @@ Example::
     ** INFO: Unloaded: ./plugins/.libs/demoplugin.so
     (gdb) c
     Continuing.
+
+Building Plugins
+^^^^^^^^^^^^^^^^
+
+The geany-plugins autotools script automatically detects the
+installed system Geany and builds the plugins against that.
+
+To use plugins with a development version of Geany built with
+a different prefix, the plugins will need to be compiled against
+that version if the ABI has changed.
+
+To do this you need to specify both --prefix and --with-geany-libdir
+to the plugin configure.  Normally the plugin prefix is the
+same as the Geany prefix to keep plugins with the version of Geany
+that they are compiled against, and with-geany-libdir is the Geany
+prefix/lib.
+
+Whilst it is possible for the plugin prefix to be different to
+the prefix of the libdir (which is why there are two settings),
+it is probably better to keep the version of Geany and its plugins
+together.

From f9265535a36860e20f1dfc1aa80c01ad64ac6949 Mon Sep 17 00:00:00 2001
From: Lex Trotman <elextr@gmail.com>
Date: Wed, 12 Oct 2011 17:45:24 +1100
Subject: [PATCH 05/70] Mention trailing whitespace in style

---
 HACKING | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/HACKING b/HACKING
index eee9bcd0..a647d9f8 100644
--- a/HACKING
+++ b/HACKING
@@ -196,6 +196,9 @@ Style
 * We use a tab width of 4 and indent completely with tabs not spaces.
   Note the documentation files use (4) spaces instead, so you may want
   to use the 'Detect from file' indent pref.
+* Do not add whitespace at the end of lines, this adds to commit noise.
+  When editing with Geany set preference files->Strip trailing spaces
+  and tabs.
 * Use the multiline comment ``/* */`` to comment small blocks of code,
   functions descriptions or longer explanations of code, etc. C++ single
   line comments will cause portability issues. The more comments are in
@@ -221,6 +224,8 @@ Style
     A few of the above can be done with the Git
     ``scripts/fix-alignment.pl``, but it is quite dumb and it's much better
     to write it correctly in the first place.
+    ``scripts/rstrip-whitespace.py`` just removes trailing whitespace.
+
 
 .. below tabs should be used, but spaces are required for reST.
 

From cbadf177f4ec4b85f76962dc73fd421481f072af Mon Sep 17 00:00:00 2001
From: Joshua Hoff <joshua.rh@comcast.net>
Date: Tue, 11 Oct 2011 20:42:09 -0500
Subject: [PATCH 06/70] simplify "append toolbar to menu" packing code

---
 src/toolbar.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/toolbar.c b/src/toolbar.c
index 4eb38369..05dd8d1e 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -480,8 +480,7 @@ void toolbar_update_ui(void)
 	/* we need to adjust the packing flags for the menubar to expand it if it is alone in the
 	 * hbox and not expand it if the toolbar is appended */
 	gtk_box_set_child_packing(GTK_BOX(hbox_menubar), menubar,
-		! (toolbar_prefs.visible && toolbar_prefs.append_to_menu),
-		! (toolbar_prefs.visible && toolbar_prefs.append_to_menu), 0, GTK_PACK_START);
+		! (toolbar_prefs.visible && toolbar_prefs.append_to_menu), TRUE, 0, GTK_PACK_START);
 }
 
 

From ea9c37abca135710c6f9dd5cc57c2e1bdb21afea Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Wed, 12 Oct 2011 17:42:57 +0100
Subject: [PATCH 07/70] Ignore generated files from makefile.win32

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index e7c3fd62..467b7569 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 *.lo
 *.so
 *.dll
+*.exe
+deps.mak
 .deps/
 .libs/
 Makefile
@@ -35,11 +37,13 @@ Makefile.in
 /geany.gladep.bak
 /geany.pc
 /geany.spec
+/geany_private.res
 /global.tags.old
 /install-sh
 /intltool
 /intltool-*
 /libtool
+/localwin32.mk
 /.lock-wscript
 /ltmain.sh
 /m4/

From 4fb9629f5bdc62b6348ca18ec4e0b3b0f46d7626 Mon Sep 17 00:00:00 2001
From: Matthew Brush <matt@geany.org>
Date: Wed, 12 Oct 2011 22:42:41 -0700
Subject: [PATCH 08/70] Detect HTML embedded filetypes from the current line

When using the commenting features (ex. toggle line commentation),
detect the the type of comments for the filetype of the line with
the caret rather than using the filetype of the current document.

Filetype is determined by the Scintilla state/style at the
beginning of the line where the caret is.

This does not fix the existing bug where using the commenting
features on lines with things like `<script>` will result in an
HTML-style comment to be wrapped around it and also where using
the commenting feature on a line with something like `<?php`
will not only wrap it in an HTML-style comment but it also won't
be able to uncomment the line.

This closes bug ID 2863829[1] and 3127598[2].

[1] https://sourceforge.net/tracker/?func=detail&aid=2863829&group_id=153444&atid=787791
[2] https://sourceforge.net/tracker/?func=detail&aid=3127598&group_id=153444&atid=787791
---
 src/editor.c | 97 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 28 deletions(-)

diff --git a/src/editor.c b/src/editor.c
index c14015fe..fdb073c5 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -114,6 +114,7 @@ static gsize count_indent_size(GeanyEditor *editor, const gchar *base_indent);
 static const gchar *snippets_find_completion_by_name(const gchar *type, const gchar *name);
 static void snippets_make_replacements(GeanyEditor *editor, GString *pattern);
 static gssize replace_cursor_markers(GeanyEditor *editor, GString *pattern);
+static GeanyFiletype *editor_get_filetype_at_current_pos(GeanyEditor *editor);
 
 
 void editor_snippets_free(void)
@@ -2711,17 +2712,74 @@ static gsize count_indent_size(GeanyEditor *editor, const gchar *base_indent)
 }
 
 
+/* Handles special cases where HTML is embedded in another language or
+ * another language is embedded in HTML */
+static GeanyFiletype *editor_get_filetype_at_current_pos(GeanyEditor *editor)
+{
+	gint style, line_start;
+	GeanyFiletype *current_ft;
+
+	g_return_val_if_fail(editor != NULL, NULL);
+	g_return_val_if_fail(editor->document->file_type != NULL, NULL);
+
+	current_ft = editor->document->file_type;
+	line_start = sci_get_position_from_line(editor->sci, sci_get_current_line(editor->sci));
+	style = sci_get_style_at(editor->sci, line_start);
+
+	/* Handle PHP filetype with embedded HTML */
+	if (current_ft->id == GEANY_FILETYPES_PHP && ! is_style_php(style))
+		current_ft = filetypes[GEANY_FILETYPES_HTML];
+
+	/* Handle languages embedded in HTML */
+	if (current_ft->id == GEANY_FILETYPES_HTML)
+	{
+		/* Embedded JS */
+		if (style >= SCE_HJ_DEFAULT && style <= SCE_HJ_REGEX)
+			current_ft = filetypes[GEANY_FILETYPES_JS];
+		/* ASP JS */
+		else if (style >= SCE_HJA_DEFAULT && style <= SCE_HJA_REGEX)
+			current_ft = filetypes[GEANY_FILETYPES_JS];
+		/* Embedded VB */
+		else if (style >= SCE_HB_DEFAULT && style <= SCE_HB_STRINGEOL)
+			current_ft = filetypes[GEANY_FILETYPES_BASIC];
+		/* ASP VB */
+		else if (style >= SCE_HBA_DEFAULT && style <= SCE_HBA_STRINGEOL)
+			current_ft = filetypes[GEANY_FILETYPES_BASIC];
+		/* Embedded Python */
+		else if (style >= SCE_HP_DEFAULT && style <= SCE_HP_IDENTIFIER)
+			current_ft = filetypes[GEANY_FILETYPES_PYTHON];
+		/* ASP Python */
+		else if (style >= SCE_HPA_DEFAULT && style <= SCE_HPA_IDENTIFIER)
+			current_ft = filetypes[GEANY_FILETYPES_PYTHON];
+		/* Embedded PHP */
+		else if ((style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR) ||
+			style == SCE_HPHP_COMPLEX_VARIABLE)
+		{
+			current_ft = filetypes[GEANY_FILETYPES_PHP];
+		}
+	}
+
+	/* Ensure the filetype's config is loaded */
+	filetypes_load_config(current_ft->id, FALSE);
+
+	return current_ft;
+}
+
+
 static void real_comment_multiline(GeanyEditor *editor, gint line_start, gint last_line)
 {
 	const gchar *eol;
 	gchar *str_begin, *str_end, *co, *cc;
 	gint line_len;
+	GeanyFiletype *ft;
 
 	g_return_if_fail(editor != NULL && editor->document->file_type != NULL);
 
+	ft = editor_get_filetype_at_current_pos(editor);
+
 	eol = editor_get_eol_char(editor);
-	co = editor->document->file_type->comment_open;
-	cc = editor->document->file_type->comment_close;
+	co = ft->comment_open;
+	cc = ft->comment_close;
 	str_begin = g_strdup_printf("%s%s", (co != NULL) ? co : "", eol);
 	str_end = g_strdup_printf("%s%s", (cc != NULL) ? cc : "", eol);
 
@@ -2741,12 +2799,15 @@ static void real_uncomment_multiline(GeanyEditor *editor)
 	gint pos, line, len, x;
 	gchar *linebuf;
 	GeanyDocument *doc;
+	GeanyFiletype *ft;
 
 	g_return_if_fail(editor != NULL && editor->document->file_type != NULL);
 	doc = editor->document;
 
+	ft = editor_get_filetype_at_current_pos(editor);
+
 	/* remove comment open chars */
-	pos = document_find_text(doc, doc->file_type->comment_open, NULL, 0, TRUE, FALSE, NULL);
+	pos = document_find_text(doc, ft->comment_open, NULL, 0, TRUE, FALSE, NULL);
 	SSM(editor->sci, SCI_DELETEBACK, 0, 0);
 
 	/* check whether the line is empty and can be deleted */
@@ -2759,7 +2820,7 @@ static void real_uncomment_multiline(GeanyEditor *editor)
 	g_free(linebuf);
 
 	/* remove comment close chars */
-	pos = document_find_text(doc, doc->file_type->comment_close, NULL, 0, FALSE, FALSE, NULL);
+	pos = document_find_text(doc, ft->comment_close, NULL, 0, FALSE, FALSE, NULL);
 	SSM(editor->sci, SCI_DELETEBACK, 0, 0);
 
 	/* check whether the line is empty and can be deleted */
@@ -2837,17 +2898,9 @@ gint editor_do_uncomment(GeanyEditor *editor, gint line, gboolean toggle)
 		sel_start = sel_end = sci_get_position_from_line(editor->sci, line);
 	}
 
-	ft = editor->document->file_type;
+	ft = editor_get_filetype_at_current_pos(editor);
 	eol_char_len = editor_get_eol_char_len(editor);
 
-	/* detection of HTML vs PHP code, if non-PHP set filetype to XML */
-	line_start = sci_get_position_from_line(editor->sci, first_line);
-	if (ft->id == GEANY_FILETYPES_PHP)
-	{
-		if (! is_style_php(sci_get_style_at(editor->sci, line_start)))
-			ft = filetypes[GEANY_FILETYPES_XML];
-	}
-
 	co = ft->comment_single;
 	if (NZV(co))
 		cc = NULL;
@@ -2968,7 +3021,6 @@ void editor_do_comment_toggle(GeanyEditor *editor)
 	sel_start = sci_get_selection_start(editor->sci);
 	sel_end = sci_get_selection_end(editor->sci);
 
-	ft = editor->document->file_type;
 	eol_char_len = editor_get_eol_char_len(editor);
 
 	first_line = sci_get_line_from_position(editor->sci,
@@ -2978,13 +3030,9 @@ void editor_do_comment_toggle(GeanyEditor *editor)
 		sci_get_selection_end(editor->sci) - editor_get_eol_char_len(editor));
 	last_line = MAX(first_line, last_line);
 
-	/* detection of HTML vs PHP code, if non-PHP set filetype to XML */
 	first_line_start = sci_get_position_from_line(editor->sci, first_line);
-	if (ft->id == GEANY_FILETYPES_PHP)
-	{
-		if (! is_style_php(sci_get_style_at(editor->sci, first_line_start)))
-			ft = filetypes[GEANY_FILETYPES_XML];
-	}
+
+	ft = editor_get_filetype_at_current_pos(editor);
 
 	co = ft->comment_single;
 	if (NZV(co))
@@ -3145,16 +3193,9 @@ void editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line
 		sel_start = sel_end = sci_get_position_from_line(editor->sci, line);
 	}
 
-	ft = editor->document->file_type;
 	eol_char_len = editor_get_eol_char_len(editor);
 
-	/* detection of HTML vs PHP code, if non-PHP set filetype to XML */
-	line_start = sci_get_position_from_line(editor->sci, first_line);
-	if (ft->id == GEANY_FILETYPES_PHP)
-	{
-		if (! is_style_php(sci_get_style_at(editor->sci, line_start)))
-			ft = filetypes[GEANY_FILETYPES_XML];
-	}
+	ft = editor_get_filetype_at_current_pos(editor);
 
 	co = ft->comment_single;
 	if (NZV(co))

From 02da53d7116e269cec1d4c6234ed5a176c38ca8e Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 13 Oct 2011 13:26:57 +0100
Subject: [PATCH 09/70] Fix focusing editor after startup on Windows

---
 src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index 2d8c083e..4dde6d9a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1090,7 +1090,6 @@ gint main(gint argc, gchar **argv)
 	ui_save_buttons_toggle(FALSE);
 
 	doc = document_get_current();
-	gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci));
 	sidebar_select_openfiles_item(doc);
 	build_menu_update(doc);
 	sidebar_update_tag_list(doc, FALSE);
@@ -1103,6 +1102,7 @@ gint main(gint argc, gchar **argv)
 	setup_window_position();
 
 	/* finally show the window */
+	document_grab_focus(doc);
 	gtk_widget_show(main_widgets.window);
 	main_status.main_window_realized = TRUE;
 

From c2ce2403f4fe12d2130c2acd9b556643e80ef1f4 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 13 Oct 2011 16:18:40 +0100
Subject: [PATCH 10/70] Windows: Fix 'Create process failed' message to show
 correct error

This helps when trying to run build commands that don't exist;
the status bar message for that is now:
Process failed (The system cannot find the file specified.)
---
 src/win32.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/win32.c b/src/win32.c
index db0821f3..a20f2c16 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -75,7 +75,8 @@ typedef struct _geany_win32_spawn geany_win32_spawn;
 
 static gboolean GetContentFromHandle(HANDLE hFile, gchar **content, GError **error);
 static HANDLE GetTempFileHandle(GError **error);
-static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, const TCHAR *dir, GError **error);
+static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline,
+		const TCHAR *dir, GError **error);
 static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile, GError **error);
 
 
@@ -952,8 +953,6 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl
 	if (! fSuccess)
 	{
 		geany_debug("win32_spawn: Create process failed");
-		if (error != NULL)
-			*error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "Create process failed");
 		return FALSE;
 	}
 
@@ -1044,7 +1043,8 @@ gchar *win32_expand_environment_variables(const gchar *str)
 }
 
 
-static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, const TCHAR *dir, GError **error)
+static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline,
+		const TCHAR *dir, GError **error)
 {
 	PROCESS_INFORMATION piProcInfo;
 	STARTUPINFOW siStartInfo;
@@ -1089,7 +1089,7 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline
 	{
 		gchar *msg = g_win32_error_message(GetLastError());
 		geany_debug("CreateChildProcess: CreateProcess failed (%s)", msg);
-		if (*error != NULL)
+		if (error != NULL)
 			*error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "%s", msg);
 		g_free(msg);
 		return FALSE;

From e9021f2174c62d30eee9231c4eafbd7320e3a02c Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 13 Oct 2011 16:33:15 +0100
Subject: [PATCH 11/70] Windows: Fix wrongly shown debug message
 'GetExitCodeProcess failed'

---
 src/win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/win32.c b/src/win32.c
index a20f2c16..8ad89ec3 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -1105,7 +1105,7 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline
 			TerminateProcess(piProcInfo.hProcess, WAIT_TIMEOUT); /* NOTE: This will not kill grandkids. */
 		}
 
-		if (GetExitCodeProcess(piProcInfo.hProcess, &gw_spawn->dwExitCode) != 0)
+		if (!GetExitCodeProcess(piProcInfo.hProcess, &gw_spawn->dwExitCode))
 		{
 			gchar *msg = g_win32_error_message(GetLastError());
 			geany_debug("GetExitCodeProcess failed: %s", msg);

From 55646df83def1cf21d85145301439eb50d267330 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 13 Oct 2011 16:56:40 +0100
Subject: [PATCH 12/70] Windows: Fix detecting a changed file on opening from
 command-line.

The file timestamp can actually be in advance of the current time in
this case.
---
 src/document.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/document.c b/src/document.c
index 5cdffe01..34076d62 100644
--- a/src/document.c
+++ b/src/document.c
@@ -3017,10 +3017,11 @@ gboolean document_check_disk_status(GeanyDocument *doc, gboolean force)
 		/* doc may be closed now */
 		ret = TRUE;
 	}
-	else if (G_UNLIKELY(! use_gio_filemon && /* ignore these checks when using GIO */
-			 (doc->priv->mtime > cur_time || st.st_mtime > cur_time)))
+	else if (! use_gio_filemon && /* ignore check when using GIO */
+		doc->priv->mtime > cur_time)
 	{
 		g_warning("%s: Something is wrong with the time stamps.", G_STRFUNC);
+		/* Note: on Windows st.st_mtime can be newer than cur_time */
 	}
 	else if (doc->priv->mtime < st.st_mtime)
 	{

From dc9ba7d074b9f7fcbc2c0be875f030ac3c562cee Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Sat, 15 Oct 2011 14:27:53 -0700
Subject: [PATCH 13/70] Improve highlighting for PHP and JS

---
 data/filetypes.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/filetypes.xml b/data/filetypes.xml
index df60ec56..5e7cbfa0 100644
--- a/data/filetypes.xml
+++ b/data/filetypes.xml
@@ -39,13 +39,13 @@ php_default=default
 php_simplestring=string_1
 php_hstring=string_1
 php_number=number_1
-php_word=number_2
-php_variable=identifier_4
+php_word=keyword_1
+php_variable=preprocessor
 php_comment=comment
 php_commentline=comment
 php_operator=operator
 php_hstring_variable=string_2
-php_complex_variable=identifier_2
+php_complex_variable=preprocessor
 
 jscript_start=tag
 jscript_default=default
@@ -53,8 +53,8 @@ jscript_comment=comment
 jscript_commentline=comment
 jscript_commentdoc=comment_doc
 jscript_number=number_1
-jscript_word=number_2
-jscript_keyword=keyword_1
+jscript_word=keyword_1
+jscript_keyword=keyword_2
 jscript_doublestring=string_1
 jscript_singlestring=string_1
 

From d6fc1f74f13ef7f9ef516c45a9094942cddb66a6 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Mon, 17 Oct 2011 16:12:41 +0100
Subject: [PATCH 14/70] Use GPtrArray and g_slice to allocate prefs.

This allows us to return StashPref pointers - before with GArray the
address could change on future appends.
---
 src/stash.c | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/stash.c b/src/stash.c
index 50d3315f..f0d318a9 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -66,18 +66,15 @@
  */
 
 /* Implementation Note
- * We use a GArray to hold prefs. It would be more efficient for user code to declare
+ * We dynamically allocate prefs. It would be more efficient for user code to declare
  * a static array of StashPref structs, but we don't do this because:
  *
  * * It would be more ugly (lots of casts and NULLs).
  * * Less type checking.
- * * The API would have to break when adding/changing fields.
+ * * The API & ABI would have to break when adding/changing fields.
  *
  * Usually the prefs code isn't what user code will spend most of its time doing, so this
- * should be efficient enough. But, if desired we could add a stash_group_set_size() function
- * to reduce reallocation (or perhaps use a different container).
- *
- * Note: Maybe using GSlice chunks with an extra 'next' pointer would be more efficient.
+ * should be efficient enough.
  */
 
 
@@ -106,7 +103,7 @@ typedef struct StashPref StashPref;
 struct StashGroup
 {
 	const gchar *name;			/* group name to use in the keyfile */
-	GArray *entries;			/* array of StashPref */
+	GPtrArray *entries;			/* array of (StashPref*) */
 	gboolean various;		/* mark group for display/edit in stash treeview */
 	gboolean use_defaults;		/* use default values if there's no keyfile entry */
 };
@@ -222,8 +219,9 @@ static void handle_strv_setting(StashGroup *group, StashPref *se,
 static void keyfile_action(SettingAction action, StashGroup *group, GKeyFile *keyfile)
 {
 	StashPref *entry;
+	guint i;
 
-	foreach_array(StashPref, entry, group->entries)
+	foreach_ptr_array(entry, i, group->entries)
 	{
 		/* don't override settings with default values */
 		if (!group->use_defaults && action == SETTING_READ &&
@@ -332,7 +330,7 @@ StashGroup *stash_group_new(const gchar *name)
 	StashGroup *group = g_new0(StashGroup, 1);
 
 	group->name = name;
-	group->entries = g_array_new(FALSE, FALSE, sizeof(StashPref));
+	group->entries = g_ptr_array_new();
 	group->use_defaults = TRUE;
 	return group;
 }
@@ -343,17 +341,21 @@ StashGroup *stash_group_new(const gchar *name)
 void stash_group_free(StashGroup *group)
 {
 	StashPref *entry;
+	guint i;
 
-	foreach_array(StashPref, entry, group->entries)
+	foreach_ptr_array(entry, i, group->entries)
 	{
 		if (entry->widget_type == GTK_TYPE_RADIO_BUTTON)
+		{
 			g_free(entry->fields);
-		else if (entry->widget_type == G_TYPE_PARAM)
-			continue;
-		else
+		}
+		else if (entry->widget_type != G_TYPE_PARAM)
+		{
 			g_assert(entry->fields == NULL);	/* to prevent memory leaks, must handle fields above */
+		}
+		g_slice_free(StashPref, entry);
 	}
-	g_array_free(group->entries, TRUE);
+	g_ptr_array_free(group->entries, TRUE);
 	g_free(group);
 }
 
@@ -379,8 +381,10 @@ static StashPref *
 add_pref(StashGroup *group, GType type, gpointer setting,
 		const gchar *key_name, gpointer default_value)
 {
-	StashPref entry = {type, setting, key_name, default_value, G_TYPE_NONE, NULL, NULL};
-	GArray *array = group->entries;
+	StashPref init = {type, setting, key_name, default_value, G_TYPE_NONE, NULL, NULL};
+	StashPref *entry = g_slice_new(StashPref);
+
+	*entry = init;
 
 	/* init any pointer settings to NULL so they can be freed later */
 	if (type == G_TYPE_STRING ||
@@ -388,9 +392,8 @@ add_pref(StashGroup *group, GType type, gpointer setting,
 		if (group->use_defaults)
 			*(gpointer**)setting = NULL;
 
-	g_array_append_val(array, entry);
-
-	return &g_array_index(array, StashPref, array->len - 1);
+	g_ptr_array_add(group->entries, entry);
+	return entry;
 }
 
 
@@ -638,8 +641,9 @@ static void handle_widget_property(GtkWidget *widget, StashPref *entry,
 static void pref_action(PrefAction action, StashGroup *group, GtkWidget *owner)
 {
 	StashPref *entry;
+	guint i;
 
-	foreach_array(StashPref, entry, group->entries)
+	foreach_ptr_array(entry, i, group->entries)
 	{
 		GtkWidget *widget;
 
@@ -1012,14 +1016,14 @@ static void stash_foreach_various_pref(GPtrArray *group_array, stash_foreach_pre
 	gpointer container, PrefAction action)
 {
 	StashGroup *group;
-	guint i;
+	guint i, j;
 	StashPref *entry;
 
 	foreach_ptr_array(group, i, group_array)
 	{
 		if (group->various)
 		{
-			foreach_array(StashPref, entry, group->entries)
+			foreach_ptr_array(entry, j, group->entries)
 				pref_func(group, entry, container, action);
 		}
 	}

From cf88abfe4d50038ab2bcfb16dd3a77674f58b735 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Mon, 17 Oct 2011 18:03:56 +0100
Subject: [PATCH 15/70] Speed up & simplify stash tree display/update

Store a pointer to the stash pref for each row, so display/update is just
O(n) instead of O(n^2) time.

This changes the order prefs are updated in, but this doesn't matter.
---
 src/prefs.c |  4 ++--
 src/stash.c | 40 +++++++++++++++-------------------------
 src/stash.h |  4 ++--
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/src/prefs.c b/src/prefs.c
index 9ebca053..444ab6c9 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -127,10 +127,10 @@ static void prefs_action(PrefCallbackAction action)
 	switch (action)
 	{
 		case PREF_DISPLAY:
-			stash_tree_display(pref_groups, various_treeview);
+			stash_tree_display(various_treeview);
 			break;
 		case PREF_UPDATE:
-			stash_tree_update(pref_groups, various_treeview);
+			stash_tree_update(various_treeview);
 			break;
 	}
 }
diff --git a/src/stash.c b/src/stash.c
index f0d318a9..fbb04187 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -80,7 +80,6 @@
 
 #include "geany.h"		/* necessary for utils.h, otherwise use gtk/gtk.h */
 #include <stdlib.h>		/* only for atoi() */
-#include <string.h>		/* only for strcmp() */
 #include "support.h"	/* only for _("text") */
 #include "utils.h"		/* only for foreach_*, utils_get_setting_*(). Stash should not depend on Geany. */
 
@@ -906,6 +905,7 @@ struct StashTreeValue
 	gpointer setting;
 	const gchar *key_name;
 	const gchar *group_name;
+	StashPref *pref;
 };
 
 typedef struct StashTreeValue StashTreeValue;
@@ -1042,6 +1042,7 @@ static void stash_tree_append_pref(StashGroup *group, StashPref *entry, GtkListS
 	value->setting = NULL;
 	value->key_name = entry->key_name;
 	value->group_name = group->name;
+	value->pref = entry;
 
 	gtk_list_store_append(store, &iter);
 	gtk_list_store_set(store, &iter, STASH_TREE_NAME, value->key_name,
@@ -1153,10 +1154,8 @@ static void stash_tree_update_pref(StashTreeValue *value, StashPref *entry)
 	}
 }
 
-/* These functions can handle about 200 settings on a 1GHz x86 CPU in ~0.06 seconds.
- * For 250+ settings, you'd better write something more efficient. */
-static void stash_tree_handle_pref(StashGroup *group, StashPref *entry, GtkTreeModel *model,
-	PrefAction action)
+
+static void stash_tree_action(GtkTreeModel *model, PrefAction action)
 {
 	GtkTreeIter iter;
 	gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
@@ -1166,36 +1165,27 @@ static void stash_tree_handle_pref(StashGroup *group, StashPref *entry, GtkTreeM
 	{
 		gtk_tree_model_get(model, &iter, STASH_TREE_VALUE, &value, -1);
 
-		if (strcmp(group->name, value->group_name) == 0 &&
-			strcmp(entry->key_name, value->key_name) == 0)
+		switch (action)
 		{
-			switch (action)
-			{
-				case PREF_DISPLAY:
-					stash_tree_display_pref(value, entry);
-					break;
-				case PREF_UPDATE:
-					stash_tree_update_pref(value, entry);
-					break;
-			}
-
-			break;
+			case PREF_DISPLAY:
+				stash_tree_display_pref(value, value->pref);
+				break;
+			case PREF_UPDATE:
+				stash_tree_update_pref(value, value->pref);
+				break;
 		}
-
 		valid = gtk_tree_model_iter_next(model, &iter);
 	}
 }
 
 
-void stash_tree_display(GPtrArray *group_array, GtkTreeView *tree)
+void stash_tree_display(GtkTreeView *tree)
 {
-	stash_foreach_various_pref(group_array, (stash_foreach_pref_func) stash_tree_handle_pref,
-		gtk_tree_view_get_model(tree), PREF_DISPLAY);
+	stash_tree_action(gtk_tree_view_get_model(tree), PREF_DISPLAY);
 }
 
 
-void stash_tree_update(GPtrArray *group_array, GtkTreeView *tree)
+void stash_tree_update(GtkTreeView *tree)
 {
-	stash_foreach_various_pref(group_array, (stash_foreach_pref_func) stash_tree_handle_pref,
-		gtk_tree_view_get_model(tree), PREF_UPDATE);
+	stash_tree_action(gtk_tree_view_get_model(tree), PREF_UPDATE);
 }
diff --git a/src/stash.h b/src/stash.h
index c03e0a42..13c3b4c5 100644
--- a/src/stash.h
+++ b/src/stash.h
@@ -92,8 +92,8 @@ void stash_group_update(StashGroup *group, GtkWidget *owner);
 
 void stash_tree_setup(GPtrArray *group_array, GtkTreeView *tree);
 
-void stash_tree_display(GPtrArray *group_array, GtkTreeView *tree);
+void stash_tree_display(GtkTreeView *tree);
 
-void stash_tree_update(GPtrArray *group_array, GtkTreeView *tree);
+void stash_tree_update(GtkTreeView *tree);
 
 #endif

From 90cf307265e45cdf33e544d5faaaffa0bce4c9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Tue, 18 Oct 2011 23:53:44 +0200
Subject: [PATCH 16/70] Adjust error line parsing for newer Python versions

The format of the error message output of the py_compile module has changed in
Python 2.6. The code now tries to detect the format and parse it accordingly.
---
 src/msgwindow.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/msgwindow.c b/src/msgwindow.c
index 0b7ab395..59518671 100644
--- a/src/msgwindow.c
+++ b/src/msgwindow.c
@@ -844,11 +844,25 @@ static void parse_compiler_error_line(const gchar *string,
 		case GEANY_FILETYPES_PYTHON:
 		{
 			/* File "HyperArch.py", line 37, in ?
-			 * (file "clrdial.tcl" line 12) */
-			data.pattern = " \"";
-			data.min_fields = 6;
-			data.line_idx = 5;
-			data.file_idx = 2;
+			 * (file "clrdial.tcl" line 12)
+			 * */
+			if (strstr(string, " line ") != NULL)
+			{
+				/* Tcl and old Python format (<= Python 2.5) */
+				data.pattern = " \"";
+				data.min_fields = 6;
+				data.line_idx = 5;
+				data.file_idx = 2;
+			}
+			else
+			{
+				/* SyntaxError: ('invalid syntax', ('sender.py', 149, 20, ' ...'))
+				 * (used since Python 2.6) */
+				data.pattern = ",'";
+				data.min_fields = 8;
+				data.line_idx = 6;
+				data.file_idx = 4;
+			}
 			break;
 		}
 		case GEANY_FILETYPES_BASIC:

From a3e5044d4fbc636c1ac5be12586de338f55c4ddd Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sun, 16 Oct 2011 21:03:06 +0200
Subject: [PATCH 17/70] Plug a few memory leaks

These leaks actually were not "real" leaks since the memory will anyway
be kept until quit.  Fixing those only makes the code "cleaner" and
will prevent them to "hide" some other (real) ones at debug times.
---
 src/ui_utils.c | 11 ++++++++---
 src/vte.c      |  2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/ui_utils.c b/src/ui_utils.c
index 0c7248ec..5866a711 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1883,6 +1883,12 @@ static void on_config_file_clicked(GtkWidget *widget, gpointer user_data)
 }
 
 
+static void free_on_closure_notify(gpointer data, GClosure *closure)
+{
+	g_free(data);
+}
+
+
 /* @note You should connect to the "document-save" signal yourself to detect
  * if the user has just saved the config file, reloading it. */
 void ui_add_config_file_menu_item(const gchar *real_path, const gchar *label, GtkContainer *parent)
@@ -1905,9 +1911,8 @@ void ui_add_config_file_menu_item(const gchar *real_path, const gchar *label, Gt
 
 	gtk_widget_show(item);
 	gtk_container_add(parent, item);
-	g_signal_connect(item, "activate", G_CALLBACK(on_config_file_clicked),
-		/* this memory is kept */
-		g_strdup(real_path));
+	g_signal_connect_data(item, "activate", G_CALLBACK(on_config_file_clicked),
+			g_strdup(real_path), free_on_closure_notify, 0);
 }
 
 
diff --git a/src/vte.c b/src/vte.c
index ce9572c7..9bf7c624 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -248,6 +248,7 @@ static void create_vte(void)
 
 	/* create menu now so copy/paste shortcuts work */
 	vc->menu = vte_create_popup_menu();
+	g_object_ref_sink(vc->menu);
 
 	frame = gtk_frame_new(NULL);
 
@@ -291,6 +292,7 @@ void vte_close(void)
 	 * this prevents a segfault on X close window if the message window is hidden */
 	gtk_widget_destroy(vc->vte);
 	gtk_widget_destroy(vc->menu);
+	g_object_unref(vc->menu);
 	g_free(vc->emulation);
 	g_free(vc->shell);
 	g_free(vc->font);

From c56788b7a781b6518235e1da8d58c948cf027954 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Wed, 19 Oct 2011 03:26:18 +0200
Subject: [PATCH 18/70] Fix a few style mappings

---
 data/colorschemes/alt.conf | 2 +-
 data/filetypes.common      | 2 +-
 data/filetypes.perl        | 8 ++++----
 data/filetypes.sh          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/colorschemes/alt.conf b/data/colorschemes/alt.conf
index cfc4a3db..6d0e3dd1 100644
--- a/data/colorschemes/alt.conf
+++ b/data/colorschemes/alt.conf
@@ -66,7 +66,7 @@ string_3=default
 string_4=default
 string_eol=0x000000;0xe0c0e0
 character=string_1
-backtick=string_2
+backticks=string_2
 here_doc=string_2
 
 scalar=string_2
diff --git a/data/filetypes.common b/data/filetypes.common
index 423d6974..95c474b8 100644
--- a/data/filetypes.common
+++ b/data/filetypes.common
@@ -151,7 +151,7 @@ string_1=string
 string_2=string_1
 string_eol=0x000000;0xe0c0e0;false;false
 character=string_1
-backtick=string_2
+backticks=string_2
 here_doc=string_2
 
 scalar=string_2
diff --git a/data/filetypes.perl b/data/filetypes.perl
index 29423d25..f2274aa0 100644
--- a/data/filetypes.perl
+++ b/data/filetypes.perl
@@ -34,10 +34,10 @@ variable_indexer=default
 # not used
 punctuation=default
 # obsolete: replaced by qq, qx, qr, qw
-longquote=perl_here_qq
-sub_prototype=perl_here_qx
-format_ident=perl_string_qr
-format=perl_string_qw
+longquote=here_doc
+sub_prototype=here_doc
+format_ident=string_2
+format=string_2
 
 [keywords]
 primary=NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept alarm and atan2 bind binmode bless caller chdir chmod chomp chop chown chr chroot close closedir cmp connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eq eval exec exists exit exp fcntl fileno flock for foreach fork format formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst le length link listen local localtime lock log lstat lt m map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q qq qr quotemeta qu qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir s scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn while write x xor y
diff --git a/data/filetypes.sh b/data/filetypes.sh
index d2beb39a..04334ed1 100644
--- a/data/filetypes.sh
+++ b/data/filetypes.sh
@@ -9,7 +9,7 @@ string=string_1
 character=string_1
 operator=operator
 identifier=identifier_1
-backticks=backtick
+backticks=backticks
 param=parameter
 scalar=scalar
 error=error

From cbc5600a1a775dc351093cb8ea2be36fb9595e95 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Tue, 18 Oct 2011 15:51:50 +0200
Subject: [PATCH 19/70] Update to Scintilla 2.29

---
 scintilla/gtk/PlatGTK.cxx          |  342 ++++++--
 scintilla/gtk/ScintillaGTK.cxx     |  645 +++++++++++---
 scintilla/include/Platform.h       |   17 +-
 scintilla/include/SciLexer.h       |   19 +
 scintilla/include/Scintilla.h      |   47 +-
 scintilla/include/Scintilla.iface  |  103 ++-
 scintilla/lexers/LexBasic.cxx      |  372 ++++++---
 scintilla/lexers/LexCOBOL.cxx      |    8 +
 scintilla/lexers/LexCPP.cxx        |   55 +-
 scintilla/lexers/LexHTML.cxx       |  125 ++-
 scintilla/lexers/LexLua.cxx        |  119 ++-
 scintilla/lexers/LexMarkdown.cxx   |   23 +-
 scintilla/lexers/LexMatlab.cxx     |   12 +-
 scintilla/lexers/LexOthers.cxx     |  260 +++++-
 scintilla/lexers/LexPerl.cxx       | 1248 ++++++++++++++++++----------
 scintilla/lexers/LexPython.cxx     |   71 +-
 scintilla/lexers/LexRuby.cxx       |   11 +-
 scintilla/lexers/LexSQL.cxx        |   22 +-
 scintilla/lexers/LexVHDL.cxx       |    2 +-
 scintilla/lexers/LexVerilog.cxx    |   30 +-
 scintilla/lexlib/Accessor.cxx      |    2 +-
 scintilla/lexlib/CharacterSet.h    |    1 -
 scintilla/lexlib/PropSetSimple.cxx |    7 +-
 scintilla/lexlib/SparseState.h     |    6 +-
 scintilla/lexlib/StyleContext.h    |    2 +-
 scintilla/lexlib/WordList.cxx      |   28 +-
 scintilla/scintilla_changes.patch  |    2 +-
 scintilla/src/CallTip.cxx          |    2 +-
 scintilla/src/ContractionState.cxx |   12 +-
 scintilla/src/ContractionState.h   |    1 +
 scintilla/src/Decoration.cxx       |    6 +-
 scintilla/src/Document.cxx         |  185 ++++-
 scintilla/src/Document.h           |   48 +-
 scintilla/src/Editor.cxx           |  699 +++++++++++-----
 scintilla/src/Editor.h             |   20 +-
 scintilla/src/Indicator.cxx        |   58 +-
 scintilla/src/Indicator.h          |    3 +-
 scintilla/src/KeyMap.cxx           |   47 +-
 scintilla/src/KeyMap.h             |    1 +
 scintilla/src/LineMarker.cxx       |  157 +++-
 scintilla/src/LineMarker.h         |   18 +-
 scintilla/src/PerLine.cxx          |    4 +-
 scintilla/src/PositionCache.cxx    |   87 +-
 scintilla/src/PositionCache.h      |   25 +-
 scintilla/src/RESearch.cxx         |    6 +-
 scintilla/src/RunStyles.cxx        |   34 +-
 scintilla/src/RunStyles.h          |    8 +-
 scintilla/src/ScintillaBase.cxx    |   17 +-
 scintilla/src/Style.cxx            |  146 ++--
 scintilla/src/Style.h              |   64 +-
 scintilla/src/ViewStyle.cxx        |  135 ++-
 scintilla/src/ViewStyle.h          |   20 +
 scintilla/src/XPM.cxx              |  143 +++-
 scintilla/src/XPM.h                |   50 +-
 scintilla/version.txt              |    2 +-
 55 files changed, 4161 insertions(+), 1416 deletions(-)

diff --git a/scintilla/gtk/PlatGTK.cxx b/scintilla/gtk/PlatGTK.cxx
index 4e224735..90f5c07f 100644
--- a/scintilla/gtk/PlatGTK.cxx
+++ b/scintilla/gtk/PlatGTK.cxx
@@ -9,6 +9,9 @@
 #include <stddef.h>
 #include <math.h>
 
+#include <vector>
+#include <map>
+
 #include <glib.h>
 #include <gmodule.h>
 #include <gdk/gdk.h>
@@ -40,9 +43,37 @@
 #define IS_WIDGET_FOCUSSED(w) (GTK_WIDGET_HAS_FOCUS(w))
 #endif
 
-#if GTK_CHECK_VERSION(2,22,0)
 #define USE_CAIRO 1
+
+#ifdef USE_CAIRO
+
+static cairo_surface_t *CreateSimilarSurface(GdkWindow *window, cairo_content_t content, int width, int height) {
+#if GTK_CHECK_VERSION(2,22,0)
+	return gdk_window_create_similar_surface(window, content, width, height);
+#else
+	cairo_surface_t *window_surface, *surface;
+
+	g_return_val_if_fail(GDK_IS_WINDOW(window), NULL);
+
+	window_surface = GDK_DRAWABLE_GET_CLASS(window)->ref_cairo_surface(window);
+
+	surface = cairo_surface_create_similar(window_surface, content, width, height);
+
+	cairo_surface_destroy(window_surface);
+
+	return surface;
 #endif
+}
+
+#endif
+
+static GdkWindow *WindowFromWidget(GtkWidget *w) {
+#if GTK_CHECK_VERSION(3,0,0)
+	return gtk_widget_get_window(w);
+#else
+	return w->window;
+#endif
+}
 
 #ifdef USE_CAIRO
 #define DISABLE_GDK_FONT 1
@@ -116,10 +147,17 @@ class FontHandle {
 	encodingType et;
 public:
 	int ascent;
+#ifndef DISABLE_GDK_FONT
 	GdkFont *pfont;
+#endif
 	PangoFontDescription *pfd;
 	int characterSet;
-	FontHandle(GdkFont *pfont_) {
+#ifdef DISABLE_GDK_FONT
+	FontHandle() : et(singleByte), ascent(0), pfd(0), characterSet(-1) {
+		ResetWidths(et);
+	}
+#else
+	FontHandle(GdkFont *pfont_=0) {
 		et = singleByte;
 		ascent = 0;
 		pfont = pfont_;
@@ -127,10 +165,13 @@ public:
 		characterSet = -1;
 		ResetWidths(et);
 	}
+#endif
 	FontHandle(PangoFontDescription *pfd_, int characterSet_) {
 		et = singleByte;
 		ascent = 0;
+#ifndef DISABLE_GDK_FONT
 		pfont = 0;
+#endif
 		pfd = pfd_;
 		characterSet = characterSet_;
 		ResetWidths(et);
@@ -139,8 +180,8 @@ public:
 #ifndef DISABLE_GDK_FONT
 		if (pfont)
 			gdk_font_unref(pfont);
-#endif
 		pfont = 0;
+#endif
 		if (pfd)
 			pango_font_description_free(pfd);
 		pfd = 0;
@@ -183,9 +224,11 @@ static GtkWidget *PWidget(WindowID wid) {
 	return reinterpret_cast<GtkWidget *>(wid);
 }
 
+#if !GTK_CHECK_VERSION(3,0,0)
 static GtkWidget *PWidget(Window &w) {
 	return PWidget(w.GetID());
 }
+#endif
 
 Point Point::FromLong(long lpoint) {
 	return Point(
@@ -254,6 +297,8 @@ void Palette::WantFind(ColourPair &cp, bool want) {
 }
 
 void Palette::Allocate(Window &w) {
+#if !GTK_CHECK_VERSION(3,0,0)
+	// Disable palette on GTK+ 3.
 	if (allocatedPalette) {
 		gdk_colormap_free_colors(gtk_widget_get_colormap(PWidget(w)),
 		                         reinterpret_cast<GdkColor *>(allocatedPalette),
@@ -274,14 +319,17 @@ void Palette::Allocate(Window &w) {
 			paletteNew[iPal].blue = entries[iPal].desired.GetBlue() * (65535 / 255);
 			paletteNew[iPal].pixel = entries[iPal].desired.AsLong();
 		}
+#ifndef USE_CAIRO
 		gdk_colormap_alloc_colors(gtk_widget_get_colormap(PWidget(w)),
 		                          paletteNew, allocatedLen, FALSE, TRUE,
 		                          successPalette);
+#endif
 		for (iPal = 0; iPal < used; iPal++) {
 			entries[iPal].allocated.Set(paletteNew[iPal].pixel);
 		}
 	}
 	delete []successPalette;
+#endif
 }
 
 #ifndef DISABLE_GDK_FONT
@@ -671,7 +719,7 @@ FontID FontCached::CreateNewFont(const char *fontName, int characterSet,
 	}
 	return new FontHandle(newid);
 #else
-	return new FontHandle(0);
+	return new FontHandle();
 #endif
 }
 
@@ -695,6 +743,8 @@ void Font::Release() {
 #ifdef SCI_NAMESPACE
 namespace Scintilla {
 #endif
+
+// On GTK+ 2.x, SurfaceID is a GdkDrawable* and on GTK+ 3.x, it is a cairo_t*
 class SurfaceImpl : public Surface {
 	encodingType et;
 #ifdef USE_CAIRO
@@ -736,6 +786,7 @@ public:
 	void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
 	void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
 		ColourAllocated outline, int alphaOutline, int flags);
+	void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage);
 	void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
 	void Copy(PRectangle rc, Point from, Surface &surfaceSource);
 
@@ -883,7 +934,11 @@ void SurfaceImpl::Init(WindowID wid) {
 	Release();
 	PLATFORM_ASSERT(wid);
 #ifdef USE_CAIRO
+#if GTK_CHECK_VERSION(3,0,0)
+	GdkWindow *drawable_ = gtk_widget_get_window(PWidget(wid));
+#else
 	GdkDrawable *drawable_ = GDK_DRAWABLE(PWidget(wid)->window);
+#endif
 	if (drawable_) {
 		context = gdk_cairo_create(drawable_);
 		PLATFORM_ASSERT(context);
@@ -904,14 +959,17 @@ void SurfaceImpl::Init(WindowID wid) {
 
 void SurfaceImpl::Init(SurfaceID sid, WindowID wid) {
 	PLATFORM_ASSERT(sid);
-	GdkDrawable *drawable_ = reinterpret_cast<GdkDrawable *>(sid);
 	Release();
 	PLATFORM_ASSERT(wid);
 #ifdef USE_CAIRO
-	context = gdk_cairo_create(drawable_);
+#if GTK_CHECK_VERSION(3,0,0)
+	context = cairo_reference(reinterpret_cast<cairo_t *>(sid));
 #else
-	gc = gdk_gc_new(drawable_);
-	drawable = drawable_;
+	context = gdk_cairo_create(reinterpret_cast<GdkDrawable *>(sid));
+#endif
+#else
+	drawable = reinterpret_cast<GdkDrawable *>(sid);
+	gc = gdk_gc_new(drawable);
 #endif
 	pcontext = gtk_widget_create_pango_context(PWidget(wid));
 	layout = pango_layout_new(pcontext);
@@ -942,8 +1000,8 @@ void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_, WindowID
 	PLATFORM_ASSERT(layout);
 #ifdef USE_CAIRO
 	if (height > 0 && width > 0)
-		psurf = gdk_window_create_similar_surface(
-			gtk_widget_get_window(PWidget(wid)),
+		psurf = CreateSimilarSurface(
+			WindowFromWidget(PWidget(wid)),
 			CAIRO_CONTENT_COLOR_ALPHA, width, height);
 #else
 	if (height > 0 && width > 0)
@@ -974,9 +1032,9 @@ void SurfaceImpl::PenColour(ColourAllocated fore) {
 	if (context) {
 		ColourDesired cdFore(fore.AsLong());
 		cairo_set_source_rgb(context,
-			cdFore.GetBlue() / 255.0,
+			cdFore.GetRed() / 255.0,
 			cdFore.GetGreen() / 255.0,
-			cdFore.GetRed() / 255.0);
+			cdFore.GetBlue() / 255.0);
 	}
 #else
 	if (gc) {
@@ -1186,7 +1244,12 @@ void SurfaceImpl::RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAl
 static void PathRoundRectangle(cairo_t *context, double left, double top, double width, double height, int radius) {
 	double degrees = M_PI / 180.0;
 
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 2, 0)
 	cairo_new_sub_path(context);
+#else
+	// First arc is in the top-right corner and starts from a point on the top line
+	cairo_move_to(context, left + width - radius, top);
+#endif
 	cairo_arc(context, left + width - radius, top + radius, radius, -90 * degrees, 0 * degrees);
 	cairo_arc(context, left + width - radius, top + height - radius, radius, 0 * degrees, 90 * degrees);
 	cairo_arc(context, left + radius, top + height - radius, radius, 90 * degrees, 180 * degrees);
@@ -1216,8 +1279,6 @@ static guint32 u32FromRGBA(guint8 r, guint8 g, guint8 b, guint8 a) {
 	return converter.val;
 }
 
-#endif
-
 static unsigned int GetRValue(unsigned int co) {
 	return (co >> 16) & 0xff;
 }
@@ -1230,24 +1291,34 @@ static unsigned int GetBValue(unsigned int co) {
 	return co & 0xff;
 }
 
+#endif
+
 void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
 		ColourAllocated outline, int alphaOutline, int flags) {
 #ifdef USE_CAIRO
 	if (context && rc.Width() > 0) {
+		ColourDesired cdFill(fill.AsLong());
 		cairo_set_source_rgba(context,
-			GetRValue(fill.AsLong()) / 255.0,
-			GetGValue(fill.AsLong()) / 255.0,
-			GetBValue(fill.AsLong()) / 255.0,
+			cdFill.GetRed() / 255.0,
+			cdFill.GetGreen() / 255.0,
+			cdFill.GetBlue() / 255.0,
 			alphaFill / 255.0);
-		PathRoundRectangle(context, rc.left + 1.0, rc.top+1.0, rc.right - rc.left - 2.0, rc.bottom - rc.top - 2.0, cornerSize);
+		if (cornerSize > 0)
+			PathRoundRectangle(context, rc.left + 1.0, rc.top + 1.0, rc.right - rc.left - 2.0, rc.bottom - rc.top - 2.0, cornerSize);
+		else
+			cairo_rectangle(context, rc.left + 1.0, rc.top + 1.0, rc.right - rc.left - 2.0, rc.bottom - rc.top - 2.0);
 		cairo_fill(context);
 
+		ColourDesired cdOutline(outline.AsLong());
 		cairo_set_source_rgba(context,
-			GetRValue(outline.AsLong()) / 255.0,
-			GetGValue(outline.AsLong()) / 255.0,
-			GetBValue(outline.AsLong()) / 255.0,
+			cdOutline.GetRed() / 255.0,
+			cdOutline.GetGreen() / 255.0,
+			cdOutline.GetBlue() / 255.0,
 			alphaOutline / 255.0);
-		PathRoundRectangle(context, rc.left +0.5, rc.top+0.5, rc.right - rc.left - 1, rc.bottom - rc.top - 1, cornerSize);
+		if (cornerSize > 0)
+			PathRoundRectangle(context, rc.left + 0.5, rc.top + 0.5, rc.right - rc.left - 1, rc.bottom - rc.top - 1, cornerSize);
+		else
+			cairo_rectangle(context, rc.left + 0.5, rc.top + 0.5, rc.right - rc.left - 1, rc.bottom - rc.top - 1);
 		cairo_stroke(context);
 	}
 #else
@@ -1293,6 +1364,51 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated
 #endif
 }
 
+void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) {
+	if (rc.Width() > width)
+		rc.left += (rc.Width() - width) / 2;
+	rc.right = rc.left + width;
+	if (rc.Height() > height)
+		rc.top += (rc.Height() - height) / 2;
+	rc.bottom = rc.top + height;
+
+#ifdef USE_CAIRO
+	int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
+	int ucs = stride * height;
+	std::vector<unsigned char> image(ucs);
+	for (int y=0; y<height; y++) {
+		for (int x=0; x<width; x++) {
+			unsigned char *pixel = &image[0] + y*stride + x * 4;
+			unsigned char alpha = pixelsImage[3];
+			pixel[2] = (*pixelsImage++) * alpha / 255;
+			pixel[1] = (*pixelsImage++) * alpha / 255;
+			pixel[0] = (*pixelsImage++) * alpha / 255;
+			pixel[3] = *pixelsImage++;
+		}
+	}
+
+	cairo_surface_t *psurf = cairo_image_surface_create_for_data(&image[0], CAIRO_FORMAT_ARGB32, width, height, stride);
+	cairo_set_source_surface(context, psurf, rc.left, rc.top);
+	cairo_rectangle(context, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top);
+	cairo_fill(context);
+
+	cairo_surface_destroy(psurf);
+#else
+	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data(pixelsImage,
+                                                         GDK_COLORSPACE_RGB,
+                                                         TRUE,
+                                                         8,
+                                                         width,
+                                                         height,
+                                                         width * 4,
+                                                         NULL,
+                                                         NULL);
+	gdk_draw_pixbuf(drawable, gc, pixbuf,
+		0,0, rc.left,rc.top, width,height, GDK_RGB_DITHER_NORMAL, 0, 0);
+	g_object_unref(pixbuf);
+#endif
+}
+
 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
 	PenColour(back);
 #ifdef USE_CAIRO
@@ -1474,7 +1590,6 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, int ybase, const char
 		int xText = rc.left;
 		if (PFont(font_)->pfd) {
 			char *utfForm = 0;
-			bool useGFree = false;
 			if (et == UTF8) {
 				pango_layout_set_text(layout, s, len);
 			} else {
@@ -1508,11 +1623,7 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, int ybase, const char
 #else
 			gdk_draw_layout_line(drawable, gc, xText, ybase, pll);
 #endif
-			if (useGFree) {
-				g_free(utfForm);
-			} else {
-				delete []utfForm;
-			}
+			delete []utfForm;
 			return;
 		}
 #ifndef DISABLE_GDK_FONT
@@ -1690,7 +1801,6 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, int *positi
 				}
 				if (positionsCalculated < 1 ) {
 					// Either Latin1 or DBCS conversion failed so treat as Latin1.
-					bool useGFree = false;
 					SetConverter(PFont(font_)->characterSet);
 					char *utfForm = UTF8FromIconv(conv, s, len);
 					if (!utfForm) {
@@ -1712,11 +1822,7 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, int *positi
 						}
 						clusterStart = clusterEnd;
 					}
-					if (useGFree) {
-						g_free(utfForm);
-					} else {
-						delete []utfForm;
-					}
+					delete []utfForm;
 					PLATFORM_ASSERT(i == lenPositions);
 				}
 			}
@@ -1792,7 +1898,6 @@ int SurfaceImpl::WidthText(Font &font_, const char *s, int len) {
 			char *utfForm = 0;
 			pango_layout_set_font_description(layout, PFont(font_)->pfd);
 			PangoRectangle pos;
-			bool useGFree = false;
 			if (et == UTF8) {
 				pango_layout_set_text(layout, s, len);
 			} else {
@@ -1815,11 +1920,7 @@ int SurfaceImpl::WidthText(Font &font_, const char *s, int len) {
 			PangoLayoutLine *pangoLine = pango_layout_get_line(layout,0);
 #endif
 			pango_layout_line_get_extents(pangoLine, NULL, &pos);
-			if (useGFree) {
-				g_free(utfForm);
-			} else {
-				delete []utfForm;
-			}
+			delete []utfForm;
 			return PANGO_PIXELS(pos.width);
 		}
 #ifndef DISABLE_GDK_FONT
@@ -2005,11 +2106,17 @@ PRectangle Window::GetPosition() {
 	// Before any size allocated pretend its 1000 wide so not scrolled
 	PRectangle rc(0, 0, 1000, 1000);
 	if (wid) {
-		rc.left = PWidget(wid)->allocation.x;
-		rc.top = PWidget(wid)->allocation.y;
-		if (PWidget(wid)->allocation.width > 20) {
-			rc.right = rc.left + PWidget(wid)->allocation.width;
-			rc.bottom = rc.top + PWidget(wid)->allocation.height;
+		GtkAllocation allocation;
+#if GTK_CHECK_VERSION(3,0,0)
+		gtk_widget_get_allocation(PWidget(wid), &allocation);
+#else
+		allocation = PWidget(wid)->allocation;
+#endif
+		rc.left = allocation.x;
+		rc.top = allocation.y;
+		if (allocation.width > 20) {
+			rc.right = rc.left + allocation.width;
+			rc.bottom = rc.top + allocation.height;
 		}
 	}
 	return rc;
@@ -2027,7 +2134,7 @@ void Window::SetPosition(PRectangle rc) {
 void Window::SetPositionRelative(PRectangle rc, Window relativeTo) {
 	int ox = 0;
 	int oy = 0;
-	gdk_window_get_origin(PWidget(relativeTo.wid)->window, &ox, &oy);
+	gdk_window_get_origin(WindowFromWidget(PWidget(relativeTo.wid)), &ox, &oy);
 	ox += rc.left;
 	if (ox < 0)
 		ox = 0;
@@ -2113,9 +2220,13 @@ void Window::SetCursor(Cursor curs) {
 		break;
 	}
 
-	if (PWidget(wid)->window)
-		gdk_window_set_cursor(PWidget(wid)->window, gdkCurs);
+	if (WindowFromWidget(PWidget(wid)))
+		gdk_window_set_cursor(WindowFromWidget(PWidget(wid)), gdkCurs);
+#if GTK_CHECK_VERSION(3,0,0)
+	g_object_unref(gdkCurs);
+#else
 	gdk_cursor_unref(gdkCurs);
+#endif
 }
 
 void Window::SetTitle(const char *s) {
@@ -2127,7 +2238,7 @@ void Window::SetTitle(const char *s) {
 PRectangle Window::GetMonitorRect(Point pt) {
 	gint x_offset, y_offset;
 
-	gdk_window_get_origin(PWidget(wid)->window, &x_offset, &y_offset);
+	gdk_window_get_origin(WindowFromWidget(PWidget(wid)), &x_offset, &y_offset);
 
 #if GTK_CHECK_VERSION(2,2,0)
 	// GTK+ 2.2+
@@ -2150,15 +2261,17 @@ PRectangle Window::GetMonitorRect(Point pt) {
 #endif
 }
 
+typedef std::map<int, RGBAImage*> ImageMap;
+
 struct ListImage {
-	const char *xpm_data;
+	const RGBAImage *rgba_data;
 	GdkPixbuf *pixbuf;
 };
 
 static void list_image_free(gpointer, gpointer value, gpointer) {
 	ListImage *list_image = (ListImage *) value;
 	if (list_image->pixbuf)
-		g_object_unref (list_image->pixbuf);
+		g_object_unref(list_image->pixbuf);
 	g_free(list_image);
 }
 
@@ -2179,7 +2292,7 @@ class ListBoxX : public ListBox {
 	WindowID scroller;
 	void *pixhash;
 	GtkCellRenderer* pixbuf_renderer;
-	XPMSet xset;
+	RGBAImageSet images;
 	int desiredVisibleRows;
 	unsigned int maxItemCharacters;
 	unsigned int aveCharWidth;
@@ -2211,7 +2324,9 @@ public:
 	virtual int GetSelection();
 	virtual int Find(const char *prefix);
 	virtual void GetValue(int n, char *value, int len);
+	void RegisterRGBA(int type, RGBAImage *image);
 	virtual void RegisterImage(int type, const char *xpm_data);
+	virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage);
 	virtual void ClearRegisteredImages();
 	virtual void SetDoubleClickAction(CallBackAction action, void *data) {
 		doubleClickAction = action;
@@ -2242,24 +2357,47 @@ static gboolean ButtonPress(GtkWidget *, GdkEventButton* ev, gpointer p) {
 /* Change the active color to the selected color so the listbox uses the color
 scheme that it would use if it had the focus. */
 static void StyleSet(GtkWidget *w, GtkStyle*, void*) {
-	GtkStyle* style;
 
 	g_return_if_fail(w != NULL);
 
 	/* Copy the selected color to active.  Note that the modify calls will cause
 	recursive calls to this function after the value is updated and w->style to
 	be set to a new object */
-	style = gtk_widget_get_style(w);
+
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkStyleContext *styleContext = gtk_widget_get_style_context(w);
+	if (styleContext == NULL)
+		return;
+
+	GdkRGBA colourForeSelected;
+	gtk_style_context_get_color(styleContext, GTK_STATE_FLAG_SELECTED, &colourForeSelected);
+	GdkRGBA colourForeActive;
+	gtk_style_context_get_color(styleContext, GTK_STATE_FLAG_ACTIVE, &colourForeActive);
+	if (!gdk_rgba_equal(&colourForeSelected, &colourForeActive))
+		gtk_widget_override_color(w, GTK_STATE_FLAG_ACTIVE, &colourForeSelected);
+
+	styleContext = gtk_widget_get_style_context(w);
+	if (styleContext == NULL)
+		return;
+
+	GdkRGBA colourBaseSelected;
+	gtk_style_context_get_background_color(styleContext, GTK_STATE_FLAG_SELECTED, &colourBaseSelected);
+	GdkRGBA colourBaseActive;
+	gtk_style_context_get_background_color(styleContext, GTK_STATE_FLAG_ACTIVE, &colourBaseActive);
+	if (!gdk_rgba_equal(&colourBaseSelected, &colourBaseActive))
+		gtk_widget_override_background_color(w, GTK_STATE_FLAG_ACTIVE, &colourBaseSelected);
+#else
+	GtkStyle *style = gtk_widget_get_style(w);
 	if (style == NULL)
 		return;
 	if (!gdk_color_equal(&style->base[GTK_STATE_SELECTED], &style->base[GTK_STATE_ACTIVE]))
 		gtk_widget_modify_base(w, GTK_STATE_ACTIVE, &style->base[GTK_STATE_SELECTED]);
-
 	style = gtk_widget_get_style(w);
 	if (style == NULL)
 		return;
 	if (!gdk_color_equal(&style->text[GTK_STATE_SELECTED], &style->text[GTK_STATE_ACTIVE]))
 		gtk_widget_modify_text(w, GTK_STATE_ACTIVE, &style->text[GTK_STATE_SELECTED]);
+#endif
 }
 
 void ListBoxX::Create(Window &, int, Point, int, bool) {
@@ -2324,7 +2462,11 @@ void ListBoxX::SetFont(Font &scint_font) {
 	// Only do for Pango font as there have been crashes for GDK fonts
 	if (Created() && PFont(scint_font)->pfd) {
 		// Current font is Pango font
+#if GTK_CHECK_VERSION(3,0,0)
+		gtk_widget_override_font(PWidget(list), PFont(scint_font)->pfd);
+#else
 		gtk_widget_modify_font(PWidget(list), PFont(scint_font)->pfd);
+#endif
 	}
 }
 
@@ -2360,14 +2502,27 @@ PRectangle ListBoxX::GetDesiredRect() {
 			gtk_tree_view_get_column(GTK_TREE_VIEW(list), 0);
 		gtk_tree_view_column_cell_get_size(column, NULL,
 			NULL, NULL, &row_width, &row_height);
+#if GTK_CHECK_VERSION(3,0,0)
+		GtkStyleContext *styleContextList = gtk_widget_get_style_context(PWidget(list));
+		GtkBorder padding;
+		gtk_style_context_get_padding(styleContextList, GTK_STATE_FLAG_NORMAL, &padding);
+		height = (rows * row_height
+		          + padding.top + padding.bottom
+		          + 2 * (gtk_container_get_border_width(GTK_CONTAINER(PWidget(list))) + 1));
+#else
 		int ythickness = PWidget(list)->style->ythickness;
 		height = (rows * row_height
 		          + 2 * (ythickness
 		                 + GTK_CONTAINER(PWidget(list))->border_width + 1));
+#endif
 		gtk_widget_set_size_request(GTK_WIDGET(PWidget(list)), -1, height);
 
 		// Get the size of the scroller because we set usize on the window
+#if GTK_CHECK_VERSION(3,0,0)
+		gtk_widget_get_preferred_size(GTK_WIDGET(scroller), NULL, &req);
+#else
 		gtk_widget_size_request(GTK_WIDGET(scroller), &req);
+#endif
 		rc.right = req.width;
 		rc.bottom = req.height;
 
@@ -2396,25 +2551,21 @@ void ListBoxX::Clear() {
 }
 
 static void init_pixmap(ListImage *list_image) {
-	const char *textForm = list_image->xpm_data;
-	const char * const * xpm_lineform = reinterpret_cast<const char * const *>(textForm);
-	const char **xpm_lineformfromtext = 0;
-	// The XPM data can be either in atext form as will be read from a file
-	// or in a line form (array of char  *) as will be used for images defined in code.
-	// Test for text form and convert to line form
-	if ((0 == memcmp(textForm, "/* X", 4)) && (0 == memcmp(textForm, "/* XPM */", 9))) {
-		// Test done is two parts to avoid possibility of overstepping the memory
-		// if memcmp implemented strangely. Must be 4 bytes at least at destination.
-		xpm_lineformfromtext = XPM::LinesFormFromTextForm(textForm);
-		xpm_lineform = xpm_lineformfromtext;
+	if (list_image->rgba_data) {
+		// Drop any existing pixmap/bitmap as data may have changed
+		if (list_image->pixbuf)
+			g_object_unref(list_image->pixbuf);
+		list_image->pixbuf =
+			gdk_pixbuf_new_from_data(list_image->rgba_data->Pixels(),
+                                                         GDK_COLORSPACE_RGB,
+                                                         TRUE,
+                                                         8,
+                                                         list_image->rgba_data->GetWidth(),
+                                                         list_image->rgba_data->GetHeight(),
+                                                         list_image->rgba_data->GetWidth() * 4,
+                                                         NULL,
+                                                         NULL);
 	}
-
-	// Drop any existing pixmap/bitmap as data may have changed
-	if (list_image->pixbuf)
-		g_object_unref(list_image->pixbuf);
-	list_image->pixbuf =
-		gdk_pixbuf_new_from_xpm_data((const gchar**)xpm_lineform);
-	delete []xpm_lineformfromtext;
 }
 
 #define SPACING 5
@@ -2481,11 +2632,17 @@ void ListBoxX::Select(int n) {
 
 		// Move the scrollbar to show the selection.
 		int total = Length();
+#if GTK_CHECK_VERSION(3,0,0)
+		GtkAdjustment *adj =
+			gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(list));
+		gfloat value = ((gfloat)n / total) * (gtk_adjustment_get_upper(adj) - gtk_adjustment_get_lower(adj))
+							+ gtk_adjustment_get_lower(adj) - gtk_adjustment_get_page_size(adj) / 2;
+#else
 		GtkAdjustment *adj =
 			gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(list));
 		gfloat value = ((gfloat)n / total) * (adj->upper - adj->lower)
 							+ adj->lower - adj->page_size / 2;
-
+#endif
 		// Get cell height
 		int row_width;
 		int row_height;
@@ -2504,8 +2661,13 @@ void ListBoxX::Select(int n) {
 		}
 		// Clamp it.
 		value = (value < 0)? 0 : value;
+#if GTK_CHECK_VERSION(3,0,0)
+		value = (value > (gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj)))?
+					(gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj)) : value;
+#else
 		value = (value > (adj->upper - adj->page_size))?
 					(adj->upper - adj->page_size) : value;
+#endif
 
 		// Set it.
 		gtk_adjustment_set_value(adj, value);
@@ -2571,13 +2733,8 @@ void ListBoxX::GetValue(int n, char *value, int len) {
 #pragma warning(disable: 4127)
 #endif
 
-void ListBoxX::RegisterImage(int type, const char *xpm_data) {
-	g_return_if_fail(xpm_data);
-
-	// Saved and use the saved copy so caller's copy can disappear.
-	xset.Add(type, xpm_data);
-	XPM *pxpm = xset.Get(type);
-	xpm_data = reinterpret_cast<const char *>(pxpm->InLinesForm());
+void ListBoxX::RegisterRGBA(int type, RGBAImage *image) {
+	images.Add(type, image);
 
 	if (!pixhash) {
 		pixhash = g_hash_table_new(g_direct_hash, g_direct_equal);
@@ -2589,17 +2746,27 @@ void ListBoxX::RegisterImage(int type, const char *xpm_data) {
 		if (list_image->pixbuf)
 			g_object_unref(list_image->pixbuf);
 		list_image->pixbuf = NULL;
-		list_image->xpm_data = xpm_data;
+		list_image->rgba_data = image;
 	} else {
 		list_image = g_new0(ListImage, 1);
-		list_image->xpm_data = xpm_data;
+		list_image->rgba_data = image;
 		g_hash_table_insert((GHashTable *) pixhash, GINT_TO_POINTER(type),
 			(gpointer) list_image);
 	}
 }
 
+void ListBoxX::RegisterImage(int type, const char *xpm_data) {
+	g_return_if_fail(xpm_data);
+	XPM xpmImage(xpm_data);
+	RegisterRGBA(type, new RGBAImage(xpmImage));
+}
+
+void ListBoxX::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) {
+	RegisterRGBA(type, new RGBAImage(width, height, pixelsImage));
+}
+
 void ListBoxX::ClearRegisteredImages() {
-	xset.Clear();
+	images.Clear();
 }
 
 void ListBoxX::SetList(const char *listText, char separator, char typesep) {
@@ -2663,7 +2830,11 @@ void Menu::Show(Point pt, Window &) {
 	GtkMenu *widget = reinterpret_cast<GtkMenu *>(mid);
 	gtk_widget_show_all(GTK_WIDGET(widget));
 	GtkRequisition requisition;
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_get_preferred_size(GTK_WIDGET(widget), NULL, &requisition);
+#else
 	gtk_widget_size_request(GTK_WIDGET(widget), &requisition);
+#endif
 	if ((pt.x + requisition.width) > screenWidth) {
 		pt.x = screenWidth - requisition.width;
 	}
@@ -2791,7 +2962,8 @@ bool Platform::IsDBCSLeadByte(int codePage, char ch) {
 		case 932:
 			// Shift_jis
 			return ((uch >= 0x81) && (uch <= 0x9F)) ||
-				((uch >= 0xE0) && (uch <= 0xEF));
+				((uch >= 0xE0) && (uch <= 0xFC));
+				// Lead bytes F0 to FC may be a Microsoft addition.
 		case 936:
 			// GBK
 			return (uch >= 0x81) && (uch <= 0xFE);
diff --git a/scintilla/gtk/ScintillaGTK.cxx b/scintilla/gtk/ScintillaGTK.cxx
index 80161815..6f1f92f5 100644
--- a/scintilla/gtk/ScintillaGTK.cxx
+++ b/scintilla/gtk/ScintillaGTK.cxx
@@ -13,6 +13,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
@@ -20,7 +21,7 @@
 #include "Platform.h"
 
 #if PLAT_GTK_WIN32
-#include "windows.h"
+#include <windows.h>
 #endif
 
 #include "ILexer.h"
@@ -52,8 +53,6 @@
 #include "ScintillaBase.h"
 #include "UniConversion.h"
 
-#include "gtk/gtksignal.h"
-#include "gtk/gtkmarshal.h"
 #include "scintilla-marshal.h"
 
 #ifdef SCI_LEXER
@@ -75,9 +74,24 @@
 #define IS_WIDGET_VISIBLE(w) (GTK_WIDGET_VISIBLE(w))
 #endif
 
-#if GTK_CHECK_VERSION(2,22,0)
 #define USE_CAIRO 1
+
+static GdkWindow *WindowFromWidget(GtkWidget *w) {
+#if GTK_CHECK_VERSION(3,0,0)
+	return gtk_widget_get_window(w);
+#else
+	return w->window;
 #endif
+}
+
+static GdkWindow *PWindow(const Window &w) {
+	GtkWidget *widget = reinterpret_cast<GtkWidget *>(w.GetID());
+#if GTK_CHECK_VERSION(3,0,0)
+	return gtk_widget_get_window(widget);
+#else
+	return widget->window;
+#endif
+}
 
 #ifdef _MSC_VER
 // Constant conditional expressions are because of GTK+ headers
@@ -103,8 +117,8 @@ class ScintillaGTK : public ScintillaBase {
 	Window wText;
 	Window scrollbarv;
 	Window scrollbarh;
-	GtkObject *adjustmentv;
-	GtkObject *adjustmenth;
+	GtkAdjustment *adjustmentv;
+	GtkAdjustment *adjustmenth;
 	int scrollBarWidth;
 	int scrollBarHeight;
 
@@ -144,7 +158,11 @@ class ScintillaGTK : public ScintillaBase {
 	gint lastWheelMouseDirection;
 	gint wheelMouseIntensity;
 
+#if GTK_CHECK_VERSION(3,0,0)
+	cairo_rectangle_list_t *rgnUpdate;
+#else
 	GdkRegion *rgnUpdate;
+#endif
 
 	// Private so ScintillaGTK objects can not be copied
 	ScintillaGTK(const ScintillaGTK &);
@@ -223,9 +241,20 @@ private:
 	gint FocusOutThis(GtkWidget *widget);
 	static gint FocusOut(GtkWidget *widget, GdkEventFocus *event);
 	static void SizeRequest(GtkWidget *widget, GtkRequisition *requisition);
+	static void GetPreferredWidth(GtkWidget *widget, gint *minimalWidth, gint *naturalWidth);
+	static void GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gint *naturalHeight);
 	static void SizeAllocate(GtkWidget *widget, GtkAllocation *allocation);
-	gint Expose(GtkWidget *widget, GdkEventExpose *ose);
-	static gint ExposeMain(GtkWidget *widget, GdkEventExpose *ose);
+#if GTK_CHECK_VERSION(3,0,0)
+	gboolean DrawTextThis(cairo_t *cr);
+	static gboolean DrawText(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis);
+	gboolean DrawThis(cairo_t *cr);
+	static gboolean DrawMain(GtkWidget *widget, cairo_t *cr);
+#else
+	gboolean ExposeTextThis(GtkWidget *widget, GdkEventExpose *ose);
+	static gboolean ExposeText(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis);
+	gboolean Expose(GtkWidget *widget, GdkEventExpose *ose);
+	static gboolean ExposeMain(GtkWidget *widget, GdkEventExpose *ose);
+#endif
 	static void Draw(GtkWidget *widget, GdkRectangle *area);
 	void ForAll(GtkCallback callback, gpointer callback_data);
 	static void MainForAll(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data);
@@ -240,14 +269,19 @@ private:
 	gboolean KeyThis(GdkEventKey *event);
 	static gboolean KeyPress(GtkWidget *widget, GdkEventKey *event);
 	static gboolean KeyRelease(GtkWidget *widget, GdkEventKey *event);
+#if GTK_CHECK_VERSION(3,0,0)
+	gboolean DrawPreeditThis(GtkWidget *widget, cairo_t *cr);
+	static gboolean DrawPreedit(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis);
+#else
 	gboolean ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose);
 	static gboolean ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis);
+#endif
 	void CommitThis(char *str);
 	static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis);
 	void PreeditChangedThis();
 	static void PreeditChanged(GtkIMContext *context, ScintillaGTK *sciThis);
-	static gint StyleSetText(GtkWidget *widget, GtkStyle *previous, void*);
-	static gint RealizeText(GtkWidget *widget, void*);
+	static void StyleSetText(GtkWidget *widget, GtkStyle *previous, void*);
+	static void RealizeText(GtkWidget *widget, void*);
 	static void Destroy(GObject *object);
 	static void SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data,
 	                              guint time);
@@ -267,17 +301,18 @@ private:
 	                             gint x, gint y, GtkSelectionData *selection_data, guint info, guint time);
 	static void DragDataGet(GtkWidget *widget, GdkDragContext *context,
 	                        GtkSelectionData *selection_data, guint info, guint time);
-	static gint TimeOut(ScintillaGTK *sciThis);
+	static gboolean TimeOut(ScintillaGTK *sciThis);
 	static gboolean IdleCallback(ScintillaGTK *sciThis);
 	static gboolean StyleIdle(ScintillaGTK *sciThis);
 	virtual void QueueStyling(int upTo);
 	static void PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis);
 
-	gint ExposeTextThis(GtkWidget *widget, GdkEventExpose *ose);
-	static gint ExposeText(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis);
-
-	static gint ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ct);
-	static gint PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis);
+#if GTK_CHECK_VERSION(3,0,0)
+	static gboolean DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip);
+#else
+	static gboolean ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ct);
+#endif
+	static gboolean PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis);
 
 	static sptr_t DirectFunction(ScintillaGTK *sciThis,
 	                             unsigned int iMessage, uptr_t wParam, sptr_t lParam);
@@ -370,6 +405,14 @@ ScintillaGTK::~ScintillaGTK() {
 	g_idle_remove_by_data(this);
 }
 
+static void UnRefCursor(GdkCursor *cursor) {
+#if GTK_CHECK_VERSION(3,0,0)
+	g_object_unref(cursor);
+#else
+	gdk_cursor_unref(cursor);
+#endif
+}
+
 void ScintillaGTK::RealizeThis(GtkWidget *widget) {
 	//Platform::DebugPrintf("ScintillaGTK::realize this\n");
 #if GTK_CHECK_VERSION(2,20,0)
@@ -379,28 +422,55 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) {
 #endif
 	GdkWindowAttr attrs;
 	attrs.window_type = GDK_WINDOW_CHILD;
-	attrs.x = widget->allocation.x;
-	attrs.y = widget->allocation.y;
-	attrs.width = widget->allocation.width;
-	attrs.height = widget->allocation.height;
+	GtkAllocation allocation;
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_get_allocation(widget, &allocation);
+#else
+	allocation = widget->allocation;
+#endif
+	attrs.x = allocation.x;
+	attrs.y = allocation.y;
+	attrs.width = allocation.width;
+	attrs.height = allocation.height;
 	attrs.wclass = GDK_INPUT_OUTPUT;
 	attrs.visual = gtk_widget_get_visual(widget);
+#if !GTK_CHECK_VERSION(3,0,0)
 	attrs.colormap = gtk_widget_get_colormap(widget);
+#endif
 	attrs.event_mask = gtk_widget_get_events(widget) | GDK_EXPOSURE_MASK;
 	GdkCursor *cursor = gdk_cursor_new(GDK_XTERM);
 	attrs.cursor = cursor;
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_set_window(widget, gdk_window_new(gtk_widget_get_parent_window(widget), &attrs,
+		GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_CURSOR));
+	gdk_window_set_user_data(gtk_widget_get_window(widget), widget);
+	GtkStyleContext *styleContext = gtk_widget_get_style_context(widget);
+	if (styleContext) {
+		GdkRGBA colourBackWidget;
+		gtk_style_context_get_background_color(styleContext, GTK_STATE_FLAG_NORMAL, &colourBackWidget);
+		gdk_window_set_background_rgba(gtk_widget_get_window(widget), &colourBackWidget);
+	}
+	gdk_window_show(gtk_widget_get_window(widget));
+	UnRefCursor(cursor);
+#else
 	widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), &attrs,
 		GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR);
 	gdk_window_set_user_data(widget->window, widget);
+	widget->style = gtk_style_attach(widget->style, widget->window);
 	gdk_window_set_background(widget->window, &widget->style->bg[GTK_STATE_NORMAL]);
 	gdk_window_show(widget->window);
-	gdk_cursor_unref(cursor);
-	widget->style = gtk_style_attach(widget->style, widget->window);
+	UnRefCursor(cursor);
+#endif
 	wPreedit = gtk_window_new(GTK_WINDOW_POPUP);
 	wPreeditDraw = gtk_drawing_area_new();
 	GtkWidget *predrw = PWidget(wPreeditDraw);	// No code inside the G_OBJECT macro
+#if GTK_CHECK_VERSION(3,0,0)
+	g_signal_connect(G_OBJECT(predrw), "draw",
+		G_CALLBACK(DrawPreedit), this);
+#else
 	g_signal_connect(G_OBJECT(predrw), "expose_event",
 		G_CALLBACK(ExposePreedit), this);
+#endif
 	gtk_container_add(GTK_CONTAINER(PWidget(wPreedit)), predrw);
 	gtk_widget_realize(PWidget(wPreedit));
 	gtk_widget_realize(predrw);
@@ -411,7 +481,7 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) {
 		G_CALLBACK(Commit), this);
 	g_signal_connect(G_OBJECT(im_context), "preedit_changed",
 		G_CALLBACK(PreeditChanged), this);
-	gtk_im_context_set_client_window(im_context, widget->window);
+	gtk_im_context_set_client_window(im_context, WindowFromWidget(widget));
 	GtkWidget *widtxt = PWidget(wText);	//	// No code inside the G_OBJECT macro
 	g_signal_connect_after(G_OBJECT(widtxt), "style_set",
 		G_CALLBACK(ScintillaGTK::StyleSetText), NULL);
@@ -422,20 +492,19 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) {
 	gtk_widget_realize(PWidget(scrollbarh));
 
 	cursor = gdk_cursor_new(GDK_XTERM);
-	gdk_window_set_cursor(PWidget(wText)->window, cursor);
-	gdk_cursor_unref(cursor);
+	gdk_window_set_cursor(PWindow(wText), cursor);
+	UnRefCursor(cursor);
 
 	cursor = gdk_cursor_new(GDK_LEFT_PTR);
-	gdk_window_set_cursor(PWidget(scrollbarv)->window, cursor);
-	gdk_cursor_unref(cursor);
+	gdk_window_set_cursor(PWindow(scrollbarv), cursor);
+	UnRefCursor(cursor);
 
 	cursor = gdk_cursor_new(GDK_LEFT_PTR);
-	gdk_window_set_cursor(PWidget(scrollbarh)->window, cursor);
-	gdk_cursor_unref(cursor);
+	gdk_window_set_cursor(PWindow(scrollbarh), cursor);
+	UnRefCursor(cursor);
 
 	gtk_selection_add_targets(widget, GDK_SELECTION_PRIMARY,
 	                          clipboardCopyTargets, nClipboardCopyTargets);
-
 #ifndef USE_GTK_CLIPBOARD
 	gtk_selection_add_targets(widget, atomClipboard,
 	                          clipboardPasteTargets, nClipboardPasteTargets);
@@ -449,14 +518,11 @@ void ScintillaGTK::Realize(GtkWidget *widget) {
 
 void ScintillaGTK::UnRealizeThis(GtkWidget *widget) {
 	try {
-
 		gtk_selection_clear_targets(widget, GDK_SELECTION_PRIMARY);
-
 #ifndef USE_GTK_CLIPBOARD
 		gtk_selection_clear_targets(widget, atomClipboard);
 #endif
 
-
 		if (IS_WIDGET_MAPPED(widget)) {
 			gtk_widget_unmap(widget);
 		}
@@ -509,7 +575,7 @@ void ScintillaGTK::MapThis() {
 		scrollbarv.SetCursor(Window::cursorArrow);
 		scrollbarh.SetCursor(Window::cursorArrow);
 		ChangeSize();
-		gdk_window_show(PWidget(wMain)->window);
+		gdk_window_show(PWindow(wMain));
 	} catch (...) {
 		errorStatus = SC_STATUS_FAILURE;
 	}
@@ -529,7 +595,7 @@ void ScintillaGTK::UnMapThis() {
 		GTK_WIDGET_UNSET_FLAGS(PWidget(wMain), GTK_MAPPED);
 #endif
 		DropGraphics();
-		gdk_window_hide(PWidget(wMain)->window);
+		gdk_window_hide(PWindow(wMain));
 		gtk_widget_unmap(PWidget(wText));
 		gtk_widget_unmap(PWidget(scrollbarh));
 		gtk_widget_unmap(PWidget(scrollbarv));
@@ -613,23 +679,44 @@ gint ScintillaGTK::FocusOut(GtkWidget *widget, GdkEventFocus * /*event*/) {
 
 void ScintillaGTK::SizeRequest(GtkWidget *widget, GtkRequisition *requisition) {
 	ScintillaGTK *sciThis = ScintillaFromWidget(widget);
-	requisition->width = 600;
-	requisition->height = gdk_screen_height();
+	requisition->width = 1;
+	requisition->height = 1;
 	GtkRequisition child_requisition;
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_get_preferred_size(PWidget(sciThis->scrollbarh), NULL, &child_requisition);
+	gtk_widget_get_preferred_size(PWidget(sciThis->scrollbarv), NULL, &child_requisition);
+#else
 	gtk_widget_size_request(PWidget(sciThis->scrollbarh), &child_requisition);
 	gtk_widget_size_request(PWidget(sciThis->scrollbarv), &child_requisition);
+#endif
+}
+
+void ScintillaGTK::GetPreferredWidth(GtkWidget *widget, gint *minimalWidth, gint *naturalWidth) {
+	GtkRequisition requisition;
+	SizeRequest(widget, &requisition);
+	*minimalWidth = *naturalWidth = requisition.width;
+}
+
+void ScintillaGTK::GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gint *naturalHeight) {
+	GtkRequisition requisition;
+	SizeRequest(widget, &requisition);
+	*minimalHeight = *naturalHeight = requisition.height;
 }
 
 void ScintillaGTK::SizeAllocate(GtkWidget *widget, GtkAllocation *allocation) {
 	ScintillaGTK *sciThis = ScintillaFromWidget(widget);
 	try {
+#if GTK_CHECK_VERSION(2,20,0)
+		gtk_widget_set_allocation(widget, allocation);
+#else
 		widget->allocation = *allocation;
+#endif
 		if (IS_WIDGET_REALIZED(widget))
-			gdk_window_move_resize(widget->window,
-			        widget->allocation.x,
-			        widget->allocation.y,
-			        widget->allocation.width,
-			        widget->allocation.height);
+			gdk_window_move_resize(WindowFromWidget(widget),
+			        allocation->x,
+			        allocation->y,
+			        allocation->width,
+			        allocation->height);
 
 		sciThis->Resize(allocation->width, allocation->height);
 
@@ -666,13 +753,18 @@ void ScintillaGTK::Initialise() {
 	gtk_widget_set_parent(PWidget(wText), PWidget(wMain));
 	GtkWidget *widtxt = PWidget(wText);	// No code inside the G_OBJECT macro
 	gtk_widget_show(widtxt);
+#if GTK_CHECK_VERSION(3,0,0)
+	g_signal_connect(G_OBJECT(widtxt), "draw",
+			   G_CALLBACK(ScintillaGTK::DrawText), this);
+#else
 	g_signal_connect(G_OBJECT(widtxt), "expose_event",
 			   G_CALLBACK(ScintillaGTK::ExposeText), this);
+#endif
 	gtk_widget_set_events(widtxt, GDK_EXPOSURE_MASK);
 	// Avoid background drawing flash
 	gtk_widget_set_double_buffered(widtxt, FALSE);
 	gtk_widget_set_size_request(widtxt, 100, 100);
-	adjustmentv = gtk_adjustment_new(0.0, 0.0, 201.0, 1.0, 20.0, 20.0);
+	adjustmentv = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 201.0, 1.0, 20.0, 20.0));
 	scrollbarv = gtk_vscrollbar_new(GTK_ADJUSTMENT(adjustmentv));
 #if GTK_CHECK_VERSION(2,20,0)
 	gtk_widget_set_can_focus(PWidget(scrollbarv), FALSE);
@@ -684,7 +776,7 @@ void ScintillaGTK::Initialise() {
 	gtk_widget_set_parent(PWidget(scrollbarv), PWidget(wMain));
 	gtk_widget_show(PWidget(scrollbarv));
 
-	adjustmenth = gtk_adjustment_new(0.0, 0.0, 101.0, 1.0, 20.0, 20.0);
+	adjustmenth = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 101.0, 1.0, 20.0, 20.0));
 	scrollbarh = gtk_hscrollbar_new(GTK_ADJUSTMENT(adjustmenth));
 #if GTK_CHECK_VERSION(2,20,0)
 	gtk_widget_set_can_focus(PWidget(scrollbarh), FALSE);
@@ -916,7 +1008,8 @@ void ScintillaGTK::SetTicking(bool on) {
 	if (timer.ticking != on) {
 		timer.ticking = on;
 		if (timer.ticking) {
-			timer.tickerID = reinterpret_cast<TickerID>(g_timeout_add(timer.tickSize, (GtkFunction)TimeOut, this));
+			timer.tickerID = reinterpret_cast<TickerID>(g_timeout_add(timer.tickSize,
+				reinterpret_cast<GSourceFunc>(TimeOut), this));
 		} else {
 			g_source_remove(GPOINTER_TO_UINT(timer.tickerID));
 		}
@@ -958,17 +1051,46 @@ bool ScintillaGTK::HaveMouseCapture() {
 	return capturedMouse;
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+
+// Is crcTest completely in crcContainer?
+static bool CRectContains(const cairo_rectangle_t &crcContainer, const cairo_rectangle_t &crcTest) {
+	return
+		(crcTest.x >= crcContainer.x) && ((crcTest.x + crcTest.width) <= (crcContainer.x + crcContainer.width)) &&
+		(crcTest.y >= crcContainer.y) && ((crcTest.y + crcTest.height) <= (crcContainer.y + crcContainer.height));
+}
+
+// Is crcTest completely in crcListContainer?
+// May incorrectly return false if complex shape
+static bool CRectListContains(const cairo_rectangle_list_t *crcListContainer, const cairo_rectangle_t &crcTest) {
+	for (int r=0; r<crcListContainer->num_rectangles; r++) {
+		if (CRectContains(crcListContainer->rectangles[r], crcTest))
+			return true;
+	}
+	return false;
+}
+
+#endif
+
 bool ScintillaGTK::PaintContains(PRectangle rc) {
+	// This allows optimization when a rectangle is completely in the update region.
+	// It is OK to return false when too difficult to determine as that just performs extra drawing
 	bool contains = true;
 	if (paintState == painting) {
 		if (!rcPaint.Contains(rc)) {
 			contains = false;
 		} else if (rgnUpdate) {
+#if GTK_CHECK_VERSION(3,0,0)
+			cairo_rectangle_t grc = {rc.left, rc.top,
+				rc.right - rc.left, rc.bottom - rc.top};
+			contains = CRectListContains(rgnUpdate, grc);
+#else
 			GdkRectangle grc = {rc.left, rc.top,
 				rc.right - rc.left, rc.bottom - rc.top};
 			if (gdk_region_rect_in(rgnUpdate, &grc) != GDK_OVERLAP_RECTANGLE_IN) {
 				contains = false;
 			}
+#endif
 		}
 	}
 	return contains;
@@ -999,13 +1121,21 @@ void ScintillaGTK::SyncPaint(PRectangle rc) {
 	rcPaint = rc;
 	PRectangle rcClient = GetClientRectangle();
 	paintingAllText = rcPaint.Contains(rcClient);
-	if ((PWidget(wText))->window) {
+	if (PWindow(wText)) {
 		Surface *sw = Surface::Allocate();
 		if (sw) {
-			sw->Init(PWidget(wText)->window, PWidget(wText));
+#if GTK_CHECK_VERSION(3,0,0)
+			cairo_t *cr = gdk_cairo_create(PWindow(wText));
+			sw->Init(cr, PWidget(wText));
+#else
+			sw->Init(PWindow(wText), PWidget(wText));
+#endif
 			Paint(sw, rc);
 			sw->Release();
 			delete sw;
+#if GTK_CHECK_VERSION(3,0,0)
+			cairo_destroy(cr);
+#endif
 		}
 	}
 	if (paintState == paintAbandoned) {
@@ -1021,8 +1151,8 @@ void ScintillaGTK::ScrollText(int linesToMove) {
 	//	rc.left, rc.top, rc.right, rc.bottom);
 	GtkWidget *wi = PWidget(wText);
 
-	gdk_window_scroll(wi->window, 0, -diff);
-	gdk_window_process_updates(wi->window, FALSE);
+	gdk_window_scroll(WindowFromWidget(wi), 0, -diff);
+	gdk_window_process_updates(WindowFromWidget(wi), FALSE);
 }
 
 void ScintillaGTK::SetVerticalScrollPos() {
@@ -1039,6 +1169,17 @@ bool ScintillaGTK::ModifyScrollBars(int nMax, int nPage) {
 	bool modified = false;
 	int pageScroll = LinesToScroll();
 
+#if GTK_CHECK_VERSION(3,0,0)
+	if (gtk_adjustment_get_upper(adjustmentv) != (nMax + 1) ||
+	        gtk_adjustment_get_page_size(adjustmentv) != nPage ||
+	        gtk_adjustment_get_page_increment(adjustmentv) != pageScroll) {
+		gtk_adjustment_set_upper(adjustmentv, nMax + 1);
+	        gtk_adjustment_set_page_size(adjustmentv, nPage);
+	        gtk_adjustment_set_page_increment(adjustmentv, pageScroll);
+		gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmentv));
+		modified = true;
+	}
+#else
 	if (GTK_ADJUSTMENT(adjustmentv)->upper != (nMax + 1) ||
 	        GTK_ADJUSTMENT(adjustmentv)->page_size != nPage ||
 	        GTK_ADJUSTMENT(adjustmentv)->page_increment != pageScroll) {
@@ -1048,6 +1189,7 @@ bool ScintillaGTK::ModifyScrollBars(int nMax, int nPage) {
 		gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmentv));
 		modified = true;
 	}
+#endif
 
 	PRectangle rcText = GetTextRectangle();
 	int horizEndPreferred = scrollWidth;
@@ -1056,6 +1198,19 @@ bool ScintillaGTK::ModifyScrollBars(int nMax, int nPage) {
 	unsigned int pageWidth = rcText.Width();
 	unsigned int pageIncrement = pageWidth / 3;
 	unsigned int charWidth = vs.styles[STYLE_DEFAULT].aveCharWidth;
+#if GTK_CHECK_VERSION(3,0,0)
+	if (gtk_adjustment_get_upper(adjustmenth) != horizEndPreferred ||
+	        gtk_adjustment_get_page_size(adjustmenth) != pageWidth ||
+	        gtk_adjustment_get_page_increment(adjustmenth) != pageIncrement ||
+	        gtk_adjustment_get_step_increment(adjustmenth) != charWidth) {
+		gtk_adjustment_set_upper(adjustmenth, horizEndPreferred);
+	        gtk_adjustment_set_page_size(adjustmenth, pageWidth);
+	        gtk_adjustment_set_page_increment(adjustmenth, pageIncrement);
+	        gtk_adjustment_set_step_increment(adjustmenth, charWidth);
+		gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmenth));
+		modified = true;
+	}
+#else
 	if (GTK_ADJUSTMENT(adjustmenth)->upper != horizEndPreferred ||
 	        GTK_ADJUSTMENT(adjustmenth)->page_size != pageWidth ||
 	        GTK_ADJUSTMENT(adjustmenth)->page_increment != pageIncrement ||
@@ -1067,6 +1222,7 @@ bool ScintillaGTK::ModifyScrollBars(int nMax, int nPage) {
 		gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmenth));
 		modified = true;
 	}
+#endif
 	return modified;
 }
 
@@ -1324,8 +1480,13 @@ void ScintillaGTK::CreateCallTipWindow(PRectangle rc) {
 		ct.wDraw = gtk_drawing_area_new();
 		GtkWidget *widcdrw = PWidget(ct.wDraw);	//	// No code inside the G_OBJECT macro
 		gtk_container_add(GTK_CONTAINER(PWidget(ct.wCallTip)), widcdrw);
+#if GTK_CHECK_VERSION(3,0,0)
+		g_signal_connect(G_OBJECT(widcdrw), "draw",
+				   G_CALLBACK(ScintillaGTK::DrawCT), &ct);
+#else
 		g_signal_connect(G_OBJECT(widcdrw), "expose_event",
 				   G_CALLBACK(ScintillaGTK::ExposeCT), &ct);
+#endif
 		g_signal_connect(G_OBJECT(widcdrw), "button_press_event",
 				   G_CALLBACK(ScintillaGTK::PressCT), static_cast<void *>(this));
 		gtk_widget_set_events(widcdrw,
@@ -1333,8 +1494,8 @@ void ScintillaGTK::CreateCallTipWindow(PRectangle rc) {
 	}
 	gtk_widget_set_size_request(PWidget(ct.wDraw), rc.Width(), rc.Height());
 	ct.wDraw.Show();
-	if (PWidget(ct.wCallTip)->window) {
-		gdk_window_resize(PWidget(ct.wCallTip)->window, rc.Width(), rc.Height());
+	if (PWindow(ct.wCallTip)) {
+		gdk_window_resize(PWindow(ct.wCallTip), rc.Width(), rc.Height());
 	}
 }
 
@@ -1356,8 +1517,8 @@ void ScintillaGTK::AddToPopUp(const char *label, int cmd, bool enabled) {
 
 bool ScintillaGTK::OwnPrimarySelection() {
 	return ((gdk_selection_owner_get(GDK_SELECTION_PRIMARY)
-		== GTK_WIDGET(PWidget(wMain))->window) &&
-			(GTK_WIDGET(PWidget(wMain))->window != NULL));
+		== PWindow(wMain)) &&
+			(PWindow(wMain) != NULL));
 }
 
 void ScintillaGTK::ClaimSelection() {
@@ -1378,11 +1539,23 @@ void ScintillaGTK::ClaimSelection() {
 	}
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+static const guchar *DataOfGSD(GtkSelectionData *sd) { return gtk_selection_data_get_data(sd); }
+static gint LengthOfGSD(GtkSelectionData *sd) { return gtk_selection_data_get_length(sd); }
+static GdkAtom TypeOfGSD(GtkSelectionData *sd) { return gtk_selection_data_get_data_type(sd); }
+static GdkAtom SelectionOfGSD(GtkSelectionData *sd) { return gtk_selection_data_get_selection(sd); }
+#else
+static const guchar *DataOfGSD(GtkSelectionData *sd) { return sd->data; }
+static gint LengthOfGSD(GtkSelectionData *sd) { return sd->length; }
+static GdkAtom TypeOfGSD(GtkSelectionData *sd) { return sd->type; }
+static GdkAtom SelectionOfGSD(GtkSelectionData *sd) { return sd->selection; }
+#endif
+
 // Detect rectangular text, convert line ends to current mode, convert from or to UTF-8
 void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText) {
-	char *data = reinterpret_cast<char *>(selectionData->data);
-	int len = selectionData->length;
-	GdkAtom selectionTypeData = selectionData->type;
+	const char *data = reinterpret_cast<const char *>(DataOfGSD(selectionData));
+	int len = LengthOfGSD(selectionData);
+	GdkAtom selectionTypeData = TypeOfGSD(selectionData);
 
 	// Return empty string if selection is not a string
 	if ((selectionTypeData != GDK_TARGET_STRING) && (selectionTypeData != atomUTF8)) {
@@ -1431,19 +1604,19 @@ void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, Selectio
 
 void ScintillaGTK::ReceivedSelection(GtkSelectionData *selection_data) {
 	try {
-		if ((selection_data->selection == atomClipboard) ||
-		        (selection_data->selection == GDK_SELECTION_PRIMARY)) {
-			if ((atomSought == atomUTF8) && (selection_data->length <= 0)) {
+		if ((SelectionOfGSD(selection_data) == atomClipboard) ||
+		        (SelectionOfGSD(selection_data) == GDK_SELECTION_PRIMARY)) {
+			if ((atomSought == atomUTF8) && (LengthOfGSD(selection_data) <= 0)) {
 				atomSought = atomString;
 				gtk_selection_convert(GTK_WIDGET(PWidget(wMain)),
-				        selection_data->selection, atomSought, GDK_CURRENT_TIME);
-			} else if ((selection_data->length > 0) &&
-			        ((selection_data->type == GDK_TARGET_STRING) || (selection_data->type == atomUTF8))) {
+				        SelectionOfGSD(selection_data), atomSought, GDK_CURRENT_TIME);
+			} else if ((LengthOfGSD(selection_data) > 0) &&
+			        ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8))) {
 				SelectionText selText;
 				GetGtkSelectionText(selection_data, selText);
 
 				UndoGroup ug(pdoc);
-				if (selection_data->selection != GDK_SELECTION_PRIMARY) {
+				if (SelectionOfGSD(selection_data) != GDK_SELECTION_PRIMARY) {
 					ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH);
 				}
 				SelectionPosition selStart = sel.IsRectangular() ?
@@ -1468,19 +1641,19 @@ void ScintillaGTK::ReceivedSelection(GtkSelectionData *selection_data) {
 
 void ScintillaGTK::ReceivedDrop(GtkSelectionData *selection_data) {
 	dragWasDropped = true;
-	if (selection_data->type == atomUriList || selection_data->type == atomDROPFILES_DND) {
-		char *ptr = new char[selection_data->length + 1];
-		ptr[selection_data->length] = '\0';
-		memcpy(ptr, selection_data->data, selection_data->length);
+	if (TypeOfGSD(selection_data) == atomUriList || TypeOfGSD(selection_data) == atomDROPFILES_DND) {
+		char *ptr = new char[LengthOfGSD(selection_data) + 1];
+		ptr[LengthOfGSD(selection_data)] = '\0';
+		memcpy(ptr, DataOfGSD(selection_data), LengthOfGSD(selection_data));
  		NotifyURIDropped(ptr);
 		delete []ptr;
-	} else if ((selection_data->type == GDK_TARGET_STRING) || (selection_data->type == atomUTF8)) {
-		if (selection_data->length > 0) {
+	} else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8)) {
+		if (TypeOfGSD(selection_data) > 0) {
 			SelectionText selText;
 			GetGtkSelectionText(selection_data, selText);
 			DropAt(posDrop, selText.s, false, selText.rectangular);
 		}
-	} else if (selection_data->length > 0) {
+	} else if (LengthOfGSD(selection_data) > 0) {
 		//~ fprintf(stderr, "ReceivedDrop other %p\n", static_cast<void *>(selection_data->type));
 	}
 	Redraw();
@@ -1588,8 +1761,16 @@ void ScintillaGTK::Resize(int width, int height) {
 	//printf("Resize %d %d\n", width, height);
 
 	// Not always needed, but some themes can have different sizes of scrollbars
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkRequisition requisition;
+	gtk_widget_get_requisition(PWidget(scrollbarv), &requisition);
+	scrollBarWidth = requisition.width;
+	gtk_widget_get_requisition(PWidget(scrollbarh), &requisition);
+	scrollBarHeight = requisition.height;
+#else
 	scrollBarWidth = GTK_WIDGET(PWidget(scrollbarv))->requisition.width;
 	scrollBarHeight = GTK_WIDGET(PWidget(scrollbarh))->requisition.height;
+#endif
 
 	// These allocations should never produce negative sizes as they would wrap around to huge
 	// unsigned numbers inside GTK+ causing warnings.
@@ -1603,7 +1784,7 @@ void ScintillaGTK::Resize(int width, int height) {
 		gtk_widget_show(GTK_WIDGET(PWidget(scrollbarh)));
 		alloc.x = 0;
 		alloc.y = height - scrollBarHeight;
-		alloc.width = Platform::Maximum(1, width - scrollBarWidth) + 1;
+		alloc.width = Platform::Maximum(1, width - scrollBarWidth);
 		alloc.height = horizontalScrollBarHeight;
 		gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarh)), &alloc);
 	} else {
@@ -1615,7 +1796,7 @@ void ScintillaGTK::Resize(int width, int height) {
 		alloc.x = width - scrollBarWidth;
 		alloc.y = 0;
 		alloc.width = scrollBarWidth;
-		alloc.height = Platform::Maximum(1, height - scrollBarHeight) + 1;
+		alloc.height = Platform::Maximum(1, height - scrollBarHeight);
 		if (!showSBHorizontal)
 			alloc.height += scrollBarWidth-1;
 		gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarv)), &alloc);
@@ -1637,10 +1818,16 @@ void ScintillaGTK::Resize(int width, int height) {
 	gtk_widget_size_allocate(GTK_WIDGET(PWidget(wText)), &alloc);
 }
 
-static void SetAdjustmentValue(GtkObject *object, int value) {
+static void SetAdjustmentValue(GtkAdjustment *object, int value) {
 	GtkAdjustment *adjustment = GTK_ADJUSTMENT(object);
+#if GTK_CHECK_VERSION(3,0,0)
+	int maxValue = static_cast<int>(
+		gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment));
+#else
 	int maxValue = static_cast<int>(
 		adjustment->upper - adjustment->page_size);
+#endif
+
 	if (value > maxValue)
 		value = maxValue;
 	if (value < 0)
@@ -1705,12 +1892,14 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) {
 			gtk_selection_convert(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_PRIMARY,
 			        atomSought, event->time);
 		} else if (event->button == 3) {
+			if (!PointInSelection(pt))
+				SetEmptySelection(PositionFromLocation(pt));
 			if (displayPopupMenu) {
 				// PopUp menu
 				// Convert to screen
 				int ox = 0;
 				int oy = 0;
-				gdk_window_get_origin(PWidget(wMain)->window, &ox, &oy);
+				gdk_window_get_origin(PWindow(wMain), &ox, &oy);
 				ContextMenu(Point(pt.x + ox, pt.y + oy));
 			} else {
 				return FALSE;
@@ -1735,7 +1924,7 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) {
 }
 
 gint ScintillaGTK::Press(GtkWidget *widget, GdkEventButton *event) {
-	if (event->window != widget->window)
+	if (event->window != WindowFromWidget(widget))
 		return FALSE;
 	ScintillaGTK *sciThis = ScintillaFromWidget(widget);
 	return sciThis->PressThis(event);
@@ -1753,7 +1942,7 @@ gint ScintillaGTK::MouseRelease(GtkWidget *widget, GdkEventButton *event) {
 			pt.y = int(event->y);
 			//Platform::DebugPrintf("Up %x %x %d %d %d\n",
 			//	sciThis,event->window,event->time, pt.x, pt.y);
-			if (event->window != PWidget(sciThis->wMain)->window)
+			if (event->window != PWindow(sciThis->wMain))
 				// If mouse released on scroll bar then the position is relative to the
 				// scrollbar, not the drawing window so just repeat the most recent point.
 				pt = sciThis->ptMouseLast;
@@ -1848,7 +2037,7 @@ gint ScintillaGTK::Motion(GtkWidget *widget, GdkEventMotion *event) {
 	ScintillaGTK *sciThis = ScintillaFromWidget(widget);
 	try {
 		//Platform::DebugPrintf("Motion %x %d\n",sciThis,event->time);
-		if (event->window != widget->window)
+		if (event->window != WindowFromWidget(widget))
 			return FALSE;
 		int x = 0;
 		int y = 0;
@@ -1873,6 +2062,75 @@ gint ScintillaGTK::Motion(GtkWidget *widget, GdkEventMotion *event) {
 // Map the keypad keys to their equivalent functions
 static int KeyTranslate(int keyIn) {
 	switch (keyIn) {
+#if GTK_CHECK_VERSION(3,0,0)
+	case GDK_KEY_ISO_Left_Tab:
+		return SCK_TAB;
+	case GDK_KEY_KP_Down:
+		return SCK_DOWN;
+	case GDK_KEY_KP_Up:
+		return SCK_UP;
+	case GDK_KEY_KP_Left:
+		return SCK_LEFT;
+	case GDK_KEY_KP_Right:
+		return SCK_RIGHT;
+	case GDK_KEY_KP_Home:
+		return SCK_HOME;
+	case GDK_KEY_KP_End:
+		return SCK_END;
+	case GDK_KEY_KP_Page_Up:
+		return SCK_PRIOR;
+	case GDK_KEY_KP_Page_Down:
+		return SCK_NEXT;
+	case GDK_KEY_KP_Delete:
+		return SCK_DELETE;
+	case GDK_KEY_KP_Insert:
+		return SCK_INSERT;
+	case GDK_KEY_KP_Enter:
+		return SCK_RETURN;
+
+	case GDK_KEY_Down:
+		return SCK_DOWN;
+	case GDK_KEY_Up:
+		return SCK_UP;
+	case GDK_KEY_Left:
+		return SCK_LEFT;
+	case GDK_KEY_Right:
+		return SCK_RIGHT;
+	case GDK_KEY_Home:
+		return SCK_HOME;
+	case GDK_KEY_End:
+		return SCK_END;
+	case GDK_KEY_Page_Up:
+		return SCK_PRIOR;
+	case GDK_KEY_Page_Down:
+		return SCK_NEXT;
+	case GDK_KEY_Delete:
+		return SCK_DELETE;
+	case GDK_KEY_Insert:
+		return SCK_INSERT;
+	case GDK_KEY_Escape:
+		return SCK_ESCAPE;
+	case GDK_KEY_BackSpace:
+		return SCK_BACK;
+	case GDK_KEY_Tab:
+		return SCK_TAB;
+	case GDK_KEY_Return:
+		return SCK_RETURN;
+	case GDK_KEY_KP_Add:
+		return SCK_ADD;
+	case GDK_KEY_KP_Subtract:
+		return SCK_SUBTRACT;
+	case GDK_KEY_KP_Divide:
+		return SCK_DIVIDE;
+	case GDK_KEY_Super_L:
+		return SCK_WIN;
+	case GDK_KEY_Super_R:
+		return SCK_RWIN;
+	case GDK_KEY_Menu:
+		return SCK_MENU;
+
+#else
+
 	case GDK_ISO_Left_Tab:
 		return SCK_TAB;
 	case GDK_KP_Down:
@@ -1938,6 +2196,7 @@ static int KeyTranslate(int keyIn) {
 		return SCK_RWIN;
 	case GDK_Menu:
 		return SCK_MENU;
+#endif
 	default:
 		return keyIn;
 	}
@@ -1958,9 +2217,13 @@ gboolean ScintillaGTK::KeyThis(GdkEventKey *event) {
 		bool ctrl = (event->state & GDK_CONTROL_MASK) != 0;
 		bool alt = (event->state & GDK_MOD1_MASK) != 0;
 		guint key = event->keyval;
-		if (ctrl && (key < 128))
+		if ((ctrl || alt) && (key < 128))
 			key = toupper(key);
+#if GTK_CHECK_VERSION(3,0,0)
+		else if (!ctrl && (key >= GDK_KEY_KP_Multiply && key <= GDK_KEY_KP_9))
+#else
 		else if (!ctrl && (key >= GDK_KP_Multiply && key <= GDK_KP_9))
+#endif
 			key &= 0x7F;
 		// Hack for keys over 256 and below command keys but makes Hungarian work.
 		// This will have to change for Unicode
@@ -1968,7 +2231,17 @@ gboolean ScintillaGTK::KeyThis(GdkEventKey *event) {
 			key = KeyTranslate(key);
 
 		bool consumed = false;
+#if !(PLAT_GTK_MACOSX)
 		bool added = KeyDown(key, shift, ctrl, alt, &consumed) != 0;
+#else
+		bool meta = ctrl;
+		ctrl = alt;
+		alt = (event->state & GDK_MOD5_MASK) != 0;
+		bool added = KeyDownWithModifiers(key, (shift ? SCI_SHIFT : 0) |
+		                                       (ctrl ? SCI_CTRL : 0) |
+		                                       (alt ? SCI_ALT : 0) |
+		                                       (meta ? SCI_META : 0), &consumed) != 0;
+#endif
 		if (!consumed)
 			consumed = added;
 		//fprintf(stderr, "SK-key: %d %x %x\n",event->keyval, event->state, consumed);
@@ -1990,11 +2263,45 @@ gboolean ScintillaGTK::KeyPress(GtkWidget *widget, GdkEventKey *event) {
 	return sciThis->KeyThis(event);
 }
 
-gboolean ScintillaGTK::KeyRelease(GtkWidget *, GdkEventKey * /*event*/) {
+gboolean ScintillaGTK::KeyRelease(GtkWidget *widget, GdkEventKey *event) {
 	//Platform::DebugPrintf("SC-keyrel: %d %x %3s\n",event->keyval, event->state, event->string);
+	ScintillaGTK *sciThis = ScintillaFromWidget(widget);
+	if (gtk_im_context_filter_keypress(sciThis->im_context, event)) {
+		return TRUE;
+	}
 	return FALSE;
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+
+gboolean ScintillaGTK::DrawPreeditThis(GtkWidget *widget, cairo_t *cr) {
+	try {
+		gchar *str;
+		gint cursor_pos;
+		PangoAttrList *attrs;
+
+		gtk_im_context_get_preedit_string(im_context, &str, &attrs, &cursor_pos);
+		PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), str);
+		pango_layout_set_attributes(layout, attrs);
+
+		cairo_move_to(cr, 0, 0);
+		pango_cairo_show_layout(cr, layout);
+
+		g_free(str);
+		pango_attr_list_unref(attrs);
+		g_object_unref(layout);
+	} catch (...) {
+		errorStatus = SC_STATUS_FAILURE;
+	}
+	return TRUE;
+}
+
+gboolean ScintillaGTK::DrawPreedit(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis) {
+	return sciThis->DrawPreeditThis(widget, cr);
+}
+
+#else
+
 gboolean ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose) {
 	try {
 		gchar *str;
@@ -2005,7 +2312,12 @@ gboolean ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose)
 		PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), str);
 		pango_layout_set_attributes(layout, attrs);
 
-#ifndef USE_CAIRO
+#ifdef USE_CAIRO
+		cairo_t *context = gdk_cairo_create(reinterpret_cast<GdkDrawable *>(WindowFromWidget(widget)));
+		cairo_move_to(context, 0, 0);
+		pango_cairo_show_layout(context, layout);
+		cairo_destroy(context);
+#else
 		GdkGC *gc = gdk_gc_new(widget->window);
 		GdkColor color[2] = {   {0, 0x0000, 0x0000, 0x0000},
 			{0, 0xffff, 0xffff, 0xffff}
@@ -2035,6 +2347,8 @@ gboolean ScintillaGTK::ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, Sci
 	return sciThis->ExposePreeditThis(widget, ose);
 }
 
+#endif
+
 void ScintillaGTK::CommitThis(char *utfVal) {
 	try {
 		//~ fprintf(stderr, "Commit '%s'\n", utfVal);
@@ -2086,7 +2400,7 @@ void ScintillaGTK::PreeditChangedThis() {
 			g_object_unref(layout);
 
 			gint x, y;
-			gdk_window_get_origin((PWidget(wText))->window, &x, &y);
+			gdk_window_get_origin(PWindow(wText), &x, &y);
 
 			Point pt = PointMainCaret();
 			if (pt.x < 0)
@@ -2112,16 +2426,19 @@ void ScintillaGTK::PreeditChanged(GtkIMContext *, ScintillaGTK *sciThis) {
 	sciThis->PreeditChangedThis();
 }
 
-gint ScintillaGTK::StyleSetText(GtkWidget *widget, GtkStyle *, void*) {
-	if (widget->window != NULL)
-		gdk_window_set_back_pixmap(widget->window, NULL, FALSE);
-	return FALSE;
+void ScintillaGTK::StyleSetText(GtkWidget *widget, GtkStyle *, void*) {
+	RealizeText(widget, NULL);
 }
 
-gint ScintillaGTK::RealizeText(GtkWidget *widget, void*) {
-	if (widget->window != NULL)
-		gdk_window_set_back_pixmap(widget->window, NULL, FALSE);
-	return FALSE;
+void ScintillaGTK::RealizeText(GtkWidget *widget, void*) {
+	// Set NULL background to avoid automatic clearing so Scintilla responsible for all drawing
+	if (WindowFromWidget(widget)) {
+#if GTK_CHECK_VERSION(3,0,0)
+		gdk_window_set_background_pattern(WindowFromWidget(widget), NULL);
+#else
+		gdk_window_set_back_pixmap(WindowFromWidget(widget), NULL, FALSE);
+#endif
+	}
 }
 
 void ScintillaGTK::Destroy(GObject *object) {
@@ -2141,7 +2458,80 @@ void ScintillaGTK::Destroy(GObject *object) {
 	}
 }
 
-gint ScintillaGTK::ExposeTextThis(GtkWidget * /*widget*/, GdkEventExpose *ose) {
+#if GTK_CHECK_VERSION(3,0,0)
+
+gboolean ScintillaGTK::DrawTextThis(cairo_t *cr) {
+	try {
+		paintState = painting;
+
+		rcPaint = GetClientRectangle();
+
+		PLATFORM_ASSERT(rgnUpdate == NULL);
+		rgnUpdate = cairo_copy_clip_rectangle_list(cr);
+		if (rgnUpdate && rgnUpdate->status != CAIRO_STATUS_SUCCESS) {
+			// If not successful then ignore
+			fprintf(stderr, "DrawTextThis failed to copy update region %d [%d]\n", rgnUpdate->status, rgnUpdate->num_rectangles);
+			cairo_rectangle_list_destroy(rgnUpdate);
+			rgnUpdate = 0;
+		}
+
+		double x1, y1, x2, y2;
+		cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+		rcPaint.left = x1;
+		rcPaint.top = y1;
+		rcPaint.right = x2;
+		rcPaint.bottom = y2;
+		PRectangle rcClient = GetClientRectangle();
+		paintingAllText = rcPaint.Contains(rcClient);
+		Surface *surfaceWindow = Surface::Allocate();
+		if (surfaceWindow) {
+			surfaceWindow->Init(cr, PWidget(wText));
+			Paint(surfaceWindow, rcPaint);
+			surfaceWindow->Release();
+			delete surfaceWindow;
+		}
+		if (paintState == paintAbandoned) {
+			// Painting area was insufficient to cover new styling or brace highlight positions
+			FullPaint();
+		}
+		paintState = notPainting;
+
+		if (rgnUpdate) {
+			cairo_rectangle_list_destroy(rgnUpdate);
+		}
+		rgnUpdate = 0;
+		paintState = notPainting;
+	} catch (...) {
+		errorStatus = SC_STATUS_FAILURE;
+	}
+
+	return FALSE;
+}
+
+gboolean ScintillaGTK::DrawText(GtkWidget *, cairo_t *cr, ScintillaGTK *sciThis) {
+	return sciThis->DrawTextThis(cr);
+}
+
+gboolean ScintillaGTK::DrawThis(cairo_t *cr) {
+	try {
+		gtk_container_propagate_draw(
+		    GTK_CONTAINER(PWidget(wMain)), PWidget(scrollbarh), cr);
+		gtk_container_propagate_draw(
+		    GTK_CONTAINER(PWidget(wMain)), PWidget(scrollbarv), cr);
+	} catch (...) {
+		errorStatus = SC_STATUS_FAILURE;
+	}
+	return FALSE;
+}
+
+gboolean ScintillaGTK::DrawMain(GtkWidget *widget, cairo_t *cr) {
+	ScintillaGTK *sciThis = ScintillaFromWidget(widget);
+	return sciThis->DrawThis(cr);
+}
+
+#else
+
+gboolean ScintillaGTK::ExposeTextThis(GtkWidget * /*widget*/, GdkEventExpose *ose) {
 	try {
 		paintState = painting;
 
@@ -2156,7 +2546,7 @@ gint ScintillaGTK::ExposeTextThis(GtkWidget * /*widget*/, GdkEventExpose *ose) {
 		paintingAllText = rcPaint.Contains(rcClient);
 		Surface *surfaceWindow = Surface::Allocate();
 		if (surfaceWindow) {
-			surfaceWindow->Init(PWidget(wText)->window, PWidget(wText));
+			surfaceWindow->Init(PWindow(wText), PWidget(wText));
 			Paint(surfaceWindow, rcPaint);
 			surfaceWindow->Release();
 			delete surfaceWindow;
@@ -2178,18 +2568,18 @@ gint ScintillaGTK::ExposeTextThis(GtkWidget * /*widget*/, GdkEventExpose *ose) {
 	return FALSE;
 }
 
-gint ScintillaGTK::ExposeText(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis) {
+gboolean ScintillaGTK::ExposeText(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis) {
 	return sciThis->ExposeTextThis(widget, ose);
 }
 
-gint ScintillaGTK::ExposeMain(GtkWidget *widget, GdkEventExpose *ose) {
+gboolean ScintillaGTK::ExposeMain(GtkWidget *widget, GdkEventExpose *ose) {
 	ScintillaGTK *sciThis = ScintillaFromWidget(widget);
 	//Platform::DebugPrintf("Expose Main %0d,%0d %0d,%0d\n",
 	//ose->area.x, ose->area.y, ose->area.width, ose->area.height);
 	return sciThis->Expose(widget, ose);
 }
 
-gint ScintillaGTK::Expose(GtkWidget *, GdkEventExpose *ose) {
+gboolean ScintillaGTK::Expose(GtkWidget *, GdkEventExpose *ose) {
 	try {
 		//fprintf(stderr, "Expose %0d,%0d %0d,%0d\n",
 		//ose->area.x, ose->area.y, ose->area.width, ose->area.height);
@@ -2206,9 +2596,15 @@ gint ScintillaGTK::Expose(GtkWidget *, GdkEventExpose *ose) {
 	return FALSE;
 }
 
+#endif
+
 void ScintillaGTK::ScrollSignal(GtkAdjustment *adj, ScintillaGTK *sciThis) {
 	try {
+#if GTK_CHECK_VERSION(3,0,0)
+		sciThis->ScrollTo(static_cast<int>(gtk_adjustment_get_value(adj)), false);
+#else
 		sciThis->ScrollTo(static_cast<int>(adj->value), false);
+#endif
 	} catch (...) {
 		sciThis->errorStatus = SC_STATUS_FAILURE;
 	}
@@ -2216,7 +2612,11 @@ void ScintillaGTK::ScrollSignal(GtkAdjustment *adj, ScintillaGTK *sciThis) {
 
 void ScintillaGTK::ScrollHSignal(GtkAdjustment *adj, ScintillaGTK *sciThis) {
 	try {
+#if GTK_CHECK_VERSION(3,0,0)
+		sciThis->HorizontalScrollTo(static_cast<int>(gtk_adjustment_get_value(adj) * 2));
+#else
 		sciThis->HorizontalScrollTo(static_cast<int>(adj->value * 2));
+#endif
 	} catch (...) {
 		sciThis->errorStatus = SC_STATUS_FAILURE;
 	}
@@ -2234,7 +2634,7 @@ void ScintillaGTK::SelectionGet(GtkWidget *widget,
 	ScintillaGTK *sciThis = ScintillaFromWidget(widget);
 	try {
 		//Platform::DebugPrintf("Selection get\n");
-		if (selection_data->selection == GDK_SELECTION_PRIMARY) {
+		if (SelectionOfGSD(selection_data) == GDK_SELECTION_PRIMARY) {
 			if (sciThis->primary.s == NULL) {
 				sciThis->CopySelectionRange(&sciThis->primary);
 			}
@@ -2269,13 +2669,19 @@ gboolean ScintillaGTK::DragMotionThis(GdkDragContext *context,
 	try {
 		Point npt(x, y);
 		SetDragPosition(SPositionFromLocation(npt, false, false, UserVirtualSpace()));
+#if GTK_CHECK_VERSION(3,0,0)
+		GdkDragAction preferredAction = gdk_drag_context_get_suggested_action(context);
+		GdkDragAction actions = gdk_drag_context_get_actions(context);
+#else
 		GdkDragAction preferredAction = context->suggested_action;
+		GdkDragAction actions = context->actions;
+#endif
 		SelectionPosition pos = SPositionFromLocation(npt);
 		if ((inDragDrop == ddDragging) && (PositionInSelection(pos.Position()))) {
 			// Avoid dragging selection onto itself as that produces a move
 			// with no real effect but which creates undo actions.
 			preferredAction = static_cast<GdkDragAction>(0);
-		} else if (context->actions == static_cast<GdkDragAction>
+		} else if (actions == static_cast<GdkDragAction>
 		        (GDK_ACTION_COPY | GDK_ACTION_MOVE)) {
 			preferredAction = GDK_ACTION_MOVE;
 		}
@@ -2347,7 +2753,12 @@ void ScintillaGTK::DragDataGet(GtkWidget *widget, GdkDragContext *context,
 		if (!sciThis->sel.Empty()) {
 			sciThis->GetSelection(selection_data, info, &sciThis->drag);
 		}
-		if (context->action == GDK_ACTION_MOVE) {
+#if GTK_CHECK_VERSION(3,0,0)
+		GdkDragAction action = gdk_drag_context_get_selected_action(context);
+#else
+		GdkDragAction action = context->action;
+#endif
+		if (action == GDK_ACTION_MOVE) {
 			for (size_t r=0; r<sciThis->sel.Count(); r++) {
 				if (sciThis->posDrop >= sciThis->sel.Range(r).Start()) {
 					if (sciThis->posDrop > sciThis->sel.Range(r).End()) {
@@ -2410,9 +2821,9 @@ void ScintillaGTK::PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis) {
 	}
 }
 
-gint ScintillaGTK::PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis) {
+gboolean ScintillaGTK::PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis) {
 	try {
-		if (event->window != widget->window)
+		if (event->window != WindowFromWidget(widget))
 			return FALSE;
 		if (event->type != GDK_BUTTON_PRESS)
 			return FALSE;
@@ -2426,11 +2837,13 @@ gint ScintillaGTK::PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGT
 	return TRUE;
 }
 
-gint ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, CallTip *ctip) {
+#if GTK_CHECK_VERSION(3,0,0)
+
+gboolean ScintillaGTK::DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip) {
 	try {
 		Surface *surfaceWindow = Surface::Allocate();
 		if (surfaceWindow) {
-			surfaceWindow->Init(widget->window, widget);
+			surfaceWindow->Init(cr, widget);
 			surfaceWindow->SetUnicodeMode(SC_CP_UTF8 == ctip->codePage);
 			surfaceWindow->SetDBCSMode(ctip->codePage);
 			ctip->PaintCT(surfaceWindow);
@@ -2443,6 +2856,27 @@ gint ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, CallTip
 	return TRUE;
 }
 
+#else
+
+gboolean ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, CallTip *ctip) {
+	try {
+		Surface *surfaceWindow = Surface::Allocate();
+		if (surfaceWindow) {
+			surfaceWindow->Init(WindowFromWidget(widget), widget);
+			surfaceWindow->SetUnicodeMode(SC_CP_UTF8 == ctip->codePage);
+			surfaceWindow->SetDBCSMode(ctip->codePage);
+			ctip->PaintCT(surfaceWindow);
+			surfaceWindow->Release();
+			delete surfaceWindow;
+		}
+	} catch (...) {
+		// No pointer back to Scintilla to save status
+	}
+	return TRUE;
+}
+
+#endif
+
 sptr_t ScintillaGTK::DirectFunction(
     ScintillaGTK *sciThis, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	return sciThis->WndProc(iMessage, wParam, lParam);
@@ -2505,9 +2939,18 @@ void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_
 	// in Initialise() may require coordinate translation?)
 
 	object_class->finalize = Destroy;
+#if GTK_CHECK_VERSION(3,0,0)
+	widget_class->get_preferred_width = GetPreferredWidth;
+	widget_class->get_preferred_height = GetPreferredHeight;
+#else
 	widget_class->size_request = SizeRequest;
+#endif
 	widget_class->size_allocate = SizeAllocate;
+#if GTK_CHECK_VERSION(3,0,0)
+	widget_class->draw = DrawMain;
+#else
 	widget_class->expose_event = ExposeMain;
+#endif
 	widget_class->motion_notify_event = Motion;
 	widget_class->button_press_event = Press;
 	widget_class->button_release_event = MouseRelease;
diff --git a/scintilla/include/Platform.h b/scintilla/include/Platform.h
index b70ffc3c..b0f3de0d 100644
--- a/scintilla/include/Platform.h
+++ b/scintilla/include/Platform.h
@@ -16,6 +16,7 @@
 
 #define PLAT_GTK 0
 #define PLAT_GTK_WIN32 0
+#define PLAT_GTK_MACOSX 0
 #define PLAT_MACOSX 0
 #define PLAT_WIN 0
 #define PLAT_WX  0
@@ -38,6 +39,11 @@
 #define PLAT_GTK_WIN32 1
 #endif
 
+#if defined(__APPLE__)
+#undef PLAT_GTK_MACOSX
+#define PLAT_GTK_MACOSX 1
+#endif
+
 #elif defined(__APPLE__)
 
 #undef PLAT_MACOSX
@@ -301,8 +307,11 @@ public:
 	FontID GetID() { return fid; }
 	// Alias another font - caller guarantees not to Release
 	void SetID(FontID fid_) { fid = fid_; }
+#if PLAT_WX
+	void SetAscent(int ascent_) { ascent = ascent_; }
+#endif
 	friend class Surface;
-        friend class SurfaceImpl;
+	friend class SurfaceImpl;
 };
 
 /**
@@ -336,6 +345,7 @@ public:
 	virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
 	virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
 		ColourAllocated outline, int alphaOutline, int flags)=0;
+	virtual void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) = 0;
 	virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
 	virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource)=0;
 
@@ -411,8 +421,8 @@ public:
 	void SetTitle(const char *s);
 	PRectangle GetMonitorRect(Point pt);
 #if PLAT_MACOSX
-	void SetWindow(void *ref) { windowRef = ref; };
-	void SetControl(void *_control) { control = _control; };
+	void SetWindow(void *ref) { windowRef = ref; }
+	void SetControl(void *_control) { control = _control; }
 #endif
 private:
 	Cursor cursorLast;
@@ -443,6 +453,7 @@ public:
 	virtual int Find(const char *prefix)=0;
 	virtual void GetValue(int n, char *value, int len)=0;
 	virtual void RegisterImage(int type, const char *xpm_data)=0;
+	virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) = 0;
 	virtual void ClearRegisteredImages()=0;
 	virtual void SetDoubleClickAction(CallBackAction, void *)=0;
 	virtual void SetList(const char* list, char separator, char typesep)=0;
diff --git a/scintilla/include/SciLexer.h b/scintilla/include/SciLexer.h
index 1d5b69ed..e8805f2d 100644
--- a/scintilla/include/SciLexer.h
+++ b/scintilla/include/SciLexer.h
@@ -344,6 +344,16 @@
 #define SCE_PL_SUB_PROTOTYPE 40
 #define SCE_PL_FORMAT_IDENT 41
 #define SCE_PL_FORMAT 42
+#define SCE_PL_STRING_VAR 43
+#define SCE_PL_XLAT 44
+#define SCE_PL_REGEX_VAR 54
+#define SCE_PL_REGSUBST_VAR 55
+#define SCE_PL_BACKTICKS_VAR 57
+#define SCE_PL_HERE_QQ_VAR 61
+#define SCE_PL_HERE_QX_VAR 62
+#define SCE_PL_STRING_QQ_VAR 64
+#define SCE_PL_STRING_QX_VAR 65
+#define SCE_PL_STRING_QR_VAR 66
 #define SCE_RB_DEFAULT 0
 #define SCE_RB_ERROR 1
 #define SCE_RB_COMMENTLINE 2
@@ -408,6 +418,14 @@
 #define SCE_L_TAG 2
 #define SCE_L_MATH 3
 #define SCE_L_COMMENT 4
+#define SCE_L_TAG2 5
+#define SCE_L_MATH2 6
+#define SCE_L_COMMENT2 7
+#define SCE_L_VERBATIM 8
+#define SCE_L_SHORTCMD 9
+#define SCE_L_SPECIAL 10
+#define SCE_L_CMDOPT 11
+#define SCE_L_ERROR 12
 #define SCE_LUA_DEFAULT 0
 #define SCE_LUA_COMMENT 1
 #define SCE_LUA_COMMENTLINE 2
@@ -428,6 +446,7 @@
 #define SCE_LUA_WORD6 17
 #define SCE_LUA_WORD7 18
 #define SCE_LUA_WORD8 19
+#define SCE_LUA_LABEL 20
 #define SCE_ERR_DEFAULT 0
 #define SCE_ERR_PYTHON 1
 #define SCE_ERR_GCC 2
diff --git a/scintilla/include/Scintilla.h b/scintilla/include/Scintilla.h
index ed110201..34e4f793 100644
--- a/scintilla/include/Scintilla.h
+++ b/scintilla/include/Scintilla.h
@@ -124,6 +124,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SC_MARK_LEFTRECT 27
 #define SC_MARK_AVAILABLE 28
 #define SC_MARK_UNDERLINE 29
+#define SC_MARK_RGBAIMAGE 30
 #define SC_MARK_CHARACTER 10000
 #define SC_MARKNUM_FOLDEREND 25
 #define SC_MARKNUM_FOLDEROPENMID 26
@@ -136,6 +137,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_MARKERDEFINE 2040
 #define SCI_MARKERSETFORE 2041
 #define SCI_MARKERSETBACK 2042
+#define SCI_MARKERSETBACKSELECTED 2292
+#define SCI_MARKERENABLEHIGHLIGHT 2293
 #define SCI_MARKERADD 2043
 #define SCI_MARKERDELETE 2044
 #define SCI_MARKERDELETEALL 2045
@@ -245,6 +248,11 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define INDIC_HIDDEN 5
 #define INDIC_BOX 6
 #define INDIC_ROUNDBOX 7
+#define INDIC_STRAIGHTBOX 8
+#define INDIC_DASH 9
+#define INDIC_DOTS 10
+#define INDIC_SQUIGGLELOW 11
+#define INDIC_DOTBOX 12
 #define INDIC_MAX 31
 #define INDIC_CONTAINER 8
 #define INDIC0_MASK 0x20
@@ -328,6 +336,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_GETSELECTIONSTART 2143
 #define SCI_SETSELECTIONEND 2144
 #define SCI_GETSELECTIONEND 2145
+#define SCI_SETEMPTYSELECTION 2556
 #define SCI_SETPRINTMAGNIFICATION 2146
 #define SCI_GETPRINTMAGNIFICATION 2147
 #define SC_PRINT_NORMAL 0
@@ -554,7 +563,9 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_MOVECARETINSIDEVIEW 2401
 #define SCI_LINELENGTH 2350
 #define SCI_BRACEHIGHLIGHT 2351
+#define SCI_BRACEHIGHLIGHTINDICATOR 2498
 #define SCI_BRACEBADLIGHT 2352
+#define SCI_BRACEBADLIGHTINDICATOR 2499
 #define SCI_BRACEMATCH 2353
 #define SCI_GETVIEWEOL 2355
 #define SCI_SETVIEWEOL 2356
@@ -707,6 +718,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_GETKEYSUNICODE 2522
 #define SCI_INDICSETALPHA 2523
 #define SCI_INDICGETALPHA 2524
+#define SCI_INDICSETOUTLINEALPHA 2558
+#define SCI_INDICGETOUTLINEALPHA 2559
 #define SCI_SETEXTRAASCENT 2525
 #define SCI_GETEXTRAASCENT 2526
 #define SCI_SETEXTRADESCENT 2527
@@ -721,6 +734,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_MARGINTEXTCLEARALL 2536
 #define SCI_MARGINSETSTYLEOFFSET 2537
 #define SCI_MARGINGETSTYLEOFFSET 2538
+#define SC_MARGINOPTION_NONE 0
+#define SC_MARGINOPTION_SUBLINESELECT 1
+#define SCI_SETMARGINOPTIONS 2539
+#define SCI_GETMARGINOPTIONS 2557
 #define SCI_ANNOTATIONSETTEXT 2540
 #define SCI_ANNOTATIONGETTEXT 2541
 #define SCI_ANNOTATIONSETSTYLE 2542
@@ -792,6 +809,16 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_CHANGELEXERSTATE 2617
 #define SCI_CONTRACTEDFOLDNEXT 2618
 #define SCI_VERTICALCENTRECARET 2619
+#define SCI_MOVESELECTEDLINESUP 2620
+#define SCI_MOVESELECTEDLINESDOWN 2621
+#define SCI_SETIDENTIFIER 2622
+#define SCI_GETIDENTIFIER 2623
+#define SCI_RGBAIMAGESETWIDTH 2624
+#define SCI_RGBAIMAGESETHEIGHT 2625
+#define SCI_MARKERDEFINERGBAIMAGE 2626
+#define SCI_REGISTERRGBAIMAGE 2627
+#define SCI_SCROLLTOSTART 2628
+#define SCI_SCROLLTOEND 2629
 #define SCI_STARTRECORD 3001
 #define SCI_STOPRECORD 3002
 #define SCI_SETLEXER 4001
@@ -868,6 +895,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCMOD_CTRL 2
 #define SCMOD_ALT 4
 #define SCMOD_SUPER 8
+#define SCMOD_META 16
 #define SCN_STYLENEEDED 2000
 #define SCN_CHARADDED 2001
 #define SCN_SAVEPOINTREACHED 2002
@@ -960,11 +988,22 @@ struct Sci_NotifyHeader {
 
 struct SCNotification {
 	struct Sci_NotifyHeader nmhdr;
-	int position;	/* SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND */
+	int position;
+	/* SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK, */
+	/* SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, SCN_CALLTIPCLICK, */
+	/* SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, SCN_HOTSPOTRELEASECLICK, */
+	/* SCN_INDICATORCLICK, SCN_INDICATORRELEASE, */
+	/* SCN_USERLISTSELECTION, SCN_AUTOCSELECTION */
+
 	int ch;		/* SCN_CHARADDED, SCN_KEY */
-	int modifiers;	/* SCN_KEY */
+	int modifiers;
+	/* SCN_KEY, SCN_DOUBLECLICK, SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, */
+	/* SCN_HOTSPOTRELEASECLICK, SCN_INDICATORCLICK, SCN_INDICATORRELEASE, */
+
 	int modificationType;	/* SCN_MODIFIED */
-	const char *text;	/* SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION */
+	const char *text;
+	/* SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION, SCN_URIDROPPED */
+
 	int length;		/* SCN_MODIFIED */
 	int linesAdded;	/* SCN_MODIFIED */
 	int message;	/* SCN_MACRORECORD */
@@ -978,7 +1017,7 @@ struct SCNotification {
 	int x;			/* SCN_DWELLSTART, SCN_DWELLEND */
 	int y;		/* SCN_DWELLSTART, SCN_DWELLEND */
 	int token;		/* SCN_MODIFIED with SC_MOD_CONTAINER */
-	int annotationLinesAdded;	/* SC_MOD_CHANGEANNOTATION */
+	int annotationLinesAdded;	/* SCN_MODIFIED with SC_MOD_CHANGEANNOTATION */
 	int updated;	/* SCN_UPDATEUI */
 };
 
diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index 0d3644d6..9530f429 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -268,6 +268,7 @@ val SC_MARK_FULLRECT=26
 val SC_MARK_LEFTRECT=27
 val SC_MARK_AVAILABLE=28
 val SC_MARK_UNDERLINE=29
+val SC_MARK_RGBAIMAGE=30
 
 val SC_MARK_CHARACTER=10000
 
@@ -292,6 +293,12 @@ fun void MarkerSetFore=2041(int markerNumber, colour fore)
 # Set the background colour used for a particular marker number.
 fun void MarkerSetBack=2042(int markerNumber, colour back)
 
+# Set the background colour used for a particular marker number when its folding block is selected.
+fun void MarkerSetBackSelected=2292(int markerNumber, colour back)
+
+# Enable/disable highlight for current folding bloc (smallest one that contains the caret)
+fun void MarkerEnableHighlight=2293(bool enabled,)
+
 # Add a marker to a line, returning an ID which can be used to find or delete the marker.
 fun int MarkerAdd=2043(int line, int markerNumber)
 
@@ -544,6 +551,11 @@ val INDIC_STRIKE=4
 val INDIC_HIDDEN=5
 val INDIC_BOX=6
 val INDIC_ROUNDBOX=7
+val INDIC_STRAIGHTBOX=8
+val INDIC_DASH=9
+val INDIC_DOTS=10
+val INDIC_SQUIGGLELOW=11
+val INDIC_DOTBOX=12
 val INDIC_MAX=31
 val INDIC_CONTAINER=8
 val INDIC0_MASK=0x20
@@ -791,6 +803,9 @@ set void SetSelectionEnd=2144(position pos,)
 # Returns the position at the end of the selection.
 get position GetSelectionEnd=2145(,)
 
+# Set caret to a position, while removing any existing selection.
+fun void SetEmptySelection=2556(position pos,)
+
 # Sets the print magnification added to the point size of each style for printing.
 set void SetPrintMagnification=2146(int magnification,)
 
@@ -1440,9 +1455,15 @@ fun int LineLength=2350(int line,)
 # Highlight the characters at two positions.
 fun void BraceHighlight=2351(position pos1, position pos2)
 
+# Use specified indicator to highlight matching braces instead of changing their style.
+fun void BraceHighlightIndicator=2498(bool useBraceHighlightIndicator, int indicator)
+
 # Highlight the character at a position indicating there is no matching brace.
 fun void BraceBadLight=2352(position pos,)
 
+# Use specified indicator to highlight non matching brace instead of changing its style.
+fun void BraceBadLightIndicator=2499(bool useBraceBadLightIndicator, int indicator)
+
 # Find the position of a matching brace or INVALID_POSITION if no match.
 fun position BraceMatch=2353(position pos,)
 
@@ -1884,6 +1905,12 @@ set void IndicSetAlpha=2523(int indicator, int alpha)
 # Get the alpha fill colour of the given indicator.
 get int IndicGetAlpha=2524(int indicator,)
 
+# Set the alpha outline colour of the given indicator.
+set void IndicSetOutlineAlpha=2558(int indicator, int alpha)
+
+# Get the alpha outline colour of the given indicator.
+get int IndicGetOutlineAlpha=2559(int indicator,)
+
 # Set extra ascent for each line
 set void SetExtraAscent=2525(int extraAscent,)
 
@@ -1926,6 +1953,16 @@ set void MarginSetStyleOffset=2537(int style,)
 # Get the start of the range of style numbers used for margin text
 get int MarginGetStyleOffset=2538(,)
 
+enu MarginOption=SC_MARGINOPTION_
+val SC_MARGINOPTION_NONE=0
+val SC_MARGINOPTION_SUBLINESELECT=1
+
+# Set the margin options.
+set void SetMarginOptions=2539(int marginOptions,)
+
+# Get the margin options.
+get int GetMarginOptions=2557(,)
+
 # Set the annotation text for a line
 set void AnnotationSetText=2540(int line, string text)
 
@@ -2106,6 +2143,38 @@ fun int ContractedFoldNext=2618(int lineStart,)
 # Centre current line in window.
 fun void VerticalCentreCaret=2619(,)
 
+# Move the selected lines up one line, shifting the line above after the selection
+fun void MoveSelectedLinesUp=2620(,)
+
+# Move the selected lines down one line, shifting the line below before the selection
+fun void MoveSelectedLinesDown=2621(,)
+
+# Set the identifier reported as idFrom in notification messages.
+set void SetIdentifier=2622(int identifier,)
+
+# Get the identifier.
+get int GetIdentifier=2623(,)
+
+# Set the width for future RGBA image data.
+set void RGBAImageSetWidth=2624(int width,)
+
+# Set the height for future RGBA image data.
+set void RGBAImageSetHeight=2625(int height,)
+
+# Define a marker from RGBA data.
+# It has the width and height from RGBAImageSetWidth/Height
+fun void MarkerDefineRGBAImage=2626(int markerNumber, string pixels)
+
+# Register an RGBA image for use in autocompletion lists.
+# It has the width and height from RGBAImageSetWidth/Height
+fun void RegisterRGBAImage=2627(int type, string pixels)
+
+# Scroll to start of document.
+fun void ScrollToStart=2628(,)
+
+# Scroll to end of document.
+fun void ScrollToEnd=2629(,)
+
 # Start notifying the container of all key presses and commands.
 fun void StartRecord=3001(,)
 
@@ -2247,6 +2316,7 @@ val SCMOD_SHIFT=1
 val SCMOD_CTRL=2
 val SCMOD_ALT=4
 val SCMOD_SUPER=8
+val SCMOD_META=16
 
 ################################################
 # For SciLexer.h
@@ -2613,6 +2683,16 @@ val SCE_PL_POD_VERB=31
 val SCE_PL_SUB_PROTOTYPE=40
 val SCE_PL_FORMAT_IDENT=41
 val SCE_PL_FORMAT=42
+val SCE_PL_STRING_VAR=43
+val SCE_PL_XLAT=44
+val SCE_PL_REGEX_VAR=54
+val SCE_PL_REGSUBST_VAR=55
+val SCE_PL_BACKTICKS_VAR=57
+val SCE_PL_HERE_QQ_VAR=61
+val SCE_PL_HERE_QX_VAR=62
+val SCE_PL_STRING_QQ_VAR=64
+val SCE_PL_STRING_QX_VAR=65
+val SCE_PL_STRING_QR_VAR=66
 # Lexical states for SCLEX_RUBY
 lex Ruby=SCLEX_RUBY SCE_RB_
 val SCE_RB_DEFAULT=0
@@ -2687,6 +2767,14 @@ val SCE_L_COMMAND=1
 val SCE_L_TAG=2
 val SCE_L_MATH=3
 val SCE_L_COMMENT=4
+val SCE_L_TAG2=5
+val SCE_L_MATH2=6
+val SCE_L_COMMENT2=7
+val SCE_L_VERBATIM=8
+val SCE_L_SHORTCMD=9
+val SCE_L_SPECIAL=10
+val SCE_L_CMDOPT=11
+val SCE_L_ERROR=12
 # Lexical states for SCLEX_LUA
 lex Lua=SCLEX_LUA SCE_LUA_
 val SCE_LUA_DEFAULT=0
@@ -2709,6 +2797,7 @@ val SCE_LUA_WORD5=16
 val SCE_LUA_WORD6=17
 val SCE_LUA_WORD7=18
 val SCE_LUA_WORD8=19
+val SCE_LUA_LABEL=20
 # Lexical states for SCLEX_ERRORLIST
 lex ErrorList=SCLEX_ERRORLIST SCE_ERR_
 val SCE_ERR_DEFAULT=0
@@ -3889,22 +3978,22 @@ evt void SavePointLeft=2003(void)
 evt void ModifyAttemptRO=2004(void)
 # GTK+ Specific to work around focus and accelerator problems:
 evt void Key=2005(int ch, int modifiers)
-evt void DoubleClick=2006(void)
-evt void UpdateUI=2007(void)
-evt void Modified=2008(int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev)
+evt void DoubleClick=2006(int modifiers, int position, int line)
+evt void UpdateUI=2007(int updated)
+evt void Modified=2008(int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev, int token, int annotationLinesAdded)
 evt void MacroRecord=2009(int message, int wParam, int lParam)
 evt void MarginClick=2010(int modifiers, int position, int margin)
 evt void NeedShown=2011(int position, int length)
 evt void Painted=2013(void)
-evt void UserListSelection=2014(int listType, string text)
+evt void UserListSelection=2014(int listType, string text, int position)
 evt void URIDropped=2015(string text)
-evt void DwellStart=2016(int position)
-evt void DwellEnd=2017(int position)
+evt void DwellStart=2016(int position, int x, int y)
+evt void DwellEnd=2017(int position, int x, int y)
 evt void Zoom=2018(void)
 evt void HotSpotClick=2019(int modifiers, int position)
 evt void HotSpotDoubleClick=2020(int modifiers, int position)
 evt void CallTipClick=2021(int position)
-evt void AutoCSelection=2022(string text)
+evt void AutoCSelection=2022(string text, int position)
 evt void IndicatorClick=2023(int modifiers, int position)
 evt void IndicatorRelease=2024(int modifiers, int position)
 evt void AutoCCancelled=2025(void)
diff --git a/scintilla/lexers/LexBasic.cxx b/scintilla/lexers/LexBasic.cxx
index fc1c6c7d..55641edc 100644
--- a/scintilla/lexers/LexBasic.cxx
+++ b/scintilla/lexers/LexBasic.cxx
@@ -1,6 +1,7 @@
 // Scintilla source code edit control
 /** @file LexBasic.cxx
  ** Lexer for BlitzBasic and PureBasic.
+ ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net>
  **/
 // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
@@ -21,18 +22,25 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <assert.h>
+#include <ctype.h>
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4786)
+#endif
+
+#include <string>
+#include <map>
 
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
 
-#include "PropSetSimple.h"
 #include "WordList.h"
 #include "LexAccessor.h"
-#include "Accessor.h"
 #include "StyleContext.h"
 #include "CharacterSet.h"
 #include "LexerModule.h"
+#include "OptionSet.h"
 
 #ifdef SCI_NAMESPACE
 using namespace Scintilla;
@@ -89,8 +97,213 @@ static int LowerCase(int c)
 	return c;
 }
 
-static void ColouriseBasicDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler, char comment_char) {
+static int CheckBlitzFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "function") ||
+		!strcmp(token, "type")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "end function") ||
+		!strcmp(token, "end type")) {
+		return -1;
+	}
+	return 0;
+}
+
+static int CheckPureFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "procedure") ||
+		!strcmp(token, "enumeration") ||
+		!strcmp(token, "interface") ||
+		!strcmp(token, "structure")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "endprocedure") ||
+		!strcmp(token, "endenumeration") ||
+		!strcmp(token, "endinterface") ||
+		!strcmp(token, "endstructure")) {
+		return -1;
+	}
+	return 0;
+}
+
+static int CheckFreeFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "function") ||
+		!strcmp(token, "sub") ||
+		!strcmp(token, "type")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "end function") ||
+		!strcmp(token, "end sub") ||
+		!strcmp(token, "end type")) {
+		return -1;
+	}
+	return 0;
+}
+
+// An individual named option for use in an OptionSet
+
+// Options used for LexerBasic
+struct OptionsBasic {
+	bool fold;
+	bool foldSyntaxBased;
+	bool foldCommentExplicit;
+	std::string foldExplicitStart;
+	std::string foldExplicitEnd;
+	bool foldExplicitAnywhere;
+	bool foldCompact;
+	OptionsBasic() {
+		fold = false;
+		foldSyntaxBased = true;
+		foldCommentExplicit = false;
+		foldExplicitStart = "";
+		foldExplicitEnd   = "";
+		foldExplicitAnywhere = false;
+		foldCompact = true;
+	}
+};
+
+static const char * const blitzbasicWordListDesc[] = {
+	"BlitzBasic Keywords",
+	"user1",
+	"user2",
+	"user3",
+	0
+};
+
+static const char * const purebasicWordListDesc[] = {
+	"PureBasic Keywords",
+	"PureBasic PreProcessor Keywords",
+	"user defined 1",
+	"user defined 2",
+	0
+};
+
+static const char * const freebasicWordListDesc[] = {
+	"FreeBasic Keywords",
+	"FreeBasic PreProcessor Keywords",
+	"user defined 1",
+	"user defined 2",
+	0
+};
+
+struct OptionSetBasic : public OptionSet<OptionsBasic> {
+	OptionSetBasic(const char * const wordListDescriptions[]) {
+		DefineProperty("fold", &OptionsBasic::fold);
+
+		DefineProperty("fold.basic.syntax.based", &OptionsBasic::foldSyntaxBased,
+			"Set this property to 0 to disable syntax based folding.");
+
+		DefineProperty("fold.basic.comment.explicit", &OptionsBasic::foldCommentExplicit,
+			"This option enables folding explicit fold points when using the Basic lexer. "
+			"Explicit fold points allows adding extra folding by placing a ;{ (BB/PB) or '{ (FB) comment at the start "
+			"and a ;} (BB/PB) or '} (FB) at the end of a section that should be folded.");
+
+		DefineProperty("fold.basic.explicit.start", &OptionsBasic::foldExplicitStart,
+			"The string to use for explicit fold start points, replacing the standard ;{ (BB/PB) or '{ (FB).");
+
+		DefineProperty("fold.basic.explicit.end", &OptionsBasic::foldExplicitEnd,
+			"The string to use for explicit fold end points, replacing the standard ;} (BB/PB) or '} (FB).");
+
+		DefineProperty("fold.basic.explicit.anywhere", &OptionsBasic::foldExplicitAnywhere,
+			"Set this property to 1 to enable explicit fold points anywhere, not just in line comments.");
+
+		DefineProperty("fold.compact", &OptionsBasic::foldCompact);
+
+		DefineWordListSets(wordListDescriptions);
+	}
+};
+
+class LexerBasic : public ILexer {
+	char comment_char;
+	int (*CheckFoldPoint)(char const *, int &);
+	WordList keywordlists[4];
+	OptionsBasic options;
+	OptionSetBasic osBasic;
+public:
+	LexerBasic(char comment_char_, int (*CheckFoldPoint_)(char const *, int &), const char * const wordListDescriptions[]) :
+	           comment_char(comment_char_),
+	           CheckFoldPoint(CheckFoldPoint_),
+	           osBasic(wordListDescriptions) {
+	}
+	~LexerBasic() {
+	}
+	void SCI_METHOD Release() {
+		delete this;
+	}
+	int SCI_METHOD Version() const {
+		return lvOriginal;
+	}
+	const char * SCI_METHOD PropertyNames() {
+		return osBasic.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) {
+		return osBasic.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) {
+		return osBasic.DescribeProperty(name);
+	}
+	int SCI_METHOD PropertySet(const char *key, const char *val);
+	const char * SCI_METHOD DescribeWordListSets() {
+		return osBasic.DescribeWordListSets();
+	}
+	int SCI_METHOD WordListSet(int n, const char *wl);
+	void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess);
+	void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess);
+
+	void * SCI_METHOD PrivateCall(int, void *) {
+		return 0;
+	}
+	static ILexer *LexerFactoryBlitzBasic() {
+		return new LexerBasic(';', CheckBlitzFoldPoint, blitzbasicWordListDesc);
+	}
+	static ILexer *LexerFactoryPureBasic() {
+		return new LexerBasic(';', CheckPureFoldPoint, purebasicWordListDesc);
+	}
+	static ILexer *LexerFactoryFreeBasic() {
+		return new LexerBasic('\'', CheckFreeFoldPoint, freebasicWordListDesc );
+	}
+};
+
+int SCI_METHOD LexerBasic::PropertySet(const char *key, const char *val) {
+	if (osBasic.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+int SCI_METHOD LexerBasic::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywordlists[0];
+		break;
+	case 1:
+		wordListN = &keywordlists[1];
+		break;
+	case 2:
+		wordListN = &keywordlists[2];
+		break;
+	case 3:
+		wordListN = &keywordlists[3];
+		break;
+	}
+	int firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerBasic::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+
 	bool wasfirst = true, isfirst = true; // true if first token in a line
 	styler.StartAt(startPos);
 
@@ -114,7 +327,7 @@ static void ColouriseBasicDoc(unsigned int startPos, int length, int initStyle,
 					};
 					sc.GetCurrentLowered(s, sizeof(s));
 					for (int i = 0; i < 4; i++) {
-						if (keywordlists[i]->InList(s)) {
+						if (keywordlists[i].InList(s)) {
 							sc.ChangeState(kstates[i]);
 						}
 					}
@@ -205,66 +418,30 @@ static void ColouriseBasicDoc(unsigned int startPos, int length, int initStyle,
 	sc.Complete();
 }
 
-static int CheckBlitzFoldPoint(char const *token, int &level) {
-	if (!strcmp(token, "function") ||
-		!strcmp(token, "type")) {
-		level |= SC_FOLDLEVELHEADERFLAG;
-		return 1;
-	}
-	if (!strcmp(token, "end function") ||
-		!strcmp(token, "end type")) {
-		return -1;
-	}
-	return 0;
-}
 
-static int CheckPureFoldPoint(char const *token, int &level) {
-	if (!strcmp(token, "procedure") ||
-		!strcmp(token, "enumeration") ||
-		!strcmp(token, "interface") ||
-		!strcmp(token, "structure")) {
-		level |= SC_FOLDLEVELHEADERFLAG;
-		return 1;
-	}
-	if (!strcmp(token, "endprocedure") ||
-		!strcmp(token, "endenumeration") ||
-		!strcmp(token, "endinterface") ||
-		!strcmp(token, "endstructure")) {
-		return -1;
-	}
-	return 0;
-}
+void SCI_METHOD LexerBasic::Fold(unsigned int startPos, int length, int /* initStyle */, IDocument *pAccess) {
 
-static int CheckFreeFoldPoint(char const *token, int &level) {
-	if (!strcmp(token, "function") ||
-		!strcmp(token, "sub") ||
-		!strcmp(token, "type")) {
-		level |= SC_FOLDLEVELHEADERFLAG;
-		return 1;
-	}
-	if (!strcmp(token, "end function") ||
-		!strcmp(token, "end sub") ||
-		!strcmp(token, "end type")) {
-		return -1;
-	}
-	return 0;
-}
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
 
-static void FoldBasicDoc(unsigned int startPos, int length,
-	Accessor &styler, int (*CheckFoldPoint)(char const *, int &)) {
 	int line = styler.GetLine(startPos);
 	int level = styler.LevelAt(line);
 	int go = 0, done = 0;
 	int endPos = startPos + length;
 	char word[256];
 	int wordlen = 0;
-	int i;
-        bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty();
+	int cNext = styler[startPos];
+
 	// Scan for tokens at the start of the line (they may include
 	// whitespace, for tokens like "End Function"
-	for (i = startPos; i < endPos; i++) {
-		int c = styler.SafeGetCharAt(i);
-		if (!done && !go) {
+	for (int i = startPos; i < endPos; i++) {
+		int c = cNext;
+		cNext = styler.SafeGetCharAt(i + 1);
+		bool atEOL = (c == '\r' && cNext != '\n') || (c == '\n');
+		if (options.foldSyntaxBased && !done && !go) {
 			if (wordlen) { // are we scanning a token already?
 				word[wordlen] = static_cast<char>(LowerCase(c));
 				if (!IsIdentifier(c)) { // done with token
@@ -294,8 +471,27 @@ static void FoldBasicDoc(unsigned int startPos, int length,
 				}
 			}
 		}
-		if (c == '\n') { // line end
-			if (!done && wordlen == 0 && foldCompact) // line was only space
+		if (options.foldCommentExplicit && ((styler.StyleAt(i) == SCE_B_COMMENT) || options.foldExplicitAnywhere)) {
+			if (userDefinedFoldMarkers) {
+				if (styler.Match(i, options.foldExplicitStart.c_str())) {
+ 					level |= SC_FOLDLEVELHEADERFLAG;
+					go = 1;
+				} else if (styler.Match(i, options.foldExplicitEnd.c_str())) {
+ 					go = -1;
+ 				}
+			} else {
+				if (c == comment_char) {
+					if (cNext == '{') {
+						level |= SC_FOLDLEVELHEADERFLAG;
+						go = 1;
+					} else if (cNext == '}') {
+						go = -1;
+					}
+				}
+ 			}
+ 		}
+		if (atEOL) { // line end
+			if (!done && wordlen == 0 && options.foldCompact) // line was only space
 				level |= SC_FOLDLEVELWHITEFLAG;
 			if (level != styler.LevelAt(line))
 				styler.SetLevel(line, level);
@@ -311,66 +507,8 @@ static void FoldBasicDoc(unsigned int startPos, int length,
 	}
 }
 
-static void ColouriseBlitzBasicDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, ';');
-}
+LexerModule lmBlitzBasic(SCLEX_BLITZBASIC, LexerBasic::LexerFactoryBlitzBasic, "blitzbasic", blitzbasicWordListDesc);
 
-static void ColourisePureBasicDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, ';');
-}
-
-static void ColouriseFreeBasicDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, '\'');
-}
-
-static void FoldBlitzBasicDoc(unsigned int startPos, int length, int,
-	WordList *[], Accessor &styler) {
-	FoldBasicDoc(startPos, length, styler, CheckBlitzFoldPoint);
-}
-
-static void FoldPureBasicDoc(unsigned int startPos, int length, int,
-	WordList *[], Accessor &styler) {
-	FoldBasicDoc(startPos, length, styler, CheckPureFoldPoint);
-}
-
-static void FoldFreeBasicDoc(unsigned int startPos, int length, int,
-	WordList *[], Accessor &styler) {
-	FoldBasicDoc(startPos, length, styler, CheckFreeFoldPoint);
-}
-
-static const char * const blitzbasicWordListDesc[] = {
-	"BlitzBasic Keywords",
-	"user1",
-	"user2",
-	"user3",
-	0
-};
-
-static const char * const purebasicWordListDesc[] = {
-	"PureBasic Keywords",
-	"PureBasic PreProcessor Keywords",
-	"user defined 1",
-	"user defined 2",
-	0
-};
-
-static const char * const freebasicWordListDesc[] = {
-	"FreeBasic Keywords",
-	"FreeBasic PreProcessor Keywords",
-	"user defined 1",
-	"user defined 2",
-	0
-};
-
-LexerModule lmBlitzBasic(SCLEX_BLITZBASIC, ColouriseBlitzBasicDoc, "blitzbasic",
-	FoldBlitzBasicDoc, blitzbasicWordListDesc);
-
-LexerModule lmPureBasic(SCLEX_PUREBASIC, ColourisePureBasicDoc, "purebasic",
-	FoldPureBasicDoc, purebasicWordListDesc);
-
-LexerModule lmFreeBasic(SCLEX_FREEBASIC, ColouriseFreeBasicDoc, "freebasic",
-	FoldFreeBasicDoc, freebasicWordListDesc);
+LexerModule lmPureBasic(SCLEX_PUREBASIC, LexerBasic::LexerFactoryPureBasic, "purebasic", purebasicWordListDesc);
 
+LexerModule lmFreeBasic(SCLEX_FREEBASIC, LexerBasic::LexerFactoryFreeBasic, "freebasic", freebasicWordListDesc);
diff --git a/scintilla/lexers/LexCOBOL.cxx b/scintilla/lexers/LexCOBOL.cxx
index a9a8f551..b3bc011d 100644
--- a/scintilla/lexers/LexCOBOL.cxx
+++ b/scintilla/lexers/LexCOBOL.cxx
@@ -208,6 +208,14 @@ static void ColouriseCOBOLDoc(unsigned int startPos, int length, int initStyle,
             if (isCOBOLwordstart(ch) || (ch == '$' && isascii(chNext) && isalpha(chNext))) {
                 ColourTo(styler, i-1, state);
                 state = SCE_C_IDENTIFIER;
+            } else if (column == 6 && ch == '*') {
+            // Cobol comment line: asterisk in column 7.
+                ColourTo(styler, i-1, state);
+                state = SCE_C_COMMENTLINE;
+            } else if (ch == '*' && chNext == '>') {
+            // Cobol inline comment: asterisk, followed by greater than.
+                ColourTo(styler, i-1, state);
+                state = SCE_C_COMMENTLINE;
             } else if (column == 0 && ch == '*' && chNext != '*') {
                 ColourTo(styler, i-1, state);
                 state = SCE_C_COMMENTLINE;
diff --git a/scintilla/lexers/LexCPP.cxx b/scintilla/lexers/LexCPP.cxx
index fa511b5f..51fd1925 100644
--- a/scintilla/lexers/LexCPP.cxx
+++ b/scintilla/lexers/LexCPP.cxx
@@ -324,6 +324,7 @@ class LexerCPP : public ILexer {
 	OptionsCPP options;
 	OptionSetCPP osCPP;
 	SparseState<std::string> rawStringTerminators;
+	enum { activeFlag = 0x40 };
 public:
 	LexerCPP(bool caseSensitive_) :
 		caseSensitive(caseSensitive_),
@@ -368,7 +369,9 @@ public:
 	static ILexer *LexerFactoryCPPInsensitive() {
 		return new LexerCPP(false);
 	}
-
+	static int MaskActive(int style) {
+		return style & ~activeFlag;
+	}
 	void EvaluateTokens(std::vector<std::string> &tokens);
 	bool EvaluateExpression(const std::string &expr, const std::map<std::string, std::string> &preprocessorDefinitions);
 };
@@ -432,7 +435,7 @@ int SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) {
 struct After {
 	int line;
 	After(int line_) : line(line_) {}
-	bool operator() (PPDefinition &p) const {
+	bool operator()(PPDefinition &p) const {
 		return p.line > line;
 	}
 };
@@ -508,11 +511,10 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 		preprocessorDefinitions[itDef->key] = itDef->value;
 	}
 
-	const int maskActivity = 0x3F;
 	std::string rawStringTerminator = rawStringTerminators.ValueAt(lineCurrent-1);
 	SparseState<std::string> rawSTNew(lineCurrent);
 
-	int activitySet = preproc.IsInactive() ? 0x40 : 0;
+	int activitySet = preproc.IsInactive() ? activeFlag : 0;
 
 	for (; sc.More(); sc.Forward()) {
 
@@ -528,7 +530,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 			lastWordWasUUID = false;
 			isIncludePreprocessor = false;
 			if (preproc.IsInactive()) {
-				activitySet = 0x40;
+				activitySet = activeFlag;
 				sc.SetState(sc.state | activitySet);
 			}
 			if (activitySet) {
@@ -563,7 +565,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 		const bool atLineEndBeforeSwitch = sc.atLineEnd;
 
 		// Determine if the current state should terminate.
-		switch (sc.state & maskActivity) {
+		switch (MaskActive(sc.state)) {
 			case SCE_C_OPERATOR:
 				sc.SetState(SCE_C_DEFAULT|activitySet);
 				break;
@@ -739,7 +741,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 				}
 				break;
 			case SCE_C_TRIPLEVERBATIM:
-				if (sc.Match ("\"\"\"")) {
+				if (sc.Match("\"\"\"")) {
 					while (sc.Match('"')) {
 						sc.Forward();
 					}
@@ -759,7 +761,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 		}
 
 		// Determine if a new state should be entered.
-		if ((sc.state & maskActivity) == SCE_C_DEFAULT) {
+		if (MaskActive(sc.state) == SCE_C_DEFAULT) {
 			if (sc.Match('@', '\"')) {
 				sc.SetState(SCE_C_VERBATIM|activitySet);
 				sc.Forward();
@@ -801,15 +803,20 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 				sc.SetState(SCE_C_REGEX|activitySet);	// JavaScript's RegEx
 			} else if (sc.ch == '\"') {
 				if (sc.chPrev == 'R') {
-					sc.SetState(SCE_C_STRINGRAW|activitySet);
-					rawStringTerminator = ")";
-					for (int termPos = sc.currentPos + 1;;termPos++) {
-						char chTerminator = styler.SafeGetCharAt(termPos, '(');
-						if (chTerminator == '(')
-							break;
-						rawStringTerminator += chTerminator;
+					styler.Flush();
+					if (MaskActive(styler.StyleAt(sc.currentPos - 1)) == SCE_C_STRINGRAW) {
+						sc.SetState(SCE_C_STRINGRAW|activitySet);
+						rawStringTerminator = ")";
+						for (int termPos = sc.currentPos + 1;; termPos++) {
+							char chTerminator = styler.SafeGetCharAt(termPos, '(');
+							if (chTerminator == '(')
+								break;
+							rawStringTerminator += chTerminator;
+						}
+						rawStringTerminator += '\"';
+					} else {
+						sc.SetState(SCE_C_STRING|activitySet);
 					}
-					rawStringTerminator += '\"';
 				} else {
 					sc.SetState(SCE_C_STRING|activitySet);
 				}
@@ -844,12 +851,12 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 						} else if (sc.Match("else")) {
 							if (!preproc.CurrentIfTaken()) {
 								preproc.InvertCurrentLevel();
-								activitySet = preproc.IsInactive() ? 0x40 : 0;
+								activitySet = preproc.IsInactive() ? activeFlag : 0;
 								if (!activitySet)
 									sc.ChangeState(SCE_C_PREPROCESSOR|activitySet);
 							} else if (!preproc.IsInactive()) {
 								preproc.InvertCurrentLevel();
-								activitySet = preproc.IsInactive() ? 0x40 : 0;
+								activitySet = preproc.IsInactive() ? activeFlag : 0;
 								if (!activitySet)
 									sc.ChangeState(SCE_C_PREPROCESSOR|activitySet);
 							}
@@ -861,19 +868,19 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 								bool ifGood = EvaluateExpression(restOfLine, preprocessorDefinitions);
 								if (ifGood) {
 									preproc.InvertCurrentLevel();
-									activitySet = preproc.IsInactive() ? 0x40 : 0;
+									activitySet = preproc.IsInactive() ? activeFlag : 0;
 									if (!activitySet)
 										sc.ChangeState(SCE_C_PREPROCESSOR|activitySet);
 								}
 							} else if (!preproc.IsInactive()) {
 								preproc.InvertCurrentLevel();
-								activitySet = preproc.IsInactive() ? 0x40 : 0;
+								activitySet = preproc.IsInactive() ? activeFlag : 0;
 								if (!activitySet)
 									sc.ChangeState(SCE_C_PREPROCESSOR|activitySet);
 							}
 						} else if (sc.Match("endif")) {
 							preproc.EndSection();
-							activitySet = preproc.IsInactive() ? 0x40 : 0;
+							activitySet = preproc.IsInactive() ? activeFlag : 0;
 							sc.ChangeState(SCE_C_PREPROCESSOR|activitySet);
 						} else if (sc.Match("define")) {
 							if (options.updatePreprocessor && !preproc.IsInactive()) {
@@ -933,15 +940,15 @@ void SCI_METHOD LexerCPP::Fold(unsigned int startPos, int length, int initStyle,
 	int levelMinCurrent = levelCurrent;
 	int levelNext = levelCurrent;
 	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
+	int styleNext = MaskActive(styler.StyleAt(startPos));
+	int style = MaskActive(initStyle);
 	const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty();
 	for (unsigned int i = startPos; i < endPos; i++) {
 		char ch = chNext;
 		chNext = styler.SafeGetCharAt(i + 1);
 		int stylePrev = style;
 		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
+		styleNext = MaskActive(styler.StyleAt(i + 1));
 		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
 		if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style)) {
 			if (!IsStreamCommentStyle(stylePrev) && (stylePrev != SCE_C_COMMENTLINEDOC)) {
diff --git a/scintilla/lexers/LexHTML.cxx b/scintilla/lexers/LexHTML.cxx
index 546f5ad9..a2079638 100644
--- a/scintilla/lexers/LexHTML.cxx
+++ b/scintilla/lexers/LexHTML.cxx
@@ -57,7 +57,7 @@ inline bool IsOperator(int ch) {
 }
 
 static void GetTextSegment(Accessor &styler, unsigned int start, unsigned int end, char *s, size_t len) {
-	size_t i = 0;
+	unsigned int i = 0;
 	for (; (i < end - start + 1) && (i < len-1); i++) {
 		s[i] = static_cast<char>(MakeLowerCase(styler[start + i]));
 	}
@@ -66,7 +66,7 @@ static void GetTextSegment(Accessor &styler, unsigned int start, unsigned int en
 
 static const char *GetNextWord(Accessor &styler, unsigned int start, char *s, size_t sLen) {
 
-	size_t i = 0;
+	unsigned int i = 0;
 	for (; i < sLen-1; i++) {
 		char ch = static_cast<char>(styler.SafeGetCharAt(start + i));
 		if ((i == 0) && !IsAWordStart(ch))
@@ -318,19 +318,19 @@ static int classifyTagHTML(unsigned int start, unsigned int end,
 
 static void classifyWordHTJS(unsigned int start, unsigned int end,
                              WordList &keywords, Accessor &styler, script_mode inScriptType) {
+	char s[30 + 1];
+	unsigned int i = 0;
+	for (; i < end - start + 1 && i < 30; i++) {
+		s[i] = styler[start + i];
+	}
+	s[i] = '\0';
+
 	char chAttr = SCE_HJ_WORD;
-	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.');
-	if (wordIsNumber)
+	bool wordIsNumber = IsADigit(s[0]) || ((s[0] == '.') && IsADigit(s[1]));
+	if (wordIsNumber) {
 		chAttr = SCE_HJ_NUMBER;
-	else {
-		char s[30 + 1];
-		unsigned int i = 0;
-		for (; i < end - start + 1 && i < 30; i++) {
-			s[i] = styler[start + i];
-		}
-		s[i] = '\0';
-		if (keywords.InList(s))
-			chAttr = SCE_HJ_KEYWORD;
+	} else if (keywords.InList(s)) {
+		chAttr = SCE_HJ_KEYWORD;
 	}
 	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
 }
@@ -356,7 +356,7 @@ static int classifyWordHTVB(unsigned int start, unsigned int end, WordList &keyw
 		return SCE_HB_DEFAULT;
 }
 
-static void classifyWordHTPy(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord, script_mode inScriptType) {
+static void classifyWordHTPy(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord, script_mode inScriptType, bool isMako) {
 	bool wordIsNumber = IsADigit(styler[start]);
 	char s[30 + 1];
 	unsigned int i = 0;
@@ -373,6 +373,8 @@ static void classifyWordHTPy(unsigned int start, unsigned int end, WordList &key
 		chAttr = SCE_HP_NUMBER;
 	else if (keywords.InList(s))
 		chAttr = SCE_HP_WORD;
+	else if (isMako && 0 == strcmp(s, "block"))
+		chAttr = SCE_HP_WORD;
 	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
 	strcpy(prevWord, s);
 }
@@ -494,7 +496,10 @@ static bool isMakoBlockEnd(const int ch, const int chNext, const char *blockType
 			   (0 == strcmp(blockType, "page"))) {
 		return ((ch == '/') && (chNext == '>'));
 	} else if (0 == strcmp(blockType, "%")) {
-		return isLineEnd(ch);
+		if (ch == '/' && isLineEnd(chNext))
+			return 1;
+		else
+		    return isLineEnd(ch);
 	} else if (0 == strcmp(blockType, "{")) {
 		return ch == '}';
 	} else {
@@ -588,6 +593,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 	int state = stateForPrintState(StateToPrint);
 	char makoBlockType[200];
 	makoBlockType[0] = '\0';
+	int makoComment = 0;
 	char djangoBlockType[2];
 	djangoBlockType[0] = '\0';
 
@@ -754,15 +760,15 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 						} else if (styler.Match(j, "end")) {
 							levelCurrent--;
 						}
-					} else if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*')) ) {
-						levelCurrent += ((ch == '{') || (ch == '/') ) ? 1 : -1;
+					} else if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*'))) {
+						levelCurrent += (((ch == '{') || (ch == '/')) ? 1 : -1);
 					}
 				} else if (((state == SCE_HPHP_COMMENT) || (state == SCE_HJ_COMMENT)) && foldComment && (ch == '*') && (chNext == '/')) {
 					levelCurrent--;
 				}
 				break;
 			case eScriptPython:
-				if (state != SCE_HP_COMMENTLINE) {
+				if (state != SCE_HP_COMMENTLINE && !isMako) {
 					if ((ch == ':') && ((chNext == '\n') || (chNext == '\r' && chNext2 == '\n'))) {
 						levelCurrent++;
 					} else if ((ch == '\n') && !((chNext == '\r') && (chNext2 == '\n')) && (chNext != '\n')) {
@@ -818,6 +824,18 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 			lineStartVisibleChars = 0;
 		}
 
+		// handle start of Mako comment line
+		if (isMako && ch == '#' && chNext == '#') {
+			makoComment = 1;
+		}
+		
+		// handle end of Mako comment line
+		else if (isMako && makoComment && (ch == '\r' || ch == '\n')) {
+			makoComment = 0;
+			styler.ColourTo(i, SCE_HP_COMMENTLINE);
+			state = SCE_HP_DEFAULT;
+		}
+		
 		// Allow falling through to mako handling code if newline is going to end a block
 		if (((ch == '\r' && chNext != '\n') || (ch == '\n')) &&
 			(!isMako || (0 != strcmp(makoBlockType, "%")))) {
@@ -882,7 +900,8 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 		         (state != SCE_HPHP_COMMENTLINE) &&
 		         (ch == '<') &&
 		         (chNext == '?') &&
-				 !IsScriptCommentState(state) ) {
+				 !IsScriptCommentState(state)) {
+ 			beforeLanguage = scriptLanguage;
 			scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, eScriptPHP);
 			if (scriptLanguage != eScriptPHP && isStringState(state)) continue;
 			styler.ColourTo(i - 1, StateToPrint);
@@ -911,9 +930,10 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 		// handle the start Mako template Python code
 		else if (isMako && scriptLanguage == eScriptNone && ((ch == '<' && chNext == '%') ||
 															 (lineStartVisibleChars == 1 && ch == '%') ||
+															 (lineStartVisibleChars == 1 && ch == '/' && chNext == '%') ||
 															 (ch == '$' && chNext == '{') ||
 															 (ch == '<' && chNext == '/' && chNext2 == '%'))) {
-			if (ch == '%')
+			if (ch == '%' || ch == '/')
 				strcpy(makoBlockType, "%");
 			else if (ch == '$')
 				strcpy(makoBlockType, "{");
@@ -938,12 +958,10 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 			state = SCE_HP_START;
 			scriptLanguage = eScriptPython;
 			styler.ColourTo(i, SCE_H_ASP);
-			if (foldHTMLPreprocessor && ch == '<')
-				levelCurrent++;
 
-			if (ch != '%' && ch != '$') {
-				i += strlen(makoBlockType);
-				visibleChars += strlen(makoBlockType);
+			if (ch != '%' && ch != '$' && ch != '/') {
+				i += static_cast<int>(strlen(makoBlockType));
+				visibleChars += static_cast<int>(strlen(makoBlockType));
 				if (keywords4.InList(makoBlockType))
 					styler.ColourTo(i, SCE_HP_WORD);
 				else
@@ -954,6 +972,36 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 			continue;
 		}
 
+		// handle the start/end of Django comment
+		else if (isDjango && state != SCE_H_COMMENT && (ch == '{' && chNext == '#')) {
+			styler.ColourTo(i - 1, StateToPrint);
+			beforePreProc = state;
+			beforeLanguage = scriptLanguage;
+			if (inScriptType == eNonHtmlScript)
+				inScriptType = eNonHtmlScriptPreProc;
+			else
+				inScriptType = eNonHtmlPreProc;
+			i += 1;
+			visibleChars += 1;
+			scriptLanguage = eScriptComment;
+			state = SCE_H_COMMENT;
+			styler.ColourTo(i, SCE_H_ASP);
+			ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+			continue;
+		} else if (isDjango && state == SCE_H_COMMENT && (ch == '#' && chNext == '}')) {
+			styler.ColourTo(i - 1, StateToPrint);
+			i += 1;
+			visibleChars += 1;
+			styler.ColourTo(i, SCE_H_ASP);
+			state = beforePreProc;
+			if (inScriptType == eNonHtmlScriptPreProc)
+				inScriptType = eNonHtmlScript;
+			else
+				inScriptType = eHtml;
+			scriptLanguage = beforeLanguage;
+			continue;
+		}
+
 		// handle the start Django template code
 		else if (isDjango && scriptLanguage != eScriptPython && (ch == '{' && (chNext == '%' ||  chNext == '{'))) {
 			if (chNext == '%')
@@ -1024,7 +1072,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				 (ch == '!') &&
 				 (StateToPrint != SCE_H_CDATA) &&
 				 (!IsCommentState(StateToPrint)) &&
-				 (!IsScriptCommentState(StateToPrint)) ) {
+				 (!IsScriptCommentState(StateToPrint))) {
 			beforePreProc = state;
 			styler.ColourTo(i - 2, StateToPrint);
 			if ((chNext == '-') && (chNext2 == '-')) {
@@ -1054,7 +1102,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				                                    styler.GetStartSegment(), i - 1, aspScript);
 			}
 			if (state == SCE_HP_WORD) {
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType);
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
 			} else {
 				styler.ColourTo(i - 1, StateToPrint);
 			}
@@ -1062,7 +1110,11 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				i++;
 				visibleChars++;
 		    }
-			if (0 != strcmp(makoBlockType, "%")) {
+			else if (0 == strcmp(makoBlockType, "%") && ch == '/') {
+				i++;
+				visibleChars++;
+			}
+			if (0 != strcmp(makoBlockType, "%") || ch == '/') {
 				styler.ColourTo(i, SCE_H_ASP);
 			}
 			state = beforePreProc;
@@ -1070,9 +1122,6 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				inScriptType = eNonHtmlScript;
 			else
 				inScriptType = eHtml;
-			if (foldHTMLPreprocessor && ch != '\n' && ch != '\r') {
-				levelCurrent--;
-			}
 			scriptLanguage = eScriptNone;
 			continue;
 		}
@@ -1087,7 +1136,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				                                    styler.GetStartSegment(), i - 1, aspScript);
 			}
 			if (state == SCE_HP_WORD) {
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType);
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
 			} else {
 				styler.ColourTo(i - 1, StateToPrint);
 			}
@@ -1121,7 +1170,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
 				break;
 			case SCE_HP_WORD:
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType);
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
 				break;
 			case SCE_HPHP_WORD:
 				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
@@ -1154,7 +1203,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 			if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) {
 				levelCurrent--;
 			}
-			scriptLanguage = eScriptNone;
+			scriptLanguage = beforeLanguage;
 			continue;
 		}
 		/////////////////////////////////////
@@ -1783,7 +1832,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 			break;
 		case SCE_HP_WORD:
 			if (!IsAWordChar(ch)) {
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType);
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
 				state = SCE_HP_DEFAULT;
 				if (ch == '#') {
 					state = SCE_HP_COMMENTLINE;
@@ -1934,7 +1983,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 					styler.ColourTo(i, StateToPrint);
 					state = SCE_HPHP_DEFAULT;
 				} else if (isLineEnd(chPrev)) {
-				const int psdLength = strlen(phpStringDelimiter);
+					const int psdLength = static_cast<int>(strlen(phpStringDelimiter));
 					const char chAfterPsd = styler.SafeGetCharAt(i + psdLength);
 					const char chAfterPsd2 = styler.SafeGetCharAt(i + psdLength + 1);
 					if (isLineEnd(chAfterPsd) ||
@@ -1957,7 +2006,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 					state = SCE_HPHP_DEFAULT;
 				}
 			} else if (isLineEnd(chPrev) && styler.Match(i, phpStringDelimiter)) {
-				const int psdLength = strlen(phpStringDelimiter);
+				const int psdLength = static_cast<int>(strlen(phpStringDelimiter));
 				const char chAfterPsd = styler.SafeGetCharAt(i + psdLength);
 				const char chAfterPsd2 = styler.SafeGetCharAt(i + psdLength + 1);
 				if (isLineEnd(chAfterPsd) ||
@@ -2072,7 +2121,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 		classifyWordHTVB(styler.GetStartSegment(), lengthDoc - 1, keywords3, styler, inScriptType);
 		break;
 	case SCE_HP_WORD:
-		classifyWordHTPy(styler.GetStartSegment(), lengthDoc - 1, keywords4, styler, prevWord, inScriptType);
+		classifyWordHTPy(styler.GetStartSegment(), lengthDoc - 1, keywords4, styler, prevWord, inScriptType, isMako);
 		break;
 	case SCE_HPHP_WORD:
 		classifyWordHTPHP(styler.GetStartSegment(), lengthDoc - 1, keywords5, styler);
diff --git a/scintilla/lexers/LexLua.cxx b/scintilla/lexers/LexLua.cxx
index a299d326..9e48efcd 100644
--- a/scintilla/lexers/LexLua.cxx
+++ b/scintilla/lexers/LexLua.cxx
@@ -59,10 +59,11 @@ static void ColouriseLuaDoc(
 
 	// Accepts accented characters
 	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
-	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true);
 	// Not exactly following number definition (several dots are seen as OK, etc.)
-	// but probably enough in most cases.
-	CharacterSet setNumber(CharacterSet::setDigits, ".-+abcdefABCDEF");
+	// but probably enough in most cases. [pP] is for hex floats.
+	CharacterSet setNumber(CharacterSet::setDigits, ".-+abcdefpABCDEFP");
+	CharacterSet setExponent(CharacterSet::setNone, "eEpP");
 	CharacterSet setLuaOperator(CharacterSet::setNone, "*/-+()={}~[];<>,.^%:#");
 	CharacterSet setEscapeSkip(CharacterSet::setNone, "\"'\\");
 
@@ -70,12 +71,16 @@ static void ColouriseLuaDoc(
 	// Initialize long string [[ ... ]] or block comment --[[ ... ]] nesting level,
 	// if we are inside such a string. Block comment was introduced in Lua 5.0,
 	// blocks with separators [=[ ... ]=] in Lua 5.1.
+	// Continuation of a string (\z whitespace escaping) is controlled by stringWs.
 	int nestLevel = 0;
 	int sepCount = 0;
-	if (initStyle == SCE_LUA_LITERALSTRING || initStyle == SCE_LUA_COMMENT) {
+	int stringWs = 0;
+	if (initStyle == SCE_LUA_LITERALSTRING || initStyle == SCE_LUA_COMMENT ||
+		initStyle == SCE_LUA_STRING || initStyle == SCE_LUA_CHARACTER) {
 		int lineState = styler.GetLineState(currentLine - 1);
-		nestLevel = lineState >> 8;
+		nestLevel = lineState >> 9;
 		sepCount = lineState & 0xFF;
+		stringWs = lineState & 0x100;
 	}
 
 	// Do not leak onto next line
@@ -95,8 +100,10 @@ static void ColouriseLuaDoc(
 			switch (sc.state) {
 			case SCE_LUA_LITERALSTRING:
 			case SCE_LUA_COMMENT:
-				// Inside a literal string or block comment, we set the line state
-				styler.SetLineState(currentLine, (nestLevel << 8) | sepCount);
+			case SCE_LUA_STRING:
+			case SCE_LUA_CHARACTER:
+				// Inside a literal string, block comment or string, we set the line state
+				styler.SetLineState(currentLine, (nestLevel << 9) | stringWs | sepCount);
 				break;
 			default:
 				// Reset the line state
@@ -123,21 +130,91 @@ static void ColouriseLuaDoc(
 
 		// Determine if the current state should terminate.
 		if (sc.state == SCE_LUA_OPERATOR) {
+			if (sc.ch == ':' && sc.chPrev == ':') {	// :: <label> :: forward scan
+				sc.Forward();
+				int ln = 0, maxln = startPos + length - sc.currentPos;
+				int c;
+				while (ln < maxln) {		// determine line extent
+					c = sc.GetRelative(ln);
+					if (c == '\r' || c == '\n')
+						break;
+					ln++;
+				}
+				maxln = ln; ln = 0;
+				while (ln < maxln) {		// skip over spaces/tabs
+					if (!IsASpaceOrTab(sc.GetRelative(ln)))
+						break;
+					ln++;
+				}
+				int ws1 = ln;
+				if (setWordStart.Contains(sc.GetRelative(ln))) {
+					int i = 0;
+					char s[100];
+					while (ln < maxln) {	// get potential label
+						c = sc.GetRelative(ln);
+						if (!setWord.Contains(c))
+							break;
+						if (i < 90)
+							s[i++] = c;
+						ln++;
+					}
+					s[i] = '\0'; int lbl = ln;
+					if (!keywords.InList(s)) {
+						while (ln < maxln) {		// skip over spaces/tabs
+							if (!IsASpaceOrTab(sc.GetRelative(ln)))
+								break;
+							ln++;
+						}
+						int ws2 = ln - lbl;
+						if (sc.GetRelative(ln) == ':' && sc.GetRelative(ln + 1) == ':') {
+							// final :: found, complete valid label construct
+							sc.ChangeState(SCE_LUA_LABEL);
+							if (ws1) {
+								sc.SetState(SCE_LUA_DEFAULT);
+								sc.Forward(ws1);
+							}
+							sc.SetState(SCE_LUA_LABEL);
+							sc.Forward(lbl - ws1);
+							if (ws2) {
+								sc.SetState(SCE_LUA_DEFAULT);
+								sc.Forward(ws2);
+							}
+							sc.SetState(SCE_LUA_LABEL);
+							sc.Forward(2);
+						}
+					}
+				}
+			}
 			sc.SetState(SCE_LUA_DEFAULT);
 		} else if (sc.state == SCE_LUA_NUMBER) {
-			// We stop the number definition on non-numerical non-dot non-eE non-sign non-hexdigit char
+			// We stop the number definition on non-numerical non-dot non-eEpP non-sign non-hexdigit char
 			if (!setNumber.Contains(sc.ch)) {
 				sc.SetState(SCE_LUA_DEFAULT);
 			} else if (sc.ch == '-' || sc.ch == '+') {
-				if (sc.chPrev != 'E' && sc.chPrev != 'e')
+				if (!setExponent.Contains(sc.chPrev))
 					sc.SetState(SCE_LUA_DEFAULT);
 			}
 		} else if (sc.state == SCE_LUA_IDENTIFIER) {
-			if (!setWord.Contains(sc.ch) || sc.Match('.', '.')) {
+			if (!(setWord.Contains(sc.ch) || sc.ch == '.') || sc.Match('.', '.')) {
 				char s[100];
 				sc.GetCurrent(s, sizeof(s));
 				if (keywords.InList(s)) {
 					sc.ChangeState(SCE_LUA_WORD);
+					if (strcmp(s, "goto") == 0) {	// goto <label> forward scan
+						sc.SetState(SCE_LUA_DEFAULT);
+						while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+							sc.Forward();
+						if (setWordStart.Contains(sc.ch)) {
+							sc.SetState(SCE_LUA_LABEL);
+							sc.Forward();
+							while (setWord.Contains(sc.ch))
+								sc.Forward();
+							sc.GetCurrent(s, sizeof(s));
+							if (keywords.InList(s))
+								sc.ChangeState(SCE_LUA_WORD);
+						}
+						sc.SetState(SCE_LUA_DEFAULT);
+					}
 				} else if (keywords2.InList(s)) {
 					sc.ChangeState(SCE_LUA_WORD2);
 				} else if (keywords3.InList(s)) {
@@ -160,24 +237,38 @@ static void ColouriseLuaDoc(
 				sc.ForwardSetState(SCE_LUA_DEFAULT);
 			}
 		} else if (sc.state == SCE_LUA_STRING) {
+			if (stringWs) {
+				if (!IsASpace(sc.ch))
+					stringWs = 0;
+			}
 			if (sc.ch == '\\') {
 				if (setEscapeSkip.Contains(sc.chNext)) {
 					sc.Forward();
+				} else if (sc.chNext == 'z') {
+					sc.Forward();
+					stringWs = 0x100;
 				}
 			} else if (sc.ch == '\"') {
 				sc.ForwardSetState(SCE_LUA_DEFAULT);
-			} else if (sc.atLineEnd) {
+			} else if (stringWs == 0 && sc.atLineEnd) {
 				sc.ChangeState(SCE_LUA_STRINGEOL);
 				sc.ForwardSetState(SCE_LUA_DEFAULT);
 			}
 		} else if (sc.state == SCE_LUA_CHARACTER) {
+			if (stringWs) {
+				if (!IsASpace(sc.ch))
+					stringWs = 0;
+			}
 			if (sc.ch == '\\') {
 				if (setEscapeSkip.Contains(sc.chNext)) {
 					sc.Forward();
+				} else if (sc.chNext == 'z') {
+					sc.Forward();
+					stringWs = 0x100;
 				}
 			} else if (sc.ch == '\'') {
 				sc.ForwardSetState(SCE_LUA_DEFAULT);
-			} else if (sc.atLineEnd) {
+			} else if (stringWs == 0 && sc.atLineEnd) {
 				sc.ChangeState(SCE_LUA_STRINGEOL);
 				sc.ForwardSetState(SCE_LUA_DEFAULT);
 			}
@@ -214,8 +305,10 @@ static void ColouriseLuaDoc(
 				sc.SetState(SCE_LUA_IDENTIFIER);
 			} else if (sc.ch == '\"') {
 				sc.SetState(SCE_LUA_STRING);
+				stringWs = 0;
 			} else if (sc.ch == '\'') {
 				sc.SetState(SCE_LUA_CHARACTER);
+				stringWs = 0;
 			} else if (sc.ch == '[') {
 				sepCount = LongDelimCheck(sc);
 				if (sepCount == 0) {
@@ -246,7 +339,7 @@ static void ColouriseLuaDoc(
 		}
 	}
 
-	if (setWord.Contains(sc.chPrev)) {
+	if (setWord.Contains(sc.chPrev) || sc.chPrev == '.') {
 		char s[100];
 		sc.GetCurrent(s, sizeof(s));
 		if (keywords.InList(s)) {
diff --git a/scintilla/lexers/LexMarkdown.cxx b/scintilla/lexers/LexMarkdown.cxx
index 39371203..a9269770 100644
--- a/scintilla/lexers/LexMarkdown.cxx
+++ b/scintilla/lexers/LexMarkdown.cxx
@@ -113,6 +113,10 @@ static bool HasPrevLineContent(StyleContext &sc) {
     return false;
 }
 
+static bool AtTermStart(StyleContext &sc) {
+    return sc.currentPos == 0 || isspacechar(sc.chPrev);
+}
+
 static bool IsValidHrule(const unsigned int endPos, StyleContext &sc) {
     int c, count = 1;
     unsigned int i = 0;
@@ -373,35 +377,38 @@ static void ColorizeMarkdownDoc(unsigned int startPos, int length, int initStyle
                 }
             }
             // Code - also a special case for alternate inside spacing
-            if (sc.Match("``") && sc.GetRelative(3) != ' ') {
+            if (sc.Match("``") && sc.GetRelative(3) != ' ' && AtTermStart(sc)) {
                 sc.SetState(SCE_MARKDOWN_CODE2);
                 sc.Forward();
             }
-            else if (sc.ch == '`' && sc.chNext != ' ') {
+            else if (sc.ch == '`' && sc.chNext != ' ' && AtTermStart(sc)) {
                 sc.SetState(SCE_MARKDOWN_CODE);
             }
             // Strong
-            else if (sc.Match("**") && sc.GetRelative(2) != ' ') {
+            else if (sc.Match("**") && sc.GetRelative(2) != ' ' && AtTermStart(sc)) {
                 sc.SetState(SCE_MARKDOWN_STRONG1);
                 sc.Forward();
            }
-            else if (sc.Match("__") && sc.GetRelative(2) != ' ') {
+            else if (sc.Match("__") && sc.GetRelative(2) != ' ' && AtTermStart(sc)) {
                 sc.SetState(SCE_MARKDOWN_STRONG2);
                 sc.Forward();
             }
             // Emphasis
-            else if (sc.ch == '*' && sc.chNext != ' ')
+            else if (sc.ch == '*' && sc.chNext != ' ' && AtTermStart(sc)) {
                 sc.SetState(SCE_MARKDOWN_EM1);
-            else if (sc.ch == '_' && sc.chNext != ' ')
+            }
+            else if (sc.ch == '_' && sc.chNext != ' ' && AtTermStart(sc)) {
                 sc.SetState(SCE_MARKDOWN_EM2);
+            }
             // Strikeout
-            else if (sc.Match("~~") && sc.GetRelative(2) != ' ') {
+            else if (sc.Match("~~") && sc.GetRelative(2) != ' ' && AtTermStart(sc)) {
                 sc.SetState(SCE_MARKDOWN_STRIKEOUT);
                 sc.Forward();
             }
             // Beginning of line
-            else if (IsNewline(sc.ch))
+            else if (IsNewline(sc.ch)) {
                 sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+            }
         }
         // Advance if not holding back the cursor for this iteration.
         if (!freezeCursor)
diff --git a/scintilla/lexers/LexMatlab.cxx b/scintilla/lexers/LexMatlab.cxx
index 0d2064e8..68915af0 100644
--- a/scintilla/lexers/LexMatlab.cxx
+++ b/scintilla/lexers/LexMatlab.cxx
@@ -106,12 +106,12 @@ static void ColouriseMatlabOctaveDoc(
 				transpose = true;
 			}
 		} else if (sc.state == SCE_MATLAB_STRING) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\'') {
-				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+			if (sc.ch == '\'') {
+				if (sc.chNext == '\'') {
+ 					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+ 				}
 			}
 		} else if (sc.state == SCE_MATLAB_DOUBLEQUOTESTRING) {
 			if (sc.ch == '\\') {
diff --git a/scintilla/lexers/LexOthers.cxx b/scintilla/lexers/LexOthers.cxx
index 2062b1b1..720d9793 100644
--- a/scintilla/lexers/LexOthers.cxx
+++ b/scintilla/lexers/LexOthers.cxx
@@ -58,7 +58,7 @@ static bool IsBOperator(char ch) {
 // Tests for BATCH Separators
 static bool IsBSeparator(char ch) {
 	return (ch == '\\') || (ch == '.') || (ch == ';') ||
-		(ch == '\"') || (ch == '\'') || (ch == '/') || (ch == ')');
+		(ch == '\"') || (ch == '\'') || (ch == '/');
 }
 
 static void ColouriseBatchLine(
@@ -854,13 +854,17 @@ static void ColouriseMakeLine(
 		styler.ColourTo(endPos, SCE_MAKE_PREPROCESSOR);
 		return;
 	}
+	int varCount = 0;
 	while (i < lengthLine) {
 		if (lineBuffer[i] == '$' && lineBuffer[i + 1] == '(') {
 			styler.ColourTo(startLine + i - 1, state);
 			state = SCE_MAKE_IDENTIFIER;
+			varCount++;
 		} else if (state == SCE_MAKE_IDENTIFIER && lineBuffer[i] == ')') {
-			styler.ColourTo(startLine + i, state);
-			state = SCE_MAKE_DEFAULT;
+			if (--varCount == 0) {
+				styler.ColourTo(startLine + i, state);
+				state = SCE_MAKE_DEFAULT;
+			}
 		}
 
 		// skip identifier and target styling if this is a command line
@@ -1158,21 +1162,71 @@ static void ColouriseErrorListDoc(unsigned int startPos, int length, int, WordLi
 	}
 }
 
-static int isSpecial(char s) {
-	return (s == '\\') || (s == ',') || (s == ';') || (s == '\'') || (s == ' ') ||
-	       (s == '\"') || (s == '`') || (s == '^') || (s == '~');
+static bool latexIsSpecial(int ch) {
+	return (ch == '#') || (ch == '$') || (ch == '%') || (ch == '&') || (ch == '_') ||
+	       (ch == '{') || (ch == '}') || (ch == ' ');
 }
 
-static int isTag(int start, Accessor &styler) {
-	char s[6];
-	unsigned int i = 0, e = 1;
-	while (i < 5 && e) {
-		s[i] = styler[start + i];
+static bool latexIsBlank(int ch) {
+	return (ch == ' ') || (ch == '\t');
+}
+
+static bool latexIsBlankAndNL(int ch) {
+	return (ch == ' ') || (ch == '\t') || (ch == '\r') || (ch == '\n');
+}
+
+static bool latexIsLetter(int ch) {
+	return isascii(ch) && isalpha(ch);
+}
+
+static bool latexIsTagValid(int &i, int l, Accessor &styler) {
+	while (i < l) {
+		if (styler.SafeGetCharAt(i) == '{') {
+			while (i < l) {
+				i++;
+				if (styler.SafeGetCharAt(i) == '}') {
+					return true;
+				}	else if (!latexIsLetter(styler.SafeGetCharAt(i)) &&
+                   styler.SafeGetCharAt(i)!='*') {
+					return false;
+				}
+			}
+		} else if (!latexIsBlank(styler.SafeGetCharAt(i))) {
+			return false;
+		}
 		i++;
-		e = (strchr("{ \t", styler[start + i]) == NULL);
+	}
+	return false;
+}
+
+static bool latexNextNotBlankIs(int i, int l, Accessor &styler, char needle) {
+  char ch;
+	while (i < l) {
+    ch = styler.SafeGetCharAt(i);
+		if (!latexIsBlankAndNL(ch) && ch != '*') {
+      if (ch == needle)
+        return true;
+      else
+        return false;
+		}
+		i++;
+	}
+	return false;
+}
+
+static bool latexLastWordIs(int start, Accessor &styler, const char *needle) {
+  unsigned int i = 0;
+	unsigned int l = static_cast<unsigned int>(strlen(needle));
+	int ini = start-l+1;
+	char s[32];
+
+	while (i < l && i < 32) {
+		s[i] = styler.SafeGetCharAt(ini + i);
+    i++;
 	}
 	s[i] = '\0';
-	return (strcmp(s, "begin") == 0) || (strcmp(s, "end") == 0);
+
+	return (strcmp(s, needle) == 0);
 }
 
 static void ColouriseLatexDoc(unsigned int startPos, int length, int initStyle,
@@ -1181,39 +1235,51 @@ static void ColouriseLatexDoc(unsigned int startPos, int length, int initStyle,
 	styler.StartAt(startPos);
 
 	int state = initStyle;
-	char chNext = styler[startPos];
+	char chNext = styler.SafeGetCharAt(startPos);
 	styler.StartSegment(startPos);
 	int lengthDoc = startPos + length;
+  char chVerbatimDelim = '\0';
 
 	for (int i = startPos; i < lengthDoc; i++) {
 		char ch = chNext;
 		chNext = styler.SafeGetCharAt(i + 1);
 
 		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
 			i++;
+			chNext = styler.SafeGetCharAt(i + 1);
 			continue;
 		}
+
 		switch (state) {
 		case SCE_L_DEFAULT :
 			switch (ch) {
 			case '\\' :
 				styler.ColourTo(i - 1, state);
-				if (isSpecial(styler[i + 1])) {
-					styler.ColourTo(i + 1, SCE_L_COMMAND);
-					i++;
-					chNext = styler.SafeGetCharAt(i + 1);
+				if (latexIsSpecial(chNext)) {
+					state = SCE_L_SPECIAL;
 				} else {
-					if (isTag(i + 1, styler))
-						state = SCE_L_TAG;
-					else
+					if (latexIsLetter(chNext)) {
 						state = SCE_L_COMMAND;
+					}	else {
+						if (chNext == '(' || chNext == '[') {
+							styler.ColourTo(i-1, state);
+							styler.ColourTo(i+1, SCE_L_SHORTCMD);
+							state = SCE_L_MATH;
+							if (chNext == '[')
+								state = SCE_L_MATH2;
+							i++;
+							chNext = styler.SafeGetCharAt(i+1);
+						} else {
+							state = SCE_L_SHORTCMD;
+						}
+					}
 				}
 				break;
 			case '$' :
 				styler.ColourTo(i - 1, state);
 				state = SCE_L_MATH;
 				if (chNext == '$') {
+					state = SCE_L_MATH2;
 					i++;
 					chNext = styler.SafeGetCharAt(i + 1);
 				}
@@ -1224,29 +1290,124 @@ static void ColouriseLatexDoc(unsigned int startPos, int length, int initStyle,
 				break;
 			}
 			break;
+		case SCE_L_ERROR:
+			styler.ColourTo(i-1, state);
+			state = SCE_L_DEFAULT;
+			break;
+		case SCE_L_SPECIAL:
+		case SCE_L_SHORTCMD:
+			styler.ColourTo(i, state);
+			state = SCE_L_DEFAULT;
+			break;
 		case SCE_L_COMMAND :
-			if (chNext == '[' || chNext == '{' || chNext == '}' ||
-			        chNext == ' ' || chNext == '\r' || chNext == '\n') {
+			if (!latexIsLetter(chNext)) {
 				styler.ColourTo(i, state);
 				state = SCE_L_DEFAULT;
-				i++;
-				chNext = styler.SafeGetCharAt(i + 1);
+        if (latexNextNotBlankIs(i+1, lengthDoc, styler, '[' )) {
+          state = SCE_L_CMDOPT;
+				} else if (latexLastWordIs(i, styler, "\\begin")) {
+					state = SCE_L_TAG;
+				} else if (latexLastWordIs(i, styler, "\\end")) {
+					state = SCE_L_TAG2;
+				} else if (latexLastWordIs(i, styler, "\\verb") &&
+                   chNext != '*' && chNext != ' ') {
+          chVerbatimDelim = chNext;
+					state = SCE_L_VERBATIM;
+				}
 			}
 			break;
+		case SCE_L_CMDOPT :
+      if (ch == ']') {
+        styler.ColourTo(i, state);
+        state = SCE_L_DEFAULT;
+      }
+			break;
 		case SCE_L_TAG :
-			if (ch == '}') {
+			if (latexIsTagValid(i, lengthDoc, styler)) {
+				styler.ColourTo(i, state);
+				state = SCE_L_DEFAULT;
+				if (latexLastWordIs(i, styler, "{verbatim}")) {
+					state = SCE_L_VERBATIM;
+				} else if (latexLastWordIs(i, styler, "{comment}")) {
+					state = SCE_L_COMMENT2;
+				} else if (latexLastWordIs(i, styler, "{math}")) {
+					state = SCE_L_MATH;
+				} else if (latexLastWordIs(i, styler, "{displaymath}")) {
+					state = SCE_L_MATH2;
+				} else if (latexLastWordIs(i, styler, "{equation}")) {
+					state = SCE_L_MATH2;
+				}
+			} else {
+				state = SCE_L_ERROR;
 				styler.ColourTo(i, state);
 				state = SCE_L_DEFAULT;
 			}
+			chNext = styler.SafeGetCharAt(i+1);
+			break;
+		case SCE_L_TAG2 :
+			if (latexIsTagValid(i, lengthDoc, styler)) {
+				styler.ColourTo(i, state);
+				state = SCE_L_DEFAULT;
+			} else {
+				state = SCE_L_ERROR;
+			}
+			chNext = styler.SafeGetCharAt(i+1);
 			break;
 		case SCE_L_MATH :
 			if (ch == '$') {
-				if (chNext == '$') {
-					i++;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
 				styler.ColourTo(i, state);
 				state = SCE_L_DEFAULT;
+			} else if (ch == '\\' && chNext == ')') {
+				styler.ColourTo(i-1, state);
+				styler.ColourTo(i+1, SCE_L_SHORTCMD);
+				i++;
+				chNext = styler.SafeGetCharAt(i+1);
+				state = SCE_L_DEFAULT;
+			} else if (ch == '\\') {
+				int match = i + 3;
+				if (latexLastWordIs(match, styler, "\\end")) {
+					match++;
+					if (latexIsTagValid(match, lengthDoc, styler)) {
+						if (latexLastWordIs(match, styler, "{math}")) {
+							styler.ColourTo(i-1, state);
+							state = SCE_L_COMMAND;
+						}
+					}
+				}
+			}
+
+			break;
+		case SCE_L_MATH2 :
+			if (ch == '$') {
+        if (chNext == '$') {
+          i++;
+          chNext = styler.SafeGetCharAt(i + 1);
+          styler.ColourTo(i, state);
+          state = SCE_L_DEFAULT;
+        } else {
+          styler.ColourTo(i, SCE_L_ERROR);
+          state = SCE_L_DEFAULT;
+        }
+			} else if (ch == '\\' && chNext == ']') {
+				styler.ColourTo(i-1, state);
+				styler.ColourTo(i+1, SCE_L_SHORTCMD);
+				i++;
+				chNext = styler.SafeGetCharAt(i+1);
+				state = SCE_L_DEFAULT;
+			} else if (ch == '\\') {
+				int match = i + 3;
+				if (latexLastWordIs(match, styler, "\\end")) {
+					match++;
+					if (latexIsTagValid(match, lengthDoc, styler)) {
+						if (latexLastWordIs(match, styler, "{displaymath}")) {
+							styler.ColourTo(i-1, state);
+							state = SCE_L_COMMAND;
+						} else if (latexLastWordIs(match, styler, "{equation}")) {
+							styler.ColourTo(i-1, state);
+							state = SCE_L_COMMAND;
+						}
+					}
+				}
 			}
 			break;
 		case SCE_L_COMMENT :
@@ -1254,6 +1415,43 @@ static void ColouriseLatexDoc(unsigned int startPos, int length, int initStyle,
 				styler.ColourTo(i - 1, state);
 				state = SCE_L_DEFAULT;
 			}
+			break;
+		case SCE_L_COMMENT2 :
+			if (ch == '\\') {
+				int match = i + 3;
+				if (latexLastWordIs(match, styler, "\\end")) {
+					match++;
+					if (latexIsTagValid(match, lengthDoc, styler)) {
+						if (latexLastWordIs(match, styler, "{comment}")) {
+							styler.ColourTo(i-1, state);
+							state = SCE_L_COMMAND;
+						}
+					}
+				}
+			}
+			break;
+		case SCE_L_VERBATIM :
+			if (ch == '\\') {
+				int match = i + 3;
+				if (latexLastWordIs(match, styler, "\\end")) {
+					match++;
+					if (latexIsTagValid(match, lengthDoc, styler)) {
+						if (latexLastWordIs(match, styler, "{verbatim}")) {
+							styler.ColourTo(i-1, state);
+							state = SCE_L_COMMAND;
+						}
+					}
+				}
+			} else if (chNext == chVerbatimDelim) {
+        styler.ColourTo(i+1, state);
+				state = SCE_L_DEFAULT;
+        chVerbatimDelim = '\0';
+      } else if (chVerbatimDelim != '\0' && (ch == '\n' || ch == '\r')) {
+        styler.ColourTo(i, SCE_L_ERROR);
+				state = SCE_L_DEFAULT;
+        chVerbatimDelim = '\0';
+      }
+			break;
 		}
 	}
 	styler.ColourTo(lengthDoc-1, state);
diff --git a/scintilla/lexers/LexPerl.cxx b/scintilla/lexers/LexPerl.cxx
index bc313a93..8a0f6422 100644
--- a/scintilla/lexers/LexPerl.cxx
+++ b/scintilla/lexers/LexPerl.cxx
@@ -1,6 +1,7 @@
 // Scintilla source code edit control
 /** @file LexPerl.cxx
  ** Lexer for Perl.
+ ** Converted to lexer object by "Udo Lechner" <dlchnr(at)gmx(dot)net>
  **/
 // Copyright 1998-2008 by Neil Hodgson <neilh@scintilla.org>
 // Lexical analysis fixes by Kein-Hong Man <mkh@pl.jaring.my>
@@ -13,16 +14,23 @@
 #include <assert.h>
 #include <ctype.h>
 
+#ifdef _MSC_VER
+#pragma warning(disable: 4786)
+#endif
+
+#include <string>
+#include <map>
+
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
 
 #include "WordList.h"
 #include "LexAccessor.h"
-#include "Accessor.h"
 #include "StyleContext.h"
 #include "CharacterSet.h"
 #include "LexerModule.h"
+#include "OptionSet.h"
 
 #ifdef SCI_NAMESPACE
 using namespace Scintilla;
@@ -61,8 +69,11 @@ using namespace Scintilla;
 #define BACK_OPERATOR	1	// whitespace/comments are insignificant
 #define BACK_KEYWORD	2	// operators/keywords are needed for disambiguation
 
-static bool isPerlKeyword(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler)
-{
+// all interpolated styles are different from their parent styles by a constant difference
+// we also assume SCE_PL_STRING_VAR is the interpolated style with the smallest value
+#define	INTERPOLATE_SHIFT	(SCE_PL_STRING_VAR - SCE_PL_STRING)
+
+static bool isPerlKeyword(unsigned int start, unsigned int end, WordList &keywords, LexAccessor &styler) {
 	// old-style keyword matcher; needed because GetCurrent() needs
 	// current segment to be committed, but we may abandon early...
 	char s[100];
@@ -73,9 +84,8 @@ static bool isPerlKeyword(unsigned int start, unsigned int end, WordList &keywor
 	return keywords.InList(s);
 }
 
-static int disambiguateBareword(Accessor &styler, unsigned int bk, unsigned int fw,
-                                int backFlag, unsigned int backPos, unsigned int endPos)
-{
+static int disambiguateBareword(LexAccessor &styler, unsigned int bk, unsigned int fw,
+        int backFlag, unsigned int backPos, unsigned int endPos) {
 	// identifiers are recognized by Perl as barewords under some
 	// conditions, the following attempts to do the disambiguation
 	// by looking backward and forward; result in 2 LSB
@@ -96,25 +106,25 @@ static int disambiguateBareword(Accessor &styler, unsigned int bk, unsigned int
 		// {bareword: possible variable spec
 		brace = true;
 	} else if ((ch == '&' && styler.SafeGetCharAt(bk - 1) != '&')
-			// &bareword: subroutine call
-			   || styler.Match(bk - 1, "->")
-			// ->bareword: part of variable spec
-			   || styler.Match(bk - 2, "sub")) {
-			// sub bareword: subroutine declaration
-			// (implied BACK_KEYWORD, no keywords end in 'sub'!)
+	        // &bareword: subroutine call
+	        || styler.Match(bk - 1, "->")
+	        // ->bareword: part of variable spec
+	        || styler.Match(bk - 2, "sub")) {
+		// sub bareword: subroutine declaration
+		// (implied BACK_KEYWORD, no keywords end in 'sub'!)
 		result |= 1;
 	}
 	// next, scan forward after word past tab/spaces only;
 	// if ch isn't one of '[{(,' we can skip the test
 	if ((ch == '{' || ch == '(' || ch == '['|| ch == ',')
-		&& fw < endPos) {
+	        && fw < endPos) {
 		while (ch = static_cast<unsigned char>(styler.SafeGetCharAt(fw)),
-			   IsASpaceOrTab(ch) && fw < endPos) {
+		        IsASpaceOrTab(ch) && fw < endPos) {
 			fw++;
 		}
 		if ((ch == '}' && brace)
-			// {bareword}: variable spec
-			|| styler.Match(fw, "=>")) {
+		        // {bareword}: variable spec
+		        || styler.Match(fw, "=>")) {
 			// [{(, bareword=>: hash literal
 			result |= 2;
 		}
@@ -122,17 +132,15 @@ static int disambiguateBareword(Accessor &styler, unsigned int bk, unsigned int
 	return result;
 }
 
-static void skipWhitespaceComment(Accessor &styler, unsigned int &p)
-{
+static void skipWhitespaceComment(LexAccessor &styler, unsigned int &p) {
 	// when backtracking, we need to skip whitespace and comments
 	int style;
 	while ((p > 0) && (style = styler.StyleAt(p),
-		   style == SCE_PL_DEFAULT || style == SCE_PL_COMMENTLINE))
+	        style == SCE_PL_DEFAULT || style == SCE_PL_COMMENTLINE))
 		p--;
 }
 
-static int styleBeforeBracePair(Accessor &styler, unsigned int bk)
-{
+static int styleBeforeBracePair(LexAccessor &styler, unsigned int bk) {
 	// backtrack to find open '{' corresponding to a '}', balanced
 	// return significant style to be tested for '/' disambiguation
 	int braceCount = 1;
@@ -159,8 +167,7 @@ static int styleBeforeBracePair(Accessor &styler, unsigned int bk)
 	return SCE_PL_DEFAULT;
 }
 
-static int styleCheckIdentifier(Accessor &styler, unsigned int bk)
-{
+static int styleCheckIdentifier(LexAccessor &styler, unsigned int bk) {
 	// backtrack to classify sub-styles of identifier under test
 	// return sub-style to be tested for '/' disambiguation
 	if (styler.SafeGetCharAt(bk) == '>')	// inputsymbol, like <foo>
@@ -172,7 +179,7 @@ static int styleCheckIdentifier(Accessor &styler, unsigned int bk)
 	while (bk > 0) {
 		int bkstyle = styler.StyleAt(bk);
 		if (bkstyle == SCE_PL_DEFAULT
-			|| bkstyle == SCE_PL_COMMENTLINE) {
+		        || bkstyle == SCE_PL_COMMENTLINE) {
 			// skip whitespace, comments
 		} else if (bkstyle == SCE_PL_OPERATOR) {
 			// test for "->" and "::"
@@ -185,8 +192,7 @@ static int styleCheckIdentifier(Accessor &styler, unsigned int bk)
 	return 0;
 }
 
-static int inputsymbolScan(Accessor &styler, unsigned int pos, unsigned int endPos)
-{
+static int inputsymbolScan(LexAccessor &styler, unsigned int pos, unsigned int endPos) {
 	// looks forward for matching > on same line; a bit ugly
 	unsigned int fw = pos;
 	while (++fw < endPos) {
@@ -202,8 +208,7 @@ static int inputsymbolScan(Accessor &styler, unsigned int pos, unsigned int endP
 	return 0;
 }
 
-static int podLineScan(Accessor &styler, unsigned int &pos, unsigned int endPos)
-{
+static int podLineScan(LexAccessor &styler, unsigned int &pos, unsigned int endPos) {
 	// forward scan the current line to classify line for POD style
 	int state = -1;
 	while (pos <= endPos) {
@@ -227,8 +232,7 @@ static int podLineScan(Accessor &styler, unsigned int &pos, unsigned int endPos)
 	return state;
 }
 
-static bool styleCheckSubPrototype(Accessor &styler, unsigned int bk)
-{
+static bool styleCheckSubPrototype(LexAccessor &styler, unsigned int bk) {
 	// backtrack to identify if we're starting a subroutine prototype
 	// we also need to ignore whitespace/comments:
 	// 'sub' [whitespace|comment] <identifier> [whitespace|comment]
@@ -241,20 +245,11 @@ static bool styleCheckSubPrototype(Accessor &styler, unsigned int bk)
 	}
 	skipWhitespaceComment(styler, bk);
 	if (bk < 2 || styler.StyleAt(bk) != SCE_PL_WORD	// check "sub" keyword
-		|| !styler.Match(bk - 2, "sub"))	// assume suffix is unique!
+	        || !styler.Match(bk - 2, "sub"))	// assume suffix is unique!
 		return false;
 	return true;
 }
 
-static bool isMatch(const char *sref, char *s)
-{
-	// match per-line delimiter - must kill trailing CR if CRLF
-	int i = strlen(s);
-	if (i != 0 && s[i - 1] == '\r')
-		s[i - 1] = '\0';
-	return (strcmp(sref, s) == 0);
-}
-
 static int actualNumStyle(int numberStyle) {
 	if (numberStyle == PERLNUM_VECTOR || numberStyle == PERLNUM_V_VECTOR) {
 		return SCE_PL_STRING;
@@ -272,18 +267,262 @@ static int opposite(int ch) {
 	return ch;
 }
 
-static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
-                             WordList *keywordlists[], Accessor &styler) {
+static bool IsCommentLine(int line, LexAccessor &styler) {
+	int pos = styler.LineStart(line);
+	int eol_pos = styler.LineStart(line + 1) - 1;
+	for (int i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (ch == '#' && style == SCE_PL_COMMENTLINE)
+			return true;
+		else if (!IsASpaceOrTab(ch))
+			return false;
+	}
+	return false;
+}
 
-	WordList &keywords = *keywordlists[0];
+static bool IsPackageLine(int line, LexAccessor &styler) {
+	int pos = styler.LineStart(line);
+	int style = styler.StyleAt(pos);
+	if (style == SCE_PL_WORD && styler.Match(pos, "package")) {
+		return true;
+	}
+	return false;
+}
+
+static int PodHeadingLevel(int pos, LexAccessor &styler) {
+	int lvl = static_cast<unsigned char>(styler.SafeGetCharAt(pos + 5));
+	if (lvl >= '1' && lvl <= '4') {
+		return lvl - '0';
+	}
+	return 0;
+}
+
+// An individual named option for use in an OptionSet
+
+// Options used for LexerPerl
+struct OptionsPerl {
+	bool fold;
+	bool foldComment;
+	bool foldCompact;
+	// Custom folding of POD and packages
+	bool foldPOD;            // fold.perl.pod
+	// Enable folding Pod blocks when using the Perl lexer.
+	bool foldPackage;        // fold.perl.package
+	// Enable folding packages when using the Perl lexer.
+
+	bool foldCommentExplicit;
+
+	bool foldAtElse;
+
+	OptionsPerl() {
+		fold = false;
+		foldComment = false;
+		foldCompact = true;
+		foldPOD = true;
+		foldPackage = true;
+		foldCommentExplicit = true;
+		foldAtElse = false;
+	}
+};
+
+static const char *const perlWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+struct OptionSetPerl : public OptionSet<OptionsPerl> {
+	OptionSetPerl() {
+		DefineProperty("fold", &OptionsPerl::fold);
+
+		DefineProperty("fold.comment", &OptionsPerl::foldComment);
+
+		DefineProperty("fold.compact", &OptionsPerl::foldCompact);
+
+		DefineProperty("fold.perl.pod", &OptionsPerl::foldPOD,
+		        "Set to 0 to disable folding Pod blocks when using the Perl lexer.");
+
+		DefineProperty("fold.perl.package", &OptionsPerl::foldPackage,
+		        "Set to 0 to disable folding packages when using the Perl lexer.");
+
+		DefineProperty("fold.perl.comment.explicit", &OptionsPerl::foldCommentExplicit,
+		        "Set to 0 to disable explicit folding.");
+
+		DefineProperty("fold.perl.at.else", &OptionsPerl::foldAtElse,
+		               "This option enables Perl folding on a \"} else {\" line of an if statement.");
+
+		DefineWordListSets(perlWordListDesc);
+	}
+};
+
+class LexerPerl : public ILexer {
+	CharacterSet setWordStart;
+	CharacterSet setWord;
+	CharacterSet setSpecialVar;
+	CharacterSet setControlVar;
+	WordList keywords;
+	OptionsPerl options;
+	OptionSetPerl osPerl;
+public:
+	LexerPerl() :
+		setWordStart(CharacterSet::setAlpha, "_", 0x80, true),
+		setWord(CharacterSet::setAlphaNum, "_", 0x80, true),
+		setSpecialVar(CharacterSet::setNone, "\"$;<>&`'+,./\\%:=~!?@[]"),
+		setControlVar(CharacterSet::setNone, "ACDEFHILMNOPRSTVWX") {
+	}
+	~LexerPerl() {
+	}
+	void SCI_METHOD Release() {
+		delete this;
+	}
+	int SCI_METHOD Version() const {
+		return lvOriginal;
+	}
+	const char *SCI_METHOD PropertyNames() {
+		return osPerl.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) {
+		return osPerl.PropertyType(name);
+	}
+	const char *SCI_METHOD DescribeProperty(const char *name) {
+		return osPerl.DescribeProperty(name);
+	}
+	int SCI_METHOD PropertySet(const char *key, const char *val);
+	const char *SCI_METHOD DescribeWordListSets() {
+		return osPerl.DescribeWordListSets();
+	}
+	int SCI_METHOD WordListSet(int n, const char *wl);
+	void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess);
+	void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess);
+
+	void *SCI_METHOD PrivateCall(int, void *) {
+		return 0;
+	}
+
+	static ILexer *LexerFactoryPerl() {
+		return new LexerPerl();
+	}
+	void InterpolateSegment(StyleContext &sc, int maxSeg, bool isPattern=false);
+};
+
+int SCI_METHOD LexerPerl::PropertySet(const char *key, const char *val) {
+	if (osPerl.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+int SCI_METHOD LexerPerl::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	}
+	int firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void LexerPerl::InterpolateSegment(StyleContext &sc, int maxSeg, bool isPattern) {
+	// interpolate a segment (with no active backslashes or delimiters within)
+	// switch in or out of an interpolation style or continue current style
+	// commit variable patterns if found, trim segment, repeat until done
+	while (maxSeg > 0) {
+		bool isVar = false;
+		int sLen = 0;
+		if ((maxSeg > 1) && (sc.ch == '$' || sc.ch == '@')) {
+			// $#[$]*word [$@][$]*word (where word or {word} is always present)
+			bool braces = false;
+			sLen = 1;
+			if (sc.ch == '$' && sc.chNext == '#') {	// starts with $#
+				sLen++;
+			}
+			while ((maxSeg > sLen) && (sc.GetRelative(sLen) == '$'))	// >0 $ dereference within
+				sLen++;
+			if ((maxSeg > sLen) && (sc.GetRelative(sLen) == '{')) {	// { start for {word}
+				sLen++;
+				braces = true;
+			}
+			if (maxSeg > sLen) {
+				int c = sc.GetRelative(sLen);
+				if (setWordStart.Contains(c)) {	// word (various)
+					sLen++;
+					isVar = true;
+					while ((maxSeg > sLen) && setWord.Contains(sc.GetRelative(sLen)))
+						sLen++;
+				} else if (braces && IsADigit(c) && (sLen == 2)) {	// digit for ${digit}
+					sLen++;
+					isVar = true;
+				}
+			}
+			if (braces) {
+				if ((maxSeg > sLen) && (sc.GetRelative(sLen) == '}')) {	// } end for {word}
+					sLen++;
+				} else
+					isVar = false;
+			}
+		}
+		if (!isVar && (maxSeg > 1)) {	// $- or @-specific variable patterns
+			sLen = 1;
+			int c = sc.chNext;
+			if (sc.ch == '$') {
+				if (IsADigit(c)) {	// $[0-9] and slurp trailing digits
+					sLen++;
+					isVar = true;
+					while ((maxSeg > sLen) && IsADigit(sc.GetRelative(sLen)))
+						sLen++;
+				} else if (setSpecialVar.Contains(c)) {	// $ special variables
+					sLen++;
+					isVar = true;
+				} else if (!isPattern && ((c == '(') || (c == ')') || (c == '|'))) {	// $ additional
+					sLen++;
+					isVar = true;
+				} else if (c == '^') {	// $^A control-char style
+					sLen++;
+					if ((maxSeg > sLen) && setControlVar.Contains(sc.GetRelative(sLen))) {
+						sLen++;
+						isVar = true;
+					}
+				}
+			} else if (sc.ch == '@') {
+				if (!isPattern && ((c == '+') || (c == '-'))) {	// @ specials non-pattern
+					sLen++;
+					isVar = true;
+				}
+			}
+		}
+		if (isVar) {	// commit as interpolated variable or normal character
+			if (sc.state < SCE_PL_STRING_VAR)
+				sc.SetState(sc.state + INTERPOLATE_SHIFT);
+			sc.Forward(sLen);
+			maxSeg -= sLen;
+		} else {
+			if (sc.state >= SCE_PL_STRING_VAR)
+				sc.SetState(sc.state - INTERPOLATE_SHIFT);
+			sc.Forward();
+			maxSeg--;
+		}
+	}
+	if (sc.state >= SCE_PL_STRING_VAR)
+		sc.SetState(sc.state - INTERPOLATE_SHIFT);
+}
+
+void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
 
 	// keywords that forces /PATTERN/ at all times; should track vim's behaviour
 	WordList reWords;
 	reWords.Set("elsif if split while");
 
 	// charset classes
-	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
-	CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true);
 	CharacterSet setSingleCharOp(CharacterSet::setNone, "rwxoRWXOezsfdlpSbctugkTBMAC");
 	// lexing of "%*</" operators is non-trivial; these are missing in the set below
 	CharacterSet setPerlOperator(CharacterSet::setNone, "^&\\()-+=|{}[]:;>,?!.~");
@@ -298,7 +537,7 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 	CharacterSet &setPOD = setModifiers;
 	CharacterSet setNonHereDoc(CharacterSet::setDigits, "=$@");
 	CharacterSet setHereDocDelim(CharacterSet::setAlphaNum, "_");
-	CharacterSet setSubPrototype(CharacterSet::setNone, "\\[$@%&*];");
+	CharacterSet setSubPrototype(CharacterSet::setNone, "\\[$@%&*+];");
 	// for format identifiers
 	CharacterSet setFormatStart(CharacterSet::setAlpha, "_=");
 	CharacterSet &setFormat = setHereDocDelim;
@@ -309,9 +548,10 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 
 	class HereDocCls {	// Class to manage HERE doc sequence
 	public:
-		int State;		// 0: '<<' encountered
-						// 1: collect the delimiter
-						// 2: here doc text (lines after the delimiter)
+		int State;
+		// 0: '<<' encountered
+		// 1: collect the delimiter
+		// 2: here doc text (lines after the delimiter)
 		int Quote;		// the char after '<<'
 		bool Quoted;		// true if Quote in ('\'','"','`')
 		int DelimiterLength;	// strlen(Delimiter)
@@ -335,7 +575,7 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 	HereDocCls HereDoc;		// TODO: FIFO for stacked here-docs
 
 	class QuoteCls {	// Class to manage quote pairs
-		public:
+	public:
 		int Rep;
 		int Count;
 		int Up, Down;
@@ -367,10 +607,13 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 	// Includes strings (may be multi-line), numbers (additional state), format
 	// bodies, as well as POD sections.
 	if (initStyle == SCE_PL_HERE_Q
-		|| initStyle == SCE_PL_HERE_QQ
-		|| initStyle == SCE_PL_HERE_QX
-		|| initStyle == SCE_PL_FORMAT
-	) {
+	    || initStyle == SCE_PL_HERE_QQ
+	    || initStyle == SCE_PL_HERE_QX
+	    || initStyle == SCE_PL_FORMAT
+	    || initStyle == SCE_PL_HERE_QQ_VAR
+	    || initStyle == SCE_PL_HERE_QX_VAR
+	   ) {
+		// backtrack through multiple styles to reach the delimiter start
 		int delim = (initStyle == SCE_PL_FORMAT) ? SCE_PL_FORMAT_IDENT:SCE_PL_HERE_DELIM;
 		while ((startPos > 1) && (styler.StyleAt(startPos) != delim)) {
 			startPos--;
@@ -378,28 +621,47 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 		startPos = styler.LineStart(styler.GetLine(startPos));
 		initStyle = styler.StyleAt(startPos - 1);
 	}
-	if (initStyle == SCE_PL_STRING_Q
-		|| initStyle == SCE_PL_STRING_QQ
-		|| initStyle == SCE_PL_STRING_QX
-		|| initStyle == SCE_PL_STRING_QR
-		|| initStyle == SCE_PL_STRING_QW
-		|| initStyle == SCE_PL_REGEX
-		|| initStyle == SCE_PL_REGSUBST
-		|| initStyle == SCE_PL_STRING
-		|| initStyle == SCE_PL_BACKTICKS
-		|| initStyle == SCE_PL_CHARACTER
-		|| initStyle == SCE_PL_NUMBER
-		|| initStyle == SCE_PL_IDENTIFIER
-		|| initStyle == SCE_PL_ERROR
-		|| initStyle == SCE_PL_SUB_PROTOTYPE
-	) {
+	if (initStyle == SCE_PL_STRING
+	    || initStyle == SCE_PL_STRING_QQ
+	    || initStyle == SCE_PL_BACKTICKS
+	    || initStyle == SCE_PL_STRING_QX
+	    || initStyle == SCE_PL_REGEX
+	    || initStyle == SCE_PL_STRING_QR
+	    || initStyle == SCE_PL_REGSUBST
+	    || initStyle == SCE_PL_STRING_VAR
+	    || initStyle == SCE_PL_STRING_QQ_VAR
+	    || initStyle == SCE_PL_BACKTICKS_VAR
+	    || initStyle == SCE_PL_STRING_QX_VAR
+	    || initStyle == SCE_PL_REGEX_VAR
+	    || initStyle == SCE_PL_STRING_QR_VAR
+	    || initStyle == SCE_PL_REGSUBST_VAR
+	   ) {
+		// for interpolation, must backtrack through a mix of two different styles
+		int otherStyle = (initStyle >= SCE_PL_STRING_VAR) ?
+			initStyle - INTERPOLATE_SHIFT : initStyle + INTERPOLATE_SHIFT;
+		while (startPos > 1) {
+			int st = styler.StyleAt(startPos - 1);
+			if ((st != initStyle) && (st != otherStyle))
+				break;
+			startPos--;
+		}
+		initStyle = SCE_PL_DEFAULT;
+	} else if (initStyle == SCE_PL_STRING_Q
+	        || initStyle == SCE_PL_STRING_QW
+	        || initStyle == SCE_PL_XLAT
+	        || initStyle == SCE_PL_CHARACTER
+	        || initStyle == SCE_PL_NUMBER
+	        || initStyle == SCE_PL_IDENTIFIER
+	        || initStyle == SCE_PL_ERROR
+	        || initStyle == SCE_PL_SUB_PROTOTYPE
+	   ) {
 		while ((startPos > 1) && (styler.StyleAt(startPos - 1) == initStyle)) {
 			startPos--;
 		}
 		initStyle = SCE_PL_DEFAULT;
 	} else if (initStyle == SCE_PL_POD
-			   || initStyle == SCE_PL_POD_VERB
-	) {
+	        || initStyle == SCE_PL_POD_VERB
+	          ) {
 		// POD backtracking finds preceeding blank lines and goes back past them
 		int ln = styler.GetLine(startPos);
 		if (ln > 0) {
@@ -437,201 +699,233 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 
 		// Determine if the current state should terminate.
 		switch (sc.state) {
-			case SCE_PL_OPERATOR:
+		case SCE_PL_OPERATOR:
+			sc.SetState(SCE_PL_DEFAULT);
+			backFlag = BACK_OPERATOR;
+			backPos = sc.currentPos;
+			break;
+		case SCE_PL_IDENTIFIER:		// identifier, bareword, inputsymbol
+			if ((!setWord.Contains(sc.ch) && sc.ch != '\'')
+			        || sc.Match('.', '.')
+			        || sc.chPrev == '>') {	// end of inputsymbol
 				sc.SetState(SCE_PL_DEFAULT);
-				backFlag = BACK_OPERATOR;
-				backPos = sc.currentPos;
-				break;
-			case SCE_PL_IDENTIFIER:		// identifier, bareword, inputsymbol
-				if ((!setWord.Contains(sc.ch) && sc.ch != '\'')
-					|| sc.Match('.', '.')
-					|| sc.chPrev == '>') {	// end of inputsymbol
-					sc.SetState(SCE_PL_DEFAULT);
-				}
-				break;
-			case SCE_PL_WORD:		// keyword, plus special cases
-				if (!setWord.Contains(sc.ch)) {
-					char s[100];
-					sc.GetCurrent(s, sizeof(s));
-					if ((strcmp(s, "__DATA__") == 0) || (strcmp(s, "__END__") == 0)) {
-						sc.ChangeState(SCE_PL_DATASECTION);
+			}
+			break;
+		case SCE_PL_WORD:		// keyword, plus special cases
+			if (!setWord.Contains(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if ((strcmp(s, "__DATA__") == 0) || (strcmp(s, "__END__") == 0)) {
+					sc.ChangeState(SCE_PL_DATASECTION);
+				} else {
+					if ((strcmp(s, "format") == 0)) {
+						sc.SetState(SCE_PL_FORMAT_IDENT);
+						HereDoc.State = 0;
 					} else {
-						if ((strcmp(s, "format") == 0)) {
-							sc.SetState(SCE_PL_FORMAT_IDENT);
-							HereDoc.State = 0;
-						} else {
-							sc.SetState(SCE_PL_DEFAULT);
-						}
-						backFlag = BACK_KEYWORD;
-						backPos = sc.currentPos;
+						sc.SetState(SCE_PL_DEFAULT);
 					}
+					backFlag = BACK_KEYWORD;
+					backPos = sc.currentPos;
 				}
-				break;
-			case SCE_PL_SCALAR:
-			case SCE_PL_ARRAY:
-			case SCE_PL_HASH:
-			case SCE_PL_SYMBOLTABLE:
-				if (sc.Match(':', ':')) {	// skip ::
+			}
+			break;
+		case SCE_PL_SCALAR:
+		case SCE_PL_ARRAY:
+		case SCE_PL_HASH:
+		case SCE_PL_SYMBOLTABLE:
+			if (sc.Match(':', ':')) {	// skip ::
+				sc.Forward();
+			} else if (!setVar.Contains(sc.ch)) {
+				if (sc.LengthCurrent() == 1) {
+					// Special variable: $(, $_ etc.
 					sc.Forward();
-				} else if (!setVar.Contains(sc.ch)) {
-					if (sc.LengthCurrent() == 1) {
-						// Special variable: $(, $_ etc.
+				}
+				sc.SetState(SCE_PL_DEFAULT);
+			}
+			break;
+		case SCE_PL_NUMBER:
+			// if no early break, number style is terminated at "(go through)"
+			if (sc.ch == '.') {
+				if (sc.chNext == '.') {
+					// double dot is always an operator (go through)
+				} else if (numState <= PERLNUM_FLOAT_EXP) {
+					// non-decimal number or float exponent, consume next dot
+					sc.SetState(SCE_PL_OPERATOR);
+					break;
+				} else {	// decimal or vectors allows dots
+					dotCount++;
+					if (numState == PERLNUM_DECIMAL) {
+						if (dotCount <= 1)	// number with one dot in it
+							break;
+						if (IsADigit(sc.chNext)) {	// really a vector
+							numState = PERLNUM_VECTOR;
+							break;
+						}
+						// number then dot (go through)
+					} else if (IsADigit(sc.chNext))	// vectors
+						break;
+					// vector then dot (go through)
+				}
+			} else if (sc.ch == '_') {
+				// permissive underscoring for number and vector literals
+				break;
+			} else if (numState == PERLNUM_DECIMAL) {
+				if (sc.ch == 'E' || sc.ch == 'e') {	// exponent, sign
+					numState = PERLNUM_FLOAT_EXP;
+					if (sc.chNext == '+' || sc.chNext == '-') {
 						sc.Forward();
 					}
-					sc.SetState(SCE_PL_DEFAULT);
+					break;
+				} else if (IsADigit(sc.ch))
+					break;
+				// number then word (go through)
+			} else if (numState == PERLNUM_HEX) {
+				if (IsADigit(sc.ch, 16))
+					break;
+			} else if (numState == PERLNUM_VECTOR || numState == PERLNUM_V_VECTOR) {
+				if (IsADigit(sc.ch))	// vector
+					break;
+				if (setWord.Contains(sc.ch) && dotCount == 0) {	// change to word
+					sc.ChangeState(SCE_PL_IDENTIFIER);
+					break;
 				}
+				// vector then word (go through)
+			} else if (IsADigit(sc.ch)) {
+				if (numState == PERLNUM_FLOAT_EXP) {
+					break;
+				} else if (numState == PERLNUM_OCTAL) {
+					if (sc.ch <= '7') break;
+				} else if (numState == PERLNUM_BINARY) {
+					if (sc.ch <= '1') break;
+				}
+				// mark invalid octal, binary numbers (go through)
+				numState = PERLNUM_BAD;
 				break;
-			case SCE_PL_NUMBER:
-				// if no early break, number style is terminated at "(go through)"
-				if (sc.ch == '.') {
-					if (sc.chNext == '.') {
-						// double dot is always an operator (go through)
-					} else if (numState <= PERLNUM_FLOAT_EXP) {
-						// non-decimal number or float exponent, consume next dot
-						sc.SetState(SCE_PL_OPERATOR);
-						break;
-					} else {	// decimal or vectors allows dots
-						dotCount++;
-						if (numState == PERLNUM_DECIMAL) {
-							if (dotCount <= 1)	// number with one dot in it
-								break;
-							if (IsADigit(sc.chNext)) {	// really a vector
-								numState = PERLNUM_VECTOR;
-								break;
-							}
-							// number then dot (go through)
-						} else if (IsADigit(sc.chNext))	// vectors
-							break;
-						// vector then dot (go through)
-					}
-				} else if (sc.ch == '_') {
-					// permissive underscoring for number and vector literals
-					break;
-				} else if (numState == PERLNUM_DECIMAL) {
-					if (sc.ch == 'E' || sc.ch == 'e') {	// exponent, sign
-						numState = PERLNUM_FLOAT_EXP;
-						if (sc.chNext == '+' || sc.chNext == '-') {
-							sc.Forward();
-						}
-						break;
-					} else if (IsADigit(sc.ch))
-						break;
-					// number then word (go through)
-				} else if (numState == PERLNUM_HEX) {
-					if (IsADigit(sc.ch, 16))
-						break;
-				} else if (numState == PERLNUM_VECTOR || numState == PERLNUM_V_VECTOR) {
-					if (IsADigit(sc.ch))	// vector
-						break;
-					if (setWord.Contains(sc.ch) && dotCount == 0) {	// change to word
-						sc.ChangeState(SCE_PL_IDENTIFIER);
-						break;
-					}
-					// vector then word (go through)
-				} else if (IsADigit(sc.ch)) {
-					if (numState == PERLNUM_FLOAT_EXP) {
-						break;
-					} else if (numState == PERLNUM_OCTAL) {
-						if (sc.ch <= '7') break;
-					} else if (numState == PERLNUM_BINARY) {
-						if (sc.ch <= '1') break;
-					}
-					// mark invalid octal, binary numbers (go through)
-					numState = PERLNUM_BAD;
-					break;
-				}
-				// complete current number or vector
-				sc.ChangeState(actualNumStyle(numState));
+			}
+			// complete current number or vector
+			sc.ChangeState(actualNumStyle(numState));
+			sc.SetState(SCE_PL_DEFAULT);
+			break;
+		case SCE_PL_COMMENTLINE:
+			if (sc.atLineEnd) {
 				sc.SetState(SCE_PL_DEFAULT);
-				break;
-			case SCE_PL_COMMENTLINE:
-				if (sc.atLineEnd) {
-					sc.SetState(SCE_PL_DEFAULT);
-				}
-				break;
-			case SCE_PL_HERE_DELIM:
-				if (HereDoc.State == 0) { // '<<' encountered
-					int delim_ch = sc.chNext;
-					int ws_skip = 0;
-					HereDoc.State = 1;	// pre-init HERE doc class
-					HereDoc.Quote = sc.chNext;
-					HereDoc.Quoted = false;
-					HereDoc.DelimiterLength = 0;
-					HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-					if (IsASpaceOrTab(delim_ch)) {
-						// skip whitespace; legal only for quoted delimiters
-						unsigned int i = sc.currentPos + 1;
-						while ((i < endPos) && IsASpaceOrTab(delim_ch)) {
-							i++;
-							delim_ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
-						}
-						ws_skip = i - sc.currentPos - 1;
+			}
+			break;
+		case SCE_PL_HERE_DELIM:
+			if (HereDoc.State == 0) { // '<<' encountered
+				int delim_ch = sc.chNext;
+				int ws_skip = 0;
+				HereDoc.State = 1;	// pre-init HERE doc class
+				HereDoc.Quote = sc.chNext;
+				HereDoc.Quoted = false;
+				HereDoc.DelimiterLength = 0;
+				HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+				if (IsASpaceOrTab(delim_ch)) {
+					// skip whitespace; legal only for quoted delimiters
+					unsigned int i = sc.currentPos + 1;
+					while ((i < endPos) && IsASpaceOrTab(delim_ch)) {
+						i++;
+						delim_ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
 					}
-					if (delim_ch == '\'' || delim_ch == '"' || delim_ch == '`') {
-						// a quoted here-doc delimiter; skip any whitespace
-						sc.Forward(ws_skip + 1);
-						HereDoc.Quote = delim_ch;
-						HereDoc.Quoted = true;
-					} else if ((ws_skip == 0 && setNonHereDoc.Contains(sc.chNext))
-							   || ws_skip > 0) {
-						// left shift << or <<= operator cases
-						// restore position if operator
-						sc.ChangeState(SCE_PL_OPERATOR);
+					ws_skip = i - sc.currentPos - 1;
+				}
+				if (delim_ch == '\'' || delim_ch == '"' || delim_ch == '`') {
+					// a quoted here-doc delimiter; skip any whitespace
+					sc.Forward(ws_skip + 1);
+					HereDoc.Quote = delim_ch;
+					HereDoc.Quoted = true;
+				} else if ((ws_skip == 0 && setNonHereDoc.Contains(sc.chNext))
+				        || ws_skip > 0) {
+					// left shift << or <<= operator cases
+					// restore position if operator
+					sc.ChangeState(SCE_PL_OPERATOR);
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+					backFlag = BACK_OPERATOR;
+					backPos = sc.currentPos;
+					HereDoc.State = 0;
+				} else {
+					// specially handle initial '\' for identifier
+					if (ws_skip == 0 && HereDoc.Quote == '\\')
+						sc.Forward();
+					// an unquoted here-doc delimiter, no special handling
+					// (cannot be prefixed by spaces/tabs), or
+					// symbols terminates; deprecated zero-length delimiter
+				}
+			} else if (HereDoc.State == 1) { // collect the delimiter
+				backFlag = BACK_NONE;
+				if (HereDoc.Quoted) { // a quoted here-doc delimiter
+					if (sc.ch == HereDoc.Quote) { // closing quote => end of delimiter
 						sc.ForwardSetState(SCE_PL_DEFAULT);
-						backFlag = BACK_OPERATOR;
-						backPos = sc.currentPos;
-						HereDoc.State = 0;
-					} else {
-						// specially handle initial '\' for identifier
-						if (ws_skip == 0 && HereDoc.Quote == '\\')
+					} else if (!sc.atLineEnd) {
+						if (sc.Match('\\', static_cast<char>(HereDoc.Quote))) { // escaped quote
 							sc.Forward();
-						// an unquoted here-doc delimiter, no special handling
-						// (cannot be prefixed by spaces/tabs), or
-						// symbols terminates; deprecated zero-length delimiter
-					}
-				} else if (HereDoc.State == 1) { // collect the delimiter
-					backFlag = BACK_NONE;
-					if (HereDoc.Quoted) { // a quoted here-doc delimiter
-						if (sc.ch == HereDoc.Quote) { // closing quote => end of delimiter
-							sc.ForwardSetState(SCE_PL_DEFAULT);
-						} else if (!sc.atLineEnd) {
-							if (sc.Match('\\', static_cast<char>(HereDoc.Quote))) { // escaped quote
-								sc.Forward();
-							}
-							if (sc.ch != '\r') {	// skip CR if CRLF
-								HereDoc.Append(sc.ch);
-							}
 						}
-					} else { // an unquoted here-doc delimiter
-						if (setHereDocDelim.Contains(sc.ch)) {
+						if (sc.ch != '\r') {	// skip CR if CRLF
 							HereDoc.Append(sc.ch);
-						} else {
-							sc.SetState(SCE_PL_DEFAULT);
 						}
 					}
-					if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {
-						sc.SetState(SCE_PL_ERROR);
-						HereDoc.State = 0;
+				} else { // an unquoted here-doc delimiter
+					if (setHereDocDelim.Contains(sc.ch)) {
+						HereDoc.Append(sc.ch);
+					} else {
+						sc.SetState(SCE_PL_DEFAULT);
 					}
 				}
-				break;
-			case SCE_PL_HERE_Q:
-			case SCE_PL_HERE_QQ:
-			case SCE_PL_HERE_QX: {
-				// also implies HereDoc.State == 2
-				sc.Complete();
-				while (!sc.atLineEnd)
-					sc.Forward();
-				char s[HERE_DELIM_MAX];
-				sc.GetCurrent(s, sizeof(s));
-				if (isMatch(HereDoc.Delimiter, s)) {
+				if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {
+					sc.SetState(SCE_PL_ERROR);
+					HereDoc.State = 0;
+				}
+			}
+			break;
+		case SCE_PL_HERE_Q:
+		case SCE_PL_HERE_QQ:
+		case SCE_PL_HERE_QX:
+			// also implies HereDoc.State == 2
+			sc.Complete();
+			if (HereDoc.DelimiterLength == 0 || sc.Match(HereDoc.Delimiter)) {
+				int c = sc.GetRelative(HereDoc.DelimiterLength);
+				if (c == '\r' || c == '\n') {	// peek first, do not consume match
+					sc.Forward(HereDoc.DelimiterLength);
 					sc.SetState(SCE_PL_DEFAULT);
 					backFlag = BACK_NONE;
 					HereDoc.State = 0;
+					if (!sc.atLineEnd)
+						sc.Forward();
+					break;
 				}
-				} break;
-			case SCE_PL_POD:
-			case SCE_PL_POD_VERB: {
+			}
+			if (sc.state == SCE_PL_HERE_Q) {	// \EOF and 'EOF' non-interpolated
+				while (!sc.atLineEnd)
+					sc.Forward();
+				break;
+			}
+			while (!sc.atLineEnd) {		// "EOF" and `EOF` interpolated
+				int s = 0, endType = 0;
+				int maxSeg = endPos - sc.currentPos;
+				while (s < maxSeg) {	// scan to break string into segments
+					int c = sc.GetRelative(s);
+					if (c == '\\') {
+						endType = 1; break;
+					} else if (c == '\r' || c == '\n') {
+						endType = 2; break;
+					}
+					s++;
+				}
+				if (s > 0)	// process non-empty segments
+					InterpolateSegment(sc, s);
+				if (endType == 1) {
+					sc.Forward();
+					// \ at end-of-line does not appear to have any effect, skip
+					if (sc.ch != '\r' && sc.ch != '\n')
+						sc.Forward();
+				} else if (endType == 2) {
+					if (!sc.atLineEnd)
+						sc.Forward();
+				}
+			}
+			break;
+		case SCE_PL_POD:
+		case SCE_PL_POD_VERB: {
 				unsigned int fw = sc.currentPos;
 				int ln = styler.GetLine(fw);
 				if (sc.atLineStart && sc.Match("=cut")) {	// end of POD
@@ -659,86 +953,162 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 						pod = SCE_PL_POD;
 				} else {
 					if (pod == SCE_PL_POD_VERB	// still part of current paragraph
-					    && (styler.GetLineState(ln - 1) == SCE_PL_POD)) {
+					        && (styler.GetLineState(ln - 1) == SCE_PL_POD)) {
 						pod = SCE_PL_POD;
 						styler.SetLineState(ln, pod);
 					} else if (pod == SCE_PL_POD
-							   && (styler.GetLineState(ln - 1) == SCE_PL_POD_VERB)) {
+					        && (styler.GetLineState(ln - 1) == SCE_PL_POD_VERB)) {
 						pod = SCE_PL_POD_VERB;
 						styler.SetLineState(ln, pod);
 					}
 					sc.SetState(pod);
 				}
 				sc.Forward(fw - sc.currentPos);	// commit style
-				} break;
-			case SCE_PL_REGEX:
-			case SCE_PL_STRING_QR:
-				if (Quote.Rep <= 0) {
-					if (!setModifiers.Contains(sc.ch))
-						sc.SetState(SCE_PL_DEFAULT);
-				} else if (!Quote.Up && !IsASpace(sc.ch)) {
-					Quote.Open(sc.ch);
-				} else if (sc.ch == '\\' && Quote.Up != '\\') {
-					sc.Forward();
-				} else if (sc.ch == Quote.Down) {
-					Quote.Count--;
-					if (Quote.Count == 0)
-						Quote.Rep--;
-				} else if (sc.ch == Quote.Up) {
-					Quote.Count++;
-				}
-				break;
-			case SCE_PL_REGSUBST:
-				if (Quote.Rep <= 0) {
-					if (!setModifiers.Contains(sc.ch))
-						sc.SetState(SCE_PL_DEFAULT);
-				} else if (!Quote.Up && !IsASpace(sc.ch)) {
-					Quote.Open(sc.ch);
-				} else if (sc.ch == '\\' && Quote.Up != '\\') {
-					sc.Forward();
-				} else if (Quote.Count == 0 && Quote.Rep == 1) {
-					// We matched something like s(...) or tr{...}, Perl 5.10
-					// appears to allow almost any character for use as the
-					// next delimiters. Whitespace and comments are accepted in
-					// between, but we'll limit to whitespace here.
-					// For '#', if no whitespace in between, it's a delimiter.
-					if (IsASpace(sc.ch)) {
-						// Keep going
-					} else if (sc.ch == '#' && IsASpaceOrTab(sc.chPrev)) {
-						sc.SetState(SCE_PL_DEFAULT);
-					} else {
-						Quote.Open(sc.ch);
-					}
-				} else if (sc.ch == Quote.Down) {
-					Quote.Count--;
-					if (Quote.Count == 0)
-						Quote.Rep--;
-					if (Quote.Up == Quote.Down)
+			}
+			break;
+		case SCE_PL_REGEX:
+		case SCE_PL_STRING_QR:
+			if (Quote.Rep <= 0) {
+				if (!setModifiers.Contains(sc.ch))
+					sc.SetState(SCE_PL_DEFAULT);
+			} else if (!Quote.Up && !IsASpace(sc.ch)) {
+				Quote.Open(sc.ch);
+			} else {
+				int s = 0, endType = 0;
+				int maxSeg = endPos - sc.currentPos;
+				while (s < maxSeg) {	// scan to break string into segments
+					int c = sc.GetRelative(s);
+					if (IsASpace(c)) {
+						break;
+					} else if (c == '\\' && Quote.Up != '\\') {
+						endType = 1; break;
+					} else if (c == Quote.Down) {
+						Quote.Count--;
+						if (Quote.Count == 0) {
+							Quote.Rep--;
+							break;
+						}
+					} else if (c == Quote.Up)
 						Quote.Count++;
-				} else if (sc.ch == Quote.Up) {
-					Quote.Count++;
+					s++;
 				}
-				break;
-			case SCE_PL_STRING_Q:
-			case SCE_PL_STRING_QQ:
-			case SCE_PL_STRING_QX:
-			case SCE_PL_STRING_QW:
-			case SCE_PL_STRING:
-			case SCE_PL_CHARACTER:
-			case SCE_PL_BACKTICKS:
-				if (!Quote.Down && !IsASpace(sc.ch)) {
-					Quote.Open(sc.ch);
-				} else if (sc.ch == '\\' && Quote.Up != '\\') {
+				if (s > 0) {	// process non-empty segments
+					if (Quote.Up != '\'') {
+						InterpolateSegment(sc, s, true);
+					} else		// non-interpolated path
+						sc.Forward(s);
+				}
+				if (endType == 1)
 					sc.Forward();
-				} else if (sc.ch == Quote.Down) {
-					Quote.Count--;
-					if (Quote.Count == 0)
-						sc.ForwardSetState(SCE_PL_DEFAULT);
-				} else if (sc.ch == Quote.Up) {
-					Quote.Count++;
+			}
+			break;
+		case SCE_PL_REGSUBST:
+		case SCE_PL_XLAT:
+			if (Quote.Rep <= 0) {
+				if (!setModifiers.Contains(sc.ch))
+					sc.SetState(SCE_PL_DEFAULT);
+			} else if (!Quote.Up && !IsASpace(sc.ch)) {
+				Quote.Open(sc.ch);
+			} else {
+				int s = 0, endType = 0;
+				int maxSeg = endPos - sc.currentPos;
+				bool isPattern = (Quote.Rep == 2);
+				while (s < maxSeg) {	// scan to break string into segments
+					int c = sc.GetRelative(s);
+					if (c == '\\' && Quote.Up != '\\') {
+						endType = 2; break;
+					} else if (Quote.Count == 0 && Quote.Rep == 1) {
+						// We matched something like s(...) or tr{...}, Perl 5.10
+						// appears to allow almost any character for use as the
+						// next delimiters. Whitespace and comments are accepted in
+						// between, but we'll limit to whitespace here.
+						// For '#', if no whitespace in between, it's a delimiter.
+						if (IsASpace(c)) {
+							// Keep going
+						} else if (c == '#' && IsASpaceOrTab(sc.GetRelative(s - 1))) {
+							endType = 3;
+						} else
+							Quote.Open(c);
+						break;
+					} else if (c == Quote.Down) {
+						Quote.Count--;
+						if (Quote.Count == 0) {
+							Quote.Rep--;
+							endType = 1;
+						}
+						if (Quote.Up == Quote.Down)
+							Quote.Count++;
+						if (endType == 1)
+							break;
+					} else if (c == Quote.Up) {
+						Quote.Count++;
+					} else if (IsASpace(c))
+						break;
+					s++;
 				}
-				break;
-			case SCE_PL_SUB_PROTOTYPE: {
+				if (s > 0) {	// process non-empty segments
+					if (sc.state == SCE_PL_REGSUBST && Quote.Up != '\'') {
+						InterpolateSegment(sc, s, isPattern);
+					} else		// non-interpolated path
+						sc.Forward(s);
+				}
+				if (endType == 2) {
+					sc.Forward();
+				} else if (endType == 3)
+					sc.SetState(SCE_PL_DEFAULT);
+			}
+			break;
+		case SCE_PL_STRING_Q:
+		case SCE_PL_STRING_QQ:
+		case SCE_PL_STRING_QX:
+		case SCE_PL_STRING_QW:
+		case SCE_PL_STRING:
+		case SCE_PL_CHARACTER:
+		case SCE_PL_BACKTICKS:
+			if (!Quote.Down && !IsASpace(sc.ch)) {
+				Quote.Open(sc.ch);
+			} else {
+				int s = 0, endType = 0;
+				int maxSeg = endPos - sc.currentPos;
+				while (s < maxSeg) {	// scan to break string into segments
+					int c = sc.GetRelative(s);
+					if (IsASpace(c)) {
+						break;
+					} else if (c == '\\' && Quote.Up != '\\') {
+						endType = 2; break;
+					} else if (c == Quote.Down) {
+						Quote.Count--;
+						if (Quote.Count == 0) {
+							endType = 3; break;
+						}
+					} else if (c == Quote.Up)
+						Quote.Count++;
+					s++;
+				}
+				if (s > 0) {	// process non-empty segments
+					switch (sc.state) {
+					case SCE_PL_STRING:
+					case SCE_PL_STRING_QQ:
+					case SCE_PL_BACKTICKS:
+						InterpolateSegment(sc, s);
+						break;
+					case SCE_PL_STRING_QX:
+						if (Quote.Up != '\'') {
+							InterpolateSegment(sc, s);
+							break;
+						}
+						// (continued for ' delim)
+					default:	// non-interpolated path
+						sc.Forward(s);
+					}
+				}
+				if (endType == 2) {
+					sc.Forward();
+				} else if (endType == 3)
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+			}
+			break;
+		case SCE_PL_SUB_PROTOTYPE: {
 				int i = 0;
 				// forward scan; must all be valid proto characters
 				while (setSubPrototype.Contains(sc.GetRelative(i)))
@@ -751,51 +1121,54 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 					sc.ChangeState(SCE_PL_OPERATOR);
 					sc.SetState(SCE_PL_DEFAULT);
 				}
-				} break;
-			case SCE_PL_FORMAT: {
+			}
+			break;
+		case SCE_PL_FORMAT: {
 				sc.Complete();
+				if (sc.Match('.')) {
+					sc.Forward();
+					if (sc.atLineEnd || ((sc.ch == '\r' && sc.chNext == '\n')))
+						sc.SetState(SCE_PL_DEFAULT);
+				}
 				while (!sc.atLineEnd)
 					sc.Forward();
-				char s[10];
-				sc.GetCurrent(s, sizeof(s));
-				if (isMatch(".", s))
-					sc.SetState(SCE_PL_DEFAULT);
-				} break;
-			case SCE_PL_ERROR:
-				break;
+			}
+			break;
+		case SCE_PL_ERROR:
+			break;
 		}
 		// Needed for specific continuation styles (one follows the other)
 		switch (sc.state) {
 			// continued from SCE_PL_WORD
-			case SCE_PL_FORMAT_IDENT:
-				// occupies HereDoc state 3 to avoid clashing with HERE docs
-				if (IsASpaceOrTab(sc.ch)) {		// skip whitespace
-					sc.ChangeState(SCE_PL_DEFAULT);
-					while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+		case SCE_PL_FORMAT_IDENT:
+			// occupies HereDoc state 3 to avoid clashing with HERE docs
+			if (IsASpaceOrTab(sc.ch)) {		// skip whitespace
+				sc.ChangeState(SCE_PL_DEFAULT);
+				while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+					sc.Forward();
+				sc.SetState(SCE_PL_FORMAT_IDENT);
+			}
+			if (setFormatStart.Contains(sc.ch)) {	// identifier or '='
+				if (sc.ch != '=') {
+					do {
 						sc.Forward();
-					sc.SetState(SCE_PL_FORMAT_IDENT);
+					} while (setFormat.Contains(sc.ch));
 				}
-				if (setFormatStart.Contains(sc.ch)) {	// identifier or '='
-					if (sc.ch != '=') {
-						do {
-							sc.Forward();
-						} while (setFormat.Contains(sc.ch));
-					}
-					while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
-						sc.Forward();
-					if (sc.ch == '=') {
-						sc.ForwardSetState(SCE_PL_DEFAULT);
-						HereDoc.State = 3;
-					} else {
-						// invalid indentifier; inexact fallback, but hey
-						sc.ChangeState(SCE_PL_IDENTIFIER);
-						sc.SetState(SCE_PL_DEFAULT);
-					}
+				while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+					sc.Forward();
+				if (sc.ch == '=') {
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+					HereDoc.State = 3;
 				} else {
-					sc.ChangeState(SCE_PL_DEFAULT);	// invalid indentifier
+					// invalid indentifier; inexact fallback, but hey
+					sc.ChangeState(SCE_PL_IDENTIFIER);
+					sc.SetState(SCE_PL_DEFAULT);
 				}
-				backFlag = BACK_NONE;
-				break;
+			} else {
+				sc.ChangeState(SCE_PL_DEFAULT);	// invalid indentifier
+			}
+			backFlag = BACK_NONE;
+			break;
 		}
 
 		// Must check end of HereDoc states here before default state is handled
@@ -812,9 +1185,15 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 					sc.ChangeState(SCE_PL_ERROR);
 				}
 				switch (HereDoc.Quote) {
-					case '\'': st_new = SCE_PL_HERE_Q ; break;
-					case '"' : st_new = SCE_PL_HERE_QQ; break;
-					case '`' : st_new = SCE_PL_HERE_QX; break;
+				case '\'':
+					st_new = SCE_PL_HERE_Q ;
+					break;
+				case '"' :
+					st_new = SCE_PL_HERE_QQ;
+					break;
+				case '`' :
+					st_new = SCE_PL_HERE_QX;
+					break;
 				}
 			} else {
 				if (HereDoc.Quote == '\\')
@@ -831,15 +1210,15 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 		// Determine if a new state should be entered.
 		if (sc.state == SCE_PL_DEFAULT) {
 			if (IsADigit(sc.ch) ||
-				(IsADigit(sc.chNext) && (sc.ch == '.' || sc.ch == 'v'))) {
+			        (IsADigit(sc.chNext) && (sc.ch == '.' || sc.ch == 'v'))) {
 				sc.SetState(SCE_PL_NUMBER);
 				backFlag = BACK_NONE;
 				numState = PERLNUM_DECIMAL;
 				dotCount = 0;
 				if (sc.ch == '0') {		// hex,bin,octal
-					if (sc.chNext == 'x') {
+					if (sc.chNext == 'x' || sc.chNext == 'X') {
 						numState = PERLNUM_HEX;
-					} else if (sc.chNext == 'b') {
+					} else if (sc.chNext == 'b' || sc.chNext == 'B') {
 						numState = PERLNUM_BINARY;
 					} else if (IsADigit(sc.chNext)) {
 						numState = PERLNUM_OCTAL;
@@ -869,16 +1248,16 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 					sc.ChangeState(SCE_PL_STRING_Q);
 					Quote.New();
 				} else if (sc.ch == 'y' && !setWord.Contains(sc.chNext)) {
-					sc.ChangeState(SCE_PL_REGSUBST);
+					sc.ChangeState(SCE_PL_XLAT);
 					Quote.New(2);
 				} else if (sc.Match('t', 'r') && !setWord.Contains(sc.GetRelative(2))) {
-					sc.ChangeState(SCE_PL_REGSUBST);
+					sc.ChangeState(SCE_PL_XLAT);
 					Quote.New(2);
 					sc.Forward();
 					fw++;
 				} else if (sc.ch == 'q' && setQDelim.Contains(sc.chNext)
-						   && !setWord.Contains(sc.GetRelative(2))) {
-					if      (sc.chNext == 'q') sc.ChangeState(SCE_PL_STRING_QQ);
+				        && !setWord.Contains(sc.GetRelative(2))) {
+					if (sc.chNext == 'q') sc.ChangeState(SCE_PL_STRING_QQ);
 					else if (sc.chNext == 'x') sc.ChangeState(SCE_PL_STRING_QX);
 					else if (sc.chNext == 'r') sc.ChangeState(SCE_PL_STRING_QR);
 					else sc.ChangeState(SCE_PL_STRING_QW);	// sc.chNext == 'w'
@@ -886,8 +1265,8 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 					sc.Forward();
 					fw++;
 				} else if (sc.ch == 'x' && (sc.chNext == '=' ||	// repetition
-						   !setWord.Contains(sc.chNext) ||
-						   (IsADigit(sc.chPrev) && IsADigit(sc.chNext)))) {
+				        !setWord.Contains(sc.chNext) ||
+				        (IsADigit(sc.chPrev) && IsADigit(sc.chNext)))) {
 					sc.ChangeState(SCE_PL_OPERATOR);
 				}
 				// if potentially a keyword, scan forward and grab word, then check
@@ -964,7 +1343,6 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 				bool isHereDoc = sc.Match('<', '<');
 				bool hereDocSpace = false;		// for: SCALAR [whitespace] '<<'
 				unsigned int bk = (sc.currentPos > 0) ? sc.currentPos - 1: 0;
-				unsigned int bkend;
 				sc.Complete();
 				styler.Flush();
 				if (styler.StyleAt(bk) == SCE_PL_DEFAULT)
@@ -976,7 +1354,7 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 				} else {
 					int bkstyle = styler.StyleAt(bk);
 					int bkch = static_cast<unsigned char>(styler.SafeGetCharAt(bk));
-					switch(bkstyle) {
+					switch (bkstyle) {
 					case SCE_PL_OPERATOR:
 						preferRE = true;
 						if (bkch == ')' || bkch == ']') {
@@ -986,17 +1364,17 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 							// needed to test for variables like ${}, @{} etc.
 							bkstyle = styleBeforeBracePair(styler, bk);
 							if (bkstyle == SCE_PL_SCALAR
-								|| bkstyle == SCE_PL_ARRAY
-								|| bkstyle == SCE_PL_HASH
-								|| bkstyle == SCE_PL_SYMBOLTABLE
-								|| bkstyle == SCE_PL_OPERATOR) {
+							        || bkstyle == SCE_PL_ARRAY
+							        || bkstyle == SCE_PL_HASH
+							        || bkstyle == SCE_PL_SYMBOLTABLE
+							        || bkstyle == SCE_PL_OPERATOR) {
 								preferRE = false;
 							}
 						} else if (bkch == '+' || bkch == '-') {
 							if (bkch == static_cast<unsigned char>(styler.SafeGetCharAt(bk - 1))
-								&& bkch != static_cast<unsigned char>(styler.SafeGetCharAt(bk - 2)))
-							// exceptions for operators: unary suffixes ++, --
-							preferRE = false;
+							        && bkch != static_cast<unsigned char>(styler.SafeGetCharAt(bk - 2)))
+								// exceptions for operators: unary suffixes ++, --
+								preferRE = false;
 						}
 						break;
 					case SCE_PL_IDENTIFIER:
@@ -1033,7 +1411,7 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 							// keywords always forced as /PATTERN/: split, if, elsif, while
 							// everything else /PATTERN/ unless digit/space immediately after '/'
 							// for '//', defined-or favoured unless special keywords
-							bkend = bk + 1;
+							unsigned int bkend = bk + 1;
 							while (bk > 0 && styler.StyleAt(bk - 1) == SCE_PL_WORD) {
 								bk--;
 							}
@@ -1049,7 +1427,8 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 								preferRE = false;
 						}
 						break;
-					// other styles uses the default, preferRE=false
+
+						// other styles uses the default, preferRE=false
 					case SCE_PL_POD:
 					case SCE_PL_HERE_Q:
 					case SCE_PL_HERE_QQ:
@@ -1123,15 +1502,15 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 					}
 				}
 			} else if (sc.ch == '='		// POD
-					   && setPOD.Contains(sc.chNext)
-					   && sc.atLineStart) {
+			        && setPOD.Contains(sc.chNext)
+			        && sc.atLineStart) {
 				sc.SetState(SCE_PL_POD);
 				backFlag = BACK_NONE;
 			} else if (sc.ch == '-' && setWordStart.Contains(sc.chNext)) {	// extended '-' cases
 				unsigned int bk = sc.currentPos;
 				unsigned int fw = 2;
 				if (setSingleCharOp.Contains(sc.chNext) &&	// file test operators
-					!setWord.Contains(sc.GetRelative(2))) {
+				        !setWord.Contains(sc.GetRelative(2))) {
 					sc.SetState(SCE_PL_WORD);
 				} else {
 					// nominally a minus and bareword; find extent of bareword
@@ -1168,64 +1547,36 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 	}
 	sc.Complete();
 	if (sc.state == SCE_PL_HERE_Q
-		|| sc.state == SCE_PL_HERE_QQ
-		|| sc.state == SCE_PL_HERE_QX
-		|| sc.state == SCE_PL_FORMAT) {
+	        || sc.state == SCE_PL_HERE_QQ
+	        || sc.state == SCE_PL_HERE_QX
+	        || sc.state == SCE_PL_FORMAT) {
 		styler.ChangeLexerState(sc.currentPos, styler.Length());
 	}
-}
-
-static bool IsCommentLine(int line, Accessor &styler) {
-	int pos = styler.LineStart(line);
-	int eol_pos = styler.LineStart(line + 1) - 1;
-	for (int i = pos; i < eol_pos; i++) {
-		char ch = styler[i];
-		int style = styler.StyleAt(i);
-		if (ch == '#' && style == SCE_PL_COMMENTLINE)
-			return true;
-		else if (!IsASpaceOrTab(ch))
-			return false;
-	}
-	return false;
-}
-
-static bool IsPackageLine(int line, Accessor &styler) {
-	int pos = styler.LineStart(line);
-	int style = styler.StyleAt(pos);
-	if (style == SCE_PL_WORD && styler.Match(pos, "package")) {
-		return true;
-	}
-	return false;
-}
-
-static int PodHeadingLevel(int pos, Accessor &styler) {
-	int lvl = static_cast<unsigned char>(styler.SafeGetCharAt(pos + 5));
-	if (lvl >= '1' && lvl <= '4') {
-		return lvl - '0';
-	}
-	return 0;
+	sc.Complete();
 }
 
 #define PERL_HEADFOLD_SHIFT		4
 #define PERL_HEADFOLD_MASK		0xF0
 
-static void FoldPerlDoc(unsigned int startPos, int length, int, WordList *[],
-                        Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	// Custom folding of POD and packages
+void SCI_METHOD LexerPerl::Fold(unsigned int startPos, int length, int /* initStyle */, IDocument *pAccess) {
 
-	// property fold.perl.pod
-	//	Enable folding Pod blocks when using the Perl lexer.
-	bool foldPOD = styler.GetPropertyInt("fold.perl.pod", 1) != 0;
+	if (!options.fold)
+		return;
 
-	// property fold.perl.package
-	//	Enable folding packages when using the Perl lexer.
-	bool foldPackage = styler.GetPropertyInt("fold.perl.package", 1) != 0;
+	LexAccessor styler(pAccess);
 
 	unsigned int endPos = startPos + length;
 	int visibleChars = 0;
 	int lineCurrent = styler.GetLine(startPos);
+
+	// Backtrack to previous line in case need to fix its fold status
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+
 	int levelPrev = SC_FOLDLEVELBASE;
 	if (lineCurrent > 0)
 		levelPrev = styler.LevelAt(lineCurrent - 1) >> 16;
@@ -1241,34 +1592,37 @@ static void FoldPerlDoc(unsigned int startPos, int length, int, WordList *[],
 		chNext = styler.SafeGetCharAt(i + 1);
 		int style = styleNext;
 		styleNext = styler.StyleAt(i + 1);
+		int stylePrevCh = (i) ? styler.StyleAt(i - 1):SCE_PL_DEFAULT;
 		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
 		bool atLineStart = ((chPrev == '\r') || (chPrev == '\n')) || i == 0;
 		// Comment folding
-		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler))
-		{
+		if (options.foldComment && atEOL && IsCommentLine(lineCurrent, styler)) {
 			if (!IsCommentLine(lineCurrent - 1, styler)
-				&& IsCommentLine(lineCurrent + 1, styler))
+			        && IsCommentLine(lineCurrent + 1, styler))
 				levelCurrent++;
 			else if (IsCommentLine(lineCurrent - 1, styler)
-					 && !IsCommentLine(lineCurrent + 1, styler))
+			        && !IsCommentLine(lineCurrent + 1, styler))
 				levelCurrent--;
 		}
 		// {} [] block folding
 		if (style == SCE_PL_OPERATOR) {
 			if (ch == '{') {
+				if (options.foldAtElse && levelCurrent < levelPrev)
+					--levelPrev;
 				levelCurrent++;
 			} else if (ch == '}') {
 				levelCurrent--;
 			}
 			if (ch == '[') {
+				if (options.foldAtElse && levelCurrent < levelPrev)
+					--levelPrev;
 				levelCurrent++;
 			} else if (ch == ']') {
 				levelCurrent--;
 			}
 		}
 		// POD folding
-		if (foldPOD && atLineStart) {
-			int stylePrevCh = (i) ? styler.StyleAt(i - 1):SCE_PL_DEFAULT;
+		if (options.foldPOD && atLineStart) {
 			if (style == SCE_PL_POD) {
 				if (stylePrevCh != SCE_PL_POD && stylePrevCh != SCE_PL_POD_VERB)
 					levelCurrent++;
@@ -1290,12 +1644,51 @@ static void FoldPerlDoc(unsigned int startPos, int length, int, WordList *[],
 			}
 		}
 		// package folding
-		if (foldPackage && atLineStart) {
+		if (options.foldPackage && atLineStart) {
 			if (IsPackageLine(lineCurrent, styler)
-				&& !IsPackageLine(lineCurrent + 1, styler))
+			        && !IsPackageLine(lineCurrent + 1, styler))
 				isPackageLine = true;
 		}
 
+		//heredoc folding
+		switch (style) {
+		case SCE_PL_HERE_QQ :
+		case SCE_PL_HERE_Q :
+		case SCE_PL_HERE_QX :
+			switch (stylePrevCh) {
+			case SCE_PL_HERE_QQ :
+			case SCE_PL_HERE_Q :
+			case SCE_PL_HERE_QX :
+				//do nothing;
+				break;
+			default :
+				levelCurrent++;
+				break;
+			}
+			break;
+		default:
+			switch (stylePrevCh) {
+			case SCE_PL_HERE_QQ :
+			case SCE_PL_HERE_Q :
+			case SCE_PL_HERE_QX :
+				levelCurrent--;
+				break;
+			default :
+				//do nothing;
+				break;
+			}
+			break;
+		}
+
+		//explicit folding
+		if (options.foldCommentExplicit && style == SCE_PL_COMMENTLINE && ch == '#') {
+			if (chNext == '{') {
+				levelCurrent++;
+			} else if (levelCurrent > SC_FOLDLEVELBASE  && chNext == '}') {
+				levelCurrent--;
+			}
+		}
+
 		if (atEOL) {
 			int lev = levelPrev;
 			// POD headings occupy bits 7-4, leaving some breathing room for
@@ -1314,7 +1707,7 @@ static void FoldPerlDoc(unsigned int startPos, int length, int, WordList *[],
 				isPackageLine = false;
 			}
 			lev |= levelCurrent << 16;
-			if (visibleChars == 0 && foldCompact)
+			if (visibleChars == 0 && options.foldCompact)
 				lev |= SC_FOLDLEVELWHITEFLAG;
 			if ((levelCurrent > levelPrev) && (visibleChars > 0))
 				lev |= SC_FOLDLEVELHEADERFLAG;
@@ -1334,9 +1727,4 @@ static void FoldPerlDoc(unsigned int startPos, int length, int, WordList *[],
 	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
 }
 
-static const char * const perlWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmPerl(SCLEX_PERL, ColourisePerlDoc, "perl", FoldPerlDoc, perlWordListDesc, 8);
+LexerModule lmPerl(SCLEX_PERL, LexerPerl::LexerFactoryPerl, "perl", perlWordListDesc, 8);
diff --git a/scintilla/lexers/LexPython.cxx b/scintilla/lexers/LexPython.cxx
index 5020d71d..fedc3125 100644
--- a/scintilla/lexers/LexPython.cxx
+++ b/scintilla/lexers/LexPython.cxx
@@ -28,7 +28,7 @@ using namespace Scintilla;
 #endif
 
 /* kwCDef, kwCTypeName only used for Cython */
-enum kwType { kwOther, kwClass, kwDef, kwImport, kwCDef, kwCTypeName };
+enum kwType { kwOther, kwClass, kwDef, kwImport, kwCDef, kwCTypeName, kwCPDef };
 
 static const int indicatorWhitespace = 1;
 
@@ -165,6 +165,11 @@ static void ColourisePyDoc(unsigned int startPos, int length, int initStyle,
 	//      Set to 1 to allow strings to span newline characters.
 	bool stringsOverNewline = styler.GetPropertyInt("lexer.python.strings.over.newline") != 0;
 
+	// property lexer.python.keywords2.no.sub.identifiers
+	//	When enabled, it will not style keywords2 items that are used as a sub-identifier.
+	//      Example: when set, will not highlight "foo.open" when "open" is a keywords2 item.
+	const bool keywords2NoSubIdentifiers = styler.GetPropertyInt("lexer.python.keywords2.no.sub.identifiers") != 0;
+
 	initStyle = initStyle & 31;
 	if (initStyle == SCE_P_STRINGEOL) {
 		initStyle = SCE_P_DEFAULT;
@@ -246,7 +251,7 @@ static void ColourisePyDoc(unsigned int startPos, int length, int initStyle,
 					style = SCE_P_CLASSNAME;
 				} else if (kwLast == kwDef) {
 					style = SCE_P_DEFNAME;
-				} else if (kwLast == kwCDef) {
+				} else if (kwLast == kwCDef || kwLast == kwCPDef) {
 					int pos = sc.currentPos;
 					unsigned char ch = styler.SafeGetCharAt(pos, '\0');
 					while (ch != '\0') {
@@ -264,7 +269,16 @@ static void ColourisePyDoc(unsigned int startPos, int length, int initStyle,
 						}
 					}
 				} else if (keywords2.InList(s)) {
-					style = SCE_P_WORD2;
+					if (keywords2NoSubIdentifiers) {
+						// We don't want to highlight keywords2
+						// that are used as a sub-identifier,
+						// i.e. not open in "foo.open".
+						int pos = styler.GetStartSegment() - 1;
+						if (pos < 0 || (styler.SafeGetCharAt(pos, '\0') != '.'))
+							style = SCE_P_WORD2;
+					} else {
+						style = SCE_P_WORD2;
+					}
 				}
 				sc.ChangeState(style);
 				sc.SetState(SCE_P_DEFAULT);
@@ -277,11 +291,13 @@ static void ColourisePyDoc(unsigned int startPos, int length, int initStyle,
 						kwLast = kwImport;
 					else if (0 == strcmp(s, "cdef"))
 						kwLast = kwCDef;
+					else if (0 == strcmp(s, "cpdef"))
+						kwLast = kwCPDef;
 					else if (0 == strcmp(s, "cimport"))
 						kwLast = kwImport;
-					else if (kwLast != kwCDef)
+					else if (kwLast != kwCDef && kwLast != kwCPDef)
 						kwLast = kwOther;
-				} else if (kwLast != kwCDef) {
+				} else if (kwLast != kwCDef && kwLast != kwCPDef) {
 					kwLast = kwOther;
 				}
 			}
@@ -337,8 +353,8 @@ static void ColourisePyDoc(unsigned int startPos, int length, int initStyle,
 			indentGood = true;
 		}
 
-		// One cdef line, clear kwLast only at end of line
-		if (kwLast == kwCDef && sc.atLineEnd) {
+		// One cdef or cpdef line, clear kwLast only at end of line
+		if ((kwLast == kwCDef || kwLast == kwCPDef) && sc.atLineEnd) {
 			kwLast = kwOther;
 		}
 
@@ -412,12 +428,8 @@ static bool IsQuoteLine(int line, Accessor &styler) {
 static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unused*/,
                       WordList *[], Accessor &styler) {
 	const int maxPos = startPos + length;
-	const int maxLines = styler.GetLine(maxPos - 1);             // Requested last line
-	const int docLines = styler.GetLine(styler.Length() - 1);  // Available last line
-
-	// property fold.comment.python
-	//	This option enables folding multi-line comments when using the Python lexer.
-	const bool foldComment = styler.GetPropertyInt("fold.comment.python") != 0;
+	const int maxLines = (maxPos == styler.Length()) ? styler.GetLine(maxPos) : styler.GetLine(maxPos - 1);	// Requested last line
+	const int docLines = styler.GetLine(styler.Length());	// Available last line
 
 	// property fold.quotes.python
 	//	This option enables folding multi-line quoted strings when using the Python lexer.
@@ -448,14 +460,11 @@ static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unuse
 	if (lineCurrent >= 1)
 		prev_state = styler.StyleAt(startPos - 1) & 31;
 	int prevQuote = foldQuotes && ((prev_state == SCE_P_TRIPLE) || (prev_state == SCE_P_TRIPLEDOUBLE));
-	int prevComment = 0;
-	if (lineCurrent >= 1)
-		prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler);
 
 	// Process all characters to end of requested range or end of any triple quote
-	// or comment that hangs over the end of the range.  Cap processing in all cases
-	// to end of document (in case of unclosed quote or comment at end).
-	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevQuote || prevComment)) {
+	//that hangs over the end of the range.  Cap processing in all cases
+	// to end of document (in case of unclosed quote at end).
+	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevQuote)) {
 
 		// Gather info
 		int lev = indentCurrent;
@@ -465,16 +474,13 @@ static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unuse
 		if (lineNext <= docLines) {
 			// Information about next line is only available if not at end of document
 			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
-			int style = styler.StyleAt(styler.LineStart(lineNext)) & 31;
+			int lookAtPos = (styler.LineStart(lineNext) == styler.Length()) ? styler.Length() - 1 : styler.LineStart(lineNext);
+			int style = styler.StyleAt(lookAtPos) & 31;
 			quote = foldQuotes && ((style == SCE_P_TRIPLE) || (style == SCE_P_TRIPLEDOUBLE));
 		}
 		const int quote_start = (quote && !prevQuote);
 		const int quote_continue = (quote && prevQuote);
-		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
-		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
-		                           IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE));
-		const int comment_continue = (comment && prevComment);
-		if ((!quote || !prevQuote) && !comment)
+		if (!quote || !prevQuote)
 			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
 		if (quote)
 			indentNext = indentCurrentLevel;
@@ -487,12 +493,6 @@ static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unuse
 		} else if (quote_continue || prevQuote) {
 			// Add level to rest of lines in the string
 			lev = lev + 1;
-		} else if (comment_start) {
-			// Place fold point at start of a block of comments
-			lev |= SC_FOLDLEVELHEADERFLAG;
-		} else if (comment_continue) {
-			// Add level to rest of lines in the block
-			lev = lev + 1;
 		}
 
 		// Skip past any blank lines for next indent level info; we skip also
@@ -540,18 +540,17 @@ static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unuse
 			}
 		}
 
-		// Set fold header on non-quote/non-comment line
-		if (!quote && !comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+		// Set fold header on non-quote line
+		if (!quote && !(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
 			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
 				lev |= SC_FOLDLEVELHEADERFLAG;
 		}
 
-		// Keep track of triple quote and block comment state of previous line
+		// Keep track of triple quote state of previous line
 		prevQuote = quote;
-		prevComment = comment_start || comment_continue;
 
 		// Set fold level for this line and move to next line
-		styler.SetLevel(lineCurrent, lev);
+		styler.SetLevel(lineCurrent, foldCompact ? lev : lev & ~SC_FOLDLEVELWHITEFLAG);
 		indentCurrent = indentNext;
 		lineCurrent = lineNext;
 	}
diff --git a/scintilla/lexers/LexRuby.cxx b/scintilla/lexers/LexRuby.cxx
index 22410848..4545bfa2 100644
--- a/scintilla/lexers/LexRuby.cxx
+++ b/scintilla/lexers/LexRuby.cxx
@@ -16,7 +16,6 @@
 #include "Scintilla.h"
 #include "SciLexer.h"
 
-#include "PropSetSimple.h"
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "Accessor.h"
@@ -1729,7 +1728,13 @@ static void FoldRbDoc(unsigned int startPos, int length, int initStyle,
                           ) {
 				levelCurrent++;
             }
-        }
+		} else if (style == SCE_RB_HERE_DELIM) {
+			if (styler.SafeGetCharAt(i-2) == '<' && styler.SafeGetCharAt(i-1) == '<') {
+				levelCurrent++;
+			} else if (styleNext == SCE_RB_DEFAULT) {
+				levelCurrent--;
+			}
+		}
 		if (atEOL) {
 			int lev = levelPrev;
 			if (visibleChars == 0 && foldCompact)
@@ -1765,4 +1770,4 @@ static const char * const rubyWordListDesc[] = {
 	0
 };
 
-LexerModule lmRuby(SCLEX_RUBY, ColouriseRbDoc, "ruby", FoldRbDoc, rubyWordListDesc);
+LexerModule lmRuby(SCLEX_RUBY, ColouriseRbDoc, "ruby", FoldRbDoc, rubyWordListDesc, 6);
diff --git a/scintilla/lexers/LexSQL.cxx b/scintilla/lexers/LexSQL.cxx
index ebcd72c0..64a896ee 100644
--- a/scintilla/lexers/LexSQL.cxx
+++ b/scintilla/lexers/LexSQL.cxx
@@ -204,8 +204,8 @@ struct OptionSetSQL : public OptionSet<OptionsSQL> {
 	OptionSetSQL() {
 		DefineProperty("fold", &OptionsSQL::fold);
 
-		DefineProperty("lexer.sql.fold.at.else", &OptionsSQL::foldAtElse,
-		               "This option enables SQL folding on a \"ELSE\" and \"ELSIF\"line of an IF statement.");
+		DefineProperty("fold.sql.at.else", &OptionsSQL::foldAtElse,
+		               "This option enables SQL folding on a \"ELSE\" and \"ELSIF\" line of an IF statement.");
 
 		DefineProperty("fold.comment", &OptionsSQL::foldComment);
 
@@ -283,6 +283,20 @@ private:
 		       style == SCE_SQL_COMMENTDOCKEYWORDERROR;
 	}
 
+	bool IsCommentStyle (int style) {
+		switch (style) {
+		case SCE_SQL_COMMENT :
+		case SCE_SQL_COMMENTDOC :
+		case SCE_SQL_COMMENTLINE :
+		case SCE_SQL_COMMENTLINEDOC :
+		case SCE_SQL_COMMENTDOCKEYWORD :
+		case SCE_SQL_COMMENTDOCKEYWORDERROR :
+			return true;
+		default :
+			return false;
+		}
+	}
+
 	OptionsSQL options;
 	OptionSetSQL osSQL;
 	SQLStates sqlStates;
@@ -521,7 +535,7 @@ void SCI_METHOD LexerSQL::Fold(unsigned int startPos, int length, int initStyle,
 		style = styleNext;
 		styleNext = styler.StyleAt(i + 1);
 		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (atEOL || (ch == ';')) {
+		if (atEOL || (!IsCommentStyle(style) && ch == ';')) {
 			if (endFound) {
 				//Maybe this is the end of "EXCEPTION" BLOCK (eg. "BEGIN ... EXCEPTION ... END;")
 				sqlStatesCurrentLine = sqlStates.IntoExceptionBlock(sqlStatesCurrentLine, false);
@@ -554,7 +568,7 @@ void SCI_METHOD LexerSQL::Fold(unsigned int startPos, int length, int initStyle,
 			if (ch == '(') {
 				if (levelCurrent > levelNext)
 					levelCurrent--;
- 				levelNext++;
+				levelNext++;
 			} else if (ch == ')') {
 				levelNext--;
 			} else if ((!options.foldOnlyBegin) && ch == ';') {
diff --git a/scintilla/lexers/LexVHDL.cxx b/scintilla/lexers/LexVHDL.cxx
index 58bcd1a5..5580b3c5 100644
--- a/scintilla/lexers/LexVHDL.cxx
+++ b/scintilla/lexers/LexVHDL.cxx
@@ -235,7 +235,7 @@ static void FoldNoBoxVHDLDoc(
       }
     }
   }
-  for(j=j+strlen(prevWord); j<endPos; j++)
+  for(j=j+static_cast<unsigned int>(strlen(prevWord)); j<endPos; j++)
   {
     char ch       = styler.SafeGetCharAt(j);
     int style     = styler.StyleAt(j);
diff --git a/scintilla/lexers/LexVerilog.cxx b/scintilla/lexers/LexVerilog.cxx
index 8de04ff7..ed39c2b1 100644
--- a/scintilla/lexers/LexVerilog.cxx
+++ b/scintilla/lexers/LexVerilog.cxx
@@ -29,7 +29,7 @@ using namespace Scintilla;
 #endif
 
 static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\''|| ch == '$');
 }
 
 static inline bool IsAWordStart(const int ch) {
@@ -269,24 +269,36 @@ static void FoldNoBoxVerilogDoc(unsigned int startPos, int length, int initStyle
                         if (styler.Match(j, "case") ||
                             styler.Match(j, "casex") ||
                             styler.Match(j, "casez") ||
+                            styler.Match(j, "class") ||
                             styler.Match(j, "function") ||
-                            styler.Match(j, "fork") ||
+                            styler.Match(j, "generate") ||
+                            styler.Match(j, "covergroup") ||
+                            styler.Match(j, "package") ||
+                            styler.Match(j, "primitive") ||
+                            styler.Match(j, "program") ||
+                            styler.Match(j, "sequence") ||
+                            styler.Match(j, "specify") ||
                             styler.Match(j, "table") ||
                             styler.Match(j, "task") ||
-                            styler.Match(j, "generate") ||
-                            styler.Match(j, "specify") ||
-                            styler.Match(j, "primitive") ||
+                            styler.Match(j, "fork") ||
                             (styler.Match(j, "module") && foldAtModule) ||
                             styler.Match(j, "begin")) {
                                 levelNext++;
                         } else if (styler.Match(j, "endcase") ||
+                                   styler.Match(j, "endclass") ||
                                    styler.Match(j, "endfunction") ||
-                                   styler.Match(j, "join") ||
-                                   styler.Match(j, "endtask") ||
                                    styler.Match(j, "endgenerate") ||
-                                   styler.Match(j, "endtable") ||
-                                   styler.Match(j, "endspecify") ||
+                                   styler.Match(j, "endgroup") ||
+                                   styler.Match(j, "endpackage") ||
                                    styler.Match(j, "endprimitive") ||
+                                   styler.Match(j, "endprogram") ||
+                                   styler.Match(j, "endsequence") ||
+                                   styler.Match(j, "endspecify") ||
+                                   styler.Match(j, "endtable") ||
+                                   styler.Match(j, "endtask") ||
+                                   styler.Match(j, "join") ||
+                                   styler.Match(j, "join_any") ||
+                                   styler.Match(j, "join_none") ||
                                    (styler.Match(j, "endmodule") && foldAtModule) ||
                                    (styler.Match(j, "end") && !IsAWordChar(styler.SafeGetCharAt(j+3)))) {
                                 levelNext--;
diff --git a/scintilla/lexlib/Accessor.cxx b/scintilla/lexlib/Accessor.cxx
index 5adaaa2f..65609598 100644
--- a/scintilla/lexlib/Accessor.cxx
+++ b/scintilla/lexlib/Accessor.cxx
@@ -71,7 +71,7 @@ int Accessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsComment
 	*flags = spaceFlags;
 	indent += SC_FOLDLEVELBASE;
 	// if completely empty line or the start of a comment...
-	if ((ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') ||
+	if ((LineStart(line) == Length()) || (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') ||
 			(pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)))
 		return indent | SC_FOLDLEVELWHITEFLAG;
 	else
diff --git a/scintilla/lexlib/CharacterSet.h b/scintilla/lexlib/CharacterSet.h
index 72405606..ba42ea3d 100644
--- a/scintilla/lexlib/CharacterSet.h
+++ b/scintilla/lexlib/CharacterSet.h
@@ -119,7 +119,6 @@ inline bool iswordstart(int ch) {
 inline bool isoperator(int ch) {
 	if (IsASCII(ch) && IsAlphaNumeric(ch))
 		return false;
-	// '.' left out as it is used to make up numbers
 	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
 	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
 	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
diff --git a/scintilla/lexlib/PropSetSimple.cxx b/scintilla/lexlib/PropSetSimple.cxx
index 6942f6e7..ce2031f8 100644
--- a/scintilla/lexlib/PropSetSimple.cxx
+++ b/scintilla/lexlib/PropSetSimple.cxx
@@ -61,9 +61,10 @@ void PropSetSimple::Set(const char *keyVal) {
 		endVal++;
 	const char *eqAt = strchr(keyVal, '=');
 	if (eqAt) {
-		Set(keyVal, eqAt + 1, eqAt-keyVal, endVal - eqAt - 1);
+		Set(keyVal, eqAt + 1, static_cast<int>(eqAt-keyVal), 
+			static_cast<int>(endVal - eqAt - 1));
 	} else if (*keyVal) {	// No '=' so assume '=1'
-		Set(keyVal, "1", endVal-keyVal, 1);
+		Set(keyVal, "1", static_cast<int>(endVal-keyVal), 1);
 	}
 }
 
@@ -150,7 +151,7 @@ char *PropSetSimple::Expanded(const char *key) const {
 
 int PropSetSimple::GetExpanded(const char *key, char *result) const {
 	char *val = Expanded(key);
-	const int n = strlen(val);
+	const int n = static_cast<int>(strlen(val));
 	if (result) {
 		strcpy(result, val);
 	}
diff --git a/scintilla/lexlib/SparseState.h b/scintilla/lexlib/SparseState.h
index 94aa929e..08ff104d 100644
--- a/scintilla/lexlib/SparseState.h
+++ b/scintilla/lexlib/SparseState.h
@@ -43,12 +43,12 @@ public:
 	}
 	void Set(int position, T value) {
 		Delete(position);
-		if ((states.size() == 0) || (value != states[states.size()-1].value)) {
+		if (states.empty() || (value != states[states.size()-1].value)) {
 			states.push_back(State(position, value));
 		}
 	}
 	T ValueAt(int position) {
-		if (!states.size())
+		if (states.empty())
 			return T();
 		if (position < states[0].position)
 			return T();
@@ -92,7 +92,7 @@ public:
 				changed = true;
 			}
 			typename stateVector::const_iterator startOther = other.states.begin();
-			if (!states.empty() && states.back().value == startOther->value)
+			if (!states.empty() && !other.states.empty() && states.back().value == startOther->value)
 				++startOther;
 			if (startOther != other.states.end()) {
 				states.insert(states.end(), startOther, other.states.end());
diff --git a/scintilla/lexlib/StyleContext.h b/scintilla/lexlib/StyleContext.h
index 15d216bd..c2d223e3 100644
--- a/scintilla/lexlib/StyleContext.h
+++ b/scintilla/lexlib/StyleContext.h
@@ -55,7 +55,6 @@ public:
 		styler(styler_),
 		endPos(startPos + length),
 		currentPos(startPos),
-		atLineStart(true),
 		atLineEnd(false),
 		state(initStyle & chMask), // Mask off all bits which aren't in the chMask.
 		chPrev(0),
@@ -63,6 +62,7 @@ public:
 		chNext(0) {
 		styler.StartAt(startPos, chMask);
 		styler.StartSegment(startPos);
+		atLineStart = static_cast<unsigned int>(styler.LineStart(styler.GetLine(startPos))) == startPos;
 		unsigned int pos = currentPos;
 		ch = static_cast<unsigned char>(styler.SafeGetCharAt(pos));
 		if (styler.IsLeadByte(static_cast<char>(ch))) {
diff --git a/scintilla/lexlib/WordList.cxx b/scintilla/lexlib/WordList.cxx
index cda35ece..9c2c9653 100644
--- a/scintilla/lexlib/WordList.cxx
+++ b/scintilla/lexlib/WordList.cxx
@@ -11,6 +11,8 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#include <algorithm>
+
 #include "WordList.h"
 
 #ifdef SCI_NAMESPACE
@@ -86,22 +88,34 @@ void WordList::Clear() {
 	len = 0;
 }
 
-extern "C" int cmpString(const void *a1, const void *a2) {
-	// Can't work out the correct incantation to use modern casts here
-	return strcmp(*(char **)(a1), *(char **)(a2));
+#ifdef _MSC_VER
+
+static bool cmpWords(const char *a, const char *b) {
+	return strcmp(a, b) == -1;
+}
+
+#else
+
+static int cmpWords(const void *a, const void *b) {
+	return strcmp(*static_cast<const char * const *>(a), *static_cast<const char * const *>(b));
 }
 
 static void SortWordList(char **words, unsigned int len) {
-	qsort(reinterpret_cast<void *>(words), len, sizeof(*words),
-	      cmpString);
+	qsort(reinterpret_cast<void *>(words), len, sizeof(*words), cmpWords);
 }
 
+#endif
+
 void WordList::Set(const char *s) {
 	Clear();
 	list = new char[strlen(s) + 1];
 	strcpy(list, s);
 	words = ArrayFromWordList(list, &len, onlyLineEnds);
+#ifdef _MSC_VER
+	std::sort(words, words + len, cmpWords);
+#else
 	SortWordList(words, len);
+#endif
 	for (unsigned int k = 0; k < (sizeof(starts) / sizeof(starts[0])); k++)
 		starts[k] = -1;
 	for (int l = len - 1; l >= 0; l--) {
@@ -121,7 +135,7 @@ bool WordList::InList(const char *s) const {
 	unsigned char firstChar = s[0];
 	int j = starts[firstChar];
 	if (j >= 0) {
-		while ((unsigned char)words[j][0] == firstChar) {
+		while (static_cast<unsigned char>(words[j][0]) == firstChar) {
 			if (s[1] == words[j][1]) {
 				const char *a = words[j] + 1;
 				const char *b = s + 1;
@@ -163,7 +177,7 @@ bool WordList::InListAbbreviated(const char *s, const char marker) const {
 	unsigned char firstChar = s[0];
 	int j = starts[firstChar];
 	if (j >= 0) {
-		while (words[j][0] == firstChar) {
+		while (static_cast<unsigned char>(words[j][0]) == firstChar) {
 			bool isSubword = false;
 			int start = 1;
 			if (words[j][1] == marker) {
diff --git a/scintilla/scintilla_changes.patch b/scintilla/scintilla_changes.patch
index 9ba54fa2..20afac3d 100644
--- a/scintilla/scintilla_changes.patch
+++ b/scintilla/scintilla_changes.patch
@@ -1,4 +1,4 @@
-A patch to Scintilla 2.25 containing our changes to Scintilla
+A patch to Scintilla 2.29 containing our changes to Scintilla
 (removing unused lexers and an updated marshallers file).
 diff -Naur scintilla_orig/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c
 --- scintilla_orig/gtk/scintilla-marshal.c	2010-10-27 23:15:45.000000000 +0200
diff --git a/scintilla/src/CallTip.cxx b/scintilla/src/CallTip.cxx
index 604304bf..cdc30fcb 100644
--- a/scintilla/src/CallTip.cxx
+++ b/scintilla/src/CallTip.cxx
@@ -100,7 +100,7 @@ void CallTip::DrawChunk(Surface *surface, int &x, const char *s,
 	int ends[numEnds + 2];
 	for (int i=0; i<len; i++) {
 		if ((maxEnd < numEnds) &&
-		        (IsArrowCharacter(s[i]) || IsTabCharacter(s[i])) ) {
+		        (IsArrowCharacter(s[i]) || IsTabCharacter(s[i]))) {
 			if (i > 0)
 				ends[maxEnd++] = i;
 			ends[maxEnd++] = i+1;
diff --git a/scintilla/src/ContractionState.cxx b/scintilla/src/ContractionState.cxx
index 8a1b486e..af0f4f3d 100644
--- a/scintilla/src/ContractionState.cxx
+++ b/scintilla/src/ContractionState.cxx
@@ -168,6 +168,14 @@ bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible
 	}
 }
 
+bool ContractionState::HiddenLines() const {
+	if (OneToOne()) {
+		return false;
+	} else {
+		return !visible->AllSameAs(1);
+	}
+}
+
 bool ContractionState::GetExpanded(int lineDoc) const {
 	if (OneToOne()) {
 		return true;
@@ -223,7 +231,7 @@ int ContractionState::GetHeight(int lineDoc) const {
 bool ContractionState::SetHeight(int lineDoc, int height) {
 	if (OneToOne() && (height == 1)) {
 		return false;
-	} else {
+	} else if (lineDoc < LinesInDoc()) {
 		EnsureData();
 		if (GetHeight(lineDoc) != height) {
 			if (GetVisible(lineDoc)) {
@@ -236,6 +244,8 @@ bool ContractionState::SetHeight(int lineDoc, int height) {
 			Check();
 			return false;
 		}
+	} else {
+		return false;
 	}
 }
 
diff --git a/scintilla/src/ContractionState.h b/scintilla/src/ContractionState.h
index 8e7b39b9..0309fc26 100644
--- a/scintilla/src/ContractionState.h
+++ b/scintilla/src/ContractionState.h
@@ -48,6 +48,7 @@ public:
 
 	bool GetVisible(int lineDoc) const;
 	bool SetVisible(int lineDocStart, int lineDocEnd, bool visible);
+	bool HiddenLines() const;
 
 	bool GetExpanded(int lineDoc) const;
 	bool SetExpanded(int lineDoc, bool expanded);
diff --git a/scintilla/src/Decoration.cxx b/scintilla/src/Decoration.cxx
index e4ac0e07..24632d7c 100644
--- a/scintilla/src/Decoration.cxx
+++ b/scintilla/src/Decoration.cxx
@@ -28,7 +28,7 @@ Decoration::~Decoration() {
 }
 
 bool Decoration::Empty() {
-	return rs.starts->Partitions() == 1;
+	return rs.Runs() == 1;
 }
 
 DecorationList::DecorationList() : currentIndicator(0), currentValue(1), current(0),
@@ -126,9 +126,13 @@ bool DecorationList::FillRange(int &position, int value, int &fillLength) {
 }
 
 void DecorationList::InsertSpace(int position, int insertLength) {
+	const bool atEnd = position == lengthDocument;
 	lengthDocument += insertLength;
 	for (Decoration *deco=root; deco; deco = deco->next) {
 		deco->rs.InsertSpace(position, insertLength);
+		if (atEnd) {
+			deco->rs.FillRange(position, 0, insertLength);
+		}
 	}
 }
 
diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx
index 34e6a99f..5c05aa5e 100644
--- a/scintilla/src/Document.cxx
+++ b/scintilla/src/Document.cxx
@@ -2,7 +2,7 @@
 /** @file Document.cxx
  ** Text document that handles notifications, DBCS, styling, words and end of line.
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>
@@ -87,10 +87,10 @@ void LexInterface::Colourise(int start, int end) {
 
 Document::Document() {
 	refCount = 0;
-#ifdef __unix__
-	eolMode = SC_EOL_LF;
-#else
+#ifdef _WIN32
 	eolMode = SC_EOL_CRLF;
+#else
+	eolMode = SC_EOL_LF;
 #endif
 	dbcsCodePage = 0;
 	stylingBits = 5;
@@ -316,15 +316,18 @@ static bool IsSubordinate(int levelStart, int levelTry) {
 		return (levelStart & SC_FOLDLEVELNUMBERMASK) < (levelTry & SC_FOLDLEVELNUMBERMASK);
 }
 
-int Document::GetLastChild(int lineParent, int level) {
+int Document::GetLastChild(int lineParent, int level, int lastLine) {
 	if (level == -1)
 		level = GetLevel(lineParent) & SC_FOLDLEVELNUMBERMASK;
 	int maxLine = LinesTotal();
+	int lookLastLine = (lastLine != -1) ? Platform::Minimum(LinesTotal() - 1, lastLine) : -1;
 	int lineMaxSubord = lineParent;
 	while (lineMaxSubord < maxLine - 1) {
 		EnsureStyledTo(LineStart(lineMaxSubord + 2));
 		if (!IsSubordinate(level, GetLevel(lineMaxSubord + 1)))
 			break;
+		if ((lookLastLine != -1) && (lineMaxSubord >= lookLastLine) && !(GetLevel(lineMaxSubord) & SC_FOLDLEVELWHITEFLAG))
+			break;
 		lineMaxSubord++;
 	}
 	if (lineMaxSubord > lineParent) {
@@ -355,6 +358,76 @@ int Document::GetFoldParent(int line) {
 	}
 }
 
+void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, int line, int lastLine) {
+	int level = GetLevel(line);
+	int lookLastLine = Platform::Maximum(line, lastLine) + 1;
+
+	int lookLine = line;
+	int lookLineLevel = level;
+	int lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK;
+	while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || 
+		((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum >= (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))))) {
+		lookLineLevel = GetLevel(--lookLine);
+		lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK;
+	}
+
+	int beginFoldBlock = (lookLineLevel & SC_FOLDLEVELHEADERFLAG) ? lookLine : GetFoldParent(lookLine);
+	if (beginFoldBlock == -1) {
+		highlightDelimiter.Clear();
+		return;
+	}
+
+	int endFoldBlock = GetLastChild(beginFoldBlock, -1, lookLastLine);
+	int firstChangeableLineBefore = -1;
+	if (endFoldBlock < line) {
+		lookLine = beginFoldBlock - 1;
+		lookLineLevel = GetLevel(lookLine);
+		lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK;
+		while ((lookLine >= 0) && (lookLineLevelNum >= SC_FOLDLEVELBASE)) {
+			if (lookLineLevel & SC_FOLDLEVELHEADERFLAG) {
+				if (GetLastChild(lookLine, -1, lookLastLine) == line) {
+					beginFoldBlock = lookLine;
+					endFoldBlock = line;
+					firstChangeableLineBefore = line - 1;
+				}
+			}
+			if ((lookLine > 0) && (lookLineLevelNum == SC_FOLDLEVELBASE) && ((GetLevel(lookLine - 1) & SC_FOLDLEVELNUMBERMASK) > lookLineLevelNum))
+				break;
+			lookLineLevel = GetLevel(--lookLine);
+			lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK;
+		}
+	}
+	if (firstChangeableLineBefore == -1) {
+		for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; 
+			lookLine >= beginFoldBlock; 
+			lookLineLevel = GetLevel(--lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) {
+			if ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || (lookLineLevelNum > (level & SC_FOLDLEVELNUMBERMASK))) {
+				firstChangeableLineBefore = lookLine;
+				break;
+			}
+		}
+	}
+	if (firstChangeableLineBefore == -1)
+		firstChangeableLineBefore = beginFoldBlock - 1;
+
+	int firstChangeableLineAfter = -1;
+	for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; 
+		lookLine <= endFoldBlock; 
+		lookLineLevel = GetLevel(++lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) {
+		if ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum < (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))) {
+			firstChangeableLineAfter = lookLine;
+			break;
+		}
+	}
+	if (firstChangeableLineAfter == -1)
+		firstChangeableLineAfter = endFoldBlock + 1;
+
+	highlightDelimiter.beginFoldBlock = beginFoldBlock;
+	highlightDelimiter.endFoldBlock = endFoldBlock;
+	highlightDelimiter.firstChangeableLineBefore = firstChangeableLineBefore;
+	highlightDelimiter.firstChangeableLineAfter = firstChangeableLineAfter;
+}
+
 int Document::ClampPositionIntoDocument(int pos) {
 	return Platform::Clamp(pos, 0, Length());
 }
@@ -589,7 +662,8 @@ bool SCI_METHOD Document::IsDBCSLeadByte(char ch) const {
 		case 932:
 			// Shift_jis
 			return ((uch >= 0x81) && (uch <= 0x9F)) ||
-				((uch >= 0xE0) && (uch <= 0xEF));
+				((uch >= 0xE0) && (uch <= 0xFC));
+				// Lead bytes F0 to FC may be a Microsoft addition. 
 		case 936:
 			// GBK
 			return (uch >= 0x81) && (uch <= 0xFE);
@@ -609,6 +683,55 @@ bool SCI_METHOD Document::IsDBCSLeadByte(char ch) const {
 	return false;
 }
 
+inline bool IsSpaceOrTab(int ch) {
+	return ch == ' ' || ch == '\t';
+}
+
+// Need to break text into segments near lengthSegment but taking into
+// account the encoding to not break inside a UTF-8 or DBCS character
+// and also trying to avoid breaking inside a pair of combining characters.
+// The segment length must always be long enough (more than 4 bytes)
+// so that there will be at least one whole character to make a segment.
+// For UTF-8, text must consist only of valid whole characters.
+// In preference order from best to worst:
+//   1) Break after space
+//   2) Break before punctuation
+//   3) Break after whole character
+
+int Document::SafeSegment(const char *text, int length, int lengthSegment) {
+	if (length <= lengthSegment)
+		return length;
+	int lastSpaceBreak = -1;
+	int lastPunctuationBreak = -1;
+	int lastEncodingAllowedBreak = -1;
+	for (int j=0; j < lengthSegment;) {
+		unsigned char ch = static_cast<unsigned char>(text[j]);
+		if (j > 0) {
+			if (IsSpaceOrTab(text[j - 1]) && !IsSpaceOrTab(text[j])) {
+				lastSpaceBreak = j;
+			}
+			if (ch < 'A') {
+				lastPunctuationBreak = j;
+			}
+		}
+		lastEncodingAllowedBreak = j;
+
+		if (dbcsCodePage == SC_CP_UTF8) {
+			j += (ch < 0x80) ? 1 : BytesFromLead(ch);
+		} else if (dbcsCodePage) {
+			j += IsDBCSLeadByte(ch) ? 2 : 1;
+		} else {
+			j++;
+		}
+	}
+	if (lastSpaceBreak >= 0) {
+		return lastSpaceBreak;
+	} else if (lastPunctuationBreak >= 0) {
+		return lastPunctuationBreak;
+	}
+	return lastEncodingAllowedBreak;
+}
+
 void Document::ModifiedAt(int pos) {
 	if (endStyled > pos)
 		endStyled = pos;
@@ -833,7 +956,7 @@ bool Document::InsertChar(int pos, char ch) {
  * Insert a null terminated string.
  */
 bool Document::InsertCString(int position, const char *s) {
-	return InsertString(position, s, strlen(s));
+	return InsertString(position, s, static_cast<int>(strlen(s)));
 }
 
 void Document::ChangeChar(int pos, char ch) {
@@ -990,17 +1113,17 @@ void Document::Indent(bool forwards, int lineBottom, int lineTop) {
 // Convert line endings for a piece of text to a particular mode.
 // Stop at len or when a NUL is found.
 // Caller must delete the returned pointer.
-char *Document::TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolMode) {
+char *Document::TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolModeWanted) {
 	char *dest = new char[2 * len + 1];
 	const char *sptr = s;
 	char *dptr = dest;
 	for (size_t i = 0; (i < len) && (*sptr != '\0'); i++) {
 		if (*sptr == '\n' || *sptr == '\r') {
-			if (eolMode == SC_EOL_CR) {
+			if (eolModeWanted == SC_EOL_CR) {
 				*dptr++ = '\r';
-			} else if (eolMode == SC_EOL_LF) {
+			} else if (eolModeWanted == SC_EOL_LF) {
 				*dptr++ = '\n';
-			} else { // eolMode == SC_EOL_CRLF
+			} else { // eolModeWanted == SC_EOL_CRLF
 				*dptr++ = '\r';
 				*dptr++ = '\n';
 			}
@@ -1232,7 +1355,7 @@ size_t Document::ExtractChar(int pos, char *bytes) {
 	size_t widthChar = UTF8CharLength(ch);
 	bytes[0] = ch;
 	for (size_t i=1; i<widthChar; i++) {
-		bytes[i] = cb.CharAt(pos+i);
+		bytes[i] = cb.CharAt(static_cast<int>(pos+i));
 		if (!GoodTrailByte(static_cast<unsigned char>(bytes[i]))) { // Bad byte
 			widthChar = 1;
 		}
@@ -1305,7 +1428,6 @@ long Document::FindText(int minPos, int maxPos, const char *search,
 
 		// Compute actual search ranges needed
 		const int lengthFind = (*length == -1) ? static_cast<int>(strlen(search)) : *length;
-		const int endSearch = (startPos <= endPos) ? endPos - lengthFind + 1 : endPos;
 
 		//Platform::DebugPrintf("Find %d %d %s %d\n", startPos, endPos, ft->lpstrText, lengthFind);
 		const int limitPos = Platform::Maximum(startPos, endPos);
@@ -1315,6 +1437,7 @@ long Document::FindText(int minPos, int maxPos, const char *search,
 			pos = NextPosition(pos, increment);
 		}
 		if (caseSensitive) {
+			const int endSearch = (startPos <= endPos) ? endPos - lengthFind + 1 : endPos;
 			while (forward ? (pos < endSearch) : (pos >= endSearch)) {
 				bool found = (pos + lengthFind) <= limitPos;
 				for (int indexSearch = 0; (indexSearch < lengthFind) && found; indexSearch++) {
@@ -1330,8 +1453,9 @@ long Document::FindText(int minPos, int maxPos, const char *search,
 			const size_t maxBytesCharacter = 4;
 			const size_t maxFoldingExpansion = 4;
 			std::vector<char> searchThing(lengthFind * maxBytesCharacter * maxFoldingExpansion + 1);
-			const int lenSearch = pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind);
-			while (forward ? (pos < endSearch) : (pos >= endSearch)) {
+			const int lenSearch = static_cast<int>(
+				pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind));
+			while (forward ? (pos < endPos) : (pos >= endPos)) {
 				int widthFirstCharacter = 0;
 				int indexDocument = 0;
 				int indexSearch = 0;
@@ -1341,11 +1465,13 @@ long Document::FindText(int minPos, int maxPos, const char *search,
 					(indexSearch < lenSearch)) {
 					char bytes[maxBytesCharacter + 1];
 					bytes[maxBytesCharacter] = 0;
-					const int widthChar = ExtractChar(pos + indexDocument, bytes);
+					const int widthChar = static_cast<int>(ExtractChar(pos + indexDocument, bytes));
 					if (!widthFirstCharacter)
 						widthFirstCharacter = widthChar;
+					if ((pos + indexDocument + widthChar) > limitPos)
+						break;
 					char folded[maxBytesCharacter * maxFoldingExpansion + 1];
-					const int lenFlat = pcf->Fold(folded, sizeof(folded), bytes, widthChar);
+					const int lenFlat = static_cast<int>(pcf->Fold(folded, sizeof(folded), bytes, widthChar));
 					folded[lenFlat] = 0;
 					// Does folded match the buffer
 					characterMatches = 0 == memcmp(folded, &searchThing[0] + indexSearch, lenFlat);
@@ -1369,8 +1495,9 @@ long Document::FindText(int minPos, int maxPos, const char *search,
 			const size_t maxBytesCharacter = 2;
 			const size_t maxFoldingExpansion = 4;
 			std::vector<char> searchThing(lengthFind * maxBytesCharacter * maxFoldingExpansion + 1);
-			const int lenSearch = pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind);
-			while (forward ? (pos < endSearch) : (pos >= endSearch)) {
+			const int lenSearch = static_cast<int>(
+				pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind));
+			while (forward ? (pos < endPos) : (pos >= endPos)) {
 				int indexDocument = 0;
 				int indexSearch = 0;
 				bool characterMatches = true;
@@ -1382,8 +1509,10 @@ long Document::FindText(int minPos, int maxPos, const char *search,
 					const int widthChar = IsDBCSLeadByte(bytes[0]) ? 2 : 1;
 					if (widthChar == 2)
 						bytes[1] = cb.CharAt(pos + indexDocument + 1);
+					if ((pos + indexDocument + widthChar) > limitPos)
+						break;
 					char folded[maxBytesCharacter * maxFoldingExpansion + 1];
-					const int lenFlat = pcf->Fold(folded, sizeof(folded), bytes, widthChar);
+					const int lenFlat = static_cast<int>(pcf->Fold(folded, sizeof(folded), bytes, widthChar));
 					folded[lenFlat] = 0;
 					// Does folded match the buffer
 					characterMatches = 0 == memcmp(folded, &searchThing[0] + indexSearch, lenFlat);
@@ -1400,7 +1529,7 @@ long Document::FindText(int minPos, int maxPos, const char *search,
 					break;
 			}
 		} else {
-			CaseFolderTable caseFolder;
+			const int endSearch = (startPos <= endPos) ? endPos - lengthFind + 1 : endPos;
 			std::vector<char> searchThing(lengthFind + 1);
 			pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind);
 			while (forward ? (pos < endSearch) : (pos >= endSearch)) {
@@ -1950,10 +2079,17 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s
 		// the start position is at end of line or between line end characters.
 		lineRangeStart++;
 		startPos = doc->LineStart(lineRangeStart);
+	} else if ((increment == -1) &&
+	           (startPos <= doc->LineStart(lineRangeStart)) &&
+	           (lineRangeStart > lineRangeEnd)) {
+		// the start position is at beginning of line.
+		lineRangeStart--;
+		startPos = doc->LineEnd(lineRangeStart);
 	}
 	int pos = -1;
 	int lenRet = 0;
 	char searchEnd = s[*length - 1];
+	char searchEndPrev = (*length > 1) ? s[*length - 2] : '\0';
 	int lineRangeBreak = lineRangeEnd + increment;
 	for (int line = lineRangeStart; line != lineRangeBreak; line += increment) {
 		int startOfLine = doc->LineStart(line);
@@ -1965,7 +2101,7 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s
 				startOfLine = startPos;
 			}
 			if (line == lineRangeEnd) {
-				if ((endPos != endOfLine) && (searchEnd == '$'))
+				if ((endPos != endOfLine) && (searchEnd == '$') && (searchEndPrev != '\\'))
 					continue;	// Can't match end of line if end position before end of line
 				endOfLine = endPos;
 			}
@@ -1976,7 +2112,7 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s
 				startOfLine = endPos;
 			}
 			if (line == lineRangeStart) {
-				if ((startPos != endOfLine) && (searchEnd == '$'))
+				if ((startPos != endOfLine) && (searchEnd == '$') && (searchEndPrev != '\\'))
 					continue;	// Can't match end of line if start position before end of line
 				endOfLine = startPos;
 			}
@@ -1987,7 +2123,8 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s
 		if (success) {
 			pos = search.bopat[0];
 			lenRet = search.eopat[0] - search.bopat[0];
-			if (increment == -1) {
+			// There can be only one start of a line, so no need to look for last match in line
+			if ((increment == -1) && (s[0] != '^')) {
 				// Check for the last match on this line.
 				int repetitions = 1000;	// Break out of infinite loop
 				while (success && (search.eopat[0] <= endOfLine) && (repetitions--)) {
diff --git a/scintilla/src/Document.h b/scintilla/src/Document.h
index ecdf5ff6..00d23a45 100644
--- a/scintilla/src/Document.h
+++ b/scintilla/src/Document.h
@@ -2,7 +2,7 @@
 /** @file Document.h
  ** Text document that handles notifications, DBCS, styling, words and end of line.
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef DOCUMENT_H
@@ -115,6 +115,46 @@ struct StyledText {
 	}
 };
 
+class HighlightDelimiter {
+public:
+	HighlightDelimiter() : isEnabled(false) {
+		Clear();
+	}
+
+	void Clear() {
+		beginFoldBlock = -1;
+		endFoldBlock = -1;
+		firstChangeableLineBefore = -1;
+		firstChangeableLineAfter = -1;
+	}
+
+	bool NeedsDrawing(int line) {
+		return isEnabled && (line <= firstChangeableLineBefore || line >= firstChangeableLineAfter);
+	}
+
+	bool IsFoldBlockHighlighted(int line) {
+		return isEnabled && beginFoldBlock != -1 && beginFoldBlock <= line && line <= endFoldBlock;
+	}
+
+	bool IsHeadOfFoldBlock(int line) {
+		return beginFoldBlock == line && line < endFoldBlock;
+	}
+
+	bool IsBodyOfFoldBlock(int line) {
+		return beginFoldBlock != -1 && beginFoldBlock < line && line < endFoldBlock;
+	}
+
+	bool IsTailOfFoldBlock(int line) {
+		return beginFoldBlock != -1 && beginFoldBlock < line && line == endFoldBlock;
+	}
+
+	int beginFoldBlock;	// Begin of current fold block
+	int endFoldBlock;	// End of current fold block
+	int firstChangeableLineBefore;	// First line that triggers repaint before starting line that determined current fold block
+	int firstChangeableLineAfter;	// First line that triggers repaint after starting line that determined current fold block
+	bool isEnabled;
+};
+
 class CaseFolder {
 public:
 	virtual ~CaseFolder() {
@@ -234,6 +274,7 @@ public:
 	bool NextCharacter(int &pos, int moveDir);	// Returns true if pos changed
 	int SCI_METHOD CodePage() const;
 	bool SCI_METHOD IsDBCSLeadByte(char ch) const;
+	int SafeSegment(const char *text, int length, int lengthSegment);
 
 	// Gateways to modifying document
 	void ModifiedAt(int pos);
@@ -262,7 +303,7 @@ public:
 	int GetColumn(int position);
 	int FindColumn(int line, int column);
 	void Indent(bool forwards, int lineBottom, int lineTop);
-	static char *TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolMode);
+	static char *TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolModeWanted);
 	void ConvertLineEnds(int eolModeSet);
 	void SetReadOnly(bool set) { cb.SetReadOnly(set); }
 	bool IsReadOnly() { return cb.IsReadOnly(); }
@@ -297,8 +338,9 @@ public:
 	int SCI_METHOD SetLevel(int line, int level);
 	int SCI_METHOD GetLevel(int line) const;
 	void ClearLevels();
-	int GetLastChild(int lineParent, int level=-1);
+	int GetLastChild(int lineParent, int level=-1, int lastLine=-1);
 	int GetFoldParent(int line);
+	void GetHighlightDelimiters(HighlightDelimiter &hDelimiter, int line, int lastLine);
 
 	void Indent(bool forwards);
 	int ExtendWordSelect(int pos, int delta, bool onlyWordCharacters=false);
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index bc5e80cc..7dbaa361 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -2,7 +2,7 @@
 /** @file Editor.cxx
  ** Main code for the edit control.
  **/
-// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>
@@ -13,6 +13,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 #include <algorithm>
 #include <memory>
 
@@ -131,7 +132,7 @@ Editor::Editor() {
 	selectionType = selChar;
 
 	lastXChosen = 0;
-	lineAnchor = 0;
+	lineAnchorPos = 0;
 	originalAnchorPos = 0;
 	wordSelectAnchorStartPos = 0;
 	wordSelectAnchorEndPos = 0;
@@ -144,6 +145,9 @@ Editor::Editor() {
 
 	caretYPolicy = CARET_EVEN;
 	caretYSlop = 0;
+	
+	visiblePolicy = 0;
+	visibleSlop = 0;
 
 	searchAnchor = 0;
 
@@ -156,6 +160,7 @@ Editor::Editor() {
 	verticalScrollBarVisible = true;
 	endAtLastLine = true;
 	caretSticky = SC_CARETSTICKY_OFF;
+	marginOptions = SC_MARGINOPTION_NONE;
 	multipleSelection = false;
 	additionalSelectionTyping = false;
 	multiPasteMode = SC_MULTIPASTE_ONCE;
@@ -755,6 +760,7 @@ void Editor::InvalidateSelection(SelectionRange newMain, bool invalidateWholeSel
 void Editor::SetSelection(SelectionPosition currentPos_, SelectionPosition anchor_) {
 	currentPos_ = ClampPositionIntoDocument(currentPos_);
 	anchor_ = ClampPositionIntoDocument(anchor_);
+	int currentLine = pdoc->LineFromPosition(currentPos_.Position());
 	/* For Line selection - ensure the anchor and caret are always
 	   at the beginning and end of the region lines. */
 	if (sel.selType == Selection::selLines) {
@@ -773,6 +779,10 @@ void Editor::SetSelection(SelectionPosition currentPos_, SelectionPosition ancho
 	sel.RangeMain() = rangeNew;
 	SetRectangularRange();
 	ClaimSelection();
+
+	if (highlightDelimiter.NeedsDrawing(currentLine)) {
+		RedrawSelMargin();
+	}
 }
 
 void Editor::SetSelection(int currentPos_, int anchor_) {
@@ -782,6 +792,7 @@ void Editor::SetSelection(int currentPos_, int anchor_) {
 // Just move the caret on the main selection
 void Editor::SetSelection(SelectionPosition currentPos_) {
 	currentPos_ = ClampPositionIntoDocument(currentPos_);
+	int currentLine = pdoc->LineFromPosition(currentPos_.Position());
 	if (sel.Count() > 1 || !(sel.RangeMain().caret == currentPos_)) {
 		InvalidateSelection(SelectionRange(currentPos_));
 	}
@@ -794,6 +805,10 @@ void Editor::SetSelection(SelectionPosition currentPos_) {
 			SelectionRange(SelectionPosition(currentPos_), sel.RangeMain().anchor);
 	}
 	ClaimSelection();
+
+	if (highlightDelimiter.NeedsDrawing(currentLine)) {
+		RedrawSelMargin();
+	}
 }
 
 void Editor::SetSelection(int currentPos_) {
@@ -801,6 +816,7 @@ void Editor::SetSelection(int currentPos_) {
 }
 
 void Editor::SetEmptySelection(SelectionPosition currentPos_) {
+	int currentLine = pdoc->LineFromPosition(currentPos_.Position());
 	SelectionRange rangeNew(ClampPositionIntoDocument(currentPos_));
 	if (sel.Count() > 1 || !(sel.RangeMain() == rangeNew)) {
 		InvalidateSelection(rangeNew);
@@ -810,6 +826,9 @@ void Editor::SetEmptySelection(SelectionPosition currentPos_) {
 	SetRectangularRange();
 	ClaimSelection();
 
+	if (highlightDelimiter.NeedsDrawing(currentLine)) {
+		RedrawSelMargin();
+	}
 }
 
 void Editor::SetEmptySelection(int currentPos_) {
@@ -910,6 +929,12 @@ int Editor::MovePositionTo(SelectionPosition newPos, Selection::selTypes selt, b
 			SetXYScroll(newXY);
 		}
 	}
+
+	int currentLine = pdoc->LineFromPosition(newPos.Position());
+
+	if (highlightDelimiter.NeedsDrawing(currentLine)) {
+		RedrawSelMargin();
+	}
 	return 0;
 }
 
@@ -957,7 +982,9 @@ void Editor::ScrollTo(int line, bool moveThumb) {
 	int topLineNew = Platform::Clamp(line, 0, MaxScrollPos());
 	if (topLineNew != topLine) {
 		// Try to optimise small scrolls
+#ifndef UNDER_CE
 		int linesToMove = topLine - topLineNew;
+#endif
 		SetTopLine(topLineNew);
 		// Optimize by styling the view as this will invalidate any needed area
 		// which could abort the initial paint if discovered later.
@@ -1005,6 +1032,59 @@ void Editor::VerticalCentreCaret() {
 	}
 }
 
+void Editor::MoveSelectedLines(int lineDelta) {
+
+	// if selection doesn't start at the beginning of the line, set the new start
+	int selectionStart = SelectionStart().Position();
+	int startLine = pdoc->LineFromPosition(selectionStart);
+	int beginningOfStartLine = pdoc->LineStart(startLine);
+	selectionStart = beginningOfStartLine;
+
+	// if selection doesn't end at the beginning of a line greater than that of the start,
+	// then set it at the beginning of the next one
+	int selectionEnd = SelectionEnd().Position();
+	int endLine = pdoc->LineFromPosition(selectionEnd);
+	int beginningOfEndLine = pdoc->LineStart(endLine);
+	if (selectionEnd > beginningOfEndLine
+		|| selectionStart == selectionEnd) {
+		selectionEnd = pdoc->LineStart(endLine + 1);
+	}
+
+	// if there's nowhere for the selection to move
+	// (i.e. at the beginning going up or at the end going down),
+	// stop it right there!
+	if ((selectionStart == 0 && lineDelta < 0)
+		|| (selectionEnd == pdoc->Length() && lineDelta > 0)
+	        || selectionStart == selectionEnd) {
+		return;
+	}
+
+	UndoGroup ug(pdoc);
+
+	SetSelection(selectionStart, selectionEnd);
+
+	SelectionText selectedText;
+	CopySelectionRange(&selectedText);
+
+	int selectionLength = SelectionRange(selectionStart, selectionEnd).Length();
+	ClearSelection();
+
+	Point currentLocation = LocationFromPosition(CurrentPosition());
+	int currentLine = LineFromLocation(currentLocation);
+	GoToLine(currentLine + lineDelta);
+
+	pdoc->InsertCString(CurrentPosition(), selectedText.s);
+	SetSelection(CurrentPosition(), CurrentPosition() + selectionLength);
+}
+
+void Editor::MoveSelectedLinesUp() {
+	MoveSelectedLines(-1);
+}
+
+void Editor::MoveSelectedLinesDown() {
+	MoveSelectedLines(1);
+}
+
 void Editor::MoveCaretInsideView(bool ensureVisible) {
 	PRectangle rcClient = GetTextRectangle();
 	Point pt = PointMainCaret();
@@ -1532,8 +1612,10 @@ void Editor::LinesSplit(int pixelWidth) {
 				unsigned int posLineStart = pdoc->LineStart(line);
 				LayoutLine(line, surface, vs, ll, pixelWidth);
 				for (int subLine = 1; subLine < ll->lines; subLine++) {
-					pdoc->InsertCString(posLineStart + (subLine - 1) * strlen(eol) +
-					        ll->LineStart(subLine), eol);
+					pdoc->InsertCString(
+						static_cast<int>(posLineStart + (subLine - 1) * strlen(eol) +
+							ll->LineStart(subLine)),
+						eol);
 					targetEnd += static_cast<int>(strlen(eol));
 				}
 			}
@@ -1576,7 +1658,8 @@ static int WidthStyledText(Surface *surface, ViewStyle &vs, int styleOffset,
 		size_t endSegment = start;
 		while ((endSegment+1 < len) && (static_cast<size_t>(styles[endSegment+1]) == style))
 			endSegment++;
-		width += surface->WidthText(vs.styles[style+styleOffset].font, text + start, endSegment - start + 1);
+		width += surface->WidthText(vs.styles[style+styleOffset].font, text + start, 
+			static_cast<int>(endSegment - start + 1));
 		start = endSegment + 1;
 	}
 	return width;
@@ -1591,7 +1674,8 @@ static int WidestLineWidth(Surface *surface, ViewStyle &vs, int styleOffset, con
 		if (st.multipleStyles) {
 			widthSubLine = WidthStyledText(surface, vs, styleOffset, st.text + start, st.styles + start, lenLine);
 		} else {
-			widthSubLine = surface->WidthText(vs.styles[styleOffset + st.style].font, st.text + start, lenLine);
+			widthSubLine = surface->WidthText(vs.styles[styleOffset + st.style].font,
+				st.text + start, static_cast<int>(lenLine));
 		}
 		if (widthSubLine > widthMax)
 			widthMax = widthSubLine;
@@ -1612,21 +1696,24 @@ void DrawStyledText(Surface *surface, ViewStyle &vs, int styleOffset, PRectangle
 			while (end < length-1 && st.styles[start+end+1] == style)
 				end++;
 			style += styleOffset;
-			int width = surface->WidthText(vs.styles[style].font, st.text + start + i, end - i + 1);
+			int width = surface->WidthText(vs.styles[style].font,
+				st.text + start + i, static_cast<int>(end - i + 1));
 			PRectangle rcSegment = rcText;
 			rcSegment.left = x;
 			rcSegment.right = x + width + 1;
 			surface->DrawTextNoClip(rcSegment, vs.styles[style].font,
-					ascent, st.text + start + i, end - i + 1,
+					ascent, st.text + start + i,
+					static_cast<int>(end - i + 1),
 					vs.styles[style].fore.allocated,
 					vs.styles[style].back.allocated);
 			x += width;
 			i = end + 1;
 		}
 	} else {
-		int style = st.style + styleOffset;
+		size_t style = st.style + styleOffset;
 		surface->DrawTextNoClip(rcText, vs.styles[style].font,
-				rcText.top + vs.maxAscent, st.text + start, length,
+				rcText.top + vs.maxAscent, st.text + start,
+				static_cast<int>(length),
 				vs.styles[style].fore.allocated,
 				vs.styles[style].back.allocated);
 	}
@@ -1659,13 +1746,6 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
 			rcSelMargin.right = rcSelMargin.left + vs.ms[margin].width;
 
 			if (vs.ms[margin].style != SC_MARGIN_NUMBER) {
-				/* alternate scheme:
-				if (vs.ms[margin].mask & SC_MASK_FOLDERS)
-					surface->FillRectangle(rcSelMargin, vs.styles[STYLE_DEFAULT].back.allocated);
-				else
-					// Required because of special way brush is created for selection margin
-					surface->FillRectangle(rcSelMargin, pixmapSelPattern);
-				*/
 				if (vs.ms[margin].mask & SC_MASK_FOLDERS)
 					// Required because of special way brush is created for selection margin
 					surface->FillRectangle(rcSelMargin, *pixmapSelPattern);
@@ -1690,22 +1770,27 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
 
 			int visibleLine = topLine;
 			int yposScreen = 0;
-
 			// Work out whether the top line is whitespace located after a
 			// lessening of fold level which implies a 'fold tail' but which should not
 			// be displayed until the last of a sequence of whitespace.
 			bool needWhiteClosure = false;
-			int level = pdoc->GetLevel(cs.DocFromDisplay(topLine));
-			if (level & SC_FOLDLEVELWHITEFLAG) {
-				int lineBack = cs.DocFromDisplay(topLine);
-				int levelPrev = level;
-				while ((lineBack > 0) && (levelPrev & SC_FOLDLEVELWHITEFLAG)) {
-					lineBack--;
-					levelPrev = pdoc->GetLevel(lineBack);
+			if (vs.ms[margin].mask & SC_MASK_FOLDERS) {
+				int level = pdoc->GetLevel(cs.DocFromDisplay(topLine));
+				if (level & SC_FOLDLEVELWHITEFLAG) {
+					int lineBack = cs.DocFromDisplay(topLine);
+					int levelPrev = level;
+					while ((lineBack > 0) && (levelPrev & SC_FOLDLEVELWHITEFLAG)) {
+						lineBack--;
+						levelPrev = pdoc->GetLevel(lineBack);
+					}
+					if (!(levelPrev & SC_FOLDLEVELHEADERFLAG)) {
+						if ((level & SC_FOLDLEVELNUMBERMASK) < (levelPrev & SC_FOLDLEVELNUMBERMASK))
+							needWhiteClosure = true;
+					}
 				}
-				if (!(levelPrev & SC_FOLDLEVELHEADERFLAG)) {
-					if ((level & SC_FOLDLEVELNUMBERMASK) < (levelPrev & SC_FOLDLEVELNUMBERMASK))
-						needWhiteClosure = true;
+				if (highlightDelimiter.isEnabled) {
+					int lastLine = cs.DocFromDisplay(topLine + LinesOnScreen()) + 1;
+					pdoc->GetHighlightDelimiters(highlightDelimiter, pdoc->LineFromPosition(CurrentPosition()), lastLine);
 				}
 			}
 
@@ -1718,75 +1803,108 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
 			while ((visibleLine < cs.LinesDisplayed()) && yposScreen < rcMargin.bottom) {
 
 				PLATFORM_ASSERT(visibleLine < cs.LinesDisplayed());
-
 				int lineDoc = cs.DocFromDisplay(visibleLine);
 				PLATFORM_ASSERT(cs.GetVisible(lineDoc));
 				bool firstSubLine = visibleLine == cs.DisplayFromDoc(lineDoc);
+				bool lastSubLine = visibleLine == (cs.DisplayFromDoc(lineDoc + 1) - 1);
 
-				// Decide which fold indicator should be displayed
-				level = pdoc->GetLevel(lineDoc);
-				int levelNext = pdoc->GetLevel(lineDoc + 1);
 				int marks = pdoc->GetMark(lineDoc);
 				if (!firstSubLine)
 					marks = 0;
-				int levelNum = level & SC_FOLDLEVELNUMBERMASK;
-				int levelNextNum = levelNext & SC_FOLDLEVELNUMBERMASK;
-				if (level & SC_FOLDLEVELHEADERFLAG) {
-					if (firstSubLine) {
-						if (cs.GetExpanded(lineDoc)) {
-							if (levelNum == SC_FOLDLEVELBASE)
-								marks |= 1 << SC_MARKNUM_FOLDEROPEN;
-							else
-								marks |= 1 << folderOpenMid;
+
+				bool headWithTail = false;
+
+				if (vs.ms[margin].mask & SC_MASK_FOLDERS) {
+					// Decide which fold indicator should be displayed
+					int level = pdoc->GetLevel(lineDoc);
+					int levelNext = pdoc->GetLevel(lineDoc + 1);
+					int levelNum = level & SC_FOLDLEVELNUMBERMASK;
+					int levelNextNum = levelNext & SC_FOLDLEVELNUMBERMASK;
+					if (level & SC_FOLDLEVELHEADERFLAG) {
+						if (firstSubLine) {
+							if (levelNum < levelNextNum) {
+								if (cs.GetExpanded(lineDoc)) {
+									if (levelNum == SC_FOLDLEVELBASE)
+										marks |= 1 << SC_MARKNUM_FOLDEROPEN;
+									else
+										marks |= 1 << folderOpenMid;
+								} else {
+									if (levelNum == SC_FOLDLEVELBASE)
+										marks |= 1 << SC_MARKNUM_FOLDER;
+									else
+										marks |= 1 << folderEnd;
+								}
+							} else if (levelNum > SC_FOLDLEVELBASE) {
+								marks |= 1 << SC_MARKNUM_FOLDERSUB;
+ 							}
 						} else {
-							if (levelNum == SC_FOLDLEVELBASE)
-								marks |= 1 << SC_MARKNUM_FOLDER;
-							else
-								marks |= 1 << folderEnd;
+							if (levelNum < levelNextNum) {
+								if (cs.GetExpanded(lineDoc)) {
+									marks |= 1 << SC_MARKNUM_FOLDERSUB;
+								} else if (levelNum > SC_FOLDLEVELBASE) {
+									marks |= 1 << SC_MARKNUM_FOLDERSUB;
+								}
+							} else if (levelNum > SC_FOLDLEVELBASE) {
+								marks |= 1 << SC_MARKNUM_FOLDERSUB;
+ 							}
 						}
-					} else {
-						marks |= 1 << SC_MARKNUM_FOLDERSUB;
-					}
-					needWhiteClosure = false;
-				} else if (level & SC_FOLDLEVELWHITEFLAG) {
-					if (needWhiteClosure) {
-						if (levelNext & SC_FOLDLEVELWHITEFLAG) {
-							marks |= 1 << SC_MARKNUM_FOLDERSUB;
+						needWhiteClosure = false;
+						int firstFollowupLine = cs.DocFromDisplay(cs.DisplayFromDoc(lineDoc + 1));
+						int firstFollowupLineLevel = pdoc->GetLevel(firstFollowupLine);
+						int secondFollowupLineLevelNum = pdoc->GetLevel(firstFollowupLine + 1) & SC_FOLDLEVELNUMBERMASK;
+						if (!cs.GetExpanded(lineDoc)) {
+							if ((firstFollowupLineLevel & SC_FOLDLEVELWHITEFLAG) &&
+								(levelNum > secondFollowupLineLevelNum))
+								needWhiteClosure = true;
+
+							if (highlightDelimiter.IsFoldBlockHighlighted(firstFollowupLine))
+								headWithTail = true;
+						}
+					} else if (level & SC_FOLDLEVELWHITEFLAG) {
+						if (needWhiteClosure) {
+							if (levelNext & SC_FOLDLEVELWHITEFLAG) {
+								marks |= 1 << SC_MARKNUM_FOLDERSUB;
+							} else if (levelNextNum > SC_FOLDLEVELBASE) {
+								marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
+								needWhiteClosure = false;
+							} else {
+								marks |= 1 << SC_MARKNUM_FOLDERTAIL;
+								needWhiteClosure = false;
+							}
 						} else if (levelNum > SC_FOLDLEVELBASE) {
-							marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
-							needWhiteClosure = false;
-						} else {
-							marks |= 1 << SC_MARKNUM_FOLDERTAIL;
-							needWhiteClosure = false;
+							if (levelNextNum < levelNum) {
+								if (levelNextNum > SC_FOLDLEVELBASE) {
+									marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
+								} else {
+									marks |= 1 << SC_MARKNUM_FOLDERTAIL;
+								}
+							} else {
+								marks |= 1 << SC_MARKNUM_FOLDERSUB;
+							}
 						}
 					} else if (levelNum > SC_FOLDLEVELBASE) {
 						if (levelNextNum < levelNum) {
-							if (levelNextNum > SC_FOLDLEVELBASE) {
-								marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
+							needWhiteClosure = false;
+							if (levelNext & SC_FOLDLEVELWHITEFLAG) {
+								marks |= 1 << SC_MARKNUM_FOLDERSUB;
+								needWhiteClosure = true;
+							} else if (lastSubLine) {
+								if (levelNextNum > SC_FOLDLEVELBASE) {
+									marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
+								} else {
+									marks |= 1 << SC_MARKNUM_FOLDERTAIL;
+								}
 							} else {
-								marks |= 1 << SC_MARKNUM_FOLDERTAIL;
+								marks |= 1 << SC_MARKNUM_FOLDERSUB;
 							}
 						} else {
 							marks |= 1 << SC_MARKNUM_FOLDERSUB;
 						}
 					}
-				} else if (levelNum > SC_FOLDLEVELBASE) {
-					if (levelNextNum < levelNum) {
-						needWhiteClosure = false;
-						if (levelNext & SC_FOLDLEVELWHITEFLAG) {
-							marks |= 1 << SC_MARKNUM_FOLDERSUB;
-							needWhiteClosure = true;
-						} else if (levelNextNum > SC_FOLDLEVELBASE) {
-							marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
-						} else {
-							marks |= 1 << SC_MARKNUM_FOLDERTAIL;
-						}
-					} else {
-						marks |= 1 << SC_MARKNUM_FOLDERSUB;
-					}
 				}
 
 				marks &= vs.ms[margin].mask;
+
 				PRectangle rcMarker = rcSelMargin;
 				rcMarker.top = yposScreen;
 				rcMarker.bottom = yposScreen + vs.lineHeight;
@@ -1832,7 +1950,25 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
 				if (marks) {
 					for (int markBit = 0; (markBit < 32) && marks; markBit++) {
 						if (marks & 1) {
-							vs.markers[markBit].Draw(surface, rcMarker, vs.styles[STYLE_LINENUMBER].font);
+							LineMarker::typeOfFold tFold = LineMarker::undefined;
+							if ((vs.ms[margin].mask & SC_MASK_FOLDERS) && highlightDelimiter.IsFoldBlockHighlighted(lineDoc)) {
+								if (highlightDelimiter.IsBodyOfFoldBlock(lineDoc)) {
+									tFold = LineMarker::body;
+								} else if (highlightDelimiter.IsHeadOfFoldBlock(lineDoc)) {
+									if (firstSubLine) {
+										tFold = headWithTail ? LineMarker::headWithTail : LineMarker::head;
+									} else {
+										if (cs.GetExpanded(lineDoc) || headWithTail) {
+											tFold = LineMarker::body;
+										} else {
+											tFold = LineMarker::undefined;
+										}
+									}
+								} else if (highlightDelimiter.IsTailOfFoldBlock(lineDoc)) {
+									tFold = LineMarker::tail;
+								}
+							}
+							vs.markers[markBit].Draw(surface, rcMarker, vs.styles[STYLE_LINENUMBER].font, tFold);
 						}
 						marks >>= 1;
 					}
@@ -2131,7 +2267,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou
 						} else {
 							lastSegItalics = vstyle.styles[ll->styles[charInLine]].italic;
 							posCache.MeasureWidths(surface, vstyle, ll->styles[charInLine], ll->chars + startseg,
-							        lenSeg, ll->positions + startseg + 1);
+							        lenSeg, ll->positions + startseg + 1, pdoc);
 						}
 					}
 				} else {    // invisible
@@ -2255,10 +2391,12 @@ ColourAllocated Editor::TextBackground(ViewStyle &vsDraw, bool overrideBackgroun
 			return vsDraw.edgecolour.allocated;
 		if (inHotspot && vsDraw.hotspotBackgroundSet)
 			return vsDraw.hotspotBackground.allocated;
-		if (overrideBackground && (styleMain != STYLE_BRACELIGHT) && (styleMain != STYLE_BRACEBAD))
-			return background;
 	}
-	return vsDraw.styles[styleMain].back.allocated;
+	if (overrideBackground && (styleMain != STYLE_BRACELIGHT) && (styleMain != STYLE_BRACEBAD)) {
+		return background;
+	} else {
+		return vsDraw.styles[styleMain].back.allocated;
+	}
 }
 
 void Editor::DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight) {
@@ -2421,7 +2559,7 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 
 	// Draw the eol-is-selected rectangle
 	rcSegment.left = xEol + xStart + virtualSpace + blobsWidth;
-	rcSegment.right = xEol + xStart + virtualSpace + blobsWidth + vsDraw.aveCharWidth;
+	rcSegment.right = rcSegment.left + vsDraw.aveCharWidth;
 
 	if (!hideSelection && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha == SC_ALPHA_NOALPHA)) {
 		surface->FillRectangle(rcSegment, SelectionBackground(vsDraw, eolInSelection == 1));
@@ -2441,7 +2579,7 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 	}
 
 	// Fill the remainder of the line
-	rcSegment.left = xEol + xStart + virtualSpace + blobsWidth + vsDraw.aveCharWidth;
+	rcSegment.left = rcSegment.right;
 	if (rcSegment.left < rcLine.left)
 		rcSegment.left = rcLine.left;
 	rcSegment.right = rcLine.right;
@@ -2476,12 +2614,22 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 	}
 }
 
+void Editor::DrawIndicator(int indicNum, int startPos, int endPos, Surface *surface, ViewStyle &vsDraw,
+		int xStart, PRectangle rcLine, LineLayout *ll, int subLine) {
+	const int subLineStart = ll->positions[ll->LineStart(subLine)];
+	PRectangle rcIndic(
+		ll->positions[startPos] + xStart - subLineStart,
+		rcLine.top + vsDraw.maxAscent,
+		ll->positions[endPos] + xStart - subLineStart,
+		rcLine.top + vsDraw.maxAscent + 3);
+	vsDraw.indicators[indicNum].Draw(surface, rcIndic, rcLine);
+}
+
 void Editor::DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart,
         PRectangle rcLine, LineLayout *ll, int subLine, int lineEnd, bool under) {
 	// Draw decorators
 	const int posLineStart = pdoc->LineStart(line);
 	const int lineStart = ll->LineStart(subLine);
-	const int subLineStart = ll->positions[lineStart];
 	const int posLineEnd = posLineStart + lineEnd;
 
 	if (!under) {
@@ -2506,12 +2654,7 @@ void Editor::DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int x
 					// IN indicator run, looking for END
 					if (indicPos >= lineEnd || !(ll->indicators[indicPos] & mask)) {
 						// AT end of indicator run, DRAW it!
-						PRectangle rcIndic(
-						    ll->positions[startPos] + xStart - subLineStart,
-						    rcLine.top + vsDraw.maxAscent,
-						    ll->positions[indicPos] + xStart - subLineStart,
-						    rcLine.top + vsDraw.maxAscent + 3);
-						vsDraw.indicators[indicnum].Draw(surface, rcIndic, rcLine);
+						DrawIndicator(indicnum, startPos, indicPos, surface, vsDraw, xStart, rcLine, ll, subLine);
 						// RESET control var
 						startPos = -1;
 					}
@@ -2531,16 +2674,33 @@ void Editor::DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int x
 				int endPos = deco->rs.EndRun(startPos);
 				if (endPos > posLineEnd)
 					endPos = posLineEnd;
-				PRectangle rcIndic(
-				    ll->positions[startPos - posLineStart] + xStart - subLineStart,
-				    rcLine.top + vsDraw.maxAscent,
-				    ll->positions[endPos - posLineStart] + xStart - subLineStart,
-				    rcLine.top + vsDraw.maxAscent + 3);
-				vsDraw.indicators[deco->indicator].Draw(surface, rcIndic, rcLine);
+				DrawIndicator(deco->indicator, startPos - posLineStart, endPos - posLineStart,
+					surface, vsDraw, xStart, rcLine, ll, subLine);
 				startPos = deco->rs.EndRun(endPos);
 			}
 		}
 	}
+
+	// Use indicators to highlight matching braces
+	if ((vs.braceHighlightIndicatorSet && (bracesMatchStyle == STYLE_BRACELIGHT)) ||
+		(vs.braceBadLightIndicatorSet && (bracesMatchStyle == STYLE_BRACEBAD))) {
+		int braceIndicator = (bracesMatchStyle == STYLE_BRACELIGHT) ? vs.braceHighlightIndicator : vs.braceBadLightIndicator;
+		if (under == vsDraw.indicators[braceIndicator].under) {
+			Range rangeLine(posLineStart + lineStart, posLineEnd);
+			if (rangeLine.ContainsCharacter(braces[0])) {
+				int braceOffset = braces[0] - posLineStart;
+				if (braceOffset < ll->numCharsInLine) {
+					DrawIndicator(braceIndicator, braceOffset, braceOffset + 1, surface, vsDraw, xStart, rcLine, ll, subLine);
+				}
+			}
+			if (rangeLine.ContainsCharacter(braces[1])) {
+				int braceOffset = braces[1] - posLineStart;
+				if (braceOffset < ll->numCharsInLine) {
+					DrawIndicator(braceIndicator, braceOffset, braceOffset + 1, surface, vsDraw, xStart, rcLine, ll, subLine);
+				}
+			}
+		}
+	}
 }
 
 void Editor::DrawAnnotation(Surface *surface, ViewStyle &vsDraw, int line, int xStart,
@@ -2725,7 +2885,7 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis
 
 	ll->psel = &sel;
 
-	BreakFinder bfBack(ll, lineStart, lineEnd, posLineStart, IsUnicodeMode(), xStartVisible, selBackDrawn);
+	BreakFinder bfBack(ll, lineStart, lineEnd, posLineStart, xStartVisible, selBackDrawn, pdoc);
 	int next = bfBack.First();
 
 	// Background drawing loop
@@ -2796,6 +2956,8 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis
 	if (vsDraw.edgeState == EDGE_LINE) {
 		int edgeX = theEdge * vsDraw.spaceWidth;
 		rcSegment.left = edgeX + xStart;
+		if ((ll->wrapIndent != 0) && (lineStart != 0))
+			rcSegment.left -= ll->wrapIndent;
 		rcSegment.right = rcSegment.left + 1;
 		surface->FillRectangle(rcSegment, vsDraw.edgecolour.allocated);
 	}
@@ -2815,8 +2977,8 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis
 
 	inIndentation = subLine == 0;	// Do not handle indentation except on first subline.
 	// Foreground drawing loop
-	BreakFinder bfFore(ll, lineStart, lineEnd, posLineStart, IsUnicodeMode(), xStartVisible,
-		((!twoPhaseDraw && selBackDrawn) || vsDraw.selforeset));
+	BreakFinder bfFore(ll, lineStart, lineEnd, posLineStart, xStartVisible,
+		((!twoPhaseDraw && selBackDrawn) || vsDraw.selforeset), pdoc);
 	next = bfFore.First();
 
 	while (next < lineEnd) {
@@ -2996,7 +3158,8 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis
 			lineNextWithText++;
 		}
 		if (lineNextWithText > line) {
-			// This line is empty, so use indentation of last line with text
+			xStartText = 100000;	// Don't limit to visible indentation on empty line
+			// This line is empty, so use indentation of first next line with text
 			indentSpace = Platform::Maximum(indentSpace,
 			        pdoc->GetLineIndentation(lineNextWithText));
 		}
@@ -3428,34 +3591,40 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
 				rcLine.top = ypos;
 				rcLine.bottom = ypos + vs.lineHeight;
 
+				bool bracesIgnoreStyle = false;
+				if ((vs.braceHighlightIndicatorSet && (bracesMatchStyle == STYLE_BRACELIGHT)) ||
+					(vs.braceBadLightIndicatorSet && (bracesMatchStyle == STYLE_BRACEBAD))) {
+					bracesIgnoreStyle = true;
+				}
 				Range rangeLine(pdoc->LineStart(lineDoc), pdoc->LineStart(lineDoc + 1));
 				// Highlight the current braces if any
 				ll->SetBracesHighlight(rangeLine, braces, static_cast<char>(bracesMatchStyle),
-				        highlightGuideColumn * vs.spaceWidth);
+				        highlightGuideColumn * vs.spaceWidth, bracesIgnoreStyle);
 
 				// Draw the line
 				DrawLine(surface, vs, lineDoc, visibleLine, xStart, rcLine, ll, subLine);
 				//durPaint += et.Duration(true);
 
 				// Restore the previous styles for the brace highlights in case layout is in cache.
-				ll->RestoreBracesHighlight(rangeLine, braces);
+				ll->RestoreBracesHighlight(rangeLine, braces, bracesIgnoreStyle);
 
 				bool expanded = cs.GetExpanded(lineDoc);
-				// Paint the line above the fold
-				if ((expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_EXPANDED))
-					||
-					(!expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_CONTRACTED))) {
-					if (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELHEADERFLAG) {
+				const int level = pdoc->GetLevel(lineDoc);
+				const int levelNext = pdoc->GetLevel(lineDoc + 1);
+				if ((level & SC_FOLDLEVELHEADERFLAG) &&
+					((level & SC_FOLDLEVELNUMBERMASK) < (levelNext & SC_FOLDLEVELNUMBERMASK))) {
+					// Paint the line above the fold
+					if ((expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_EXPANDED))
+						||
+						(!expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_CONTRACTED))) {
 						PRectangle rcFoldLine = rcLine;
 						rcFoldLine.bottom = rcFoldLine.top + 1;
 						surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated);
 					}
-				}
-				// Paint the line below the fold
-				if ((expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_EXPANDED))
-					||
-					(!expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_CONTRACTED))) {
-					if (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELHEADERFLAG) {
+					// Paint the line below the fold
+					if ((expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_EXPANDED))
+						||
+						(!expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_CONTRACTED))) {
 						PRectangle rcFoldLine = rcLine;
 						rcFoldLine.top = rcFoldLine.bottom - 1;
 						surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated);
@@ -3569,6 +3738,9 @@ long Editor::FormatRange(bool draw, Sci_RangeToFormat *pfr) {
 	vsPrint.whitespaceBackgroundSet = false;
 	vsPrint.whitespaceForegroundSet = false;
 	vsPrint.showCaretLineBackground = false;
+	// Don't highlight matching braces using indicators
+	vsPrint.braceHighlightIndicatorSet = false;
+	vsPrint.braceBadLightIndicatorSet = false;
 
 	// Set colours for printing according to users settings
 	for (size_t sty = 0; sty < vsPrint.stylesSize; sty++) {
@@ -3789,37 +3961,50 @@ void Editor::FilterSelections() {
 	}
 }
 
+static bool cmpSelPtrs(const SelectionRange *a, const SelectionRange *b) {
+	return *a < *b;
+}
+
 // AddCharUTF inserts an array of bytes which may or may not be in UTF-8.
 void Editor::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) {
 	FilterSelections();
 	{
 		UndoGroup ug(pdoc, (sel.Count() > 1) || !sel.Empty() || inOverstrike);
-		for (size_t r=0; r<sel.Count(); r++) {
-			if (!RangeContainsProtected(sel.Range(r).Start().Position(),
-				sel.Range(r).End().Position())) {
-				int positionInsert = sel.Range(r).Start().Position();
-				if (!sel.Range(r).Empty()) {
-					if (sel.Range(r).Length()) {
-						pdoc->DeleteChars(positionInsert, sel.Range(r).Length());
-						sel.Range(r).ClearVirtualSpace();
+
+		std::vector<SelectionRange *> selPtrs;
+		for (size_t r = 0; r < sel.Count(); r++) {
+			selPtrs.push_back(&sel.Range(r));
+		}
+		std::sort(selPtrs.begin(), selPtrs.end(), cmpSelPtrs);
+
+		for (std::vector<SelectionRange *>::reverse_iterator rit = selPtrs.rbegin();
+			rit != selPtrs.rend(); ++rit) {
+			SelectionRange *currentSel = *rit;
+			if (!RangeContainsProtected(currentSel->Start().Position(),
+				currentSel->End().Position())) {
+				int positionInsert = currentSel->Start().Position();
+				if (!currentSel->Empty()) {
+					if (currentSel->Length()) {
+						pdoc->DeleteChars(positionInsert, currentSel->Length());
+						currentSel->ClearVirtualSpace();
 					} else {
 						// Range is all virtual so collapse to start of virtual space
-						sel.Range(r).MinimizeVirtualSpace();
+						currentSel->MinimizeVirtualSpace();
 					}
 				} else if (inOverstrike) {
 					if (positionInsert < pdoc->Length()) {
 						if (!IsEOLChar(pdoc->CharAt(positionInsert))) {
 							pdoc->DelChar(positionInsert);
-							sel.Range(r).ClearVirtualSpace();
+							currentSel->ClearVirtualSpace();
 						}
 					}
 				}
-				positionInsert = InsertSpace(positionInsert, sel.Range(r).caret.VirtualSpace());
+				positionInsert = InsertSpace(positionInsert, currentSel->caret.VirtualSpace());
 				if (pdoc->InsertString(positionInsert, s, len)) {
-					sel.Range(r).caret.SetPosition(positionInsert + len);
-					sel.Range(r).anchor.SetPosition(positionInsert + len);
+					currentSel->caret.SetPosition(positionInsert + len);
+					currentSel->anchor.SetPosition(positionInsert + len);
 				}
-				sel.Range(r).ClearVirtualSpace();
+				currentSel->ClearVirtualSpace();
 				// If in wrap mode rewrap current line so EnsureCaretVisible has accurate information
 				if (wrapState != eWrapNone) {
 					AutoSurface surface(this);
@@ -4038,7 +4223,13 @@ bool Editor::CanPaste() {
 void Editor::Clear() {
 	// If multiple selections, don't delete EOLS
 	if (sel.Empty()) {
-		UndoGroup ug(pdoc, sel.Count() > 1);
+		bool singleVirtual = false;
+		if ((sel.Count() == 1) &&
+			!RangeContainsProtected(sel.MainCaret(), sel.MainCaret() + 1) &&
+			sel.RangeMain().Start().VirtualSpace()) {
+			singleVirtual = true;
+		}
+		UndoGroup ug(pdoc, (sel.Count() > 1) || singleVirtual);
 		for (size_t r=0; r<sel.Count(); r++) {
 			if (!RangeContainsProtected(sel.Range(r).caret.Position(), sel.Range(r).caret.Position() + 1)) {
 				if (sel.Range(r).Start().VirtualSpace()) {
@@ -4141,6 +4332,10 @@ void Editor::DelCharBack(bool allowLineStartDeletion) {
 
 void Editor::NotifyFocus(bool) {}
 
+void Editor::SetCtrlID(int identifier) {
+	ctrlID = identifier; 
+}
+
 void Editor::NotifyStyleToNeeded(int endStyleNeeded) {
 	SCNotification scn = {0};
 	scn.nmhdr.code = SCN_STYLENEEDED;
@@ -4386,7 +4581,7 @@ void Editor::NotifyModified(Document *, DocModification mh, void *) {
 			braces[0] = MovePositionForDeletion(braces[0], mh.position, mh.length);
 			braces[1] = MovePositionForDeletion(braces[1], mh.position, mh.length);
 		}
-		if (cs.LinesDisplayed() < cs.LinesInDoc()) {
+		if ((mh.modificationType & (SC_MOD_BEFOREINSERT | SC_MOD_BEFOREDELETE)) && cs.HiddenLines()) {
 			// Some lines are hidden so may need shown.
 			// TODO: check if the modified area is hidden.
 			if (mh.modificationType & SC_MOD_BEFOREINSERT) {
@@ -4602,6 +4797,10 @@ void Editor::NotifyMacroRecord(unsigned int iMessage, uptr_t wParam, sptr_t lPar
 	case SCI_SELECTIONDUPLICATE:
 	case SCI_COPYALLOWLINE:
 	case SCI_VERTICALCENTRECARET:
+	case SCI_MOVESELECTEDLINESUP:
+	case SCI_MOVESELECTEDLINESDOWN:
+	case SCI_SCROLLTOSTART:
+	case SCI_SCROLLTOEND:
 		break;
 
 		// Filter out all others like display changes. Also, newlines are redundant
@@ -4694,10 +4893,13 @@ void Editor::ChangeCaseOfSelection(int caseMapping) {
 				while (sMapped[lastDifference] == sText[lastDifference])
 					lastDifference--;
 				size_t endSame = sMapped.size() - 1 - lastDifference;
-				pdoc->DeleteChars(currentNoVS.Start().Position() + firstDifference,
-					rangeBytes - firstDifference - endSame);
-				pdoc->InsertString(currentNoVS.Start().Position() + firstDifference,
-					sMapped.c_str() + firstDifference, lastDifference - firstDifference + 1);
+				pdoc->DeleteChars(
+					static_cast<int>(currentNoVS.Start().Position() + firstDifference),
+					static_cast<int>(rangeBytes - firstDifference - endSame));
+				pdoc->InsertString(
+					static_cast<int>(currentNoVS.Start().Position() + firstDifference),
+					sMapped.c_str() + firstDifference,
+					static_cast<int>(lastDifference - firstDifference + 1));
 				// Automatic movement changes selection so reset to exactly the same as it was.
 				sel.Range(r) = current;
 			}
@@ -5338,6 +5540,12 @@ int Editor::KeyCommand(unsigned int iMessage) {
 		            StartEndDisplayLine(sel.MainCaret(), false), 1), Selection::selStream);
 		SetLastXChosen();
 		break;
+	case SCI_SCROLLTOSTART:
+		ScrollTo(0);
+		break;
+	case SCI_SCROLLTOEND:
+		ScrollTo(MaxScrollPos());
+		break;
 	}
 	return 0;
 }
@@ -5346,10 +5554,8 @@ int Editor::KeyDefault(int, int) {
 	return 0;
 }
 
-int Editor::KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed) {
+int Editor::KeyDownWithModifiers(int key, int modifiers, bool *consumed) {
 	DwellEnd(false);
-	int modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) |
-	        (alt ? SCI_ALT : 0);
 	int msg = kmap.Find(key, modifiers);
 	if (msg) {
 		if (consumed)
@@ -5362,6 +5568,12 @@ int Editor::KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed) {
 	}
 }
 
+int Editor::KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed) {
+	int modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) |
+	        (alt ? SCI_ALT : 0);
+	return KeyDownWithModifiers(key, modifiers, consumed);
+}
+
 void Editor::SetWhitespaceVisible(int view) {
 	vs.viewWhitespace = static_cast<WhiteSpaceVisibility>(view);
 }
@@ -5634,7 +5846,7 @@ void Editor::CopySelectionRange(SelectionText *ss, bool allowLineCopy) {
 			int end = pdoc->LineEnd(currentLine);
 
 			char *text = CopyRange(start, end);
-			int textLen = text ? strlen(text) : 0;
+			size_t textLen = text ? strlen(text) : 0;
 			// include room for \r\n\0
 			textLen += 3;
 			char *textWithEndl = new char[textLen];
@@ -5645,7 +5857,7 @@ void Editor::CopySelectionRange(SelectionText *ss, bool allowLineCopy) {
 				strncat(textWithEndl, "\r", textLen);
 			if (pdoc->eolMode != SC_EOL_CR)
 				strncat(textWithEndl, "\n", textLen);
-			ss->Set(textWithEndl, strlen(textWithEndl) + 1,
+			ss->Set(textWithEndl, static_cast<int>(strlen(textWithEndl) + 1),
 				pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, false, true);
 			delete []text;
 		}
@@ -5658,7 +5870,7 @@ void Editor::CopySelectionRange(SelectionText *ss, bool allowLineCopy) {
 				delimiterLength = 1;
 			}
 		}
-		int size = sel.Length() + delimiterLength * sel.Count();
+		size_t size = sel.Length() + delimiterLength * sel.Count();
 		char *text = new char[size + 1];
 		int j = 0;
 		std::vector<SelectionRange> rangesInOrder = sel.RangesCopy();
@@ -5681,7 +5893,7 @@ void Editor::CopySelectionRange(SelectionText *ss, bool allowLineCopy) {
 			}
 		}
 		text[size] = '\0';
-		ss->Set(text, size + 1, pdoc->dbcsCodePage,
+		ss->Set(text, static_cast<int>(size + 1), pdoc->dbcsCodePage,
 			vs.styles[STYLE_DEFAULT].characterSet, sel.IsRectangular(), sel.selType == Selection::selLines);
 	}
 }
@@ -5807,21 +6019,21 @@ bool Editor::PositionInSelection(int pos) {
 }
 
 bool Editor::PointInSelection(Point pt) {
-	SelectionPosition pos = SPositionFromLocation(pt);
-	int xPos = XFromPosition(pos);
+	SelectionPosition pos = SPositionFromLocation(pt, false, true);
+	Point ptPos = LocationFromPosition(pos);
 	for (size_t r=0; r<sel.Count(); r++) {
 		SelectionRange range = sel.Range(r);
 		if (range.Contains(pos)) {
 			bool hit = true;
 			if (pos == range.Start()) {
 				// see if just before selection
-				if (pt.x < xPos) {
+				if (pt.x < ptPos.x) {
 					hit = false;
 				}
 			}
 			if (pos == range.End()) {
 				// see if just after selection
-				if (pt.x > xPos) {
+				if (pt.x > ptPos.x) {
 					hit = false;
 				}
 			}
@@ -5853,17 +6065,37 @@ Window::Cursor Editor::GetMarginCursor(Point pt) {
 	return Window::cursorReverseArrow;
 }
 
-void Editor::LineSelection(int lineCurrent_, int lineAnchor_) {
-	if (lineAnchor_ < lineCurrent_) {
-		SetSelection(pdoc->LineStart(lineCurrent_ + 1),
-		        pdoc->LineStart(lineAnchor_));
-	} else if (lineAnchor_ > lineCurrent_) {
-		SetSelection(pdoc->LineStart(lineCurrent_),
-		        pdoc->LineStart(lineAnchor_ + 1));
-	} else { // Same line, select it
-		SetSelection(pdoc->LineStart(lineAnchor_ + 1),
-		        pdoc->LineStart(lineAnchor_));
+void Editor::LineSelection(int lineCurrentPos_, int lineAnchorPos_, bool wholeLine) {
+	int selCurrentPos, selAnchorPos;
+	if (wholeLine) {
+		int lineCurrent_ = pdoc->LineFromPosition(lineCurrentPos_);
+		int lineAnchor_ = pdoc->LineFromPosition(lineAnchorPos_);
+		if (lineAnchorPos_ < lineCurrentPos_) {
+			selCurrentPos = pdoc->LineStart(lineCurrent_ + 1);
+			selAnchorPos = pdoc->LineStart(lineAnchor_);
+		} else if (lineAnchorPos_ > lineCurrentPos_) {
+			selCurrentPos = pdoc->LineStart(lineCurrent_);
+			selAnchorPos = pdoc->LineStart(lineAnchor_ + 1);
+		} else { // Same line, select it
+			selCurrentPos = pdoc->LineStart(lineAnchor_ + 1);
+			selAnchorPos = pdoc->LineStart(lineAnchor_);
+		}
+	} else {
+		if (lineAnchorPos_ < lineCurrentPos_) {
+			selCurrentPos = StartEndDisplayLine(lineCurrentPos_, false) + 1;
+			selCurrentPos = pdoc->MovePositionOutsideChar(selCurrentPos, 1);
+			selAnchorPos = StartEndDisplayLine(lineAnchorPos_, true);
+		} else if (lineAnchorPos_ > lineCurrentPos_) {
+			selCurrentPos = StartEndDisplayLine(lineCurrentPos_, true);
+			selAnchorPos = StartEndDisplayLine(lineAnchorPos_, false) + 1;
+			selAnchorPos = pdoc->MovePositionOutsideChar(selAnchorPos, 1);
+		} else { // Same line, select it
+			selCurrentPos = StartEndDisplayLine(lineAnchorPos_, false) + 1;
+			selCurrentPos = pdoc->MovePositionOutsideChar(selCurrentPos, 1);
+			selAnchorPos = StartEndDisplayLine(lineAnchorPos_, true);
+		}
 	}
+	SetSelection(selCurrentPos, selAnchorPos);
 }
 
 void Editor::WordSelection(int pos) {
@@ -5943,10 +6175,20 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b
 				selectionType = selWord;
 				doubleClick = true;
 			} else if (selectionType == selWord) {
-				selectionType = selLine;
+				// Since we ended up here, we're inside a *triple* click, which should always select 
+				// whole line irregardless of word wrap being enabled or not.
+				selectionType = selWholeLine;
 			} else {
-				selectionType = selChar;
-				originalAnchorPos = sel.MainCaret();
+				if (inSelMargin) {
+					// Selection type is either selSubLine or selWholeLine here and we're inside margin.
+					// If it is selSubLine, we're inside a *double* click and word wrap is enabled, 
+					// so we switch to selWholeLine in order to select whole line.
+					if (selectionType == selSubLine)
+						selectionType = selWholeLine;
+				} else {
+					selectionType = selChar;
+					originalAnchorPos = sel.MainCaret();
+				}
 			}
 		}
 
@@ -5978,9 +6220,9 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b
 			wordSelectAnchorEndPos = endWord;
 			wordSelectInitialCaretPos = sel.MainCaret();
 			WordSelection(wordSelectInitialCaretPos);
-		} else if (selectionType == selLine) {
-			lineAnchor = LineFromLocation(pt);
-			SetSelection(pdoc->LineStart(lineAnchor + 1), pdoc->LineStart(lineAnchor));
+		} else if (selectionType == selSubLine || selectionType == selWholeLine) {
+			lineAnchorPos = newPos.Position();
+			LineSelection(lineAnchorPos, lineAnchorPos, selectionType == selWholeLine);
 			//Platform::DebugPrintf("Triple click: %d - %d\n", anchor, currentPos);
 		} else {
 			SetEmptySelection(sel.MainCaret());
@@ -6000,25 +6242,27 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b
 				return;
 			}
 			if (!shift) {
-				lineAnchor = LineFromLocation(pt);
-				// Single click in margin: select whole line
-				LineSelection(lineAnchor, lineAnchor);
-				SetSelection(pdoc->LineStart(lineAnchor + 1),
-				        pdoc->LineStart(lineAnchor));
+				// Single click in margin: select whole line or only subline if word wrap is enabled
+				lineAnchorPos = newPos.Position();
+				selectionType = ((wrapState != eWrapNone) && (marginOptions & SC_MARGINOPTION_SUBLINESELECT)) ? selSubLine : selWholeLine;
+				LineSelection(lineAnchorPos, lineAnchorPos, selectionType == selWholeLine);
 			} else {
 				// Single shift+click in margin: select from line anchor to clicked line
 				if (sel.MainAnchor() > sel.MainCaret())
-					lineAnchor = pdoc->LineFromPosition(sel.MainAnchor() - 1);
+					lineAnchorPos = sel.MainAnchor() - 1;
 				else
-					lineAnchor = pdoc->LineFromPosition(sel.MainAnchor());
-				int lineStart = LineFromLocation(pt);
-				LineSelection(lineStart, lineAnchor);
-				//lineAnchor = lineStart; // Keep the same anchor for ButtonMove
+					lineAnchorPos = sel.MainAnchor();
+				// Reset selection type if there is an empty selection. 
+				// This ensures that we don't end up stuck in previous selection mode, which is no longer valid.
+				// Otherwise, if there's a non empty selection, reset selection type only if it differs from selSubLine and selWholeLine.
+				// This ensures that we continue selecting in the same selection mode.
+				if (sel.Empty()	|| (selectionType != selSubLine && selectionType != selWholeLine))
+					selectionType = ((wrapState != eWrapNone) && (marginOptions & SC_MARGINOPTION_SUBLINESELECT)) ? selSubLine : selWholeLine;
+				LineSelection(newPos.Position(), lineAnchorPos, selectionType == selWholeLine);
 			}
 
 			SetDragPosition(SelectionPosition(invalidPosition));
 			SetMouseCapture(true);
-			selectionType = selLine;
 		} else {
 			if (PointIsHotspot(pt)) {
 				NotifyHotSpotClicked(newPos.Position(), shift, ctrl, alt);
@@ -6176,23 +6420,18 @@ void Editor::ButtonMove(Point pt) {
 				}
 			} else {
 				// Continue selecting by line
-				int lineMove = LineFromLocation(pt);
-				LineSelection(lineMove, lineAnchor);
+				LineSelection(movePos.Position(), lineAnchorPos, selectionType == selWholeLine);
 			}
 		}
 
 		// Autoscroll
 		PRectangle rcClient = GetClientRectangle();
+		int lineMove = DisplayFromPosition(movePos.Position());
 		if (pt.y > rcClient.bottom) {
-			int lineMove = cs.DisplayFromDoc(LineFromLocation(pt));
-			if (lineMove < 0) {
-				lineMove = cs.DisplayFromDoc(pdoc->LinesTotal() - 1);
-			}
 			ScrollTo(lineMove - LinesOnScreen() + 1);
 			Redraw();
 		} else if (pt.y < rcClient.top) {
-			int lineMove = cs.DisplayFromDoc(LineFromLocation(pt));
-			ScrollTo(lineMove - 1);
+			ScrollTo(lineMove);
 			Redraw();
 		}
 		EnsureCaretVisible(false, false, true);
@@ -6200,7 +6439,7 @@ void Editor::ButtonMove(Point pt) {
 		if (hsStart != -1 && !PositionIsHotspot(movePos.Position()))
 			SetHotSpotRange(NULL);
 
-		if (hotSpotClickPos != INVALID_POSITION && PositionFromLocation(pt,true,false) != hotSpotClickPos ) {
+		if (hotSpotClickPos != INVALID_POSITION && PositionFromLocation(pt,true,false) != hotSpotClickPos) {
 			if (inDragDrop == ddNone) {
 				DisplayCursor(Window::cursorText);
 			}
@@ -6556,8 +6795,8 @@ void Editor::ToggleContraction(int line) {
 
 		if (cs.GetExpanded(line)) {
 			int lineMaxSubord = pdoc->GetLastChild(line);
-			cs.SetExpanded(line, 0);
 			if (lineMaxSubord > line) {
+				cs.SetExpanded(line, 0);
 				cs.SetVisible(line + 1, lineMaxSubord, false);
 
 				int lineCurrent = pdoc->LineFromPosition(sel.MainCaret());
@@ -6584,7 +6823,7 @@ void Editor::ToggleContraction(int line) {
 }
 
 int Editor::ContractedFoldNext(int lineStart) {
-	for (int line = lineStart; line<pdoc->LinesTotal(); ) {
+	for (int line = lineStart; line<pdoc->LinesTotal();) {
 		if (!cs.GetExpanded(line) && (pdoc->GetLevel(line) & SC_FOLDLEVELHEADERFLAG))
 			return line;
 		line = cs.ContractedNext(line+1);
@@ -6605,7 +6844,12 @@ void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) {
 	WrapLines(true, -1);
 
 	if (!cs.GetVisible(lineDoc)) {
-		int lineParent = pdoc->GetFoldParent(lineDoc);
+		int lookLine = lineDoc;
+		int lookLineLevel = pdoc->GetLevel(lookLine);
+		while ((lookLine > 0) && (lookLineLevel & SC_FOLDLEVELWHITEFLAG)) {
+			lookLineLevel = pdoc->GetLevel(--lookLine);
+		}
+		int lineParent = pdoc->GetFoldParent(lookLine);
 		if (lineParent >= 0) {
 			if (lineDoc != lineParent)
 				EnsureLineVisible(lineParent, enforcePolicy);
@@ -6701,9 +6945,9 @@ int Editor::WrapCount(int line) {
 
 void Editor::AddStyledText(char *buffer, int appendLength) {
 	// The buffer consists of alternating character bytes and style bytes
-	size_t textLength = appendLength / 2;
+	int textLength = appendLength / 2;
 	char *text = new char[textLength];
-	size_t i;
+	int i;
 	for (i = 0; i < textLength; i++) {
 		text[i] = buffer[i*2];
 	}
@@ -6811,7 +7055,7 @@ sptr_t Editor::StyleGetMessage(unsigned int iMessage, uptr_t wParam, sptr_t lPar
 }
 
 sptr_t Editor::StringResult(sptr_t lParam, const char *val) {
-	const int n = strlen(val);
+	const size_t n = strlen(val);
 	if (lParam != 0) {
 		char *ptr = reinterpret_cast<char *>(lParam);
 		strcpy(ptr, val);
@@ -6871,6 +7115,14 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		VerticalCentreCaret();
 		break;
 
+	case SCI_MOVESELECTEDLINESUP:
+		MoveSelectedLinesUp();
+		break;
+
+	case SCI_MOVESELECTEDLINESDOWN:
+		MoveSelectedLinesDown();
+		break;
+
 	case SCI_COPYRANGE:
 		CopyRangeToClipboard(wParam, lParam);
 		break;
@@ -7279,6 +7531,10 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	case SCI_GETSELECTIONEND:
 		return sel.LimitsForRectangularElseMain().end.Position();
 
+	case SCI_SETEMPTYSELECTION:
+		SetEmptySelection(wParam);
+		break;
+
 	case SCI_SETPRINTMAGNIFICATION:
 		printMagnification = wParam;
 		break;
@@ -7637,8 +7893,8 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		return endAtLastLine;
 
 	case SCI_SETCARETSTICKY:
-		PLATFORM_ASSERT((wParam >= SC_CARETSTICKY_OFF) && (wParam <= SC_CARETSTICKY_WHITESPACE));
-		if ((wParam >= SC_CARETSTICKY_OFF) && (wParam <= SC_CARETSTICKY_WHITESPACE)) {
+		PLATFORM_ASSERT(wParam <= SC_CARETSTICKY_WHITESPACE);
+		if (wParam <= SC_CARETSTICKY_WHITESPACE) {
 			caretSticky = wParam;
 		}
 		break;
@@ -7737,6 +7993,15 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		InvalidateStyleData();
 		RedrawSelMargin();
 		break;
+	case SCI_MARKERSETBACKSELECTED:
+		if (wParam <= MARKER_MAX)
+			vs.markers[wParam].backSelected.desired = ColourDesired(lParam);
+		InvalidateStyleRedraw();
+		break;
+	case SCI_MARKERENABLEHIGHLIGHT:
+		highlightDelimiter.isEnabled = wParam == 1;
+		InvalidateStyleRedraw();
+		break;
 	case SCI_MARKERSETBACK:
 		if (wParam <= MARKER_MAX)
 			vs.markers[wParam].back.desired = ColourDesired(lParam);
@@ -7793,6 +8058,22 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		RedrawSelMargin();
 		break;
 
+	case SCI_RGBAIMAGESETWIDTH:
+		sizeRGBAImage.x = wParam;
+		break;
+
+	case SCI_RGBAIMAGESETHEIGHT:
+		sizeRGBAImage.y = wParam;
+		break;
+
+	case SCI_MARKERDEFINERGBAIMAGE:
+		if (wParam <= MARKER_MAX) {
+			vs.markers[wParam].SetRGBAImage(sizeRGBAImage, reinterpret_cast<unsigned char *>(lParam));
+		};
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+
 	case SCI_SETMARGINTYPEN:
 		if (ValidMargin(wParam)) {
 			vs.ms[wParam].style = lParam;
@@ -8085,7 +8366,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		return vs.caretcolour.desired.AsLong();
 
 	case SCI_SETCARETSTYLE:
-		if (wParam >= CARETSTYLE_INVISIBLE && wParam <= CARETSTYLE_BLOCK)
+		if (wParam <= CARETSTYLE_BLOCK)
 			vs.caretStyle = wParam;
 		else
 			/* Default to the line caret */
@@ -8097,7 +8378,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		return vs.caretStyle;
 
 	case SCI_SETCARETWIDTH:
-		if (wParam <= 0)
+		if (static_cast<int>(wParam) <= 0)
 			vs.caretWidth = 0;
 		else if (wParam >= 3)
 			vs.caretWidth = 3;
@@ -8163,6 +8444,16 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	case SCI_INDICGETALPHA:
 		return (wParam <= INDIC_MAX) ? vs.indicators[wParam].fillAlpha : 0;
 
+	case SCI_INDICSETOUTLINEALPHA:
+		if (wParam <= INDIC_MAX && lParam >=0 && lParam <= 255) {
+			vs.indicators[wParam].outlineAlpha = lParam;
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case SCI_INDICGETOUTLINEALPHA:
+		return (wParam <= INDIC_MAX) ? vs.indicators[wParam].outlineAlpha : 0;
+
 	case SCI_SETINDICATORCURRENT:
 		pdoc->decorations.SetCurrentIndicator(wParam);
 		break;
@@ -8226,6 +8517,8 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	case SCI_DOCUMENTSTARTEXTEND:
 	case SCI_DOCUMENTEND:
 	case SCI_DOCUMENTENDEXTEND:
+	case SCI_SCROLLTOSTART:
+	case SCI_SCROLLTOEND:
 
 	case SCI_STUTTEREDPAGEUP:
 	case SCI_STUTTEREDPAGEUPEXTEND:
@@ -8288,10 +8581,24 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		SetBraceHighlight(static_cast<int>(wParam), lParam, STYLE_BRACELIGHT);
 		break;
 
+	case SCI_BRACEHIGHLIGHTINDICATOR:
+		if (lParam >= 0 && lParam <= INDIC_MAX) {
+			vs.braceHighlightIndicatorSet = wParam != 0;
+			vs.braceHighlightIndicator = lParam;
+		}
+		break;
+
 	case SCI_BRACEBADLIGHT:
 		SetBraceHighlight(static_cast<int>(wParam), -1, STYLE_BRACEBAD);
 		break;
 
+	case SCI_BRACEBADLIGHTINDICATOR:
+		if (lParam >= 0 && lParam <= INDIC_MAX) {
+			vs.braceBadLightIndicatorSet = wParam != 0;
+			vs.braceBadLightIndicator = lParam;
+		}
+		break;
+
 	case SCI_BRACEMATCH:
 		// wParam is position of char to find brace for,
 		// lParam is maximum amount of text to restyle to find it
@@ -8566,6 +8873,13 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	case SCI_MARGINGETSTYLEOFFSET:
 		return vs.marginStyleOffset;
 
+	case SCI_SETMARGINOPTIONS:
+		marginOptions = wParam;
+		break;
+
+	case SCI_GETMARGINOPTIONS:
+		return marginOptions;
+
 	case SCI_MARGINSETTEXT:
 		pdoc->MarginSetText(wParam, CharPtrFromSPtr(lParam));
 		break;
@@ -8880,6 +9194,13 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	case SCI_CHANGELEXERSTATE:
 		pdoc->ChangeLexerState(wParam, lParam);
 		break;
+	
+	case SCI_SETIDENTIFIER:
+		SetCtrlID(wParam);
+		break;
+	
+	case SCI_GETIDENTIFIER:
+		return GetCtrlID();
 
 	default:
 		return DefWndProc(iMessage, wParam, lParam);
diff --git a/scintilla/src/Editor.h b/scintilla/src/Editor.h
index db8a36aa..f1a500b7 100644
--- a/scintilla/src/Editor.h
+++ b/scintilla/src/Editor.h
@@ -2,7 +2,7 @@
 /** @file Editor.h
  ** Defines the main editor class.
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef EDITOR_H
@@ -131,6 +131,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	 * When a style attribute is changed, this cache is flushed. */
 	bool stylesValid;
 	ViewStyle vs;
+	Point sizeRGBAImage;
 	Palette palette;
 
 	int printMagnification;
@@ -139,6 +140,9 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	int cursorMode;
 	int controlCharSymbol;
 
+	// Highlight current folding block
+	HighlightDelimiter highlightDelimiter;
+
 	bool hasFocus;
 	bool hideSelection;
 	bool inOverstrike;
@@ -160,6 +164,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	bool verticalScrollBarVisible;
 	bool endAtLastLine;
 	int caretSticky;
+	int marginOptions;
 	bool multipleSelection;
 	bool additionalSelectionTyping;
 	int multiPasteMode;
@@ -191,7 +196,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	int dwellDelay;
 	int ticksToDwell;
 	bool dwelling;
-	enum { selChar, selWord, selLine } selectionType;
+	enum { selChar, selWord, selSubLine, selWholeLine } selectionType;
 	Point ptMouseLast;
 	enum { ddNone, ddInitial, ddDragging } inDragDrop;
 	bool dropWentOutside;
@@ -199,7 +204,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	SelectionPosition posDrop;
 	int hotSpotClickPos;
 	int lastXChosen;
-	int lineAnchor;
+	int lineAnchorPos;
 	int originalAnchorPos;
 	int wordSelectAnchorStartPos;
 	int wordSelectAnchorEndPos;
@@ -332,6 +337,9 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	virtual void ScrollText(int linesToMove);
 	void HorizontalScrollTo(int xPos);
 	void VerticalCentreCaret();
+	void MoveSelectedLines(int lineDelta);
+	void MoveSelectedLinesUp();
+	void MoveSelectedLinesDown();
 	void MoveCaretInsideView(bool ensureVisible=true);
 	int DisplayFromPosition(int pos);
 
@@ -367,6 +375,8 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 		int line, int lineEnd, int xStart, int subLine, int subLineStart,
 		bool overrideBackground, ColourAllocated background,
 		bool drawWrapMark, ColourAllocated wrapColour);
+	void DrawIndicator(int indicNum, int startPos, int endPos, Surface *surface, ViewStyle &vsDraw,
+		int xStart, PRectangle rcLine, LineLayout *ll, int subLine);
 	void DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart,
 		PRectangle rcLine, LineLayout *ll, int subLine, int lineEnd, bool under);
 	void DrawAnnotation(Surface *surface, ViewStyle &vsDraw, int line, int xStart,
@@ -413,6 +423,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 
 	virtual void NotifyChange() = 0;
 	virtual void NotifyFocus(bool focus);
+	virtual void SetCtrlID(int identifier);
 	virtual int GetCtrlID() { return ctrlID; }
 	virtual void NotifyParent(SCNotification scn) = 0;
 	virtual void NotifyStyleToNeeded(int endStyleNeeded);
@@ -455,6 +466,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	int StartEndDisplayLine(int pos, bool start);
 	virtual int KeyCommand(unsigned int iMessage);
 	virtual int KeyDefault(int /* key */, int /*modifiers*/);
+	int KeyDownWithModifiers(int key, int modifiers, bool *consumed);
 	int KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed=0);
 
 	int GetWhitespaceVisible();
@@ -484,7 +496,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	bool PointInSelection(Point pt);
 	bool PointInSelMargin(Point pt);
 	Window::Cursor GetMarginCursor(Point pt);
-	void LineSelection(int lineCurrent_, int lineAnchor_);
+	void LineSelection(int lineCurrentPos_, int lineAnchorPos_, bool wholeLine);
 	void WordSelection(int pos);
 	void DwellEnd(bool mouseMoved);
 	void MouseLeave();
diff --git a/scintilla/src/Indicator.cxx b/scintilla/src/Indicator.cxx
index da953122..7059a55b 100644
--- a/scintilla/src/Indicator.cxx
+++ b/scintilla/src/Indicator.cxx
@@ -5,9 +5,17 @@
 // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
+#include <vector>
+#include <map>
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4786)
+#endif
+
 #include "Platform.h"
 
 #include "Scintilla.h"
+#include "XPM.h"
 #include "Indicator.h"
 
 #ifdef SCI_NAMESPACE
@@ -27,6 +35,17 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r
 			y = 2 - y;
 		}
 		surface->LineTo(rc.right, rc.top + y);	// Finish the line
+	} else if (style == INDIC_SQUIGGLELOW) {
+		surface->MoveTo(rc.left, rc.top);
+		int x = rc.left + 3;
+		int y = 0;
+		while (x < rc.right) {
+			surface->LineTo(x-1, rc.top + y);
+			y = 1 - y;
+        	surface->LineTo(x, rc.top + y);
+			x += 3;
+		}
+		surface->LineTo(rc.right, rc.top + y);	// Finish the line
 	} else if (style == INDIC_TT) {
 		surface->MoveTo(rc.left, ymid);
 		int x = rc.left + 5;
@@ -67,12 +86,47 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r
 		surface->LineTo(rc.right, rcLine.top+1);
 		surface->LineTo(rc.left, rcLine.top+1);
 		surface->LineTo(rc.left, ymid+1);
-	} else if (style == INDIC_ROUNDBOX) {
+	} else if (style == INDIC_ROUNDBOX || style == INDIC_STRAIGHTBOX) {
 		PRectangle rcBox = rcLine;
 		rcBox.top = rcLine.top + 1;
 		rcBox.left = rc.left;
 		rcBox.right = rc.right;
-		surface->AlphaRectangle(rcBox, 1, fore.allocated, fillAlpha, fore.allocated, 50, 0);
+		surface->AlphaRectangle(rcBox, (style == INDIC_ROUNDBOX) ? 1 : 0, fore.allocated, fillAlpha, fore.allocated, outlineAlpha, 0);
+	} else if (style == INDIC_DOTBOX) {
+		PRectangle rcBox = rcLine;
+		rcBox.top = rcLine.top + 1;
+		rcBox.left = rc.left;
+		rcBox.right = rc.right;
+		// Cap width at 4000 to avoid large allocations when mistakes made
+		int width = Platform::Minimum(rcBox.Width(), 4000);
+		RGBAImage image(width, rcBox.Height(), 0);
+		// Draw horizontal lines top and bottom
+		for (int x=0; x<width; x++) {
+			for (int y=0; y<rcBox.Height(); y += rcBox.Height()-1) {
+				image.SetPixel(x, y, fore.desired, ((x + y) % 2) ? outlineAlpha : fillAlpha);
+			}
+		}
+		// Draw vertical lines left and right
+		for (int y=1; y<rcBox.Height(); y++) {
+			for (int x=0; x<width; x += width-1) {
+				image.SetPixel(x, y, fore.desired, ((x + y) % 2) ? outlineAlpha : fillAlpha);
+			}
+		}
+		surface->DrawRGBAImage(rcBox, image.GetWidth(), image.GetHeight(), image.Pixels());
+	} else if (style == INDIC_DASH) {
+		int x = rc.left;
+		while (x < rc.right) {
+			surface->MoveTo(x, ymid);
+			surface->LineTo(Platform::Minimum(x + 4, rc.right), ymid);
+			x += 7;
+		}
+	} else if (style == INDIC_DOTS) {
+		int x = rc.left;
+		while (x < rc.right) {
+			PRectangle rcDot(x, ymid, x+1, ymid+1);
+			surface->FillRectangle(rcDot, fore.allocated);
+			x += 2;
+		}
 	} else {	// Either INDIC_PLAIN or unknown
 		surface->MoveTo(rc.left, ymid);
 		surface->LineTo(rc.right, ymid);
diff --git a/scintilla/src/Indicator.h b/scintilla/src/Indicator.h
index 42b56f07..e787b592 100644
--- a/scintilla/src/Indicator.h
+++ b/scintilla/src/Indicator.h
@@ -20,7 +20,8 @@ public:
 	bool under;
 	ColourPair fore;
 	int fillAlpha;
-	Indicator() : style(INDIC_PLAIN), under(false), fore(ColourDesired(0,0,0)), fillAlpha(30) {
+	int outlineAlpha;
+	Indicator() : style(INDIC_PLAIN), under(false), fore(ColourDesired(0,0,0)), fillAlpha(30), outlineAlpha(50) {
 	}
 	void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine);
 };
diff --git a/scintilla/src/KeyMap.cxx b/scintilla/src/KeyMap.cxx
index c223d5b5..4d866d19 100644
--- a/scintilla/src/KeyMap.cxx
+++ b/scintilla/src/KeyMap.cxx
@@ -66,14 +66,42 @@ unsigned int KeyMap::Find(int key, int modifiers) {
 	return 0;
 }
 
+#if PLAT_GTK_MACOSX
+#define OS_X_KEYS 1
+#else
+#define OS_X_KEYS 0
+#endif
+
+// Define a modifier that is exactly Ctrl key on all platforms
+// Most uses of Ctrl map to Cmd on OS X but some can't so use SCI_[S]CTRL_META
+#if OS_X_KEYS
+#define SCI_CTRL_META SCI_META
+#define SCI_SCTRL_META (SCI_META | SCI_SHIFT)
+#else
+#define SCI_CTRL_META SCI_CTRL
+#define SCI_SCTRL_META (SCI_CTRL | SCI_SHIFT)
+#endif
+
 const KeyToCommand KeyMap::MapDefault[] = {
+
+#if OS_X_KEYS
+    {SCK_DOWN,		SCI_CTRL,	SCI_DOCUMENTEND},
+    {SCK_DOWN,		SCI_CSHIFT,	SCI_DOCUMENTENDEXTEND},
+    {SCK_UP,		SCI_CTRL,	SCI_DOCUMENTSTART},
+    {SCK_UP,		SCI_CSHIFT,	SCI_DOCUMENTSTARTEXTEND},
+    {SCK_LEFT,		SCI_CTRL,	SCI_VCHOME},
+    {SCK_LEFT,		SCI_CSHIFT,	SCI_VCHOMEEXTEND},
+    {SCK_RIGHT,		SCI_CTRL,	SCI_LINEEND},
+    {SCK_RIGHT,		SCI_CSHIFT,	SCI_LINEENDEXTEND},
+#endif
+
     {SCK_DOWN,		SCI_NORM,	SCI_LINEDOWN},
     {SCK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND},
-    {SCK_DOWN,		SCI_CTRL,	SCI_LINESCROLLDOWN},
+    {SCK_DOWN,		SCI_CTRL_META,	SCI_LINESCROLLDOWN},
     {SCK_DOWN,		SCI_ASHIFT,	SCI_LINEDOWNRECTEXTEND},
     {SCK_UP,		SCI_NORM,	SCI_LINEUP},
     {SCK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND},
-    {SCK_UP,			SCI_CTRL,	SCI_LINESCROLLUP},
+    {SCK_UP,			SCI_CTRL_META,	SCI_LINESCROLLUP},
     {SCK_UP,		SCI_ASHIFT,	SCI_LINEUPRECTEXTEND},
     {'[',			SCI_CTRL,		SCI_PARAUP},
     {'[',			SCI_CSHIFT,	SCI_PARAUPEXTEND},
@@ -81,13 +109,13 @@ const KeyToCommand KeyMap::MapDefault[] = {
     {']',			SCI_CSHIFT,	SCI_PARADOWNEXTEND},
     {SCK_LEFT,		SCI_NORM,	SCI_CHARLEFT},
     {SCK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND},
-    {SCK_LEFT,		SCI_CTRL,	SCI_WORDLEFT},
-    {SCK_LEFT,		SCI_CSHIFT,	SCI_WORDLEFTEXTEND},
+    {SCK_LEFT,		SCI_CTRL_META,	SCI_WORDLEFT},
+    {SCK_LEFT,		SCI_SCTRL_META,	SCI_WORDLEFTEXTEND},
     {SCK_LEFT,		SCI_ASHIFT,	SCI_CHARLEFTRECTEXTEND},
     {SCK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT},
     {SCK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND},
-    {SCK_RIGHT,		SCI_CTRL,	SCI_WORDRIGHT},
-    {SCK_RIGHT,		SCI_CSHIFT,	SCI_WORDRIGHTEXTEND},
+    {SCK_RIGHT,		SCI_CTRL_META,	SCI_WORDRIGHT},
+    {SCK_RIGHT,		SCI_SCTRL_META,	SCI_WORDRIGHTEXTEND},
     {SCK_RIGHT,		SCI_ASHIFT,	SCI_CHARRIGHTRECTEXTEND},
     {'/',		SCI_CTRL,		SCI_WORDPARTLEFT},
     {'/',		SCI_CSHIFT,	SCI_WORDPARTLEFTEXTEND},
@@ -98,14 +126,12 @@ const KeyToCommand KeyMap::MapDefault[] = {
     {SCK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART},
     {SCK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND},
     {SCK_HOME, 		SCI_ALT, 	SCI_HOMEDISPLAY},
-//    {SCK_HOME,		SCI_ASHIFT,	SCI_HOMEDISPLAYEXTEND},
     {SCK_HOME,		SCI_ASHIFT,	SCI_VCHOMERECTEXTEND},
     {SCK_END,	 	SCI_NORM,	SCI_LINEEND},
     {SCK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND},
     {SCK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND},
     {SCK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND},
     {SCK_END, 		SCI_ALT, 	SCI_LINEENDDISPLAY},
-//    {SCK_END,		SCI_ASHIFT,	SCI_LINEENDDISPLAYEXTEND},
     {SCK_END,		SCI_ASHIFT,	SCI_LINEENDRECTEXTEND},
     {SCK_PRIOR,		SCI_NORM,	SCI_PAGEUP},
     {SCK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND},
@@ -127,7 +153,11 @@ const KeyToCommand KeyMap::MapDefault[] = {
     {SCK_BACK, 		SCI_ALT,	SCI_UNDO},
     {SCK_BACK,		SCI_CSHIFT,	SCI_DELLINELEFT},
     {'Z', 			SCI_CTRL,	SCI_UNDO},
+#if OS_X_KEYS
+    {'Z', 			SCI_CSHIFT,	SCI_REDO},
+#else
     {'Y', 			SCI_CTRL,	SCI_REDO},
+#endif
     {'X', 			SCI_CTRL,	SCI_CUT},
     {'C', 			SCI_CTRL,	SCI_COPY},
     {'V', 			SCI_CTRL,	SCI_PASTE},
@@ -139,7 +169,6 @@ const KeyToCommand KeyMap::MapDefault[] = {
     {SCK_ADD, 		SCI_CTRL,	SCI_ZOOMIN},
     {SCK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT},
     {SCK_DIVIDE,	SCI_CTRL,	SCI_SETZOOM},
-    //'L', 			SCI_CTRL,		SCI_FORMFEED,
     {'L', 			SCI_CTRL,	SCI_LINECUT},
     {'L', 			SCI_CSHIFT,	SCI_LINEDELETE},
     {'T', 			SCI_CSHIFT,	SCI_LINECOPY},
diff --git a/scintilla/src/KeyMap.h b/scintilla/src/KeyMap.h
index fd9005de..f1235d84 100644
--- a/scintilla/src/KeyMap.h
+++ b/scintilla/src/KeyMap.h
@@ -16,6 +16,7 @@ namespace Scintilla {
 #define SCI_SHIFT SCMOD_SHIFT
 #define SCI_CTRL SCMOD_CTRL
 #define SCI_ALT SCMOD_ALT
+#define SCI_META SCMOD_META
 #define SCI_CSHIFT (SCI_CTRL | SCI_SHIFT)
 #define SCI_ASHIFT (SCI_ALT | SCI_SHIFT)
 
diff --git a/scintilla/src/LineMarker.cxx b/scintilla/src/LineMarker.cxx
index 41efe48c..b2b7ceae 100644
--- a/scintilla/src/LineMarker.cxx
+++ b/scintilla/src/LineMarker.cxx
@@ -2,11 +2,14 @@
 /** @file LineMarker.cxx
  ** Defines the look of a line marker in the margin .
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <string.h>
 
+#include <vector>
+#include <map>
+
 #include "Platform.h"
 
 #include "Scintilla.h"
@@ -20,6 +23,7 @@ using namespace Scintilla;
 void LineMarker::RefreshColourPalette(Palette &pal, bool want) {
 	pal.WantFind(fore, want);
 	pal.WantFind(back, want);
+	pal.WantFind(backSelected, want);
 	if (pxpm) {
 		pxpm->RefreshColourPalette(pal, want);
 	}
@@ -37,6 +41,12 @@ void LineMarker::SetXPM(const char *const *linesForm) {
 	markType = SC_MARK_PIXMAP;
 }
 
+void LineMarker::SetRGBAImage(Point sizeRGBAImage, const unsigned char *pixelsRGBAImage) {
+	delete image;
+	image = new RGBAImage(sizeRGBAImage.x, sizeRGBAImage.y, pixelsRGBAImage);
+	markType = SC_MARK_RGBAIMAGE;
+}
+
 static void DrawBox(Surface *surface, int centreX, int centreY, int armSize, ColourAllocated fore, ColourAllocated back) {
 	PRectangle rc;
 	rc.left = centreX - armSize;
@@ -67,11 +77,39 @@ static void DrawMinus(Surface *surface, int centreX, int centreY, int armSize, C
 	surface->FillRectangle(rcH, fore);
 }
 
-void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter) {
+void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, typeOfFold tFold) {
+	ColourPair head = back;
+	ColourPair body = back;
+	ColourPair tail = back;
+
+	switch (tFold) {
+	case LineMarker::head :
+	case LineMarker::headWithTail :
+		head = backSelected;
+		tail = backSelected;
+		break;
+	case LineMarker::body :
+		head = backSelected;
+		body = backSelected;
+		break;
+	case LineMarker::tail :
+		body = backSelected;
+		tail = backSelected;
+		break;
+	default :
+		// LineMarker::undefined
+		break;
+	}
+
+
 	if ((markType == SC_MARK_PIXMAP) && (pxpm)) {
 		pxpm->Draw(surface, rcWhole);
 		return;
 	}
+	if ((markType == SC_MARK_RGBAIMAGE) && (image)) {
+		surface->DrawRGBAImage(rcWhole, image->GetWidth(), image->GetHeight(), image->Pixels());
+		return;
+	}
 	// Restrict most shapes a bit
 	PRectangle rc = rcWhole;
 	rc.top++;
@@ -159,106 +197,145 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac
 		// An invisible marker so don't draw anything
 
 	} else if (markType == SC_MARK_VLINE) {
-		surface->PenColour(back.allocated);
+		surface->PenColour(body.allocated);
 		surface->MoveTo(centreX, rcWhole.top);
 		surface->LineTo(centreX, rcWhole.bottom);
 
 	} else if (markType == SC_MARK_LCORNER) {
-		surface->PenColour(back.allocated);
+		surface->PenColour(tail.allocated);
 		surface->MoveTo(centreX, rcWhole.top);
 		surface->LineTo(centreX, rc.top + dimOn2);
 		surface->LineTo(rc.right - 2, rc.top + dimOn2);
 
 	} else if (markType == SC_MARK_TCORNER) {
-		surface->PenColour(back.allocated);
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, rcWhole.bottom);
+		surface->PenColour(tail.allocated);
 		surface->MoveTo(centreX, rc.top + dimOn2);
 		surface->LineTo(rc.right - 2, rc.top + dimOn2);
 
+		surface->PenColour(body.allocated);
+		surface->MoveTo(centreX, rcWhole.top);
+		surface->LineTo(centreX, rc.top + dimOn2 + 1);
+
+		surface->PenColour(head.allocated);
+		surface->LineTo(centreX, rcWhole.bottom);
+
 	} else if (markType == SC_MARK_LCORNERCURVE) {
-		surface->PenColour(back.allocated);
+		surface->PenColour(tail.allocated);
 		surface->MoveTo(centreX, rcWhole.top);
 		surface->LineTo(centreX, rc.top + dimOn2-3);
 		surface->LineTo(centreX+3, rc.top + dimOn2);
 		surface->LineTo(rc.right - 1, rc.top + dimOn2);
 
 	} else if (markType == SC_MARK_TCORNERCURVE) {
-		surface->PenColour(back.allocated);
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, rcWhole.bottom);
-
+		surface->PenColour(tail.allocated);
 		surface->MoveTo(centreX, rc.top + dimOn2-3);
 		surface->LineTo(centreX+3, rc.top + dimOn2);
 		surface->LineTo(rc.right - 1, rc.top + dimOn2);
 
+		surface->PenColour(body.allocated);
+		surface->MoveTo(centreX, rcWhole.top);
+		surface->LineTo(centreX, rc.top + dimOn2-2);
+
+		surface->PenColour(head.allocated);
+		surface->LineTo(centreX, rcWhole.bottom);
+
 	} else if (markType == SC_MARK_BOXPLUS) {
-		surface->PenColour(back.allocated);
-		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		DrawPlus(surface, centreX, centreY, blobSize, back.allocated);
+		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, head.allocated);
+		DrawPlus(surface, centreX, centreY, blobSize, tail.allocated);
 
 	} else if (markType == SC_MARK_BOXPLUSCONNECTED) {
-		surface->PenColour(back.allocated);
-		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		DrawPlus(surface, centreX, centreY, blobSize, back.allocated);
-
+		if (tFold == LineMarker::headWithTail)
+			surface->PenColour(tail.allocated);
+		else
+			surface->PenColour(body.allocated);
 		surface->MoveTo(centreX, centreY + blobSize);
 		surface->LineTo(centreX, rcWhole.bottom);
 
+		surface->PenColour(body.allocated);
 		surface->MoveTo(centreX, rcWhole.top);
 		surface->LineTo(centreX, centreY - blobSize);
 
-	} else if (markType == SC_MARK_BOXMINUS) {
-		surface->PenColour(back.allocated);
-		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		DrawMinus(surface, centreX, centreY, blobSize, back.allocated);
+		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, head.allocated);
+		DrawPlus(surface, centreX, centreY, blobSize, tail.allocated);
 
+		if (tFold == LineMarker::body) {
+			surface->PenColour(tail.allocated);
+			surface->MoveTo(centreX + 1, centreY + blobSize);
+			surface->LineTo(centreX + blobSize + 1, centreY + blobSize);
+
+			surface->MoveTo(centreX + blobSize, centreY + blobSize);
+			surface->LineTo(centreX + blobSize, centreY - blobSize);
+
+			surface->MoveTo(centreX + 1, centreY - blobSize);
+			surface->LineTo(centreX + blobSize + 1, centreY - blobSize);
+		}
+	} else if (markType == SC_MARK_BOXMINUS) {
+		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, head.allocated);
+		DrawMinus(surface, centreX, centreY, blobSize, tail.allocated);
+
+		surface->PenColour(head.allocated);
 		surface->MoveTo(centreX, centreY + blobSize);
 		surface->LineTo(centreX, rcWhole.bottom);
 
 	} else if (markType == SC_MARK_BOXMINUSCONNECTED) {
-		surface->PenColour(back.allocated);
-		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		DrawMinus(surface, centreX, centreY, blobSize, back.allocated);
+		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, head.allocated);
+		DrawMinus(surface, centreX, centreY, blobSize, tail.allocated);
 
+		surface->PenColour(head.allocated);
 		surface->MoveTo(centreX, centreY + blobSize);
 		surface->LineTo(centreX, rcWhole.bottom);
 
+		surface->PenColour(body.allocated);
 		surface->MoveTo(centreX, rcWhole.top);
 		surface->LineTo(centreX, centreY - blobSize);
 
+		if (tFold == LineMarker::body) {
+			surface->PenColour(tail.allocated);
+			surface->MoveTo(centreX + 1, centreY + blobSize);
+			surface->LineTo(centreX + blobSize + 1, centreY + blobSize);
+
+			surface->MoveTo(centreX + blobSize, centreY + blobSize);
+			surface->LineTo(centreX + blobSize, centreY - blobSize);
+
+			surface->MoveTo(centreX + 1, centreY - blobSize);
+			surface->LineTo(centreX + blobSize + 1, centreY - blobSize);
+		}
 	} else if (markType == SC_MARK_CIRCLEPLUS) {
-		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		surface->PenColour(back.allocated);
-		DrawPlus(surface, centreX, centreY, blobSize, back.allocated);
+		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, head.allocated);
+		DrawPlus(surface, centreX, centreY, blobSize, tail.allocated);
 
 	} else if (markType == SC_MARK_CIRCLEPLUSCONNECTED) {
-		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		surface->PenColour(back.allocated);
-		DrawPlus(surface, centreX, centreY, blobSize, back.allocated);
-
+		if (tFold == LineMarker::headWithTail)
+			surface->PenColour(tail.allocated);
+		else
+			surface->PenColour(body.allocated);
 		surface->MoveTo(centreX, centreY + blobSize);
 		surface->LineTo(centreX, rcWhole.bottom);
 
+		surface->PenColour(body.allocated);
 		surface->MoveTo(centreX, rcWhole.top);
 		surface->LineTo(centreX, centreY - blobSize);
 
-	} else if (markType == SC_MARK_CIRCLEMINUS) {
-		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		surface->PenColour(back.allocated);
-		DrawMinus(surface, centreX, centreY, blobSize, back.allocated);
+		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, head.allocated);
+		DrawPlus(surface, centreX, centreY, blobSize, tail.allocated);
 
+	} else if (markType == SC_MARK_CIRCLEMINUS) {
+		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, head.allocated);
+		DrawMinus(surface, centreX, centreY, blobSize, tail.allocated);
+
+		surface->PenColour(head.allocated);
 		surface->MoveTo(centreX, centreY + blobSize);
 		surface->LineTo(centreX, rcWhole.bottom);
 
 	} else if (markType == SC_MARK_CIRCLEMINUSCONNECTED) {
-		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		surface->PenColour(back.allocated);
-		DrawMinus(surface, centreX, centreY, blobSize, back.allocated);
+		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, head.allocated);
+		DrawMinus(surface, centreX, centreY, blobSize, tail.allocated);
 
+		surface->PenColour(head.allocated);
 		surface->MoveTo(centreX, centreY + blobSize);
 		surface->LineTo(centreX, rcWhole.bottom);
 
+		surface->PenColour(body.allocated);
 		surface->MoveTo(centreX, rcWhole.top);
 		surface->LineTo(centreX, centreY - blobSize);
 
diff --git a/scintilla/src/LineMarker.h b/scintilla/src/LineMarker.h
index ca15cb81..6477a1ff 100644
--- a/scintilla/src/LineMarker.h
+++ b/scintilla/src/LineMarker.h
@@ -2,7 +2,7 @@
 /** @file LineMarker.h
  ** Defines the look of a line marker in the margin .
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef LINEMARKER_H
@@ -12,47 +12,61 @@
 namespace Scintilla {
 #endif
 
+
 /**
  */
 class LineMarker {
 public:
+	enum typeOfFold { undefined, head, body, tail, headWithTail };
+
 	int markType;
 	ColourPair fore;
 	ColourPair back;
+	ColourPair backSelected;
 	int alpha;
 	XPM *pxpm;
+	RGBAImage *image;
 	LineMarker() {
 		markType = SC_MARK_CIRCLE;
 		fore = ColourDesired(0,0,0);
 		back = ColourDesired(0xff,0xff,0xff);
+		backSelected = ColourDesired(0xff,0x00,0x00);
 		alpha = SC_ALPHA_NOALPHA;
 		pxpm = NULL;
+		image = NULL;
 	}
 	LineMarker(const LineMarker &) {
 		// Defined to avoid pxpm being blindly copied, not as real copy constructor
 		markType = SC_MARK_CIRCLE;
 		fore = ColourDesired(0,0,0);
 		back = ColourDesired(0xff,0xff,0xff);
+		backSelected = ColourDesired(0xff,0x00,0x00);
 		alpha = SC_ALPHA_NOALPHA;
 		pxpm = NULL;
+		image = NULL;
 	}
 	~LineMarker() {
 		delete pxpm;
+		delete image;
 	}
 	LineMarker &operator=(const LineMarker &) {
 		// Defined to avoid pxpm being blindly copied, not as real assignment operator
 		markType = SC_MARK_CIRCLE;
 		fore = ColourDesired(0,0,0);
 		back = ColourDesired(0xff,0xff,0xff);
+		backSelected = ColourDesired(0xff,0x00,0x00);
 		alpha = SC_ALPHA_NOALPHA;
 		delete pxpm;
 		pxpm = NULL;
+		delete image;
+		image = NULL;
 		return *this;
 	}
 	void RefreshColourPalette(Palette &pal, bool want);
 	void SetXPM(const char *textForm);
 	void SetXPM(const char *const *linesForm);
-	void Draw(Surface *surface, PRectangle &rc, Font &fontForCharacter);
+	void SetRGBAImage(Point sizeRGBAImage, const unsigned char *pixelsRGBAImage);
+	void Draw(Surface *surface, PRectangle &rc, Font &fontForCharacter, typeOfFold tFold);
 };
 
 #ifdef SCI_NAMESPACE
diff --git a/scintilla/src/PerLine.cxx b/scintilla/src/PerLine.cxx
index 8fc6e253..7d961a88 100644
--- a/scintilla/src/PerLine.cxx
+++ b/scintilla/src/PerLine.cxx
@@ -425,10 +425,10 @@ void LineAnnotation::SetText(int line, const char *text) {
 		if (annotations[line]) {
 			delete []annotations[line];
 		}
-		annotations[line] = AllocateAnnotation(strlen(text), style);
+		annotations[line] = AllocateAnnotation(static_cast<int>(strlen(text)), style);
 		AnnotationHeader *pah = reinterpret_cast<AnnotationHeader *>(annotations[line]);
 		pah->style = static_cast<short>(style);
-		pah->length = strlen(text);
+		pah->length = static_cast<int>(strlen(text));
 		pah->lines = static_cast<short>(NumberLines(text));
 		memcpy(annotations[line]+sizeof(AnnotationHeader), text, pah->length);
 	} else {
diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx
index 2ed15245..2105c292 100644
--- a/scintilla/src/PositionCache.cxx
+++ b/scintilla/src/PositionCache.cxx
@@ -12,6 +12,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 
 #include "Platform.h"
 
@@ -151,15 +152,15 @@ void LineLayout::SetLineStart(int line, int start) {
 }
 
 void LineLayout::SetBracesHighlight(Range rangeLine, Position braces[],
-                                    char bracesMatchStyle, int xHighlight) {
-	if (rangeLine.ContainsCharacter(braces[0])) {
+                                    char bracesMatchStyle, int xHighlight, bool ignoreStyle) {
+	if (!ignoreStyle && rangeLine.ContainsCharacter(braces[0])) {
 		int braceOffset = braces[0] - rangeLine.start;
 		if (braceOffset < numCharsInLine) {
 			bracePreviousStyles[0] = styles[braceOffset];
 			styles[braceOffset] = bracesMatchStyle;
 		}
 	}
-	if (rangeLine.ContainsCharacter(braces[1])) {
+	if (!ignoreStyle && rangeLine.ContainsCharacter(braces[1])) {
 		int braceOffset = braces[1] - rangeLine.start;
 		if (braceOffset < numCharsInLine) {
 			bracePreviousStyles[1] = styles[braceOffset];
@@ -172,14 +173,14 @@ void LineLayout::SetBracesHighlight(Range rangeLine, Position braces[],
 	}
 }
 
-void LineLayout::RestoreBracesHighlight(Range rangeLine, Position braces[]) {
-	if (rangeLine.ContainsCharacter(braces[0])) {
+void LineLayout::RestoreBracesHighlight(Range rangeLine, Position braces[], bool ignoreStyle) {
+	if (!ignoreStyle && rangeLine.ContainsCharacter(braces[0])) {
 		int braceOffset = braces[0] - rangeLine.start;
 		if (braceOffset < numCharsInLine) {
 			styles[braceOffset] = bracePreviousStyles[0];
 		}
 	}
-	if (rangeLine.ContainsCharacter(braces[1])) {
+	if (!ignoreStyle && rangeLine.ContainsCharacter(braces[1])) {
 		int braceOffset = braces[1] - rangeLine.start;
 		if (braceOffset < numCharsInLine) {
 			styles[braceOffset] = bracePreviousStyles[1];
@@ -391,18 +392,19 @@ static int NextBadU(const char *s, int p, int len, int &trailBytes) {
 	return -1;
 }
 
-BreakFinder::BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, bool utf8_, int xStart, bool breakForSelection) :
+BreakFinder::BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_,
+	int xStart, bool breakForSelection, Document *pdoc_) :
 	ll(ll_),
 	lineStart(lineStart_),
 	lineEnd(lineEnd_),
 	posLineStart(posLineStart_),
-	utf8(utf8_),
 	nextBreak(lineStart_),
 	saeSize(0),
 	saeLen(0),
 	saeCurrentPos(0),
 	saeNext(0),
-	subBreak(-1) {
+	subBreak(-1),
+	pdoc(pdoc_) {
 	saeSize = 8;
 	selAndEdge = new int[saeSize];
 	for (unsigned int j=0; j < saeSize; j++) {
@@ -435,7 +437,7 @@ BreakFinder::BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posL
 	Insert(ll->edgeColumn - 1);
 	Insert(lineEnd - 1);
 
-	if (utf8) {
+	if (pdoc && (SC_CP_UTF8 == pdoc->dbcsCodePage)) {
 		int trailBytes=0;
 		for (int pos = -1;;) {
 			pos = NextBadU(ll->chars, pos, lineEnd, trailBytes);
@@ -456,10 +458,6 @@ int BreakFinder::First() const {
 	return nextBreak;
 }
 
-static bool IsTrailByte(int ch) {
-	return (ch >= 0x80) && (ch < (0x80 + 0x40));
-}
-
 int BreakFinder::Next() {
 	if (subBreak == -1) {
 		int prev = nextBreak;
@@ -490,34 +488,7 @@ int BreakFinder::Next() {
 		subBreak = -1;
 		return nextBreak;
 	} else {
-		int lastGoodBreak = -1;
-		int lastOKBreak = -1;
-		int lastUTF8Break = -1;
-		int j;
-		for (j = subBreak + 1; j <= nextBreak; j++) {
-			if (IsSpaceOrTab(ll->chars[j - 1]) && !IsSpaceOrTab(ll->chars[j])) {
-				lastGoodBreak = j;
-			}
-			if (static_cast<unsigned char>(ll->chars[j]) < 'A') {
-				lastOKBreak = j;
-			}
-			if (utf8 && !IsTrailByte(static_cast<unsigned char>(ll->chars[j]))) {
-				lastUTF8Break = j;
-			}
-			if (((j - subBreak) >= lengthEachSubdivision) &&
-				((lastGoodBreak >= 0) || (lastOKBreak >= 0) || (lastUTF8Break >= 0))) {
-				break;
-			}
-		}
-		if (lastGoodBreak >= 0) {
-			subBreak = lastGoodBreak;
-		} else if (lastOKBreak >= 0) {
-			subBreak = lastOKBreak;
-		} else if (lastUTF8Break >= 0) {
-			subBreak = lastUTF8Break;
-		} else {
-			subBreak = nextBreak;
-		}
+		subBreak += pdoc->SafeSegment(ll->chars + subBreak, nextBreak-subBreak, lengthEachSubdivision);
 		if (subBreak >= nextBreak) {
 			subBreak = -1;
 			return nextBreak;
@@ -571,16 +542,16 @@ bool PositionCacheEntry::Retrieve(unsigned int styleNumber_, const char *s_,
 	}
 }
 
-int PositionCacheEntry::Hash(unsigned int styleNumber, const char *s, unsigned int len) {
+int PositionCacheEntry::Hash(unsigned int styleNumber_, const char *s, unsigned int len_) {
 	unsigned int ret = s[0] << 7;
-	for (unsigned int i=0; i<len; i++) {
+	for (unsigned int i=0; i<len_; i++) {
 		ret *= 1000003;
 		ret ^= s[i];
 	}
 	ret *= 1000003;
-	ret ^= len;
+	ret ^= len_;
 	ret *= 1000003;
-	ret ^= styleNumber;
+	ret ^= styleNumber_;
 	return ret;
 }
 
@@ -624,7 +595,8 @@ void PositionCache::SetSize(size_t size_) {
 }
 
 void PositionCache::MeasureWidths(Surface *surface, ViewStyle &vstyle, unsigned int styleNumber,
-	const char *s, unsigned int len, int *positions) {
+	const char *s, unsigned int len, int *positions, Document *pdoc) {
+
 	allClear = false;
 	int probe = -1;
 	if ((size > 0) && (len < 30)) {
@@ -633,11 +605,11 @@ void PositionCache::MeasureWidths(Surface *surface, ViewStyle &vstyle, unsigned
 
 		// Two way associative: try two probe positions.
 		int hashValue = PositionCacheEntry::Hash(styleNumber, s, len);
-		probe = hashValue % size;
+		probe = static_cast<int>(hashValue % size);
 		if (pces[probe].Retrieve(styleNumber, s, len, positions)) {
 			return;
 		}
-		int probe2 = (hashValue * 37) % size;
+		int probe2 = static_cast<int>((hashValue * 37) % size);
 		if (pces[probe2].Retrieve(styleNumber, s, len, positions)) {
 			return;
 		}
@@ -646,7 +618,22 @@ void PositionCache::MeasureWidths(Surface *surface, ViewStyle &vstyle, unsigned
 			probe = probe2;
 		}
 	}
-	surface->MeasureWidths(vstyle.styles[styleNumber].font, s, len, positions);
+	if (len > BreakFinder::lengthStartSubdivision) {
+		// Break up into segments
+		unsigned int startSegment = 0;
+		int xStartSegment = 0;
+		while (startSegment < len) {
+			unsigned int lenSegment = pdoc->SafeSegment(s + startSegment, len - startSegment, BreakFinder::lengthEachSubdivision);
+			surface->MeasureWidths(vstyle.styles[styleNumber].font, s + startSegment, lenSegment, positions + startSegment);
+			for (unsigned int inSeg = 0; inSeg < lenSegment; inSeg++) {
+				positions[startSegment + inSeg] += xStartSegment;
+			}
+			xStartSegment = positions[startSegment + lenSegment - 1];
+			startSegment += lenSegment;
+		}
+	} else {
+		surface->MeasureWidths(vstyle.styles[styleNumber].font, s, len, positions);
+	}
 	if (probe >= 0) {
 		clock++;
 		if (clock > 60000) {
diff --git a/scintilla/src/PositionCache.h b/scintilla/src/PositionCache.h
index 75454587..c6076ea2 100644
--- a/scintilla/src/PositionCache.h
+++ b/scintilla/src/PositionCache.h
@@ -63,8 +63,8 @@ public:
 	bool InLine(int offset, int line) const;
 	void SetLineStart(int line, int start);
 	void SetBracesHighlight(Range rangeLine, Position braces[],
-		char bracesMatchStyle, int xHighlight);
-	void RestoreBracesHighlight(Range rangeLine, Position braces[]);
+		char bracesMatchStyle, int xHighlight, bool ignoreStyle);
+	void RestoreBracesHighlight(Range rangeLine, Position braces[], bool ignoreStyle);
 	int FindBefore(int x, int lower, int upper) const;
 	int EndLineStyle() const;
 };
@@ -110,23 +110,17 @@ public:
 	void Set(unsigned int styleNumber_, const char *s_, unsigned int len_, int *positions_, unsigned int clock);
 	void Clear();
 	bool Retrieve(unsigned int styleNumber_, const char *s_, unsigned int len_, int *positions_) const;
-	static int Hash(unsigned int styleNumber, const char *s, unsigned int len);
+	static int Hash(unsigned int styleNumber_, const char *s, unsigned int len);
 	bool NewerThan(const PositionCacheEntry &other) const;
 	void ResetClock();
 };
 
 // Class to break a line of text into shorter runs at sensible places.
 class BreakFinder {
-	// If a whole run is longer than lengthStartSubdivision then subdivide
-	// into smaller runs at spaces or punctuation.
-	enum { lengthStartSubdivision = 300 };
-	// Try to make each subdivided run lengthEachSubdivision or shorter.
-	enum { lengthEachSubdivision = 100 };
 	LineLayout *ll;
 	int lineStart;
 	int lineEnd;
 	int posLineStart;
-	bool utf8;
 	int nextBreak;
 	int *selAndEdge;
 	unsigned int saeSize;
@@ -134,9 +128,16 @@ class BreakFinder {
 	unsigned int saeCurrentPos;
 	int saeNext;
 	int subBreak;
+	Document *pdoc;
 	void Insert(int val);
 public:
-	BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, bool utf8_, int xStart, bool breakForSelection);
+	// If a whole run is longer than lengthStartSubdivision then subdivide
+	// into smaller runs at spaces or punctuation.
+	enum { lengthStartSubdivision = 300 };
+	// Try to make each subdivided run lengthEachSubdivision or shorter.
+	enum { lengthEachSubdivision = 100 };
+	BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_,
+		int xStart, bool breakForSelection, Document *pdoc_);
 	~BreakFinder();
 	int First() const;
 	int Next();
@@ -152,9 +153,9 @@ public:
 	~PositionCache();
 	void Clear();
 	void SetSize(size_t size_);
-	int GetSize() const { return size; }
+	size_t GetSize() const { return size; }
 	void MeasureWidths(Surface *surface, ViewStyle &vstyle, unsigned int styleNumber,
-		const char *s, unsigned int len, int *positions);
+		const char *s, unsigned int len, int *positions, Document *pdoc);
 };
 
 inline bool IsSpaceOrTab(int ch) {
diff --git a/scintilla/src/RESearch.cxx b/scintilla/src/RESearch.cxx
index f26375fe..ffcc58d3 100644
--- a/scintilla/src/RESearch.cxx
+++ b/scintilla/src/RESearch.cxx
@@ -321,7 +321,7 @@ void RESearch::ChSetWithCase(unsigned char c, bool caseSensitive) {
 	}
 }
 
-const unsigned char escapeValue(unsigned char ch) {
+unsigned char escapeValue(unsigned char ch) {
 	switch (ch) {
 	case 'a':	return '\a';
 	case 'b':	return '\b';
@@ -888,10 +888,10 @@ int RESearch::PMatch(CharacterIndexer &ci, int lp, int endp, char *ap) {
 				return NOTFOUND;
 			break;
 		case BOT:
-			bopat[*ap++] = lp;
+			bopat[static_cast<int>(*ap++)] = lp;
 			break;
 		case EOT:
-			eopat[*ap++] = lp;
+			eopat[static_cast<int>(*ap++)] = lp;
 			break;
 		case BOW:
 			if ((lp!=bol && iswordc(ci.CharAt(lp-1))) || !iswordc(ci.CharAt(lp)))
diff --git a/scintilla/src/RunStyles.cxx b/scintilla/src/RunStyles.cxx
index 460d5d24..643d2fb2 100644
--- a/scintilla/src/RunStyles.cxx
+++ b/scintilla/src/RunStyles.cxx
@@ -21,7 +21,7 @@ using namespace Scintilla;
 #endif
 
 // Find the first run at a position
-int RunStyles::RunFromPosition(int position) {
+int RunStyles::RunFromPosition(int position) const {
 	int run = starts->PartitionFromPosition(position);
 	// Go to first element with this position
 	while ((run > 0) && (position == starts->PositionFromPartition(run-1))) {
@@ -147,6 +147,8 @@ bool RunStyles::FillRange(int &position, int value, int &fillLength) {
 		runEnd = RunFromPosition(end);
 		RemoveRunIfSameAsPrevious(runEnd);
 		RemoveRunIfSameAsPrevious(runStart);
+		runEnd = RunFromPosition(end);
+		RemoveRunIfEmpty(runEnd);
 		return true;
 	} else {
 		return false;
@@ -216,3 +218,33 @@ void RunStyles::DeleteRange(int position, int deleteLength) {
 	}
 }
 
+int RunStyles::Runs() const {
+	return starts->Partitions();
+}
+
+bool RunStyles::AllSame() const {
+	for (int run = 1; run < starts->Partitions(); run++) {
+		if (styles->ValueAt(run) != styles->ValueAt(run - 1))
+			return false;
+	}
+	return true;
+}
+
+bool RunStyles::AllSameAs(int value) const {
+	return AllSame() && (styles->ValueAt(0) == value);
+}
+
+int RunStyles::Find(int value, int start) const {
+	if (start < Length()) {
+		int run = start ? RunFromPosition(start) : 0;
+		if (styles->ValueAt(run) == value)
+			return start;
+		run++;
+		while (run < starts->Partitions()) {
+			if (styles->ValueAt(run) == value)
+				return starts->PositionFromPartition(run);
+			run++;
+		}
+	}
+	return -1;
+}
diff --git a/scintilla/src/RunStyles.h b/scintilla/src/RunStyles.h
index 0a333ca2..a3efd93c 100644
--- a/scintilla/src/RunStyles.h
+++ b/scintilla/src/RunStyles.h
@@ -15,10 +15,10 @@ namespace Scintilla {
 #endif
 
 class RunStyles {
-public:
+private:
 	Partitioning *starts;
 	SplitVector<int> *styles;
-	int RunFromPosition(int position);
+	int RunFromPosition(int position) const;
 	int SplitRun(int position);
 	void RemoveRun(int run);
 	void RemoveRunIfEmpty(int run);
@@ -37,6 +37,10 @@ public:
 	void InsertSpace(int position, int insertLength);
 	void DeleteAll();
 	void DeleteRange(int position, int deleteLength);
+	int Runs() const;
+	bool AllSame() const;
+	bool AllSameAs(int value) const;
+	int Find(int value, int start) const;
 };
 
 #ifdef SCI_NAMESPACE
diff --git a/scintilla/src/ScintillaBase.cxx b/scintilla/src/ScintillaBase.cxx
index 9467025e..da6b03e0 100644
--- a/scintilla/src/ScintillaBase.cxx
+++ b/scintilla/src/ScintillaBase.cxx
@@ -13,6 +13,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 
 #include "Platform.h"
 
@@ -135,16 +136,16 @@ int ScintillaBase::KeyCommand(unsigned int iMessage) {
 			AutoCompleteMove(1);
 			return 0;
 		case SCI_LINEUP:
-			AutoCompleteMove( -1);
+			AutoCompleteMove(-1);
 			return 0;
 		case SCI_PAGEDOWN:
 			AutoCompleteMove(5);
 			return 0;
 		case SCI_PAGEUP:
-			AutoCompleteMove( -5);
+			AutoCompleteMove(-5);
 			return 0;
 		case SCI_VCHOME:
-			AutoCompleteMove( -5000);
+			AutoCompleteMove(-5000);
 			return 0;
 		case SCI_LINEEND:
 			AutoCompleteMove(5000);
@@ -204,7 +205,8 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) {
 	if (ac.chooseSingle && (listType == 0)) {
 		if (list && !strchr(list, ac.GetSeparator())) {
 			const char *typeSep = strchr(list, ac.GetTypesep());
-			size_t lenInsert = (typeSep) ? (typeSep-list) : strlen(list);
+			int lenInsert = typeSep ? 
+				static_cast<int>(typeSep-list) : static_cast<int>(strlen(list));
 			if (ac.ignoreCase) {
 				SetEmptySelection(sel.MainCaret() - lenEntered);
 				pdoc->DeleteChars(sel.MainCaret(), lenEntered);
@@ -349,6 +351,7 @@ void ScintillaBase::AutoCompleteCompleted() {
 	scn.wParam = listType;
 	scn.listType = listType;
 	Position firstPos = ac.posStart - ac.startLen;
+	scn.position = firstPos;
 	scn.lParam = firstPos;
 	scn.text = selected;
 	NotifyParent(scn);
@@ -392,7 +395,7 @@ int ScintillaBase::AutoCompleteGetCurrentText(char *buffer) {
 			ac.lb->GetValue(item, selected, sizeof(selected));
 			if (buffer != NULL)
 				strcpy(buffer, selected);
-			return strlen(selected);
+			return static_cast<int>(strlen(selected));
 		}
 	}
 	if (buffer != NULL)
@@ -759,6 +762,10 @@ sptr_t ScintillaBase::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPara
 		ac.lb->RegisterImage(wParam, reinterpret_cast<const char *>(lParam));
 		break;
 
+	case SCI_REGISTERRGBAIMAGE:
+		ac.lb->RegisterRGBAImage(wParam, sizeRGBAImage.x, sizeRGBAImage.y, reinterpret_cast<unsigned char *>(lParam));
+		break;
+
 	case SCI_CLEARREGISTEREDIMAGES:
 		ac.lb->ClearRegisteredImages();
 		break;
diff --git a/scintilla/src/Style.cxx b/scintilla/src/Style.cxx
index 392fd1c9..fc250f0b 100644
--- a/scintilla/src/Style.cxx
+++ b/scintilla/src/Style.cxx
@@ -16,14 +16,51 @@
 using namespace Scintilla;
 #endif
 
-Style::Style() {
-	aliasOfDefaultFont = true;
+FontAlias::FontAlias() {
+}
+
+FontAlias::~FontAlias() {
+	SetID(0);
+	// ~Font will not release the actual font resource sine it is now 0
+}
+
+void FontAlias::MakeAlias(Font &fontOrigin) {
+	SetID(fontOrigin.GetID());
+}
+
+void FontAlias::ClearFont() {
+	SetID(0);
+}
+
+bool FontSpecification::EqualTo(const FontSpecification &other) const {
+	return bold == other.bold &&
+	       italic == other.italic &&
+	       size == other.size &&
+	       characterSet == other.characterSet &&
+	       fontName == other.fontName;
+}
+
+FontMeasurements::FontMeasurements() {
+	Clear();
+}
+
+void FontMeasurements::Clear() {
+	lineHeight = 2;
+	ascent = 1;
+	descent = 1;
+	externalLeading = 0;
+	aveCharWidth = 1;
+	spaceWidth = 1;
+	sizeZoomed = 2;
+}
+
+Style::Style() : FontSpecification() {
 	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),
 	      Platform::DefaultFontSize(), 0, SC_CHARSET_DEFAULT,
 	      false, false, false, false, caseMixed, true, true, false);
 }
 
-Style::Style(const Style &source) {
+Style::Style(const Style &source) : FontSpecification(), FontMeasurements() {
 	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),
 	      0, 0, 0,
 	      false, false, false, false, caseMixed, true, true, false);
@@ -42,11 +79,6 @@ Style::Style(const Style &source) {
 }
 
 Style::~Style() {
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else
-		font.Release();
-	aliasOfDefaultFont = false;
 }
 
 Style &Style::operator=(const Style &source) {
@@ -70,10 +102,10 @@ Style &Style::operator=(const Style &source) {
 }
 
 void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_,
-                  const char *fontName_, int characterSet_,
-                  bool bold_, bool italic_, bool eolFilled_,
-                  bool underline_, ecaseForced caseForce_,
-		  bool visible_, bool changeable_, bool hotspot_) {
+        const char *fontName_, int characterSet_,
+        bool bold_, bool italic_, bool eolFilled_,
+        bool underline_, ecaseForced caseForce_,
+        bool visible_, bool changeable_, bool hotspot_) {
 	fore.desired = fore_;
 	back.desired = back_;
 	characterSet = characterSet_;
@@ -87,79 +119,31 @@ void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_,
 	visible = visible_;
 	changeable = changeable_;
 	hotspot = hotspot_;
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else
-		font.Release();
-	aliasOfDefaultFont = false;
-	sizeZoomed = 2;
-	lineHeight = 2;
-	ascent = 1;
-	descent = 1;
-	externalLeading = 0;
-	aveCharWidth = 1;
-	spaceWidth = 1;
+	font.ClearFont();
+	FontMeasurements::Clear();
 }
 
 void Style::ClearTo(const Style &source) {
 	Clear(
-		source.fore.desired,
-		source.back.desired,
-		source.size,
-		source.fontName,
-		source.characterSet,
-		source.bold,
-		source.italic,
-		source.eolFilled,
-		source.underline,
-		source.caseForce,
-		source.visible,
-		source.changeable,
-		source.hotspot);
+	    source.fore.desired,
+	    source.back.desired,
+	    source.size,
+	    source.fontName,
+	    source.characterSet,
+	    source.bold,
+	    source.italic,
+	    source.eolFilled,
+	    source.underline,
+	    source.caseForce,
+	    source.visible,
+	    source.changeable,
+	    source.hotspot);
 }
 
-bool Style::EquivalentFontTo(const Style *other) const {
-	if (bold != other->bold ||
-	        italic != other->italic ||
-	        size != other->size ||
-	        characterSet != other->characterSet)
-		return false;
-	if (fontName == other->fontName)
-		return true;
-	if (!fontName)
-		return false;
-	if (!other->fontName)
-		return false;
-	return strcmp(fontName, other->fontName) == 0;
-}
-
-void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, int extraFontFlag) {
-	sizeZoomed = size + zoomLevel;
-	if (sizeZoomed <= 2)	// Hangs if sizeZoomed <= 1
-		sizeZoomed = 2;
-
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else
-		font.Release();
-	int deviceHeight = surface.DeviceHeightFont(sizeZoomed);
-	aliasOfDefaultFont = defaultStyle &&
-	                     (EquivalentFontTo(defaultStyle) || !fontName);
-	if (aliasOfDefaultFont) {
-		font.SetID(defaultStyle->font.GetID());
-	} else if (fontName) {
-		font.Create(fontName, characterSet, deviceHeight, bold, italic, extraFontFlag);
-	} else {
-		font.SetID(0);
-	}
-
-	ascent = surface.Ascent(font);
-	descent = surface.Descent(font);
-	// Probably more typographically correct to include leading
-	// but that means more complex drawing as leading must be erased
-	//lineHeight = surface.ExternalLeading() + surface.Height();
-	externalLeading = surface.ExternalLeading(font);
-	lineHeight = surface.Height(font);
-	aveCharWidth = surface.AverageCharWidth(font);
-	spaceWidth = surface.WidthChar(font, ' ');
+void Style::Copy(Font &font_, const FontMeasurements &fm_) {
+	font.MakeAlias(font_);
+#if PLAT_WX
+	font.SetAscent(fm_.ascent);
+#endif
+	(FontMeasurements &)(*this) = fm_;
 }
diff --git a/scintilla/src/Style.h b/scintilla/src/Style.h
index c1f87e1b..29122b0a 100644
--- a/scintilla/src/Style.h
+++ b/scintilla/src/Style.h
@@ -12,18 +12,54 @@
 namespace Scintilla {
 #endif
 
-/**
- */
-class Style {
-public:
-	ColourPair fore;
-	ColourPair back;
-	bool aliasOfDefaultFont;
+struct FontSpecification {
+	const char *fontName;
 	bool bold;
 	bool italic;
 	int size;
-	const char *fontName;
 	int characterSet;
+	int extraFontFlag;
+	FontSpecification() :
+		fontName(0),
+		bold(false),
+		italic(false),
+		size(10),
+		characterSet(0),
+		extraFontFlag(0) {
+	}
+	bool EqualTo(const FontSpecification &other) const;
+};
+
+// Just like Font but only has a copy of the FontID so should not delete it
+class FontAlias : public Font {
+	// Private so FontAlias objects can not be copied
+	FontAlias(const FontAlias &);
+	FontAlias &operator=(const FontAlias &);
+public:
+	FontAlias();
+	virtual ~FontAlias();
+	void MakeAlias(Font &fontOrigin);
+	void ClearFont();
+};
+
+struct FontMeasurements {
+	unsigned int lineHeight;
+	unsigned int ascent;
+	unsigned int descent;
+	unsigned int externalLeading;
+	unsigned int aveCharWidth;
+	unsigned int spaceWidth;
+	int sizeZoomed;
+	FontMeasurements();
+	void Clear();
+};
+
+/**
+ */
+class Style : public FontSpecification, public FontMeasurements {
+public:
+	ColourPair fore;
+	ColourPair back;
 	bool eolFilled;
 	bool underline;
 	enum ecaseForced {caseMixed, caseUpper, caseLower};
@@ -32,14 +68,7 @@ public:
 	bool changeable;
 	bool hotspot;
 
-	Font font;
-	int sizeZoomed;
-	unsigned int lineHeight;
-	unsigned int ascent;
-	unsigned int descent;
-	unsigned int externalLeading;
-	unsigned int aveCharWidth;
-	unsigned int spaceWidth;
+	FontAlias font;
 
 	Style();
 	Style(const Style &source);
@@ -52,8 +81,7 @@ public:
 	           bool underline_, ecaseForced caseForce_,
 		   bool visible_, bool changeable_, bool hotspot_);
 	void ClearTo(const Style &source);
-	bool EquivalentFontTo(const Style *other) const;
-	void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, int extraFontFlag = 0);
+	void Copy(Font &font_, const FontMeasurements &fm_);
 	bool IsProtected() const { return !(changeable && visible);}
 };
 
diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx
index 78ba1f78..9ba69b1c 100644
--- a/scintilla/src/ViewStyle.cxx
+++ b/scintilla/src/ViewStyle.cxx
@@ -7,6 +7,9 @@
 
 #include <string.h>
 
+#include <vector>
+#include <map>
+
 #include "Platform.h"
 
 #include "Scintilla.h"
@@ -72,11 +75,66 @@ const char *FontNames::Save(const char *name) {
 	return names[max-1];
 }
 
+FontRealised::FontRealised(const FontSpecification &fs) {
+	frNext = NULL;
+	(FontSpecification &)(*this) = fs;
+}
+
+FontRealised::~FontRealised() {
+	font.Release();
+	delete frNext;
+	frNext = 0;
+}
+
+void FontRealised::Realise(Surface &surface, int zoomLevel) {
+	PLATFORM_ASSERT(fontName);
+	sizeZoomed = size + zoomLevel;
+	if (sizeZoomed <= 2)	// Hangs if sizeZoomed <= 1
+		sizeZoomed = 2;
+
+	int deviceHeight = surface.DeviceHeightFont(sizeZoomed);
+	font.Create(fontName, characterSet, deviceHeight, bold, italic, extraFontFlag);
+
+	ascent = surface.Ascent(font);
+	descent = surface.Descent(font);
+	externalLeading = surface.ExternalLeading(font);
+	lineHeight = surface.Height(font);
+	aveCharWidth = surface.AverageCharWidth(font);
+	spaceWidth = surface.WidthChar(font, ' ');
+	if (frNext) {
+		frNext->Realise(surface, zoomLevel);
+	}
+}
+
+FontRealised *FontRealised::Find(const FontSpecification &fs) {
+	if (!fs.fontName)
+		return this;
+	FontRealised *fr = this;
+	while (fr) {
+		if (fr->EqualTo(fs))
+			return fr;
+		fr = fr->frNext;
+	}
+	return 0;
+}
+
+void FontRealised::FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent) {
+	FontRealised *fr = this;
+	while (fr) {
+		if (maxAscent < fr->ascent)
+			maxAscent = fr->ascent;
+		if (maxDescent < fr->descent)
+			maxDescent = fr->descent;
+		fr = fr->frNext;
+	}
+}
+
 ViewStyle::ViewStyle() {
 	Init();
 }
 
 ViewStyle::ViewStyle(const ViewStyle &source) {
+	frFirst = NULL;
 	Init(source.stylesSize);
 	for (unsigned int sty=0; sty<source.stylesSize; sty++) {
 		styles[sty] = source.styles[sty];
@@ -150,14 +208,21 @@ ViewStyle::ViewStyle(const ViewStyle &source) {
 	marginStyleOffset = source.marginStyleOffset;
 	annotationVisible = source.annotationVisible;
 	annotationStyleOffset = source.annotationStyleOffset;
+	braceHighlightIndicatorSet = source.braceHighlightIndicatorSet;
+	braceHighlightIndicator = source.braceHighlightIndicator;
+	braceBadLightIndicatorSet = source.braceBadLightIndicatorSet;
+	braceBadLightIndicator = source.braceBadLightIndicator;
 }
 
 ViewStyle::~ViewStyle() {
 	delete []styles;
 	styles = NULL;
+	delete frFirst;
+	frFirst = NULL;
 }
 
 void ViewStyle::Init(size_t stylesSize_) {
+	frFirst = NULL;
 	stylesSize = 0;
 	styles = NULL;
 	AllocStyles(stylesSize_);
@@ -255,6 +320,10 @@ void ViewStyle::Init(size_t stylesSize_) {
 	marginStyleOffset = 0;
 	annotationVisible = ANNOTATION_HIDDEN;
 	annotationStyleOffset = 0;
+	braceHighlightIndicatorSet = false;
+	braceHighlightIndicator = 0;
+	braceBadLightIndicatorSet = false;
+	braceBadLightIndicator = 0;
 }
 
 void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
@@ -290,33 +359,59 @@ void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
 	pal.WantFind(hotspotBackground, want);
 }
 
+void ViewStyle::CreateFont(const FontSpecification &fs) {
+	if (fs.fontName) {
+		for (FontRealised *cur=frFirst; cur; cur=cur->frNext) {
+			if (cur->EqualTo(fs))
+				return;
+			if (!cur->frNext) {
+				cur->frNext = new FontRealised(fs);
+				return;
+			}
+		}
+		frFirst = new FontRealised(fs);
+	}
+}
+
 void ViewStyle::Refresh(Surface &surface) {
+	delete frFirst;
+	frFirst = NULL;
 	selbar.desired = Platform::Chrome();
 	selbarlight.desired = Platform::ChromeHighlight();
-	styles[STYLE_DEFAULT].Realise(surface, zoomLevel, NULL, extraFontFlag);
-	maxAscent = styles[STYLE_DEFAULT].ascent;
-	maxDescent = styles[STYLE_DEFAULT].descent;
+
+	for (unsigned int i=0; i<stylesSize; i++) {
+		styles[i].extraFontFlag = extraFontFlag;
+	}
+
+	CreateFont(styles[STYLE_DEFAULT]);
+	for (unsigned int j=0; j<stylesSize; j++) {
+		CreateFont(styles[j]);
+	}
+
+	frFirst->Realise(surface, zoomLevel);
+
+	for (unsigned int k=0; k<stylesSize; k++) {
+		FontRealised *fr = frFirst->Find(styles[k]);
+		styles[k].Copy(fr->font, *fr);
+	}
+	maxAscent = 1;
+	maxDescent = 1;
+	frFirst->FindMaxAscentDescent(maxAscent, maxDescent);
+	maxAscent += extraAscent;
+	maxDescent += extraDescent;
+	lineHeight = maxAscent + maxDescent;
+
 	someStylesProtected = false;
 	someStylesForceCase = false;
-	for (unsigned int i=0; i<stylesSize; i++) {
-		if (i != STYLE_DEFAULT) {
-			styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT], extraFontFlag);
-			if (maxAscent < styles[i].ascent)
-				maxAscent = styles[i].ascent;
-			if (maxDescent < styles[i].descent)
-				maxDescent = styles[i].descent;
-		}
-		if (styles[i].IsProtected()) {
+	for (unsigned int l=0; l<stylesSize; l++) {
+		if (styles[l].IsProtected()) {
 			someStylesProtected = true;
 		}
-		if (styles[i].caseForce != Style::caseMixed) {
+		if (styles[l].caseForce != Style::caseMixed) {
 			someStylesForceCase = true;
 		}
 	}
-	maxAscent += extraAscent;
-	maxDescent += extraDescent;
 
-	lineHeight = maxAscent + maxDescent;
 	aveCharWidth = styles[STYLE_DEFAULT].aveCharWidth;
 	spaceWidth = styles[STYLE_DEFAULT].spaceWidth;
 
@@ -361,10 +456,10 @@ void ViewStyle::EnsureStyle(size_t index) {
 
 void ViewStyle::ResetDefaultStyle() {
 	styles[STYLE_DEFAULT].Clear(ColourDesired(0,0,0),
-		ColourDesired(0xff,0xff,0xff),
-		Platform::DefaultFontSize(), fontNames.Save(Platform::DefaultFont()),
-		SC_CHARSET_DEFAULT,
-		false, false, false, false, Style::caseMixed, true, true, false);
+	        ColourDesired(0xff,0xff,0xff),
+	        Platform::DefaultFontSize(), fontNames.Save(Platform::DefaultFont()),
+	        SC_CHARSET_DEFAULT,
+	        false, false, false, false, Style::caseMixed, true, true, false);
 }
 
 void ViewStyle::ClearStyles() {
diff --git a/scintilla/src/ViewStyle.h b/scintilla/src/ViewStyle.h
index 6ca488df..b038a9b5 100644
--- a/scintilla/src/ViewStyle.h
+++ b/scintilla/src/ViewStyle.h
@@ -39,6 +39,20 @@ public:
 	const char *Save(const char *name);
 };
 
+class FontRealised : public FontSpecification, public FontMeasurements {
+	// Private so FontRealised objects can not be copied
+	FontRealised(const FontRealised &);
+	FontRealised &operator=(const FontRealised &);
+public:
+	Font font;
+	FontRealised *frNext;
+	FontRealised(const FontSpecification &fs);
+	virtual ~FontRealised();
+	void Realise(Surface &surface, int zoomLevel);
+	FontRealised *Find(const FontSpecification &fs);
+	void FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent);
+};
+
 enum IndentView {ivNone, ivReal, ivLookForward, ivLookBoth};
 
 enum WhiteSpaceVisibility {wsInvisible=0, wsVisibleAlways=1, wsVisibleAfterIndent=2};
@@ -48,6 +62,7 @@ enum WhiteSpaceVisibility {wsInvisible=0, wsVisibleAlways=1, wsVisibleAfterInden
 class ViewStyle {
 public:
 	FontNames fontNames;
+	FontRealised *frFirst;
 	size_t stylesSize;
 	Style *styles;
 	LineMarker markers[MARKER_MAX + 1];
@@ -114,11 +129,16 @@ public:
 	int marginStyleOffset;
 	int annotationVisible;
 	int annotationStyleOffset;
+	bool braceHighlightIndicatorSet;
+	int braceHighlightIndicator;
+	bool braceBadLightIndicatorSet;
+	int braceBadLightIndicator;
 
 	ViewStyle();
 	ViewStyle(const ViewStyle &source);
 	~ViewStyle();
 	void Init(size_t stylesSize_=64);
+	void CreateFont(const FontSpecification &fs);
 	void RefreshColourPalette(Palette &pal, bool want);
 	void Refresh(Surface &surface);
 	void AllocStyles(size_t sizeNew);
diff --git a/scintilla/src/XPM.cxx b/scintilla/src/XPM.cxx
index d1389efa..f0277c65 100644
--- a/scintilla/src/XPM.cxx
+++ b/scintilla/src/XPM.cxx
@@ -8,6 +8,13 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef _MSC_VER
+#pragma warning(disable: 4786)
+#endif
+
+#include <vector>
+#include <map>
+
 #include "Platform.h"
 
 #include "XPM.h"
@@ -38,6 +45,10 @@ static size_t MeasureLength(const char *s) {
 	return i;
 }
 
+ColourDesired XPM::ColourDesiredFromCode(int ch) const {
+	return colourCodeTable[ch]->desired;
+}
+
 ColourAllocated XPM::ColourFromCode(int ch) const {
 	return colourCodeTable[ch]->allocated;
 #ifdef SLOW
@@ -200,6 +211,21 @@ void XPM::Draw(Surface *surface, PRectangle &rc) {
 	}
 }
 
+void XPM::PixelAt(int x, int y, ColourDesired &colour, bool &transparent) const {
+	if (!data || !codes || !colours || !lines || (x<0) || (x >= width) || (y<0) || (y >= height)) {
+		colour = 0;
+		transparent = true;
+		return;
+	}
+	int code = lines[y+nColours+1][x];
+	transparent = code == codeTransparent;
+	if (transparent) {
+		colour = 0;
+	} else {
+		colour = ColourDesiredFromCode(code).AsLong();
+	}
+}
+
 const char **XPM::LinesFormFromTextForm(const char *textForm) {
 	// Build the lines form out of the text form
 	const char **linesForm = 0;
@@ -261,14 +287,14 @@ void XPMSet::Clear() {
 	width = -1;
 }
 
-void XPMSet::Add(int id, const char *textForm) {
+void XPMSet::Add(int ident, const char *textForm) {
 	// Invalidate cached dimensions
 	height = -1;
 	width = -1;
 
 	// Replace if this id already present
 	for (int i = 0; i < len; i++) {
-		if (set[i]->GetId() == id) {
+		if (set[i]->GetId() == ident) {
 			set[i]->Init(textForm);
 			set[i]->CopyDesiredColours();
 			return;
@@ -278,7 +304,7 @@ void XPMSet::Add(int id, const char *textForm) {
 	// Not present, so add to end
 	XPM *pxpm = new XPM(textForm);
 	if (pxpm) {
-		pxpm->SetId(id);
+		pxpm->SetId(ident);
 		pxpm->CopyDesiredColours();
 		if (len == maximum) {
 			maximum += 64;
@@ -294,9 +320,9 @@ void XPMSet::Add(int id, const char *textForm) {
 	}
 }
 
-XPM *XPMSet::Get(int id) {
+XPM *XPMSet::Get(int ident) {
 	for (int i = 0; i < len; i++) {
-		if (set[i]->GetId() == id) {
+		if (set[i]->GetId() == ident) {
 			return set[i];
 		}
 	}
@@ -324,3 +350,110 @@ int XPMSet::GetWidth() {
 	}
 	return (width > 0) ? width : 0;
 }
+
+RGBAImage::RGBAImage(int width_, int height_, const unsigned char *pixels_) :
+	height(height_), width(width_) {
+	if (pixels_) {
+		pixelBytes.assign(pixels_, pixels_ + CountBytes());
+	} else {
+		pixelBytes.resize(CountBytes());
+	}
+}
+
+RGBAImage::RGBAImage(const XPM &xpm) {
+	height = xpm.GetHeight();
+	width = xpm.GetWidth();
+	pixelBytes.resize(CountBytes());
+	for (int y=0; y<height; y++) {
+		for (int x=0; x<width; x++) {
+			ColourDesired colour;
+			bool transparent = false;
+			xpm.PixelAt(x, y, colour, transparent);
+			SetPixel(x, y, colour, transparent ? 0 : 255);
+		}
+	}
+}
+
+RGBAImage::~RGBAImage() {
+}
+
+int RGBAImage::CountBytes() const {
+	return width * height * 4;
+}
+
+const unsigned char *RGBAImage::Pixels() const {
+	return &pixelBytes[0];
+}
+
+void RGBAImage::SetPixel(int x, int y, ColourDesired colour, int alpha) {
+	unsigned char *pixel = &pixelBytes[0] + (y*width+x) * 4;
+	// RGBA
+	pixel[0] = colour.GetRed();
+	pixel[1] = colour.GetGreen();
+	pixel[2] = colour.GetBlue();
+	pixel[3] = alpha;
+}
+
+RGBAImageSet::RGBAImageSet() : height(-1), width(-1){
+}
+
+RGBAImageSet::~RGBAImageSet() {
+	Clear();
+}
+
+/// Remove all images.
+void RGBAImageSet::Clear() {
+	for (ImageMap::iterator it=images.begin(); it != images.end(); ++it) {
+		delete it->second;
+		it->second = 0;
+	}
+	images.clear();
+	height = -1;
+	width = -1;
+}
+
+/// Add an image.
+void RGBAImageSet::Add(int ident, RGBAImage *image) {
+	ImageMap::iterator it=images.find(ident);
+	if (it == images.end()) {
+		images[ident] = image;
+	} else {
+		delete it->second;
+		it->second = image;
+	}
+	height = -1;
+	width = -1;
+}
+
+/// Get image by id.
+RGBAImage *RGBAImageSet::Get(int ident) {
+	ImageMap::iterator it = images.find(ident);
+	if (it != images.end()) {
+		return it->second;
+	}
+	return NULL;
+}
+
+/// Give the largest height of the set.
+int RGBAImageSet::GetHeight() const {
+	if (height < 0) {
+		for (ImageMap::const_iterator it=images.begin(); it != images.end(); ++it) {
+			if (height < it->second->GetHeight()) {
+				height = it->second->GetHeight();
+			}
+		}
+	}
+	return (height > 0) ? height : 0;
+}
+
+/// Give the largest width of the set.
+int RGBAImageSet::GetWidth() const {
+	if (width < 0) {
+		for (ImageMap::const_iterator it=images.begin(); it != images.end(); ++it) {
+			if (width < it->second->GetWidth()) {
+				width = it->second->GetWidth();
+			}
+		}
+	}
+	return (width > 0) ? width : 0;
+}
diff --git a/scintilla/src/XPM.h b/scintilla/src/XPM.h
index cb05aae3..b9c7308a 100644
--- a/scintilla/src/XPM.h
+++ b/scintilla/src/XPM.h
@@ -24,6 +24,7 @@ class XPM {
 	char codeTransparent;
 	char *codes;
 	ColourPair *colours;
+	ColourDesired ColourDesiredFromCode(int ch) const;
 	ColourAllocated ColourFromCode(int ch) const;
 	void FillRun(Surface *surface, int code, int startX, int y, int x);
 	char **lines;
@@ -46,6 +47,7 @@ public:
 	int GetId() const { return pid; }
 	int GetHeight() const { return height; }
 	int GetWidth() const { return width; }
+	void PixelAt(int x, int y, ColourDesired &colour, bool &transparent) const;
 	static const char **LinesFormFromTextForm(const char *textForm);
 };
 
@@ -64,15 +66,59 @@ public:
 	/// Remove all XPMs.
 	void Clear();
 	/// Add a XPM.
-	void Add(int id, const char *textForm);
+	void Add(int ident, const char *textForm);
 	/// Get XPM by id.
-	XPM *Get(int id);
+	XPM *Get(int ident);
 	/// Give the largest height of the set.
 	int GetHeight();
 	/// Give the largest width of the set.
 	int GetWidth();
 };
 
+/**
+ * An translucent image stoed as a sequence of RGBA bytes.
+ */
+class RGBAImage {
+	// Private so RGBAImage objects can not be copied
+	RGBAImage(const RGBAImage &);
+	RGBAImage &operator=(const RGBAImage &);
+	int height;
+	int width;
+	std::vector<unsigned char> pixelBytes;
+public:
+	RGBAImage(int width_, int height_, const unsigned char *pixels_);
+	RGBAImage(const XPM &xpm);
+	virtual ~RGBAImage();
+	int GetHeight() const { return height; }
+	int GetWidth() const { return width; }
+	int CountBytes() const;
+	const unsigned char *Pixels() const;
+	void SetPixel(int x, int y, ColourDesired colour, int alpha=0xff); 
+};
+
+/**
+ * A collection of RGBAImage pixmaps indexed by integer id.
+ */
+class RGBAImageSet {
+	typedef std::map<int, RGBAImage*> ImageMap;
+	ImageMap images;
+	mutable int height;	///< Memorize largest height of the set.
+	mutable int width;	///< Memorize largest width of the set.
+public:
+	RGBAImageSet();
+	~RGBAImageSet();
+	/// Remove all images.
+	void Clear();
+	/// Add an image.
+	void Add(int ident, RGBAImage *image);
+	/// Get image by id.
+	RGBAImage *Get(int ident);
+	/// Give the largest height of the set.
+	int GetHeight() const;
+	/// Give the largest width of the set.
+	int GetWidth() const;
+};
+
 #ifdef SCI_NAMESPACE
 }
 #endif
diff --git a/scintilla/version.txt b/scintilla/version.txt
index 188ccfe5..bf18240e 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-225
+229

From bb745e8f3bb427ddd981b2ca9fa3eaca6e14a6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20=C5=BD=C3=A1ra?= <ondrej.zara@firma.seznam.cz>
Date: Wed, 19 Oct 2011 01:10:42 -0700
Subject: [PATCH 20/70] Add 'prototype' keyword for JavaScript

---
 data/filetypes.javascript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/filetypes.javascript b/data/filetypes.javascript
index e4637112..477853d1 100644
--- a/data/filetypes.javascript
+++ b/data/filetypes.javascript
@@ -3,7 +3,7 @@
 
 [keywords]
 # all items must be in one line
-primary=break case catch const continue default delete do each else false finally for function get if in Infinity instanceof let NaN new null return set switch this throw true try typeof undefined var void while with yield
+primary=break case catch const continue default delete do each else false finally for function get if in Infinity instanceof let NaN new null return set switch this throw true try typeof undefined var void while with yield prototype
 secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt
 
 [settings]

From 1a14e4869f3d16cb17331ff4c108eb10e87f0833 Mon Sep 17 00:00:00 2001
From: Matthew Brush <matt@geany.org>
Date: Wed, 19 Oct 2011 01:29:10 -0700
Subject: [PATCH 21/70] Update Scintilla keywords and highlighting when
 changing document tabs

---
 src/callbacks.c |  1 +
 src/document.c  | 33 +++++++++++++++++++++++++++++++++
 src/document.h  |  2 ++
 3 files changed, 36 insertions(+)

diff --git a/src/callbacks.c b/src/callbacks.c
index 07240b84..3dbc2a23 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -632,6 +632,7 @@ void on_notebook1_switch_page_after(GtkNotebook *notebook, GtkNotebookPage *page
 		ui_document_show_hide(doc); /* update the document menu */
 		build_menu_update(doc);
 		sidebar_update_tag_list(doc, FALSE);
+		document_update_highlighting(doc);
 
 		/* We delay the check to avoid weird fast, unintended switching of notebook pages when
 		 * the 'file has changed' dialog is shown while the switch event is not yet completely
diff --git a/src/document.c b/src/document.c
index 34076d62..dc1bd5ef 100644
--- a/src/document.c
+++ b/src/document.c
@@ -2448,6 +2448,39 @@ static gboolean update_type_keywords(GeanyDocument *doc, gint lang)
 }
 
 
+/*
+ * Updates the keywords in a document and re-colourizes it.
+ *
+ * @param doc The document
+ */
+void document_update_highlighting(GeanyDocument *doc)
+{
+	const GString *s = NULL;
+	ScintillaObject *sci;
+	gint keyword_idx;
+
+	g_return_if_fail(DOC_VALID(doc));
+	g_return_if_fail(IS_SCINTILLA(doc->editor->sci));
+
+	sci = doc->editor->sci;
+
+	/* get possibly cached list of keywords for the current language.
+	 * we don't care whether the cached keywords have changed. */
+	get_project_typenames(&s, doc->file_type->lang);
+
+	if (s)
+	{
+		keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(sci));
+
+		if (keyword_idx > 0)
+		{
+			sci_set_keywords(sci, keyword_idx, s->str);
+			queue_colourise(doc);
+		}
+	}
+}
+
+
 static void document_load_config(GeanyDocument *doc, GeanyFiletype *type,
 		gboolean filetype_changed)
 {
diff --git a/src/document.h b/src/document.h
index 04839091..96c0d655 100644
--- a/src/document.h
+++ b/src/document.h
@@ -235,6 +235,8 @@ void document_update_tag_list(GeanyDocument *doc, gboolean update);
 
 void document_update_tag_list_in_idle(GeanyDocument *doc);
 
+void document_update_highlighting(GeanyDocument *doc);
+
 void document_set_encoding(GeanyDocument *doc, const gchar *new_encoding);
 
 gboolean document_check_disk_status(GeanyDocument *doc, gboolean force);

From 6c8e80271e7307671b3ccb16552abf13924256c7 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Wed, 19 Oct 2011 13:09:13 +0100
Subject: [PATCH 22/70] Refactor without stash_foreach_various_pref

Function was only used once.
---
 src/stash.c | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/stash.c b/src/stash.c
index fbb04187..4da02c8c 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -1009,27 +1009,6 @@ static void stash_tree_destroy_cb(GtkWidget *widget, gpointer user_data)
 }
 
 
-typedef void (*stash_foreach_pref_func)(StashGroup *group, StashPref *entry, gpointer container,
-	PrefAction action);
-
-static void stash_foreach_various_pref(GPtrArray *group_array, stash_foreach_pref_func pref_func,
-	gpointer container, PrefAction action)
-{
-	StashGroup *group;
-	guint i, j;
-	StashPref *entry;
-
-	foreach_ptr_array(group, i, group_array)
-	{
-		if (group->various)
-		{
-			foreach_ptr_array(entry, j, group->entries)
-				pref_func(group, entry, container, action);
-		}
-	}
-}
-
-
 static void stash_tree_append_pref(StashGroup *group, StashPref *entry, GtkListStore *store,
 	PrefAction action)
 {
@@ -1050,6 +1029,24 @@ static void stash_tree_append_pref(StashGroup *group, StashPref *entry, GtkListS
 }
 
 
+static void stash_tree_append_prefs(GPtrArray *group_array,
+	GtkListStore *store, PrefAction action)
+{
+	StashGroup *group;
+	guint i, j;
+	StashPref *entry;
+
+	foreach_ptr_array(group, i, group_array)
+	{
+		if (group->various)
+		{
+			foreach_ptr_array(entry, j, group->entries)
+				stash_tree_append_pref(group, entry, store, action);
+		}
+	}
+}
+
+
 /* Setups a simple editor for stash preferences based on the widget arguments.
  * group_array - Array of groups which's settings will be edited.
  * tree - GtkTreeView in which to edit the preferences. Must be empty. */
@@ -1062,8 +1059,7 @@ void stash_tree_setup(GPtrArray *group_array, GtkTreeView *tree)
 	GtkObject *adjustment;
 
 	store = gtk_list_store_new(STASH_TREE_COUNT, G_TYPE_STRING, G_TYPE_POINTER);
-	stash_foreach_various_pref(group_array,
-		(stash_foreach_pref_func) stash_tree_append_pref, store, PREF_DISPLAY);
+	stash_tree_append_prefs(group_array, store, PREF_DISPLAY);
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), STASH_TREE_NAME,
 		GTK_SORT_ASCENDING);
 

From b1b88286cf2c71a1be8e0bccc207063e93755bbd Mon Sep 17 00:00:00 2001
From: Matthew Brush <matt@geany.org>
Date: Wed, 19 Oct 2011 21:39:17 -0700
Subject: [PATCH 23/70] Simplify updating Scintilla keywords on reload config
 and tab switch.

Remove type keywords caching function since it doesn't really speed up
anything and we don't care if the keywords change since they can/should
still be reloaded.  This also prevents "leaking" a static GString once
when the application closes and saves a call to g_string_free() when the
type keywords have changed.

Rename document_update_highlighting() to document_update_type_keywords()
since no re-highlighting is needed when updating Scintilla keywords.
Scintilla highlights the new keywords automatically so this saves a call
to queue_colourise().

Remove update_type_keywords() function since this is now all handled
in the document_update_type_keywords() function.  This function had a
comment about updating all documents when sci is NULL but it was never
used in this way since it was only called on document_load_config() which
always operates on a single document and the sci should not be NULL.
---
 src/callbacks.c |   2 +-
 src/document.c  | 139 ++++++++++--------------------------------------
 src/document.h  |   2 +-
 3 files changed, 30 insertions(+), 113 deletions(-)

diff --git a/src/callbacks.c b/src/callbacks.c
index 3dbc2a23..114146e2 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -632,7 +632,7 @@ void on_notebook1_switch_page_after(GtkNotebook *notebook, GtkNotebookPage *page
 		ui_document_show_hide(doc); /* update the document menu */
 		build_menu_update(doc);
 		sidebar_update_tag_list(doc, FALSE);
-		document_update_highlighting(doc);
+		document_update_type_keywords(doc);
 
 		/* We delay the check to avoid weird fast, unintended switching of notebook pages when
 		 * the 'file has changed' dialog is shown while the switch event is not yet completely
diff --git a/src/document.c b/src/document.c
index dc1bd5ef..2e7bfc1c 100644
--- a/src/document.c
+++ b/src/document.c
@@ -2348,59 +2348,24 @@ void document_update_tag_list_in_idle(GeanyDocument *doc)
 }
 
 
-/* Caches the list of project typenames, as a space separated GString.
- * Returns: TRUE if typenames have changed.
- * (*types) is set to the list of typenames, or NULL if there are none. */
-static gboolean get_project_typenames(const GString **types, gint lang)
+/*
+ * Updates the type keywords in the document's Scintilla widget.
+ *
+ * @param doc The document
+ */
+void document_update_type_keywords(GeanyDocument *doc)
 {
-	static GString *last_typenames = NULL;
-	GString *s = NULL;
+	gint keyword_idx;
+	gchar *keywords = NULL;
+	GString *str;
+	GPtrArray *tags_array;
 
-	if (app->tm_workspace)
-	{
-		GPtrArray *tags_array = app->tm_workspace->work_object.tags_array;
-
-		if (tags_array)
-		{
-			s = symbols_find_tags_as_string(tags_array, TM_GLOBAL_TYPE_MASK, lang);
-		}
-	}
-
-	if (s && last_typenames && g_string_equal(s, last_typenames))
-	{
-		g_string_free(s, TRUE);
-		*types = last_typenames;
-		return FALSE;	/* project typenames haven't changed */
-	}
-	/* cache typename list for next time */
-	if (last_typenames)
-		g_string_free(last_typenames, TRUE);
-	last_typenames = s;
-
-	*types = s;
-	if (s == NULL)
-		return FALSE;
-	return TRUE;
-}
-
-
-/* If sci is NULL, update project typenames for all documents that support typenames,
- * if typenames have changed.
- * If sci is not NULL, then if sci supports typenames, project typenames are updated
- * if necessary, and typename keywords are set for sci.
- * Returns: TRUE if any scintilla type keywords were updated. */
-static gboolean update_type_keywords(GeanyDocument *doc, gint lang)
-{
-	gboolean ret = FALSE;
-	guint n;
-	const GString *s;
-	ScintillaObject *sci;
-
-	g_return_val_if_fail(doc != NULL, FALSE);
-	sci = doc->editor->sci;
+	g_return_if_fail(DOC_VALID(doc));
+	g_return_if_fail(IS_SCINTILLA(doc->editor->sci));
 
 	switch (doc->file_type->id)
-	{	/* continue working with the following languages, skip on all others */
+	{
+		/* continue working with the following languages, skip on all others */
 		case GEANY_FILETYPES_C:
 		case GEANY_FILETYPES_CPP:
 		case GEANY_FILETYPES_CS:
@@ -2409,73 +2374,25 @@ static gboolean update_type_keywords(GeanyDocument *doc, gint lang)
 		case GEANY_FILETYPES_VALA:
 			break;
 		default:
-			return FALSE;
+			return;
 	}
 
-	sci = doc->editor->sci;
-	if (sci != NULL && editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1)
-		return FALSE;
+	keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(doc->editor->sci));
+	if (G_UNLIKELY(keyword_idx < 1))
+		return;
 
-	if (! get_project_typenames(&s, lang))
-	{	/* typenames have not changed */
-		if (s != NULL && sci != NULL)
-		{
-			gint keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(sci));
+	if (G_UNLIKELY(app->tm_workspace == NULL))
+		return;
 
-			sci_set_keywords(sci, keyword_idx, s->str);
-			queue_colourise(doc);
-		}
-		return FALSE;
-	}
-	g_return_val_if_fail(s != NULL, FALSE);
-
-	for (n = 0; n < documents_array->len; n++)
+	tags_array = app->tm_workspace->work_object.tags_array;
+	if (tags_array)
 	{
-		if (documents[n]->is_valid)
+		str = symbols_find_tags_as_string(tags_array, TM_GLOBAL_TYPE_MASK, doc->file_type->lang);
+		if (str)
 		{
-			ScintillaObject *wid = documents[n]->editor->sci;
-			gint keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(wid));
-
-			if (keyword_idx > 0)
-			{
-				sci_set_keywords(wid, keyword_idx, s->str);
-				queue_colourise(documents[n]);
-				ret = TRUE;
-			}
-		}
-	}
-	return ret;
-}
-
-
-/*
- * Updates the keywords in a document and re-colourizes it.
- *
- * @param doc The document
- */
-void document_update_highlighting(GeanyDocument *doc)
-{
-	const GString *s = NULL;
-	ScintillaObject *sci;
-	gint keyword_idx;
-
-	g_return_if_fail(DOC_VALID(doc));
-	g_return_if_fail(IS_SCINTILLA(doc->editor->sci));
-
-	sci = doc->editor->sci;
-
-	/* get possibly cached list of keywords for the current language.
-	 * we don't care whether the cached keywords have changed. */
-	get_project_typenames(&s, doc->file_type->lang);
-
-	if (s)
-	{
-		keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(sci));
-
-		if (keyword_idx > 0)
-		{
-			sci_set_keywords(sci, keyword_idx, s->str);
-			queue_colourise(doc);
+			keywords = g_string_free(str, FALSE);
+			sci_set_keywords(doc->editor->sci, keyword_idx, keywords);
+			g_free(keywords);
 		}
 	}
 }
@@ -2512,7 +2429,7 @@ static void document_load_config(GeanyDocument *doc, GeanyFiletype *type,
 	document_update_tag_list(doc, TRUE);
 
 	/* Update session typename keywords. */
-	update_type_keywords(doc, type->lang);
+	document_update_type_keywords(doc);
 }
 
 
diff --git a/src/document.h b/src/document.h
index 96c0d655..8bfe1cc6 100644
--- a/src/document.h
+++ b/src/document.h
@@ -235,7 +235,7 @@ void document_update_tag_list(GeanyDocument *doc, gboolean update);
 
 void document_update_tag_list_in_idle(GeanyDocument *doc);
 
-void document_update_highlighting(GeanyDocument *doc);
+void document_update_type_keywords(GeanyDocument *doc);
 
 void document_set_encoding(GeanyDocument *doc, const gchar *new_encoding);
 

From 5fc6764b9b0f9abd7d02db5953a612815b774620 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Wed, 19 Oct 2011 03:18:19 +0200
Subject: [PATCH 24/70] Update highlighting styles for new Scintilla styles

---
 data/filetypes.latex |  9 +++++++++
 data/filetypes.lua   |  1 +
 data/filetypes.perl  | 12 ++++++++++++
 src/highlighting.c   | 44 +++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/data/filetypes.latex b/data/filetypes.latex
index d455b8ef..f2811394 100644
--- a/data/filetypes.latex
+++ b/data/filetypes.latex
@@ -6,6 +6,15 @@ command=keyword_1
 tag=tag
 math=number_1
 comment=comment
+# mappings below may need checking
+tag2=tag
+math2=number_1
+comment2=comment
+verbatim=default
+shortcmd=keyword_1
+special=keyword_2
+cmdopt=keyword_1
+error=error
 
 [keywords]
 # all items must be in one line
diff --git a/data/filetypes.lua b/data/filetypes.lua
index 89a62226..44322e3b 100644
--- a/data/filetypes.lua
+++ b/data/filetypes.lua
@@ -21,6 +21,7 @@ word5=keyword_1
 word6=keyword_2
 word7=keyword_3
 word8=keyword_4
+label=label
 
 [keywords]
 # all items must be in one line
diff --git a/data/filetypes.perl b/data/filetypes.perl
index f2274aa0..ea48ab37 100644
--- a/data/filetypes.perl
+++ b/data/filetypes.perl
@@ -31,6 +31,18 @@ string_qx=string_2
 string_qr=string_2
 string_qw=string_2
 variable_indexer=default
+# *_var mappings may need checking
+string_var=identifier_1
+regex_var=identifier_2
+regsubst_var=identifier_2
+backticks_var=identifier_2
+here_qq_var=identifier_2
+here_qx_var=identifier_2
+string_qq_var=identifier_2
+string_qx_var=identifier_2
+string_qr_var=identifier_2
+# translation: tr{}{} y{}{}
+xlat=string_2
 # not used
 punctuation=default
 # obsolete: replaced by qq, qx, qr, qw
diff --git a/src/highlighting.c b/src/highlighting.c
index c7d8238b..913a61d2 100644
--- a/src/highlighting.c
+++ b/src/highlighting.c
@@ -1173,12 +1173,20 @@ static void styleset_erlang(ScintillaObject *sci, gint ft_id)
 
 static void styleset_latex_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 5);
+	new_styleset(ft_id, 13);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "command", &style_sets[ft_id].styling[1]);
 	get_keyfile_style(config, config_home, "tag", &style_sets[ft_id].styling[2]);
 	get_keyfile_style(config, config_home, "math", &style_sets[ft_id].styling[3]);
 	get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[4]);
+	get_keyfile_style(config, config_home, "tag2", &style_sets[ft_id].styling[5]);
+	get_keyfile_style(config, config_home, "math2", &style_sets[ft_id].styling[6]);
+	get_keyfile_style(config, config_home, "comment2", &style_sets[ft_id].styling[7]);
+	get_keyfile_style(config, config_home, "verbatim", &style_sets[ft_id].styling[8]);
+	get_keyfile_style(config, config_home, "shortcmd", &style_sets[ft_id].styling[9]);
+	get_keyfile_style(config, config_home, "special", &style_sets[ft_id].styling[10]);
+	get_keyfile_style(config, config_home, "cmdopt", &style_sets[ft_id].styling[11]);
+	get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[12]);
 
 	style_sets[ft_id].keywords = g_new(gchar*, 2);
 	get_keyfile_keywords(config, config_home, "primary", ft_id, 0);
@@ -1198,6 +1206,14 @@ static void styleset_latex(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_L_TAG, ft_id, 2);
 	set_sci_style(sci, SCE_L_MATH, ft_id, 3);
 	set_sci_style(sci, SCE_L_COMMENT, ft_id, 4);
+	set_sci_style(sci, SCE_L_TAG2, ft_id, 5);
+	set_sci_style(sci, SCE_L_MATH2, ft_id, 6);
+	set_sci_style(sci, SCE_L_COMMENT2, ft_id, 7);
+	set_sci_style(sci, SCE_L_VERBATIM, ft_id, 8);
+	set_sci_style(sci, SCE_L_SHORTCMD, ft_id, 9);
+	set_sci_style(sci, SCE_L_SPECIAL, ft_id, 10);
+	set_sci_style(sci, SCE_L_CMDOPT, ft_id, 11);
+	set_sci_style(sci, SCE_L_ERROR, ft_id, 12);
 }
 
 
@@ -1495,7 +1511,7 @@ static void styleset_java(ScintillaObject *sci, gint ft_id)
 
 static void styleset_perl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 35);
+	new_styleset(ft_id, 45);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[1]);
 	get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]);
@@ -1531,6 +1547,16 @@ static void styleset_perl_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 	get_keyfile_style(config, config_home, "sub_prototype", &style_sets[ft_id].styling[32]);
 	get_keyfile_style(config, config_home, "format_ident", &style_sets[ft_id].styling[33]);
 	get_keyfile_style(config, config_home, "format", &style_sets[ft_id].styling[34]);
+	get_keyfile_style(config, config_home, "string_var", &style_sets[ft_id].styling[35]);
+	get_keyfile_style(config, config_home, "xlat", &style_sets[ft_id].styling[36]);
+	get_keyfile_style(config, config_home, "regex_var", &style_sets[ft_id].styling[37]);
+	get_keyfile_style(config, config_home, "regsubst_var", &style_sets[ft_id].styling[38]);
+	get_keyfile_style(config, config_home, "backticks_var", &style_sets[ft_id].styling[39]);
+	get_keyfile_style(config, config_home, "here_qq_var", &style_sets[ft_id].styling[40]);
+	get_keyfile_style(config, config_home, "here_qx_var", &style_sets[ft_id].styling[41]);
+	get_keyfile_style(config, config_home, "string_qq_var", &style_sets[ft_id].styling[42]);
+	get_keyfile_style(config, config_home, "string_qx_var", &style_sets[ft_id].styling[43]);
+	get_keyfile_style(config, config_home, "string_qr_var", &style_sets[ft_id].styling[44]);
 
 
 	style_sets[ft_id].keywords = g_new(gchar*, 2);
@@ -1581,6 +1607,16 @@ static void styleset_perl(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_PL_SUB_PROTOTYPE, ft_id, 32);
 	set_sci_style(sci, SCE_PL_FORMAT_IDENT, ft_id, 33);
 	set_sci_style(sci, SCE_PL_FORMAT, ft_id, 34);
+	set_sci_style(sci, SCE_PL_STRING_VAR, ft_id, 35);
+	set_sci_style(sci, SCE_PL_XLAT, ft_id, 36);
+	set_sci_style(sci, SCE_PL_REGEX_VAR, ft_id, 37);
+	set_sci_style(sci, SCE_PL_REGSUBST_VAR, ft_id, 38);
+	set_sci_style(sci, SCE_PL_BACKTICKS_VAR, ft_id, 39);
+	set_sci_style(sci, SCE_PL_HERE_QQ_VAR, ft_id, 40);
+	set_sci_style(sci, SCE_PL_HERE_QX_VAR, ft_id, 41);
+	set_sci_style(sci, SCE_PL_STRING_QQ_VAR, ft_id, 42);
+	set_sci_style(sci, SCE_PL_STRING_QX_VAR, ft_id, 43);
+	set_sci_style(sci, SCE_PL_STRING_QR_VAR, ft_id, 44);
 }
 
 
@@ -3065,7 +3101,7 @@ static void styleset_js(ScintillaObject *sci, gint ft_id)
 
 static void styleset_lua_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 20);
+	new_styleset(ft_id, 21);
 
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]);
@@ -3087,6 +3123,7 @@ static void styleset_lua_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 	get_keyfile_style(config, config_home, "word6", &style_sets[ft_id].styling[17]);
 	get_keyfile_style(config, config_home, "word7", &style_sets[ft_id].styling[18]);
 	get_keyfile_style(config, config_home, "word8", &style_sets[ft_id].styling[19]);
+	get_keyfile_style(config, config_home, "label", &style_sets[ft_id].styling[20]);
 
 	style_sets[ft_id].keywords = g_new(gchar*, 9);
 	get_keyfile_keywords(config, config_home, "keywords", ft_id, 0);
@@ -3135,6 +3172,7 @@ static void styleset_lua(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_LUA_WORD6, ft_id, 17);
 	set_sci_style(sci, SCE_LUA_WORD7, ft_id, 18);
 	set_sci_style(sci, SCE_LUA_WORD8, ft_id, 19);
+	set_sci_style(sci, SCE_LUA_LABEL, ft_id, 20);
 }
 
 

From 89ab83cfbad80f083dfb68883d8dfb26810c74ff Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Wed, 19 Oct 2011 03:18:54 +0200
Subject: [PATCH 25/70] Add Scintilla update to the NEWS

---
 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index 8e3c185c..4e7bf875 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Geany 1.22 (unreleased)
+
+    Editor
+    * Update Scintilla to version 2.29.
+
+
 Geany 0.21 (October 2, 2011)
 
     General

From 24dd7330b213d1e7a4ba5bbaded74ceb53394349 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Wed, 19 Oct 2011 15:37:34 +0200
Subject: [PATCH 26/70] Update code and comment styles for new Scintilla styles

---
 src/highlighting.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/highlighting.c b/src/highlighting.c
index 913a61d2..4696244f 100644
--- a/src/highlighting.c
+++ b/src/highlighting.c
@@ -3764,7 +3764,7 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
 				style == SCE_F_STRINGEOL);
 
 		case SCLEX_PERL:
-			return (/*style == SCE_PL_STRING ||*/ /* may want variable autocompletion "$(foo)" */
+			return (style == SCE_PL_STRING ||
 				style == SCE_PL_CHARACTER ||
 				style == SCE_PL_HERE_DELIM ||
 				style == SCE_PL_HERE_Q ||
@@ -3776,7 +3776,9 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
 				style == SCE_PL_STRING_QX ||
 				style == SCE_PL_STRING_QR ||
 				style == SCE_PL_STRING_QW ||
-				style == SCE_PL_POD_VERB);
+				style == SCE_PL_POD_VERB ||
+				style == SCE_PL_XLAT
+				/* we don't include any STRING_*_VAR for autocompletion */);
 
 		case SCLEX_R:
 			return (style == SCE_R_STRING);
@@ -3920,7 +3922,8 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 			return (style == SCE_PO_COMMENT);
 
 		case SCLEX_LATEX:
-			return (style == SCE_L_COMMENT);
+			return (style == SCE_L_COMMENT ||
+				style == SCE_L_COMMENT2);
 
 		case SCLEX_MAKEFILE:
 			return (style == SCE_MAKE_COMMENT);

From cdb748c2c48f4e845e8354a58d75db5ec6e73487 Mon Sep 17 00:00:00 2001
From: Lex Trotman <elextr@gmail.com>
Date: Sat, 22 Oct 2011 22:55:57 +1100
Subject: [PATCH 27/70] Add filetype extraction by regex

Adds the ability to set filetype on open by extracting it from the
file using a regex on the first few lines (default 2).
---
 doc/geany.html  | 84 ++++++++++++++++++++++++++++++++++++-------------
 doc/geany.txt   | 44 ++++++++++++++++++--------
 src/document.h  |  1 +
 src/filetypes.c | 70 +++++++++++++++++++++++++++++++++++------
 src/keyfile.c   |  3 ++
 5 files changed, 158 insertions(+), 44 deletions(-)

diff --git a/doc/geany.html b/doc/geany.html
index a01a686f..6065e3e1 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz  Colomban Wendling" />
-<meta name="date" content="2011-10-01" />
+<meta name="date" content="2011-10-02" />
 <style type="text/css">
 
 /*
@@ -140,9 +140,9 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
 <br />Frank Lanitz
 <br />Colomban Wendling</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2011-10-01</td></tr>
+<td>2011-10-02</td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>0.21</td></tr>
+<td>1.22</td></tr>
 </tbody>
 </table>
 <p>Copyright © 2005-2011</p>
@@ -507,13 +507,14 @@ of this program, and also in the chapter <a class="reference internal" href="#gn
 <li><a class="reference internal" href="#compile-time-options" id="id231">Compile-time options</a><ul>
 <li><a class="reference internal" href="#src-geany-h" id="id232">src/geany.h</a></li>
 <li><a class="reference internal" href="#project-h" id="id233">project.h</a></li>
-<li><a class="reference internal" href="#editor-h" id="id234">editor.h</a></li>
-<li><a class="reference internal" href="#keyfile-c" id="id235">keyfile.c</a></li>
-<li><a class="reference internal" href="#build-c" id="id236">build.c</a></li>
+<li><a class="reference internal" href="#filetypes-c" id="id234">filetypes.c</a></li>
+<li><a class="reference internal" href="#editor-h" id="id235">editor.h</a></li>
+<li><a class="reference internal" href="#keyfile-c" id="id236">keyfile.c</a></li>
+<li><a class="reference internal" href="#build-c" id="id237">build.c</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#gnu-general-public-license" id="id237">GNU General Public License</a></li>
-<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id238">License for Scintilla and SciTE</a></li>
+<li><a class="reference internal" href="#gnu-general-public-license" id="id238">GNU General Public License</a></li>
+<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id239">License for Scintilla and SciTE</a></li>
 </ul>
 </div>
 <div class="section" id="introduction">
@@ -2866,10 +2867,10 @@ internal default, which is currently:</p>
 <p>Note that <tt class="docutils literal">\t</tt> = tab.</p>
 <table border="1" class="docutils">
 <colgroup>
-<col width="34%" />
-<col width="46%" />
-<col width="9%" />
-<col width="12%" />
+<col width="33%" />
+<col width="45%" />
+<col width="10%" />
+<col width="11%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Key</th>
@@ -2943,6 +2944,17 @@ saving. Backup is named <cite>filename~</cite>.</td>
 <td>false</td>
 <td>immediately</td>
 </tr>
+<tr><td><strong>Filetype related</strong></td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>
+<tr><td>extract_filetype_regex</td>
+<td>Regex to extract filetype name from file
+via capture group one.</td>
+<td>See below.</td>
+<td>immediately</td>
+</tr>
 <tr><td><strong>Search related</strong></td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
@@ -2978,6 +2990,7 @@ execute section of the Build menu.</td>
 </tr>
 </tbody>
 </table>
+<p>The extract_filetype_regex has the default value GEANY_DEFAULT_FILETYPE_REGEX.</p>
 </div>
 <div class="section" id="terminal-vte-preferences">
 <h3><a class="toc-backref" href="#id126">Terminal (VTE) preferences</a></h3>
@@ -5558,7 +5571,7 @@ bsd, gpl, snippets.</td>
 </tr>
 <tr><td>geanyversion</td>
 <td>The actual Geany version, e.g.
-&quot;Geany 0.21&quot;.</td>
+&quot;Geany 1.22&quot;.</td>
 <td>file templates, file header,
 function description, ChangeLog entry,
 bsd, gpl, snippets.</td>
@@ -5890,7 +5903,7 @@ editing the file, to build the HTML document to see how your changes
 look, run &quot;<tt class="docutils literal">make doc</tt>&quot; in the subdirectory <tt class="docutils literal">doc</tt> of Geany's source
 directory. This regenerates the <tt class="docutils literal">geany.html</tt> file. To generate a PDF
 file, use the command &quot;<tt class="docutils literal">make pdf</tt>&quot; which should generate a file called
-geany-0.21.pdf.</p>
+geany-1.22.pdf.</p>
 <p>After you are happy with your changes, create a patch:</p>
 <pre class="literal-block">
 % svn diff geany.txt &gt; foo.patch
@@ -6131,8 +6144,31 @@ open dialog.</td>
 </tbody>
 </table>
 </div>
+<div class="section" id="filetypes-c">
+<h2><a class="toc-backref" href="#id234">filetypes.c</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="33%" />
+<col width="48%" />
+<col width="20%" />
+</colgroup>
+<thead valign="bottom">
+<tr><th class="head">Option</th>
+<th class="head">Description</th>
+<th class="head">Default</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr><td>GEANY_FILETYPE_SEARCH_LINES</td>
+<td>The number of lines to search for the
+filetype with the extract filetype regex.</td>
+<td>2</td>
+</tr>
+</tbody>
+</table>
+</div>
 <div class="section" id="editor-h">
-<h2><a class="toc-backref" href="#id234">editor.h</a></h2>
+<h2><a class="toc-backref" href="#id235">editor.h</a></h2>
 <table border="1" class="docutils">
 <colgroup>
 <col width="33%" />
@@ -6158,7 +6194,7 @@ underscore.</td>
 </table>
 </div>
 <div class="section" id="keyfile-c">
-<h2><a class="toc-backref" href="#id235">keyfile.c</a></h2>
+<h2><a class="toc-backref" href="#id236">keyfile.c</a></h2>
 <p>These are default settings that can be overridden in the <a class="reference internal" href="#preferences">Preferences</a> dialog.</p>
 <table border="1" class="docutils">
 <colgroup>
@@ -6235,11 +6271,17 @@ comment.</td>
 Geany provide.</td>
 <td>30</td>
 </tr>
+<tr><td>GEANY_DEFAULT_FILETYPE_REGEX</td>
+<td>The default regex to extract filetypes from
+files.</td>
+<td>See below.</td>
+</tr>
 </tbody>
 </table>
+<p>The GEANY_DEFAULT_FILETYPE_REGEX default value is  -\*-\s*([^\s]+)\s*-\*- which finds Emacs filetypes.</p>
 </div>
 <div class="section" id="build-c">
-<h2><a class="toc-backref" href="#id236">build.c</a></h2>
+<h2><a class="toc-backref" href="#id237">build.c</a></h2>
 <table border="1" class="docutils">
 <colgroup>
 <col width="33%" />
@@ -6284,7 +6326,7 @@ overriding the compile setting.</td>
 </div>
 </div>
 <div class="section" id="gnu-general-public-license">
-<h1><a class="toc-backref" href="#id237">GNU General Public License</a></h1>
+<h1><a class="toc-backref" href="#id238">GNU General Public License</a></h1>
 <pre class="literal-block">
             GNU GENERAL PUBLIC LICENSE
                Version 2, June 1991
@@ -6629,7 +6671,7 @@ Public License instead of this License.
 </pre>
 </div>
 <div class="section" id="license-for-scintilla-and-scite">
-<h1><a class="toc-backref" href="#id238">License for Scintilla and SciTE</a></h1>
+<h1><a class="toc-backref" href="#id239">License for Scintilla and SciTE</a></h1>
 <p>Copyright 1998-2003 by Neil Hodgson &lt;neilh(at)scintilla(dot)org&gt;</p>
 <p>All Rights Reserved</p>
 <p>Permission to use, copy, modify, and distribute this software and
@@ -6649,7 +6691,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2011-10-02 13:04 UTC.
+Generated on: 2011-10-22 11:53 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/doc/geany.txt b/doc/geany.txt
index 75404cef..171a1898 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -2485,14 +2485,14 @@ internal default, which is currently:
 
 Note that ``\t`` = tab.
 
-================================  ===========================================  ========  ===========
-Key                               Description                                  Default   Applies
-================================  ===========================================  ========  ===========
+================================  ===========================================  ==========  ===========
+Key                               Description                                  Default     Applies
+================================  ===========================================  ==========  ===========
 **VTE related**
-emulation                         Terminal emulation mode. Only change this    xterm     immediately
+emulation                         Terminal emulation mode. Only change this    xterm       immediately
                                   if you have VTE termcap files other than
                                   ``vte/termcap/xterm``.
-send_selection_unsafe             By default, Geany strips any trailing        false     immediately
+send_selection_unsafe             By default, Geany strips any trailing        false       immediately
                                   newline characters from the current
                                   selection before sending it to the terminal
                                   to not execute arbitrary code. This is
@@ -2501,7 +2501,7 @@ send_selection_unsafe             By default, Geany strips any trailing        f
                                   it to be executed directly, set this option
                                   to true.
 **File related**
-use_atomic_file_saving            Defines the mode how Geany saves files to    false     immediately
+use_atomic_file_saving            Defines the mode how Geany saves files to    false       immediately
                                   disk. If disabled, Geany directly writes
                                   the content of the document to disk. This
                                   might cause loss of data when there is
@@ -2518,23 +2518,27 @@ use_atomic_file_saving            Defines the mode how Geany saves files to    f
                                   break things seriously.
                                   The better approach would be to ensure your
                                   disk won't run out of free space.
-use_gio_unsafe_file_saving        Whether to use GIO as the unsafe file        true      immediately
+use_gio_unsafe_file_saving        Whether to use GIO as the unsafe file        true        immediately
                                   saving backend. It is better on most
                                   situations but is known not to work
                                   correctly on some complex setups.
-gio_unsafe_save_backup            Make a backup when using GIO unsafe file     false     immediately
+gio_unsafe_save_backup            Make a backup when using GIO unsafe file     false       immediately
                                   saving. Backup is named `filename~`.
+**Filetype related**
+extract_filetype_regex            Regex to extract filetype name from file     See below.  immediately
+                                  via capture group one.
 **Search related**
-find_selection_type               See `Find selection`_.                       0         immediately
+find_selection_type               See `Find selection`_.                       0           immediately
 **Build Menu related**
-number_ft_menu_items              The maximum number of menu items in the      2         on restart
+number_ft_menu_items              The maximum number of menu items in the      2           on restart
                                   filetype section of the Build menu.
-number_non_ft_menu_items          The maximum number of menu items in the      3         on restart
+number_non_ft_menu_items          The maximum number of menu items in the      3           on restart
                                   independent section of the Build menu.
-number_exec_menu_items            The maximum number of menu items in the      2         on restart
+number_exec_menu_items            The maximum number of menu items in the      2           on restart
                                   execute section of the Build menu.
-================================  ===========================================  ========  ===========
+================================  ===========================================  ==========  ===========
 
+The extract_filetype_regex has the default value GEANY_DEFAULT_FILETYPE_REGEX.
 
 Terminal (VTE) preferences
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -5100,6 +5104,16 @@ GEANY_PROJECT_EXT               The default filename extension for Geany      ge
                                 open dialog.
 ==============================  ============================================  ==================
 
+filetypes.c
+-----------
+
+==============================  ============================================  ==================
+Option                          Description                                   Default
+==============================  ============================================  ==================
+GEANY_FILETYPE_SEARCH_LINES     The number of lines to search for the         2
+                                filetype with the extract filetype regex.
+==============================  ============================================  ==================
+
 editor.h
 --------
 
@@ -5142,8 +5156,12 @@ GEANY_TOGGLE_MARK               A string which is used to mark a toggled      "~
                                 comment.
 GEANY_MAX_AUTOCOMPLETE_WORDS    How many autocompletion suggestions should    30
                                 Geany provide.
+GEANY_DEFAULT_FILETYPE_REGEX    The default regex to extract filetypes from   See below.
+                                files.
 ==============================  ============================================  ==================
 
+The GEANY_DEFAULT_FILETYPE_REGEX default value is  -\\*-\\s*([^\\s]+)\\s*-\\*- which finds Emacs filetypes.
+
 build.c
 -------
 
diff --git a/src/document.h b/src/document.h
index 8bfe1cc6..6642da08 100644
--- a/src/document.h
+++ b/src/document.h
@@ -61,6 +61,7 @@ typedef struct GeanyFilePrefs
 	gboolean		ensure_convert_new_lines;
 	gboolean		gio_unsafe_save_backup;
 	gboolean		use_gio_unsafe_file_saving; /* whether to use GIO as the unsafe backend */
+	gchar			*extract_filetype_regex;	/* regex to extract filetype on opening */
 }
 GeanyFilePrefs;
 
diff --git a/src/filetypes.c b/src/filetypes.c
index 1d044f77..c4b1b2a5 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -46,6 +46,7 @@
 
 #include <stdlib.h>
 
+#define GEANY_FILETYPE_SEARCH_LINES 2 /* lines of file to search for filetype */
 
 GPtrArray *filetypes_array = NULL;	/* Dynamic array of filetype pointers */
 
@@ -955,13 +956,48 @@ static GeanyFiletype *find_shebang(const gchar *utf8_filename, const gchar *line
 
 /* Detect the filetype checking for a shebang, then filename extension. */
 static GeanyFiletype *filetypes_detect_from_file_internal(const gchar *utf8_filename,
-														  const gchar *line)
+														  gchar **lines)
 {
-	GeanyFiletype *ft;
+	GeanyFiletype	*ft;
+	gint			 i;
+	GRegex			*ft_regex;
+	GMatchInfo		*match;
+	GError			*regerr = NULL;
 
 	/* try to find a shebang and if found use it prior to the filename extension
 	 * also checks for <?xml */
-	ft = find_shebang(utf8_filename, line);
+	ft = find_shebang(utf8_filename, lines[0]);
+	if (ft != NULL)
+		return ft;
+
+	/* try to extract the filetype using a regex capture */
+	ft_regex = g_regex_new( file_prefs.extract_filetype_regex,
+							G_REGEX_RAW | G_REGEX_MULTILINE,
+							0,
+							&regerr);
+	if (regerr == NULL)
+	{
+		for (i = 0; i < GEANY_FILETYPE_SEARCH_LINES; i++)
+		{
+			if (g_regex_match(ft_regex, lines[i], 0, &match))
+			{
+				gchar *capture = g_match_info_fetch(match, 1);
+				if (capture != NULL)
+				{
+					ft = filetypes_lookup_by_name(capture);
+					g_free(capture);
+				}
+			}
+			g_match_info_free(match);
+			if (ft != NULL)
+				break;
+		}
+	}
+	else
+	{
+		g_error_free(regerr);
+	}
+	g_regex_unref(ft_regex);
 	if (ft != NULL)
 		return ft;
 
@@ -975,15 +1011,22 @@ static GeanyFiletype *filetypes_detect_from_file_internal(const gchar *utf8_file
 /* Detect the filetype for the document, checking for a shebang, then filename extension. */
 GeanyFiletype *filetypes_detect_from_document(GeanyDocument *doc)
 {
-	GeanyFiletype *ft;
-	gchar *line;
+	GeanyFiletype 	*ft;
+	gchar 			*lines[GEANY_FILETYPE_SEARCH_LINES];
+	gint			 i;
 
 	if (doc == NULL)
 		return filetypes[GEANY_FILETYPES_NONE];
 
-	line = sci_get_line(doc->editor->sci, 0);
-	ft = filetypes_detect_from_file_internal(doc->file_name, line);
-	g_free(line);
+	for (i = 0; i < GEANY_FILETYPE_SEARCH_LINES; ++i)
+	{
+		lines[i] = sci_get_line(doc->editor->sci, i);
+	}
+	ft = filetypes_detect_from_file_internal(doc->file_name, lines);
+	for (i = 0; i < GEANY_FILETYPE_SEARCH_LINES; ++i)
+	{
+		g_free(lines[i]);
+	}
 	return ft;
 }
 
@@ -1001,8 +1044,10 @@ GeanyFiletype *filetypes_detect_from_document(GeanyDocument *doc)
 GeanyFiletype *filetypes_detect_from_file(const gchar *utf8_filename)
 {
 	gchar line[1024];
-	FILE *f;
+	gchar *lines[GEANY_FILETYPE_SEARCH_LINES];
+	FILE  *f;
 	gchar *locale_name = utils_get_locale_from_utf8(utf8_filename);
+	gint  i;
 
 	f = g_fopen(locale_name, "r");
 	g_free(locale_name);
@@ -1011,7 +1056,12 @@ GeanyFiletype *filetypes_detect_from_file(const gchar *utf8_filename)
 		if (fgets(line, sizeof(line), f) != NULL)
 		{
 			fclose(f);
-			return filetypes_detect_from_file_internal(utf8_filename, line);
+			for (i = 0; i < GEANY_FILETYPE_SEARCH_LINES; ++i)
+			{
+				lines[i] = NULL;
+			}
+			lines[0] = line;
+			return filetypes_detect_from_file_internal(utf8_filename, lines);
 		}
 		fclose(f);
 	}
diff --git a/src/keyfile.c b/src/keyfile.c
index 14dee75b..4c798af9 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -82,6 +82,7 @@
 #define GEANY_TOGGLE_MARK				"~ "
 #define GEANY_MAX_AUTOCOMPLETE_WORDS	30
 #define GEANY_MAX_SYMBOLS_UPDATE_FREQ	250
+#define GEANY_DEFAULT_FILETYPE_REGEX    "-\\*-\\s*([^\\s]+)\\s*-\\*-"
 
 
 static gchar *scribble_text = NULL;
@@ -218,6 +219,8 @@ static void init_pref_groups(void)
 		"indent_hard_tab_width", 8);
 	stash_group_add_integer(group, (gint*)&search_prefs.find_selection_type,
 		"find_selection_type", GEANY_FIND_SEL_CURRENT_WORD);
+	stash_group_add_string(group, &file_prefs.extract_filetype_regex,
+		"extract_filetype_regex", GEANY_DEFAULT_FILETYPE_REGEX);
 
 	/* Note: Interface-related various prefs are in ui_init_prefs() */
 

From 03dd57f148425401ba366ff6905a57e0f1f10a17 Mon Sep 17 00:00:00 2001
From: Lex Trotman <elextr@gmail.com>
Date: Sun, 23 Oct 2011 13:41:10 +1100
Subject: [PATCH 28/70] Fix escaping of session filepaths

Fixes bug #3425969.  Replace Geany escaping of session filepaths
with g_uri_escape_string (available now in 2.16) allowing any
punctuation characters in the path.
---
 src/keyfile.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/keyfile.c b/src/keyfile.c
index 4c798af9..b3ae7ca4 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -293,18 +293,14 @@ static gchar *get_session_file_string(GeanyDocument *doc)
 {
 	gchar *fname;
 	gchar *locale_filename;
+	gchar *escaped_filename;
 	GeanyFiletype *ft = doc->file_type;
 
 	if (ft == NULL) /* can happen when saving a new file when quitting */
 		ft = filetypes[GEANY_FILETYPES_NONE];
 
 	locale_filename = utils_get_locale_from_utf8(doc->file_name);
-	/* If the filename contains any ';' (semi-colons) we need to escape them otherwise
-	 * g_key_file_get_string_list() would fail reading them, so we replace them before
-	 * writing with usual colons which must never appear in a filename and replace them
-	 * back when we read the file again from the file.
-	 * (g_path_skip_root() to skip C:\... on Windows) */
-	g_strdelimit((gchar*) utils_path_skip_root(locale_filename), ";", ':');
+	escaped_filename = g_uri_escape_string(locale_filename, NULL, TRUE);
 
 	fname = g_strdup_printf("%d;%s;%d;%d;%d;%d;%d;%s;%d;%d",
 		sci_get_current_position(doc->editor->sci),
@@ -314,9 +310,10 @@ static gchar *get_session_file_string(GeanyDocument *doc)
 		doc->editor->indent_type,
 		doc->editor->auto_indent,
 		doc->editor->line_wrapping,
-		locale_filename,
+		escaped_filename,
 		doc->editor->line_breaking,
 		doc->editor->indent_width);
+	g_free(escaped_filename);
 	g_free(locale_filename);
 	return fname;
 }
@@ -1019,6 +1016,7 @@ static gboolean open_session_file(gchar **tmp, guint len)
 	guint pos;
 	const gchar *ft_name;
 	gchar *locale_filename;
+	gchar *unescaped_filename;
 	gint enc_idx, indent_type;
 	gboolean ro, auto_indent, line_wrapping;
 	/** TODO when we have a global pref for line breaking, use its value */
@@ -1033,9 +1031,8 @@ static gboolean open_session_file(gchar **tmp, guint len)
 	auto_indent = atoi(tmp[5]);
 	line_wrapping = atoi(tmp[6]);
 	/* try to get the locale equivalent for the filename */
-	locale_filename = utils_get_locale_from_utf8(tmp[7]);
-	/* replace ':' back with ';' (see get_session_file_string for details) */
-	g_strdelimit((gchar*) utils_path_skip_root(locale_filename), ":", ';');
+	unescaped_filename = g_uri_unescape_string(tmp[7], NULL);
+	locale_filename = utils_get_locale_from_utf8(unescaped_filename);
 
 	if (len > 8)
 		line_breaking = atoi(tmp[8]);
@@ -1067,6 +1064,7 @@ static gboolean open_session_file(gchar **tmp, guint len)
 	}
 
 	g_free(locale_filename);
+	g_free(unescaped_filename);
 	return ret;
 }
 

From 82146e953fa1bd41611ae1414159491818c412d7 Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Sun, 23 Oct 2011 00:41:50 -0700
Subject: [PATCH 29/70] Remove max length limit of 248 characters on search
 dialogs

---
 src/search.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/search.c b/src/search.c
index 1627835a..315eb81d 100644
--- a/src/search.c
+++ b/src/search.c
@@ -482,7 +482,6 @@ static void create_find_dialog(void)
 	entry = gtk_combo_box_entry_new_text();
 	ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))));
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
-	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 248);
 	gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 50);
 	find_dlg.entry = gtk_bin_get_child(GTK_BIN(entry));
 	ui_hookup_widget(find_dlg.dialog, entry, "entry");
@@ -647,7 +646,6 @@ static void create_replace_dialog(void)
 	entry_find = gtk_combo_box_entry_new_text();
 	ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))));
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label_find), entry_find);
-	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 248);
 	gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 50);
 	ui_hookup_widget(replace_dlg.dialog, entry_find, "entry_find");
 	replace_dlg.find_entry = gtk_bin_get_child(GTK_BIN(entry_find));
@@ -655,7 +653,6 @@ static void create_replace_dialog(void)
 	entry_replace = gtk_combo_box_entry_new_text();
 	ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))));
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label_replace), entry_replace);
-	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 248);
 	gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 50);
 	ui_hookup_widget(replace_dlg.dialog, entry_replace, "entry_replace");
 	replace_dlg.replace_entry = gtk_bin_get_child(GTK_BIN(entry_replace));
@@ -888,7 +885,6 @@ static void create_fif_dialog(void)
 	entry = gtk_bin_get_child(GTK_BIN(combo));
 	ui_entry_add_clear_icon(GTK_ENTRY(entry));
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
-	gtk_entry_set_max_length(GTK_ENTRY(entry), 248);
 	gtk_entry_set_width_chars(GTK_ENTRY(entry), 50);
 	gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
 	fif_dlg.search_combo = combo;
@@ -932,7 +928,6 @@ static void create_fif_dialog(void)
 	entry = gtk_bin_get_child(GTK_BIN(dir_combo));
 	ui_entry_add_clear_icon(GTK_ENTRY(entry));
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label1), entry);
-	gtk_entry_set_max_length(GTK_ENTRY(entry), 248);
 	gtk_entry_set_width_chars(GTK_ENTRY(entry), 50);
 	fif_dlg.dir_combo = dir_combo;
 

From deb2d4a7f9ad385aa0c0be3a50ce683c88687890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Sun, 23 Oct 2011 16:24:39 +0200
Subject: [PATCH 30/70] Add a few notes about generating tags files on Windows

---
 doc/geany.html | 13 +++++++++++--
 doc/geany.txt  | 11 +++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/doc/geany.html b/doc/geany.html
index 6065e3e1..1721f77d 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz  Colomban Wendling" />
 <meta name="date" content="2011-10-02" />
@@ -2055,6 +2055,15 @@ of header files. When Geany is next started, your custom tags file
 will be loaded instead of the default c99.tags. You should keep a
 copy of the generated tags file because it will get overwritten when
 upgrading Geany.</p>
+<p><em>Generating tag files on Windows:</em></p>
+<p>This works basically the same as on other platforms but you need to make
+sure you have grep installed and Geany can find it, i.e. it must be
+in the PATH environment variable. To test this, open a console window
+and type <tt class="docutils literal">grep</tt> and see whether it is executed.
+If it is, then you can create a tags file like the following:</p>
+<pre class="literal-block">
+&quot;c:\program files\geany\bin\geany&quot; -g c:\mytags.php.tags c:\code\somefile.php
+</pre>
 </div>
 </div>
 <div class="section" id="c-ignore-tags">
@@ -6691,7 +6700,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2011-10-22 11:53 UTC.
+Generated on: 2011-10-23 14:12 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/doc/geany.txt b/doc/geany.txt
index 171a1898..c7a59a7d 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -1662,6 +1662,17 @@ will be loaded instead of the default c99.tags. You should keep a
 copy of the generated tags file because it will get overwritten when
 upgrading Geany.
 
+*Generating tag files on Windows:*
+
+This works basically the same as on other platforms but you need to make
+sure you have grep installed and Geany can find it, i.e. it must be
+in the PATH environment variable. To test this, open a console window
+and type ``grep`` and see whether it is executed.
+If it is, then you can create a tags file like the following::
+
+    "c:\program files\geany\bin\geany" -g c:\mytags.php.tags c:\code\somefile.php
+
+
 
 C ignore.tags
 ^^^^^^^^^^^^^

From c51129db6e703b6227e45130fcfc3243945fec3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Sun, 23 Oct 2011 16:29:17 +0200
Subject: [PATCH 31/70] When using the debug console, capture stdin as well.

This enables us to wait for input in the debug console window
and so keep it open if necessary until there is some input of
the user.
---
 src/win32.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/win32.c b/src/win32.c
index 8ad89ec3..5899b3e1 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -787,6 +787,13 @@ static void debug_setup_console()
 	fp = _fdopen(hConHandle, "w");
 	*stderr = *fp;
 	setvbuf(stderr, NULL, _IONBF, 0);
+
+	/* redirect unbuffered STDIN to the console */
+	lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
+	hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+	fp = _fdopen( hConHandle, "r" );
+	*stdin = *fp;
+	setvbuf(stdin, NULL, _IONBF, 0);
 }
 
 
@@ -794,8 +801,8 @@ void win32_init_debug_code(void)
 {
 	if (app->debug_mode)
 	{
-		/* create a console window to get log messages on Windows */
-		/** TODO remove me? */
+		/* create a console window to get log messages on Windows, 
+		 * especially useful when generating tags files */
 		debug_setup_console();
 		/* Enable GLib process spawn debug mode when Geany was started with the debug flag */
 		g_setenv("G_SPAWN_WIN32_DEBUG", "1", FALSE);

From 3fd7e9f68e6b859b80095fc609ffbdebf16306bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=F6ger?= <enrico.troeger@uvena.de>
Date: Sun, 23 Oct 2011 16:32:22 +0200
Subject: [PATCH 32/70] Wait for user input in the debug console

This way, Geany's standard out and error can be read if started in verbose
mode until a key is pressed which makes debugging of command line
actions easier.
---
 src/main.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main.c b/src/main.c
index 4dde6d9a..0fd6e10f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -479,6 +479,18 @@ static void print_filetypes(void)
 }
 
 
+static void wait_for_input_on_windows(void)
+{
+#ifdef G_OS_WIN32
+	if (verbose_mode)
+	{
+		geany_debug("Press any key to continue");
+		getchar();
+	}
+#endif
+}
+
+
 static void parse_command_line_options(gint *argc, gchar ***argv)
 {
 	GError *error = NULL;
@@ -514,6 +526,12 @@ static void parse_command_line_options(gint *argc, gchar ***argv)
 		exit(1);
 	}
 
+	app->debug_mode = verbose_mode;
+
+#ifdef G_OS_WIN32
+	win32_init_debug_code();
+#endif
+
 	if (show_version)
 	{
 		printf(PACKAGE " %s (", main_get_version_string());
@@ -523,6 +541,7 @@ static void parse_command_line_options(gint *argc, gchar ***argv)
 			GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
 			GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
 		printf(")\n");
+		wait_for_input_on_windows();
 		exit(0);
 	}
 
@@ -532,15 +551,10 @@ static void parse_command_line_options(gint *argc, gchar ***argv)
 		printf("%s\n", GEANY_DATADIR);
 		printf("%s\n", GEANY_LIBDIR);
 		printf("%s\n", GEANY_LOCALEDIR);
+		wait_for_input_on_windows();
 		exit(0);
 	}
 
-	app->debug_mode = verbose_mode;
-
-#ifdef G_OS_WIN32
-	win32_init_debug_code();
-#endif
-
 	if (alternate_config)
 	{
 		geany_debug("alternate config: %s", alternate_config);
@@ -558,12 +572,14 @@ static void parse_command_line_options(gint *argc, gchar ***argv)
 		filetypes_init_types();
 		ret = symbols_generate_global_tags(*argc, *argv, ! no_preprocessing);
 		filetypes_free_types();
+		wait_for_input_on_windows();
 		exit(ret);
 	}
 
 	if (ft_names)
 	{
 		print_filetypes();
+		wait_for_input_on_windows();
 		exit(0);
 	}
 

From f6e135435b3d8cf6c382ab0504ff71c3ab6217f7 Mon Sep 17 00:00:00 2001
From: Matthew Brush <matt@geany.org>
Date: Sun, 23 Oct 2011 13:44:52 -0700
Subject: [PATCH 33/70] Fixup various filedefs mappings

---
 data/filetypes.ada       | 4 ++--
 data/filetypes.asm       | 2 +-
 data/filetypes.c         | 4 ++--
 data/filetypes.caml      | 2 +-
 data/filetypes.cobol     | 2 +-
 data/filetypes.css       | 4 ++--
 data/filetypes.d         | 6 +++---
 data/filetypes.freebasic | 2 +-
 data/filetypes.haskell   | 4 ++--
 data/filetypes.lisp      | 2 +-
 data/filetypes.nsis      | 2 +-
 data/filetypes.pascal    | 4 ++--
 data/filetypes.perl      | 2 +-
 data/filetypes.python    | 2 +-
 data/filetypes.ruby      | 2 +-
 data/filetypes.sh        | 4 ++--
 data/filetypes.sql       | 2 +-
 data/filetypes.xml       | 4 ++--
 18 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/data/filetypes.ada b/data/filetypes.ada
index 6a8e3b81..1b05717b 100644
--- a/data/filetypes.ada
+++ b/data/filetypes.ada
@@ -10,8 +10,8 @@ character=string_1
 charactereol=string_eol
 string=string_1
 stringeol=string_eol
-label=preprocessor
-commentline=comment
+label=label
+commentline=comment_line
 illegal=error
 
 [keywords]
diff --git a/data/filetypes.asm b/data/filetypes.asm
index fa1ed591..a2b28670 100644
--- a/data/filetypes.asm
+++ b/data/filetypes.asm
@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-comment=comment
+comment=comment_line
 number=number_1
 string=string_1
 operator=operator
diff --git a/data/filetypes.c b/data/filetypes.c
index 4b22d9a3..ef95fd36 100644
--- a/data/filetypes.c
+++ b/data/filetypes.c
@@ -3,7 +3,7 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
-commentline=comment
+commentline=comment_line
 commentdoc=comment_doc
 number=number_1
 word=keyword_1
@@ -17,7 +17,7 @@ identifier=identifier_1
 stringeol=string_eol
 verbatim=string_2
 regex=regex
-commentlinedoc=comment_doc
+commentlinedoc=comment_line_doc
 commentdockeyword=comment_doc_keyword
 commentdockeyworderror=comment_doc_keyword_error
 globalclass=class
diff --git a/data/filetypes.caml b/data/filetypes.caml
index 2738ff29..c1c17642 100644
--- a/data/filetypes.caml
+++ b/data/filetypes.caml
@@ -10,7 +10,7 @@ number=number_1
 keyword=keyword_1
 keyword2=keyword_2
 string=string_1
-char=string_1
+char=character
 operator=operator
 identifier=identifier_1
 tagname=preprocessor
diff --git a/data/filetypes.cobol b/data/filetypes.cobol
index c308702d..4bcbe078 100644
--- a/data/filetypes.cobol
+++ b/data/filetypes.cobol
@@ -3,7 +3,7 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
-commentline=comment
+commentline=comment_line
 commentdoc=comment_doc
 number=number_1
 word=keyword_1
diff --git a/data/filetypes.css b/data/filetypes.css
index 7b56f4d7..62060d22 100644
--- a/data/filetypes.css
+++ b/data/filetypes.css
@@ -11,7 +11,7 @@ unknown_identifier=class
 operator=operator
 identifier=keyword_1
 doublestring=string_1
-singlestring=string_1
+singlestring=string_2
 attribute=attribute
 value=value
 id=number
@@ -23,7 +23,7 @@ pseudoelement=element
 extended_identifier=keyword_4
 extended_pseudoclass=class
 extended_pseudoelement=element
-media=string_2
+media=string_3
 
 [keywords]
 # CSS 1 properties
diff --git a/data/filetypes.d b/data/filetypes.d
index a263e2db..33651eff 100644
--- a/data/filetypes.d
+++ b/data/filetypes.d
@@ -3,7 +3,7 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
-commentline=comment
+commentline=comment_line
 commentdoc=comment_doc
 commentdocnested=comment_doc
 number=number_1
@@ -13,10 +13,10 @@ word3=keyword_3
 typedef=type
 string=string_1
 stringeol=string_eol
-character=string_1
+character=character
 operator=operator
 identifier=identifier_1
-commentlinedoc=comment_doc
+commentlinedoc=comment_line_doc
 commentdockeyword=comment_doc_keyword
 commentdockeyworderror=comment_doc_keyword_error
 
diff --git a/data/filetypes.freebasic b/data/filetypes.freebasic
index 43404774..fcde7f08 100644
--- a/data/filetypes.freebasic
+++ b/data/filetypes.freebasic
@@ -16,7 +16,7 @@ word3=keyword_3
 word4=keyword_4
 constant=identifier_2
 asm=type
-label=identifier_3
+label=label
 error=error
 hexnumber=number_1
 binnumber=number_1
diff --git a/data/filetypes.haskell b/data/filetypes.haskell
index d182d399..3d9d9217 100644
--- a/data/filetypes.haskell
+++ b/data/filetypes.haskell
@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-commentline=comment
+commentline=comment_line
 commentblock=comment
 commentblock2=comment
 commentblock3=comment
@@ -10,7 +10,7 @@ number=number_1
 keyword=keyword_1
 import=preprocessor
 string=string_1
-character=string_2
+character=character
 class=class
 operator=operator
 identifier=identifier_1
diff --git a/data/filetypes.lisp b/data/filetypes.lisp
index 4fc766ee..b5e94fd8 100644
--- a/data/filetypes.lisp
+++ b/data/filetypes.lisp
@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-comment=comment
+comment=comment_line
 multicomment=comment
 number=number_1
 keyword=keyword_1
diff --git a/data/filetypes.nsis b/data/filetypes.nsis
index d23a4c9d..e9b8429c 100644
--- a/data/filetypes.nsis
+++ b/data/filetypes.nsis
@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-comment=comment
+comment=comment_line
 stringdq=string_1
 stringlq=string_2
 stringrq=string_2
diff --git a/data/filetypes.pascal b/data/filetypes.pascal
index 64aafdb9..cd67f0d8 100644
--- a/data/filetypes.pascal
+++ b/data/filetypes.pascal
@@ -4,8 +4,8 @@
 default=default
 identifier=identifier_1
 comment=comment
-comment2=comment
-commentline=comment
+comment2=comment_doc
+commentline=comment_line
 preprocessor=preprocessor
 preprocessor2=preprocessor
 number=number_1
diff --git a/data/filetypes.perl b/data/filetypes.perl
index ea48ab37..158a4eef 100644
--- a/data/filetypes.perl
+++ b/data/filetypes.perl
@@ -3,7 +3,7 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 error=error
-commentline=comment
+commentline=comment_line
 number=number_1
 word=keyword_1
 string=string_1
diff --git a/data/filetypes.python b/data/filetypes.python
index 66b109e9..04349b01 100644
--- a/data/filetypes.python
+++ b/data/filetypes.python
@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-commentline=comment
+commentline=comment_line
 number=number_1
 string=string_1
 character=character
diff --git a/data/filetypes.ruby b/data/filetypes.ruby
index 31f911cf..fb8f0494 100644
--- a/data/filetypes.ruby
+++ b/data/filetypes.ruby
@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-commentline=comment
+commentline=comment_line
 number=number_1
 string=string_1
 character=character
diff --git a/data/filetypes.sh b/data/filetypes.sh
index 04334ed1..07b2957e 100644
--- a/data/filetypes.sh
+++ b/data/filetypes.sh
@@ -2,11 +2,11 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-commentline=comment
+commentline=comment_line
 number=number_1
 word=keyword_1
 string=string_1
-character=string_1
+character=character
 operator=operator
 identifier=identifier_1
 backticks=backticks
diff --git a/data/filetypes.sql b/data/filetypes.sql
index b53033f6..98a86ded 100644
--- a/data/filetypes.sql
+++ b/data/filetypes.sql
@@ -14,7 +14,7 @@ operator=operator
 identifier=identifier_1
 sqlplus=default
 sqlplus_prompt=default
-sqlplus_comment=default
+sqlplus_comment=comment
 quotedidentifier=identifier_2
 
 [keywords]
diff --git a/data/filetypes.xml b/data/filetypes.xml
index 5e7cbfa0..8582f551 100644
--- a/data/filetypes.xml
+++ b/data/filetypes.xml
@@ -42,7 +42,7 @@ php_number=number_1
 php_word=keyword_1
 php_variable=preprocessor
 php_comment=comment
-php_commentline=comment
+php_commentline=comment_line
 php_operator=operator
 php_hstring_variable=string_2
 php_complex_variable=preprocessor
@@ -50,7 +50,7 @@ php_complex_variable=preprocessor
 jscript_start=tag
 jscript_default=default
 jscript_comment=comment
-jscript_commentline=comment
+jscript_commentline=comment_line
 jscript_commentdoc=comment_doc
 jscript_number=number_1
 jscript_word=keyword_1

From d33f511fc49b09168284bfe030f738635f748258 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Thu, 27 Oct 2011 21:30:12 +0200
Subject: [PATCH 34/70] Use evince as default viewer for TeX/LaTeX

On most systems Geany is running inside an GTK/GNOME environment.
As a matter of this fact we can assume evince is the default PDF-viewer.
---
 data/filetypes.latex | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/filetypes.latex b/data/filetypes.latex
index f2811394..1a465dcd 100644
--- a/data/filetypes.latex
+++ b/data/filetypes.latex
@@ -57,8 +57,8 @@ context_action_cmd=
 compiler=latex --file-line-error-style "%f"
 # it is called linker, but here it is an alternative compiler command
 linker=pdflatex --file-line-error-style "%f"
-run_cmd=xdvi "%e.dvi"
-run_cmd2=xpdf "%e.pdf"
+run_cmd=evince "%e.dvi"
+run_cmd2=evince "%e.pdf"
 
 [build-menu]
 FT_00_LB=LaTeX -> _DVI
@@ -68,8 +68,8 @@ FT_01_LB=LaTeX -> _PDF
 FT_01_CM=pdflatex --file-line-error-style "%f"
 FT_01_BD=false
 EX_00_LB=V_iew PDF File
-EX_00_CM=xpdf "%e.pdf"
+EX_00_CM=evince "%e.pdf"
 EX_00_BD=false
 EX_01_LB=_View DVI File
-EX_01_CM=xdvi "%e.dvi"
+EX_01_CM=evince "%e.dvi"
 EX_01_BD=false

From 65e20780e43c80141cbadf19ae6510d9c3b2bfcc Mon Sep 17 00:00:00 2001
From: Matthew Brush <matt@geany.org>
Date: Thu, 27 Oct 2011 23:58:32 -0700
Subject: [PATCH 35/70] classbuilder: Use GTK/GNU code style for generated GTK+
 code

Use two spaces instead of tabs, spaces between function and opening
argument bracket, and various minor changes.

Add dummy gpointer to private struct so the class can be compiled
without modification.
---
 plugins/classbuilder.c | 80 ++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/plugins/classbuilder.c b/plugins/classbuilder.c
index 010a725c..66697e0a 100644
--- a/plugins/classbuilder.c
+++ b/plugins/classbuilder.c
@@ -132,36 +132,30 @@ static const gchar templates_gtk_class_header[] = "{fileheader}\n\n\
 {base_include}\n\
 G_BEGIN_DECLS\n\
 \n\n\
-#define {namespace_up}TYPE_{class_name_up}				({namespace_low}{class_name_low}_get_type())\n\
-#define {namespace_up}{class_name_up}(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj),\\\n\
-			{namespace_up}TYPE_{class_name_up}, {namespace}{class_name}))\n\
-#define {namespace_up}{class_name_up}_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass),\\\n\
-			{namespace_up}TYPE_{class_name_up}, {namespace}{class_name}Class))\n\
-#define {namespace_up}IS_{class_name_up}(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj),\\\n\
-			{namespace_up}TYPE_{class_name_up}))\n\
-#define {namespace_up}IS_{class_name_up}_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass),\\\n\
-			{namespace_up}TYPE_{class_name_up}))\n\
-#define {namespace_up}{class_name_up}_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj),\\\n\
-			{namespace_up}TYPE_{class_name_up}, {namespace}{class_name}Class))\n\
+#define {namespace_up}TYPE_{class_name_up}             ({namespace_low}{class_name_low}_get_type ())\n\
+#define {namespace_up}{class_name_up}(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), {namespace_up}TYPE_{class_name_up}, {namespace}{class_name}))\n\
+#define {namespace_up}{class_name_up}_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), {namespace_up}TYPE_{class_name_up}, {namespace}{class_name}Class))\n\
+#define {namespace_up}IS_{class_name_up}(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), {namespace_up}TYPE_{class_name_up}))\n\
+#define {namespace_up}IS_{class_name_up}_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), {namespace_up}TYPE_{class_name_up}))\n\
+#define {namespace_up}{class_name_up}_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), {namespace_up}TYPE_{class_name_up}, {namespace}{class_name}Class))\n\
 \n\
-typedef struct _{namespace}{class_name}			{namespace}{class_name};\n\
-typedef struct _{namespace}{class_name}Class		{namespace}{class_name}Class;\n\
-typedef struct _{namespace}{class_name}Private		{namespace}{class_name}Private;\n\
+typedef struct _{namespace}{class_name}         {namespace}{class_name};\n\
+typedef struct _{namespace}{class_name}Class    {namespace}{class_name}Class;\n\
+typedef struct _{namespace}{class_name}Private  {namespace}{class_name}Private;\n\
 \n\
 struct _{namespace}{class_name}\n\
 {\n\
-	{base_name} parent;\n\
-	/* add your public declarations here */\n\
-	\n\
-	{namespace}{class_name}Private *priv;\n\
+  {base_name} parent;\n\
+  /* add your public declarations here */\n\
+  {namespace}{class_name}Private *priv;\n\
 };\n\
 \n\
 struct _{namespace}{class_name}Class\n\
 {\n\
-	{base_name}Class parent_class;\n\
+  {base_name}Class parent_class;\n\
 };\n\
 \n\n\
-GType		{namespace_low}{class_name_low}_get_type		(void);\n\
+GType {namespace_low}{class_name_low}_get_type (void);\n\n\
 {constructor_decl}\
 \n\n\
 G_END_DECLS\n\
@@ -174,26 +168,27 @@ static const gchar templates_gtk_class_source[] = "{fileheader}\n\
 \n\
 struct _{namespace}{class_name}Private\n\
 {\n\
-	/* add your private declarations here */\n\
+  /* add your private declarations here */\n\
+  gpointer delete_me;\n\
 };\n\
 \n\
 {destructor_decl}\
 \n\
-G_DEFINE_TYPE({namespace}{class_name}, {namespace_low}{class_name_low}, {base_gtype})\n\
+G_DEFINE_TYPE ({namespace}{class_name}, {namespace_low}{class_name_low}, {base_gtype})\n\
 \n\n\
-static void {namespace_low}{class_name_low}_class_init({namespace}{class_name}Class *klass)\n\
+static void\n\
+{namespace_low}{class_name_low}_class_init ({namespace}{class_name}Class *klass)\n\
 {\n\
-	{gtk_destructor_registration}\n\
-	g_type_class_add_private((gpointer)klass, sizeof({namespace}{class_name}Private));\n\
+  {gtk_destructor_registration}\n\
+  g_type_class_add_private ((gpointer)klass, sizeof ({namespace}{class_name}Private));\n\
 }\n\
 \n\
 {destructor_impl}\n\
 \n\
-static void {namespace_low}{class_name_low}_init({namespace}{class_name} *self)\n\
+static void\n\
+{namespace_low}{class_name_low}_init ({namespace}{class_name} *self)\n\
 {\n\
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self,\n\
-		{namespace_up}TYPE_{class_name_up}, {namespace}{class_name}Private);\n\
-	\n\
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, {namespace_up}TYPE_{class_name_up}, {namespace}{class_name}Private);\n\
 }\n\
 \n\
 {constructor_impl}\n\
@@ -876,14 +871,15 @@ static gboolean create_class(CreateClassDialog *cc_dlg)
 			class_info->source = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->source_entry)));
 			if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box)))
 			{
-				class_info->constructor_decl = g_strdup_printf("%s*\t%s%s_new\t\t\t(void);\n",
+				class_info->constructor_decl = g_strdup_printf("%s *%s%s_new (void);\n",
 						gtk_entry_get_text(GTK_ENTRY(cc_dlg->gtk_constructor_type_entry)),
 						class_info->namespace_low, class_info->class_name_low);
 				class_info->constructor_impl = g_strdup_printf("\n"
-						"%s *%s%s_new(void)\n"
+						"%s *\n"
+						"%s%s_new (void)\n"
 						"{\n"
-						"\treturn g_object_new(%sTYPE_%s, NULL);\n"
-						"}\n",
+						"  return g_object_new (%sTYPE_%s, NULL);\n"
+						"}",
 						gtk_entry_get_text(GTK_ENTRY(cc_dlg->gtk_constructor_type_entry)),
 						class_info->namespace_low, class_info->class_name_low,
 						class_info->namespace_up, class_info->class_name_up);
@@ -897,20 +893,20 @@ static gboolean create_class(CreateClassDialog *cc_dlg)
 			{
 				class_info->gtk_destructor_registration =
 						g_strdup_printf("GObjectClass *g_object_class;\n\n"
-						"\tg_object_class = G_OBJECT_CLASS(klass);\n\n"
-						"\tg_object_class->finalize = %s%s_finalize;\n",
+						"  g_object_class = G_OBJECT_CLASS (klass);\n\n"
+						"  g_object_class->finalize = %s%s_finalize;\n",
 						class_info->namespace_low, class_info->class_name_low);
 				class_info->destructor_decl =
-						g_strdup_printf("static void %s%s_finalize\t\t\t(GObject *object);\n",
+						g_strdup_printf("static void %s%s_finalize (GObject *object);\n",
 						class_info->namespace_low, class_info->class_name_low);
 				class_info->destructor_impl = g_strdup_printf("\n"
-						"static void %s%s_finalize(GObject *object)\n"
+						"static void\n"
+						"%s%s_finalize (GObject *object)\n"
 						"{\n"
-						"\t%s%s *self;\n\n"
-						"\tg_return_if_fail(object != NULL);\n"
-						"\tg_return_if_fail(%sIS_%s(object));\n\n"
-						"\tself = %s%s(object);\n\n"
-						"\tG_OBJECT_CLASS(%s%s_parent_class)->finalize(object);\n"
+						"  %s%s *self;\n\n"
+						"  g_return_if_fail (%sIS_%s (object));\n\n"
+						"  self = %s%s (object);\n\n"
+						"  G_OBJECT_CLASS (%s%s_parent_class)->finalize (object);\n"
 						"}\n",
 						class_info->namespace_low,	class_info->class_name_low,
 						class_info->namespace,		class_info->class_name,

From c4980f8c1e0a758e3da21369862865bfbb546304 Mon Sep 17 00:00:00 2001
From: Matthew Brush <matt@geany.org>
Date: Fri, 28 Oct 2011 01:12:29 -0700
Subject: [PATCH 36/70] classbuilder: Move caret to start of generated
 documents

---
 plugins/classbuilder.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/classbuilder.c b/plugins/classbuilder.c
index 66697e0a..5e56adcb 100644
--- a/plugins/classbuilder.c
+++ b/plugins/classbuilder.c
@@ -1032,6 +1032,7 @@ static gboolean create_class(CreateClassDialog *cc_dlg)
 		text = get_template_class_source(class_info);
 		editor_insert_text_block(doc->editor, text, 0, -1, 0, TRUE);
 		g_free(text);
+		sci_set_current_position(doc->editor->sci, 0, TRUE);
 	}
 
 	if (! utils_str_equal(class_info->header, "") && class_info->type != GEANY_CLASS_TYPE_PHP)
@@ -1040,6 +1041,7 @@ static gboolean create_class(CreateClassDialog *cc_dlg)
 		text = get_template_class_header(class_info);
 		editor_insert_text_block(doc->editor, text, 0, -1, 0, TRUE);
 		g_free(text);
+		sci_set_current_position(doc->editor->sci, 0, TRUE);
 	}
 
 	free_pointers(24, tmp, class_info->namespace, class_info->namespace_up,

From a23e999b7bde54cc23184e6991ca5fdb58cdc47c Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Fri, 28 Oct 2011 10:25:58 -0700
Subject: [PATCH 37/70] Bump GTK+ version to 2.16

---
 HACKING               | 10 +++++-----
 README                |  2 +-
 configure.ac          |  2 +-
 doc/geany.html        |  6 +++---
 doc/geany.txt         |  4 ++--
 geany.pc.in           |  2 +-
 plugins/filebrowser.c | 18 +++---------------
 src/callbacks.c       |  2 --
 src/dialogs.c         |  6 ++----
 src/ui_utils.c        | 18 +++++-------------
 src/utils.c           | 26 ++++++++++++--------------
 wscript               |  4 ++--
 12 files changed, 37 insertions(+), 63 deletions(-)

diff --git a/HACKING b/HACKING
index a647d9f8..a50c179e 100644
--- a/HACKING
+++ b/HACKING
@@ -144,16 +144,16 @@ And then simply apply it like so::
 
 GTK versions & API documentation
 --------------------------------
-Geany requires GTK >= 2.12 and GLib >= 2.16. API symbols from newer
+Geany requires GTK >= 2.16 and GLib >= 2.20. API symbols from newer
 GTK/GLib versions should be avoided or made optional to keep the source
 code building on older systems.
 
-The official GTK 2.12 API documentation may not be available online
+The official GTK 2.16 API documentation may not be available online
 anymore, so we put it on http://www.geany.org/manual/gtk/. There
 is also a tarball with all available files for download and use with
 devhelp.
 
-Using the 2.12 API documentation of the GTK libs (including GLib, GDK
+Using the 2.16 API documentation of the GTK libs (including GLib, GDK
 and Pango) has the advantages that you don't get confused by any
 newer API additions and you don't have to take care about whether
 you can use them or not.
@@ -164,8 +164,8 @@ Coding
   them down into smaller static functions where possible. This makes code
   much easier to read and maintain.
 * Use GLib types and functions - gint not int, g_free() not free().
-* Your code should build against GLib 2.16 and GTK 2.12. At least for the
-  moment, we want to keep the minimum requirement for GTK at 2.12 (of
+* Your code should build against GLib 2.20 and GTK 2.16. At least for the
+  moment, we want to keep the minimum requirement for GTK at 2.16 (of
   course, you can use the GTK_CHECK_VERSION macro to protect code using
   later versions).
 * Variables should be declared before statements. You can use
diff --git a/README b/README
index 0e72fcb9..6e23243d 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ The basic features of Geany are:
 
 Requirements
 ------------
-For compiling Geany yourself, you will need the GTK (>= 2.12.0)
+For compiling Geany yourself, you will need the GTK (>= 2.16.0)
 libraries and header files. You will also need its dependency libraries
 and header files, such as Pango, Glib and ATK. All these files are
 available at http://www.gtk.org.
diff --git a/configure.ac b/configure.ac
index de39934e..6b7178d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ GEANY_CHECK_REVISION([dnl force debug mode for a SVN working copy
 
 
 # GTK/GLib/GIO checks
-gtk_modules="gtk+-2.0 >= 2.12 glib-2.0 >= 2.16 gio-2.0 >= 2.16"
+gtk_modules="gtk+-2.0 >= 2.16 glib-2.0 >= 2.20 gio-2.0 >= 2.20"
 PKG_CHECK_MODULES([GTK], [$gtk_modules])
 AC_SUBST([GTK_CFLAGS])
 AC_SUBST([GTK_LIBS])
diff --git a/doc/geany.html b/doc/geany.html
index 1721f77d..bacc94f5 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -571,7 +571,7 @@ The latest version can always be found at <a class="reference external" href="ht
 <h1><a class="toc-backref" href="#id12">Installation</a></h1>
 <div class="section" id="requirements">
 <h2><a class="toc-backref" href="#id13">Requirements</a></h2>
-<p>You will need the GTK (&gt;= 2.12.0) libraries and their dependencies
+<p>You will need the GTK (&gt;= 2.16.0) libraries and their dependencies
 (Pango, GLib and ATK). Your distro should provide packages for these,
 usually installed by default. For Windows, you can download an installer
 from the website which bundles these libraries.</p>
@@ -584,7 +584,7 @@ incomplete list see <a class="reference external" href="http://www.geany.org/Dow
 <div class="section" id="source-compilation">
 <h2><a class="toc-backref" href="#id15">Source compilation</a></h2>
 <p>Compiling Geany is quite easy.
-To do so, you need the GTK (&gt;= 2.12.0) libraries and header files.
+To do so, you need the GTK (&gt;= 2.16.0) libraries and header files.
 You also need the Pango, GLib and ATK libraries and header files.
 All these files are available at <a class="reference external" href="http://www.gtk.org">http://www.gtk.org</a>, but very often
 your distro will provide development packages to save the trouble of
@@ -6700,7 +6700,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2011-10-23 14:12 UTC.
+Generated on: 2011-10-28 17:11 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/doc/geany.txt b/doc/geany.txt
index c7a59a7d..2fa4a550 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -101,7 +101,7 @@ Installation
 Requirements
 ------------
 
-You will need the GTK (>= 2.12.0) libraries and their dependencies
+You will need the GTK (>= 2.16.0) libraries and their dependencies
 (Pango, GLib and ATK). Your distro should provide packages for these,
 usually installed by default. For Windows, you can download an installer
 from the website which bundles these libraries.
@@ -118,7 +118,7 @@ Source compilation
 ------------------
 
 Compiling Geany is quite easy.
-To do so, you need the GTK (>= 2.12.0) libraries and header files.
+To do so, you need the GTK (>= 2.16.0) libraries and header files.
 You also need the Pango, GLib and ATK libraries and header files.
 All these files are available at http://www.gtk.org, but very often
 your distro will provide development packages to save the trouble of
diff --git a/geany.pc.in b/geany.pc.in
index 65521121..0844bfe7 100644
--- a/geany.pc.in
+++ b/geany.pc.in
@@ -8,7 +8,7 @@ localedir=@localedir@
 
 Name: Geany
 Description: A fast and lightweight IDE using GTK2
-Requires: gtk+-2.0 >= 2.12.0
+Requires: gtk+-2.0 >= 2.16.0
 Version: @VERSION@
 Libs: -L${libdir}
 Cflags: -DGTK -I${includedir}/geany -I${includedir}/geany/tagmanager -I${includedir}/geany/scintilla
diff --git a/plugins/filebrowser.c b/plugins/filebrowser.c
index c18c07ca..0f543ddb 100644
--- a/plugins/filebrowser.c
+++ b/plugins/filebrowser.c
@@ -886,16 +886,6 @@ static GtkWidget *make_toolbar(void)
 	g_signal_connect(wid, "clicked", G_CALLBACK(on_current_path), NULL);
 	gtk_container_add(GTK_CONTAINER(toolbar), wid);
 
-	if (gtk_check_version(2, 15, 2) != NULL)
-	{
-		wid = GTK_WIDGET(gtk_separator_tool_item_new());
-		gtk_container_add(GTK_CONTAINER(toolbar), wid);
-
-		wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_CLEAR));
-		gtk_widget_set_tooltip_text(wid, _("Clear the filter"));
-		g_signal_connect(wid, "clicked", G_CALLBACK(on_clear_filter), NULL);
-		gtk_container_add(GTK_CONTAINER(toolbar), wid);
-	}
 	return toolbar;
 }
 
@@ -911,11 +901,9 @@ static GtkWidget *make_filterbar(void)
 	filter_combo = gtk_combo_box_entry_new_text();
 	filter_entry = gtk_bin_get_child(GTK_BIN(filter_combo));
 
-	if (gtk_check_version(2, 15, 2) == NULL)
-	{
-		ui_entry_add_clear_icon(GTK_ENTRY(filter_entry));
-		g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL);
-	}
+	ui_entry_add_clear_icon(GTK_ENTRY(filter_entry));
+	g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL);
+
 	gtk_widget_set_tooltip_text(filter_entry,
 		_("Filter your files with the usual wildcards. Separate multiple patterns with a space."));
 	g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL);
diff --git a/src/callbacks.c b/src/callbacks.c
index 114146e2..dac39da8 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1428,14 +1428,12 @@ void on_menu_show_sidebar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer use
 		interface_prefs.sidebar_symbol_visible = TRUE;
 	}
 
-#if GTK_CHECK_VERSION(2, 14, 0)
 	/* if window has input focus, set it back to the editor before toggling off */
 	if (! ui_prefs.sidebar_visible &&
 		gtk_container_get_focus_child(GTK_CONTAINER(main_widgets.sidebar_notebook)) != NULL)
 	{
 		keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR);
 	}
-#endif
 
 	ui_sidebar_show_hide();
 }
diff --git a/src/dialogs.c b/src/dialogs.c
index 7b394113..fff4bf04 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -378,8 +378,7 @@ static GtkWidget *create_open_file_dialog(void)
 	gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(main_widgets.window));
 	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE);
-	if (gtk_check_version(2, 14, 0) == NULL)
-		gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialog), FALSE);
 
 	/* add checkboxes and filename entry */
 	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), add_file_open_extra_widget(dialog));
@@ -605,8 +604,7 @@ static GtkWidget *create_save_file_dialog(void)
 	gtk_widget_show_all(vbox);
 	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), vbox);
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE);
-	if (gtk_check_version(2, 14, 0) == NULL)
-		gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialog), FALSE);
 
 	/* set the folder by default to the project base dir or the global pref for opening files */
 	initdir = utils_get_default_dir_utf8();
diff --git a/src/ui_utils.c b/src/ui_utils.c
index 5866a711..e4f1b014 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1117,7 +1117,7 @@ static void add_recent_file(const gchar *utf8_filename, GeanyRecentFiles *grf)
 {
 	if (g_queue_find_custom(grf->recent_queue, utf8_filename, (GCompareFunc) strcmp) == NULL)
 	{
-#if GTK_CHECK_VERSION(2, 10, 0)
+
 		if (grf->type == RECENT_FILE_FILE)
 		{
 			GtkRecentManager *manager = gtk_recent_manager_get_default();
@@ -1128,7 +1128,7 @@ static void add_recent_file(const gchar *utf8_filename, GeanyRecentFiles *grf)
 				g_free(uri);
 			}
 		}
-#endif
+
 		g_queue_push_head(grf->recent_queue, g_strdup(utf8_filename));
 		if (g_queue_get_length(grf->recent_queue) > file_prefs.mru_length)
 		{
@@ -1421,21 +1421,14 @@ static void entry_clear_icon_release_cb(GtkEntry *entry, gint icon_pos,
 /** Adds a small clear icon to the right end of the passed @a entry.
  *  A callback to clear the contents of the GtkEntry is automatically added.
  *
- *  This feature is only available with GTK 2.16 but implemented as a runtime check,
- *  so it is safe to just use this function, if the code is ran with older versions,
- *  nothing happens. If ran with GTK 2.16 or newer, the icon is displayed.
- *
  * @param entry The GtkEntry object to which the icon should be attached.
  *
  *  @since 0.16
  */
 void ui_entry_add_clear_icon(GtkEntry *entry)
 {
-	if (gtk_check_version(2, 15, 2) == NULL)
-	{
-		g_object_set(entry, "secondary-icon-stock", "gtk-clear", NULL);
-		g_signal_connect(entry, "icon-release", G_CALLBACK(entry_clear_icon_release_cb), NULL);
-	}
+	g_object_set(entry, "secondary-icon-stock", "gtk-clear", NULL);
+	g_signal_connect(entry, "icon-release", G_CALLBACK(entry_clear_icon_release_cb), NULL);
 }
 
 
@@ -2532,7 +2525,6 @@ void ui_editable_insert_text_callback(GtkEditable *editable, gchar *new_text,
 GdkPixbuf *ui_get_mime_icon(const gchar *mime_type, GtkIconSize size)
 {
 	GdkPixbuf *icon = NULL;
-#if GTK_CHECK_VERSION(2, 14, 0)
 	gchar *ctype;
 	GIcon *gicon;
 	GtkIconInfo *info;
@@ -2558,7 +2550,7 @@ GdkPixbuf *ui_get_mime_icon(const gchar *mime_type, GtkIconSize size)
 			gtk_icon_info_free(info);
 		}
 	}
-#endif
+
 	/* fallback for builds with GIO < 2.18 or if icon lookup failed, like it might happen on Windows */
 	if (icon == NULL)
 	{
diff --git a/src/utils.c b/src/utils.c
index eaf14754..9b9a71a4 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1871,23 +1871,21 @@ gboolean utils_is_remote_path(const gchar *path)
 		return TRUE;
 
 #ifndef G_OS_WIN32
-	if (glib_check_version(2, 16, 0) == NULL) /* no need to check for this with GLib < 2.16 */
-	{
-		static gchar *fuse_path = NULL;
-		static gsize len = 0;
+	static gchar *fuse_path = NULL;
+	static gsize len = 0;
 
-		if (G_UNLIKELY(fuse_path == NULL))
-		{
-			fuse_path = g_build_filename(g_get_home_dir(), ".gvfs", NULL);
-			len = strlen(fuse_path);
-		}
-		/* Comparing the file path against a hardcoded path is not the most elegant solution
-		 * but for now it is better than nothing. Ideally, g_file_new_for_path() should create
-		 * proper GFile objects for Fuse paths, but it only does in future GVFS
-		 * versions (gvfs 1.1.1). */
-		return (strncmp(path, fuse_path, len) == 0);
+	if (G_UNLIKELY(fuse_path == NULL))
+	{
+		fuse_path = g_build_filename(g_get_home_dir(), ".gvfs", NULL);
+		len = strlen(fuse_path);
 	}
+	/* Comparing the file path against a hardcoded path is not the most elegant solution
+	 * but for now it is better than nothing. Ideally, g_file_new_for_path() should create
+	 * proper GFile objects for Fuse paths, but it only does in future GVFS
+	 * versions (gvfs 1.1.1). */
+	return (strncmp(path, fuse_path, len) == 0);
 #endif
+
 	return FALSE;
 }
 
diff --git a/wscript b/wscript
index 0913ee9a..bcc23a8c 100644
--- a/wscript
+++ b/wscript
@@ -138,9 +138,9 @@ def configure(conf):
     _load_intltool_if_available(conf)
 
     # GTK / GIO version check
-    conf.check_cfg(package='gtk+-2.0', atleast_version='2.12.0', uselib_store='GTK',
+    conf.check_cfg(package='gtk+-2.0', atleast_version='2.16.0', uselib_store='GTK',
         mandatory=True, args='--cflags --libs')
-    conf.check_cfg(package='glib-2.0', atleast_version='2.16.0', uselib_store='GLIB',
+    conf.check_cfg(package='glib-2.0', atleast_version='2.20.0', uselib_store='GLIB',
         mandatory=True, args='--cflags --libs')
     conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=True)
     gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') or 'Unknown'

From 3cc02e6aa1f92a106a0817990ba6623dbfc7b66c Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 30 Oct 2011 12:26:48 +0100
Subject: [PATCH 38/70] Update of Polish translation

---
 po/ChangeLog |    5 +
 po/pl.po     | 5304 +++++++++++++++++++++++---------------------------
 2 files changed, 2480 insertions(+), 2829 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index d4c3f8bd..e4ce6885 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-31  Frank Lanitz  <frlan@frank.uvena.de>
+
+ * pl.po: Update of Polish translation. Thanks to Wojciech świderski.
+
+
 2011-10-06  Frank Lanitz  <frlan@frank.uvena.de>
 
  * sv.po: Update of Swedish translation
diff --git a/po/pl.po b/po/pl.po
index 42613a10..f96dd1ac 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,19 +1,20 @@
 # translation of pl.po to polski
 # Polish translations for geany package.
-# Copyright (C) 2006, 2007 THE geany'S COPYRIGHT HOLDER
+# Copyright (C) 2006 - 2011 THE geany'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the geany package.
 #
 # Jacek Wolszczak <shutdownrunner@o2.pl>, 2006.
 # Jaroslaw Foksa <jfoksa@gmail.com>, 2007.
-# Krzysztof Troska <elleander86@gmail.com> 2008.
+# Krzysztof Troska <elleander86@gmail.com>, 2008.
+# Wojciech świderski <woj.swiderski@gmail.com>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: geany 0.19\n"
+"Project-Id-Version: geany 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-17 09:51+0200\n"
-"PO-Revision-Date: 2007-09-26 21:22+0000\n"
-"Last-Translator: Jaroslaw Foksa <jfoksa@gmail.com>\n"
+"POT-Creation-Date: 2011-10-30 12:12+0100\n"
+"PO-Revision-Date: 2011-10-30 12:15+0100\n"
+"Last-Translator: Wojciech świderski <woj.swiderski@gmail.com>\n"
 "Language-Team: polski <geany-i18n@uvena.de>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -25,9 +26,11 @@ msgstr ""
 
 #: ../geany.desktop.in.h:1
 msgid "A fast and lightweight IDE using GTK2"
-msgstr "Geany - szybkie i lekkie środowisko programistyczne"
+msgstr "Szybkie i lekkie środowisko programistyczne oparte na GTK2"
 
-#: ../geany.desktop.in.h:2 ../src/interface.c:314 ../src/interface.c:1842
+#: ../geany.desktop.in.h:2
+#: ../src/interface.c:314
+#: ../src/interface.c:1842
 msgid "Geany"
 msgstr "Geany"
 
@@ -35,708 +38,689 @@ msgstr "Geany"
 msgid "Integrated Development Environment"
 msgstr "Zintegrowane środowisko programistyczne"
 
-#: ../src/about.c:155
+#: ../src/about.c:153
 msgid "About Geany"
 msgstr "O programie"
 
-#: ../src/about.c:205
+#: ../src/about.c:203
 msgid "A fast and lightweight IDE"
 msgstr ""
-"Geany - szybkie i lekkie\n"
+"Szybkie i lekkie\n"
 "środowisko programistyczne"
 
-#: ../src/about.c:226
+#: ../src/about.c:224
 #, c-format
 msgid "(built on or after %s)"
 msgstr "(kompilacja: %s)"
 
 #. gtk_container_add(GTK_CONTAINER(info_box), cop_label);
-#: ../src/about.c:257
+#: ../src/about.c:255
 msgid "Info"
 msgstr "Informacje"
 
-#: ../src/about.c:273
+#: ../src/about.c:271
 msgid "Developers"
 msgstr "Programiści"
 
-#: ../src/about.c:282
+#: ../src/about.c:280
 msgid "maintainer"
 msgstr "opiekun"
 
-#: ../src/about.c:290 ../src/about.c:298
+#: ../src/about.c:288
+#: ../src/about.c:296
 msgid "developer"
 msgstr "programista"
 
-#: ../src/about.c:306
+#: ../src/about.c:304
 msgid "translation maintainer"
 msgstr "opiekun tłumaczeń"
 
-#: ../src/about.c:315
+#: ../src/about.c:313
 msgid "Translators"
 msgstr "Tłumacze"
 
-#: ../src/about.c:335
+#: ../src/about.c:333
 msgid "Previous Translators"
 msgstr "Poprzedni tłumacze"
 
-#: ../src/about.c:356
-#, fuzzy
+#: ../src/about.c:354
 msgid "Contributors"
-msgstr "Konstruktory typów"
+msgstr "Współtwórcy"
 
-#: ../src/about.c:366
+#: ../src/about.c:364
 #, c-format
-msgid ""
-"Some of the many contributors (for a more detailed list, see the file %s):"
-msgstr ""
+msgid "Some of the many contributors (for a more detailed list, see the file %s):"
+msgstr "Wybrani współtwórcy (szczegółowa lista w pliku %s):"
 
-#: ../src/about.c:392
+#: ../src/about.c:390
 msgid "Credits"
 msgstr "Zasługi"
 
-#: ../src/about.c:406
+#: ../src/about.c:404
 msgid "License"
 msgstr "Licencja"
 
-#: ../src/about.c:415
-msgid ""
-"License text could not be found, please visit http://www.gnu.org/licenses/"
-"gpl-2.0.txt to view it online."
-msgstr ""
-"Tekst licencji nie został odnaleziony na komputerze. Przejdź pod adres "
-"http://www.gnu.org/licenses/gpl-2.0.txt aby zobaczyć licencję."
+#: ../src/about.c:413
+msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online."
+msgstr "Nie odnaleziono tekstu licencji. Licencja on-line pod adresem:http://www.gnu.org/licenses/gpl-2.0.txt"
 
 #. fall back to %d
-#: ../src/build.c:657
+#: ../src/build.c:658
 #, c-format
 msgid "failed to substitute %%p, no project active"
-msgstr ""
+msgstr "nie udało się zastąpić %%p, brak aktywnych projektów"
 
-#: ../src/build.c:695
-#, fuzzy
+#: ../src/build.c:696
 msgid "Process failed, no working directory"
-msgstr "Nie można zmienić katalogu bieżącego na \"%s\""
+msgstr "Proces zakończony niepowodzeniem, brak katalogu roboczego"
 
-#: ../src/build.c:721
+#: ../src/build.c:722
 #, c-format
 msgid "%s (in directory: %s)"
 msgstr "%s (w katalogu %s)"
 
-#: ../src/build.c:741 ../src/build.c:963 ../src/search.c:1626
+#: ../src/build.c:742
+#: ../src/build.c:964
+#: ../src/search.c:1619
 #, c-format
 msgid "Process failed (%s)"
-msgstr "Proces zakończył działanie z niepowodzeniem (%s)"
+msgstr "Proces zakończył się niepowodzeniem (%s)"
 
-#: ../src/build.c:809
+#: ../src/build.c:810
 #, c-format
 msgid "Failed to change the working directory to \"%s\""
 msgstr "Nie można zmienić katalogu bieżącego na \"%s\""
 
-#: ../src/build.c:838
+#: ../src/build.c:839
 #, c-format
 msgid "Failed to execute \"%s\" (start-script could not be created)"
-msgstr "Nie udało się wykonać %s (skrypt startowy nie mógł zostać utworzony)"
+msgstr "Nie udało się wykonać \"%s\" (skrypt startowy nie mógł zostać utworzony)"
 
-#: ../src/build.c:892
-msgid ""
-"Could not execute the file in the VTE because it probably contains a command."
-msgstr ""
+#: ../src/build.c:893
+msgid "Could not execute the file in the VTE because it probably contains a command."
+msgstr "Nie można wywołać pliku w wirtualnym terminalu, prawdopodobnie zawiera polecenie."
 
-#: ../src/build.c:930
+#: ../src/build.c:931
 #, c-format
-msgid ""
-"Could not find terminal \"%s\" (check path for Terminal tool setting in "
-"Preferences)"
-msgstr ""
-"Nie można odnaleźć terminala %s (sprawdź w ustawieniach ścieżkę do programu "
-"odpowiedzialnego za emulację terminala)"
+msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)"
+msgstr "Nie odnaleziono terminala \"%s\" (sprawdź w Ustawieniach ścieżkę do programu odpowiedzialnego za emulację terminala)"
 
-#: ../src/build.c:1103
+#: ../src/build.c:1104
 msgid "Compilation failed."
 msgstr "Kompilacja nie powiodła się"
 
-#: ../src/build.c:1117
+#: ../src/build.c:1118
 msgid "Compilation finished successfully."
-msgstr "Kompilacja została ukończona pomyślnie"
+msgstr "Kompilacja ukończona pomyślnie."
 
-#: ../src/build.c:1276
-#, fuzzy
+#: ../src/build.c:1287
 msgid "Custom Text"
-msgstr "Zbuduj przy użyciu własnych parametrów"
+msgstr "Własne parametry"
 
-#: ../src/build.c:1277
-#, fuzzy
+#: ../src/build.c:1288
 msgid "Enter custom text here, all entered text is appended to the command."
-msgstr ""
-"Wprowadź tutaj swoje opcje, wpisany tutaj tekst jest przekazywany do "
-"polecenia make"
+msgstr "Wprowadź własne opcje, zostaną przekazane do polecenia."
 
-#: ../src/build.c:1355
+#: ../src/build.c:1366
 msgid "_Next Error"
 msgstr "_Następny błąd"
 
-#: ../src/build.c:1357
-#, fuzzy
+#: ../src/build.c:1368
 msgid "_Previous Error"
-msgstr "_Poprzedni"
+msgstr "_Poprzedni błąd"
 
 #. arguments
-#: ../src/build.c:1367 ../src/build.c:2745
-#, fuzzy
+#: ../src/build.c:1378
+#: ../src/build.c:2756
 msgid "_Set Build Commands"
-msgstr "Ustaw zewnętrzne polecenia"
-
-#: ../src/build.c:1651 ../src/toolbar.c:374
-#, fuzzy
-msgid "Build the current file"
-msgstr "Kompiluje bieżący plik"
+msgstr "Z_definiuj polecenia budowania"
 
 #: ../src/build.c:1662
-#, fuzzy
+#: ../src/toolbar.c:372
+msgid "Build the current file"
+msgstr "Kompiluje bieżący plik z poleceniem 'build'"
+
+#: ../src/build.c:1673
 msgid "Build the current file with Make and the default target"
-msgstr "Buduje bieżący plik z użyciem narzędzia make i domyślnych parametrów"
+msgstr "Kompiluje bieżący plik z przy pomocy 'make' i domyślnego celu"
 
-#: ../src/build.c:1664
-#, fuzzy
+#: ../src/build.c:1675
 msgid "Build the current file with Make and the specified target"
-msgstr "Buduje bieżący plik przy użyciu narzędzia make"
+msgstr "Kompiluje bieżący plik z przy pomocy 'make' i wskazanego celu"
 
-#: ../src/build.c:1666
-#, fuzzy
+#: ../src/build.c:1677
 msgid "Compile the current file with Make"
-msgstr "Kompiluje bieżący plik"
+msgstr "Kompiluje bieżący plik z poleceniem 'make'"
 
-#: ../src/build.c:1693
+#: ../src/build.c:1704
 #, c-format
 msgid "Process could not be stopped (%s)."
 msgstr "Proces nie może zostać zatrzymany(%s)."
 
-#: ../src/build.c:1710 ../src/build.c:1722
+#: ../src/build.c:1721
+#: ../src/build.c:1733
 msgid "No more build errors."
 msgstr "Nie wystąpiło więcej błędów podczas budowania."
 
 #. FIXME: we should pass either build dialog or project dialog instead of NULL for parent
-#: ../src/build.c:1818
+#: ../src/build.c:1829
 msgid "Set menu item label"
-msgstr ""
+msgstr "Przypisz etykietę w menu"
 
-#: ../src/build.c:1844 ../src/symbols.c:737
+#: ../src/build.c:1855
+#: ../src/symbols.c:735
 msgid "Label"
 msgstr "Etykieta"
 
-#: ../src/build.c:1845 ../src/symbols.c:732 ../src/tools.c:526
+#: ../src/build.c:1856
+#: ../src/symbols.c:730
+#: ../src/tools.c:524
 msgid "Command"
 msgstr "Polecenie"
 
-#: ../src/build.c:1846
-#, fuzzy
+#: ../src/build.c:1857
 msgid "Working directory"
-msgstr "Ka_talog:"
+msgstr "Ka_talog bieżący:"
 
-#: ../src/build.c:1847
-#, fuzzy
+#: ../src/build.c:1858
 msgid "Reset"
-msgstr "Pomniejsz"
+msgstr "Przywróć wyjściowe (reset)"
 
-#: ../src/build.c:1892
+#: ../src/build.c:1903
 msgid "Click to set menu item label"
-msgstr ""
+msgstr "Kliknij, by przypisać etykietę w menu"
 
-#: ../src/build.c:1976 ../src/build.c:1978
-#, fuzzy, c-format
+#: ../src/build.c:1987
+#: ../src/build.c:1989
+#, c-format
 msgid "%s commands"
 msgstr "%s poleceń"
 
-#: ../src/build.c:1978
-#, fuzzy
+#: ../src/build.c:1989
 msgid "No filetype"
-msgstr "Ustaw typ _pliku"
+msgstr "Nie podano typu pliku"
 
-#: ../src/build.c:1987 ../src/build.c:2022
-#, fuzzy
+#: ../src/build.c:1998
+#: ../src/build.c:2033
 msgid "Error regular expression:"
-msgstr "Wyrażenia regularne _Grep"
+msgstr "Błędne wyrażenie regularne:"
 
-#: ../src/build.c:2015
-#, fuzzy
+#: ../src/build.c:2026
 msgid "Independent commands"
-msgstr "Wstaw komentarz"
+msgstr "Polecenia uniwersalne"
 
-#: ../src/build.c:2047
+#: ../src/build.c:2058
 msgid "Note: Item 2 opens a dialog and appends the response to the command."
-msgstr ""
+msgstr "Uwaga: wybór 2 otwiera okno dialogowe i dołącza odpowiedź użytkownika do polecenia."
 
-#: ../src/build.c:2056
-#, fuzzy
+#: ../src/build.c:2067
 msgid "Execute commands"
-msgstr "Ustaw zewnętrzne polecenia"
+msgstr "Wykonaj polecenia"
 
-#: ../src/build.c:2068
+#: ../src/build.c:2079
 #, c-format
-msgid ""
-"%d, %e, %f, %p are substituted in command and directory fields, see manual "
-"for details."
-msgstr ""
+msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details."
+msgstr "%d, %e, %f, %p są podstawiane w poleceniu oraz jako katalogi - szczegóły w dokumentacji."
 
-#: ../src/build.c:2225
-#, fuzzy
+#: ../src/build.c:2236
 msgid "Set Build Commands"
-msgstr "Ustaw zewnętrzne polecenia"
+msgstr "_Zdefiniuj polecenia budowania (build)"
 
-#: ../src/build.c:2436
+#: ../src/build.c:2447
 msgid "_Compile"
 msgstr "_Skompiluj"
 
 #. build the code
-#: ../src/build.c:2443 ../src/build.c:2705 ../src/interface.c:1245
+#: ../src/build.c:2454
+#: ../src/build.c:2716
+#: ../src/interface.c:1245
 msgid "_Build"
 msgstr "Z_buduj"
 
-#: ../src/build.c:2450 ../src/build.c:2480 ../src/build.c:2673
-#, fuzzy
+#: ../src/build.c:2461
+#: ../src/build.c:2491
+#: ../src/build.c:2684
 msgid "_Execute"
-msgstr "Wykonaj:"
+msgstr "_Wykonaj"
 
 #. build the code with make custom
-#: ../src/build.c:2495 ../src/build.c:2671 ../src/build.c:2725
+#: ../src/build.c:2506
+#: ../src/build.c:2682
+#: ../src/build.c:2736
 msgid "Make Custom _Target"
-msgstr "Zbuduj przy użyciu własnych parame_trów"
+msgstr "Zlinkuj z własnym _celem (make)"
 
 #. build the code with make object
-#: ../src/build.c:2497 ../src/build.c:2672 ../src/build.c:2733
+#: ../src/build.c:2508
+#: ../src/build.c:2683
+#: ../src/build.c:2744
 msgid "Make _Object"
-msgstr "Zbuduj _obiekt"
+msgstr "Zlinkuj _obiekt (make)"
 
-#: ../src/build.c:2499 ../src/build.c:2670
-#, fuzzy
+#: ../src/build.c:2510
+#: ../src/build.c:2681
 msgid "_Make"
-msgstr "Program Make:"
+msgstr "_Make"
 
 #. build the code with make all
-#: ../src/build.c:2717
+#: ../src/build.c:2728
 msgid "_Make All"
-msgstr "Zbuduj _wszystko"
+msgstr "Zlinkuj _wszystko (make)"
 
-#: ../src/callbacks.c:149
+#: ../src/callbacks.c:147
 msgid "Do you really want to quit?"
 msgstr " Czy na pewno chcesz zakończyć program? "
 
-#: ../src/callbacks.c:219
+#: ../src/callbacks.c:216
 #, fuzzy, c-format
 msgid "%d file saved."
 msgid_plural "%d files saved."
-msgstr[0] "Plik %s został zapisany."
-msgstr[1] "Plik %s został zapisany."
+msgstr[0] "Plik %d został zapisany."
+msgstr[1] "Plik %d został zapisany."
 
-#: ../src/callbacks.c:443 ../src/document.c:2925 ../src/interface.c:385
-#: ../src/sidebar.c:684
+#: ../src/callbacks.c:440
+#: ../src/document.c:2882
+#: ../src/interface.c:385
+#: ../src/sidebar.c:679
 msgid "_Reload"
 msgstr "Wczytaj _ponownie"
 
-#: ../src/callbacks.c:444
+#: ../src/callbacks.c:441
 msgid "Any unsaved changes will be lost."
 msgstr "Wszystkie niezapisane zmiany zostaną utracone."
 
-#: ../src/callbacks.c:445
+#: ../src/callbacks.c:442
 #, c-format
 msgid "Are you sure you want to reload '%s'?"
 msgstr "Czy na pewno chcesz czytać ponownie '%s'?"
 
-#: ../src/callbacks.c:1066 ../src/keybindings.c:425
+#: ../src/callbacks.c:1066
+#: ../src/keybindings.c:448
 msgid "Go to Line"
 msgstr "Przejdź do wiersza"
 
 #: ../src/callbacks.c:1067
 msgid "Enter the line you want to go to:"
-msgstr "Wprowadź numer wiersza do którego chcesz przejść:"
+msgstr "Wprowadź numer wiersza, do którego chcesz przejść:"
 
-#: ../src/callbacks.c:1150 ../src/callbacks.c:1175
-msgid ""
-"Please set the filetype for the current file before using this function."
-msgstr "Ustaw typ dla bieżącego pliku zanim użyjesz tę funkcję"
+#: ../src/callbacks.c:1150
+#: ../src/callbacks.c:1175
+msgid "Please set the filetype for the current file before using this function."
+msgstr "Ustaw typ dla bieżącego pliku zanim użyjesz tej funkcji"
 
-#: ../src/callbacks.c:1280 ../src/ui_utils.c:619
+#: ../src/callbacks.c:1280
+#: ../src/ui_utils.c:617
 msgid "dd.mm.yyyy"
 msgstr "dd.mm.rrrr"
 
-#: ../src/callbacks.c:1282 ../src/ui_utils.c:620
+#: ../src/callbacks.c:1282
+#: ../src/ui_utils.c:618
 msgid "mm.dd.yyyy"
 msgstr "mm.dd.rrrr"
 
-#: ../src/callbacks.c:1284 ../src/ui_utils.c:621
+#: ../src/callbacks.c:1284
+#: ../src/ui_utils.c:619
 msgid "yyyy/mm/dd"
 msgstr "rrrr/mm/dd"
 
-#: ../src/callbacks.c:1286 ../src/ui_utils.c:630
+#: ../src/callbacks.c:1286
+#: ../src/ui_utils.c:628
 msgid "dd.mm.yyyy hh:mm:ss"
 msgstr "dd.mm.rrrr gg:mm:ss"
 
-#: ../src/callbacks.c:1288 ../src/ui_utils.c:631
+#: ../src/callbacks.c:1288
+#: ../src/ui_utils.c:629
 msgid "mm.dd.yyyy hh:mm:ss"
 msgstr "mm.dd.rrrr gg:mm:ss"
 
-#: ../src/callbacks.c:1290 ../src/ui_utils.c:632
+#: ../src/callbacks.c:1290
+#: ../src/ui_utils.c:630
 msgid "yyyy/mm/dd hh:mm:ss"
 msgstr "rrrr/mm/dd gg:mm:ss"
 
-#: ../src/callbacks.c:1292 ../src/ui_utils.c:641
-#, fuzzy
+#: ../src/callbacks.c:1292
+#: ../src/ui_utils.c:639
 msgid "_Use Custom Date Format"
-msgstr "Użyj własnego formatu daty"
+msgstr "_Użyj własnego formatu daty"
 
 #: ../src/callbacks.c:1296
 msgid "Custom Date Format"
 msgstr "Własny format daty"
 
 #: ../src/callbacks.c:1297
-msgid ""
-"Enter here a custom date and time format. You can use any conversion "
-"specifiers which can be used with the ANSI C strftime function."
-msgstr ""
-"Wprowadź własny format daty i czasu. Możesz używać dowolne operatory "
-"konwersji dostępne w funkcji strftime języka ANSI C."
+msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function."
+msgstr "Wprowadź własny format daty i czasu. Możesz używać dowolne operatory konwersji dostępne w funkcji strftime języka ANSI C."
 
 #: ../src/callbacks.c:1320
 msgid "Date format string could not be converted (possibly too long)."
 msgstr "Format daty nie mógł zostać skonwertowany (prawdopodobnie za długi)"
 
-#: ../src/callbacks.c:1515 ../src/callbacks.c:1523
+#: ../src/callbacks.c:1513
+#: ../src/callbacks.c:1521
 msgid "No more message items."
 msgstr "Nie ma więcej komunikatów"
 
-#: ../src/dialogs.c:229
+#: ../src/dialogs.c:226
 msgid "Detect from file"
 msgstr "Według zawartości pliku"
 
-#: ../src/dialogs.c:232
-#, fuzzy
+#: ../src/dialogs.c:229
 msgid "West European"
-msgstr "_Zachodnioeuropejskie"
+msgstr "Zachodnioeuropejskie"
 
-#: ../src/dialogs.c:234
-#, fuzzy
+#: ../src/dialogs.c:231
 msgid "East European"
-msgstr "_Wschodnioeuropejskie"
+msgstr "Wschodnioeuropejskie"
 
-#: ../src/dialogs.c:236
-#, fuzzy
+#: ../src/dialogs.c:233
 msgid "East Asian"
-msgstr "_Południowoazjatyckie"
+msgstr "Wschodnioazjatyckie"
 
-#: ../src/dialogs.c:238
-#, fuzzy
+#: ../src/dialogs.c:235
 msgid "SE & SW Asian"
-msgstr "_Azja Płd.-Wsch. i Płd.-Zach."
+msgstr "Azja Płd.-Wsch. i Płd.-Zach."
 
-#: ../src/dialogs.c:240
-#, fuzzy
+#: ../src/dialogs.c:237
 msgid "Middle Eastern"
-msgstr "_Bliskowschodnie"
+msgstr "Bliskowschodnie"
 
-#: ../src/dialogs.c:242 ../src/encodings.c:120 ../src/encodings.c:121
-#: ../src/encodings.c:122 ../src/encodings.c:123 ../src/encodings.c:124
-#: ../src/encodings.c:125 ../src/encodings.c:126 ../src/encodings.c:127
+#: ../src/dialogs.c:239
+#: ../src/encodings.c:118
+#: ../src/encodings.c:119
+#: ../src/encodings.c:120
+#: ../src/encodings.c:121
+#: ../src/encodings.c:122
+#: ../src/encodings.c:123
+#: ../src/encodings.c:124
+#: ../src/encodings.c:125
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../src/dialogs.c:291
-#, fuzzy
+#: ../src/dialogs.c:288
 msgid "_More Options"
-msgstr "Opcje"
+msgstr "_Więcej opcji"
 
 #. line 1 with checkbox and encoding combo
-#: ../src/dialogs.c:298
+#: ../src/dialogs.c:295
 msgid "Show _hidden files"
-msgstr "Wyświetlanie _ukrytych plików"
+msgstr "Pokaż _ukryte pliki"
 
-#: ../src/dialogs.c:309
+#: ../src/dialogs.c:306
 msgid "Set encoding:"
-msgstr "Ustaw kodowanie znaków"
+msgstr "Ustaw kodowanie znaków:"
 
-#: ../src/dialogs.c:318
+#: ../src/dialogs.c:315
 msgid ""
-"Explicitly defines an encoding for the file, if it would not be detected. "
-"This is useful when you know that the encoding of a file cannot be detected "
-"correctly by Geany.\n"
-"Note if you choose multiple files, they will all be opened with the chosen "
-"encoding."
+"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n"
+"Note if you choose multiple files, they will all be opened with the chosen encoding."
 msgstr ""
-"Jednoznacznie definiuje kodowanie znaków dla pliku. Ta opcja jest przydatna, "
-"jeżeli wiesz, że Geany nie będzie potrafił określić prawidłowo kodowania. "
-"Jeżeli wybierzesz więcej plików, wszystkie zostaną otwarte z wybranym "
-"kodowaniem."
+"Jednoznacznie definiuje kodowanie znaków dla pliku. Ta opcja jest przydatna, jeżeli wiadomo, że Geany nie rozpozna kodowania prawidłowo.\n"
+"W przypadku większej liczby plików wszystkie zostaną otwarte z wybranym kodowaniem."
 
 #. line 2 with filetype combo
-#: ../src/dialogs.c:325
+#: ../src/dialogs.c:322
 msgid "Set filetype:"
 msgstr "Typ pliku:"
 
-#: ../src/dialogs.c:335
+#: ../src/dialogs.c:332
 msgid ""
-"Explicitly defines a filetype for the file, if it would not be detected by "
-"filename extension.\n"
-"Note if you choose multiple files, they will all be opened with the chosen "
-"filetype."
+"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n"
+"Note if you choose multiple files, they will all be opened with the chosen filetype."
 msgstr ""
-"Jednoznacznie określony typ pliku gdyby nie został on wykryty na podstawie "
-"rozszerzenia.\n"
-"Jeżeli wybierzesz kilka plików, określony typ zostanie zastosowany do "
-"wszystkich plików."
+"Jednoznacznie określony typ pliku gdyby nie został on wykryty na podstawie rozszerzenia.\n"
+"Jeżeli wybierzesz kilka plików, określony typ zostanie zastosowany do wszystkich plików."
 
-#: ../src/dialogs.c:364 ../src/dialogs.c:469
+#: ../src/dialogs.c:361
+#: ../src/dialogs.c:465
 msgid "Open File"
 msgstr "Otwieranie pliku"
 
-#: ../src/dialogs.c:368 ../src/interface.c:877
+#: ../src/dialogs.c:365
+#: ../src/interface.c:877
 msgid "_View"
-msgstr "P_okaż"
+msgstr "_Widok"
 
-#: ../src/dialogs.c:370
-msgid ""
-"Opens the file in read-only mode. If you choose more than one file to open, "
-"all files will be opened read-only."
-msgstr ""
-"Otwiera plik w trybie tylko do odczytu. Jeżeli wybierzesz więcej niż jeden "
-"plik do otwarcia, wszystkie pliki zostaną otwarte w tym trybie."
+#: ../src/dialogs.c:367
+msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only."
+msgstr "Otwiera plik w trybie tylko do odczytu. Jeżeli wybierzesz więcej niż jeden plik do otwarcia, wszystkie pliki zostaną otwarte w tym trybie."
 
-#: ../src/dialogs.c:391
+#: ../src/dialogs.c:387
 msgid "Detect by file extension"
 msgstr "Według rozszerzenia"
 
-#: ../src/dialogs.c:548
+#: ../src/dialogs.c:544
 msgid "Overwrite?"
-msgstr ""
+msgstr "Nadpisać?"
 
-#: ../src/dialogs.c:549
+#: ../src/dialogs.c:545
 msgid "Filename already exists!"
-msgstr ""
+msgstr "Plik o takiej nazwie już istnieje!"
 
-#: ../src/dialogs.c:584 ../src/dialogs.c:710
+#: ../src/dialogs.c:580
+#: ../src/dialogs.c:706
 msgid "Save File"
 msgstr "Zapisz plik"
 
-#: ../src/dialogs.c:593
+#: ../src/dialogs.c:589
 msgid "R_ename"
 msgstr "Z_mień nazwę"
 
-#: ../src/dialogs.c:594
-#, fuzzy
+#: ../src/dialogs.c:590
 msgid "Save the file and rename it"
-msgstr "Zapisz plik i zmień jego nazwę."
+msgstr "Zapisz plik i zmień jego nazwę"
 
-#: ../src/dialogs.c:602
+#: ../src/dialogs.c:598
 msgid "_Open file in a new tab"
 msgstr "O_twórz plik w nowej zakładce"
 
-#: ../src/dialogs.c:605
+#: ../src/dialogs.c:601
 #, fuzzy
-msgid ""
-"Keep the current unsaved document open and open the newly saved file in a "
-"new tab"
-msgstr ""
-"Otwórz plik w nowej zakładce (nie zamykaj bieżących niezapisanych plików)."
+msgid "Keep the current unsaved document open and open the newly saved file in a new tab"
+msgstr "Nie zamykaj bieżącego dokumentu, otwórz zapisany dokument w nowej karcie"
 
-#: ../src/dialogs.c:728 ../src/win32.c:683
+#: ../src/dialogs.c:724
+#: ../src/win32.c:679
 msgid "Error"
 msgstr "Błąd"
 
-#: ../src/dialogs.c:731 ../src/dialogs.c:1609 ../src/win32.c:689
-#: ../src/win32.c:748
+#: ../src/dialogs.c:727
+#: ../src/dialogs.c:810
+#: ../src/dialogs.c:1597
+#: ../src/win32.c:685
 msgid "Question"
 msgstr "Pytanie"
 
-#: ../src/dialogs.c:734 ../src/win32.c:695
+#: ../src/dialogs.c:730
+#: ../src/win32.c:691
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../src/dialogs.c:737 ../src/win32.c:701
+#: ../src/dialogs.c:733
+#: ../src/win32.c:697
 msgid "Information"
 msgstr "Informacja"
 
-#: ../src/dialogs.c:818
+#: ../src/dialogs.c:814
 msgid "_Don't save"
 msgstr "_Nie zapisuj"
 
-#: ../src/dialogs.c:849
+#: ../src/dialogs.c:843
 #, c-format
 msgid "The file '%s' is not saved."
 msgstr "Plik %s nie został zapisany."
 
-#: ../src/dialogs.c:851
+#: ../src/dialogs.c:844
 msgid "Do you want to save it before closing?"
 msgstr "Czy chcesz go zapisać przed zamknięciem programu?"
 
-#: ../src/dialogs.c:923
+#: ../src/dialogs.c:911
 msgid "Choose font"
 msgstr "Wybór czcionki"
 
-#: ../src/dialogs.c:1221
-msgid ""
-"An error occurred or file information could not be retrieved (e.g. from a "
-"new file)."
-msgstr ""
-"Wystąpił błąd lub pobieranie informacji o pliku nie powiodło się (czy plik "
-"został zapisany?)"
+#: ../src/dialogs.c:1209
+msgid "An error occurred or file information could not be retrieved (e.g. from a new file)."
+msgstr "Wystąpił błąd lub pobieranie informacji o pliku nie powiodło się (czy plik został zapisany?)"
 
-#: ../src/dialogs.c:1240 ../src/dialogs.c:1241 ../src/dialogs.c:1242
-#: ../src/dialogs.c:1248 ../src/dialogs.c:1249 ../src/dialogs.c:1250
-#: ../src/symbols.c:1999 ../src/symbols.c:2020 ../src/symbols.c:2072
-#: ../src/ui_utils.c:244
+#: ../src/dialogs.c:1228
+#: ../src/dialogs.c:1229
+#: ../src/dialogs.c:1230
+#: ../src/dialogs.c:1236
+#: ../src/dialogs.c:1237
+#: ../src/dialogs.c:1238
+#: ../src/symbols.c:1997
+#: ../src/symbols.c:2018
+#: ../src/symbols.c:2070
+#: ../src/ui_utils.c:242
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../src/dialogs.c:1255 ../src/symbols.c:887
+#: ../src/dialogs.c:1243
+#: ../src/symbols.c:885
 msgid "Properties"
-msgstr "Właściwości"
+msgstr "Własności"
 
-#: ../src/dialogs.c:1286
+#: ../src/dialogs.c:1274
 msgid "<b>Type:</b>"
 msgstr "<b>Typ:</b>"
 
-#: ../src/dialogs.c:1300
+#: ../src/dialogs.c:1288
 msgid "<b>Size:</b>"
 msgstr "<b>Rozmiar:</b>"
 
-#: ../src/dialogs.c:1316
+#: ../src/dialogs.c:1304
 msgid "<b>Location:</b>"
 msgstr "<b>Położenie:</b>"
 
-#: ../src/dialogs.c:1330
+#: ../src/dialogs.c:1318
 msgid "<b>Read-only:</b>"
 msgstr "<b>Tylko do odczytu:</b>"
 
-#: ../src/dialogs.c:1337
+#: ../src/dialogs.c:1325
 msgid "(only inside Geany)"
 msgstr "(tylko wewnątrz Geany)"
 
-#: ../src/dialogs.c:1346
+#: ../src/dialogs.c:1334
 msgid "<b>Encoding:</b>"
 msgstr "<b>Kodowanie:</b>"
 
-#: ../src/dialogs.c:1356 ../src/ui_utils.c:248
+#: ../src/dialogs.c:1344
+#: ../src/ui_utils.c:246
 msgid "(with BOM)"
 msgstr "(z BOM)"
 
-#: ../src/dialogs.c:1356
+#: ../src/dialogs.c:1344
 msgid "(without BOM)"
 msgstr "(bez BOM)"
 
-#: ../src/dialogs.c:1367
+#: ../src/dialogs.c:1355
 msgid "<b>Modified:</b>"
 msgstr "<b>Ostatnia modyfikacja:</b>"
 
-#: ../src/dialogs.c:1381
+#: ../src/dialogs.c:1369
 msgid "<b>Changed:</b>"
 msgstr "<b>Ostatnia zmiana:</b>"
 
-#: ../src/dialogs.c:1395
+#: ../src/dialogs.c:1383
 msgid "<b>Accessed:</b>"
 msgstr "<b>Ostatni dostęp:</b>"
 
-#: ../src/dialogs.c:1417
+#: ../src/dialogs.c:1405
 msgid "<b>Permissions:</b>"
 msgstr "<b>Uprawnienia:</b>"
 
 #. Header
-#: ../src/dialogs.c:1425
+#: ../src/dialogs.c:1413
 msgid "Read:"
 msgstr "Odczyt:"
 
-#: ../src/dialogs.c:1432
+#: ../src/dialogs.c:1420
 msgid "Write:"
 msgstr "Zapis:"
 
-#: ../src/dialogs.c:1439
+#: ../src/dialogs.c:1427
 msgid "Execute:"
 msgstr "Wykonaj:"
 
 #. Owner
-#: ../src/dialogs.c:1447
+#: ../src/dialogs.c:1435
 msgid "Owner:"
 msgstr "Właściciel:"
 
 #. Group
-#: ../src/dialogs.c:1483
+#: ../src/dialogs.c:1471
 msgid "Group:"
 msgstr "Grupa:"
 
 #. Other
-#: ../src/dialogs.c:1519
+#: ../src/dialogs.c:1507
 msgid "Other:"
 msgstr "Inni:"
 
-#: ../src/document.c:641
+#: ../src/document.c:643
 #, c-format
 msgid "File %s closed."
 msgstr "Zamknięto plik %s."
 
-#: ../src/document.c:789
+#: ../src/document.c:791
 #, c-format
 msgid "New file \"%s\" opened."
 msgstr "Został otwarty nowy plik \"%s\""
 
-#: ../src/document.c:840 ../src/document.c:1362
+#: ../src/document.c:842
+#: ../src/document.c:1369
 #, c-format
 msgid "Could not open file %s (%s)"
 msgstr "Nie można otworzyć pliku %s (%s)"
 
-#: ../src/document.c:860
+#: ../src/document.c:862
 #, c-format
 msgid "The file \"%s\" is not valid %s."
 msgstr "Plik \"%s\" nie istnieje %s"
 
-#: ../src/document.c:866
+#: ../src/document.c:868
 #, c-format
-msgid ""
-"The file \"%s\" does not look like a text file or the file encoding is not "
-"supported."
-msgstr ""
-"Plik \"%s\" nie jest plikiem tekstowym lub jego kodowanie nie jest "
-"obsługiwane."
+msgid "The file \"%s\" does not look like a text file or the file encoding is not supported."
+msgstr "Plik \"%s\" nie jest plikiem tekstowym lub jego kodowanie nie jest obsługiwane."
 
-#: ../src/document.c:876
+#: ../src/document.c:878
 #, c-format
 msgid ""
-"The file \"%s\" could not be opened properly and has been truncated. This "
-"can occur if the file contains a NULL byte. Be aware that saving it can "
-"cause data loss.\n"
+"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n"
 "The file was set to read-only."
 msgstr ""
-"Plik \"%s\" nie został poprawnie otwarty - został skrócony o część swojej "
-"zawartości. Przyczyną może być np. nieoczekiwane wystąpienie bitu NULL. "
-"Zapisanie pliku w obecnej postaci może spowodować utratą danych.\n"
+"Plik \"%s\" nie został poprawnie otwarty - został skrócony o część swojej zawartości. Przyczyną może być np. nieoczekiwane wystąpienie bitu NULL. Zapisanie pliku w obecnej postaci może spowodować utratą danych.\n"
 "Plik został otwarty w trybie tylko do odczytu."
 
-#: ../src/document.c:1078
+#: ../src/document.c:1080
 msgid "Spaces"
 msgstr "Spacje"
 
-#: ../src/document.c:1081
+#: ../src/document.c:1083
 msgid "Tabs"
 msgstr "Znaki tabulacji"
 
-#: ../src/document.c:1084
-#, fuzzy
+#: ../src/document.c:1086
 msgid "Tabs and Spaces"
-msgstr "Zamień znaki tabulacji na _spacje"
+msgstr "Spacje i znaki tabulacji"
 
 #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs
 #. * and Spaces), the second one is the filename
-#: ../src/document.c:1089
-#, fuzzy, c-format
+#: ../src/document.c:1091
+#, c-format
 msgid "Setting %s indentation mode for %s."
-msgstr "Automatyczne wcięcia"
+msgstr "Ustawienie %s trybu wcięć na %s."
 
-#: ../src/document.c:1100
-#, fuzzy, c-format
+#: ../src/document.c:1102
+#, c-format
 msgid "Setting indentation width to %d for %s."
-msgstr "Automatyczne wcięcia"
+msgstr "Ustawienie wielkości wcięć na %d w %s."
 
-#: ../src/document.c:1137 ../src/document.c:1737
+#: ../src/document.c:1146
+#: ../src/document.c:1744
 msgid "Invalid filename"
 msgstr "Niepoprawna nazwa pliku"
 
-#: ../src/document.c:1251
+#: ../src/document.c:1258
 #, c-format
 msgid "File %s reloaded."
 msgstr "Wczytano ponownie plik %s."
@@ -744,106 +728,111 @@ msgstr "Wczytano ponownie plik %s."
 #. For translators: this is the status window message for opening a file. %d is the number
 #. * of the newly opened file, %s indicates whether the file is opened read-only
 #. * (it is replaced with the string ", read-only").
-#: ../src/document.c:1259
+#: ../src/document.c:1266
 #, c-format
 msgid "File %s opened(%d%s)."
 msgstr "Otwarto plik %s (%d%s)."
 
-#: ../src/document.c:1261
+#: ../src/document.c:1268
 msgid ", read-only"
 msgstr ", tylko do odczytu"
 
-#: ../src/document.c:1456
-#, fuzzy
+#: ../src/document.c:1463
 msgid "Error renaming file."
-msgstr "Błąd przy zapisywaniu pliku."
+msgstr "Błąd przy próbie zmiany nazwy pliku."
 
-#: ../src/document.c:1543
-#, fuzzy, c-format
-msgid ""
-"An error occurred while converting the file from UTF-8 in \"%s\". The file "
-"remains unsaved."
-msgstr ""
-"Wystąpił błąd podczas konwersji bliku z UTF-8 w \"%s\". Plik nie został "
-"zapisany.\n"
-"Komunikat błędu: %s\n"
+#: ../src/document.c:1550
+#, c-format
+msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved."
+msgstr "Błąd podczas konwersji bliku ze standardu UTF-8 do \"%s\". Plik nie został zapisany."
 
-#: ../src/document.c:1565
+#: ../src/document.c:1572
 #, c-format
 msgid ""
 "Error message: %s\n"
 "The error occurred at \"%s\" (line: %d, column: %d)."
 msgstr ""
+"Błąd: %s\n"
+"Wystąpił błąd w \"%s\" (wiersz %d, kolumna %d)"
 
-#: ../src/document.c:1570
-#, fuzzy, c-format
+#: ../src/document.c:1577
+#, c-format
 msgid "Error message: %s."
-msgstr "Błąd przy zapisywaniu pliku (%s)."
+msgstr "Błąd: (%s)."
 
-#: ../src/document.c:1630
+#: ../src/document.c:1637
 #, c-format
 msgid "Failed to open file '%s' for writing: fopen() failed: %s"
-msgstr ""
+msgstr "Nie można otworzyć pliku '%s' do zapisu: błąd fopen(): %s"
 
-#: ../src/document.c:1648
+#: ../src/document.c:1655
 #, c-format
 msgid "Failed to write file '%s': fwrite() failed: %s"
-msgstr ""
+msgstr "Nie można zapisać pliku '%s': błąd fwrite(): %s"
 
-#: ../src/document.c:1662
+#: ../src/document.c:1669
 #, c-format
 msgid "Failed to close file '%s': fclose() failed: %s"
-msgstr ""
+msgstr "Nie można zamknąć pliku '%s': błąd fclose(): %s"
 
-#: ../src/document.c:1737 ../src/document.c:1802
+#: ../src/document.c:1744
+#: ../src/document.c:1809
 #, c-format
 msgid "Error saving file (%s)."
 msgstr "Błąd przy zapisywaniu pliku (%s)."
 
-#: ../src/document.c:1807
+#: ../src/document.c:1814
 #, c-format
 msgid ""
 "%s\n"
 "\n"
 "The file on disk may now be truncated!"
 msgstr ""
+"%s\n"
+"\n"
+"Plik na dysku może zostać ucięty!"
 
-#: ../src/document.c:1809
+#: ../src/document.c:1816
 msgid "Error saving file."
 msgstr "Błąd przy zapisywaniu pliku."
 
-#: ../src/document.c:1833
+#: ../src/document.c:1840
 #, c-format
 msgid "File %s saved."
 msgstr "Plik %s został zapisany."
 
-#: ../src/document.c:1910 ../src/document.c:1974 ../src/document.c:1982
+#: ../src/document.c:1917
+#: ../src/document.c:1981
+#: ../src/document.c:1989
 #, c-format
 msgid "\"%s\" was not found."
 msgstr "\"%s\" nie został znaleziony"
 
-#: ../src/document.c:1982
+#: ../src/document.c:1989
 msgid "Wrap search and find again?"
 msgstr "Rozpocząć wyszukiwanie od początku pliku?"
 
-#: ../src/document.c:2068 ../src/search.c:1281 ../src/search.c:1325
-#: ../src/search.c:2063 ../src/search.c:2064
+#: ../src/document.c:2075
+#: ../src/search.c:1274
+#: ../src/search.c:1318
+#: ../src/search.c:2056
+#: ../src/search.c:2057
 #, c-format
 msgid "No matches found for \"%s\"."
 msgstr "Nie znaleziono tekstu '%s'."
 
-#: ../src/document.c:2074
+#: ../src/document.c:2081
 #, fuzzy, c-format
 msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"."
 msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"."
 msgstr[0] "%s: zastąpiono %d wystąpienia ciągu %s na ciąg \"%s\"."
 msgstr[1] "%s: zastąpiono %d wystąpienia ciągu %s na ciąg \"%s\"."
 
-#: ../src/document.c:2926
+#: ../src/document.c:2883
 msgid "Do you want to reload it?"
 msgstr "Chcesz wczytać go ponownie?"
 
-#: ../src/document.c:2927
+#: ../src/document.c:2884
 #, c-format
 msgid ""
 "The file '%s' on the disk is more recent than\n"
@@ -852,254 +841,284 @@ msgstr ""
 "Plik '%s' na dysku jest nowszy niż plik\n"
 "znajdujący się w bieżącym buforze."
 
-#: ../src/document.c:2945
+#: ../src/document.c:2902
 msgid "Close _without saving"
-msgstr ""
+msgstr "Zamknij _bez zapisywania"
 
-#: ../src/document.c:2948
+#: ../src/document.c:2905
 msgid "Try to resave the file?"
-msgstr ""
+msgstr "Ponowić próbę zapisu?"
 
-#: ../src/document.c:2949
-#, fuzzy, c-format
+#: ../src/document.c:2906
+#, c-format
 msgid "File \"%s\" was not found on disk!"
-msgstr "\"%s\" nie został znaleziony"
+msgstr "Pliku \"%s\" nie znaleziono na dysku!"
 
-#: ../src/editor.c:4341
-#, fuzzy
+#: ../src/editor.c:4337
 msgid "Enter Tab Width"
-msgstr "Szerokość tabulacji"
+msgstr "Podaj wielkość tabulacji"
 
-#: ../src/editor.c:4342
+#: ../src/editor.c:4338
 msgid "Enter the amount of spaces which should be replaced by a tab character."
-msgstr ""
+msgstr "Podaj liczbę spacji zastępujących pojedynczy znak tabulacji."
 
-#: ../src/editor.c:4494
+#: ../src/editor.c:4490
 #, c-format
 msgid "Warning: non-standard hard tab width: %d != 8!"
-msgstr ""
+msgstr "Uwaga: nietypowa długość twardej tabulacji: %d !=8!"
 
-#: ../src/encodings.c:75
+#: ../src/encodings.c:73
 msgid "Celtic"
 msgstr "Celtyckie"
 
-#: ../src/encodings.c:76 ../src/encodings.c:77
+#: ../src/encodings.c:74
+#: ../src/encodings.c:75
 msgid "Greek"
 msgstr "Greckie"
 
-#: ../src/encodings.c:78
+#: ../src/encodings.c:76
 msgid "Nordic"
 msgstr "Nordyckie"
 
-#: ../src/encodings.c:79
+#: ../src/encodings.c:77
 msgid "South European"
 msgstr "Południowoeuropejskie"
 
-#: ../src/encodings.c:80 ../src/encodings.c:81 ../src/encodings.c:82
-#: ../src/encodings.c:83
+#: ../src/encodings.c:78
+#: ../src/encodings.c:79
+#: ../src/encodings.c:80
+#: ../src/encodings.c:81
 msgid "Western"
 msgstr "Zachodnie"
 
-#: ../src/encodings.c:85 ../src/encodings.c:86 ../src/encodings.c:87
+#: ../src/encodings.c:83
+#: ../src/encodings.c:84
+#: ../src/encodings.c:85
 msgid "Baltic"
 msgstr "Bałtyckie"
 
-#: ../src/encodings.c:88 ../src/encodings.c:89 ../src/encodings.c:90
+#: ../src/encodings.c:86
+#: ../src/encodings.c:87
+#: ../src/encodings.c:88
 msgid "Central European"
 msgstr "Środkowoeuropejskie"
 
 #. ISO-IR-111 not available on Windows
-#: ../src/encodings.c:91 ../src/encodings.c:92 ../src/encodings.c:94
-#: ../src/encodings.c:95 ../src/encodings.c:96
+#: ../src/encodings.c:89
+#: ../src/encodings.c:90
+#: ../src/encodings.c:92
+#: ../src/encodings.c:93
+#: ../src/encodings.c:94
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: ../src/encodings.c:97
+#: ../src/encodings.c:95
 msgid "Cyrillic/Russian"
 msgstr "Cyrylica/Rosyjskie"
 
-#: ../src/encodings.c:98
+#: ../src/encodings.c:96
 msgid "Cyrillic/Ukrainian"
 msgstr "Cyrylica/Ukraińskie"
 
-#: ../src/encodings.c:99
+#: ../src/encodings.c:97
 msgid "Romanian"
 msgstr "Rumuńskie"
 
-#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103
+#: ../src/encodings.c:99
+#: ../src/encodings.c:100
+#: ../src/encodings.c:101
 msgid "Arabic"
 msgstr "Arabskie"
 
 #. not available at all, ?
-#: ../src/encodings.c:104 ../src/encodings.c:106 ../src/encodings.c:107
+#: ../src/encodings.c:102
+#: ../src/encodings.c:104
+#: ../src/encodings.c:105
 msgid "Hebrew"
 msgstr "Hebrajskie"
 
-#: ../src/encodings.c:108
+#: ../src/encodings.c:106
 msgid "Hebrew Visual"
 msgstr "Hebrajskie wizualne"
 
-#: ../src/encodings.c:110
+#: ../src/encodings.c:108
 msgid "Armenian"
 msgstr "Armeńskie"
 
-#: ../src/encodings.c:111
+#: ../src/encodings.c:109
 msgid "Georgian"
 msgstr "Gruzińskie"
 
-#: ../src/encodings.c:112
+#: ../src/encodings.c:110
 msgid "Thai"
 msgstr "Tajskie"
 
-#: ../src/encodings.c:113 ../src/encodings.c:114 ../src/encodings.c:115
+#: ../src/encodings.c:111
+#: ../src/encodings.c:112
+#: ../src/encodings.c:113
 msgid "Turkish"
 msgstr "Tureckie"
 
-#: ../src/encodings.c:116 ../src/encodings.c:117 ../src/encodings.c:118
+#: ../src/encodings.c:114
+#: ../src/encodings.c:115
+#: ../src/encodings.c:116
 msgid "Vietnamese"
 msgstr "Wietnamskie"
 
 #. maybe not available on Linux
-#: ../src/encodings.c:129 ../src/encodings.c:130 ../src/encodings.c:131
-#: ../src/encodings.c:133
+#: ../src/encodings.c:127
+#: ../src/encodings.c:128
+#: ../src/encodings.c:129
+#: ../src/encodings.c:131
 msgid "Chinese Simplified"
 msgstr "Chińskie uproszczone"
 
-#: ../src/encodings.c:134 ../src/encodings.c:135 ../src/encodings.c:136
+#: ../src/encodings.c:132
+#: ../src/encodings.c:133
+#: ../src/encodings.c:134
 msgid "Chinese Traditional"
 msgstr "Chińskie tradycyjne"
 
-#: ../src/encodings.c:137 ../src/encodings.c:138 ../src/encodings.c:139
-#: ../src/encodings.c:140
+#: ../src/encodings.c:135
+#: ../src/encodings.c:136
+#: ../src/encodings.c:137
+#: ../src/encodings.c:138
 msgid "Japanese"
 msgstr "Japońskie"
 
-#: ../src/encodings.c:141 ../src/encodings.c:142 ../src/encodings.c:143
-#: ../src/encodings.c:144
+#: ../src/encodings.c:139
+#: ../src/encodings.c:140
+#: ../src/encodings.c:141
+#: ../src/encodings.c:142
 msgid "Korean"
 msgstr "Koreańskie"
 
-#: ../src/encodings.c:146
+#: ../src/encodings.c:144
 msgid "Without encoding"
 msgstr "Bez kodowania"
 
-#: ../src/encodings.c:430
+#: ../src/encodings.c:428
 msgid "_West European"
 msgstr "_Zachodnioeuropejskie"
 
-#: ../src/encodings.c:436
+#: ../src/encodings.c:434
 msgid "_East European"
 msgstr "_Wschodnioeuropejskie"
 
-#: ../src/encodings.c:442
+#: ../src/encodings.c:440
 msgid "East _Asian"
 msgstr "_Południowoazjatyckie"
 
-#: ../src/encodings.c:448
+#: ../src/encodings.c:446
 msgid "_SE & SW Asian"
 msgstr "_Azja Płd.-Wsch. i Płd.-Zach."
 
-#: ../src/encodings.c:454
+#: ../src/encodings.c:452
 msgid "_Middle Eastern"
 msgstr "_Bliskowschodnie"
 
-#: ../src/encodings.c:460
+#: ../src/encodings.c:458
 msgid "_Unicode"
 msgstr "_Unicode"
 
-#: ../src/filetypes.c:84 ../src/filetypes.c:166 ../src/filetypes.c:180
-#: ../src/filetypes.c:188 ../src/filetypes.c:202
-#, fuzzy, c-format
+#: ../src/filetypes.c:83
+#: ../src/filetypes.c:165
+#: ../src/filetypes.c:179
+#: ../src/filetypes.c:187
+#: ../src/filetypes.c:201
+#, c-format
 msgid "%s source file"
-msgstr "C"
+msgstr "%s plik źródłowy"
 
-#: ../src/filetypes.c:85
-#, fuzzy, c-format
+#: ../src/filetypes.c:84
+#, c-format
 msgid "%s file"
-msgstr "C"
+msgstr "%s plik"
 
-#: ../src/filetypes.c:103 ../src/filetypes.c:1753 ../src/interface.c:3918
+#: ../src/filetypes.c:102
+#: ../src/filetypes.c:1787
+#: ../src/interface.c:3918
 #: ../src/interface.c:5636
 msgid "None"
 msgstr "Brak"
 
-#: ../src/filetypes.c:304
-#, fuzzy
+#: ../src/filetypes.c:303
 msgid "Shell script"
-msgstr "Pliki skryptów powłoki"
+msgstr "Skrypt powłoki"
 
-#: ../src/filetypes.c:312
+#: ../src/filetypes.c:311
 msgid "Makefile"
 msgstr "Plik sterujący dla make"
 
-#: ../src/filetypes.c:319
+#: ../src/filetypes.c:318
 msgid "XML document"
 msgstr "XML"
 
-#: ../src/filetypes.c:343
-#, fuzzy
+#: ../src/filetypes.c:342
 msgid "Cascading StyleSheet"
 msgstr "Arkusz stylów CSS"
 
-#: ../src/filetypes.c:412
+#: ../src/filetypes.c:411
 msgid "Config file"
 msgstr "Plik konfiguracyjny"
 
-#: ../src/filetypes.c:418
-#, fuzzy
+#: ../src/filetypes.c:417
 msgid "Gettext translation file"
-msgstr "opiekun tłumaczeń"
+msgstr "Plik tłumaczeń językowych"
 
-#: ../src/filetypes.c:713
+#: ../src/filetypes.c:712
 msgid "_Programming Languages"
 msgstr "Języki p_rogramowania"
 
-#: ../src/filetypes.c:714
+#: ../src/filetypes.c:713
 msgid "_Scripting Languages"
 msgstr "Języki _skryptowe"
 
-#: ../src/filetypes.c:715
+#: ../src/filetypes.c:714
 msgid "_Markup Languages"
 msgstr "Języki _znacznikowe"
 
-#: ../src/filetypes.c:716
-#, fuzzy
+#: ../src/filetypes.c:715
 msgid "M_iscellaneous"
-msgstr "<b>Różne</b>"
+msgstr "_Różne"
 
-#: ../src/filetypes.c:1431 ../src/win32.c:105
+#: ../src/filetypes.c:1465
+#: ../src/win32.c:104
 msgid "All Source"
 msgstr "Wszystkie pliki źródłowe"
 
 #. create meta file filter "All files"
-#: ../src/filetypes.c:1456 ../src/project.c:294 ../src/win32.c:95
-#: ../src/win32.c:143 ../src/win32.c:145
+#: ../src/filetypes.c:1490
+#: ../src/project.c:292
+#: ../src/win32.c:94
+#: ../src/win32.c:139
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/filetypes.c:1514
+#: ../src/filetypes.c:1548
 #, c-format
 msgid "Bad regex for filetype %s: %s"
-msgstr ""
+msgstr "Niepoprawne wyrażenie regularne dla typu pliku %s: %s"
 
-#: ../src/geany.h:52
+#: ../src/geany.h:50
 msgid "untitled"
 msgstr "bez nazwy"
 
-#: ../src/highlighting.c:3623 ../src/main.c:808 ../src/socket.c:165
-#: ../src/templates.c:226
+#: ../src/highlighting.c:3611
+#: ../src/main.c:822
+#: ../src/socket.c:163
+#: ../src/templates.c:224
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Nie można odnaleźć pliku %s"
 
-#: ../src/highlighting.c:3646
+#: ../src/highlighting.c:3634
 msgid "_Default"
-msgstr ""
+msgstr "_Domyślnie"
 
-#: ../src/highlighting.c:3714
-#, fuzzy
+#: ../src/highlighting.c:3702
 msgid "_Color Schemes"
-msgstr "_Wybór koloru"
+msgstr "Schematy _kolorów"
 
 #: ../src/interface.c:328
 msgid "_File"
@@ -1109,13 +1128,14 @@ msgstr "_Plik"
 msgid "New (with _Template)"
 msgstr "Nowy (z _szablonu)"
 
-#: ../src/interface.c:356 ../src/interface.c:2378
+#: ../src/interface.c:356
+#: ../src/interface.c:2378
 msgid "Open Selected F_ile"
 msgstr "Otwórz wybrany pl_ik"
 
 #: ../src/interface.c:360
 msgid "Recent _Files"
-msgstr "Ostatnio o_twierane"
+msgstr "Ost_atnio otwierane"
 
 #: ../src/interface.c:377
 msgid "Save A_ll"
@@ -1125,85 +1145,94 @@ msgstr "Za_pisz wszystko"
 msgid "R_eload As"
 msgstr "Wczytaj ponowni_e z kodowaniem"
 
-#: ../src/interface.c:404 ../src/interface.c:639 ../src/interface.c:698
-#: ../src/interface.c:712 ../src/interface.c:1110 ../src/interface.c:1120
-#: ../src/interface.c:2343 ../src/interface.c:2357
+#: ../src/interface.c:404
+#: ../src/interface.c:639
+#: ../src/interface.c:698
+#: ../src/interface.c:712
+#: ../src/interface.c:1110
+#: ../src/interface.c:1120
+#: ../src/interface.c:2343
+#: ../src/interface.c:2357
 msgid "invisible"
 msgstr "Niewidoczny"
 
 #: ../src/interface.c:421
 msgid "Page Set_up"
-msgstr ""
+msgstr "_Ustawienia strony"
 
-#: ../src/interface.c:438 ../src/notebook.c:246
-#, fuzzy
+#: ../src/interface.c:438
+#: ../src/notebook.c:243
 msgid "Close Ot_her Documents"
-msgstr "Zamyka bieżący plik"
+msgstr "Zamknij _pozostałe dokumenty"
 
-#: ../src/interface.c:446 ../src/notebook.c:251
+#: ../src/interface.c:446
+#: ../src/notebook.c:248
 msgid "C_lose All"
-msgstr "Zamknij wszystk_o"
+msgstr "Za_mknij wszystko"
 
-#: ../src/interface.c:463 ../src/interface.c:2273
+#: ../src/interface.c:463
+#: ../src/interface.c:2273
 msgid "_Edit"
 msgstr "_Edycja"
 
 #: ../src/interface.c:513
-#, fuzzy
 msgid "_Commands"
-msgstr "Polecenie"
+msgstr "_Polecenia"
 
-#: ../src/interface.c:520 ../src/keybindings.c:311
-#, fuzzy
+#: ../src/interface.c:520
+#: ../src/keybindings.c:334
 msgid "_Cut Current Line(s)"
-msgstr "Wycina bieżącą linię"
+msgstr "_Wytnij bieżący wiersz(e)"
 
-#: ../src/interface.c:528 ../src/keybindings.c:308
-#, fuzzy
+#: ../src/interface.c:528
+#: ../src/keybindings.c:331
 msgid "_Copy Current Line(s)"
-msgstr "Kopiuje bieżącą linię"
+msgstr "S_kopiuj bieżący wiersz(e)"
 
-#: ../src/interface.c:536 ../src/keybindings.c:263
-#, fuzzy
+#: ../src/interface.c:536
+#: ../src/keybindings.c:286
 msgid "_Delete Current Line(s)"
-msgstr "Usuń bieżącą linię"
+msgstr "_Usuń bieżący wiersz(e)"
 
-#: ../src/interface.c:540 ../src/keybindings.c:260
-#, fuzzy
+#: ../src/interface.c:540
+#: ../src/keybindings.c:283
 msgid "_Duplicate Line or Selection"
 msgstr "D_uplikuj wiersz albo zaznaczenie"
 
-#: ../src/interface.c:549 ../src/keybindings.c:321
-#, fuzzy
+#: ../src/interface.c:549
+#: ../src/keybindings.c:344
 msgid "_Select Current Line(s)"
-msgstr "Zaznacz bieżący wiersz"
+msgstr "Zaznacz bieżący _wiersz(e)"
 
-#: ../src/interface.c:553 ../src/keybindings.c:324
-#, fuzzy
+#: ../src/interface.c:553
+#: ../src/keybindings.c:347
 msgid "_Select Current Paragraph"
-msgstr "Zaznacz bieżący akapit"
+msgstr "Zaznacz bieżący _akapit"
 
-#: ../src/interface.c:562 ../src/keybindings.c:363
-#, fuzzy
+#: ../src/interface.c:562
+#: ../src/keybindings.c:386
 msgid "_Send Selection to Terminal"
-msgstr "_Wyślij zaznaczenie do"
+msgstr "_Wyślij zaznaczenie do terminala"
 
-#: ../src/interface.c:566 ../src/interface.c:2277
+#: ../src/interface.c:566
+#: ../src/interface.c:2277
 msgid "_Format"
 msgstr "_Format"
 
-#: ../src/interface.c:573 ../src/keybindings.c:365
+#: ../src/interface.c:573
+#: ../src/keybindings.c:388
 msgid "_Reflow Lines/Block"
-msgstr ""
+msgstr "_Wyświetl ponownie wiersze/blok tekstu"
 
-#: ../src/interface.c:577 ../src/keybindings.c:335
+#: ../src/interface.c:577
+#: ../src/keybindings.c:358
 msgid "T_oggle Case of Selection"
 msgstr "Odwróć w_ielkość zaznaczonych liter"
 
-#: ../src/interface.c:581 ../src/keybindings.c:270
-#, fuzzy
+#: ../src/interface.c:581
+#: ../src/keybindings.c:293
 msgid "_Transpose Current Line"
-msgstr "Zamień miejscami bieżący wiersz z wierszem poprzedzającym"
+msgstr "Zamień _miejscami bieżący wiersz z poprzedzającym"
 
 #: ../src/interface.c:590
 msgid "_Comment Line(s)"
@@ -1225,10 +1254,10 @@ msgstr "Z_większ wcięcie"
 msgid "_Decrease Indent"
 msgstr "Z_mniejsz wcięcie"
 
-#: ../src/interface.c:623 ../src/keybindings.c:354
-#, fuzzy
+#: ../src/interface.c:623
+#: ../src/keybindings.c:377
 msgid "_Smart Line Indent"
-msgstr "Inteligentne wcięcia wierszy"
+msgstr "Inteli_gentne wcięcia wierszy"
 
 #: ../src/interface.c:632
 msgid "_Send Selection to"
@@ -1238,60 +1267,63 @@ msgstr "_Wyślij zaznaczenie do"
 msgid "I_nsert Comments"
 msgstr "W_staw komentarze"
 
-#: ../src/interface.c:658 ../src/interface.c:2292
-#, fuzzy
+#: ../src/interface.c:658
+#: ../src/interface.c:2292
 msgid "Insert _ChangeLog Entry"
-msgstr "Wstawia wpis pliku dziennika (ChangeLog)"
+msgstr "Wstaw wpis pliku dziennika (_ChangeLog)"
 
-#: ../src/interface.c:662 ../src/interface.c:2296
-#, fuzzy
+#: ../src/interface.c:662
+#: ../src/interface.c:2296
 msgid "Insert _Function Description"
-msgstr "Wstaw opis funkcji"
+msgstr "Wstaw _opis funkcji"
 
-#: ../src/interface.c:666 ../src/interface.c:2300
-#, fuzzy
+#: ../src/interface.c:666
+#: ../src/interface.c:2300
 msgid "Insert _Multiline Comment"
-msgstr "Wstaw długi komentarz"
+msgstr "_Wstaw komentarz wielowierszowy"
 
-#: ../src/interface.c:675 ../src/interface.c:2315
-#, fuzzy
+#: ../src/interface.c:675
+#: ../src/interface.c:2315
 msgid "Insert File _Header"
-msgstr "Wstaw nagłówek pliku"
+msgstr "Wstaw _nagłówek pliku"
 
-#: ../src/interface.c:679 ../src/interface.c:2319
-#, fuzzy
+#: ../src/interface.c:679
+#: ../src/interface.c:2319
 msgid "Insert _GPL Notice"
-msgstr "Wstaw informację o licencji GPL"
+msgstr "Wstaw informację o licencji _GPL"
 
-#: ../src/interface.c:683 ../src/interface.c:2323
-#, fuzzy
+#: ../src/interface.c:683
+#: ../src/interface.c:2323
 msgid "Insert _BSD License Notice"
 msgstr "Wstaw informację o licencji _BSD"
 
-#: ../src/interface.c:687 ../src/interface.c:2332
+#: ../src/interface.c:687
+#: ../src/interface.c:2332
 msgid "Insert Dat_e"
 msgstr "Wstaw _datę"
 
-#: ../src/interface.c:701 ../src/interface.c:2346
+#: ../src/interface.c:701
+#: ../src/interface.c:2346
 msgid "_Insert \"include <...>\""
 msgstr "Wstaw \"_include <...>\""
 
-#: ../src/interface.c:715 ../src/interface.c:2365 ../src/keybindings.c:374
-#, fuzzy
+#: ../src/interface.c:715
+#: ../src/interface.c:2365
+#: ../src/keybindings.c:397
 msgid "_Insert Alternative White Space"
-msgstr "Wstaw alternatywną wolną przestrzeń"
+msgstr "Wstaw _alternatywne białe znaki"
 
 #: ../src/interface.c:724
-#, fuzzy
 msgid "Preference_s"
-msgstr "Ustawienia"
+msgstr "_Preferencje"
 
-#: ../src/interface.c:732 ../src/keybindings.c:387
-#, fuzzy
+#: ../src/interface.c:732
+#: ../src/keybindings.c:410
 msgid "P_lugin Preferences"
-msgstr "Ustawienia"
+msgstr "Us_tawienia wtyczek"
 
-#: ../src/interface.c:740 ../src/interface.c:2369
+#: ../src/interface.c:740
+#: ../src/interface.c:2369
 msgid "_Search"
 msgstr "_Szukaj"
 
@@ -1307,7 +1339,8 @@ msgstr "Znajdź _poprzedni"
 msgid "Find in F_iles"
 msgstr "Znajdź w _plikach"
 
-#: ../src/interface.c:772 ../src/search.c:632
+#: ../src/interface.c:772
+#: ../src/search.c:629
 msgid "_Replace"
 msgstr "Z_astąp"
 
@@ -1316,71 +1349,69 @@ msgid "Next _Message"
 msgstr "Następny ko_munikat"
 
 #: ../src/interface.c:793
-#, fuzzy
 msgid "Pr_evious Message"
-msgstr "Następny komunikat"
+msgstr "P_oprzedni komunikat"
 
-#: ../src/interface.c:806 ../src/keybindings.c:434
-#, fuzzy
+#: ../src/interface.c:806
+#: ../src/keybindings.c:457
 msgid "_Go to Next Marker"
-msgstr "Idź do następnego znacznika"
+msgstr "Idź do _następnej zakładki"
 
-#: ../src/interface.c:810 ../src/keybindings.c:437
-#, fuzzy
+#: ../src/interface.c:810
+#: ../src/keybindings.c:460
 msgid "_Go to Previous Marker"
-msgstr "Idź do poprzedniego znacznika"
+msgstr "Idź do _poprzedniej zakładki"
 
 #: ../src/interface.c:819
 msgid "_Go to Line"
-msgstr "Przejdź _do wiersza"
+msgstr "Idź _do wiersza"
 
-#: ../src/interface.c:827 ../src/interface.c:2304
+#: ../src/interface.c:827
+#: ../src/interface.c:2304
 msgid "_More"
-msgstr ""
+msgstr "_Więcej"
 
-#: ../src/interface.c:834 ../src/keybindings.c:399
-#, fuzzy
+#: ../src/interface.c:834
+#: ../src/keybindings.c:422
 msgid "Find Next _Selection"
-msgstr "Znajdź następne zaznaczenie"
+msgstr "Znajdź następne wystąpienie _zaznaczonego tekstu"
 
-#: ../src/interface.c:838 ../src/keybindings.c:401
-#, fuzzy
+#: ../src/interface.c:838
+#: ../src/keybindings.c:424
 msgid "Find Pre_vious Selection"
-msgstr "Znajdź poprzednie zaznaczenie"
+msgstr "Znajdź _poprzednie wystąpienie zaznaczonego tekstu"
 
-#: ../src/interface.c:847 ../src/interface.c:2386
-#, fuzzy
+#: ../src/interface.c:847
+#: ../src/interface.c:2386
 msgid "Find _Usage"
-msgstr "Znajdź"
+msgstr "Znajdź _wykorzystanie"
 
-#: ../src/interface.c:851 ../src/interface.c:2394
-#, fuzzy
+#: ../src/interface.c:851
+#: ../src/interface.c:2394
 msgid "Find _Document Usage"
-msgstr "Znajdź"
+msgstr "Znajdź wykorzystanie w _dokumencie"
 
-#: ../src/interface.c:860 ../src/keybindings.c:416
-#, fuzzy
+#: ../src/interface.c:860
+#: ../src/keybindings.c:439
 msgid "_Mark All"
-msgstr "Zbuduj _wszystko"
+msgstr "Zaznacz _wszystko"
 
-#: ../src/interface.c:869 ../src/interface.c:2402
-#, fuzzy
+#: ../src/interface.c:869
+#: ../src/interface.c:2402
 msgid "Go to _Tag Definition"
-msgstr "Przejdź do definicji znacznika"
+msgstr "Przejdź do _definicji znacznika"
 
 #: ../src/interface.c:873
-#, fuzzy
 msgid "Go to T_ag Declaration"
-msgstr "Przejdź do deklaracji znacznika"
+msgstr "Przejdź do d_eklaracji znacznika"
 
 #: ../src/interface.c:884
 msgid "Change _Font"
 msgstr "Zmień _czcionkę"
 
 #: ../src/interface.c:897
-#, fuzzy
 msgid "To_ggle All Additional Widgets"
-msgstr "Przełącz wszystkie dodatkowe panele"
+msgstr "Pokaż/ukryj dodatkowe _widżety"
 
 #: ../src/interface.c:901
 msgid "Full_screen"
@@ -1398,33 +1429,33 @@ msgstr "Pasek _narzędzi"
 msgid "Show Side_bar"
 msgstr "Panel _boczny"
 
-#: ../src/interface.c:920 ../src/interface.c:4354 ../src/interface.c:5766
-#: ../src/keybindings.c:253 ../src/prefs.c:1571
+#: ../src/interface.c:920
+#: ../src/interface.c:4354
+#: ../src/interface.c:5766
+#: ../src/keybindings.c:222
+#: ../src/prefs.c:1586
 msgid "Editor"
 msgstr "Edytor"
 
 #: ../src/interface.c:927
 msgid "Show _Markers Margin"
-msgstr "Mar_gines ze znacznikami"
+msgstr "Mar_gines zakładek"
 
 #: ../src/interface.c:932
 msgid "Show _Line Numbers"
-msgstr "_Numery wierszy"
+msgstr "Pokaż _numery wierszy"
 
 #: ../src/interface.c:937
-#, fuzzy
 msgid "Show _White Space"
-msgstr "Wyświetlanie ukrytych znaków"
+msgstr "Pokaż _białe znaki"
 
 #: ../src/interface.c:941
-#, fuzzy
 msgid "Show Line _Endings"
-msgstr "Wyświetlanie znaków końca wiersza"
+msgstr "Pokaż znaki _końca wiersza"
 
 #: ../src/interface.c:945
-#, fuzzy
 msgid "Show _Indentation Guides"
-msgstr "Wyświetlanie prowadnic"
+msgstr "Wyświetl _prowadnice wcięć"
 
 #: ../src/interface.c:966
 msgid "_Document"
@@ -1435,74 +1466,73 @@ msgid "_Line Wrapping"
 msgstr "_Zawijanie wierszy"
 
 #: ../src/interface.c:978
-#, fuzzy
 msgid "Line _Breaking"
-msgstr "Zawijanie wierszy"
+msgstr "Wymuszone łamanie _wierszy"
 
 #: ../src/interface.c:982
-#, fuzzy
 msgid "_Auto-indentation"
 msgstr "_Automatyczne wcięcia"
 
 #: ../src/interface.c:987
 msgid "In_dent Type"
-msgstr ""
+msgstr "Rodzaj _wcięć"
 
-#: ../src/interface.c:994 ../src/interface.c:1028
-#, fuzzy
+#: ../src/interface.c:994
+#: ../src/interface.c:1028
 msgid "_Detect from Content"
-msgstr "Według zawartości pliku"
+msgstr "_Ustal na podstawie zawartości"
 
-#: ../src/interface.c:1003 ../src/interface.c:3948 ../src/interface.c:5666
-#, fuzzy
+#: ../src/interface.c:1003
+#: ../src/interface.c:3948
+#: ../src/interface.c:5666
 msgid "_Tabs"
-msgstr "Znaki tabulacji"
+msgstr "Znaki _tabulacji"
 
-#: ../src/interface.c:1009 ../src/interface.c:3939 ../src/interface.c:5657
-#, fuzzy
+#: ../src/interface.c:1009
+#: ../src/interface.c:3939
+#: ../src/interface.c:5657
 msgid "_Spaces"
-msgstr "Spacje"
+msgstr "_Spacje"
 
 #: ../src/interface.c:1015
-#, fuzzy
 msgid "T_abs and Spaces"
-msgstr "Zamień znaki tabulacji na _spacje"
+msgstr "Zn_aki tabulacji i spacje"
 
 #: ../src/interface.c:1021
 msgid "Indent Widt_h"
-msgstr ""
+msgstr "_Wielkość wcięcia"
 
 #: ../src/interface.c:1037
 msgid "_1"
-msgstr ""
+msgstr "_1"
 
 #: ../src/interface.c:1043
 msgid "_2"
-msgstr ""
+msgstr "_2"
 
 #: ../src/interface.c:1049
 msgid "_3"
-msgstr ""
+msgstr "_3"
 
 #: ../src/interface.c:1055
 msgid "_4"
-msgstr ""
+msgstr "_4"
 
 #: ../src/interface.c:1061
 msgid "_5"
-msgstr ""
+msgstr "_5"
 
 #: ../src/interface.c:1067
 msgid "_6"
-msgstr ""
+msgstr "_6"
 
 #: ../src/interface.c:1073
 msgid "_7"
-msgstr ""
+msgstr "_7"
 
 #: ../src/interface.c:1079
 msgid "_8"
-msgstr ""
+msgstr "_8"
 
 #: ../src/interface.c:1090
 msgid "Read _Only"
@@ -1537,18 +1567,16 @@ msgid "Convert and Set to CR (_Mac)"
 msgstr "Konwertuj i ustaw na CR (_Mac)"
 
 #: ../src/interface.c:1153
-#, fuzzy
 msgid "_Strip Trailing Spaces"
-msgstr "Usuwanie spacji i znaków tabulacji na końcach linii"
+msgstr "Usuń _białe znaki z końców wierszy"
 
 #: ../src/interface.c:1157
 msgid "_Replace Tabs by Spaces"
 msgstr "Zamień znaki tabulacji na _spacje"
 
 #: ../src/interface.c:1161
-#, fuzzy
 msgid "Replace Spaces b_y Tabs"
-msgstr "Zamień znaki tabulacji na _spacje"
+msgstr "Zamień spacje na znaki _tabulacji"
 
 #: ../src/interface.c:1170
 msgid "_Fold All"
@@ -1560,11 +1588,11 @@ msgstr "_Rozwiń wszystkie"
 
 #: ../src/interface.c:1183
 msgid "Remove _Markers"
-msgstr "_Usuń znaczniki"
+msgstr "_Usuń zakładki"
 
 #: ../src/interface.c:1187
 msgid "Remove Error _Indicators"
-msgstr "Usuń _wszystkie znaczniki błędów"
+msgstr "Usuń _wszystkie podkreślenia błędów"
 
 #: ../src/interface.c:1191
 msgid "_Project"
@@ -1579,22 +1607,20 @@ msgid "_Open"
 msgstr "_Otwórz"
 
 #: ../src/interface.c:1214
-#, fuzzy
 msgid "_Recent Projects"
-msgstr "Otwórz projekt"
+msgstr "_Ostatnio otwierane projekty"
 
 #: ../src/interface.c:1218
 msgid "_Close"
 msgstr "_Zamknij"
 
 #: ../src/interface.c:1231
-#, fuzzy
 msgid "_Apply Default Indentation"
-msgstr "_Automatyczne wcięcia"
+msgstr "Zastosuje _domyślne wcięcia"
 
 #: ../src/interface.c:1234
 msgid "Apply the default indentation settings to all documents"
-msgstr ""
+msgstr "Zastosuj domyślne wcięcia do wszystkich dokumentów"
 
 #: ../src/interface.c:1249
 msgid "_Tools"
@@ -1602,12 +1628,11 @@ msgstr "_Narzędzia"
 
 #: ../src/interface.c:1256
 msgid "_Reload Configuration"
-msgstr ""
+msgstr "Wczytaj _ponownie konfigurację"
 
 #: ../src/interface.c:1264
-#, fuzzy
 msgid "C_onfiguration Files"
-msgstr "Kompilacja nie powiodła się"
+msgstr "Pliki k_onfiguracyjne"
 
 #: ../src/interface.c:1277
 msgid "_Color Chooser"
@@ -1621,7 +1646,8 @@ msgstr "Zliczanie _słów"
 msgid "Load Ta_gs"
 msgstr "Wczytaj z_naczniki"
 
-#: ../src/interface.c:1293 ../src/interface.c:1300
+#: ../src/interface.c:1293
+#: ../src/interface.c:1300
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -1631,21 +1657,20 @@ msgstr "_Strona domowa"
 
 #: ../src/interface.c:1312
 msgid "_Keyboard Shortcuts"
-msgstr "Skróty _klawiszowe"
+msgstr "Skróty _klawiaturowe"
 
 #: ../src/interface.c:1316
-#, fuzzy
 msgid "_Debug Messages"
-msgstr "Komunikaty"
+msgstr "Komunikaty _debugera"
 
-#: ../src/interface.c:1355 ../src/sidebar.c:124
+#: ../src/interface.c:1355
+#: ../src/sidebar.c:122
 msgid "Symbols"
 msgstr "Symbole"
 
 #: ../src/interface.c:1369
-#, fuzzy
 msgid "Documents"
-msgstr "_Dokument"
+msgstr "Dokumenty"
 
 #: ../src/interface.c:1405
 msgid "Status"
@@ -1664,26 +1689,23 @@ msgid "Scribble"
 msgstr "Brudnopis"
 
 #: ../src/interface.c:2135
-#, fuzzy
 msgid "_Toolbar Preferences"
-msgstr "Ustawienia"
+msgstr "Ustawienia paska _narzędzi"
 
 #: ../src/interface.c:2148
-#, fuzzy
 msgid "_Hide Toolbar"
-msgstr "Ukryj pasek narzędzi"
+msgstr "_Ukryj pasek narzędzi"
 
 #: ../src/interface.c:2281
-#, fuzzy
 msgid "I_nsert"
 msgstr "Ws_taw"
 
 #: ../src/interface.c:2410
-#, fuzzy
 msgid "Conte_xt Action"
-msgstr "Akcja kontekstowa"
+msgstr "Działanie _kontekstowe"
 
-#: ../src/interface.c:2952 ../src/keybindings.c:384
+#: ../src/interface.c:2952
+#: ../src/keybindings.c:407
 msgid "Preferences"
 msgstr "Ustawienia"
 
@@ -1693,31 +1715,23 @@ msgstr "Wczytywanie plików z ostatniej sesji"
 
 #: ../src/interface.c:2991
 msgid "Opens at startup the files from the last session"
-msgstr ""
-"Przy uruchomieniu programu zostaną otwarte wszystkie pliki z poprzedniej "
-"sesji"
+msgstr "Przy uruchomieniu programu zostaną otwarte wszystkie pliki z poprzedniej sesji"
 
 #: ../src/interface.c:2993
 msgid "Load virtual terminal support"
 msgstr "Wsparcie dla wirtualnego terminala"
 
 #: ../src/interface.c:2995
-#, fuzzy
-msgid ""
-"Whether the virtual terminal emulation (VTE) should be loaded at startup, "
-"disable it if you do not need it"
-msgstr ""
-"Określa, czy wirtualny terminal powinien być uruchamiany przy starcie "
-"programu. Odznacz tę opcję, jeżeli go nie potrzebujesz."
+msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it"
+msgstr "Określa, czy przy starcie programu uruchamiać wirtualny terminal. Wyłącz opcję, jeżeli go nie potrzebujesz."
 
 #: ../src/interface.c:2997
 msgid "Enable plugin support"
-msgstr "Obsługa wtyczek"
+msgstr "Włącz obsługę wtyczek"
 
 #: ../src/interface.c:3001
-#, fuzzy
 msgid "<b>Startup</b>"
-msgstr "<b>Panel boczny</b>"
+msgstr "<b>Uruchamianie</b>"
 
 #: ../src/interface.c:3020
 msgid "Save window position and geometry"
@@ -1732,125 +1746,88 @@ msgid "Confirm exit"
 msgstr "Potwierdzanie zakończenia programu"
 
 #: ../src/interface.c:3028
-#, fuzzy
 msgid "Shows a confirmation dialog on exit"
-msgstr "Wyświetla okno dialogowe potwierdzenia przy zamykaniu programu"
+msgstr "Wyświetla monit o potwierdzenie przy zamykaniu programu"
 
 #: ../src/interface.c:3030
-#, fuzzy
 msgid "<b>Shutdown</b>"
-msgstr "<b>Uruchamianie i wylączanie</b>"
+msgstr "<b>Wyłączanie</b>"
 
 #: ../src/interface.c:3051
 msgid "Startup path:"
-msgstr "Katalog początkowy:"
+msgstr "Katalog domyślny:"
 
 #: ../src/interface.c:3063
-msgid ""
-"Path to start in when opening or saving files. Must be an absolute path. "
-"Leave blank to use the current working directory."
-msgstr ""
-"Ścieżka do domyślnego katalogu dla otwieranych i zapisywanych plików. Musi "
-"być ścieżką absolutną. Pozostaw to pole puste, aby używać bieżący katalog."
+msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory."
+msgstr "Ścieżka do domyślnego katalogu dla otwieranych i zapisywanych plików. Musi być ścieżką absolutną. Pozostaw pole puste, aby korzystać z bieżącego katalogu."
 
 #: ../src/interface.c:3076
 msgid "Project files:"
-msgstr "Katalog z plikami projektu"
+msgstr "Katalog z plikami projektu:"
 
 #: ../src/interface.c:3088
 msgid "Path to start in when opening project files"
-msgstr ""
-"Ścieżka to domyślnego katalogu wyświetlanego podczas otwierania plików "
-"projektu"
+msgstr "Ścieżka to domyślnego katalogu wyświetlanego podczas otwierania plików projektu"
 
 #: ../src/interface.c:3101
-#, fuzzy
 msgid "Extra plugin path:"
-msgstr "Obsługa wtyczek"
+msgstr "Dodatkowy katalog z wtyczkami:"
 
 #: ../src/interface.c:3113
-msgid ""
-"Geany looks by default in the global installation path and in the "
-"configuration directory. The path entered here will be searched additionally "
-"for plugins. Leave blank to disable."
-msgstr ""
+msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable."
+msgstr "Geany zawsze przeszukuje ścieżkę katalogu instalacyjnego oraz konfiguracyjnego. Dodatkowe wtyczki będą poszukiwane na ścieżce podanej w tym miejscu. Możesz pozostawić to pole puste."
 
 #: ../src/interface.c:3126
 msgid "<b>Paths</b>"
 msgstr "<b>Katalogi</b>"
 
 #: ../src/interface.c:3131
-#, fuzzy
 msgid "Startup"
-msgstr "Status"
+msgstr "Uruchamianie"
 
 #: ../src/interface.c:3154
 msgid "Beep on errors or when compilation has finished"
 msgstr "Sygnał dźwiękowy przy wystąpieniu błędów lub po zakończeniu kompilacji"
 
 #: ../src/interface.c:3157
-#, fuzzy
-msgid ""
-"Whether to beep if an error occurred or when the compilation process has "
-"finished"
-msgstr ""
-"Uruchamia sygnał dźwiękowy przy wystąpieniu błędów lub po zakończeniu "
-"procesu kompilacji"
+msgid "Whether to beep if an error occurred or when the compilation process has finished"
+msgstr "Sygnał dźwiękowy przy wystąpieniu błędów lub po zakończeniu kompilacji"
 
 #: ../src/interface.c:3159
 msgid "Switch to status message list at new message"
-msgstr ""
-"Przełączanie okna komunikatów do zakładki  \"Status\" przy nadejściu nowego "
-"komunikatu"
+msgstr "Uaktywnij okno Statusu"
 
 #: ../src/interface.c:3162
-#, fuzzy
-msgid ""
-"Switch to the status message tab (in the notebook window at the bottom) if a "
-"new status message arrives"
-msgstr ""
-"Przełącza okno komunikatów (na dole ekranu) do zakładki \"Status\" gdy "
-"pojawi się nowy komunikat dotyczący statusu (np. zapis pliku, szukanie ciągu "
-"znaków, itp.)"
+msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives"
+msgstr "Uaktywnij okno Statusu za każdym razem, gdy pojawi się nowy komunikat"
 
 #: ../src/interface.c:3164
 msgid "Suppress status messages in the status bar"
-msgstr "Ukryj informacje statusu na pasku statusu"
+msgstr "Nie wyświetlaj komunikatów o statusie na pasku statusu"
 
 #: ../src/interface.c:3167
-msgid ""
-"Removes all messages from the status bar. The messages are still displayed "
-"in the status messages window."
-msgstr ""
-"Usuwa wszystkie informacje na pasku statusu. Informacje są jednak nadal "
-"dostępne w oknie z informacjami o statusie."
+msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window."
+msgstr "Usuwa wszystkie informacje na pasku statusu. Informacje są nadal dostępne w oknie Statusu."
 
 #: ../src/interface.c:3169
-#, fuzzy
 msgid "Auto-focus widgets (focus follows mouse)"
-msgstr "Automatycznie aktywuj panele po najechaniu kursorem"
+msgstr "Automatycznie aktywuj widżety po najechania kursora myszy"
 
 #: ../src/interface.c:3172
-msgid ""
-"Gives the focus automatically to widgets below the mouse cursor. Works for "
-"the main editor widget, the scribble, the toolbar search and goto line "
-"fields and the VTE."
-msgstr ""
-"Automatycznie aktywuje panele znajdujące się pod kursorem myszy. Działa dla "
-"głównego okna edytora, pola wyszukiwania, pola skoku do wiersza i "
-"wbudowanego emulatora terminala."
+msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE."
+msgstr "Automatycznie aktywuje widżety znajdujące się pod kursorem myszy. Działa dla głównego okna edytora, pola wyszukiwania, pola skoku do wiersza i terminala wirtualnego."
 
 #: ../src/interface.c:3174
 msgid "Use Windows File Open/Save dialogs"
-msgstr ""
+msgstr "Użyj okienek dialogowych Otwórz/Zapisz systemu Windows"
 
 #: ../src/interface.c:3177
-msgid ""
-"Defines whether to use the native Windows File Open/Save dialogs or whether "
-"to use the GTK default dialogs"
-msgstr ""
+msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs"
+msgstr "Określa, czy użyć okienek dialogowych Otwórz/Zapisz systemu Windows czy biblioteki GTK"
 
-#: ../src/interface.c:3179 ../src/interface.c:3415 ../src/interface.c:4564
+#: ../src/interface.c:3179
+#: ../src/interface.c:3415
+#: ../src/interface.c:4564
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Różne</b>"
 
@@ -1859,66 +1836,46 @@ msgid "Always wrap search and hide the Find dialog"
 msgstr "Zapętlanie wyszukiwanie i ukrywanie okna dialogowego wyszukiwania"
 
 #: ../src/interface.c:3201
-#, fuzzy
-msgid ""
-"Always wrap search around the document and hide the Find dialog after "
-"clicking Find Next/Previous"
-msgstr ""
-"Wyszukuje podany ciąg od miejsca położenia kursora do końca dokumentu, a "
-"nastepnie rozpoczyna przeszukiwanie od jego początku. Ukrywa także okno "
-"dialogowe wyszukiwania po naciśnięciu przycisku \"Znajdź następny/poprzedni\""
+msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous"
+msgstr "Zawsze przeszukuj cały dokument od bieżącego miejsca \"dookoła\". Ukryj okno Szukaj po naciśnięciu przycisków Następny/Poprzedni."
 
 #: ../src/interface.c:3203
 msgid "Use the current word under the cursor for Find dialogs"
-msgstr ""
+msgstr "Użyja słowa pod kursorem w formularzu okienka Szukaj"
 
 #: ../src/interface.c:3206
-msgid ""
-"Use current word under the cursor when opening the Find, Find in Files or "
-"Replace dialog and there is no selection"
-msgstr ""
+msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection"
+msgstr "Użyj słowa pod kursorem w okienkach Szukaj, Szukaj w plikach, Zastąp, jeżeli nie zaznaczono tekstu"
 
 #: ../src/interface.c:3208
-#, fuzzy
 msgid "Use the current file's directory for Find in Files"
-msgstr "Nieprawidłowy katalog."
+msgstr "Użyj bieżącego katalogu w okienku \"Szukaj w plikach\""
 
 #: ../src/interface.c:3212
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Panel boczny</b>"
+msgstr "<b>Szukaj</b>"
 
 #: ../src/interface.c:3231
-#, fuzzy
 msgid "Use project-based session files"
-msgstr "Pliki projektów Geany"
+msgstr "Korzystaj z plików sesji opartych na projektach"
 
 #: ../src/interface.c:3234
-msgid ""
-"Whether to store a project's session files and open them when re-opening the "
-"project"
-msgstr ""
+msgid "Whether to store a project's session files and open them when re-opening the project"
+msgstr "Określa, czy czy przechowywać pliki sesji projektu i otwierać je przy ponownym otwieraniu projektu"
 
 #: ../src/interface.c:3236
-#, fuzzy
 msgid "Store project file inside the project base directory"
-msgstr "Utworzyć katalog podstawowy dla projektu?"
+msgstr "Przechowuj plik projektu w katalogu bazowym projektu"
 
 #: ../src/interface.c:3239
-msgid ""
-"When enabled, a project file is stored by default inside the project base "
-"directory when creating new projects instead of one directory above the base "
-"directory. You can still change the path of the project file in the New "
-"Project dialog."
-msgstr ""
+msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog."
+msgstr "Włączona opcja określa, że podczas tworzenia nowego projektu plik projektu przechowywany będzie w katalogu bazowym projektu, zamiast w katalogu nadrzędnym wobec niego. Ścieżkę do pliku projektu można zmienić w oknie dialogowym Nowy projekt"
 
 #: ../src/interface.c:3241
-#, fuzzy
 msgid "<b>Projects</b>"
-msgstr "<b>Katalogi</b>"
+msgstr "<b>Projekty</b>"
 
 #: ../src/interface.c:3246
-#, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Różne</b>"
 
@@ -1926,45 +1883,48 @@ msgstr "<b>Różne</b>"
 #. * corresponding chapter in the documentation, comparing translatable
 #. * strings is easy to break. Maybe attach an identifying string to the
 #. * tab label object.
-#: ../src/interface.c:3250 ../src/prefs.c:1565
+#: ../src/interface.c:3250
+#: ../src/prefs.c:1580
 msgid "General"
 msgstr "Ogólne"
 
 #: ../src/interface.c:3291
 msgid "Show symbol list"
-msgstr "Wyświetlanie listy symboli"
+msgstr "Pokaż listę symboli"
 
 #: ../src/interface.c:3294
 msgid "Toggle the symbol list on and off"
 msgstr "Wyświetla lub ukrywa listę symboli"
 
 #: ../src/interface.c:3296
-#, fuzzy
 msgid "Show documents list"
-msgstr "Wyświetlanie listy otwartych plików"
+msgstr "Pokaż listę otwartych plików"
 
 #: ../src/interface.c:3299
-#, fuzzy
 msgid "Toggle the documents list on and off"
-msgstr "Wyświetla lub ukrywa listę otwartych plików"
+msgstr "Pokaż/schowaj listę otwartych plików"
 
 #: ../src/interface.c:3301
-#, fuzzy
 msgid "Show sidebar"
-msgstr "Panel _boczny"
+msgstr "Pokaż panel _boczny"
 
 #: ../src/interface.c:3309
-#, fuzzy
 msgid "Position:"
-msgstr "Opis:"
+msgstr "Położenie"
 
-#: ../src/interface.c:3313 ../src/interface.c:3469 ../src/interface.c:3530
-#: ../src/interface.c:3548 ../src/interface.c:3566
+#: ../src/interface.c:3313
+#: ../src/interface.c:3469
+#: ../src/interface.c:3530
+#: ../src/interface.c:3548
+#: ../src/interface.c:3566
 msgid "Left"
 msgstr "Lewo"
 
-#: ../src/interface.c:3320 ../src/interface.c:3477 ../src/interface.c:3531
-#: ../src/interface.c:3549 ../src/interface.c:3567
+#: ../src/interface.c:3320
+#: ../src/interface.c:3477
+#: ../src/interface.c:3531
+#: ../src/interface.c:3549
+#: ../src/interface.c:3567
 msgid "Right"
 msgstr "Prawo"
 
@@ -1976,103 +1936,99 @@ msgstr "<b>Panel boczny</b>"
 msgid "Symbol list:"
 msgstr "Lista symboli:"
 
-#: ../src/interface.c:3354 ../src/interface.c:3517
+#: ../src/interface.c:3354
+#: ../src/interface.c:3517
 msgid "Message window:"
 msgstr "Okno komunikatów:"
 
-#: ../src/interface.c:3361 ../src/interface.c:3553
+#: ../src/interface.c:3361
+#: ../src/interface.c:3553
 msgid "Editor:"
 msgstr "Edytor:"
 
 #: ../src/interface.c:3373
 msgid "Sets the font for the message window"
-msgstr "Ustawia czcionkę dla okna komunikatów"
+msgstr "Ustawia font dla okna komunikatów"
 
 #: ../src/interface.c:3381
 msgid "Sets the font for the symbol list"
-msgstr "Ustawia czcionkę dla listy symboli"
+msgstr "Ustawia font dla listy symboli"
 
 #: ../src/interface.c:3389
 msgid "Sets the editor font"
-msgstr "Ustawia czcionkę edytora"
+msgstr "Ustawia font edytora"
 
 #: ../src/interface.c:3391
 msgid "<b>Fonts</b>"
-msgstr "<b>Czcionki</b>"
+msgstr "<b>Fonty</b>"
 
 #: ../src/interface.c:3410
 msgid "Show status bar"
-msgstr "Wyświetlanie paska statusu"
+msgstr "Pokaż pasek statusu"
 
 #: ../src/interface.c:3413
-#, fuzzy
 msgid "Whether to show the status bar at the bottom of the main window"
-msgstr "Przełącza widok paska statusu wyświetlanego na dole okna programu."
+msgstr "Określa, czy wyświetlać pasek statusu u dołu głównego okna programu"
 
-#: ../src/interface.c:3420 ../src/interface.c:3755 ../src/prefs.c:1567
+#: ../src/interface.c:3420
+#: ../src/interface.c:3755
+#: ../src/prefs.c:1582
 msgid "Interface"
 msgstr "Interfejs"
 
 #: ../src/interface.c:3443
 msgid "Show editor tabs"
-msgstr "Wyświetlanie zakładek edytora"
+msgstr "Pokaż karty okna edytora"
 
 #: ../src/interface.c:3447
 msgid "Show close buttons"
-msgstr "Wyświetlanie przycisków zamykania na zakładkach"
+msgstr "Pokaż przyciski zamykania"
 
 #: ../src/interface.c:3450
-#, fuzzy
-msgid ""
-"Shows a small cross button in the file tabs to easily close files when "
-"clicking on it (requires restart of Geany)"
-msgstr ""
-"Pokazuje małe przyciski z ikoną krzyżyka w rogu zakładek, które umożliwiają "
-"szybkie zamykanie plików (po zmianie tej opcji należy ponownie uruchomić "
-"Geany aby zadziałała)."
+msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)"
+msgstr "Pokaż ikony zamykania kart edytora (wymaga ponownego uruchomienia programu)"
 
 #: ../src/interface.c:3456
 msgid "Placement of new file tabs:"
-msgstr "Położenie nowych zakładek plików:"
+msgstr "Umieść kartę nowego dokumentu:"
 
 #: ../src/interface.c:3472
 msgid "File tabs will be placed on the left of the notebook"
-msgstr "Zakładki nowych plików będą umieszczane na lewym końcu listy zakładek"
+msgstr "Karty nowych dokumentów od lewego końca"
 
 #: ../src/interface.c:3480
 msgid "File tabs will be placed on the right of the notebook"
-msgstr "Zakładki nowych plików będą umieszczane na prawym końcu listy zakładek"
+msgstr "Karty nowych dokumentów od prawego końca"
 
 #: ../src/interface.c:3484
-#, fuzzy
 msgid "Next to current"
-msgstr "Zapisuje bieżący plik"
+msgstr "Sąsiadująco z bieżącym"
 
 #: ../src/interface.c:3489
-msgid ""
-"Whether to place file tabs next to the current tab rather than at the edges "
-"of the notebook"
-msgstr ""
+msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook"
+msgstr "Określa, czy nowe karty edytora wstawiane będą obok karty bieżącej, czy na końcu"
 
 #: ../src/interface.c:3491
-#, fuzzy
 msgid "Double-clicking hides all additional widgets"
-msgstr "Włącz/Wyłącz tryb minimalistyczny"
+msgstr "Dwukrotne kliknięcie ukrywa dodatkowe widżety"
 
 #: ../src/interface.c:3494
-#, fuzzy
 msgid "Calls the View->Toggle All Additional Widgets command"
-msgstr "Przełącz wszystkie dodatkowe panele"
+msgstr "Wykonaj: Widok -> Pokaż/ukryj dodatkowe widżety"
 
 #: ../src/interface.c:3496
 msgid "<b>Editor tabs</b>"
-msgstr "<b>Zakładki edytora</b>"
+msgstr "<b>Karty edytora</b>"
 
-#: ../src/interface.c:3532 ../src/interface.c:3550 ../src/interface.c:3568
+#: ../src/interface.c:3532
+#: ../src/interface.c:3550
+#: ../src/interface.c:3568
 msgid "Top"
 msgstr "Góra"
 
-#: ../src/interface.c:3533 ../src/interface.c:3551 ../src/interface.c:3569
+#: ../src/interface.c:3533
+#: ../src/interface.c:3551
+#: ../src/interface.c:3569
 msgid "Bottom"
 msgstr "Dół"
 
@@ -2082,84 +2038,75 @@ msgstr "Panel boczny"
 
 #: ../src/interface.c:3571
 msgid "<b>Tab positions</b>"
-msgstr "<b>Położenie elementów interfejsu:</b>"
+msgstr "<b>Położenie kart:</b>"
 
 #: ../src/interface.c:3576
-#, fuzzy
 msgid "Notebook tabs"
-msgstr "Polecenia składni"
+msgstr "Karty edytora"
 
 #: ../src/interface.c:3607
-#, fuzzy
 msgid "Show t_oolbar"
-msgstr "Wyświetlanie paska narzędzi"
+msgstr "Pokaż pasek _narzędzi"
 
 #: ../src/interface.c:3611
 msgid "_Append toolbar to the menu"
-msgstr ""
+msgstr "_Dołącz pasek zadań do menu"
 
 #: ../src/interface.c:3614
 msgid "Pack the toolbar to the main menu to save vertical space"
-msgstr ""
+msgstr "Ustaw pasek narzędzi obok głównego menu, by zaoszczędzić miejsce"
 
-#: ../src/interface.c:3636 ../src/toolbar.c:936
-#, fuzzy
+#: ../src/interface.c:3636
+#: ../src/toolbar.c:933
 msgid "Customize Toolbar"
-msgstr "Pasek _narzędzi"
+msgstr "Dostosuj pasek narzędzi"
 
 #: ../src/interface.c:3656
 msgid "System _default"
-msgstr ""
+msgstr "Ustawienia _systemowe"
 
 #: ../src/interface.c:3664
-#, fuzzy
 msgid "Images _and text"
-msgstr "Napisy i ikony"
+msgstr "Tekst i i_kony"
 
 #: ../src/interface.c:3672
-#, fuzzy
 msgid "_Images only"
-msgstr "Tylko ikony"
+msgstr "Tylko ik_ony"
 
 #: ../src/interface.c:3680
-#, fuzzy
 msgid "_Text only"
-msgstr "Tylko napisy"
+msgstr "Tylko _tekst"
 
 #: ../src/interface.c:3688
-#, fuzzy
 msgid "<b>Icon style</b>"
-msgstr "<b>Czcionki</b>"
+msgstr "<b>Rodzaj ikon</b>"
 
 #: ../src/interface.c:3709
 msgid "S_ystem default"
-msgstr ""
+msgstr "_Domyślne ustawienia systemu"
 
 #: ../src/interface.c:3717
-#, fuzzy
 msgid "_Small icons"
-msgstr "Małe ikony"
+msgstr "_Małe ikony"
 
 #: ../src/interface.c:3725
-#, fuzzy
 msgid "_Very small icons"
-msgstr "Małe ikony"
+msgstr "Mi_niaturki"
 
 #: ../src/interface.c:3733
-#, fuzzy
 msgid "_Large icons"
-msgstr "Duże ikony"
+msgstr "_Duże ikony"
 
 #: ../src/interface.c:3741
-#, fuzzy
 msgid "<b>Icon size</b>"
-msgstr "<b>Rozmiar:</b>"
+msgstr "<b>Rozmiar ikon:</b>"
 
 #: ../src/interface.c:3746
 msgid "<b>Toolbar</b>"
 msgstr "<b>Pasek narzędzi</b>"
 
-#: ../src/interface.c:3751 ../src/prefs.c:1569
+#: ../src/interface.c:3751
+#: ../src/prefs.c:1584
 msgid "Toolbar"
 msgstr "Pasek narzędzi"
 
@@ -2168,436 +2115,360 @@ msgid "Line wrapping"
 msgstr "Zawijanie wierszy"
 
 #: ../src/interface.c:3785
-msgid ""
-"Wrap the line at the window border and continue it on the next line. Note: "
-"line wrapping has a high performance cost for large documents so should be "
-"disabled on slow machines."
-msgstr ""
-"Zawija linie tak, aby mieściły się w oknie edytora. Uwaga: zawijanie linii w "
-"przypadku dużych dokumentów może być zasobochłonne (tj. spowalniać działanie "
-"programu) na starszych starszych komputerach."
+msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines."
+msgstr "Zawija wiersze, by mieściły się w oknie edytora. Uwaga: zawijanie wierszy w przypadku dużych dokumentów może spowalniać działanie programu."
 
 #: ../src/interface.c:3787
-#, fuzzy
 msgid "\"Smart\" home key"
 msgstr "\"Inteligentny\" klawisz Home"
 
 #: ../src/interface.c:3790
-msgid ""
-"When \"smart\" home is enabled, the HOME key will move the caret to the "
-"first non-blank character of the line, unless it is already there, it moves "
-"to the very beginning of the line. When this feature is disabled, the HOME "
-"key always moves the caret to the start of the current line, regardless of "
-"its current position."
-msgstr ""
-"Gdy ta opcja jest włączona, klawisz HOME automatycznie przesunie karetkę na "
-"pierwszy znak we wierszu nie będący wolną przestrzenią, a w przypadku, gdy "
-"już tam będzie, przesunie karetkę na sam początek linii. Gdy ta opcja jest "
-"wyłączona, klawisz HOME zawsze przesuwa karetkę na początek wiersza, "
-"niezależnie od bieżącej pozycji."
+msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position."
+msgstr "Włączona opcja sprawia, że naciśnięcie klawisza HOME ustawi kursor przed pierwszym białym znakiem wiersza lub na jego początku. W przeciwnym wypadku kursor zawsze ustawi się na początku wiersza."
 
 #: ../src/interface.c:3792
 msgid "Disable Drag and Drop"
 msgstr "Wyłączenie przeciągania i upuszczania"
 
 #: ../src/interface.c:3795
-#, fuzzy
-msgid ""
-"Disable drag and drop completely in the editor window so you can't drag and "
-"drop any selections within or outside of the editor window"
-msgstr ""
-"Wyłącza całkowicie przeciąganie i upuszczanie w oknie edytora aby umożliwić "
-"przeciąganie i upuszczanie dowolnego zaznaczenia wewnątrz lub na zewnątrz "
-"okna edytora."
+msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window"
+msgstr "Wyłącza możliwość przeciągania i upuszczania zaznaczonego fragmentu tekstu tak w obrębie, jak i z zewnątrz edytora"
 
 #: ../src/interface.c:3797
-#, fuzzy
 msgid "Code folding"
 msgstr "Zwijanie sekcji kodu"
 
 #: ../src/interface.c:3801
-#, fuzzy
 msgid "Fold/unfold all children of a fold point"
-msgstr "Rozwijanie potomne punktów zwinięcia"
+msgstr "Zwiń/rozwiń wszystkie sekcje potomne względem tego punktu"
 
 #: ../src/interface.c:3804
-msgid ""
-"Fold or unfold all children of a fold point. By pressing the Shift key while "
-"clicking on a fold symbol the contrary behavior is used."
-msgstr ""
+msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used."
+msgstr "Zwiń/rozwiń wszystkie sekcje potomne względem tego punktu. Przytrzymaj Shift i kliknij dla operacji odwrotnej."
 
 #: ../src/interface.c:3806
 msgid "Use indicators to show compile errors"
 msgstr "Podkreślanie miejsc, w których wystąpiły błędy kompilacji"
 
 #: ../src/interface.c:3809
-#, fuzzy
-msgid ""
-"Whether to use indicators (a squiggly underline) to highlight the lines "
-"where the compiler found a warning or an error"
-msgstr ""
-"Podkreśla te części kodu źródłowego, w których kompilator znalazł błędy lub "
-"których dotyczyły ostrzeżenia kompilatora."
+msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error"
+msgstr "Określa, czy podkreślać wiersze, w których kompilator generuje ostrzeżenia lub wskazuje błędy"
 
 #: ../src/interface.c:3811
-#, fuzzy
 msgid "Newline strips trailing spaces"
-msgstr "Usuwanie spacji i znaków tabulacji na końcach linii"
+msgstr "Przejście do nowego wiersza usuwa końcowe spacje w wierszu poprzednim"
 
 #: ../src/interface.c:3814
 msgid "Enable newline to strip the trailing spaces on the previous line"
-msgstr ""
+msgstr "Włącz usuwanie końcowych spacji przy przejściu do nowego wiersza"
 
 #: ../src/interface.c:3820
-#, fuzzy
 msgid "Line breaking column:"
-msgstr "Zawijanie wierszy"
+msgstr "Zawijaj wiersze od kolumny:"
 
 #: ../src/interface.c:3834
-#, fuzzy
 msgid "Comment toggle marker:"
-msgstr "Przełącz znacznik"
+msgstr "Znacznik przełączania komentarzy:"
 
 #: ../src/interface.c:3841
-msgid ""
-"A string which is added when toggling a line comment in a source file, it is "
-"used to mark the comment as toggled."
-msgstr ""
+msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled."
+msgstr "Znak dołączany jako przełącznik komentarza w kodzie źródłowym dla zaznaczenia, że komentarz został włączony lub wyłączony."
 
 #: ../src/interface.c:3843
 msgid "<b>Features</b>"
-msgstr "<b>Opcje</b>"
+msgstr "<b>Różne</b>"
 
 #: ../src/interface.c:3848
-#, fuzzy
 msgid "Features"
-msgstr "<b>Opcje</b>"
+msgstr "Różne"
 
 #: ../src/interface.c:3861
-msgid ""
-"Note: To apply these settings to all currently open documents, use "
-"<i>Project->Apply Default Indentation</i>."
-msgstr ""
+msgid "Note: To apply these settings to all currently open documents, use <i>Project->Apply Default Indentation</i>."
+msgstr "Uwaga: by zastosować te ustawienia do wszystkich otwartych dokumentów, użyj: <i>Projekt -> Zastosuj domyślne wcięcia</i>."
 
-#: ../src/interface.c:3888 ../src/interface.c:5606
-#, fuzzy
+#: ../src/interface.c:3888
+#: ../src/interface.c:5606
 msgid "Width:"
-msgstr "Zapis:"
+msgstr "Szerokość:"
 
-#: ../src/interface.c:3901 ../src/interface.c:5619
-#, fuzzy
+#: ../src/interface.c:3901
+#: ../src/interface.c:5619
 msgid "The width in chars of a single indent"
-msgstr ""
-"Szerokość znaku tabulacji wyrażona szerokością jednego znaku standardowego"
+msgstr "Wielkość pojedynczego wcięcia w znakach"
 
-#: ../src/interface.c:3906 ../src/interface.c:5624
-#, fuzzy
+#: ../src/interface.c:3906
+#: ../src/interface.c:5624
 msgid "Auto-indent mode:"
-msgstr "Automatyczne wcięcia"
+msgstr "Automatyczne wcięcia:"
 
-#: ../src/interface.c:3919 ../src/interface.c:5637
+#: ../src/interface.c:3919
+#: ../src/interface.c:5637
 msgid "Basic"
 msgstr "Podstawowe"
 
-#: ../src/interface.c:3920 ../src/interface.c:5638
+#: ../src/interface.c:3920
+#: ../src/interface.c:5638
 msgid "Current chars"
 msgstr "Bieżące znaki"
 
-#: ../src/interface.c:3921 ../src/interface.c:5639
+#: ../src/interface.c:3921
+#: ../src/interface.c:5639
 msgid "Match braces"
-msgstr "Idź do nawiasu zamykającego/otwierającego"
+msgstr "Paruj nawiasy"
 
-#: ../src/interface.c:3923 ../src/interface.c:5641
-#, fuzzy
+#: ../src/interface.c:3923
+#: ../src/interface.c:5641
 msgid "Detect type from file"
-msgstr "Według zawartości pliku"
+msgstr "Ustal typ na podstawie zawartości pliku"
 
-#: ../src/interface.c:3928 ../src/interface.c:5646
-msgid ""
-"Whether to detect the indentation type from file contents when a file is "
-"opened"
-msgstr ""
+#: ../src/interface.c:3928
+#: ../src/interface.c:5646
+msgid "Whether to detect the indentation type from file contents when a file is opened"
+msgstr "Włącz wykrywanie rodzaju wcięć na podstawie zawartości pliku przy jego otwieraniu"
 
-#: ../src/interface.c:3930 ../src/interface.c:5648
-#, fuzzy
+#: ../src/interface.c:3930
+#: ../src/interface.c:5648
 msgid "T_abs and spaces"
-msgstr "Zamień znaki tabulacji na _spacje"
+msgstr "Sp_acje i znaki tabulacji"
 
-#: ../src/interface.c:3935 ../src/interface.c:5653
-msgid ""
-"Use spaces if the total indent is less than the tab width, otherwise use both"
-msgstr ""
+#: ../src/interface.c:3935
+#: ../src/interface.c:5653
+msgid "Use spaces if the total indent is less than the tab width, otherwise use both"
+msgstr "Użyj spacji jeżeli wcięcie jest mniejsza niż wielkość tabulacji, w przeciwnym wypadku używaj obu rodzajów znaków"
 
-#: ../src/interface.c:3944 ../src/interface.c:5662
+#: ../src/interface.c:3944
+#: ../src/interface.c:5662
 msgid "Use spaces when inserting indentation"
-msgstr ""
+msgstr "Używaj spacji do wcięć"
 
-#: ../src/interface.c:3953 ../src/interface.c:5671
+#: ../src/interface.c:3953
+#: ../src/interface.c:5671
 msgid "Use one tab per indent"
-msgstr ""
+msgstr "Jeden znak tabulacji na wcięcie"
 
-#: ../src/interface.c:3957 ../src/interface.c:5682
-#, fuzzy
+#: ../src/interface.c:3957
+#: ../src/interface.c:5682
 msgid "Detect width from file"
-msgstr "Według zawartości pliku"
+msgstr "Określ szerokość na podstawie zawartości pliku"
 
-#: ../src/interface.c:3962 ../src/interface.c:5687
-msgid ""
-"Whether to detect the indentation width from file contents when a file is "
-"opened"
-msgstr ""
+#: ../src/interface.c:3962
+#: ../src/interface.c:5687
+msgid "Whether to detect the indentation width from file contents when a file is opened"
+msgstr "Włącz wykrywanie wielkości wcięć na podstawie zawartości pliku przy jego otwieraniu"
 
-#: ../src/interface.c:3964 ../src/interface.c:4254 ../src/interface.c:5675
+#: ../src/interface.c:3964
+#: ../src/interface.c:4254
+#: ../src/interface.c:5675
 msgid "Type:"
 msgstr "Typ:"
 
 #: ../src/interface.c:3971
-#, fuzzy
 msgid "Tab key indents"
-msgstr "Inteligentne wcięcia wierszy"
+msgstr "Klawisz tabulatora wcina wiersz"
 
 #: ../src/interface.c:3974
-msgid ""
-"Pressing tab/shift-tab indents/unindents instead of inserting a tab character"
-msgstr ""
+msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character"
+msgstr "Tab/Shift-Tab wcina/cofa wcięcie tekstu zamiast wstawić znak tabulacji"
 
 #: ../src/interface.c:3976
 msgid "<b>Indentation</b>"
-msgstr "<b>Wcięcie</b>"
+msgstr "<b>Wcięcia</b>"
 
-#: ../src/interface.c:3981 ../src/interface.c:5689
-#, fuzzy
+#: ../src/interface.c:3981
+#: ../src/interface.c:5689
 msgid "Indentation"
-msgstr "<b>Wcięcie</b>"
+msgstr "<b>Wcięcia</b>"
 
 #: ../src/interface.c:4004
-#, fuzzy
 msgid "Snippet completion"
-msgstr "Automatyczne uzupełnianie konstrukcji"
+msgstr "Uzupełnianie snippetu"
 
 #: ../src/interface.c:4007
-msgid ""
-"Type a defined short character sequence and complete it to a more complex "
-"string using a single keypress"
-msgstr ""
+msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress"
+msgstr "Napisz zdefiniowany skrót i rozwiń go jednym naciśnięciem klawisza"
 
 #: ../src/interface.c:4009
-#, fuzzy
 msgid "XML/HTML tag auto-closing"
-msgstr "Automatyczne uzupełnianie znaczników XML i HTML"
+msgstr "Automatyczne domykanie znaczników XML i HTML"
 
 #: ../src/interface.c:4012
 msgid "Insert matching closing tag for XML/HTML"
-msgstr ""
+msgstr "Wstaw sparowany znacznik XML/HTML"
 
 #: ../src/interface.c:4014
-#, fuzzy
 msgid "Automatic continuation of multi-line comments"
-msgstr "Wstawia komentarz dłuższy niż jedna linia"
+msgstr "Automatycznie kontynuuj komentarze wielowierszowe"
 
 #: ../src/interface.c:4017
-msgid ""
-"Continue automatically multi-line comments in languages like C, C++ and Java "
-"when a new line is entered inside such a comment"
-msgstr ""
+msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment"
+msgstr "Kontynuuj jako komentarz wielowierszowy, gdy nowy wiersz został wstawiony w jego obrębie (C, C++, Java, etc.)"
 
 #: ../src/interface.c:4019
 msgid "Autocomplete symbols"
-msgstr ""
+msgstr "Autouzupełnianie symboli"
 
 #: ../src/interface.c:4022
-msgid ""
-"Automatic completion of known symbols in open files (function names, global "
-"variables, ...)"
-msgstr ""
-"Automatyczne uzupełnianie wyrażeń występujących w otwartych plikach (np. "
-"nazw funkcji, zmiennych globalnych, itp.) "
+msgid "Automatic completion of known symbols in open files (function names, global variables, ...)"
+msgstr "Automatyczne uzupełnianie wyrażeń występujących w otwartych plikach (np. nazw funkcji, zmiennych globalnych, itp.) "
 
 #: ../src/interface.c:4024
 msgid "Autocomplete all words in document"
-msgstr ""
+msgstr "Autouzupełnianie wszystkich słów w dokumencie"
 
 #: ../src/interface.c:4028
-#, fuzzy
 msgid "Drop rest of word on completion"
-msgstr "Automatyczne uzupełnianie konstrukcji"
+msgstr "Odrzuć resztę słowa podczas autouzupełniania"
 
 #: ../src/interface.c:4038
 msgid "Max. symbol name suggestions:"
-msgstr ""
+msgstr "Liczba pozycji na liście autouuzpełniania:"
 
 #: ../src/interface.c:4045
 msgid "Completion list height:"
-msgstr ""
+msgstr "Wysokość listy autouzupełniania:"
 
 #: ../src/interface.c:4052
-#, fuzzy
 msgid "Characters to type for autocompletion:"
-msgstr "_Automatyczne uzupełnianie pętli"
+msgstr "Liczba znaków do wywołania do autouzupełniania:"
 
 #: ../src/interface.c:4065
-msgid ""
-"The amount of characters which are necessary to show the symbol "
-"autocompletion list"
-msgstr ""
+msgid "The amount of characters which are necessary to show the symbol autocompletion list"
+msgstr "Liczba znaków niezbędnych dla uzyskania podpowiedzi autouzupełniania"
 
 #: ../src/interface.c:4074
-#, fuzzy
 msgid "Display height in rows for the autocompletion list"
 msgstr "Liczba wierszy wyświetlanych przez listę autouzupełniania"
 
 #: ../src/interface.c:4083
-#, fuzzy
 msgid "Maximum number of entries to display in the autocompletion list"
-msgstr "Liczba wierszy wyświetlanych przez listę autouzupełniania"
+msgstr "Liczba wierszy wyświetlanych na liście autouzupełniania"
 
 #: ../src/interface.c:4086
 msgid "Symbol list update frequency:"
-msgstr ""
+msgstr "Częstość odświeżania listy symboli:"
 
 #: ../src/interface.c:4099
-msgid ""
-"Minimal delay (in milliseconds) between two automatic updates of the symbol "
-"list. Note that a too short delay may have performance impact, especially "
-"with large files. A delay of 0 disables real-time updates."
-msgstr ""
+msgid "Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, especially with large files. A delay of 0 disables real-time updates."
+msgstr "Minimalny odstęp czasu (w milisekundach) między kolejnym odświeżeniem listy symboli. Zbyt krótki odstęp może mieć wpływ na wydajność, szczególnie w przypadku wielkich plików. Odstęp 0 wyłącza odświeżanie w czasie rzeczywistym."
 
 #: ../src/interface.c:4102
-#, fuzzy
 msgid "<b>Completions</b>"
 msgstr "<b>Automatyczne uzupełnianie</b>"
 
 #: ../src/interface.c:4121
 msgid "Parenthesis ( )"
-msgstr ""
+msgstr "Nawiasy ( )"
 
 #: ../src/interface.c:4126
 msgid "Auto-close parenthesis when typing an opening one"
-msgstr ""
+msgstr "Automatyczne zamykanie nawiasów po otwarciu"
 
 #: ../src/interface.c:4128
 msgid "Single quotes ' '"
-msgstr ""
+msgstr "Pojedynczy cudzysłów ' '"
 
 #: ../src/interface.c:4133
 msgid "Auto-close single quote when typing an opening one"
-msgstr ""
+msgstr "Automatyczne zamykanie pojedynczych cudzysłowów po otwarciu"
 
 #: ../src/interface.c:4135
 msgid "Curly brackets { }"
-msgstr ""
+msgstr "Nawiasy klamrowe { }"
 
 #: ../src/interface.c:4140
 msgid "Auto-close curly bracket when typing an opening one"
-msgstr ""
+msgstr "Automatyczne zamykanie nawiasów klamrowych po otwarciu"
 
 #: ../src/interface.c:4142
 msgid "Square brackets [ ]"
-msgstr ""
+msgstr "Nawiasy kwadratowe [ ]"
 
 #: ../src/interface.c:4147
 msgid "Auto-close square-bracket when typing an opening one"
-msgstr ""
+msgstr "Automatyczne zamykanie nawiasów kwadratowych po otwarciu"
 
 #: ../src/interface.c:4149
 msgid "Double quotes \" \""
-msgstr ""
+msgstr "Podwójny cudzysłów"
 
 #: ../src/interface.c:4154
 msgid "Auto-close double quote when typing an opening one"
-msgstr ""
+msgstr "Automatyczne zamykanie podwójnych cudzysłowów po otwarciu"
 
 #: ../src/interface.c:4156
 msgid "<b>Auto-close quotes and brackets</b>"
-msgstr ""
+msgstr "<b>Automatyczne zamykanie cudzysłowów i nawiasów</b>"
 
 #: ../src/interface.c:4161
-#, fuzzy
 msgid "Completions"
-msgstr "<b>Automatyczne uzupełnianie</b>"
+msgstr "<b>Auto-uzupełnianie</b>"
 
 #: ../src/interface.c:4184
 msgid "Invert syntax highlighting colors"
 msgstr "Odwróć kolory podświetlania składni"
 
 #: ../src/interface.c:4187
-#, fuzzy
 msgid "Invert all colors, by default using white text on a black background"
-msgstr "Stosuj biały kolor tekstu na czarnym tle"
+msgstr "Odwróć wszystkie kolory, domyślnie biały kolor tekstu na czarnym tle"
 
 #: ../src/interface.c:4189
 msgid "Show indentation guides"
-msgstr "Wyświetlanie prowadnic"
+msgstr "Pokaż prowadnice wcięć"
 
 #: ../src/interface.c:4192
-#, fuzzy
 msgid "Shows small dotted lines to help you to use the right indentation"
-msgstr ""
-"Pokazuje małe przerywane linie, które pomagają w wyborze odpowieniej "
-"prowadnicy"
+msgstr "Wyświetl przerywane linie, pomocne przy ustalaniu wielkości wcięć"
 
 #: ../src/interface.c:4194
 msgid "Show white space"
-msgstr "Wyświetlanie ukrytych znaków"
+msgstr "Pokaż białe znaki"
 
 #: ../src/interface.c:4197
-#, fuzzy
 msgid "Marks spaces with dots and tabs with arrows"
-msgstr "Oznacza spacje za pomocą kropek, a znaki tabulacji strzałkami"
+msgstr "Oznacz spacje kropkami, znaki tabulacji strzałkami"
 
 #: ../src/interface.c:4199
 msgid "Show line endings"
-msgstr "Wyświetlanie znaków końca wiersza"
+msgstr "Pokaż znaki końca wiersza"
 
 #: ../src/interface.c:4202
-#, fuzzy
 msgid "Shows the line ending character"
-msgstr "Włącza wyświetlanie znaków końca wiersza"
+msgstr "Pokaż znaki końca wiersza"
 
 #: ../src/interface.c:4204
-#, fuzzy
 msgid "Show line numbers"
-msgstr "_Numery wierszy"
+msgstr "Pokaż numery wierszy"
 
 #: ../src/interface.c:4207
-#, fuzzy
 msgid "Shows or hides the Line Number margin"
-msgstr "Wyświetla lub ukrywa numerowanie wierszy na marginesie."
+msgstr "Pokaż/ukryj margines numerów wierszy"
 
 #: ../src/interface.c:4209
-#, fuzzy
 msgid "Show markers margin"
-msgstr "Mar_gines ze znacznikami"
+msgstr "Pokaż margines znaczników"
 
 #: ../src/interface.c:4212
-#, fuzzy
-msgid ""
-"Shows or hides the small margin right of the line numbers, which is used to "
-"mark lines"
-msgstr ""
-"Pokazuje lub ukrywa mały margines po prawej stronie pola z numerami wierszy, "
-"który umożliwia zaznaczanie wierszy"
+msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines"
+msgstr "Pokaż/ukryj margines do zaznaczania wierszy"
 
 #: ../src/interface.c:4214
-#, fuzzy
 msgid "Stop scrolling at last line"
-msgstr "Przewiń do bieżącej linii"
+msgstr "Zatrzymaj przewijanie na ostatnim wierszu dokumentu"
 
 #: ../src/interface.c:4217
 msgid "Whether to stop scrolling one page past the last line of a document"
-msgstr ""
+msgstr "Ustala, czy zatrzymać przewijanie stronę po ostatnim wierszu dokumentu"
 
 #: ../src/interface.c:4219
 msgid "<b>Display</b>"
 msgstr "<b>Wyświetlanie</b>"
 
-#: ../src/interface.c:4240 ../src/interface.c:5721
-#, fuzzy
+#: ../src/interface.c:4240
+#: ../src/interface.c:5721
 msgid "Column:"
-msgstr "Firma:"
+msgstr "Kolumna:"
 
 #: ../src/interface.c:4247
-#, fuzzy
 msgid "Color:"
 msgstr "Kolor"
 
@@ -2605,87 +2476,71 @@ msgstr "Kolor"
 msgid "Sets the color of the long line marker"
 msgstr "Ustawia kolor znacznika długiej linii"
 
-#: ../src/interface.c:4267 ../src/toolbar.c:72 ../src/tools.c:931
-#: ../src/vte.c:794 ../src/vte.c:801
+#: ../src/interface.c:4267
+#: ../src/toolbar.c:70
+#: ../src/tools.c:929
+#: ../src/vte.c:794
+#: ../src/vte.c:801
 msgid "Color Chooser"
 msgstr "Wybór koloru"
 
 #: ../src/interface.c:4275
-#, fuzzy
-msgid ""
-"The long line marker is a thin vertical line in the editor, it helps to mark "
-"long lines, or as a hint to break the line. Set this value to a value "
-"greater than 0 to specify the column where it should appear."
-msgstr ""
-"Znacznikiem długiej linii jest pionowa linia widoczna w oknie edytora. "
-"Pomaga ona w zachowaniu przejrzystości kodu, może służyć jako wskazówka przy "
-"dzieleniu zbyt długich wierszy. Podaj liczbę znaków w poziomie, jaką ma "
-"wydzielać ta linia."
+msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear."
+msgstr "Znacznikiem długiego wiersza jest pionowa linia w oknie edytora. Pomaga ona zorientować się, które wiersze są zbyt długie. Wskaż, w której kolumnie ma być wyświetlana."
 
 #: ../src/interface.c:4285
 msgid "Line"
 msgstr "Wiersz"
 
 #: ../src/interface.c:4288
-#, fuzzy
-msgid ""
-"Prints a vertical line in the editor window at the given cursor position "
-"(see below)"
-msgstr ""
-"Wyświetla pionową linię w oknie edytora w określonej pozycji kursora (patrz "
-"poniżej)"
+msgid "Prints a vertical line in the editor window at the given cursor position (see below)"
+msgstr "Wyświetla pionową linię w oknie edytora w określonej pozycji kursora (patrz niżej)"
 
 #: ../src/interface.c:4292
 msgid "Background"
 msgstr "Tło"
 
 #: ../src/interface.c:4295
-msgid ""
-"The background color of characters after the given cursor position (see "
-"below) changed to the color set below, (this is recommended if you use "
-"proportional fonts)"
-msgstr ""
+msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)"
+msgstr "Kolor tła znaków za kursorem zmienia się na taki, jak przed kursorem (zalecane, jeżeli używany font jest proporcjonalny)"
 
 #: ../src/interface.c:4299
-#, fuzzy
 msgid "Enabled"
-msgstr "Zwijanie sekcji kodu"
+msgstr "Włączone"
 
-#: ../src/interface.c:4305 ../src/interface.c:5761
+#: ../src/interface.c:4305
+#: ../src/interface.c:5761
 msgid "<b>Long line marker</b>"
 msgstr "<b>Znacznik długiej linii</b>"
 
-#: ../src/interface.c:4324 ../src/interface.c:5728
+#: ../src/interface.c:4324
+#: ../src/interface.c:5728
 msgid "Disabled"
-msgstr "Brak"
+msgstr "Wyłączone"
 
 #: ../src/interface.c:4327
 msgid "Do not show virtual spaces"
-msgstr ""
+msgstr "Nie pokazuj wirtualnych spacji"
 
 #: ../src/interface.c:4331
 msgid "Only for rectangular selections"
-msgstr ""
+msgstr "Tylko dla prostokątnych bloków zaznaczenia"
 
 #: ../src/interface.c:4334
-msgid ""
-"Only show virtual spaces beyond the end of lines when drawing a rectangular "
-"selection"
-msgstr ""
+msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection"
+msgstr "Pokaż wirtualne miejsca poza końcem wierszy tylko dla prostokątnych bloków zaznaczenia"
 
 #: ../src/interface.c:4338
 msgid "Always"
-msgstr ""
+msgstr "Zawsze"
 
 #: ../src/interface.c:4341
-#, fuzzy
 msgid "Always show virtual spaces beyond the end of lines"
-msgstr "Usuwa spacje i znaki tabulacji na końcu linii"
+msgstr "Zawsze pokazuj wolne miejsce poza końcem wiersza"
 
 #: ../src/interface.c:4345
-#, fuzzy
 msgid "<b>Virtual spaces</b>"
-msgstr "<b>Ścieżki do narzędzi</b>"
+msgstr "<b>Wirtualne wolne miejsce</b>"
 
 #: ../src/interface.c:4350
 msgid "Display"
@@ -2693,16 +2548,15 @@ msgstr "Wyświetlanie"
 
 #: ../src/interface.c:4381
 msgid "Open new documents from the command-line"
-msgstr ""
+msgstr "Otwórz nowe dokumenty przy pomocy wiersza poleceń"
 
 #: ../src/interface.c:4384
 msgid "Start a new file for each command-line filename that doesn't exist"
-msgstr ""
+msgstr "Jeżeli w wierszu poleceń pojawi się nazwa nieistniejącego pliku, utwórz go"
 
 #: ../src/interface.c:4398
-#, fuzzy
 msgid "Default end of line characters:"
-msgstr "Domyślne kodowanie (dla nowych plików):"
+msgstr "Domyślny znak końca wiersza:"
 
 #: ../src/interface.c:4405
 msgid "<b>New files</b>"
@@ -2713,39 +2567,28 @@ msgid "Default encoding (new files):"
 msgstr "Domyślne kodowanie (dla nowych plików):"
 
 #: ../src/interface.c:4436
-#, fuzzy
 msgid "Sets the default encoding for newly created files"
-msgstr "Ustaw domyślne kodowanie dla nowych plików."
+msgstr "Ustaw domyślne kodowanie dla nowoutworzonych plików"
 
 #: ../src/interface.c:4442
-#, fuzzy
 msgid "Use fixed encoding when opening non-Unicode files"
-msgstr "Używaj określonego kodowania dla otwieranych plików"
+msgstr "Używaj ustalonego kodowania podczas otwierania plików w standardzie innym niż Unikod"
 
 #: ../src/interface.c:4445
-#, fuzzy
-msgid ""
-"This option disables the automatic detection of the file encoding when "
-"opening non-Unicode files and opens the file with the specified encoding "
-"(usually not needed)"
-msgstr ""
-"Ta opcja wyłącza automatyczne wykrywanie kodowania przy otwieraniu plików, "
-"zamiast tego pliki będą otwierane z określonym kodowaniem."
+msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)"
+msgstr "Wyłącza wykrywanie kodowania przy otwieraniu pliku zapisanych w innym standardzie niż Unikod i otwiera plik w określonym kodowaniu (zazwyczaj nie jest to potrzebne)"
 
 #: ../src/interface.c:4451
-#, fuzzy
 msgid "Default encoding (existing non-Unicode files):"
-msgstr "Domyślne kodowanie (dla istniejących plików):"
+msgstr "Domyślne kodowanie (dla istniejących plików w standardzie innym niż Unikod):"
 
 #: ../src/interface.c:4459
-#, fuzzy
 msgid "Sets the default encoding for opening existing non-Unicode files"
-msgstr "Ustaw domyślne kodowanie dla otwieranych plików."
+msgstr "Określa wybór kodowania podczas otwierania istniejących plików kodowanych w standardzie innym niż Unikod."
 
 #: ../src/interface.c:4465
-#, fuzzy
 msgid "<b>Encodings</b>"
-msgstr "<b>Kodowanie:</b>"
+msgstr "<b>Kodowanie</b>"
 
 #: ../src/interface.c:4484
 msgid "Ensure new line at file end"
@@ -2756,33 +2599,29 @@ msgid "Ensures that at the end of the file is a new line"
 msgstr "Ustawia pustą nową linię na końcu pliku"
 
 #: ../src/interface.c:4489
-#, fuzzy
 msgid "Ensure consistent line endings"
-msgstr "Nowa linia na końcu pliku"
+msgstr "Wymusza jednolitość znaczników końca wiersza"
 
 #: ../src/interface.c:4492
-msgid ""
-"Ensures that newline characters always get converted before saving, avoiding "
-"mixed line endings in the same file"
-msgstr ""
+msgid "Ensures that newline characters always get converted before saving, avoiding mixed line endings in the same file"
+msgstr "Wymusza ujednolicenie znaków nowego wiersza przed zapisaniem pliku"
 
 #: ../src/interface.c:4494
-#, fuzzy
 msgid "Strip trailing spaces and tabs"
-msgstr "Usuwanie spacji i znaków tabulacji na końcach linii"
+msgstr "Usuwanie białych znaków z końców wierszy"
 
 #: ../src/interface.c:4497
 msgid "Removes trailing spaces and tabs and the end of lines"
 msgstr "Usuwa spacje i znaki tabulacji na końcu linii"
 
-#: ../src/interface.c:4499 ../src/keybindings.c:519
+#: ../src/interface.c:4499
+#: ../src/keybindings.c:542
 msgid "Replace tabs by space"
 msgstr "Zamiana tabulacji na spacje"
 
 #: ../src/interface.c:4502
-#, fuzzy
 msgid "Replaces all tabs in document by spaces"
-msgstr "Zamienia wszystkie znaki tabulacji na spacje."
+msgstr "Zamienia wszystkie znaki tabulacji na spacje"
 
 #: ../src/interface.c:4504
 msgid "<b>Saving files</b>"
@@ -2793,22 +2632,21 @@ msgid "Recent files list length:"
 msgstr "Rozmiar listy ostatnio używanych plików:"
 
 #: ../src/interface.c:4543
-#, fuzzy
 msgid "Specifies the number of files which are stored in the Recent files list"
-msgstr "Określa liczbę plików wyświetlanych w menu \"Ostatnio otwierane\"."
+msgstr "Określa liczbę ostatnio otwieranych plików w menu \"Ostatnio otwierane\"."
 
 #: ../src/interface.c:4547
 msgid "Disk check timeout:"
-msgstr ""
+msgstr "Częstość sprawdzania, czy plik na dysku został zmieniony:"
 
 #: ../src/interface.c:4560
-msgid ""
-"How often to check for changes to document files on disk, in seconds. Zero "
-"disables checking."
-msgstr ""
+msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking."
+msgstr "Częstość sprawdzania, czy dokument został zmieniony, w sekundach. Zero wyłącza sprawdzanie."
 
-#: ../src/interface.c:4569 ../src/prefs.c:1573 ../src/symbols.c:682
-#: ../plugins/filebrowser.c:1133
+#: ../src/interface.c:4569
+#: ../src/prefs.c:1588
+#: ../src/symbols.c:680
+#: ../plugins/filebrowser.c:1119
 msgid "Files"
 msgstr "Pliki"
 
@@ -2821,22 +2659,16 @@ msgid "Browser:"
 msgstr "Przeglądarka:"
 
 #: ../src/interface.c:4621
-msgid ""
-"A terminal emulator like xterm, gnome-terminal or konsole (should accept the "
-"-e argument)"
-msgstr ""
-"Emulacja terminala takiego jak xterm, gnome-terminal czy konsole (powinien "
-"akceptować argument -e)"
+msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)"
+msgstr "Emulacja terminala takiego jak xterm, gnome-terminal czy konsole (powinien akceptować argument -e)"
 
 #: ../src/interface.c:4628
 msgid "Path (and possibly additional arguments) to your favorite browser"
-msgstr ""
-"Ścieżka (oraz ewentualnie dodatkowe parametry) do twojej ulubionej "
-"przeglądarki"
+msgstr "Ścieżka (oraz ewentualnie dodatkowe parametry) do twojej ulubionej przeglądarki"
 
 #: ../src/interface.c:4650
 msgid "Grep:"
-msgstr "Program Grep:"
+msgstr "Grep:"
 
 #: ../src/interface.c:4673
 msgid "<b>Tool paths</b>"
@@ -2844,24 +2676,20 @@ msgstr "<b>Ścieżki do narzędzi</b>"
 
 #: ../src/interface.c:4694
 msgid "Context action:"
-msgstr "Akcja kontekstowa:"
+msgstr "Działanie kontekstowe:"
 
 #: ../src/interface.c:4705
 #, c-format
-msgid ""
-"Context action command. The currently selected word can be used with %s. It "
-"can appear anywhere in the given command and will be replaced before "
-"execution."
-msgstr ""
-"Polecenie akcji kontekstowej. Aktualnie zaznaczone słowo może być używane w "
-"połączeniu z %s. Może pojawić się w dowolnym miejscu podanego polecenia i "
-"zostanie zamienione przed jego wykonaniem."
+msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution."
+msgstr "Polecenie działania kontekstowego. Zaznaczone słowo może być używane w połączeniu z %s. Może pojawić się w dowolnym miejscu podanego polecenia i zostanie zastąpione przed jego wykonaniem."
 
 #: ../src/interface.c:4718
 msgid "<b>Commands</b>"
 msgstr "<b>Polecenia</b>"
 
-#: ../src/interface.c:4723 ../src/keybindings.c:559 ../src/prefs.c:1575
+#: ../src/interface.c:4723
+#: ../src/keybindings.c:234
+#: ../src/prefs.c:1590
 msgid "Tools"
 msgstr "Narzędzia"
 
@@ -2906,51 +2734,35 @@ msgid "The name of the developer"
 msgstr "Nazwisko programisty"
 
 #: ../src/interface.c:4826
-#, fuzzy
 msgid "Year:"
-msgstr "Panel boczny"
+msgstr "Rok:"
 
 #: ../src/interface.c:4833
-#, fuzzy
 msgid "Date:"
-msgstr "Program Make:"
+msgstr "Data:"
 
 #: ../src/interface.c:4840
 msgid "Date & time:"
-msgstr ""
+msgstr "Data i czas:"
 
 #: ../src/interface.c:4852
-#, fuzzy
-msgid ""
-"Specify a format for the the {datetime} wildcard. You can use any conversion "
-"specifiers which can be used with the ANSI C strftime function."
-msgstr ""
-"Wprowadź własny format daty i czasu. Możesz używać dowolne operatory "
-"konwersji dostępne w funkcji strftime języka ANSI C."
+msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function."
+msgstr "Wprowadź własny format daty i czasu. Możesz używać dowolnych specyfikatorów funkcji strftime języka ANSI C."
 
 #: ../src/interface.c:4859
-#, fuzzy
-msgid ""
-"Specify a format for the the {year} wildcard. You can use any conversion "
-"specifiers which can be used with the ANSI C strftime function."
-msgstr ""
-"Wprowadź własny format daty i czasu. Możesz używać dowolne operatory "
-"konwersji dostępne w funkcji strftime języka ANSI C."
+msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function."
+msgstr "Wprowadź własny format roku. Możesz używać dowolnych specyfikatorów funkcji strftime języka ANSI C."
 
 #: ../src/interface.c:4866
-#, fuzzy
-msgid ""
-"Specify a format for the the {date} wildcard. You can use any conversion "
-"specifiers which can be used with the ANSI C strftime function."
-msgstr ""
-"Wprowadź własny format daty i czasu. Możesz używać dowolne operatory "
-"konwersji dostępne w funkcji strftime języka ANSI C."
+msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function."
+msgstr "Wprowadź własny format daty. Możesz używać dowolnych specyfikatorów funkcji strftime języka ANSI C."
 
 #: ../src/interface.c:4868
 msgid "<b>Template data</b>"
 msgstr "<b>Dane szablonu</b>"
 
-#: ../src/interface.c:4873 ../src/prefs.c:1577
+#: ../src/interface.c:4873
+#: ../src/prefs.c:1592
 msgid "Templates"
 msgstr "Szablony"
 
@@ -2960,823 +2772,769 @@ msgstr "Zmi_eń"
 
 #: ../src/interface.c:4915
 msgid "<b>Keyboard shortcuts</b>"
-msgstr "<b>Skróty klawiszowe</b>"
+msgstr "<b>Skróty klawiaturowe</b>"
 
-#: ../src/interface.c:4920 ../src/prefs.c:1579
+#: ../src/interface.c:4920
+#: ../src/prefs.c:1594
 msgid "Keybindings"
-msgstr "Skróty klawiszowe"
+msgstr "Skróty klawiaturowe"
 
 #: ../src/interface.c:4953
-#, fuzzy
 msgid "Command:"
 msgstr "Polecenie"
 
 #: ../src/interface.c:4960
-#, fuzzy, c-format
+#, c-format
 msgid "Path to the command for printing files (use %f for the filename)"
-msgstr ""
-"Pełna ścieżka wraz z opcjami do komendy umożliwiającej drukowanie plików (w "
-"miejsce nazwy pliku wstaw %f)"
+msgstr "Ścieżka do polecenia drukowania (w miejsce nazwy pliku wstaw %f)"
 
 #: ../src/interface.c:4970
 msgid "Use an external command for printing"
-msgstr ""
+msgstr "Drukuj przy pomocy polecenia zewnętrznego"
 
-#: ../src/interface.c:4990 ../src/printing.c:378
-#, fuzzy
+#: ../src/interface.c:4990
+#: ../src/printing.c:376
 msgid "Print line numbers"
-msgstr "_Numery wierszy"
+msgstr "Drukuj numery wierszy"
 
-#: ../src/interface.c:4993 ../src/printing.c:380
-#, fuzzy
+#: ../src/interface.c:4993
+#: ../src/printing.c:378
 msgid "Add line numbers to the printed page"
-msgstr "Podążanie za ścieżką do bieżącego pliku"
+msgstr "Drukuj numery wierszy"
 
-#: ../src/interface.c:4995 ../src/printing.c:383
-#, fuzzy
+#: ../src/interface.c:4995
+#: ../src/printing.c:381
 msgid "Print page numbers"
-msgstr "_Numery wierszy"
+msgstr "Drukuj numery stron"
 
-#: ../src/interface.c:4998 ../src/printing.c:385
-msgid ""
-"Add page numbers at the bottom of each page. It takes 2 lines of the page."
-msgstr ""
+#: ../src/interface.c:4998
+#: ../src/printing.c:383
+msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page."
+msgstr "Drukuj numer strony u dołu (zajmuje 2 wiersze wydruku)."
 
-#: ../src/interface.c:5000 ../src/printing.c:388
-#, fuzzy
+#: ../src/interface.c:5000
+#: ../src/printing.c:386
 msgid "Print page header"
-msgstr "Nagłówek podstawowy"
+msgstr "Drukuj nagłówek strony"
 
-#: ../src/interface.c:5003 ../src/printing.c:390
-msgid ""
-"Add a little header to every page containing the page number, the filename "
-"and the current date (see below). It takes 3 lines of the page."
-msgstr ""
+#: ../src/interface.c:5003
+#: ../src/printing.c:388
+msgid "Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page."
+msgstr "Dodaj 3-wierszowy nagłówek strony zawierający jej numer, nazwę pliku i bieżącą datę (patrz niżej)."
 
-#: ../src/interface.c:5020 ../src/printing.c:406
-#, fuzzy
+#: ../src/interface.c:5020
+#: ../src/printing.c:404
 msgid "Use the basename of the printed file"
-msgstr "Podążanie za ścieżką do bieżącego pliku"
+msgstr "Drukuj nazwę pliku"
 
 #: ../src/interface.c:5023
-#, fuzzy
 msgid "Print only the basename (without the path) of the printed file"
-msgstr "Podążanie za ścieżką do bieżącego pliku"
+msgstr "Drukuj tylko nazwę pliku (bez ścieżki dostępuj)"
 
-#: ../src/interface.c:5029 ../src/printing.c:414
-#, fuzzy
+#: ../src/interface.c:5029
+#: ../src/printing.c:412
 msgid "Date format:"
-msgstr "Własny format daty"
+msgstr "Format daty:"
 
-#: ../src/interface.c:5036 ../src/printing.c:420
-#, fuzzy
-msgid ""
-"Specify a format for the date and time stamp which is added to the page "
-"header on each page. You can use any conversion specifiers which can be used "
-"with the ANSI C strftime function."
-msgstr ""
-"Wprowadź własny format daty i czasu. Możesz używać dowolne operatory "
-"konwersji dostępne w funkcji strftime języka ANSI C."
+#: ../src/interface.c:5036
+#: ../src/printing.c:418
+msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function."
+msgstr "Wprowadź własny format daty i czasu. Możesz użyć dowolnych specyfikatorów formatu funkcji strftime języka ANSI C."
 
 #: ../src/interface.c:5039
 msgid "Use native GTK printing"
-msgstr ""
+msgstr "Drukuj za pośrednictwem biblioteki GTK"
 
 #: ../src/interface.c:5045
-#, fuzzy
 msgid "<b>Printing</b>"
-msgstr "<b>Kodowanie:</b>"
+msgstr "<b>Drukowanie</b>"
 
-#: ../src/interface.c:5050 ../src/prefs.c:1581
-#, fuzzy
+#: ../src/interface.c:5050
+#: ../src/prefs.c:1596
 msgid "Printing"
-msgstr "Wydrukuj"
+msgstr "Drukowanie"
 
 #: ../src/interface.c:5097
 msgid "<i>Warning: read the manual before changing these preferences.</i>"
-msgstr ""
+msgstr "<i>Uwaga: przeczytaj podręcznik przed zmianą tych ustawień.</i>"
 
 #: ../src/interface.c:5102
-#, fuzzy
 msgid "<b>Various preferences</b>"
-msgstr "<b>Ścieżki do narzędzi</b>"
+msgstr "<b>Rozmaite ustawienia</b>"
 
-#: ../src/interface.c:5107 ../src/prefs.c:1583
-#, fuzzy
+#: ../src/interface.c:5107
+#: ../src/prefs.c:1598
 msgid "Various"
-msgstr "_Poprzedni"
+msgstr "Rozmaite"
 
 #: ../src/interface.c:5589
 msgid "Project Properties"
-msgstr "Właściwości projektu"
+msgstr "Własności projektu"
 
 #: ../src/interface.c:5714
-#, fuzzy
 msgid "Display:"
-msgstr "Wyświetlanie"
+msgstr "Wyświetlanie:"
 
 #: ../src/interface.c:5736
 msgid "Custom"
-msgstr ""
+msgstr "Własne"
 
 #: ../src/interface.c:5744
 msgid "Use global settings"
-msgstr ""
+msgstr "Użyj ustawień globalnych"
 
-#: ../src/keybindings.c:220 ../src/plugins.c:1248 ../src/symbols.c:709
-#, fuzzy
+#. visual group order
+#: ../src/keybindings.c:221
+#: ../src/plugins.c:1246
+#: ../src/symbols.c:707
 msgid "File"
-msgstr "_Plik"
+msgstr "Plik"
 
 #: ../src/keybindings.c:223
-msgid "New"
-msgstr "Nowy"
+msgid "Clipboard"
+msgstr "Schowek"
+
+#: ../src/keybindings.c:224
+msgid "Select"
+msgstr "Zaznacz"
 
 #: ../src/keybindings.c:225
-msgid "Open"
-msgstr "Otwórz"
-
-#: ../src/keybindings.c:228
-msgid "Open selected file"
-msgstr "Otwórz wybrany plik"
-
-#: ../src/keybindings.c:230
-msgid "Save"
-msgstr "Zapisz"
-
-#: ../src/keybindings.c:232 ../src/toolbar.c:57
-msgid "Save as"
-msgstr "Zapisz jako"
-
-#: ../src/keybindings.c:234
-msgid "Save all"
-msgstr "Zapisz wszystko"
-
-#: ../src/keybindings.c:237
-msgid "Print"
-msgstr "Wydrukuj"
-
-#: ../src/keybindings.c:239
-msgid "Close"
-msgstr "Zamknij"
-
-#: ../src/keybindings.c:241
-msgid "Close all"
-msgstr "Zamknij wszystko"
-
-#: ../src/keybindings.c:244
-msgid "Reload file"
-msgstr "Wczytaj plik ponownie"
-
-#: ../src/keybindings.c:246
-msgid "Re-open last closed tab"
-msgstr ""
-
-#: ../src/keybindings.c:248 ../src/project.c:506
-#, fuzzy
-msgid "Project"
-msgstr "P_rojekt"
-
-#: ../src/keybindings.c:251
-msgid "Project properties"
-msgstr "Właściwości projektu"
-
-#: ../src/keybindings.c:256
-msgid "Undo"
-msgstr "Cofnij"
-
-#: ../src/keybindings.c:258
-msgid "Redo"
-msgstr "Ponowienie"
-
-#: ../src/keybindings.c:267
-#, fuzzy
-msgid "Delete to line end"
-msgstr "Usuń bieżącą linię"
-
-#: ../src/keybindings.c:273
-msgid "Scroll to current line"
-msgstr "Przewiń do bieżącej linii"
-
-#: ../src/keybindings.c:275
-msgid "Scroll up the view by one line"
-msgstr "Przewiń widok o jedną linię w górę"
-
-#: ../src/keybindings.c:277
-msgid "Scroll down the view by one line"
-msgstr "Przesuń widok o jedną linię w dół"
-
-#: ../src/keybindings.c:279
-#, fuzzy
-msgid "Complete snippet"
-msgstr "Zatwierdź sugerowane uzupełnienie konstrukcji"
-
-#: ../src/keybindings.c:281
-msgid "Move cursor in snippet"
-msgstr ""
-
-#: ../src/keybindings.c:283
-#, fuzzy
-msgid "Suppress snippet completion"
-msgstr "Automatyczne uzupełnianie konstrukcji"
-
-#: ../src/keybindings.c:285
-msgid "Context Action"
-msgstr "Akcja kontekstowa"
-
-#: ../src/keybindings.c:287
-msgid "Complete word"
-msgstr "Całe słowo"
-
-#: ../src/keybindings.c:289
-msgid "Show calltip"
-msgstr "Pokaż podpowiedzi"
-
-#: ../src/keybindings.c:291
-msgid "Show macro list"
-msgstr "Pokaż listę makr"
-
-#: ../src/keybindings.c:293
-#, fuzzy
-msgid "Word part completion"
-msgstr "Automatyczne uzupełnianie konstrukcji"
-
-#: ../src/keybindings.c:295
-#, fuzzy
-msgid "Move line(s) up"
-msgstr "Komentuj linie"
-
-#: ../src/keybindings.c:297
-#, fuzzy
-msgid "Move line(s) down"
-msgstr "Komentuj linie"
-
-#: ../src/keybindings.c:299
-msgid "Clipboard"
-msgstr ""
-
-#: ../src/keybindings.c:302
-msgid "Cut"
-msgstr ""
-
-#: ../src/keybindings.c:304
-#, fuzzy
-msgid "Copy"
-msgstr "Firma:"
-
-#: ../src/keybindings.c:306
-msgid "Paste"
-msgstr ""
-
-#: ../src/keybindings.c:314
-#, fuzzy
-msgid "Select"
-msgstr "Zaznacz wszystko"
-
-#: ../src/keybindings.c:317
-msgid "Select All"
-msgstr "Zaznacz wszystko"
-
-#: ../src/keybindings.c:319
-msgid "Select current word"
-msgstr "Zaznacz bieżące słowo"
-
-#: ../src/keybindings.c:327
-#, fuzzy
-msgid "Select to previous word part"
-msgstr "Idź do poprzedniego znacznika"
-
-#: ../src/keybindings.c:329
-#, fuzzy
-msgid "Select to next word part"
-msgstr "Idź do następnego znacznika"
-
-#: ../src/keybindings.c:331
-#, fuzzy
 msgid "Format"
-msgstr "_Format"
+msgstr "Format"
 
-#: ../src/keybindings.c:337
-msgid "Toggle line commentation"
-msgstr "Przełącz komentowanie linii"
-
-#: ../src/keybindings.c:340
-msgid "Comment line(s)"
-msgstr "Komentuj linie"
-
-#: ../src/keybindings.c:342
-msgid "Uncomment line(s)"
-msgstr "Odkomentuj linie"
-
-#: ../src/keybindings.c:344
-msgid "Increase indent"
-msgstr "Zwiększ wcięcie"
-
-#: ../src/keybindings.c:347
-msgid "Decrease indent"
-msgstr "Zmniejsz wcięcie"
-
-#: ../src/keybindings.c:350
-msgid "Increase indent by one space"
-msgstr "Zwiększ wcięcie o jedną spację"
-
-#: ../src/keybindings.c:352
-msgid "Decrease indent by one space"
-msgstr "Zmniejsz wcięcie o jedną spację"
-
-#: ../src/keybindings.c:356
-msgid "Send to Custom Command 1"
-msgstr "Wyślij do zewnętrznego polecenia 1"
-
-#: ../src/keybindings.c:358
-msgid "Send to Custom Command 2"
-msgstr "Wyślij do zewnętrznego polecenia 2"
-
-#: ../src/keybindings.c:360
-msgid "Send to Custom Command 3"
-msgstr "Wyślij do zewnętrznego polecenia 3"
-
-#: ../src/keybindings.c:368
-#, fuzzy
+#: ../src/keybindings.c:226
 msgid "Insert"
 msgstr "Ws_taw"
 
-#: ../src/keybindings.c:371
-msgid "Insert date"
-msgstr "Wstaw datę"
-
-#: ../src/keybindings.c:377
-msgid "Insert New Line Before Current"
-msgstr ""
-
-#: ../src/keybindings.c:379
-msgid "Insert New Line After Current"
-msgstr ""
-
-#: ../src/keybindings.c:381
-#, fuzzy
+#: ../src/keybindings.c:227
 msgid "Settings"
-msgstr "Sekcje"
+msgstr "Ustawienia"
 
-#: ../src/keybindings.c:389 ../src/toolbar.c:382
-#, fuzzy
+#: ../src/keybindings.c:228
+#: ../src/toolbar.c:380
 msgid "Search"
 msgstr "_Szukaj"
 
-#: ../src/keybindings.c:392 ../src/search.c:465
-msgid "Find"
-msgstr "Szukaj"
-
-#: ../src/keybindings.c:394
-msgid "Find Next"
-msgstr "Znajdź następny"
-
-#: ../src/keybindings.c:396
-msgid "Find Previous"
-msgstr "Znajdź poprzedni"
-
-#: ../src/keybindings.c:403 ../src/search.c:622
-msgid "Replace"
-msgstr "Zastąp"
-
-#: ../src/keybindings.c:405 ../src/search.c:876
-msgid "Find in Files"
-msgstr "Znajdź w _plikach"
-
-#: ../src/keybindings.c:408
-msgid "Next Message"
-msgstr "Następny komunikat"
-
-#: ../src/keybindings.c:410
-#, fuzzy
-msgid "Previous Message"
-msgstr "Następny komunikat"
-
-#: ../src/keybindings.c:412
-msgid "Find Usage"
-msgstr "Znajdź"
-
-#: ../src/keybindings.c:414
-#, fuzzy
-msgid "Find Document Usage"
-msgstr "Znajdź"
-
-#: ../src/keybindings.c:418
-#, fuzzy
+#: ../src/keybindings.c:229
 msgid "Go to"
-msgstr "Przejdź do wiersza"
+msgstr "Przejdź do"
 
-#: ../src/keybindings.c:421 ../src/toolbar.c:68
-msgid "Navigate back a location"
-msgstr "Przejdź do poprzedniej lokacji"
-
-#: ../src/keybindings.c:423 ../src/toolbar.c:69
-msgid "Navigate forward a location"
-msgstr "Przejdź do następnej lokacji"
-
-#: ../src/keybindings.c:428
-msgid "Go to matching brace"
-msgstr "Idź do nawiasu zamykającego/otwierającego"
-
-#: ../src/keybindings.c:431
-msgid "Toggle marker"
-msgstr "Przełącz znacznik"
-
-#: ../src/keybindings.c:439
-msgid "Go to Tag Definition"
-msgstr "Przejdź do definicji znacznika"
-
-#: ../src/keybindings.c:441
-msgid "Go to Tag Declaration"
-msgstr "Przejdź do deklaracji znacznika"
-
-#: ../src/keybindings.c:443
-#, fuzzy
-msgid "Go to Start of Line"
-msgstr "Przejdź do wiersza"
-
-#: ../src/keybindings.c:445
-#, fuzzy
-msgid "Go to End of Line"
-msgstr "Przejdź do wiersza"
-
-#: ../src/keybindings.c:447
-#, fuzzy
-msgid "Go to End of Display Line"
-msgstr "Przejdź do wiersza"
-
-#: ../src/keybindings.c:449
-#, fuzzy
-msgid "Go to Previous Word Part"
-msgstr "Idź do poprzedniego znacznika"
-
-#: ../src/keybindings.c:451
-#, fuzzy
-msgid "Go to Next Word Part"
-msgstr "Idź do następnego znacznika"
-
-#: ../src/keybindings.c:453
-#, fuzzy
+#: ../src/keybindings.c:230
 msgid "View"
-msgstr "P_okaż"
+msgstr "Widok"
 
-#: ../src/keybindings.c:456
-msgid "Toggle All Additional Widgets"
-msgstr "Przełącz wszystkie dodatkowe panele"
-
-#: ../src/keybindings.c:459
-msgid "Fullscreen"
-msgstr "Pełny _ekran"
-
-#: ../src/keybindings.c:461
-msgid "Toggle Messages Window"
-msgstr "Przełącz okno komunikatów"
-
-#: ../src/keybindings.c:464
-msgid "Toggle Sidebar"
-msgstr "Przełącz panel boczny"
-
-#: ../src/keybindings.c:466
-msgid "Zoom In"
-msgstr "Powiększ"
-
-#: ../src/keybindings.c:468
-msgid "Zoom Out"
-msgstr "Pomniejsz"
-
-#: ../src/keybindings.c:470
-#, fuzzy
-msgid "Zoom Reset"
-msgstr "Pomniejsz"
-
-#: ../src/keybindings.c:472
-msgid "Focus"
-msgstr ""
-
-#: ../src/keybindings.c:475
-msgid "Switch to Editor"
-msgstr "Przejdź do edytora"
-
-#: ../src/keybindings.c:477
-msgid "Switch to Search Bar"
-msgstr "Przejdź do paska wyszukiwania"
-
-#: ../src/keybindings.c:479
-#, fuzzy
-msgid "Switch to Message Window"
-msgstr "_Okno komunikatów"
-
-#: ../src/keybindings.c:481
-#, fuzzy
-msgid "Switch to Compiler"
-msgstr "Przejdź do paska wyszukiwania"
-
-#: ../src/keybindings.c:483
-#, fuzzy
-msgid "Switch to Messages"
-msgstr "Przejdź do paska wyszukiwania"
-
-#: ../src/keybindings.c:485
-msgid "Switch to Scribble"
-msgstr "Przejdź do Scribble"
-
-#: ../src/keybindings.c:487
-msgid "Switch to VTE"
-msgstr "Przejdź do terminala"
-
-#: ../src/keybindings.c:489
-#, fuzzy
-msgid "Switch to Sidebar"
-msgstr "Przejdź do paska wyszukiwania"
-
-#: ../src/keybindings.c:491
-#, fuzzy
-msgid "Switch to Sidebar Symbol List"
-msgstr "Przejdź do paska wyszukiwania"
-
-#: ../src/keybindings.c:493
-#, fuzzy
-msgid "Switch to Sidebar Document List"
-msgstr "Przejdź do lewego dokumentu"
-
-#: ../src/keybindings.c:495
-#, fuzzy
-msgid "Notebook tab"
-msgstr "Polecenia składni"
-
-#: ../src/keybindings.c:498
-msgid "Switch to left document"
-msgstr "Przejdź do lewego dokumentu"
-
-#: ../src/keybindings.c:500
-msgid "Switch to right document"
-msgstr "Przejdź do prawego dokumentu"
-
-#: ../src/keybindings.c:502
-msgid "Switch to last used document"
-msgstr "Przejdź do ostatnio używanego dokumentu"
-
-#: ../src/keybindings.c:504
-msgid "Move document left"
-msgstr "Przesuń dokument w lewo"
-
-#: ../src/keybindings.c:506
-msgid "Move document right"
-msgstr "Przesuń dokument w prawo"
-
-#: ../src/keybindings.c:508
-#, fuzzy
-msgid "Move document first"
-msgstr "Przesuń dokument w lewo"
-
-#: ../src/keybindings.c:510
-#, fuzzy
-msgid "Move document last"
-msgstr "Przesuń dokument w lewo"
-
-#: ../src/keybindings.c:512
-#, fuzzy
+#: ../src/keybindings.c:231
 msgid "Document"
 msgstr "_Dokument"
 
-#: ../src/keybindings.c:515
-#, fuzzy
-msgid "Toggle Line wrapping"
-msgstr "Zawijanie wierszy"
+#: ../src/keybindings.c:232
+#: ../src/project.c:504
+msgid "Project"
+msgstr "Projekt"
 
-#: ../src/keybindings.c:517
-#, fuzzy
-msgid "Toggle Line breaking"
-msgstr "P_rzełącz komentowanie linii"
-
-#: ../src/keybindings.c:521
-#, fuzzy
-msgid "Replace spaces by tabs"
-msgstr "Zamień znaki tabulacji na _spacje"
-
-#: ../src/keybindings.c:523
-#, fuzzy
-msgid "Toggle current fold"
-msgstr "Zaznacz bieżące słowo"
-
-#: ../src/keybindings.c:525
-msgid "Fold all"
-msgstr "Zwiń wszystkie"
-
-#: ../src/keybindings.c:527
-msgid "Unfold all"
-msgstr "Rozwiń wszystkie"
-
-#: ../src/keybindings.c:529
-msgid "Reload symbol list"
-msgstr "Wczytaj ponownie listę symboli"
-
-#: ../src/keybindings.c:531
-#, fuzzy
-msgid "Remove Markers"
-msgstr "_Usuń znaczniki"
-
-#: ../src/keybindings.c:533
-#, fuzzy
-msgid "Remove Error Indicators"
-msgstr "Usuń _wszystkie znaczniki błędów"
-
-#: ../src/keybindings.c:535
-#, fuzzy
-msgid "Remove Markers and Error Indicators"
-msgstr "Usuń _wszystkie znaczniki błędów"
-
-#: ../src/keybindings.c:537 ../src/keybindings.c:542 ../src/project.c:484
-#: ../src/ui_utils.c:1947
+#: ../src/keybindings.c:233
+#: ../src/keybindings.c:565
+#: ../src/project.c:482
+#: ../src/ui_utils.c:1943
 msgid "Build"
 msgstr "Buduj"
 
-#: ../src/keybindings.c:540 ../src/toolbar.c:70
-msgid "Compile"
-msgstr "Skompiluj"
-
-#: ../src/keybindings.c:544
-msgid "Make all"
-msgstr "Zbuduj wszystko"
-
-#: ../src/keybindings.c:547
-msgid "Make custom target"
-msgstr "Zbuduj przy użyciu własnych parametrów"
-
-#: ../src/keybindings.c:549
-msgid "Make object"
-msgstr "Zbuduj obiekt"
-
-#: ../src/keybindings.c:551
-msgid "Next error"
-msgstr "Następny błąd"
-
-#: ../src/keybindings.c:553
-#, fuzzy
-msgid "Previous error"
-msgstr "Poprzedni tłumacze"
-
-#: ../src/keybindings.c:555
-msgid "Run"
-msgstr "Uruchom"
-
-#: ../src/keybindings.c:557
-msgid "Build options"
-msgstr "Opcje budowania"
-
-#: ../src/keybindings.c:562
-msgid "Show Color Chooser"
-msgstr "Przycisk wyboru kolorów"
-
-#: ../src/keybindings.c:564 ../src/keybindings.c:567
+#: ../src/keybindings.c:235
+#: ../src/keybindings.c:590
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../src/keybindings.c:849
+#: ../src/keybindings.c:236
+msgid "Focus"
+msgstr "Fokus"
+
+#: ../src/keybindings.c:237
+msgid "Notebook tab"
+msgstr "Karta edytora"
+
+#: ../src/keybindings.c:246
+msgid "New"
+msgstr "Nowy"
+
+#: ../src/keybindings.c:248
+msgid "Open"
+msgstr "Otwórz"
+
+#: ../src/keybindings.c:251
+msgid "Open selected file"
+msgstr "Otwórz wybrany plik"
+
+#: ../src/keybindings.c:253
+msgid "Save"
+msgstr "Zapisz"
+
+#: ../src/keybindings.c:255
+#: ../src/toolbar.c:55
+msgid "Save as"
+msgstr "Zapisz jako"
+
+#: ../src/keybindings.c:257
+msgid "Save all"
+msgstr "Zapisz wszystko"
+
+#: ../src/keybindings.c:260
+msgid "Print"
+msgstr "Wydrukuj"
+
+#: ../src/keybindings.c:262
+msgid "Close"
+msgstr "Zamknij"
+
+#: ../src/keybindings.c:264
+msgid "Close all"
+msgstr "Zamknij wszystko"
+
+#: ../src/keybindings.c:267
+msgid "Reload file"
+msgstr "Wczytaj plik ponownie"
+
+#: ../src/keybindings.c:269
+msgid "Re-open last closed tab"
+msgstr "Otwórz ostatnio zamkniętą kartę"
+
+#: ../src/keybindings.c:274
+msgid "Project properties"
+msgstr "Własności projektu"
+
+#: ../src/keybindings.c:279
+msgid "Undo"
+msgstr "Cofnij"
+
+#: ../src/keybindings.c:281
+msgid "Redo"
+msgstr "Ponowienie"
+
+#: ../src/keybindings.c:290
+msgid "Delete to line end"
+msgstr "Usuń do końca wiersza"
+
+#: ../src/keybindings.c:296
+msgid "Scroll to current line"
+msgstr "Przewiń do bieżącej linii"
+
+#: ../src/keybindings.c:298
+msgid "Scroll up the view by one line"
+msgstr "Przewiń widok o jedną linię w górę"
+
+#: ../src/keybindings.c:300
+msgid "Scroll down the view by one line"
+msgstr "Przesuń widok o jedną linię w dół"
+
+#: ../src/keybindings.c:302
+msgid "Complete snippet"
+msgstr "Uzupełnij snippet"
+
+#: ../src/keybindings.c:304
+msgid "Move cursor in snippet"
+msgstr "Przenieś kursor w obrębie snippetu"
+
+#: ../src/keybindings.c:306
+msgid "Suppress snippet completion"
+msgstr "Wstrzymaj uzupełnianie snippetu"
+
+#: ../src/keybindings.c:308
+msgid "Context Action"
+msgstr "Akcja kontekstowa"
+
+#: ../src/keybindings.c:310
+msgid "Complete word"
+msgstr "Całe słowo"
+
+#: ../src/keybindings.c:312
+msgid "Show calltip"
+msgstr "Pokaż podpowiedzi"
+
+#: ../src/keybindings.c:314
+msgid "Show macro list"
+msgstr "Pokaż listę makr"
+
+#: ../src/keybindings.c:316
+msgid "Word part completion"
+msgstr "Częściowe uzupełnianie słów"
+
+#: ../src/keybindings.c:318
+msgid "Move line(s) up"
+msgstr "Przesuń wiersz(e) w górę"
+
+#: ../src/keybindings.c:320
+msgid "Move line(s) down"
+msgstr "Przesuń wiersz(e) w dół"
+
+#: ../src/keybindings.c:325
+msgid "Cut"
+msgstr "Wytnij"
+
+#: ../src/keybindings.c:327
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: ../src/keybindings.c:329
+msgid "Paste"
+msgstr "Wklej"
+
+#: ../src/keybindings.c:340
+msgid "Select All"
+msgstr "Zaznacz wszystko"
+
+#: ../src/keybindings.c:342
+msgid "Select current word"
+msgstr "Zaznacz bieżące słowo"
+
+#: ../src/keybindings.c:350
+msgid "Select to previous word part"
+msgstr "Rozszerz zaznaczenie do poprzedniej granicy słowa"
+
+#: ../src/keybindings.c:352
+msgid "Select to next word part"
+msgstr "Rozszerz zaznaczenie do następnej części słowa"
+
+#: ../src/keybindings.c:360
+msgid "Toggle line commentation"
+msgstr "Przełącz komentowanie linii"
+
+#: ../src/keybindings.c:363
+msgid "Comment line(s)"
+msgstr "Komentuj linie"
+
+#: ../src/keybindings.c:365
+msgid "Uncomment line(s)"
+msgstr "Odkomentuj linie"
+
+#: ../src/keybindings.c:367
+msgid "Increase indent"
+msgstr "Zwiększ wcięcie"
+
+#: ../src/keybindings.c:370
+msgid "Decrease indent"
+msgstr "Zmniejsz wcięcie"
+
+#: ../src/keybindings.c:373
+msgid "Increase indent by one space"
+msgstr "Zwiększ wcięcie o jedną spację"
+
+#: ../src/keybindings.c:375
+msgid "Decrease indent by one space"
+msgstr "Zmniejsz wcięcie o jedną spację"
+
+#: ../src/keybindings.c:379
+msgid "Send to Custom Command 1"
+msgstr "Wyślij do zewnętrznego polecenia 1"
+
+#: ../src/keybindings.c:381
+msgid "Send to Custom Command 2"
+msgstr "Wyślij do zewnętrznego polecenia 2"
+
+#: ../src/keybindings.c:383
+msgid "Send to Custom Command 3"
+msgstr "Wyślij do zewnętrznego polecenia 3"
+
+#: ../src/keybindings.c:394
+msgid "Insert date"
+msgstr "Wstaw datę"
+
+#: ../src/keybindings.c:400
+msgid "Insert New Line Before Current"
+msgstr "Wstaw nowy wiersz przed bieżącym"
+
+#: ../src/keybindings.c:402
+msgid "Insert New Line After Current"
+msgstr "Wstaw nowy wiersz za bieżącym"
+
+#: ../src/keybindings.c:415
+#: ../src/search.c:463
+msgid "Find"
+msgstr "Szukaj"
+
+#: ../src/keybindings.c:417
+msgid "Find Next"
+msgstr "Znajdź następny"
+
+#: ../src/keybindings.c:419
+msgid "Find Previous"
+msgstr "Znajdź poprzedni"
+
+#: ../src/keybindings.c:426
+#: ../src/search.c:619
+msgid "Replace"
+msgstr "Zastąp"
+
+#: ../src/keybindings.c:428
+#: ../src/search.c:871
+msgid "Find in Files"
+msgstr "Znajdź w _plikach"
+
+#: ../src/keybindings.c:431
+msgid "Next Message"
+msgstr "Następny komunikat"
+
+#: ../src/keybindings.c:433
+msgid "Previous Message"
+msgstr "Poprzedni komunikat"
+
+#: ../src/keybindings.c:435
+msgid "Find Usage"
+msgstr "Znajdź wykorzystanie"
+
+#: ../src/keybindings.c:437
+msgid "Find Document Usage"
+msgstr "Znajdź wykorzystanie w dokumencie"
+
+#: ../src/keybindings.c:444
+#: ../src/toolbar.c:66
+msgid "Navigate back a location"
+msgstr "Przejdź do kolejnego położenia w tył"
+
+#: ../src/keybindings.c:446
+#: ../src/toolbar.c:67
+msgid "Navigate forward a location"
+msgstr "Przejdź do kolejnego położenia w przód"
+
+#: ../src/keybindings.c:451
+msgid "Go to matching brace"
+msgstr "Idź do nawiasu zamykającego/otwierającego"
+
+#: ../src/keybindings.c:454
+msgid "Toggle marker"
+msgstr "Przełącz znacznik"
+
+#: ../src/keybindings.c:462
+msgid "Go to Tag Definition"
+msgstr "Przejdź do definicji znacznika"
+
+#: ../src/keybindings.c:464
+msgid "Go to Tag Declaration"
+msgstr "Przejdź do deklaracji znacznika"
+
+#: ../src/keybindings.c:466
+msgid "Go to Start of Line"
+msgstr "Przejdź na początek wiersza"
+
+#: ../src/keybindings.c:468
+msgid "Go to End of Line"
+msgstr "Przejdź na koniec wiersza"
+
+#: ../src/keybindings.c:470
+msgid "Go to End of Display Line"
+msgstr "Przejdź do końca wyświetlania wiersza"
+
+#: ../src/keybindings.c:472
+msgid "Go to Previous Word Part"
+msgstr "Przejdź do poprzedniego fragmentu słowa"
+
+#: ../src/keybindings.c:474
+msgid "Go to Next Word Part"
+msgstr "Przejdź do następnego fragmentu słowa"
+
+#: ../src/keybindings.c:479
+msgid "Toggle All Additional Widgets"
+msgstr "Pokaż/ukryj dodatkowe widżety"
+
+#: ../src/keybindings.c:482
+msgid "Fullscreen"
+msgstr "Pełny _ekran"
+
+#: ../src/keybindings.c:484
+msgid "Toggle Messages Window"
+msgstr "Przełącz okno komunikatów"
+
+#: ../src/keybindings.c:487
+msgid "Toggle Sidebar"
+msgstr "Przełącz panel boczny"
+
+#: ../src/keybindings.c:489
+msgid "Zoom In"
+msgstr "Powiększ"
+
+#: ../src/keybindings.c:491
+msgid "Zoom Out"
+msgstr "Zmniejsz"
+
+#: ../src/keybindings.c:493
+msgid "Zoom Reset"
+msgstr "Przywróć pierwotną wielkość tekstu"
+
+#: ../src/keybindings.c:498
+msgid "Switch to Editor"
+msgstr "Uaktywnij okno edytora"
+
+#: ../src/keybindings.c:500
+msgid "Switch to Search Bar"
+msgstr "Uaktywnij pasek wyszukiwania"
+
+#: ../src/keybindings.c:502
+msgid "Switch to Message Window"
+msgstr "Uaktywnij okno _Komunikatów"
+
+#: ../src/keybindings.c:504
+msgid "Switch to Compiler"
+msgstr "Uaktywnij okno Ko_mpilatora"
+
+#: ../src/keybindings.c:506
+msgid "Switch to Messages"
+msgstr "Uaktywnij okno komunikatów"
+
+#: ../src/keybindings.c:508
+msgid "Switch to Scribble"
+msgstr "Uaktywnij okno Brudnopisu"
+
+#: ../src/keybindings.c:510
+msgid "Switch to VTE"
+msgstr "Uaktywnij okno terminala"
+
+#: ../src/keybindings.c:512
+msgid "Switch to Sidebar"
+msgstr "Uaktywnij panel boczny"
+
+#: ../src/keybindings.c:514
+msgid "Switch to Sidebar Symbol List"
+msgstr "Uaktywnij panel listy symboli"
+
+#: ../src/keybindings.c:516
+msgid "Switch to Sidebar Document List"
+msgstr "Uaktywnij panel dokumentów"
+
+#: ../src/keybindings.c:521
+msgid "Switch to left document"
+msgstr "Uaktywnij lewy dokument"
+
+#: ../src/keybindings.c:523
+msgid "Switch to right document"
+msgstr "Uaktywnij prawy dokument"
+
+#: ../src/keybindings.c:525
+msgid "Switch to last used document"
+msgstr "Uaktywnij ostatnio używany dokument"
+
+#: ../src/keybindings.c:527
+msgid "Move document left"
+msgstr "Przesuń dokument w lewo"
+
+#: ../src/keybindings.c:529
+msgid "Move document right"
+msgstr "Przesuń dokument w prawo"
+
+#: ../src/keybindings.c:531
+msgid "Move document first"
+msgstr "Przesuń dokument na początek"
+
+#: ../src/keybindings.c:533
+msgid "Move document last"
+msgstr "Przesuń dokument na koniec"
+
+#: ../src/keybindings.c:538
+msgid "Toggle Line wrapping"
+msgstr "Włącz/wyłącz zawijanie wierszy"
+
+#: ../src/keybindings.c:540
+msgid "Toggle Line breaking"
+msgstr "Włącz/wyłącz łamanie wierszy"
+
+#: ../src/keybindings.c:544
+msgid "Replace spaces by tabs"
+msgstr "Zastąp spacje znakami tabulacji"
+
+#: ../src/keybindings.c:546
+msgid "Toggle current fold"
+msgstr "Zwiń/rozwiń sekwencję kodu"
+
+#: ../src/keybindings.c:548
+msgid "Fold all"
+msgstr "Zwiń wszystkie"
+
+#: ../src/keybindings.c:550
+msgid "Unfold all"
+msgstr "Rozwiń wszystkie"
+
+#: ../src/keybindings.c:552
+msgid "Reload symbol list"
+msgstr "Wczytaj ponownie listę symboli"
+
+#: ../src/keybindings.c:554
+msgid "Remove Markers"
+msgstr "_Usuń oznaczniki"
+
+#: ../src/keybindings.c:556
+msgid "Remove Error Indicators"
+msgstr "Usuń _wszystkie podkreślenia błędów"
+
+#: ../src/keybindings.c:558
+msgid "Remove Markers and Error Indicators"
+msgstr "Usuń _wszystkie oznaczniki i podkreślenia błędów"
+
+#: ../src/keybindings.c:563
+#: ../src/toolbar.c:68
+msgid "Compile"
+msgstr "Skompiluj"
+
+#: ../src/keybindings.c:567
+msgid "Make all"
+msgstr "Zbuduj wszystko"
+
+#: ../src/keybindings.c:570
+msgid "Make custom target"
+msgstr "Zbuduj przy użyciu własnych parametrów"
+
+#: ../src/keybindings.c:572
+msgid "Make object"
+msgstr "Zbuduj obiekt"
+
+#: ../src/keybindings.c:574
+msgid "Next error"
+msgstr "Następny błąd"
+
+#: ../src/keybindings.c:576
+msgid "Previous error"
+msgstr "Poprzedni błąd"
+
+#: ../src/keybindings.c:578
+msgid "Run"
+msgstr "Uruchom"
+
+#: ../src/keybindings.c:580
+msgid "Build options"
+msgstr "Opcje budowania"
+
+#: ../src/keybindings.c:585
+msgid "Show Color Chooser"
+msgstr "Przycisk wyboru kolorów"
+
+#: ../src/keybindings.c:872
 msgid "Keyboard Shortcuts"
-msgstr "Skróty klawiszowe"
+msgstr "Skróty klawiaturowe"
 
-#: ../src/keybindings.c:861
+#: ../src/keybindings.c:884
 msgid "The following keyboard shortcuts are configurable:"
-msgstr "Poniższe skróty klawiszowe są konfigurowalne:"
+msgstr "Poniższe skróty klawiaturowe są konfigurowalne:"
 
-#: ../src/keybindings.c:1762
-#, fuzzy
+#: ../src/keybindings.c:1785
 msgid "Switch to Document"
-msgstr "Przejdź do lewego dokumentu"
+msgstr "Uaktywnij dokument"
 
-#: ../src/keyfile.c:885
+#: ../src/keyfile.c:907
 msgid "Type here what you want, use it as a notice/scratch board"
 msgstr "To jest brudnopis. Możesz wpisać tu cokolwiek chcesz."
 
-#: ../src/keyfile.c:1091
+#: ../src/keyfile.c:1114
 msgid "Failed to load one or more session files."
 msgstr "Wczytywanie jednego lub więcej plików sesji zakończone niepowodzeniem."
 
-#: ../src/log.c:182
-#, fuzzy
+# Komunikaty "wewnętrznego" debugera Geany
+#: ../src/log.c:180
 msgid "Debug Messages"
-msgstr "Komunikaty"
+msgstr "Komunikaty Debugera"
 
-#: ../src/log.c:184
-#, fuzzy
+#: ../src/log.c:182
 msgid "Cl_ear"
-msgstr "_Szukaj"
+msgstr "_Wyczyść"
 
-#: ../src/main.c:128
-msgid ""
-"Set initial column number for the first opened file (useful in conjunction "
-"with --line)"
-msgstr ""
-"Ustawia początkową liczbę kolumn dla pierwszego otwartego pliku (użyteczne w "
-"połączeniu z --line)"
+#: ../src/main.c:126
+msgid "Set initial column number for the first opened file (useful in conjunction with --line)"
+msgstr "Ustawia kursor w podanej kolumnie pierwszego z otwieranych plików (użyteczne w połączeniu z --line)"
 
-#: ../src/main.c:129
+#: ../src/main.c:127
 msgid "Use an alternate configuration directory"
 msgstr "Użyj innego katalogu z konfiguracją"
 
-#: ../src/main.c:130
+#: ../src/main.c:128
 msgid "Print internal filetype names"
 msgstr "Drukuj wewnętrzne nazwy typów plików"
 
-#: ../src/main.c:131
+#: ../src/main.c:129
 msgid "Generate global tags file (see documentation)"
 msgstr "Generuje globalny plik ze znacznikami (zobacz dokumentację)"
 
-#: ../src/main.c:132
+#: ../src/main.c:130
 msgid "Don't preprocess C/C++ files when generating tags"
-msgstr ""
+msgstr "Nie przetwarzaj plików C/C++ podczas generowania znaczników"
+
+#: ../src/main.c:132
+msgid "Don't open files in a running instance, force opening a new instance"
+msgstr "Nie otwieraj plików w działającej instancji, wymuszaj otwieranie w nowej instancji"
+
+#: ../src/main.c:133
+msgid "Use this socket filename for communication with a running Geany instance"
+msgstr "Użyj nazwy tego socketu, by skomunikować się z działającą kopią Geany"
 
 #: ../src/main.c:134
-msgid "Don't open files in a running instance, force opening a new instance"
-msgstr ""
-"Nie otwieraj plików w działającej instancji, wymuszaj otwieranie w nowej "
-"instancji"
-
-#: ../src/main.c:135
-msgid ""
-"Use this socket filename for communication with a running Geany instance"
-msgstr ""
+msgid "Return a list of open documents in a running Geany instance"
+msgstr "Zwraca listę otwartych dokumentów aktywnej kopii Geany."
 
 #: ../src/main.c:136
-msgid "Return a list of open documents in a running Geany instance"
-msgstr ""
-
-#: ../src/main.c:138
 msgid "Set initial line number for the first opened file"
-msgstr "Ustaw początkowy numer wiersza dla pierwszego otwartego pliku"
+msgstr "Ustawia kursor w podanym wierszu pierwszego z otwieranych plików"
 
-#: ../src/main.c:139
+#: ../src/main.c:137
 msgid "Don't show message window at startup"
 msgstr "Nie pokazuj okna komunikatów przy starcie"
 
-#: ../src/main.c:140
+#: ../src/main.c:138
 msgid "Don't load auto completion data (see documentation)"
 msgstr "Nie wczytuj danych autouzupełniania (zobacz dokumentację)"
 
-#: ../src/main.c:142
+#: ../src/main.c:140
 msgid "Don't load plugins"
 msgstr "Nie wczytuj wtyczek"
 
-#: ../src/main.c:144
+#: ../src/main.c:142
 msgid "Print Geany's installation prefix"
-msgstr ""
+msgstr "Drukuj parametry instalacji programu Geany"
 
-#: ../src/main.c:145
+#: ../src/main.c:143
 msgid "Don't load the previous session's files"
 msgstr "Nie wczytuj plików z poprzedniej sesji"
 
-#: ../src/main.c:147
+#: ../src/main.c:145
 msgid "Don't load terminal support"
 msgstr "Nie wczytuj obsługi wbudowanego terminala"
 
-#: ../src/main.c:148
+#: ../src/main.c:146
 msgid "Filename of libvte.so"
 msgstr "Nazwa pliku libvte.so"
 
-#: ../src/main.c:150
+#: ../src/main.c:148
 msgid "Be verbose"
-msgstr ""
+msgstr "Więcej szczegółów"
 
-#: ../src/main.c:151
+#: ../src/main.c:149
 msgid "Show version and exit"
 msgstr "Wyświetl informacje o wersji i zakończ program"
 
-#: ../src/main.c:505
+#: ../src/main.c:515
 msgid "[FILES...]"
 msgstr "[PLIKI...]"
 
 #. note for translators: library versions are printed after this
-#: ../src/main.c:523
-#, fuzzy, c-format
-msgid "built on %s with "
-msgstr "(kompilacja: %s)"
-
-#: ../src/main.c:613
-msgid "Move it now?"
-msgstr ""
-
-#: ../src/main.c:615
-msgid "Geany needs to move your old configuration directory before starting."
-msgstr ""
-
-#: ../src/main.c:624
+#: ../src/main.c:539
 #, c-format
-msgid ""
-"Your configuration directory has been successfully moved from \"%s\" to \"%s"
-"\"."
-msgstr ""
+msgid "built on %s with "
+msgstr "kompilacja: %s"
+
+#: ../src/main.c:627
+msgid "Move it now?"
+msgstr "Przenieść teraz?"
+
+#: ../src/main.c:629
+msgid "Geany needs to move your old configuration directory before starting."
+msgstr "Przed uruchomieniem Geany musi przenieść stary katalog z plikami konfiguracyjnymi."
+
+#: ../src/main.c:638
+#, c-format
+msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"."
+msgstr "Katalog z plikami konfiguracyjnymi pomyślnie przeniesiony z \"%s\" do \"%s\"."
 
 #. for translators: the third %s in brackets is the error message which
 #. * describes why moving the dir didn't work
-#: ../src/main.c:634
+#: ../src/main.c:648
 #, c-format
-msgid ""
-"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). "
-"Please move manually the directory to the new location."
-msgstr ""
+msgid "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). Please move manually the directory to the new location."
+msgstr "Katalog z plikami konfiguracyjnymi \"%s\" nie mógł zostać przeniesiony do \"%s\" (%s). Zrób to samodzielnie."
 
-#: ../src/main.c:715
+#: ../src/main.c:729
 #, c-format
 msgid ""
 "Configuration directory could not be created (%s).\n"
@@ -3787,917 +3545,941 @@ msgstr ""
 "Geany może nie działać poprawnie bez swojego katalogu z konfiguracją.\n"
 "Uruchomić program pomimo tego?"
 
-#: ../src/main.c:1057
+#: ../src/main.c:1071
 #, c-format
 msgid "This is Geany %s."
 msgstr "Używasz Geany %s."
 
-#: ../src/main.c:1059
+#: ../src/main.c:1073
 #, c-format
 msgid "Configuration directory could not be created (%s)."
 msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)."
 
-#: ../src/main.c:1272
-#, fuzzy
+#: ../src/main.c:1286
 msgid "Configuration files reloaded."
-msgstr "Kompilacja nie powiodła się"
+msgstr "Pliki konfiguracyjne ponownie wczytane."
 
-#: ../src/msgwindow.c:160
+#: ../src/msgwindow.c:158
 msgid "Status messages"
 msgstr "Komunikaty stanu"
 
-#: ../src/msgwindow.c:558
-#, fuzzy
+#: ../src/msgwindow.c:556
 msgid "C_opy"
-msgstr "Firma:"
+msgstr "_Kopiuj"
 
-#: ../src/msgwindow.c:567
-#, fuzzy
+#: ../src/msgwindow.c:565
 msgid "Copy _All"
-msgstr "Zamknij wszystk_o"
+msgstr "Kopiuj _wszystko"
 
-#: ../src/msgwindow.c:597
+#: ../src/msgwindow.c:595
 msgid "_Hide Message Window"
 msgstr "_Ukryj okno komunikatów"
 
-#: ../src/msgwindow.c:653
-#, fuzzy, c-format
-msgid "Could not find file '%s' - trying the current document path."
-msgstr "Usuwa wszystkie znaczniki błędów w bieżącym dokumencie"
-
-#: ../src/plugins.c:487
+#: ../src/msgwindow.c:651
 #, c-format
-msgid ""
-"The plugin \"%s\" is not binary compatible with this release of Geany - "
-"please recompile it."
-msgstr ""
+msgid "Could not find file '%s' - trying the current document path."
+msgstr "Nie odnaleziono pliku '%s' - użyję ścieżki bieżącego dokumentu."
 
-#: ../src/plugins.c:994
+#: ../src/plugins.c:485
+#, c-format
+msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it."
+msgstr "Wtyczka \"%s\" jest niekompatybilna z tym wydaniem Geany - zrekompiluj ją."
+
+#: ../src/plugins.c:992
 msgid "_Plugin Manager"
-msgstr ""
+msgstr "_Menedżer wtyczek"
 
 #. Translators: <plugin name> <plugin version>
-#: ../src/plugins.c:1160
+#: ../src/plugins.c:1158
 #, c-format
 msgid "%s %s"
-msgstr ""
+msgstr "%s %s"
 
-#: ../src/plugins.c:1236
-#, fuzzy
+#: ../src/plugins.c:1234
 msgid "Active"
-msgstr "Działanie"
+msgstr "Włączona"
 
-#: ../src/plugins.c:1242
+#: ../src/plugins.c:1240
 msgid "Plugin"
-msgstr ""
+msgstr "Wtyczka"
 
-#: ../src/plugins.c:1266
+#: ../src/plugins.c:1264
 msgid "No plugins available."
-msgstr ""
+msgstr "Brak dostępnych wtyczek."
 
-#: ../src/plugins.c:1362
+#: ../src/plugins.c:1360
 msgid "Plugins"
-msgstr ""
+msgstr "Wtyczki"
 
-#: ../src/plugins.c:1382
+#: ../src/plugins.c:1380
 msgid "Choose which plugins should be loaded at startup:"
-msgstr ""
+msgstr "Wskaż, które wtyczki wczytać podczas uruchamiania programu:"
 
-#: ../src/plugins.c:1394
-#, fuzzy
+#: ../src/plugins.c:1392
 msgid "<b>Plugin details:</b>"
-msgstr "<b>Wcięcie</b>"
+msgstr "<b>Opis wtyczki</b>"
 
-#: ../src/plugins.c:1403
+#: ../src/plugins.c:1401
 msgid "Plugin:"
-msgstr ""
+msgstr "Wtyczka:"
 
-#: ../src/plugins.c:1404 ../src/project.c:446
+#: ../src/plugins.c:1402
+#: ../src/project.c:444
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/plugins.c:1405
+#: ../src/plugins.c:1403
 msgid "Author(s):"
-msgstr ""
+msgstr "Autor(zy)"
 
-#: ../src/pluginutils.c:334
+#: ../src/pluginutils.c:332
 msgid "Configure Plugins"
-msgstr ""
+msgstr "Konfiguruj wtyczki"
 
-#: ../src/prefs.c:172
+#: ../src/prefs.c:177
 msgid "Grab Key"
 msgstr "Przechwyć klawisz"
 
-#: ../src/prefs.c:178
-#, fuzzy, c-format
+#: ../src/prefs.c:183
+#, c-format
 msgid "Press the combination of the keys you want to use for \"%s\"."
-msgstr ""
-"Wciśnij klawisz/kombinację klawiszy, którą chcesz używać dla akcji: \"%s\""
+msgstr "Wciśnij kombinację klawiszy, której chcesz używać dla akcji: \"%s\"."
 
-#: ../src/prefs.c:218 ../src/symbols.c:2141
-#, fuzzy
+#: ../src/prefs.c:223
+#: ../src/symbols.c:2139
 msgid "_Expand All"
-msgstr "Szukaj wszystkie"
+msgstr "_Rozwiń wszystkie"
 
-#: ../src/prefs.c:223 ../src/symbols.c:2146
-#, fuzzy
+#: ../src/prefs.c:228
+#: ../src/symbols.c:2144
 msgid "_Collapse All"
-msgstr "Zamknij wszystk_o"
+msgstr "Zwiń wszystk_o"
 
-#: ../src/prefs.c:282
+#: ../src/prefs.c:287
 msgid "Action"
 msgstr "Działanie"
 
-#: ../src/prefs.c:286
+#: ../src/prefs.c:291
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: ../src/prefs.c:1449
+#: ../src/prefs.c:1464
 msgid "_Allow"
-msgstr ""
+msgstr "_Zezwól"
 
-#: ../src/prefs.c:1451
+#: ../src/prefs.c:1466
 msgid "_Override"
-msgstr ""
+msgstr "_Nadpisz"
 
-#: ../src/prefs.c:1452
+#: ../src/prefs.c:1467
 msgid "Override that keybinding?"
-msgstr ""
+msgstr "Zmienić przypisanie klawiszy?"
 
-#: ../src/prefs.c:1453
-#, fuzzy, c-format
+#: ../src/prefs.c:1468
+#, c-format
 msgid "The combination '%s' is already used for \"%s\"."
-msgstr ""
-"Kombinacja klawiszy \"%s\" jest już używana przez \"%s\". Spróbuj wybrać "
-"inną kombinację."
+msgstr "Kombinacja '%s' jest już użawana dla \"%s\"."
 
-#: ../src/prefs.c:1585 ../src/vte.c:283 ../src/vte.c:752 ../src/vte.c:757
+#: ../src/prefs.c:1600
+#: ../src/vte.c:282
+#: ../src/vte.c:752
+#: ../src/vte.c:757
 msgid "Terminal"
 msgstr "Terminal"
 
 #. add manually GeanyWrapLabels because they can't be added with Glade
 #. page Tools
-#: ../src/prefs.c:1646
+#: ../src/prefs.c:1661
 msgid "Enter tool paths below. Tools you do not need can be left blank."
-msgstr ""
-"Wprowadź tutaj ścieżki do narzędzi. \n"
-"Pola ścieżek do nieużywanych narzędzi mogą zostać pozostawione puste"
+msgstr "Podaj ścieżki do narzędzi. Pozostaw puste, jeżeli nie używasz narzędzia."
 
 #. page Templates
-#: ../src/prefs.c:1651
-msgid ""
-"Set the information to be used in templates. See the documentation for "
-"details."
-msgstr ""
-"Ustaw informacje wykorzystywane przez szablony. Więcej informacji na ten "
-"temat znajduje się w dokumentacji."
+#: ../src/prefs.c:1666
+msgid "Set the information to be used in templates. See the documentation for details."
+msgstr "Podaj informacje używane w szablonach. Więcej szczegółów w dokumentacji."
 
 #. page Keybindings
-#: ../src/prefs.c:1656
-msgid ""
-"Here you can change keyboard shortcuts for various actions. Select one and "
-"press the Change button to enter a new shortcut, or double click on an "
-"action to edit the string representation of the shortcut directly."
-msgstr ""
-"Tutaj możesz zmienić skróty klawiszowe. Wybierz dowolne działanie z listy i "
-"wciśnij przycisk \"Zmień\" aby modyfikować przyporządkowany temu działaniu "
-"skrót klawiszowy."
+#: ../src/prefs.c:1671
+msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly."
+msgstr "Tu można zmienić skróty klawiaturowe. Wybierz skrót z listy i wciśnij \"Zmień\", aby podać nowy skrót, lub dwukrotnie kliknij myszą, by edytować jego reprezentację."
 
 #. page Editor->Indentation
-#: ../src/prefs.c:1661
-msgid ""
-"<i>Warning: these settings are overridden by the current project. See "
-"<b>Project->Properties</b>.</i>"
-msgstr ""
+#: ../src/prefs.c:1676
+msgid "<i>Warning: these settings are overridden by the current project. See <b>Project->Properties</b>.</i>"
+msgstr "<i>Uwaga: te ustawienia zostaną zmienione przez bieżący projekt. Patrz: <b>Projekt->Własności</b>.</i>"
 
-#: ../src/printing.c:185
+#: ../src/printing.c:183
 msgid "The editor font is not a monospaced font!"
-msgstr ""
+msgstr "Używany font nie ma stałej szerokości!"
 
-#: ../src/printing.c:186
+#: ../src/printing.c:184
 msgid "Text will be wrongly spaced."
-msgstr ""
+msgstr "Tekst będzie niewłaściwie rozmieszczony."
 
-#: ../src/printing.c:303
-#, fuzzy, c-format
+#: ../src/printing.c:301
+#, c-format
 msgid "<b>Page %d of %d</b>"
-msgstr "<b>Ostatnia zmiana:</b>"
+msgstr "<b>Strona %d z %d</b>"
 
-#: ../src/printing.c:373
-#, fuzzy
+#: ../src/printing.c:371
 msgid "Document Setup"
-msgstr "Menu Dokument"
+msgstr "Ustawienia dokumentu"
 
-#: ../src/printing.c:408
-#, fuzzy
+#: ../src/printing.c:406
 msgid "Print only the basename(without the path) of the printed file"
-msgstr "Podążanie za ścieżką do bieżącego pliku"
+msgstr "Drukuj tylko nazwę (bez ścieżki) drukowanego pliku"
 
-#: ../src/printing.c:527
-#, fuzzy, c-format
+#: ../src/printing.c:525
+#, c-format
 msgid "Page %d of %d"
-msgstr "<b>Ostatnia zmiana:</b>"
+msgstr "<b>Strona %d z %d</b>"
+
+#: ../src/printing.c:779
+#, c-format
+msgid "Did not send document %s to the printing subsystem."
+msgstr "Dokument %s nie został wysłany do systemu drukowania."
 
 #: ../src/printing.c:781
 #, c-format
-msgid "Did not send document %s to the printing subsystem."
-msgstr ""
-
-#: ../src/printing.c:783
-#, c-format
 msgid "Document %s was sent to the printing subsystem."
-msgstr ""
+msgstr "Dokument %s wysłany do systemu drukowania."
 
-#: ../src/printing.c:835
-#, fuzzy, c-format
+#: ../src/printing.c:833
+#, c-format
 msgid "Printing of %s failed (%s)."
-msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (zwrócony kod: %s)."
+msgstr "Drukowanie %s zakończone niepowodzeniem (kod: %s)."
 
-#: ../src/printing.c:874
+#: ../src/printing.c:872
 msgid "Please set a print command in the preferences dialog first."
-msgstr ""
+msgstr "Podaj polecenie drukowania w ustawieniach."
 
-#: ../src/printing.c:882
+#: ../src/printing.c:880
 #, c-format
 msgid ""
 "The file \"%s\" will be printed with the following command:\n"
 "\n"
 "%s"
 msgstr ""
-"Plik \"%s\" zostanie wydrukowany przy użyciu następującego polecenia:\n"
+"Plik \"%s\" zostanie wydrukowany przy użyciu polecenia:\n"
 "\n"
 "%s"
 
-#: ../src/printing.c:898
+#: ../src/printing.c:896
 #, c-format
 msgid "Printing of \"%s\" failed (return code: %s)."
-msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (zwrócony kod: %s)."
+msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (kod: %s)."
 
-#: ../src/printing.c:904
+#: ../src/printing.c:902
 #, c-format
 msgid "File %s printed."
-msgstr "Wydrukowano plik %s."
+msgstr "Plik %s wydrukowany."
 
 #. "projects" is part of the default project base path so be careful when translating
 #. * please avoid special characters and spaces, look at the source for details or ask Frank
-#: ../src/project.c:99
+#: ../src/project.c:97
 msgid "projects"
 msgstr "projekty"
 
-#: ../src/project.c:118
+#: ../src/project.c:116
 msgid "New Project"
 msgstr "Nowy projekt"
 
-#: ../src/project.c:126
+#: ../src/project.c:124
 msgid "C_reate"
 msgstr "Utwó_rz"
 
-#: ../src/project.c:140 ../src/project.c:433 ../plugins/classbuilder.c:477
-#: ../plugins/classbuilder.c:487
+#: ../src/project.c:138
+#: ../src/project.c:431
+#: ../plugins/classbuilder.c:470
+#: ../plugins/classbuilder.c:480
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../src/project.c:149 ../src/project.c:420
+#: ../src/project.c:147
+#: ../src/project.c:418
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: ../src/project.c:165 ../src/project.c:463
+#: ../src/project.c:163
+#: ../src/project.c:461
 msgid "Base path:"
-msgstr "Katalog podstawowy"
+msgstr "Ścieżka:"
 
-#: ../src/project.c:171 ../src/project.c:472
-#, fuzzy
-msgid ""
-"Base directory of all files that make up the project. This can be a new "
-"path, or an existing directory tree. You can use paths relative to the "
-"project filename."
-msgstr ""
-"Katalog w którym znajdują się wszystkie pliki wchodzące w skład projektu. To "
-"może być ścieżka do nowego lub już istniejącego katalogu."
+#: ../src/project.c:169
+#: ../src/project.c:470
+msgid "Base directory of all files that make up the project. This can be a new path, or an existing directory tree. You can use paths relative to the project filename."
+msgstr "Katalog bazowy dla wszystkich plików projektu. Może to być katalog już istniejący, lub nowa ścieżka. Można użyć ścieżki względnej do nazwy projektu"
 
-#: ../src/project.c:174 ../src/project.c:475
+#: ../src/project.c:172
+#: ../src/project.c:473
 msgid "Choose Project Base Path"
-msgstr "Wybierz katalog podstawowy dla projektu"
+msgstr "Wybierz katalog bazowy dla projektu"
 
-#: ../src/project.c:196 ../src/project.c:575
-#, fuzzy
+#: ../src/project.c:194
+#: ../src/project.c:573
 msgid "Project file could not be written"
-msgstr "Plik projektu nie mógł zostać odczytany."
+msgstr "Plik projektu nie został zapisany."
 
-#: ../src/project.c:199
+#: ../src/project.c:197
 #, c-format
 msgid "Project \"%s\" created."
 msgstr "Projekt \"%s\" utworzony."
 
-#: ../src/project.c:240 ../src/project.c:272 ../src/project.c:960
+#: ../src/project.c:238
+#: ../src/project.c:270
+#: ../src/project.c:958
 #, c-format
 msgid "Project file \"%s\" could not be loaded."
 msgstr "Plik projektu \"%s\" nie mógł zostać wczytany."
 
-#: ../src/project.c:266 ../src/project.c:278
+#: ../src/project.c:264
+#: ../src/project.c:276
 msgid "Open Project"
 msgstr "Otwórz projekt"
 
-#: ../src/project.c:298
+#: ../src/project.c:296
 msgid "Project files"
-msgstr "Katalog z plikami projektu"
+msgstr "Pliki projektu"
 
-#: ../src/project.c:348
+#: ../src/project.c:346
 #, c-format
 msgid "Project \"%s\" closed."
 msgstr "Projekt \"%s\" został zamknięty."
 
-#: ../src/project.c:492
+#: ../src/project.c:490
 msgid "File patterns:"
 msgstr "Wzory plików:"
 
-#: ../src/project.c:500
-msgid ""
-"Space separated list of file patterns used for the find in files dialog (e."
-"g. *.c *.h)"
-msgstr ""
+#: ../src/project.c:498
+msgid "Space separated list of file patterns used for the find in files dialog (e.g. *.c *.h)"
+msgstr "Lista wzorców plików oddzielona spacjami (w oknie wyszukiwania) (np. g. *.c *h)"
 
-#: ../src/project.c:578
+#: ../src/project.c:576
 #, c-format
 msgid "Project \"%s\" saved."
 msgstr "Projekt \"%s\" zapisany."
 
-#: ../src/project.c:609
+#: ../src/project.c:607
 msgid "Do you want to close it before proceeding?"
-msgstr "Czy chcesz go zamknąć przed kontynuowaniem?"
+msgstr "Czy chcesz zamknąć przed kontynuowaniem?"
 
-#: ../src/project.c:610
-#, fuzzy, c-format
+#: ../src/project.c:608
+#, c-format
 msgid "The '%s' project is already open."
-msgstr "Projekt '%s' jest już otwarty"
+msgstr "Projekt '%s' jest już otwarty."
 
-#: ../src/project.c:658
+#: ../src/project.c:656
 msgid "The specified project name is too short."
-msgstr "Podana nazwa projektu jest za krótka"
+msgstr "Podana nazwa projektu jest za krótka."
 
-#: ../src/project.c:664
+#: ../src/project.c:662
 #, c-format
 msgid "The specified project name is too long (max. %d characters)."
-msgstr "Podana nazwa projektu jest zbyt długa (maksymalnie %d znaków)"
+msgstr "Podana nazwa projektu jest zbyt długa (maksymalnie %d znaków)."
 
-#: ../src/project.c:676
+#: ../src/project.c:674
 msgid "You have specified an invalid project filename."
-msgstr "Podałeś niewłaściwą nazwę pliku projektu."
+msgstr "Niewłaściwa nazwa pliku projektu."
 
-#: ../src/project.c:699
+#: ../src/project.c:697
 msgid "Create the project's base path directory?"
-msgstr "Utworzyć katalog podstawowy dla projektu?"
+msgstr "Utworzyć katalog bazowy dla projektu?"
 
-#: ../src/project.c:700
+#: ../src/project.c:698
 #, c-format
 msgid "The path \"%s\" does not exist."
 msgstr "Katalog \"%s\" nie istnieje."
 
-#: ../src/project.c:709
-#, fuzzy, c-format
+#: ../src/project.c:707
+#, c-format
 msgid "Project base directory could not be created (%s)."
-msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)."
+msgstr "Nie można utworzyć katalogu bazowego (%s)."
 
-#: ../src/project.c:722
-#, fuzzy, c-format
+#: ../src/project.c:720
+#, c-format
 msgid "Project file could not be written (%s)."
-msgstr "Plik projektu nie mógł zostać odczytany."
+msgstr "Plik projektu nie został zapisany (%s)."
 
 #. initialise the dialog
-#: ../src/project.c:864 ../src/project.c:875
+#: ../src/project.c:862
+#: ../src/project.c:873
 msgid "Choose Project Filename"
 msgstr "Wybierz nazwę pliku projektu"
 
-#: ../src/project.c:950
+#: ../src/project.c:948
 #, c-format
 msgid "Project \"%s\" opened."
 msgstr "Projekt \"%s\" otwarty"
 
-#: ../src/search.c:292 ../src/search.c:977
+#: ../src/search.c:290
+#: ../src/search.c:970
 msgid "_Use regular expressions"
-msgstr "Użycie wyrażeń _regularnych"
+msgstr "_Użyj wyrażeń regularnych"
 
-#: ../src/search.c:295
-msgid ""
-"Use POSIX-like regular expressions. For detailed information about using "
-"regular expressions, please read the documentation."
-msgstr ""
-"Używaj wyrażeń regularnych w stylu POSIX. Więcej informacji na ten temat "
-"znajduje się w dokumentacji."
+#: ../src/search.c:293
+msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation."
+msgstr "Użyj wyrażeń regularnych w stylu POSIX. Szczegóły w dokumentacji."
 
-#: ../src/search.c:302
+#: ../src/search.c:300
 msgid "Search _backwards"
 msgstr "Wyszukiwanie _wstecz"
 
-#: ../src/search.c:315
+#: ../src/search.c:313
 msgid "Use _escape sequences"
 msgstr "Uż_ycie sekwencji specjalnych"
 
-#: ../src/search.c:319
-#, fuzzy
+#: ../src/search.c:317
 msgid ""
-"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the "
-"corresponding control characters"
+"Replace \\\\, \\t, \\n"
+", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters"
 msgstr ""
-"Zastąp \\\\, \\t, \\n, \\r oraz \\uXXXX (znaki Unicode) odpowiednimi znakami "
-"kontrolnymi."
+"Zastąp \\\\, \\t, \\n"
+", \\r oraz \\uXXXX (znaki Unicode) odpowiednimi znakami kontrolnymi."
 
-#: ../src/search.c:328 ../src/search.c:986
+#: ../src/search.c:326
+#: ../src/search.c:979
 msgid "C_ase sensitive"
 msgstr "Rozróżnianie wielkości _liter"
 
-#: ../src/search.c:332 ../src/search.c:991
+#: ../src/search.c:330
+#: ../src/search.c:984
 msgid "Match only a _whole word"
 msgstr "Tylko całe _wyrazy"
 
-#: ../src/search.c:336
+#: ../src/search.c:334
 msgid "Match from s_tart of word"
 msgstr "Tylko wyrazy o takich samych _początkach"
 
-#: ../src/search.c:472
+#: ../src/search.c:470
 msgid "_Previous"
 msgstr "_Poprzedni"
 
-#: ../src/search.c:477
+#: ../src/search.c:475
 msgid "_Next"
 msgstr "_Następny"
 
-#: ../src/search.c:481 ../src/search.c:643 ../src/search.c:886
+#: ../src/search.c:479
+#: ../src/search.c:640
+#: ../src/search.c:881
 msgid "_Search for:"
 msgstr "_Szukaj:"
 
 #. Now add the multiple match options
-#: ../src/search.c:511
-#, fuzzy
+#: ../src/search.c:508
 msgid "_Find All"
-msgstr "Szukaj wszystkie"
+msgstr "_Znajdź wszystkie"
 
-#: ../src/search.c:518
+#: ../src/search.c:515
 msgid "_Mark"
-msgstr "Ust_aw znaczniki"
+msgstr "_Oznacz"
 
-#: ../src/search.c:520
-#, fuzzy
+#: ../src/search.c:517
 msgid "Mark all matches in the current document"
-msgstr ""
-"Ustawia znaczniki we wszystkich liniach danego dokumentu w których występuje "
-"szukany ciąg"
+msgstr "Oznacz wszystkie wystąpienia w bieżącym dokumencie"
 
-#: ../src/search.c:525 ../src/search.c:702
+#: ../src/search.c:522
+#: ../src/search.c:697
 msgid "In Sessi_on"
 msgstr "W _sesji"
 
-#: ../src/search.c:530 ../src/search.c:707
+#: ../src/search.c:527
+#: ../src/search.c:702
 msgid "_In Document"
 msgstr "_W dokumencie"
 
 #. close window checkbox
-#: ../src/search.c:536 ../src/search.c:720
+#: ../src/search.c:533
+#: ../src/search.c:715
 msgid "Close _dialog"
-msgstr "_Zamknij po ustawieniu znaczników"
+msgstr "_Zamknij po ustawieniu oznaczeń"
 
-#: ../src/search.c:540 ../src/search.c:724
-#, fuzzy
+#: ../src/search.c:537
+#: ../src/search.c:719
 msgid "Disable this option to keep the dialog open"
-msgstr "Zamyka okno po ustawieniu znaczników"
+msgstr "Wyłącz tę opcję, by zostawić okno otwarte"
 
-#: ../src/search.c:637
+#: ../src/search.c:634
 msgid "Replace & Fi_nd"
 msgstr "Za_stąp i znajdź"
 
-#: ../src/search.c:646
-#, fuzzy
+#: ../src/search.c:643
 msgid "Replace wit_h:"
 msgstr "Za_stąp ciągiem:"
 
 #. Now add the multiple replace options
-#: ../src/search.c:695
-#, fuzzy
+#: ../src/search.c:690
 msgid "Re_place All"
-msgstr "Zastąp wszystkie"
+msgstr "Zastąp _wszystkie"
 
-#: ../src/search.c:712
+#: ../src/search.c:707
 msgid "In Se_lection"
 msgstr "W _zaznaczeniu"
 
-#: ../src/search.c:714
+#: ../src/search.c:709
 msgid "Replace all matches found in the currently selected text"
 msgstr "Zamieć wszystkie ciągi znalezione w aktualnie zaznaczonym tekście"
 
-#: ../src/search.c:831
+#: ../src/search.c:826
 msgid "all"
-msgstr ""
+msgstr "wszystko"
 
-#: ../src/search.c:833
-#, fuzzy
+#: ../src/search.c:828
 msgid "project"
-msgstr "projekty"
+msgstr "projekt"
 
-#: ../src/search.c:835
+#: ../src/search.c:830
 msgid "custom"
-msgstr ""
+msgstr "własne"
 
-#: ../src/search.c:839
+#: ../src/search.c:834
 msgid ""
 "All: search all files in the directory\n"
 "Project: use file patterns defined in the project settings\n"
 "Custom: specify file patterns manually"
 msgstr ""
+"Wszystkie: szukaj wszystkich plików w katalogu\n"
+"Projekt: użyj maski pliku zdefiniowanej w projekcie\n"
+"Własne: wprowadź własną maskę"
 
-#: ../src/search.c:906
+#: ../src/search.c:900
 msgid "Fi_les:"
-msgstr ""
+msgstr "P_liki:"
 
-#: ../src/search.c:918
-#, fuzzy
+#: ../src/search.c:912
 msgid "File patterns, e.g. *.c *.h"
-msgstr "Wzory plików:"
+msgstr "Maski plików, np. *.c *.h"
 
-#: ../src/search.c:930
+#: ../src/search.c:924
 msgid "_Directory:"
 msgstr "Ka_talog:"
 
-#: ../src/search.c:949
-#, fuzzy
+#: ../src/search.c:942
 msgid "E_ncoding:"
-msgstr "Ustaw kodowanie znaków"
+msgstr "_Kodowanie:"
 
-#: ../src/search.c:980
-#, fuzzy
+#: ../src/search.c:973
 msgid "See grep's manual page for more information"
-msgstr "Zobacz podręcznik programu Grep aby uzyskać więcej informacji."
+msgstr "Po szczegóły zajrzyj do podręcznika programu grep."
 
-#: ../src/search.c:982
+#: ../src/search.c:975
 msgid "_Recurse in subfolders"
 msgstr "Szukaj w _podkatalogach"
 
-#: ../src/search.c:995
+#: ../src/search.c:988
 msgid "_Invert search results"
 msgstr "_Odwróć wyniki wyszukiwania"
 
-#: ../src/search.c:999
-#, fuzzy
+#: ../src/search.c:992
 msgid "Invert the sense of matching, to select non-matching lines"
-msgstr ""
-"Odwróć tak, żeby zaznaczone zostały linie nie spełniające zadanego kryterium."
+msgstr "Zaznacz wiersze <b>nie pasujące</b> do kryterium."
 
-#: ../src/search.c:1016
+#: ../src/search.c:1009
 msgid "E_xtra options:"
 msgstr "Opcje _dodatkowe:"
 
-#: ../src/search.c:1023
+#: ../src/search.c:1016
 msgid "Other options to pass to Grep"
-msgstr "Inne opcje przekazywane programowi Grep"
+msgstr "Inne opcje dla programu Grep"
 
-#: ../src/search.c:1284 ../src/search.c:2069 ../src/search.c:2072
+#: ../src/search.c:1277
+#: ../src/search.c:2062
+#: ../src/search.c:2065
 #, fuzzy, c-format
 msgid "Found %d match for \"%s\"."
 msgid_plural "Found %d matches for \"%s\"."
 msgstr[0] "Znaleziono %d wyników wyszukiwania ciągu \"%s\"."
 msgstr[1] "Znaleziono %d wyników wyszukiwania ciągu \"%s\"."
 
-#: ../src/search.c:1331
-#, fuzzy, c-format
+#: ../src/search.c:1324
+#, c-format
 msgid "Replaced %u matches in %u documents."
-msgstr ""
-"Ustawia znaczniki we wszystkich liniach danego dokumentu w których występuje "
-"szukany ciąg"
+msgstr "Zastąpiono %u wystąpień w %u dokumentach."
 
-#: ../src/search.c:1518
+#: ../src/search.c:1511
 msgid "Invalid directory for find in files."
 msgstr "Nieprawidłowy katalog."
 
-#: ../src/search.c:1539
+#: ../src/search.c:1532
 msgid "No text to find."
-msgstr "Nie znaleziono tekstu"
+msgstr "Nie znaleziono tekstu."
 
-#: ../src/search.c:1566
+#: ../src/search.c:1559
 #, c-format
 msgid "Cannot execute grep tool '%s'; check the path setting in Preferences."
-msgstr ""
-"Nie można uruchomić programu grep: \"%s\". Sprawdź, czy podałeś właściwą "
-"ścieżkę do programu w ustawieniach Geany."
+msgstr "Nie można uruchomić programu grep: \"%s\". Sprawdź, czy podałeś właściwą ścieżkę do programu w ustawieniach Geany."
 
-#: ../src/search.c:1634
-#, fuzzy
+#: ../src/search.c:1627
 msgid "Searching..."
-msgstr "_Szukaj"
+msgstr "Poszukiwanie..."
 
-#: ../src/search.c:1645
+#: ../src/search.c:1638
 #, c-format
 msgid "%s %s -- %s (in directory: %s)"
 msgstr "%s %s -- %s (w katalogu: %s)"
 
-#: ../src/search.c:1686
+#: ../src/search.c:1679
 #, c-format
 msgid "Could not open directory (%s)"
 msgstr "Nie można otworzyć katalogu %s"
 
-#: ../src/search.c:1788
+#: ../src/search.c:1781
 msgid "Search failed."
 msgstr "Wyszukiwanie nieudane"
 
-#: ../src/search.c:1808
+#: ../src/search.c:1801
 #, fuzzy, c-format
 msgid "Search completed with %d match."
 msgid_plural "Search completed with %d matches."
 msgstr[0] "Wyszukiwanie zakończone z %d wynikami"
 msgstr[1] "Wyszukiwanie zakończone z %d wynikami"
 
-#: ../src/search.c:1816
+#: ../src/search.c:1809
 msgid "No matches found."
 msgstr "Nie znaleziono ciągu."
 
-#: ../src/search.c:1848
+#: ../src/search.c:1841
 #, c-format
 msgid "Bad regex: %s"
-msgstr ""
+msgstr "Błędne wyrażenie regularne: %s"
 
 #. TODO maybe this message needs a rewording
-#: ../src/socket.c:227
+#: ../src/socket.c:225
 msgid ""
-"Geany tried to access the Unix Domain socket of another instance running as "
-"another user.\n"
+"Geany tried to access the Unix Domain socket of another instance running as another user.\n"
 "This is a fatal error and Geany will now quit."
 msgstr ""
+"Program usiłował uzyskać dostęp do socketu domeny unixowej innej kopii uruchomionej przez innego użytkownika.\n"
+"Błąd krytyczny - program za chwilę zakończy działanie."
 
-#: ../src/symbols.c:688 ../src/symbols.c:738 ../src/symbols.c:805
+#: ../src/stash.c:1072
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../src/stash.c:1079
+msgid "Value"
+msgstr ""
+
+#: ../src/symbols.c:686
+#: ../src/symbols.c:736
+#: ../src/symbols.c:803
 msgid "Chapter"
 msgstr "Rozdział"
 
-#: ../src/symbols.c:689 ../src/symbols.c:734 ../src/symbols.c:806
+#: ../src/symbols.c:687
+#: ../src/symbols.c:732
+#: ../src/symbols.c:804
 msgid "Section"
 msgstr "Sekcja"
 
-#: ../src/symbols.c:690
+#: ../src/symbols.c:688
 msgid "Sect1"
 msgstr "Sekcja1"
 
-#: ../src/symbols.c:691
+#: ../src/symbols.c:689
 msgid "Sect2"
 msgstr "Sekcja2"
 
-#: ../src/symbols.c:692
+#: ../src/symbols.c:690
 msgid "Sect3"
 msgstr "Sekcja3"
 
-#: ../src/symbols.c:693
+#: ../src/symbols.c:691
 msgid "Appendix"
 msgstr "Dodatek"
 
-#: ../src/symbols.c:694 ../src/symbols.c:739 ../src/symbols.c:755
-#: ../src/symbols.c:766 ../src/symbols.c:853 ../src/symbols.c:864
-#: ../src/symbols.c:876 ../src/symbols.c:890 ../src/symbols.c:902
-#: ../src/symbols.c:914 ../src/symbols.c:929 ../src/symbols.c:958
-#: ../src/symbols.c:987
+#: ../src/symbols.c:692
+#: ../src/symbols.c:737
+#: ../src/symbols.c:753
+#: ../src/symbols.c:764
+#: ../src/symbols.c:851
+#: ../src/symbols.c:862
+#: ../src/symbols.c:874
+#: ../src/symbols.c:888
+#: ../src/symbols.c:900
+#: ../src/symbols.c:912
+#: ../src/symbols.c:927
+#: ../src/symbols.c:956
+#: ../src/symbols.c:985
 msgid "Other"
 msgstr "Inne"
 
-#: ../src/symbols.c:700 ../src/symbols.c:922 ../src/symbols.c:967
+#: ../src/symbols.c:698
+#: ../src/symbols.c:920
+#: ../src/symbols.c:965
 msgid "Module"
 msgstr "Moduł"
 
-#: ../src/symbols.c:701 ../src/symbols.c:849 ../src/symbols.c:900
-#: ../src/symbols.c:912 ../src/symbols.c:927 ../src/symbols.c:939
+#: ../src/symbols.c:699
+#: ../src/symbols.c:847
+#: ../src/symbols.c:898
+#: ../src/symbols.c:910
+#: ../src/symbols.c:925
+#: ../src/symbols.c:937
 msgid "Types"
-msgstr "Typy:"
+msgstr "Typy"
 
-#: ../src/symbols.c:702
+#: ../src/symbols.c:700
 msgid "Type constructors"
 msgstr "Konstruktory typów"
 
-#: ../src/symbols.c:703 ../src/symbols.c:725 ../src/symbols.c:746
-#: ../src/symbols.c:754 ../src/symbols.c:763 ../src/symbols.c:775
-#: ../src/symbols.c:784 ../src/symbols.c:837 ../src/symbols.c:886
-#: ../src/symbols.c:909 ../src/symbols.c:924 ../src/symbols.c:952
-#: ../src/symbols.c:974
+#: ../src/symbols.c:701
+#: ../src/symbols.c:723
+#: ../src/symbols.c:744
+#: ../src/symbols.c:752
+#: ../src/symbols.c:761
+#: ../src/symbols.c:773
+#: ../src/symbols.c:782
+#: ../src/symbols.c:835
+#: ../src/symbols.c:884
+#: ../src/symbols.c:907
+#: ../src/symbols.c:922
+#: ../src/symbols.c:950
+#: ../src/symbols.c:972
 msgid "Functions"
 msgstr "Funkcje"
 
-#: ../src/symbols.c:708
+#: ../src/symbols.c:706
 msgid "Program"
-msgstr ""
+msgstr "Program"
 
-#: ../src/symbols.c:710 ../src/symbols.c:718 ../src/symbols.c:724
+#: ../src/symbols.c:708
+#: ../src/symbols.c:716
+#: ../src/symbols.c:722
 msgid "Sections"
 msgstr "Sekcje"
 
-#: ../src/symbols.c:711
+#: ../src/symbols.c:709
 msgid "Paragraph"
-msgstr ""
+msgstr "Akapit"
 
-#: ../src/symbols.c:712
-#, fuzzy
+#: ../src/symbols.c:710
 msgid "Group"
-msgstr "Grupa:"
+msgstr "Grupa"
 
-#: ../src/symbols.c:713
+#: ../src/symbols.c:711
 msgid "Data"
-msgstr ""
+msgstr "Data"
 
-#: ../src/symbols.c:719
+#: ../src/symbols.c:717
 msgid "Keys"
 msgstr "Przyciski"
 
-#: ../src/symbols.c:726 ../src/symbols.c:777 ../src/symbols.c:838
-#: ../src/symbols.c:863 ../src/symbols.c:888 ../src/symbols.c:901
-#: ../src/symbols.c:910 ../src/symbols.c:926 ../src/symbols.c:986
+#: ../src/symbols.c:724
+#: ../src/symbols.c:775
+#: ../src/symbols.c:836
+#: ../src/symbols.c:861
+#: ../src/symbols.c:886
+#: ../src/symbols.c:899
+#: ../src/symbols.c:908
+#: ../src/symbols.c:924
+#: ../src/symbols.c:984
 msgid "Variables"
 msgstr "Zmienne"
 
-#: ../src/symbols.c:733
+#: ../src/symbols.c:731
 msgid "Environment"
 msgstr "Środowisko"
 
-#: ../src/symbols.c:735 ../src/symbols.c:807
+#: ../src/symbols.c:733
+#: ../src/symbols.c:805
 msgid "Subsection"
 msgstr "Podsekcja"
 
-#: ../src/symbols.c:736 ../src/symbols.c:808
+#: ../src/symbols.c:734
+#: ../src/symbols.c:806
 msgid "Subsubsection"
 msgstr "Podsekcja"
 
-#: ../src/symbols.c:747
-#, fuzzy
+#: ../src/symbols.c:745
 msgid "Structures"
-msgstr "Status"
+msgstr "Struktury"
 
-#: ../src/symbols.c:762 ../src/symbols.c:846 ../src/symbols.c:871
-#: ../src/symbols.c:883
+#: ../src/symbols.c:760
+#: ../src/symbols.c:844
+#: ../src/symbols.c:869
+#: ../src/symbols.c:881
 msgid "Package"
 msgstr "Pakiet"
 
-#: ../src/symbols.c:764 ../src/symbols.c:913 ../src/symbols.c:936
-#, fuzzy
-msgid "Labels"
-msgstr "Etykieta"
-
-#: ../src/symbols.c:765 ../src/symbols.c:776 ../src/symbols.c:889
+#: ../src/symbols.c:762
 #: ../src/symbols.c:911
+#: ../src/symbols.c:934
+msgid "Labels"
+msgstr "Etykiety"
+
+#: ../src/symbols.c:763
+#: ../src/symbols.c:774
+#: ../src/symbols.c:887
+#: ../src/symbols.c:909
 msgid "Constants"
 msgstr "Stałe"
 
-#: ../src/symbols.c:773 ../src/symbols.c:872 ../src/symbols.c:884
-#: ../src/symbols.c:897 ../src/symbols.c:923
+#: ../src/symbols.c:771
+#: ../src/symbols.c:870
+#: ../src/symbols.c:882
+#: ../src/symbols.c:895
+#: ../src/symbols.c:921
 msgid "Interfaces"
 msgstr "Interfejsy"
 
-#: ../src/symbols.c:774 ../src/symbols.c:795 ../src/symbols.c:816
-#: ../src/symbols.c:826 ../src/symbols.c:835 ../src/symbols.c:873
-#: ../src/symbols.c:885 ../src/symbols.c:898 ../src/symbols.c:973
+#: ../src/symbols.c:772
+#: ../src/symbols.c:793
+#: ../src/symbols.c:814
+#: ../src/symbols.c:824
+#: ../src/symbols.c:833
+#: ../src/symbols.c:871
+#: ../src/symbols.c:883
+#: ../src/symbols.c:896
+#: ../src/symbols.c:971
 msgid "Classes"
 msgstr "Klasy"
 
-#: ../src/symbols.c:785
+#: ../src/symbols.c:783
 msgid "Anchors"
-msgstr ""
+msgstr "Odsyłacze HTML"
+
+#: ../src/symbols.c:784
+msgid "H1 Headings"
+msgstr "Nagłówek H1"
+
+#: ../src/symbols.c:785
+msgid "H2 Headings"
+msgstr "Nagłówek H2"
 
 #: ../src/symbols.c:786
-msgid "H1 Headings"
-msgstr ""
-
-#: ../src/symbols.c:787
-msgid "H2 Headings"
-msgstr ""
-
-#: ../src/symbols.c:788
 msgid "H3 Headings"
-msgstr ""
+msgstr "Nagłówek H3"
 
-#: ../src/symbols.c:796
-#, fuzzy
+#: ../src/symbols.c:794
 msgid "ID Selectors"
-msgstr "W _zaznaczeniu"
+msgstr "Selektory ID"
 
-#: ../src/symbols.c:797
-#, fuzzy
+#: ../src/symbols.c:795
 msgid "Type Selectors"
-msgstr "Konstruktory typów"
+msgstr "Selektory typów"
 
-#: ../src/symbols.c:815 ../src/symbols.c:861
-#, fuzzy
+#: ../src/symbols.c:813
+#: ../src/symbols.c:859
 msgid "Modules"
-msgstr "Moduł"
+msgstr "Moduły"
 
-#: ../src/symbols.c:817
+#: ../src/symbols.c:815
 msgid "Singletons"
 msgstr "Wzorce singletonu"
 
-#: ../src/symbols.c:818 ../src/symbols.c:827 ../src/symbols.c:836
-#: ../src/symbols.c:874 ../src/symbols.c:899
+#: ../src/symbols.c:816
+#: ../src/symbols.c:825
+#: ../src/symbols.c:834
+#: ../src/symbols.c:872
+#: ../src/symbols.c:897
 msgid "Methods"
 msgstr "Metody"
 
-#: ../src/symbols.c:825 ../src/symbols.c:970
+#: ../src/symbols.c:823
+#: ../src/symbols.c:968
 msgid "Namespaces"
-msgstr "Przestrzenie nazw"
+msgstr "Przestrzeń nazw (namespaces)"
 
-#: ../src/symbols.c:828 ../src/symbols.c:953
-#, fuzzy
+#: ../src/symbols.c:826
+#: ../src/symbols.c:951
 msgid "Procedures"
-msgstr "Właściwości"
+msgstr "Procedury"
 
-#: ../src/symbols.c:839
-#, fuzzy
+#: ../src/symbols.c:837
 msgid "Imports"
-msgstr "Eksportuj"
+msgstr "Importuje"
 
-#: ../src/symbols.c:847
-#, fuzzy
+#: ../src/symbols.c:845
 msgid "Entities"
-msgstr "bez nazwy"
+msgstr "Encje"
 
-#: ../src/symbols.c:848
+#: ../src/symbols.c:846
 #, fuzzy
 msgid "Architectures"
-msgstr "Status"
+msgstr "Architektury"
+
+#: ../src/symbols.c:848
+msgid "Functions / Procedures"
+msgstr "Funkcje / procedury"
+
+#: ../src/symbols.c:849
+msgid "Variables / Signals"
+msgstr "Zmienne / Sygnały"
 
 #: ../src/symbols.c:850
-#, fuzzy
-msgid "Functions / Procedures"
-msgstr "Właściwości"
-
-#: ../src/symbols.c:851
-#, fuzzy
-msgid "Variables / Signals"
-msgstr "Zmienne"
-
-#: ../src/symbols.c:852
 msgid "Processes / Components"
-msgstr ""
+msgstr "Procesy / Składniki"
+
+#: ../src/symbols.c:858
+msgid "Events"
+msgstr "Zdarzenia"
 
 #: ../src/symbols.c:860
-msgid "Events"
-msgstr ""
-
-#: ../src/symbols.c:862
-#, fuzzy
 msgid "Functions / Tasks"
-msgstr "Funkcje"
+msgstr "Funkcje / Zadania"
 
-#: ../src/symbols.c:875 ../src/symbols.c:975
+#: ../src/symbols.c:873
+#: ../src/symbols.c:973
 msgid "Members"
 msgstr "Atrybuty/metody w klasach"
 
-#: ../src/symbols.c:925
+#: ../src/symbols.c:923
 msgid "Subroutines"
-msgstr ""
+msgstr "Podprogramy"
 
-#: ../src/symbols.c:928
+#: ../src/symbols.c:926
 msgid "Blocks"
-msgstr ""
+msgstr "Bloki"
 
-#: ../src/symbols.c:937 ../src/symbols.c:946 ../src/symbols.c:983
+#: ../src/symbols.c:935
+#: ../src/symbols.c:944
+#: ../src/symbols.c:981
 msgid "Macros"
 msgstr "Makra"
 
-#: ../src/symbols.c:938
-#, fuzzy
+#: ../src/symbols.c:936
 msgid "Defines"
-msgstr "Wiersze:"
+msgstr "Dyrektywy 'define'"
 
-#: ../src/symbols.c:945
+#: ../src/symbols.c:943
 msgid "Targets"
-msgstr ""
+msgstr "Cele"
+
+#: ../src/symbols.c:952
+msgid "Indexes"
+msgstr "Indeksy"
+
+#: ../src/symbols.c:953
+msgid "Tables"
+msgstr "Tablice"
 
 #: ../src/symbols.c:954
-msgid "Indexes"
-msgstr ""
+msgid "Triggers"
+msgstr "Wyzwalacze"
 
 #: ../src/symbols.c:955
-#, fuzzy
-msgid "Tables"
-msgstr "Zmienne"
-
-#: ../src/symbols.c:956
-msgid "Triggers"
-msgstr ""
-
-#: ../src/symbols.c:957
-#, fuzzy
 msgid "Views"
-msgstr "P_okaż"
+msgstr "Widoki"
 
-#: ../src/symbols.c:976
-#, fuzzy
+#: ../src/symbols.c:974
 msgid "Structs"
-msgstr "Status"
+msgstr "Struktury"
 
-#: ../src/symbols.c:977
+#: ../src/symbols.c:975
 msgid "Typedefs / Enums"
-msgstr ""
+msgstr "Definicje typów"
 
-#: ../src/symbols.c:1618
+#: ../src/symbols.c:1616
 #, c-format
 msgid "Unknown filetype extension for \"%s\".\n"
 msgstr "Nieznane rozszerzenie pliku dla \"%s\".\n"
 
-#: ../src/symbols.c:1641
-#, fuzzy, c-format
+#: ../src/symbols.c:1639
+#, c-format
 msgid "Failed to create tags file, perhaps because no tags were found.\n"
-msgstr "Nie udało się utworzyć pliku ze znacznikami.\n"
+msgstr "Nie udało się utworzyć pliku ze znacznikami, być może nie znaleziono żadnych znaczników.\n"
 
-#: ../src/symbols.c:1648
+#: ../src/symbols.c:1646
 #, c-format
 msgid ""
 "Usage: %s -g <Tag File> <File list>\n"
@@ -4706,478 +4488,431 @@ msgstr ""
 "Użycie: %s -g <Plik_z_tagami> <Lista>\n"
 "\n"
 
-#: ../src/symbols.c:1649
+#: ../src/symbols.c:1647
 #, c-format
 msgid ""
 "Example:\n"
-"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/"
-"gtk/gtk.h\n"
+"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n"
 msgstr ""
 "Przykład:\n"
-"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/"
-"gtk/gtk.h\n"
+"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n"
 
-#: ../src/symbols.c:1663
+#: ../src/symbols.c:1661
 msgid "Load Tags"
 msgstr "Wczytaj znaczniki"
 
-#: ../src/symbols.c:1670
+#: ../src/symbols.c:1668
 msgid "Geany tag files (*.tags)"
 msgstr "Pliki Geany ze znacznikami (*.tags)"
 
 #. For translators: the first wildcard is the filetype, the second the filename
-#: ../src/symbols.c:1690
+#: ../src/symbols.c:1688
 #, c-format
 msgid "Loaded %s tags file '%s'."
 msgstr "Wczytano %s pliku ze znacznikami %s"
 
-#: ../src/symbols.c:1693
+#: ../src/symbols.c:1691
 #, c-format
 msgid "Could not load tags file '%s'."
 msgstr "Nie można wczytać pliku ze znacznikami: %s"
 
-#: ../src/symbols.c:1848
+#: ../src/symbols.c:1846
 #, c-format
 msgid "Forward declaration \"%s\" not found."
 msgstr "Nie odnaleziono deklaracji \"%s\""
 
-#: ../src/symbols.c:1850
+#: ../src/symbols.c:1848
 #, c-format
 msgid "Definition of \"%s\" not found."
 msgstr "Brak Definicji \"%s\""
 
-#: ../src/symbols.c:2156
-#, fuzzy
+#: ../src/symbols.c:2154
 msgid "Sort by _Name"
-msgstr "Uporządkuj według nazw"
+msgstr "Sortuj według _nazwy"
 
-#: ../src/symbols.c:2163
-#, fuzzy
+#: ../src/symbols.c:2161
 msgid "Sort by _Appearance"
-msgstr "Uporządkuj według kolejności wystąpienia"
+msgstr "Uporządkuj w kolejności _występowania"
 
-#: ../src/templates.c:77
+#: ../src/templates.c:75
 #, c-format
 msgid "Failed to convert template file \"%s\" to UTF-8"
-msgstr ""
+msgstr "Nie udało się zmienić kodowania szablonu \"%s\" na UTF-8"
 
 #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build"
-#: ../src/toolbar.c:56
+#: ../src/toolbar.c:54
 msgid "Save the current file"
 msgstr "Zapisuje bieżący plik"
 
-#: ../src/toolbar.c:58
+#: ../src/toolbar.c:56
 msgid "Save all open files"
 msgstr "Zapisuje wszystkie otwarte pliki"
 
-#: ../src/toolbar.c:59
+#: ../src/toolbar.c:57
 msgid "Reload the current file from disk"
 msgstr "Ponownie wczytuje bieżący plik z dysku"
 
-#: ../src/toolbar.c:60
+#: ../src/toolbar.c:58
 msgid "Close the current file"
 msgstr "Zamyka bieżący plik"
 
-#: ../src/toolbar.c:61
-#, fuzzy
+#: ../src/toolbar.c:59
 msgid "Close all open files"
 msgstr "Zamyka wszystkie otwarte pliki"
 
-#: ../src/toolbar.c:62
-#, fuzzy
+#: ../src/toolbar.c:60
 msgid "Cut the current selection"
-msgstr "Konwertuj zaznaczone znaki do małych/dużych liter"
+msgstr "Wytnij zaznaczony fragment"
+
+#: ../src/toolbar.c:61
+msgid "Copy the current selection"
+msgstr "Kopiuj zaznaczony fragment"
+
+#: ../src/toolbar.c:62
+msgid "Paste the contents of the clipboard"
+msgstr "Wklej zawartość schowka"
 
 #: ../src/toolbar.c:63
-#, fuzzy
-msgid "Copy the current selection"
-msgstr "Kompiluje bieżący plik"
+msgid "Delete the current selection"
+msgstr "Usuń zaznaczony fragment"
 
 #: ../src/toolbar.c:64
-msgid "Paste the contents of the clipboard"
-msgstr ""
-
-#: ../src/toolbar.c:65
-#, fuzzy
-msgid "Delete the current selection"
-msgstr "Konwertuj zaznaczone znaki do małych/dużych liter"
-
-#: ../src/toolbar.c:66
 msgid "Undo the last modification"
 msgstr "Cofnij ostatnią modyfikację"
 
-#: ../src/toolbar.c:67
+#: ../src/toolbar.c:65
 msgid "Redo the last modification"
 msgstr "Ponów ostatnią modyfikację"
 
-#: ../src/toolbar.c:70
+#: ../src/toolbar.c:68
 msgid "Compile the current file"
 msgstr "Kompiluje bieżący plik"
 
-#: ../src/toolbar.c:71
+#: ../src/toolbar.c:69
 msgid "Run or view the current file"
 msgstr "Uruchamia lub włącza podgląd bieżącego pliku"
 
+#: ../src/toolbar.c:70
+msgid "Open a color chooser dialog, to interactively pick colors from a palette"
+msgstr "Otwórz okno dialogowe wyboru kolorów, by wybrać kolor z palety"
+
+#: ../src/toolbar.c:71
+msgid "Zoom in the text"
+msgstr "Powiększ tekst"
+
 #: ../src/toolbar.c:72
-#, fuzzy
-msgid ""
-"Open a color chooser dialog, to interactively pick colors from a palette"
-msgstr ""
-"Otwiera okno dialogowe wyboru kolorów, które umożliwia wybór koloru w sposób "
-"interaktywny z palety"
+msgid "Zoom out the text"
+msgstr "Zmniejsz tekst"
 
 #: ../src/toolbar.c:73
-msgid "Zoom in the text"
-msgstr "Powiększa tekst"
-
-#: ../src/toolbar.c:74
-msgid "Zoom out the text"
-msgstr "Zmniejsza tekst"
-
-#: ../src/toolbar.c:75
-#, fuzzy
 msgid "Decrease indentation"
 msgstr "Zmniejsz wcięcie"
 
-#: ../src/toolbar.c:76
-#, fuzzy
+#: ../src/toolbar.c:74
 msgid "Increase indentation"
 msgstr "Zwiększ wcięcie"
 
-#: ../src/toolbar.c:77 ../src/toolbar.c:382
+#: ../src/toolbar.c:75
+#: ../src/toolbar.c:380
 msgid "Find the entered text in the current file"
 msgstr "Szuka podanego tekstu w bieżącym pliku"
 
-#: ../src/toolbar.c:78 ../src/toolbar.c:392
-#, fuzzy
+#: ../src/toolbar.c:76
+#: ../src/toolbar.c:390
 msgid "Jump to the entered line number"
-msgstr "Przechodzi do podanego numeru wiersza."
+msgstr "Przejdź do wiersza o numerze"
 
-#: ../src/toolbar.c:79
+#: ../src/toolbar.c:77
 msgid "Show the preferences dialog"
-msgstr ""
+msgstr "Pokaż okno dialogowe preferencji"
 
-#: ../src/toolbar.c:80
+#: ../src/toolbar.c:78
 msgid "Quit Geany"
 msgstr "Zamknij Geany"
 
-#: ../src/toolbar.c:81
-#, fuzzy
+#: ../src/toolbar.c:79
 msgid "Print document"
-msgstr "XML"
+msgstr "Drukuj dokument"
 
-#: ../src/toolbar.c:82
-#, fuzzy
+#: ../src/toolbar.c:80
 msgid "Replace text in the current document"
-msgstr ""
-"Ustawia znaczniki we wszystkich liniach danego dokumentu w których występuje "
-"szukany ciąg"
+msgstr "Zastąp tekst w bieżącym dokumencie"
 
-#: ../src/toolbar.c:358
+#: ../src/toolbar.c:356
 msgid "Create a new file"
 msgstr "Tworzy nowy plik"
 
-#: ../src/toolbar.c:359
-#, fuzzy
+#: ../src/toolbar.c:357
 msgid "Create a new file from a template"
-msgstr "Tworzy nowy plik"
+msgstr "Utwórz nowy plik z szablonu"
 
-#: ../src/toolbar.c:366
+#: ../src/toolbar.c:364
 msgid "Open an existing file"
 msgstr "Otwiera plik"
 
-#: ../src/toolbar.c:367
-#, fuzzy
+#: ../src/toolbar.c:365
 msgid "Open a recent file"
-msgstr "Otwórz wybrany plik"
+msgstr "Otwórz ostatnio otwierany plik"
 
-#: ../src/toolbar.c:375
-#, fuzzy
+#: ../src/toolbar.c:373
 msgid "Choose more build actions"
-msgstr "Nie wystąpiło więcej błędów podczas budowania."
+msgstr "Więcej parametrów budowania"
 
-#: ../src/toolbar.c:392
-#, fuzzy
+#: ../src/toolbar.c:390
 msgid "Goto"
-msgstr "Przejdź do wiersza"
+msgstr "Przejdź do"
 
-#: ../src/toolbar.c:582
+#: ../src/toolbar.c:579
 msgid "Separator"
-msgstr ""
+msgstr "Separator"
 
-#: ../src/toolbar.c:583
+#: ../src/toolbar.c:580
 msgid "--- Separator ---"
-msgstr ""
+msgstr "--- Separator ---"
 
-#: ../src/toolbar.c:952
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
-msgstr ""
+#: ../src/toolbar.c:949
+msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
+msgstr "Wskaż narzędzia, które znajdą się na pasku narzędzi. Ich położenie można zmienić za pomocą myszy."
 
-#: ../src/toolbar.c:968
+#: ../src/toolbar.c:965
 msgid "Available Items"
-msgstr ""
+msgstr "Dostępne pozycje"
 
-#: ../src/toolbar.c:989
-#, fuzzy
+#: ../src/toolbar.c:986
 msgid "Displayed Items"
-msgstr "Wyświetlanie"
+msgstr "Wyświetlane pozycje"
 
-#: ../src/tools.c:110 ../src/tools.c:115
-#, fuzzy, c-format
-msgid "Invalid command: %s"
-msgstr "Wykonaj polecenie:"
-
-#: ../src/tools.c:110
-#, fuzzy
-msgid "Command not found"
-msgstr "\"%s\" nie został znaleziony"
-
-#: ../src/tools.c:256
+#: ../src/tools.c:108
+#: ../src/tools.c:113
 #, c-format
-msgid ""
-"The executed custom command returned an error. Your selection was not "
-"changed. Error message: %s"
-msgstr ""
+msgid "Invalid command: %s"
+msgstr "Nieprawidłowe poleceni: %s"
 
-#: ../src/tools.c:322
+#: ../src/tools.c:108
+msgid "Command not found"
+msgstr "Nie znaleziono polecenia"
+
+#: ../src/tools.c:254
+#, c-format
+msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s"
+msgstr "Polecenie własne zakończone błędem. Zaznaczony obszar nie został zmieniony. Komunikat: %s"
+
+#: ../src/tools.c:320
 msgid "The executed custom command exited with an unsuccessful exit code."
-msgstr ""
+msgstr "Polecenie własne zakończone z kodem niepowodzenia."
 
-#: ../src/tools.c:350 ../src/tools.c:398
-#, fuzzy, c-format
+#: ../src/tools.c:348
+#: ../src/tools.c:396
+#, c-format
 msgid "Custom command failed: %s"
-msgstr "Nie zdefiniowano zewnętrznych poleceń"
+msgstr "Polecenie własne zakończone niepowodzeniem: %s"
 
-#: ../src/tools.c:354
+#: ../src/tools.c:352
 #, c-format
 msgid "Passing data and executing custom command: %s"
 msgstr "Przetwarzanie danych i uruchamianie zewnętrznego polecenia: %s"
 
-#: ../src/tools.c:500 ../src/tools.c:733
+#: ../src/tools.c:498
+#: ../src/tools.c:731
 msgid "Set Custom Commands"
 msgstr "Ustaw zewnętrzne polecenia"
 
-#: ../src/tools.c:508
-msgid ""
-"You can send the current selection to any of these commands and the output "
-"of the command replaces the current selection."
-msgstr ""
-"Możesz wysłać bieżące zaznaczenie do jednej z tych komend, w wyniku czego "
-"wyjście z działania wybranej komendy zastąpi zaznaczony obszar."
+#: ../src/tools.c:506
+msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection."
+msgstr "Możesz wysłać bieżące zaznaczenie do jednej z tych komend, w wyniku czego wyjście z działania wybranej komendy zastąpi zaznaczony obszar."
 
-#: ../src/tools.c:522
+#: ../src/tools.c:520
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#: ../src/tools.c:708
+#: ../src/tools.c:706
 msgid "No custom commands defined."
 msgstr "Nie zdefiniowano zewnętrznych poleceń"
 
-#: ../src/tools.c:802
+#: ../src/tools.c:800
 msgid "Word Count"
 msgstr "Ilość słów"
 
-#: ../src/tools.c:812
+#: ../src/tools.c:810
 msgid "selection"
 msgstr "zaznaczenie"
 
-#: ../src/tools.c:818
+#: ../src/tools.c:816
 msgid "whole document"
 msgstr "cały dokument"
 
-#: ../src/tools.c:827
+#: ../src/tools.c:825
 msgid "Range:"
 msgstr "Zakres:"
 
-#: ../src/tools.c:839
+#: ../src/tools.c:837
 msgid "Lines:"
 msgstr "Wiersze:"
 
-#: ../src/tools.c:853
+#: ../src/tools.c:851
 msgid "Words:"
 msgstr "Słowa:"
 
-#: ../src/tools.c:867
+#: ../src/tools.c:865
 msgid "Characters:"
 msgstr "Znaki:"
 
-#: ../src/sidebar.c:175
+#: ../src/sidebar.c:173
 msgid "No tags found"
 msgstr "Nie znaleziono"
 
-#: ../src/sidebar.c:587
-#, fuzzy
+#: ../src/sidebar.c:582
 msgid "Show S_ymbol List"
-msgstr "Wyświetlanie listy symboli"
+msgstr "Pokaż listę s_ymboli"
 
-#: ../src/sidebar.c:595
-#, fuzzy
+#: ../src/sidebar.c:590
 msgid "Show _Document List"
-msgstr "Wyświetlanie listy otwartych plików"
+msgstr "Pokaż listę otwartych _dokumentów"
 
-#: ../src/sidebar.c:603 ../plugins/filebrowser.c:660
-#, fuzzy
+#: ../src/sidebar.c:598
+#: ../plugins/filebrowser.c:658
 msgid "H_ide Sidebar"
-msgstr "Ukryj panel boczny"
+msgstr "_Ukryj panel boczny"
 
-#: ../src/sidebar.c:697 ../plugins/filebrowser.c:631
-#, fuzzy
+#: ../src/sidebar.c:692
+#: ../plugins/filebrowser.c:629
 msgid "_Find in Files"
-msgstr "Znajdź w _plikach"
+msgstr "Szukaj w _plikach"
 
-#: ../src/sidebar.c:707
-#, fuzzy
+#: ../src/sidebar.c:702
 msgid "Show _Paths"
-msgstr "Wyświetlanie paska statusu"
+msgstr "Pokaż ścieżki do_stępu"
 
 #. Status bar statistics: col = column, sel = selection.
-#: ../src/ui_utils.c:175
-#, fuzzy
-msgid ""
-"line: %l / %L\t col: %c\t sel: %s\t %w      %t      %mmode: %M      "
-"encoding: %e      filetype: %f      scope: %S"
-msgstr ""
-"wiersz: %d\t kolumna: %d\t zaznaczone: %d\t %s      %s      tryb: %s      "
-"kodowanie: %s %s      typ pliku: %s      funkcja: %s"
+#: ../src/ui_utils.c:173
+msgid "line: %l / %L\t col: %c\t sel: %s\t %w      %t      %mmode: %M      encoding: %e      filetype: %f      scope: %S"
+msgstr "wiersz: %l / %L \t kol.: %c\t zazn.: %s\t %w      %t      tryb: %M      kodowanie: %e    typ pliku: %f     funkcja: %S"
 
 #. RO = read-only
-#: ../src/ui_utils.c:205 ../src/ui_utils.c:212
+#: ../src/ui_utils.c:203
+#: ../src/ui_utils.c:210
 msgid "RO "
 msgstr "RO "
 
 #. OVR = overwrite/overtype, INS = insert
-#: ../src/ui_utils.c:207
+#: ../src/ui_utils.c:205
 msgid "OVR"
 msgstr "NDP"
 
-#: ../src/ui_utils.c:207
+#: ../src/ui_utils.c:205
 msgid "INS"
 msgstr "WST"
 
-#: ../src/ui_utils.c:221
+#: ../src/ui_utils.c:219
 msgid "TAB"
-msgstr ""
+msgstr "TAB"
 
 #. SP = space
-#: ../src/ui_utils.c:224
+#: ../src/ui_utils.c:222
 msgid "SP"
-msgstr ""
+msgstr "SP"
 
 #. T/S = tabs and spaces
-#: ../src/ui_utils.c:227
+#: ../src/ui_utils.c:225
 msgid "T/S"
-msgstr ""
+msgstr "TAB/SP"
 
-#: ../src/ui_utils.c:235
+#: ../src/ui_utils.c:233
 msgid "MOD"
 msgstr "MOD"
 
-#: ../src/ui_utils.c:362
-#, fuzzy
+#: ../src/ui_utils.c:360
 msgid " (new instance)"
-msgstr "Dziedziczenie"
+msgstr "(nowa instancja)"
 
-#: ../src/ui_utils.c:392
+#: ../src/ui_utils.c:390
 #, c-format
 msgid "Font updated (%s)."
 msgstr "Zaktualizowano czcionkę (%s)."
 
-#: ../src/ui_utils.c:588
+#: ../src/ui_utils.c:586
 msgid "C Standard Library"
 msgstr "Standardowa biblioteka C"
 
-#: ../src/ui_utils.c:589
+#: ../src/ui_utils.c:587
 msgid "ISO C99"
 msgstr "ISO C99"
 
-#: ../src/ui_utils.c:590
+#: ../src/ui_utils.c:588
 msgid "C++ (C Standard Library)"
 msgstr "C++ (Standardowa biblioteka C)"
 
-#: ../src/ui_utils.c:591
+#: ../src/ui_utils.c:589
 msgid "C++ Standard Library"
 msgstr "Standardowa biblioteka C++"
 
-#: ../src/ui_utils.c:592
+#: ../src/ui_utils.c:590
 msgid "C++ STL"
 msgstr "C++ STL"
 
-#: ../src/ui_utils.c:654
-#, fuzzy
+#: ../src/ui_utils.c:652
 msgid "_Set Custom Date Format"
-msgstr "Ustaw własny format daty"
+msgstr "Zdefiniuj _własny format daty"
 
-#: ../src/ui_utils.c:1791
+#: ../src/ui_utils.c:1782
 msgid "Select Folder"
-msgstr "Wybierz  katalog"
+msgstr "Wybierz katalog"
 
-#: ../src/ui_utils.c:1791
+#: ../src/ui_utils.c:1782
 msgid "Select File"
 msgstr "Wybierz plik"
 
-#: ../src/ui_utils.c:1945
-#, fuzzy
+#: ../src/ui_utils.c:1941
 msgid "Save All"
 msgstr "Za_pisz wszystko"
 
-#: ../src/ui_utils.c:1946
-#, fuzzy
+#: ../src/ui_utils.c:1942
 msgid "Close All"
 msgstr "Zamknij wszystk_o"
 
-#: ../src/utils.c:89
-#, fuzzy
+#: ../src/utils.c:87
 msgid "Select Browser"
-msgstr "Przeglądarka:"
+msgstr "Wybierz przeglądarkę"
 
-#: ../src/utils.c:90
-msgid ""
-"Failed to spawn the configured browser command. Please correct it or enter "
-"another one."
-msgstr ""
+#: ../src/utils.c:88
+msgid "Failed to spawn the configured browser command. Please correct it or enter another one."
+msgstr "Nie udało się uruchomić polecenia przeglądarki. Popraw je lub podaj inne."
 
-#: ../src/utils.c:368
+#: ../src/utils.c:366
 msgid "Win (CRLF)"
 msgstr "Win (CRLF)"
 
-#: ../src/utils.c:369
+#: ../src/utils.c:367
 msgid "Mac (CR)"
 msgstr "Mac (CR)"
 
-#: ../src/utils.c:370
+#: ../src/utils.c:368
 msgid "Unix (LF)"
 msgstr "Unix (LF)"
 
 #: ../src/vte.c:545
-#, fuzzy
 msgid "_Set Path From Document"
-msgstr "Przejdź do lewego dokumentu"
+msgstr "P_obierz ścieżkę dokumentu"
 
 #: ../src/vte.c:550
-#, fuzzy
 msgid "_Restart Terminal"
-msgstr "Terminal"
+msgstr "Po_nownie uruchom terminal"
 
 #: ../src/vte.c:573
 msgid "_Input Methods"
 msgstr "Meto_dy wejściowe"
 
 #: ../src/vte.c:667
-msgid ""
-"Could not change the directory in the VTE because it probably contains a "
-"command."
-msgstr ""
+msgid "Could not change the directory in the VTE because it probably contains a command."
+msgstr "Nie udało się zmienić katalogu w terminalu wirtualnym, prawdopodobnie zawiera on plik wykonywalny."
 
 #: ../src/vte.c:765
 msgid "Font:"
-msgstr ""
+msgstr "Font:"
 
 #: ../src/vte.c:775
-#, fuzzy
 msgid "Sets the font for the terminal widget"
-msgstr "Ustawia czcionkę dla okna terminala"
+msgstr "Określa font dla okna terminala"
 
 #: ../src/vte.c:777
 msgid "Foreground color:"
@@ -5188,678 +4923,599 @@ msgid "Background color:"
 msgstr "Kolor tła"
 
 #: ../src/vte.c:793
-#, fuzzy
 msgid "Sets the foreground color of the text in the terminal widget"
-msgstr "Ustawia kolor czcionki dla okna terminala."
+msgstr "Określa kolor tekstu w oknie terminala"
 
 #: ../src/vte.c:800
-#, fuzzy
 msgid "Sets the background color of the text in the terminal widget"
-msgstr "Ustawia kolor tła dla okna terminala"
+msgstr "Ustawia kolor tła w oknie terminala"
 
 #: ../src/vte.c:803
 msgid "Scrollback lines:"
 msgstr "Liczba linii:"
 
 #: ../src/vte.c:815
-#, fuzzy
-msgid ""
-"Specifies the history in lines, which you can scroll back in the terminal "
-"widget"
-msgstr ""
-"Określa maksymalną liczbę linii, o jaką można przewinąć wstecz terminal."
+msgid "Specifies the history in lines, which you can scroll back in the terminal widget"
+msgstr "Określa liczbę wierszy historii wyświetlania terminala"
 
 #: ../src/vte.c:819
 msgid "Shell:"
 msgstr "Powłoka:"
 
 #: ../src/vte.c:827
-#, fuzzy
-msgid ""
-"Sets the path to the shell which should be started inside the terminal "
-"emulation"
-msgstr ""
-"Określa ścieżkę do powłoki, która powinna być uruchamiana przez wbudowany "
-"emulator terminala"
+msgid "Sets the path to the shell which should be started inside the terminal emulation"
+msgstr "Określa ścieżkę do powłoki uruchamianej w terminalu wirtualnym"
 
 #: ../src/vte.c:844
 msgid "Scroll on keystroke"
-msgstr "Przewijanie przy _naciśnięciu klawisza"
+msgstr "Przewijanie przy naciśnięciu klawisza"
 
 #: ../src/vte.c:845
-#, fuzzy
 msgid "Whether to scroll to the bottom if a key was pressed"
-msgstr ""
-"Określa czy przewinąć do końca zawartość terminala kiedy zostanie naciśnięty "
-"klawisz "
+msgstr "Określa, czy przewinąć do końca zawartość terminala, gdy zostanie naciśnięty klawisz "
 
 #: ../src/vte.c:848
 msgid "Scroll on output"
 msgstr "Przewijanie terminala przy nowej zawartości"
 
 #: ../src/vte.c:849
-#, fuzzy
 msgid "Whether to scroll to the bottom when output is generated"
-msgstr ""
-"Określa czy przewinąć do końca zawartość terminala kiedy zostanie "
-"wygenerowana nowa zawartość wyjścia"
+msgstr "Określa, czy przewinąć do końca zawartość terminala, gdy zostanie wygenerowane wyjście polecenia"
 
 #: ../src/vte.c:852
 msgid "Cursor blinks"
-msgstr ""
+msgstr "Migotanie kursora"
 
 #: ../src/vte.c:853
-#, fuzzy
 msgid "Whether to blink the cursor"
-msgstr "Określa czy włączyć zawijanie sekcji kodu"
+msgstr "Określa, czy używać migotającego kursora"
 
 #: ../src/vte.c:856
 msgid "Override Geany keybindings"
-msgstr ""
+msgstr "Zmień skróty klawiszowe Geany"
 
 #: ../src/vte.c:858
-msgid ""
-"Allows the VTE to receive keyboard shortcuts (apart from focus commands)"
-msgstr ""
+msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)"
+msgstr "Zezwala terminalowi wirtualnemu na przechwytywanie skrótów klawiszowych (oprócz związanych z focusem)"
 
 #: ../src/vte.c:861
 msgid "Disable menu shortcut key (F10 by default)"
-msgstr "Wyłączenie skrótu klawiszowy menu (domyślnie F10)"
+msgstr "Wyłącz skrót klawiszowy dla menu (domyślnie F10)"
 
 #: ../src/vte.c:862
-msgid ""
-"This option disables the keybinding to popup the menu bar (default is F10). "
-"Disabling it can be useful if you use, for example, Midnight Commander "
-"within the VTE."
-msgstr ""
-"Ta opcja wyłącza skrót klawiszowy odpowiedzialny za wyświetlanie menu "
-"programu (domyślnie przycisk F10). Wyłączenie tej opcji może być pomocne, "
-"jeżeli używasz inne programy wykorzystujące ten skrót (np. Midnight "
-"Commander we wbudowanym emulatorze terminala)"
+msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE."
+msgstr "Ta opcja wyłącza skrót klawiszowy uaktywniający menu (domyślnie F10). Może to być pomocne, jeżeli w terminalu wirtualnym używasz programów również wykorzystujących ten klawisz."
 
-#: ../src/vte.c:865 ../plugins/filebrowser.c:1275
+#: ../src/vte.c:865
+#: ../plugins/filebrowser.c:1261
 msgid "Follow the path of the current file"
 msgstr "Podążanie za ścieżką do bieżącego pliku"
 
 #: ../src/vte.c:866
-#, fuzzy
 msgid "Whether to execute \"cd $path\" when you switch between opened files"
-msgstr ""
-"Określa, czy polecenie \"cd $sciezka\" powinno być wykonywane przy "
-"przechodzeniu między otwartymi plikami"
+msgstr "Określa, czy polecenie \"cd $sciezka\" powinno być wykonywane przy przechodzeniu między otwartymi plikami"
 
 #. create check_skip_script checkbox before the check_skip_script checkbox to be able to
 #. * use the object for the toggled handler of check_skip_script checkbox
 #: ../src/vte.c:871
 msgid "Don't use run script"
-msgstr ""
+msgstr "Nie używaj skryptu uruchomieniowego"
 
 #: ../src/vte.c:872
-msgid ""
-"Don't use the simple run script which is usually used to display the exit "
-"status of the executed program"
-msgstr ""
+msgid "Don't use the simple run script which is usually used to display the exit status of the executed program"
+msgstr "Nie używaj skryptu uruchomieniowego, wykorzystywanego zazwyczaj do wyświetlania statusu końcowego wywołanego programu."
 
 #: ../src/vte.c:875
 msgid "Execute programs in VTE"
 msgstr "Wykonywanie programów we wbudowanym terminalu"
 
 #: ../src/vte.c:876
-#, fuzzy
-msgid ""
-"Run programs in VTE instead of opening a terminal emulation window. Please "
-"note, programs executed in VTE cannot be stopped"
-msgstr ""
-"Uruchamiaj programy we wbudowanym emulatorze terminala (na dole okna "
-"programu Geany) zamiast otwierać nowe osobne okno z terminalalem. Programy "
-"uruchamiane we wbudowanym oknie nie mogą być zatrzymywane."
+msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped"
+msgstr "Uruchom programy w terminalu wirtualnym zamiast w oknie terminala systemowego. Uwaga: działania programu nie można przerwać."
 
-#: ../src/win32.c:161
+#: ../src/win32.c:159
 msgid "Geany project files"
 msgstr "Pliki projektów Geany"
 
-#: ../src/win32.c:167
+#: ../src/win32.c:165
 msgid "Executables"
 msgstr "Pliki wykonywalne"
 
-#: ../plugins/classbuilder.c:40
+# Nazwa własna wtyczki
+#: ../plugins/classbuilder.c:38
 msgid "Class Builder"
-msgstr "Konstruktor klasy"
+msgstr "Class Builder"
 
-#: ../plugins/classbuilder.c:40
+#: ../plugins/classbuilder.c:38
 msgid "Creates source files for new class types."
 msgstr "Tworzy pliki źródłowe dla nowych typów klas"
 
-#: ../plugins/classbuilder.c:442
+#: ../plugins/classbuilder.c:435
 msgid "Create Class"
 msgstr "Utwórz klasę"
 
-#: ../plugins/classbuilder.c:453
-#, fuzzy
+#: ../plugins/classbuilder.c:446
 msgid "Create C++ Class"
-msgstr "Utwórz klasę"
+msgstr "Utwórz klasę C++"
 
-#: ../plugins/classbuilder.c:456
-#, fuzzy
+#: ../plugins/classbuilder.c:449
 msgid "Create GTK+ Class"
-msgstr "Utwórz klasę"
+msgstr "Utwórz klasę GTK+"
 
-#: ../plugins/classbuilder.c:459
-#, fuzzy
+#: ../plugins/classbuilder.c:452
 msgid "Create PHP Class"
-msgstr "Utwórz klasę"
+msgstr "Utwórz klasę PHP"
+
+#: ../plugins/classbuilder.c:469
+msgid "Namespace"
+msgstr "Namespace"
 
 #: ../plugins/classbuilder.c:476
-#, fuzzy
-msgid "Namespace"
-msgstr "Przestrzenie nazw"
-
-#: ../plugins/classbuilder.c:483 ../plugins/classbuilder.c:485
+#: ../plugins/classbuilder.c:478
 msgid "Class"
 msgstr "Klasa"
 
-#: ../plugins/classbuilder.c:492
+#: ../plugins/classbuilder.c:485
 msgid "Header file:"
 msgstr "Plik nagłówkowy:"
 
-#: ../plugins/classbuilder.c:494
+#: ../plugins/classbuilder.c:487
 msgid "Source file:"
 msgstr "Plik źródłowy"
 
-#: ../plugins/classbuilder.c:496
+#: ../plugins/classbuilder.c:489
 msgid "Inheritance"
 msgstr "Dziedziczenie"
 
-#: ../plugins/classbuilder.c:498
+#: ../plugins/classbuilder.c:491
 msgid "Base class:"
 msgstr "Klasa podstawowa:"
 
-#: ../plugins/classbuilder.c:506
-#, fuzzy
+#: ../plugins/classbuilder.c:499
 msgid "Base source:"
-msgstr "Haskell"
+msgstr "Źródło bazowe:"
 
-#: ../plugins/classbuilder.c:511
+#: ../plugins/classbuilder.c:504
 msgid "Base header:"
-msgstr "Nagłówek podstawowy"
+msgstr "Nagłówek podstawowy:"
 
-#: ../plugins/classbuilder.c:519
+#: ../plugins/classbuilder.c:512
 msgid "Global"
 msgstr "Globalne"
 
-#: ../plugins/classbuilder.c:538
+#: ../plugins/classbuilder.c:531
 msgid "Base GType:"
 msgstr "GType podstawowy"
 
-#: ../plugins/classbuilder.c:543
+#: ../plugins/classbuilder.c:536
 msgid "Implements:"
-msgstr ""
+msgstr "Implementuje:"
 
-#: ../plugins/classbuilder.c:545
+#: ../plugins/classbuilder.c:538
 msgid "Options"
 msgstr "Opcje"
 
-#: ../plugins/classbuilder.c:562
+#: ../plugins/classbuilder.c:555
 msgid "Create constructor"
 msgstr "Utwórz konstruktor"
 
-#: ../plugins/classbuilder.c:567
+#: ../plugins/classbuilder.c:560
 msgid "Create destructor"
 msgstr "Utwórz destruktor"
 
-#: ../plugins/classbuilder.c:574
+#: ../plugins/classbuilder.c:567
 msgid "Is abstract"
-msgstr ""
+msgstr "Klasa abstrakcyjna"
 
-#: ../plugins/classbuilder.c:577
-#, fuzzy
+#: ../plugins/classbuilder.c:570
 msgid "Is singleton"
-msgstr "Wzorce singletonu"
+msgstr "Singleton"
 
-#: ../plugins/classbuilder.c:587
-#, fuzzy
+#: ../plugins/classbuilder.c:580
 msgid "Constructor type:"
-msgstr "Typ konstruktora GTK+"
+msgstr "Typ konstruktora:"
 
-#: ../plugins/classbuilder.c:1096
+#: ../plugins/classbuilder.c:1092
 msgid "Create Cla_ss"
 msgstr "Utwó_rz klasę"
 
-#: ../plugins/classbuilder.c:1102
-#, fuzzy
+#: ../plugins/classbuilder.c:1098
 msgid "_C++ Class"
-msgstr "Klasa C++"
+msgstr "Klasa _C++"
 
-#: ../plugins/classbuilder.c:1105
-#, fuzzy
+#: ../plugins/classbuilder.c:1101
 msgid "_GTK+ Class"
-msgstr "Klasa GTK+"
+msgstr "Klasa _GTK+"
 
-#: ../plugins/classbuilder.c:1108
-#, fuzzy
+#: ../plugins/classbuilder.c:1104
 msgid "_PHP Class"
-msgstr "Klasa C++"
+msgstr "Klasa _PHP"
 
-#: ../plugins/htmlchars.c:43
+# Nazwa własna wtyczki, nie tłumaczyć
+#: ../plugins/htmlchars.c:41
 msgid "HTML Characters"
-msgstr "Znaki HTML"
+msgstr "HTML Characters"
 
-#: ../plugins/htmlchars.c:43
+#: ../plugins/htmlchars.c:41
 msgid "Inserts HTML character entities like '&amp;'."
-msgstr "Wstawia znaki HTML."
+msgstr "Wstawia encje HTML (np. '&amp;'')."
 
-#: ../plugins/htmlchars.c:44 ../plugins/export.c:42
-#: ../plugins/filebrowser.c:48 ../plugins/saveactions.c:44
-#: ../plugins/splitwindow.c:37
-#, fuzzy
+#: ../plugins/htmlchars.c:42
+#: ../plugins/export.c:40
+#: ../plugins/filebrowser.c:46
+#: ../plugins/saveactions.c:42
+#: ../plugins/splitwindow.c:35
 msgid "The Geany developer team"
-msgstr "Nazwisko programisty"
+msgstr "Zespół programistów Geany"
 
-#: ../plugins/htmlchars.c:80
+#: ../plugins/htmlchars.c:78
 msgid "HTML characters"
 msgstr "znaki HTML"
 
-#: ../plugins/htmlchars.c:86
+#: ../plugins/htmlchars.c:84
 msgid "ISO 8859-1 characters"
 msgstr "Znaki ISO-8859-1"
 
-#: ../plugins/htmlchars.c:184
+#: ../plugins/htmlchars.c:182
 msgid "Greek characters"
 msgstr "Znaki greckie"
 
-#: ../plugins/htmlchars.c:239
+#: ../plugins/htmlchars.c:237
 msgid "Mathematical characters"
 msgstr "Znaki matematyczne"
 
-#: ../plugins/htmlchars.c:280
+#: ../plugins/htmlchars.c:278
 msgid "Technical characters"
 msgstr "Znaki techniczne"
 
-#: ../plugins/htmlchars.c:288
+#: ../plugins/htmlchars.c:286
 msgid "Arrow characters"
 msgstr "Znaki strzałek"
 
-#: ../plugins/htmlchars.c:301
+#: ../plugins/htmlchars.c:299
 msgid "Punctuation characters"
 msgstr "Znaki interpunkcyjne"
 
-#: ../plugins/htmlchars.c:317
+#: ../plugins/htmlchars.c:315
 msgid "Miscellaneous characters"
 msgstr "Różne znaki"
 
-#: ../plugins/htmlchars.c:372 ../plugins/filebrowser.c:1167
-#: ../plugins/saveactions.c:477
-#, fuzzy
+#: ../plugins/htmlchars.c:370
+#: ../plugins/filebrowser.c:1153
+#: ../plugins/saveactions.c:475
 msgid "Plugin configuration directory could not be created."
-msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)."
+msgstr "Nie można utworzyć katalogu konfiguracyjnego dla wtyczki."
 
-#: ../plugins/htmlchars.c:493
+#: ../plugins/htmlchars.c:491
 msgid "Special Characters"
 msgstr "Znaki specjalne"
 
-#: ../plugins/htmlchars.c:495
+#: ../plugins/htmlchars.c:493
 msgid "_Insert"
 msgstr "Ws_taw"
 
-#: ../plugins/htmlchars.c:504
-msgid ""
-"Choose a special character from the list below and double click on it or use "
-"the button to insert it at the current cursor position."
-msgstr ""
-"Wybierz znak specjalny z poniższej listy i kliknij go lub wciśnij przycisk "
-"\"Wstaw\", aby wstawić znak w bieżącej pozycji kursora"
+#: ../plugins/htmlchars.c:502
+msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position."
+msgstr "Wybierz znak specjalny z listy i dwukrotnie kliknij myszą, lub wciśnij przycisk,by wstawić znak w miejscu kursora."
 
-#: ../plugins/htmlchars.c:518
+#: ../plugins/htmlchars.c:516
 msgid "Character"
 msgstr "Znak"
 
-#: ../plugins/htmlchars.c:524
+#: ../plugins/htmlchars.c:522
 msgid "HTML (name)"
 msgstr "HTML (nazwa)"
 
-#: ../plugins/htmlchars.c:742
+#: ../plugins/htmlchars.c:740
 msgid "_Insert Special HTML Characters"
 msgstr "Znaki specjalne _HTML"
 
 #. Add menuitem for html replacement functions
-#: ../plugins/htmlchars.c:757
-#, fuzzy
+#: ../plugins/htmlchars.c:755
 msgid "_HTML Replacement"
-msgstr "Zastąp"
+msgstr "Zastąp znaki specjalne _HTML"
 
-#: ../plugins/htmlchars.c:764
-#, fuzzy
+#: ../plugins/htmlchars.c:762
 msgid "_Auto-replace Special Characters"
-msgstr "Znaki specjalne"
+msgstr "Za_mień znaki specjalne"
 
-#: ../plugins/htmlchars.c:773
-#, fuzzy
+#: ../plugins/htmlchars.c:771
 msgid "_Replace Characters in Selection"
-msgstr "D_uplikuj wiersz albo zaznaczenie"
+msgstr "_Zamień znaki specjalne w zaznaczeniu"
 
-#: ../plugins/htmlchars.c:788
+#: ../plugins/htmlchars.c:786
 msgid "Insert Special HTML Characters"
 msgstr "Wstaw specjalne znaki HTML"
 
-#: ../plugins/htmlchars.c:791
-#, fuzzy
+#: ../plugins/htmlchars.c:789
 msgid "Replace special characters"
-msgstr "Znaki specjalne"
+msgstr "Zamień znaki specjalne"
 
-#: ../plugins/htmlchars.c:794
-#, fuzzy
+#: ../plugins/htmlchars.c:792
 msgid "Toggle plugin status"
-msgstr "Przełącz komentowanie linii"
+msgstr "Włącz/wyłącz wtyczkę"
 
-#: ../plugins/export.c:41
+# Nazwa własna wtyczki, nie tłumaczyć
+#: ../plugins/export.c:39
 msgid "Export"
-msgstr "Eksportuj"
+msgstr "Export"
 
-#: ../plugins/export.c:41
+#: ../plugins/export.c:39
 msgid "Exports the current file into different formats."
 msgstr "Eksportuje bieżący plik do innego formatu."
 
-#: ../plugins/export.c:173
+#: ../plugins/export.c:171
 msgid "Export File"
 msgstr "Eksportuj plik"
 
-#: ../plugins/export.c:191
-#, fuzzy
+#: ../plugins/export.c:189
 msgid "_Insert line numbers"
-msgstr "_Numery wierszy"
+msgstr "_Wstaw numery wierszy"
 
-#: ../plugins/export.c:193
+#: ../plugins/export.c:191
 msgid "Insert line numbers before each line in the exported document"
-msgstr ""
+msgstr "Poprzedź każdy wiersz jego numerem w eksportowanym dokumencie"
 
-#: ../plugins/export.c:203
+#: ../plugins/export.c:201
 msgid "_Use current zoom level"
 msgstr "Użyj bieżącego powięks_zenia"
 
-#: ../plugins/export.c:205
-#, fuzzy
-msgid ""
-"Renders the font size of the document together with the current zoom level"
-msgstr ""
-"Wyświetla rozmiar czcionki bieżącego dokumentu razem z bieżącym poziomem "
-"powiększenia."
+#: ../plugins/export.c:203
+msgid "Renders the font size of the document together with the current zoom level"
+msgstr "Wyświetla wielkość fontu dla bieżącego dokumentu oraz stopień powiększenia tekstu."
 
-#: ../plugins/export.c:283
+#: ../plugins/export.c:281
 #, c-format
 msgid "Document successfully exported as '%s'."
 msgstr "Dokument został pomyślnie wyeksportowany do '%s'."
 
-#: ../plugins/export.c:285
+#: ../plugins/export.c:283
 #, c-format
 msgid "File '%s' could not be written (%s)."
 msgstr "Plik '%s' nie mógł zostać zapisany (%s)."
 
-#: ../plugins/export.c:335
+#: ../plugins/export.c:333
 #, c-format
 msgid "The file '%s' already exists. Do you want to overwrite it?"
 msgstr "Pliki '%s' już istnieje. Czy chcesz go nadpisać?"
 
-#: ../plugins/export.c:783
+#: ../plugins/export.c:781
 msgid "_Export"
 msgstr "_Eksportuj"
 
 #. HTML
-#: ../plugins/export.c:790
-#, fuzzy
+#: ../plugins/export.c:788
 msgid "As _HTML"
-msgstr "Do HTML"
+msgstr "Jako _HTML"
 
 #. LaTeX
-#: ../plugins/export.c:796
-#, fuzzy
+#: ../plugins/export.c:794
 msgid "As _LaTeX"
-msgstr "Do LateX"
+msgstr "Jako _LaTeX"
 
-#: ../plugins/filebrowser.c:47
-#, fuzzy
+#: ../plugins/filebrowser.c:45
 msgid "File Browser"
-msgstr "Przeglądarka:"
+msgstr "Przeglądarka plików"
 
-#: ../plugins/filebrowser.c:47
+#: ../plugins/filebrowser.c:45
 msgid "Adds a file browser tab to the sidebar."
-msgstr ""
+msgstr "Dodaje kartę przeglądarki plików do panelu bocznego."
 
-#: ../plugins/filebrowser.c:370
+#: ../plugins/filebrowser.c:368
 msgid "Too many items selected!"
-msgstr ""
+msgstr "Zaznaczono zbyt wiele pozycji!"
 
-#: ../plugins/filebrowser.c:446
+#: ../plugins/filebrowser.c:444
 #, c-format
 msgid "Could not execute configured external command '%s' (%s)."
-msgstr ""
+msgstr "Nie udało się wywołać polecenia zewnętrznego '%s' (%s)."
 
-#: ../plugins/filebrowser.c:616
+#: ../plugins/filebrowser.c:614
 msgid "Open _externally"
-msgstr ""
+msgstr "Otwórz z poleceniem z_ewnętrznym"
 
-#: ../plugins/filebrowser.c:641
-#, fuzzy
+#: ../plugins/filebrowser.c:639
 msgid "Show _Hidden Files"
-msgstr "Wyświetlanie _ukrytych plików"
+msgstr "Pokaż _ukryte pliki"
 
-#: ../plugins/filebrowser.c:872
+#: ../plugins/filebrowser.c:870
 msgid "Up"
-msgstr ""
+msgstr "W górę"
 
-#: ../plugins/filebrowser.c:877
+#: ../plugins/filebrowser.c:875
 msgid "Refresh"
-msgstr ""
+msgstr "Odśwież"
 
-#: ../plugins/filebrowser.c:882
+#: ../plugins/filebrowser.c:880
 msgid "Home"
-msgstr ""
+msgstr "Na początek"
 
-#: ../plugins/filebrowser.c:887
-#, fuzzy
+#: ../plugins/filebrowser.c:885
 msgid "Set path from document"
-msgstr "Przejdź do lewego dokumentu"
+msgstr "Pobierz ścieżkę dokumentu"
 
-#: ../plugins/filebrowser.c:897
-#, fuzzy
-msgid "Clear the filter"
-msgstr "Zamyka bieżący plik"
-
-#: ../plugins/filebrowser.c:911
-#, fuzzy
+#: ../plugins/filebrowser.c:899
 msgid "Filter:"
-msgstr "_Plik"
+msgstr "Filtr:"
 
-#: ../plugins/filebrowser.c:922
-msgid ""
-"Filter your files with the usual wildcards. Separate multiple patterns with "
-"a space."
-msgstr ""
+#: ../plugins/filebrowser.c:908
+msgid "Filter your files with the usual wildcards. Separate multiple patterns with a space."
+msgstr "Filtruje pliki za pomocą zwykłych masek. Kolejne maski odzielone spacjami."
 
-#: ../plugins/filebrowser.c:1137
+#: ../plugins/filebrowser.c:1123
 msgid "Focus File List"
-msgstr ""
+msgstr "Focus na liście plików"
 
-#: ../plugins/filebrowser.c:1139
+#: ../plugins/filebrowser.c:1125
 msgid "Focus Path Entry"
-msgstr ""
+msgstr "Focus na polu ścieżki"
 
-#: ../plugins/filebrowser.c:1232
-#, fuzzy
+#: ../plugins/filebrowser.c:1218
 msgid "External open command:"
-msgstr "%s poleceń"
+msgstr "Zewnętrzne polecenie 'otwórz':"
 
-#: ../plugins/filebrowser.c:1240
+#: ../plugins/filebrowser.c:1226
 #, c-format
 msgid ""
-"The command to execute when using \"Open with\". You can use %f and %d "
-"wildcards.\n"
+"The command to execute when using \"Open with\". You can use %f and %d wildcards.\n"
 "%f will be replaced with the filename including full path\n"
-"%d will be replaced with the path name of the selected file without the "
-"filename"
+"%d will be replaced with the path name of the selected file without the filename"
 msgstr ""
+"Polecenie wywoływane za pomocą \"Otwórz z...\". W parametrach %f i %d wolno użyć masek plików.\n"
+"%f zostanie zastąpione nazwą pliku wraz ze ścieżką.\n"
+"%d zostanie zastąpione ścieżką dostępu do pliku."
 
-#: ../plugins/filebrowser.c:1248
-#, fuzzy
+#: ../plugins/filebrowser.c:1234
 msgid "Show hidden files"
-msgstr "Wyświetlanie _ukrytych plików"
+msgstr "Pokaż ukryte pliki"
 
-#: ../plugins/filebrowser.c:1256
-#, fuzzy
+#: ../plugins/filebrowser.c:1242
 msgid "Hide file extensions:"
-msgstr "Według rozszerzenia"
+msgstr "Ukryj rozszerzenia plików"
 
-#: ../plugins/filebrowser.c:1281
-#, fuzzy
+#: ../plugins/filebrowser.c:1267
 msgid "Use the project's base directory"
-msgstr "Utworzyć katalog podstawowy dla projektu?"
+msgstr "Wykorzystaj katalog bazowy projektu"
 
-#: ../plugins/filebrowser.c:1285
-#, fuzzy
-msgid ""
-"Change the directory to the base directory of the currently opened project"
-msgstr "Zapisuje bieżący plik"
+#: ../plugins/filebrowser.c:1271
+msgid "Change the directory to the base directory of the currently opened project"
+msgstr "Zmień katalog na katalog bazowy bieżącego projektu"
 
-#: ../plugins/saveactions.c:43
-#, fuzzy
+#: ../plugins/saveactions.c:41
 msgid "Save Actions"
-msgstr "Sekcje"
+msgstr "Save Actions"
 
-#: ../plugins/saveactions.c:43
+#: ../plugins/saveactions.c:41
 msgid "This plugin provides different actions related to saving of files."
-msgstr ""
+msgstr "Wtyczka automatyzuje rozmaite czynności związane z zapisywaniem plików."
 
-#: ../plugins/saveactions.c:173
-#, fuzzy, c-format
+#: ../plugins/saveactions.c:171
+#, c-format
 msgid "Backup Copy: Directory could not be created (%s)."
-msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)."
+msgstr "Kopia bezpieczeństwa: nie można katalogu (%s)."
 
 #. it's unlikely that this happens
-#: ../plugins/saveactions.c:205
-#, fuzzy, c-format
-msgid "Backup Copy: File could not be read (%s)."
-msgstr "Plik '%s' nie mógł zostać zapisany (%s)."
-
-#: ../plugins/saveactions.c:223
-#, fuzzy, c-format
-msgid "Backup Copy: File could not be saved (%s)."
-msgstr "Proces nie może zostać zatrzymany(%s)."
-
-#: ../plugins/saveactions.c:315
+#: ../plugins/saveactions.c:203
 #, c-format
+msgid "Backup Copy: File could not be read (%s)."
+msgstr "Kopia bezpieczeństwa: nie odczytano pliku (%s)."
+
+#: ../plugins/saveactions.c:221
+#, c-format
+msgid "Backup Copy: File could not be saved (%s)."
+msgstr "Kopia bezpieczeństwa: nie zapisano pliku (%s)."
+
+#: ../plugins/saveactions.c:313
+#, fuzzy, c-format
 msgid "Autosave: Saved %d file automatically."
 msgid_plural "Autosave: Saved %d files automatically."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Autozapis: plik %d zapisany."
+msgstr[1] "Autozapis: pliki %d zapisane."
 
 #. initialize the dialog
-#: ../plugins/saveactions.c:384
-#, fuzzy
+#: ../plugins/saveactions.c:382
 msgid "Select Directory"
-msgstr "Zaznacz bieżące słowo"
+msgstr "Wybierz katalog"
 
-#: ../plugins/saveactions.c:469
+#: ../plugins/saveactions.c:467
 msgid "Backup directory does not exist or is not writable."
-msgstr ""
+msgstr "Katalog dla kopii bezpieczeństwa nie istnieje lub nie ma praw do zapisu"
+
+#: ../plugins/saveactions.c:548
+msgid "Auto Save"
+msgstr "Auto-zapis"
 
 #: ../plugins/saveactions.c:550
-#, fuzzy
-msgid "Auto Save"
-msgstr "Zapisz"
-
-#: ../plugins/saveactions.c:552 ../plugins/saveactions.c:614
-#: ../plugins/saveactions.c:655
-msgid "_Enable"
-msgstr ""
-
-#: ../plugins/saveactions.c:560
-msgid "Auto save _interval:"
-msgstr ""
-
-#: ../plugins/saveactions.c:568
-#, fuzzy
-msgid "seconds"
-msgstr "%s poleceń"
-
-#: ../plugins/saveactions.c:577
-msgid "_Print status message if files have been automatically saved"
-msgstr ""
-
-#: ../plugins/saveactions.c:585
-#, fuzzy
-msgid "Save only current open _file"
-msgstr "Zapisuje bieżący plik"
-
-#: ../plugins/saveactions.c:592
-#, fuzzy
-msgid "Sa_ve all open files"
-msgstr "Zapisuje wszystkie otwarte pliki"
-
 #: ../plugins/saveactions.c:612
-#, fuzzy
-msgid "Instant Save"
-msgstr "Wstaw datę"
-
-#: ../plugins/saveactions.c:622
-#, fuzzy
-msgid "_Filetype to use for newly opened files:"
-msgstr "Ustaw domyślne kodowanie dla nowych plików."
-
 #: ../plugins/saveactions.c:653
+msgid "_Enable"
+msgstr "_Włącz"
+
+#: ../plugins/saveactions.c:558
+msgid "Auto save _interval:"
+msgstr "_Odstęp między kolejnymi auto-zapisami"
+
+#: ../plugins/saveactions.c:566
+msgid "seconds"
+msgstr "sekund"
+
+#: ../plugins/saveactions.c:575
+msgid "_Print status message if files have been automatically saved"
+msgstr "Wyświetl _komunikat po automatycznym zapisie plików"
+
+#: ../plugins/saveactions.c:583
+msgid "Save only current open _file"
+msgstr "Zapisz tylko _bieżący plik"
+
+#: ../plugins/saveactions.c:590
+msgid "Sa_ve all open files"
+msgstr "Zapisz _wszystkie otwarte pliki"
+
+#: ../plugins/saveactions.c:610
+msgid "Instant Save"
+msgstr "Natychmiastowy zapis pliku"
+
+#: ../plugins/saveactions.c:620
+msgid "_Filetype to use for newly opened files:"
+msgstr "Domyślny typ _nowych plików:"
+
+#: ../plugins/saveactions.c:651
 msgid "Backup Copy"
-msgstr ""
+msgstr "Kopia bezpieczeństwa"
 
-#: ../plugins/saveactions.c:663
+#: ../plugins/saveactions.c:661
 msgid "_Directory to save backup files in:"
-msgstr ""
+msgstr "_Katalog dla kopii bezpieczeństwa:"
 
-#: ../plugins/saveactions.c:686
+#: ../plugins/saveactions.c:684
 msgid "Date/_Time format for backup files (\"man strftime\" for details):"
-msgstr ""
+msgstr "Format daty/_czasu dla kopii bezpieczeństwa (szczegóły w \"man strftime\"):"
 
-#: ../plugins/saveactions.c:699
+#: ../plugins/saveactions.c:697
 msgid "Directory _levels to include in the backup destination:"
-msgstr ""
+msgstr "_Podczas robienia kopii bezpieczeństwa uwzględnij podkatalogi do poziomu:"
 
-#: ../plugins/splitwindow.c:36
+# Nazwa własna wtyczki, nie tłumaczyć
+#: ../plugins/splitwindow.c:34
 msgid "Split Window"
-msgstr ""
+msgstr "Split Window"
 
-#: ../plugins/splitwindow.c:36
+#: ../plugins/splitwindow.c:34
 msgid "Splits the editor view into two windows."
-msgstr ""
+msgstr "Dzieli okno na dwie części"
 
-#: ../plugins/splitwindow.c:275
-#, fuzzy
+#: ../plugins/splitwindow.c:273
 msgid "Show the current document"
-msgstr ""
-"Ustawia znaczniki we wszystkich liniach danego dokumentu w których występuje "
-"szukany ciąg"
+msgstr "Pokaż bieżący dokument"
 
-#: ../plugins/splitwindow.c:292 ../plugins/splitwindow.c:426
-#: ../plugins/splitwindow.c:441
+#: ../plugins/splitwindow.c:290
+#: ../plugins/splitwindow.c:424
+#: ../plugins/splitwindow.c:439
 msgid "_Unsplit"
-msgstr ""
+msgstr "_Usuń podział"
 
-#: ../plugins/splitwindow.c:408
+#: ../plugins/splitwindow.c:406
 msgid "_Split Window"
-msgstr ""
+msgstr "_Podziel okno"
 
-#: ../plugins/splitwindow.c:416
-#, fuzzy
+#: ../plugins/splitwindow.c:414
 msgid "_Side by Side"
-msgstr "Ukryj panel boczny"
+msgstr "_Sąsiadująco"
 
-#: ../plugins/splitwindow.c:421
+#: ../plugins/splitwindow.c:419
 msgid "_Top and Bottom"
-msgstr ""
+msgstr "_Góra i dół"
+
+#: ../plugins/splitwindow.c:435
+msgid "Split Horizontally"
+msgstr "Podziel w pionie"
 
 #: ../plugins/splitwindow.c:437
-msgid "Split Horizontally"
-msgstr ""
-
-#: ../plugins/splitwindow.c:439
 msgid "Split Vertically"
-msgstr ""
+msgstr "Podziel w poziomie"
+
+#~ msgid "Clear the filter"
+#~ msgstr "Usuń filtr"
 
 #, fuzzy
 #~ msgid "Clear"
@@ -6068,6 +5724,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Replaced text in %u file."
+
 #~ msgid_plural "Replaced text in %u files."
 #~ msgstr[0] "Zamieniono ciąg w %u plikach."
 #~ msgstr[1] "Zamieniono ciąg w %u plikach."
@@ -6189,34 +5846,30 @@ msgstr ""
 #~ msgstr "Wstawia opis przed bieżącą funkcję"
 
 #~ msgid "Inserts a multiline comment"
-#~ msgstr "Wstawia komentarz dłuższy niż jedna linia"
+#~ msgstr "Wstawia komentarz wielowierszowy"
 
 #~ msgid "Inserts a GPL notice (should be done at the beginning of the file)"
-#~ msgstr "Wstawia notatkę GPL (należy ją wstawiać na początku pliku)"
+#~ msgstr "Wstawia notatkę GPL (należy ją wstawić na początku pliku)"
 
-#, fuzzy
 #~ msgid ""
 #~ "Inserts a BSD license notice (should be done at the beginning of the file)"
 #~ msgstr ""
-#~ "Wstawia informację o licencji BSD (powinna znaleźć się na początku pliku)"
+#~ "Wstawia informację o licencji BSD (należy ją wstawić na początku pliku)"
 
 #~ msgid "Change the default font"
-#~ msgstr "Zmienia domyślną czcionkę"
+#~ msgstr "Zmień domyślną czcionkę"
 
 #~ msgid "Toggle the window with status and compiler messages on and off"
-#~ msgstr "Przełacz okno ze statusem i komunikatami kompilatora"
+#~ msgstr "Wyświetl/ukryj okno statusu i komunikatów kompilatora"
 
 #~ msgid "Toggle the toolbar on and off"
-#~ msgstr "Wyświetla lub ukrywa pasek narzędzi"
+#~ msgstr "Wyświetl/ukryj pasek narzędzi"
 
 #~ msgid "Treat this file as read-only. No changes can be made."
-#~ msgstr ""
-#~ "Przełącza edycję na tryb tylko do odczytu. Nie będzie można dokonać zmian "
-#~ "w pliku"
+#~ msgstr "Tryb 'tylko do odczytu'. Nie można dokonać zmian w pliku."
 
-#, fuzzy
 #~ msgid "Replaces all spaces in the document by tab characters."
-#~ msgstr "Zamienia wszystkie znaki tabulacji na spacje."
+#~ msgstr "Zamienia wszystkie znaki spacji na znaki tabulacji."
 
 #~ msgid "Folds all contractible code blocks"
 #~ msgstr "Zwija wszystkie sekcje kodu"
@@ -6234,7 +5887,7 @@ msgstr ""
 #~ msgstr "Wczytaj plik z globalnym znacznikami"
 
 #~ msgid "Shows a list of all keyboard shortcuts for Geany."
-#~ msgstr "Wyświetla listę skrótów klawiszowych Geany"
+#~ msgstr "Wyświetla listę skrótów klawiaturowych Geany"
 
 #~ msgid "Enter a line number and jump to it."
 #~ msgstr "Tu wpisz numer wiersza, do którego chcesz przejść."
@@ -6275,24 +5928,22 @@ msgstr ""
 #~ msgstr "Wyświetla przyciski |Kompiluj| i |Uruchom| na pasku narzędzi"
 
 #~ msgid "Show Color Chooser button"
-#~ msgstr "Przycisk wyboru koloru"
+#~ msgstr "Pokaż przycisk wyboru koloru"
 
 #~ msgid "Display the Color Chooser button in the toolbar"
 #~ msgstr "Wyświetla przycisk wyboru koloru na pasku narzędzi"
 
 #~ msgid "Show Zoom In and Zoom Out buttons"
-#~ msgstr "|Powiększ|  i  |Pomniejsz|"
+#~ msgstr "Pokaż przyciski Powiększ i Pomniejsz"
 
 #~ msgid "Display the Zoom In and Zoom Out buttons in the toolbar"
-#~ msgstr "Wyświetla przyciski |Powiększ| i |Pomniejsz| na pasku narzędzi"
+#~ msgstr "Wyświetla przyciski Powiększ i Pomniejsz na pasku narzędzi"
 
-#, fuzzy
 #~ msgid "Show Increase and Decrease Indentation buttons"
-#~ msgstr "|Cofnij|  i  |Ponów|"
+#~ msgstr "Pokaż przyciski Zwiększ/Zmniejsz wcięcie"
 
-#, fuzzy
 #~ msgid "Display the Increase and Decrease Indentation buttons in the toolbar"
-#~ msgstr "Wyświetla przycisk |Cofnij| i |Ponów| na pasku narzędzi"
+#~ msgstr "Wyświetla przycisk Zwiększ/Zmniejsz wcięcie na pasku narzędzi"
 
 #~ msgid "Show Search field"
 #~ msgstr "Pola wyszukiwania"
@@ -6301,16 +5952,16 @@ msgstr ""
 #~ msgstr "Wyświetla pole wyszukiwania na pasku narzędzi"
 
 #~ msgid "Show Go to Line field"
-#~ msgstr "Pole skoku do wiersza"
+#~ msgstr "Pokaż pole 'Idź do wiersza'"
 
 #~ msgid "Display the line number field and button in the toolbar"
 #~ msgstr "Wyświetla pole linii wiersza i przycisk na pasku narzędzi"
 
 #~ msgid "Show Quit button"
-#~ msgstr "|Zakończ|"
+#~ msgstr "Pokaż przycisk Zakończ"
 
 #~ msgid "Display the quit button in the toolbar"
-#~ msgstr "Wyświetla przycisk |Zakończ| na pasku narzędzi"
+#~ msgstr "Wyświetla przycisk Zakończ na pasku narzędzi"
 
 #~ msgid "<b>Items</b>"
 #~ msgstr "<b>Widoczne elementy</b>"
@@ -6319,11 +5970,10 @@ msgstr ""
 #~ msgstr "Pracuj w trybie debuggera (wyświetlaj więcej komunikatów)"
 
 #~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Nie można odnaleźć pliku z piksmapą: %s"
+#~ msgstr "Nie odnaleziono pliku z grafiką: %s"
 
-#, fuzzy
 #~ msgid "JavaScript functions"
-#~ msgstr "Javascript"
+#~ msgstr "Funkcje Javascript"
 
 #~ msgid "Structs / Typedefs"
 #~ msgstr "Struktury / definicje typów"
@@ -6335,11 +5985,12 @@ msgstr ""
 #~ "Controls how the terminal emulator should behave. Do not change this "
 #~ "value unless you know exactly what you are doing."
 #~ msgstr ""
-#~ "Określa, w jaki sposób powinien zachowywać się emulator terminala. Nie "
-#~ "zmieniaj tej wartości jeżeli nie wiesz do czego ona służy."
+#~ "Określa sposób zachowania się emulatora terminala. Nie zmieniaj tej "
+#~ "wartości, jeżeli nie wiesz do czego ona służy."
 
 #, fuzzy
 #~ msgid "Found %d matches for \"%s\"."
+
 #~ msgid_plural "Found %d matches for \"%s\"."
 #~ msgstr[0] "Znaleziono %d wyników wyszukiwania ciągu \"%s\"."
 #~ msgstr[1] "Znaleziono %d wyników wyszukiwania ciągu \"%s\"."
@@ -6347,11 +5998,8 @@ msgstr ""
 #~ msgid "Failed to execute the terminal program"
 #~ msgstr "Nie udało się uruchomić programu terminala"
 
-#, fuzzy
 #~ msgid "Whether to use tabs or spaces when indentation is inserted."
-#~ msgstr ""
-#~ "Określa czy przewinąć do końca zawartość terminala kiedy zostanie "
-#~ "wygenerowana nowa zawartość wyjścia"
+#~ msgstr "Używanie spacji lub tabulacji do wcięć"
 
 #, fuzzy
 #~ msgid "Rows of symbol completion list:"
@@ -6399,9 +6047,8 @@ msgstr ""
 #~ msgid "Mixins"
 #~ msgstr "Klasy mieszane"
 
-#, fuzzy
 #~ msgid "C source file"
-#~ msgstr "C#"
+#~ msgstr "C"
 
 #~ msgid "C++ source file"
 #~ msgstr "C++"
@@ -6419,7 +6066,7 @@ msgstr ""
 #~ msgstr "Pascal"
 
 #~ msgid "Assembler source file"
-#~ msgstr "Assembler"
+#~ msgstr "Aassembler"
 
 #~ msgid "FreeBasic source file"
 #~ msgstr "FreeBasic"
@@ -6472,10 +6119,10 @@ msgstr ""
 #~ msgid "Open files"
 #~ msgstr "Otwarte pliki"
 
-#, fuzzy
 #~ msgid "Show open files list"
-#~ msgstr "Wyświetlanie listy otwartych plików"
+#~ msgstr "Pokaż listę otwartych plików"
 
+#, fuzzy
 #~ msgid ""
 #~ "Whenever some whitespace is inserted by Geany it will use tabs when "
 #~ "enabled otherwise Geany will use just spaces."
@@ -6500,14 +6147,14 @@ msgstr ""
 #~ msgstr "Drukuj:"
 
 #~ msgid "Find in files"
-#~ msgstr "Znajdź w plikach"
+#~ msgstr "Szukaj w plikach"
 
 #~ msgid "Go to line"
-#~ msgstr "Przejdź do wiersza"
+#~ msgstr "Idź do wiersza"
 
 #, fuzzy
 #~ msgid "Complete construct"
-#~ msgstr "Utwórz konstruktor"
+#~ msgstr "Uzupełnij konstrukcję"
 
 #~ msgid "Go to tag definition"
 #~ msgstr "Przejdź do definicji znacznika"
@@ -6521,7 +6168,6 @@ msgstr ""
 #~ "Katalog, z którego powinno być wykonywane polecenie \"Zbuduj wszystko\". "
 #~ "Pozostaw to pole puste, aby używać domyślny katalog. "
 
-#, fuzzy
 #~ msgid "Hide"
 #~ msgstr "Ukryj"
 
@@ -6534,4 +6180,4 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Do you want to save all opened files before processing?"
-#~ msgstr "Czy chcesz go zapisać przed zamknięciem programu?"
+#~ msgstr "Czy chcesz zapisać wszystkie otwarte pliki przed kontynuacją?"

From c7639863884e8779c3be765869c84b414cd65ae8 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 30 Oct 2011 12:50:44 +0100
Subject: [PATCH 39/70] Correct ChangeLog entry

---
 po/ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index e4ce6885..9d71d657 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,4 +1,4 @@
-2011-10-31  Frank Lanitz  <frlan@frank.uvena.de>
+2011-10-30  Frank Lanitz  <frlan@frank.uvena.de>
 
  * pl.po: Update of Polish translation. Thanks to Wojciech świderski.
 

From a4194c5a63e255774e134f533653afe503628cea Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 30 Oct 2011 12:51:24 +0100
Subject: [PATCH 40/70] =?UTF-8?q?Move=20Jaros=C5=82aw=20to=20list=20of=20p?=
 =?UTF-8?q?rev.=20Polish=20translators?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/about.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/about.c b/src/about.c
index 63d91204..26999380 100644
--- a/src/about.c
+++ b/src/about.c
@@ -61,7 +61,6 @@ const gchar *translators[][2] = {
 	{ "kk", "Baurzhan Muftakhidinov &lt;baurthefirst@gmail.com&gt;"},
 	{ "lb", "Laurent Hoeltgen &lt;hoeltgman@gmail.com&gt;" },
 	{ "nl", "Peter Scholtens &lt;peter.scholtens@xs4all.nl&gt;\nAyke van Laethem &lt;aykevanlaethem@gmail.com&gt;" },
-	{ "pl_PL", "Jarosław Foksa &lt;jfoksa@gmail.com&gt;" },
 	{ "pt_BR", "Alexandra Moreire &lt;alexandream@gmail.com&gt;\n"
 			   "Adrovane Marques Kade &lt;adrovane@gmail.com&gt;\n"
 			   "Rafael Peregrino da Silva &lt;rperegrino@linuxnewmedia.com.br&gt;"},
@@ -79,7 +78,7 @@ static const gint translators_len = G_N_ELEMENTS(translators);
 
 const gchar *prev_translators[][2] = {
 	{ "es", "Damián Viano &lt;debian@damianv.com.ar&gt;\nNacho Cabanes &lt;ncabanes@gmail.com&gt;" },
-	{ "pl_PL", "Jacek Wolszczak &lt;shutdownrunner@o2.pl&gt;" },
+	{ "pl_PL", "Jacek Wolszczak &lt;shutdownrunner@o2.pl&gt;\nJarosław Foksa &lt;jfoksa@gmail.com&gt;" },
 	{ "nl", "Kurt De Bree &lt;kdebree@telenet.be&gt;" }
 };
 static const gint prev_translators_len = G_N_ELEMENTS(prev_translators);

From e9973cc990fe13d87f94cfa2b807b2db764bf30b Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 30 Oct 2011 12:51:58 +0100
Subject: [PATCH 41/70] Just use pl as language code for Polish translation

---
 src/about.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/about.c b/src/about.c
index 26999380..432c7726 100644
--- a/src/about.c
+++ b/src/about.c
@@ -78,7 +78,7 @@ static const gint translators_len = G_N_ELEMENTS(translators);
 
 const gchar *prev_translators[][2] = {
 	{ "es", "Damián Viano &lt;debian@damianv.com.ar&gt;\nNacho Cabanes &lt;ncabanes@gmail.com&gt;" },
-	{ "pl_PL", "Jacek Wolszczak &lt;shutdownrunner@o2.pl&gt;\nJarosław Foksa &lt;jfoksa@gmail.com&gt;" },
+	{ "pl", "Jacek Wolszczak &lt;shutdownrunner@o2.pl&gt;\nJarosław Foksa &lt;jfoksa@gmail.com&gt;" },
 	{ "nl", "Kurt De Bree &lt;kdebree@telenet.be&gt;" }
 };
 static const gint prev_translators_len = G_N_ELEMENTS(prev_translators);

From 0337b19dcb2aa952c07fb5ceab31dc3fdff48127 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 30 Oct 2011 12:55:09 +0100
Subject: [PATCH 42/70] =?UTF-8?q?Adding=20Wojciech=20=C5=9Awiderski=20to?=
 =?UTF-8?q?=20list=20of=20Polish=20translators?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 THANKS       | 1 +
 po/ChangeLog | 2 +-
 src/about.c  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/THANKS b/THANKS
index 3ec8e36b..898b9617 100644
--- a/THANKS
+++ b/THANKS
@@ -132,6 +132,7 @@ Ayke van Laethem <aykevanlaethem(at)gmail(dot)com> - nl
 Jacek Wolszczak <shutdownrunner(at)o2(dot)pl> - pl_PL
 Jarosław Foksa <jfoksa(at)gmail(dot)com> - pl_PL
 Krzysztof Troska <elleander86(at)gmail(dot)com> - pl_PL
+Wojciech Świderski <woj.swiderski@gmail.com> - pl_PL
 Alexandre Moreira <alexandream(at)gmail(dot)com> - pt_BR
 Adrovane Marques Kade <adrovane(at)gmail(dot)com> - pt_BR
 Rafael Peregrino da Silva <rperegrino(at)linuxnewmedia(dot)com(dot)br - pt_BR
diff --git a/po/ChangeLog b/po/ChangeLog
index 9d71d657..723c9659 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,6 +1,6 @@
 2011-10-30  Frank Lanitz  <frlan@frank.uvena.de>
 
- * pl.po: Update of Polish translation. Thanks to Wojciech świderski.
+ * pl.po: Update of Polish translation. Thanks to Wojciech Świderski.
 
 
 2011-10-06  Frank Lanitz  <frlan@frank.uvena.de>
diff --git a/src/about.c b/src/about.c
index 432c7726..937c6c21 100644
--- a/src/about.c
+++ b/src/about.c
@@ -61,6 +61,7 @@ const gchar *translators[][2] = {
 	{ "kk", "Baurzhan Muftakhidinov &lt;baurthefirst@gmail.com&gt;"},
 	{ "lb", "Laurent Hoeltgen &lt;hoeltgman@gmail.com&gt;" },
 	{ "nl", "Peter Scholtens &lt;peter.scholtens@xs4all.nl&gt;\nAyke van Laethem &lt;aykevanlaethem@gmail.com&gt;" },
+	{ "pl", "Wojciech Świderski &lt;woj.swiderski@gmail.com&gt;"},
 	{ "pt_BR", "Alexandra Moreire &lt;alexandream@gmail.com&gt;\n"
 			   "Adrovane Marques Kade &lt;adrovane@gmail.com&gt;\n"
 			   "Rafael Peregrino da Silva &lt;rperegrino@linuxnewmedia.com.br&gt;"},

From 36ebb1f2b70f35dd802e98a628df070cff4f4d09 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sun, 30 Oct 2011 22:01:49 +0100
Subject: [PATCH 43/70] Use canonical macros for stock items rather than plain
 strings

This makes the code more readable, potentially more future-proof (if
the actual string changes) and better style (catches possible typos at
build-time).
---
 plugins/saveactions.c |  2 +-
 src/build.c           |  8 ++++----
 src/gb.c              | 12 ++++++------
 src/msgwindow.c       |  6 +++---
 src/project.c         |  4 ++--
 src/search.c          |  2 +-
 src/sidebar.c         |  8 ++++----
 src/ui_utils.c        |  2 +-
 src/vte.c             | 10 +++++-----
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/plugins/saveactions.c b/plugins/saveactions.c
index 07e87d57..8ac3c0a2 100644
--- a/plugins/saveactions.c
+++ b/plugins/saveactions.c
@@ -671,7 +671,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 		g_signal_connect(button, "clicked",
 			G_CALLBACK(backupcopy_dir_button_clicked_cb), entry_dir);
 
-		image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON);
+		image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
 		gtk_container_add(GTK_CONTAINER(button), image);
 
 		hbox = gtk_hbox_new(FALSE, 6);
diff --git a/src/build.c b/src/build.c
index e9bed765..8540620a 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1627,21 +1627,21 @@ static void set_stop_button(gboolean stop)
 	if (run_button != NULL)
 		button_stock_id = gtk_tool_button_get_stock_id(run_button);
 
-	if (stop && utils_str_equal(button_stock_id, "gtk-stop"))
+	if (stop && utils_str_equal(button_stock_id, GTK_STOCK_STOP))
 		return;
-	if (! stop && utils_str_equal(button_stock_id, "gtk-execute"))
+	if (! stop && utils_str_equal(button_stock_id, GTK_STOCK_EXECUTE))
 		return;
 
 	 /* use the run button also as stop button  */
 	if (stop)
 	{
 		if (run_button != NULL)
-			gtk_tool_button_set_stock_id(run_button, "gtk-stop");
+			gtk_tool_button_set_stock_id(run_button, GTK_STOCK_STOP);
 	}
 	else
 	{
 		if (run_button != NULL)
-			gtk_tool_button_set_stock_id(run_button, "gtk-execute");
+			gtk_tool_button_set_stock_id(run_button, GTK_STOCK_EXECUTE);
 	}
 }
 
diff --git a/src/gb.c b/src/gb.c
index 08c41254..b8c48093 100644
--- a/src/gb.c
+++ b/src/gb.c
@@ -90,15 +90,15 @@ static void create_window(GtkWindow *parent)
 	gtk_box_pack_start(GTK_BOX(vbox1), hbox1, TRUE, FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 
-	image1 = gtk_image_new_from_stock("gtk-cancel", GTK_ICON_SIZE_BUTTON);
+	image1 = gtk_image_new_from_stock(GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show(image1);
 	gtk_box_pack_start(GTK_BOX(hbox1), image1, TRUE, FALSE, 0);
 
-	image2 = gtk_image_new_from_stock("gtk-cancel", GTK_ICON_SIZE_BUTTON);
+	image2 = gtk_image_new_from_stock(GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show(image2);
 	gtk_box_pack_start(GTK_BOX(hbox1), image2, TRUE, FALSE, 0);
 
-	image3 = gtk_image_new_from_stock("gtk-cancel", GTK_ICON_SIZE_BUTTON);
+	image3 = gtk_image_new_from_stock(GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON);
 	gtk_widget_set_name(image3, "image3");
 	gtk_widget_show(image3);
 	gtk_box_pack_start(GTK_BOX(hbox1), image3, TRUE, FALSE, 0);
@@ -127,12 +127,12 @@ static void create_window(GtkWindow *parent)
 	gtk_box_set_homogeneous(GTK_BOX(hbox2), TRUE);
 	gtk_box_pack_start(GTK_BOX(vbox1), hbox2, TRUE, FALSE, 0);
 
-	button4 = gtk_button_new_from_stock("gtk-help");
+	button4 = gtk_button_new_from_stock(GTK_STOCK_HELP);
 	gtk_widget_show(button4);
 	gtk_box_pack_start(GTK_BOX(hbox2), button4, FALSE, FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(button4), 5);
 
-	button5 = gtk_button_new_from_stock("gtk-close");
+	button5 = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
 	gtk_widget_show(button5);
 	gtk_box_pack_start(GTK_BOX(hbox2), button5, FALSE, FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(button5), 5);
@@ -188,7 +188,7 @@ static GtkWidget *create_help_dialog(GtkWindow *parent)
 	gtk_widget_show(dialog_action_area1);
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area1), GTK_BUTTONBOX_END);
 
-	okbutton1 = gtk_button_new_from_stock("gtk-ok");
+	okbutton1 = gtk_button_new_from_stock(GTK_STOCK_OK);
 	gtk_widget_show(okbutton1);
 	gtk_dialog_add_action_widget(GTK_DIALOG(help_dialog), okbutton1, GTK_RESPONSE_OK);
 	GTK_WIDGET_SET_FLAGS(okbutton1, GTK_CAN_DEFAULT);
diff --git a/src/msgwindow.c b/src/msgwindow.c
index 59518671..e009730a 100644
--- a/src/msgwindow.c
+++ b/src/msgwindow.c
@@ -547,7 +547,7 @@ static GtkWidget *create_message_popup_menu(gint type)
 
 	message_popup_menu = gtk_menu_new();
 
-	clear = gtk_image_menu_item_new_from_stock("gtk-clear", NULL);
+	clear = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL);
 	gtk_widget_show(clear);
 	gtk_container_add(GTK_CONTAINER(message_popup_menu), clear);
 	g_signal_connect(clear, "activate",
@@ -556,7 +556,7 @@ static GtkWidget *create_message_popup_menu(gint type)
 	copy = gtk_image_menu_item_new_with_mnemonic(_("C_opy"));
 	gtk_widget_show(copy);
 	gtk_container_add(GTK_CONTAINER(message_popup_menu), copy);
-	image = gtk_image_new_from_stock("gtk-copy", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_stock(GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy), image);
 	g_signal_connect(copy, "activate",
@@ -565,7 +565,7 @@ static GtkWidget *create_message_popup_menu(gint type)
 	copy_all = gtk_image_menu_item_new_with_mnemonic(_("Copy _All"));
 	gtk_widget_show(copy_all);
 	gtk_container_add(GTK_CONTAINER(message_popup_menu), copy_all);
-	image = gtk_image_new_from_stock("gtk-copy", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_stock(GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy_all), image);
 	g_signal_connect(copy_all, "activate",
diff --git a/src/project.c b/src/project.c
index 6cb87866..4a98ae1e 100644
--- a/src/project.c
+++ b/src/project.c
@@ -120,7 +120,7 @@ void project_new(void)
 	gtk_widget_set_name(e->dialog, "GeanyDialogProject");
 	bbox = gtk_hbox_new(FALSE, 0);
 	button = gtk_button_new();
-	image = gtk_image_new_from_stock("gtk-new", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_stock(GTK_STOCK_NEW, GTK_ICON_SIZE_BUTTON);
 	label = gtk_label_new_with_mnemonic(_("C_reate"));
 	gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 3);
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 3);
@@ -152,7 +152,7 @@ void project_new(void)
 	gtk_entry_set_width_chars(GTK_ENTRY(e->file_name), 30);
 	button = gtk_button_new();
 	g_signal_connect(button, "clicked", G_CALLBACK(on_file_save_button_clicked), e);
-	image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
 	gtk_container_add(GTK_CONTAINER(button), image);
 	bbox = gtk_hbox_new(FALSE, 6);
 	gtk_box_pack_start_defaults(GTK_BOX(bbox), e->file_name);
diff --git a/src/search.c b/src/search.c
index 315eb81d..cd95a450 100644
--- a/src/search.c
+++ b/src/search.c
@@ -874,7 +874,7 @@ static void create_fif_dialog(void)
 	gtk_box_set_spacing(GTK_BOX(vbox), 9);
 	gtk_widget_set_name(fif_dlg.dialog, "GeanyDialogSearch");
 
-	gtk_dialog_add_button(GTK_DIALOG(fif_dlg.dialog), "gtk-find", GTK_RESPONSE_ACCEPT);
+	gtk_dialog_add_button(GTK_DIALOG(fif_dlg.dialog), GTK_STOCK_FIND, GTK_RESPONSE_ACCEPT);
 	gtk_dialog_set_default_response(GTK_DIALOG(fif_dlg.dialog),
 		GTK_RESPONSE_ACCEPT);
 
diff --git a/src/sidebar.c b/src/sidebar.c
index cbdd1b9e..c2a14ba8 100644
--- a/src/sidebar.c
+++ b/src/sidebar.c
@@ -597,7 +597,7 @@ void sidebar_add_common_menu_items(GtkMenu *menu)
 
 	item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
-		gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU));
+		gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect(item, "activate", G_CALLBACK(on_hide_sidebar), NULL);
@@ -658,7 +658,7 @@ static void create_openfiles_popup_menu(void)
 
 	openfiles_popup_menu = gtk_menu_new();
 
-	item = gtk_image_menu_item_new_from_stock("gtk-close", NULL);
+	item = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLOSE, NULL);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item);
 	g_signal_connect(item, "activate",
@@ -669,7 +669,7 @@ static void create_openfiles_popup_menu(void)
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item);
 
-	item = gtk_image_menu_item_new_from_stock("gtk-save", NULL);
+	item = gtk_image_menu_item_new_from_stock(GTK_STOCK_SAVE, NULL);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item);
 	g_signal_connect(item, "activate",
@@ -678,7 +678,7 @@ static void create_openfiles_popup_menu(void)
 
 	item = gtk_image_menu_item_new_with_mnemonic(_("_Reload"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
-		gtk_image_new_from_stock("gtk-revert-to-saved", GTK_ICON_SIZE_MENU));
+		gtk_image_new_from_stock(GTK_STOCK_REVERT_TO_SAVED, GTK_ICON_SIZE_MENU));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item);
 	g_signal_connect(item, "activate",
diff --git a/src/ui_utils.c b/src/ui_utils.c
index e4f1b014..c1d9237b 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1427,7 +1427,7 @@ static void entry_clear_icon_release_cb(GtkEntry *entry, gint icon_pos,
  */
 void ui_entry_add_clear_icon(GtkEntry *entry)
 {
-	g_object_set(entry, "secondary-icon-stock", "gtk-clear", NULL);
+	g_object_set(entry, "secondary-icon-stock", GTK_STOCK_CLEAR, NULL);
 	g_signal_connect(entry, "icon-release", G_CALLBACK(entry_clear_icon_release_cb), NULL);
 }
 
diff --git a/src/vte.c b/src/vte.c
index 9bf7c624..e357b039 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -515,14 +515,14 @@ static GtkWidget *vte_create_popup_menu(void)
 	accel_group = gtk_accel_group_new();
 	gtk_window_add_accel_group(GTK_WINDOW(main_widgets.window), accel_group);
 
-	item = gtk_image_menu_item_new_from_stock("gtk-copy", NULL);
+	item = gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, NULL);
 	gtk_widget_add_accelerator(item, "activate", accel_group,
 		GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_COPY));
 
-	item = gtk_image_menu_item_new_from_stock("gtk-paste", NULL);
+	item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, NULL);
 	gtk_widget_add_accelerator(item, "activate", accel_group,
 		GDK_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE);
 	gtk_widget_show(item);
@@ -533,7 +533,7 @@ static GtkWidget *vte_create_popup_menu(void)
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
-	item = gtk_image_menu_item_new_from_stock("gtk-select-all", NULL);
+	item = gtk_image_menu_item_new_from_stock(GTK_STOCK_SELECT_ALL, NULL);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_SELECTALL));
@@ -556,7 +556,7 @@ static GtkWidget *vte_create_popup_menu(void)
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
-	item = gtk_image_menu_item_new_from_stock("gtk-preferences", NULL);
+	item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PREFERENCES));
@@ -836,7 +836,7 @@ void vte_append_preferences_tab(void)
 					(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 					(GtkAttachOptions) (0), 0, 0);
 
-		image_shell = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON);
+		image_shell = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
 		gtk_widget_show(image_shell);
 		gtk_container_add(GTK_CONTAINER(button_shell), image_shell);
 

From 274e01f5551c52374e49eb44690d3b5a665f2b21 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sun, 30 Oct 2011 22:52:29 +0100
Subject: [PATCH 44/70] Fix various coding style issues

---
 src/symbols.c  |  6 +++---
 src/ui_utils.c | 31 ++++++++++++++-----------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/symbols.c b/src/symbols.c
index 4048fc3c..8b1b7f94 100644
--- a/src/symbols.c
+++ b/src/symbols.c
@@ -2115,7 +2115,7 @@ static void on_symbol_tree_menu_show(GtkWidget *widget,
 
 static void on_expand_collapse(GtkWidget *widget, gpointer user_data)
 {
-	gboolean expand = utils_str_equal(user_data, GTK_STOCK_ADD);
+	gboolean expand = GPOINTER_TO_INT(user_data);
 	GeanyDocument *doc = document_get_current();
 
 	if (! doc)
@@ -2139,12 +2139,12 @@ static void create_taglist_popup_menu(void)
 	symbol_menu.expand_all = item = ui_image_menu_item_new(GTK_STOCK_ADD, _("_Expand All"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(on_expand_collapse), (gpointer)GTK_STOCK_ADD);
+	g_signal_connect(item, "activate", G_CALLBACK(on_expand_collapse), GINT_TO_POINTER(TRUE));
 
 	symbol_menu.collapse_all = item = ui_image_menu_item_new(GTK_STOCK_REMOVE, _("_Collapse All"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(on_expand_collapse), (gpointer)GTK_STOCK_REMOVE);
+	g_signal_connect(item, "activate", G_CALLBACK(on_expand_collapse), GINT_TO_POINTER(FALSE));
 
 	item = gtk_separator_menu_item_new();
 	gtk_widget_show(item);
diff --git a/src/ui_utils.c b/src/ui_utils.c
index c1d9237b..fb24243a 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1292,12 +1292,11 @@ static void update_recent_menu(GeanyRecentFiles *grf)
 
 void ui_toggle_editor_features(GeanyUIEditorFeatures feature)
 {
-	gint i, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
-	GeanyDocument *doc;
+	guint i;
 
-	for (i = 0; i < max; i++)
+	foreach_document (i)
 	{
-		doc = document_get_from_page(i);
+		GeanyDocument *doc = documents[i];
 
 		switch (feature)
 		{
@@ -1718,7 +1717,7 @@ void ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title,
 	if (title)
 		g_object_set_data_full(G_OBJECT(open_btn), "title", g_strdup(title),
 				(GDestroyNotify) g_free);
-	g_object_set_data(G_OBJECT(open_btn), "action", (gpointer) action);
+	g_object_set_data(G_OBJECT(open_btn), "action", GINT_TO_POINTER(action));
 	ui_hookup_widget(open_btn, path_entry, "entry");
 	g_signal_connect(open_btn, "clicked", G_CALLBACK(ui_path_box_open_clicked), open_btn);
 }
@@ -1766,10 +1765,8 @@ static gchar *run_file_chooser(const gchar *title, GtkFileChooserAction action,
 static void ui_path_box_open_clicked(GtkButton *button, gpointer user_data)
 {
 	GtkWidget *path_box = GTK_WIDGET(user_data);
-	GtkFileChooserAction action =
-		(GtkFileChooserAction) g_object_get_data(G_OBJECT(path_box), "action");
-	GtkEntry *entry =
-		(GtkEntry *) g_object_get_data(G_OBJECT(path_box), "entry");
+	GtkFileChooserAction action = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(path_box), "action"));
+	GtkEntry *entry = g_object_get_data(G_OBJECT(path_box), "entry");
 	const gchar *title = g_object_get_data(G_OBJECT(path_box), "title");
 	gchar *utf8_path = NULL;
 
@@ -1832,7 +1829,7 @@ void ui_statusbar_showhide(gboolean state)
 void ui_table_add_row(GtkTable *table, gint row, ...)
 {
 	va_list args;
-	gint i;
+	guint i;
 	GtkWidget *widget;
 
 	va_start(args, row);
@@ -1935,7 +1932,7 @@ void ui_init_stock_items(void)
 	GtkIconSet *icon_set;
 	GtkIconFactory *factory = gtk_icon_factory_new();
 	GdkPixbuf *pb;
-	gsize i, len;
+	guint i, len;
 	GtkStockItem items[] =
 	{
 		{ GEANY_STOCK_SAVE_ALL, N_("Save All"), 0, 0, GETTEXT_PACKAGE },
@@ -2251,7 +2248,7 @@ GtkWidget *ui_lookup_widget(GtkWidget *widget, const gchar *widget_name)
 
 
 /* Progress Bar */
-static guint progress_bar_timer_id = (guint) -1;
+static guint progress_bar_timer_id = 0;
 
 
 static GtkWidget *progress_bar_create(void)
@@ -2294,7 +2291,7 @@ static gboolean progress_bar_pulse(gpointer data)
  **/
 void ui_progress_bar_start(const gchar *text)
 {
-	g_return_if_fail(progress_bar_timer_id == (guint) -1);
+	g_return_if_fail(progress_bar_timer_id == 0);
 
 	if (! interface_prefs.statusbar_visible)
 		return;
@@ -2315,10 +2312,10 @@ void ui_progress_bar_stop(void)
 {
 	gtk_widget_hide(GTK_WIDGET(main_widgets.progressbar));
 
-	if (progress_bar_timer_id != (guint) -1)
+	if (progress_bar_timer_id != 0)
 	{
 		g_source_remove(progress_bar_timer_id);
-		progress_bar_timer_id = (guint) -1;
+		progress_bar_timer_id = 0;
 	}
 }
 
@@ -2422,7 +2419,7 @@ void ui_menu_add_document_items_sorted(GtkMenu *menu, GeanyDocument *active,
 	gchar *base_name, *label;
 	GPtrArray *sorted_documents;
 
-	len = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
+	len = (guint) gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
 
 	sorted_documents = g_ptr_array_sized_new(len);
 	/* copy the documents_array into the new one */
@@ -2507,7 +2504,7 @@ void ui_editable_insert_text_callback(GtkEditable *editable, gchar *new_text,
 	gint i;
 
 	if (new_text_len == -1)
-		new_text_len = strlen(new_text);
+		new_text_len = (gint) strlen(new_text);
 
 	for (i = 0; i < new_text_len; i++, new_text++)
 	{

From af838cda7b9a40c677437bd1828c31491f5c0f89 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sun, 30 Oct 2011 23:11:04 +0100
Subject: [PATCH 45/70] Allow to expand or collapse all items from openfiles
 popup menu

This is useful if one have many open files from different directories
and wants to see the files from only one or another.
---
 src/sidebar.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/sidebar.c b/src/sidebar.c
index c2a14ba8..180fc143 100644
--- a/src/sidebar.c
+++ b/src/sidebar.c
@@ -57,8 +57,10 @@ static struct
 	GtkWidget *reload;
 	GtkWidget *show_paths;
 	GtkWidget *find_in_files;
+	GtkWidget *expand_all;
+	GtkWidget *collapse_all;
 }
-doc_items = {NULL, NULL, NULL, NULL, NULL};
+doc_items = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 
 enum
 {
@@ -652,6 +654,17 @@ static void on_find_in_files(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 
+static void on_openfiles_expand_collapse(GtkMenuItem *menuitem, gpointer user_data)
+{
+	gboolean expand = GPOINTER_TO_INT(user_data);
+
+	if (expand)
+		gtk_tree_view_expand_all(GTK_TREE_VIEW(tv.tree_openfiles));
+	else
+		gtk_tree_view_collapse_all(GTK_TREE_VIEW(tv.tree_openfiles));
+}
+
+
 static void create_openfiles_popup_menu(void)
 {
 	GtkWidget *item;
@@ -706,6 +719,22 @@ static void create_openfiles_popup_menu(void)
 	g_signal_connect(doc_items.show_paths, "activate",
 			G_CALLBACK(on_openfiles_show_paths_activate), NULL);
 
+	item = gtk_separator_menu_item_new();
+	gtk_widget_show(item);
+	gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item);
+
+	doc_items.expand_all = ui_image_menu_item_new(GTK_STOCK_ADD, _("_Expand All"));
+	gtk_widget_show(doc_items.expand_all);
+	gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), doc_items.expand_all);
+	g_signal_connect(doc_items.expand_all, "activate",
+					 G_CALLBACK(on_openfiles_expand_collapse), GINT_TO_POINTER(TRUE));
+
+	doc_items.collapse_all = ui_image_menu_item_new(GTK_STOCK_REMOVE, _("_Collapse All"));
+	gtk_widget_show(doc_items.collapse_all);
+	gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), doc_items.collapse_all);
+	g_signal_connect(doc_items.collapse_all, "activate",
+					 G_CALLBACK(on_openfiles_expand_collapse), GINT_TO_POINTER(FALSE));
+
 	sidebar_add_common_menu_items(GTK_MENU(openfiles_popup_menu));
 }
 
@@ -996,8 +1025,9 @@ static void documents_menu_update(GtkTreeSelection *selection)
 	gtk_widget_set_sensitive(doc_items.find_in_files, sel);
 	g_free(shortname);
 
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths),
-		documents_show_paths);
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths), documents_show_paths);
+	gtk_widget_set_sensitive(doc_items.expand_all, documents_show_paths);
+	gtk_widget_set_sensitive(doc_items.collapse_all, documents_show_paths);
 }
 
 

From b69198691aa7b2a8a0d759aab10f64292b3e75b1 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Mon, 31 Oct 2011 16:47:18 +0000
Subject: [PATCH 46/70] Add utils_filenamecmp().

---
 src/document.c | 11 ++---------
 src/utils.h    |  7 +++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/document.c b/src/document.c
index 2e7bfc1c..88cb3d73 100644
--- a/src/document.c
+++ b/src/document.c
@@ -104,13 +104,6 @@ static void document_redo_add(GeanyDocument *doc, guint type, gpointer data);
 static gboolean update_tags_from_buffer(GeanyDocument *doc);
 
 
-/* ignore the case of filenames and paths under WIN32, causes errors if not */
-#ifdef G_OS_WIN32
-#define filenamecmp(a, b)	utils_str_casecmp((a), (b))
-#else
-#define filenamecmp(a, b)	strcmp((a), (b))
-#endif
-
 /**
  * Finds a document whose @c real_path field matches the given filename.
  *
@@ -138,7 +131,7 @@ GeanyDocument* document_find_by_real_path(const gchar *realname)
 		if (! doc->is_valid || ! doc->real_path)
 			continue;
 
-		if (filenamecmp(realname, doc->real_path) == 0)
+		if (utils_filenamecmp(realname, doc->real_path) == 0)
 		{
 			return doc;
 		}
@@ -186,7 +179,7 @@ GeanyDocument *document_find_by_filename(const gchar *utf8_filename)
 		if (! doc->is_valid || doc->file_name == NULL)
 			continue;
 
-		if (filenamecmp(utf8_filename, doc->file_name) == 0)
+		if (utils_filenamecmp(utf8_filename, doc->file_name) == 0)
 		{
 			return doc;
 		}
diff --git a/src/utils.h b/src/utils.h
index 07306ce1..89524207 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -62,6 +62,13 @@
 		utils_get_setting_##type(home, group, key, default_val) :\
 		utils_get_setting_##type(sys, group, key, default_val)
 
+/* ignore the case of filenames and paths under WIN32, causes errors if not */
+#ifdef G_OS_WIN32
+#define utils_filenamecmp(a, b)	utils_str_casecmp((a), (b))
+#else
+#define utils_filenamecmp(a, b)	strcmp((a), (b))
+#endif
+
 
 /** Iterates all the items in @a array using pointers.
  * @param item pointer to an item in @a array.

From 42b3e7212a21a7518c65b088e436699085111783 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Mon, 31 Oct 2011 16:48:52 +0000
Subject: [PATCH 47/70] Fix document list path comparison on Windows

Use case-insensitive matching for project base path and home
directory in document filenames.
---
 src/sidebar.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/sidebar.c b/src/sidebar.c
index 180fc143..c6ed41c6 100644
--- a/src/sidebar.c
+++ b/src/sidebar.c
@@ -343,6 +343,16 @@ static gboolean find_tree_iter_dir(GtkTreeIter *iter, const gchar *dir)
 }
 
 
+static gboolean utils_filename_has_prefix(const gchar *str, const gchar *prefix)
+{
+	gchar *head = g_strndup(str, strlen(prefix));
+	gint ret = utils_filenamecmp(head, prefix);
+
+	g_free(head);
+	return ret == 0;
+}
+
+
 static gchar *get_doc_folder(const gchar *path)
 {
 	gchar *tmp_dirname = g_strdup(path);
@@ -362,7 +372,7 @@ static gchar *get_doc_folder(const gchar *path)
 			project_base_path[len-1] = '\0';
 
 		/* check whether the dir name matches or uses the project base path */
-		if (g_str_has_prefix(tmp_dirname, project_base_path))
+		if (utils_filename_has_prefix(tmp_dirname, project_base_path))
 		{
 			rest = tmp_dirname + len;
 			if (*rest == G_DIR_SEPARATOR || *rest == '\0')
@@ -377,7 +387,7 @@ static gchar *get_doc_folder(const gchar *path)
 		dirname = tmp_dirname;
 
 		/* If matches home dir, replace with tilde */
-		if (home_dir && *home_dir != 0 && g_str_has_prefix(dirname, home_dir))
+		if (NZV(home_dir) && utils_filename_has_prefix(dirname, home_dir))
 		{
 			rest = dirname + strlen(home_dir);
 			if (*rest == G_DIR_SEPARATOR || *rest == '\0')

From fdd5537cc0fcdb0e0ce1a5f58d2e08647436b847 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Mon, 31 Oct 2011 17:22:39 +0000
Subject: [PATCH 48/70] Use g_return_val_if_fail for some invalid NULL
 arguments

---
 src/document.c | 6 +-----
 src/utils.c    | 9 +++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/document.c b/src/document.c
index 88cb3d73..1b03ded1 100644
--- a/src/document.c
+++ b/src/document.c
@@ -1134,11 +1134,7 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename
 	else
 	{
 		/* filename must not be NULL when opening a file */
-		if (filename == NULL)
-		{
-			ui_set_statusbar(FALSE, _("Invalid filename"));
-			return NULL;
-		}
+		g_return_val_if_fail(filename, NULL);
 
 #ifdef G_OS_WIN32
 		/* if filename is a shortcut, try to resolve it */
diff --git a/src/utils.c b/src/utils.c
index 9b9a71a4..fcd759f9 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -795,8 +795,7 @@ gint utils_get_setting_integer(GKeyFile *config, const gchar *section, const gch
 	gint tmp;
 	GError *error = NULL;
 
-	if (G_UNLIKELY(config == NULL))
-		return default_value;
+	g_return_val_if_fail(config, default_value);
 
 	tmp = g_key_file_get_integer(config, section, key, &error);
 	if (error)
@@ -826,8 +825,7 @@ gboolean utils_get_setting_boolean(GKeyFile *config, const gchar *section, const
 	gboolean tmp;
 	GError *error = NULL;
 
-	if (G_UNLIKELY(config == NULL))
-		return default_value;
+	g_return_val_if_fail(config, default_value);
 
 	tmp = g_key_file_get_boolean(config, section, key, &error);
 	if (error)
@@ -856,8 +854,7 @@ gchar *utils_get_setting_string(GKeyFile *config, const gchar *section, const gc
 {
 	gchar *tmp;
 
-	if (G_UNLIKELY(config == NULL))
-		return g_strdup(default_value);
+	g_return_val_if_fail(config, g_strdup(default_value));
 
 	tmp = g_key_file_get_string(config, section, key, NULL);
 	if (!tmp)

From 5f0e46e07e3deaf5543b9920ae092711a31f6445 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Tue, 1 Nov 2011 13:27:00 +0000
Subject: [PATCH 49/70] Fix finding paths in the document list on Windows

Finding paths in the tree was not case-insensitive either.
---
 src/sidebar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sidebar.c b/src/sidebar.c
index c6ed41c6..37f85767 100644
--- a/src/sidebar.c
+++ b/src/sidebar.c
@@ -336,7 +336,7 @@ static gboolean find_tree_iter_dir(GtkTreeIter *iter, const gchar *dir)
 
 	gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_SHORTNAME, &name, -1);
 
-	result = utils_str_equal(name, dir);
+	result = utils_filenamecmp(name, dir) == 0;
 	g_free(name);
 
 	return result;
@@ -346,10 +346,10 @@ static gboolean find_tree_iter_dir(GtkTreeIter *iter, const gchar *dir)
 static gboolean utils_filename_has_prefix(const gchar *str, const gchar *prefix)
 {
 	gchar *head = g_strndup(str, strlen(prefix));
-	gint ret = utils_filenamecmp(head, prefix);
+	gboolean ret = utils_filenamecmp(head, prefix) == 0;
 
 	g_free(head);
-	return ret == 0;
+	return ret;
 }
 
 

From 13597df9dffdcbd3091aac224d20b1924c563bde Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Tue, 1 Nov 2011 15:46:11 +0000
Subject: [PATCH 50/70] Convert Unix path separators on Windows when opening
 documents

Unix path separators can occur e.g. when using MSYS.
Windows does not allow filenames to contain Unix path separators so
this should be safe.
---
 src/utils.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/utils.c b/src/utils.c
index fcd759f9..8cf48eda 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1903,6 +1903,10 @@ void utils_tidy_path(gchar *filename)
 	if (str->len >= 2 && strncmp(str->str, "\\\\", 2) == 0)
 		preserve_double_backslash = TRUE;
 
+#ifdef G_OS_WIN32
+	/* using MSYS we can get Unix-style separators */
+	utils_string_replace_all(str, "/", G_DIR_SEPARATOR_S);
+#endif
 	/* replace "/./" and "//" */
 	utils_string_replace_all(str, G_DIR_SEPARATOR_S "." G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
 	utils_string_replace_all(str, G_DIR_SEPARATOR_S G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);

From f31a84869d45980a7ecb27f5a4d6c3588c547eee Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Tue, 1 Nov 2011 16:07:52 +0000
Subject: [PATCH 51/70] Minor code cleanup for document_update_type_keywords()

Fix correctly checking result of editor_lexer_get_type_keyword_idx().
Do not check IS_SCINTILLA unnecessarily (this is covered by DOC_VALID).
Do not use G_[UN]LIKELY macros as this complicates code without any
real benefit (unless in a tight loop).
---
 src/document.c | 5 ++---
 src/editor.c   | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/document.c b/src/document.c
index 1b03ded1..eadfa320 100644
--- a/src/document.c
+++ b/src/document.c
@@ -2350,7 +2350,6 @@ void document_update_type_keywords(GeanyDocument *doc)
 	GPtrArray *tags_array;
 
 	g_return_if_fail(DOC_VALID(doc));
-	g_return_if_fail(IS_SCINTILLA(doc->editor->sci));
 
 	switch (doc->file_type->id)
 	{
@@ -2367,10 +2366,10 @@ void document_update_type_keywords(GeanyDocument *doc)
 	}
 
 	keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(doc->editor->sci));
-	if (G_UNLIKELY(keyword_idx < 1))
+	if (keyword_idx == -1)
 		return;
 
-	if (G_UNLIKELY(app->tm_workspace == NULL))
+	if (app->tm_workspace == NULL)
 		return;
 
 	tags_array = app->tm_workspace->work_object.tags_array;
diff --git a/src/editor.c b/src/editor.c
index fdb073c5..36c26644 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -3486,7 +3486,8 @@ static gboolean editor_lexer_is_c_like(gint lexer)
 #endif
 
 
-/* Returns: -1 if lexer doesn't support type keywords */
+/* Returns: -1 if lexer doesn't support type keywords.
+ * @see document_update_type_keywords(). */
 gint editor_lexer_get_type_keyword_idx(gint lexer)
 {
 	switch (lexer)

From 83d9f9e82bc26bcd4c59644883bca58f70a96e4a Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Wed, 2 Nov 2011 15:03:17 +0000
Subject: [PATCH 52/70] Fix generating API docs (Windows makefile).

Also fixes a doxygen warning.
---
 doc/makefile.win32  | 5 +++++
 doc/pluginsymbols.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/makefile.win32 b/doc/makefile.win32
index 7ff59612..670d56b7 100644
--- a/doc/makefile.win32
+++ b/doc/makefile.win32
@@ -7,6 +7,7 @@
 
 RST2HTML=python rst2html.py
 DOXYGEN=doxygen
+CP = copy
 RM = del
 -include ../localwin32.mk
 
@@ -16,6 +17,10 @@ doc: geany.txt
 hacking-doc: ../HACKING
 	$(RST2HTML) -stg --stylesheet=geany.css $^ hacking.html
 
+# FIXME: we should also replace anything like @VERSION@
+Doxyfile: Doxyfile.in
+	$(CP) $< $@
+
 api-doc: Doxyfile
 	$(DOXYGEN)
 
diff --git a/doc/pluginsymbols.c b/doc/pluginsymbols.c
index 5fe678f2..17319a29 100644
--- a/doc/pluginsymbols.c
+++ b/doc/pluginsymbols.c
@@ -32,7 +32,8 @@
  * @link plugindata.h @endlink.
  */
 
-/** Use the PLUGIN_VERSION_CHECK() macro instead. Required by Geany. */
+/** Use the PLUGIN_VERSION_CHECK() macro instead. Required by Geany.
+ * @return . */
 gint plugin_version_check(gint);
 
 /** Use the PLUGIN_SET_INFO() macro to define it. Required by Geany.

From f1b9c58612293f90d465ade5ada014ef324e365d Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Wed, 2 Nov 2011 15:10:50 +0000
Subject: [PATCH 53/70] Fix auto-saving documents when the current document has
 no filename

---
 plugins/saveactions.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/saveactions.c b/plugins/saveactions.c
index 8ac3c0a2..92e24cf2 100644
--- a/plugins/saveactions.c
+++ b/plugins/saveactions.c
@@ -296,8 +296,8 @@ static gboolean auto_save(gpointer data)
 		{
 			doc = document_get_from_page(i);
 
-			/* skip current file to save it lastly, skip files without name */
-			if (doc != cur_doc && cur_doc->file_name != NULL)
+			/* skip current file (save it last), skip files without name */
+			if (doc != cur_doc && doc->file_name != NULL)
 				if (document_save_file(doc, FALSE))
 					saved_files++;
 		}

From de559ef5d4150e2485ef3ffb865e9c9d3249bcd8 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Wed, 2 Nov 2011 15:17:17 +0000
Subject: [PATCH 54/70] Make document_save_file() show the Save As dialog when
 necessary

Previously an error message was shown if doc->file_name is NULL.

The Save As dialog is now shown if the document does not have an
absolute path. This is because the user should confirm where to save
the document in this case.

Although this changes plugin API behaviour, it seems the best way to
ensure the Save As dialog is always shown when needed so the user
knows where the document has been saved.
---
 src/build.c     |  3 ---
 src/callbacks.c | 20 ++++----------------
 src/dialogs.c   | 12 +++---------
 src/document.c  | 35 +++++++++++++++++++++--------------
 4 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/src/build.c b/src/build.c
index 8540620a..98035f24 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1270,9 +1270,6 @@ static void on_build_menu_item(GtkWidget *w, gpointer user_data)
 
 	if (doc && doc->changed)
 	{
-		if (document_need_save_as(doc) && !dialogs_show_save_as())
-			return;
-
 		if (!document_save_file(doc, FALSE))
 			return;
 	}
diff --git a/src/callbacks.c b/src/callbacks.c
index dac39da8..249b0df5 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -172,10 +172,7 @@ void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data)
 
 	if (doc != NULL && cur_page >= 0)
 	{
-		if (document_need_save_as(doc))
-			dialogs_show_save_as();
-		else
-			document_save_file(doc, FALSE);
+		document_save_file(doc, FALSE);
 	}
 }
 
@@ -197,18 +194,9 @@ void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 		doc = document_get_from_page(i);
 		if (! doc->changed)
 			continue;
-		if (document_need_save_as(doc))
-		{
-			/* display unnamed document */
-			document_show_tab(doc);
-			if (dialogs_show_save_as())
-				count++;
-		}
-		else
-		{
-			if (document_save_file(doc, FALSE))
-				count++;
-		}
+
+		if (document_save_file(doc, FALSE))
+			count++;
 	}
 	if (!count)
 		return;
diff --git a/src/dialogs.c b/src/dialogs.c
index fff4bf04..d2e99ebe 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -850,15 +850,9 @@ gboolean dialogs_show_unsaved_file(GeanyDocument *doc)
 	switch (response)
 	{
 		case GTK_RESPONSE_YES:
-		{
-			if (document_need_save_as(doc))
-			{
-				return dialogs_show_save_as();
-			}
-			else
-				/* document_save_file() returns the status if the file could be saved */
-				return document_save_file(doc, FALSE);
-		}
+			/* document_save_file() returns the status if the file could be saved */
+			return document_save_file(doc, FALSE);
+
 		case GTK_RESPONSE_NO:
 			return TRUE;
 
diff --git a/src/document.c b/src/document.c
index eadfa320..b0faa26c 100644
--- a/src/document.c
+++ b/src/document.c
@@ -1698,20 +1698,27 @@ static gchar *save_doc(GeanyDocument *doc, const gchar *locale_filename,
 
 
 /**
- *  Saves the document. Saving may include replacing tabs by spaces,
+ *  Saves the document.
+ *  Also shows the Save As dialog if necessary.
+ *  If the file is not modified, this function may do nothing unless @a force is set to @c TRUE.
+ *
+ *  Saving may include replacing tabs by spaces,
  *  stripping trailing spaces and adding a final new line at the end of the file, depending
  *  on user preferences. Then the @c "document-before-save" signal is emitted,
  *  allowing plugins to modify the document before it is saved, and data is
- *  actually written to disk. The filetype is set again or auto-detected if it wasn't set yet.
- *  Afterwards, the @c "document-save" signal is emitted for plugins.
+ *  actually written to disk.
  *
- *  If the file is not modified, this functions does nothing unless force is set to @c TRUE.
+ *  On successful saving:
+ *  - GeanyDocument::real_path is set.
+ *  - The filetype is set again or auto-detected if it wasn't set yet.
+ *  - The @c "document-save" signal is emitted for plugins.
  *
- *  @note You should ensure @c doc->file_name is not @c NULL before calling this; otherwise
- *  call dialogs_show_save_as().
+ *  @warning You should ensure @c doc->file_name has an absolute path unless you want the
+ *  Save As dialog to be shown. A @c NULL value also shows the dialog. This behaviour was
+ *  added in Geany 1.22.
  *
  *  @param doc The document to save.
- *  @param force Whether to save the file even if it is not modified (e.g. for Save As).
+ *  @param force Whether to save the file even if it is not modified.
  *
  *  @return @c TRUE if the file was saved or @c FALSE if the file could not or should not be saved.
  **/
@@ -1724,17 +1731,17 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force)
 
 	g_return_val_if_fail(doc != NULL, FALSE);
 
+	if (document_need_save_as(doc))
+	{
+		/* ensure doc is the current tab before showing the dialog */
+		document_show_tab(doc);
+		return dialogs_show_save_as();
+	}
+
 	/* the "changed" flag should exclude the "readonly" flag, but check it anyway for safety */
 	if (! force && ! ui_prefs.allow_always_save && (! doc->changed || doc->readonly))
 		return FALSE;
 
-	if (G_UNLIKELY(doc->file_name == NULL))
-	{
-		ui_set_statusbar(TRUE, _("Error saving file (%s)."), _("Invalid filename"));
-		utils_beep();
-		return FALSE;
-	}
-
 	/* replaces tabs by spaces but only if the current file is not a Makefile */
 	if (file_prefs.replace_tabs && doc->file_type->id != GEANY_FILETYPES_MAKE)
 		editor_replace_tabs(doc->editor);

From 6ceb5ac1640dcf15f5bfb1415777fc7d5e58767e Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Wed, 2 Nov 2011 20:18:12 -0700
Subject: [PATCH 55/70] Remove editor_lexer_get_type_keyword_idx() function

It was used only in one place in document_update_type_keywords() which
already did a similar check using the file type before calling this function.

Update HACKING file and very minor cleanup of other code in
document_update_type_keywords().
---
 HACKING        |  2 +-
 src/document.c | 27 +++++++++++----------------
 src/editor.c   | 16 ----------------
 src/editor.h   |  2 --
 4 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/HACKING b/HACKING
index a50c179e..43671416 100644
--- a/HACKING
+++ b/HACKING
@@ -459,7 +459,7 @@ For brace indentation, update lexer_has_braces() in editor.c;
 indentation after ':' is done from on_new_line_added().
 
 If the Scintilla lexer supports user type keyword highlighting (e.g.
-SCLEX_CPP), update editor_lexer_get_type_keyword_idx() in editor.c.
+SCLEX_CPP), update document_update_type_keywords() in document.c.
 
 Adding a TagManager parser
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/document.c b/src/document.c
index b0faa26c..b1a0f2c4 100644
--- a/src/document.c
+++ b/src/document.c
@@ -72,6 +72,8 @@
 #include "search.h"
 #include "filetypesprivate.h"
 
+#include "SciLexer.h"
+
 
 GeanyFilePrefs file_prefs;
 
@@ -2352,33 +2354,26 @@ void document_update_tag_list_in_idle(GeanyDocument *doc)
 void document_update_type_keywords(GeanyDocument *doc)
 {
 	gint keyword_idx;
-	gchar *keywords = NULL;
+	gchar *keywords;
 	GString *str;
 	GPtrArray *tags_array;
 
 	g_return_if_fail(DOC_VALID(doc));
+	g_return_if_fail(app->tm_workspace != NULL);
 
-	switch (doc->file_type->id)
+	switch (sci_get_lexer(doc->editor->sci))
 	{
-		/* continue working with the following languages, skip on all others */
-		case GEANY_FILETYPES_C:
-		case GEANY_FILETYPES_CPP:
-		case GEANY_FILETYPES_CS:
-		case GEANY_FILETYPES_D:
-		case GEANY_FILETYPES_JAVA:
-		case GEANY_FILETYPES_VALA:
+		case SCLEX_CPP:
+		case SCLEX_D:
+			/* index of the keyword set in the Scintilla lexer, for 
+			 * example in LexCPP.cxx, see "cppWordLists" global array. */
+			keyword_idx = 3;
 			break;
+		/* early out if the lexer doesn't support user type keywords */
 		default:
 			return;
 	}
 
-	keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(doc->editor->sci));
-	if (keyword_idx == -1)
-		return;
-
-	if (app->tm_workspace == NULL)
-		return;
-
 	tags_array = app->tm_workspace->work_object.tags_array;
 	if (tags_array)
 	{
diff --git a/src/editor.c b/src/editor.c
index 36c26644..492b477b 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -3486,22 +3486,6 @@ static gboolean editor_lexer_is_c_like(gint lexer)
 #endif
 
 
-/* Returns: -1 if lexer doesn't support type keywords.
- * @see document_update_type_keywords(). */
-gint editor_lexer_get_type_keyword_idx(gint lexer)
-{
-	switch (lexer)
-	{
-		case SCLEX_CPP:
-		case SCLEX_D:
-		return 3;
-
-		default:
-		return -1;
-	}
-}
-
-
 /* inserts a three-line comment at one line above current cursor position */
 void editor_insert_multiline_comment(GeanyEditor *editor)
 {
diff --git a/src/editor.h b/src/editor.h
index b9722f70..1a5c2b36 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -206,8 +206,6 @@ void editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line
 
 gint editor_do_uncomment(GeanyEditor *editor, gint line, gboolean toggle);
 
-gint editor_lexer_get_type_keyword_idx(gint lexer);
-
 void editor_insert_multiline_comment(GeanyEditor *editor);
 
 void editor_insert_alternative_whitespace(GeanyEditor *editor);

From ea51c487d3f1eb0baaed021249b39f775ed6992c Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Sat, 22 Oct 2011 23:48:53 -0700
Subject: [PATCH 56/70] Use Scintilla's buffer directly for parsing tags

---
 src/document.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/document.c b/src/document.c
index b1a0f2c4..03a570fa 100644
--- a/src/document.c
+++ b/src/document.c
@@ -2250,21 +2250,19 @@ gint document_replace_all(GeanyDocument *doc, const gchar *find_text, const gcha
 
 static gboolean update_tags_from_buffer(GeanyDocument *doc)
 {
-	gboolean result;
-#if 0
-		/* old code */
-		result = tm_source_file_update(doc->tm_file, TRUE, FALSE, TRUE);
-#else
-		gsize len = sci_get_length(doc->editor->sci) + 1;
-		gchar *text = g_malloc(len);
+	guchar *buffer_ptr;
+	gsize len;
 
-		/* we copy the whole text into memory instead using a direct char pointer from
-		 * Scintilla because tm_source_file_buffer_update() does modify the string slightly */
-		sci_get_text(doc->editor->sci, len, text);
-		result = tm_source_file_buffer_update(doc->tm_file, (guchar*) text, len, TRUE);
-		g_free(text);
-#endif
-	return result;
+	len = sci_get_length(doc->editor->sci);
+
+	/* gets a direct character pointer from Scintilla.
+	 * this is OK because tm_source_file_buffer_update() does not modify the
+	 * buffer, it only requires that buffer doesn't change while it's running,
+	 * which it won't since it runs in this thread (ie. synchronously).
+	 * see tagmanager/read.c:bufferOpen */
+	buffer_ptr = (guchar *) scintilla_send_message(doc->editor->sci, SCI_GETCHARACTERPOINTER, 0, 0);
+
+	return tm_source_file_buffer_update(doc->tm_file, buffer_ptr, len, TRUE);
 }
 
 

From ff663c16785a4b49a420e1b9a5977d95f140a242 Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Wed, 2 Nov 2011 22:44:26 -0700
Subject: [PATCH 57/70] Remove init_doc_struct() function from documents.c

This function was only used from document_create() and most of this code is
not needed since the memset() and g_new0() calls set the memory to all 0's,
which in this case should suffice to (re)set all the members to 0/NULL/FALSE.

Refactor so all the resetting to defaults code is done in remove_page()
only and then only do the required non-FALSE/NULL initialization in
document_create().

Move the remove_page() prototype to the top of the file and various other
minor changes in remove_page().
---
 src/document.c | 81 +++++++++++++-------------------------------------
 1 file changed, 20 insertions(+), 61 deletions(-)

diff --git a/src/document.c b/src/document.c
index 03a570fa..6f6b8f82 100644
--- a/src/document.c
+++ b/src/document.c
@@ -104,6 +104,7 @@ typedef struct
 static void document_undo_clear(GeanyDocument *doc);
 static void document_redo_add(GeanyDocument *doc, guint type, gpointer data);
 static gboolean update_tags_from_buffer(GeanyDocument *doc);
+static gboolean remove_page(guint page_num);
 
 
 /**
@@ -357,42 +358,6 @@ void document_set_text_changed(GeanyDocument *doc, gboolean changed)
 }
 
 
-/* Sets is_valid to FALSE and initializes some members to NULL, to mark it uninitialized.
- * The flag is_valid is set to TRUE in document_create(). */
-static void init_doc_struct(GeanyDocument *new_doc)
-{
-	GeanyDocumentPrivate *priv;
-
-	memset(new_doc, 0, sizeof(GeanyDocument));
-
-	new_doc->is_valid = FALSE;
-	new_doc->has_tags = FALSE;
-	new_doc->readonly = FALSE;
-	new_doc->file_name = NULL;
-	new_doc->file_type = NULL;
-	new_doc->tm_file = NULL;
-	new_doc->encoding = NULL;
-	new_doc->has_bom = FALSE;
-	new_doc->editor = NULL;
-	new_doc->changed = FALSE;
-	new_doc->real_path = NULL;
-
-	new_doc->priv = g_new0(GeanyDocumentPrivate, 1);
-	priv = new_doc->priv;
-	priv->tag_store = NULL;
-	priv->tag_tree = NULL;
-	priv->saved_encoding.encoding = NULL;
-	priv->saved_encoding.has_bom = FALSE;
-	priv->undo_actions = NULL;
-	priv->redo_actions = NULL;
-	priv->line_count = 0;
-	priv->tag_list_update_source = 0;
-#ifndef USE_GIO_FILEMON
-	priv->last_check = time(NULL);
-#endif
-}
-
-
 /* returns the next free place in the document list,
  * or -1 if the documents_array is full */
 static gint document_get_new_idx(void)
@@ -533,8 +498,6 @@ static gboolean on_idle_focus(gpointer doc)
 }
 
 
-static gboolean remove_page(guint page_num);
-
 /* Creates a new document and editor, adding a tab in the notebook.
  * @return The created document */
 static GeanyDocument *document_create(const gchar *utf8_filename)
@@ -545,9 +508,9 @@ static GeanyDocument *document_create(const gchar *utf8_filename)
 
 	if (cur_pages == 1)
 	{
-		GeanyDocument *cur = document_get_current();
+		doc = document_get_current();
 		/* remove the empty document first */
-		if (cur != NULL && cur->file_name == NULL && ! cur->changed)
+		if (doc != NULL && doc->file_name == NULL && ! doc->changed)
 			/* prevent immediately opening another new doc with
 			 * new_document_after_close pref */
 			remove_page(0);
@@ -556,18 +519,22 @@ static GeanyDocument *document_create(const gchar *utf8_filename)
 	new_idx = document_get_new_idx();
 	if (new_idx == -1)	/* expand the array, no free places */
 	{
-		GeanyDocument *new_doc = g_new0(GeanyDocument, 1);
+		doc = g_new0(GeanyDocument, 1);
 
 		new_idx = documents_array->len;
-		g_ptr_array_add(documents_array, new_doc);
+		g_ptr_array_add(documents_array, doc);
 	}
+	
 	doc = documents[new_idx];
-	init_doc_struct(doc);	/* initialize default document settings */
+	
+	/* initialize default document settings */
+	doc->priv = g_new0(GeanyDocumentPrivate, 1);
 	doc->index = new_idx;
-
 	doc->file_name = g_strdup(utf8_filename);
-
 	doc->editor = editor_create(doc);
+#ifndef USE_GIO_FILEMON
+	doc->priv->last_check = time(NULL);
+#endif
 
 	sidebar_openfiles_add(doc);	/* sets doc->iter */
 
@@ -605,21 +572,16 @@ gboolean document_close(GeanyDocument *doc)
 }
 
 
-/* Call document_remove_page() instead, this is only needed for document_create(). */
+/* Call document_remove_page() instead, this is only needed for document_create()
+ * to prevent re-opening a new document when the last document is closed (if enabled). */
 static gboolean remove_page(guint page_num)
 {
 	GeanyDocument *doc = document_get_from_page(page_num);
 
-	if (G_UNLIKELY(doc == NULL))
-	{
-		g_warning("%s: page_num: %d", G_STRFUNC, page_num);
-		return FALSE;
-	}
+	g_return_val_if_fail(doc != NULL, FALSE);
 
 	if (doc->changed && ! dialogs_show_unsaved_file(doc))
-	{
 		return FALSE;
-	}
 
 	/* tell any plugins that the document is about to be closed */
 	g_signal_emit_by_name(geany_object, "document-close", doc);
@@ -644,23 +606,20 @@ static gboolean remove_page(guint page_num)
 	tm_workspace_remove_object(doc->tm_file, TRUE, TRUE);
 
 	editor_destroy(doc->editor);
-	doc->editor = NULL;
+	doc->editor = NULL; /* needs to be NULL for document_undo_clear() call below */
 
 	document_stop_file_monitoring(doc);
 
-	doc->file_name = NULL;
-	doc->real_path = NULL;
-	doc->file_type = NULL;
-	doc->encoding = NULL;
-	doc->has_bom = FALSE;
-	doc->tm_file = NULL;
 	document_undo_clear(doc);
+
 	g_free(doc->priv);
 
+	/* reset document settings to defaults for re-use */
+	memset(doc, 0, sizeof(GeanyDocument));
+
 	if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0)
 	{
 		sidebar_update_tag_list(NULL, FALSE);
-		/*on_notebook1_switch_page(GTK_NOTEBOOK(main_widgets.notebook), NULL, 0, NULL);*/
 		ui_set_window_title(NULL);
 		ui_save_buttons_toggle(FALSE);
 		ui_update_popup_reundo_items(NULL);

From efcce8808e92ba56684605790959cb014a11c9c8 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 3 Nov 2011 17:00:48 +0000
Subject: [PATCH 58/70] Add note not to use G_LIKELY or G_UNLIKELY (except in
 critical loops)

These add noise to the code with little real benefit.
---
 HACKING | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/HACKING b/HACKING
index 43671416..f57f2980 100644
--- a/HACKING
+++ b/HACKING
@@ -164,6 +164,8 @@ Coding
   them down into smaller static functions where possible. This makes code
   much easier to read and maintain.
 * Use GLib types and functions - gint not int, g_free() not free().
+* Do not use G_LIKELY or G_UNLIKELY (except in critical loops). These
+  add noise to the code with little real benefit.
 * Your code should build against GLib 2.20 and GTK 2.16. At least for the
   moment, we want to keep the minimum requirement for GTK at 2.16 (of
   course, you can use the GTK_CHECK_VERSION macro to protect code using

From 822240d17f19ca03720e1d5a2a244fc6b3e45702 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 3 Nov 2011 17:34:06 +0000
Subject: [PATCH 59/70] Add Style example for structs, doc-comments

---
 HACKING | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/HACKING b/HACKING
index f57f2980..df7bd1f2 100644
--- a/HACKING
+++ b/HACKING
@@ -164,8 +164,6 @@ Coding
   them down into smaller static functions where possible. This makes code
   much easier to read and maintain.
 * Use GLib types and functions - gint not int, g_free() not free().
-* Do not use G_LIKELY or G_UNLIKELY (except in critical loops). These
-  add noise to the code with little real benefit.
 * Your code should build against GLib 2.20 and GTK 2.16. At least for the
   moment, we want to keep the minimum requirement for GTK at 2.16 (of
   course, you can use the GTK_CHECK_VERSION macro to protect code using
@@ -174,6 +172,8 @@ Coding
   gcc's -Wdeclaration-after-statement to warn about this.
 * Don't let variable names shadow outer variables - use gcc's -Wshadow
   option.
+* Do not use G_LIKELY or G_UNLIKELY (except in critical loops). These
+  add noise to the code with little real benefit.
 
 Compiler options & warnings
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -233,14 +233,32 @@ Style
 
 Example::
 
+    struct Bar;
+
+    typedef struct Foo  /* struct names normally are the same as typedef names */
+    {
+        gint    foo;    /* names are somewhat aligned visually */
+        gint    bar;    /* fields don't share the same line */
+        SomeLongTypeName baz; /* alignment is not strict */
+        gchar   *ptr;   /* pointer symbol must go next to variable name, not type */
+        Bar     public; /**< only plugin API fields have a doc-comment */
+    }
+    Foo;
+
+
     gint some_func(void);
 
+    gint some_other_func(void);
 
+
+    /* optional function comment explains something important */
     gint function_long_name(gchar arg1, <too many args to fit on this line>,
             gchar argN)
     {
-        /* variable declarations go before code in each scope */
+        /* variable declarations always go before code in each scope */
+        /* variable names should NOT be aligned at all */
         gint foo, bar;  /* variables can go on the same line */
+        gint baz;       /* but often don't */
         gchar *ptr;     /* pointer symbol must go next to variable name, not type */
         gchar *another; /* pointers should normally go on separate lines */
 
@@ -249,7 +267,8 @@ Example::
          * lines to explain */
         if (foo)
         {
-            gint dir = -1;    /* -1 to search backwards */
+            /* variables only used in one scope should normally be declared there */
+            gint dir = -1;
 
             bar = foo;
             if ((bar & (guint)dir) != 7)
@@ -261,6 +280,12 @@ Example::
     }
 
 
+    /** Explains using doc-comments for plugin API functions.
+     * First line should be short and use the third person tense - 'explains',
+     * not 'explain'.
+     *
+     * @return Some number.
+     * @since 1.22. */
     gint another_function(void)
     {
         ...

From c39390aae8df5c65c0371f288eb1272b3b3e1b6c Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 3 Nov 2011 18:16:13 +0000
Subject: [PATCH 60/70] Fix using American spelling of color

---
 doc/geany.html | 14 +++++++++++---
 doc/geany.txt  |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/doc/geany.html b/doc/geany.html
index bacc94f5..8136bf9f 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -2,11 +2,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz  Colomban Wendling" />
 <meta name="date" content="2011-10-02" />
+
 <style type="text/css">
 
 /*
@@ -125,11 +127,14 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
 }
 
 </style>
+
 </head>
 <body>
 <div class="document" id="geany">
+
 <h1 class="title">Geany</h1>
 <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
+
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
 <col class="docinfo-content" />
@@ -145,6 +150,7 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
 <td>1.22</td></tr>
 </tbody>
 </table>
+
 <p>Copyright © 2005-2011</p>
 <p>This document is distributed under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2
@@ -5220,7 +5226,7 @@ is enabled (see View menu).</p>
 </dd>
 <dt>marker_search</dt>
 <dd><p class="first">The style for a marked search results (when using &quot;Mark&quot; in Search dialogs).
-The second argument sets the background colour for the drawn rectangle.</p>
+The second argument sets the background color for the drawn rectangle.</p>
 <p>Only the second argument is interpreted.</p>
 <p class="last"><em>Example:</em> <tt class="docutils literal">marker_search=0x000000;0xb8f4b8;false;false</tt></p>
 </dd>
@@ -6696,13 +6702,15 @@ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
 USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 </div>
+
 </div>
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2011-10-28 17:11 UTC.
+Generated on: 2011-11-03 18:14 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
 </body>
 </html>
+
diff --git a/doc/geany.txt b/doc/geany.txt
index 2fa4a550..3516d780 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -4368,7 +4368,7 @@ marker_line
 
 marker_search
     The style for a marked search results (when using "Mark" in Search dialogs).
-    The second argument sets the background colour for the drawn rectangle.
+    The second argument sets the background color for the drawn rectangle.
 
     Only the second argument is interpreted.
 

From 0167f589b314056517627f88069a933daf56ee4d Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Wed, 2 Nov 2011 00:04:35 +0100
Subject: [PATCH 61/70] Small code cleanup

Use foreach_document() in a few places where appropriate and make
some code more consistent.
---
 src/callbacks.c   |  1 +
 src/document.c    | 15 ++++++---------
 src/keybindings.c |  3 +--
 src/keyfile.c     |  2 +-
 src/sidebar.c     | 11 +++--------
 src/ui_utils.c    |  6 +++---
 6 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/callbacks.c b/src/callbacks.c
index 249b0df5..3c7498cc 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -189,6 +189,7 @@ void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 	GeanyDocument *doc, *cur_doc = document_get_current();
 	gint count = 0;
 
+	/* iterate over documents in tabs order */
 	for (i = 0; i < max; i++)
 	{
 		doc = document_get_from_page(i);
diff --git a/src/document.c b/src/document.c
index 6f6b8f82..46002281 100644
--- a/src/document.c
+++ b/src/document.c
@@ -2758,13 +2758,14 @@ GeanyDocument *document_clone(GeanyDocument *old_doc, const gchar *utf8_filename
  * @return TRUE if all files were saved or had their changes discarded. */
 gboolean document_account_for_unsaved(void)
 {
-	guint i, p, page_count, len = documents_array->len;
-	GeanyDocument *doc;
+	guint i, p, page_count;
 
 	page_count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
+	/* iterate over documents in tabs order */
 	for (p = 0; p < page_count; p++)
 	{
-		doc = document_get_from_page(p);
+		GeanyDocument *doc = document_get_from_page(p);
+
 		if (DOC_VALID(doc) && doc->changed)
 		{
 			if (! dialogs_show_unsaved_file(doc))
@@ -2772,13 +2773,9 @@ gboolean document_account_for_unsaved(void)
 		}
 	}
 	/* all documents should now be accounted for, so ignore any changes */
-	for (i = 0; i < len; i++)
+	foreach_document (i)
 	{
-		doc = documents[i];
-		if (doc->is_valid && doc->changed)
-		{
-			doc->changed = FALSE;
-		}
+		documents[i]->changed = FALSE;
 	}
 	return TRUE;
 }
diff --git a/src/keybindings.c b/src/keybindings.c
index 6ff3bb55..6435ffe1 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -975,8 +975,7 @@ static gboolean check_fixed_kb(guint keyval, guint state)
 			if (keyval == GDK_Page_Up)
 				gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), 0);
 			if (keyval == GDK_Page_Down)
-				gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook),
-					gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) - 1);
+				gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), -1);
 			return TRUE;
 		}
 	}
diff --git a/src/keyfile.c b/src/keyfile.c
index b3ae7ca4..f7c4ef8d 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -330,7 +330,7 @@ void configuration_save_session_files(GKeyFile *config)
 	npage = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook));
 	g_key_file_set_integer(config, "files", "current_page", npage);
 
-	/* store the filenames to reopen them the next time */
+	/* store the filenames in the notebook tab order to reopen them the next time */
 	max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
 	for (i = 0; i < max; i++)
 	{
diff --git a/src/sidebar.c b/src/sidebar.c
index 37f85767..f250f881 100644
--- a/src/sidebar.c
+++ b/src/sidebar.c
@@ -530,18 +530,13 @@ void sidebar_openfiles_update(GeanyDocument *doc)
 
 void sidebar_openfiles_update_all()
 {
-	guint i, page_count;
+	guint i;
 	GeanyDocument *doc;
 
 	gtk_tree_store_clear(store_openfiles);
-	page_count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
-	for (i = 0; i < page_count; i++)
+	foreach_document (i)
 	{
-		doc = document_get_from_page(i);
-		if (G_UNLIKELY(doc == NULL))
-			continue;
-
-		sidebar_openfiles_add(doc);
+		sidebar_openfiles_add(documents[i]);
 	}
 }
 
diff --git a/src/ui_utils.c b/src/ui_utils.c
index fb24243a..99431213 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -659,7 +659,7 @@ void ui_save_buttons_toggle(gboolean enable)
 	gboolean dirty_tabs = FALSE;
 
 	if (ui_prefs.allow_always_save)
-		enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) > 0 ? TRUE : FALSE;
+		enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) > 0;
 
 	ui_widget_set_sensitive(widgets.save_buttons[0], enable);
 	ui_widget_set_sensitive(widgets.save_buttons[1], enable);
@@ -769,7 +769,7 @@ static void init_document_widgets(void)
 void ui_document_buttons_update(void)
 {
 	guint i;
-	gboolean enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) ? TRUE : FALSE;
+	gboolean enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) > 0;
 
 	for (i = 0; i < widgets.document_buttons->len; i++)
 	{
@@ -797,7 +797,7 @@ static void on_doc_sensitive_widget_destroy(GtkWidget *widget, G_GNUC_UNUSED gpo
  **/
 void ui_add_document_sensitive(GtkWidget *widget)
 {
-	gboolean enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) ? TRUE : FALSE;
+	gboolean enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) > 0;
 
 	ui_widget_set_sensitive(widget, enable);
 

From b55a30c2bf1fe2070b2edc4711d9a1bb93645291 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Thu, 3 Nov 2011 20:45:52 +0100
Subject: [PATCH 62/70] Build recent data for GTK ourselves

This prevents GTK of trying to fetch the necessary information like
MIME-type itself, which leads to a significant speedup (> 30%), as
well as using the real MIME-type we use rather than the GIO-guessed
one.
---
 src/document.c |  8 ++++----
 src/main.c     |  4 ++--
 src/ui_utils.c | 32 ++++++++++++++++++++++++++------
 src/ui_utils.h |  2 +-
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/document.c b/src/document.c
index 46002281..a5be343d 100644
--- a/src/document.c
+++ b/src/document.c
@@ -588,7 +588,7 @@ static gboolean remove_page(guint page_num)
 
 	/* Checking real_path makes it likely the file exists on disk */
 	if (! main_status.closing_all && doc->real_path != NULL)
-		ui_add_recent_file(doc->file_name);
+		ui_add_recent_document(doc);
 
 	doc->is_valid = FALSE;
 
@@ -1113,7 +1113,7 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename
 		doc = document_find_by_filename(utf8_filename);
 		if (doc != NULL)
 		{
-			ui_add_recent_file(utf8_filename);	/* either add or reorder recent item */
+			ui_add_recent_document(doc);	/* either add or reorder recent item */
 			/* show the doc before reload dialog */
 			document_show_tab(doc);
 			document_check_disk_status(doc, TRUE);	/* force a file changed check */
@@ -1200,7 +1200,7 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename
 
 		/* finally add current file to recent files menu, but not the files from the last session */
 		if (! main_status.opening_session_files)
-			ui_add_recent_file(utf8_filename);
+			ui_add_recent_document(doc);
 
 		if (reload)
 		{
@@ -1475,7 +1475,7 @@ gboolean document_save_file_as(GeanyDocument *doc, const gchar *utf8_fname)
 	doc->priv->file_disk_status = FILE_IGNORE;
 
 	if (ret)
-		ui_add_recent_file(doc->file_name);
+		ui_add_recent_document(doc);
 	return ret;
 }
 
diff --git a/src/main.c b/src/main.c
index 0fd6e10f..c54bae27 100644
--- a/src/main.c
+++ b/src/main.c
@@ -776,7 +776,7 @@ gboolean main_handle_filename(const gchar *locale_filename)
 		doc = document_open_file(filename, FALSE, NULL, NULL);
 		/* add recent file manually if opening_session_files is set */
 		if (doc != NULL && main_status.opening_session_files)
-			ui_add_recent_file(doc->file_name);
+			ui_add_recent_document(doc);
 		g_free(filename);
 		return TRUE;
 	}
@@ -786,7 +786,7 @@ gboolean main_handle_filename(const gchar *locale_filename)
 
 		doc = document_new_file(utf8_filename, NULL, NULL);
 		if (doc != NULL)
-			ui_add_recent_file(doc->file_name);
+			ui_add_recent_document(doc);
 		g_free(utf8_filename);
 		g_free(filename);
 		return TRUE;
diff --git a/src/ui_utils.c b/src/ui_utils.c
index 99431213..4f4dc983 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1113,18 +1113,19 @@ static void recent_project_activate_cb(GtkMenuItem *menuitem, G_GNUC_UNUSED gpoi
 }
 
 
-static void add_recent_file(const gchar *utf8_filename, GeanyRecentFiles *grf)
+static void add_recent_file(const gchar *utf8_filename, GeanyRecentFiles *grf,
+		const GtkRecentData *rdata)
 {
 	if (g_queue_find_custom(grf->recent_queue, utf8_filename, (GCompareFunc) strcmp) == NULL)
 	{
 
-		if (grf->type == RECENT_FILE_FILE)
+		if (grf->type == RECENT_FILE_FILE && rdata)
 		{
 			GtkRecentManager *manager = gtk_recent_manager_get_default();
 			gchar *uri = g_filename_to_uri(utf8_filename, NULL, NULL);
 			if (uri != NULL)
 			{
-				gtk_recent_manager_add_item(manager, uri);
+				gtk_recent_manager_add_full(manager, uri, rdata);
 				g_free(uri);
 			}
 		}
@@ -1142,15 +1143,34 @@ static void add_recent_file(const gchar *utf8_filename, GeanyRecentFiles *grf)
 }
 
 
-void ui_add_recent_file(const gchar *utf8_filename)
+void ui_add_recent_document(GeanyDocument *doc)
 {
-	add_recent_file(utf8_filename, recent_get_recent_files());
+	/* what are the groups for actually? */
+	static const gchar *groups[2] = {
+		"geany",
+		NULL
+	};
+	GtkRecentData rdata;
+
+	/* Prepare the data for gtk_recent_manager_add_full() */
+	rdata.display_name = NULL;
+	rdata.description = NULL;
+	rdata.mime_type = doc->file_type->mime_type;
+	/* if we ain't got no mime-type, fallback to plain text */
+	if (! rdata.mime_type)
+		rdata.mime_type = (gchar *) "text/plain";
+	rdata.app_name = (gchar *) "geany";
+	rdata.app_exec = (gchar *) "geany %u";
+	rdata.groups = (gchar **) groups;
+	rdata.is_private = FALSE;
+
+	add_recent_file(doc->file_name, recent_get_recent_files(), &rdata);
 }
 
 
 void ui_add_recent_project_file(const gchar *utf8_filename)
 {
-	add_recent_file(utf8_filename, recent_get_recent_projects());
+	add_recent_file(utf8_filename, recent_get_recent_projects(), NULL);
 }
 
 
diff --git a/src/ui_utils.h b/src/ui_utils.h
index 9d5da4d3..5cab7de6 100644
--- a/src/ui_utils.h
+++ b/src/ui_utils.h
@@ -292,7 +292,7 @@ GtkWidget *ui_new_image_from_inline(gint img);
 
 void ui_create_recent_menus(void);
 
-void ui_add_recent_file(const gchar *utf8_filename);
+void ui_add_recent_document(GeanyDocument *doc);
 
 void ui_add_recent_project_file(const gchar *utf8_filename);
 

From c1df8a7263075b537950aba147c04a192c2f612e Mon Sep 17 00:00:00 2001
From: Matthew Brush <mbrush@codebrainz.ca>
Date: Fri, 4 Nov 2011 19:17:20 -0700
Subject: [PATCH 63/70] Use file type instead of lexer to decide if type
 keywords are supported

Not every filetype for a specific lexer implements type keywords even if the
lexer supports it.
---
 src/document.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/document.c b/src/document.c
index a5be343d..a00d4487 100644
--- a/src/document.c
+++ b/src/document.c
@@ -2318,15 +2318,19 @@ void document_update_type_keywords(GeanyDocument *doc)
 	g_return_if_fail(DOC_VALID(doc));
 	g_return_if_fail(app->tm_workspace != NULL);
 
-	switch (sci_get_lexer(doc->editor->sci))
+	switch (doc->file_type->id)
 	{
-		case SCLEX_CPP:
-		case SCLEX_D:
+		case GEANY_FILETYPES_C:
+		case GEANY_FILETYPES_CPP:
+		case GEANY_FILETYPES_CS:
+		case GEANY_FILETYPES_D:
+		case GEANY_FILETYPES_JAVA:
+		case GEANY_FILETYPES_VALA:
 			/* index of the keyword set in the Scintilla lexer, for 
 			 * example in LexCPP.cxx, see "cppWordLists" global array. */
 			keyword_idx = 3;
 			break;
-		/* early out if the lexer doesn't support user type keywords */
+		/* early out if user type keywords are not supported */
 		default:
 			return;
 	}

From 19da0ce965901090f803805c53c3c3d33d6ac4f9 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sat, 5 Nov 2011 23:56:33 +0100
Subject: [PATCH 64/70] Fix or add a few Scintilla styles mappings

Closes #3432760.
---
 data/filetypes.asm  |   3 +-
 data/filetypes.caml |   2 +
 data/filetypes.lisp |   5 +-
 data/filetypes.sql  |   3 +
 data/filetypes.tcl  |   2 +
 src/highlighting.c  | 216 +++++++++++++++++++++++++-------------------
 6 files changed, 135 insertions(+), 96 deletions(-)

diff --git a/data/filetypes.asm b/data/filetypes.asm
index a2b28670..3ba4961b 100644
--- a/data/filetypes.asm
+++ b/data/filetypes.asm
@@ -3,6 +3,8 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 comment=comment_line
+commentblock=comment
+commentdirective=comment
 number=number_1
 string=string_1
 operator=operator
@@ -12,7 +14,6 @@ mathinstruction=keyword_2
 register=type
 directive=preprocessor
 directiveoperand=keyword_3
-commentblock=comment
 character=string_1
 stringeol=string_eol
 extinstruction=keyword_4
diff --git a/data/filetypes.caml b/data/filetypes.caml
index c1c17642..f966c7b5 100644
--- a/data/filetypes.caml
+++ b/data/filetypes.caml
@@ -9,12 +9,14 @@ comment3=comment
 number=number_1
 keyword=keyword_1
 keyword2=keyword_2
+keyword3=keyword_3
 string=string_1
 char=character
 operator=operator
 identifier=identifier_1
 tagname=preprocessor
 linenum=number_2
+white=default
 
 [keywords]
 # all items must be in one line
diff --git a/data/filetypes.lisp b/data/filetypes.lisp
index b5e94fd8..7ec277ec 100644
--- a/data/filetypes.lisp
+++ b/data/filetypes.lisp
@@ -6,16 +6,13 @@ comment=comment_line
 multicomment=comment
 number=number_1
 keyword=keyword_1
-special_keyword=type
+keywordkw=keyword_2
 symbol=keyword_2
 string=string_1
 stringeol=string_eol
 identifier=identifier_1
 operator=operator
 special=function
-character=character
-macro=preprocessor
-macrodispatch=number_2
 
 [keywords]
 # all items must be in one line
diff --git a/data/filetypes.sql b/data/filetypes.sql
index 98a86ded..5e82e61a 100644
--- a/data/filetypes.sql
+++ b/data/filetypes.sql
@@ -4,7 +4,10 @@
 default=default
 comment=comment
 commentline=comment_line
+commentlinedoc=comment_line_doc
 commentdoc=comment_doc
+commentdockeyword=comment_doc_keyword
+commentdockeyworderror=comment_doc_keyword_error
 number=number_1
 word=keyword_1
 word2=keyword_2
diff --git a/data/filetypes.tcl b/data/filetypes.tcl
index fa12c644..9a5602a1 100644
--- a/data/filetypes.tcl
+++ b/data/filetypes.tcl
@@ -4,6 +4,8 @@
 default=default
 comment=comment
 commentline=comment_line
+commentbox=comment
+blockcomment=comment
 number=number_1
 operator=operator
 identifier=identifier_1
diff --git a/src/highlighting.c b/src/highlighting.c
index 4696244f..39fa5461 100644
--- a/src/highlighting.c
+++ b/src/highlighting.c
@@ -1035,22 +1035,19 @@ static void styleset_diff(ScintillaObject *sci, gint ft_id)
 
 static void styleset_lisp_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 15);
+	new_styleset(ft_id, 12);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]);
 	get_keyfile_style(config, config_home, "multicomment", &style_sets[ft_id].styling[2]);
 	get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[3]);
 	get_keyfile_style(config, config_home, "keyword", &style_sets[ft_id].styling[4]);
-	get_keyfile_style(config, config_home, "special_keyword", &style_sets[ft_id].styling[5]);
-	get_keyfile_style(config, config_home, "symbol", &style_sets[ft_id].styling[6]);
-	get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[7]);
-	get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[8]);
-	get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[9]);
-	get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]);
-	get_keyfile_style(config, config_home, "special", &style_sets[ft_id].styling[11]);
-	get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[12]);
-	get_keyfile_style(config, config_home, "macro", &style_sets[ft_id].styling[13]);
-	get_keyfile_style(config, config_home, "macrodispatch", &style_sets[ft_id].styling[14]);
+	get_keyfile_style(config, config_home, "symbol", &style_sets[ft_id].styling[5]);
+	get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[6]);
+	get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[7]);
+	get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[8]);
+	get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[9]);
+	get_keyfile_style(config, config_home, "special", &style_sets[ft_id].styling[10]);
+	get_keyfile_style(config, config_home, "keywordkw", &style_sets[ft_id].styling[11]);
 
 	style_sets[ft_id].keywords = g_new(gchar*, 3);
 	get_keyfile_keywords(config, config_home, "keywords", ft_id, 0);
@@ -1072,20 +1069,13 @@ static void styleset_lisp(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_LISP_MULTI_COMMENT, ft_id, 2);
 	set_sci_style(sci, SCE_LISP_NUMBER, ft_id, 3);
 	set_sci_style(sci, SCE_LISP_KEYWORD, ft_id, 4);
-/*
-	set_sci_style(sci, SCE_LISP_SPECIAL_KEYWORD, ft_id, 5);
-*/
-	set_sci_style(sci, SCE_LISP_SYMBOL, ft_id, 6);
-	set_sci_style(sci, SCE_LISP_STRING, ft_id, 7);
-	set_sci_style(sci, SCE_LISP_STRINGEOL, ft_id, 8);
-	set_sci_style(sci, SCE_LISP_IDENTIFIER, ft_id, 9);
-	set_sci_style(sci, SCE_LISP_OPERATOR, ft_id, 10);
-	set_sci_style(sci, SCE_LISP_SPECIAL, ft_id, 11);
-/*
-	set_sci_style(sci, SCE_LISP_CHARACTER, ft_id, 12);
-	set_sci_style(sci, SCE_LISP_MACRO, ft_id, 13);
-	set_sci_style(sci, SCE_LISP_MACRO_DISPATCH, ft_id, 14);
-*/
+	set_sci_style(sci, SCE_LISP_SYMBOL, ft_id, 5);
+	set_sci_style(sci, SCE_LISP_STRING, ft_id, 6);
+	set_sci_style(sci, SCE_LISP_STRINGEOL, ft_id, 7);
+	set_sci_style(sci, SCE_LISP_IDENTIFIER, ft_id, 8);
+	set_sci_style(sci, SCE_LISP_OPERATOR, ft_id, 9);
+	set_sci_style(sci, SCE_LISP_SPECIAL, ft_id, 10);
+	set_sci_style(sci, SCE_LISP_KEYWORD_KW, ft_id, 11);
 }
 
 
@@ -1431,6 +1421,7 @@ static void styleset_markup(ScintillaObject *sci, gboolean set_keywords)
 	set_sci_style(sci, SCE_HJA_SINGLESTRING, GEANY_FILETYPES_XML, 52);
 	set_sci_style(sci, SCE_HJA_SYMBOLS, GEANY_FILETYPES_XML, 53);
 	set_sci_style(sci, SCE_HJA_STRINGEOL, GEANY_FILETYPES_XML, 54);
+	set_sci_style(sci, SCE_HJA_REGEX, GEANY_FILETYPES_XML, 55);
 
 	/* for embedded Python we use the Python styles */
 	set_sci_style(sci, SCE_HP_START, GEANY_FILETYPES_XML, 43);
@@ -1801,7 +1792,7 @@ static void styleset_r(ScintillaObject *sci, gint ft_id)
 
 static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 35);
+	new_styleset(ft_id, 34);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[1]);
 	get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]);
@@ -1824,19 +1815,18 @@ static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 	get_keyfile_style(config, config_home, "stdin", &style_sets[ft_id].styling[19]);
 	get_keyfile_style(config, config_home, "stdout", &style_sets[ft_id].styling[20]);
 	get_keyfile_style(config, config_home, "stderr", &style_sets[ft_id].styling[21]);
-	get_keyfile_style(config, config_home, "datasection", &style_sets[ft_id].styling[22]);
-	get_keyfile_style(config, config_home, "regex", &style_sets[ft_id].styling[23]);
-	get_keyfile_style(config, config_home, "here_q", &style_sets[ft_id].styling[24]);
-	get_keyfile_style(config, config_home, "here_qq", &style_sets[ft_id].styling[25]);
-	get_keyfile_style(config, config_home, "here_qx", &style_sets[ft_id].styling[26]);
-	get_keyfile_style(config, config_home, "string_q", &style_sets[ft_id].styling[27]);
-	get_keyfile_style(config, config_home, "string_qq", &style_sets[ft_id].styling[28]);
-	get_keyfile_style(config, config_home, "string_qx", &style_sets[ft_id].styling[29]);
-	get_keyfile_style(config, config_home, "string_qr", &style_sets[ft_id].styling[30]);
-	get_keyfile_style(config, config_home, "string_qw", &style_sets[ft_id].styling[31]);
-	get_keyfile_style(config, config_home, "upper_bound", &style_sets[ft_id].styling[32]);
-	get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[33]);
-	get_keyfile_style(config, config_home, "pod", &style_sets[ft_id].styling[34]);
+	get_keyfile_style(config, config_home, "regex", &style_sets[ft_id].styling[22]);
+	get_keyfile_style(config, config_home, "here_q", &style_sets[ft_id].styling[23]);
+	get_keyfile_style(config, config_home, "here_qq", &style_sets[ft_id].styling[24]);
+	get_keyfile_style(config, config_home, "here_qx", &style_sets[ft_id].styling[25]);
+	get_keyfile_style(config, config_home, "string_q", &style_sets[ft_id].styling[26]);
+	get_keyfile_style(config, config_home, "string_qq", &style_sets[ft_id].styling[27]);
+	get_keyfile_style(config, config_home, "string_qx", &style_sets[ft_id].styling[28]);
+	get_keyfile_style(config, config_home, "string_qr", &style_sets[ft_id].styling[29]);
+	get_keyfile_style(config, config_home, "string_qw", &style_sets[ft_id].styling[30]);
+	get_keyfile_style(config, config_home, "upper_bound", &style_sets[ft_id].styling[31]);
+	get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[32]);
+	get_keyfile_style(config, config_home, "pod", &style_sets[ft_id].styling[33]);
 
 	style_sets[ft_id].keywords = g_new(gchar*, 2);
 	get_keyfile_keywords(config, config_home, "primary", ft_id, 0);
@@ -1873,19 +1863,18 @@ static void styleset_ruby(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_RB_STDIN, ft_id, 19);
 	set_sci_style(sci, SCE_RB_STDOUT, ft_id, 20);
 	set_sci_style(sci, SCE_RB_STDERR, ft_id, 21);
-	set_sci_style(sci, SCE_RB_DATASECTION, ft_id, 22);
-	set_sci_style(sci, SCE_RB_REGEX, ft_id, 23);
-	set_sci_style(sci, SCE_RB_HERE_Q, ft_id, 24);
-	set_sci_style(sci, SCE_RB_HERE_QQ, ft_id, 25);
-	set_sci_style(sci, SCE_RB_HERE_QX, ft_id, 26);
-	set_sci_style(sci, SCE_RB_STRING_Q, ft_id, 27);
-	set_sci_style(sci, SCE_RB_STRING_QQ, ft_id, 28);
-	set_sci_style(sci, SCE_RB_STRING_QX, ft_id, 29);
-	set_sci_style(sci, SCE_RB_STRING_QR, ft_id, 30);
-	set_sci_style(sci, SCE_RB_STRING_QW, ft_id, 31);
-	set_sci_style(sci, SCE_RB_UPPER_BOUND, ft_id, 32);
-	set_sci_style(sci, SCE_RB_ERROR, ft_id, 33);
-	set_sci_style(sci, SCE_RB_POD, ft_id, 34);
+	set_sci_style(sci, SCE_RB_REGEX, ft_id, 22);
+	set_sci_style(sci, SCE_RB_HERE_Q, ft_id, 23);
+	set_sci_style(sci, SCE_RB_HERE_QQ, ft_id, 24);
+	set_sci_style(sci, SCE_RB_HERE_QX, ft_id, 25);
+	set_sci_style(sci, SCE_RB_STRING_Q, ft_id, 26);
+	set_sci_style(sci, SCE_RB_STRING_QQ, ft_id, 27);
+	set_sci_style(sci, SCE_RB_STRING_QX, ft_id, 28);
+	set_sci_style(sci, SCE_RB_STRING_QR, ft_id, 29);
+	set_sci_style(sci, SCE_RB_STRING_QW, ft_id, 30);
+	set_sci_style(sci, SCE_RB_UPPER_BOUND, ft_id, 31);
+	set_sci_style(sci, SCE_RB_ERROR, ft_id, 32);
+	set_sci_style(sci, SCE_RB_POD, ft_id, 33);
 }
 
 
@@ -2247,7 +2236,7 @@ static void styleset_conf(ScintillaObject *sci, gint ft_id)
 
 static void styleset_asm_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 15);
+	new_styleset(ft_id, 16);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]);
 	get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]);
@@ -2263,6 +2252,7 @@ static void styleset_asm_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 	get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[12]);
 	get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[13]);
 	get_keyfile_style(config, config_home, "extinstruction", &style_sets[ft_id].styling[14]);
+	get_keyfile_style(config, config_home, "commentdirective", &style_sets[ft_id].styling[15]);
 
 	style_sets[ft_id].keywords = g_new(gchar*, 4);
 	get_keyfile_keywords(config, config_home, "instructions", ft_id, 0);
@@ -2298,6 +2288,7 @@ static void styleset_asm(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_ASM_CHARACTER, ft_id, 12);
 	set_sci_style(sci, SCE_ASM_STRINGEOL, ft_id, 13);
 	set_sci_style(sci, SCE_ASM_EXTINSTRUCTION, ft_id, 14);
+	set_sci_style(sci, SCE_ASM_COMMENTDIRECTIVE, ft_id, 15);
 }
 
 
@@ -2457,22 +2448,29 @@ static void styleset_fortran(ScintillaObject *sci, gint ft_id)
 
 static void styleset_sql_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 15);
+	new_styleset(ft_id, 18);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]);
 	get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]);
 	get_keyfile_style(config, config_home, "commentdoc", &style_sets[ft_id].styling[3]);
-	get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[4]);
-	get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[5]);
-	get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[6]);
-	get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[7]);
-	get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[8]);
-	get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[9]);
-	get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[10]);
-	get_keyfile_style(config, config_home, "sqlplus", &style_sets[ft_id].styling[11]);
-	get_keyfile_style(config, config_home, "sqlplus_prompt", &style_sets[ft_id].styling[12]);
-	get_keyfile_style(config, config_home, "sqlplus_comment", &style_sets[ft_id].styling[13]);
-	get_keyfile_style(config, config_home, "quotedidentifier", &style_sets[ft_id].styling[14]);
+	get_keyfile_style(config, config_home, "commentlinedoc", &style_sets[ft_id].styling[4]);
+	get_keyfile_style(config, config_home, "commentdockeyword", &style_sets[ft_id].styling[5]);
+	get_keyfile_style(config, config_home, "commentdockeyworderror", &style_sets[ft_id].styling[6]);
+	get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[7]);
+	get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[8]);
+	get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[9]);
+	get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[10]);
+	get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[11]);
+	get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[12]);
+	get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[13]);
+	get_keyfile_style(config, config_home, "sqlplus", &style_sets[ft_id].styling[14]);
+	get_keyfile_style(config, config_home, "sqlplus_prompt", &style_sets[ft_id].styling[15]);
+	get_keyfile_style(config, config_home, "sqlplus_comment", &style_sets[ft_id].styling[16]);
+	get_keyfile_style(config, config_home, "quotedidentifier", &style_sets[ft_id].styling[17]);
+	/*get_keyfile_style(config, config_home, "user1", &style_sets[ft_id].styling[18]);
+	get_keyfile_style(config, config_home, "user2", &style_sets[ft_id].styling[19]);
+	get_keyfile_style(config, config_home, "user3", &style_sets[ft_id].styling[20]);
+	get_keyfile_style(config, config_home, "user4", &style_sets[ft_id].styling[21]);*/
 
 	style_sets[ft_id].keywords = g_new(gchar*, 2);
 	get_keyfile_keywords(config, config_home, "keywords", ft_id, 0);
@@ -2491,17 +2489,25 @@ static void styleset_sql(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_SQL_COMMENT, ft_id, 1);
 	set_sci_style(sci, SCE_SQL_COMMENTLINE, ft_id, 2);
 	set_sci_style(sci, SCE_SQL_COMMENTDOC, ft_id, 3);
-	set_sci_style(sci, SCE_SQL_NUMBER, ft_id, 4);
-	set_sci_style(sci, SCE_SQL_WORD, ft_id, 5);
-	set_sci_style(sci, SCE_SQL_WORD2, ft_id, 6);
-	set_sci_style(sci, SCE_SQL_STRING, ft_id, 7);
-	set_sci_style(sci, SCE_SQL_CHARACTER, ft_id, 8);
-	set_sci_style(sci, SCE_SQL_OPERATOR, ft_id, 9);
-	set_sci_style(sci, SCE_SQL_IDENTIFIER, ft_id, 10);
-	set_sci_style(sci, SCE_SQL_SQLPLUS, ft_id, 11);
-	set_sci_style(sci, SCE_SQL_SQLPLUS_PROMPT, ft_id, 12);
-	set_sci_style(sci, SCE_SQL_SQLPLUS_COMMENT, ft_id, 13);
-	set_sci_style(sci, SCE_SQL_QUOTEDIDENTIFIER, ft_id, 14);
+	set_sci_style(sci, SCE_SQL_COMMENTLINEDOC, ft_id, 4);
+	set_sci_style(sci, SCE_SQL_COMMENTDOCKEYWORD, ft_id, 5);
+	set_sci_style(sci, SCE_SQL_COMMENTDOCKEYWORDERROR, ft_id, 6);
+	set_sci_style(sci, SCE_SQL_NUMBER, ft_id, 7);
+	set_sci_style(sci, SCE_SQL_WORD, ft_id, 8);
+	set_sci_style(sci, SCE_SQL_WORD2, ft_id, 9);
+	set_sci_style(sci, SCE_SQL_STRING, ft_id, 10);
+	set_sci_style(sci, SCE_SQL_CHARACTER, ft_id, 11);
+	set_sci_style(sci, SCE_SQL_OPERATOR, ft_id, 12);
+	set_sci_style(sci, SCE_SQL_IDENTIFIER, ft_id, 13);
+	set_sci_style(sci, SCE_SQL_SQLPLUS, ft_id, 14);
+	set_sci_style(sci, SCE_SQL_SQLPLUS_PROMPT, ft_id, 15);
+	set_sci_style(sci, SCE_SQL_SQLPLUS_COMMENT, ft_id, 16);
+	set_sci_style(sci, SCE_SQL_QUOTEDIDENTIFIER, ft_id, 17);
+	/* these are for user-defined keywords we don't set yet */
+	/*set_sci_style(sci, SCE_SQL_USER1, ft_id, 18);
+	set_sci_style(sci, SCE_SQL_USER2, ft_id, 19);
+	set_sci_style(sci, SCE_SQL_USER3, ft_id, 20);
+	set_sci_style(sci, SCE_SQL_USER4, ft_id, 21);*/
 }
 
 
@@ -2618,7 +2624,7 @@ static void styleset_haskell(ScintillaObject *sci, gint ft_id)
 
 static void styleset_caml_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 14);
+	new_styleset(ft_id, 16);
 
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]);
@@ -2628,12 +2634,14 @@ static void styleset_caml_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 	get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[5]);
 	get_keyfile_style(config, config_home, "keyword", &style_sets[ft_id].styling[6]);
 	get_keyfile_style(config, config_home, "keyword2", &style_sets[ft_id].styling[7]);
-	get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[8]);
-	get_keyfile_style(config, config_home, "char", &style_sets[ft_id].styling[9]);
-	get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]);
-	get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[11]);
-	get_keyfile_style(config, config_home, "tagname", &style_sets[ft_id].styling[12]);
-	get_keyfile_style(config, config_home, "linenum", &style_sets[ft_id].styling[13]);
+	get_keyfile_style(config, config_home, "keyword3", &style_sets[ft_id].styling[8]);
+	get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[9]);
+	get_keyfile_style(config, config_home, "char", &style_sets[ft_id].styling[10]);
+	get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[11]);
+	get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[12]);
+	get_keyfile_style(config, config_home, "tagname", &style_sets[ft_id].styling[13]);
+	get_keyfile_style(config, config_home, "linenum", &style_sets[ft_id].styling[14]);
+	get_keyfile_style(config, config_home, "white", &style_sets[ft_id].styling[15]);
 
 	style_sets[ft_id].keywords = g_new(gchar*, 3);
 	get_keyfile_keywords(config, config_home, "keywords", ft_id, 0);
@@ -2658,18 +2666,20 @@ static void styleset_caml(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_CAML_NUMBER, ft_id, 5);
 	set_sci_style(sci, SCE_CAML_KEYWORD, ft_id, 6);
 	set_sci_style(sci, SCE_CAML_KEYWORD2, ft_id, 7);
-	set_sci_style(sci, SCE_CAML_STRING, ft_id, 8);
-	set_sci_style(sci, SCE_CAML_CHAR, ft_id, 9);
-	set_sci_style(sci, SCE_CAML_OPERATOR, ft_id, 10);
-	set_sci_style(sci, SCE_CAML_IDENTIFIER, ft_id, 11);
-	set_sci_style(sci, SCE_CAML_TAGNAME, ft_id, 12);
-	set_sci_style(sci, SCE_CAML_LINENUM, ft_id, 13);
+	set_sci_style(sci, SCE_CAML_KEYWORD3, ft_id, 8);
+	set_sci_style(sci, SCE_CAML_STRING, ft_id, 9);
+	set_sci_style(sci, SCE_CAML_CHAR, ft_id, 10);
+	set_sci_style(sci, SCE_CAML_OPERATOR, ft_id, 11);
+	set_sci_style(sci, SCE_CAML_IDENTIFIER, ft_id, 12);
+	set_sci_style(sci, SCE_CAML_TAGNAME, ft_id, 13);
+	set_sci_style(sci, SCE_CAML_LINENUM, ft_id, 14);
+	set_sci_style(sci, SCE_CAML_WHITE, ft_id, 15);
 }
 
 
 static void styleset_tcl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
-	new_styleset(ft_id, 16);
+	new_styleset(ft_id, 18);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
 	get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]);
 	get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]);
@@ -2686,6 +2696,11 @@ static void styleset_tcl_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 	get_keyfile_style(config, config_home, "worditcl", &style_sets[ft_id].styling[13]);
 	get_keyfile_style(config, config_home, "wordtkcmds", &style_sets[ft_id].styling[14]);
 	get_keyfile_style(config, config_home, "wordexpand", &style_sets[ft_id].styling[15]);
+	get_keyfile_style(config, config_home, "commentbox", &style_sets[ft_id].styling[16]);
+	get_keyfile_style(config, config_home, "blockcomment", &style_sets[ft_id].styling[17]);
+	/*get_keyfile_style(config, config_home, "user1", &style_sets[ft_id].styling[18]);
+	get_keyfile_style(config, config_home, "user2", &style_sets[ft_id].styling[19]);
+	get_keyfile_style(config, config_home, "user3", &style_sets[ft_id].styling[20]);*/
 
 	style_sets[ft_id].keywords = g_new(gchar*, 6);
 	get_keyfile_keywords(config, config_home, "tcl", ft_id, 0);
@@ -2724,6 +2739,12 @@ static void styleset_tcl(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_TCL_WORD3, ft_id, 13);
 	set_sci_style(sci, SCE_TCL_WORD4, ft_id, 14);
 	set_sci_style(sci, SCE_TCL_WORD5, ft_id, 15);
+	set_sci_style(sci, SCE_TCL_COMMENT_BOX, ft_id, 16);
+	set_sci_style(sci, SCE_TCL_BLOCK_COMMENT, ft_id, 17);
+	/* these are for user-defined keywords we don't set yet */
+	/*set_sci_style(sci, SCE_TCL_WORD6, ft_id, 18);
+	set_sci_style(sci, SCE_TCL_WORD7, ft_id, 19);
+	set_sci_style(sci, SCE_TCL_WORD8, ft_id, 20);*/
 }
 
 static void styleset_txt2tags_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
@@ -2852,6 +2873,8 @@ static void styleset_d_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 	get_keyfile_style(config, config_home, "commentlinedoc", &style_sets[ft_id].styling[15]);
 	get_keyfile_style(config, config_home, "commentdockeyword", &style_sets[ft_id].styling[16]);
 	get_keyfile_style(config, config_home, "commentdockeyworderror", &style_sets[ft_id].styling[17]);
+	/*get_keyfile_style(config, config_home, "word6", &style_sets[ft_id].styling[18]);
+	get_keyfile_style(config, config_home, "word7", &style_sets[ft_id].styling[19]);*/
 
 	style_sets[ft_id].keywords = g_new(gchar*, 5);
 	get_keyfile_keywords(config, config_home, "primary", ft_id, 0);
@@ -2897,6 +2920,9 @@ static void styleset_d(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_D_COMMENTLINEDOC, ft_id, 15);
 	set_sci_style(sci, SCE_D_COMMENTDOCKEYWORD, ft_id, 16);
 	set_sci_style(sci, SCE_D_COMMENTDOCKEYWORDERROR, ft_id, 17);
+	/* these are for user-defined keywords we don't set yet */
+	/*set_sci_style(sci, SCE_D_WORD6, ft_id, 18);
+	set_sci_style(sci, SCE_D_WORD7, ft_id, 19);*/
 }
 
 
@@ -3940,7 +3966,10 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 		case SCLEX_SQL:
 			return (style == SCE_SQL_COMMENT ||
 				style == SCE_SQL_COMMENTLINE ||
-				style == SCE_SQL_COMMENTDOC);
+				style == SCE_SQL_COMMENTDOC ||
+				style == SCE_SQL_COMMENTLINEDOC ||
+				style == SCE_SQL_COMMENTDOCKEYWORD ||
+				style == SCE_SQL_COMMENTDOCKEYWORDERROR);
 
 		case SCLEX_TCL:
 			return (style == SCE_TCL_COMMENT ||
@@ -3995,6 +4024,11 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 		case SCLEX_ADA:
 			return (style == SCE_ADA_COMMENTLINE ||
 				style == SCE_NSIS_COMMENTBOX);
+
+		case SCLEX_ASM:
+			return (style == SCE_ASM_COMMENT ||
+				style == SCE_ASM_COMMENTBLOCK ||
+				style == SCE_ASM_COMMENTDIRECTIVE);
 	}
 	return FALSE;
 }

From 3f31453acee15b09925ddca5dde1ea5d7bfaf194 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sun, 6 Nov 2011 01:12:42 +0100
Subject: [PATCH 65/70] Fix various integer sign and size issues

---
 src/build.c        |   8 +-
 src/callbacks.c    |   6 +-
 src/document.c     |   2 +-
 src/editor.c       |   4 +-
 src/filetypes.c    |   8 +-
 src/filetypes.h    |   2 +-
 src/highlighting.c | 224 ++++++++++++++++++++++-----------------------
 src/highlighting.h |   2 +-
 src/sciwrappers.c  |   2 +-
 src/sciwrappers.h  |   2 +-
 src/symbols.c      |   2 +-
 src/symbols.h      |   2 +-
 12 files changed, 133 insertions(+), 131 deletions(-)

diff --git a/src/build.c b/src/build.c
index 98035f24..6e6ac176 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1390,7 +1390,7 @@ static void create_build_menu_item(GtkWidget *menu, GeanyKeyGroup *group, GtkAcc
 	}
 	gtk_widget_show(item);
 	if (bs->key_binding >= 0)
-		add_menu_accel(group, bs->key_binding, ag, item);
+		add_menu_accel(group, (guint) bs->key_binding, ag, item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	if (bs->cb != NULL)
 	{
@@ -2304,7 +2304,8 @@ static const gchar *fixedkey="xx_xx_xx";
 static void build_load_menu_grp(GKeyFile *config, GeanyBuildCommand **dst, gint grp,
 								gchar *prefix, gboolean loc)
 {
-	gint cmd, prefixlen; /* NOTE prefixlen used in macros above */
+	gint cmd;
+	gsize prefixlen; /* NOTE prefixlen used in macros above */
 	GeanyBuildCommand *dstcmd;
 	gchar *key;
 	static gchar cmdbuf[3] = "  ";
@@ -2515,7 +2516,8 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p)
 
 static gint build_save_menu_grp(GKeyFile *config, GeanyBuildCommand *src, gint grp, gchar *prefix)
 {
-	gint cmd, prefixlen; /* NOTE prefixlen used in macros above */
+	gint cmd;
+	gsize prefixlen; /* NOTE prefixlen used in macros above */
 	gchar *key;
 	gint count = 0;
 	enum GeanyBuildCmdEntries i;
diff --git a/src/callbacks.c b/src/callbacks.c
index 3c7498cc..5429e14f 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -185,9 +185,9 @@ void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data)
 
 void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-	gint i, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
+	guint i, max = (guint) gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
 	GeanyDocument *doc, *cur_doc = document_get_current();
-	gint count = 0;
+	guint count = 0;
 
 	/* iterate over documents in tabs order */
 	for (i = 0; i < max; i++)
@@ -734,7 +734,7 @@ void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data)
 		gchar *result = NULL;
 		gint cmd = SCI_LOWERCASE;
 		gint text_len = sci_get_selected_text_length(sci);
-		gboolean rectsel = scintilla_send_message(sci, SCI_SELECTIONISRECTANGLE, 0, 0);
+		gboolean rectsel = (gboolean) scintilla_send_message(sci, SCI_SELECTIONISRECTANGLE, 0, 0);
 
 		text = g_malloc(text_len + 1);
 		sci_get_selected_text(sci, text);
diff --git a/src/document.c b/src/document.c
index a00d4487..043ad727 100644
--- a/src/document.c
+++ b/src/document.c
@@ -2310,7 +2310,7 @@ void document_update_tag_list_in_idle(GeanyDocument *doc)
  */
 void document_update_type_keywords(GeanyDocument *doc)
 {
-	gint keyword_idx;
+	guint keyword_idx;
 	gchar *keywords;
 	GString *str;
 	GPtrArray *tags_array;
diff --git a/src/editor.c b/src/editor.c
index 492b477b..55453399 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -600,10 +600,10 @@ static void check_line_breaking(GeanyEditor *editor, gint pos, gchar c)
 }
 
 
-static void show_autocomplete(ScintillaObject *sci, gint rootlen, const gchar *words)
+static void show_autocomplete(ScintillaObject *sci, gsize rootlen, const gchar *words)
 {
 	/* store whether a calltip is showing, so we can reshow it after autocompletion */
-	calltip.set = SSM(sci, SCI_CALLTIPACTIVE, 0, 0);
+	calltip.set = (gboolean) SSM(sci, SCI_CALLTIPACTIVE, 0, 0);
 	SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words);
 }
 
diff --git a/src/filetypes.c b/src/filetypes.c
index c4b1b2a5..f27707c1 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -1179,7 +1179,7 @@ static void load_indent_settings(GeanyFiletype *ft, GKeyFile *config, GKeyFile *
 }
 
 
-static void load_settings(gint ft_id, GKeyFile *config, GKeyFile *configh)
+static void load_settings(guint ft_id, GKeyFile *config, GKeyFile *configh)
 {
 	GeanyFiletype *ft = filetypes[ft_id];
 	gchar *result;
@@ -1369,13 +1369,13 @@ static void load_system_keyfile(GKeyFile *key_file, const gchar *file, GKeyFileF
 /* Load the configuration file for the associated filetype id.
  * This should only be called when the filetype is needed, to save loading
  * 20+ configuration files all at once. */
-void filetypes_load_config(gint ft_id, gboolean reload)
+void filetypes_load_config(guint ft_id, gboolean reload)
 {
 	GKeyFile *config, *config_home;
 	GeanyFiletypePrivate *pft;
 	GeanyFiletype *ft;
 
-	g_return_if_fail(ft_id >= 0 && ft_id < (gint) filetypes_array->len);
+	g_return_if_fail(ft_id < filetypes_array->len);
 
 	ft = filetypes[ft_id];
 	pft = ft->priv;
@@ -1528,7 +1528,7 @@ GeanyFiletype *filetypes_lookup_by_name(const gchar *name)
 }
 
 
-static gchar *get_regex_match_string(const gchar *message, regmatch_t *pmatch, gint match_idx)
+static gchar *get_regex_match_string(const gchar *message, regmatch_t *pmatch, guint match_idx)
 {
 	return g_strndup(&message[pmatch[match_idx].rm_so],
 		pmatch[match_idx].rm_eo - pmatch[match_idx].rm_so);
diff --git a/src/filetypes.h b/src/filetypes.h
index ed2dc26d..4e3cbeba 100644
--- a/src/filetypes.h
+++ b/src/filetypes.h
@@ -193,7 +193,7 @@ GeanyFiletype *filetypes_detect_from_file(const gchar *utf8_filename);
 
 void filetypes_free_types(void);
 
-void filetypes_load_config(gint ft_id, gboolean reload);
+void filetypes_load_config(guint ft_id, gboolean reload);
 
 void filetypes_save_commands(GeanyFiletype *ft);
 
diff --git a/src/highlighting.c b/src/highlighting.c
index 39fa5461..c060fdc2 100644
--- a/src/highlighting.c
+++ b/src/highlighting.c
@@ -129,7 +129,7 @@ static void sci_set_property(ScintillaObject *sci, const gchar *name, const gcha
 }
 
 
-static void new_styleset(gint file_type_id, gint styling_count)
+static void new_styleset(guint file_type_id, gsize styling_count)
 {
 	StyleSet *set = &style_sets[file_type_id];
 
@@ -138,7 +138,7 @@ static void new_styleset(gint file_type_id, gint styling_count)
 }
 
 
-static void free_styleset(gint file_type_id)
+static void free_styleset(guint file_type_id)
 {
 	StyleSet *style_ptr;
 	style_ptr = &style_sets[file_type_id];
@@ -158,7 +158,7 @@ static void free_styleset(gint file_type_id)
 
 
 static void get_keyfile_keywords(GKeyFile *config, GKeyFile *configh,
-				const gchar *key, gint ft_id, gint pos)
+				const gchar *key, guint ft_id, guint pos)
 {
 	style_sets[ft_id].keywords[pos] =
 		utils_get_setting(string, configh, config, "keywords", key, "");
@@ -383,7 +383,7 @@ static GeanyLexerStyle *get_style(guint ft_id, guint styling_index)
 }
 
 
-static void set_sci_style(ScintillaObject *sci, gint style, guint ft_id, guint styling_index)
+static void set_sci_style(ScintillaObject *sci, guint style, guint ft_id, guint styling_index)
 {
 	GeanyLexerStyle *style_ptr = get_style(ft_id, styling_index);
 
@@ -532,7 +532,7 @@ static void load_named_styles(GKeyFile *config, GKeyFile *config_home)
 }
 
 
-static void styleset_common_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_common_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	load_named_styles(config, config_home);
 
@@ -574,7 +574,7 @@ static void styleset_common_init(gint ft_id, GKeyFile *config, GKeyFile *config_
 }
 
 
-static void styleset_common(ScintillaObject *sci, filetype_id ft_id)
+static void styleset_common(ScintillaObject *sci, guint ft_id)
 {
 	SSM(sci, SCI_STYLECLEARALL, 0, 0);
 
@@ -764,7 +764,7 @@ static void styleset_common(ScintillaObject *sci, filetype_id ft_id)
 
 /* Merge & assign global typedefs and user secondary keywords.
  * keyword_idx is used for both style_sets[].keywords and scintilla keyword style number */
-static void merge_type_keywords(ScintillaObject *sci, gint ft_id, gint keyword_idx)
+static void merge_type_keywords(ScintillaObject *sci, guint ft_id, guint keyword_idx)
 {
 	const gchar *user_words = style_sets[ft_id].keywords[keyword_idx];
 	GString *s;
@@ -784,7 +784,7 @@ static void merge_type_keywords(ScintillaObject *sci, gint ft_id, gint keyword_i
 
 /* All stylesets except None should call this. */
 static void
-apply_filetype_properties(ScintillaObject *sci, gint lexer, filetype_id ft_id)
+apply_filetype_properties(ScintillaObject *sci, guint lexer, guint ft_id)
 {
 	g_assert(ft_id != GEANY_FILETYPES_NONE);
 
@@ -812,8 +812,8 @@ static void load_style_entries(GKeyFile *config, GKeyFile *config_home, gint fil
 
 /* styles: the style IDs for the filetype.
  * STYLE_DEFAULT will be set to match the first style. */
-static void apply_style_entries(ScintillaObject *sci, gint filetype_idx,
-		gint *styles, gsize styles_len)
+static void apply_style_entries(ScintillaObject *sci, guint filetype_idx,
+		guint *styles, gsize styles_len)
 {
 	guint i;
 
@@ -828,7 +828,7 @@ static void apply_style_entries(ScintillaObject *sci, gint filetype_idx,
 
 /* call new_styleset(filetype_idx, >= 20) before using this. */
 static void
-styleset_c_like_init(GKeyFile *config, GKeyFile *config_home, gint filetype_idx)
+styleset_c_like_init(GKeyFile *config, GKeyFile *config_home, guint filetype_idx)
 {
 	const gchar *entries[] =
  	{
@@ -860,9 +860,9 @@ styleset_c_like_init(GKeyFile *config, GKeyFile *config_home, gint filetype_idx)
 }
 
 
-static void styleset_c_like(ScintillaObject *sci, gint ft_id, gint lexer)
+static void styleset_c_like(ScintillaObject *sci, guint ft_id, guint lexer)
 {
-	gint styles[] = {
+	guint styles[] = {
 		SCE_C_DEFAULT,
 		SCE_C_COMMENT,
 		SCE_C_COMMENTLINE,
@@ -895,7 +895,7 @@ static void styleset_c_like(ScintillaObject *sci, gint ft_id, gint lexer)
 }
 
 
-static void styleset_c_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_c_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	styleset_c_like_init(config, config_home, ft_id);
 
@@ -907,7 +907,7 @@ static void styleset_c_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 }
 
 
-static void styleset_c(ScintillaObject *sci, gint ft_id)
+static void styleset_c(ScintillaObject *sci, guint ft_id)
 {
 	styleset_c_like(sci, ft_id, SCLEX_CPP);
 
@@ -921,7 +921,7 @@ static void styleset_c(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_pascal_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_pascal_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 15);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -946,7 +946,7 @@ static void styleset_pascal_init(gint ft_id, GKeyFile *config, GKeyFile *config_
 }
 
 
-static void styleset_pascal(ScintillaObject *sci, gint ft_id)
+static void styleset_pascal(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_PASCAL, ft_id);
 
@@ -971,7 +971,7 @@ static void styleset_pascal(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_makefile_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_makefile_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 7);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -986,7 +986,7 @@ static void styleset_makefile_init(gint ft_id, GKeyFile *config, GKeyFile *confi
 }
 
 
-static void styleset_makefile(ScintillaObject *sci, gint ft_id)
+static void styleset_makefile(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_MAKEFILE, ft_id);
 
@@ -1001,7 +1001,7 @@ static void styleset_makefile(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_diff_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_diff_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 8);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1017,7 +1017,7 @@ static void styleset_diff_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_diff(ScintillaObject *sci, gint ft_id)
+static void styleset_diff(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_DIFF, ft_id);
 
@@ -1033,7 +1033,7 @@ static void styleset_diff(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_lisp_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_lisp_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 12);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1056,7 +1056,7 @@ static void styleset_lisp_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_lisp(ScintillaObject *sci, gint ft_id)
+static void styleset_lisp(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_LISP, ft_id);
 
@@ -1079,7 +1079,7 @@ static void styleset_lisp(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_erlang_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_erlang_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 26);
 	get_keyfile_style(config, config_home, "default",			&style_sets[ft_id].styling[0]);
@@ -1120,7 +1120,7 @@ static void styleset_erlang_init(gint ft_id, GKeyFile *config, GKeyFile *config_
 }
 
 
-static void styleset_erlang(ScintillaObject *sci, gint ft_id)
+static void styleset_erlang(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_ERLANG, ft_id);
 
@@ -1161,7 +1161,7 @@ static void styleset_erlang(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_latex_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_latex_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 13);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1184,7 +1184,7 @@ static void styleset_latex_init(gint ft_id, GKeyFile *config, GKeyFile *config_h
 }
 
 
-static void styleset_latex(ScintillaObject *sci, gint ft_id)
+static void styleset_latex(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_LATEX, ft_id);
 
@@ -1207,14 +1207,14 @@ static void styleset_latex(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_php_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_php_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	style_sets[ft_id].styling = NULL;
 	style_sets[ft_id].keywords = NULL;
 }
 
 
-static void styleset_php(ScintillaObject *sci, gint ft_id)
+static void styleset_php(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_HTML, ft_id);
 
@@ -1223,14 +1223,14 @@ static void styleset_php(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_html_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_html_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	style_sets[ft_id].styling = NULL;
 	style_sets[ft_id].keywords = NULL;
 }
 
 
-static void styleset_html(ScintillaObject *sci, gint ft_id)
+static void styleset_html(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_HTML, ft_id);
 
@@ -1239,7 +1239,7 @@ static void styleset_html(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_markup_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_markup_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(GEANY_FILETYPES_XML, 56);
 	get_keyfile_style(config, config_home, "html_default", &style_sets[GEANY_FILETYPES_XML].styling[0]);
@@ -1472,7 +1472,7 @@ static void styleset_markup(ScintillaObject *sci, gboolean set_keywords)
 }
 
 
-static void styleset_java_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_java_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	styleset_c_like_init(config, config_home, ft_id);
 
@@ -1485,7 +1485,7 @@ static void styleset_java_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_java(ScintillaObject *sci, gint ft_id)
+static void styleset_java(ScintillaObject *sci, guint ft_id)
 {
 	styleset_c_like(sci, ft_id, SCLEX_CPP);
 
@@ -1500,7 +1500,7 @@ static void styleset_java(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_perl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_perl_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 45);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1556,7 +1556,7 @@ static void styleset_perl_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_perl(ScintillaObject *sci, gint ft_id)
+static void styleset_perl(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_PERL, ft_id);
 
@@ -1611,7 +1611,7 @@ static void styleset_perl(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_python_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_python_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 16);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1638,7 +1638,7 @@ static void styleset_python_init(gint ft_id, GKeyFile *config, GKeyFile *config_
 }
 
 
-static void styleset_python(ScintillaObject *sci, gint ft_id)
+static void styleset_python(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_PYTHON, ft_id);
 
@@ -1665,7 +1665,7 @@ static void styleset_python(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_cmake_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_cmake_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 15);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1692,7 +1692,7 @@ static void styleset_cmake_init(gint ft_id, GKeyFile *config, GKeyFile *config_h
 }
 
 
-static void styleset_cmake(ScintillaObject *sci, gint ft_id)
+static void styleset_cmake(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_CMAKE, ft_id);
 
@@ -1719,7 +1719,7 @@ static void styleset_cmake(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_cobol_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_cobol_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	styleset_c_like_init(config, config_home, ft_id);
 
@@ -1731,7 +1731,7 @@ static void styleset_cobol_init(gint ft_id, GKeyFile *config, GKeyFile *config_h
 }
 
 
-static void styleset_cobol(ScintillaObject *sci, gint ft_id)
+static void styleset_cobol(ScintillaObject *sci, guint ft_id)
 {
 	styleset_c_like(sci, ft_id, SCLEX_COBOL);
 
@@ -1741,7 +1741,7 @@ static void styleset_cobol(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_r_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_r_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 12);
 
@@ -1766,7 +1766,7 @@ static void styleset_r_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 }
 
 
-static void styleset_r(ScintillaObject *sci, gint ft_id)
+static void styleset_r(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_R, ft_id);
 
@@ -1790,7 +1790,7 @@ static void styleset_r(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_ruby_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 34);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1834,7 +1834,7 @@ static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_ruby(ScintillaObject *sci, gint ft_id)
+static void styleset_ruby(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_RUBY, ft_id);
 
@@ -1878,7 +1878,7 @@ static void styleset_ruby(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_sh_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_sh_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 14);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1902,7 +1902,7 @@ static void styleset_sh_init(gint ft_id, GKeyFile *config, GKeyFile *config_home
 }
 
 
-static void styleset_sh(ScintillaObject *sci, gint ft_id)
+static void styleset_sh(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_BASH, ft_id);
 
@@ -1926,7 +1926,7 @@ static void styleset_sh(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_xml(ScintillaObject *sci, gint ft_id)
+static void styleset_xml(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_XML, ft_id);
 
@@ -1935,7 +1935,7 @@ static void styleset_xml(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_docbook_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_docbook_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 29);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -1975,7 +1975,7 @@ static void styleset_docbook_init(gint ft_id, GKeyFile *config, GKeyFile *config
 }
 
 
-static void styleset_docbook(ScintillaObject *sci, gint ft_id)
+static void styleset_docbook(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_XML, ft_id);
 
@@ -2019,7 +2019,7 @@ static void styleset_docbook(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_default(ScintillaObject *sci, gint ft_id)
+static void styleset_default(ScintillaObject *sci, guint ft_id)
 {
 	SSM(sci, SCI_SETLEXER, SCLEX_NULL, 0);
 
@@ -2030,7 +2030,7 @@ static void styleset_default(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_css_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_css_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 23);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2070,7 +2070,7 @@ static void styleset_css_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 }
 
 
-static void styleset_css(ScintillaObject *sci, gint ft_id)
+static void styleset_css(ScintillaObject *sci, guint ft_id)
 {
 	guint i;
 
@@ -2108,7 +2108,7 @@ static void styleset_css(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_nsis_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_nsis_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 19);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2140,7 +2140,7 @@ static void styleset_nsis_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_nsis(ScintillaObject *sci, gint ft_id)
+static void styleset_nsis(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_NSIS, ft_id);
 
@@ -2172,7 +2172,7 @@ static void styleset_nsis(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_po_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_po_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 9);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2189,7 +2189,7 @@ static void styleset_po_init(gint ft_id, GKeyFile *config, GKeyFile *config_home
 }
 
 
-static void styleset_po(ScintillaObject *sci, gint ft_id)
+static void styleset_po(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_PO, ft_id);
 
@@ -2206,7 +2206,7 @@ static void styleset_po(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_conf_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_conf_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 6);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2220,7 +2220,7 @@ static void styleset_conf_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_conf(ScintillaObject *sci, gint ft_id)
+static void styleset_conf(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_PROPERTIES, ft_id);
 
@@ -2234,7 +2234,7 @@ static void styleset_conf(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_asm_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_asm_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 16);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2262,7 +2262,7 @@ static void styleset_asm_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 }
 
 
-static void styleset_asm(ScintillaObject *sci, gint ft_id)
+static void styleset_asm(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_ASM, ft_id);
 
@@ -2292,7 +2292,7 @@ static void styleset_asm(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_f77_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_f77_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 15);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2319,7 +2319,7 @@ static void styleset_f77_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 }
 
 
-static void styleset_f77(ScintillaObject *sci, gint ft_id)
+static void styleset_f77(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_F77, ft_id);
 
@@ -2346,7 +2346,7 @@ static void styleset_f77(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_forth_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_forth_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 12);
 
@@ -2370,7 +2370,7 @@ static void styleset_forth_init(gint ft_id, GKeyFile *config, GKeyFile *config_h
 }
 
 
-static void styleset_forth(ScintillaObject *sci, gint ft_id)
+static void styleset_forth(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_FORTH, ft_id);
 
@@ -2392,7 +2392,7 @@ static void styleset_forth(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_fortran_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_fortran_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 15);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2419,7 +2419,7 @@ static void styleset_fortran_init(gint ft_id, GKeyFile *config, GKeyFile *config
 }
 
 
-static void styleset_fortran(ScintillaObject *sci, gint ft_id)
+static void styleset_fortran(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_FORTRAN, ft_id);
 
@@ -2446,7 +2446,7 @@ static void styleset_fortran(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_sql_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_sql_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 18);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2478,7 +2478,7 @@ static void styleset_sql_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 }
 
 
-static void styleset_sql(ScintillaObject *sci, gint ft_id)
+static void styleset_sql(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_SQL, ft_id);
 
@@ -2511,7 +2511,7 @@ static void styleset_sql(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_markdown_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_markdown_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 17);
 
@@ -2537,7 +2537,7 @@ static void styleset_markdown_init(gint ft_id, GKeyFile *config, GKeyFile *confi
 }
 
 
-static void styleset_markdown(ScintillaObject *sci, gint ft_id)
+static void styleset_markdown(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_MARKDOWN, ft_id);
 
@@ -2567,7 +2567,7 @@ static void styleset_markdown(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_haskell_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_haskell_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 17);
 
@@ -2595,7 +2595,7 @@ static void styleset_haskell_init(gint ft_id, GKeyFile *config, GKeyFile *config
 }
 
 
-static void styleset_haskell(ScintillaObject *sci, gint ft_id)
+static void styleset_haskell(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_HASKELL, ft_id);
 
@@ -2622,7 +2622,7 @@ static void styleset_haskell(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_caml_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_caml_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 16);
 
@@ -2650,7 +2650,7 @@ static void styleset_caml_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_caml(ScintillaObject *sci, gint ft_id)
+static void styleset_caml(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_CAML, ft_id);
 
@@ -2677,7 +2677,7 @@ static void styleset_caml(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_tcl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_tcl_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 18);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2712,7 +2712,7 @@ static void styleset_tcl_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 }
 
 
-static void styleset_tcl(ScintillaObject *sci, gint ft_id)
+static void styleset_tcl(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_TCL, ft_id);
 
@@ -2747,7 +2747,7 @@ static void styleset_tcl(ScintillaObject *sci, gint ft_id)
 	set_sci_style(sci, SCE_TCL_WORD8, ft_id, 20);*/
 }
 
-static void styleset_txt2tags_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_txt2tags_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 22);
 
@@ -2778,7 +2778,7 @@ static void styleset_txt2tags_init(gint ft_id, GKeyFile *config, GKeyFile *confi
 }
 
 
-static void styleset_txt2tags(ScintillaObject *sci, gint ft_id)
+static void styleset_txt2tags(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_TXT2TAGS, ft_id);
 
@@ -2812,7 +2812,7 @@ static void styleset_txt2tags(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_matlab_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_matlab_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 9);
 	get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]);
@@ -2831,7 +2831,7 @@ static void styleset_matlab_init(gint ft_id, GKeyFile *config, GKeyFile *config_
 }
 
 
-static void styleset_matlab(ScintillaObject *sci, gint ft_id)
+static void styleset_matlab(ScintillaObject *sci, guint ft_id)
 {
 	/* We use SCLEX_OCTAVE instead of SCLEX_MATLAB to also support Octave # comment char */
 	apply_filetype_properties(sci, SCLEX_OCTAVE, ft_id);
@@ -2851,7 +2851,7 @@ static void styleset_matlab(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_d_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_d_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 18);
 
@@ -2885,7 +2885,7 @@ static void styleset_d_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
 }
 
 
-static void styleset_d(ScintillaObject *sci, gint ft_id)
+static void styleset_d(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_D, ft_id);
 
@@ -2926,7 +2926,7 @@ static void styleset_d(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_ferite_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_ferite_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	styleset_c_like_init(config, config_home, ft_id);
 
@@ -2938,7 +2938,7 @@ static void styleset_ferite_init(gint ft_id, GKeyFile *config, GKeyFile *config_
 }
 
 
-static void styleset_ferite(ScintillaObject *sci, gint ft_id)
+static void styleset_ferite(ScintillaObject *sci, guint ft_id)
 {
 	styleset_c_like(sci, ft_id, SCLEX_CPP);
 
@@ -2948,7 +2948,7 @@ static void styleset_ferite(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_vhdl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_vhdl_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 15);
 
@@ -2980,7 +2980,7 @@ static void styleset_vhdl_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_vhdl(ScintillaObject *sci, gint ft_id)
+static void styleset_vhdl(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_VHDL, ft_id);
 
@@ -3011,7 +3011,7 @@ static void styleset_vhdl(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_verilog_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_verilog_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 14);
 
@@ -3038,7 +3038,7 @@ static void styleset_verilog_init(gint ft_id, GKeyFile *config, GKeyFile *config
 }
 
 
-static void styleset_verilog(ScintillaObject *sci, gint ft_id)
+static void styleset_verilog(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_VERILOG, ft_id);
 
@@ -3064,7 +3064,7 @@ static void styleset_verilog(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_yaml_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_yaml_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 10);
 
@@ -3085,7 +3085,7 @@ static void styleset_yaml_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_yaml(ScintillaObject *sci, gint ft_id)
+static void styleset_yaml(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_YAML, ft_id);
 
@@ -3105,7 +3105,7 @@ static void styleset_yaml(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_js_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_js_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	styleset_c_like_init(config, config_home, ft_id);
 
@@ -3116,7 +3116,7 @@ static void styleset_js_init(gint ft_id, GKeyFile *config, GKeyFile *config_home
 }
 
 
-static void styleset_js(ScintillaObject *sci, gint ft_id)
+static void styleset_js(ScintillaObject *sci, guint ft_id)
 {
 	styleset_c_like(sci, ft_id, SCLEX_CPP);
 
@@ -3125,7 +3125,7 @@ static void styleset_js(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_lua_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_lua_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 21);
 
@@ -3164,7 +3164,7 @@ static void styleset_lua_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 }
 
 
-static void styleset_lua(ScintillaObject *sci, gint ft_id)
+static void styleset_lua(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_LUA, ft_id);
 
@@ -3202,7 +3202,7 @@ static void styleset_lua(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_basic_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_basic_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 19);
 
@@ -3235,7 +3235,7 @@ static void styleset_basic_init(gint ft_id, GKeyFile *config, GKeyFile *config_h
 }
 
 
-static void styleset_basic(ScintillaObject *sci, gint ft_id)
+static void styleset_basic(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_FREEBASIC, ft_id);
 
@@ -3267,7 +3267,7 @@ static void styleset_basic(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_actionscript_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_actionscript_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	styleset_c_like_init(config, config_home, ft_id);
 
@@ -3279,7 +3279,7 @@ static void styleset_actionscript_init(gint ft_id, GKeyFile *config, GKeyFile *c
 }
 
 
-static void styleset_actionscript(ScintillaObject *sci, gint ft_id)
+static void styleset_actionscript(ScintillaObject *sci, guint ft_id)
 {
 	styleset_c_like(sci, ft_id, SCLEX_CPP);
 
@@ -3289,7 +3289,7 @@ static void styleset_actionscript(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_haxe_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_haxe_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	styleset_c_like_init(config, config_home, ft_id);
 
@@ -3301,7 +3301,7 @@ static void styleset_haxe_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
 }
 
 
-static void styleset_haxe(ScintillaObject *sci, gint ft_id)
+static void styleset_haxe(ScintillaObject *sci, guint ft_id)
 {
 	styleset_c_like(sci, ft_id, SCLEX_CPP);
 
@@ -3311,7 +3311,7 @@ static void styleset_haxe(ScintillaObject *sci, gint ft_id)
 }
 
 
-static void styleset_ada_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
+static void styleset_ada_init(guint ft_id, GKeyFile *config, GKeyFile *config_home)
 {
 	new_styleset(ft_id, 12);
 
@@ -3334,7 +3334,7 @@ static void styleset_ada_init(gint ft_id, GKeyFile *config, GKeyFile *config_hom
 }
 
 
-static void styleset_ada(ScintillaObject *sci, gint ft_id)
+static void styleset_ada(ScintillaObject *sci, guint ft_id)
 {
 	apply_filetype_properties(sci, SCLEX_ADA, ft_id);
 
@@ -3399,7 +3399,7 @@ static void read_properties(GeanyFiletype *ft, GKeyFile *config, GKeyFile *confi
 }
 
 
-static gint get_lexer_filetype(GeanyFiletype *ft)
+static guint get_lexer_filetype(GeanyFiletype *ft)
 {
 	ft = NVL(ft->lexer_filetype, ft);
 	return ft->id;
@@ -3413,10 +3413,10 @@ static gint get_lexer_filetype(GeanyFiletype *ft)
 		break
 
 /* Called by filetypes_load_config(). */
-void highlighting_init_styles(gint filetype_idx, GKeyFile *config, GKeyFile *configh)
+void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *configh)
 {
 	GeanyFiletype *ft = filetypes[filetype_idx];
-	gint lexer_id = get_lexer_filetype(ft);
+	guint lexer_id = get_lexer_filetype(ft);
 
 	if (!style_sets)
 		style_sets = g_new0(StyleSet, filetypes_array->len);
@@ -3504,7 +3504,7 @@ void highlighting_init_styles(gint filetype_idx, GKeyFile *config, GKeyFile *con
  * @param ft Filetype settings to use. */
 void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft)
 {
-	gint lexer_id = get_lexer_filetype(ft);
+	guint lexer_id = get_lexer_filetype(ft);
 
 	filetypes_load_config(ft->id, FALSE);	/* load filetypes.ext */
 
@@ -3585,15 +3585,15 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft)
  * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with scintilla_send_message(). */
 const GeanyLexerStyle *highlighting_get_style(gint ft_id, gint style_id)
 {
-	if (ft_id < 0 || ft_id >= (gint)filetypes_array->len)
-		return NULL;
+	g_return_val_if_fail(ft_id >= 0 && (guint) ft_id < filetypes_array->len, NULL);
+	g_return_val_if_fail(style_id >= 0, NULL);
 
 	/* ensure filetype loaded */
-	filetypes_load_config(ft_id, FALSE);
+	filetypes_load_config((guint) ft_id, FALSE);
 
 	/* TODO: style_id might not be the real array index (Scintilla styles are not always synced
 	 * with array indices) */
-	return get_style(ft_id, style_id);
+	return get_style((guint) ft_id, (guint) style_id);
 }
 
 
diff --git a/src/highlighting.h b/src/highlighting.h
index 609ff9a3..13ab476a 100644
--- a/src/highlighting.h
+++ b/src/highlighting.h
@@ -41,7 +41,7 @@ GeanyLexerStyle;
 
 void highlighting_init(void);
 
-void highlighting_init_styles(gint filetype_idx, GKeyFile *config, GKeyFile *configh);
+void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *configh);
 
 void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft);
 
diff --git a/src/sciwrappers.c b/src/sciwrappers.c
index ca36768a..bc2a8a50 100644
--- a/src/sciwrappers.c
+++ b/src/sciwrappers.c
@@ -970,7 +970,7 @@ gint sci_replace_target(ScintillaObject *sci, const gchar *text, gboolean regex)
 }
 
 
-void sci_set_keywords(ScintillaObject *sci, gint k, const gchar *text)
+void sci_set_keywords(ScintillaObject *sci, guint k, const gchar *text)
 {
 	SSM(sci, SCI_SETKEYWORDS, k, (sptr_t) text);
 }
diff --git a/src/sciwrappers.h b/src/sciwrappers.h
index 7e36a54c..d909413c 100644
--- a/src/sciwrappers.h
+++ b/src/sciwrappers.h
@@ -144,7 +144,7 @@ void				sci_set_target_end			(ScintillaObject *sci, gint end);
 gint				sci_get_target_end			(ScintillaObject *sci);
 gint				sci_replace_target			(ScintillaObject *sci, const gchar *text, gboolean regex);
 
-void				sci_set_keywords			(ScintillaObject *sci, gint k, const gchar *text);
+void				sci_set_keywords			(ScintillaObject *sci, guint k, const gchar *text);
 gint				sci_get_lexer				(ScintillaObject *sci);
 void				sci_set_readonly			(ScintillaObject *sci, gboolean readonly);
 gint				sci_get_zoom				(ScintillaObject *sci);
diff --git a/src/symbols.c b/src/symbols.c
index 8b1b7f94..826555d4 100644
--- a/src/symbols.c
+++ b/src/symbols.c
@@ -160,7 +160,7 @@ static gboolean symbols_load_global_tags(const gchar *tags_file, GeanyFiletype *
 
 /* Ensure that the global tags file(s) for the file_type_idx filetype is loaded.
  * This provides autocompletion, calltips, etc. */
-void symbols_global_tags_loaded(gint file_type_idx)
+void symbols_global_tags_loaded(guint file_type_idx)
 {
 	TagFileInfo *tfi;
 	gint tag_type;
diff --git a/src/symbols.h b/src/symbols.h
index d71af3aa..c596cc8e 100644
--- a/src/symbols.h
+++ b/src/symbols.h
@@ -39,7 +39,7 @@ void symbols_finalize(void);
 
 void symbols_reload_config_files(void);
 
-void symbols_global_tags_loaded(gint file_type_idx);
+void symbols_global_tags_loaded(guint file_type_idx);
 
 GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gint lang);
 

From 4d92e0530b7e64f4cbeda2d264b7e705cfd75699 Mon Sep 17 00:00:00 2001
From: Lex Trotman <elextr@gmail.com>
Date: Sun, 6 Nov 2011 18:10:56 +1100
Subject: [PATCH 66/70] Fix warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix warnings that appeared with GCC 4.6
js.c:1067:10: warning: variable ‘is_prototype’ set but not used
dialogs.c:173:2: warning: missing initializer
dialogs.c:173:2: warning: (near initialization for ‘value.data’)
sidebar.c:534:17: warning: unused variable ‘doc’
---
 src/dialogs.c   | 2 +-
 src/sidebar.c   | 1 -
 tagmanager/js.c | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/dialogs.c b/src/dialogs.c
index d2e99ebe..22a772ac 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -170,7 +170,7 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response)
 
 static void on_file_open_notify(GObject *filechooser, GParamSpec *pspec, gpointer data)
 {
-	GValue value = { 0 };
+	GValue value;
 
 	g_value_init(&value, pspec->value_type);
 	g_object_get_property(filechooser, pspec->name, &value);
diff --git a/src/sidebar.c b/src/sidebar.c
index f250f881..d59a1873 100644
--- a/src/sidebar.c
+++ b/src/sidebar.c
@@ -531,7 +531,6 @@ void sidebar_openfiles_update(GeanyDocument *doc)
 void sidebar_openfiles_update_all()
 {
 	guint i;
-	GeanyDocument *doc;
 
 	gtk_tree_store_clear(store_openfiles);
 	foreach_document (i)
diff --git a/tagmanager/js.c b/tagmanager/js.c
index 929023a8..347a1dcf 100644
--- a/tagmanager/js.c
+++ b/tagmanager/js.c
@@ -1064,7 +1064,6 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class)
 	boolean is_class = FALSE;
 	boolean is_terminated = TRUE;
 	boolean is_global = FALSE;
-	boolean is_prototype = FALSE;
 	boolean has_methods = FALSE;
 	vString *	fulltag;
 
@@ -1176,7 +1175,6 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class)
 					 */
 					makeClassTag (name);
 					is_class = TRUE;
-					is_prototype = TRUE;
 
 					/*
 					 * There should a ".function_name" next.

From 1e54fb6a015f02c5be2ab18faca7b2059ca0a114 Mon Sep 17 00:00:00 2001
From: Lex Trotman <elextr@gmail.com>
Date: Sun, 6 Nov 2011 20:58:32 +1100
Subject: [PATCH 67/70] Alter warning fix

Uninitialised GValue does not always work, but is an opaque type so
structure of initialiser isn't known.  Glib 2.30 on has G_VALUE_INIT
to use as initial value.  Fix so if not defined give it the previous literal
value { 0 }, although this leaves the warning, so it is not initialising
the GValue correctly but enough to work.
---
 src/dialogs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/dialogs.c b/src/dialogs.c
index 22a772ac..75dd2636 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -167,10 +167,13 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response)
 			app->project->base_path, NULL);
 }
 
+#ifndef G_VALUE_INIT
+#define G_VALUE_INIT { 0 }
+#endif
 
 static void on_file_open_notify(GObject *filechooser, GParamSpec *pspec, gpointer data)
 {
-	GValue value;
+	GValue value = G_VALUE_INIT;
 
 	g_value_init(&value, pspec->value_type);
 	g_object_get_property(filechooser, pspec->name, &value);

From f201434a280dcd8f37ac95f42923d838142d1093 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 6 Nov 2011 12:36:38 +0100
Subject: [PATCH 68/70] Adding Mongolian translation

---
 THANKS       |    1 +
 po/ChangeLog |    5 +
 po/mn.po     | 5582 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/about.c  |    1 +
 4 files changed, 5589 insertions(+)
 create mode 100644 po/mn.po

diff --git a/THANKS b/THANKS
index 898b9617..0a0ec722 100644
--- a/THANKS
+++ b/THANKS
@@ -126,6 +126,7 @@ Chikahiro Masami <cmasa(dot)z321(at)gmail(dot)com> - ja
 Park Jang-heon <dotkabi(at)gmail(dot)com> - ko
 Baurzhan Muftakhidinov <baurthefirst(at)gmail(dot)com> - kk
 Laurent Hoeltgen <hoeltgman(at)gmail(dot)com> - lb
+tsetsee <tsetsee(dot)yugi(at)gmail(dot)com> - mn
 Kurt De Bree <kdebree(at)telenet(dot)be> - nl
 Peter Scholtens <<peter(dot)scholtens(at)xs4all(dot)nl> - nl
 Ayke van Laethem <aykevanlaethem(at)gmail(dot)com> - nl
diff --git a/po/ChangeLog b/po/ChangeLog
index 723c9659..b9c99bfb 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-06  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
+
+ * mn.po: Added Mongolian translation. Thanks to Цэцэнцэнгэл.
+
+
 2011-10-30  Frank Lanitz  <frlan@frank.uvena.de>
 
  * pl.po: Update of Polish translation. Thanks to Wojciech Świderski.
diff --git a/po/mn.po b/po/mn.po
new file mode 100644
index 00000000..94cdf443
--- /dev/null
+++ b/po/mn.po
@@ -0,0 +1,5582 @@
+# Mongolian translations for Geany package.
+# Copyright (C) 2011 THE Geany'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Geany package.
+# tsetsee <tsetsee.yugi@gmail.com>, 2011.
+# Цэцэнцэнгэл <tsetsee.yugi@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Geany 1.22\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-06 12:27+0100\n"
+"PO-Revision-Date: 2011-11-04 14:52+0530\n"
+"Last-Translator: Цэцэнцэнгэл <tsetsee.yugi@gmail.com>\n"
+"Language-Team: Монгол <tsetsee.yugi@gmail.com>\n"
+"Language: mn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: ../geany.desktop.in.h:1
+#, fuzzy
+msgid "A fast and lightweight IDE using GTK2"
+msgstr "Хурдан авсаархан IDE"
+
+#: ../geany.desktop.in.h:2 ../src/interface.c:314 ../src/interface.c:1842
+msgid "Geany"
+msgstr ""
+
+#: ../geany.desktop.in.h:3
+msgid "Integrated Development Environment"
+msgstr ""
+
+#: ../src/about.c:153
+msgid "About Geany"
+msgstr "Жиенигийн тухай"
+
+#: ../src/about.c:203
+msgid "A fast and lightweight IDE"
+msgstr "Хурдан авсаархан IDE"
+
+#: ../src/about.c:224
+#, fuzzy, c-format
+msgid "(built on or after %s)"
+msgstr "(%s-ийг боловсруулах)"
+
+#. gtk_container_add(GTK_CONTAINER(info_box), cop_label);
+#: ../src/about.c:255
+msgid "Info"
+msgstr "Мэдээлэл"
+
+#: ../src/about.c:271
+msgid "Developers"
+msgstr "Хөгжүүлэгчид"
+
+#: ../src/about.c:280
+#, fuzzy
+msgid "maintainer"
+msgstr "Засварлагчид"
+
+#: ../src/about.c:288 ../src/about.c:296
+msgid "developer"
+msgstr "хөгжүүлэгч"
+
+#: ../src/about.c:304
+msgid "translation maintainer"
+msgstr "Орчуулга засварлагчид"
+
+#: ../src/about.c:313
+msgid "Translators"
+msgstr "Орчуулагчид"
+
+#: ../src/about.c:333
+#, fuzzy
+msgid "Previous Translators"
+msgstr "Орчуулагчид"
+
+#: ../src/about.c:354
+msgid "Contributors"
+msgstr ""
+
+#: ../src/about.c:364
+#, c-format
+msgid ""
+"Some of the many contributors (for a more detailed list, see the file %s):"
+msgstr ""
+
+#: ../src/about.c:390
+msgid "Credits"
+msgstr "Талархал"
+
+#: ../src/about.c:404
+msgid "License"
+msgstr "Лиценз"
+
+#: ../src/about.c:413
+msgid ""
+"License text could not be found, please visit http://www.gnu.org/licenses/"
+"gpl-2.0.txt to view it online."
+msgstr ""
+
+#. fall back to %d
+#: ../src/build.c:658
+#, c-format
+msgid "failed to substitute %%p, no project active"
+msgstr ""
+
+#: ../src/build.c:696
+#, fuzzy
+msgid "Process failed, no working directory"
+msgstr "%s-ийн хавтасыг солиход алдаа гарлаа"
+
+#: ../src/build.c:722
+#, c-format
+msgid "%s (in directory: %s)"
+msgstr "%s (%s хавтасд)"
+
+#: ../src/build.c:742 ../src/build.c:964 ../src/search.c:1619
+#, c-format
+msgid "Process failed (%s)"
+msgstr "Процесс-д алдаа гарлаа (%s)"
+
+#: ../src/build.c:810
+#, fuzzy, c-format
+msgid "Failed to change the working directory to \"%s\""
+msgstr "%s-ийн хавтасыг солиход алдаа гарлаа"
+
+#: ../src/build.c:839
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\" (start-script could not be created)"
+msgstr "%s-ийг ажиллуулахад алдаа гарлаа (start-script үүссэнгүй)"
+
+#: ../src/build.c:893
+msgid ""
+"Could not execute the file in the VTE because it probably contains a command."
+msgstr ""
+
+#: ../src/build.c:931
+#, fuzzy, c-format
+msgid ""
+"Could not find terminal \"%s\" (check path for Terminal tool setting in "
+"Preferences)"
+msgstr ""
+"'%s'-ээс терминалыг олсонгүй (Тохиргоо цэснээс Терминалын замыг шалгана уу)"
+
+#: ../src/build.c:1104
+msgid "Compilation failed."
+msgstr "Хөрвүүлэлтийн алдаа гарлаа."
+
+#: ../src/build.c:1118
+msgid "Compilation finished successfully."
+msgstr "Амжилттай хөрвүүлэгдлээ."
+
+#: ../src/build.c:1284
+#, fuzzy
+msgid "Custom Text"
+msgstr "Аргументтэйгээр Үүсгэх"
+
+#: ../src/build.c:1285
+#, fuzzy
+msgid "Enter custom text here, all entered text is appended to the command."
+msgstr "Тохиргоогоо энд бич. Бичсэн текст үүсгэх командад орно."
+
+#: ../src/build.c:1363
+msgid "_Next Error"
+msgstr "_Дараачийн Алдаа"
+
+#: ../src/build.c:1365
+#, fuzzy
+msgid "_Previous Error"
+msgstr "_Дараачийн Алдаа"
+
+#. arguments
+#: ../src/build.c:1375 ../src/build.c:2755
+msgid "_Set Build Commands"
+msgstr ""
+
+#: ../src/build.c:1659 ../src/toolbar.c:372
+#, fuzzy
+msgid "Build the current file"
+msgstr "Файлыг хөрвүүл"
+
+#: ../src/build.c:1670
+#, fuzzy
+msgid "Build the current file with Make and the default target"
+msgstr "Файлыг үүсгэх хэрэгсэл болон аргументтэйгээр боловсруул"
+
+#: ../src/build.c:1672
+#, fuzzy
+msgid "Build the current file with Make and the specified target"
+msgstr "Файлыг үүсгэх хэрэгсэл болон заагдсан аргументтэйгээр боловсруул"
+
+#: ../src/build.c:1674
+#, fuzzy
+msgid "Compile the current file with Make"
+msgstr "Файлыг хөрвүүл"
+
+#: ../src/build.c:1701
+#, c-format
+msgid "Process could not be stopped (%s)."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#: ../src/build.c:1718 ../src/build.c:1730
+msgid "No more build errors."
+msgstr "Боловсруулахад алдаа гараагүй"
+
+#. FIXME: we should pass either build dialog or project dialog instead of NULL for parent
+#: ../src/build.c:1826
+msgid "Set menu item label"
+msgstr ""
+
+#: ../src/build.c:1852 ../src/symbols.c:735
+msgid "Label"
+msgstr ""
+
+#: ../src/build.c:1853 ../src/symbols.c:730 ../src/tools.c:524
+#, fuzzy
+msgid "Command"
+msgstr " командууд"
+
+#: ../src/build.c:1854
+#, fuzzy
+msgid "Working directory"
+msgstr "%s (%s хавтасд)"
+
+#: ../src/build.c:1855
+msgid "Reset"
+msgstr ""
+
+#: ../src/build.c:1900
+msgid "Click to set menu item label"
+msgstr ""
+
+#: ../src/build.c:1984 ../src/build.c:1986
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr " командууд"
+
+#: ../src/build.c:1986
+#, fuzzy
+msgid "No filetype"
+msgstr "Файлын төрлийг заа:"
+
+#: ../src/build.c:1995 ../src/build.c:2030
+msgid "Error regular expression:"
+msgstr ""
+
+#: ../src/build.c:2023
+#, fuzzy
+msgid "Independent commands"
+msgstr " командууд"
+
+#: ../src/build.c:2055
+msgid "Note: Item 2 opens a dialog and appends the response to the command."
+msgstr ""
+
+#: ../src/build.c:2064
+#, fuzzy
+msgid "Execute commands"
+msgstr " командууд"
+
+#: ../src/build.c:2076
+#, c-format
+msgid ""
+"%d, %e, %f, %p are substituted in command and directory fields, see manual "
+"for details."
+msgstr ""
+
+#: ../src/build.c:2233
+msgid "Set Build Commands"
+msgstr ""
+
+#: ../src/build.c:2445
+msgid "_Compile"
+msgstr "_Хөрвүүл"
+
+#. build the code
+#: ../src/build.c:2452 ../src/build.c:2715 ../src/interface.c:1245
+msgid "_Build"
+msgstr "_Боловсруул"
+
+#: ../src/build.c:2459 ../src/build.c:2489 ../src/build.c:2683
+#, fuzzy
+msgid "_Execute"
+msgstr "Ажиллуул:"
+
+#. build the code with make custom
+#: ../src/build.c:2504 ../src/build.c:2681 ../src/build.c:2735
+msgid "Make Custom _Target"
+msgstr "_Аргументтэйгээр Үүсгэх"
+
+#. build the code with make object
+#: ../src/build.c:2506 ../src/build.c:2682 ../src/build.c:2743
+msgid "Make _Object"
+msgstr "_Объектыг боловсруул"
+
+#: ../src/build.c:2508 ../src/build.c:2680
+#, fuzzy
+msgid "_Make"
+msgstr "_Бүгдийг Үүсгэх\t"
+
+#. build the code with make all
+#: ../src/build.c:2727
+msgid "_Make All"
+msgstr "_Бүгдийг Үүсгэх\t"
+
+#: ../src/callbacks.c:147
+msgid "Do you really want to quit?"
+msgstr "Гармаар байна уу?"
+
+#: ../src/callbacks.c:205
+#, fuzzy, c-format
+msgid "%d file saved."
+msgid_plural "%d files saved."
+msgstr[0] "Шинэ файл нээгдлээ."
+msgstr[1] "Шинэ файл нээгдлээ."
+
+#: ../src/callbacks.c:429 ../src/document.c:2830 ../src/interface.c:385
+#: ../src/sidebar.c:696
+msgid "_Reload"
+msgstr "_Дахин ачаал"
+
+#: ../src/callbacks.c:430
+msgid "Any unsaved changes will be lost."
+msgstr "Хадгалаагүй өөрчлөлтүүд алга болно."
+
+#: ../src/callbacks.c:431
+#, c-format
+msgid "Are you sure you want to reload '%s'?"
+msgstr "'%s'-ийг дахин ачааллуулах уу?"
+
+#: ../src/callbacks.c:1055 ../src/keybindings.c:448
+msgid "Go to Line"
+msgstr ""
+
+#: ../src/callbacks.c:1056
+msgid "Enter the line you want to go to:"
+msgstr "Очих мөрөө оруул:"
+
+#: ../src/callbacks.c:1139 ../src/callbacks.c:1164
+msgid ""
+"Please set the filetype for the current file before using this function."
+msgstr "Энэ функцыг хэрэглэхийн өмнө файлынхаа төрлийг зааж өгнө үү."
+
+#: ../src/callbacks.c:1269 ../src/ui_utils.c:617
+msgid "dd.mm.yyyy"
+msgstr "өдөр.сар.жил"
+
+#: ../src/callbacks.c:1271 ../src/ui_utils.c:618
+msgid "mm.dd.yyyy"
+msgstr "сар.өдөр.жил"
+
+#: ../src/callbacks.c:1273 ../src/ui_utils.c:619
+msgid "yyyy/mm/dd"
+msgstr "жил/сар/өдөр"
+
+#: ../src/callbacks.c:1275 ../src/ui_utils.c:628
+msgid "dd.mm.yyyy hh:mm:ss"
+msgstr "өдөр.сар.жил цаг:мин:сек"
+
+#: ../src/callbacks.c:1277 ../src/ui_utils.c:629
+msgid "mm.dd.yyyy hh:mm:ss"
+msgstr "сар.өдөр.жил цаг:мин:сек"
+
+#: ../src/callbacks.c:1279 ../src/ui_utils.c:630
+msgid "yyyy/mm/dd hh:mm:ss"
+msgstr "жил/сар/өдөр цаг:мин:сек"
+
+#: ../src/callbacks.c:1281 ../src/ui_utils.c:639
+#, fuzzy
+msgid "_Use Custom Date Format"
+msgstr "Огнооны Хэлбэрүүдийг Хэрэглэх"
+
+#: ../src/callbacks.c:1285
+msgid "Custom Date Format"
+msgstr "Огнооны Хэлбэр"
+
+#: ../src/callbacks.c:1286
+#, fuzzy
+msgid ""
+"Enter here a custom date and time format. You can use any conversion "
+"specifiers which can be used with the ANSI C strftime function."
+msgstr ""
+"Огноо болон цагны хэлбэрийг оруул. Хувиргалт хийхдээ ANSI Cи хэлний strftime "
+"функцийг хэрэглэж болно. Дэлгэрэнгүй мэдээллийг \"man strftime\" гэж харна "
+"уу."
+
+#: ../src/callbacks.c:1309
+msgid "Date format string could not be converted (possibly too long)."
+msgstr "Огнооны хэлбэр тэмдэгт мөр-лүү хөрвөгдсөнгүй (Хэт урт байна)."
+
+#: ../src/callbacks.c:1502 ../src/callbacks.c:1510
+msgid "No more message items."
+msgstr "Мэдээ дууссан."
+
+#: ../src/dialogs.c:229
+msgid "Detect from file"
+msgstr "Файлаас тогтоо"
+
+#: ../src/dialogs.c:232
+msgid "West European"
+msgstr ""
+
+#: ../src/dialogs.c:234
+msgid "East European"
+msgstr ""
+
+#: ../src/dialogs.c:236
+msgid "East Asian"
+msgstr ""
+
+#: ../src/dialogs.c:238
+msgid "SE & SW Asian"
+msgstr ""
+
+#: ../src/dialogs.c:240
+msgid "Middle Eastern"
+msgstr ""
+
+#: ../src/dialogs.c:242 ../src/encodings.c:118 ../src/encodings.c:119
+#: ../src/encodings.c:120 ../src/encodings.c:121 ../src/encodings.c:122
+#: ../src/encodings.c:123 ../src/encodings.c:124 ../src/encodings.c:125
+msgid "Unicode"
+msgstr ""
+
+#: ../src/dialogs.c:291
+msgid "_More Options"
+msgstr ""
+
+#. line 1 with checkbox and encoding combo
+#: ../src/dialogs.c:298
+msgid "Show _hidden files"
+msgstr "_Нууц файлуудыг харуул"
+
+#: ../src/dialogs.c:309
+msgid "Set encoding:"
+msgstr "Энкодчиллыг заа:"
+
+#: ../src/dialogs.c:318
+msgid ""
+"Explicitly defines an encoding for the file, if it would not be detected. "
+"This is useful when you know that the encoding of a file cannot be detected "
+"correctly by Geany.\n"
+"Note if you choose multiple files, they will all be opened with the chosen "
+"encoding."
+msgstr ""
+"Жиени-гээр файлын энкод танигдахгүй тохиолдолд файлын энкодчиллыг цаанаас нь "
+"зааж өгсөн байна.\n"
+"Жич: Олон файлыг сонгосон бол бүгд сонгогдсон энкодчиллоор нээгдэнэ."
+
+#. line 2 with filetype combo
+#: ../src/dialogs.c:325
+msgid "Set filetype:"
+msgstr "Файлын төрлийг заа:"
+
+#: ../src/dialogs.c:335
+msgid ""
+"Explicitly defines a filetype for the file, if it would not be detected by "
+"filename extension.\n"
+"Note if you choose multiple files, they will all be opened with the chosen "
+"filetype."
+msgstr ""
+"Файлын өртгөтгөлөөр файлын төрлийг тодорхойлж чадахгүй бол файлын төрлийг "
+"цаанаас нь зааж өгсөн.\n"
+"Жич: Олон файл сонгосон бол бүгд сонгогдсон файлын төрлөөр нээгдэнэ."
+
+#: ../src/dialogs.c:364 ../src/dialogs.c:468
+msgid "Open File"
+msgstr "Файл Нээх"
+
+#: ../src/dialogs.c:368 ../src/interface.c:877
+msgid "_View"
+msgstr "_Харагдац"
+
+#: ../src/dialogs.c:370
+msgid ""
+"Opens the file in read-only mode. If you choose more than one file to open, "
+"all files will be opened read-only."
+msgstr ""
+"Файлыг зөвхөн харахаар нээх. Нэгээс олон файл нээх бол бүх файл харахаар л "
+"нээгдэнэ."
+
+#: ../src/dialogs.c:390
+msgid "Detect by file extension"
+msgstr "Файлыг өргөтгөлийг тогтоо"
+
+#: ../src/dialogs.c:547
+msgid "Overwrite?"
+msgstr ""
+
+#: ../src/dialogs.c:548
+msgid "Filename already exists!"
+msgstr ""
+
+#: ../src/dialogs.c:583 ../src/dialogs.c:709
+msgid "Save File"
+msgstr "Файлыг Хадгал"
+
+#: ../src/dialogs.c:592
+msgid "R_ename"
+msgstr ""
+
+#: ../src/dialogs.c:593
+msgid "Save the file and rename it"
+msgstr ""
+
+#: ../src/dialogs.c:601
+msgid "_Open file in a new tab"
+msgstr ""
+
+#: ../src/dialogs.c:604
+msgid ""
+"Keep the current unsaved document open and open the newly saved file in a "
+"new tab"
+msgstr ""
+
+#: ../src/dialogs.c:727 ../src/win32.c:679
+#, fuzzy
+msgid "Error"
+msgstr "_Дараачийн Алдаа"
+
+#: ../src/dialogs.c:730 ../src/dialogs.c:813 ../src/dialogs.c:1594
+#: ../src/win32.c:685
+msgid "Question"
+msgstr ""
+
+#: ../src/dialogs.c:733 ../src/win32.c:691
+msgid "Warning"
+msgstr ""
+
+#: ../src/dialogs.c:736 ../src/win32.c:697
+msgid "Information"
+msgstr ""
+
+#: ../src/dialogs.c:817
+msgid "_Don't save"
+msgstr "_Хадгалахгүй"
+
+#: ../src/dialogs.c:846
+#, c-format
+msgid "The file '%s' is not saved."
+msgstr "'%s' файл хадгалагдсангүй."
+
+#: ../src/dialogs.c:847
+msgid "Do you want to save it before closing?"
+msgstr "Хаахын өмнө хадгалах уу?"
+
+#: ../src/dialogs.c:908
+msgid "Choose font"
+msgstr "Фонтыг сонго"
+
+#: ../src/dialogs.c:1206
+msgid ""
+"An error occurred or file information could not be retrieved (e.g. from a "
+"new file)."
+msgstr ""
+"Алдаа гарсан эсвэл файлын мэдээллийг татаж чадахгүй байна (жишээ: шинэ "
+"файлаас)."
+
+#: ../src/dialogs.c:1225 ../src/dialogs.c:1226 ../src/dialogs.c:1227
+#: ../src/dialogs.c:1233 ../src/dialogs.c:1234 ../src/dialogs.c:1235
+#: ../src/symbols.c:1997 ../src/symbols.c:2018 ../src/symbols.c:2070
+#: ../src/ui_utils.c:242
+msgid "unknown"
+msgstr "үл танигдах"
+
+#: ../src/dialogs.c:1240 ../src/symbols.c:885
+msgid "Properties"
+msgstr "Шинж чанар"
+
+#: ../src/dialogs.c:1271
+msgid "<b>Type:</b>"
+msgstr "<b>Төрөл:</b>"
+
+#: ../src/dialogs.c:1285
+msgid "<b>Size:</b>"
+msgstr "<b>Хэмжээ:</b>"
+
+#: ../src/dialogs.c:1301
+msgid "<b>Location:</b>"
+msgstr "<b>Байршил:</b>"
+
+#: ../src/dialogs.c:1315
+msgid "<b>Read-only:</b>"
+msgstr "<b>Зөвхөн-нээхээр:</b>"
+
+#: ../src/dialogs.c:1322
+msgid "(only inside Geany)"
+msgstr "(зөвхөн Жиени-д)"
+
+#: ../src/dialogs.c:1331
+msgid "<b>Encoding:</b>"
+msgstr "<b>Энкодчлол:</b>"
+
+#: ../src/dialogs.c:1341 ../src/ui_utils.c:246
+msgid "(with BOM)"
+msgstr "(BOM-ээр)"
+
+#: ../src/dialogs.c:1341
+msgid "(without BOM)"
+msgstr "(BOM-гүй)"
+
+#: ../src/dialogs.c:1352
+msgid "<b>Modified:</b>"
+msgstr "<b>Сайжруулсан:</b>"
+
+#: ../src/dialogs.c:1366
+msgid "<b>Changed:</b>"
+msgstr "<b>Өөрчилсөн:</b>"
+
+#: ../src/dialogs.c:1380
+msgid "<b>Accessed:</b>"
+msgstr "<b>Хандсан:</b>"
+
+#: ../src/dialogs.c:1402
+msgid "<b>Permissions:</b>"
+msgstr "<b>Хандах эрх:</b>"
+
+#. Header
+#: ../src/dialogs.c:1410
+msgid "Read:"
+msgstr "Харах:"
+
+#: ../src/dialogs.c:1417
+msgid "Write:"
+msgstr "Бичих:"
+
+#: ../src/dialogs.c:1424
+msgid "Execute:"
+msgstr "Ажиллуул:"
+
+#. Owner
+#: ../src/dialogs.c:1432
+msgid "Owner:"
+msgstr "Эзэмшигч:"
+
+#. Group
+#: ../src/dialogs.c:1468
+msgid "Group:"
+msgstr "Бүлэг:"
+
+#. Other
+#: ../src/dialogs.c:1504
+msgid "Other:"
+msgstr "Бусад:"
+
+#: ../src/document.c:600
+#, c-format
+msgid "File %s closed."
+msgstr "%s файл хаагдлаа."
+
+#: ../src/document.c:745
+#, fuzzy, c-format
+msgid "New file \"%s\" opened."
+msgstr "Шинэ файл нээгдлээ."
+
+#: ../src/document.c:796 ../src/document.c:1319
+#, c-format
+msgid "Could not open file %s (%s)"
+msgstr "%s файлыг нээж чадахгүй байна (%s)"
+
+#: ../src/document.c:816
+#, c-format
+msgid "The file \"%s\" is not valid %s."
+msgstr "The file \"%s\" is not valid %s."
+
+#: ../src/document.c:822
+#, c-format
+msgid ""
+"The file \"%s\" does not look like a text file or the file encoding is not "
+"supported."
+msgstr ""
+"The file \"%s\" does not look like a text file or the file encoding is not "
+"supported."
+
+#: ../src/document.c:832
+#, c-format
+msgid ""
+"The file \"%s\" could not be opened properly and has been truncated. This "
+"can occur if the file contains a NULL byte. Be aware that saving it can "
+"cause data loss.\n"
+"The file was set to read-only."
+msgstr ""
+"The file \"%s\" could not be opened properly and has been truncated. This "
+"can occur if the file contains a NULL byte. Be aware that saving it can "
+"cause data loss.\n"
+"The file was set to read-only."
+
+#: ../src/document.c:1034
+msgid "Spaces"
+msgstr ""
+
+#: ../src/document.c:1037
+msgid "Tabs"
+msgstr ""
+
+#: ../src/document.c:1040
+msgid "Tabs and Spaces"
+msgstr ""
+
+#. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs
+#. * and Spaces), the second one is the filename
+#: ../src/document.c:1045
+#, c-format
+msgid "Setting %s indentation mode for %s."
+msgstr ""
+
+#: ../src/document.c:1056
+#, c-format
+msgid "Setting indentation width to %d for %s."
+msgstr ""
+
+#: ../src/document.c:1208
+#, c-format
+msgid "File %s reloaded."
+msgstr "File %s reloaded."
+
+#. For translators: this is the status window message for opening a file. %d is the number
+#. * of the newly opened file, %s indicates whether the file is opened read-only
+#. * (it is replaced with the string ", read-only").
+#: ../src/document.c:1216
+#, c-format
+msgid "File %s opened(%d%s)."
+msgstr "File %s opened(%d%s)."
+
+#: ../src/document.c:1218
+msgid ", read-only"
+msgstr ""
+
+#: ../src/document.c:1413
+msgid "Error renaming file."
+msgstr ""
+
+#: ../src/document.c:1500
+#, c-format
+msgid ""
+"An error occurred while converting the file from UTF-8 in \"%s\". The file "
+"remains unsaved."
+msgstr ""
+
+#: ../src/document.c:1522
+#, c-format
+msgid ""
+"Error message: %s\n"
+"The error occurred at \"%s\" (line: %d, column: %d)."
+msgstr ""
+
+#: ../src/document.c:1527
+#, fuzzy, c-format
+msgid "Error message: %s."
+msgstr "Мэдээ дууссан."
+
+#: ../src/document.c:1587
+#, c-format
+msgid "Failed to open file '%s' for writing: fopen() failed: %s"
+msgstr ""
+
+#: ../src/document.c:1605
+#, c-format
+msgid "Failed to write file '%s': fwrite() failed: %s"
+msgstr ""
+
+#: ../src/document.c:1619
+#, c-format
+msgid "Failed to close file '%s': fclose() failed: %s"
+msgstr ""
+
+#: ../src/document.c:1766
+#, c-format
+msgid "Error saving file (%s)."
+msgstr ""
+
+#: ../src/document.c:1771
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The file on disk may now be truncated!"
+msgstr ""
+
+#: ../src/document.c:1773
+msgid "Error saving file."
+msgstr ""
+
+#: ../src/document.c:1797
+#, c-format
+msgid "File %s saved."
+msgstr ""
+
+#: ../src/document.c:1874 ../src/document.c:1938 ../src/document.c:1946
+#, c-format
+msgid "\"%s\" was not found."
+msgstr ""
+
+#: ../src/document.c:1946
+msgid "Wrap search and find again?"
+msgstr ""
+
+#: ../src/document.c:2032 ../src/search.c:1274 ../src/search.c:1318
+#: ../src/search.c:2056 ../src/search.c:2057
+#, c-format
+msgid "No matches found for \"%s\"."
+msgstr ""
+
+#: ../src/document.c:2038
+#, c-format
+msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"."
+msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/document.c:2831
+#, fuzzy
+msgid "Do you want to reload it?"
+msgstr "'%s'-ийг дахин ачааллуулах уу?"
+
+#: ../src/document.c:2832
+#, c-format
+msgid ""
+"The file '%s' on the disk is more recent than\n"
+"the current buffer."
+msgstr ""
+
+#: ../src/document.c:2850
+msgid "Close _without saving"
+msgstr ""
+
+#: ../src/document.c:2853
+msgid "Try to resave the file?"
+msgstr ""
+
+#: ../src/document.c:2854
+#, c-format
+msgid "File \"%s\" was not found on disk!"
+msgstr ""
+
+#: ../src/editor.c:4322
+msgid "Enter Tab Width"
+msgstr ""
+
+#: ../src/editor.c:4323
+msgid "Enter the amount of spaces which should be replaced by a tab character."
+msgstr ""
+
+#: ../src/editor.c:4475
+#, c-format
+msgid "Warning: non-standard hard tab width: %d != 8!"
+msgstr ""
+
+#: ../src/encodings.c:73
+msgid "Celtic"
+msgstr ""
+
+#: ../src/encodings.c:74 ../src/encodings.c:75
+msgid "Greek"
+msgstr ""
+
+#: ../src/encodings.c:76
+msgid "Nordic"
+msgstr ""
+
+#: ../src/encodings.c:77
+msgid "South European"
+msgstr ""
+
+#: ../src/encodings.c:78 ../src/encodings.c:79 ../src/encodings.c:80
+#: ../src/encodings.c:81
+msgid "Western"
+msgstr ""
+
+#: ../src/encodings.c:83 ../src/encodings.c:84 ../src/encodings.c:85
+msgid "Baltic"
+msgstr ""
+
+#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88
+msgid "Central European"
+msgstr ""
+
+#. ISO-IR-111 not available on Windows
+#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:92
+#: ../src/encodings.c:93 ../src/encodings.c:94
+msgid "Cyrillic"
+msgstr ""
+
+#: ../src/encodings.c:95
+msgid "Cyrillic/Russian"
+msgstr ""
+
+#: ../src/encodings.c:96
+msgid "Cyrillic/Ukrainian"
+msgstr ""
+
+#: ../src/encodings.c:97
+msgid "Romanian"
+msgstr ""
+
+#: ../src/encodings.c:99 ../src/encodings.c:100 ../src/encodings.c:101
+msgid "Arabic"
+msgstr ""
+
+#. not available at all, ?
+#: ../src/encodings.c:102 ../src/encodings.c:104 ../src/encodings.c:105
+msgid "Hebrew"
+msgstr ""
+
+#: ../src/encodings.c:106
+msgid "Hebrew Visual"
+msgstr ""
+
+#: ../src/encodings.c:108
+msgid "Armenian"
+msgstr ""
+
+#: ../src/encodings.c:109
+msgid "Georgian"
+msgstr ""
+
+#: ../src/encodings.c:110
+msgid "Thai"
+msgstr ""
+
+#: ../src/encodings.c:111 ../src/encodings.c:112 ../src/encodings.c:113
+msgid "Turkish"
+msgstr ""
+
+#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116
+msgid "Vietnamese"
+msgstr ""
+
+#. maybe not available on Linux
+#: ../src/encodings.c:127 ../src/encodings.c:128 ../src/encodings.c:129
+#: ../src/encodings.c:131
+msgid "Chinese Simplified"
+msgstr ""
+
+#: ../src/encodings.c:132 ../src/encodings.c:133 ../src/encodings.c:134
+msgid "Chinese Traditional"
+msgstr ""
+
+#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137
+#: ../src/encodings.c:138
+msgid "Japanese"
+msgstr ""
+
+#: ../src/encodings.c:139 ../src/encodings.c:140 ../src/encodings.c:141
+#: ../src/encodings.c:142
+msgid "Korean"
+msgstr ""
+
+#: ../src/encodings.c:144
+msgid "Without encoding"
+msgstr ""
+
+#: ../src/encodings.c:428
+msgid "_West European"
+msgstr ""
+
+#: ../src/encodings.c:434
+msgid "_East European"
+msgstr ""
+
+#: ../src/encodings.c:440
+msgid "East _Asian"
+msgstr ""
+
+#: ../src/encodings.c:446
+msgid "_SE & SW Asian"
+msgstr ""
+
+#: ../src/encodings.c:452
+msgid "_Middle Eastern"
+msgstr ""
+
+#: ../src/encodings.c:458
+msgid "_Unicode"
+msgstr ""
+
+#: ../src/filetypes.c:83 ../src/filetypes.c:165 ../src/filetypes.c:179
+#: ../src/filetypes.c:187 ../src/filetypes.c:201
+#, c-format
+msgid "%s source file"
+msgstr ""
+
+#: ../src/filetypes.c:84
+#, c-format
+msgid "%s file"
+msgstr ""
+
+#: ../src/filetypes.c:102 ../src/filetypes.c:1787 ../src/interface.c:3918
+#: ../src/interface.c:5636
+msgid "None"
+msgstr ""
+
+#: ../src/filetypes.c:303
+msgid "Shell script"
+msgstr ""
+
+#: ../src/filetypes.c:311
+msgid "Makefile"
+msgstr ""
+
+#: ../src/filetypes.c:318
+#, fuzzy
+msgid "XML document"
+msgstr "бүх барим"
+
+#: ../src/filetypes.c:342
+msgid "Cascading StyleSheet"
+msgstr ""
+
+#: ../src/filetypes.c:411
+msgid "Config file"
+msgstr ""
+
+#: ../src/filetypes.c:417
+#, fuzzy
+msgid "Gettext translation file"
+msgstr "Орчуулга засварлагчид"
+
+#: ../src/filetypes.c:712
+msgid "_Programming Languages"
+msgstr ""
+
+#: ../src/filetypes.c:713
+msgid "_Scripting Languages"
+msgstr ""
+
+#: ../src/filetypes.c:714
+msgid "_Markup Languages"
+msgstr ""
+
+#: ../src/filetypes.c:715
+msgid "M_iscellaneous"
+msgstr ""
+
+#: ../src/filetypes.c:1465 ../src/win32.c:104
+msgid "All Source"
+msgstr ""
+
+#. create meta file filter "All files"
+#: ../src/filetypes.c:1490 ../src/project.c:292 ../src/win32.c:94
+#: ../src/win32.c:139
+msgid "All files"
+msgstr ""
+
+#: ../src/filetypes.c:1548
+#, c-format
+msgid "Bad regex for filetype %s: %s"
+msgstr ""
+
+#: ../src/geany.h:50
+msgid "untitled"
+msgstr ""
+
+#: ../src/highlighting.c:3637 ../src/main.c:822 ../src/socket.c:163
+#: ../src/templates.c:224
+#, fuzzy, c-format
+msgid "Could not find file '%s'."
+msgstr "%s файлыг нээж чадахгүй байна (%s)"
+
+#: ../src/highlighting.c:3660
+msgid "_Default"
+msgstr ""
+
+#: ../src/highlighting.c:3728
+msgid "_Color Schemes"
+msgstr ""
+
+#: ../src/interface.c:328
+msgid "_File"
+msgstr ""
+
+#: ../src/interface.c:339
+msgid "New (with _Template)"
+msgstr ""
+
+#: ../src/interface.c:356 ../src/interface.c:2378
+msgid "Open Selected F_ile"
+msgstr ""
+
+#: ../src/interface.c:360
+msgid "Recent _Files"
+msgstr ""
+
+#: ../src/interface.c:377
+msgid "Save A_ll"
+msgstr ""
+
+#: ../src/interface.c:393
+msgid "R_eload As"
+msgstr ""
+
+#: ../src/interface.c:404 ../src/interface.c:639 ../src/interface.c:698
+#: ../src/interface.c:712 ../src/interface.c:1110 ../src/interface.c:1120
+#: ../src/interface.c:2343 ../src/interface.c:2357
+msgid "invisible"
+msgstr ""
+
+#: ../src/interface.c:421
+msgid "Page Set_up"
+msgstr ""
+
+#: ../src/interface.c:438 ../src/notebook.c:243
+msgid "Close Ot_her Documents"
+msgstr ""
+
+#: ../src/interface.c:446 ../src/notebook.c:248
+msgid "C_lose All"
+msgstr ""
+
+#: ../src/interface.c:463 ../src/interface.c:2273
+msgid "_Edit"
+msgstr ""
+
+#: ../src/interface.c:513
+#, fuzzy
+msgid "_Commands"
+msgstr " командууд"
+
+#: ../src/interface.c:520 ../src/keybindings.c:334
+msgid "_Cut Current Line(s)"
+msgstr ""
+
+#: ../src/interface.c:528 ../src/keybindings.c:331
+msgid "_Copy Current Line(s)"
+msgstr ""
+
+#: ../src/interface.c:536 ../src/keybindings.c:286
+msgid "_Delete Current Line(s)"
+msgstr ""
+
+#: ../src/interface.c:540 ../src/keybindings.c:283
+msgid "_Duplicate Line or Selection"
+msgstr ""
+
+#: ../src/interface.c:549 ../src/keybindings.c:344
+msgid "_Select Current Line(s)"
+msgstr ""
+
+#: ../src/interface.c:553 ../src/keybindings.c:347
+msgid "_Select Current Paragraph"
+msgstr ""
+
+#: ../src/interface.c:562 ../src/keybindings.c:386
+msgid "_Send Selection to Terminal"
+msgstr ""
+
+#: ../src/interface.c:566 ../src/interface.c:2277
+msgid "_Format"
+msgstr ""
+
+#: ../src/interface.c:573 ../src/keybindings.c:388
+msgid "_Reflow Lines/Block"
+msgstr ""
+
+#: ../src/interface.c:577 ../src/keybindings.c:358
+msgid "T_oggle Case of Selection"
+msgstr ""
+
+#: ../src/interface.c:581 ../src/keybindings.c:293
+msgid "_Transpose Current Line"
+msgstr ""
+
+#: ../src/interface.c:590
+msgid "_Comment Line(s)"
+msgstr ""
+
+#: ../src/interface.c:594
+msgid "U_ncomment Line(s)"
+msgstr ""
+
+#: ../src/interface.c:598
+msgid "_Toggle Line Commentation"
+msgstr ""
+
+#: ../src/interface.c:607
+msgid "_Increase Indent"
+msgstr ""
+
+#: ../src/interface.c:615
+msgid "_Decrease Indent"
+msgstr ""
+
+#: ../src/interface.c:623 ../src/keybindings.c:377
+msgid "_Smart Line Indent"
+msgstr ""
+
+#: ../src/interface.c:632
+msgid "_Send Selection to"
+msgstr ""
+
+#: ../src/interface.c:647
+msgid "I_nsert Comments"
+msgstr ""
+
+#: ../src/interface.c:658 ../src/interface.c:2292
+msgid "Insert _ChangeLog Entry"
+msgstr ""
+
+#: ../src/interface.c:662 ../src/interface.c:2296
+msgid "Insert _Function Description"
+msgstr ""
+
+#: ../src/interface.c:666 ../src/interface.c:2300
+msgid "Insert _Multiline Comment"
+msgstr ""
+
+#: ../src/interface.c:675 ../src/interface.c:2315
+msgid "Insert File _Header"
+msgstr ""
+
+#: ../src/interface.c:679 ../src/interface.c:2319
+msgid "Insert _GPL Notice"
+msgstr ""
+
+#: ../src/interface.c:683 ../src/interface.c:2323
+msgid "Insert _BSD License Notice"
+msgstr ""
+
+#: ../src/interface.c:687 ../src/interface.c:2332
+msgid "Insert Dat_e"
+msgstr ""
+
+#: ../src/interface.c:701 ../src/interface.c:2346
+msgid "_Insert \"include <...>\""
+msgstr ""
+
+#: ../src/interface.c:715 ../src/interface.c:2365 ../src/keybindings.c:397
+msgid "_Insert Alternative White Space"
+msgstr ""
+
+#: ../src/interface.c:724
+msgid "Preference_s"
+msgstr ""
+
+#: ../src/interface.c:732 ../src/keybindings.c:410
+msgid "P_lugin Preferences"
+msgstr ""
+
+#: ../src/interface.c:740 ../src/interface.c:2369
+msgid "_Search"
+msgstr ""
+
+#: ../src/interface.c:751
+msgid "Find _Next"
+msgstr ""
+
+#: ../src/interface.c:755
+msgid "Find _Previous"
+msgstr ""
+
+#: ../src/interface.c:764
+msgid "Find in F_iles"
+msgstr ""
+
+#: ../src/interface.c:772 ../src/search.c:629
+msgid "_Replace"
+msgstr ""
+
+#: ../src/interface.c:785
+msgid "Next _Message"
+msgstr ""
+
+#: ../src/interface.c:793
+msgid "Pr_evious Message"
+msgstr ""
+
+#: ../src/interface.c:806 ../src/keybindings.c:457
+msgid "_Go to Next Marker"
+msgstr ""
+
+#: ../src/interface.c:810 ../src/keybindings.c:460
+msgid "_Go to Previous Marker"
+msgstr ""
+
+#: ../src/interface.c:819
+msgid "_Go to Line"
+msgstr ""
+
+#: ../src/interface.c:827 ../src/interface.c:2304
+msgid "_More"
+msgstr ""
+
+#: ../src/interface.c:834 ../src/keybindings.c:422
+msgid "Find Next _Selection"
+msgstr ""
+
+#: ../src/interface.c:838 ../src/keybindings.c:424
+msgid "Find Pre_vious Selection"
+msgstr ""
+
+#: ../src/interface.c:847 ../src/interface.c:2386
+msgid "Find _Usage"
+msgstr ""
+
+#: ../src/interface.c:851 ../src/interface.c:2394
+msgid "Find _Document Usage"
+msgstr ""
+
+#: ../src/interface.c:860 ../src/keybindings.c:439
+#, fuzzy
+msgid "_Mark All"
+msgstr "_Бүгдийг Үүсгэх\t"
+
+#: ../src/interface.c:869 ../src/interface.c:2402
+msgid "Go to _Tag Definition"
+msgstr ""
+
+#: ../src/interface.c:873
+msgid "Go to T_ag Declaration"
+msgstr ""
+
+#: ../src/interface.c:884
+msgid "Change _Font"
+msgstr ""
+
+#: ../src/interface.c:897
+msgid "To_ggle All Additional Widgets"
+msgstr ""
+
+#: ../src/interface.c:901
+msgid "Full_screen"
+msgstr ""
+
+#: ../src/interface.c:905
+msgid "Show Message _Window"
+msgstr ""
+
+#: ../src/interface.c:910
+msgid "Show _Toolbar"
+msgstr ""
+
+#: ../src/interface.c:915
+msgid "Show Side_bar"
+msgstr ""
+
+#: ../src/interface.c:920 ../src/interface.c:4354 ../src/interface.c:5766
+#: ../src/keybindings.c:222 ../src/prefs.c:1586
+msgid "Editor"
+msgstr ""
+
+#: ../src/interface.c:927
+msgid "Show _Markers Margin"
+msgstr ""
+
+#: ../src/interface.c:932
+msgid "Show _Line Numbers"
+msgstr ""
+
+#: ../src/interface.c:937
+#, fuzzy
+msgid "Show _White Space"
+msgstr "_Нууц файлуудыг харуул"
+
+#: ../src/interface.c:941
+msgid "Show Line _Endings"
+msgstr ""
+
+#: ../src/interface.c:945
+#, fuzzy
+msgid "Show _Indentation Guides"
+msgstr "_Нууц файлуудыг харуул"
+
+#: ../src/interface.c:966
+msgid "_Document"
+msgstr ""
+
+#: ../src/interface.c:973
+msgid "_Line Wrapping"
+msgstr ""
+
+#: ../src/interface.c:978
+msgid "Line _Breaking"
+msgstr ""
+
+#: ../src/interface.c:982
+msgid "_Auto-indentation"
+msgstr ""
+
+#: ../src/interface.c:987
+msgid "In_dent Type"
+msgstr ""
+
+#: ../src/interface.c:994 ../src/interface.c:1028
+#, fuzzy
+msgid "_Detect from Content"
+msgstr "Файлаас тогтоо"
+
+#: ../src/interface.c:1003 ../src/interface.c:3948 ../src/interface.c:5666
+msgid "_Tabs"
+msgstr ""
+
+#: ../src/interface.c:1009 ../src/interface.c:3939 ../src/interface.c:5657
+msgid "_Spaces"
+msgstr ""
+
+#: ../src/interface.c:1015
+msgid "T_abs and Spaces"
+msgstr ""
+
+#: ../src/interface.c:1021
+msgid "Indent Widt_h"
+msgstr ""
+
+#: ../src/interface.c:1037
+msgid "_1"
+msgstr ""
+
+#: ../src/interface.c:1043
+msgid "_2"
+msgstr ""
+
+#: ../src/interface.c:1049
+msgid "_3"
+msgstr ""
+
+#: ../src/interface.c:1055
+msgid "_4"
+msgstr ""
+
+#: ../src/interface.c:1061
+msgid "_5"
+msgstr ""
+
+#: ../src/interface.c:1067
+msgid "_6"
+msgstr ""
+
+#: ../src/interface.c:1073
+msgid "_7"
+msgstr ""
+
+#: ../src/interface.c:1079
+msgid "_8"
+msgstr ""
+
+#: ../src/interface.c:1090
+msgid "Read _Only"
+msgstr ""
+
+#: ../src/interface.c:1094
+msgid "_Write Unicode BOM"
+msgstr ""
+
+#: ../src/interface.c:1103
+msgid "Set File_type"
+msgstr ""
+
+#: ../src/interface.c:1113
+msgid "Set _Encoding"
+msgstr ""
+
+#: ../src/interface.c:1123
+msgid "Set Line E_ndings"
+msgstr ""
+
+#: ../src/interface.c:1130
+msgid "Convert and Set to _CR/LF (Win)"
+msgstr ""
+
+#: ../src/interface.c:1136
+msgid "Convert and Set to _LF (Unix)"
+msgstr ""
+
+#: ../src/interface.c:1142
+msgid "Convert and Set to CR (_Mac)"
+msgstr ""
+
+#: ../src/interface.c:1153
+msgid "_Strip Trailing Spaces"
+msgstr ""
+
+#: ../src/interface.c:1157
+msgid "_Replace Tabs by Spaces"
+msgstr ""
+
+#: ../src/interface.c:1161
+msgid "Replace Spaces b_y Tabs"
+msgstr ""
+
+#: ../src/interface.c:1170
+msgid "_Fold All"
+msgstr ""
+
+#: ../src/interface.c:1174
+msgid "_Unfold All"
+msgstr ""
+
+#: ../src/interface.c:1183
+msgid "Remove _Markers"
+msgstr ""
+
+#: ../src/interface.c:1187
+msgid "Remove Error _Indicators"
+msgstr ""
+
+#: ../src/interface.c:1191
+msgid "_Project"
+msgstr ""
+
+#: ../src/interface.c:1198
+msgid "_New"
+msgstr ""
+
+#: ../src/interface.c:1206
+msgid "_Open"
+msgstr ""
+
+#: ../src/interface.c:1214
+msgid "_Recent Projects"
+msgstr ""
+
+#: ../src/interface.c:1218
+msgid "_Close"
+msgstr ""
+
+#: ../src/interface.c:1231
+msgid "_Apply Default Indentation"
+msgstr ""
+
+#: ../src/interface.c:1234
+msgid "Apply the default indentation settings to all documents"
+msgstr ""
+
+#: ../src/interface.c:1249
+msgid "_Tools"
+msgstr ""
+
+#: ../src/interface.c:1256
+msgid "_Reload Configuration"
+msgstr ""
+
+#: ../src/interface.c:1264
+#, fuzzy
+msgid "C_onfiguration Files"
+msgstr "Хөрвүүлэлтийн алдаа гарлаа."
+
+#: ../src/interface.c:1277
+#, fuzzy
+msgid "_Color Chooser"
+msgstr "Өнгө Сонгогч"
+
+#: ../src/interface.c:1285
+msgid "_Word Count"
+msgstr ""
+
+#: ../src/interface.c:1289
+msgid "Load Ta_gs"
+msgstr ""
+
+#: ../src/interface.c:1293 ../src/interface.c:1300
+msgid "_Help"
+msgstr ""
+
+#: ../src/interface.c:1308
+msgid "_Website"
+msgstr ""
+
+#: ../src/interface.c:1312
+msgid "_Keyboard Shortcuts"
+msgstr ""
+
+#: ../src/interface.c:1316
+msgid "_Debug Messages"
+msgstr ""
+
+#: ../src/interface.c:1355 ../src/sidebar.c:124
+msgid "Symbols"
+msgstr ""
+
+#: ../src/interface.c:1369
+#, fuzzy
+msgid "Documents"
+msgstr "бүх барим"
+
+#: ../src/interface.c:1405
+msgid "Status"
+msgstr ""
+
+#: ../src/interface.c:1419
+msgid "Compiler"
+msgstr ""
+
+#: ../src/interface.c:1434
+msgid "Messages"
+msgstr ""
+
+#: ../src/interface.c:1447
+msgid "Scribble"
+msgstr ""
+
+#: ../src/interface.c:2135
+msgid "_Toolbar Preferences"
+msgstr ""
+
+#: ../src/interface.c:2148
+msgid "_Hide Toolbar"
+msgstr ""
+
+#: ../src/interface.c:2281
+msgid "I_nsert"
+msgstr ""
+
+#: ../src/interface.c:2410
+msgid "Conte_xt Action"
+msgstr ""
+
+#: ../src/interface.c:2952 ../src/keybindings.c:407
+msgid "Preferences"
+msgstr ""
+
+#: ../src/interface.c:2988
+msgid "Load files from the last session"
+msgstr ""
+
+#: ../src/interface.c:2991
+msgid "Opens at startup the files from the last session"
+msgstr ""
+
+#: ../src/interface.c:2993
+msgid "Load virtual terminal support"
+msgstr ""
+
+#: ../src/interface.c:2995
+msgid ""
+"Whether the virtual terminal emulation (VTE) should be loaded at startup, "
+"disable it if you do not need it"
+msgstr ""
+
+#: ../src/interface.c:2997
+msgid "Enable plugin support"
+msgstr ""
+
+#: ../src/interface.c:3001
+#, fuzzy
+msgid "<b>Startup</b>"
+msgstr "<b>Хэмжээ:</b>"
+
+#: ../src/interface.c:3020
+msgid "Save window position and geometry"
+msgstr ""
+
+#: ../src/interface.c:3023
+msgid "Saves the window position and geometry and restores it at the start"
+msgstr ""
+
+#: ../src/interface.c:3025
+msgid "Confirm exit"
+msgstr ""
+
+#: ../src/interface.c:3028
+msgid "Shows a confirmation dialog on exit"
+msgstr ""
+
+#: ../src/interface.c:3030
+#, fuzzy
+msgid "<b>Shutdown</b>"
+msgstr "<b>Байршил:</b>"
+
+#: ../src/interface.c:3051
+msgid "Startup path:"
+msgstr ""
+
+#: ../src/interface.c:3063
+msgid ""
+"Path to start in when opening or saving files. Must be an absolute path. "
+"Leave blank to use the current working directory."
+msgstr ""
+
+#: ../src/interface.c:3076
+msgid "Project files:"
+msgstr ""
+
+#: ../src/interface.c:3088
+msgid "Path to start in when opening project files"
+msgstr ""
+
+#: ../src/interface.c:3101
+msgid "Extra plugin path:"
+msgstr ""
+
+#: ../src/interface.c:3113
+msgid ""
+"Geany looks by default in the global installation path and in the "
+"configuration directory. The path entered here will be searched additionally "
+"for plugins. Leave blank to disable."
+msgstr ""
+
+#: ../src/interface.c:3126
+#, fuzzy
+msgid "<b>Paths</b>"
+msgstr "<b>Байршил:</b>"
+
+#: ../src/interface.c:3131
+msgid "Startup"
+msgstr ""
+
+#: ../src/interface.c:3154
+msgid "Beep on errors or when compilation has finished"
+msgstr ""
+
+#: ../src/interface.c:3157
+msgid ""
+"Whether to beep if an error occurred or when the compilation process has "
+"finished"
+msgstr ""
+
+#: ../src/interface.c:3159
+msgid "Switch to status message list at new message"
+msgstr ""
+
+#: ../src/interface.c:3162
+msgid ""
+"Switch to the status message tab (in the notebook window at the bottom) if a "
+"new status message arrives"
+msgstr ""
+
+#: ../src/interface.c:3164
+msgid "Suppress status messages in the status bar"
+msgstr ""
+
+#: ../src/interface.c:3167
+msgid ""
+"Removes all messages from the status bar. The messages are still displayed "
+"in the status messages window."
+msgstr ""
+
+#: ../src/interface.c:3169
+msgid "Auto-focus widgets (focus follows mouse)"
+msgstr ""
+
+#: ../src/interface.c:3172
+msgid ""
+"Gives the focus automatically to widgets below the mouse cursor. Works for "
+"the main editor widget, the scribble, the toolbar search and goto line "
+"fields and the VTE."
+msgstr ""
+
+#: ../src/interface.c:3174
+msgid "Use Windows File Open/Save dialogs"
+msgstr ""
+
+#: ../src/interface.c:3177
+msgid ""
+"Defines whether to use the native Windows File Open/Save dialogs or whether "
+"to use the GTK default dialogs"
+msgstr ""
+
+#: ../src/interface.c:3179 ../src/interface.c:3415 ../src/interface.c:4564
+msgid "<b>Miscellaneous</b>"
+msgstr ""
+
+#: ../src/interface.c:3198
+msgid "Always wrap search and hide the Find dialog"
+msgstr ""
+
+#: ../src/interface.c:3201
+msgid ""
+"Always wrap search around the document and hide the Find dialog after "
+"clicking Find Next/Previous"
+msgstr ""
+
+#: ../src/interface.c:3203
+msgid "Use the current word under the cursor for Find dialogs"
+msgstr ""
+
+#: ../src/interface.c:3206
+msgid ""
+"Use current word under the cursor when opening the Find, Find in Files or "
+"Replace dialog and there is no selection"
+msgstr ""
+
+#: ../src/interface.c:3208
+#, fuzzy
+msgid "Use the current file's directory for Find in Files"
+msgstr "Файлыг PDF файл-руу хөрвүүлэх"
+
+#: ../src/interface.c:3212
+#, fuzzy
+msgid "<b>Search</b>"
+msgstr "<b>Хэмжээ:</b>"
+
+#: ../src/interface.c:3231
+msgid "Use project-based session files"
+msgstr ""
+
+#: ../src/interface.c:3234
+msgid ""
+"Whether to store a project's session files and open them when re-opening the "
+"project"
+msgstr ""
+
+#: ../src/interface.c:3236
+msgid "Store project file inside the project base directory"
+msgstr ""
+
+#: ../src/interface.c:3239
+msgid ""
+"When enabled, a project file is stored by default inside the project base "
+"directory when creating new projects instead of one directory above the base "
+"directory. You can still change the path of the project file in the New "
+"Project dialog."
+msgstr ""
+
+#: ../src/interface.c:3241
+#, fuzzy
+msgid "<b>Projects</b>"
+msgstr "<b>Хандах эрх:</b>"
+
+#: ../src/interface.c:3246
+msgid "Miscellaneous"
+msgstr ""
+
+#. TODO Find a better way to map the current notebook page to the
+#. * corresponding chapter in the documentation, comparing translatable
+#. * strings is easy to break. Maybe attach an identifying string to the
+#. * tab label object.
+#: ../src/interface.c:3250 ../src/prefs.c:1580
+msgid "General"
+msgstr ""
+
+#: ../src/interface.c:3291
+msgid "Show symbol list"
+msgstr ""
+
+#: ../src/interface.c:3294
+msgid "Toggle the symbol list on and off"
+msgstr ""
+
+#: ../src/interface.c:3296
+#, fuzzy
+msgid "Show documents list"
+msgstr "бүх барим"
+
+#: ../src/interface.c:3299
+msgid "Toggle the documents list on and off"
+msgstr ""
+
+#: ../src/interface.c:3301
+msgid "Show sidebar"
+msgstr ""
+
+#: ../src/interface.c:3309
+msgid "Position:"
+msgstr ""
+
+#: ../src/interface.c:3313 ../src/interface.c:3469 ../src/interface.c:3530
+#: ../src/interface.c:3548 ../src/interface.c:3566
+msgid "Left"
+msgstr ""
+
+#: ../src/interface.c:3320 ../src/interface.c:3477 ../src/interface.c:3531
+#: ../src/interface.c:3549 ../src/interface.c:3567
+msgid "Right"
+msgstr ""
+
+#: ../src/interface.c:3326
+msgid "<b>Sidebar</b>"
+msgstr ""
+
+#: ../src/interface.c:3347
+msgid "Symbol list:"
+msgstr ""
+
+#: ../src/interface.c:3354 ../src/interface.c:3517
+msgid "Message window:"
+msgstr ""
+
+#: ../src/interface.c:3361 ../src/interface.c:3553
+msgid "Editor:"
+msgstr ""
+
+#: ../src/interface.c:3373
+msgid "Sets the font for the message window"
+msgstr ""
+
+#: ../src/interface.c:3381
+msgid "Sets the font for the symbol list"
+msgstr ""
+
+#: ../src/interface.c:3389
+msgid "Sets the editor font"
+msgstr ""
+
+#: ../src/interface.c:3391
+msgid "<b>Fonts</b>"
+msgstr ""
+
+#: ../src/interface.c:3410
+msgid "Show status bar"
+msgstr ""
+
+#: ../src/interface.c:3413
+msgid "Whether to show the status bar at the bottom of the main window"
+msgstr ""
+
+#: ../src/interface.c:3420 ../src/interface.c:3755 ../src/prefs.c:1582
+msgid "Interface"
+msgstr ""
+
+#: ../src/interface.c:3443
+msgid "Show editor tabs"
+msgstr ""
+
+#: ../src/interface.c:3447
+msgid "Show close buttons"
+msgstr ""
+
+#: ../src/interface.c:3450
+msgid ""
+"Shows a small cross button in the file tabs to easily close files when "
+"clicking on it (requires restart of Geany)"
+msgstr ""
+
+#: ../src/interface.c:3456
+msgid "Placement of new file tabs:"
+msgstr ""
+
+#: ../src/interface.c:3472
+msgid "File tabs will be placed on the left of the notebook"
+msgstr ""
+
+#: ../src/interface.c:3480
+msgid "File tabs will be placed on the right of the notebook"
+msgstr ""
+
+#: ../src/interface.c:3484
+msgid "Next to current"
+msgstr ""
+
+#: ../src/interface.c:3489
+msgid ""
+"Whether to place file tabs next to the current tab rather than at the edges "
+"of the notebook"
+msgstr ""
+
+#: ../src/interface.c:3491
+msgid "Double-clicking hides all additional widgets"
+msgstr ""
+
+#: ../src/interface.c:3494
+msgid "Calls the View->Toggle All Additional Widgets command"
+msgstr ""
+
+#: ../src/interface.c:3496
+msgid "<b>Editor tabs</b>"
+msgstr ""
+
+#: ../src/interface.c:3532 ../src/interface.c:3550 ../src/interface.c:3568
+msgid "Top"
+msgstr ""
+
+#: ../src/interface.c:3533 ../src/interface.c:3551 ../src/interface.c:3569
+msgid "Bottom"
+msgstr ""
+
+#: ../src/interface.c:3535
+msgid "Sidebar:"
+msgstr ""
+
+#: ../src/interface.c:3571
+#, fuzzy
+msgid "<b>Tab positions</b>"
+msgstr "<b>Байршил:</b>"
+
+#: ../src/interface.c:3576
+msgid "Notebook tabs"
+msgstr ""
+
+#: ../src/interface.c:3607
+msgid "Show t_oolbar"
+msgstr ""
+
+#: ../src/interface.c:3611
+msgid "_Append toolbar to the menu"
+msgstr ""
+
+#: ../src/interface.c:3614
+msgid "Pack the toolbar to the main menu to save vertical space"
+msgstr ""
+
+#: ../src/interface.c:3636 ../src/toolbar.c:933
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../src/interface.c:3656
+msgid "System _default"
+msgstr ""
+
+#: ../src/interface.c:3664
+msgid "Images _and text"
+msgstr ""
+
+#: ../src/interface.c:3672
+msgid "_Images only"
+msgstr ""
+
+#: ../src/interface.c:3680
+msgid "_Text only"
+msgstr ""
+
+#: ../src/interface.c:3688
+#, fuzzy
+msgid "<b>Icon style</b>"
+msgstr "<b>Төрөл:</b>"
+
+#: ../src/interface.c:3709
+msgid "S_ystem default"
+msgstr ""
+
+#: ../src/interface.c:3717
+msgid "_Small icons"
+msgstr ""
+
+#: ../src/interface.c:3725
+msgid "_Very small icons"
+msgstr ""
+
+#: ../src/interface.c:3733
+msgid "_Large icons"
+msgstr ""
+
+#: ../src/interface.c:3741
+#, fuzzy
+msgid "<b>Icon size</b>"
+msgstr "<b>Хэмжээ:</b>"
+
+#: ../src/interface.c:3746
+#, fuzzy
+msgid "<b>Toolbar</b>"
+msgstr "<b>Төрөл:</b>"
+
+#: ../src/interface.c:3751 ../src/prefs.c:1584
+msgid "Toolbar"
+msgstr ""
+
+#: ../src/interface.c:3782
+msgid "Line wrapping"
+msgstr ""
+
+#: ../src/interface.c:3785
+msgid ""
+"Wrap the line at the window border and continue it on the next line. Note: "
+"line wrapping has a high performance cost for large documents so should be "
+"disabled on slow machines."
+msgstr ""
+
+#: ../src/interface.c:3787
+msgid "\"Smart\" home key"
+msgstr ""
+
+#: ../src/interface.c:3790
+msgid ""
+"When \"smart\" home is enabled, the HOME key will move the caret to the "
+"first non-blank character of the line, unless it is already there, it moves "
+"to the very beginning of the line. When this feature is disabled, the HOME "
+"key always moves the caret to the start of the current line, regardless of "
+"its current position."
+msgstr ""
+
+#: ../src/interface.c:3792
+msgid "Disable Drag and Drop"
+msgstr ""
+
+#: ../src/interface.c:3795
+msgid ""
+"Disable drag and drop completely in the editor window so you can't drag and "
+"drop any selections within or outside of the editor window"
+msgstr ""
+
+#: ../src/interface.c:3797
+#, fuzzy
+msgid "Code folding"
+msgstr "Фонтыг сонго"
+
+#: ../src/interface.c:3801
+msgid "Fold/unfold all children of a fold point"
+msgstr ""
+
+#: ../src/interface.c:3804
+msgid ""
+"Fold or unfold all children of a fold point. By pressing the Shift key while "
+"clicking on a fold symbol the contrary behavior is used."
+msgstr ""
+
+#: ../src/interface.c:3806
+msgid "Use indicators to show compile errors"
+msgstr ""
+
+#: ../src/interface.c:3809
+msgid ""
+"Whether to use indicators (a squiggly underline) to highlight the lines "
+"where the compiler found a warning or an error"
+msgstr ""
+
+#: ../src/interface.c:3811
+msgid "Newline strips trailing spaces"
+msgstr ""
+
+#: ../src/interface.c:3814
+msgid "Enable newline to strip the trailing spaces on the previous line"
+msgstr ""
+
+#: ../src/interface.c:3820
+msgid "Line breaking column:"
+msgstr ""
+
+#: ../src/interface.c:3834
+msgid "Comment toggle marker:"
+msgstr ""
+
+#: ../src/interface.c:3841
+msgid ""
+"A string which is added when toggling a line comment in a source file, it is "
+"used to mark the comment as toggled."
+msgstr ""
+
+#: ../src/interface.c:3843
+msgid "<b>Features</b>"
+msgstr ""
+
+#: ../src/interface.c:3848
+msgid "Features"
+msgstr ""
+
+#: ../src/interface.c:3861
+msgid ""
+"Note: To apply these settings to all currently open documents, use "
+"<i>Project->Apply Default Indentation</i>."
+msgstr ""
+
+#: ../src/interface.c:3888 ../src/interface.c:5606
+msgid "Width:"
+msgstr ""
+
+#: ../src/interface.c:3901 ../src/interface.c:5619
+msgid "The width in chars of a single indent"
+msgstr ""
+
+#: ../src/interface.c:3906 ../src/interface.c:5624
+msgid "Auto-indent mode:"
+msgstr ""
+
+#: ../src/interface.c:3919 ../src/interface.c:5637
+msgid "Basic"
+msgstr ""
+
+#: ../src/interface.c:3920 ../src/interface.c:5638
+msgid "Current chars"
+msgstr ""
+
+#: ../src/interface.c:3921 ../src/interface.c:5639
+msgid "Match braces"
+msgstr ""
+
+#: ../src/interface.c:3923 ../src/interface.c:5641
+#, fuzzy
+msgid "Detect type from file"
+msgstr "Файлаас тогтоо"
+
+#: ../src/interface.c:3928 ../src/interface.c:5646
+msgid ""
+"Whether to detect the indentation type from file contents when a file is "
+"opened"
+msgstr ""
+
+#: ../src/interface.c:3930 ../src/interface.c:5648
+msgid "T_abs and spaces"
+msgstr ""
+
+#: ../src/interface.c:3935 ../src/interface.c:5653
+msgid ""
+"Use spaces if the total indent is less than the tab width, otherwise use both"
+msgstr ""
+
+#: ../src/interface.c:3944 ../src/interface.c:5662
+msgid "Use spaces when inserting indentation"
+msgstr ""
+
+#: ../src/interface.c:3953 ../src/interface.c:5671
+msgid "Use one tab per indent"
+msgstr ""
+
+#: ../src/interface.c:3957 ../src/interface.c:5682
+#, fuzzy
+msgid "Detect width from file"
+msgstr "Файлаас тогтоо"
+
+#: ../src/interface.c:3962 ../src/interface.c:5687
+msgid ""
+"Whether to detect the indentation width from file contents when a file is "
+"opened"
+msgstr ""
+
+#: ../src/interface.c:3964 ../src/interface.c:4254 ../src/interface.c:5675
+msgid "Type:"
+msgstr ""
+
+#: ../src/interface.c:3971
+msgid "Tab key indents"
+msgstr ""
+
+#: ../src/interface.c:3974
+msgid ""
+"Pressing tab/shift-tab indents/unindents instead of inserting a tab character"
+msgstr ""
+
+#: ../src/interface.c:3976
+#, fuzzy
+msgid "<b>Indentation</b>"
+msgstr "<b>Байршил:</b>"
+
+#: ../src/interface.c:3981 ../src/interface.c:5689
+msgid "Indentation"
+msgstr ""
+
+#: ../src/interface.c:4004
+msgid "Snippet completion"
+msgstr ""
+
+#: ../src/interface.c:4007
+msgid ""
+"Type a defined short character sequence and complete it to a more complex "
+"string using a single keypress"
+msgstr ""
+
+#: ../src/interface.c:4009
+msgid "XML/HTML tag auto-closing"
+msgstr ""
+
+#: ../src/interface.c:4012
+msgid "Insert matching closing tag for XML/HTML"
+msgstr ""
+
+#: ../src/interface.c:4014
+msgid "Automatic continuation of multi-line comments"
+msgstr ""
+
+#: ../src/interface.c:4017
+msgid ""
+"Continue automatically multi-line comments in languages like C, C++ and Java "
+"when a new line is entered inside such a comment"
+msgstr ""
+
+#: ../src/interface.c:4019
+msgid "Autocomplete symbols"
+msgstr ""
+
+#: ../src/interface.c:4022
+msgid ""
+"Automatic completion of known symbols in open files (function names, global "
+"variables, ...)"
+msgstr ""
+
+#: ../src/interface.c:4024
+msgid "Autocomplete all words in document"
+msgstr ""
+
+#: ../src/interface.c:4028
+msgid "Drop rest of word on completion"
+msgstr ""
+
+#: ../src/interface.c:4038
+msgid "Max. symbol name suggestions:"
+msgstr ""
+
+#: ../src/interface.c:4045
+msgid "Completion list height:"
+msgstr ""
+
+#: ../src/interface.c:4052
+msgid "Characters to type for autocompletion:"
+msgstr ""
+
+#: ../src/interface.c:4065
+msgid ""
+"The amount of characters which are necessary to show the symbol "
+"autocompletion list"
+msgstr ""
+
+#: ../src/interface.c:4074
+msgid "Display height in rows for the autocompletion list"
+msgstr ""
+
+#: ../src/interface.c:4083
+msgid "Maximum number of entries to display in the autocompletion list"
+msgstr ""
+
+#: ../src/interface.c:4086
+msgid "Symbol list update frequency:"
+msgstr ""
+
+#: ../src/interface.c:4099
+msgid ""
+"Minimal delay (in milliseconds) between two automatic updates of the symbol "
+"list. Note that a too short delay may have performance impact, especially "
+"with large files. A delay of 0 disables real-time updates."
+msgstr ""
+
+#: ../src/interface.c:4102
+#, fuzzy
+msgid "<b>Completions</b>"
+msgstr "<b>Байршил:</b>"
+
+#: ../src/interface.c:4121
+msgid "Parenthesis ( )"
+msgstr ""
+
+#: ../src/interface.c:4126
+msgid "Auto-close parenthesis when typing an opening one"
+msgstr ""
+
+#: ../src/interface.c:4128
+msgid "Single quotes ' '"
+msgstr ""
+
+#: ../src/interface.c:4133
+msgid "Auto-close single quote when typing an opening one"
+msgstr ""
+
+#: ../src/interface.c:4135
+msgid "Curly brackets { }"
+msgstr ""
+
+#: ../src/interface.c:4140
+msgid "Auto-close curly bracket when typing an opening one"
+msgstr ""
+
+#: ../src/interface.c:4142
+msgid "Square brackets [ ]"
+msgstr ""
+
+#: ../src/interface.c:4147
+msgid "Auto-close square-bracket when typing an opening one"
+msgstr ""
+
+#: ../src/interface.c:4149
+msgid "Double quotes \" \""
+msgstr ""
+
+#: ../src/interface.c:4154
+msgid "Auto-close double quote when typing an opening one"
+msgstr ""
+
+#: ../src/interface.c:4156
+msgid "<b>Auto-close quotes and brackets</b>"
+msgstr ""
+
+#: ../src/interface.c:4161
+#, fuzzy
+msgid "Completions"
+msgstr "_Хөрвүүл"
+
+#: ../src/interface.c:4184
+msgid "Invert syntax highlighting colors"
+msgstr ""
+
+#: ../src/interface.c:4187
+msgid "Invert all colors, by default using white text on a black background"
+msgstr ""
+
+#: ../src/interface.c:4189
+msgid "Show indentation guides"
+msgstr ""
+
+#: ../src/interface.c:4192
+msgid "Shows small dotted lines to help you to use the right indentation"
+msgstr ""
+
+#: ../src/interface.c:4194
+msgid "Show white space"
+msgstr ""
+
+#: ../src/interface.c:4197
+msgid "Marks spaces with dots and tabs with arrows"
+msgstr ""
+
+#: ../src/interface.c:4199
+msgid "Show line endings"
+msgstr ""
+
+#: ../src/interface.c:4202
+msgid "Shows the line ending character"
+msgstr ""
+
+#: ../src/interface.c:4204
+msgid "Show line numbers"
+msgstr ""
+
+#: ../src/interface.c:4207
+msgid "Shows or hides the Line Number margin"
+msgstr ""
+
+#: ../src/interface.c:4209
+msgid "Show markers margin"
+msgstr ""
+
+#: ../src/interface.c:4212
+msgid ""
+"Shows or hides the small margin right of the line numbers, which is used to "
+"mark lines"
+msgstr ""
+
+#: ../src/interface.c:4214
+msgid "Stop scrolling at last line"
+msgstr ""
+
+#: ../src/interface.c:4217
+msgid "Whether to stop scrolling one page past the last line of a document"
+msgstr ""
+
+#: ../src/interface.c:4219
+msgid "<b>Display</b>"
+msgstr ""
+
+#: ../src/interface.c:4240 ../src/interface.c:5721
+msgid "Column:"
+msgstr ""
+
+#: ../src/interface.c:4247
+msgid "Color:"
+msgstr ""
+
+#: ../src/interface.c:4266
+msgid "Sets the color of the long line marker"
+msgstr ""
+
+#: ../src/interface.c:4267 ../src/toolbar.c:70 ../src/tools.c:929
+#: ../src/vte.c:794 ../src/vte.c:801
+msgid "Color Chooser"
+msgstr "Өнгө Сонгогч"
+
+#: ../src/interface.c:4275
+msgid ""
+"The long line marker is a thin vertical line in the editor, it helps to mark "
+"long lines, or as a hint to break the line. Set this value to a value "
+"greater than 0 to specify the column where it should appear."
+msgstr ""
+
+#: ../src/interface.c:4285
+msgid "Line"
+msgstr ""
+
+#: ../src/interface.c:4288
+msgid ""
+"Prints a vertical line in the editor window at the given cursor position "
+"(see below)"
+msgstr ""
+
+#: ../src/interface.c:4292
+msgid "Background"
+msgstr ""
+
+#: ../src/interface.c:4295
+msgid ""
+"The background color of characters after the given cursor position (see "
+"below) changed to the color set below, (this is recommended if you use "
+"proportional fonts)"
+msgstr ""
+
+#: ../src/interface.c:4299
+msgid "Enabled"
+msgstr ""
+
+#: ../src/interface.c:4305 ../src/interface.c:5761
+msgid "<b>Long line marker</b>"
+msgstr ""
+
+#: ../src/interface.c:4324 ../src/interface.c:5728
+msgid "Disabled"
+msgstr ""
+
+#: ../src/interface.c:4327
+msgid "Do not show virtual spaces"
+msgstr ""
+
+#: ../src/interface.c:4331
+msgid "Only for rectangular selections"
+msgstr ""
+
+#: ../src/interface.c:4334
+msgid ""
+"Only show virtual spaces beyond the end of lines when drawing a rectangular "
+"selection"
+msgstr ""
+
+#: ../src/interface.c:4338
+msgid "Always"
+msgstr ""
+
+#: ../src/interface.c:4341
+msgid "Always show virtual spaces beyond the end of lines"
+msgstr ""
+
+#: ../src/interface.c:4345
+msgid "<b>Virtual spaces</b>"
+msgstr ""
+
+#: ../src/interface.c:4350
+msgid "Display"
+msgstr ""
+
+#: ../src/interface.c:4381
+msgid "Open new documents from the command-line"
+msgstr ""
+
+#: ../src/interface.c:4384
+msgid "Start a new file for each command-line filename that doesn't exist"
+msgstr ""
+
+#: ../src/interface.c:4398
+msgid "Default end of line characters:"
+msgstr ""
+
+#: ../src/interface.c:4405
+msgid "<b>New files</b>"
+msgstr ""
+
+#: ../src/interface.c:4428
+msgid "Default encoding (new files):"
+msgstr ""
+
+#: ../src/interface.c:4436
+msgid "Sets the default encoding for newly created files"
+msgstr ""
+
+#: ../src/interface.c:4442
+msgid "Use fixed encoding when opening non-Unicode files"
+msgstr ""
+
+#: ../src/interface.c:4445
+msgid ""
+"This option disables the automatic detection of the file encoding when "
+"opening non-Unicode files and opens the file with the specified encoding "
+"(usually not needed)"
+msgstr ""
+
+#: ../src/interface.c:4451
+msgid "Default encoding (existing non-Unicode files):"
+msgstr ""
+
+#: ../src/interface.c:4459
+msgid "Sets the default encoding for opening existing non-Unicode files"
+msgstr ""
+
+#: ../src/interface.c:4465
+#, fuzzy
+msgid "<b>Encodings</b>"
+msgstr "<b>Энкодчлол:</b>"
+
+#: ../src/interface.c:4484
+msgid "Ensure new line at file end"
+msgstr ""
+
+#: ../src/interface.c:4487
+msgid "Ensures that at the end of the file is a new line"
+msgstr ""
+
+#: ../src/interface.c:4489
+msgid "Ensure consistent line endings"
+msgstr ""
+
+#: ../src/interface.c:4492
+msgid ""
+"Ensures that newline characters always get converted before saving, avoiding "
+"mixed line endings in the same file"
+msgstr ""
+
+#: ../src/interface.c:4494
+msgid "Strip trailing spaces and tabs"
+msgstr ""
+
+#: ../src/interface.c:4497
+msgid "Removes trailing spaces and tabs and the end of lines"
+msgstr ""
+
+#: ../src/interface.c:4499 ../src/keybindings.c:542
+msgid "Replace tabs by space"
+msgstr ""
+
+#: ../src/interface.c:4502
+msgid "Replaces all tabs in document by spaces"
+msgstr ""
+
+#: ../src/interface.c:4504
+msgid "<b>Saving files</b>"
+msgstr ""
+
+#: ../src/interface.c:4529
+msgid "Recent files list length:"
+msgstr ""
+
+#: ../src/interface.c:4543
+msgid "Specifies the number of files which are stored in the Recent files list"
+msgstr ""
+
+#: ../src/interface.c:4547
+msgid "Disk check timeout:"
+msgstr ""
+
+#: ../src/interface.c:4560
+msgid ""
+"How often to check for changes to document files on disk, in seconds. Zero "
+"disables checking."
+msgstr ""
+
+#: ../src/interface.c:4569 ../src/prefs.c:1588 ../src/symbols.c:680
+#: ../plugins/filebrowser.c:1119
+msgid "Files"
+msgstr ""
+
+#: ../src/interface.c:4602
+msgid "Terminal:"
+msgstr ""
+
+#: ../src/interface.c:4609
+msgid "Browser:"
+msgstr ""
+
+#: ../src/interface.c:4621
+msgid ""
+"A terminal emulator like xterm, gnome-terminal or konsole (should accept the "
+"-e argument)"
+msgstr ""
+
+#: ../src/interface.c:4628
+msgid "Path (and possibly additional arguments) to your favorite browser"
+msgstr ""
+
+#: ../src/interface.c:4650
+msgid "Grep:"
+msgstr ""
+
+#: ../src/interface.c:4673
+msgid "<b>Tool paths</b>"
+msgstr ""
+
+#: ../src/interface.c:4694
+msgid "Context action:"
+msgstr ""
+
+#: ../src/interface.c:4705
+#, c-format
+msgid ""
+"Context action command. The currently selected word can be used with %s. It "
+"can appear anywhere in the given command and will be replaced before "
+"execution."
+msgstr ""
+
+#: ../src/interface.c:4718
+#, fuzzy
+msgid "<b>Commands</b>"
+msgstr "<b>Өөрчилсөн:</b>"
+
+#: ../src/interface.c:4723 ../src/keybindings.c:234 ../src/prefs.c:1590
+msgid "Tools"
+msgstr ""
+
+#: ../src/interface.c:4761
+msgid "email address of the developer"
+msgstr ""
+
+#: ../src/interface.c:4768
+msgid "Initials of the developer name"
+msgstr ""
+
+#: ../src/interface.c:4770
+msgid "Initial version:"
+msgstr ""
+
+#: ../src/interface.c:4782
+msgid "Version number, which a new file initially has"
+msgstr ""
+
+#: ../src/interface.c:4789
+msgid "Company name"
+msgstr ""
+
+#: ../src/interface.c:4791
+#, fuzzy
+msgid "Developer:"
+msgstr "Хөгжүүлэгчид"
+
+#: ../src/interface.c:4798
+#, fuzzy
+msgid "Company:"
+msgstr "Хөрвүүл:"
+
+#: ../src/interface.c:4805
+msgid "Mail address:"
+msgstr ""
+
+#: ../src/interface.c:4812
+msgid "Initials:"
+msgstr ""
+
+#: ../src/interface.c:4824
+msgid "The name of the developer"
+msgstr ""
+
+#: ../src/interface.c:4826
+msgid "Year:"
+msgstr ""
+
+#: ../src/interface.c:4833
+msgid "Date:"
+msgstr ""
+
+#: ../src/interface.c:4840
+msgid "Date & time:"
+msgstr ""
+
+#: ../src/interface.c:4852
+#, fuzzy
+msgid ""
+"Specify a format for the the {datetime} wildcard. You can use any conversion "
+"specifiers which can be used with the ANSI C strftime function."
+msgstr ""
+"Огноо болон цагны хэлбэрийг оруул. Хувиргалт хийхдээ ANSI Cи хэлний strftime "
+"функцийг хэрэглэж болно. Дэлгэрэнгүй мэдээллийг \"man strftime\" гэж харна "
+"уу."
+
+#: ../src/interface.c:4859
+#, fuzzy
+msgid ""
+"Specify a format for the the {year} wildcard. You can use any conversion "
+"specifiers which can be used with the ANSI C strftime function."
+msgstr ""
+"Огноо болон цагны хэлбэрийг оруул. Хувиргалт хийхдээ ANSI Cи хэлний strftime "
+"функцийг хэрэглэж болно. Дэлгэрэнгүй мэдээллийг \"man strftime\" гэж харна "
+"уу."
+
+#: ../src/interface.c:4866
+#, fuzzy
+msgid ""
+"Specify a format for the the {date} wildcard. You can use any conversion "
+"specifiers which can be used with the ANSI C strftime function."
+msgstr ""
+"Огноо болон цагны хэлбэрийг оруул. Хувиргалт хийхдээ ANSI Cи хэлний strftime "
+"функцийг хэрэглэж болно. Дэлгэрэнгүй мэдээллийг \"man strftime\" гэж харна "
+"уу."
+
+#: ../src/interface.c:4868
+#, fuzzy
+msgid "<b>Template data</b>"
+msgstr "<b>Төрөл:</b>"
+
+#: ../src/interface.c:4873 ../src/prefs.c:1592
+msgid "Templates"
+msgstr ""
+
+#: ../src/interface.c:4911
+#, fuzzy
+msgid "C_hange"
+msgstr "Зай:"
+
+#: ../src/interface.c:4915
+#, fuzzy
+msgid "<b>Keyboard shortcuts</b>"
+msgstr "Товчлуурын хослолууд"
+
+#: ../src/interface.c:4920 ../src/prefs.c:1594
+msgid "Keybindings"
+msgstr ""
+
+#: ../src/interface.c:4953
+#, fuzzy
+msgid "Command:"
+msgstr " командууд"
+
+#: ../src/interface.c:4960
+#, c-format
+msgid "Path to the command for printing files (use %f for the filename)"
+msgstr ""
+
+#: ../src/interface.c:4970
+msgid "Use an external command for printing"
+msgstr ""
+
+#: ../src/interface.c:4990 ../src/printing.c:376
+msgid "Print line numbers"
+msgstr ""
+
+#: ../src/interface.c:4993 ../src/printing.c:378
+msgid "Add line numbers to the printed page"
+msgstr ""
+
+#: ../src/interface.c:4995 ../src/printing.c:381
+msgid "Print page numbers"
+msgstr ""
+
+#: ../src/interface.c:4998 ../src/printing.c:383
+msgid ""
+"Add page numbers at the bottom of each page. It takes 2 lines of the page."
+msgstr ""
+
+#: ../src/interface.c:5000 ../src/printing.c:386
+msgid "Print page header"
+msgstr ""
+
+#: ../src/interface.c:5003 ../src/printing.c:388
+msgid ""
+"Add a little header to every page containing the page number, the filename "
+"and the current date (see below). It takes 3 lines of the page."
+msgstr ""
+
+#: ../src/interface.c:5020 ../src/printing.c:404
+msgid "Use the basename of the printed file"
+msgstr ""
+
+#: ../src/interface.c:5023
+msgid "Print only the basename (without the path) of the printed file"
+msgstr ""
+
+#: ../src/interface.c:5029 ../src/printing.c:412
+#, fuzzy
+msgid "Date format:"
+msgstr "Огнооны Хэлбэр"
+
+#: ../src/interface.c:5036 ../src/printing.c:418
+#, fuzzy
+msgid ""
+"Specify a format for the date and time stamp which is added to the page "
+"header on each page. You can use any conversion specifiers which can be used "
+"with the ANSI C strftime function."
+msgstr ""
+"Огноо болон цагны хэлбэрийг оруул. Хувиргалт хийхдээ ANSI Cи хэлний strftime "
+"функцийг хэрэглэж болно. Дэлгэрэнгүй мэдээллийг \"man strftime\" гэж харна "
+"уу."
+
+#: ../src/interface.c:5039
+msgid "Use native GTK printing"
+msgstr ""
+
+#: ../src/interface.c:5045
+#, fuzzy
+msgid "<b>Printing</b>"
+msgstr "<b>Энкодчлол:</b>"
+
+#: ../src/interface.c:5050 ../src/prefs.c:1596
+msgid "Printing"
+msgstr ""
+
+#: ../src/interface.c:5097
+msgid "<i>Warning: read the manual before changing these preferences.</i>"
+msgstr ""
+
+#: ../src/interface.c:5102
+msgid "<b>Various preferences</b>"
+msgstr ""
+
+#: ../src/interface.c:5107 ../src/prefs.c:1598
+msgid "Various"
+msgstr ""
+
+#: ../src/interface.c:5589
+#, fuzzy
+msgid "Project Properties"
+msgstr "Шинж чанар"
+
+#: ../src/interface.c:5714
+msgid "Display:"
+msgstr ""
+
+#: ../src/interface.c:5736
+msgid "Custom"
+msgstr ""
+
+#: ../src/interface.c:5744
+msgid "Use global settings"
+msgstr ""
+
+#. visual group order
+#: ../src/keybindings.c:221 ../src/plugins.c:1246 ../src/symbols.c:707
+#, fuzzy
+msgid "File"
+msgstr "Файл Нээх"
+
+#: ../src/keybindings.c:223
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/keybindings.c:224
+#, fuzzy
+msgid "Select"
+msgstr "сонголт"
+
+#: ../src/keybindings.c:225
+msgid "Format"
+msgstr ""
+
+#: ../src/keybindings.c:226
+msgid "Insert"
+msgstr ""
+
+#: ../src/keybindings.c:227
+msgid "Settings"
+msgstr ""
+
+#: ../src/keybindings.c:228 ../src/toolbar.c:380
+msgid "Search"
+msgstr ""
+
+#: ../src/keybindings.c:229
+#, fuzzy
+msgid "Go to"
+msgstr "Мөр-лүү оч"
+
+#: ../src/keybindings.c:230
+#, fuzzy
+msgid "View"
+msgstr "_Харагдац"
+
+#: ../src/keybindings.c:231
+#, fuzzy
+msgid "Document"
+msgstr "бүх барим"
+
+#: ../src/keybindings.c:232 ../src/project.c:504
+msgid "Project"
+msgstr ""
+
+#: ../src/keybindings.c:233 ../src/keybindings.c:565 ../src/project.c:482
+#: ../src/ui_utils.c:1960
+#, fuzzy
+msgid "Build"
+msgstr "_Боловсруул"
+
+#: ../src/keybindings.c:235 ../src/keybindings.c:590
+msgid "Help"
+msgstr ""
+
+#: ../src/keybindings.c:236
+msgid "Focus"
+msgstr ""
+
+#: ../src/keybindings.c:237
+msgid "Notebook tab"
+msgstr ""
+
+#: ../src/keybindings.c:246
+msgid "New"
+msgstr ""
+
+#: ../src/keybindings.c:248
+#, fuzzy
+msgid "Open"
+msgstr "Файл Нээх"
+
+#: ../src/keybindings.c:251
+msgid "Open selected file"
+msgstr ""
+
+#: ../src/keybindings.c:253
+#, fuzzy
+msgid "Save"
+msgstr "Файлыг Хадгал"
+
+#: ../src/keybindings.c:255 ../src/toolbar.c:55
+#, fuzzy
+msgid "Save as"
+msgstr "Файлыг Хадгал"
+
+#: ../src/keybindings.c:257
+msgid "Save all"
+msgstr ""
+
+#: ../src/keybindings.c:260
+msgid "Print"
+msgstr ""
+
+#: ../src/keybindings.c:262
+msgid "Close"
+msgstr ""
+
+#: ../src/keybindings.c:264
+msgid "Close all"
+msgstr ""
+
+#: ../src/keybindings.c:267
+#, fuzzy
+msgid "Reload file"
+msgstr "_Дахин ачаал"
+
+#: ../src/keybindings.c:269
+msgid "Re-open last closed tab"
+msgstr ""
+
+#: ../src/keybindings.c:274
+#, fuzzy
+msgid "Project properties"
+msgstr "Шинж чанар"
+
+#: ../src/keybindings.c:279
+msgid "Undo"
+msgstr ""
+
+#: ../src/keybindings.c:281
+msgid "Redo"
+msgstr ""
+
+#: ../src/keybindings.c:290
+msgid "Delete to line end"
+msgstr ""
+
+#: ../src/keybindings.c:296
+#, fuzzy
+msgid "Scroll to current line"
+msgstr "Файлыг хөрвүүл"
+
+#: ../src/keybindings.c:298
+msgid "Scroll up the view by one line"
+msgstr ""
+
+#: ../src/keybindings.c:300
+msgid "Scroll down the view by one line"
+msgstr ""
+
+#: ../src/keybindings.c:302
+msgid "Complete snippet"
+msgstr ""
+
+#: ../src/keybindings.c:304
+msgid "Move cursor in snippet"
+msgstr ""
+
+#: ../src/keybindings.c:306
+msgid "Suppress snippet completion"
+msgstr ""
+
+#: ../src/keybindings.c:308
+msgid "Context Action"
+msgstr ""
+
+#: ../src/keybindings.c:310
+msgid "Complete word"
+msgstr ""
+
+#: ../src/keybindings.c:312
+msgid "Show calltip"
+msgstr ""
+
+#: ../src/keybindings.c:314
+msgid "Show macro list"
+msgstr ""
+
+#: ../src/keybindings.c:316
+msgid "Word part completion"
+msgstr ""
+
+#: ../src/keybindings.c:318
+msgid "Move line(s) up"
+msgstr ""
+
+#: ../src/keybindings.c:320
+msgid "Move line(s) down"
+msgstr ""
+
+#: ../src/keybindings.c:325
+msgid "Cut"
+msgstr ""
+
+#: ../src/keybindings.c:327
+msgid "Copy"
+msgstr ""
+
+#: ../src/keybindings.c:329
+msgid "Paste"
+msgstr ""
+
+#: ../src/keybindings.c:340
+msgid "Select All"
+msgstr ""
+
+#: ../src/keybindings.c:342
+msgid "Select current word"
+msgstr ""
+
+#: ../src/keybindings.c:350
+msgid "Select to previous word part"
+msgstr ""
+
+#: ../src/keybindings.c:352
+msgid "Select to next word part"
+msgstr ""
+
+#: ../src/keybindings.c:360
+msgid "Toggle line commentation"
+msgstr ""
+
+#: ../src/keybindings.c:363
+msgid "Comment line(s)"
+msgstr ""
+
+#: ../src/keybindings.c:365
+msgid "Uncomment line(s)"
+msgstr ""
+
+#: ../src/keybindings.c:367
+msgid "Increase indent"
+msgstr ""
+
+#: ../src/keybindings.c:370
+msgid "Decrease indent"
+msgstr ""
+
+#: ../src/keybindings.c:373
+msgid "Increase indent by one space"
+msgstr ""
+
+#: ../src/keybindings.c:375
+msgid "Decrease indent by one space"
+msgstr ""
+
+#: ../src/keybindings.c:379
+msgid "Send to Custom Command 1"
+msgstr ""
+
+#: ../src/keybindings.c:381
+msgid "Send to Custom Command 2"
+msgstr ""
+
+#: ../src/keybindings.c:383
+msgid "Send to Custom Command 3"
+msgstr ""
+
+#: ../src/keybindings.c:394
+msgid "Insert date"
+msgstr ""
+
+#: ../src/keybindings.c:400
+msgid "Insert New Line Before Current"
+msgstr ""
+
+#: ../src/keybindings.c:402
+msgid "Insert New Line After Current"
+msgstr ""
+
+#: ../src/keybindings.c:415 ../src/search.c:463
+msgid "Find"
+msgstr ""
+
+#: ../src/keybindings.c:417
+msgid "Find Next"
+msgstr ""
+
+#: ../src/keybindings.c:419
+msgid "Find Previous"
+msgstr ""
+
+#: ../src/keybindings.c:426 ../src/search.c:619
+msgid "Replace"
+msgstr ""
+
+#: ../src/keybindings.c:428 ../src/search.c:871
+msgid "Find in Files"
+msgstr ""
+
+#: ../src/keybindings.c:431
+msgid "Next Message"
+msgstr ""
+
+#: ../src/keybindings.c:433
+msgid "Previous Message"
+msgstr ""
+
+#: ../src/keybindings.c:435
+msgid "Find Usage"
+msgstr ""
+
+#: ../src/keybindings.c:437
+msgid "Find Document Usage"
+msgstr ""
+
+#: ../src/keybindings.c:444 ../src/toolbar.c:66
+msgid "Navigate back a location"
+msgstr ""
+
+#: ../src/keybindings.c:446 ../src/toolbar.c:67
+msgid "Navigate forward a location"
+msgstr ""
+
+#: ../src/keybindings.c:451
+#, fuzzy
+msgid "Go to matching brace"
+msgstr "Мөр-лүү оч"
+
+#: ../src/keybindings.c:454
+msgid "Toggle marker"
+msgstr ""
+
+#: ../src/keybindings.c:462
+msgid "Go to Tag Definition"
+msgstr ""
+
+#: ../src/keybindings.c:464
+msgid "Go to Tag Declaration"
+msgstr ""
+
+#: ../src/keybindings.c:466
+#, fuzzy
+msgid "Go to Start of Line"
+msgstr "Мөр-лүү оч"
+
+#: ../src/keybindings.c:468
+#, fuzzy
+msgid "Go to End of Line"
+msgstr "Мөр-лүү оч"
+
+#: ../src/keybindings.c:470
+msgid "Go to End of Display Line"
+msgstr ""
+
+#: ../src/keybindings.c:472
+msgid "Go to Previous Word Part"
+msgstr ""
+
+#: ../src/keybindings.c:474
+msgid "Go to Next Word Part"
+msgstr ""
+
+#: ../src/keybindings.c:479
+msgid "Toggle All Additional Widgets"
+msgstr ""
+
+#: ../src/keybindings.c:482
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/keybindings.c:484
+msgid "Toggle Messages Window"
+msgstr ""
+
+#: ../src/keybindings.c:487
+msgid "Toggle Sidebar"
+msgstr ""
+
+#: ../src/keybindings.c:489
+msgid "Zoom In"
+msgstr ""
+
+#: ../src/keybindings.c:491
+msgid "Zoom Out"
+msgstr ""
+
+#: ../src/keybindings.c:493
+msgid "Zoom Reset"
+msgstr ""
+
+#: ../src/keybindings.c:498
+msgid "Switch to Editor"
+msgstr ""
+
+#: ../src/keybindings.c:500
+msgid "Switch to Search Bar"
+msgstr ""
+
+#: ../src/keybindings.c:502
+msgid "Switch to Message Window"
+msgstr ""
+
+#: ../src/keybindings.c:504
+msgid "Switch to Compiler"
+msgstr ""
+
+#: ../src/keybindings.c:506
+msgid "Switch to Messages"
+msgstr ""
+
+#: ../src/keybindings.c:508
+msgid "Switch to Scribble"
+msgstr ""
+
+#: ../src/keybindings.c:510
+msgid "Switch to VTE"
+msgstr ""
+
+#: ../src/keybindings.c:512
+msgid "Switch to Sidebar"
+msgstr ""
+
+#: ../src/keybindings.c:514
+msgid "Switch to Sidebar Symbol List"
+msgstr ""
+
+#: ../src/keybindings.c:516
+msgid "Switch to Sidebar Document List"
+msgstr ""
+
+#: ../src/keybindings.c:521
+#, fuzzy
+msgid "Switch to left document"
+msgstr "бүх барим"
+
+#: ../src/keybindings.c:523
+#, fuzzy
+msgid "Switch to right document"
+msgstr "бүх барим"
+
+#: ../src/keybindings.c:525
+#, fuzzy
+msgid "Switch to last used document"
+msgstr "бүх барим"
+
+#: ../src/keybindings.c:527
+#, fuzzy
+msgid "Move document left"
+msgstr "бүх барим"
+
+#: ../src/keybindings.c:529
+#, fuzzy
+msgid "Move document right"
+msgstr "бүх барим"
+
+#: ../src/keybindings.c:531
+#, fuzzy
+msgid "Move document first"
+msgstr "бүх барим"
+
+#: ../src/keybindings.c:533
+#, fuzzy
+msgid "Move document last"
+msgstr "бүх барим"
+
+#: ../src/keybindings.c:538
+msgid "Toggle Line wrapping"
+msgstr ""
+
+#: ../src/keybindings.c:540
+msgid "Toggle Line breaking"
+msgstr ""
+
+#: ../src/keybindings.c:544
+msgid "Replace spaces by tabs"
+msgstr ""
+
+#: ../src/keybindings.c:546
+#, fuzzy
+msgid "Toggle current fold"
+msgstr "Файлыг хөрвүүл"
+
+#: ../src/keybindings.c:548
+msgid "Fold all"
+msgstr ""
+
+#: ../src/keybindings.c:550
+msgid "Unfold all"
+msgstr ""
+
+#: ../src/keybindings.c:552
+msgid "Reload symbol list"
+msgstr ""
+
+#: ../src/keybindings.c:554
+msgid "Remove Markers"
+msgstr ""
+
+#: ../src/keybindings.c:556
+msgid "Remove Error Indicators"
+msgstr ""
+
+#: ../src/keybindings.c:558
+msgid "Remove Markers and Error Indicators"
+msgstr ""
+
+#: ../src/keybindings.c:563 ../src/toolbar.c:68
+msgid "Compile"
+msgstr ""
+
+#: ../src/keybindings.c:567
+#, fuzzy
+msgid "Make all"
+msgstr "_Бүгдийг Үүсгэх\t"
+
+#: ../src/keybindings.c:570
+#, fuzzy
+msgid "Make custom target"
+msgstr "Аргументтэйгээр Үүсгэх"
+
+#: ../src/keybindings.c:572
+#, fuzzy
+msgid "Make object"
+msgstr "_Объектыг боловсруул"
+
+#: ../src/keybindings.c:574
+#, fuzzy
+msgid "Next error"
+msgstr "_Дараачийн Алдаа"
+
+#: ../src/keybindings.c:576
+msgid "Previous error"
+msgstr ""
+
+#: ../src/keybindings.c:578
+msgid "Run"
+msgstr ""
+
+#: ../src/keybindings.c:580
+msgid "Build options"
+msgstr ""
+
+#: ../src/keybindings.c:585
+#, fuzzy
+msgid "Show Color Chooser"
+msgstr "Өнгө Сонгогч"
+
+#: ../src/keybindings.c:872
+#, fuzzy
+msgid "Keyboard Shortcuts"
+msgstr "Товчлуурын хослолууд"
+
+#: ../src/keybindings.c:884
+#, fuzzy
+msgid "The following keyboard shortcuts are configurable:"
+msgstr "Дараах хослолууд тодорхойлогдсон:"
+
+#: ../src/keybindings.c:1784
+#, fuzzy
+msgid "Switch to Document"
+msgstr "бүх барим"
+
+#: ../src/keyfile.c:907
+msgid "Type here what you want, use it as a notice/scratch board"
+msgstr ""
+
+#: ../src/keyfile.c:1114
+msgid "Failed to load one or more session files."
+msgstr ""
+
+#: ../src/log.c:180
+msgid "Debug Messages"
+msgstr ""
+
+#: ../src/log.c:182
+msgid "Cl_ear"
+msgstr ""
+
+#: ../src/main.c:126
+msgid ""
+"Set initial column number for the first opened file (useful in conjunction "
+"with --line)"
+msgstr ""
+
+#: ../src/main.c:127
+msgid "Use an alternate configuration directory"
+msgstr ""
+
+#: ../src/main.c:128
+msgid "Print internal filetype names"
+msgstr ""
+
+#: ../src/main.c:129
+msgid "Generate global tags file (see documentation)"
+msgstr ""
+
+#: ../src/main.c:130
+msgid "Don't preprocess C/C++ files when generating tags"
+msgstr ""
+
+#: ../src/main.c:132
+msgid "Don't open files in a running instance, force opening a new instance"
+msgstr ""
+
+#: ../src/main.c:133
+msgid ""
+"Use this socket filename for communication with a running Geany instance"
+msgstr ""
+
+#: ../src/main.c:134
+msgid "Return a list of open documents in a running Geany instance"
+msgstr ""
+
+#: ../src/main.c:136
+msgid "Set initial line number for the first opened file"
+msgstr ""
+
+#: ../src/main.c:137
+msgid "Don't show message window at startup"
+msgstr ""
+
+#: ../src/main.c:138
+msgid "Don't load auto completion data (see documentation)"
+msgstr ""
+
+#: ../src/main.c:140
+msgid "Don't load plugins"
+msgstr ""
+
+#: ../src/main.c:142
+msgid "Print Geany's installation prefix"
+msgstr ""
+
+#: ../src/main.c:143
+msgid "Don't load the previous session's files"
+msgstr ""
+
+#: ../src/main.c:145
+msgid "Don't load terminal support"
+msgstr ""
+
+#: ../src/main.c:146
+msgid "Filename of libvte.so"
+msgstr ""
+
+#: ../src/main.c:148
+msgid "Be verbose"
+msgstr ""
+
+#: ../src/main.c:149
+msgid "Show version and exit"
+msgstr ""
+
+#: ../src/main.c:515
+msgid "[FILES...]"
+msgstr ""
+
+#. note for translators: library versions are printed after this
+#: ../src/main.c:539
+#, fuzzy, c-format
+msgid "built on %s with "
+msgstr "(%s-ийг боловсруулах)"
+
+#: ../src/main.c:627
+msgid "Move it now?"
+msgstr ""
+
+#: ../src/main.c:629
+msgid "Geany needs to move your old configuration directory before starting."
+msgstr ""
+
+#: ../src/main.c:638
+#, c-format
+msgid ""
+"Your configuration directory has been successfully moved from \"%s\" to \"%s"
+"\"."
+msgstr ""
+
+#. for translators: the third %s in brackets is the error message which
+#. * describes why moving the dir didn't work
+#: ../src/main.c:648
+#, c-format
+msgid ""
+"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). "
+"Please move manually the directory to the new location."
+msgstr ""
+
+#: ../src/main.c:729
+#, c-format
+msgid ""
+"Configuration directory could not be created (%s).\n"
+"There could be some problems using Geany without a configuration directory.\n"
+"Start Geany anyway?"
+msgstr ""
+
+#: ../src/main.c:1071
+#, c-format
+msgid "This is Geany %s."
+msgstr ""
+
+#: ../src/main.c:1073
+#, fuzzy, c-format
+msgid "Configuration directory could not be created (%s)."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#: ../src/main.c:1286
+#, fuzzy
+msgid "Configuration files reloaded."
+msgstr "Хөрвүүлэлтийн алдаа гарлаа."
+
+#: ../src/msgwindow.c:158
+msgid "Status messages"
+msgstr ""
+
+#: ../src/msgwindow.c:556
+msgid "C_opy"
+msgstr ""
+
+#: ../src/msgwindow.c:565
+msgid "Copy _All"
+msgstr ""
+
+#: ../src/msgwindow.c:595
+msgid "_Hide Message Window"
+msgstr ""
+
+#: ../src/msgwindow.c:651
+#, c-format
+msgid "Could not find file '%s' - trying the current document path."
+msgstr ""
+
+#: ../src/plugins.c:485
+#, c-format
+msgid ""
+"The plugin \"%s\" is not binary compatible with this release of Geany - "
+"please recompile it."
+msgstr ""
+
+#: ../src/plugins.c:992
+msgid "_Plugin Manager"
+msgstr ""
+
+#. Translators: <plugin name> <plugin version>
+#: ../src/plugins.c:1158
+#, c-format
+msgid "%s %s"
+msgstr ""
+
+#: ../src/plugins.c:1234
+msgid "Active"
+msgstr ""
+
+#: ../src/plugins.c:1240
+msgid "Plugin"
+msgstr ""
+
+#: ../src/plugins.c:1264
+msgid "No plugins available."
+msgstr ""
+
+#: ../src/plugins.c:1360
+msgid "Plugins"
+msgstr ""
+
+#: ../src/plugins.c:1380
+msgid "Choose which plugins should be loaded at startup:"
+msgstr ""
+
+#: ../src/plugins.c:1392
+msgid "<b>Plugin details:</b>"
+msgstr ""
+
+#: ../src/plugins.c:1401
+msgid "Plugin:"
+msgstr ""
+
+#: ../src/plugins.c:1402 ../src/project.c:444
+#, fuzzy
+msgid "Description:"
+msgstr "DVI үүсэлт:"
+
+#: ../src/plugins.c:1403
+msgid "Author(s):"
+msgstr ""
+
+#: ../src/pluginutils.c:332
+msgid "Configure Plugins"
+msgstr ""
+
+#: ../src/prefs.c:177
+msgid "Grab Key"
+msgstr ""
+
+#: ../src/prefs.c:183
+#, c-format
+msgid "Press the combination of the keys you want to use for \"%s\"."
+msgstr ""
+
+#: ../src/prefs.c:223 ../src/symbols.c:2139 ../src/sidebar.c:730
+#, fuzzy
+msgid "_Expand All"
+msgstr "_Бүгдийг Үүсгэх\t"
+
+#: ../src/prefs.c:228 ../src/symbols.c:2144 ../src/sidebar.c:736
+#, fuzzy
+msgid "_Collapse All"
+msgstr "_Бүгдийг Үүсгэх\t"
+
+#: ../src/prefs.c:287
+#, fuzzy
+msgid "Action"
+msgstr "сонголт"
+
+#: ../src/prefs.c:291
+msgid "Shortcut"
+msgstr ""
+
+#: ../src/prefs.c:1464
+msgid "_Allow"
+msgstr ""
+
+#: ../src/prefs.c:1466
+msgid "_Override"
+msgstr ""
+
+#: ../src/prefs.c:1467
+msgid "Override that keybinding?"
+msgstr ""
+
+#: ../src/prefs.c:1468
+#, c-format
+msgid "The combination '%s' is already used for \"%s\"."
+msgstr ""
+
+#: ../src/prefs.c:1600 ../src/vte.c:282 ../src/vte.c:752 ../src/vte.c:757
+msgid "Terminal"
+msgstr ""
+
+#. add manually GeanyWrapLabels because they can't be added with Glade
+#. page Tools
+#: ../src/prefs.c:1661
+msgid "Enter tool paths below. Tools you do not need can be left blank."
+msgstr ""
+
+#. page Templates
+#: ../src/prefs.c:1666
+msgid ""
+"Set the information to be used in templates. See the documentation for "
+"details."
+msgstr ""
+
+#. page Keybindings
+#: ../src/prefs.c:1671
+msgid ""
+"Here you can change keyboard shortcuts for various actions. Select one and "
+"press the Change button to enter a new shortcut, or double click on an "
+"action to edit the string representation of the shortcut directly."
+msgstr ""
+
+#. page Editor->Indentation
+#: ../src/prefs.c:1676
+msgid ""
+"<i>Warning: these settings are overridden by the current project. See "
+"<b>Project->Properties</b>.</i>"
+msgstr ""
+
+#: ../src/printing.c:183
+msgid "The editor font is not a monospaced font!"
+msgstr ""
+
+#: ../src/printing.c:184
+msgid "Text will be wrongly spaced."
+msgstr ""
+
+#: ../src/printing.c:301
+#, fuzzy, c-format
+msgid "<b>Page %d of %d</b>"
+msgstr "<b>Өөрчилсөн:</b>"
+
+#: ../src/printing.c:371
+msgid "Document Setup"
+msgstr ""
+
+#: ../src/printing.c:406
+msgid "Print only the basename(without the path) of the printed file"
+msgstr ""
+
+#: ../src/printing.c:525
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: ../src/printing.c:779
+#, c-format
+msgid "Did not send document %s to the printing subsystem."
+msgstr ""
+
+#: ../src/printing.c:781
+#, c-format
+msgid "Document %s was sent to the printing subsystem."
+msgstr ""
+
+#: ../src/printing.c:833
+#, fuzzy, c-format
+msgid "Printing of %s failed (%s)."
+msgstr "Процесс-д алдаа гарлаа (%s)"
+
+#: ../src/printing.c:872
+msgid "Please set a print command in the preferences dialog first."
+msgstr ""
+
+#: ../src/printing.c:880
+#, c-format
+msgid ""
+"The file \"%s\" will be printed with the following command:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/printing.c:896
+#, c-format
+msgid "Printing of \"%s\" failed (return code: %s)."
+msgstr ""
+
+#: ../src/printing.c:902
+#, c-format
+msgid "File %s printed."
+msgstr ""
+
+#. "projects" is part of the default project base path so be careful when translating
+#. * please avoid special characters and spaces, look at the source for details or ask Frank
+#: ../src/project.c:97
+msgid "projects"
+msgstr ""
+
+#: ../src/project.c:116
+msgid "New Project"
+msgstr ""
+
+#: ../src/project.c:124
+msgid "C_reate"
+msgstr ""
+
+#: ../src/project.c:138 ../src/project.c:431 ../plugins/classbuilder.c:470
+#: ../plugins/classbuilder.c:480
+msgid "Name:"
+msgstr ""
+
+#: ../src/project.c:147 ../src/project.c:418
+msgid "Filename:"
+msgstr ""
+
+#: ../src/project.c:163 ../src/project.c:461
+msgid "Base path:"
+msgstr ""
+
+#: ../src/project.c:169 ../src/project.c:470
+msgid ""
+"Base directory of all files that make up the project. This can be a new "
+"path, or an existing directory tree. You can use paths relative to the "
+"project filename."
+msgstr ""
+
+#: ../src/project.c:172 ../src/project.c:473
+msgid "Choose Project Base Path"
+msgstr ""
+
+#: ../src/project.c:194 ../src/project.c:573
+#, fuzzy
+msgid "Project file could not be written"
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#: ../src/project.c:197
+#, c-format
+msgid "Project \"%s\" created."
+msgstr ""
+
+#: ../src/project.c:238 ../src/project.c:270 ../src/project.c:958
+#, fuzzy, c-format
+msgid "Project file \"%s\" could not be loaded."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#: ../src/project.c:264 ../src/project.c:276
+msgid "Open Project"
+msgstr ""
+
+#: ../src/project.c:296
+msgid "Project files"
+msgstr ""
+
+#: ../src/project.c:346
+#, fuzzy, c-format
+msgid "Project \"%s\" closed."
+msgstr "%s файл хаагдлаа."
+
+#: ../src/project.c:490
+msgid "File patterns:"
+msgstr ""
+
+#: ../src/project.c:498
+msgid ""
+"Space separated list of file patterns used for the find in files dialog (e."
+"g. *.c *.h)"
+msgstr ""
+
+#: ../src/project.c:576
+#, c-format
+msgid "Project \"%s\" saved."
+msgstr ""
+
+#: ../src/project.c:607
+#, fuzzy
+msgid "Do you want to close it before proceeding?"
+msgstr "Хаахын өмнө хадгалах уу?"
+
+#: ../src/project.c:608
+#, c-format
+msgid "The '%s' project is already open."
+msgstr ""
+
+#: ../src/project.c:656
+msgid "The specified project name is too short."
+msgstr ""
+
+#: ../src/project.c:662
+#, c-format
+msgid "The specified project name is too long (max. %d characters)."
+msgstr ""
+
+#: ../src/project.c:674
+msgid "You have specified an invalid project filename."
+msgstr ""
+
+#: ../src/project.c:697
+msgid "Create the project's base path directory?"
+msgstr ""
+
+#: ../src/project.c:698
+#, fuzzy, c-format
+msgid "The path \"%s\" does not exist."
+msgstr "The file \"%s\" is not valid %s."
+
+#: ../src/project.c:707
+#, fuzzy, c-format
+msgid "Project base directory could not be created (%s)."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#: ../src/project.c:720
+#, fuzzy, c-format
+msgid "Project file could not be written (%s)."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#. initialise the dialog
+#: ../src/project.c:862 ../src/project.c:873
+msgid "Choose Project Filename"
+msgstr ""
+
+#: ../src/project.c:948
+#, c-format
+msgid "Project \"%s\" opened."
+msgstr ""
+
+#: ../src/search.c:290 ../src/search.c:970
+msgid "_Use regular expressions"
+msgstr ""
+
+#: ../src/search.c:293
+msgid ""
+"Use POSIX-like regular expressions. For detailed information about using "
+"regular expressions, please read the documentation."
+msgstr ""
+
+#: ../src/search.c:300
+msgid "Search _backwards"
+msgstr ""
+
+#: ../src/search.c:313
+msgid "Use _escape sequences"
+msgstr ""
+
+#: ../src/search.c:317
+msgid ""
+"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the "
+"corresponding control characters"
+msgstr ""
+
+#: ../src/search.c:326 ../src/search.c:979
+msgid "C_ase sensitive"
+msgstr ""
+
+#: ../src/search.c:330 ../src/search.c:984
+msgid "Match only a _whole word"
+msgstr ""
+
+#: ../src/search.c:334
+msgid "Match from s_tart of word"
+msgstr ""
+
+#: ../src/search.c:470
+msgid "_Previous"
+msgstr ""
+
+#: ../src/search.c:475
+#, fuzzy
+msgid "_Next"
+msgstr "_Дараачийн Алдаа"
+
+#: ../src/search.c:479 ../src/search.c:640 ../src/search.c:881
+msgid "_Search for:"
+msgstr ""
+
+#. Now add the multiple match options
+#: ../src/search.c:508
+msgid "_Find All"
+msgstr ""
+
+#: ../src/search.c:515
+msgid "_Mark"
+msgstr ""
+
+#: ../src/search.c:517
+msgid "Mark all matches in the current document"
+msgstr ""
+
+#: ../src/search.c:522 ../src/search.c:697
+msgid "In Sessi_on"
+msgstr ""
+
+#: ../src/search.c:527 ../src/search.c:702
+#, fuzzy
+msgid "_In Document"
+msgstr "бүх барим"
+
+#. close window checkbox
+#: ../src/search.c:533 ../src/search.c:715
+msgid "Close _dialog"
+msgstr ""
+
+#: ../src/search.c:537 ../src/search.c:719
+msgid "Disable this option to keep the dialog open"
+msgstr ""
+
+#: ../src/search.c:634
+msgid "Replace & Fi_nd"
+msgstr ""
+
+#: ../src/search.c:643
+msgid "Replace wit_h:"
+msgstr ""
+
+#. Now add the multiple replace options
+#: ../src/search.c:690
+#, fuzzy
+msgid "Re_place All"
+msgstr "_Бүгдийг Үүсгэх\t"
+
+#: ../src/search.c:707
+#, fuzzy
+msgid "In Se_lection"
+msgstr "сонголт"
+
+#: ../src/search.c:709
+msgid "Replace all matches found in the currently selected text"
+msgstr ""
+
+#: ../src/search.c:826
+msgid "all"
+msgstr ""
+
+#: ../src/search.c:828
+msgid "project"
+msgstr ""
+
+#: ../src/search.c:830
+msgid "custom"
+msgstr ""
+
+#: ../src/search.c:834
+msgid ""
+"All: search all files in the directory\n"
+"Project: use file patterns defined in the project settings\n"
+"Custom: specify file patterns manually"
+msgstr ""
+
+#: ../src/search.c:900
+msgid "Fi_les:"
+msgstr ""
+
+#: ../src/search.c:912
+msgid "File patterns, e.g. *.c *.h"
+msgstr ""
+
+#: ../src/search.c:924
+msgid "_Directory:"
+msgstr ""
+
+#: ../src/search.c:942
+#, fuzzy
+msgid "E_ncoding:"
+msgstr "Энкодчиллыг заа:"
+
+#: ../src/search.c:973
+msgid "See grep's manual page for more information"
+msgstr ""
+
+#: ../src/search.c:975
+msgid "_Recurse in subfolders"
+msgstr ""
+
+#: ../src/search.c:988
+msgid "_Invert search results"
+msgstr ""
+
+#: ../src/search.c:992
+msgid "Invert the sense of matching, to select non-matching lines"
+msgstr ""
+
+#: ../src/search.c:1009
+msgid "E_xtra options:"
+msgstr ""
+
+#: ../src/search.c:1016
+msgid "Other options to pass to Grep"
+msgstr ""
+
+#: ../src/search.c:1277 ../src/search.c:2062 ../src/search.c:2065
+#, c-format
+msgid "Found %d match for \"%s\"."
+msgid_plural "Found %d matches for \"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/search.c:1324
+#, c-format
+msgid "Replaced %u matches in %u documents."
+msgstr ""
+
+#: ../src/search.c:1511
+msgid "Invalid directory for find in files."
+msgstr ""
+
+#: ../src/search.c:1532
+msgid "No text to find."
+msgstr ""
+
+#: ../src/search.c:1559
+#, fuzzy, c-format
+msgid "Cannot execute grep tool '%s'; check the path setting in Preferences."
+msgstr ""
+"'%s'-ээс терминалыг олсонгүй (Тохиргоо цэснээс Терминалын замыг шалгана уу)"
+
+#: ../src/search.c:1627
+msgid "Searching..."
+msgstr ""
+
+#: ../src/search.c:1638
+#, fuzzy, c-format
+msgid "%s %s -- %s (in directory: %s)"
+msgstr "%s (%s хавтасд)"
+
+#: ../src/search.c:1679
+#, fuzzy, c-format
+msgid "Could not open directory (%s)"
+msgstr "%s файлыг нээж чадахгүй байна (%s)"
+
+#: ../src/search.c:1781
+msgid "Search failed."
+msgstr ""
+
+#: ../src/search.c:1801
+#, c-format
+msgid "Search completed with %d match."
+msgid_plural "Search completed with %d matches."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/search.c:1809
+msgid "No matches found."
+msgstr ""
+
+#: ../src/search.c:1841
+#, c-format
+msgid "Bad regex: %s"
+msgstr ""
+
+#. TODO maybe this message needs a rewording
+#: ../src/socket.c:225
+msgid ""
+"Geany tried to access the Unix Domain socket of another instance running as "
+"another user.\n"
+"This is a fatal error and Geany will now quit."
+msgstr ""
+
+#: ../src/stash.c:1072
+msgid "Name"
+msgstr ""
+
+#: ../src/stash.c:1079
+msgid "Value"
+msgstr ""
+
+#: ../src/symbols.c:686 ../src/symbols.c:736 ../src/symbols.c:803
+msgid "Chapter"
+msgstr ""
+
+#: ../src/symbols.c:687 ../src/symbols.c:732 ../src/symbols.c:804
+#, fuzzy
+msgid "Section"
+msgstr "сонголт"
+
+#: ../src/symbols.c:688
+msgid "Sect1"
+msgstr ""
+
+#: ../src/symbols.c:689
+msgid "Sect2"
+msgstr ""
+
+#: ../src/symbols.c:690
+msgid "Sect3"
+msgstr ""
+
+#: ../src/symbols.c:691
+msgid "Appendix"
+msgstr ""
+
+#: ../src/symbols.c:692 ../src/symbols.c:737 ../src/symbols.c:753
+#: ../src/symbols.c:764 ../src/symbols.c:851 ../src/symbols.c:862
+#: ../src/symbols.c:874 ../src/symbols.c:888 ../src/symbols.c:900
+#: ../src/symbols.c:912 ../src/symbols.c:927 ../src/symbols.c:956
+#: ../src/symbols.c:985
+#, fuzzy
+msgid "Other"
+msgstr "Бусад:"
+
+#: ../src/symbols.c:698 ../src/symbols.c:920 ../src/symbols.c:965
+msgid "Module"
+msgstr ""
+
+#: ../src/symbols.c:699 ../src/symbols.c:847 ../src/symbols.c:898
+#: ../src/symbols.c:910 ../src/symbols.c:925 ../src/symbols.c:937
+msgid "Types"
+msgstr ""
+
+#: ../src/symbols.c:700
+msgid "Type constructors"
+msgstr ""
+
+#: ../src/symbols.c:701 ../src/symbols.c:723 ../src/symbols.c:744
+#: ../src/symbols.c:752 ../src/symbols.c:761 ../src/symbols.c:773
+#: ../src/symbols.c:782 ../src/symbols.c:835 ../src/symbols.c:884
+#: ../src/symbols.c:907 ../src/symbols.c:922 ../src/symbols.c:950
+#: ../src/symbols.c:972
+msgid "Functions"
+msgstr ""
+
+#: ../src/symbols.c:706
+msgid "Program"
+msgstr ""
+
+#: ../src/symbols.c:708 ../src/symbols.c:716 ../src/symbols.c:722
+#, fuzzy
+msgid "Sections"
+msgstr "сонголт"
+
+#: ../src/symbols.c:709
+msgid "Paragraph"
+msgstr ""
+
+#: ../src/symbols.c:710
+#, fuzzy
+msgid "Group"
+msgstr "Бүлэг:"
+
+#: ../src/symbols.c:711
+msgid "Data"
+msgstr ""
+
+#: ../src/symbols.c:717
+msgid "Keys"
+msgstr ""
+
+#: ../src/symbols.c:724 ../src/symbols.c:775 ../src/symbols.c:836
+#: ../src/symbols.c:861 ../src/symbols.c:886 ../src/symbols.c:899
+#: ../src/symbols.c:908 ../src/symbols.c:924 ../src/symbols.c:984
+msgid "Variables"
+msgstr ""
+
+#: ../src/symbols.c:731
+msgid "Environment"
+msgstr ""
+
+#: ../src/symbols.c:733 ../src/symbols.c:805
+#, fuzzy
+msgid "Subsection"
+msgstr "сонголт"
+
+#: ../src/symbols.c:734 ../src/symbols.c:806
+#, fuzzy
+msgid "Subsubsection"
+msgstr "сонголт"
+
+#: ../src/symbols.c:745
+msgid "Structures"
+msgstr ""
+
+#: ../src/symbols.c:760 ../src/symbols.c:844 ../src/symbols.c:869
+#: ../src/symbols.c:881
+msgid "Package"
+msgstr ""
+
+#: ../src/symbols.c:762 ../src/symbols.c:911 ../src/symbols.c:934
+msgid "Labels"
+msgstr ""
+
+#: ../src/symbols.c:763 ../src/symbols.c:774 ../src/symbols.c:887
+#: ../src/symbols.c:909
+msgid "Constants"
+msgstr ""
+
+#: ../src/symbols.c:771 ../src/symbols.c:870 ../src/symbols.c:882
+#: ../src/symbols.c:895 ../src/symbols.c:921
+msgid "Interfaces"
+msgstr ""
+
+#: ../src/symbols.c:772 ../src/symbols.c:793 ../src/symbols.c:814
+#: ../src/symbols.c:824 ../src/symbols.c:833 ../src/symbols.c:871
+#: ../src/symbols.c:883 ../src/symbols.c:896 ../src/symbols.c:971
+msgid "Classes"
+msgstr ""
+
+#: ../src/symbols.c:783
+msgid "Anchors"
+msgstr ""
+
+#: ../src/symbols.c:784
+msgid "H1 Headings"
+msgstr ""
+
+#: ../src/symbols.c:785
+msgid "H2 Headings"
+msgstr ""
+
+#: ../src/symbols.c:786
+msgid "H3 Headings"
+msgstr ""
+
+#: ../src/symbols.c:794
+msgid "ID Selectors"
+msgstr ""
+
+#: ../src/symbols.c:795
+msgid "Type Selectors"
+msgstr ""
+
+#: ../src/symbols.c:813 ../src/symbols.c:859
+msgid "Modules"
+msgstr ""
+
+#: ../src/symbols.c:815
+msgid "Singletons"
+msgstr ""
+
+#: ../src/symbols.c:816 ../src/symbols.c:825 ../src/symbols.c:834
+#: ../src/symbols.c:872 ../src/symbols.c:897
+msgid "Methods"
+msgstr ""
+
+#: ../src/symbols.c:823 ../src/symbols.c:968
+msgid "Namespaces"
+msgstr ""
+
+#: ../src/symbols.c:826 ../src/symbols.c:951
+msgid "Procedures"
+msgstr ""
+
+#: ../src/symbols.c:837
+msgid "Imports"
+msgstr ""
+
+#: ../src/symbols.c:845
+msgid "Entities"
+msgstr ""
+
+#: ../src/symbols.c:846
+msgid "Architectures"
+msgstr ""
+
+#: ../src/symbols.c:848
+msgid "Functions / Procedures"
+msgstr ""
+
+#: ../src/symbols.c:849
+msgid "Variables / Signals"
+msgstr ""
+
+#: ../src/symbols.c:850
+msgid "Processes / Components"
+msgstr ""
+
+#: ../src/symbols.c:858
+msgid "Events"
+msgstr ""
+
+#: ../src/symbols.c:860
+msgid "Functions / Tasks"
+msgstr ""
+
+#: ../src/symbols.c:873 ../src/symbols.c:973
+msgid "Members"
+msgstr ""
+
+#: ../src/symbols.c:923
+msgid "Subroutines"
+msgstr ""
+
+#: ../src/symbols.c:926
+msgid "Blocks"
+msgstr ""
+
+#: ../src/symbols.c:935 ../src/symbols.c:944 ../src/symbols.c:981
+msgid "Macros"
+msgstr ""
+
+#: ../src/symbols.c:936
+#, fuzzy
+msgid "Defines"
+msgstr "Мөр:"
+
+#: ../src/symbols.c:943
+msgid "Targets"
+msgstr ""
+
+#: ../src/symbols.c:952
+msgid "Indexes"
+msgstr ""
+
+#: ../src/symbols.c:953
+msgid "Tables"
+msgstr ""
+
+#: ../src/symbols.c:954
+msgid "Triggers"
+msgstr ""
+
+#: ../src/symbols.c:955
+#, fuzzy
+msgid "Views"
+msgstr "_Харагдац"
+
+#: ../src/symbols.c:974
+msgid "Structs"
+msgstr ""
+
+#: ../src/symbols.c:975
+msgid "Typedefs / Enums"
+msgstr ""
+
+#: ../src/symbols.c:1616
+#, c-format
+msgid "Unknown filetype extension for \"%s\".\n"
+msgstr ""
+
+#: ../src/symbols.c:1639
+#, c-format
+msgid "Failed to create tags file, perhaps because no tags were found.\n"
+msgstr ""
+
+#: ../src/symbols.c:1646
+#, c-format
+msgid ""
+"Usage: %s -g <Tag File> <File list>\n"
+"\n"
+msgstr ""
+
+#: ../src/symbols.c:1647
+#, c-format
+msgid ""
+"Example:\n"
+"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/"
+"gtk/gtk.h\n"
+msgstr ""
+
+#: ../src/symbols.c:1661
+msgid "Load Tags"
+msgstr ""
+
+#: ../src/symbols.c:1668
+msgid "Geany tag files (*.tags)"
+msgstr ""
+
+#. For translators: the first wildcard is the filetype, the second the filename
+#: ../src/symbols.c:1688
+#, c-format
+msgid "Loaded %s tags file '%s'."
+msgstr ""
+
+#: ../src/symbols.c:1691
+#, fuzzy, c-format
+msgid "Could not load tags file '%s'."
+msgstr "%s файлыг нээж чадахгүй байна (%s)"
+
+#: ../src/symbols.c:1846
+#, c-format
+msgid "Forward declaration \"%s\" not found."
+msgstr "\"%s\" Forward declaration олдсонгүй."
+
+#: ../src/symbols.c:1848
+#, c-format
+msgid "Definition of \"%s\" not found."
+msgstr "\"%s\"-ийн тодорхойлолт олдсонгүй."
+
+#: ../src/symbols.c:2154
+msgid "Sort by _Name"
+msgstr ""
+
+#: ../src/symbols.c:2161
+msgid "Sort by _Appearance"
+msgstr ""
+
+#: ../src/templates.c:75
+#, c-format
+msgid "Failed to convert template file \"%s\" to UTF-8"
+msgstr ""
+
+#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build"
+#: ../src/toolbar.c:54
+msgid "Save the current file"
+msgstr ""
+
+#: ../src/toolbar.c:56
+msgid "Save all open files"
+msgstr ""
+
+#: ../src/toolbar.c:57
+msgid "Reload the current file from disk"
+msgstr ""
+
+#: ../src/toolbar.c:58
+msgid "Close the current file"
+msgstr ""
+
+#: ../src/toolbar.c:59
+msgid "Close all open files"
+msgstr ""
+
+#: ../src/toolbar.c:60
+#, fuzzy
+msgid "Cut the current selection"
+msgstr "Файлыг хөрвүүл"
+
+#: ../src/toolbar.c:61
+#, fuzzy
+msgid "Copy the current selection"
+msgstr "Файлыг хөрвүүл"
+
+#: ../src/toolbar.c:62
+msgid "Paste the contents of the clipboard"
+msgstr ""
+
+#: ../src/toolbar.c:63
+#, fuzzy
+msgid "Delete the current selection"
+msgstr "Файлыг хөрвүүл"
+
+#: ../src/toolbar.c:64
+msgid "Undo the last modification"
+msgstr ""
+
+#: ../src/toolbar.c:65
+msgid "Redo the last modification"
+msgstr ""
+
+#: ../src/toolbar.c:68
+msgid "Compile the current file"
+msgstr ""
+
+#: ../src/toolbar.c:69
+msgid "Run or view the current file"
+msgstr "Файлыг харах эсвэл ажиллуулах"
+
+#: ../src/toolbar.c:70
+msgid ""
+"Open a color chooser dialog, to interactively pick colors from a palette"
+msgstr ""
+
+#: ../src/toolbar.c:71
+msgid "Zoom in the text"
+msgstr ""
+
+#: ../src/toolbar.c:72
+msgid "Zoom out the text"
+msgstr ""
+
+#: ../src/toolbar.c:73
+msgid "Decrease indentation"
+msgstr ""
+
+#: ../src/toolbar.c:74
+msgid "Increase indentation"
+msgstr ""
+
+#: ../src/toolbar.c:75 ../src/toolbar.c:380
+msgid "Find the entered text in the current file"
+msgstr ""
+
+#: ../src/toolbar.c:76 ../src/toolbar.c:390
+msgid "Jump to the entered line number"
+msgstr ""
+
+#: ../src/toolbar.c:77
+msgid "Show the preferences dialog"
+msgstr ""
+
+#: ../src/toolbar.c:78
+msgid "Quit Geany"
+msgstr ""
+
+#: ../src/toolbar.c:79
+#, fuzzy
+msgid "Print document"
+msgstr "бүх барим"
+
+#: ../src/toolbar.c:80
+msgid "Replace text in the current document"
+msgstr ""
+
+#: ../src/toolbar.c:356
+msgid "Create a new file"
+msgstr ""
+
+#: ../src/toolbar.c:357
+msgid "Create a new file from a template"
+msgstr ""
+
+#: ../src/toolbar.c:364
+msgid "Open an existing file"
+msgstr ""
+
+#: ../src/toolbar.c:365
+#, fuzzy
+msgid "Open a recent file"
+msgstr "Файлыг хөрвүүл"
+
+#: ../src/toolbar.c:373
+#, fuzzy
+msgid "Choose more build actions"
+msgstr "Боловсруулахад алдаа гараагүй"
+
+#: ../src/toolbar.c:390
+msgid "Goto"
+msgstr ""
+
+#: ../src/toolbar.c:579
+msgid "Separator"
+msgstr ""
+
+#: ../src/toolbar.c:580
+msgid "--- Separator ---"
+msgstr ""
+
+#: ../src/toolbar.c:949
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../src/toolbar.c:965
+msgid "Available Items"
+msgstr ""
+
+#: ../src/toolbar.c:986
+msgid "Displayed Items"
+msgstr ""
+
+#: ../src/tools.c:108 ../src/tools.c:113
+#, fuzzy, c-format
+msgid "Invalid command: %s"
+msgstr " командууд"
+
+#: ../src/tools.c:108
+msgid "Command not found"
+msgstr ""
+
+#: ../src/tools.c:254
+#, c-format
+msgid ""
+"The executed custom command returned an error. Your selection was not "
+"changed. Error message: %s"
+msgstr ""
+
+#: ../src/tools.c:320
+msgid "The executed custom command exited with an unsuccessful exit code."
+msgstr ""
+
+#: ../src/tools.c:348 ../src/tools.c:396
+#, c-format
+msgid "Custom command failed: %s"
+msgstr ""
+
+#: ../src/tools.c:352
+#, c-format
+msgid "Passing data and executing custom command: %s"
+msgstr ""
+
+#: ../src/tools.c:498 ../src/tools.c:731
+msgid "Set Custom Commands"
+msgstr ""
+
+#: ../src/tools.c:506
+msgid ""
+"You can send the current selection to any of these commands and the output "
+"of the command replaces the current selection."
+msgstr ""
+
+#: ../src/tools.c:520
+msgid "ID"
+msgstr ""
+
+#: ../src/tools.c:706
+msgid "No custom commands defined."
+msgstr ""
+
+#: ../src/tools.c:800
+msgid "Word Count"
+msgstr "Үгийг Тоол"
+
+#: ../src/tools.c:810
+msgid "selection"
+msgstr "сонголт"
+
+#: ../src/tools.c:816
+msgid "whole document"
+msgstr "бүх барим"
+
+#: ../src/tools.c:825
+msgid "Range:"
+msgstr "Зай:"
+
+#: ../src/tools.c:837
+msgid "Lines:"
+msgstr "Мөр:"
+
+#: ../src/tools.c:851
+msgid "Words:"
+msgstr "Үг:"
+
+#: ../src/tools.c:865
+msgid "Characters:"
+msgstr "Тэмдэгт:"
+
+#: ../src/sidebar.c:175
+msgid "No tags found"
+msgstr ""
+
+#: ../src/sidebar.c:588
+msgid "Show S_ymbol List"
+msgstr ""
+
+#: ../src/sidebar.c:596
+#, fuzzy
+msgid "Show _Document List"
+msgstr "бүх барим"
+
+#: ../src/sidebar.c:604 ../plugins/filebrowser.c:658
+msgid "H_ide Sidebar"
+msgstr ""
+
+#: ../src/sidebar.c:709 ../plugins/filebrowser.c:629
+msgid "_Find in Files"
+msgstr ""
+
+#: ../src/sidebar.c:719
+msgid "Show _Paths"
+msgstr ""
+
+#. Status bar statistics: col = column, sel = selection.
+#: ../src/ui_utils.c:173
+msgid ""
+"line: %l / %L\t col: %c\t sel: %s\t %w      %t      %mmode: %M      "
+"encoding: %e      filetype: %f      scope: %S"
+msgstr ""
+
+#. RO = read-only
+#: ../src/ui_utils.c:203 ../src/ui_utils.c:210
+msgid "RO "
+msgstr ""
+
+#. OVR = overwrite/overtype, INS = insert
+#: ../src/ui_utils.c:205
+msgid "OVR"
+msgstr ""
+
+#: ../src/ui_utils.c:205
+msgid "INS"
+msgstr ""
+
+#: ../src/ui_utils.c:219
+msgid "TAB"
+msgstr ""
+
+#. SP = space
+#: ../src/ui_utils.c:222
+msgid "SP"
+msgstr ""
+
+#. T/S = tabs and spaces
+#: ../src/ui_utils.c:225
+msgid "T/S"
+msgstr ""
+
+#: ../src/ui_utils.c:233
+msgid "MOD"
+msgstr ""
+
+#: ../src/ui_utils.c:360
+msgid " (new instance)"
+msgstr ""
+
+#: ../src/ui_utils.c:390
+#, c-format
+msgid "Font updated (%s)."
+msgstr ""
+
+#: ../src/ui_utils.c:586
+msgid "C Standard Library"
+msgstr ""
+
+#: ../src/ui_utils.c:587
+msgid "ISO C99"
+msgstr ""
+
+#: ../src/ui_utils.c:588
+msgid "C++ (C Standard Library)"
+msgstr ""
+
+#: ../src/ui_utils.c:589
+msgid "C++ Standard Library"
+msgstr ""
+
+#: ../src/ui_utils.c:590
+msgid "C++ STL"
+msgstr ""
+
+#: ../src/ui_utils.c:652
+#, fuzzy
+msgid "_Set Custom Date Format"
+msgstr "Огнооны Хэлбэрүүдийг Хэрэглэх"
+
+#: ../src/ui_utils.c:1799
+msgid "Select Folder"
+msgstr ""
+
+#: ../src/ui_utils.c:1799
+#, fuzzy
+msgid "Select File"
+msgstr "Файлыг Хадгал"
+
+#: ../src/ui_utils.c:1958
+#, fuzzy
+msgid "Save All"
+msgstr "_Бүгдийг Үүсгэх\t"
+
+#: ../src/ui_utils.c:1959
+msgid "Close All"
+msgstr ""
+
+#: ../src/utils.c:87
+msgid "Select Browser"
+msgstr ""
+
+#: ../src/utils.c:88
+msgid ""
+"Failed to spawn the configured browser command. Please correct it or enter "
+"another one."
+msgstr ""
+
+#: ../src/utils.c:366
+msgid "Win (CRLF)"
+msgstr ""
+
+#: ../src/utils.c:367
+msgid "Mac (CR)"
+msgstr ""
+
+#: ../src/utils.c:368
+msgid "Unix (LF)"
+msgstr ""
+
+#: ../src/vte.c:545
+msgid "_Set Path From Document"
+msgstr ""
+
+#: ../src/vte.c:550
+msgid "_Restart Terminal"
+msgstr ""
+
+#: ../src/vte.c:573
+msgid "_Input Methods"
+msgstr ""
+
+#: ../src/vte.c:667
+msgid ""
+"Could not change the directory in the VTE because it probably contains a "
+"command."
+msgstr ""
+
+#: ../src/vte.c:765
+msgid "Font:"
+msgstr ""
+
+#: ../src/vte.c:775
+msgid "Sets the font for the terminal widget"
+msgstr ""
+
+#: ../src/vte.c:777
+msgid "Foreground color:"
+msgstr ""
+
+#: ../src/vte.c:783
+msgid "Background color:"
+msgstr ""
+
+#: ../src/vte.c:793
+msgid "Sets the foreground color of the text in the terminal widget"
+msgstr ""
+
+#: ../src/vte.c:800
+msgid "Sets the background color of the text in the terminal widget"
+msgstr ""
+
+#: ../src/vte.c:803
+msgid "Scrollback lines:"
+msgstr ""
+
+#: ../src/vte.c:815
+msgid ""
+"Specifies the history in lines, which you can scroll back in the terminal "
+"widget"
+msgstr ""
+
+#: ../src/vte.c:819
+msgid "Shell:"
+msgstr ""
+
+#: ../src/vte.c:827
+msgid ""
+"Sets the path to the shell which should be started inside the terminal "
+"emulation"
+msgstr ""
+
+#: ../src/vte.c:844
+msgid "Scroll on keystroke"
+msgstr ""
+
+#: ../src/vte.c:845
+msgid "Whether to scroll to the bottom if a key was pressed"
+msgstr ""
+
+#: ../src/vte.c:848
+msgid "Scroll on output"
+msgstr ""
+
+#: ../src/vte.c:849
+msgid "Whether to scroll to the bottom when output is generated"
+msgstr ""
+
+#: ../src/vte.c:852
+msgid "Cursor blinks"
+msgstr ""
+
+#: ../src/vte.c:853
+msgid "Whether to blink the cursor"
+msgstr ""
+
+#: ../src/vte.c:856
+msgid "Override Geany keybindings"
+msgstr ""
+
+#: ../src/vte.c:858
+msgid ""
+"Allows the VTE to receive keyboard shortcuts (apart from focus commands)"
+msgstr ""
+
+#: ../src/vte.c:861
+msgid "Disable menu shortcut key (F10 by default)"
+msgstr ""
+
+#: ../src/vte.c:862
+msgid ""
+"This option disables the keybinding to popup the menu bar (default is F10). "
+"Disabling it can be useful if you use, for example, Midnight Commander "
+"within the VTE."
+msgstr ""
+
+#: ../src/vte.c:865 ../plugins/filebrowser.c:1261
+#, fuzzy
+msgid "Follow the path of the current file"
+msgstr "Файлыг хөрвүүлээд харах"
+
+#: ../src/vte.c:866
+msgid "Whether to execute \"cd $path\" when you switch between opened files"
+msgstr ""
+
+#. create check_skip_script checkbox before the check_skip_script checkbox to be able to
+#. * use the object for the toggled handler of check_skip_script checkbox
+#: ../src/vte.c:871
+msgid "Don't use run script"
+msgstr ""
+
+#: ../src/vte.c:872
+msgid ""
+"Don't use the simple run script which is usually used to display the exit "
+"status of the executed program"
+msgstr ""
+
+#: ../src/vte.c:875
+msgid "Execute programs in VTE"
+msgstr ""
+
+#: ../src/vte.c:876
+msgid ""
+"Run programs in VTE instead of opening a terminal emulation window. Please "
+"note, programs executed in VTE cannot be stopped"
+msgstr ""
+
+#: ../src/win32.c:159
+msgid "Geany project files"
+msgstr ""
+
+#: ../src/win32.c:165
+#, fuzzy
+msgid "Executables"
+msgstr "Ажиллуул:"
+
+#: ../plugins/classbuilder.c:38
+msgid "Class Builder"
+msgstr ""
+
+#: ../plugins/classbuilder.c:38
+msgid "Creates source files for new class types."
+msgstr ""
+
+#: ../plugins/classbuilder.c:435
+msgid "Create Class"
+msgstr ""
+
+#: ../plugins/classbuilder.c:446
+msgid "Create C++ Class"
+msgstr ""
+
+#: ../plugins/classbuilder.c:449
+msgid "Create GTK+ Class"
+msgstr ""
+
+#: ../plugins/classbuilder.c:452
+msgid "Create PHP Class"
+msgstr ""
+
+#: ../plugins/classbuilder.c:469
+msgid "Namespace"
+msgstr ""
+
+#: ../plugins/classbuilder.c:476 ../plugins/classbuilder.c:478
+msgid "Class"
+msgstr ""
+
+#: ../plugins/classbuilder.c:485
+msgid "Header file:"
+msgstr ""
+
+#: ../plugins/classbuilder.c:487
+#, fuzzy
+msgid "Source file:"
+msgstr "Файлын төрлийг заа:"
+
+#: ../plugins/classbuilder.c:489
+msgid "Inheritance"
+msgstr ""
+
+#: ../plugins/classbuilder.c:491
+msgid "Base class:"
+msgstr ""
+
+#: ../plugins/classbuilder.c:499
+msgid "Base source:"
+msgstr ""
+
+#: ../plugins/classbuilder.c:504
+msgid "Base header:"
+msgstr ""
+
+#: ../plugins/classbuilder.c:512
+msgid "Global"
+msgstr ""
+
+#: ../plugins/classbuilder.c:531
+msgid "Base GType:"
+msgstr ""
+
+#: ../plugins/classbuilder.c:536
+msgid "Implements:"
+msgstr ""
+
+#: ../plugins/classbuilder.c:538
+msgid "Options"
+msgstr ""
+
+#: ../plugins/classbuilder.c:555
+msgid "Create constructor"
+msgstr ""
+
+#: ../plugins/classbuilder.c:560
+msgid "Create destructor"
+msgstr ""
+
+#: ../plugins/classbuilder.c:567
+msgid "Is abstract"
+msgstr ""
+
+#: ../plugins/classbuilder.c:570
+msgid "Is singleton"
+msgstr ""
+
+#: ../plugins/classbuilder.c:580
+msgid "Constructor type:"
+msgstr ""
+
+#: ../plugins/classbuilder.c:1092
+msgid "Create Cla_ss"
+msgstr ""
+
+#: ../plugins/classbuilder.c:1098
+msgid "_C++ Class"
+msgstr ""
+
+#: ../plugins/classbuilder.c:1101
+msgid "_GTK+ Class"
+msgstr ""
+
+#: ../plugins/classbuilder.c:1104
+msgid "_PHP Class"
+msgstr ""
+
+#: ../plugins/htmlchars.c:41
+#, fuzzy
+msgid "HTML Characters"
+msgstr "Тэмдэгт:"
+
+#: ../plugins/htmlchars.c:41
+msgid "Inserts HTML character entities like '&amp;'."
+msgstr ""
+
+#: ../plugins/htmlchars.c:42 ../plugins/export.c:40
+#: ../plugins/filebrowser.c:46 ../plugins/saveactions.c:42
+#: ../plugins/splitwindow.c:35
+msgid "The Geany developer team"
+msgstr ""
+
+#: ../plugins/htmlchars.c:78
+#, fuzzy
+msgid "HTML characters"
+msgstr "Тэмдэгт:"
+
+#: ../plugins/htmlchars.c:84
+msgid "ISO 8859-1 characters"
+msgstr ""
+
+#: ../plugins/htmlchars.c:182
+#, fuzzy
+msgid "Greek characters"
+msgstr "Тэмдэгт:"
+
+#: ../plugins/htmlchars.c:237
+msgid "Mathematical characters"
+msgstr ""
+
+#: ../plugins/htmlchars.c:278
+msgid "Technical characters"
+msgstr ""
+
+#: ../plugins/htmlchars.c:286
+#, fuzzy
+msgid "Arrow characters"
+msgstr "Тэмдэгт:"
+
+#: ../plugins/htmlchars.c:299
+msgid "Punctuation characters"
+msgstr ""
+
+#: ../plugins/htmlchars.c:315
+msgid "Miscellaneous characters"
+msgstr ""
+
+#: ../plugins/htmlchars.c:370 ../plugins/filebrowser.c:1153
+#: ../plugins/saveactions.c:475
+msgid "Plugin configuration directory could not be created."
+msgstr ""
+
+#: ../plugins/htmlchars.c:491
+#, fuzzy
+msgid "Special Characters"
+msgstr "Тэмдэгт:"
+
+#: ../plugins/htmlchars.c:493
+msgid "_Insert"
+msgstr ""
+
+#: ../plugins/htmlchars.c:502
+msgid ""
+"Choose a special character from the list below and double click on it or use "
+"the button to insert it at the current cursor position."
+msgstr ""
+
+#: ../plugins/htmlchars.c:516
+#, fuzzy
+msgid "Character"
+msgstr "Тэмдэгт:"
+
+#: ../plugins/htmlchars.c:522
+msgid "HTML (name)"
+msgstr ""
+
+#: ../plugins/htmlchars.c:740
+msgid "_Insert Special HTML Characters"
+msgstr ""
+
+#. Add menuitem for html replacement functions
+#: ../plugins/htmlchars.c:755
+msgid "_HTML Replacement"
+msgstr ""
+
+#: ../plugins/htmlchars.c:762
+msgid "_Auto-replace Special Characters"
+msgstr ""
+
+#: ../plugins/htmlchars.c:771
+msgid "_Replace Characters in Selection"
+msgstr ""
+
+#: ../plugins/htmlchars.c:786
+msgid "Insert Special HTML Characters"
+msgstr ""
+
+#: ../plugins/htmlchars.c:789
+msgid "Replace special characters"
+msgstr ""
+
+#: ../plugins/htmlchars.c:792
+msgid "Toggle plugin status"
+msgstr ""
+
+#: ../plugins/export.c:39
+msgid "Export"
+msgstr ""
+
+#: ../plugins/export.c:39
+#, fuzzy
+msgid "Exports the current file into different formats."
+msgstr "Файлыг DVI файл-руу хөрвүүл"
+
+#: ../plugins/export.c:171
+#, fuzzy
+msgid "Export File"
+msgstr "Файл Нээх"
+
+#: ../plugins/export.c:189
+msgid "_Insert line numbers"
+msgstr ""
+
+#: ../plugins/export.c:191
+msgid "Insert line numbers before each line in the exported document"
+msgstr ""
+
+#: ../plugins/export.c:201
+msgid "_Use current zoom level"
+msgstr ""
+
+#: ../plugins/export.c:203
+msgid ""
+"Renders the font size of the document together with the current zoom level"
+msgstr ""
+
+#: ../plugins/export.c:281
+#, c-format
+msgid "Document successfully exported as '%s'."
+msgstr ""
+
+#: ../plugins/export.c:283
+#, fuzzy, c-format
+msgid "File '%s' could not be written (%s)."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#: ../plugins/export.c:333
+#, c-format
+msgid "The file '%s' already exists. Do you want to overwrite it?"
+msgstr "'%s' файл үүсчихсэн байна. Дарж бичих үү?"
+
+#: ../plugins/export.c:781
+msgid "_Export"
+msgstr ""
+
+#. HTML
+#: ../plugins/export.c:788
+msgid "As _HTML"
+msgstr ""
+
+#. LaTeX
+#: ../plugins/export.c:794
+msgid "As _LaTeX"
+msgstr ""
+
+#: ../plugins/filebrowser.c:45
+msgid "File Browser"
+msgstr ""
+
+#: ../plugins/filebrowser.c:45
+msgid "Adds a file browser tab to the sidebar."
+msgstr ""
+
+#: ../plugins/filebrowser.c:368
+msgid "Too many items selected!"
+msgstr ""
+
+#: ../plugins/filebrowser.c:444
+#, c-format
+msgid "Could not execute configured external command '%s' (%s)."
+msgstr ""
+
+#: ../plugins/filebrowser.c:614
+msgid "Open _externally"
+msgstr ""
+
+#: ../plugins/filebrowser.c:639
+#, fuzzy
+msgid "Show _Hidden Files"
+msgstr "_Нууц файлуудыг харуул"
+
+#: ../plugins/filebrowser.c:870
+msgid "Up"
+msgstr ""
+
+#: ../plugins/filebrowser.c:875
+msgid "Refresh"
+msgstr ""
+
+#: ../plugins/filebrowser.c:880
+msgid "Home"
+msgstr ""
+
+#: ../plugins/filebrowser.c:885
+#, fuzzy
+msgid "Set path from document"
+msgstr "бүх барим"
+
+#: ../plugins/filebrowser.c:899
+msgid "Filter:"
+msgstr ""
+
+#: ../plugins/filebrowser.c:908
+msgid ""
+"Filter your files with the usual wildcards. Separate multiple patterns with "
+"a space."
+msgstr ""
+
+#: ../plugins/filebrowser.c:1123
+msgid "Focus File List"
+msgstr ""
+
+#: ../plugins/filebrowser.c:1125
+msgid "Focus Path Entry"
+msgstr ""
+
+#: ../plugins/filebrowser.c:1218
+msgid "External open command:"
+msgstr ""
+
+#: ../plugins/filebrowser.c:1226
+#, c-format
+msgid ""
+"The command to execute when using \"Open with\". You can use %f and %d "
+"wildcards.\n"
+"%f will be replaced with the filename including full path\n"
+"%d will be replaced with the path name of the selected file without the "
+"filename"
+msgstr ""
+
+#: ../plugins/filebrowser.c:1234
+#, fuzzy
+msgid "Show hidden files"
+msgstr "_Нууц файлуудыг харуул"
+
+#: ../plugins/filebrowser.c:1242
+#, fuzzy
+msgid "Hide file extensions:"
+msgstr "Файлыг өргөтгөлийг тогтоо"
+
+#: ../plugins/filebrowser.c:1267
+msgid "Use the project's base directory"
+msgstr ""
+
+#: ../plugins/filebrowser.c:1271
+msgid ""
+"Change the directory to the base directory of the currently opened project"
+msgstr ""
+
+#: ../plugins/saveactions.c:41
+msgid "Save Actions"
+msgstr ""
+
+#: ../plugins/saveactions.c:41
+msgid "This plugin provides different actions related to saving of files."
+msgstr ""
+
+#: ../plugins/saveactions.c:171
+#, fuzzy, c-format
+msgid "Backup Copy: Directory could not be created (%s)."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#. it's unlikely that this happens
+#: ../plugins/saveactions.c:203
+#, fuzzy, c-format
+msgid "Backup Copy: File could not be read (%s)."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#: ../plugins/saveactions.c:221
+#, fuzzy, c-format
+msgid "Backup Copy: File could not be saved (%s)."
+msgstr "Процесс зогсож чадахгүй байсан (%s)."
+
+#: ../plugins/saveactions.c:313
+#, c-format
+msgid "Autosave: Saved %d file automatically."
+msgid_plural "Autosave: Saved %d files automatically."
+msgstr[0] ""
+msgstr[1] ""
+
+#. initialize the dialog
+#: ../plugins/saveactions.c:382
+msgid "Select Directory"
+msgstr ""
+
+#: ../plugins/saveactions.c:467
+msgid "Backup directory does not exist or is not writable."
+msgstr ""
+
+#: ../plugins/saveactions.c:548
+msgid "Auto Save"
+msgstr ""
+
+#: ../plugins/saveactions.c:550 ../plugins/saveactions.c:612
+#: ../plugins/saveactions.c:653
+msgid "_Enable"
+msgstr ""
+
+#: ../plugins/saveactions.c:558
+msgid "Auto save _interval:"
+msgstr ""
+
+#: ../plugins/saveactions.c:566
+msgid "seconds"
+msgstr ""
+
+#: ../plugins/saveactions.c:575
+msgid "_Print status message if files have been automatically saved"
+msgstr ""
+
+#: ../plugins/saveactions.c:583
+msgid "Save only current open _file"
+msgstr ""
+
+#: ../plugins/saveactions.c:590
+msgid "Sa_ve all open files"
+msgstr ""
+
+#: ../plugins/saveactions.c:610
+msgid "Instant Save"
+msgstr ""
+
+#: ../plugins/saveactions.c:620
+msgid "_Filetype to use for newly opened files:"
+msgstr ""
+
+#: ../plugins/saveactions.c:651
+msgid "Backup Copy"
+msgstr ""
+
+#: ../plugins/saveactions.c:661
+msgid "_Directory to save backup files in:"
+msgstr ""
+
+#: ../plugins/saveactions.c:684
+msgid "Date/_Time format for backup files (\"man strftime\" for details):"
+msgstr ""
+
+#: ../plugins/saveactions.c:697
+msgid "Directory _levels to include in the backup destination:"
+msgstr ""
+
+#: ../plugins/splitwindow.c:34
+msgid "Split Window"
+msgstr ""
+
+#: ../plugins/splitwindow.c:34
+msgid "Splits the editor view into two windows."
+msgstr ""
+
+#: ../plugins/splitwindow.c:273
+#, fuzzy
+msgid "Show the current document"
+msgstr "бүх барим"
+
+#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:424
+#: ../plugins/splitwindow.c:439
+msgid "_Unsplit"
+msgstr ""
+
+#: ../plugins/splitwindow.c:406
+msgid "_Split Window"
+msgstr ""
+
+#: ../plugins/splitwindow.c:414
+msgid "_Side by Side"
+msgstr ""
+
+#: ../plugins/splitwindow.c:419
+msgid "_Top and Bottom"
+msgstr ""
+
+#: ../plugins/splitwindow.c:435
+msgid "Split Horizontally"
+msgstr ""
+
+#: ../plugins/splitwindow.c:437
+msgid "Split Vertically"
+msgstr ""
+
+#~ msgid "language"
+#~ msgstr "хэл"
+
+#~ msgid "Failed to view %s (make sure it is already compiled)"
+#~ msgstr "%s-ийг харахад алдаа гарлаа (Хөрвүүлэгдсэн эсэхийг шалгана уу)"
+
+#~ msgid "Command stopped because the current file has no extension."
+#~ msgstr "Файлд өргөтгөл байхгүй учраас комманд зогслоо."
+
+# stat гэж юу вэ???
+#~ msgid "Something very strange is occurred, could not stat %s (%s)."
+#~ msgstr "Тодорхойгүй шалтгаанаар %s-ийг эхлүүлж чадсангүй (%s)."
+
+#~ msgid "Failed to execute %s (make sure it is already built)"
+#~ msgstr ""
+#~ "%s-ийг ажиллуулахад алдаа гарлаа (боловсруулагдсан эсэхийг шалгана уу)"
+
+#~ msgid "Builds the current file (generate an executable file)"
+#~ msgstr "Файлыг боловсруул (ажиллуулах файлыг үүсгэ)"
+
+#~ msgid "Compiles the current file using the make tool"
+#~ msgstr "Үүсгэх хэрэгслээр файлыг хөрвүүл"
+
+#~ msgid "_Set Includes and Arguments"
+#~ msgstr "_Оруулалт болон Аргументийг зааж өгөх"
+
+#~ msgid ""
+#~ "Sets the includes and library paths for the compiler and the program "
+#~ "arguments for execution"
+#~ msgstr ""
+#~ "Хөрвүүлэгчийн оруулалт болон сангийн зам, програмын аргументийг зааж өгөх"
+
+#~ msgid "LaTeX -> DVI"
+#~ msgstr "LaTex -> DVI"
+
+#~ msgid "LaTeX -> PDF"
+#~ msgstr "LaTeX -> PDF"
+
+#~ msgid "View DVI File"
+#~ msgstr "DVI файлыг харах"
+
+#~ msgid "View PDF File"
+#~ msgstr "PDF файлыг харах"
+
+#~ msgid "Set Arguments"
+#~ msgstr "Аргументийг зааж өгөх"
+
+#~ msgid "Sets the program paths and arguments"
+#~ msgstr "Програмын зам болон аргументийг зааж өгөх"
+
+#~ msgid "Failed to execute the view program"
+#~ msgstr "View програмыг ажиллуулахад алдаа гарлаа"
+
+#~ msgid "Failed to execute the terminal program"
+#~ msgstr "Terminal програмыг ажиллуулахад алдаа гарлаа"
+
+#~ msgid "Set programs and options for compiling and viewing (La)TeX files."
+#~ msgstr "(La)Tex файлыг хөрвүүлэх болон харах програм болон тохиргоог оруул."
+
+#~ msgid "PDF creation:"
+#~ msgstr "PDF үүсэлт:"
+
+#~ msgid "DVI preview:"
+#~ msgstr "DVI харагдац:"
+
+#~ msgid "PDF preview:"
+#~ msgstr "PDF харагдац:"
+
+#~ msgid ""
+#~ "%f will be replaced by the current filename, e.g. test_file.c\n"
+#~ "%e will be replaced by the filename without extension, e.g. test_file"
+#~ msgstr ""
+#~ "%f файлын нэрээр солигдоно: test_file.c\n"
+#~ "%e өртгөтгөлгүй файлын нэрээр солигдоно: test_file"
+
+#~ msgid "Set Includes and Arguments"
+#~ msgstr "Оруулалт болон Аргументийг заа"
+
+#~ msgid "Set the commands for building and running programs."
+#~ msgstr "Програмыг боловсруулах болон ажиллуулах командуудыг заа."
+
+#~ msgid "Build:"
+#~ msgstr "Боловсруул:"
+
+#~ msgid "Invalid filename"
+#~ msgstr "Invalid filename"
diff --git a/src/about.c b/src/about.c
index 937c6c21..8f6069d7 100644
--- a/src/about.c
+++ b/src/about.c
@@ -60,6 +60,7 @@ const gchar *translators[][2] = {
 	{ "ko", "Park Jang-heon &lt;dotkabi@gmail.com&gt;" },
 	{ "kk", "Baurzhan Muftakhidinov &lt;baurthefirst@gmail.com&gt;"},
 	{ "lb", "Laurent Hoeltgen &lt;hoeltgman@gmail.com&gt;" },
+	{ "mn", "tsetsee &lt;tsetsee.yugi@gmail.com&gt;"},
 	{ "nl", "Peter Scholtens &lt;peter.scholtens@xs4all.nl&gt;\nAyke van Laethem &lt;aykevanlaethem@gmail.com&gt;" },
 	{ "pl", "Wojciech Świderski &lt;woj.swiderski@gmail.com&gt;"},
 	{ "pt_BR", "Alexandra Moreire &lt;alexandream@gmail.com&gt;\n"

From 28dc825e2a504cb139ebc9dc9d25e565ff0f4fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Sun, 6 Nov 2011 13:53:46 +0100
Subject: [PATCH 69/70] Update developer list in the About dialog

---
 src/about.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/about.c b/src/about.c
index 8f6069d7..5465b21e 100644
--- a/src/about.c
+++ b/src/about.c
@@ -38,7 +38,7 @@
 #define INFO "<span size=\"larger\" weight=\"bold\">%s</span>"
 #define CODENAME "<span weight=\"bold\">\"" GEANY_CODENAME "\"</span>"
 #define BUILDDATE "<span size=\"smaller\">%s</span>"
-#define COPYRIGHT "Copyright (c)  2005-2011\nNick Treleaven\nColomban Wendling\nEnrico Tröger\nFrank Lanitz\nAll rights reserved."
+#define COPYRIGHT "Copyright (c)  2005-2011\nColomban Wendling\nNick Treleaven\nMatthew Brush\nEnrico Tröger\nFrank Lanitz\nAll rights reserved."
 
 const gchar *translators[][2] = {
 	{ "ast", "Marcos Costales &lt;marcoscostales@gmail.com&gt;"},

From c9a32bfdc9abe29c13c20eedd8b8142e625f6e76 Mon Sep 17 00:00:00 2001
From: Matthew Brush <matt@geany.org>
Date: Sun, 6 Nov 2011 18:23:01 -0800
Subject: [PATCH 70/70] Make use of gtk_widget_get_window() added in GTK+ 2.14

---
 src/editor.c      |  2 +-
 src/keybindings.c |  2 +-
 src/keyfile.c     |  2 +-
 src/socket.c      |  8 +++++---
 src/win32.c       | 24 ++++++++++++------------
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/editor.c b/src/editor.c
index 55453399..642bfa2d 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -3563,7 +3563,7 @@ void editor_scroll_to_line(GeanyEditor *editor, gint line, gfloat percent_of_vie
 
 	wid = GTK_WIDGET(editor->sci);
 
-	if (! wid->window || ! gdk_window_is_viewable(wid->window))
+	if (! gtk_widget_get_window(wid) || ! gdk_window_is_viewable(gtk_widget_get_window(wid)))
 		return;	/* prevent gdk_window_scroll warning */
 
 	if (line == -1)
diff --git a/src/keybindings.c b/src/keybindings.c
index 6435ffe1..022cc4a1 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1013,7 +1013,7 @@ static void trigger_button_event(GtkWidget *widget, guint32 event_time)
 	if (GTK_IS_TEXT_VIEW(widget))
 		event->window = gtk_text_view_get_window(GTK_TEXT_VIEW(widget), GTK_TEXT_WINDOW_TEXT);
 	else
-		event->window = widget->window;
+		event->window = gtk_widget_get_window(widget);
 	event->time = event_time;
 	event->type = GDK_BUTTON_PRESS;
 	event->button = 3;
diff --git a/src/keyfile.c b/src/keyfile.c
index f7c4ef8d..ffb0fbc7 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -553,7 +553,7 @@ static void save_ui_prefs(GKeyFile *config)
 
 		gtk_window_get_position(GTK_WINDOW(main_widgets.window), &ui_prefs.geometry[0], &ui_prefs.geometry[1]);
 		gtk_window_get_size(GTK_WINDOW(main_widgets.window), &ui_prefs.geometry[2], &ui_prefs.geometry[3]);
-		if (gdk_window_get_state(main_widgets.window->window) & GDK_WINDOW_STATE_MAXIMIZED)
+		if (gdk_window_get_state(gtk_widget_get_window(main_widgets.window)) & GDK_WINDOW_STATE_MAXIMIZED)
 			ui_prefs.geometry[4] = 1;
 		else
 			ui_prefs.geometry[4] = 0;
diff --git a/src/socket.c b/src/socket.c
index bf0dea16..815f224f 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -636,7 +636,8 @@ gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpoint
 #ifdef G_OS_WIN32
 		else if (strncmp(buf, "window", 6) == 0)
 		{
-			HWND hwnd = (HWND) gdk_win32_drawable_get_handle(GDK_DRAWABLE(window->window));
+			HWND hwnd = (HWND) gdk_win32_drawable_get_handle(
+				GDK_DRAWABLE(gtk_widget_get_window(window)));
 			socket_fd_write(sock, (gchar *)&hwnd, sizeof(hwnd));
 		}
 #endif
@@ -649,11 +650,12 @@ gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpoint
 		 * gtk_window_present() really bring the main window into the foreground on some
 		 * window managers like Gnome's metacity.
 		 * Code taken from Gedit. */
-		gdk_x11_window_set_user_time(window->window, gdk_x11_get_server_time(window->window));
+		gdk_x11_window_set_user_time(gtk_widget_get_window(window),
+			gdk_x11_get_server_time(gtk_widget_get_window(window)));
 #endif
 		gtk_window_present(GTK_WINDOW(window));
 #ifdef G_OS_WIN32
-		gdk_window_show(window->window);
+		gdk_window_show(gtk_widget_get_window(window));
 #endif
 	}
 
diff --git a/src/win32.c b/src/win32.c
index 5899b3e1..544c4526 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -244,7 +244,7 @@ gchar *win32_show_folder_dialog(GtkWidget *parent, const gchar *title, const gch
 		parent = main_widgets.window;
 
 	memset(&bi, 0, sizeof bi);
-	bi.hwndOwner = GDK_WINDOW_HWND(parent->window);
+	bi.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(parent));
 	bi.pidlRoot = NULL;
 	bi.lpszTitle = w_title;
 	bi.lpfn = BrowseCallbackProc;
@@ -297,7 +297,7 @@ gchar *win32_show_project_open_dialog(GtkWidget *parent, const gchar *title,
 #else
 	of.lStructSize = sizeof of;
 #endif
-	of.hwndOwner = GDK_WINDOW_HWND(parent->window);
+	of.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(parent));
 	of.lpstrFilter = get_filters(project_file_filter);
 
 	of.lpstrCustomFilter = NULL;
@@ -359,7 +359,7 @@ gboolean win32_show_document_open_dialog(GtkWindow *parent, const gchar *title,
 #else
 	of.lStructSize = sizeof of;
 #endif
-	of.hwndOwner = GDK_WINDOW_HWND(GTK_WIDGET(parent)->window);
+	of.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(GTK_WIDGET(parent)));
 	of.lpstrFilter = get_file_filters();
 
 	of.lpstrCustomFilter = NULL;
@@ -442,7 +442,7 @@ gchar *win32_show_document_save_as_dialog(GtkWindow *parent, const gchar *title,
 #else
 	of.lStructSize = sizeof of;
 #endif
-	of.hwndOwner = GDK_WINDOW_HWND(GTK_WIDGET(parent)->window);
+	of.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(GTK_WIDGET(parent)));
 
 	of.lpstrFilter = get_file_filter_all_files();
 	of.lpstrCustomFilter = NULL;
@@ -498,7 +498,7 @@ gchar *win32_show_file_dialog(GtkWindow *parent, const gchar *title, const gchar
 #else
 	of.lStructSize = sizeof of;
 #endif
-	of.hwndOwner = GDK_WINDOW_HWND(GTK_WIDGET(parent)->window);
+	of.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(GTK_WIDGET(parent)));
 
 	of.lpstrFile = w_file;
 	of.nMaxFile = 2048;
@@ -537,7 +537,7 @@ void win32_show_font_dialog(void)
 
 	memset(&cf, 0, sizeof cf);
 	cf.lStructSize = sizeof cf;
-	cf.hwndOwner = GDK_WINDOW_HWND(main_widgets.window->window);
+	cf.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window));
 	cf.lpLogFont = &lf;
 	/* support CF_APPLY? */
 	cf.Flags = CF_NOSCRIPTSEL | CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT | CF_SCREENFONTS;
@@ -564,7 +564,7 @@ void win32_show_color_dialog(const gchar *colour)
 	/* Initialize CHOOSECOLOR */
 	memset(&cc, 0, sizeof cc);
 	cc.lStructSize = sizeof(cc);
-	cc.hwndOwner = GDK_WINDOW_HWND(main_widgets.window->window);
+	cc.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window));
 	cc.lpCustColors = (LPDWORD) acr_cust_clr;
 	cc.rgbResult = (colour != NULL) ? utils_strtod(colour, NULL, colour[0] == '#') : 0;
 	cc.Flags = CC_FULLOPEN | CC_RGBINIT;
@@ -612,7 +612,7 @@ void win32_show_pref_file_dialog(GtkEntry *item)
 #else
 	of.lStructSize = sizeof of;
 #endif
-	of.hwndOwner = GDK_WINDOW_HWND(ui_widgets.prefs_dialog->window);
+	of.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(ui_widgets.prefs_dialog));
 
 	of.lpstrFilter = get_filters(FALSE);
 	of.lpstrCustomFilter = NULL;
@@ -705,9 +705,9 @@ gboolean win32_message_dialog(GtkWidget *parent, GtkMessageType type, const gcha
 	MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, G_N_ELEMENTS(w_title));
 
 	if (parent != NULL)
-		parent_hwnd = GDK_WINDOW_HWND(parent->window);
+		parent_hwnd = GDK_WINDOW_HWND(gtk_widget_get_window(parent));
 	else if (main_widgets.window != NULL)
-		parent_hwnd = GDK_WINDOW_HWND(main_widgets.window->window);
+		parent_hwnd = GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window));
 
 	/* display the message box */
 	rc = MessageBoxW(parent_hwnd, w_msg, w_title, t);
@@ -801,7 +801,7 @@ void win32_init_debug_code(void)
 {
 	if (app->debug_mode)
 	{
-		/* create a console window to get log messages on Windows, 
+		/* create a console window to get log messages on Windows,
 		 * especially useful when generating tags files */
 		debug_setup_console();
 		/* Enable GLib process spawn debug mode when Geany was started with the debug flag */
@@ -1291,7 +1291,7 @@ gchar *win32_get_shortcut_target(const gchar *file_name)
 	gchar *path = NULL;
 	wchar_t *wfilename = g_utf8_to_utf16(file_name, -1, NULL, NULL, NULL);
 
-	resolve_link(GDK_WINDOW_HWND(main_widgets.window->window), wfilename, &path);
+	resolve_link(GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window)), wfilename, &path);
 	g_free(wfilename);
 
 	if (path == NULL)