Hello community,

here is the log from the commit of package kate for openSUSE:Factory checked in 
at 2014-08-25 11:02:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kate (Old)
 and      /work/SRC/openSUSE:Factory/.kate.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kate"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kate/kate.changes        2014-07-16 
16:16:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes   2014-08-25 
11:03:01.000000000 +0200
@@ -1,0 +2,20 @@
+Fri Aug 15 08:23:54 UTC 2014 - [email protected]
+
+- Update to 4.14.0
+   * KDE 4.14.0 SC Final Release
+   * See http://www.kde.org/announcements/4.14/
+
+-------------------------------------------------------------------
+Wed Aug 13 11:34:33 UTC 2014 - [email protected]
+
+- Add subpackage for the python plugins
+  - Requires additional python requires for full functionality 
+
+-------------------------------------------------------------------
+Thu Jul 17 16:44:00 UTC 2014 - [email protected]
+
+- Update to 4.13.90
+   * KDE 4.14 Beta 2 release
+   * See http://www.kde.org/announcements/announce-4.14-beta2.php
+
+-------------------------------------------------------------------

Old:
----
  kate-4.13.80.tar.xz

New:
----
  kate-4.14.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kate.spec ++++++
--- /var/tmp/diff_new_pack.vsMbOC/_old  2014-08-25 11:03:01.000000000 +0200
+++ /var/tmp/diff_new_pack.vsMbOC/_new  2014-08-25 11:03:01.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           kate
-Version:        4.13.80
+Version:        4.14.0
 Release:        0
 Summary:        Advanced Text Editor
 License:        GPL-2.0+
@@ -33,6 +33,7 @@
 BuildRequires:  python-sip-devel
 BuildRequires:  xz
 Requires:       libktexteditor = %{version}
+Recommends:     %{name}-python-plugins = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires
 
@@ -97,6 +98,24 @@
 %description -n libktexteditor
 The libraries shared by kwrite and kate editors.
 
+%package python-plugins
+Summary:        Additional python plugins for %{name}
+Group:          Productivity/Editors/Other
+Recommends:     IPython
+Recommends:     python-jedi
+Recommends:     python-Jinja2
+Recommends:     python-ply
+Recommends:     python-pyplete
+Recommends:     python-simplejson
+
+%description python-plugins
+This package pulls in optional dependencies that provide
+additional functionality for kate python plugins.
+
+You can still use python plugins with kate without these
+dependencies, but some plugins will not work or will
+have limited functionality.
+
 %post -n libktexteditor -p /sbin/ldconfig
 
 %postun -n libktexteditor -p /sbin/ldconfig
@@ -112,13 +131,32 @@
 
 %files -f filelists/kate
 %defattr(-,root,root)
-%dir %{_kde4_libdir}/python*/site-packages/PyKate4/
 %dir %{_kde4_appsdir}/kate/
 %dir %{_kde4_appsdir}/kate/*
 %dir %{_kde4_appsdir}/kate/*/*
 %dir %{_kde4_appsdir}/kate/*/*/*
 %dir %{_kde4_appsdir}/kate/*/*/*/*
 %dir %{_kde4_appsdir}/katexmltools/
+%exclude %{_kde4_libdir}/python*/site-packages/PyKate4
+%exclude %{_kde4_appsdir}/kate/plugins/pate
+%exclude %{_kde4_appsdir}/kate/pate
+%exclude %{_kde4_appsdir}/kate/plugins/katepateplugin
+%exclude %{_kde4_modulesdir}/katepateplugin.so
+%exclude %{_kde4_servicetypesdir}/katepythonplugin.desktop
+%exclude %{_kde4_servicesdir}/pate.desktop
+%exclude %{_kde4_servicesdir}/katepate_*.desktop
+
+%files python-plugins
+%defattr(-,root,root)
+%doc addons/kate/pate/README.txt
+%{_kde4_libdir}/python*/site-packages/PyKate4/
+%{_kde4_appsdir}/kate/plugins/pate/
+%{_kde4_appsdir}/kate/pate/
+%{_kde4_appsdir}/kate/plugins/katepateplugin/
+%{_kde4_modulesdir}/katepateplugin.so
+%{_kde4_servicetypesdir}/katepythonplugin.desktop
+%{_kde4_servicesdir}/pate.desktop
+%{_kde4_servicesdir}/katepate_*.desktop
 
 %package -n kwrite
 Summary:        KDE Text Editor

++++++ kate-4.13.80.tar.xz -> kate-4.14.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/close-except-like/katecloseexceptplugin.desktop 
new/kate-4.14.0/addons/kate/close-except-like/katecloseexceptplugin.desktop
--- 
old/kate-4.13.80/addons/kate/close-except-like/katecloseexceptplugin.desktop    
    2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/close-except-like/katecloseexceptplugin.desktop 
2014-08-13 21:58:07.000000000 +0200
@@ -14,6 +14,7 @@
 Name[da]=Luk undtagen/lignende
 Name[de]=Bedingtes Schließen
 Name[el]=Κλείσιμο Except/Like
+Name[en_GB]=Close Except/Like
 Name[es]=Cerrar excepto/como
 Name[et]=Selliste/teistsuguste sulgemine
 Name[fi]=Sulje samanlaiset kuin / muut kuin
@@ -54,6 +55,7 @@
 Comment[da]=Luk gruppe af dokumenter baseret på en fælles sti eller filendelse
 Comment[de]=Eine Gruppe von Dokumenten auf der Basis eines gemeinsamen Pfades 
oder einer Dateierweiterung schließen
 Comment[el]=Κλείσιμο ομάδας εγγράφων με βάση κοινή διαδρομή ή κατάληξη 
ονόματος αρχείου
+Comment[en_GB]=Close group of documents based on a common path or file 
extension
 Comment[es]=Cerrar un grupo de documentos según una ruta común o una extensión 
de archivo
 Comment[et]=Rühma ühise asukoha või faililaiendiga dokumentide sulgemine
 Comment[fi]=Sulje joukko tiedostoja niille yhteisen polun tai tiedostopäätteen 
perusteella
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/katepythonplugin.desktop 
new/kate-4.14.0/addons/kate/pate/src/katepythonplugin.desktop
--- old/kate-4.13.80/addons/kate/pate/src/katepythonplugin.desktop      
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/katepythonplugin.desktop       
2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Comment[da]=Kate Python-plugin
 Comment[de]=Python-Modul für Kate
 Comment[el]=Πρόσθετο του Kate για την Python
+Comment[en_GB]=Kate Python Plugin
 Comment[es]=Complementos de Python para Kate
 Comment[et]=Kate Pythoni plugin
 Comment[fi]=Katen Python-liitännäinen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/addons/kate/pate/src/pate.desktop 
new/kate-4.14.0/addons/kate/pate/src/pate.desktop
--- old/kate-4.13.80/addons/kate/pate/src/pate.desktop  2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/pate.desktop   2014-08-13 
21:58:07.000000000 +0200
@@ -12,6 +12,7 @@
 Name[da]=Python-plugins
 Name[de]=Python-Module
 Name[el]=Python πρόσθετα
+Name[en_GB]=Python Plugins
 Name[es]=Complementos de Python
 Name[et]=Pythoni pluginad
 Name[fi]=Python-liitännäiset
@@ -58,6 +59,7 @@
 Comment[da]=Pâté-vært for Python-plugins
 Comment[de]=Pâté-Verwaltung von Python-Modulen
 Comment[el]=Υπολογιστής Pâté για Python πρόσθετα
+Comment[en_GB]=Pâté host for Python plugins
 Comment[es]=Servidor Pâté para complementos de Python
 Comment[et]=Pythoni pluginate Pâté keskkond
 Comment[fi]=Paté-isäntä Python-liitännäisille
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/cmake_utils/__init__.py 
new/kate-4.14.0/addons/kate/pate/src/plugins/cmake_utils/__init__.py
--- old/kate-4.13.80/addons/kate/pate/src/plugins/cmake_utils/__init__.py       
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/plugins/cmake_utils/__init__.py        
2014-08-13 21:58:07.000000000 +0200
@@ -82,9 +82,10 @@
 def _find_current_context(document, cursor):
     '''Determinate current context under cursor'''
     # Parse whole document starting from a very first line!
