From 4fc717a4c19a1fe0349977d7b9c86561c5a5cf2d Mon Sep 17 00:00:00 2001
From: Michael Sevakis <jethead71@rockbox.org>
Date: Mon, 28 Aug 2006 22:38:41 +0000
Subject: Added FS#2939 Encoder Codec Interface + Codecs by Antonius Hellmann
 with additional FM Recording support and my modifications

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10789 a1c6a512-1295-4272-9138-f99709370657
---
 apps/lang/english.lang | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'apps/lang')

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 3d87c0cd5d..5687c81e59 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -9661,6 +9661,22 @@
     *: "Full Path"
   </voice>
 </phrase>
+<<<<<<< english.lang
+<phrase>
+  id: VOICE_KBIT_PER_SEC
+  desc: spoken only, for file extension
+  user:
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "kilobits per second"
+  </voice>
+</phrase>
+=======
 <phrase>
   id: LANG_RECORD_AGC_PRESET
   desc: automatic gain control in record settings
@@ -9778,3 +9794,4 @@
     *: "AGC maximum gain"
   </voice>
 </phrase>
+>>>>>>> 1.267
-- 
cgit v1.2.3