(3.3-branch only) modify version strings to 3.3

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21335 a1c6a512-1295-4272-9138-f99709370657
Make ASCII sort the default for the release
2009-06-18 20:54:03 +00:00 · 2009-06-18 14:02:41 +00:00 · 2009-06-18 13:57:08 +00:00 · 2009-06-18 13:53:41 +00:00 · 2009-06-13 17:47:25 +00:00 · 2009-06-12 22:39:27 +00:00
17 changed files with 138 additions and 26 deletions
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@ -2608,7 +2608,8 @@ static bool toggle_usb_serial(void)
 }
 #endif

-#ifdef USB_ENABLE_HID
+/* Disable HID handling for the release */
+#if 0
 static bool hid_send_cmd(consumer_usage_page_t cmd, char *msg)
 {
    (void)msg;
@ -2792,7 +2793,8 @@ static const struct the_menu_item menuitems[] = {
 #if defined(ROCKBOX_HAS_LOGF) && defined(USB_ENABLE_SERIAL)
        {"USB Serial driver (logf)", toggle_usb_serial },
 #endif
-#if defined(USB_ENABLE_HID)
+/* Disable HID handling for the release */
+#if 0
        {"USB HID play/pause", usb_hid_send_play_pause },
        {"USB HID stop", usb_hid_send_stop },
        {"USB HID prev track", usb_hid_send_scan_previous_track },
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@ -768,8 +768,9 @@ long gui_wps_show(void)
            break;
 #endif /* HAVE_TOUCHSCREEN */            
            case ACTION_REDRAW: /* yes are locked, just redraw */
-                /* fall througgh */
-            case ACTION_NONE: /* Timeout, do an partial update */
+                wps_state.do_full_update = true;
+                break;
+            case ACTION_NONE: /* Timeout, do a partial update */
                update = true;
                ffwd_rew(button); /* hopefully fix the ffw/rwd bug */
                break;
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@ -64,12 +64,15 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
    vp->x = 0;
    vp->width = screens[screen].lcdwidth;

-    vp->y = showing_bars(screen)?STATUSBAR_HEIGHT:0;
-    vp->height = screens[screen].lcdheight - vp->y;
 #ifdef HAVE_LCD_BITMAP
    vp->drawmode = DRMODE_SOLID;
    vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */
+
+    vp->y = showing_bars(screen)?STATUSBAR_HEIGHT:0;
+#else
+    vp->y = 0;
 #endif
+    vp->height = screens[screen].lcdheight - vp->y;

 #ifdef HAVE_REMOTE_LCD
    /* We only need this test if there is a remote LCD */
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@ -1922,15 +1922,15 @@
  user: core
  <source>
    *: none
-    swcodec: "Beep Volume"
+    swcodec: "Track Skip Beep"
  </source>
  <dest>
    *: none
-    swcodec: "Piep-Lautstärke"
+    swcodec: "Piepen bei Titelwechsel"
  </dest>
  <voice>
    *: none
-    swcodec: "Piep-Lautstärke"
+    swcodec: "Piepen bei Titelwechsel"
  </voice>
 </phrase>
 <phrase>
@ -12349,3 +12349,68 @@
    speaker: "Lautsprecher einschalten"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_PREVENT_SKIPPING
+  desc: in Settings -> Playback Settings
+  user: core
+  <source>
+    *: "Prevent Track Skipping"
+  </source>
+  <dest>
+    *: "Titelwechsel verhindern"
+  </dest>
+  <voice>
+    *: "Titelwechsel verhindern"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOUCHSCREEN_POINT
+  desc: in Settings -> General -> System menu
+  user: core
+  <source>
+    *: none
+    touchscreen: "Absolute Point"
+  </source>
+  <dest>
+    *: none
+    touchscreen: "Direktes Berühren"
+  </dest>
+  <voice>
+    *: none
+    touchscreen: "Direktes Berühren"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOUCHSCREEN_GRID
+  desc: in Settings -> General -> System menu
+  user: core
+  <source>
+    *: none
+    touchscreen: "3x3 Grid"
+  </source>
+  <dest>
+    *: none
+    touchscreen: "3x3-Gitter"
+  </dest>
+  <voice>
+    *: none
+    touchscreen: "3x3-Gitter"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOUCHSCREEN_MODE
+  desc: in Settings -> General -> System menu
+  user: core
+  <source>
+    *: none
+    touchscreen: "Touchscreen Mode"
+  </source>
+  <dest>
+    *: none
+    touchscreen: "Touchscreen-Modus"
+  </dest>
+  <voice>
+    *: none
+    touchscreen: "Touchscreen-Modus"
+  </voice>
+</phrase>
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@ -1877,7 +1877,7 @@
    *: "Track Gain if Shuffling"
 </source>
 <dest>
-    *: "Landas ng tubo kong balasahin"
+    *: "Landas ng tubo kung balasahin"
 </dest>
 <voice>
    *: "Track Gain if Shuffling"
@ -6000,7 +6000,7 @@
 </dest>
 <voice>
    *: none
-    recording: "What to do when Splitting"
+    recording: "Ano gawin kung hatiin"
 </voice>
 </phrase>
 <phrase>
@ -6119,7 +6119,7 @@
 </dest>
 <voice>
    *: none
-    recording: "Directory"
+    recording: "Listahan"
 </voice>
 </phrase>
 <phrase>
@ -6153,7 +6153,7 @@
 </dest>
 <voice>
    *: none
-    recording: "Set As Recording Directory"
+    recording: "Ilagay Listahan ng rekording"
 </voice>
 </phrase>
 <phrase>
@ -6170,7 +6170,7 @@
 </dest>
 <voice>
    *: none
-    recording: "Clear Recording Directory"
+    recording: "Alisin Listahan ng rekording"
 </voice>
 </phrase>
 <phrase>
@ -12411,3 +12411,37 @@
    *: "Gaya ng numero"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_TIMESTRETCH
+  desc: timestretch enable
+  user: core
+  <source>
+    *: none
+    swcodec: "Timestretch"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Pahabain ang oras"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Pahabain ang oras"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SPEED
+  desc: timestretch speed
+  user: core
+  <source>
+    *: none
+    swcodec: "Speed"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Tulin"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Tulin"
+  </voice>
+</phrase>
--- a/apps/screens.c
+++ b/apps/screens.c
@ -111,7 +111,8 @@ static int handle_usb_events(void)
    while(1)
    {
        int button;
-#if defined(HAVE_USBSTACK) && defined(USB_ENABLE_HID)
+/* Disable HID handling for the release */
+#if 0 /*defined(HAVE_USBSTACK) && defined(USB_ENABLE_HID) */
        bool hid_enabled = usb_core_driver_enabled(USB_DRIVER_HID);

        if (hid_enabled)
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@ -793,7 +793,7 @@ const struct settings_list settings[] = {
                   "sort files", "alpha,oldest,newest,type", NULL, 4,
                   ID2P(LANG_SORT_ALPHA), ID2P(LANG_SORT_DATE),
                   ID2P(LANG_SORT_DATE_REVERSE) , ID2P(LANG_SORT_TYPE)),
-    CHOICE_SETTING(0, interpret_numbers, LANG_SORT_INTERPRET_NUMBERS, 1,
+    CHOICE_SETTING(0, interpret_numbers, LANG_SORT_INTERPRET_NUMBERS, 0,
                    "sort interpret number", "digits,numbers",NULL, 2,
                    ID2P(LANG_SORT_INTERPRET_AS_DIGIT),
                    ID2P(LANG_SORT_INTERPRET_AS_NUMBERS)),
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@ -180,7 +180,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1203

--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@ -157,7 +157,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1204

--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@ -176,7 +176,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205

--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@ -183,7 +183,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205

--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@ -167,7 +167,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x120a

--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@ -191,7 +191,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1209

--- a/tools/release/bins.pl
+++ b/tools/release/bins.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl

-$version="3.0";
+$version="3.3";

 my $verbose;
 if($ARGV[0] eq "-v") {
--- a/tools/release/manuals.pl
+++ b/tools/release/manuals.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl

-$version="3.0";
+$version="3.3";

 my $verbose;
 if($ARGV[0] eq "-v") {
--- a/tools/release/voices.pl
+++ b/tools/release/voices.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl

-$version="3.0";
+$version="3.3";

 my $verbose;
 if($ARGV[0] eq "-v") {
--- a/tools/version.sh
+++ b/tools/version.sh
@ -83,5 +83,5 @@ else
    fi
 fi
 VERSION=$VER-`date -u +%y%m%d`
-echo $VERSION
+echo "3.3"
Author	SHA1	Message	Date
Daniel Stenberg	444b4931c7	(3.3-branch only) modify version strings to 3.3 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21335 a1c6a512-1295-4272-9138-f99709370657	2009-06-18 20:54:03 +00:00
Frank Gevaerts	ed4c2a549c	Make ASCII sort the default for the release git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21329 a1c6a512-1295-4272-9138-f99709370657	2009-06-18 14:02:41 +00:00
Marianne Arnold	8251ffdcc4	Update German translation. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21328 a1c6a512-1295-4272-9138-f99709370657	2009-06-18 13:57:08 +00:00
Marianne Arnold	35841d38e5	Restore the ACTION_REDRAW case as it was before r20661 (with a slight change as suggested by Thomas Martitz). Without it you could get trapped in the WPS on targets with software hold as disabling hold again did not work correctly. Also fix(ed) typos... git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21326 a1c6a512-1295-4272-9138-f99709370657	2009-06-18 13:53:41 +00:00
Robert Menes	7dd1a76242	A combination of FS#10328 and additional fixes by Melba Sitjar to the Tagalog language file. Some spelling errors and voice strings have been fixed, and two missing strings were added. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21276 a1c6a512-1295-4272-9138-f99709370657	2009-06-13 17:47:25 +00:00
Jens Arnold	dbe2e6cdf6	(Release branch) Fix the charcell viewport defaults. The statusbar is offscreen on charcell. This fixes e.g. the yesno screen when deleting files. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21268 a1c6a512-1295-4272-9138-f99709370657	2009-06-12 22:39:27 +00:00
Frank Gevaerts	1190acefd8	Disable HID for the release, mainly because of FS#10319 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21262 a1c6a512-1295-4272-9138-f99709370657	2009-06-12 16:56:30 +00:00
Frank Gevaerts	d79583f1e0	Use OF USB on the ipods. Using our own USB code exposes some problems, such as the current charging issues (for many people, charging basically doesn't work), and speed (mostly due to not using DMA) git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21261 a1c6a512-1295-4272-9138-f99709370657	2009-06-12 16:55:33 +00:00
Frank Gevaerts	79a4ace357	Branch for the 3.3 release git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_3@21252 a1c6a512-1295-4272-9138-f99709370657	2009-06-11 22:09:36 +00:00