[merkaartor] 04/05: Add patches for 'Unknown' & 'occurrence' typos.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Jan 10 01:37:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository merkaartor.
commit 6579b8206eeb2cadeb5e138f4145e7c27ed19462
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jan 10 02:11:28 2016 +0100
Add patches for 'Unknown' & 'occurrence' typos.
---
debian/changelog | 1 +
debian/patches/occurrence-typo.patch | 15 +++
debian/patches/series | 2 +
debian/patches/unknown-typo.patch | 213 +++++++++++++++++++++++++++++++++++
4 files changed, 231 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2aed1f3..38056d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ merkaartor (0.18.2-4) UNRELEASED; urgency=medium
* Rebuild with libquazip (0.7.1-1).
- Update build dependency from libquazip-qt5-dev to libquazip5-dev
- Update SYSTEM_QUAZIP_LDFLAGS from -lquazip-qt5 to -lquazip5
+ * Add patches for 'Unknown' & 'occurrence' typos.
-- Bas Couwenberg <sebastic at debian.org> Sun, 10 Jan 2016 01:24:23 +0100
diff --git a/debian/patches/occurrence-typo.patch b/debian/patches/occurrence-typo.patch
new file mode 100644
index 0000000..ee7d5a1
--- /dev/null
+++ b/debian/patches/occurrence-typo.patch
@@ -0,0 +1,15 @@
+Description: Fix 'occurence' typo, replace with 'occurrence'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/merkaartor/pull/84
+
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -721,7 +721,7 @@ v0.11
+ * ADD : french translation
+ * ADD : Merkaartor document (*.mdc)
+ * FIX : Apply button in Preferences now updates the main window immediately
+- * FIX : if a feature contains a node more than once, if the node is deleted, only the first occurence is removed
++ * FIX : if a feature contains a node more than once, if the node is deleted, only the first occurrence is removed
+ * ADD : merge nodes function
+ * FIX : don't ignore "width" tags on export
+ * ADD : translation capabilities
diff --git a/debian/patches/series b/debian/patches/series
index 107c704..cd3c38f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,5 @@ desktop-keywords.patch
qmake-config-nostrip.patch
libgps22.patch
desktop-keywords-syntax.patch
+unknown-typo.patch
+occurrence-typo.patch
diff --git a/debian/patches/unknown-typo.patch b/debian/patches/unknown-typo.patch
new file mode 100644
index 0000000..01fa8f0
--- /dev/null
+++ b/debian/patches/unknown-typo.patch
@@ -0,0 +1,213 @@
+Description: Fix 'Unknow' typo, replace with 'Unknown'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/merkaartor/pull/84
+
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -1970,7 +1970,7 @@ void MainWindow::loadUrl(const QUrl& the
+ }
+ }
+ } else {
+- QMessageBox::critical(this, tr("Incoming Remote control request"), tr("Unknow action url: %1").arg(theUrl.toString()));
++ QMessageBox::critical(this, tr("Incoming Remote control request"), tr("Unknown action url: %1").arg(theUrl.toString()));
+ }
+ #undef theQuery
+ }
+--- a/translations/merkaartor_ar.ts
++++ b/translations/merkaartor_ar.ts
+@@ -2360,7 +2360,7 @@ Are you absolutely sure this KML can leg
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_cs.ts
++++ b/translations/merkaartor_cs.ts
+@@ -3341,7 +3341,7 @@ Pokud si nejste jisti , prosím požáde
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_de.ts
++++ b/translations/merkaartor_de.ts
+@@ -2020,7 +2020,7 @@ Wollen Sie Ihre Änderungen speichern?</
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation>Unbekannte Aktions-URL: %1</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_es.ts
++++ b/translations/merkaartor_es.ts
+@@ -2277,7 +2277,7 @@ Si no estás seguro, deberías preguntar
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_et.ts
++++ b/translations/merkaartor_et.ts
+@@ -2408,7 +2408,7 @@ Are you absolutely sure this KML can leg
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_fr.ts
++++ b/translations/merkaartor_fr.ts
+@@ -2013,7 +2013,7 @@ Do you want to save your changes?</sourc
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_hr.ts
++++ b/translations/merkaartor_hr.ts
+@@ -2535,7 +2535,7 @@ Are you absolutely sure this KML can leg
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_hu.ts
++++ b/translations/merkaartor_hu.ts
+@@ -3810,7 +3810,7 @@ Do you want to save your changes?</sourc
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_it.ts
++++ b/translations/merkaartor_it.ts
+@@ -2483,7 +2483,7 @@ Do you want to save your changes?</sourc
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_ja.ts
++++ b/translations/merkaartor_ja.ts
+@@ -2338,7 +2338,7 @@ Are you absolutely sure this KML can leg
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_nl.ts
++++ b/translations/merkaartor_nl.ts
+@@ -2394,7 +2394,7 @@ Weet je absoluut zeker dat deze KML lega
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_pl.ts
++++ b/translations/merkaartor_pl.ts
+@@ -2263,7 +2263,7 @@ Czy zachować zmiany?</translation>
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation>Nieznany url działania: %1</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_pt.ts
++++ b/translations/merkaartor_pt.ts
+@@ -2366,7 +2366,7 @@ Are you absolutely sure this KML can leg
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_pt_BR.ts
++++ b/translations/merkaartor_pt_BR.ts
+@@ -2323,7 +2323,7 @@ Si no estás seguro, deberías preguntar
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_ru.ts
++++ b/translations/merkaartor_ru.ts
+@@ -2010,7 +2010,7 @@ Do you want to save your changes?</sourc
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_sk.ts
++++ b/translations/merkaartor_sk.ts
+@@ -2365,7 +2365,7 @@ Are you absolutely sure this KML can leg
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_sv.ts
++++ b/translations/merkaartor_sv.ts
+@@ -2387,7 +2387,7 @@ Om du är osäker, vänligen fråga på
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_uk.ts
++++ b/translations/merkaartor_uk.ts
+@@ -2393,7 +2393,7 @@ Are you absolutely sure this KML can leg
+ </message>
+ <message>
+ <location filename="../src/MainWindow.cpp" line="1935"/>
+- <source>Unknow action url: %1</source>
++ <source>Unknown action url: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git
More information about the Pkg-grass-devel
mailing list