-    in_a_string = False
-    in_a_command = False
-    in_a_comment = False
+    in_string = False
+    in_command = False
+    in_comment = False
+    in_var = False
     skip_next = False
     nested_var_level = 0
     command = None
@@ -92,13 +93,14 @@
     for current_line in range(0, cursor.line() + 1):
         line_str = document.line(current_line)
         prev = None
-        in_a_comment = False
+        in_comment = False
         should_count_pos = (current_line == cursor.line())
         for pos, c in enumerate(line_str):
+            print("c='{}'".format(c))
             if should_count_pos and pos == cursor.column():
                 break
-            if c == '#' and not in_a_string:
-                in_a_comment = True
+            if c == '#' and not in_string:
+                in_comment = True
                 # TODO Syntax error if we r in a var expansion
                 break                                       # Ignore 
everything till the end of line
             if skip_next:                                   # Should we skip 
current char?
@@ -106,20 +108,24 @@
             elif c == '\\':                                 # Found a 
backslash:
                 skip_next = True                            #  skip next char!
             elif c == '"':                                  # Found a quote 
char
-                in_a_string = not in_a_string               # Switch 'in a 
string' state
+                in_string = not in_string                   # Switch 'in a 
string' state
                 # TODO Syntax error if we r in a var expansion
             elif c == '{' and prev == '$':                  # Looks like a 
variable expansion?
                 nested_var_level += 1                       # Yep, incrase var 
level
+                in_var = True
             elif c == '}':                                  # End of a 
variable expansion
-                nested_var_level -= 1
-            elif c == '(' and not in_a_string:              # Command params 
started
+                if in_var:
+                    nested_var_level -= 1
+                    if nested_var_level == 0:
+                        in_var = False
+            elif c == '(' and not in_string:                # Command params 
started
                 command = line_str[0:pos].strip()
                 # TODO Syntax error if we r in a var expansion
-                in_a_command = True
+                in_command = True
                 fn_params_start = KTextEditor.Cursor(current_line, pos + 1)
-            elif c == ')' and not in_a_string:
+            elif c == ')' and not in_string:
                 # TODO Syntax error if we r in a var expansion
-                in_a_command = False
+                in_command = False
                 command = None
                 fn_params_start = None
 
@@ -131,7 +137,7 @@
         fn_params_range = KTextEditor.Range(fn_params_start, cursor)
     else:
         fn_params_range = KTextEditor.Range(-1, -1, -1, -1)
-    return (command, in_a_string, nested_var_level != 0, in_a_comment, 
fn_params_range)
+    return (command, in_string, in_var, in_comment, fn_params_range)
 
 
 def _is_there_CMakeLists(path):
@@ -234,8 +240,8 @@
     else:
         # Ok, nothing selected. Lets check the context: are we inside a 
command?
         cursor = view.cursorPosition()
