[SCM] snd packaging branch, master, updated. debian/11.6-1-4-gbccde2a

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ff081d837a4ba9e3df063a641e4327e62ff92c07
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 22 15:12:30 2010 +0200

    Drop 01.german.diff patch, now unnecessary.

diff --git a/debian/patches/01-german.diff b/debian/patches/01-german.diff
deleted file mode 100644
index 9b91ba2..0000000
--- a/debian/patches/01-german.diff
+++ /dev/null
@@ -1,143 +0,0 @@
-Description: Fix the german translation.
-Origin: Debian
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=313897
-Last-Update: 2009-09-28
-Reviewed-by: Alessio Treglia <quadrispro at ubuntu.com>
-Index: snd-10.9/po/de.po
-===================================================================
---- snd-10.9.orig/po/de.po	2009-09-28 08:36:39.909310177 +0200
-+++ snd-10.9/po/de.po	2009-09-28 08:39:50.132811174 +0200
-@@ -44,7 +44,7 @@
- 
- #: snd-chn.c:550 snd-chn.c:6461
- msgid "time (samples)"
--msgstr "Zeit (Sampels)"
-+msgstr "Zeit (Samples)"
- 
- #: snd-chn.c:551 snd-chn.c:6462
- msgid "time (percent)"
-@@ -75,17 +75,17 @@
- #: snd-chn.c:3596
- #, c-format
- msgid "cursor at %s (sample <PRId64>) = %s"
--msgstr "Cursor bei %s (Sampel <PRId64>) = %s"
-+msgstr "Cursor bei %s (Sample <PRId64>) = %s"
- 
- #: snd-chn.c:3603
- #, c-format
- msgid "chan %d, cursor at %s (sample <PRId64>) = %s"
--msgstr "Kanal %d, Cursor bei %s (Sampel <PRId64>) = %s"
-+msgstr "Kanal %d, Cursor bei %s (Sample <PRId64>) = %s"
- 
- #: snd-chn.c:3612
- #, c-format
- msgid "cursor at %s (sample <PRId64>): %s"
--msgstr "Cursor bei %s (Sampel <PRId64>): %s"
-+msgstr "Cursor bei %s (Sample <PRId64>): %s"
- 
- #: snd-chn.c:3749
- #, c-format
-@@ -94,7 +94,7 @@
- 
- #: snd-chn.c:3751
- msgid " samps"
--msgstr " Sampels"
-+msgstr " Samples"
- 
- #: snd-chn.c:3751
- msgid " Hz"
-@@ -114,7 +114,7 @@
- #: snd-chn.c:4136
- #, c-format
- msgid "mark %d at sample <PRId64>"
--msgstr "Markierung %d bei Sampel <PRId64>"
-+msgstr "Markierung %d bei Sample <PRId64>"
- 
- #: snd-chn.c:4155
- #, c-format
-@@ -140,7 +140,7 @@
- msgid ""
- ", fft %d points beginning at sample <PRId64> (%.3f secs), %s\n"
- "\n"
--msgstr ", FFT %d Punkte beginnen bei Sampel <PRId64> (%.3fs), %s\n"
-+msgstr ", FFT %d Punkte beginnen bei Sample <PRId64> (%.3fs), %s\n"
- 
- #: snd-dac.c:1608
- #, c-format
-@@ -184,7 +184,7 @@
- 
- #: snd-data.c:955 snd-gmenu.c:635 snd-gmenu.c:636 snd-xmenu.c:495
- msgid "samples"
--msgstr "Sampels"
-+msgstr "Samples"
- 
- #: snd-data.c:955
- msgid "frames"
-@@ -739,7 +739,7 @@
- 
- #: snd-gfile.c:2250 snd-xfile.c:2370
- msgid "samples:"
--msgstr "Sampels:"
-+msgstr "Samples:"
- 
- #: snd-gfile.c:2275 snd-xfile.c:2432
- msgid "comment:"
-@@ -958,7 +958,7 @@
- 
- #: snd-gfile.c:5126 snd-xfile.c:5744
- msgid "at sample"
--msgstr "am Sampel"
-+msgstr "am Sample"
- 
- #: snd-gfile.c:5135 snd-xfile.c:5778
- msgid "at mark"
-@@ -1328,7 +1328,7 @@
- 
- #: snd-gmenu.c:849 snd-gmenu.c:850 snd-xmenu.c:624
- msgid "Resample"
--msgstr "Resampel"
-+msgstr "Resample"
- 
- #: snd-gmenu.c:855 snd-gmenu.c:856 snd-xmenu.c:627
- msgid "FFT"
-@@ -1707,7 +1707,7 @@
- 
- #: snd-help.c:345
- msgid " samples"
--msgstr " Sampels"
-+msgstr " Samples"
- 
- #: snd-help.c:348
- msgid ", with modules"
-@@ -1765,11 +1765,11 @@
- #: snd-kbd.c:708
- #, c-format
- msgid "%s placed at sample <PRId64>"
--msgstr "%s bei Sampel <PRId64> placiert"
-+msgstr "%s bei Sample <PRId64> placiert"
- 
- #: snd-kbd.c:711
- msgid "There is already a mark at sample <PRId64>"
--msgstr "Es existiert schon eine Markierung bei Sampel <PRId64>"
-+msgstr "Es existiert schon eine Markierung bei Sample <PRId64>"
- 
- #: snd-kbd.c:793
- msgid "selection not saved"
-@@ -1808,7 +1808,7 @@
- 
- #: snd-kbd.c:1504 snd-kbd.c:1529
- msgid "no mark at sample <PRId64>"
--msgstr "keine Markierung bei Sampel <PRId64>"
-+msgstr "keine Markierung bei Sample <PRId64>"
- 
- #: snd-kbd.c:1631
- msgid "selection starts at <PRId64>"
-@@ -2344,7 +2344,7 @@
- #: snd-sig.c:3890 snd-sig.c:4041
- #, c-format
- msgid "%s stopped at sample <PRId64>"
--msgstr "%s bei Sampel <PRId64> angehalten"
-+msgstr "%s bei Sample <PRId64> angehalten"
- 
- #: snd-snd.c:16
- #, c-format
diff --git a/debian/patches/series b/debian/patches/series
index fc51cc2..30db91f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 00-makefile.diff
-# 01-german.diff
 03-manpage_warnings.diff
 04-gcc_warnings.diff
 05-kfreebsd.diff

-- 
snd packaging