[qgis] 09/14: Add patch to fix 'occurrences' typo.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Dec 1 22:36:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit ad9252022d75700467aa3e126aa8269deaf0d0a9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Dec 1 19:40:03 2015 +0100
Add patch to fix 'occurrences' typo.
---
debian/changelog | 1 +
debian/patches/occurrences-typo.patch | 607 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 609 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ace5f6a..0769757 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qgis (2.8.4+dfsg-1) UNRELEASED; urgency=medium
[ Bas Couwenberg ]
* New upstream release.
* Drop software-typo.patch, applied upstream. Refresh remaining patches.
+ * Add patch to fix 'occurrences' typo.
-- Bas Couwenberg <sebastic at debian.org> Mon, 30 Nov 2015 08:16:36 +0100
diff --git a/debian/patches/occurrences-typo.patch b/debian/patches/occurrences-typo.patch
new file mode 100644
index 0000000..5ef30b4
--- /dev/null
+++ b/debian/patches/occurrences-typo.patch
@@ -0,0 +1,607 @@
+Description: Fix 'occurences' typo, replace with 'occurrences'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -8762,7 +8762,7 @@ Werner Macho <werner.macho at gmail.com> 20
+
+ Juergen E. Fischer <jef at norbit.de> 2014-10-26
+
+- doxygen: add/replace some occurences of \verbatim with \code
++ doxygen: add/replace some occurrences of \verbatim with \code
+
+ Robert Szczepanek <robert at szczepanek.pl> 2014-10-25
+
+@@ -34230,7 +34230,7 @@ Denis Rouzaud <denis.rouzaud at gmail.com>
+
+ Matthias Kuhn <matthias.kuhn at gmx.ch> 2013-08-13
+
+- [SIP] Change all occurences of convert[From|To]Instance to convert[From|To]Type
++ [SIP] Change all occurrences of convert[From|To]Instance to convert[From|To]Type
+ Removal of these deprecated calls is expected to improve stability
+
+ Radim Blazek <radim.blazek at gmail.com> 2013-08-13
+@@ -107726,7 +107726,7 @@ jef <jef at c8812cc2-4d05-0410-92ff-de0c093
+
+ mhugent <mhugent at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2008-06-23
+
+- Replaced some occurences of default srs id with epgs id
++ Replaced some occurrences of default srs id with epgs id
+
+ git-svn-id: http://svn.osgeo.org/qgis/trunk@8673 c8812cc2-4d05-0410-92ff-de0c093fc19c
+
+@@ -117470,7 +117470,7 @@ wonder <wonder at c8812cc2-4d05-0410-92ff-d
+
+ wonder <wonder at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2007-02-28
+
+- - removed legacy macro QgsDebug and changed remaining occurences of it to QgsDebugMsg
++ - removed legacy macro QgsDebug and changed remaining occurrences of it to QgsDebugMsg
+ - moved #include "qgsconfig.h" from qgis.h to qgis.cpp so it doesn't spit many warnings when building bindings because of redefined PREFIX
+
+
+@@ -123917,7 +123917,7 @@ mhugent <mhugent at c8812cc2-4d05-0410-92ff
+
+ g_j_m <g_j_m at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2006-06-11
+
+- Capture a few unusual occurences with respect to views with unique
++ Capture a few unusual occurrences with respect to views with unique
+ constraints but non-unique data. In response to ticket #143.
+
+
+--- a/i18n/qgis_ar.ts
++++ b/i18n/qgis_ar.ts
+@@ -56538,7 +56538,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_bs.ts
++++ b/i18n/qgis_bs.ts
+@@ -58330,7 +58330,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+@@ -58346,7 +58346,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_ca.ts
++++ b/i18n/qgis_ca.ts
+@@ -56161,7 +56161,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_cs.ts
++++ b/i18n/qgis_cs.ts
+@@ -56522,7 +56522,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_da.ts
++++ b/i18n/qgis_da.ts
+@@ -59037,7 +59037,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_de.ts
++++ b/i18n/qgis_de.ts
+@@ -59950,7 +59950,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_el.ts
++++ b/i18n/qgis_el.ts
+@@ -56095,7 +56095,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_en.ts
++++ b/i18n/qgis_en.ts
+@@ -60248,7 +60248,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+@@ -60264,7 +60264,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_es.ts
++++ b/i18n/qgis_es.ts
+@@ -59675,7 +59675,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_et.ts
++++ b/i18n/qgis_et.ts
+@@ -56451,7 +56451,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_eu.ts
++++ b/i18n/qgis_eu.ts
+@@ -56664,7 +56664,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_fa.ts
++++ b/i18n/qgis_fa.ts
+@@ -56068,7 +56068,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_fi.ts
++++ b/i18n/qgis_fi.ts
+@@ -59404,7 +59404,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_fr.ts
++++ b/i18n/qgis_fr.ts
+@@ -59581,7 +59581,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_gl.ts
++++ b/i18n/qgis_gl.ts
+@@ -59684,7 +59684,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_hi.ts
++++ b/i18n/qgis_hi.ts
+@@ -56475,7 +56475,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_hr.ts
++++ b/i18n/qgis_hr.ts
+@@ -56314,7 +56314,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_hu.ts
++++ b/i18n/qgis_hu.ts
+@@ -58358,7 +58358,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_id.ts
++++ b/i18n/qgis_id.ts
+@@ -56597,7 +56597,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_is.ts
++++ b/i18n/qgis_is.ts
+@@ -56154,7 +56154,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_it.ts
++++ b/i18n/qgis_it.ts
+@@ -59803,7 +59803,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_ja.ts
++++ b/i18n/qgis_ja.ts
+@@ -59957,7 +59957,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_km.ts
++++ b/i18n/qgis_km.ts
+@@ -56374,7 +56374,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_ko.ts
++++ b/i18n/qgis_ko.ts
+@@ -59118,7 +59118,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_lt.ts
++++ b/i18n/qgis_lt.ts
+@@ -57413,7 +57413,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_lv.ts
++++ b/i18n/qgis_lv.ts
+@@ -56268,7 +56268,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_mn.ts
++++ b/i18n/qgis_mn.ts
+@@ -56081,7 +56081,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_nb.ts
++++ b/i18n/qgis_nb.ts
+@@ -59637,7 +59637,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_nl.ts
++++ b/i18n/qgis_nl.ts
+@@ -59587,7 +59587,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_pl.ts
++++ b/i18n/qgis_pl.ts
+@@ -58747,7 +58747,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_pt_BR.ts
++++ b/i18n/qgis_pt_BR.ts
+@@ -59628,7 +59628,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_pt_PT.ts
++++ b/i18n/qgis_pt_PT.ts
+@@ -59575,7 +59575,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_ro.ts
++++ b/i18n/qgis_ro.ts
+@@ -57170,7 +57170,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_ru.ts
++++ b/i18n/qgis_ru.ts
+@@ -58341,7 +58341,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_sk.ts
++++ b/i18n/qgis_sk.ts
+@@ -56292,7 +56292,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_sl.ts
++++ b/i18n/qgis_sl.ts
+@@ -56433,7 +56433,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_sr.ts
++++ b/i18n/qgis_sr.ts
+@@ -56277,7 +56277,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_sr at latin.ts
++++ b/i18n/qgis_sr at latin.ts
+@@ -56279,7 +56279,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_sv.ts
++++ b/i18n/qgis_sv.ts
+@@ -59548,7 +59548,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_th.ts
++++ b/i18n/qgis_th.ts
+@@ -56130,7 +56130,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_tr.ts
++++ b/i18n/qgis_tr.ts
+@@ -56065,7 +56065,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_uk.ts
++++ b/i18n/qgis_uk.ts
+@@ -56216,7 +56216,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_vi.ts
++++ b/i18n/qgis_vi.ts
+@@ -59450,7 +59450,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_zh-Hans.ts
++++ b/i18n/qgis_zh-Hans.ts
+@@ -56565,7 +56565,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_zh_CN.ts
++++ b/i18n/qgis_zh_CN.ts
+@@ -56553,7 +56553,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/i18n/qgis_zh_TW.ts
++++ b/i18n/qgis_zh_TW.ts
+@@ -56560,7 +56560,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/resources/function_help/regexp_replace
++++ b/resources/function_help/regexp_replace
+@@ -8,7 +8,7 @@ Returns a string with the supplied regul
+ <!-- List args for functions here-->
+ <i> string</i> → is string. The start string.<br>
+ <i> regex</i> → is string. The regular expression to replace. Backslash characters must be double escaped (eg "\\s" to match a white space character). Non-greedy regular expressions are not supported.<br>
+-<i> after</i> → is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
++<i> after</i> → is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using \\1, \\2, etc. <br></p>
+
+ <p><h4>Example</h4>
+ <!-- Show example of function.-->
+--- a/src/core/qgsvectorlayer.cpp
++++ b/src/core/qgsvectorlayer.cpp
+@@ -2179,7 +2179,7 @@ bool QgsVectorLayer::deleteAttributes( Q
+ {
+ bool deleted = false;
+
+- // Remove multiple occurences of same attribute
++ // Remove multiple occurrences of same attribute
+ attrs = attrs.toSet().toList();
+
+ qSort( attrs.begin(), attrs.end(), qGreater<int>() );
+--- a/src/plugins/plugin_builder.py
++++ b/src/plugins/plugin_builder.py
+@@ -146,7 +146,7 @@ files = [plugin_file(pluginDir, 'CMakeLi
+ plugin_file(pluginDir, pluginLCaseName + 'gui.h'),
+ plugin_file(pluginDir, pluginLCaseName + 'guibase.ui')]
+
+-# replace occurences of [pluginlcasename], [pluginname], [plugindescription], [menuname], [menutiem]
++# replace occurrences of [pluginlcasename], [pluginname], [plugindescription], [menuname], [menutiem]
+ # in template with the values from user
+ replacements = [('\\[pluginlcasename\\]', pluginLCaseName),
+ ('\\[pluginname\\]', pluginName),
diff --git a/debian/patches/series b/debian/patches/series
index 42ae00f..516f815 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ developersmap-use-debian-package.patch
exclude-dxf2shp-plugin.patch
exclude-elvensword-resources.patch
0001-fix-arm-build.patch
+occurrences-typo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list