-        command, in_a_string, in_a_var, in_a_comment, fn_params_range = 
_find_current_context(document, cursor)
-        kate.kDebug('CMakeHelper: command="{}", in_a_string={}, 
in_a_var={}'.format(command, in_a_string, in_a_var))
+        command, in_string, in_var, in_comment, fn_params_range = 
_find_current_context(document, cursor)
+        kate.kDebug('CMakeHelper: command="{}", in_string={}, 
in_var={}'.format(command, in_string, in_var))
         selected_dir = cur_dir
         if command == 'add_subdirectory':
             # Check if the command have some parameters already entered
@@ -322,19 +328,19 @@
 
         cursor = view.cursorPosition()
         # Try to detect completion context
-        command, in_a_string, in_a_var, in_a_comment, fn_params_range = 
_find_current_context(document, cursor)
+        command, in_string, in_var, in_comment, fn_params_range = 
_find_current_context(document, cursor)
         kate.kDebug(
-            'CMakeCC: command="{}", in_a_string={}, in_a_var={}, 
in_a_comment={}'.
-            format(command, in_a_string, in_a_var, in_a_comment)
+            'CMakeCC: command="{}", in_string={}, in_var={}, in_comment={}'.
+            format(command, in_string, in_var, in_comment)
           )
         if fn_params_range.isValid():
             kate.kDebug('CMakeCC: 
params="{}"'.format(document.text(fn_params_range)))
 
-        if in_a_comment:
+        if in_comment:
             # Nothing to complete if we r in a comment
             return
 
-        if in_a_var:
+        if in_var:
             # Try to complete a variable name
             self.TITLE_AUTOCOMPLETION = i18nc('@label:listbox', 'CMake 
Variables Completion')
             for var in cmake_help_parser.get_cmake_vars():
@@ -346,7 +352,7 @@
                       )
                   )
             return
-        if in_a_string:
+        if in_string:
             # If we a not in a variable expansion, but inside a string
             # there is nothing to complete!
             return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop
 
new/kate-4.14.0/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop
      2014-07-03 21:24:35.000000000 +0200
+++ 
new/kate-4.14.0/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop
       2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=CMake-værktøjer
 Name[de]=CMake-Dienstprogramme
 Name[el]=Εργαλεία του CMake
+Name[en_GB]=CMake Utilities
 Name[es]=Utilidades CMake
 Name[et]=CMake'i tööriistad
 Name[fi]=CMake-työkalut
@@ -50,6 +51,7 @@
 Comment[da]=Kodefuldførelse, browser til cache og hjælp
 Comment[de]=Quelltext-Vervollständigung, Zwischenspeicher und Hilfe-Browser
 Comment[el]=Εργαλείο συμπλήρωσης κώδικα, λανθάνουσα μνήμη και βοηθητικός 
περιηγητής
+Comment[en_GB]=Code completer, cache and help browser
 Comment[es]=Completador de código, caché y navegador de la ayuda
 Comment[et]=Koodilõpetaja, puhver ja abibrauser
 Comment[fi]=Koodintäydennys sekä välimuistin ja ohjeiden selain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop
 
new/kate-4.14.0/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop
      2014-07-03 21:24:35.000000000 +0200
+++ 
new/kate-4.14.0/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop
       2014-08-13 21:58:07.000000000 +0200
@@ -9,6 +9,7 @@
 Name[da]=Farveværktøjer
 Name[de]=Farbenwerkzeuge
 Name[el]=Εργαλεία χρωμάτων
+Name[en_GB]=Colour Tools
 Name[es]=Herramientas de color
 Name[et]=Värvitööriistad
 Name[fi]=Color Tools
@@ -49,6 +50,7 @@
 Comment[da]=Værktøjer til at arbejde med hexadecimale farver i dokumenter
 Comment[de]=Hilfsmittel zum Umgang mit Hexadezimalwerten für Farben in 
Dokumenten
 Comment[el]=Εργαλεία για εργασία με δεκαεξαδικά χρώματα σε έγγραφα
+Comment[en_GB]=Utilities to work with hexadecimal colours in documents
 Comment[es]=Utilidades para trabajar con colores en hexadecimal en los 
documentos
 Comment[et]=Tööriistad kuueteistkümnendkoodis värvide kasutamiseks dokumentides
 Comment[fi]=Työkaluja heksadesimaalisten värien kanssa työskentelyyn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/expand/katepate_expand.desktop 
new/kate-4.14.0/addons/kate/pate/src/plugins/expand/katepate_expand.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/expand/katepate_expand.desktop    
    2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/plugins/expand/katepate_expand.desktop 
2014-08-13 21:58:07.000000000 +0200
@@ -9,6 +9,7 @@
 Name[da]=Brugerdefinerede tekstudvidelser
 Name[de]=Benutzerdefinierte Texterweiterungen
 Name[el]=Επεκτάσεις κειμένου ορισμένες από το χρήστη
+Name[en_GB]=User defined text expansions
 Name[es]=Expansiones de texto definidas por el usuario
 Name[et]=Kasutaja määratud tekstilaiendused
 Name[fi]=Käyttäjän määrittämät tekstilaajennukset
@@ -46,6 +47,7 @@
 Comment[da]=Kør udvidelsesfunktion og indsæt output i et dokument
 Comment[de]=Führt die Erweiterungsfunktion aus und fügt die Ausgabe in ein 
Dokument ein
 Comment[el]=Εκτέλεση λειτουργίας επέκτασης και εισαγωγή της εξόδου σε έγγραφο
+Comment[en_GB]=Execute expansion function and insert output into a document
 Comment[es]=Ejecutar la función de expansión e insertar la salida en un 
documento
 Comment[et]=Laiendusfunktsiooni käivitamine ja väljundi lisamine dokumenti
 Comment[fi]=Suorita laajennusfunktio ja lisää tuloste tiedostoon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/gid/katepate_gid.desktop 
new/kate-4.14.0/addons/kate/pate/src/plugins/gid/katepate_gid.desktop
--- old/kate-4.13.80/addons/kate/pate/src/plugins/gid/katepate_gid.desktop      
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/plugins/gid/katepate_gid.desktop       
2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=GNU idutils-plugin
 Name[de]=„GNU Idutils“-Modul
 Name[el]=Πρόσθετο GNU idutils
+Name[en_GB]=GNU idutils plugin
 Name[es]=Complemento GNU idutils
 Name[et]=GNU idutilsi plugin
 Name[fi]=GNU idutils -liitännäinen
@@ -47,6 +48,7 @@
 Comment[ca@valencia]=Examina els testimonis en un fitxer ID amb «idutils» de 
GNU
 Comment[da]=Gennemse poletter i en GNU idutils id-fil
 Comment[de]=Durchsuchen Sie die Token in einer ID-Datei von „GNU-Idutils“
+Comment[en_GB]=Browse the tokens in a GNU idutils ID file
 Comment[es]=Mostrar los identificadores en un archivo GNU idutils de ID
 Comment[et]=GNU idutilsi ID-faili tähiste sirvimine
 Comment[fi]=Selaa GNU idutils -ohjelman ID-tiedoston lausekkeita
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop
 new/kate-4.14.0/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop
    2014-07-03 21:24:35.000000000 +0200
+++ 
new/kate-4.14.0/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop 
    2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=JavaScript-værktøjer
 Name[de]=JavaScript-Dienstprogramme
 Name[el]=Εργαλεία JavaScript
+Name[en_GB]=JavaScript Utilities
 Name[es]=Utilidades de JavaScript
 Name[et]=JavaScripti tööriistad
 Name[fi]=JavaScript-työkalut
@@ -49,6 +50,7 @@
 Comment[da]=JS- og jQuery autofuldførelse, en jQuery-forberedt tekststump, 
JSLint/JSHint
 Comment[de]=Auto-Vervollständigung für JS und jQuery, jQuery-Textbaustein, 
jSLint/JSHint
 Comment[el]=Αυτόματη συμπλήρωση JS και jQuery, ένα έτοιμο προς χρήση τμήμα 
κώδικα jQuery, JSLint/JSHint
+Comment[en_GB]=JS and jQuery autocompletion, a jQuery ready snippet, 
JSLint/JSHint
 Comment[es]=Completado automático de JS y jQuery, un fragmento de código de 
jQuery preparado, JSLint/JSHint
 Comment[et]=JS ja jQuery automaatne lõpetamine, jQuery valmisoleku koodijupp, 
JSLint/JSHint
 Comment[fi]=JS- ja jQuery-automaattitäydennys, jQuery ready -koodikatkelma, 
JSLint/JSHint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_block.desktop 
new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_block.desktop
--- old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_block.desktop        
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_block.desktop 
2014-08-13 21:58:07.000000000 +0200
@@ -9,6 +9,7 @@
 Name[cs]=Blok
 Name[da]=Blok
 Name[de]=Block
+Name[en_GB]=Block
 Name[es]=Bloque
 Name[et]=Plokk
 Name[fi]=Block
@@ -48,6 +49,7 @@
 Comment[da]=Diverse handlinger til at hjælpe med koderedigering
 Comment[de]=Verschiedene Aktionen zur Hilfe bei dem Editieren von Quelltext
 Comment[el]=Διάφορες ενέργειες για βοήθεια στην επεξεργασία κώδικα
+Comment[en_GB]=Various actions to help code editing
 Comment[es]=Diversas acciones para ayudar en la edición de código
 Comment[et]=Mitmesugused toimingud koodi redigeerimise hõlbustamiseks
 Comment[fi]=Toimintoja helpottamaan koodin muokkausta
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_commentar.desktop 
new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_commentar.desktop
--- old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_commentar.desktop    
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_commentar.desktop     
2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=Plugins til at arbejde med kommentarer
 Name[de]=Module für die Bearbeitung von Kommentaren
 Name[el]=Πρόσθετα για εργασία με σχόλια
+Name[en_GB]=Plugins to work with comments
 Name[es]=Complementos para trabajar con comentarios
 Name[et]=Pluginad kommentaaride tarbeks
 Name[fi]=Liitännäisiä kommenttien kanssa työskentelyyn
@@ -49,6 +50,7 @@
 Comment[da]=Understøttede sprog er C++, JS, Python, CMake, Bash
 Comment[de]=Unterstützte Sprachen sind C++, JS, Python, CMake, Bash
 Comment[el]=Υποστηριζόμενες γλώσσες είναι οι C++, JS, Python, CMake, Bash
+Comment[en_GB]=Supported languages are C++, JS, Python, CMake, Bash
 Comment[es]=Los lenguajes permitidos son C++, JS, Python, CMake y Bash
 Comment[et]=Toetatud keeled on C++, JS, Python, CMake, Bash
 Comment[fi]=Tuetut kielet ovat C++, JS, Python, CMake, Bash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_format.desktop 
new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_format.desktop
--- old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_format.desktop       
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_format.desktop        
2014-08-13 21:58:07.000000000 +0200
@@ -9,6 +9,7 @@
 Name[da]=Boost-like C++ kodeformatering
 Name[de]=„C++“-Formatierer ähnlich wie Boost
 Name[el]=Διαμορφωτής κώδικα C++ τύπου-Boost
+Name[en_GB]=Boost-like C++ Code Formatter
 Name[es]=Formateador de código C++ de tipo boost
 Name[et]=Boosti moodi C++ koodi vormindaja
 Name[fi]=Boostin kaltainen C++-koodin muotoilu
@@ -46,6 +47,7 @@
 Comment[da]=Hjælp til at formatere kald/skabeloner i boost-stil
 Comment[de]=Hilfe zur Formatierung von Aufrufen / Vorlagen im Boost-Stil
 Comment[el]=Βοήθεια στη μορφοποίηση κλήσεων/προτύπων σε στιλ boost
+Comment[en_GB]=Help to format calls/templates in boost style
 Comment[es]=Ayuda para formatear llamadas y plantillas en estilo boost
 Comment[et]=Väljakutsete ja mallide vormindamine Boosti laadis
 Comment[fi]=Auttaa muotoilemaan kutsut/templatet Boost-tyyliin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop
 
new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop
     2014-07-03 21:24:35.000000000 +0200
+++ 
new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop
      2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=Python autofuldførelse
 Name[de]=Python-Autovervollständigung
 Name[el]=Αυτόματη συμπλήρωση Python
+Name[en_GB]=Python Autocompletion
 Name[es]=Terminación automática de Python
 Name[et]=Pythoni automaatne lõpetamine
 Name[fi]=Python-automaattitäydennys
@@ -49,6 +50,7 @@
 Comment[da]=Baseret på biblioteket Jedi
 Comment[de]=Entwickelt aus der Jedi-Bibliothek
 Comment[el]=Βασισμένο στη βιβλιοθήκη Jedi
+Comment[en_GB]=Based on the Jedi library
 Comment[es]=Basado en la biblioteca Jedi
 Comment[et]=Loodud Jedi teegi põhjal
 Comment[fi]=Perustuu Jedi-kirjastoon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_try_open_file.desktop 
new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_try_open_file.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_try_open_file.desktop    
    2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_try_open_file.desktop 
2014-08-13 21:58:07.000000000 +0200
@@ -9,6 +9,7 @@
 Name[da]=Nem åbning/oprettelse af filer
 Name[de]=Einfacher Öffnen/Erstellen von Dateien
 Name[el]=Εύκολο άνοιγμα/δημιουργία αρχείου
+Name[en_GB]=Easy file open/create
 Name[es]=Apertura y creación sencilla de archivos
 Name[et]=Hõlpus failide avamine ja loomine
 Name[fi]=Helppo tiedoston avaaminen/luonti
@@ -46,6 +47,7 @@
 Comment[da]=Prøv at åbne markeret tekst som URI til et dokument
 Comment[de]=Öffnen des ausgewählten Textes als URI zu einem Dokument
 Comment[el]=Προσπάθεια για άνοιγμα του επιλεγμένου κειμένου σαν URI σε έγγραφο
+Comment[en_GB]=Try to open selected text as URI to a document
 Comment[es]=Intentar abrir el texto seleccionado como URI de un documento
 Comment[et]=Valitud tekst püütakse avada dokumendile osutava URI-na
 Comment[fi]=Yritä avata valittu teksti URI:na tiedostoon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop 
new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop
--- old/kate-4.13.80/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop   
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop    
2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=XML-værktøjer
 Name[de]=XML-Werkzeuge
 Name[el]=Εργαλεία XML
+Name[en_GB]=XML Tools
 Name[es]=Herramientas XML
 Name[et]=XML-tööriistad
 Name[fi]=XML-työkalut
@@ -48,6 +49,7 @@
 Comment[da]=XML pretty print
 Comment[de]=XML-Quelltextformatierung
 Comment[el]=Κομψή αποτύπωση XML
+Comment[en_GB]=XML Pretty print
 Comment[es]=Impresión elegante de XML
 Comment[et]=XML-i ilutrükk
 Comment[fi]=XML Pretty print
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop
 
new/kate-4.14.0/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop
      2014-07-03 21:24:35.000000000 +0200
+++ 
new/kate-4.14.0/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop
       2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=Python autofuldførelse
 Name[de]=Python-Autovervollständigung
 Name[el]=Αυτόματη συμπλήρωση Python
+Name[en_GB]=Python Autocompletion
 Name[es]=Terminación automática de Python
 Name[et]=Pythoni automaatne lõpetamine
 Name[fi]=Python-automaattitäydennys
@@ -49,6 +50,7 @@
 Comment[da]=Beta, kun til Python 2
 Comment[de]=Beta, nur für Python 2
 Comment[el]=Δοκιμαστική έκδοση, μόνο για Python 2
+Comment[en_GB]=Beta, only for Python 2
 Comment[es]=Beta, solo para Python 2
 Comment[et]=Beeta, ainult Python 2 jaoks
 Comment[fi]=Beeta, vain Python 2:lle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop
 
new/kate-4.14.0/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop
        2014-07-03 21:24:35.000000000 +0200
+++ 
new/kate-4.14.0/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop
 2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=Simpel Python-konsol
 Name[de]=Einfache Python-Konsole
 Name[el]=Απλή κονσόλα Python
+Name[en_GB]=Simple Python Console
 Name[es]=Consola de Python sencilla
 Name[et]=Lihtne Pythoni konsool
 Name[fi]=Yksinkertainen Python-konsoli
@@ -48,6 +49,7 @@
 Comment[da]=Interaktiv konsol til at inspicere Kate indvendigt og se sig 
omkring
 Comment[de]=interaktive Konsole für die Untersuchung der Internas von Kate
 Comment[el]=Διαδραστική κονσόλα για εξερεύνηση στο εσωτερικό του Kate και 
παιχνίδι
+Comment[en_GB]=Interactive console for inspecting Kate's internals and playing 
about
 Comment[es]=Consola interactiva para inspeccionar las interioridades de Kate y 
jugar con ellas
 Comment[et]=Interaktiivne konsool Kate loodu uurimiseks ja redigeerimiseks
 Comment[fi]=Interaktiivinen konsoli Katen sisusten tutkimiseen ja leikkimiseen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop
 
new/kate-4.14.0/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop
        2014-07-03 21:24:35.000000000 +0200
+++ 
new/kate-4.14.0/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop
 2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=IPython-konsol
 Name[de]=IPython-Konsole
 Name[el]=Κονσόλα IPython
+Name[en_GB]=IPython Console
 Name[es]=Consola de IPython
 Name[et]=IPythoni konsool
 Name[fi]=IPython-konsoli
@@ -48,6 +49,7 @@
 Comment[ca@valencia]=Consola interactiva per a hackejar el Kate i fer ciència
 Comment[da]=Interaktiv konsol til at hacke kate og bedrive videnskab
 Comment[de]=interaktive Konsole für das Hacken von Kate und wissenschaftliches 
Arbeiten
+Comment[en_GB]=Interactive console for hacking kate and doing science
 Comment[es]=Consola interactiva para hacerse con el control de Kate y hacer 
ciencia
 Comment[et]=Interaktiivne konsool Kate häkkimiseks ja teaduse tegemiseks
 Comment[fi]=Interaktiivinen konsoli Katen kehittämiseen ja tieteen tekemiseen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop
 
new/kate-4.14.0/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop
--- 
old/kate-4.13.80/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop
    2014-07-03 21:24:35.000000000 +0200
+++ 
new/kate-4.14.0/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop
     2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=Python-værktøjer
 Name[de]=Python-Werkzeuge
 Name[el]=Εργαλεία Python
+Name[en_GB]=Python Utilities
 Name[es]=Utilidades de Python
 Name[et]=Pythoni tööriistad
 Name[fi]=Python-työkalut
@@ -49,8 +50,9 @@
 Comment[da]=Fortolkningstjekker, PEP8-tjekker, Pyflakes-tjekker, Tekststumper
 Comment[de]=Python-Werkzeuge: Parse-Überprüfung, PEP8-Überprüfung, 
Pyflakes-Überprüfung, Textbausteine
 Comment[el]=Ελεγκτής ανάλυσης, ελεγκτής PEP8, ελεγκτής Pyflakes, αποσπάσματα 
κώδικα
+Comment[en_GB]=Parse Checker, PEP8 Checker, Pyflakes Checker, Snippets
 Comment[es]=Comprobación de análisis sintáctico, comprobador de PEP8, 
comprobador de Pyflakes, fragmentos de código
-Comment[et]=Parsimiskontroll, PEP-ide kontroll, Pyflakesi kontroll, koodijupid
+Comment[et]=Parsimiskontroll, PEP8 kontroll, Pyflakesi kontroll, koodijupid
 Comment[fi]=Jäsennystarkistin, PEP8-tarkistin, Pyflakes-tarkistin, 
koodikatkelmia
 Comment[fr]=Vérificateur d'analyse, vérificateur PEP8, vérificateur Pyflakes, 
fragments
 Comment[gl]=Análise sintáctica, comprobacións PEP8, Pyflakes e Snippets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/project/kateprojectplugin.desktop 
new/kate-4.14.0/addons/kate/project/kateprojectplugin.desktop
--- old/kate-4.13.80/addons/kate/project/kateprojectplugin.desktop      
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/project/kateprojectplugin.desktop       
2014-08-13 21:58:07.000000000 +0200
@@ -13,6 +13,7 @@
 Name[da]=Projekt-plugin
 Name[de]=Projektmodul
 Name[el]=Project πρόσθετο
+Name[en_GB]=Project Plugin
 Name[es]=Complemento de proyecto
 Name[et]=Projektiplugin
 Name[fi]=Projektiliitännäinen
@@ -59,6 +60,7 @@
 Comment[da]=Projekt-plugin til Kate
 Comment[de]=Projektmodul für Kate
 Comment[el]=Project πρόσθετο για το Kate
+Comment[en_GB]=Project plugin for Kate
 Comment[es]=Complemento de proyectos para Kate
 Comment[et]=Kate projektiplugin
 Comment[fi]=Projektiliitännäinen Kateen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/replicode/katereplicodeplugin.desktop 
new/kate-4.14.0/addons/kate/replicode/katereplicodeplugin.desktop
--- old/kate-4.13.80/addons/kate/replicode/katereplicodeplugin.desktop  
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/replicode/katereplicodeplugin.desktop   
2014-08-13 21:58:07.000000000 +0200
@@ -10,6 +10,7 @@
 Name[da]=Replicode
 Name[de]=Replicode
 Name[el]=Replicode
+Name[en_GB]=Replicode
 Name[es]=Replicode
 Name[et]=Replicode
 Name[fi]=Replicode
@@ -43,6 +44,7 @@
 Comment[da]=Replicode
 Comment[de]=Replicode
 Comment[el]=Replicode
+Comment[en_GB]=Replicode
 Comment[es]=Replicode
 Comment[et]=Replicode
 Comment[fi]=Replicode
@@ -76,6 +78,7 @@
 GenericName[da]=Replicode
 GenericName[de]=Replicode
 GenericName[el]=Replicode
+GenericName[en_GB]=Replicode
 GenericName[es]=Replicode
 GenericName[et]=Replicode
 GenericName[fi]=Replicode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/addons/kate/search/katesearch.desktop 
new/kate-4.14.0/addons/kate/search/katesearch.desktop
--- old/kate-4.13.80/addons/kate/search/katesearch.desktop      2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/search/katesearch.desktop       2014-08-13 
21:58:07.000000000 +0200
@@ -13,6 +13,7 @@
 Name[da]=Søg og erstat
 Name[de]=Suchen & Ersetzen
 Name[el]=Αναζήτηση & αντικατάσταση
+Name[en_GB]=Search & Replace
 Name[es]=Buscar y remplazar
 Name[et]=Otsimine ja asendamine
 Name[fi]=Etsi ja korvaa
@@ -61,6 +62,7 @@
 Comment[da]=Søg og erstat i åbne dokumenter eller i filer på disken
 Comment[de]=Suchen & Ersetzen in geöffneten Dateien oder in Dateien auf der 
Festplatte
 Comment[el]=Αναζήτηση & αντικατάσταση σε ανοιγμένα έγγραφα ή σε αρχεία στο 
δίσκο
+Comment[en_GB]=Search & replace in opened documents or in files on disk
 Comment[es]=Buscar y remplazar en los documentos abiertos o en los archivos 
del disco
 Comment[et]=Otsimine ja asendamine avatud dokumentides või kettal asuvates 
failides
 Comment[fi]=Etsi ja korvaa avatuista tai levyllä sijaitsevista tiedostoista
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/snippets/katesnippetsplugin.desktop 
new/kate-4.14.0/addons/kate/snippets/katesnippetsplugin.desktop
--- old/kate-4.13.80/addons/kate/snippets/katesnippetsplugin.desktop    
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/snippets/katesnippetsplugin.desktop     
2014-08-13 21:58:07.000000000 +0200
@@ -11,6 +11,7 @@
 Name[da]=Værktøjsvisning til tekststumper
 Name[de]=Werkzeugansicht für Textbausteine
 Name[el]=Προβολή εργαλείου τμημάτων κώδικα
+Name[en_GB]=Snippets tool view
 Name[es]=Vista de la herramienta de fragmentos de código
 Name[et]=Koodijuppide tööriistavaade
 Name[fi]=Katkelmanäkymä
@@ -54,6 +55,7 @@
 Comment[da]=Værktøjsvisning til indlejring af håndtering af tekststumper
 Comment[de]=Werkzeugansicht für die eingebettete Verwaltung von Textbausteinen
 Comment[el]=Προβολή εργαλείου που ενσωματώνει τη διαχείριση τμημάτων κώδικα
+Comment[en_GB]=Toolview embedding the snippets management
 Comment[es]=Vista que empotra el gestor de fragmentos de código
 Comment[et]=Koodijuppide haldamist põimiv tööriistavaade
 Comment[fi]=Katkelmien hallinnan sisältävä työkalunäkymä
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/tabbarextension/katetabbarextension.desktop 
new/kate-4.14.0/addons/kate/tabbarextension/katetabbarextension.desktop
--- old/kate-4.13.80/addons/kate/tabbarextension/katetabbarextension.desktop    
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/tabbarextension/katetabbarextension.desktop     
2014-08-13 21:58:07.000000000 +0200
@@ -12,6 +12,7 @@
 Name[da]=Fanebladslinje med flere linjer
 Name[de]=Mehrzeilige Unterfensterleiste
 Name[el]=Καρτέλες πολλαπλών γραμμών
+Name[en_GB]=Multiline Tab Bar
 Name[es]=Barra de pestañas multilínea
 Name[et]=Mitmerealine kaardiriba
 Name[eu]=Lerro anitzeko fitxa-barra
@@ -62,6 +63,7 @@
 Comment[da]=Føjer en fanebladslinje med flere rækker til Kates hovedvindue
 Comment[de]=Fügt dem Hauptfenster von Kate eine mehrzeilige Unterfensterleiste 
hinzu
 Comment[el]=Προσθέτει καρτέλες πολλαπλών γραμμών στο κύριο παράθυρο του Kate
+Comment[en_GB]=Adds a tab bar with multiple rows to Kate's main window
 Comment[es]=Añade una barra de pestañas con varias filas a la ventana 
principal de Kate
 Comment[et]=Lisab Kate peaaknasse mitmerealise kaardiriba
 Comment[eu]=Hainbat errenkada dituen fitxa-barra gehitzen dio Kate-ren leiho 
nagusiari
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/kate/tabify/katetabifyplugin.desktop 
new/kate-4.14.0/addons/kate/tabify/katetabifyplugin.desktop
--- old/kate-4.13.80/addons/kate/tabify/katetabifyplugin.desktop        
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/kate/tabify/katetabifyplugin.desktop 2014-08-13 
21:58:07.000000000 +0200
@@ -68,6 +68,7 @@
 Comment[da]=Føjer en standard fanebladslinje til Kates hovedvindue
 Comment[de]=Fügt dem Hauptfenster von Kate eine normale Unterfensterleiste 
hinzu
 Comment[el]=Προσθέτει μια τυπική γραμμή καρτελών στο κύριο παράθυρο του Kate
+Comment[en_GB]=Adds a standard tab bar to Kate's main window
 Comment[es]=Añade una barra de pestañas estándar a la ventana principal de Kate
 Comment[et]=Lisab Kate peaaknasse standardse kaardiriba
 Comment[eu]=Fitxa-barra estandarra gehitzen dio Kate-ren leiho nagusiari
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kate-4.13.80/addons/ktexteditor/lumen/ktexteditor_lumen.desktop 
new/kate-4.14.0/addons/ktexteditor/lumen/ktexteditor_lumen.desktop
--- old/kate-4.13.80/addons/ktexteditor/lumen/ktexteditor_lumen.desktop 
2014-07-03 21:24:35.000000000 +0200
+++ new/kate-4.14.0/addons/ktexteditor/lumen/ktexteditor_lumen.desktop  
2014-08-13 21:58:07.000000000 +0200
@@ -22,6 +22,7 @@
 Name[da]=Lumen
 Name[de]=Lumen
 Name[el]=Lumen
+Name[en_GB]=Lumen
 Name[es]=Lumen
 Name[et]=Lumen
 Name[fi]=Lumen
@@ -59,6 +60,7 @@
 Comment[da]=Lumen er et autofuldførelse-plugin til D, som bruger 
autofuldførelse-serveren DCD
 Comment[de]=Lumen ist ein Modul zur automatischen Vervollständigung für D und 
benutzt den DCD-Auto-Vervollständigungs-Server
 Comment[el]=Το Lumen είναι ένα πρόσθετο αυτόματης συμπλήρωσης για την D, με τη 
χρήση του εξυπηρετητή αυτόματης συμπλήρωσης DCD
+Comment[en_GB]=Lumen is a Autocompletion Plugin for D, using the DCD 
autocompletion server
 Comment[es]=Lumen es un complemento de completado automático para D que 
utiliza el servidor de completado automático DCD.
 Comment[et]=Lumen on D keele automaatse koodilõpetamise plugin, mis kasutab 
välist koodilõpetamisserverit
 Comment[fi]=Lumen on D-kielen automaattitäydennysliitännäinen, joka käyttää 
DCD-automaattitäydennyspalvelinta
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/document/katedocument.cpp 
new/kate-4.14.0/part/document/katedocument.cpp
--- old/kate-4.13.80/part/document/katedocument.cpp     2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/part/document/katedocument.cpp      2014-08-13 
21:58:07.000000000 +0200
@@ -5488,11 +5488,18 @@
   } else
     return -1;
 
+  KateView* view = static_cast<KateView*>(activeView());
+  if (!view) {
+    if (!m_views.isEmpty()) {
+      view = m_views.first();
+    } else {
+      //FIXME: find a way to use this function without any view, or move it to 
the KateView.
+      return -1;
+    }
+  }
+
   QList<KTextEditor::Attribute::Ptr> attributes = highlight()->attributes(
-      static_cast<KateView*>(activeView())
-        ->renderer()
-        ->config()
-        ->schema()
+      view->renderer()->config()->schema()
     );
 
   // sanity check for the attribute
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/render/katelayoutcache.cpp 
new/kate-4.14.0/part/render/katelayoutcache.cpp
--- old/kate-4.13.80/part/render/katelayoutcache.cpp    2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/part/render/katelayoutcache.cpp     2014-08-13 
21:58:07.000000000 +0200
@@ -404,6 +404,9 @@
 
 int KateLayoutCache::displayViewLine(const KTextEditor::Cursor& virtualCursor, 
bool limitToVisible)
 {
+  if (!virtualCursor.isValid())
+    return -1;
+
   KTextEditor::Cursor work = viewCacheStart();
   
   // only try this with valid lines!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/script/data/indentation/haskell.js 
new/kate-4.14.0/part/script/data/indentation/haskell.js
--- old/kate-4.13.80/part/script/data/indentation/haskell.js    2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/part/script/data/indentation/haskell.js     2014-08-13 
21:58:07.000000000 +0200
@@ -2,8 +2,9 @@
  * name: Haskell
  * license: LGPL
  * author: Erlend Hamberg <[email protected]>
- * revision: 2
+ * revision: 3
  * kate-version: 3.4
+ * required-syntax-style: haskell
  */
 
 // required katepart js libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/syntax/data/agda.xml 
new/kate-4.14.0/part/syntax/data/agda.xml
--- old/kate-4.13.80/part/syntax/data/agda.xml  1970-01-01 01:00:00.000000000 
+0100
+++ new/kate-4.14.0/part/syntax/data/agda.xml   2014-08-13 21:58:07.000000000 
+0200
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"[
+  <!ENTITY charsdelim "_;.&#34;(){}@">
+  <!ENTITY wordsep "(?=([&charsdelim;]|\s|$))">
+]>
+<language name="Agda" version="1.0" kateversion="3.12" section="Sources" 
extensions="*.agda" mimetype="text/x-agda" author="Matthias C. M. Troffaes" 
license="LGPL">
+  <highlighting>
+    <list name="reserved keywords">
+      <item> abstract </item>
+      <item> codata </item>
+      <item> coinductive </item>
+      <item> constructor </item>
+      <item> data </item>
+      <item> field </item>
+      <item> forall </item>
+      <item> hiding </item>
+      <item> import </item>
+      <item> in </item>
+      <item> inductive </item>
+      <item> infix </item>
+      <item> infixl  </item>
+      <item> infixr </item>
+      <item> let </item>
+      <item> open </item>
+      <item> pattern </item>
+      <item> postulate </item>
+      <item> primitive </item>
+      <item> private </item>
+      <item> public </item>
+      <item> module </item>
+      <item> mutual </item>
+      <item> quote </item>
+      <item> quoteGoal </item>
+      <item> quoteTerm </item>
+      <item> record </item>
+      <item> renaming </item>
+      <item> rewrite </item>
+      <item> syntax </item>
+      <item> to </item>
+      <item> unquote </item>
+      <item> using </item>
+      <item> where </item>
+      <item> with </item>
+    </list>
+    <contexts>
+      <context attribute="Normal" lineEndContext="#stay" name="code">
+        <RegExpr attribute="Pragma"  context="#stay" String="\{-#.*#-\}" />
+        <keyword attribute="Keyword" context="#stay" String="reserved 
keywords" />
+        <RegExpr attribute="Type"    context="#stay" 
String="(Prop|Set[₀-₉]+|Set[0-9]*)&wordsep;" />
+        <RegExpr attribute="Special" context="#stay" 
String="(-&gt;|→|∀|λ|:|=|\|)&wordsep;" />
+        <RegExpr attribute="Float"   context="#stay" 
String="\d+\.\d+&wordsep;" />
+        <RegExpr attribute="Decimal" context="#stay" String="[0-9]+&wordsep;" 
/>
+        <DetectChar attribute="Char"   context="char"   char="'" />
+        <DetectChar attribute="String" context="string" char="&quot;" />
+        <Detect2Chars attribute="Comment" context="comment"  char="-"  
char1="-" />
+        <Detect2Chars attribute="Comment" context="comments" char="{" 
char1="-" />
+        <Detect2Chars attribute="Hole"    context="hole"     char="{" 
char1="!" />
+        <!-- delimiters which cannot be part of an identifier, or
+             backslash which starts a lambda expression -->
+        <AnyChar      attribute="Special" context="#stay" 
String="&charsdelim;\\" />
+        <!-- any other identifier (can contain backslash and single
+             quote anywhere except at start, but these two special
+             cases are already taken care off above) -->
+        <RegExpr attribute="Normal" context="#stay" 
String="[^&charsdelim;\s]+" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="comment" />
+      <context attribute="Comment" lineEndContext="#stay" name="comments">
+        <Detect2Chars attribute="Comment" context="comments" char="{" 
char1="-" /> <!-- for nested comments -->
+        <Detect2Chars attribute="Comment" context="#pop" char="-" char1="}" />
+      </context>
+      <context attribute="Hole" lineEndContext="#stay" name="hole">
+        <Detect2Chars attribute="Hole" context="#pop" char="!" char1="}" />
+      </context>
+      <context attribute="Char" lineEndContext="#pop" name="char">
+        <Detect2Chars attribute="Char" context="#stay" char="\\" char1="'" />
+        <DetectChar   attribute="Char" context="#pop"  char="'" />
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="string">
+        <Detect2Chars attribute="String" context="#stay" char="\\" 
char1="&quot;" />
+        <DetectChar   attribute="String" context="#pop"  char="&quot;" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal"   defStyleNum="dsNormal"   spellChecking="false" 
/>
+      <itemData name="Comment"  defStyleNum="dsComment"  />
+      <itemData name="Pragma"   defStyleNum="dsOthers"   spellChecking="false" 
/>
+      <itemData name="Hole"     defStyleNum="dsOthers"   spellChecking="false" 
/>
+      <itemData name="Keyword"  defStyleNum="dsKeyword"  spellChecking="false" 
/>
+      <itemData name="Type"     defStyleNum="dsDataType" spellChecking="false" 
/>
+      <itemData name="Special"  defStyleNum="dsOthers"   spellChecking="false" 
/>
+      <itemData name="Decimal"  defStyleNum="dsDecVal"   spellChecking="false" 
/>
+      <itemData name="Float"    defStyleNum="dsFloat"    spellChecking="false" 
/>
+      <itemData name="Char"     defStyleNum="dsChar"     spellChecking="false" 
/>
+      <itemData name="String"   defStyleNum="dsString" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <folding indentationsensitive="1"/>
+    <comments>
+      <comment name="singleLine" start="--" />
+      <comment name="multiLine" start="{-" end="-}" />
+    </comments>
+    <keywords casesensitive="1"
+              weakDeliminator=":!+,-&lt;=&gt;%&amp;*/?[]^|~\\"
+              additionalDeliminator="&charsdelim;" />
+  </general>
+</language>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/syntax/data/css.xml 
new/kate-4.14.0/part/syntax/data/css.xml
--- old/kate-4.13.80/part/syntax/data/css.xml   2014-07-03 21:24:35.000000000 
+0200
+++ new/kate-4.14.0/part/syntax/data/css.xml    2014-08-13 21:58:07.000000000 
+0200
@@ -797,6 +797,7 @@
                         
                         <context attribute="Media" lineEndContext="#stay" 
name="MQEV">
                         <!-- this should be seperate for different features, 
for now it is all the same -->
+                            <DetectSpaces/>
                             <RegExpr attribute="Value" context="#pop" 
String="[1-9][0-9.]*\s*/\s*[1-9][0-9.]*" />
                             <RegExpr attribute="Value" context="#pop" 
String="[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|dpi|dpcm)\b"
 />
                             <RegExpr attribute="Value" context="#pop" 
String="[0-9.]+[%]?" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/syntax/data/doxygen.xml 
new/kate-4.14.0/part/syntax/data/doxygen.xml
--- old/kate-4.13.80/part/syntax/data/doxygen.xml       2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/part/syntax/data/doxygen.xml        2014-08-13 
21:58:07.000000000 +0200
@@ -29,7 +29,7 @@
  -->
 
 <language name="Doxygen"
-          version="1.36"
+          version="1.37"
           kateversion="2.5"
           section="Markup"
           extensions="*.dox;*.doxygen"
@@ -149,7 +149,7 @@
       <item> \extends </item>          <item> @extends </item>
       <item> \file </item>             <item> @file </item>
       <item> \htmlinclude </item>      <item> @htmlinclude </item>
-      <item> \idlexcept </item>m>      <item> @idlexcept </item>
+      <item> \idlexcept </item>        <item> @idlexcept </item>
       <item> \if </item>               <item> @if </item>
       <item> \ifnot </item>            <item> @ifnot </item>
       <item> \implements </item>       <item> @implements </item>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/syntax/data/haskell.xml 
new/kate-4.14.0/part/syntax/data/haskell.xml
--- old/kate-4.13.80/part/syntax/data/haskell.xml       2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/part/syntax/data/haskell.xml        2014-08-13 
21:58:07.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Haskell" version="2.2" kateversion="2.3" section="Sources" 
extensions="*.hs;*.chs" mimetype="text/x-haskell" author="Nicolas Wu 
([email protected])" license="LGPL" indenter="haskell">
+<language name="Haskell" version="2.3" kateversion="2.3" section="Sources" 
extensions="*.hs;*.chs" mimetype="text/x-haskell" author="Nicolas Wu 
([email protected])" license="LGPL" indenter="haskell" style="haskell">
   <highlighting>
   <list name="keywords">
     <item> case </item>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/syntax/data/markdown.xml 
new/kate-4.14.0/part/syntax/data/markdown.xml
--- old/kate-4.13.80/part/syntax/data/markdown.xml      2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/part/syntax/data/markdown.xml       2014-08-13 
21:58:07.000000000 +0200
@@ -35,7 +35,7 @@
 <!ENTITY strikeoutregex "[~]{2}[^~].*[^~][~]{2}">
 <!-- pandoc style -->
 ]>
