diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2006-08-28 22:43:46 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2006-08-28 22:43:46 +0000 |
commit | 25c0f4c6c3536b4571abb0100913f68d8d04dc19 (patch) | |
tree | 10390dece5a3825a0ae762bb4968f652c8db39a1 /apps | |
parent | 4fc717a4c19a1fe0349977d7b9c86561c5a5cf2d (diff) | |
download | rockbox-25c0f4c6c3536b4571abb0100913f68d8d04dc19.tar.gz rockbox-25c0f4c6c3536b4571abb0100913f68d8d04dc19.zip |
fixed engligh.lang conflicts
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10790 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 5687c81e59..edf052145c 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -1677,7 +1677,7 @@ | |||
1677 | </phrase> | 1677 | </phrase> |
1678 | <phrase> | 1678 | <phrase> |
1679 | id: LANG_TAGCACHE | 1679 | id: LANG_TAGCACHE |
1680 | desc: in settings menu | 1680 | desc: in settings menu |
1681 | user: | 1681 | user: |
1682 | <source> | 1682 | <source> |
1683 | *: "Tag Cache" | 1683 | *: "Tag Cache" |
@@ -1691,7 +1691,7 @@ | |||
1691 | </phrase> | 1691 | </phrase> |
1692 | <phrase> | 1692 | <phrase> |
1693 | id: LANG_TAGCACHE_DISK | 1693 | id: LANG_TAGCACHE_DISK |
1694 | desc: | 1694 | desc: |
1695 | user: | 1695 | user: |
1696 | <source> | 1696 | <source> |
1697 | *: "" | 1697 | *: "" |
@@ -5221,7 +5221,7 @@ | |||
5221 | </phrase> | 5221 | </phrase> |
5222 | <phrase> | 5222 | <phrase> |
5223 | id: LANG_RECORD_TRIGGER_ACTIVE | 5223 | id: LANG_RECORD_TRIGGER_ACTIVE |
5224 | desc: | 5224 | desc: |
5225 | user: | 5225 | user: |
5226 | <source> | 5226 | <source> |
5227 | *: "Trigger Active" | 5227 | *: "Trigger Active" |
@@ -8424,17 +8424,17 @@ | |||
8424 | <voice> | 8424 | <voice> |
8425 | *: "Direct gain" | 8425 | *: "Direct gain" |
8426 | </voice> | 8426 | </voice> |
8427 | </phrase> | 8427 | </phrase> |
8428 | <phrase> | 8428 | <phrase> |
8429 | id: LANG_CROSSFEED_CROSS_GAIN | 8429 | id: LANG_CROSSFEED_CROSS_GAIN |
8430 | desc: in crossfeed settings | 8430 | desc: in crossfeed settings |
8431 | <source> | 8431 | <source> |
8432 | *: "Cross Gain" | 8432 | *: "Cross Gain" |
8433 | </source> | 8433 | </source> |
8434 | <dest> | 8434 | <dest> |
8435 | *: "Cross Gain" | 8435 | *: "Cross Gain" |
8436 | </dest> | 8436 | </dest> |
8437 | <voice> | 8437 | <voice> |
8438 | *: "Cross gain" | 8438 | *: "Cross gain" |
8439 | </voice> | 8439 | </voice> |
8440 | </phrase> | 8440 | </phrase> |
@@ -8531,7 +8531,7 @@ | |||
8531 | <voice> | 8531 | <voice> |
8532 | *: "Remote Scrolling Options" | 8532 | *: "Remote Scrolling Options" |
8533 | </voice> | 8533 | </voice> |
8534 | </phrase> | 8534 | </phrase> |
8535 | <phrase> | 8535 | <phrase> |
8536 | id: LANG_TAGCACHE_UPDATE | 8536 | id: LANG_TAGCACHE_UPDATE |
8537 | desc: in tag cache settings | 8537 | desc: in tag cache settings |
@@ -8765,7 +8765,7 @@ | |||
8765 | <voice> | 8765 | <voice> |
8766 | *: "Start new file" | 8766 | *: "Start new file" |
8767 | </voice> | 8767 | </voice> |
8768 | </phrase> | 8768 | </phrase> |
8769 | <phrase> | 8769 | <phrase> |
8770 | id: LANG_STOP_RECORDING | 8770 | id: LANG_STOP_RECORDING |
8771 | desc: in record timesplit options | 8771 | desc: in record timesplit options |
@@ -9661,22 +9661,6 @@ | |||
9661 | *: "Full Path" | 9661 | *: "Full Path" |
9662 | </voice> | 9662 | </voice> |
9663 | </phrase> | 9663 | </phrase> |
9664 | <<<<<<< english.lang | ||
9665 | <phrase> | ||
9666 | id: VOICE_KBIT_PER_SEC | ||
9667 | desc: spoken only, for file extension | ||
9668 | user: | ||
9669 | <source> | ||
9670 | *: "" | ||
9671 | </source> | ||
9672 | <dest> | ||
9673 | *: "" | ||
9674 | </dest> | ||
9675 | <voice> | ||
9676 | *: "kilobits per second" | ||
9677 | </voice> | ||
9678 | </phrase> | ||
9679 | ======= | ||
9680 | <phrase> | 9664 | <phrase> |
9681 | id: LANG_RECORD_AGC_PRESET | 9665 | id: LANG_RECORD_AGC_PRESET |
9682 | desc: automatic gain control in record settings | 9666 | desc: automatic gain control in record settings |
@@ -9794,4 +9778,17 @@ | |||
9794 | *: "AGC maximum gain" | 9778 | *: "AGC maximum gain" |
9795 | </voice> | 9779 | </voice> |
9796 | </phrase> | 9780 | </phrase> |
9797 | >>>>>>> 1.267 | 9781 | <phrase> |
9782 | id: VOICE_KBIT_PER_SEC | ||
9783 | desc: spoken only, for file extension | ||
9784 | user: | ||
9785 | <source> | ||
9786 | *: "" | ||
9787 | </source> | ||
9788 | <dest> | ||
9789 | *: "" | ||
9790 | </dest> | ||
9791 | <voice> | ||
9792 | *: "kilobits per second" | ||
9793 | </voice> | ||
9794 | </phrase> | ||