[SCM] ardour/master: Drop obsolete 02-misspelling.patch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Sat Aug 11 20:45:44 UTC 2012


The following commit has been merged in the master branch:
commit e8b6138e087c71f5abffeb103a901a41f8226cf1
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sat Aug 11 21:06:56 2012 +0200

    Drop obsolete 02-misspelling.patch
    
    Included upstream

diff --git a/debian/patches/02-misspelling.patch b/debian/patches/02-misspelling.patch
deleted file mode 100644
index 4bccfe0..0000000
--- a/debian/patches/02-misspelling.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-Description: Misspelling patch
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-Applied-Upstream: Post r12923
-Last-Update: 2011-10-04
-Index: ardour/gtk2_ardour/po/el.po
-===================================================================
---- ardour.orig/gtk2_ardour/po/el.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/gtk2_ardour/po/el.po	2011-10-04 15:48:43.202223921 +0200
-@@ -6497,7 +6497,7 @@
- #~ msgstr "KeyboardTarget: δεν ευρέθη μετάφραση για \"%1\""
- #~ msgid "KeyboardTarget: unknown action \"%1\""
- #~ msgstr "KeyboardTarget: άγνωστη ενέργεια \"%1\""
--#~ msgid "misformed binding node - ignored"
-+#~ msgid "malformed binding node - ignored"
- #~ msgstr "παραμορφωμένος πομπός δεσμού - αγνοήθηκε"
- #~ msgid "ardour: soundfile selector"
- #~ msgstr "ardour: επιλογέας Soundfiles"
-Index: ardour/gtk2_ardour/po/pt_PT.po
-===================================================================
---- ardour.orig/gtk2_ardour/po/pt_PT.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/gtk2_ardour/po/pt_PT.po	2011-10-04 15:48:43.206223939 +0200
-@@ -6087,7 +6087,7 @@
- #~ msgid "KeyboardTarget: unknown action \"%1\""
- #~ msgstr "KeyboardTarget: acção desconhecida \"%1\""
- 
--#~ msgid "misformed binding node - ignored"
-+#~ msgid "malformed binding node - ignored"
- #~ msgstr "combinação mal formada - ignorada"
- 
- #~ msgid "ardour: soundfile selector"
-Index: ardour/libs/ardour/po/el.po
-===================================================================
---- ardour.orig/libs/ardour/po/el.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/el.po	2011-10-04 15:48:43.206223939 +0200
-@@ -931,7 +931,7 @@
- msgstr "Το κομμάτι %1 χρησιμοποιεί άγνωστη λίστα αναπαρ/γής \"%2\""
- 
- #: libs/ardour/named_selection.cc:80
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr "Το κομμάτι %1 περιέχει δύσμορφες πληροφορίες για τη λίστα αναπαρ/γής"
- 
- #: libs/ardour/panner.cc:256
-Index: ardour/libs/ardour/po/es.po
-===================================================================
---- ardour.orig/libs/ardour/po/es.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/es.po	2011-10-04 15:48:43.210223959 +0200
-@@ -837,7 +837,7 @@
- msgstr ""
- 
- #: libs/ardour/named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
- 
- #: libs/ardour/panner.cc:256
-Index: ardour/libs/ardour/po/eu.po
-===================================================================
---- ardour.orig/libs/ardour/po/eu.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/eu.po	2011-10-04 15:48:43.210223959 +0200
-@@ -823,7 +823,7 @@
- msgstr ""
- 
- #: libs/ardour/named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
- 
- #: libs/ardour/panner.cc:257
-Index: ardour/libs/ardour/po/fr.po
-===================================================================
---- ardour.orig/libs/ardour/po/fr.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/fr.po	2011-10-04 15:48:43.210223959 +0200
-@@ -832,7 +832,7 @@
- msgstr ""
- 
- #: libs/ardour/named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
- 
- #: libs/ardour/panner.cc:257
-Index: ardour/libs/ardour/po/it.po
-===================================================================
---- ardour.orig/libs/ardour/po/it.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/it.po	2011-10-04 15:48:43.214223988 +0200
-@@ -950,7 +950,7 @@
- msgstr "Lo spezzone %1 usa una playlist sconosciuta \"%2\""
- 
- #: libs/ardour/named_selection.cc:80
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr "Lo spezzone %1 contiene informazioni sulla playlist mal formate"
- 
- #: libs/ardour/panner.cc:256
-Index: ardour/libs/ardour/po/nn.po
-===================================================================
---- ardour.orig/libs/ardour/po/nn.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/nn.po	2011-10-04 15:48:43.214223988 +0200
-@@ -836,7 +836,7 @@
- msgstr "Beten %1 bruker ei ukjend speleliste, \"%2\""
- 
- #: libs/ardour/named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr "Beten %1 inneheld feilforma spelelisteinformasjon"
- 
- #: libs/ardour/panner.cc:256
-Index: ardour/libs/ardour/po/pl.po
-===================================================================
---- ardour.orig/libs/ardour/po/pl.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/pl.po	2011-10-04 15:48:43.214223988 +0200
-@@ -830,7 +830,7 @@
- msgstr ""
- 
- #: libs/ardour/named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
- 
- #: libs/ardour/panner.cc:253
-Index: ardour/libs/ardour/po/ru.po
-===================================================================
---- ardour.orig/libs/ardour/po/ru.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/ru.po	2011-10-04 15:48:43.218224002 +0200
-@@ -821,7 +821,7 @@
- msgstr ""
- 
- #: libs/ardour/named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
- 
- #: libs/ardour/panner.cc:253
-Index: ardour/libs/ardour/po/sv.po
-===================================================================
---- ardour.orig/libs/ardour/po/sv.po	2011-10-04 14:58:51.000000000 +0200
-+++ ardour/libs/ardour/po/sv.po	2011-10-04 15:48:43.218224002 +0200
-@@ -893,7 +893,7 @@
- msgstr ""
- 
- #: libs/ardour/named_selection.cc:80
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
- 
- #: libs/ardour/panner.cc:211
-Index: ardour/libs/ardour/named_selection.cc
-===================================================================
---- ardour.orig/libs/ardour/named_selection.cc	2011-10-04 11:56:25.513110656 +0200
-+++ ardour/libs/ardour/named_selection.cc	2011-10-04 15:50:36.150784000 +0200
-@@ -88,7 +88,7 @@
- 				warning << string_compose (_("Chunk %1 uses an unknown playlist \"%2\""), name, property->value()) << endmsg;
- 			}
- 		} else {
--			error << string_compose (_("Chunk %1 contains misformed playlist information"), name) << endmsg;
-+			error << string_compose (_("Chunk %1 contains malformed playlist information"), name) << endmsg;
- 			throw failed_constructor();
- 		}
- 	}

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list