diff options
| author | Michael Giacomelli <giac2000@hotmail.com> | 2008-12-25 03:32:29 +0000 |
|---|---|---|
| committer | Michael Giacomelli <giac2000@hotmail.com> | 2008-12-25 03:32:29 +0000 |
| commit | da41c0ef0c4cd3b5d647344071542c6e9c92ebb9 (patch) | |
| tree | e53ee8b85cea879f2e90c67271a7f5ac63963a72 /apps | |
| parent | e25f1f9f2aed34c0f1a759d3bf64de7f9c5574ff (diff) | |
| download | rockbox-da41c0ef0c4cd3b5d647344071542c6e9c92ebb9.zip rockbox-da41c0ef0c4cd3b5d647344071542c6e9c92ebb9.tar.gz rockbox-da41c0ef0c4cd3b5d647344071542c6e9c92ebb9.tar.bz2 rockbox-da41c0ef0c4cd3b5d647344071542c6e9c92ebb9.tar.xz | |
Fix junk added to language file.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19587 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/lang/english.lang | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index f5f9ed3..5bce7f4 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -11811,7 +11811,6 @@ gigabeatf: "High" </voice> </phrase> -<<<<<<< .mine <phrase> id: LANG_SERIAL_BITRATE desc: in system settings menu @@ -11914,7 +11913,6 @@ serial_port: "57600" </voice> </phrase> -======= <phrase> id: LANG_VERY_SLOW desc: in settings_menu @@ -12013,9 +12011,6 @@ *: "slash" </voice> </phrase> -<<<<<<< .mine ->>>>>>> .r18116 -======= <phrase> id: LANG_GAIN_LEFT desc: in the recording screen @@ -12217,9 +12212,6 @@ *: "Search Results" </voice> </phrase> -<<<<<<< .mine ->>>>>>> .r18870 -======= <phrase> id: LANG_QS_ITEMS desc: DEPRECATED |