-<language name="Markdown" version="1.3" kateversion="3.7" section="Markup" 
extensions="*.md;*.mmd;*.markdown" priority="15" author="Darrin Yeager, Claes 
Holmerson" license="GPL,BSD">
+<language name="Markdown" version="1.4" kateversion="3.7" section="Markup" 
extensions="*.md;*.mmd;*.markdown" priority="15" author="Darrin Yeager, Claes 
Holmerson" license="GPL,BSD">
   <highlighting>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal 
Text">
@@ -56,17 +56,17 @@
         <RegExpr attribute="meta" 
String="^(Title|Author|Date|Copyright|Revision|CSS|LaTeX\ 
XSLT|Categories|Tags|BaseName|Excerpt):(.*)+$"/>
         <IncludeRules context="inc"/>
       </context>
-      <context attribute="blockquote" lineEndContext="#pop" name="blockquote">
+      <context attribute="blockquote" lineEndContext="#stay" 
lineEmptyContext="#pop" name="blockquote">
         <RegExpr attribute="bq-strong" String="&strongregex;"/>
         <RegExpr attribute="bq-emphasis" String="&emphasisregex;"/>
         <IncludeRules context="inc"/>
       </context>
-      <context attribute="bullet" lineEndContext="#pop" name="bullet">
+      <context attribute="bullet" lineEndContext="#stay" 
lineEmptyContext="#pop" name="bullet">
         <RegExpr attribute="bl-strong" String="&strongregex;"/>
         <RegExpr attribute="bl-emphasis" String="&emphasisregex;"/>
         <IncludeRules context="inc"/>
       </context>
