Bump version to 3.12

Change-Id: I086950e1d506cba4d526d7ec99af7caae0688eb9
FS#12756 by Marek Salaba - update Czech translation
2012-10-06 14:39:58 +01:00 · 2012-10-06 14:28:35 +01:00 · 2012-09-27 22:15:02 +02:00 · 2012-09-24 09:47:45 +02:00 · 2012-09-22 22:31:57 +02:00
7 changed files with 172 additions and 17 deletions
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@ -13003,3 +13003,31 @@
    swcodec: "Vlastní"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_SELECT_FOLDER
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select one or more directories"
+  </source>
+  <dest>
+    *: "Vybrat jeden nebo více adresářů"
+  </dest>
+  <voice>
+    *: "Vybrat jeden nebo více adresářů"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECT_DATABASE_DIRS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select directories to scan"
+  </source>
+  <dest>
+    *: "Vybrat adresáře pro prohledávání"
+  </dest>
+  <voice>
+    *: "Vybrat adresáře pro prohledávání"
+  </voice>
+</phrase>
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@ -12311,15 +12311,15 @@
  user: core
  <source>
    *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
+    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
  </source>
  <dest>
    *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Raumklangverbesserung"
+    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "Raumklangverbesserung"
  </dest>
  <voice>
    *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Raumklangverbesserung"
+    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "Raumklangverbesserung"
  </voice>
 </phrase>
 <phrase>
@ -12887,16 +12887,16 @@
 </phrase>
 <phrase>
  id: LANG_SLEEP_TIMER_DURATION
-  desc: default sleep timer duration in minutes (unused in UI)
+  desc: default sleep timer duration in minutes
  user: core
  <source>
    *: "Default Sleep Timer Duration"
  </source>
  <dest>
-    *: "Standard Einschlaftimer"
+    *: "Standarddauer Einschlaftimer"
  </dest>
  <voice>
-    *: "Standard Einschlafzeit"
+    *: "Standarddauer Einschlafzeit"
  </voice>
 </phrase>
 <phrase>
@ -12927,3 +12927,124 @@
    *: "Einschlafzeit automatisch starten"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_SELECT_FOLDER
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select one or more directories"
+  </source>
+  <dest>
+    *: "Eines oder mehrere Verzeichnisse auswählen"
+  </dest>
+  <voice>
+    *: "Eines oder mehrere Verzeichnisse auswählen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFEED_MEIER
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Simple (Meier)"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Einfach (Meier)"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Einfach"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLEEP_TIMER_START_CURRENT
+  desc: shown when a sleep timer isn't running
+  user: core
+  <source>
+    *: "Start Sleep Timer"
+  </source>
+  <dest>
+    *: "Einschlaftimer starten"
+  </dest>
+  <voice>
+    *: "Einschlaftimer starten"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECT_DATABASE_DIRS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select directories to scan"
+  </source>
+  <dest>
+    *: "Verzeichnisse auswählen"
+  </dest>
+  <voice>
+    *: "Verzeichnisse zum Durchsuchen auswählen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CODEPAGE_WESTERN_EUROPEAN
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Western European (CP1252)"
+  </source>
+  <dest>
+    *: "Westeuropäisch (CP1252)"
+  </dest>
+  <voice>
+    *: "Westeuropäisch"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFEED_CUSTOM
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Custom"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Manuell"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Manuell"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_SHORTCUTS_INSTEAD_OF_QS
+  desc: in settings_menu.
+  user: core
+  <source>
+    *: none
+    quickscreen: "Use Shortcuts Menu Instead of Quick Screen"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Verknüpfungsmenü statt Schnelleinstellung verwenden"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Verknüpfungsmenü statt Schnelleinstellung verwenden"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONSTRAIN_NEXT_FOLDER
+  desc: in settings_menu. Whether LANG_NEXT_FOLDER should be constrained to directories within LANG_SET_AS_START_DIR
+  user: core
+  <source>
+    *: "Constrain Auto-Change"
+  </source>
+  <dest>
+    *: "Beschränke autom. Verzeichniswechsel"
+  </dest>
+  <voice>
+    *: "Beschränke automatischen Verzeichniswechsel"
+  </voice>
+</phrase>
--- a/tools/builds.pm
+++ b/tools/builds.pm
@ -1,8 +1,8 @@
-$publicrelease="3.11.2";
-$manualrelease="3.11.2";
-$voicerelease="3.11.2";
-$releasedate="April 12, 2012";
-$releasenotes="/wiki/ReleaseNotes3112";
+$publicrelease="3.12";
+$manualrelease="3.12";
+$voicerelease="3.12";
+$releasedate="06 October 2012";
+$releasenotes="/wiki/ReleaseNotes312";

 %builds = (
    'archosav300' => {
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@ -301,13 +301,19 @@ int main(int argc, char **argv)
            return 2;
        }
        ext++;
-#ifdef HAVE_REMOTE_LCD
        if (!strcmp(ext, "rwps") || !strcmp(ext, "rsbs") || !strcmp(ext, "rfms"))
+        {
+#ifdef HAVE_REMOTE_LCD
            screen = SCREEN_REMOTE;
-        else
+#else
+            /* skip rwps etc. if not supported on this target (not an error) */
+            continue;
 #endif
-        if (!strcmp(ext, "wps")  || !strcmp(ext, "sbs")  || !strcmp(ext, "fms"))
+        }
+        else if (!strcmp(ext, "wps")  || !strcmp(ext, "sbs")  || !strcmp(ext, "fms"))
+        {
            screen = SCREEN_MAIN;
+        }
        else
        {
            printf("Invalid extension\n");
--- a/tools/release/bins.pl
+++ b/tools/release/bins.pl
@ -1,5 +1,5 @@
 #!/usr/bin/perl
-$version="3.11.1";
+$version="3.12";

 require "tools/builds.pm";

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

-$version="3.11.1";
+$version="3.12";

 require "tools/builds.pm";

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

-$version="3.11.1";
+$version="3.12";

 require "tools/builds.pm";
Author	SHA1	Message	Date
Alex Parker	2ee4565281	Bump version to 3.12 Change-Id: I086950e1d506cba4d526d7ec99af7caae0688eb9	2012-10-06 14:39:58 +01:00
Alex Parker	5e1ca421c9	FS#12756 by Marek Salaba - update Czech translation Change-Id: If5fdd731bf2691daaa7bea9e748ff27190db595e	2012-10-06 14:28:35 +01:00
Dominik Riebeling	9dff033165	Fix typo in german translation. Thanks to fml on irc for noticing. Change-Id: I598903aa080580ce33fff4c8abdac26928c76233	2012-09-27 22:15:02 +02:00
Thomas Martitz	bd00be91de	checkwps: Do not error out on rwps for non-remote targets. This breaks themes on the theme site (that ship an rwps for remote targets) for non-remote targets. As rockbox just ignores the rwps checkwps now does the same. Change-Id: Id8c7833f0bd88d239dce87711456b94c93480a51	2012-09-24 09:47:45 +02:00
Dominik Riebeling	d4ab7dacc2	Update german translation. Based on FS#12735 by Kaspar Rothenfußer with some modifications by me to be in line with terms already used in the translation. Change-Id: Ia1ba59bd00d61f0fd27bd496a116143e4b83b420	2012-09-22 22:31:57 +02:00