-      <context attribute="numlist" lineEndContext="#pop" name="numlist">
+      <context attribute="numlist" lineEndContext="#stay" 
lineEmptyContext="#pop" name="numlist">
         <RegExpr attribute="nl-strong" String="&strongregex;"/>
         <RegExpr attribute="nl-emphasis" String="&emphasisregex;"/>
         <IncludeRules context="inc"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/syntax/data/rest.xml 
new/kate-4.14.0/part/syntax/data/rest.xml
--- old/kate-4.13.80/part/syntax/data/rest.xml  2014-07-03 21:24:35.000000000 
+0200
+++ new/kate-4.14.0/part/syntax/data/rest.xml   2014-08-13 21:58:07.000000000 
+0200
@@ -11,7 +11,7 @@
   Copyright 2010 Matt Williams ([email protected])
   Copyright 2014 Matthew Woehlke ([email protected])
   -->
-<language name="reStructuredText" extensions="*.rst" section="Markup" 
mimetype="text/x-rst" version="1.03" kateversion="2.4" casesensitive="1">
+<language name="reStructuredText" extensions="*.rst" section="Markup" 
mimetype="text/x-rst" version="1.4" kateversion="2.4" casesensitive="1">
 
   <highlighting>
 
@@ -23,9 +23,6 @@
         <RegExpr attribute="Footnote" context="#stay" String="^\s*\.\. 
\[(\d+|#|\*|#[&SimpleReferenceNameChars;]+)\]\s" minimal="true" column="0"/>
         <RegExpr attribute="Citation" context="#stay" String="^\s*\.\. 
\[[&SimpleReferenceNameChars;]+\]\s" minimal="true" column="0"/>
         <RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. 
(__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" column="0"/>
-        <RegExpr attribute="CMakeCode" String="^\s*\.\. code-block::\s*cmake$" 
context="CMakeCodeBlock" column="0"/>
-        <RegExpr attribute="CppCode" String="^\s*\.\. code-block::\s*c\+\+$" 
context="CppCodeBlock" column="0"/>
-        <RegExpr attribute="PythonCode" String="^\s*\.\. 
code-block::\s*python$" context="PythonCodeBlock" column="0"/>
         <RegExpr attribute="Code" String="^\s*\.\. code-block::" 
context="CodeBlock" column="0"/>
         <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. 
[\w-_\.]+::(\s|$)" minimal="true" column="0"/>
         <RegExpr attribute="Code" String="::$" context="CodeBlock" />
@@ -67,46 +64,10 @@
         <IncludeRules context="##Alerts"/>
       </context>
 
-      <context name="CMakeCodeBlock" attribute="CMakeCode" 
lineEndContext="#stay">
-        <RegExpr attribute="CMakeCode" String="^(\s+)(?=\S)" 
context="CMakeCodeRegion" column="0"/>
-      </context>
-      <context name="CppCodeBlock" attribute="CppCode" lineEndContext="#stay">
-        <RegExpr attribute="CppCode" String="^(\s+)(?=\S)" 
context="CppCodeRegion" column="0"/>
-      </context>
-      <context name="PythonCodeBlock" attribute="PythonCode" 
lineEndContext="#stay">
-        <RegExpr attribute="PythonCode" String="^(\s+)(?=\S)" 
context="PythonCodeRegion" column="0"/>
-      </context>
       <context name="CodeBlock" attribute="Code" lineEndContext="#stay">
         <RegExpr attribute="Code" String="^(\s+)(?=\S)" context="Code" 
column="0"/>
       </context>
 
-      <context name="CMakeCodeRegion" attribute="CMakeCode" 
lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="CMakeCode" String="^%1" lookAhead="true" 
context="CMakeCode" column="0" dynamic="true"/>
-        <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" 
context="#pop#pop" column="0"/>
-        <IncludeRules context="CMakeCode" includeAttrib="true"/>
-      </context>
-      <context name="CMakeCode" attribute="CMakeCode" lineEndContext="#pop">
-        <IncludeRules context="##CMake" includeAttrib="true"/>
-      </context>
-
-      <context name="CppCodeRegion" attribute="CppCode" lineEndContext="#stay" 
dynamic="true">
-        <RegExpr attribute="CppCode" String="^%1" lookAhead="true" 
context="CppCode" column="0" dynamic="true"/>
-        <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" 
context="#pop#pop" column="0"/>
-        <IncludeRules context="CppCode" includeAttrib="true"/>
-      </context>
-      <context name="CppCode" attribute="CppCode" lineEndContext="#pop">
-        <IncludeRules context="##C++" includeAttrib="true"/>
-      </context>
-
-      <context name="PythonCodeRegion" attribute="PythonCode" 
lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="PythonCode" String="^%1" lookAhead="true" 
context="PythonCode" column="0" dynamic="true"/>
-        <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" 
context="#pop#pop" column="0"/>
-        <IncludeRules context="PythonCode" includeAttrib="true"/>
-      </context>
-      <context name="PythonCode" attribute="PythonCode" lineEndContext="#pop">
-        <IncludeRules context="##Python" includeAttrib="true"/>
-      </context>
-
       <context name="Code" attribute="Code" lineEndContext="#stay" 
dynamic="true">
         <RegExpr attribute="Code" String="^%1" context="#stay" column="0" 
dynamic="true"/>
         <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" 
context="#pop#pop" column="0"/>
@@ -132,9 +93,6 @@
       <itemData name="Directive" defStyleNum="dsDataType" />
       <itemData name="SubstitutionDefinition" defStyleNum="dsDataType" />
       <itemData name="Role" defStyleNum="dsKeyword" />
-      <itemData name="CMakeCode" defStyleNum="dsDataType" />
-      <itemData name="CppCode" defStyleNum="dsDataType" />
-      <itemData name="PythonCode" defStyleNum="dsDataType" />
       <itemData name="Code" defStyleNum="dsDataType" />
       <itemData name="Comment" defStyleNum="dsComment" />
     </itemDatas>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/syntax/data/restructuredtext.xml 
new/kate-4.14.0/part/syntax/data/restructuredtext.xml
--- old/kate-4.13.80/part/syntax/data/restructuredtext.xml      2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/part/syntax/data/restructuredtext.xml       1970-01-01 
01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language name="Restructured Text" version="1.0" kateversion="2.4" 
section="Markup" extensions="*.rst" author="Massimiliano Torromeo 
([email protected])" license="LGPL">
-
-       <highlighting>
-               <contexts>
-                       <context name="Normal" attribute="Normal Text" 
lineEndContext="#stay">
-                               <RegExpr attribute="Emphasys" String="\*[^* 
].*\S\*" context="#stay" />
-                               <RegExpr attribute="Strong" 
String="\*\*\S.*\S\*\*" context="#stay" />
-                               <RegExpr attribute="Literal" 
String="``\S.*\S``" context="#stay" />
-                               <RegExpr attribute="Directive" String="^\.\. " 
context="Directive" />
-                               <RegExpr attribute="Title" 
String="^(#{3,}|\*{3,}|={3,}|-{3,}|\^{3,}|&quot;{3,}|&apos;{3,}|~{3,}|`{3,}|\+{3,})$"
 context="#stay" />
-                               <RegExpr attribute="OrderedList" 
String="[#0-9]\.\s" firstNonSpace="1" context="#stay" />
-                               <AnyChar attribute="UnorderedList" String="*+-" 
firstNonSpace="1" context="#stay" />
-                               <DetectChar attribute="Link" char="`" 
context="Link" />
-                               <RegExpr attribute="Code" String="::$" 
context="CodeBlock" />
-                       </context>
-
-                       <context name="CodeBlock" attribute="Code" 
lineEndContext="#stay">
-                               <RegExpr attribute="Code" String="^\s" 
context="Code" />
-                       </context>
-
-                       <context name="Code" attribute="Code" 
lineEndContext="#stay">
-                               <RegExpr attribute="Normal" String="^\S" 
lookAhead="true" context="#pop#pop" />
-                       </context>
-
-                       <context name="Directive" attribute="Directive" 
lineEndContext="#pop">
-                               <RegExpr attribute="Keyword" String="\w+" 
context="#stay" />
-                       </context>
-
-                       <context name="Link" attribute="Link" 
lineEndContext="#pop">
-                               <DetectChar attribute="Link" char="&lt;" 
context="URL" />
-                               <Detect2Chars attribute="Link" char="`" 
char1="_" context="#pop" />
-                       </context>
-
-                       <context name="URL" attribute="LinkUrl" 
lineEndContext="#stay">
-                               <RegExpr attribute="LinkUrl" String="[^&gt;]+" 
context="#stay" />
-                               <DetectChar attribute="Link" char="&gt;" 
context="#pop" />
-                       </context>
-               </contexts>
-
-               <itemDatas>
-                       <itemData name="Normal Text" defStyleNum="dsNormal" />
-                       <itemData name="Directive" defStyleNum="dsDecVal" />
-                       <itemData name="Emphasys" defStyleNum="dsNormal" 
italic="1" />
-                       <itemData name="Strong" defStyleNum="dsNormal" bold="1" 
/>
-                       <itemData name="Literal" defStyleNum="dsDataType" />
-                       <itemData name="Keyword" defStyleNum="dsKeyword" />
-                       <itemData name="OrderedList" defStyleNum="dsDecVal" />
-                       <itemData name="UnorderedList" defStyleNum="dsFloat" />
-                       <itemData name="Link" defStyleNum="dsString" />
-                       <itemData name="LinkUrl" defStyleNum="dsString" 
bold="1" />
-                       <itemData name="Title" defStyleNum="dsKeyword" bold="1" 
/>
-                       <itemData name="Code" defStyleNum="dsDataType" />
-                       <itemData name="Error" defStyleNum="dsError" />
-               </itemDatas>
-
-       </highlighting>
-</language>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/part/vimode/katevivisualmode.cpp 
new/kate-4.14.0/part/vimode/katevivisualmode.cpp
--- old/kate-4.13.80/part/vimode/katevivisualmode.cpp   2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/part/vimode/katevivisualmode.cpp    2014-08-13 
21:58:07.000000000 +0200
@@ -245,6 +245,8 @@
 
   // If not valid going back to normal mode
   if (!r.isValid()) {
+    // Don't screw up the cursor's position. See BUG #337286.
+    m_pendingResetIsDueToExit = true;
     reset();
     return;
   }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/tests/katedocument_test.cpp 
new/kate-4.14.0/tests/katedocument_test.cpp
--- old/kate-4.13.80/tests/katedocument_test.cpp        2014-07-03 
21:24:35.000000000 +0200
+++ new/kate-4.14.0/tests/katedocument_test.cpp 2014-08-13 21:58:07.000000000 
+0200
@@ -345,4 +345,11 @@
   QCOMPARE(docDigest, fileDigest);
 }
 
+void KateDocumentTest::testDefStyleNum()
+{
+  KateDocument doc;
+  doc.setText("foo\nbar\nasdf");
+  QCOMPARE(doc.defStyleNum(0, 0), -1);
+}
+
 #include "katedocument_test.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/tests/katedocument_test.h 
new/kate-4.14.0/tests/katedocument_test.h
--- old/kate-4.13.80/tests/katedocument_test.h  2014-07-03 21:24:35.000000000 
+0200
+++ new/kate-4.14.0/tests/katedocument_test.h   2014-08-13 21:58:07.000000000 
+0200
@@ -44,6 +44,8 @@
   void testInsertNewline();
 
   void testDigest();
+
+  void testDefStyleNum();
 };
 
 #endif // KATE_DOCUMENT_TEST_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/tests/kateview_test.cpp 
new/kate-4.14.0/tests/kateview_test.cpp
--- old/kate-4.13.80/tests/kateview_test.cpp    2014-07-03 21:24:35.000000000 
+0200
+++ new/kate-4.14.0/tests/kateview_test.cpp     2014-08-13 21:58:07.000000000 
+0200
@@ -71,6 +71,22 @@
     QCOMPARE(view1->cursorToCoordinate(KTextEditor::Cursor(3, 1)), QPoint(-1, 
-1));
 }
 
+void KateViewTest::testCursorToCoordinates()
+{
+    KateDocument doc(false, false, false);
+    doc.setText("int a;");
+
+    KateView* view = static_cast<KateView*>(doc.createView(0));
+    // this is important
+    view->config()->setDynWordWrap(true);
+    view->show();
+
+    // don't crash, see https://bugs.kde.org/show_bug.cgi?id=337863
+    view->cursorToCoordinate(Cursor(0, 0));
+    view->cursorToCoordinate(Cursor(1, 0));
+    view->cursorToCoordinate(Cursor(-1, 0));
+}
+
 void KateViewTest::testReloadMultipleViews()
 {
     KTemporaryFile file;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kate-4.13.80/tests/kateview_test.h 
new/kate-4.14.0/tests/kateview_test.h
--- old/kate-4.13.80/tests/kateview_test.h      2014-07-03 21:24:35.000000000 
+0200
+++ new/kate-4.14.0/tests/kateview_test.h       2014-08-13 21:58:07.000000000 
+0200
@@ -39,6 +39,7 @@
   void testFolding();
 
   void testCoordinatesToCursor();
+  void testCursorToCoordinates();
 
   void testBug287291();
 

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to