vice-emu-commit Mailing List for VICE (Page 1061)

Versatile Commodore Emulator

Brought to you by: blackystardust, gpz

vice-emu-commit — Commit notifications for the source server

You can subscribe to this list here.

2008	Jan	Feb	Mar	Apr (38)	May (60)	Jun (122)	Jul (148)	Aug (178)	Sep (151)	Oct (131)	Nov (208)	Dec (129)
2009	Jan (193)	Feb (209)	Mar (221)	Apr (243)	May (165)	Jun (168)	Jul (198)	Aug (161)	Sep (103)	Oct (98)	Nov (168)	Dec (99)
2010	Jan (263)	Feb (156)	Mar (57)	Apr (93)	May (85)	Jun (124)	Jul (57)	Aug (58)	Sep (113)	Oct (148)	Nov (114)	Dec (193)
2011	Jan (200)	Feb (207)	Mar (91)	Apr (91)	May (142)	Jun (104)	Jul (115)	Aug (137)	Sep (266)	Oct (91)	Nov (85)	Dec (186)
2012	Jan (98)	Feb (146)	Mar (160)	Apr (99)	May (59)	Jun (257)	Jul (84)	Aug (103)	Sep (169)	Oct (206)	Nov (90)	Dec (296)
2013	Jan (294)	Feb (130)	Mar (36)	Apr (14)	May (51)	Jun (74)	Jul (180)	Aug (85)	Sep (26)	Oct (45)	Nov (29)	Dec (21)
2014	Jan (56)	Feb (40)	Mar (57)	Apr (30)	May (31)	Jun (11)	Jul (107)	Aug (135)	Sep (142)	Oct (195)	Nov (139)	Dec (133)
2015	Jan (293)	Feb (161)	Mar (146)	Apr (85)	May (139)	Jun (51)	Jul (21)	Aug (24)	Sep (29)	Oct (136)	Nov (212)	Dec (118)
2016	Jan (119)	Feb (165)	Mar (229)	Apr (219)	May (134)	Jun (119)	Jul (134)	Aug (236)	Sep (203)	Oct (215)	Nov (300)	Dec (140)
2017	Jan (188)	Feb (20)	Mar (147)	Apr (198)	May (26)	Jun (21)	Jul (67)	Aug (219)	Sep (209)	Oct (194)	Nov (144)	Dec (99)
2018	Jan (139)	Feb (122)	Mar (116)	Apr (85)	May (232)	Jun (181)	Jul (190)	Aug (105)	Sep (92)	Oct (178)	Nov (105)	Dec (86)
2019	Jan (119)	Feb (79)	Mar (74)	Apr (117)	May (115)	Jun (307)	Jul (107)	Aug (131)	Sep (103)	Oct (60)	Nov (118)	Dec (70)
2020	Jan (114)	Feb (103)	Mar (77)	Apr (121)	May (193)	Jun (110)	Jul (214)	Aug (210)	Sep (179)	Oct (260)	Nov (237)	Dec (334)
2021	Jan (163)	Feb (186)	Mar (58)	Apr (81)	May (108)	Jun (175)	Jul (154)	Aug (180)	Sep (217)	Oct (204)	Nov (232)	Dec (190)
2022	Jan (253)	Feb (134)	Mar (229)	Apr (190)	May (125)	Jun (70)	Jul (8)	Aug (22)	Sep (19)	Oct (33)	Nov (94)	Dec (164)
2023	Jan (158)	Feb (366)	Mar (272)	Apr (109)	May (198)	Jun (226)	Jul (200)	Aug (94)	Sep (108)	Oct (62)	Nov (175)	Dec (116)
2024	Jan (35)	Feb (40)	Mar (51)	Apr (89)	May (24)	Jun (26)	Jul (53)	Aug (71)	Sep (23)	Oct (11)	Nov (22)	Dec (58)
2025	Jan (26)	Feb (40)	Mar (107)	Apr (39)	May (35)	Jun (20)	Jul (11)	Aug (24)	Sep (35)	Oct (28)	Nov (14)	Dec

Flat | Threaded

<< < 1 .. 1059 1060 1061 1062 1063 .. 1071 > >> (Page 1061 of 1071)

[Vice-emu-commit] SF.net SVN: vice-emu: [18993] trunk/vice/src/c64/reu.c

From: <st...@us...> - 2008-07-10 19:27:21

Revision: 18993
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18993&view=rev
Author:   strik
Date:     2008-07-10 12:27:27 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
Added a cast for &rec_options.first_unused_register_address in the resource
initialisation. The other option would be to change
rec_options.first_unused_register_address to (signed) int, but that would
require even more casts at other places.

Modified Paths:
--------------
    trunk/vice/src/c64/reu.c

Modified: trunk/vice/src/c64/reu.c
===================================================================
--- trunk/vice/src/c64/reu.c	2008-07-10 19:14:41 UTC (rev 18992)
+++ trunk/vice/src/c64/reu.c	2008-07-10 19:27:27 UTC (rev 18993)
@@ -427,7 +427,7 @@
     { "REUsize", 512, RES_EVENT_NO, NULL,
       &reu_size_kb, set_reu_size, NULL },
     { "REUfirstUnusedRegister", REU_REG_RW_UNUSED, RES_EVENT_NO, NULL,
-      &rec_options.first_unused_register_address, set_reu_first_unused, NULL },
+      (int *) &rec_options.first_unused_register_address, set_reu_first_unused, NULL },
     { NULL }
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18992] trunk/vice/src

From: <st...@us...> - 2008-07-10 19:14:32

Revision: 18992
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18992&view=rev
Author:   strik
Date:     2008-07-10 12:14:41 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
2008-07-10  Spiro Trikaliotis  <spi...@gm...>

	* src/c64/reu.c: The status register bits are not reset if a new
	transfer starts without reading the status register; however,
	the interrupt only occurs if they are set again to new values.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/c64/reu.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-10 11:17:19 UTC (rev 18991)
+++ trunk/vice/src/ChangeLog	2008-07-10 19:14:41 UTC (rev 18992)
@@ -1,3 +1,9 @@
+2008-07-10  Spiro Trikaliotis  <spi...@gm...>
+
+	* c64/reu.c: The status register bits are not reset if a new
+	transfer starts without reading the status register; however,
+	the interrupt only occurs if they are set again to new values.
+
 2008-07-09  Spiro Trikaliotis  <spi...@gm...>
 
 	* c64/reu.c: set_reu_size(): Do not reset

Modified: trunk/vice/src/c64/reu.c
===================================================================
--- trunk/vice/src/c64/reu.c	2008-07-10 11:17:19 UTC (rev 18991)
+++ trunk/vice/src/c64/reu.c	2008-07-10 19:14:41 UTC (rev 18992)
@@ -917,15 +917,20 @@
   \param len
     The transfer length the operation stopped at
 
+  \param new_status_or_mask
+    A mask which is used to set bits in the status
+
   \remark
     if autoload is enabled, the shadow registers are written back 
     to the REU registers.
 */
 static void reu_dma_update_regs(WORD host_addr, unsigned int reu_addr,
-                                int len)
+                                int len, BYTE new_status_or_mask)
 {
     reu_addr &= rec_options.wrap_around_mask_when_storing;
 
+    rec.status |= new_status_or_mask;
+
     if (!(rec.command & REU_REG_RW_COMMAND_AUTOLOAD)) {
         /* not autoload
          * incr. of addr. disabled, as already pointing to correct addr.
@@ -951,24 +956,26 @@
 
         DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Autoload.") );
     }
-}
 
-/*! \brief Mark END-OF-BLOCK condition
+    if ((rec.int_mask_reg 
+            & (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) 
+           == (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED))
+    {
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Interrupt pending") );
+        rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
+        maincpu_set_irq(reu_int_num, 1);
+    }
 
- \return
-   The value to store to the length register (hard-coded to 1)
-
- \remark
-   Whenever a REU operation completes, the END-OF-BLOCK bit
-   is set. This is done with the help of this function,
-   as this occurs at different places.
-*/
-static int reu_set_end_of_block(void)
-{
-    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
-    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
-
-    return 0x01; /* the length value to store after the transfer */
+    if ( new_status_or_mask | REU_REG_R_STATUS_VERIFY_ERROR ) {
+        if ((rec.int_mask_reg 
+               & (REU_REG_RW_INTERRUPT_VERIFY_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED))
+              == (REU_REG_RW_INTERRUPT_VERIFY_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED))
+        {
+            DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Verify Interrupt pending") );
+            rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
+            maincpu_set_irq(reu_int_num, 1);
+        }
+    }
 }
 
 /*! \brief DMA operation writing from the host to the REU
@@ -999,7 +1006,7 @@
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
                 host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step)) {
+    while (len) {
         maincpu_clk++;
         machine_handle_pending_alarms(0);
         value = mem_read(host_addr);
@@ -1009,9 +1016,11 @@
 
         store_to_reu(reu_addr, value);
         host_addr = (host_addr + host_step) & 0xffff;
+        reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step);
+        len--;
     }
-    len = reu_set_end_of_block();
-    reu_dma_update_regs(host_addr, reu_addr, len);
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+    reu_dma_update_regs(host_addr, reu_addr, len, REU_REG_R_STATUS_END_OF_BLOCK);
 }
 
 /*! \brief DMA operation writing from the REU to the host
@@ -1040,7 +1049,7 @@
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
                 host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step)) {
+    while (len) {
         DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
                     "Transferring byte: %x from ext $%05X to main $%04X.",
                     reu_ram[reu_addr % reu_size], reu_addr, host_addr) );
@@ -1049,9 +1058,11 @@
         mem_store(host_addr, value);
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
+        reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step);
+        len--;
     }
-    len = reu_set_end_of_block();
-    reu_dma_update_regs(host_addr, reu_addr, len);
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+    reu_dma_update_regs(host_addr, reu_addr, len, REU_REG_R_STATUS_END_OF_BLOCK);
 }
 
 /*! \brief DMA operation swaping data between host and REU
@@ -1081,7 +1092,7 @@
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
                 host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step) ) {
+    while (len) {
         value_from_reu = read_from_reu(reu_addr);
         maincpu_clk++;
         machine_handle_pending_alarms(0);
@@ -1094,9 +1105,11 @@
         maincpu_clk++;
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
+        reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step);
+        len--;
     }
-    len = reu_set_end_of_block();
-    reu_dma_update_regs(host_addr, reu_addr, len);
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+    reu_dma_update_regs(host_addr, reu_addr, len, REU_REG_R_STATUS_END_OF_BLOCK);
 }
 
 /*! \brief DMA operation comparing data between host and REU
@@ -1122,13 +1135,18 @@
     BYTE value_from_reu;
     BYTE value_from_c64;
 
+    BYTE new_status_or_mask = 0;
+
     DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "compare ext $%05X %s<=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
                 host_step ? "" : " (fixed)", len, len) );
 
-    rec.status &= ~ (REU_REG_R_STATUS_VERIFY_ERROR | REU_REG_R_STATUS_END_OF_BLOCK);
+    /* the real 17xx does not clear these bits on compare;
+     * thus, we do not clear them, either! */
 
+    /* rec.status &= ~ (REU_REG_R_STATUS_VERIFY_ERROR | REU_REG_R_STATUS_END_OF_BLOCK); */
+
     while (len--) {
         maincpu_clk++;
         machine_handle_pending_alarms(0);
@@ -1147,25 +1165,23 @@
             /* weird behaviour of the 17xx: If the last or next-to-last byte
              * failed, the "end of block transfer" bit is set, too.
              */
-            if ( (len == 0) || (len == 1) ) {
-                len = reu_set_end_of_block();
+            if (len <= 1) {
+                new_status_or_mask |= REU_REG_R_STATUS_END_OF_BLOCK;
+                len = 1;
             }
-
-            if (rec.int_mask_reg & (REU_REG_RW_INTERRUPT_VERIFY_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) {
-                DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Verify Interrupt pending") );
-                rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
-                maincpu_set_irq(reu_int_num, 1);
-            }
             break;
         }
     }
 
+    assert( len >= -1 );
+
     if (len < 0) {
         /* all bytes are equal, mark End Of Block */
-        len = reu_set_end_of_block();
+        new_status_or_mask = REU_REG_R_STATUS_END_OF_BLOCK;
+        len = 1;
     }
 
-    reu_dma_update_regs(host_addr, reu_addr, len);
+    reu_dma_update_regs(host_addr, reu_addr, len, new_status_or_mask);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1238,15 +1254,6 @@
 
     rec.command = (rec.command & ~ REU_REG_RW_COMMAND_EXECUTE) 
                   | REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED;
-
-    if ((rec.int_mask_reg 
-            & (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) 
-           == (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED))
-    {
-        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Interrupt pending") );
-        rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
-        maincpu_set_irq(reu_int_num, 1);
-    }
 }
 
 /* ------------------------------------------------------------------------- */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18991] branches/viceplus/v1.22.24-x64dtv/vice

From: <no...@us...> - 2008-07-10 11:17:13

Revision: 18991
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18991&view=rev
Author:   nojoopa
Date:     2008-07-10 04:17:19 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
x64dtv merging part 3

Modified Paths:
--------------
    branches/viceplus/v1.22.24-x64dtv/vice/configure.in
    branches/viceplus/v1.22.24-x64dtv/vice/data/C64DTV/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/data/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64/c64mem.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmem.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/maincpu.h

Added Paths:
-----------
    branches/viceplus/v1.22.24-x64dtv/vice/data/C64DTV/

Modified: branches/viceplus/v1.22.24-x64dtv/vice/configure.in
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/configure.in	2008-07-10 08:46:59 UTC (rev 18990)
+++ branches/viceplus/v1.22.24-x64dtv/vice/configure.in	2008-07-10 11:17:19 UTC (rev 18991)
@@ -1773,6 +1773,7 @@
   xcbm2_LDFLAGS="-mwindows"
 
   X64_WINRES="\$(top_builddir)/src/arch/win32/resc64.o"
+  X64DTV_WINRES="\$(top_builddir)/src/arch/win32/resc64dtv.o"
   X128_WINRES="\$(top_builddir)/src/arch/win32/resc128.o"
   XVIC_WINRES="\$(top_builddir)/src/arch/win32/resvic20.o"
   XPET_WINRES="\$(top_builddir)/src/arch/win32/respet.o"
@@ -1821,6 +1822,7 @@
 AC_SUBST(xcbm2_LDFLAGS)
 
 AC_SUBST(X64_WINRES)
+AC_SUBST(X64DTV_WINRES)
 AC_SUBST(X128_WINRES)
 AC_SUBST(XVIC_WINRES)
 AC_SUBST(XPET_WINRES)
@@ -2285,6 +2287,7 @@
            data/Makefile
            data/C128/Makefile
            data/C64/Makefile
+           data/C64DTV/Makefile
            data/CBM-II/Makefile
            data/DRIVES/Makefile
            data/PET/Makefile
@@ -2326,6 +2329,7 @@
            src/c128/Makefile
            src/c64/Makefile
            src/c64/cart/Makefile
+           src/c64dtv/Makefile
            src/cbm2/Makefile
            src/core/Makefile
            src/crtc/Makefile

Copied: branches/viceplus/v1.22.24-x64dtv/vice/data/C64DTV (from rev 18985, branches/viceplus/v1.22.24-x64dtv/vice/data/C64)

Modified: branches/viceplus/v1.22.24-x64dtv/vice/data/C64DTV/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/data/C64/Makefile.am	2008-07-09 10:35:04 UTC (rev 18985)
+++ branches/viceplus/v1.22.24-x64dtv/vice/data/C64DTV/Makefile.am	2008-07-10 11:17:19 UTC (rev 18991)
@@ -1,6 +1,6 @@
-c64dir = $(VICEDIR)/C64
+c64dtvdir = $(VICEDIR)/C64DTV
 
-c64_DATA = \
+c64dtv_DATA = \
 	amiga_sym.vkm \
 	amiga_pos.vkm \
 	basic \
@@ -33,5 +33,5 @@
 	x11_sym.vkm \
 	x11_pos.vkm
 
-EXTRA_DIST = $(c64_DATA)
+EXTRA_DIST = $(c64dtv_DATA)
 

Modified: branches/viceplus/v1.22.24-x64dtv/vice/data/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/data/Makefile.am	2008-07-10 08:46:59 UTC (rev 18990)
+++ branches/viceplus/v1.22.24-x64dtv/vice/data/Makefile.am	2008-07-10 11:17:19 UTC (rev 18991)
@@ -1,9 +1,9 @@
 if MSDOS_COMPILE
-SUBDIRS = C64 C128 VIC20 PET PLUS4 CBM-II DRIVES PRINTER
+SUBDIRS = C64 C64DTV C128 VIC20 PET PLUS4 CBM-II DRIVES PRINTER
 else
 if WIN32_COMPILE
-SUBDIRS = C64 C128 VIC20 PET PLUS4 CBM-II DRIVES PRINTER
+SUBDIRS = C64 C64DTV C128 VIC20 PET PLUS4 CBM-II DRIVES PRINTER
 else
-SUBDIRS = C64 C128 VIC20 PET PLUS4 CBM-II DRIVES PRINTER fonts
+SUBDIRS = C64 C64DTV C128 VIC20 PET PLUS4 CBM-II DRIVES PRINTER fonts
 endif
 endif

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c	2008-07-10 08:46:59 UTC (rev 18990)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c	2008-07-10 11:17:19 UTC (rev 18991)
@@ -57,11 +57,12 @@
 
 UI_MENU_DEFINE_RADIO(MachineVideoStandard)
 
-ui_menu_entry_t set_video_standard_submenu[] = {
+static ui_menu_entry_t set_video_standard_c64dtv_submenu[] = {
     { N_("*PAL-G"), (ui_callback_t)radio_MachineVideoStandard,
       (ui_callback_data_t)MACHINE_SYNC_PAL, NULL },
     { N_("*NTSC-M"), (ui_callback_t)radio_MachineVideoStandard,
       (ui_callback_data_t)MACHINE_SYNC_NTSC, NULL },
+    { NULL },
     { NULL }
 };
 
@@ -335,6 +336,10 @@
 
 int c64dtvui_init(void)
 {
+    memcpy(set_video_standard_submenu, 
+           set_video_standard_c64dtv_submenu,
+           sizeof(set_video_standard_c64dtv_submenu));
+
     ui_set_application_icon(c64dtv_icon_data);
     c64ui_dynamic_menu_create();
 

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/c64/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/c64/Makefile.am	2008-07-10 08:46:59 UTC (rev 18990)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/c64/Makefile.am	2008-07-10 11:17:19 UTC (rev 18991)
@@ -9,7 +9,7 @@
 	-I$(top_srcdir)/src/tape \
 	-I$(top_srcdir)/src/vicii
 
-noinst_LIBRARIES = libc64.a libc64c128.a
+noinst_LIBRARIES = libc64.a libc64c128.a libc64c64dtv.a
 
 libc64_a_SOURCES = \
 	c64-cmdline-options.c \
@@ -91,6 +91,26 @@
 	tfe.h \
 	tfearch.h
 
+libc64c64dtv_a_SOURCES = \
+	c64bus.c \
+	c64drive.c \
+	c64fastiec.c \
+	c64fastiec.h \
+	c64keyboard.c \
+	c64keyboard.h \
+	c64parallel.c \
+	c64parallel.h \
+	c64printer.c \
+	c64rom.c \
+	c64rom.h \
+	c64romset.c \
+	c64romset.h \
+	c64rsuser.c \
+	c64rsuser.h \
+	c64video.c \
+	patchrom.c \
+	patchrom.h
+
 libc64c128_a_SOURCES = \
 	c64acia.h \
 	c64acia1.c \

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/c64/c64mem.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/c64/c64mem.h	2008-07-10 08:46:59 UTC (rev 18990)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/c64/c64mem.h	2008-07-10 11:17:19 UTC (rev 18991)
@@ -36,7 +36,9 @@
 #include "mem.h"
 #endif
 
+#ifndef C64_RAM_SIZE
 #define C64_RAM_SIZE                    0x10000
+#endif
 #define C64_KERNAL_ROM_SIZE             0x2000
 #define C64_BASIC_ROM_SIZE              0x2000
 #define C64_CHARGEN_ROM_SIZE            0x1000
@@ -84,4 +86,3 @@
 extern void c64_mem_init(void);
 
 #endif
-

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv.c	2008-07-10 08:46:59 UTC (rev 18990)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv.c	2008-07-10 11:17:19 UTC (rev 18991)
@@ -211,7 +211,6 @@
         || machine_video_resources_init() < 0
         || c64dtv_resources_init() < 0
         || c64dtvmem_resources_init() < 0
-        || screenshot_resources_init() < 0
         || vicii_resources_init() < 0
         || sound_resources_init() < 0
         || sid_resources_init() < 0
@@ -255,7 +254,6 @@
         || video_init_cmdline_options() < 0
         || c64dtv_cmdline_options_init() < 0
         || monitor_cmdline_options_init() < 0
-        || screenshot_cmdline_options_init() < 0
         || c64dtvmem_cmdline_options_init() < 0
         || vicii_cmdline_options_init() < 0
         || sound_cmdline_options_init() < 0

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmem.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmem.c	2008-07-10 08:46:59 UTC (rev 18990)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmem.c	2008-07-10 11:17:19 UTC (rev 18991)
@@ -549,12 +549,13 @@
     return mem_ioreg_list;
 }
 
-void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
+void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank)
 {
     *base = ((vicii_peek(0xd018) & 0xf0) << 6)
             | ((~cia2_peek(0xdd00) & 0x03) << 14);
     *rows = 25;
     *columns = 40;
+    *bank = 0;
 }
 
 /* end of c64dtvmem_main.c */

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/maincpu.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/maincpu.h	2008-07-10 08:46:59 UTC (rev 18990)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/maincpu.h	2008-07-10 11:17:19 UTC (rev 18991)
@@ -44,8 +44,13 @@
 /* The VIC-II emulation needs this ugly hack.  */
 extern unsigned int reg_pc;
 
+#ifdef C64DTV
+struct mos6510dtv_regs_s;
+extern struct mos6510dtv_regs_s maincpu_regs;
+#else
 struct mos6510_regs_s;
 extern struct mos6510_regs_s maincpu_regs;
+#endif
 
 extern int maincpu_rmw_flag;
 extern CLOCK maincpu_clk;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18990] branches/viceplus/v1.22.24-x64dtv/vice

From: <no...@us...> - 2008-07-10 08:46:59

Revision: 18990
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18990&view=rev
Author:   nojoopa
Date:     2008-07-10 01:46:59 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
x64dtv merging part 2

Modified Paths:
--------------
    branches/viceplus/v1.22.24-x64dtv/vice/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/po/POTFILES.in
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uisid.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/icon.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_lex.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_parse.c

Added Paths:
-----------
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/skyos/icons/x64dtv.ico
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/arch/win32/resc64dtv.rc

Modified: branches/viceplus/v1.22.24-x64dtv/vice/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/Makefile.am	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/Makefile.am	2008-07-10 08:46:59 UTC (rev 18990)
@@ -11,13 +11,16 @@
 	vice.spec \
 	vice-mint.spec
 
-.PHONY: x64 x128 xvic xpet xplus4 xcbm2
+.PHONY: x64  x128 x64dtv xvic xpet xplus4 xcbm2
 x64:
 	(cd src; $(MAKE) x64-all)
 
 x128:
 	(cd src; $(MAKE) x128-all)
 
+x64dtv:
+	(cd src; $(MAKE) x64dtv-all)
+
 xvic:
 	(cd src; $(MAKE) xvic-all)
 

Modified: branches/viceplus/v1.22.24-x64dtv/vice/po/POTFILES.in
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/po/POTFILES.in	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/po/POTFILES.in	2008-07-10 08:46:59 UTC (rev 18990)
@@ -18,11 +18,16 @@
 src/c128/c128mmu.c
 src/c128/functionrom.c
 src/c64/c64-cmdline-options.c
+src/c64dtv/c64dtv-cmdline-options.c
 src/c64/cart/c64cart.c
 src/c64/cart/ide64.c
 src/c64/c64_256k.c
+src/c64dtv/c64dtvblitter.c
+src/c64dtv/c64dtvdma.c
+src/c64dtv/c64dtvflash.c
 src/c64/digimax.c
 src/c64/georam.c
+src/c64dtv/hummeradc.c
 src/c64/mmc64.c
 src/c64/plus256k.c
 src/c64/plus60k.c
@@ -60,6 +65,7 @@
 src/printerdrv/interface-userport.c
 src/printerdrv/output-select.c
 src/printerdrv/output-text.c
+src/ps2mouse.c
 src/ram.c
 src/raster/raster-cmdline-options.c
 src/rs232drv/rs232drv.c
@@ -201,6 +207,7 @@
 src/arch/win32/resc128.rc.po.c
 src/arch/win32/resc64.rc.po.c
 src/arch/win32/resc64_256k.rc.po.c
+src/arch/win32/resc64dtv.rc.po.c
 src/arch/win32/rescbm2.rc.po.c
 src/arch/win32/resdigimax.rc.po.c
 src/arch/win32/resdrivec128.rc.po.c

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/Makefile.am	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/Makefile.am	2008-07-10 08:46:59 UTC (rev 18990)
@@ -28,6 +28,7 @@
 	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/drive \
 	-I$(top_srcdir)/src/c64 \
+	-I$(top_srcdir)/src/c64dtv \
 	-I$(top_srcdir)/src/c128 \
 	-I$(top_srcdir)/src/vic20 \
 	-I$(top_srcdir)/src/pet \
@@ -86,6 +87,7 @@
 	sco_sol/convertprototype.c \
 	sco_sol/make-bindist.sh \
 	skyos/icons/x64.ico \
+	skyos/icons/x64dtv.ico \
 	skyos/icons/x128.ico \
 	skyos/icons/xcbm2.ico \
 	skyos/icons/xpet.ico \
@@ -110,3 +112,4 @@
 .PHONY: macosx
 macosx:
 	(cd macosx; $(MAKE))
+

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/Makefile.am	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/Makefile.am	2008-07-10 08:46:59 UTC (rev 18990)
@@ -6,6 +6,7 @@
 	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/drive \
 	-I$(top_srcdir)/src/c64 \
+	-I$(top_srcdir)/src/c64dtv \
 	-I$(top_srcdir)/src/c128 \
 	-I$(top_srcdir)/src/vic20 \
 	-I$(top_srcdir)/src/pet \
@@ -18,6 +19,7 @@
 libarchgui_a_SOURCES = \
 	c128ui.c \
 	c64ui.c \
+	c64dtvui.c \
 	cbm2ui.c \
 	petui.c \
 	plus4ui.c \
@@ -30,6 +32,8 @@
 	uic64_256k.h \
 	uic64cart.c \
 	uic64cart.h \
+	uic64dtv.c \
+	uic64dtv.h \
 	uicartridge.h \
 	uicmdline.c \
 	uicommands.c \
@@ -46,6 +50,8 @@
 	uidrivec128.h \
 	uidrivec64.c \
 	uidrivec64.h \
+	uidrivec64dtv.c \
+	uidrivec64dtv.h \
 	uidrivec64c128.c \
 	uidrivec64c128.h \
 	uidrivec64vic20.c \
@@ -105,6 +111,8 @@
 	uiprinteriecplus4.h \
 	uiprinterieee.c \
 	uiprinterieee.h \
+	uips2mouse.c \
+	uips2mouse.h \
 	uiramcart.c \
 	uiramcart.h \
 	uireu.c \

Copied: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c (from rev 18985, branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64ui.c)
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,354 @@
+/*
+ * c64dtvui.c - Implementation of the C64DTV-specific part of the UI.
+ *
+ * Written by
+ *  Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "debug.h"
+#include "icon.h"
+#include "machine.h"
+#include "machine-video.h"
+#include "resources.h"
+#include "uiattach.h"
+#include "uic64dtv.h"
+#include "uicommands.h"
+#include "uidrive.h"
+#include "uidrivec64dtv.h"
+#include "uidrivec64vic20.h"
+#include "uijoystick2.h"
+#include "uikeyboard.h"
+#include "uimenu.h"
+#include "uiperipheraliec.h"
+#include "uips2mouse.h"
+#include "uiromset.h"
+#include "uiscreenshot.h"
+#include "uisettings.h"
+#include "uisid.h"
+#include "uisound.h"
+#include "uitfe.h"
+#include "uivicii.h"
+#include "vsync.h"
+
+
+UI_MENU_DEFINE_RADIO(MachineVideoStandard)
+
+ui_menu_entry_t set_video_standard_submenu[] = {
+    { N_("*PAL-G"), (ui_callback_t)radio_MachineVideoStandard,
+      (ui_callback_data_t)MACHINE_SYNC_PAL, NULL },
+    { N_("*NTSC-M"), (ui_callback_t)radio_MachineVideoStandard,
+      (ui_callback_data_t)MACHINE_SYNC_NTSC, NULL },
+    { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+UI_MENU_DEFINE_TOGGLE(SidFilters)
+
+ui_menu_entry_t sid_submenu[] = {
+    { N_("SID engine"),
+      NULL, NULL, sid_engine_submenu },
+    { "--" },
+    { N_("*Emulate filters"),
+      (ui_callback_t)toggle_SidFilters, NULL, NULL },
+    { N_("Chip model"),
+      NULL, NULL, sid_model_submenu },
+#ifdef HAVE_RESID
+    { "--" },
+    { N_("reSID sampling method"),
+      NULL, NULL, sid_resid_sampling_submenu },
+    { N_("reSID resampling passband..."),
+      (ui_callback_t)set_sid_resid_passband, NULL, NULL },
+#endif
+    { NULL },
+};
+
+UI_MENU_DEFINE_TOGGLE(Sound)
+
+static ui_menu_entry_t sid_options_submenu[] = {
+    { N_("SID engine"),
+      NULL, NULL, sid_engine_submenu },
+    { N_("*Enable sound playback"),
+      (ui_callback_t)toggle_Sound, NULL, NULL },
+    { N_("*Emulate filters"),
+      (ui_callback_t)toggle_SidFilters, NULL, NULL },
+    { N_("Chip model"),
+      NULL, NULL, sid_model_submenu },
+    { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+UI_MENU_DEFINE_TOGGLE(EmuID)
+
+static ui_menu_entry_t io_extensions_submenu[] = {
+    { N_("*Emulator identification"),
+      (ui_callback_t)toggle_EmuID, NULL, NULL },
+#ifdef HAVE_MOUSE
+    { N_("*PS/2 Mouse Emulation"),
+      NULL, NULL, ps2_mouse_submenu },
+#endif
+    { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+static ui_menu_entry_t c64ui_main_romset_submenu[] = {
+    { N_("Load new kernal ROM"),
+      (ui_callback_t)ui_load_rom_file,
+      (ui_callback_data_t)"KernalName", NULL },
+    { N_("Load new BASIC ROM"),
+      (ui_callback_t)ui_load_rom_file,
+      (ui_callback_data_t)"BasicName", NULL },
+    { N_("Load new character ROM"),
+      (ui_callback_t)ui_load_rom_file,
+      (ui_callback_data_t)"ChargenName", NULL },
+    { NULL }
+};
+
+static ui_menu_entry_t c64_romset_submenu[] = {
+    { N_("Load default ROMs"),
+      (ui_callback_t)ui_set_romset,
+      (ui_callback_data_t)"default.vrs", NULL },
+    { "--" },
+    { N_("Load new computer ROM"),
+      NULL, NULL, c64ui_main_romset_submenu },
+    { N_("Load new drive ROM"),
+      NULL, NULL, ui_drivec64vic20_romset_submenu },
+    { "--" },
+    { N_("ROM set type"),
+      NULL, NULL, uiromset_type_submenu },
+    { "--" },
+    { N_("ROM set archive"),
+      NULL, NULL, uiromset_archive_submenu },
+    { N_("ROM set file"),
+      NULL, NULL, uiromset_file_submenu },
+    { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+static UI_CALLBACK(save_screenshot)
+{
+    /* Where does the 1024 come from?  */
+    char filename[1024];
+    unsigned int wid = (unsigned int)UI_MENU_CB_PARAM;
+
+    vsync_suspend_speed_eval();
+
+    /* The following code depends on a zeroed filename.  */
+    memset(filename, 0, 1024);
+
+    if (ui_screenshot_dialog(filename, machine_video_canvas_get(wid)) < 0)
+        return;
+}
+
+static ui_menu_entry_t ui_screenshot_commands_menu[] = {
+    { N_("Save media file"),
+      (ui_callback_t)save_screenshot, (ui_callback_data_t)0, NULL },
+    { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+static ui_menu_entry_t c64_menu[] = {
+    { N_("ROM settings"),
+      NULL, NULL, c64_romset_submenu },
+    { N_("VIC-II settings"),
+      NULL, NULL, vicii_submenu },
+    { N_("SID settings"),
+      NULL, NULL, sid_submenu },
+    { N_("C64DTV settings"),
+      NULL, NULL, c64dtv_submenu },
+    { NULL }
+};
+
+static ui_menu_entry_t x64_left_menu[] = {
+    { "",
+      NULL, NULL, uiattach_disk_menu },
+    { "--",
+      NULL, NULL, uiattach_smart_attach_menu },
+    { "",
+      NULL, NULL, ui_directory_commands_menu },
+    { "--",
+      NULL, NULL, ui_snapshot_commands_menu },
+    { "",
+      NULL, NULL, ui_screenshot_commands_menu },
+    { "",
+      NULL, NULL, ui_sound_record_commands_menu },
+    { "--",
+      NULL, NULL, ui_tool_commands_menu },
+    { "--",
+      NULL, NULL, ui_help_commands_menu },
+    { "--",
+      NULL, NULL, ui_run_commands_menu },
+    { "--",
+      NULL, NULL, ui_exit_commands_menu },
+    { NULL }
+};
+
+static ui_menu_entry_t x64_right_menu[] = {
+    { "",
+      NULL, NULL, ui_performance_settings_menu },
+    { "--",
+      NULL, NULL, uikeyboard_settings_menu },
+    { "",
+      NULL, NULL, ui_sound_settings_menu },
+    { "",
+      NULL, NULL, ui_drivec64dtv_settings_menu },
+    { "",
+      NULL, NULL, ui_peripheraliec_settings_menu },
+    { "",
+      NULL, NULL, joystick_settings_menu },
+    { "--",
+      NULL, NULL, c64_menu },
+    { "--",
+      NULL, NULL, ui_settings_settings_menu },
+#ifdef DEBUG
+    { "--",
+      NULL, NULL, ui_debug_settings_menu },
+#endif
+    { NULL }
+};
+
+static ui_menu_entry_t x64_file_submenu[] = {
+    { "",
+      NULL, NULL, uiattach_smart_attach_menu },
+    { "--",
+      NULL, NULL, uiattach_disk_menu },
+    { "--",
+      NULL, NULL, ui_directory_commands_menu },
+    { "--",
+      NULL, NULL, ui_tool_commands_menu },
+    { "--",
+      NULL, NULL, ui_run_commands_menu },
+    { "--",
+      NULL, NULL, ui_exit_commands_menu },
+    { NULL }
+};
+
+static ui_menu_entry_t x64_snapshot_submenu[] = {
+    { "",
+      NULL, NULL, ui_snapshot_commands_submenu },
+    { "--",
+      NULL, NULL, ui_screenshot_commands_menu },
+    { "",
+      NULL, NULL, ui_sound_record_commands_menu },
+    { NULL }
+};
+
+static ui_menu_entry_t x64_options_submenu[] = {
+    { "",
+      NULL, NULL, ui_performance_settings_menu },
+    { "--",
+      NULL, NULL, joystick_options_submenu },
+    { "--",
+      NULL, NULL, sid_options_submenu },
+    { "--",
+      NULL, NULL, c64dtv_submenu },
+    { "--",
+      NULL, NULL, ui_drive_options_submenu },
+    { "--",
+      NULL, NULL, ui_flash_options_submenu },
+    { "--",
+      NULL, NULL, io_extensions_submenu },
+    { NULL }
+};
+
+static ui_menu_entry_t x64_settings_submenu[] = {
+    { "",
+      NULL, NULL, uikeyboard_settings_menu },
+    { "",
+      NULL, NULL, ui_sound_settings_menu },
+    { "",
+      NULL, NULL, ui_drivec64dtv_settings_menu },
+    { "",
+      NULL, NULL, ui_peripheraliec_settings_menu },
+    { "",
+      NULL, NULL, joystick_settings_menu },
+    { "--",
+      NULL, NULL, c64_menu },
+    { "--",
+      NULL, NULL, ui_settings_settings_menu },
+    { NULL }
+};
+
+static ui_menu_entry_t x64_main_menu[] = {
+    { N_("File"),
+      NULL, NULL, x64_file_submenu },
+    { N_("Snapshot"),
+      NULL, NULL, x64_snapshot_submenu },
+    { N_("Options"),
+      NULL, NULL, x64_options_submenu },
+    { N_("Settings"),
+      NULL, NULL, x64_settings_submenu },
+                   /* Translators: RJ means right justify and should be
+                      saved in your tranlation! e.g. german "RJHilfe" */
+    { N_("RJHelp"),
+      NULL, NULL, ui_help_commands_menu },
+    { NULL }
+};
+
+static ui_menu_entry_t x64_speed_menu[] = {
+    { "",
+      NULL, NULL, ui_performance_settings_menu },
+    { "--" },
+    { "--" },
+    { NULL }
+};
+
+static void c64ui_dynamic_menu_create(void)
+{
+    uisound_menu_create();
+    uivicii_menu_create();
+}
+
+static void c64ui_dynamic_menu_shutdown(void)
+{
+    uivicii_menu_shutdown();
+    uisound_menu_shutdown();
+}
+
+int c64dtvui_init(void)
+{
+    ui_set_application_icon(c64dtv_icon_data);
+    c64ui_dynamic_menu_create();
+
+    ui_set_left_menu(x64_left_menu);
+    ui_set_right_menu(x64_right_menu);
+    ui_set_topmenu(x64_main_menu);
+    ui_set_speedmenu(x64_speed_menu);
+
+    ui_update_menus();
+
+    return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+    c64ui_dynamic_menu_shutdown();
+}

Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.c	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.c	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,79 @@
+/*
+ * uic64dtv.c
+ *
+ * Written by
+ *  Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+
+#include "uilib.h"
+#include "uimenu.h"
+#include "uic64dtv.h"
+#include "uips2mouse.h"
+
+UI_MENU_DEFINE_RADIO(DtvRevision)
+UI_MENU_DEFINE_TOGGLE(c64dtvromrw)
+UI_MENU_DEFINE_TOGGLE(HummerUserportJoy)
+UI_MENU_DEFINE_RADIO(HummerUserportJoyPort)
+UI_MENU_DEFINE_TOGGLE(PS2Mouse)
+UI_MENU_DEFINE_TOGGLE(Mouse)
+
+UI_CALLBACK(set_c64dtv_rom_name)
+{
+    uilib_select_string((char *)UI_MENU_CB_PARAM, _("C64DTV ROM image name"),
+                        _("Name:"));
+}
+
+static ui_menu_entry_t c64dtv_revision_submenu[] = {
+    { "*DTV2", (ui_callback_t)radio_DtvRevision,
+      (ui_callback_data_t)2, NULL },
+    { "*DTV3", (ui_callback_t)radio_DtvRevision,
+      (ui_callback_data_t)3, NULL },
+    { NULL }
+};
+
+static ui_menu_entry_t c64dtv_hummer_joy_submenu[] = {
+    { "*Joy1", (ui_callback_t)radio_HummerUserportJoyPort,
+      (ui_callback_data_t)1, NULL },
+    { "*Joy2", (ui_callback_t)radio_HummerUserportJoyPort,
+      (ui_callback_data_t)2, NULL },
+    { NULL }
+};
+
+ui_menu_entry_t c64dtv_submenu[] = {
+    { N_("C64DTV ROM image name..."),
+      (ui_callback_t)set_c64dtv_rom_name,
+      (ui_callback_data_t)"c64dtvromfilename", NULL },
+    { N_("C64DTV blitter revision"),
+      NULL, NULL, c64dtv_revision_submenu },
+    { N_("*Enable writes to C64DTV ROM image"),
+      (ui_callback_t)toggle_c64dtvromrw, NULL, NULL },
+    { N_("*Enable Hummer Userport joystick"),
+      (ui_callback_t)toggle_HummerUserportJoy, NULL, NULL },
+    { N_("Hummer joystick port mapped to Userport"),
+      NULL, NULL, c64dtv_hummer_joy_submenu },
+    { N_("PS/2 mouse on Userport"),
+      NULL, NULL, ps2_mouse_submenu },
+};

Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.h	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.h	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,32 @@
+/*
+ * uic64dtv.h
+ *
+ * Written by
+ *  Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#ifndef _UI_C64DTV_H
+#define _UI_C64DTV_H
+
+extern struct ui_menu_entry_s c64dtv_submenu[];
+
+#endif

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.c	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.c	2008-07-10 08:46:59 UTC (rev 18990)
@@ -35,6 +35,7 @@
 
 
 UI_MENU_DEFINE_TOGGLE(DriveTrueEmulation)
+UI_MENU_DEFINE_TOGGLE(FlashTrueFS)
 UI_MENU_DEFINE_RADIO(Drive8ExtendImagePolicy)
 UI_MENU_DEFINE_RADIO(Drive9ExtendImagePolicy)
 UI_MENU_DEFINE_RADIO(Drive10ExtendImagePolicy)
@@ -184,3 +185,8 @@
     { NULL }
 };
 
+ui_menu_entry_t ui_flash_options_submenu[] = {
+    { N_("*Enable true flash filesystem emulation"),
+      (ui_callback_t)toggle_FlashTrueFS, NULL, NULL },
+    { NULL }
+};
\ No newline at end of file

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.h	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.h	2008-07-10 08:46:59 UTC (rev 18990)
@@ -30,6 +30,7 @@
 #include "uimenu.h"
 
 extern struct ui_menu_entry_s ui_drive_options_submenu[];
+extern struct ui_menu_entry_s ui_flash_options_submenu[];
 
 extern UI_CALLBACK(uidrive_extend_policy_control);
 

Copied: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c (from rev 18985, branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64.c)
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,104 @@
+/*
+ * uidrivec64.c
+ *
+ * Written by
+ *  Andreas Boose <vic...@t-...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+
+#include "resources.h"
+#include "uidrive.h"
+#include "uidrivec64.h"
+#include "uidrivec64c128.h"
+#include "uidrivec64vic20.h"
+#include "uidriveiec.h"
+#include "uimenu.h"
+
+
+UI_MENU_DEFINE_TOGGLE(DriveTrueEmulation)
+UI_MENU_DEFINE_TOGGLE(FlashTrueFS)
+
+static ui_menu_entry_t drivec64dtv_settings_submenu[] = {
+    { N_("*Enable true drive emulation"),
+      (ui_callback_t)toggle_DriveTrueEmulation, NULL, NULL },
+    { N_("*Enable true flash filesystem"),
+      (ui_callback_t)toggle_FlashTrueFS, NULL, NULL },
+    { "--" },
+    { N_("Drive #8 model"),
+      NULL, NULL, uidrivec64vic20_set_drive0_type_submenu },
+    { N_("*Drive #8 expansion"),
+      (ui_callback_t)uidriveiec_expansion_control, (ui_callback_data_t)0,
+      uidrivec64c128_drive0_expansion_submenu },
+    { N_("*Drive #8 40-track image support"),
+      (ui_callback_t)uidrive_extend_policy_control, (ui_callback_data_t)0,
+      set_drive0_extend_image_policy_submenu },
+    { N_("*Drive #8 idle method"),
+      (ui_callback_t)uidriveiec_idle_method_control, (ui_callback_data_t)0,
+      set_drive0_idle_method_submenu },
+    { "--" },
+    { N_("Drive #9 model"),
+      NULL, NULL, uidrivec64vic20_set_drive1_type_submenu },
+    { N_("*Drive #9 expansion"),
+      (ui_callback_t)uidriveiec_expansion_control, (ui_callback_data_t)1,
+      uidrivec64c128_drive1_expansion_submenu },
+    { N_("*Drive #9 40-track image support"),
+      (ui_callback_t)uidrive_extend_policy_control, (ui_callback_data_t)1,
+      set_drive1_extend_image_policy_submenu },
+    { N_("*Drive #9 idle method"),
+      (ui_callback_t)uidriveiec_idle_method_control, (ui_callback_data_t)1,
+      set_drive1_idle_method_submenu },
+    { "--" },
+    { N_("Drive #10 model"),
+      NULL, NULL, uidrivec64vic20_set_drive2_type_submenu },
+    { N_("*Drive #10 expansion"),
+      (ui_callback_t)uidriveiec_expansion_control, (ui_callback_data_t)2,
+      uidrivec64c128_drive2_expansion_submenu },
+    { N_("*Drive #10 40-track image support"),
+      (ui_callback_t)uidrive_extend_policy_control, (ui_callback_data_t)2,
+      set_drive2_extend_image_policy_submenu },
+    { N_("*Drive #10 idle method"),
+      (ui_callback_t)uidriveiec_idle_method_control, (ui_callback_data_t)2,
+      set_drive2_idle_method_submenu },
+    { "--" },
+    { N_("Drive #11 model"),
+      NULL, NULL, uidrivec64vic20_set_drive3_type_submenu },
+    { N_("*Drive #11 expansion"),
+      (ui_callback_t)uidriveiec_expansion_control, (ui_callback_data_t)3,
+      uidrivec64c128_drive3_expansion_submenu },
+    { N_("*Drive #11 40-track image support"),
+      (ui_callback_t)uidrive_extend_policy_control, (ui_callback_data_t)3,
+      set_drive3_extend_image_policy_submenu },
+    { N_("*Drive #11 idle method"),
+      (ui_callback_t)uidriveiec_idle_method_control, (ui_callback_data_t)3,
+      set_drive3_idle_method_submenu },
+    { NULL }
+};
+
+ui_menu_entry_t ui_drivec64dtv_settings_menu[] = {
+    { N_("Drive settings"),
+      NULL, NULL, drivec64dtv_settings_submenu },
+    { NULL }
+};
+

Copied: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h (from rev 18985, branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64.h)
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,35 @@
+/*
+ * uidrivec64.h
+ *
+ * Written by
+ *  Andreas Boose <vic...@t-...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#ifndef _UIDRIVEC64_H
+#define _UIDRIVEC64_H
+
+#include "uimenu.h"
+
+extern struct ui_menu_entry_s ui_drivec64dtv_settings_menu[];
+
+#endif
+

Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.c	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.c	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,47 @@
+/*
+ * uips2mouse.c
+ *
+ * Written by
+ *  Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#include "vice.h"
+
+#ifdef HAVE_MOUSE
+
+#include <stdio.h>
+
+#include "uimenu.h"
+#include "uips2mouse.h"
+
+
+UI_MENU_DEFINE_TOGGLE(Mouse)
+UI_MENU_DEFINE_TOGGLE(ps2mouse)
+
+ui_menu_entry_t ps2_mouse_submenu[] = {
+    { N_("*Enable PS/2 mouse"),
+      (ui_callback_t)toggle_ps2mouse, NULL, NULL },
+    { N_("*Grab mouse events"),
+      (ui_callback_t)toggle_Mouse, NULL, NULL, KEYSYM_m, UI_HOTMOD_META },
+};
+
+#endif

Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.h	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.h	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,34 @@
+/*
+ * uimouse.h
+ *
+ * Written by
+ *  Andreas Boose <vic...@t-...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#ifndef _UIPS2MOUSE_H
+#define _UIPS2MOUSE_H
+
+#include "uimenu.h"
+
+extern struct ui_menu_entry_s ps2_mouse_submenu[];
+
+#endif

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uisid.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uisid.c	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uisid.c	2008-07-10 08:46:59 UTC (rev 18990)
@@ -74,6 +74,10 @@
       (ui_callback_t)radio_SidModel, (ui_callback_data_t)1, NULL },
     { N_("*8580 + digi boost"),
       (ui_callback_t)radio_SidModel, (ui_callback_data_t)2, NULL },
+    { N_("*6581R4 (not yet implemented)"),
+      (ui_callback_t)radio_SidModel, (ui_callback_data_t)3, NULL },
+    { N_("*DTVSID"),
+      (ui_callback_t)radio_SidModel, (ui_callback_data_t)4, NULL },
     { NULL }
 };
 

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/icon.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/icon.h	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/icon.h	2008-07-10 08:46:59 UTC (rev 18990)
@@ -29,10 +29,10 @@
 
 extern const char *c128_icon_data[];
 extern const char *c64_icon_data[];
+extern const char *c64dtv_icon_data[];
 extern const char *cbm2_icon_data[];
 extern const char *pet_icon_data[];
 extern const char *plus4_icon_data[];
 extern const char *vic20_icon_data[];
 
 #endif
-

Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/skyos/icons/x64dtv.ico
===================================================================
(Binary files differ)


Property changes on: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/skyos/icons/x64dtv.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/Makefile.am	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/Makefile.am	2008-07-10 08:46:59 UTC (rev 18990)
@@ -24,6 +24,7 @@
 libx11ui_a_SOURCES = \
 	c128icon.c \
 	c64icon.c \
+	c64dtvicon.c \
 	cbm2icon.c \
 	fullscreen.c \
 	peticon.c \

Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,578 @@
+/* XPM */
+const char * c64dtv_icon_data[] = {
+"48 42 533 2",
+"  	c None",
+". 	c #C7C3C7",
+"+ 	c #C0BCC0",
+"@ 	c #9C9B9C",
+"# 	c #696869",
+"$ 	c #6F6E6F",
+"% 	c #919091",
+"& 	c #B8B5B8",
+"* 	c #C8C7C8",
+"= 	c #E5E6E5",
+"- 	c #B6B8B6",
+"; 	c #5D605D",
+"> 	c #5B5E5B",
+", 	c #5F615F",
+"' 	c #686A68",
+") 	c #9A999A",
+"! 	c #C4C1C4",
+"~ 	c #C1BFC1",
+"{ 	c #BCC0BC",
+"] 	c #A5A8A5",
+"^ 	c #7A7D7A",
+"/ 	c #6E716E",
+"( 	c #767A76",
+"_ 	c #7F827F",
+": 	c #707370",
+"< 	c #646764",
+"[ 	c #9E9D9E",
+"} 	c #C6C2C6",
+"| 	c #CBCDCB",
+"1 	c #E7E9E7",
+"2 	c #B0B2B0",
+"3 	c #999C99",
+"4 	c #858885",
+"5 	c #848784",
+"6 	c #C5C8C5",
+"7 	c #B1B4B1",
+"8 	c #6A6D6A",
+"9 	c #6D6F6D",
+"0 	c #C2BEC2",
+"a 	c #C1BEC1",
+"b 	c #DFE1DF",
+"c 	c #FAFAFA",
+"d 	c #D1D4D1",
+"e 	c #CDD0CD",
+"f 	c #646664",
+"g 	c #8F928F",
+"h 	c #9B9D9B",
+"i 	c #696C69",
+"j 	c #585B58",
+"k 	c #A7A4A7",
+"l 	c #BCBABC",
+"m 	c #ABAFAB",
+"n 	c #888B88",
+"o 	c #848684",
+"p 	c #4C4E4C",
+"q 	c #232423",
+"r 	c #2B2C2B",
+"s 	c #434543",
+"t 	c #393B39",
+"u 	c #939193",
+"v 	c #BCB9BC",
+"w 	c #5F625F",
+"x 	c #4D4F4D",
+"y 	c #4A4C4A",
+"z 	c #383A38",
+"A 	c #1D1E1D",
+"B 	c #060706",
+"C 	c #020202",
+"D 	c #0C0D0C",
+"E 	c #161716",
+"F 	c #131313",
+"G 	c #A7A3A7",
+"H 	c #C4C0C4",
+"I 	c #525152",
+"J 	c #171717",
+"K 	c #181918",
+"L 	c #0D0D0D",
+"M 	c #030303",
+"N 	c #000000",
+"O 	c #010101",
+"P 	c #2F2E2F",
+"Q 	c #7E7C7E",
+"R 	c #363536",
+"S 	c #3A393A",
+"T 	c #626062",
+"U 	c #989598",
+"V 	c #565456",
+"W 	c #484748",
+"X 	c #979397",
+"Y 	c #3D3B3D",
+"Z 	c #B7B3B7",
+"` 	c #A5A2A5",
+" .	c #171617",
+"..	c #131213",
+"+.	c #939093",
+"@.	c #646264",
+"#.	c #737173",
+"$.	c #0D0C0D",
+"%.	c #525052",
+"&.	c #ABA7AB",
+"*.	c #827F82",
+"=.	c #ACA9AC",
+"-.	c #323132",
+";.	c #9C999C",
+">.	c #343334",
+",.	c #060606",
+"'.	c #040404",
+").	c #2D2C2D",
+"!.	c #949194",
+"~.	c #5C5A5C",
+"{.	c #121212",
+"].	c #B7B4B7",
+"^.	c #959295",
+"/.	c #BDB9BD",
+"(.	c #1F1E1F",
+"_.	c #716E71",
+":.	c #BEBABE",
+"<.	c #212021",
+"[.	c #747274",
+"}.	c #A19EA1",
+"|.	c #494949",
+"1.	c #4E4D4E",
+"2.	c #C1BDC1",
+"3.	c #636163",
+"4.	c #797779",
+"5.	c #AFABAF",
+"6.	c #595759",
+"7.	c #383738",
+"8.	c #A09CA0",
+"9.	c #070707",
+"0.	c #B5B1B5",
+"a.	c #818181",
+"b.	c #121312",
+"c.	c #535153",
+"d.	c #646164",
+"e.	c #6B696B",
+"f.	c #0A0A0A",
+"g.	c #B3B0B3",
+"h.	c #0E0E0E",
+"i.	c #575557",
+"j.	c #7A7A7A",
+"k.	c #141514",
+"l.	c #414141",
+"m.	c #B0ACB0",
+"n.	c #9F9C9F",
+"o.	c #222222",
+"p.	c #C3BFC3",
+"q.	c #1A1A1A",
+"r.	c #090909",
+"s.	c #7B787B",
+"t.	c #6F706F",
+"u.	c #2F2F2F",
+"v.	c #C2BBBF",
+"w.	c #C7C1C5",
+"x.	c #292829",
+"y.	c #A9A6A9",
+"z.	c #5E5C5E",
+"A.	c #B2AEB2",
+"B.	c #666766",
+"C.	c #1F1918",
+"D.	c #9B3334",
+"E.	c #A84647",
+"F.	c #B67E80",
+"G.	c #C6C1C5",
+"H.	c #C5C1C5",
+"I.	c #C2BFC2",
+"J.	c #A8A6A8",
+"K.	c #575957",
+"L.	c #101010",
+"M.	c #130F0E",
+"N.	c #870808",
+"O.	c #9B0101",
+"P.	c #8B0606",
+"Q.	c #7F7374",
+"R.	c #AFACAF",
+"S.	c #C5C2C5",
+"T.	c #8D8C8D",
+"U.	c #696B69",
+"V.	c #555855",
+"W.	c #101110",
+"X.	c #0D0E0E",
+"Y.	c #483C3A",
+"Z.	c #572F2E",
+"`.	c #2F1716",
+" +	c #3C3E3C",
+".+	c #535553",
+"++	c #6D6E6D",
+"@+	c #9C9A9C",
+"#+	c #BDBABD",
+"$+	c #A09EA0",
+"%+	c #777877",
+"&+	c #5D5F5D",
+"*+	c #545654",
+"=+	c #545754",
+"-+	c #595755",
+";+	c #111111",
+">+	c #3D3A38",
+",+	c #4E4F4C",
+"'+	c #494B49",
+")+	c #484A48",
+"!+	c #505250",
+"~+	c #525452",
+"{+	c #616361",
+"]+	c #868686",
+"^+	c #B0ADB0",
+"/+	c #A5A3A5",
+"(+	c #7F7F7F",
+"_+	c #636463",
+":+	c #444544",
+"<+	c #393A39",
+"[+	c #454240",
+"}+	c #4D2F2E",
+"|+	c #582A28",
+"1+	c #0E0F0E",
+"2+	c #561414",
+"3+	c #771A19",
+"4+	c #583937",
+"5+	c #474A47",
+"6+	c #4A4D4A",
+"7+	c #515351",
+"8+	c #4F524F",
+"9+	c #4D504D",
+"0+	c #555755",
+"a+	c #707170",
+"b+	c #9B9A9B",
+"c+	c #B4B1B4",
+"d+	c #8E8D8E",
+"e+	c #707070",
+"f+	c #5C5F5C",
+"g+	c #5F1918",
+"h+	c #680A0A",
+"i+	c #581F1E",
+"j+	c #3E3D3B",
+"k+	c #070606",
+"l+	c #570B0B",
+"m+	c #990202",
+"n+	c #910C0C",
+"o+	c #4F4C4A",
+"p+	c #535653",
+"q+	c #525552",
+"r+	c #656765",
+"s+	c #888888",
+"t+	c #B1AFB1",
+"u+	c #A6A4A6",
+"v+	c #808080",
+"w+	c #5E605E",
+"x+	c #464846",
+"y+	c #606260",
+"z+	c #6F726F",
+"A+	c #6C6F6C",
+"B+	c #656865",
+"C+	c #636563",
+"D+	c #5B5D5B",
+"E+	c #7B1918",
+"F+	c #A30909",
+"G+	c #A30A0A",
+"H+	c #871313",
+"I+	c #630606",
+"J+	c #6C0202",
+"K+	c #980101",
+"L+	c #900101",
+"M+	c #510E0E",
+"N+	c #585A58",
+"O+	c #575A57",
+"P+	c #565956",
+"Q+	c #343634",
+"R+	c #515451",
+"S+	c #634E4C",
+"T+	c #7F3A39",
+"U+	c #A54748",
+"V+	c #B95E60",
+"W+	c #BE8184",
+"X+	c #C5B6BA",
+"Y+	c #A4A3A3",
+"Z+	c #7E807E",
+"`+	c #737472",
+" @	c #585957",
+".@	c #383938",
+"+@	c #212321",
+"@@	c #363736",
+"#@	c #6D706D",
+"$@	c #676A67",
+"%@	c #5F5654",
+"&@	c #5E2927",
+"*@	c #5F1010",
+"=@	c #560808",
+"-@	c #4F0605",
+";@	c #460505",
+">@	c #350E0D",
+",@	c #27201F",
+"'@	c #595C59",
+")@	c #5A5D5A",
+"!@	c #454845",
+"~@	c #574A47",
+"{@	c #A10C0B",
+"]@	c #AF0000",
+"^@	c #B00000",
+"/@	c #B10000",
+"(@	c #B20000",
+"_@	c #B42829",
+":@	c #B6A9AC",
+"<@	c #A8A9A8",
+"[@	c #A8ABA8",
+"}@	c #A09E9C",
+"|@	c #977876",
+"1@	c #AC5554",
+"2@	c #835453",
+"3@	c #5B5958",
+"4@	c #1E1F1E",
+"5@	c #1F211F",
+"6@	c #313231",
+"7@	c #676967",
+"8@	c #636562",
+"9@	c #61615E",
+"0@	c #5A5A58",
+"a@	c #4E504E",
+"b@	c #565856",
+"c@	c #3B3D3B",
+"d@	c #171817",
+"e@	c #080908",
+"f@	c #362927",
+"g@	c #7F0101",
+"h@	c #A10000",
+"i@	c #A50000",
+"j@	c #950000",
+"k@	c #5B0909",
+"l@	c #5B5957",
+"m@	c #A6A3A6",
+"n@	c #797A79",
+"o@	c #928D8A",
+"p@	c #885C5B",
+"q@	c #832E2D",
+"r@	c #6D403F",
+"s@	c #8D4A49",
+"t@	c #A13A3A",
+"u@	c #862423",
+"v@	c #441E1D",
+"w@	c #1F1F1E",
+"x@	c #1E201E",
+"y@	c #2D2F2D",
+"z@	c #4B4D4B",
+"A@	c #636663",
+"B@	c #686B68",
+"C@	c #616461",
+"D@	c #606360",
+"E@	c #2E302E",
+"F@	c #3D3E3D",
+"G@	c #555653",
+"H@	c #5B2F2E",
+"I@	c #571413",
+"J@	c #260909",
+"K@	c #1A0908",
+"L@	c #180F0F",
+"M@	c #2E2E2D",
+"N@	c #424442",
+"O@	c #323432",
+"P@	c #4C4C4C",
+"Q@	c #A7A5A7",
+"R@	c #626461",
+"S@	c #6A6967",
+"T@	c #7A7472",
+"U@	c #7B6260",
+"V@	c #CF3030",
+"W@	c #DA3131",
+"X@	c #CA2929",
+"Y@	c #731717",
+"Z@	c #261C1B",
+"`@	c #2D201F",
+" #	c #24201F",
+".#	c #1F201F",
+"+#	c #202120",
+"@#	c #474947",
+"##	c #666966",
+"$#	c #626462",
+"%#	c #252625",
+"&#	c #080808",
+"*#	c #454745",
+"=#	c #60605D",
+"-#	c #595A57",
+";#	c #3D3F3D",
+">#	c #282928",
+",#	c #272827",
+"'#	c #292B29",
+")#	c #918F91",
+"!#	c #909090",
+"~#	c #626562",
+"{#	c #6F6B68",
+"]#	c #532B2A",
+"^#	c #351817",
+"/#	c #281919",
+"(#	c #782222",
+"_#	c #BF2828",
+":#	c #C52221",
+"<#	c #9E1A1A",
+"[#	c #2E1918",
+"}#	c #444644",
+"|#	c #424342",
+"1#	c #1A1B1A",
+"2#	c #2B2D2B",
+"3#	c #4E514E",
+"4#	c #5E615E",
+"5#	c #595B59",
+"6#	c #3E403E",
+"7#	c #2C2D2C",
+"8#	c #262726",
+"9#	c #242524",
+"0#	c #4E4E4E",
+"a#	c #666566",
+"b#	c #3F413F",
+"c#	c #6B6E6B",
+"d#	c #6F706E",
+"e#	c #882525",
+"f#	c #A41D1D",
+"g#	c #A41B1B",
+"h#	c #711111",
+"i#	c #3E1717",
+"j#	c #571F1F",
+"k#	c #471919",
+"l#	c #281F1E",
+"m#	c #373837",
+"n#	c #5A5C5A",
+"o#	c #242624",
+"p#	c #232523",
+"q#	c #1C1D1C",
+"r#	c #161616",
+"s#	c #8E8B8E",
+"t#	c #5C5E5C",
+"u#	c #606361",
+"v#	c #5C5351",
+"w#	c #413938",
+"x#	c #353332",
+"y#	c #593130",
+"z#	c #C91F1F",
+"A#	c #D11B1B",
+"B#	c #CC1717",
+"C#	c #831211",
+"D#	c #1A1918",
+"E#	c #070807",
+"F#	c #262826",
+"G#	c #252725",
+"H#	c #1B1C1B",
+"I#	c #272627",
+"J#	c #BBB7BB",
+"K#	c #B9B5B9",
+"L#	c #201F20",
+"M#	c #1B1B1B",
+"N#	c #464946",
+"O#	c #604442",
+"P#	c #6D1111",
+"Q#	c #711010",
+"R#	c #610E0E",
+"S#	c #451615",
+"T#	c #70201F",
+"U#	c #801818",
+"V#	c #621514",
+"W#	c #5B4D4B",
+"X#	c #303230",
+"Y#	c #222422",
+"Z#	c #222322",
+"`#	c #0B0C0B",
+" $	c #878587",
+".$	c #807E80",
+"+$	c #050505",
+"@$	c #5A5C59",
+"#$	c #54514F",
+"$$	c #982A29",
+"%$	c #D01414",
+"&$	c #D11111",
+"*$	c #C80F0F",
+"=$	c #7B3735",
+"-$	c #6C706C",
+";$	c #6D716D",
+">$	c #2D2E2D",
+",$	c #3D3C3D",
+"'$	c #0B0B0B",
+")$	c #592F2E",
+"!$	c #4F0D0C",
+"~$	c #4D0909",
+"{$	c #380E0E",
+"]$	c #474442",
+"^$	c #717471",
+"/$	c #727672",
+"($	c #727572",
+"_$	c #212221",
+":$	c #090A09",
+"<$	c #1D1C1D",
+"[$	c #454345",
+"}$	c #292A29",
+"|$	c #5A5B59",
+"1$	c #777A77",
+"2$	c #767976",
+"3$	c #202220",
+"4$	c #1E1E1E",
+"5$	c #777477",
+"6$	c #BCB8BC",
+"7$	c #1E1D1E",
+"8$	c #858285",
+"9$	c #252425",
+"0$	c #0C0C0C",
+"a$	c #333433",
+"b$	c #4F514F",
+"c$	c #2F302F",
+"d$	c #131413",
+"e$	c #767376",
+"f$	c #B8B4B8",
+"g$	c #191919",
+"h$	c #111211",
+"i$	c #373937",
+"j$	c #505350",
+"k$	c #2A2C2A",
+"l$	c #1C1C1C",
+"m$	c #706E70",
+"n$	c #5C5B5C",
+"o$	c #151615",
+"p$	c #6D6A6D",
+"q$	c #A8A5A8",
+"r$	c #4B494B",
+"s$	c #0F100F",
+"t$	c #151515",
+"u$	c #6E6C6E",
+"v$	c #393839",
+"w$	c #020302",
+"x$	c #6F6D6F",
+"y$	c #BAB6BA",
+"z$	c #8D8B8D",
+"A$	c #1C1B1C",
+"B$	c #6A686A",
+"C$	c #767476",
+"D$	c #1D1D1D",
+"E$	c #6C6A6C",
+"F$	c #615F61",
+"G$	c #181818",
+"H$	c #686668",
+". . . . . . . . . . . . . . . . . . . + @ # $ % & . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . * = - ; > , ' ) ! . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . ~ { ] ^ / ( _ : < [ . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . } | 1 2 3 4 5 6 7 8 9 0 . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . a b c d e 5 f g h i j k . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . l m ] n o p q r s s t u . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . v w x y z A B C D E F G . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . H I J K L M N N N O P H Q R R S T + U R R R R R V W . . X Y Z Z ",
+". . . . . . . . . . . . . . . . . `  .O N N N N N ..+.. @.N #.T $.%.&.#.V N V #.*.O =.. %.-.H H ",
+". . . . . . . . . . . . . . . . . . ;.>.,.O N '.).!.} . @.N . . ~.{.].. ^.N ^.. /.(._.:.<.[.. . ",
+". . . . . . . . . . . . . . . . . . . 0 }.|.O 1.2.. . . 3.N . . 4.C 5.. ^.N ^.. . 6.7.8.9.0.. . ",
+". . . . . . . . . . . . . . . . . . . . . a.b.c.. . . . d.N . . e.f.g.. ^.N ^.. . ;.h.i.R . . . ",
+". . . . . . . . . . . . . . . . . . . . . j.k.l.. . . . @.N m.n.o.R p.. ^.N ^.. . } q.r.s.. . . ",
+". . . . . . . . . . . . . . . . . . . . . t.b.u.v.w.. . @.N N M x.y.. . ^.N ^.. . . z.h.A.. . . ",
+". . . . . . . . . . . . . . . . . . . . } B.k.C.D.E.F.G.H + + 2.H . . . H.+ H.. . . H 2.. . . . ",
+". . . . . . . . . . . . . . . . . . . I.J.K.L.M.N.O.P.Q.R.H.. . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . S.0.T.U.V.y W.X.Y.Z.`. +.+++@+#+. . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . } #+$+%+&+*+=+-+y ;+L >+,+'+)+x !+~+{+]+^+H . . . . . . . . . . . . . ",
+". . . . . . . . . . . a /+(+_+:+<+ +[+}+|+s 1+f.2+3+4+5+6+7+~+8+9+0+a+b+/.} . . . . . . . . . . ",
+". . . . . . . . S.c+d+e+.+*+f+j p  +g+h+i+j+L k+l+m+n+o+~+p+p+p+q+0+=+K.r+s+t+H.. . . . . . . . ",
+". . . . . . + u+v+w+x+y+z+A+i B+C+D+E+F+G+H+I+J+K+L+M+x j N+O+P+O+x Q+R+O+S+T+U+V+W+X+. . . . . ",
+". . . } l Y+Z+`+D+ @.@+@@@K.9 #@$@B+%@&@*@=@-@;@>@,@x+'@)@'@O+!@q B 9.'+~@{@]@^@/@(@_@:@} . . . ",
+". . t+<@[@}@|@1@2@3@z 4@4@5@6@7+7@i B+8@9@0@a@!+0+b@K.> p+c@d@'.N N e@p f@g@h@i@i@j@k@l@j.m@. . ",
+". 0 n@#@4 o@p@q@r@s@t@u@v@w@x@q y@z@A@B@B@< < C@D@> !+E@h.C N N M E F@D+G@H@I@J@K@L@M@N@O@P@:.. ",
+". Q@< < r+R@S@T@U@V@W@X@Y@Z@`@ #.#+#E@@#, i ##$#z@%#&#N N N ,..#*#)@w w D@D@=#-#8+;#y@>#,#'#)#. ",
+"! !#~#A@C@~#w #@{#]#^#/#(#_#:#<#[#4@4@+@,#}#|#1#M N N N f.2#3#4#C@D@C@~#A@A@5#6#7#8#,#%#9#8#0#I.",
+"} a#b#> w 4#w C@w A@c#d#e#f#g#h#i#j#k#l#+@4@9.N N O b.m#n#< C@~#A@B+##< q+<+'#8#%#%#o#%#p#q#r#` ",
+"} s#C K N@j t#w D@f+&+u#v#w#x#y#z#A#B#C#D#4@E#'.A *#w+##B+< B+##B@< 8+Q+F#%#o#G#p#9#+@H#D O I#J#",
+". K#L#N M M#N#D+t#j D+t#$#~#A+O#P#Q#R#S#T#U#V#W#$@8 i B@$@##$@D@a@X#8#o#p#q 9#Y#Z#1#`#C N '. $. ",
+". . .$C N N +$+#'+'@&+> > 0+f+@$#$x 7+$$%$&$*$=$B@8 -$#@;$< x+>$%#Y#q 9#Y#Y#Z#K f.C N N N ,$2.. ",
+". . H 6.'$N N N '.G#3#O+N+K.j K.'@f+< )$!$~${$]$^$/$($C+N@>#9#Z#Z#Z#_$_$_$K :$O N N N O <$G . . ",
+". . . . m@[$'.N N N E#}$3#O+N+O+)@)@O+&+|$C@/ 1$2${+6#Y#3$3$q _$+#+#.#E r.O N N N N 4$5$6$. . . ",
+". . . . . S.^.>.M N N N r.>$9+P+=+P+N+K.'@w+8 D@@@3$_$5@+#4@x@+#4@k.E#N N N N O 7$#.:.. . . . . ",
+". . . . . . . + 8$9$C N N O 0$a$b$q+j )@)@N+'@c$A .#A .#4@A A d$9.O N N N O 7$e$f$. . . . . . . ",
+". . . . . . . . . J#_.g$N N N O h$i$j$=+V.V.N+k$A q#A A H#h$,.O N N N O l$m$].. . . . . . . . . ",
+". . . . . . . . . . . g.n$h.N N N C o$ +~+K.p+}$H#H#K ;++$N N N N O q.p$f$. . . . . . . . . . . ",
+". . . . . . . . . . . . . q$r$'.N N N C K N@7+,#K s$'.N N N N N t$u$K#. . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . } ;.v$M N N N w$H#o$M N N N N N q.x$y$. . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . 2.z$x.C N N N N N N N O A$B$f$. . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . 6$C$D$O N N N O J E$0.. . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ].F$;+O G$H$g.. . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . =.4.f$. . . . . . . . . . . . . . . . . . . . . . . "};

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am	2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am	2008-07-10 08:46:59 UTC (rev 18990)
@@ -7,6 +7,7 @@
 	-I$(top_srcdir)/src/drive \
 	-I$(top_srcdir)/src/vdrive \
 	-I$(top_srcdir)/src/c64 \
+	-I$(top_srcdir)/src/c64dtv \
 	-I$(top_srcdir)/src/c128 \
 	-I$(top_srcdir)/src/vic20 \
 	-I$(top_srcdir)/src/pet \

Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/win32/resc64dtv.rc
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/win32/resc64dtv.rc	                        (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/win32/resc64dtv.rc	2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,3130 @@
+// C64 specific resources.
+//
+
+#include "config.h"
+#include "debug.h"
+#include "config.h"
+#include "res.h"
+#include "rescommon.h"
+
+#pragma code_page(28591)
+
+#define FILE_DESCRIPTION  "VicePlus C64DTV Emulator"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+// original and default ENGLISH version of menu
+
+IDR_MENUC64DTV MENU DISCARDABLE
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "&Autostart disk image...", IDM_AUTOSTART
+        MENUITEM SEPARATOR
+        POPUP "Attach &disk image"
+        BEGIN
+            MENUITEM "Drive &8\tAlt+8",  IDM_ATTACH_8
+            MENUITEM "Drive &9\tAlt+9",  IDM_ATTACH_9
+            MENUITEM "Drive 1&0\tAlt+0", IDM_ATTACH_10
+            MENUITEM "Drive &11\tAlt+1", IDM_ATTACH_11
+        END
+        POPUP "D&etach disk image"
+        BEGIN
+            MENUITEM "Drive &8",  IDM_DETACH_8
+            MENUITEM "Drive &9",  IDM_DETACH_9
+            MENUITEM "Drive 1&0", IDM_DETACH_10
+            MENUITEM "Drive &11", IDM_DETACH_11
+            MENUITEM SEPARATOR
+            MENUITEM "&All\tAlt+A", IDM_DETACH_ALL
+        END
+        POPUP "DTV flash &rom image"
+        BEGIN
+            MENUITEM "Attach &flash rom image", IDM_ATTACH_DTV_FLASH
+            MENUITEM "&Detach flash rom image", IDM_DETACH_DTV_FLASH
+            MENUITEM "&Create new flash rom image", IDM_CREATE_DTV_FLASH
+        END
+        POPUP "&Flip list"
+        BEGIN
+            MENUITEM "&Add current image\tAlt+I",     IDM_FLIP_ADD
+            MENUITEM "&Remove current image\tAlt+K",  IDM_FLIP_REMOVE
+            MENUITEM "Attach &next image\tAlt+N",     IDM_FLIP_NEXT
+            MENUITEM "Attach &previous image\tAlt+B", IDM_FLIP_PREVIOUS
+            MENUITEM SEPARATOR
+            MENUITEM "&Load flip list", IDM_FLIP_LOAD
+            MENUITEM "&Save flip list", IDM_FLIP_SAVE
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "&Pause\tAlt+Pause", IDM_PAUSE, CHECKED
+        MENUITEM "&Monitor\tAlt+M", IDM_MONITOR
+        POPUP "&Reset"
+        BEGIN
+            MENUITEM "&Hard\tCtrl+Alt+R", IDM_RESET_HARD
+            MENUITEM "&Soft\tAlt+R",      IDM_RESET_SOFT
+            MENUITEM SEPARATOR
+            MENUITEM "Drive #&8",         IDM_RESET_DRIVE8
+            MENUITEM "Drive #&9",         IDM_RESET_DRIVE9
+            MENUITEM "Drive #1&0",        IDM_RESET_DRIVE10
+            MENUITEM "Drive #&11",        IDM_RESET_DRIVE11
+        END
+#ifdef DEBUG
+        POPUP "&Debug"
+        BEGIN
+            POPUP "M&ode"
+            BEGIN
+                MENUITEM "&Normal", IDM_DEBUG_MODE_NORMAL
+                MENUITEM "&Small", IDM_DEBUG_MODE_SMALL
+                MENUITEM "&History", IDM_DEBUG_MODE_HISTORY
+                MENUITEM "&History Autoplay", IDM_DEBUG_MODE_AUTOPLAY
+            END
+            MENUITEM "&Main CPU Trace\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
+            MENUITEM "Drive&0 CPU Trace\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
+            MENUITEM "Drive&1 CPU Trace\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
+        END
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "E&xit\tAlt+X", IDM_EXIT
+    END
+    POPUP "Sna&pshot"
+    BEGIN
+        MENUITEM "Load snapshot &image...",          IDM_SNAPSHOT_LOAD
+        MENUITEM "Save sna&pshot image...",          IDM_SNAPSHOT_SAVE
+        MENUITEM "&Load quicksnapshot image\tAlt+L", IDM_LOADQUICK
+        MENUITEM "&Save quicksnapshot image\tAlt+S", IDM_SAVEQUICK
+        MENUITEM SEPARATOR
+        MENUITEM "Start/Stop &Recording History",       IDM_EVENT_TOGGLE_RECORD
+        MENUITEM "Start/Stop Pl&ayback History",        IDM_EVENT_TOGGLE_PLAYBACK
+        MENUITEM "Set Recording Milestone\tAlt+G",  IDM_EVENT_SETMILESTONE
+        MENUITEM "Return to Milestone\tAlt+H",      IDM_EVENT_RESETMILESTONE
+        POPUP "Recording start mode"
+        BEGIN
+            MENUITEM "&Save new snapshot",      IDM_EVENT_START_MODE_SAVE
+            MENUITEM "&Load existing snapshot", IDM_EVENT_START_MODE_LOAD
+            MENUITEM "Start with &reset",       IDM_EVENT_START_MODE_RESET
+            MENUITEM "Overwrite &Playback",     IDM_EVENT_START_MODE_PLAYBACK
+        END
+        MENUITEM "Select History files/directory",    IDM_EVENT_DIRECTORY
+        MENUITEM SEPARATOR
+        MENUITEM "Save/stop media file...\tAlt+C", IDM_MEDIAFILE
+        MENUITEM SEPARATOR
+        MENUITEM "Record Sound...", IDM_SOUND_RECORD_START
+        MENUITEM "Stop Sound Recording", IDM_SOUND_RECORD_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Netplay (experimental)...", IDM_NETWORK_SETTINGS
+    END
+    POPUP "&Options"
+    BEGIN
+        POPUP "&Refresh rate"
+        BEGIN
+            MENUITEM "&Auto", IDM_REFRESH_RATE_AUTO
+            MENUITEM "1/&1",  IDM_REFRESH_RATE_1
+            MENUITEM "1/&2",  IDM_REFRESH_RATE_2
+            MENUITEM "1/&3",  IDM_REFRESH_RATE_3
+            MENUITEM "1/&4",  IDM_REFRESH_RATE_4
+            MENUITEM "1/&5",  IDM_REFRESH_RATE_5
+            MENUITEM "1/&6",  IDM_REFRESH_RATE_6
+            MENUITEM "1/&7",  IDM_REFRESH_RATE_7
+            MENUITEM "1/&8",  IDM_REFRESH_RATE_8
+            MENUITEM "1/&9",  IDM_REFRESH_RATE_9
+            MENUITEM "1/1&0", IDM_REFRESH_RATE_10
+#if 0
+            MENUITEM SEPARATOR
+            MENUITEM "&Custom", IDM_REFRESH_RATE_CUSTOM
+#endif
+        END
+        POPUP "&Maximum Speed"
+        BEGIN
+            MENUITEM "&200%",     IDM_MAXIMUM_SPEED_200
+            MENUITEM "&100%",     IDM_MAXIMUM_SPEED_100
+            MENUITEM "&50%",      IDM_MAXIMUM_SPEED_50
+            MENUITEM "&20%",      IDM_MAXIMUM_SPEED_20
+            MENUITEM "1&0%",      IDM_MAXIMUM_SPEED_10
+            MENUITEM "No &limit", IDM_MAXIMUM_SPEED_NO_LIMIT
+            MENUITEM SEPARATOR
+            MENUITEM "&Custom",   IDM_MAXIMUM_SPEED_CUSTOM
+        END
+        MENUITEM "&Warp mode\tAlt+W", IDM_TOGGLE_WARP_MODE, CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "Fullscreen\tAlt+D", IDM_TOGGLE_FULLSCREEN
+        MENUITEM "Always on Top", IDM_TOGGLE_ALWAYSONTOP
+        MENUITEM SEPARATOR
+        MENUITEM "Video &cache", IDM_TOGGLE_VIDEOCACHE, CHECKED
+        MENUITEM "&Double size", IDM_TOGGLE_DOUBLESIZE, CHECKED
+        MENUITEM "Dou&ble scan", IDM_TOGGLE_DOUBLESCAN, CHECKED
+        MENUITEM "PAL Emulation", IDM_TOGGLE_FASTPAL, CHECKED
+        MENUITEM "Scale2x", IDM_TOGGLE_SCALE2X, CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "Swap &Joystick\tAlt+J", IDM_SWAP_JOYSTICK
+        MENUITEM SEPARATOR
+        MENUITEM "&Sound playback", IDM_TOGGLE_SOUND, CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "&True drive emulation", IDM_TOGGLE_DRIVE_TRUE_EMULATION, CHECKED
+        MENUITEM "&True flash filesystem", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM, CHECKED
+        MENUITEM "&Virtual device traps", IDM_TOGGLE_VIRTUAL_DEVICES
+        MENUITEM SEPARATOR
+        POPUP "Vide&o standard"
+        BEGIN
+            MENUITEM "&PAL-G",      IDM_SYNC_FACTOR_PAL
+            MENUITEM "&NTSC-M",     IDM_SYNC_FACTOR_NTSC
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Emulator &Identification", IDM_TOGGLE_EMUID
+        MENUITEM "&PS/2 mouse emulation", IDM_PS2MOUSE
+        MENUITEM "&Grab mouse events\tAlt+Q", IDM_MOUSE
+    END
+    POPUP "S&ettings"
+    BEGIN
+        MENUITEM "&Video settings...",     IDM_VIDEO_SETTINGS
+        MENUITEM "&Peripheral settings...",IDM_DEVICEMANAGER
+        MENUITEM "&Drive settings...",     IDM_DRIVE_SETTINGS
+        MENUITEM "VIC-II settings...",     IDM_VICII_SETTINGS
+        MENUITEM "&Joystick settings...",  IDM_JOY_SETTINGS
+        MENUITEM "&Keyboard settings...",  IDM_KEYBOARD_SETTINGS
+        MENUITEM "S&ound settings...",     IDM_SOUND_SETTINGS
+        MENUITEM "S&ID settings...",       IDM_SID_SETTINGS
+        MENUITEM "&ROM settings...",       IDM_ROM_SETTINGS
+        MENUITEM "RA&M settings...",       IDM_RAM_SETTINGS
+        MENUITEM "&C64DTV settings...",    IDM_C64DTV_SETTINGS
+        MENUITEM SEPARATOR
+        MENUITEM "&Save current settings", IDM_SETTINGS_SAVE
+        MENUITEM "&Load saved settings",   IDM_SETTINGS_LOAD
+        MENUITEM "Set de&fault settings",  IDM_SETTINGS_DEFAULT
+        MENUITEM SEPARATOR
+        MENUITEM "Save settings on e&xit", IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
+        MENUITEM "&Confirm on exit",       IDM_TOGGLE_CONFIRM_ON_EXIT
+    END
+    POPUP "&Language"
+    BEGIN
+        MENUITEM "&English", IDM_LANG_EN
+        MENUITEM "&German", IDM_LANG_DE
+        MENUITEM "&French", IDM_LANG_FR
+        MENUITEM "&Hungarian", IDM_LANG_HU
+        MENUITEM "&Italian", IDM_LANG_IT
+        MENUITEM "&Dutch", IDM_LANG_NL
+        MENUITEM "&Polish", IDM_LANG_PL
+        MENUITEM "&Swedish", IDM_LANG_SV
+    END
+    POPUP "&Help"
+    BEGIN
+//        MENUITEM "H&elp",               IDM_HELP
+//        MENUITEM SEPARATOR
+        MENUITEM "&About...",             IDM_ABOUT
+        MENUITEM SEPARATOR
+        MENUITEM "Command line &options", IDM_CMDLINE
+        MENUITEM SEPARATOR
+        MENUITEM "&Contributors",         IDM_CONTRIBUTORS
+        MENUITEM "&License",              IDM_LICENSE
+        MENUITEM "No &warranty",          IDM_WARRANTY
+    END
+END
+
+
+// GERMAN version of menu
+
+IDR_MENUC64DTV_DE MENU DISCARDABLE
+BEGIN
+    POPUP "&Datei"
+    BEGIN
+        MENUITEM "&Autostart Disk Image...", IDM_AUTOSTART
+        MENUITEM SEPARATOR
+        POPUP "&Disk Image einlegen"
+        BEGIN
+            MENUITEM "Laufwerk &8\tAlt+8",  IDM_ATTACH_8
+            MENUITEM "Laufwerk &9\tAlt+9",  IDM_ATTACH_9
+            MENUITEM "Laufwerk 1&0\tAlt+0", IDM_ATTACH_10
+            MENUITEM "Laufwerk &11\tAlt+1", IDM_ATTACH_11
+        END
+        POPUP "Disk Image &entfernen"
+        BEGIN
+            MENUITEM "Laufwerk &8",  IDM_DETACH_8
+            MENUITEM "Laufwerk &9",  IDM_DETACH_9
+            MENUITEM "Laufwerk 1&0", IDM_DETACH_10
+            MENUITEM "Laufwerk &11", IDM_DETACH_11
+            MENUITEM SEPARATOR
+            MENUITEM "&Alle\tAlt+A", IDM_DETACH_ALL
+        END
+        POPUP "&Flipliste"
+        BEGIN
+            MENUITEM "&Aktuelles Image hinzuf\xFCgen\tAlt+I", IDM_FLIP_ADD
+            MENUITEM "Aktuelles Image entfe&rnen\tAlt+K",  IDM_FLIP_REMOVE
+            MENUITEM "N\xE4chstes Image\tAlt+N",             IDM_FLIP_NEXT
+            MENUITEM "Voriges Image\tAlt+B",              IDM_FLIP_PREVIOUS
+            MENUITEM SEPARATOR
+            MENUITEM "Fliplist Datei &Laden",     IDM_FLIP_LOAD
+            MENUITEM "Fliplist Datei &Speichern", IDM_FLIP_SAVE
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "&Pause\tAlt+Pause", IDM_PAUSE, CHECKED
+        MENUITEM "&Monitor\tAlt+M", IDM_MONITOR
+        POPUP "&Reset"
+        BEGIN
+            MENUITEM "&Hart\tCtrl+Alt+R", IDM_RESET_HARD
+            MENUITEM "&Soft\tAlt+R",      IDM_RESET_SOFT
+            MENUITEM SEPARATOR
+            MENUITEM "Laufwerk #&8",  IDM_RESET_DRIVE8
+            MENUITEM "Laufwerk #&9",  IDM_RESET_DRIVE9
+            MENUITEM "Laufwerk #1&0", IDM_RESET_DRIVE10
+            MENUITEM "Laufwerk #&11", IDM_RESET_DRIVE11
+        END
+#ifdef DEBUG
+        POPUP "&Debug"
+        BEGIN
+            POPUP "M&odus"
+            BEGIN
+                MENUITEM "&Normal", IDM_DEBUG_MODE_NORMAL
+                MENUITEM "&Klein", IDM_DEBUG_MODE_SMALL
+                MENUITEM "&History", IDM_DEBUG_MODE_HISTORY
+                MENUITEM "&History Automatische Wiedergabe", IDM_DEBUG_MODE_AUTOPLAY
+            END
+            MENUITEM "&Main CPU Trace\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
+            MENUITEM "Laufwerk&0 CPU Trace\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
+            MENUITEM "Laufwerk&1 CPU Trace\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
+        END
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "E&xit\tAlt+X", IDM_EXIT
+    END
+    POPUP "Sna&pshot"
+    BEGIN
+        MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
+        MENUITEM "Sna&pshot Image Speichern...", IDM_SNAPSHOT_SAVE
+        MENUITEM "Schnell&laden von Snapshot Image\tAlt+L", IDM_LOADQUICK
+        MENUITEM "&Schnellspeichern von Snapshot\tAlt+S", IDM_SAVEQUICK
+        MENUITEM SEPARATOR
+        MENUITEM "Sta&rt/Stop Aufnahme History",       IDM_EVENT_TOGGLE_RECORD
+        MENUITEM "St&art/Stop Wiedergabe History",        IDM_EVENT_TOGGLE_PLAYBACK
+        MEN...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18989] branches/amatthies/v1.22.24-sprites/

From: <ama...@us...> - 2008-07-09 19:42:34

Revision: 18989
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18989&view=rev
Author:   amatthies
Date:     2008-07-09 12:42:05 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Branch for sprite fixes (2nd attempt)

Added Paths:
-----------
    branches/amatthies/v1.22.24-sprites/

Copied: branches/amatthies/v1.22.24-sprites (from rev 18988, tags/v1.22/v1.22.24)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18988] branches/amatthies/v1.22.24-sprites/

From: <ama...@us...> - 2008-07-09 19:40:56

Revision: 18988
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18988&view=rev
Author:   amatthies
Date:     2008-07-09 12:39:59 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Removed file/folder

Removed Paths:
-------------
    branches/amatthies/v1.22.24-sprites/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18987] branches/amatthies/v1.22.24-sprites/

From: <ama...@us...> - 2008-07-09 19:37:52

Revision: 18987
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18987&view=rev
Author:   amatthies
Date:     2008-07-09 12:37:02 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Branch for Sprite fixes.

Added Paths:
-----------
    branches/amatthies/v1.22.24-sprites/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18986] branches/viceplus/v1.22.24-x64dtv/vice/src

From: <no...@us...> - 2008-07-09 16:24:35

Revision: 18986
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18986&view=rev
Author:   nojoopa
Date:     2008-07-09 09:24:33 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
x64dtv merging

Modified Paths:
--------------
    branches/viceplus/v1.22.24-x64dtv/vice/src/6510core.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/autostart.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64ui.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/machine.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/maincpu.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_drive.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_file.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_lex.l
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_memory.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_parse.y
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_register.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/monitor.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/montypes.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/raster/raster-line.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/raster/raster.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/raster/raster.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/envelope.cc
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/envelope.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/sid.cc
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/sid.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/siddefs.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/siddefs.h.in
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/voice.cc
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/wave.cc
    branches/viceplus/v1.22.24-x64dtv/vice/src/resid/wave.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/sid/fastsid.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/sid/resid.cc
    branches/viceplus/v1.22.24-x64dtv/vice/src/sid/sid-cmdline-options.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/sid/sid-resources.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/sid/sid.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/translate.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/translate.txt
    branches/viceplus/v1.22.24-x64dtv/vice/src/traps.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/vicii-badline.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/vicii-fetch.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/vicii-irq.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/vicii-mem.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/vicii-mem.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/vicii.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/viciitypes.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/video.h

Added Paths:
-----------
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/Makefile.am
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv-cmdline-options.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv-cmdline-options.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv-resources.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv-resources.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv-snapshot.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv-snapshot.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtv.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvblitter.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvblitter.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvcart.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvcia1.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvcia2.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvcpu.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvdma.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvdma.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvflash.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvflash.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtviec.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmem.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmem.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmeminit.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmeminit.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmemrom.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmemsnapshot.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvmemsnapshot.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvpla.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvsound.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/c64dtvtfe.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/flash-trap.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/flash-trap.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/hummeradc.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/c64dtv/hummeradc.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/asm6502dtv.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_register6502dtv.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/mos6510dtv.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/ps2mouse.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/ps2mouse.h
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/vicii-stubs.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/viciidtv-color.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/viciidtv-draw.c
    branches/viceplus/v1.22.24-x64dtv/vice/src/vicii/viciidtv-snapshot.c

Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/6510core.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/6510core.c	2008-07-09 10:35:04 UTC (rev 18985)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/6510core.c	2008-07-09 16:24:33 UTC (rev 18986)
@@ -5,6 +5,10 @@
  *  Ettore Perazzoli <et...@co...>
  *  Andreas Boose <vic...@t-...>
  *
+ * DTV sections written by
+ *  M.Kiesel <ma...@us...>
+ *  Hannu Nuotio <han...@tu...>
+ *
  * This file is part of VICE, the Versatile Commodore Emulator.
  * See README for copyright notice.
  *
@@ -25,6 +29,8 @@
  *
  */
 
+/* This file is included by CPU definition files */
+/* (maincpu.c, drivecpu.c, ...) */
 
 #ifdef DRIVE_CPU
 #define CPU_STR "Drive CPU"
@@ -32,8 +38,37 @@
 #define CPU_STR "Main CPU"
 #endif
 
+#ifndef C64DTV
+/* The C64DTV can use different shadow registers for accu read/write. */
+/* For standard 6510, this is not the case. */
+#define reg_a_write reg_a
+#define reg_a_read  reg_a
+
+/* Opcode execution time may vary on the C64DTV. */
+#define CLK_RTS 3
+#define CLK_RTI 4
+#define CLK_BRK 5
+#define CLK_ABS_I_STORE2 2
+#define CLK_STACK_PUSH 1
+#define CLK_STACK_PULL 2
+#define CLK_ABS_RMW2 3
+#define CLK_ABS_I_RMW2 3
+#define CLK_ZERO_I_STORE 2
+#define CLK_ZERO_I2 2
+#define CLK_ZERO_RMW 3
+#define CLK_ZERO_I_RMW 4
+#define CLK_IND_X_RMW 3
+#define CLK_IND_Y_RMW1 1
+#define CLK_IND_Y_RMW2 3
+#define CLK_BRANCH2 1
+#define CLK_INT_CYCLE 1
+#define CLK_JSR_INT_CYCLE 1
+#define CLK_IND_Y_W 2
+#define CLK_NOOP_ZERO_X 2
+
 #define IRQ_CYCLES      7
 #define NMI_CYCLES      7
+#endif
 #define RESET_CYCLES    6
 
 /* ------------------------------------------------------------------------- */
@@ -175,11 +210,12 @@
 #endif
 
 #ifndef DRIVE_CPU
+#ifndef C64DTV
 /* Export the local version of the registers.  */
 #define EXPORT_REGISTERS()      \
   do {                          \
       GLOBAL_REGS.pc = reg_pc;  \
-      GLOBAL_REGS.a = reg_a;    \
+      GLOBAL_REGS.a = reg_a_read;    \
       GLOBAL_REGS.x = reg_x;    \
       GLOBAL_REGS.y = reg_y;    \
       GLOBAL_REGS.sp = reg_sp;  \
@@ -191,7 +227,7 @@
 /* Import the public version of the registers.  */
 #define IMPORT_REGISTERS()      \
   do {                          \
-      reg_a = GLOBAL_REGS.a;    \
+      reg_a_write /*TODO*/= GLOBAL_REGS.a;    \
       reg_x = GLOBAL_REGS.x;    \
       reg_y = GLOBAL_REGS.y;    \
       reg_sp = GLOBAL_REGS.sp;  \
@@ -200,6 +236,67 @@
       flag_z = GLOBAL_REGS.z;   \
       JUMP(GLOBAL_REGS.pc);     \
   } while (0)
+#else  /* C64DTV */
+
+/* Export the local version of the registers.  */
+#define EXPORT_REGISTERS()      \
+  do {                          \
+      GLOBAL_REGS.pc = reg_pc;  \
+      GLOBAL_REGS.a = dtv_registers[0]; \
+      GLOBAL_REGS.x = dtv_registers[2]; \
+      GLOBAL_REGS.y = dtv_registers[1]; \
+      GLOBAL_REGS.sp = reg_sp;  \
+      GLOBAL_REGS.p = reg_p;    \
+      GLOBAL_REGS.n = flag_n;   \
+      GLOBAL_REGS.z = flag_z;   \
+      GLOBAL_REGS.r3 = dtv_registers[3]; \
+      GLOBAL_REGS.r4 = dtv_registers[4]; \
+      GLOBAL_REGS.r5 = dtv_registers[5]; \
+      GLOBAL_REGS.r6 = dtv_registers[6]; \
+      GLOBAL_REGS.r7 = dtv_registers[7]; \
+      GLOBAL_REGS.r8 = dtv_registers[8]; \
+      GLOBAL_REGS.r9 = dtv_registers[9]; \
+      GLOBAL_REGS.r10 = dtv_registers[10]; \
+      GLOBAL_REGS.r11 = dtv_registers[11]; \
+      GLOBAL_REGS.r12 = dtv_registers[12]; \
+      GLOBAL_REGS.r13 = dtv_registers[13]; \
+      GLOBAL_REGS.r14 = dtv_registers[14]; \
+      GLOBAL_REGS.r15 = dtv_registers[15]; \
+      GLOBAL_REGS.acm = (reg_a_write_idx << 4) | (reg_a_read_idx); \
+      GLOBAL_REGS.xym = (reg_y_idx << 4) | (reg_x_idx); \
+  } while (0)
+
+/* Import the public version of the registers.  */
+#define IMPORT_REGISTERS()      \
+  do {                          \
+      dtv_registers[0] = GLOBAL_REGS.a; \
+      dtv_registers[2] = GLOBAL_REGS.x; \
+      dtv_registers[1] = GLOBAL_REGS.y; \
+      reg_sp = GLOBAL_REGS.sp;  \
+      reg_p = GLOBAL_REGS.p;    \
+      flag_n = GLOBAL_REGS.n;   \
+      flag_z = GLOBAL_REGS.z;   \
+      dtv_registers[3] = GLOBAL_REGS.r3; \
+      dtv_registers[4] = GLOBAL_REGS.r4; \
+      dtv_registers[5] = GLOBAL_REGS.r5; \
+      dtv_registers[6] = GLOBAL_REGS.r6; \
+      dtv_registers[7] = GLOBAL_REGS.r7; \
+      dtv_registers[8] = GLOBAL_REGS.r8; \
+      dtv_registers[9] = GLOBAL_REGS.r9; \
+      dtv_registers[10] = GLOBAL_REGS.r10; \
+      dtv_registers[11] = GLOBAL_REGS.r11; \
+      dtv_registers[12] = GLOBAL_REGS.r12; \
+      dtv_registers[13] = GLOBAL_REGS.r13; \
+      dtv_registers[14] = GLOBAL_REGS.r14; \
+      dtv_registers[15] = GLOBAL_REGS.r15; \
+      reg_a_write_idx = GLOBAL_REGS.acm >> 4; \
+      reg_a_read_idx = GLOBAL_REGS.acm & 0xf; \
+      reg_y_idx = GLOBAL_REGS.xym >> 4; \
+      reg_x_idx = GLOBAL_REGS.xym & 0xf; \
+      JUMP(GLOBAL_REGS.pc); \
+  } while (0)
+
+#endif /* C64DTV */
 #else  /* DRIVE_CPU */
 #define IMPORT_REGISTERS()
 #define EXPORT_REGISTERS()
@@ -207,8 +304,12 @@
 
 /* Stack operations. */
 
+#ifndef PUSH
 #define PUSH(val) ((PAGE_ONE)[(reg_sp--)] = ((BYTE)(val)))
+#endif
+#ifndef PULL
 #define PULL()    ((PAGE_ONE)[(++reg_sp)])
+#endif
 
 #ifdef DEBUG
 #define TRACE_NMI() \
@@ -325,25 +426,25 @@
 #define LOAD_ABS_X(addr)                                     \
    ((((addr) & 0xff) + reg_x) > 0xff                         \
     ? (LOAD(((addr) & 0xff00) | (((addr) + reg_x) & 0xff)),  \
-       CLK_ADD(CLK,1),                                       \
+       CLK_ADD(CLK,CLK_INT_CYCLE),                           \
        LOAD((addr) + reg_x))                                 \
     : LOAD((addr) + reg_x))
 
 #define LOAD_ABS_X_RMW(addr)                              \
    (LOAD(((addr) & 0xff00) | (((addr) + reg_x) & 0xff)),  \
-    CLK_ADD(CLK,1),                                       \
+    CLK_ADD(CLK,CLK_INT_CYCLE),                           \
     LOAD((addr) + reg_x))
 
 #define LOAD_ABS_Y(addr)                                     \
    ((((addr) & 0xff) + reg_y) > 0xff                         \
     ? (LOAD(((addr) & 0xff00) | (((addr) + reg_y) & 0xff)),  \
-       CLK_ADD(CLK,1),                                       \
+       CLK_ADD(CLK,CLK_INT_CYCLE),                           \
        LOAD((addr) + reg_y))                                 \
     : LOAD((addr) + reg_y))
 
 #define LOAD_ABS_Y_RMW(addr)                              \
    (LOAD(((addr) & 0xff00) | (((addr) + reg_y) & 0xff)),  \
-    CLK_ADD(CLK,1),                                       \
+    CLK_ADD(CLK,CLK_INT_CYCLE),                           \
     LOAD((addr) + reg_y))
 
 #define LOAD_IND_X(addr)  \
@@ -353,7 +454,7 @@
    (CLK_ADD(CLK, 2), ((LOAD_ZERO_ADDR((addr)) & 0xff) + reg_y) > 0xff  \
     ? (LOAD((LOAD_ZERO_ADDR((addr)) & 0xff00)                          \
             | ((LOAD_ZERO_ADDR((addr)) + reg_y) & 0xff)),              \
-       CLK_ADD(CLK,1),                                                 \
+       CLK_ADD(CLK,CLK_INT_CYCLE),                                     \
        LOAD(LOAD_ZERO_ADDR((addr)) + reg_y))                           \
     : LOAD(LOAD_ZERO_ADDR((addr)) + reg_y))
 
@@ -367,7 +468,7 @@
    (CLK_ADD(CLK, 2), ((LOAD_ZERO_ADDR((addr)) & 0xff) + reg_y) > 0xff  \
     ? (LOAD_IND((LOAD_ZERO_ADDR((addr)) & 0xff00)                      \
             | ((LOAD_ZERO_ADDR((addr)) + reg_y) & 0xff)),              \
-       CLK_ADD(CLK,1),                                                 \
+       CLK_ADD(CLK,CLK_INT_CYCLE),                                     \
        LOAD_IND(LOAD_ZERO_ADDR((addr)) + reg_y))                       \
     : LOAD_IND(LOAD_ZERO_ADDR((addr)) + reg_y))
 
@@ -457,51 +558,51 @@
       CLK_ADD(CLK, (clk_inc));                                                \
                                                                               \
       if (LOCAL_DECIMAL()) {                                                  \
-          tmp = (reg_a & 0xf) + (tmp_value & 0xf) + (reg_p & 0x1);            \
+          tmp = (reg_a_read & 0xf) + (tmp_value & 0xf) + (reg_p & 0x1);            \
           if (tmp > 0x9)                                                      \
               tmp += 0x6;                                                     \
           if (tmp <= 0x0f)                                                    \
-              tmp = (tmp & 0xf) + (reg_a & 0xf0) + (tmp_value & 0xf0);        \
+              tmp = (tmp & 0xf) + (reg_a_read & 0xf0) + (tmp_value & 0xf0);        \
           else                                                                \
-              tmp = (tmp & 0xf) + (reg_a & 0xf0) + (tmp_value & 0xf0) + 0x10; \
-          LOCAL_SET_ZERO(!((reg_a + tmp_value + (reg_p & 0x1)) & 0xff));      \
+              tmp = (tmp & 0xf) + (reg_a_read & 0xf0) + (tmp_value & 0xf0) + 0x10; \
+          LOCAL_SET_ZERO(!((reg_a_read + tmp_value + (reg_p & 0x1)) & 0xff));      \
           LOCAL_SET_SIGN(tmp & 0x80);                                         \
-          LOCAL_SET_OVERFLOW(((reg_a ^ tmp) & 0x80)                           \
-                              && !((reg_a ^ tmp_value) & 0x80));              \
+          LOCAL_SET_OVERFLOW(((reg_a_read ^ tmp) & 0x80)                           \
+                              && !((reg_a_read ^ tmp_value) & 0x80));              \
           if ((tmp & 0x1f0) > 0x90)                                           \
               tmp += 0x60;                                                    \
           LOCAL_SET_CARRY((tmp & 0xff0) > 0xf0);                              \
       } else {                                                                \
-          tmp = tmp_value + reg_a + (reg_p & P_CARRY);                        \
+          tmp = tmp_value + reg_a_read + (reg_p & P_CARRY);                        \
           LOCAL_SET_NZ(tmp & 0xff);                                           \
-          LOCAL_SET_OVERFLOW(!((reg_a ^ tmp_value) & 0x80)                    \
-                              && ((reg_a ^ tmp) & 0x80));                     \
+          LOCAL_SET_OVERFLOW(!((reg_a_read ^ tmp_value) & 0x80)                    \
+                              && ((reg_a_read ^ tmp) & 0x80));                     \
           LOCAL_SET_CARRY(tmp > 0xff);                                        \
       }                                                                       \
-      reg_a = tmp;                                                            \
+      reg_a_write = tmp;                                                            \
       INC_PC(pc_inc);                                                         \
   } while (0)
 
 #define ANC(value, pc_inc)           \
   do {                               \
-      reg_a &= (value);              \
-      LOCAL_SET_NZ(reg_a);           \
+      reg_a_write = reg_a_read & (value); \
+      LOCAL_SET_NZ(reg_a_read);      \
       LOCAL_SET_CARRY(LOCAL_SIGN()); \
       INC_PC(pc_inc);                \
   } while (0)
 
 #define AND(value, clk_inc, pc_inc)  \
   do {                               \
-      reg_a &= (value);              \
-      LOCAL_SET_NZ(reg_a);           \
+      reg_a_write = reg_a_read & (value); \
+      LOCAL_SET_NZ(reg_a_read);      \
       CLK_ADD(CLK, (clk_inc));       \
       INC_PC(pc_inc);                \
   } while (0)
 
 #define ANE(value, pc_inc)                                 \
   do {                                                     \
-      reg_a = ((reg_a | 0xee) & reg_x & ((BYTE)(value)));  \
-      LOCAL_SET_NZ(reg_a);                                 \
+      reg_a_write = ((reg_a_read | 0xee) & reg_x & ((BYTE)(value)));  \
+      LOCAL_SET_NZ(reg_a_read);                            \
       INC_PC(pc_inc);                                      \
   } while (0)
 
@@ -510,7 +611,7 @@
   do {                                                             \
       unsigned int tmp;                                            \
                                                                    \
-      tmp = reg_a & (value);                                       \
+      tmp = reg_a_read & (value);                                  \
       if (LOCAL_DECIMAL()) {                                       \
           int tmp_2 = tmp;                                         \
           tmp_2 |= (reg_p & P_CARRY) << 8;                         \
@@ -525,14 +626,14 @@
               LOCAL_SET_CARRY(1);                                  \
           } else                                                   \
               LOCAL_SET_CARRY(0);                                  \
-          reg_a = tmp_2;                                           \
+          reg_a_write = tmp_2;                                     \
       } else {                                                     \
           tmp |= (reg_p & P_CARRY) << 8;                           \
           tmp >>= 1;                                               \
           LOCAL_SET_NZ(tmp);                                       \
           LOCAL_SET_CARRY(tmp & 0x40);                             \
           LOCAL_SET_OVERFLOW((tmp & 0x40) ^ ((tmp & 0x20) << 1));  \
-          reg_a = tmp;                                             \
+          reg_a_write = tmp;                                       \
       }                                                            \
       INC_PC(pc_inc);                                              \
   } while (0)
@@ -554,9 +655,9 @@
 
 #define ASL_A()                       \
   do {                                \
-      LOCAL_SET_CARRY(reg_a & 0x80);  \
-      reg_a <<= 1;                    \
-      LOCAL_SET_NZ(reg_a);            \
+      LOCAL_SET_CARRY(reg_a_read & 0x80); \
+      reg_a_write = reg_a_read << 1;  \
+      LOCAL_SET_NZ(reg_a_read);       \
       INC_PC(1);                      \
   } while (0)
 
@@ -564,10 +665,10 @@
   do {                             \
       unsigned int tmp;            \
                                    \
-      tmp = reg_a & (value);       \
+      tmp = reg_a_read & (value);  \
       LOCAL_SET_CARRY(tmp & 0x01); \
-      reg_a = tmp >> 1;            \
-      LOCAL_SET_NZ(reg_a);         \
+      reg_a_write = tmp >> 1;      \
+      LOCAL_SET_NZ(reg_a_read);    \
       INC_PC(pc_inc);              \
   } while (0)
 
@@ -579,10 +680,11 @@
       CLK_ADD(CLK,1);                 \
       LOCAL_SET_SIGN(tmp & 0x80);     \
       LOCAL_SET_OVERFLOW(tmp & 0x40); \
-      LOCAL_SET_ZERO(!(tmp & reg_a)); \
+      LOCAL_SET_ZERO(!(tmp & reg_a_read)); \
       INC_PC(pc_inc);                 \
   } while (0)
 
+#ifndef C64DTV
 #define BRANCH(cond, value)                                        \
   do {                                                             \
       INC_PC(2);                                                   \
@@ -591,16 +693,17 @@
           unsigned int dest_addr = reg_pc + (signed char)(value);  \
                                                                    \
           LOAD(reg_pc);                                            \
-          CLK_ADD(CLK,1);                                          \
+          CLK_ADD(CLK,CLK_BRANCH2);                                \
           if ((reg_pc ^ dest_addr) & 0xff00) {                     \
               LOAD((reg_pc & 0xff00) | (dest_addr & 0xff));        \
-              CLK_ADD(CLK,1);                                      \
+              CLK_ADD(CLK,CLK_BRANCH2);                            \
           } else {                                                 \
               OPCODE_DELAYS_INTERRUPT();                           \
           }                                                        \
           JUMP(dest_addr & 0xffff);                                \
       }                                                            \
   } while (0)
+#endif
 
 /* The BRK opcode is also used to patch the ROM.  The function trap_handler()
    returns nonzero if this is not a patch, but a `real' BRK instruction. */
@@ -611,7 +714,7 @@
       EXPORT_REGISTERS();                                        \
       if (!ROM_TRAP_ALLOWED()                                    \
           || (trap_result = ROM_TRAP_HANDLER()) == (DWORD)-1) {  \
-          CLK_ADD(CLK,5);                                        \
+          CLK_ADD(CLK,CLK_BRK);                                  \
           TRACE_BRK();                                           \
           INC_PC(2);                                             \
           LOCAL_SET_BREAK(1);                                    \
@@ -662,7 +765,7 @@
   do {                               \
       unsigned int tmp;              \
                                      \
-      tmp = reg_a - (value);         \
+      tmp = reg_a_read - (value);    \
       LOCAL_SET_CARRY(tmp < 0x100);  \
       LOCAL_SET_NZ(tmp & 0xff);      \
       CLK_ADD(CLK, (clk_inc));       \
@@ -699,8 +802,8 @@
       CLK_ADD(CLK,(clk_inc1));                                        \
       tmp = load_func(tmp_addr);                                      \
       tmp = (tmp - 1) & 0xff;                                         \
-      LOCAL_SET_CARRY(reg_a >= tmp);                                  \
-      LOCAL_SET_NZ((reg_a - tmp));                                    \
+      LOCAL_SET_CARRY(reg_a_read >= tmp);                             \
+      LOCAL_SET_NZ((reg_a_read - tmp));                               \
       RMW_FLAG = 1;                                                   \
       INC_PC(pc_inc);                                                 \
       store_func(tmp_addr, tmp, (clk_inc2));                          \
@@ -714,15 +817,15 @@
                                                                 \
       CLK_ADD(CLK,2);                                           \
       LOAD((tmp_addr & 0xff00) | ((tmp_addr + reg_y) & 0xff));  \
-      CLK_ADD(CLK,1);                                           \
+      CLK_ADD(CLK,CLK_IND_Y_RMW1);                              \
       tmp_addr += reg_y;                                        \
       tmp = LOAD(tmp_addr);                                     \
       tmp = (tmp - 1) & 0xff;                                   \
-      LOCAL_SET_CARRY(reg_a >= tmp);                            \
-      LOCAL_SET_NZ((reg_a - tmp));                              \
+      LOCAL_SET_CARRY(reg_a_read >= tmp);                       \
+      LOCAL_SET_NZ((reg_a_read - tmp));                         \
       RMW_FLAG = 1;                                             \
       INC_PC(2);                                                \
-      STORE_ABS(tmp_addr, tmp, 3);                              \
+      STORE_ABS(tmp_addr, tmp, CLK_IND_Y_RMW2);                 \
       RMW_FLAG = 0;                                             \
   } while (0)
 
@@ -756,8 +859,8 @@
 
 #define EOR(value, clk_inc, pc_inc)  \
   do {                               \
-      reg_a ^= (value);              \
-      LOCAL_SET_NZ(reg_a);           \
+      reg_a_write = reg_a_read ^ (value); \
+      LOCAL_SET_NZ(reg_a_read);      \
       CLK_ADD(CLK, (clk_inc));       \
       INC_PC(pc_inc);                \
   } while (0)
@@ -811,14 +914,14 @@
                                                               \
       CLK_ADD(CLK,2);                                         \
       LOAD((my_addr & 0xff00) | ((my_addr + reg_y) & 0xff));  \
-      CLK_ADD(CLK,1);                                         \
+      CLK_ADD(CLK,CLK_IND_Y_RMW1);                            \
       my_addr += reg_y;                                       \
       my_src = LOAD(my_addr);                                 \
       my_src = (my_src + 1) & 0xff;                           \
       SBC(my_src, 0, 0);                                      \
       RMW_FLAG = 1;                                           \
       INC_PC(2);                                              \
-      STORE_ABS(my_addr, my_src, 3);                          \
+      STORE_ABS(my_addr, my_src, CLK_IND_Y_RMW2);             \
       RMW_FLAG = 0;                                           \
   } while (0)
 
@@ -847,31 +950,31 @@
       PUSH(((reg_pc) >> 8) & 0xff);           \
       PUSH((reg_pc) & 0xff);                  \
       tmp_addr = (p1 | (LOAD(reg_pc) << 8));  \
-      CLK_ADD(CLK,1);                         \
+      CLK_ADD(CLK,CLK_JSR_INT_CYCLE);         \
       JUMP(tmp_addr);                         \
   } while (0)
 
 #define LAS(value, clk_inc, pc_inc)               \
   do {                                            \
-      reg_a = reg_x = reg_sp = reg_sp & (value);  \
-      LOCAL_SET_NZ(reg_a);                        \
+      reg_a_write = reg_x = reg_sp = reg_sp & (value);  \
+      LOCAL_SET_NZ(reg_a_read);                   \
       CLK_ADD(CLK,(clk_inc));                     \
       INC_PC(pc_inc);                             \
   } while (0)
 
 #define LAX(value, clk_inc, pc_inc)  \
   do {                               \
-      reg_a = reg_x = (value);       \
-      LOCAL_SET_NZ(reg_a);           \
+      reg_a_write = reg_x = (value); \
+      LOCAL_SET_NZ(reg_a_read);      \
       CLK_ADD(CLK, (clk_inc));       \
       INC_PC(pc_inc);                \
   } while (0)
 
 #define LDA(value, clk_inc, pc_inc)  \
   do {                               \
-      reg_a = (BYTE)(value);         \
+      reg_a_write = (BYTE)(value);   \
       CLK_ADD(CLK, (clk_inc));       \
-      LOCAL_SET_NZ(reg_a);           \
+      LOCAL_SET_NZ(reg_a_read);      \
       INC_PC(pc_inc);                \
   } while (0)
 
@@ -908,9 +1011,9 @@
 
 #define LSR_A()                       \
   do {                                \
-      LOCAL_SET_CARRY(reg_a & 0x01);  \
-      reg_a >>= 1;                    \
-      LOCAL_SET_NZ(reg_a);            \
+      LOCAL_SET_CARRY(reg_a_read & 0x01); \
+      reg_a_write = reg_a_read >> 1;  \
+      LOCAL_SET_NZ(reg_a_read);       \
       INC_PC(1);                      \
   } while (0)
 
@@ -918,15 +1021,15 @@
    Moreover, the behavior is different from the one described in 64doc. */
 #define LXA(value, pc_inc)                                 \
   do {                                                     \
-      reg_a = reg_x = ((reg_a | 0xee) & ((BYTE)(value)));  \
-      LOCAL_SET_NZ(reg_a);                                 \
+      reg_a_write = reg_x = ((reg_a_read | 0xee) & ((BYTE)(value)));  \
+      LOCAL_SET_NZ(reg_a_read);                            \
       INC_PC(pc_inc);                                      \
   } while (0)
 
 #define ORA(value, clk_inc, pc_inc)  \
   do {                               \
-      reg_a |= (value);              \
-      LOCAL_SET_NZ(reg_a);           \
+      reg_a_write = reg_a_read | (value); \
+      LOCAL_SET_NZ(reg_a_write);     \
       CLK_ADD(CLK, (clk_inc));       \
       INC_PC(pc_inc);                \
   } while (0)
@@ -954,23 +1057,23 @@
 
 #define PHA()         \
   do {                \
-      CLK_ADD(CLK,1); \
-      PUSH(reg_a);    \
+      CLK_ADD(CLK,CLK_STACK_PUSH); \
+      PUSH(reg_a_read); \
       INC_PC(1);      \
   } while (0)
 
 #define PHP()                          \
   do {                                 \
-      CLK_ADD(CLK,1);                  \
+      CLK_ADD(CLK,CLK_STACK_PUSH); \
       PUSH(LOCAL_STATUS() | P_BREAK);  \
       INC_PC(1);                       \
   } while (0)
 
 #define PLA()               \
   do {                      \
-      CLK_ADD(CLK,2);       \
-      reg_a = PULL();       \
-      LOCAL_SET_NZ(reg_a);  \
+      CLK_ADD(CLK,CLK_STACK_PULL); \
+      reg_a_write = PULL(); \
+      LOCAL_SET_NZ(reg_a_read); \
       INC_PC(1);            \
   } while (0)
 
@@ -983,7 +1086,7 @@
           OPCODE_ENABLES_IRQ();                          \
       else if ((s & P_INTERRUPT) && !LOCAL_INTERRUPT())  \
           OPCODE_DISABLES_IRQ();                         \
-      CLK_ADD(CLK,2);                                    \
+      CLK_ADD(CLK,CLK_STACK_PULL);                       \
       LOCAL_SET_STATUS(s);                               \
       INC_PC(1);                                         \
   } while (0)
@@ -996,8 +1099,8 @@
       CLK_ADD(CLK,(clk_inc1));                                        \
       tmp = ((load_func(tmp_addr) << 1) | (reg_p & P_CARRY));         \
       LOCAL_SET_CARRY(tmp & 0x100);                                   \
-      reg_a &= tmp;                                                   \
-      LOCAL_SET_NZ(reg_a);                                            \
+      reg_a_write = reg_a_read & tmp;                                 \
+      LOCAL_SET_NZ(reg_a_read);                                       \
       RMW_FLAG = 1;                                                   \
       INC_PC(pc_inc);                                                 \
       store_func(tmp_addr, tmp, clk_inc2);                            \
@@ -1011,15 +1114,15 @@
                                                                 \
       CLK_ADD(CLK,2);                                           \
       LOAD((tmp_addr & 0xff00) | ((tmp_addr + reg_y) & 0xff));  \
-      CLK_ADD(CLK,1);                                           \
+      CLK_ADD(CLK,CLK_IND_Y_RMW1);                              \
       tmp_addr += reg_y;                                        \
       tmp = ((LOAD(tmp_addr) << 1) | (reg_p & P_CARRY));        \
       LOCAL_SET_CARRY(tmp & 0x100);                             \
-      reg_a &= tmp;                                             \
-      LOCAL_SET_NZ(reg_a);                                      \
+      reg_a_write = reg_a_read & tmp;                           \
+      LOCAL_SET_NZ(reg_a_read);                                 \
       RMW_FLAG = 1;                                             \
       INC_PC(2);                                                \
-      STORE_ABS(tmp_addr, tmp, 3);                              \
+      STORE_ABS(tmp_addr, tmp, CLK_IND_Y_RMW2);                 \
       RMW_FLAG = 0;                                             \
   } while (0)
 
@@ -1040,11 +1143,11 @@
 
 #define ROL_A()                         \
   do {                                  \
-      unsigned int tmp = reg_a << 1;    \
+      unsigned int tmp = reg_a_read << 1; \
                                         \
-      reg_a = tmp | (reg_p & P_CARRY);  \
+      reg_a_write = tmp | (reg_p & P_CARRY);  \
       LOCAL_SET_CARRY(tmp & 0x100);     \
-      LOCAL_SET_NZ(reg_a);              \
+      LOCAL_SET_NZ(reg_a_read);         \
       INC_PC(1);                        \
   } while (0)
 
@@ -1067,11 +1170,11 @@
 
 #define ROR_A()                             \
   do {                                      \
-      BYTE tmp = reg_a;                     \
+      BYTE tmp = reg_a_read;                \
                                             \
-      reg_a = (reg_a >> 1) | (reg_p << 7);  \
+      reg_a_write = (reg_a_read >> 1) | (reg_p << 7);  \
       LOCAL_SET_CARRY(tmp & 0x01);          \
-      LOCAL_SET_NZ(reg_a);                  \
+      LOCAL_SET_NZ(reg_a_read);             \
       INC_PC(1);                            \
   } while (0)
 
@@ -1103,7 +1206,7 @@
       CLK_ADD(CLK,2);                                                 \
       my_tmp_addr = LOAD_ZERO_ADDR(addr);                             \
       LOAD((my_tmp_addr & 0xff00) | ((my_tmp_addr + reg_y) & 0xff));  \
-      CLK_ADD(CLK,1);                                                 \
+      CLK_ADD(CLK,CLK_IND_Y_RMW1);                                    \
       my_tmp_addr += reg_y;                                           \
       src = LOAD(my_tmp_addr);                                        \
       RMW_FLAG = 1;                                                   \
@@ -1113,7 +1216,7 @@
           my_temp |= 0x80;                                            \
       LOCAL_SET_CARRY(src & 0x1);                                     \
       ADC(my_temp, 0, 0);                                             \
-      STORE_ABS(my_tmp_addr, my_temp, 3);                             \
+      STORE_ABS(my_tmp_addr, my_temp, CLK_IND_Y_RMW2);                \
       RMW_FLAG = 0;                                                   \
   } while (0)
 
@@ -1126,7 +1229,7 @@
   do {                              \
       WORD tmp;                     \
                                     \
-      CLK_ADD(CLK,4);               \
+      CLK_ADD(CLK,CLK_RTI);         \
       tmp = (WORD)PULL();           \
       LOCAL_SET_STATUS((BYTE)tmp);  \
       tmp = (WORD)PULL();           \
@@ -1138,11 +1241,11 @@
   do {                            \
       WORD tmp;                   \
                                   \
-      CLK_ADD(CLK,3);             \
+      CLK_ADD(CLK,CLK_RTS);       \
       tmp = PULL();               \
       tmp = tmp | (PULL() << 8);  \
       LOAD(tmp);                  \
-      CLK_ADD(CLK,1);             \
+      CLK_ADD(CLK,CLK_INT_CYCLE); \
       tmp++;                      \
       JUMP(tmp);                  \
   } while (0)
@@ -1155,13 +1258,13 @@
       tmp = (addr);                            \
       CLK_ADD(CLK,(clk_inc2));                 \
       INC_PC(pc_inc);                          \
-      STORE(tmp, reg_a & reg_x);               \
+      STORE(tmp, reg_a_read & reg_x);          \
   } while (0)
 
 #define SAX_ZERO(addr, clk_inc, pc_inc)   \
   do {                                    \
       CLK_ADD(CLK,(clk_inc));             \
-      STORE_ZERO((addr), reg_a & reg_x);  \
+      STORE_ZERO((addr), reg_a_read & reg_x);  \
       INC_PC(pc_inc);                     \
   } while (0)
 
@@ -1171,28 +1274,28 @@
                                                                              \
       src = (WORD)(value);                                                   \
       CLK_ADD(CLK, (clk_inc));                                               \
-      tmp = reg_a - src - ((reg_p & P_CARRY) ? 0 : 1);                       \
+      tmp = reg_a_read - src - ((reg_p & P_CARRY) ? 0 : 1);                  \
       if (reg_p & P_DECIMAL) {                                               \
           unsigned int tmp_a;                                                \
-          tmp_a = (reg_a & 0xf) - (src & 0xf) - ((reg_p & P_CARRY) ? 0 : 1); \
+          tmp_a = (reg_a_read & 0xf) - (src & 0xf) - ((reg_p & P_CARRY) ? 0 : 1); \
           if (tmp_a & 0x10)                                                  \
               tmp_a = ((tmp_a - 6) & 0xf)                                    \
-                       | ((reg_a & 0xf0) - (src & 0xf0) - 0x10);             \
+                       | ((reg_a_read & 0xf0) - (src & 0xf0) - 0x10);        \
           else                                                               \
-              tmp_a = (tmp_a & 0xf) | ((reg_a & 0xf0) - (src & 0xf0));       \
+              tmp_a = (tmp_a & 0xf) | ((reg_a_read & 0xf0) - (src & 0xf0));  \
           if (tmp_a & 0x100)                                                 \
               tmp_a -= 0x60;                                                 \
           LOCAL_SET_CARRY(tmp < 0x100);                                      \
           LOCAL_SET_NZ(tmp & 0xff);                                          \
-          LOCAL_SET_OVERFLOW(((reg_a ^ tmp) & 0x80)                          \
-                             && ((reg_a ^ src) & 0x80));                     \
-          reg_a = (BYTE) tmp_a;                                              \
+          LOCAL_SET_OVERFLOW(((reg_a_read ^ tmp) & 0x80)                     \
+                             && ((reg_a_read ^ src) & 0x80));                \
+          reg_a_write = (BYTE) tmp_a;                                        \
       } else {                                                               \
           LOCAL_SET_NZ(tmp & 0xff);                                          \
           LOCAL_SET_CARRY(tmp < 0x100);                                      \
-          LOCAL_SET_OVERFLOW(((reg_a ^ tmp) & 0x80)                          \
-                             && ((reg_a ^ src) & 0x80));                     \
-          reg_a = (BYTE) tmp;                                                \
+          LOCAL_SET_OVERFLOW(((reg_a_read ^ tmp) & 0x80)                     \
+                             && ((reg_a_read ^ src) & 0x80));                \
+          reg_a_write = (BYTE) tmp;                                          \
       }                                                                      \
       INC_PC(pc_inc);                                                        \
     }                                                                        \
@@ -1204,7 +1307,7 @@
                                     \
       tmp = (value);                \
       INC_PC(pc_inc);               \
-      tmp = (reg_a & reg_x) - tmp;  \
+      tmp = (reg_a_read & reg_x) - tmp; \
       LOCAL_SET_CARRY(tmp < 0x100); \
       reg_x = tmp & 0xff;           \
       LOCAL_SET_NZ(reg_x);          \
@@ -1237,7 +1340,7 @@
                                                                           \
       tmp = (addr);                                                       \
       INC_PC(3);                                                          \
-      STORE_ABS_SH_Y(tmp, reg_a & reg_x & (((tmp + reg_y) >> 8) + 1), 2); \
+      STORE_ABS_SH_Y(tmp, reg_a_read & reg_x & (((tmp + reg_y) >> 8) + 1), CLK_ABS_I_STORE2);  \
   } while (0)
 
 #define SHA_IND_Y(addr)                               \
@@ -1248,8 +1351,8 @@
       CLK_ADD(CLK,2);                                 \
       tmp = LOAD_ZERO_ADDR(addr);                     \
       LOAD((tmp & 0xff00) | ((tmp + reg_y) & 0xff));  \
-      CLK_ADD(CLK,2);                                 \
-      val = reg_a & reg_x & ((tmp >> 8) + 1);         \
+      CLK_ADD(CLK,CLK_IND_Y_W);                       \
+      val = reg_a_read & reg_x & ((tmp >> 8) + 1);    \
       if ((tmp & 0xff) + reg_y > 0xff)                \
           tmp = ((tmp + reg_y) & 0xff) | (val << 8);  \
       else                                            \
@@ -1264,7 +1367,7 @@
                                                                    \
       tmp = (addr);                                                \
       INC_PC(3);                                                   \
-      STORE_ABS_SH_Y(tmp, reg_x & (((tmp + reg_y) >> 8) + 1), 2);  \
+      STORE_ABS_SH_Y(tmp, reg_x & (((tmp + reg_y) >> 8) + 1), CLK_ABS_I_STORE2); \
   } while (0)
 
 #define SHY_ABS_X(addr)                                            \
@@ -1273,7 +1376,7 @@
                                                                    \
       tmp = (addr);                                                \
       INC_PC(3);                                                   \
-      STORE_ABS_SH_X(tmp, reg_y & (((tmp + reg_x) >> 8) + 1), 2);  \
+      STORE_ABS_SH_X(tmp, reg_y & (((tmp + reg_x) >> 8) + 1), CLK_ABS_I_STORE2); \
   } while (0)
 
 #define SHS_ABS_Y(addr)                                                    \
@@ -1281,8 +1384,8 @@
       int tmp = (addr);                                                    \
                                                                            \
       INC_PC(3);                                                           \
-      STORE_ABS_SH_Y(tmp, reg_a & reg_x & (((tmp + reg_y) >> 8) + 1), 2);  \
-      reg_sp = reg_a & reg_x;                                              \
+      STORE_ABS_SH_Y(tmp, reg_a_read & reg_x & (((tmp + reg_y) >> 8) + 1), CLK_ABS_I_STORE2); \
+      reg_sp = reg_a_read & reg_x;                                         \
   } while (0)
 
 #define SLO(addr, clk_inc1, clk_inc2, pc_inc, load_func, store_func)  \
@@ -1295,8 +1398,8 @@
       tmp_value = load_func(tmp_addr);                                \
       LOCAL_SET_CARRY(tmp_value & 0x80);                              \
       tmp_value <<= 1;                                                \
-      reg_a |= tmp_value;                                             \
-      LOCAL_SET_NZ(reg_a);                                            \
+      reg_a_write = reg_a_read | tmp_value;                           \
+      LOCAL_SET_NZ(reg_a_read);                                       \
       RMW_FLAG = 1;                                                   \
       INC_PC(pc_inc);                                                 \
       store_func(tmp_addr, tmp_value, clk_inc2);                      \
@@ -1311,16 +1414,16 @@
       CLK_ADD(CLK,2);                                           \
       tmp_addr = LOAD_ZERO_ADDR(addr);                          \
       LOAD((tmp_addr & 0xff00) | ((tmp_addr + reg_y) & 0xff));  \
-      CLK_ADD(CLK,1);                                           \
+      CLK_ADD(CLK,CLK_IND_Y_RMW1);                              \
       tmp_addr += reg_y;                                        \
       tmp_value = LOAD(tmp_addr);                               \
       LOCAL_SET_CARRY(tmp_value & 0x80);                        \
       tmp_value <<= 1;                                          \
-      reg_a |= tmp_value;                                       \
-      LOCAL_SET_NZ(reg_a);                                      \
+      reg_a_write = reg_a_read | tmp_value;                     \
+      LOCAL_SET_NZ(reg_a_read);                                 \
       RMW_FLAG = 1;                                             \
       INC_PC(2);                                                \
-      STORE_ABS(tmp_addr, tmp_value, 3);                        \
+      STORE_ABS(tmp_addr, tmp_value, CLK_IND_Y_RMW2);           \
       RMW_FLAG = 0;                                             \
   } while (0)
 
@@ -1334,8 +1437,8 @@
       tmp = load_func(tmp_addr);                                      \
       LOCAL_SET_CARRY(tmp & 0x01);                                    \
       tmp >>= 1;                                                      \
-      reg_a ^= tmp;                                                   \
-      LOCAL_SET_NZ(reg_a);                                            \
+      reg_a_write = reg_a_read ^ tmp;                                 \
+      LOCAL_SET_NZ(reg_a_read);                                       \
       RMW_FLAG = 1;                                                   \
       INC_PC(pc_inc);                                                 \
       store_func(tmp_addr, tmp, clk_inc2);                            \
@@ -1349,16 +1452,16 @@
                                                                 \
       CLK_ADD(CLK,2);                                           \
       LOAD((tmp_addr & 0xff00) | ((tmp_addr + reg_y) & 0xff));  \
-      CLK_ADD(CLK,1);                                           \
+      CLK_ADD(CLK,CLK_IND_Y_RMW1);                              \
       tmp_addr += reg_y;                                        \
       tmp = LOAD(tmp_addr);                                     \
       LOCAL_SET_CARRY(tmp & 0x01);                              \
       tmp >>= 1;                                                \
-      reg_a ^= tmp;                                             \
-      LOCAL_SET_NZ(reg_a);                                      \
+      reg_a_write = reg_a_read ^ tmp;                           \
+      LOCAL_SET_NZ(reg_a_read);                                 \
       RMW_FLAG = 1;                                             \
       INC_PC(2);                                                \
-      STORE_ABS(tmp_addr, tmp, 3);                              \
+      STORE_ABS(tmp_addr, tmp, CLK_IND_Y_RMW2);                 \
       RMW_FLAG = 0;                                             \
   } while (0)
 
@@ -1369,13 +1472,13 @@
       CLK_ADD(CLK,(clk_inc1));                             \
       tmp = (addr);                                        \
       INC_PC(pc_inc);                                      \
-      store_func(tmp, reg_a, clk_inc2);                    \
+      store_func(tmp, reg_a_read, clk_inc2);               \
   } while (0)
 
 #define STA_ZERO(addr, clk_inc, pc_inc)  \
   do {                                   \
       CLK_ADD(CLK,(clk_inc));            \
-      STORE_ZERO((addr), reg_a);         \
+      STORE_ZERO((addr), reg_a_read);    \
       INC_PC(pc_inc);                    \
   } while (0)
 
@@ -1386,9 +1489,9 @@
       CLK_ADD(CLK,2);                                     \
       tmp = LOAD_ZERO_ADDR(addr);                         \
       LOAD_IND((tmp & 0xff00) | ((tmp + reg_y) & 0xff));  \
-      CLK_ADD(CLK,2);                                     \
+      CLK_ADD(CLK,CLK_IND_Y_W);                           \
       INC_PC(2);                                          \
-      STORE_IND(tmp + reg_y, reg_a);                      \
+      STORE_IND(tmp + reg_y, reg_a_read);                 \
   } while (0)
 
 #define STX(addr, clk_inc, pc_inc)  \
@@ -1427,15 +1530,15 @@
 
 #define TAX()               \
   do {                      \
-      reg_x = reg_a;        \
-      LOCAL_SET_NZ(reg_a);  \
+      reg_x = reg_a_read;   \
+      LOCAL_SET_NZ(reg_a_read); \
       INC_PC(1);            \
   } while (0)
 
 #define TAY()               \
   do {                      \
-      reg_y = reg_a;        \
-      LOCAL_SET_NZ(reg_a);  \
+      reg_y = reg_a_read;   \
+      LOCAL_SET_NZ(reg_a_read); \
       INC_PC(1);            \
   } while (0)
 
@@ -1448,8 +1551,8 @@
 
 #define TXA()               \
   do {                      \
-      reg_a = reg_x;        \
-      LOCAL_SET_NZ(reg_a);  \
+      reg_a_write = reg_x;  \
+      LOCAL_SET_NZ(reg_a_read); \
       INC_PC(1);            \
   } while (0)
 
@@ -1461,8 +1564,8 @@
 
 #define TYA()               \
   do {                      \
-      reg_a = reg_y;        \
-      LOCAL_SET_NZ(reg_a);  \
+      reg_a_write = reg_y;  \
+      LOCAL_SET_NZ(reg_a_read); \
       INC_PC(1);            \
   } while (0)
 
@@ -1489,6 +1592,8 @@
     /* $F0 */  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1  /* $F0 */
 };
 
+#ifndef C64DTV  /* C64DTV opcode_t & fetch are defined in c64dtvcpu.c */
+
 #ifdef CPU_8502  /* 8502 specific opcode fetch */
 
 static const BYTE rewind_fetch_tab[] = {
@@ -1738,6 +1843,8 @@
 
 #endif
 
+#endif /* !C64DTV */
+
 /* ------------------------------------------------------------------------ */
 
 /* Here, the CPU is emulated. */
@@ -1788,11 +1895,12 @@
 
 #ifdef FEATURE_CPUMEMHISTORY
 #ifndef DRIVE_CPU
+#ifndef C64DTV
         /* HACK to cope with FETCH_OPCODE optimization in x64 */
         if (((int)reg_pc) < bank_limit) {
             memmap_mem_read(reg_pc);
         }
-
+#endif
         if(p0 == 0x20) {
             monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(LOAD(reg_pc+2)));
         } else {
@@ -1812,7 +1920,7 @@
             debug_drive((DWORD)(reg_pc), debug_clk,
                         mon_disassemble_to_string(e_disk8_space, reg_pc, op,
                         lo, hi, (BYTE)0, 1, "6502"), 
-                        reg_a, reg_x, reg_y, reg_sp);
+                        reg_a_read, reg_x, reg_y, reg_sp);
         }
 #else
         if (TRACEFLG) {
@@ -1823,7 +1931,7 @@
             debug_maincpu((DWORD)(reg_pc), debug_clk,
                           mon_disassemble_to_string(e_comp_space, reg_pc, op,
                           lo, hi, (BYTE)0, 1, "6502"),
-                          reg_a, reg_x, reg_y, reg_sp);
+                          reg_a_read, reg_x, reg_y, reg_sp);
         }
 #endif
 #endif
@@ -1842,10 +1950,7 @@
             break;
 
           case 0x02:            /* JAM */
-          case 0x12:            /* JAM */
           case 0x22:            /* JAM */
-          case 0x32:            /* JAM */
-          case 0x42:            /* JAM */
           case 0x52:            /* JAM */
           case 0x62:            /* JAM */
           case 0x72:            /* JAM */
@@ -1853,12 +1958,32 @@
           case 0xb2:            /* JAM */
           case 0xd2:            /* JAM */
           case 0xf2:            /* JAM */
+#ifndef C64DTV
+          case 0x12:            /* JAM */
+          case 0x32:            /* JAM */
+          case 0x42:            /* JAM */
+#endif
             REWIND_FETCH_OPCODE(CLK);
             JAM();
             break;
 
+#ifdef C64DTV
+          /* These opcodes are defined in c64/c64dtvcpu.c */
+          case 0x12:            /* BRA */
+            BRANCH(1, p1);
+            break;
+
+          case 0x32:            /* SAC */
+            SAC(p1);
+            break;
+
+          case 0x42:            /* SIR */
+            SIR(p1);
+            break;
+#endif
+
           case 0x03:            /* SLO ($nn,X) */
-            SLO(LOAD_ZERO_ADDR(p1 + reg_x), 3, 3, 2, LOAD_ABS, STORE_ABS);
+            SLO(LOAD_ZERO_ADDR(p1 + reg_x), 3, CLK_IND_X_RMW, 2, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x04:            /* NOOP $nn */
@@ -1872,11 +1997,11 @@
             break;
 
           case 0x06:            /* ASL $nn */
-            ASL(p1, 3, 2, LOAD_ZERO, STORE_ABS);
+            ASL(p1, CLK_ZERO_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x07:            /* SLO $nn */
-            SLO(p1, 0, 3, 2, LOAD_ZERO, STORE_ABS);
+            SLO(p1, 0, CLK_ZERO_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x08:            /* PHP */
@@ -1908,11 +2033,11 @@
             break;
 
           case 0x0e:            /* ASL $nnnn */
-            ASL(p2, 3, 3, LOAD_ABS, STORE_ABS);
+            ASL(p2, CLK_ABS_RMW2, 3, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x0f:            /* SLO $nnnn */
-            SLO(p2, 0, 3, 3, LOAD_ABS, STORE_ABS);
+            SLO(p2, 0, CLK_ABS_RMW2, 3, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x10:            /* BPL $nnnn */
@@ -1933,19 +2058,19 @@
           case 0x74:            /* NOOP $nn,X */
           case 0xd4:            /* NOOP $nn,X */
           case 0xf4:            /* NOOP $nn,X */
-            NOOP(2, 2);
+            NOOP(CLK_NOOP_ZERO_X, 2);
             break;
 
           case 0x15:            /* ORA $nn,X */
-            ORA(LOAD_ZERO_X(p1), 2, 2);
+            ORA(LOAD_ZERO_X(p1), CLK_ZERO_I2, 2);
             break;
 
           case 0x16:            /* ASL $nn,X */
-            ASL((p1 + reg_x) & 0xff, 4, 2, LOAD_ZERO, STORE_ABS);
+            ASL((p1 + reg_x) & 0xff, CLK_ZERO_I_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x17:            /* SLO $nn,X */
-            SLO((p1 + reg_x) & 0xff, 0, 4, 2, LOAD_ZERO, STORE_ABS);
+            SLO((p1 + reg_x) & 0xff, 0, CLK_ZERO_I_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x18:            /* CLC */
@@ -1966,7 +2091,7 @@
             break;
 
           case 0x1b:            /* SLO $nnnn,Y */
-            SLO(p2, 0, 3, 3, LOAD_ABS_Y_RMW, STORE_ABS_Y_RMW);
+            SLO(p2, 0, CLK_ABS_I_RMW2, 3, LOAD_ABS_Y_RMW, STORE_ABS_Y_RMW);
             break;
 
           case 0x1c:            /* NOOP $nnnn,X */
@@ -1983,11 +2108,11 @@
             break;
 
           case 0x1e:            /* ASL $nnnn,X */
-            ASL(p2, 3, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
+            ASL(p2, CLK_ABS_I_RMW2, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
             break;
 
           case 0x1f:            /* SLO $nnnn,X */
-            SLO(p2, 0, 3, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
+            SLO(p2, 0, CLK_ABS_I_RMW2, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
             break;
 
           case 0x20:            /* JSR $nnnn */
@@ -1999,7 +2124,7 @@
             break;
 
           case 0x23:            /* RLA ($nn,X) */
-            RLA(LOAD_ZERO_ADDR(p1 + reg_x), 3, 3, 2, LOAD_ABS, STORE_ABS);
+            RLA(LOAD_ZERO_ADDR(p1 + reg_x), 3, CLK_IND_X_RMW, 2, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x24:            /* BIT $nn */
@@ -2011,11 +2136,11 @@
             break;
 
           case 0x26:            /* ROL $nn */
-            ROL(p1, 3, 2, LOAD_ZERO, STORE_ABS);
+            ROL(p1, CLK_ZERO_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x27:            /* RLA $nn */
-            RLA(p1, 0, 3, 2, LOAD_ZERO, STORE_ABS);
+            RLA(p1, 0, CLK_ZERO_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x28:            /* PLP */
@@ -2043,11 +2168,11 @@
             break;
 
           case 0x2e:            /* ROL $nnnn */
-            ROL(p2, 3, 3, LOAD_ABS, STORE_ABS);
+            ROL(p2, CLK_ABS_RMW2, 3, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x2f:            /* RLA $nnnn */
-            RLA(p2, 0, 3, 3, LOAD_ABS, STORE_ABS);
+            RLA(p2, 0, CLK_ABS_RMW2, 3, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x30:            /* BMI $nnnn */
@@ -2063,15 +2188,15 @@
             break;
 
           case 0x35:            /* AND $nn,X */
-            AND(LOAD_ZERO_X(p1), 2, 2);
+            AND(LOAD_ZERO_X(p1), CLK_ZERO_I2, 2);
             break;
 
           case 0x36:            /* ROL $nn,X */
-            ROL((p1 + reg_x) & 0xff, 4, 2, LOAD_ZERO, STORE_ABS);
+            ROL((p1 + reg_x) & 0xff, CLK_ZERO_I_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x37:            /* RLA $nn,X */
-            RLA((p1 + reg_x) & 0xff, 0, 4, 2, LOAD_ZERO, STORE_ABS);
+            RLA((p1 + reg_x) & 0xff, 0, CLK_ZERO_I_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x38:            /* SEC */
@@ -2083,7 +2208,7 @@
             break;
 
           case 0x3b:            /* RLA $nnnn,Y */
-            RLA(p2, 0, 3, 3, LOAD_ABS_Y_RMW, STORE_ABS_Y_RMW);
+            RLA(p2, 0, CLK_ABS_I_RMW2, 3, LOAD_ABS_Y_RMW, STORE_ABS_Y_RMW);
             break;
 
           case 0x3d:            /* AND $nnnn,X */
@@ -2091,11 +2216,11 @@
             break;
 
           case 0x3e:            /* ROL $nnnn,X */
-            ROL(p2, 3, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
+            ROL(p2, CLK_ABS_I_RMW2, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
             break;
 
           case 0x3f:            /* RLA $nnnn,X */
-            RLA(p2, 0, 3, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
+            RLA(p2, 0, CLK_ABS_I_RMW2, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
             break;
 
           case 0x40:            /* RTI */
@@ -2107,7 +2232,7 @@
             break;
 
           case 0x43:            /* SRE ($nn,X) */
-            SRE(LOAD_ZERO_ADDR(p1 + reg_x), 3, 3, 2, LOAD_ABS, STORE_ABS);
+            SRE(LOAD_ZERO_ADDR(p1 + reg_x), 3, CLK_IND_X_RMW, 2, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x45:            /* EOR $nn */
@@ -2115,11 +2240,11 @@
             break;
 
           case 0x46:            /* LSR $nn */
-            LSR(p1, 3, 2, LOAD_ZERO, STORE_ABS);
+            LSR(p1, CLK_ZERO_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x47:            /* SRE $nn */
-            SRE(p1, 0, 3, 2, LOAD_ZERO, STORE_ABS);
+            SRE(p1, 0, CLK_ZERO_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x48:            /* PHA */
@@ -2147,11 +2272,11 @@
             break;
 
           case 0x4e:            /* LSR $nnnn */
-            LSR(p2, 3, 3, LOAD_ABS, STORE_ABS);
+            LSR(p2, CLK_ABS_RMW2, 3, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x4f:            /* SRE $nnnn */
-            SRE(p2, 0, 3, 3, LOAD_ABS, STORE_ABS);
+            SRE(p2, 0, CLK_ABS_RMW2, 3, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x50:            /* BVC $nnnn */
@@ -2171,15 +2296,15 @@
             break;
 
           case 0x55:            /* EOR $nn,X */
-            EOR(LOAD_ZERO_X(p1), 2, 2);
+            EOR(LOAD_ZERO_X(p1), CLK_ZERO_I2, 2);
             break;
 
           case 0x56:            /* LSR $nn,X */
-            LSR((p1 + reg_x) & 0xff, 4, 2, LOAD_ZERO, STORE_ABS);
+            LSR((p1 + reg_x) & 0xff, CLK_ZERO_I_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x57:            /* SRE $nn,X */
-            SRE((p1 + reg_x) & 0xff, 0, 4, 2, LOAD_ZERO, STORE_ABS);
+            SRE((p1 + reg_x) & 0xff, 0, CLK_ZERO_I_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x58:            /* CLI */
@@ -2191,7 +2316,7 @@
             break;
 
           case 0x5b:            /* SRE $nnnn,Y */
-            SRE(p2, 0, 3, 3, LOAD_ABS_Y_RMW, STORE_ABS_Y_RMW);
+            SRE(p2, 0, CLK_ABS_I_RMW2, 3, LOAD_ABS_Y_RMW, STORE_ABS_Y_RMW);
             break;
 
           case 0x5d:            /* EOR $nnnn,X */
@@ -2199,11 +2324,11 @@
             break;
 
           case 0x5e:            /* LSR $nnnn,X */
-            LSR(p2, 3, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
+            LSR(p2, CLK_ABS_I_RMW2, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
             break;
 
           case 0x5f:            /* SRE $nnnn,X */
-            SRE(p2, 0, 3, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
+            SRE(p2, 0, CLK_ABS_I_RMW2, 3, LOAD_ABS_X_RMW, STORE_ABS_X_RMW);
             break;
 
           case 0x60:            /* RTS */
@@ -2215,7 +2340,7 @@
             break;
 
           case 0x63:            /* RRA ($nn,X) */
-            RRA(LOAD_ZERO_ADDR(p1 + reg_x), 3, 3, 2, LOAD_ABS, STORE_ABS);
+            RRA(LOAD_ZERO_ADDR(p1 + reg_x), 3, CLK_IND_X_RMW, 2, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x65:            /* ADC $nn */
@@ -2223,11 +2348,11 @@
             break;
 
           case 0x66:            /* ROR $nn */
-            ROR(p1, 3, 2, LOAD_ZERO, STORE_ABS);
+            ROR(p1, CLK_ZERO_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x67:            /* RRA $nn */
-            RRA(p1, 0, 3, 2, LOAD_ZERO, STORE_ABS);
+            RRA(p1, 0, CLK_ZERO_RMW, 2, LOAD_ZERO, STORE_ABS);
             break;
 
           case 0x68:            /* PLA */
@@ -2255,11 +2380,11 @@
             break;
 
           case 0x6e:            /* ROR $nnnn */
-            ROR(p2, 3, 3, LOAD_ABS, STORE_ABS);
+            ROR(p2, CLK_ABS_RMW2, 3, LOAD_ABS, STORE_ABS);
             break;
 
           case 0x6f:            /* RRA $nnnn */
-            RRA(p2, 0, 3, 3, LOAD_ABS, STORE_ABS);
+            RRA(p2, 0, CLK_ABS_RMW...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18985] branches/viceplus/v1.22.24-x64dtv/

From: <no...@us...> - 2008-07-09 10:35:00

Revision: 18985
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18985&view=rev
Author:   nojoopa
Date:     2008-07-09 03:35:04 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Copied 1.22.24 for x64dtv merging

Added Paths:
-----------
    branches/viceplus/v1.22.24-x64dtv/

Copied: branches/viceplus/v1.22.24-x64dtv (from rev 18984, tags/v1.22/v1.22.24)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18984] branches/viceplus/

From: <no...@us...> - 2008-07-09 10:28:24

Revision: 18984
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18984&view=rev
Author:   nojoopa
Date:     2008-07-09 03:28:24 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Generated working branch for VICEplus team

Added Paths:
-----------
    branches/viceplus/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18983] trunk/vice/vice-mint.spec

From: <st...@us...> - 2008-07-09 08:46:21

Revision: 18983
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18983&view=rev
Author:   strik
Date:     2008-07-09 01:46:30 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Removed executable property from vice-mint.spec.

Property Changed:
----------------
    trunk/vice/vice-mint.spec


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18982] trunk/vice/src

From: <st...@us...> - 2008-07-09 08:42:54

Revision: 18982
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18982&view=rev
Author:   strik
Date:     2008-07-09 01:43:01 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
2008-07-09  Spiro Trikaliotis  <spi...@gm...>

	* src/c64/reu.c: set_reu_size(): Do not reset
	first_unused_register_address; remove a warning about
	uninitialised object in reu_read().

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/c64/reu.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-09 08:40:38 UTC (rev 18981)
+++ trunk/vice/src/ChangeLog	2008-07-09 08:43:01 UTC (rev 18982)
@@ -1,3 +1,9 @@
+2008-07-09  Spiro Trikaliotis  <spi...@gm...>
+
+	* c64/reu.c: set_reu_size(): Do not reset
+	first_unused_register_address; remove a warning about
+	uninitialised object in reu_read().
+
 2008-07-08  Marco van den Heuvel  <bla...@ya...>
 
 	* translate.c: Updated the dutch translations.

Modified: trunk/vice/src/c64/reu.c
===================================================================
--- trunk/vice/src/c64/reu.c	2008-07-09 08:40:38 UTC (rev 18981)
+++ trunk/vice/src/c64/reu.c	2008-07-09 08:43:01 UTC (rev 18982)
@@ -345,7 +345,6 @@
     rec_options.wrap_around_mask_when_storing = rec_options.wrap_around - 1;
     rec_options.reg_bank_unused = REU_REG_RW_BANK_UNUSED;
     rec_options.status_preset = REU_REG_R_STATUS_256K_CHIPS;
-    rec_options.first_unused_register_address = REU_REG_RW_UNUSED;
 
     switch (val) {
       case 128:
@@ -751,7 +750,7 @@
 */
 BYTE REGPARM1 reu_read(WORD addr)
 {
-    BYTE retval;
+    BYTE retval = 0xff;
 
     addr &= 0xff;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18981] trunk/vice/vice-mint.spec

From: <st...@us...> - 2008-07-09 08:40:29

Revision: 18981
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18981&view=rev
Author:   strik
Date:     2008-07-09 01:40:38 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Changed meta-information (executable, mime-type, eol-style) on some files. 

Property Changed:
----------------
    trunk/vice/vice-mint.spec


Property changes on: trunk/vice/vice-mint.spec
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18980] trunk/vice

From: <st...@us...> - 2008-07-09 08:36:25

Revision: 18980
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18980&view=rev
Author:   strik
Date:     2008-07-09 01:36:29 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Change meta-information (executable, mime-type, eol-style) on some files.

Modified Paths:
--------------
    trunk/vice/doc/html/hpux.html
    trunk/vice/doc/html/qnx.html
    trunk/vice/doc/html/sco.html
    trunk/vice/src/c64/cart/stardos.c

Property Changed:
----------------
    trunk/vice/data/fonts/vice-cbm.bdf
    trunk/vice/doc/html/hpux.html
    trunk/vice/doc/html/qnx.html
    trunk/vice/doc/html/sco.html
    trunk/vice/src/c64/cart/actionreplay4.c
    trunk/vice/src/c64/cart/actionreplay4.h
    trunk/vice/src/c64/cart/stardos.c
    trunk/vice/src/c64/cart/stardos.h


Property changes on: trunk/vice/data/fonts/vice-cbm.bdf
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:eol-style
   + native

Modified: trunk/vice/doc/html/hpux.html
===================================================================
--- trunk/vice/doc/html/hpux.html	2008-07-09 07:56:34 UTC (rev 18979)
+++ trunk/vice/doc/html/hpux.html	2008-07-09 08:36:29 UTC (rev 18980)
@@ -1,77 +1,77 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>The VICE Emulator</title>
-</head>
-
-<body text="#000000" bgcolor="#FFFFFF">
-
-<hr>
-
-<center>
-<img SRC="images/vice-logo.jpg" ALT="The VICE"  align=CENTER>
-</center>
-
-<hr>
-<br>
-
-<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
-Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
-Mac OS X machine and executes programs intended for the old 8-bit
-computers. The current version emulates the C64, the C128, the VIC20,
-almost all PET models, the PLUS4 and the CBM-II (aka C610).
-
-<h2>
-Download VICE for HPUX based systems
-</h2>
-
-You can download the latest VICE distributions for HPUX systems here.
-Some distributions may not be available at the release date.
-
-<p>
-
-<li>
-<b>Source</b> distributions:
-</li>
-
-<ul>
-<li>
-Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
-</li>
-</ul>
-
-<p>
-
-<li>
-New <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>HPPA HPUX</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-hppa-11.11.depot.gz">vice-v2.0-hppa-11.11.depot.gz</a>.
-To be installed with the depot installer.
-</li>
-
-<li>
-Binary for <b>IA64 HPUX</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-ia64-11.31.depot.gz">vice-v2.0-ia64-11.31.depot.gz</a>.
-To be installed with the depot installer.
-</li>
-
-</ul>
-
-The files are taken from
-
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
-
-<br><br>
-
-For more information visit the <a href="index.html">main page</a>.
-
-</body>
-
-</html>
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>The VICE Emulator</title>
+</head>
+
+<body text="#000000" bgcolor="#FFFFFF">
+
+<hr>
+
+<center>
+<img SRC="images/vice-logo.jpg" ALT="The VICE"  align=CENTER>
+</center>
+
+<hr>
+<br>
+
+<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
+Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
+Mac OS X machine and executes programs intended for the old 8-bit
+computers. The current version emulates the C64, the C128, the VIC20,
+almost all PET models, the PLUS4 and the CBM-II (aka C610).
+
+<h2>
+Download VICE for HPUX based systems
+</h2>
+
+You can download the latest VICE distributions for HPUX systems here.
+Some distributions may not be available at the release date.
+
+<p>
+
+<li>
+<b>Source</b> distributions:
+</li>
+
+<ul>
+<li>
+Tarball:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
+</li>
+</ul>
+
+<p>
+
+<li>
+New <b>binary</b> distributions:
+</li>
+
+<ul>
+
+<li>
+Binary for <b>HPPA HPUX</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-hppa-11.11.depot.gz">vice-v2.0-hppa-11.11.depot.gz</a>.
+To be installed with the depot installer.
+</li>
+
+<li>
+Binary for <b>IA64 HPUX</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-ia64-11.31.depot.gz">vice-v2.0-ia64-11.31.depot.gz</a>.
+To be installed with the depot installer.
+</li>
+
+</ul>
+
+The files are taken from
+
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
+
+<br><br>
+
+For more information visit the <a href="index.html">main page</a>.
+
+</body>
+
+</html>


Property changes on: trunk/vice/doc/html/hpux.html
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:mime-type
   + text/html
Name: svn:eol-style
   + native

Modified: trunk/vice/doc/html/qnx.html
===================================================================
--- trunk/vice/doc/html/qnx.html	2008-07-09 07:56:34 UTC (rev 18979)
+++ trunk/vice/doc/html/qnx.html	2008-07-09 08:36:29 UTC (rev 18980)
@@ -1,91 +1,91 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>The VICE Emulator</title>
-</head>
-
-<body text="#000000" bgcolor="#FFFFFF">
-
-<hr>
-
-<center>
-<img SRC="images/vice-logo.jpg" ALT="The VICE"  align=CENTER>
-</center>
-
-<hr>
-<br>
-
-<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
-Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
-Mac OS X machine and executes programs intended for the old 8-bit
-computers. The current version emulates the C64, the C128, the VIC20,
-almost all PET models, the PLUS4 and the CBM-II (aka C610).
-
-<h2>
-Download VICE for QNX systems
-</h2>
-
-You can download the latest VICE distributions for QNX systems here.
-Some distributions may not be available at the release date.
-
-<p>
-
-<li>
-<b>Source</b> distributions:
-</li>
-
-<ul>
-<li>
-Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
-</li>
-</ul>
-
-<p>
-
-<li>
-New <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>x86 QNX 4.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-qnx4.tar.F">vice-2.0-qnx4.tar.F</a>.
-to be installed with the QNX 4.x installer.
-</li>
-
-<li>
-Binary for <b>x86 QNX 6.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/VICE-2.0-x86-public.qpr">VICE-2.0-x86-public.qpr</a>.
-To be installed with the QNX 6.x installer.
-</li>
-
-</ul>
-
-<li>
-Old <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>x86 QNX 6.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/VICE-1.22-x86-public.qpr">VICE-1.22-x86-public.qpr</a>.
-To be installed with the QNX 6.x installer.
-</li>
-
-</ul>
-
-The files are taken from
-
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
-
-<br><br>
-
-For more information visit the <a href="index.html">main page</a>.
-
-</body>
-
-</html>
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>The VICE Emulator</title>
+</head>
+
+<body text="#000000" bgcolor="#FFFFFF">
+
+<hr>
+
+<center>
+<img SRC="images/vice-logo.jpg" ALT="The VICE"  align=CENTER>
+</center>
+
+<hr>
+<br>
+
+<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
+Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
+Mac OS X machine and executes programs intended for the old 8-bit
+computers. The current version emulates the C64, the C128, the VIC20,
+almost all PET models, the PLUS4 and the CBM-II (aka C610).
+
+<h2>
+Download VICE for QNX systems
+</h2>
+
+You can download the latest VICE distributions for QNX systems here.
+Some distributions may not be available at the release date.
+
+<p>
+
+<li>
+<b>Source</b> distributions:
+</li>
+
+<ul>
+<li>
+Tarball:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
+</li>
+</ul>
+
+<p>
+
+<li>
+New <b>binary</b> distributions:
+</li>
+
+<ul>
+
+<li>
+Binary for <b>x86 QNX 4.x</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-qnx4.tar.F">vice-2.0-qnx4.tar.F</a>.
+to be installed with the QNX 4.x installer.
+</li>
+
+<li>
+Binary for <b>x86 QNX 6.x</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/VICE-2.0-x86-public.qpr">VICE-2.0-x86-public.qpr</a>.
+To be installed with the QNX 6.x installer.
+</li>
+
+</ul>
+
+<li>
+Old <b>binary</b> distributions:
+</li>
+
+<ul>
+
+<li>
+Binary for <b>x86 QNX 6.x</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/VICE-1.22-x86-public.qpr">VICE-1.22-x86-public.qpr</a>.
+To be installed with the QNX 6.x installer.
+</li>
+
+</ul>
+
+The files are taken from
+
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
+
+<br><br>
+
+For more information visit the <a href="index.html">main page</a>.
+
+</body>
+
+</html>


Property changes on: trunk/vice/doc/html/qnx.html
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:mime-type
   + text/html
Name: svn:eol-style
   + native

Modified: trunk/vice/doc/html/sco.html
===================================================================
--- trunk/vice/doc/html/sco.html	2008-07-09 07:56:34 UTC (rev 18979)
+++ trunk/vice/doc/html/sco.html	2008-07-09 08:36:29 UTC (rev 18980)
@@ -1,83 +1,83 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>The VICE Emulator</title>
-</head>
-
-<body text="#000000" bgcolor="#FFFFFF">
-
-<hr>
-
-<center>
-<img SRC="images/vice-logo.jpg" ALT="The VICE"  align=CENTER>
-</center>
-
-<hr>
-<br>
-
-<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
-Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
-Mac OS X machine and executes programs intended for the old 8-bit
-computers. The current version emulates the C64, the C128, the VIC20,
-almost all PET models, the PLUS4 and the CBM-II (aka C610).
-
-<h2>
-Download VICE for SCO based systems
-</h2>
-
-You can download the latest VICE distributions for SCO based systems here.
-Some distributions may not be available at the release date.
-
-<p>
-
-<li>
-<b>Source</b> distributions:
-</li>
-
-<ul>
-<li>
-Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
-</li>
-</ul>
-
-<p>
-
-<li>
-New <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>Openserver 5.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-osr5-x86-local.gz">vice-2.0-osr5-x86-local.gz</a>.
-To be installed with the package installer.
-</li>
-
-<li>
-Binary for <b>Openserver 6.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-osr6-x86-local.gz">vice-2.0-osr6-x86-local.gz</a>.
-To be installed with the package installer.
-</li>
-
-<li>
-Binary for <b>Unixware 7.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-uw7-x86-local.gz">vice-2.0-uw7-x86-local.gz</a>.
-To be installed with the package installer.
-</li>
-
-</ul>
-
-The files are taken from
-
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
-
-<br><br>
-
-For more information visit the <a href="index.html">main page</a>.
-
-</body>
-
-</html>
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>The VICE Emulator</title>
+</head>
+
+<body text="#000000" bgcolor="#FFFFFF">
+
+<hr>
+
+<center>
+<img SRC="images/vice-logo.jpg" ALT="The VICE"  align=CENTER>
+</center>
+
+<hr>
+<br>
+
+<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
+Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
+Mac OS X machine and executes programs intended for the old 8-bit
+computers. The current version emulates the C64, the C128, the VIC20,
+almost all PET models, the PLUS4 and the CBM-II (aka C610).
+
+<h2>
+Download VICE for SCO based systems
+</h2>
+
+You can download the latest VICE distributions for SCO based systems here.
+Some distributions may not be available at the release date.
+
+<p>
+
+<li>
+<b>Source</b> distributions:
+</li>
+
+<ul>
+<li>
+Tarball:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
+</li>
+</ul>
+
+<p>
+
+<li>
+New <b>binary</b> distributions:
+</li>
+
+<ul>
+
+<li>
+Binary for <b>Openserver 5.x</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-osr5-x86-local.gz">vice-2.0-osr5-x86-local.gz</a>.
+To be installed with the package installer.
+</li>
+
+<li>
+Binary for <b>Openserver 6.x</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-osr6-x86-local.gz">vice-2.0-osr6-x86-local.gz</a>.
+To be installed with the package installer.
+</li>
+
+<li>
+Binary for <b>Unixware 7.x</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-uw7-x86-local.gz">vice-2.0-uw7-x86-local.gz</a>.
+To be installed with the package installer.
+</li>
+
+</ul>
+
+The files are taken from
+
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
+
+<br><br>
+
+For more information visit the <a href="index.html">main page</a>.
+
+</body>
+
+</html>


Property changes on: trunk/vice/doc/html/sco.html
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:mime-type
   + text/html
Name: svn:eol-style
   + native


Property changes on: trunk/vice/src/c64/cart/actionreplay4.c
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


Property changes on: trunk/vice/src/c64/cart/actionreplay4.h
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: trunk/vice/src/c64/cart/stardos.c
===================================================================
--- trunk/vice/src/c64/cart/stardos.c	2008-07-09 07:56:34 UTC (rev 18979)
+++ trunk/vice/src/c64/cart/stardos.c	2008-07-09 08:36:29 UTC (rev 18980)
@@ -1,184 +1,184 @@
-/*
- * stardos.c - Cartridge handling, StarDOS cart.
- *
- * (w)2008 Groepaz/Hitmen
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- *  02111-1307  USA.
- *
- */
-
-#include "vice.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "stardos.h"
-#include "c64cart.h"
-#include "c64cartmem.h"
-#include "c64export.h"
-#include "c64io.h"
-#include "machine.h"
-#include "types.h"
-#include "util.h"
-#include "vicii-phi1.h"
-#include "c64mem.h"
-#include "c64memrom.h"
-#include "c64rom.h"
-#include "resources.h"
-
-static const c64export_resource_t export_res = {
-    "StarDOS", 1, 1
-};
-
-static BYTE stardos_kernal[C64_KERNAL_ROM_SIZE];
-static int cnt_de61, cnt_dfa1;
-
-/*  the stardos hardware is kindof perverted. it has two "registers", which
-    are nothing more than the IO1 and/or IO2 line connected to a capacitor.
-    the caps are then connected to a flipflop. now multiple reads of one of
-    the "registers" charges a capacitor, which then when its charged enough
-    causes the flipflop to switch. the output of the flipflop then controls
-    the GAME line, ie it switches a rom bank at $8000 on or off.
-
-    the original stardos code reads either $de61 or $dfa1 256 times in a loop,
-    the emulation somewhat replicates this behaviour (delayed charging of the
-    capacitor) by using a counter that is equivalent to the "charge" of the
-    caps- and we assume that 256 reads are needed to succesfully switch.
-	
-    the second rom bank contains a kernal replacement. the necessary select 
-    signal comes from a clip that has to be installed inside of the c64.
-*/
-
-void stardos_install_kernal(void)
-{
-    /* load the stardos_kernal as a kernal overriding buffer */
-    c64rom_load_kernal(NULL, stardos_kernal);
-}
-
-void stardos_remove_kernal(void)
-{
-    const char *rom_name = NULL;
-
-    c64rom_cartkernal_active=0;
-    resources_get_string("KernalName", &rom_name);
-    c64rom_load_kernal(rom_name, NULL);
-}
-
-BYTE REGPARM1 stardos_io1_read(WORD addr)
-{
-    if(addr==0xde61)
-    {
-	    ++cnt_de61;
-	    if(cnt_de61>0xff)
-	    {
-		    /* enable bank 0 at $8000 */
-		    cartridge_config_changed(0, 0, CMODE_READ);
-		    cnt_dfa1=0;
-	    }
-    }
-    
-    return vicii_read_phi1();
-} 
-
-BYTE REGPARM1 stardos_io2_read(WORD addr)
-{
-    if(addr==0xdfa1)
-    {
-	    ++cnt_dfa1;
-	    if(cnt_dfa1>0xff)
-	    {
-		    /* disable bank 0 at $8000 */
-		    cartridge_config_changed(2, 2, CMODE_READ);
-		    cnt_de61=0;
-	    }
-    }
-    
-    return vicii_read_phi1();
-}
-
-BYTE REGPARM1 stardos_roml_read(WORD addr)
-{
-    return roml_banks[(addr & 0x1fff)];
-}
-
-void stardos_config_init(void)
-{
-    stardos_install_kernal();
-    cnt_de61=0;
-    cnt_dfa1=0;
-    cartridge_config_changed(2, 2, CMODE_READ);
-}
-
-/* not sure, the original hardware doesn't work like this.
-   should probably be left out unless it will cause problems */
-#if 0
-void stardos_reset(void)
-{
-    cnt_de61=0;
-    cnt_dfa1=0;
-}
-#endif
-
-void stardos_config_setup(BYTE *rawcart)
-{
-    memcpy(roml_banks, &rawcart[0], 0x2000);
-    memcpy(stardos_kernal, &rawcart[0x2000], 0x2000);
-
-    cartridge_config_changed(2, 2, CMODE_READ);
-}
-
-int stardos_bin_attach(const char *filename, BYTE *rawcart)
-{
-    if (util_file_load(filename, rawcart, 0x4000,
-        UTIL_FILE_LOAD_SKIP_ADDRESS) < 0)
-        return -1;
-
-    if (c64export_add(&export_res) < 0)
-        return -1;
-
-    return 0;
-}
-
-int stardos_crt_attach(FILE *fd, BYTE *rawcart)
-{
-    BYTE chipheader[0x10];
-
-    if (fread(chipheader, 0x10, 1, fd) < 1)
-        return -1;
-
-    if (fread(&rawcart[0x0000], 0x2000, 1, fd) < 1)
-        return -1;
-
-    if (fread(chipheader, 0x10, 1, fd) < 1)
-        return -1;
-
-    if (fread(&rawcart[0x2000], 0x2000, 1, fd) < 1)
-        return -1;
-
-    if (c64export_add(&export_res) < 0)
-        return -1;
-
-    return 0;
-}
-
-void stardos_detach(void)
-{
-    stardos_remove_kernal();
-    c64export_remove(&export_res);
-}
+/*
+ * stardos.c - Cartridge handling, StarDOS cart.
+ *
+ * (w)2008 Groepaz/Hitmen
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "stardos.h"
+#include "c64cart.h"
+#include "c64cartmem.h"
+#include "c64export.h"
+#include "c64io.h"
+#include "machine.h"
+#include "types.h"
+#include "util.h"
+#include "vicii-phi1.h"
+#include "c64mem.h"
+#include "c64memrom.h"
+#include "c64rom.h"
+#include "resources.h"
+
+static const c64export_resource_t export_res = {
+    "StarDOS", 1, 1
+};
+
+static BYTE stardos_kernal[C64_KERNAL_ROM_SIZE];
+static int cnt_de61, cnt_dfa1;
+
+/*  the stardos hardware is kindof perverted. it has two "registers", which
+    are nothing more than the IO1 and/or IO2 line connected to a capacitor.
+    the caps are then connected to a flipflop. now multiple reads of one of
+    the "registers" charges a capacitor, which then when its charged enough
+    causes the flipflop to switch. the output of the flipflop then controls
+    the GAME line, ie it switches a rom bank at $8000 on or off.
+
+    the original stardos code reads either $de61 or $dfa1 256 times in a loop,
+    the emulation somewhat replicates this behaviour (delayed charging of the
+    capacitor) by using a counter that is equivalent to the "charge" of the
+    caps- and we assume that 256 reads are needed to succesfully switch.
+	
+    the second rom bank contains a kernal replacement. the necessary select 
+    signal comes from a clip that has to be installed inside of the c64.
+*/
+
+void stardos_install_kernal(void)
+{
+    /* load the stardos_kernal as a kernal overriding buffer */
+    c64rom_load_kernal(NULL, stardos_kernal);
+}
+
+void stardos_remove_kernal(void)
+{
+    const char *rom_name = NULL;
+
+    c64rom_cartkernal_active=0;
+    resources_get_string("KernalName", &rom_name);
+    c64rom_load_kernal(rom_name, NULL);
+}
+
+BYTE REGPARM1 stardos_io1_read(WORD addr)
+{
+    if(addr==0xde61)
+    {
+	    ++cnt_de61;
+	    if(cnt_de61>0xff)
+	    {
+		    /* enable bank 0 at $8000 */
+		    cartridge_config_changed(0, 0, CMODE_READ);
+		    cnt_dfa1=0;
+	    }
+    }
+    
+    return vicii_read_phi1();
+} 
+
+BYTE REGPARM1 stardos_io2_read(WORD addr)
+{
+    if(addr==0xdfa1)
+    {
+	    ++cnt_dfa1;
+	    if(cnt_dfa1>0xff)
+	    {
+		    /* disable bank 0 at $8000 */
+		    cartridge_config_changed(2, 2, CMODE_READ);
+		    cnt_de61=0;
+	    }
+    }
+    
+    return vicii_read_phi1();
+}
+
+BYTE REGPARM1 stardos_roml_read(WORD addr)
+{
+    return roml_banks[(addr & 0x1fff)];
+}
+
+void stardos_config_init(void)
+{
+    stardos_install_kernal();
+    cnt_de61=0;
+    cnt_dfa1=0;
+    cartridge_config_changed(2, 2, CMODE_READ);
+}
+
+/* not sure, the original hardware doesn't work like this.
+   should probably be left out unless it will cause problems */
+#if 0
+void stardos_reset(void)
+{
+    cnt_de61=0;
+    cnt_dfa1=0;
+}
+#endif
+
+void stardos_config_setup(BYTE *rawcart)
+{
+    memcpy(roml_banks, &rawcart[0], 0x2000);
+    memcpy(stardos_kernal, &rawcart[0x2000], 0x2000);
+
+    cartridge_config_changed(2, 2, CMODE_READ);
+}
+
+int stardos_bin_attach(const char *filename, BYTE *rawcart)
+{
+    if (util_file_load(filename, rawcart, 0x4000,
+        UTIL_FILE_LOAD_SKIP_ADDRESS) < 0)
+        return -1;
+
+    if (c64export_add(&export_res) < 0)
+        return -1;
+
+    return 0;
+}
+
+int stardos_crt_attach(FILE *fd, BYTE *rawcart)
+{
+    BYTE chipheader[0x10];
+
+    if (fread(chipheader, 0x10, 1, fd) < 1)
+        return -1;
+
+    if (fread(&rawcart[0x0000], 0x2000, 1, fd) < 1)
+        return -1;
+
+    if (fread(chipheader, 0x10, 1, fd) < 1)
+        return -1;
+
+    if (fread(&rawcart[0x2000], 0x2000, 1, fd) < 1)
+        return -1;
+
+    if (c64export_add(&export_res) < 0)
+        return -1;
+
+    return 0;
+}
+
+void stardos_detach(void)
+{
+    stardos_remove_kernal();
+    c64export_remove(&export_res);
+}


Property changes on: trunk/vice/src/c64/cart/stardos.c
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


Property changes on: trunk/vice/src/c64/cart/stardos.h
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18979] trunk/vice

From: <bla...@us...> - 2008-07-09 07:56:27

Revision: 18979
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18979&view=rev
Author:   blackystardust
Date:     2008-07-09 00:56:34 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Updated the dutch translations in translate.c and removed the '#~' items from the *.po files.

Modified Paths:
--------------
    trunk/vice/po/ChangeLog
    trunk/vice/po/de.po
    trunk/vice/po/fr.po
    trunk/vice/po/it.po
    trunk/vice/po/nl.po
    trunk/vice/po/pl.po
    trunk/vice/po/sv.po
    trunk/vice/src/ChangeLog
    trunk/vice/src/translate.c

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-07-08 20:44:34 UTC (rev 18978)
+++ trunk/vice/po/ChangeLog	2008-07-09 07:56:34 UTC (rev 18979)
@@ -1,5 +1,10 @@
 2008-07-08  Marco van den Heuvel  <bla...@ya...>
 
+	* de.po, fr.po, hu.po, it.po, nl.po, pl.po, sv.po: Removed the
+	'#~' items.
+
+2008-07-08  Marco van den Heuvel  <bla...@ya...>
+
 	* nl.po: Updated.
 
 2008-07-08  Spiro Trikaliotis  <spi...@gm...>

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-07-08 20:44:34 UTC (rev 18978)
+++ trunk/vice/po/de.po	2008-07-09 07:56:34 UTC (rev 18979)
@@ -11322,517 +11322,3 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr "Amiga Maus"
-
-#, fuzzy
-#~ msgid "Attach raw 32KB Action Replay 4 cartridge image"
-#~ msgstr "32K Action Replay Image einlegen"
-
-#, fuzzy
-#~ msgid "Attach raw StarDOS image"
-#~ msgstr "Band Image einlegen"
-
-#~ msgid "Drive &8\tAlt+8"
-#~ msgstr "Laufwerk &8\tAlt+8"
-
-#~ msgid "Drive &9\tAlt+9"
-#~ msgstr "Laufwerk &9\tAlt+9"
-
-#~ msgid "Drive 1&0\tAlt+0"
-#~ msgstr "Laufwerk 1&0\tAlt+0"
-
-#~ msgid "Drive &11\tAlt+1"
-#~ msgstr "Laufwerk11 &11\tAlt+1"
-
-#~ msgid "&All\tAlt+A"
-#~ msgstr "&Alle\tAlt+A"
-
-#~ msgid "&Add current image\tAlt+I"
-#~ msgstr "&Aktuelles Image hinzuf\xFCgen\tAlt+I"
-
-#~ msgid "&Remove current image\tAlt+K"
-#~ msgstr "Aktuelles Image entfe&rnen\tAlt+K"
-
-#~ msgid "Attach &next image\tAlt+N"
-#~ msgstr "N\xE4chstes Image\tAlt+N"
-
-#~ msgid "Attach &previous image\tAlt+B"
-#~ msgstr "Voriges Image\tAlt+B"
-
-#~ msgid "Attach &tape image...\tAlt+T"
-#~ msgstr "Band Image einlegen...\tAlt+T"
-
-#~ msgid "Cartridge free&ze\tAlt+Z"
-#~ msgstr "Erweiterungsmodul Freeze\tAlt+Z"
-
-#~ msgid "&Pause\tAlt+Pause"
-#~ msgstr "&Pause\tAlt+Pause"
-
-#~ msgid "&Monitor\tAlt+M"
-#~ msgstr "&Monitor\tAlt+M"
-
-#~ msgid "&Hard\tCtrl+Alt+R"
-#~ msgstr "&Hart\tCtrl+Alt+R"
-
-#~ msgid "&Soft\tAlt+R"
-#~ msgstr "&Soft\tAlt+R"
-
-#~ msgid "E&xit\tAlt+X"
-#~ msgstr "E&xit\tAlt+X"
-
-#~ msgid "&Load quicksnapshot image\tAlt+L"
-#~ msgstr "Schnell&laden von Snapshot Image\tAlt+L"
-
-#~ msgid "&Save quicksnapshot image\tAlt+S"
-#~ msgstr "&Schnellspeichern von Snapshot\tAlt+S"
-
-#~ msgid "Set Recording Milestone\tAlt+G"
-#~ msgstr "Setze Aufnahme Meilenstein\tAlt+G"
-
-#~ msgid "Return to Milestone\tAlt+H"
-#~ msgstr "R\xFCckkehr zum Meilenstein\tAlt+H"
-
-#~ msgid "Save/stop media file...\tAlt+C"
-#~ msgstr "Speichern/stop media Datei...\tAlt+C"
-
-#~ msgid "&Warp mode\tAlt+W"
-#~ msgstr "&Warp modus\tAlt+W"
-
-#~ msgid "Swap &Joystick\tAlt+J"
-#~ msgstr "Joystick ports austauschen\tAlt+J"
-
-#~ msgid "&Grab mouse events\tAlt+Q"
-#~ msgstr "&Maus Ereignisse abfangen\tAlt+Q"
-
-#~ msgid "Fullscreen\tAlt+D"
-#~ msgstr "Vollbild\tAlt+D"
-
-#~ msgid "Can't add fontpath `%s'.\n"
-#~ msgstr "Schriftpfad hinzuf\xFCgen ist fehlgeschlagen: `%s'.\n"
-
-#~ msgid "Set fontpath: `%s'.\n"
-#~ msgstr "Setze Fontpfad: `%s'.\n"
-
-#~ msgid "Cannot load text font %s."
-#~ msgstr "Laden der Textschrift `%s' fehlgeschlagen."
-
-#~ msgid "Enable emulation of the 1351 proportional mouse"
-#~ msgstr "Emulation der 1351 Proportional Mouse aktivieren"
-
-#~ msgid "Disable emulation of the 1351 proportional mouse"
-#~ msgstr "Emulation der 1351 Proportional Mouse deaktivieren"
-
-#, fuzzy
-#~ msgid "Romsetbestand"
-#~ msgstr "Rom Satz"
-
-#~ msgid "Mouse Port"
-#~ msgstr "Maus Port"
-
-#~ msgid "*VIC-II settings"
-#~ msgstr "*VIC-II Einstellungen"
-
-#~ msgid "Commands"
-#~ msgstr "Kommandos"
-
-#~ msgid "DGA1 Resolutions"
-#~ msgstr "DGA1 Aufl\xF6sungen"
-
-#~ msgid "DGA2 Resolutions"
-#~ msgstr "DGA2 Aufl\xF6sungen"
-
-#~ msgid "Successfully initialized video."
-#~ msgstr "Video erfolgreich initialisiert."
-
-#~ msgid "Found %dbit visual."
-#~ msgstr "%dbit Farbtiefe erkannt."
-
-#~ msgid "Attach debugger to pid %d...\n"
-#~ msgstr "Attach debugger to pid %d...\n"
-
-#~ msgid "Successfully forked DGA."
-#~ msgstr "Successfully forked DGA"
-
-#~ msgid "Unable to query DGA1 version."
-#~ msgstr "DGA1 Version kann nicht abgefragt werden."
-
-#~ msgid "Unable to query DGA1 information."
-#~ msgstr "DGA1 Version kann nicht abgefragt werden."
-
-#~ msgid "Root permissions required to use DGA1."
-#~ msgstr "Superuser Privilegien werden f\xFCr DGA1 ben\xF6tigt."
-
-#~ msgid "Problems with DGA - disabling fullscreen."
-#~ msgstr "Probleme mit DGA - deaktiviere Vollbildmodus"
-
-#~ msgid "Error switching to fullscreen%s"
-#~ msgstr "Fehler beim Umschalten auf Vollbild Modus%s"
-
-#~ msgid "DGA extension: addr:%p, width %d, bank size %d mem size %d\n"
-#~ msgstr "DGA extension: addr:%p, width %d, bank size %d mem size %d\n"
-
-#~ msgid "Switch to windowmode"
-#~ msgstr "Umschalten auf Fenster Modus"
-
-#~ msgid "Selected mode: %s"
-#~ msgstr "Gew\xE4hlter Modus: %s"
-
-#~ msgid "Attach debugger to pid %d..."
-#~ msgstr "Attach debugger to pid %d..."
-
-#~ msgid "refresh, not ready, skipping frame"
-#~ msgstr "Bildrefresh nicht fertig, \xFCberspringe Bild"
-
-#~ msgid "Successfully forked DGA"
-#~ msgstr "Successfully forked DGA"
-
-#~ msgid "Unable to query video extension version - disabling fullscreen."
-#~ msgstr ""
-#~ "Kann Version von Video Erweiterung nicht feststellen - deaktivier "
-#~ "Vollbildmodus"
-
-#~ msgid "Unable to query video extension information - disabling fullscreen."
-#~ msgstr ""
-#~ "Kann n\xF6tige Information f\xFCr Video Erweiterung nicht abfragen - deaktivier "
-#~ "Vollbildmodus"
-
-#~ msgid "Xserver is running an old XFree86-DGA version (%d.%d) "
-#~ msgstr "Alte Version der XFree86-VidMode Erweiterung erkannt (%d.  %d)"
-
-#~ msgid "Minimum required version is %d.%d - disabling fullscreen."
-#~ msgstr "Minimal erforderliche Version ist %d.%d - deaktivier Vollbildmodus"
-
-#~ msgid "Switch to fullscreen%s"
-#~ msgstr "Aktiviere Vollbild Modus%s"
-
-#~ msgid "Need root privileges for DGA2 fullscreen"
-#~ msgstr ""
-#~ "Super User Privilegien sind n\xF6tig um den Vollbild Modus zu aktivieren."
-
-#~ msgid "Error switching to fullscreen (SetMode) %ix%i"
-#~ msgstr "Fehler beim Umschalten auf Vollbild Modus %ix%i"
-
-#~ msgid "Error switching to fullscreen (pixmap) %ix%i"
-#~ msgstr "Fehler beim Umschalten auf Vollbild Modus %ix%i"
-
-#~ msgid ""
-#~ "Not enough video memory pages in mode %s, disabling fullscreen (%d,%d)."
-#~ msgstr ""
-#~ "Nicht gen\xFCgend Speicher f\xFCr Vollbild Modus %s vorhanden - deaktiviere "
-#~ "Vollbildmodus (%d,%d)"
-
-#~ msgid "Error switching to fullscreen (CreateGC) %ix%i"
-#~ msgstr "Fehler beim Umschalten auf Vollbild Modus %ix%i"
-
-#~ msgid "Couldn't allocate color cache"
-#~ msgstr "Nicht gen\xFCgend Speicher f\xFCr Farbcache vorhanden"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Start monitor?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Monitor Aktivieren ?"
-
-#~ msgid "glXWaitVideoSyncSGI() returned %d"
-#~ msgstr "glXWaitVideoSyncSGI() lieferte %d"
-
-#~ msgid "glXChooseVisual() failed"
-#~ msgstr "glXChooseVisual() ist gescheitert"
-
-#~ msgid "glXCreateContext() failed"
-#~ msgstr "glXCreateContext() ist gescheitert"
-
-#~ msgid "GLX_SGI_video_sync extension is supported"
-#~ msgstr "GLX_SGI_video_sync Erweiterung wird unterst\xFCtzt"
-
-#~ msgid "GLX_SGI_video_sync extension not supported"
-#~ msgstr "GLX_SGI_video_sync Erweiterung wird nicht unterst\xFCtzt"
-
-#~ msgid "%s openGL_sync"
-#~ msgstr "%s openGL_sync"
-
-#~ msgid "enabling"
-#~ msgstr "aktiviere"
-
-#~ msgid "disabling"
-#~ msgstr "deaktiviere"
-
-#~ msgid "double size not implemented - use standard double size from menu."
-#~ msgstr ""
-#~ "Doppelte Gr\xF6\xDFe ist nicht implementiert - verwende standard doppelte Gr\xF6\xDFe "
-#~ "aus dem Men\xFC"
-
-#~ msgid "X11 XRandR extension not available, using default display mode."
-#~ msgstr ""
-#~ "X11 XRandR Erweiterung ist nicht verf\xFCgbar, verwender standard display "
-#~ "Modus."
-
-#~ msgid "XRandR reports current display: %dx%d@%d"
-#~ msgstr "XRandR aktueller Displaymodus: %dx%d@%d"
-
-#~ msgid "%s XRandR"
-#~ msgstr "%s XRandR"
-
-#~ msgid "XRandR setting failed: %d"
-#~ msgstr "XRandR Aktivierung ist gescheitert: %d"
-
-#, fuzzy
-#~ msgid "Ebable SID Cartridge"
-#~ msgstr "Erweiterungsmodul speichern"
-
-#~ msgid "Quicksaving file %s."
-#~ msgstr "Schnell Speicherung von Datei %s."
-
-#, fuzzy
-#~ msgid "*Drive #8 parallel cable"
-#~ msgstr "*Parallel Kabel f\xFCr Laufwerk #8 aktivieren"
-
-#, fuzzy
-#~ msgid "*Drive #9 parallel cable"
-#~ msgstr "*Parallel Kabel f\xFCr Laufwerk #9 aktivieren"
-
-#, fuzzy
-#~ msgid "*Drive #10 parallel cable"
-#~ msgstr "*Parallel Kabel f\xFCr Laufwerk #10 aktivieren"
-
-#, fuzzy
-#~ msgid "*Drive #11 parallel cable"
-#~ msgstr "*Parallel Kabel f\xFCr Laufwerk #11 aktivieren"
-
-#~ msgid "*$2000-$3FFF RAM expansion"
-#~ msgstr "*$2000-$3FFF RAM Erweiterung"
-
-#~ msgid "*$4000-$5FFF RAM expansion"
-#~ msgstr "*$4000-$5FFF RAM Erweiterung"
-
-#~ msgid "*$6000-$7FFF RAM expansion"
-#~ msgstr "*$6000-$7FFF RAM Erweiterung"
-
-#~ msgid "*$8000-$9FFF RAM expansion"
-#~ msgstr "*$8000-$9FFF RAM Erweiterung"
-
-#~ msgid "*$A000-$BFFF RAM expansion"
-#~ msgstr "*$A000-$BFFF RAM Erweiterung"
-
-#~ msgid "*Custom Keys"
-#~ msgstr "*Benutzerdefiniert"
-
-#, fuzzy
-#~ msgid "Cannot create image file"
-#~ msgstr "Kann Datei `%s' nicht erzeugen"
-
-#, fuzzy
-#~ msgid "Enable the TFE (\")The Final Ethernet\") unit"
-#~ msgstr "TFE (\"the final ethernet\") Erweiterung aktivitieren"
-
-#, fuzzy
-#~ msgid "Disable the TFE (\")The Final Ethernet\") unit"
-#~ msgstr "TFE (\"the final ethernet\") Erweiterung deaktivitieren"
-
-#~ msgid "Enable SpeedDOS-compatible parallel cable"
-#~ msgstr "SpeedDOS kompatibles Parallelkabel aktivieren"
-
-#~ msgid "Disable SpeedDOS-compatible parallel cable"
-#~ msgstr "SpeedDOS kompatibles Parallelkabel deaktivieren"
-
-#~ msgid "Filename: "
-#~ msgstr "Dateiname: "
-
-#~ msgid "VIC II Screenshot"
-#~ msgstr "VIC II Screenshot"
-
-#~ msgid "VDC Screenshot"
-#~ msgstr "VDC Screenshot"
-
-#~ msgid "Screenshot..."
-#~ msgstr "Screenshot..."
-
-#~ msgid "IDE64: Using imagefile `%s'."
-#~ msgstr "IDE64: Verwende Image Datei `%s'."
-
-#~ msgid "IDE64: Cannot use image file `%s'. NO DRIVE EMULATION!"
-#~ msgstr "IDE64: Image Datei `%s' nicht verwendbar. KEINE LAUFWERK EMULATION!"
-
-#~ msgid "IDE64: Couldn't read disk geometry from image, using default 8MB."
-#~ msgstr ""
-#~ "IDE64: Kann Disk Geometrie aus Image Datei nicht ableiten, benutze 8MB "
-#~ "Standard."
-
-#~ msgid "IDE64: Disk is not formatted, using default 8MB."
-#~ msgstr "IDE64: Disk ist nicht formatiert, benutze 8MB Standard."
-
-#~ msgid "IDE64: using %i/%i/%i CHS geometry, %lu sectors total."
-#~ msgstr "IDE64: Benutze %i/%i/%i CHS Geometire, %lu Sektoren insgesamt."
-
-#~ msgid "IDE64: LBA geometry, %lu sectors total."
-#~ msgstr "IDE64: LBA Geometrie, %lu Sektoren insgesamt."
-
-#, fuzzy
-#~ msgid "Cannot read received snapshot file"
-#~ msgstr "Kann Snapshot Datei nicht laden."
-
-#~ msgid "Save as"
-#~ msgstr "Speichern als"
-
-#~ msgid "Specify name of first RS232 device (/dev/ttyS0)"
-#~ msgstr "Device Name f\xFCr erstes RS232 Ger\xE4t definieren (/dev/ttyS0)"
-
-#~ msgid "Specify name of second RS232 device (/dev/ttyS1)"
-#~ msgstr "Name f\xFCr zweites RS232 Ger\xE4t definieren (/dev/ttyS1)"
-
-#~ msgid "Specify name of third RS232 device (rs232.dump)"
-#~ msgstr "Name f\xFCr drittes RS232 Ger\xE4t definieren (rs232.dump)"
-
-#~ msgid "Specify command to pipe data in/out, preceed with '|' (|lpr)"
-#~ msgstr "Kommando f\xFCr Daten in-/output definieren, '|' voranstellen (|lpr)"
-
-#~ msgid "Unknown image type."
-#~ msgstr "Unbekannter Image Typ."
-
-#~ msgid "Use XVideo Extension (hardware scaling)"
-#~ msgstr "XVideo Erweiterung nutzen (Hardware Skalierung)"
-
-#~ msgid "Use software rendering"
-#~ msgstr "Software Rendering benutzen"
-
-#~ msgid "*Userport 300 baud RS232 emulation"
-#~ msgstr "*Userport 300 Baud RS232 Emulation"
-
-#~ msgid "*Userport 1200 baud RS232 emulation"
-#~ msgstr "*Userport 1200 Baud RS232 Emulation"
-
-#~ msgid "*CIA 9600 baud RS232 emulation"
-#~ msgstr "*CIA 9600 Baud RS232 Emulation"
-
-#~ msgid "Load custom ROM set definition"
-#~ msgstr "Benutzerdefinierten ROM Satz laden"
-
-#~ msgid "Unload Basic ROM"
-#~ msgstr "Basic ROM entfernen"
-
-#~ msgid "Could not create milestone snapshot file."
-#~ msgstr "Kann Meilenstein Snapshot Datei nicht erzeugen."
-
-#~ msgid "Flush IEC printer #4 device"
-#~ msgstr "Leeren vom IEC Drucker #4 Ger\xE4t"
-
-#~ msgid "Flush IEC printer #5 device"
-#~ msgstr "Leeren vom IEC Drucker #5 Ger\xE4t"
-
-#, fuzzy
-#~ msgid "*Drive #10 enable IEC device"
-#~ msgstr "*Parallel Kabel f\xFCr Laufwerk #9 aktivieren"
-
-#, fuzzy
-#~ msgid "*Drive #11 enable IEC device"
-#~ msgstr "*Parallel Kabel f\xFCr Laufwerk #9 aktivieren"
-
-#~ msgid "*Sharp PAL Emulation (Y/C Input)"
-#~ msgstr "*Sharfe PAL Emulation (Y/C Eingang)"
-
-#~ msgid "*Blurry PAL Emulation (Composite Input)"
-#~ msgstr "*Unscharfe PAL Emulation (Composite Eingang)"
-
-#~ msgid "Memory settings"
-#~ msgstr "Speicher Einstellungen"
-
-#~ msgid "*3.00 sec"
-#~ msgstr "*3.00 sec"
-
-#~ msgid "VIC-II Video settings"
-#~ msgstr "VIC-II Einstellungen"
-
-#~ msgid "TED Video settings"
-#~ msgstr "TED Video Einstellungen"
-
-#~ msgid "Found suitable mode for fullscreen."
-#~ msgstr "Passender Aufl\xF6sung f\xFCr Vollbild Modus vorhanden."
-
-#~ msgid "Couldn't allocate pixel value cache."
-#~ msgstr "Zuwenig Speicher f\xFCr Pixel Cache."
-
-#~ msgid "*Enable DGA2 fullscreen"
-#~ msgstr "*Aktiviere DGA2 Vollbild Modus"
-
-#~ msgid "Successfully forked DGA\n"
-#~ msgstr "Successfully forked DGA\n"
-
-#~ msgid "Xserver is running an old XFree86-VidMode version (%d.  %d)"
-#~ msgstr "Alte Version der XFree86-VidMode Erweiterung erkannt (%d.  %d)"
-
-#~ msgid ""
-#~ "Vice is not running as root, DGA extension not possible - disabling "
-#~ "fullscreen."
-#~ msgstr ""
-#~ "Vice l\xE4uft nicht mit root Privilegiern, DGA Erweiterung nicht m\xF6glich - "
-#~ "deaktivier Vollbildmodus."
-
-#~ msgid "Could not find KeySym `%s'!"
-#~ msgstr "Kann Key Symbol `%s' nicht finden!"
-
-#~ msgid "Bad row/column value (%d/%d) for keysym `%s'."
-#~ msgstr "Falsche Wert f\xFCr Zeile/Spalte (%d/%d) Bei Key Symbol `%s'."
-
-#~ msgid "Loading keymap `%s'."
-#~ msgstr "Lade Keymap `%s'."
-
-#~ msgid "Cannot load keymap `%s'."
-#~ msgstr "Kann Keymap Datei `%s' nicht laden."
-
-#~ msgid "(null)"
-#~ msgstr "(null)"
-
-#~ msgid ""
-#~ "Couldn't allocate backbuffer for DGA PAL rendering; disabling fullscreen."
-#~ msgstr ""
-#~ "Zuwenig Zwischenspeicher f\xFCr PAL Rendering - deaktiviere Vollbild Modus."
-
-#~ msgid "Please recompile the program for a supported bit depth."
-#~ msgstr "Bitte VICE mit passender Farbtiefe neu \xFCbersetzen."
-
-#~ msgid "Only %ibpp supported by this emulator."
-#~ msgstr "Lediglich %ibpp wird von diesem Emulator unterst\xFCtzt."
-
-#~ msgid "Current X server depth is %ibpp."
-#~ msgstr "Aktuelle X Server Farbtiefe ist %ibpp"
-
-#~ msgid "Switch X server depth or recompile with --enable-autobpp."
-#~ msgstr "Switch X server depth or recompile with --enable-autobpp."
-
-#~ msgid "*Model defaults"
-#~ msgstr "*Modell Standardeinstellungen"
-
-#~ msgid "Screen color"
-#~ msgstr "Bildschirmfarbe"
-
-#~ msgid "Change to fullscreen %ix%i"
-#~ msgstr "Umaschalten auf Vollbild Modus %ix%i"
-
-#~ msgid "Specify command for printer 1 (|petlp |lpr)"
-#~ msgstr "Command f\xFCr Drucker 1 definieren (|petlp |lpr)"
-
-#~ msgid "Specify command for printer 2 (|lpr)"
-#~ msgstr "Kommando f\xFCr Drucker 2 definieren (|lpr)"
-
-#~ msgid "print_open(device=%d)."
-#~ msgstr "print_open(device=%d)."
-
-#~ msgid "Trying to write to invalid fd %d."
-#~ msgstr "Trying to write to invalid fd %d."
-
-#~ msgid "Trying to write to non-open fd %d."
-#~ msgstr "Trying to write to non-open fd %d."
-
-#~ msgid "Trying to flush invalid fd %d."
-#~ msgstr "Trying to flush invalid fd %d."
-
-#~ msgid "Trying to flush non-open fd %d."
-#~ msgstr "Trying to flush non-open fd %d."
-
-#~ msgid "Color request for canvas %p."
-#~ msgstr "Color request for canvas %p."
-
-#~ msgid "Change color request for canvas %p."
-#~ msgstr "Change color request for canvas %p."

Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po	2008-07-08 20:44:34 UTC (rev 18978)
+++ trunk/vice/po/fr.po	2008-07-09 07:56:34 UTC (rev 18979)
@@ -11866,365 +11866,3 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr ""
-
-#~ msgid "Specify name of Norwegian Kernal ROM image"
-#~ msgstr "Sp\xE9cifier le nom de l'image Kernal norv\xE9gienne"
-
-#, fuzzy
-#~ msgid "Attach raw 32KB Action Replay 4 cartridge image"
-#~ msgstr "Ins\xE9rer une cartouche Action Replay 32KO"
-
-#, fuzzy
-#~ msgid "Attach raw StarDOS image"
-#~ msgstr "Ins\xE9rer une image de datassette"
-
-#~ msgid "Drive &8\tAlt+8"
-#~ msgstr "Lecteur #&8\tAlt+8"
-
-#~ msgid "Drive &9\tAlt+9"
-#~ msgstr "Lecteur #&9\tAlt+9"
-
-#~ msgid "Drive 1&0\tAlt+0"
-#~ msgstr "Lecteur #&10\tAlt+0"
-
-#~ msgid "Drive &11\tAlt+1"
-#~ msgstr "Lecteur #&11\tAlt+1"
-
-#~ msgid "&All\tAlt+A"
-#~ msgstr "&Tout\tAlt+A"
-
-#~ msgid "&Add current image\tAlt+I"
-#~ msgstr "&Ajouter l'image de disque courante\tAlt+I"
-
-#~ msgid "&Remove current image\tAlt+K"
-#~ msgstr "&Retirer l'image de disque courante\tAlt+K"
-
-#~ msgid "Attach &next image\tAlt+N"
-#~ msgstr "Ins\xE9rer la &prochaine image\tAlt+N"
-
-#~ msgid "Attach &previous image\tAlt+B"
-#~ msgstr "Ins\xE9rer l'image p&r\xE9c\xE9dente\tAlt+B"
-
-#~ msgid "Attach &tape image...\tAlt+T"
-#~ msgstr "Ins\xE9rer une image &datassette...\tAlt+T"
-
-#~ msgid "Cartridge free&ze\tAlt+Z"
-#~ msgstr "Geler la cartouche\tAlt+2"
-
-#~ msgid "&Pause\tAlt+Pause"
-#~ msgstr "&Pause\tAlt+Pause"
-
-#~ msgid "&Monitor\tAlt+M"
-#~ msgstr "&Tracer\tAlt+M"
-
-#~ msgid "&Hard\tCtrl+Alt+R"
-#~ msgstr "&Physiquement\tCtrl+Alt+R"
-
-#~ msgid "&Soft\tAlt+R"
-#~ msgstr "&Logiciellement\tAlt+R"
-
-#~ msgid "E&xit\tAlt+X"
-#~ msgstr "&Quitter\tAlt+X"
-
-#~ msgid "&Load quicksnapshot image\tAlt+L"
-#~ msgstr "&Charger la sauvegarde rapide\tAlt+L"
-
-#~ msgid "&Save quicksnapshot image\tAlt+S"
-#~ msgstr "&Enregistrer la sauvegarde rapide\tAlt+L"
-
-#~ msgid "Set Recording Milestone\tAlt+G"
-#~ msgstr "Lever le Signet d'enregistrement\tAlt+G"
-
-#~ msgid "Return to Milestone\tAlt+H"
-#~ msgstr "Retourner au Signet d'enregistrement\tAlt+H"
-
-#~ msgid "Save/stop media file...\tAlt+C"
-#~ msgstr "Enregistrer/Arr\xEAter fichier m\xE9dia...\tAlt+C"
-
-#~ msgid "&Warp mode\tAlt+W"
-#~ msgstr "&Mode turbo\tAlt+W"
-
-#~ msgid "Swap &Joystick\tAlt+J"
-#~ msgstr "Interchanger les joysticks"
-
-#~ msgid "Fullscreen\tAlt+D"
-#~ msgstr "P\xE9riph\xE9rique plein \xE9cran"
-
-#~ msgid "Can't add fontpath `%s'.\n"
-#~ msgstr "Impossible d'ajouter le \"fontpath\" `%s'.\n"
-
-#~ msgid "Set fontpath: `%s'.\n"
-#~ msgstr "D\xE9finir le \"fontpath\": `%s'.\n"
-
-#~ msgid "Cannot load text font %s."
-#~ msgstr "Impossible de charger la police de caract\xE8res %s."
-
-#~ msgid "Enable emulation of the 1351 proportional mouse"
-#~ msgstr "Activer l'\xE9mulation de la souris 1351"
-
-#~ msgid "Disable emulation of the 1351 proportional mouse"
-#~ msgstr "D\xE9sactiver l'\xE9mulation de la souris 1351"
-
-#, fuzzy
-#~ msgid "Romsetbestand"
-#~ msgstr "Romset"
-
-#, fuzzy
-#~ msgid "Mouse Port"
-#~ msgstr "Imprimante Userport"
-
-#~ msgid "*VIC-II settings"
-#~ msgstr "*Param\xE8tres VIC-II"
-
-#~ msgid "Commands"
-#~ msgstr "Commandes"
-
-#~ msgid "DGA1 Resolutions"
-#~ msgstr "R\xE9solutions DGA1"
-
-#~ msgid "DGA2 Resolutions"
-#~ msgstr "R\xE9solutions DGA2"
-
-#~ msgid "Successfully initialized video."
-#~ msgstr "Initialisation vid\xE9o r\xE9ussie."
-
-#~ msgid "Found %dbit visual."
-#~ msgstr "D\xE9tect\xE9 une capacit\xE9 visuelle de %dbits."
-
-#~ msgid "Attach debugger to pid %d...\n"
-#~ msgstr "Attacher le d\xE9bogeur au pid %d...\n"
-
-#~ msgid "Successfully forked DGA."
-#~ msgstr "Fork de DGA r\xE9ussi."
-
-#~ msgid "Unable to query DGA1 version."
-#~ msgstr "Impossible d'envoyer des requ\xEAtes de version DGA1"
-
-#~ msgid "Unable to query DGA1 information."
-#~ msgstr "Impossible d'envoyer des requ\xEAtes d'information DGA1"
-
-#~ msgid "Root permissions required to use DGA1."
-#~ msgstr "Permissions root requises pour utiliser DGA1."
-
-#~ msgid "Problems with DGA - disabling fullscreen."
-#~ msgstr "Probl\xE8mes avec DGA - d\xE9sactivation du mode plein \xE9cran."
-
-#~ msgid "Error switching to fullscreen%s"
-#~ msgstr "Erreur lors du passage au mode plein \xE9cran%s"
-
-#~ msgid "DGA extension: addr:%p, width %d, bank size %d mem size %d\n"
-#~ msgstr ""
-#~ "Extension DGA: addr:%p, taille %d, taille banque %d, taille mem %d\n"
-
-#~ msgid "Switch to windowmode"
-#~ msgstr "Passer au mode fen\xEAtr\xE9"
-
-#~ msgid "Selected mode: %s"
-#~ msgstr "Mode s\xE9lectionn\xE9: %s"
-
-#~ msgid "Attach debugger to pid %d..."
-#~ msgstr "Attacher le d\xE9bogeur au pid %d..."
-
-#~ msgid "refresh, not ready, skipping frame"
-#~ msgstr "rafra\xEEchissement, non pr\xEAt, saute par dessus cette frame"
-
-#~ msgid "Successfully forked DGA"
-#~ msgstr "Fork DGA r\xE9ussi"
-
-#~ msgid "Unable to query video extension version - disabling fullscreen."
-#~ msgstr ""
-#~ "Impossible de d\xE9terminer la version de l'extension vid\xE9o - mode plein "
-#~ "\xE9cran d\xE9sactiv\xE9."
-
-#~ msgid "Unable to query video extension information - disabling fullscreen."
-#~ msgstr ""
-#~ "Impossible de d\xE9terminer les information de l'extension vid\xE9o - mode "
-#~ "plein \xE9cran d\xE9sactiv\xE9."
-
-#~ msgid "Xserver is running an old XFree86-DGA version (%d.%d) "
-#~ msgstr "Xserver ex\xE9cute une ancienne version d'XFree86-DGA (%d.%d) "
-
-#~ msgid "Minimum required version is %d.%d - disabling fullscreen."
-#~ msgstr ""
-#~ "La version minimale requise est %d.%d - d\xE9sactivation du mode plein \xE9cran"
-
-#~ msgid "Switch to fullscreen%s"
-#~ msgstr "Passage au mode plein \xE9cran%s"
-
-#~ msgid "Need root privileges for DGA2 fullscreen"
-#~ msgstr "Privil\xE8ges root requis pour le mode DGA2 plein \xE9cran"
-
-#~ msgid "Error switching to fullscreen (SetMode) %ix%i"
-#~ msgstr "Erreur de passage au mode plein \xE9cran (SetMode) %ix%i"
-
-#~ msgid "Error switching to fullscreen (pixmap) %ix%i"
-#~ msgstr "Erreur de passage au mode plein \xE9cran (pixmap) %ix%i"
-
-#~ msgid ""
-#~ "Not enough video memory pages in mode %s, disabling fullscreen (%d,%d)."
-#~ msgstr ""
-#~ "Nombre insuffisant de pages de m\xE9moire vi\xE9do en mode %s, d\xE9sactivation du "
-#~ "mode plein \xE9cran (%d,%d)."
-
-#~ msgid "Error switching to fullscreen (CreateGC) %ix%i"
-#~ msgstr "Erreur de passage au mode plein \xE9cran (CreateGC) %ix%i"
-
-#~ msgid "Couldn't allocate color cache"
-#~ msgstr "Impossible d'allouer le cache couleur"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Start monitor?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Activer la trace?"
-
-#, fuzzy
-#~ msgid "glXChooseVisual() failed"
-#~ msgstr "\xC9chec de XCreateImage."
-
-#, fuzzy
-#~ msgid "glXCreateContext() failed"
-#~ msgstr "\xC9chec de XCreateImage."
-
-#, fuzzy
-#~ msgid "enabling"
-#~ msgstr "r\xE9\xE9chantillonage"
-
-#, fuzzy
-#~ msgid "disabling"
-#~ msgstr "r\xE9\xE9chantillonage"
-
-#, fuzzy
-#~ msgid "Ebable SID Cartridge"
-#~ msgstr "Sauvegarde de la cartouche"
-
-#~ msgid "Quicksaving file %s."
-#~ msgstr "Enregistrement rapide du fichier %s."
-
-#, fuzzy
-#~ msgid "*Drive #8 parallel cable"
-#~ msgstr "*Activer l'utilisation du c\xE2ble parral\xE8le pour le lecteur #8"
-
-#, fuzzy
-#~ msgid "*Drive #9 parallel cable"
-#~ msgstr "*Activer l'utilisation du c\xE2ble parral\xE8le pour le lecteur #9"
-
-#, fuzzy
-#~ msgid "*Drive #10 parallel cable"
-#~ msgstr "*Activer l'utilisation du c\xE2ble parral\xE8le pour le lecteur #10"
-
-#, fuzzy
-#~ msgid "*Drive #11 parallel cable"
-#~ msgstr "*Activer l'utilisation du c\xE2ble parral\xE8le pour le lecteur #11"
-
-#~ msgid "*$2000-$3FFF RAM expansion"
-#~ msgstr "*Expansion de RAM $2000-$3FFF"
-
-#~ msgid "*$4000-$5FFF RAM expansion"
-#~ msgstr "*Expansion de RAM $4000-$5FFF"
-
-#~ msgid "*$6000-$7FFF RAM expansion"
-#~ msgstr "*Expansion de RAM $6000-$7FFF"
-
-#~ msgid "*$8000-$9FFF RAM expansion"
-#~ msgstr "*Expansion de RAM $8000-$9FFF"
-
-#~ msgid "*$A000-$BFFF RAM expansion"
-#~ msgstr "*Expansion de RAM $A000-$BFFF"
-
-#~ msgid "*Custom Keys"
-#~ msgstr "*Touches personnalis\xE9es"
-
-#, fuzzy
-#~ msgid "Cannot create image file"
-#~ msgstr "Impossible de cr\xE9er le fichier image %s"
-
-#, fuzzy
-#~ msgid "Enable the TFE (\")The Final Ethernet\") unit"
-#~ msgstr "Activer l'unit\xE9 TFE (\"The Final Ethernet\")"
-
-#, fuzzy
-#~ msgid "Disable the TFE (\")The Final Ethernet\") unit"
-#~ msgstr "D\xE9sactiver l'unit\xE9 TFE"
-
-#~ msgid "Enable SpeedDOS-compatible parallel cable"
-#~ msgstr "Activer l'utilisation du c\xE2ble parall\xE8le compatible SpeedDOS"
-
-#~ msgid "Disable SpeedDOS-compatible parallel cable"
-#~ msgstr "D\xE9sactiver l'utilisation du c\xE2ble parall\xE8le  compatible SpeedDOS"
-
-#~ msgid "Filename: "
-#~ msgstr "Nom de fichier: "
-
-#~ msgid "VIC II Screenshot"
-#~ msgstr "Capture d'\xE9cran VIC II"
-
-#~ msgid "VDC Screenshot"
-#~ msgstr "Capture d'\xE9cran VDC"
-
-#~ msgid "Screenshot..."
-#~ msgstr "Capture d'\xE9cran..."
-
-#~ msgid "IDE64: Using imagefile `%s'."
-#~ msgstr "IDE64: Utilisation de l'image `%s'."
-
-#~ msgid "IDE64: Cannot use image file `%s'. NO DRIVE EMULATION!"
-#~ msgstr ""
-#~ "IDE64: Impossible d'utiliser le fichier `%s'. AUCUNE \xC9MULATION DE DISQUE!"
-
-#~ msgid "IDE64: Couldn't read disk geometry from image, using default 8MB."
-#~ msgstr ""
-#~ "IDE64: Impossible de lire la g\xE9om\xE9trie de l'image, utilisation du "
-#~ "param\xE8tre par d\xE9faut: 8MO."
-
-#~ msgid "IDE64: Disk is not formatted, using default 8MB."
-#~ msgstr ""
-#~ "IDE64: Le disque n'est pas formatt\xE9, utilisation du param\xE8tre par d\xE9faut: "
-#~ "8MO."
-
-#~ msgid "IDE64: using %i/%i/%i CHS geometry, %lu sectors total."
-#~ msgstr "IDE64: Utilisation : %i/%i/%i g\xE9om\xE9trie CHS, total de %lu secteurs."
-
-#~ msgid "IDE64: LBA geometry, %lu sectors total."
-#~ msgstr "IDE64: G\xE9om\xE9trie LBA, total de %lu secteurs."
-
-#, fuzzy
-#~ msgid "Cannot read received snapshot file"
-#~ msgstr "Impossible de charger la sauvegarde."
-
-#~ msgid "Save as"
-#~ msgstr "Enregistrer sous"
-
-#~ msgid "Specify name of second RS232 device (/dev/ttyS1)"
-#~ msgstr "Sp\xE9cifiez le nom du 2e port RS232 (/dev/ttyS1)"
-
-#~ msgid "Specify command to pipe data in/out, preceed with '|' (|lpr)"
-#~ msgstr ""
-#~ "Sp\xE9cifiez la commande de transfer de donn\xE9es, pr\xE9c\xE9d\xE9e d'une '|' (|lpr)"
-
-#~ msgid "Unknown image type."
-#~ msgstr "Type d'image inconnu."
-
-#~ msgid "Use XVideo Extension (hardware scaling)"
-#~ msgstr "Utiliser les extensions XVideo"
-
-#~ msgid "Use software rendering"
-#~ msgstr "Utiliser le rendu logiciel"
-
-#~ msgid "*Userport 300 baud RS232 emulation"
-#~ msgstr "*\xC9mulation d'un port utilisateur RS232 de 300 bauds"
-
-#~ msgid "*Userport 1200 baud RS232 emulation"
-#~ msgstr "*\xC9mulation d'un port utilisateur RS232 de 1200 bauds"
-
-#~ msgid "*CIA 9600 baud RS232 emulation"
-#~ msgstr "*\xC9mulation d'un port utilisateur RS232 CIA de 9600 bauds"
-
-#~ msgid "Unload Basic ROM"
-#~ msgstr "D\xE9charger la ROM Basic"
-
-#~ msgid "Load custom ROM set definition"
-#~ msgstr "Charger une d\xE9finition personnalis\xE9e de ROM"

Modified: trunk/vice/po/it.po
===================================================================
--- trunk/vice/po/it.po	2008-07-08 20:44:34 UTC (rev 18978)
+++ trunk/vice/po/it.po	2008-07-09 07:56:34 UTC (rev 18979)
@@ -11448,413 +11448,3 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr ""
-
-#~ msgid "Specify name of Norwegian Kernal ROM image"
-#~ msgstr "Specifica il nome dell'immagine della ROM del Kernal norvegese"
-
-#, fuzzy
-#~ msgid "Attach raw 32KB Action Replay 4 cartridge image"
-#~ msgstr "Seleziona l'immagine di una cartuccia Action Replay di 32KB"
-
-#, fuzzy
-#~ msgid "Attach raw StarDOS image"
-#~ msgstr "Seleziona l'immagine di una cassetta"
-
-#~ msgid "Drive &8\tAlt+8"
-#~ msgstr "Drive &8\tAlt+8"
-
-#~ msgid "Drive &9\tAlt+9"
-#~ msgstr "Drive &9\tAlt+9"
-
-#~ msgid "Drive 1&0\tAlt+0"
-#~ msgstr "Drive 1&0\tAlt+0"
-
-#~ msgid "Drive &11\tAlt+1"
-#~ msgstr "Drive &11\tAlt+1"
-
-#~ msgid "&All\tAlt+A"
-#~ msgstr "&Tutti\tAlt+A"
-
-#~ msgid "&Add current image\tAlt+I"
-#~ msgstr "&Aggiungi l'immagine attuale\tAlt+I"
-
-#~ msgid "&Remove current image\tAlt+K"
-#~ msgstr "&Rimuovi l'immagine attuale\tAlt+K"
-
-#~ msgid "Attach &next image\tAlt+N"
-#~ msgstr "Seleziona l'immagine successiva\tAlt+N"
-
-#~ msgid "Attach &previous image\tAlt+B"
-#~ msgstr "Seleziona l'immagine &precedente\tAlt+B"
-
-#~ msgid "Attach &tape image...\tAlt+T"
-#~ msgstr "Seleziona l'immagine di una &cassetta...\tAlt+T"
-
-#~ msgid "Cartridge free&ze\tAlt+Z"
-#~ msgstr "Free&ze della cartuccia\tAlt+Z"
-
-#~ msgid "&Pause\tAlt+Pause"
-#~ msgstr "&Pausa\tAlt+Pause"
-
-#~ msgid "&Monitor\tAlt+M"
-#~ msgstr "&Monitor\tAlt+M"
-
-#~ msgid "&Hard\tCtrl+Alt+R"
-#~ msgstr "&Hard\tCtrl+Alt+R"
-
-#~ msgid "&Soft\tAlt+R"
-#~ msgstr "&Soft\tAlt+R"
-
-#~ msgid "E&xit\tAlt+X"
-#~ msgstr "E&sci\tAlt+X"
-
-#~ msgid "&Load quicksnapshot image\tAlt+L"
-#~ msgstr "&Carica immagine quicksnapshot\tAlt+L"
-
-#~ msgid "&Save quicksnapshot image\tAlt+S"
-#~ msgstr "Salva immagine quicksnapshot\tAlt+S"
-
-#~ msgid "Set Recording Milestone\tAlt+G"
-#~ msgstr "Imposta segnalibro\tAlt+G"
-
-#~ msgid "Return to Milestone\tAlt+H"
-#~ msgstr "Vai al segnalibro\tAlt+H"
-
-#~ msgid "Save/stop media file...\tAlt+C"
-#~ msgstr "Salva/arresta file multimediale...\tAlt+C"
-
-#~ msgid "&Warp mode\tAlt+W"
-#~ msgstr "Modalit\xE0 &turbo\tAlt+W"
-
-#~ msgid "Swap &Joystick\tAlt+J"
-#~ msgstr "Scambia &joystick\tAlt+J"
-
-#~ msgid "Fullscreen\tAlt+D"
-#~ msgstr "A tutto schermo\tAlt+D"
-
-#~ msgid "Can't add fontpath `%s'.\n"
-#~ msgstr "Non \xE8 possibile aggiungere il percorso per i font `%s'.\n"
-
-#~ msgid "Set fontpath: `%s'.\n"
-#~ msgstr "Imposto il percorso per i font: `%s'.\n"
-
-#~ msgid "Cannot load text font %s."
-#~ msgstr "Non \xE8 possibile caricare il font %s."
-
-#~ msgid "Enable emulation of the 1351 proportional mouse"
-#~ msgstr "Attiva l'emulazione del mouse 1351"
-
-#~ msgid "Disable emulation of the 1351 proportional mouse"
-#~ msgstr "Disattiva l'emulazione del mouse 1351"
-
-#, fuzzy
-#~ msgid "Romsetbestand"
-#~ msgstr "Romset"
-
-#, fuzzy
-#~ msgid "Mouse Port"
-#~ msgstr "Porta del mouse"
-
-#~ msgid "*VIC-II settings"
-#~ msgstr "*Impostazioni VIC-II"
-
-#~ msgid "Commands"
-#~ msgstr "Comandi"
-
-#~ msgid "DGA1 Resolutions"
-#~ msgstr "Risoluzioni DGA1"
-
-#~ msgid "DGA2 Resolutions"
-#~ msgstr "Risoluzioni DGA2"
-
-#~ msgid "Successfully initialized video."
-#~ msgstr "Video inizializzato con successo."
-
-#~ msgid "Found %dbit visual."
-#~ msgstr "Trovata una visuale %dbit."
-
-#~ msgid "Attach debugger to pid %d...\n"
-#~ msgstr "Allega il debugger al pid %d...\n"
-
-#~ msgid "Successfully forked DGA."
-#~ msgstr "Fork della DGA riuscito."
-
-#~ msgid "Unable to query DGA1 version."
-#~ msgstr "Non \xE8 possibile rilevare la versione DGA1."
-
-#~ msgid "Unable to query DGA1 information."
-#~ msgstr "Non \xE8 possibile ottenere informazioni sulla DGA1."
-
-#~ msgid "Root permissions required to use DGA1."
-#~ msgstr "I permessi di root sono richiesti per utilizzare la DGA1."
-
-#~ msgid "Problems with DGA - disabling fullscreen."
-#~ msgstr ""
-#~ "Problemi con la DGA - disabilitazione della visualizzazione a tutto "
-#~ "schermo"
-
-#~ msgid "Error switching to fullscreen%s"
-#~ msgstr "Si \xE8 verificato un errore durante la commutazione a tutto schermo%s"
-
-#~ msgid "DGA extension: addr:%p, width %d, bank size %d mem size %d\n"
-#~ msgstr ""
-#~ "Estensioni DGA: ind:%p, profondit\xE0 %d, dimensione del banco %d dimensione "
-#~ "della memoria %d\n"
-
-#~ msgid "Switch to windowmode"
-#~ msgstr "Commutazione alla modalit\xE0 a finestre"
-
-#~ msgid "Selected mode: %s"
-#~ msgstr "Modalit\xE0 selezionata: %s"
-
-#~ msgid "Attach debugger to pid %d..."
-#~ msgstr "Allega il debugger al pid %d..."
-
-#~ msgid "refresh, not ready, skipping frame"
-#~ msgstr "aggiorno, non pronto, salto frame"
-
-#~ msgid "Successfully forked DGA"
-#~ msgstr "Fork della DGA riuscito"
-
-#~ msgid "Unable to query video extension version - disabling fullscreen."
-#~ msgstr ""
-#~ "Non \xE8 possibile ottenere la versione delle estensioni video - "
-#~ "disabilitazione della visualizzazione a tutto schermo."
-
-#~ msgid "Unable to query video extension information - disabling fullscreen."
-#~ msgstr ""
-#~ "Non \xE8 possibile ottenere le infomazioni sulle estensioni video - "
-#~ "disabilitazione della visualizzazione a tutto schermo."
-
-#~ msgid "Xserver is running an old XFree86-DGA version (%d.%d) "
-#~ msgstr "Xserver sta eseguendo una vecchia versione di XFree86-DGA (%d.%d) "
-
-#~ msgid "Minimum required version is %d.%d - disabling fullscreen."
-#~ msgstr ""
-#~ "La versione minima richiesta \xE8 la %d.%d - Disabilitazione della "
-#~ "visualizzazione a tutto schermo."
-
-#~ msgid "Switch to fullscreen%s"
-#~ msgstr "Commutazione a tutto schermo%s"
-
-#~ msgid "Need root privileges for DGA2 fullscreen"
-#~ msgstr ""
-#~ "Servono i privilegi di root per la visualizzazione a tutto schermo DGA2"
-
-#~ msgid "Error switching to fullscreen (SetMode) %ix%i"
-#~ msgstr ""
-#~ "Si \xE8 verificato un errore durante la commutazione a tutto schermo "
-#~ "(SetMode) %ix%i"
-
-#~ msgid "Error switching to fullscreen (pixmap) %ix%i"
-#~ msgstr ""
-#~ "Si \xE8 verificato un errore durante la commutazione a tutto schermo "
-#~ "(pixmap) %ix%i"
-
-#~ msgid ""
-#~ "Not enough video memory pages in mode %s, disabling fullscreen (%d,%d)."
-#~ msgstr ""
-#~ "Non si sono abbastanza pagine di memoria video nella modalit\xE0 %s, "
-#~ "disabilitazione della visualizzazione a tutto schermo (%d,%d)."
-
-#~ msgid "Error switching to fullscreen (CreateGC) %ix%i"
-#~ msgstr ""
-#~ "Si \xE8 verificato un errore durante la commutazione a tutto schermo "
-#~ "(CreateGC) %ix%i"
-
-#~ msgid "Couldn't allocate color cache"
-#~ msgstr "Non \xE8 possibile allocare la cache dei colori"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Start monitor?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Avvia il monitor?"
-
-#~ msgid "glXWaitVideoSyncSGI() returned %d"
-#~ msgstr "glXWaitVideoSyncSGI() ha restituito %d"
-
-#~ msgid "glXChooseVisual() failed"
-#~ msgstr "glXChooseVisual() fallita"
-
-#~ msgid "glXCreateContext() failed"
-#~ msgstr "glXCreateContext() fallita"
-
-#, fuzzy
-#~ msgid "enabling"
-#~ msgstr "ricampionamento"
-
-#, fuzzy
-#~ msgid "disabling"
-#~ msgstr "ricampionamento"
-
-#~ msgid "Enable SpeedDOS-compatible parallel cable"
-#~ msgstr "Attiva il cavo parallelo compatibile con SpeedDOS"
-
-#~ msgid "Disable SpeedDOS-compatible parallel cable"
-#~ msgstr "Disttiva il cavo parallelo compatibile con SpeedDOS"
-
-#~ msgid "Quicksaving file %s."
-#~ msgstr "Salvataggio veloce del file %s."
-
-#~ msgid "Drive #8 RAM expansion"
-#~ msgstr "Drive #8: Espasione RAM"
-
-#~ msgid "*Drive #8 enable parallel cable"
-#~ msgstr "*Drive #8: Attiva il cavo parallelo"
-
-#~ msgid "Drive #9 RAM expansion"
-#~ msgstr "Drive #9: Espansione RAM"
-
-#~ msgid "*Drive #9 enable parallel cable"
-#~ msgstr "*Drive #9: Attiva il cavo parallelo"
-
-#~ msgid "*Drive #10 enable parallel cable"
-#~ msgstr "*Drive #10: Attiva il cavo parallelo"
-
-#~ msgid "*Drive #11 enable parallel cable"
-#~ msgstr "*Drive #11: Attiva il cavo parallelo"
-
-#~ msgid "*$2000-$3FFF RAM expansion"
-#~ msgstr "*Espansione RAM a $2000-$3FFF"
-
-#~ msgid "*$4000-$5FFF RAM expansion"
-#~ msgstr "*Espansione RAM a $4000-$5FFF"
-
-#~ msgid "*$6000-$7FFF RAM expansion"
-#~ msgstr "*Espansione RAM a $6000-$7FFF"
-
-#~ msgid "*$8000-$9FFF RAM expansion"
-#~ msgstr "*Espansione RAM a $8000-$9FFF"
-
-#~ msgid "*$A000-$BFFF RAM expansion"
-#~ msgstr "*Espansione RAM a $A000-$BFFF"
-
-#~ msgid "*Custom Keys"
-#~ msgstr "*Tasti personalizzati"
-
-#~ msgid "Filename: "
-#~ msgstr "Nome del file: "
-
-#~ msgid "&Enable +60K"
-#~ msgstr "&Attiva +60K"
-
-#~ msgid "VIC II Screenshot"
-#~ msgstr "Cattura schermo del VIC II"
-
-#~ msgid "VDC Screenshot"
-#~ msgstr "Cattura schermo del VDC"
-
-#~ msgid "Screenshot..."
-#~ msgstr "Cattura schermo..."
-
-#~ msgid "IDE64: Using imagefile `%s'."
-#~ msgstr "IDE64: usa file immagine `%s'."
-
-#~ msgid "IDE64: Disk is not formatted, using default 8MB."
-#~ msgstr "IDE64: Disco no formattato, uso il valore predefinito di 8MB."
-
-#~ msgid "IDE64: LBA geometry, %lu sectors total."
-#~ msgstr "IDE64: geometria LBA, %lu settori totali."
-
-#~ msgid "Save as"
-#~ msgstr "Salva come"
-
-#~ msgid "Specify name of second RS232 device (/dev/ttyS1)"
-#~ msgstr "Specifica il device della seconda RS232 (/dev/ttyS1)"
-
-#~ msgid "Specify command to pipe data in/out, preceed with '|' (|lpr)"
-#~ msgstr ""
-#~ "Specifica il comando per l'input/output dei dati, preceduto da '|' (|lpr)"
-
-#~ msgid "Unknown image type."
-#~ msgstr "Tipo di immagine sconosciuto."
-
-#~ msgid "Use software rendering"
-#~ msgstr "Usa il rendering software"
-
-#~ msgid "*Userport 300 baud RS232 emulation"
-#~ msgstr "*Emulazione della RS232 su Userport a 300 baud"
-
-#~ msgid "*Userport 1200 baud RS232 emulation"
-#~ msgstr "*Emulazione della RS232 su Userport a 1200 baud"
-
-#~ msgid "*CIA 9600 baud RS232 emulation"
-#~ msgstr "*Emulazione della RS232 su CIA a 9600 baud"
-
-#~ msgid "Load custom ROM set definition"
-#~ msgstr "Carica un ROM set personalizzato"
-
-#~ msgid "Unload Basic ROM"
-#~ msgstr "Scarica la ROM del Basic"
-
-#~ msgid "Flush IEC printer #4 device"
-#~ msgstr "Svuota il dispositivo della stampante IEC #4"
-
-#~ msgid "Flush IEC printer #5 device"
-#~ msgstr "Svuota il dispositivo della stampante IEC #5"
-
-#, fuzzy
-#~ msgid "*Drive #10 enable IEC device"
-#~ msgstr "*Drive #9: Attiva il cavo parallelo"
-
-#, fuzzy
-#~ msgid "*Drive #11 enable IEC device"
-#~ msgstr "*Drive #9: Attiva il cavo parallelo"
-
-#~ msgid "*Sharp PAL Emulation (Y/C Input)"
-#~ msgstr "*Emulazione PAL nitida (Y/C Input)"
-
-#~ msgid "*Blurry PAL Emulation (Composite Input)"
-#~ msgstr "*Emulazione PAL sbavata (Composite Input)"
-
-#~ msgid "Memory settings"
-#~ msgstr "Impostazioni della memoria"
-
-#~ msgid "*3.00 sec"
-#~ msgstr "*3.00 sec"
-
-#~ msgid "VIC-II Video settings"
-#~ msgstr "Impostazioni video del VIC-II"
-
-#~ msgid "TED Video settings"
-#~ msgstr "Impostazioni video del TED"
-
-#, fuzzy
-#~ msgid "*Enable DGA2 fullscreen"
-#~ msgstr "Attiva schermo intero"
-
-#~ msgid "Successfully forked DGA\n"
-#~ msgstr "Fork della DGA riuscito\n"
-
-#~ msgid "Xserver is running an old XFree86-VidMode version (%d.  %d)"
-#~ msgstr ""
-#~ "Xserver sta eseguendo una vecchia versione di XFree86-VidMode (%d.  %d)"
-
-#~ msgid "Bad row/column value (%d/%d) for keysym `%s'."
-#~ msgstr "Coppia riga/colonna (%d/%d) non valida per il simbolo `%s'."
-
-#~ msgid "Loading keymap `%s'."
-#~ msgstr "Caricamento della mappa della tastiera `%s'."
-
-#~ msgid "(null)"
-#~ msgstr "(null)"
-
-#~ msgid "Please recompile the program for a supported bit depth."
-#~ msgstr "Per favore ricompila il programma con una profondita supportata"
-
-#~ msgid "Only %ibpp supported by this emulator."
-#~ msgstr "Solo %ibpp sono supportati da questo emulatore."
-
-#~ msgid "Switch X server depth or recompile with --enable-autobpp."
-#~ msgstr ""
-#~ "Cambia la profondita dell'X server o ricompila con --enable-autobpp."
-
-#~ msgid "*Model defaults"
-#~ msgstr "*Modello predefinito"
-
-#~ msgid "Seleziona 4KB image at $B000..."
-#~ msgstr "Seleziona un'immagine di 4KB a $B000..."

Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po	2008-07-08 20:44:34 UTC (rev 18978)
+++ trunk/vice/po/nl.po	2008-07-09 07:56:34 UTC (rev 18979)
@@ -54,7 +54,7 @@
 
 #: src/autostart.c:177 src/translate.c.po.c:634
 msgid "On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'"
-msgstr "Bij het autostarten, bebruik het 'RUN' commando met een dubbele punt, dus 'RUN:'"
+msgstr "Bij het autostarten, gebruik het 'RUN' commando met een dubbele punt, dus 'RUN:'"
 
 #: src/autostart.c:179 src/translate.c.po.c:644
 msgid "On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'"

Modified: trunk/vice/po/pl.po
===================================================================
--- trunk/vice/po/pl.po	2008-07-08 20:44:34 UTC (rev 18978)
+++ trunk/vice/po/pl.po	2008-07-09 07:56:34 UTC (rev 18979)
@@ -12577,433 +12577,3 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr ""
-
-#, fuzzy
-#~ msgid "Specify name of Norwegian Kernal ROM image"
-#~ msgstr "Okre\xB6l nazw\xEA pliku pozycyjnej mapy klawiatury"
-
-#, fuzzy
-#~ msgid "Attach raw 32KB Action Replay 4 cartridge image"
-#~ msgstr "W\xB3\xF3\xBF obraz Action Replay..."
-
-#, fuzzy
-#~ msgid "Attach raw StarDOS image"
-#~ msgstr "W\xB3\xF3\xBF obraz kasety"
-
-#, fuzzy
-#~ msgid "Drive &8\tAlt+8"
-#~ msgstr "Model nap\xEAdu #8"
-
-#, fuzzy
-#~ msgid "Drive &9\tAlt+9"
-#~ msgstr "Model nap\xEAdu #8"
-
-#, fuzzy
-#~ msgid "Drive 1&0\tAlt+0"
-#~ msgstr "Model nap\xEAdu #8"
-
-#, fuzzy
-#~ msgid "Drive &11\tAlt+1"
-#~ msgstr "Model nap\xEAdu #8"
-
-#, fuzzy
-#~ msgid "&Add current image\tAlt+I"
-#~ msgstr "Dodaj aktualny obraz (jednostka 8)"
-
-#, fuzzy
-#~ msgid "&Remove current image\tAlt+K"
-#~ msgstr "Usu\xF1 aktualny obraz (jednostka 8)"
-
-#, fuzzy
-#~ msgid "Attach &next image\tAlt+N"
-#~ msgstr "W\xB3\xF3\xBF nast\xEApny obraz (jednostka 8)"
-
-#, fuzzy
-#~ msgid "Attach &previous image\tAlt+B"
-#~ msgstr "W\xB3\xF3\xBF poprzedni obraz (jednostka 8)"
-
-#, fuzzy
-#~ msgid "Attach &tape image...\tAlt+T"
-#~ msgstr "W\xB3\xF3\xBF obraz kasety..."
-
-#, fuzzy
-#~ msgid "Cartridge free&ze\tAlt+Z"
-#~ msgstr "Cartridge freeze"
-
-#, fuzzy
-#~ msgid "&Monitor\tAlt+M"
-#~ msgstr "Monitor"
-
-#, fuzzy
-#~ msgid "&Soft\tAlt+R"
-#~ msgstr "Monitor"
-
-#, fuzzy
-#~ msgid "E&xit\tAlt+X"
-#~ msgstr "Monitor"
-
-#, fuzzy
-#~ msgid "&Load quicksnapshot image\tAlt+L"
-#~ msgstr "Zapisz plik"
-
-#, fuzzy
-#~ msgid "&Save quicksnapshot image\tAlt+S"
-#~ msgstr "Zapisz plik"
-
-#, fuzzy
-#~ msgid "Set Recording Milestone\tAlt+G"
-#~ msgstr "Zatrzymaj zapisywanie wydarzen "
-
-#, fuzzy
-#~ msgid "Return to Milestone\tAlt+H"
-#~ msgstr "Zatrzymaj zapisywanie wydarzen "
-
-#, fuzzy
-#~ msgid "Save/stop media file...\tAlt+C"
-#~ msgstr "Zapisz obraz kartrid\xBFa"
-
-#, fuzzy
-#~ msgid "Swap &Joystick\tAlt+J"
-#~ msgstr "Zamie\xF1 porty (1/2)"
-
-#, fuzzy
-#~ msgid "Fullscreen\tAlt+D"
-#~ msgstr "*Ustawienia pe\xB3nego ekranu"
-
-#~ msgid "Can't add fontpath `%s'.\n"
-#~ msgstr "Nie mo\xBFna doda\xE6 \xB6cie\xBFki czcionki: `%s'.\n"
-
-#~ msgid "Set fontpath: `%s'.\n"
-#~ msgstr "Ustaw \xB6cie\xBFk\xEA czcionki: `%s'.\n"
-
-#~ msgid "Cannot load text font %s."
-#~ msgstr "Nie mo\xBFna za\xB3adowa\xE6 tekstowej czcionki %s."
-
-#~ msgid "Enable emulation of the 1351 proportional mouse"
-#~ msgstr "W\xB3\xB1cz emulacj\xEA myszki 1351"
-
-#~ msgid "Disable emulation of the 1351 proportional mouse"
-#~ msgstr "Wy\xB3\xB1cz emulacj\xEA myszki 1351"
-
-#, fuzzy
-#~ msgid "Romsetbestand"
-#~ msgstr "Reset"
-
-#, fuzzy
-#~ msgid "Mouse Port"
-#~ msgstr "Ustawienia drukarki"
-
-#~ msgid "*VIC-II settings"
-#~ msgstr "*Ustawienia VIC-II"
-
-#~ msgid "Commands"
-#~ msgstr "Komendy"
-
-#~ msgid "DGA1 Resolutions"
-#~ msgstr "Rozdzielczo\xB6\xE6 DGA1"
-
-#~ msgid "DGA2 Resolutions"
-#~ msgstr "Rozdzielczo\xB6\xE6 DGA2"
-
-#~ msgid "Successfully initialized video."
-#~ msgstr "Inicjalizacji wideo zako\xF1czona pomy\xB6lnie"
-
-#~ msgid "Found %dbit visual."
-#~ msgstr "Znaleziono urz\xB1dzenie wizualne %dbit "
-
-#~ msgid "Attach debugger to pid %d...\n"
-#~ msgstr "Zainstaluj debbuger na pid %d...\n"
-
-#~ msgid "Successfully forked DGA."
-#~ msgstr "Rozga\xB3\xEAzianie DGA zako\xF1czenie pomy\xB6lnie"
-
-#~ msgid "Unable to query DGA1 version."
-#~ msgstr "Nie mo\xBFna odczyta\xE6 wersji DGA1."
-
-#~ msgid "Unable to query DGA1 information."
-#~ msgstr "Nie mo\xBFna odczyta\xE6 informacji o DGA1"
-
-#~ msgid "Root permissions required to use DGA1."
-#~ msgstr "Aby u\xBFywa\xE6 DGA1 konieczne s\xB1 uprawnienia roota."
-
-#~ msgid "Problems with DGA - disabling fullscreen."
-#~ msgstr "Problemy z DGA - wy\xB3\xB1czam pe\xB3ny ekran"
-
-#~ msgid "Error switching to fullscreen%s"
-#~ msgstr "B\xB3\xB1d prze\xB3\xB1czania do pe\xB3nego ekranu %s"
-
-#~ msgid "DGA extension: addr:%p, width %d, bank size %d mem size %d\n"
-#~ msgstr ""
-#~ "Rozszerzenie DGA: addr:%p, szeroko\xB6\xE6 %d, rozmiar banku %d rozmiar pami\xEAci "
-#~ "%d\n"
-
-#~ msgid "Switch to windowmode"
-#~ msgstr "Prze\xB3\xB1cz do trybu okna"
-
-#~ msgid "Selected mode: %s"
-#~ msgstr "Wybrano tryb: %s"
-
-#~ msgid "Attach debugger to pid %d..."
-#~ msgstr "Zainstaluj debbuger na pid %d..."
-
-#~ msgid "refresh, not ready, skipping frame"
-#~ msgstr "od\xB6wie\xBF, nie czytaj , opu\xB6\xE6 klatk\xEA"
-
-#~ msgid "Successfully forked DGA"
-#~ msgstr "Rozga\xB3\xEAzianie DGA zako\xF1czenie pomy\xB6lnie"
-
-#~ msgid "Unable to query video extension version - disabling fullscreen."
-#~ msgstr ""
-#~ "Nie mo\xBFna pobra\xE6 informacji o wersji rozszerzenia video - wy\xB3\xB1czanie "
-#~ "pe\xB3nego ekranu"
-
-#~ msgid "Unable to query video extension information - disabling fullscreen."
-#~ msgstr ""
-#~ "Nie mo\xBFna pobra\xE6 informacji o rozszerzeniach video - wy\xB3\xB1czanie pe\xB3nego "
-#~ "ekranu"
-
-#~ msgid "Xserver is running an old XFree86-DGA version (%d.%d) "
-#~ msgstr "Xserver jest uruchomiony w starej wersji XFree86-DGA (%d.%d.) "
-
-#~ msgid "Minimum required version is %d.%d - disabling fullscreen."
-#~ msgstr "Minimaln\xB1 wymagan\xB1 wersj\xB1 jest %d.%d - wy\xB3\xB1czanie pe\xB3nego ekranu"
-
-#~ msgid "Switch to fullscreen%s"
-#~ msgstr "Prze\xB3\xB1cz na pe\xB3ny ekran%s"
-
-#~ msgid "Need root privileges for DGA2 fullscreen"
-#~ msgstr "Musisz mie\xE6 uprawnienia roota, aby u\xBFy\xE6 trybu pe\xB3noekranowego DGA2"
-
-#~ msgid "Error switching to fullscreen (SetMode) %ix%i"
-#~ msgstr "B\xB3\xB1d prze\xB3\xB1czania do pe\xB3nego ekranu (SetMode) %ix%i"
-
-#~ msgid "Error switching to fullscreen (pixmap) %ix%i"
-#~ msgstr "B\xB3\xB1d prze\xB3\xB1czania do pe\xB3nego ekranu (pixmap) %ix%i"
-
-#~ msgid ""
-#~ "Not enough video memory pages in mode %s, disabling fullscreen (%d,%d)."
-#~ msgstr ""
-#~ "Zbyt ma\xB3o stron pami\xEAci graficznej w trybie %s, wy\xB3\xB1czanie pe\xB3nego ekranu"
-#~ "(%d,%d)."
-
-#~ msgid "Error switching to fullscreen (CreateGC) %ix%i"
-#~ msgstr "B\xB3\xB1d prze\xB3\xB1czania do pe\xB3nego ekranu (CreateGC) %ix%i"
-
-#~ msgid "Couldn't allocate color cache"
-#~ msgstr "Nie mo\xBFna alokowa\xE6 cache'u koloru"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Start monitor?"
-#~ msgstr "Aktywacja monitora"
-
-#, fuzzy
-#~ msgid "glXChooseVisual() failed"
-#~ msgstr "B\xB3\xB1d XCreateImage"
-
-#, fuzzy
-#~ msgid "glXCreateContext() failed"
-#~ msgstr "B\xB3\xB1d XCreateImage"
-
-#, fuzzy
-#~ msgid "enabling"
-#~ msgstr "*Przesamplowanie"
-
-#, fuzzy
-#~ msgid "disabling"
-#~ msgstr "*Przesamplowanie"
-
-#, fuzzy
-#~ msgid "Ebable SID Cartridge"
-#~ msgstr "Zapisz kartrid\xBF"
-
-#~ msgid "Quicksaving file %s."
-#~ msgstr "Szybkie zapisywanie pliku %s."
-
-#, fuzzy
-#~ msgid "*Drive #9 parallel cable"
-#~ msgstr "*Nap\xEAd #9 - w\xB3\xB1cz kabel r\xF3wnoleg\xB3y "
-
-#, fuzzy
-#~ msgid "*Drive #10 parallel cable"
-#~ msgstr "*Nap\xEAd #9 - w\xB3\xB1cz kabel r\xF3wnoleg\xB3y "
-
-#, fuzzy
-#~ msgid "*Drive #11 parallel cable"
-#~ msgstr "*Nap\xEAd #9 - w\xB3\xB1cz kabel r\xF3wnoleg\xB3y "
-
-#~ msgid "*$2000-$3FFF RAM expansion"
-#~ msgstr "*Rozszerzenie RAM $2000-$3FFF"
-
-#~ msgid "*$4000-$5FFF RAM expansion"
-#~ msgstr "*Rozszerzenie RAM $6000-$7FFF"
-
-#~ msgid "*$6000-$7FFF RAM expansion"
-#~ msgstr "*Rozszerzenie RAM $6000-$7FFF"
-
-#~ msgid "*$8000-$9FFF RAM expansion"
-#~ msgstr "*Rozszerzenie RAM $6000-$7FFF"
-
-#~ msgid "*$A000-$BFFF RAM expansion"
-#~ msgstr "*Rozszerzenie RAM $6000-$7FFF"
-
-#~ msgid "*Custom Keys"
-#~ msgstr "*W\xB3asne klawisze"
-
-#, fuzzy
-#~ msgid "Cannot create image file"
-#~ msgstr "Nie mo\xBFna stworzyc obrazu `%s'."
-
-#, fuzzy
-#~ msgid "Enable SpeedDOS-compatible parallel cable"
-#~ msgstr "*Nap\xEAd #8 - w\xB3\xB1cz kabel r\xF3wnoleg\xB3y"
-
-#, fuzzy
-#~ msgid "Disable SpeedDOS-compatible parallel cable"
-#~ msgstr "*Nap\xEAd #9 - w\xB3\xB1cz kabel r\xF3wnoleg\xB3y "
-
-#~ msgid "Filename: "
-#~ msgstr "Nazwa pliku:"
-
-#~ msgid "VIC II Screenshot"
-#~ msgstr "Zrzut ekranu VIC II"
-
-#~ msgid "VDC Screenshot"
-#~ msgstr "Zrzut ekranu VDC"
-
-#~ msgid "Screenshot..."
-#~ msgstr "Zrzut ekranu"
-
-#, fuzzy
-#~ msgid "Cannot read received snapshot file"
-#~ msgstr ""
-#~ "Nie mo\xBFna za\xB3adowa\xE6 pliku zrzutu\n"
-#~ "`%s'"
-
-#, fuzzy
-#~ msgid "Save as"
-#~ msgstr "Zapisz"
-
-#~ msgid "Specify name of second RS232 device (/dev/ttyS1)"
-#~ msgstr "Okre\xB6l nazw\xEA drugorz\xEAdnego urz\xB1dzenia RS232 (/dev/ttyS1)"
-
-#~ msgid "Specify command to pipe data in/out, preceed with '|' (|lpr)"
-#~ msgstr "Specify command to pipe data in/out, preceed with '|' (|lpr)"
-
-#~ msgid "Unknown image type."
-#~ msgstr "Nieznany typ obrazu."
-
-#~ msgid "Use software rendering"
-#~ msgstr "U\xBFyj renderowania programowego"
-
-# src/arch/unix/uisettings.c:616 src/arch/unix/vic20ui.c:319 
-#~ msgid "*Userport 300 baud RS232 emulation"
-#~ msgstr "*Emulacja portu RS232 o pr\xEAdko\xB6ci 300 bod\xF3w"
-
-# src/arch/unix/uisettings.c:618 src/arch/unix/vic20ui.c:321 
-#~ msgid "*Userport 1200 baud RS232 emulation"
-#~ msgstr "*Emulacja portu RS232 o pr\xEAdko\xB6ci 1200 bod\xF3w"
-
-# src/arch/unix/uisettings.c:620 
-#~ msgid "*CIA 9600 baud RS232 emulation"
-#~ msgstr "*Emulacja RS232 o pr\xEAdko\xB6ci CIA 9600 bod\xF3w"
-
-#~ msgid "Load custom ROM set definition"
-#~ msgstr "Za\xB3aduj w\xB3asne ustawienia ROM"
-
-#~ msgid "Unload Basic ROM"
-#~ msgstr "Usu\xF1 ROM Basic"
-
-#, fuzzy
-#~ msgid "Could not create milestone snapshot file."
-#~ msgstr ""
-#~ "Nie mo\xBFna za\xB3adowa\xE6 pliku zrzutu\n"
-#~ "`%s'"
-
-#~ msgid "Flush IEC printer #4 device"
-#~ msgstr "Urz\xB1dzenie #4 drukarki - Flush IEC"
-
-#~ msgid "Flush IEC printer #5 device"
-#~ msgstr "Urz\xB1dzenie #5 drukarki - Flush IEC"
-
-#, fuzzy
-#~ msgid "*Drive #10 enable IEC device"
-#~ msgstr "*Nap\xEAd #9 - w\xB3\xB1cz kabel r\xF3wnoleg\xB3y "
-
-#, fuzzy
-#~ msgid "*Drive #11 enable IEC device"
-#~ msgstr "*Nap\xEAd #9 - w\xB3\xB1cz kabel r\xF3wnoleg\xB3y "
-
-#~ msgid "*Sharp PAL Emulation (Y/C Input)"
-#~ msgstr "*Ostra emulacja PAL (wej\xB6cie Y/C)"
-
-#~ msgid "*Blurry PAL Emulation (Composite Input)"
-#~ msgstr "*Rozma\xBF emulacj\xEA PAL"
-
-#~ msgid "Memory settings"
-#~ msgstr "Ustawienia pami\xEAci"
-
-#~ msgid "*3.00 sec"
-#~ msgstr "*3.00 sek"
-
-#~ msgid "VIC-II Video settings"
-#~ msgstr "Ustawienia video VIC-II"
-
-#~ msgid "TED Video settings"
-#~ msgstr "Ustawienia video TED"
-
-#~ msgid "Found suitable mode for fullscreen."
-#~ msgstr "Znajd\xBC odpowiedni tryb dla pe\xB3nego ekranu."
-
-#~ msgid "Couldn't allocate pixel value cache."
-#~ msgstr "Nie mo\xBFna zalokowa\xE6 warto\xB6ci piksela cache."
-
-#~ msgid "*Enable DGA2 fullscreen"
-#~ msgstr "*W\xB3\xB1cz pe\xB3ny ekran"
-
-#~ msgid "Successfully forked DGA\n"
-#~ msgstr "Rozga\xB3\xEAzianie DGA zako\xF1czenie pomy\xB6lnie\n"
-
-#~ msgid "Xserver is running an old XFree86-VidMode version (%d.  %d)"
-#~ msgstr "Xserver jest uruchomiony w starej wersji XFree86-VidMode (%d.  %d)"
-
-#~ msgid ""
-#~ "Vice is not running as root, DGA extension not possible - disabling "
-#~ "fullscreen."
-#~ msgstr ""
-#~ "Vice nie jest uruchomione przez roota, rozszerzenie DGA nie mo\xBFe by\xE6 "
-#~ "u\xBFyte - wy\xB3\xB1czam pe\xB3ny ekran."
-
-#~ msgid "Could not find KeySym `%s'!"
-#~ msgstr "Nie mo\xBFna znale\xBC\xE6 KeySym `%s'!"
-
-#~ msgid "Bad row/column value (%d/%d) for keysym `%s'."
-#~ msgstr "B\xB3\xEAdna warto\xB6c rz\xB1d/kolumn dla keysym (%d/%d)`%s'."
-
-#~ msgid "Loading keymap `%s'."
-#~ msgstr "\xA3aduj\xEA map\xEA klawiatury `%s'."
-
-#~ msgid "Cannot load keymap `%s'."
-#~ msgstr "Nie mo\xBFna za\xB3adowa\xE6 mapy klawiszy `%s'."
-
-#~ msgid "(null)"
-#~ msgstr "(pusty)"
-
-#~ msgid "*Model defaults"
-#~ msgstr "*Domy\xB6lny model"
-
-#~ msgid "Please recompile the program for a supported bit depth."
-#~ msgstr "Prosz\xEA przekompilowa\xE6 program dla obs\xB3ugiwanej g\xB3\xEAbi koloru."
-
-#~ msgid "Only %ibpp supported by this emulator."
-#~ msgstr "Tylko jest ob\xB3ugiwane przez ten emulator (%ibpp)."
-
-#~ msgid "Current X server depth is %ibpp."
-#~ msgstr "Obecna g\xB3\xEAbia X serwera to %ibpp."
-
-#~ msgid "Switch X server depth or recompile with --enable-autobpp."
-#~ msgstr ""
-#~ "Prze\xB3\xB1cz g\xB3\xEAbi\xEA w serwerze X lub przekompiluj z parametrem --enable-"
-#~ "autobpp."

Modified: trunk/vice/po/sv.po
===================================================================
--- trunk/vice/po/sv.po	2008-07-08 20:44:34 UTC (rev 18978)
+++ trunk/vice/po/sv.po	2008-07-09 07:56:34 UTC (rev 18979)
@@ -11344,212 +11344,3 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr "Amigamus"
-
-#, fuzzy
-#~ msgid "Attach raw 32KB Action Replay 4 cartridge image"
-#~ msgstr "Anslut r\xE5 32KB-Action Replay-insticksmodulfil"
-
-#, fuzzy
-#~ msgid "Attach raw StarDOS image"
-#~ msgstr "Anslut bandavbildningsfil"
-
-#~ msgid "Drive &8\tAlt+8"
-#~ msgstr "Enhet &8\tAlt+8"
-
-#~ msgid "Drive &9\tAlt+9"
-#~ msgstr "Enhet &9\tAlt+9"
-
-#~ msgid "Drive 1&0\tAlt+0"
-#~ msgstr "Enhet 1&0\tAlt+0"
-
-#~ msgid "Drive &11\tAlt+1"
-#~ msgstr "Enhet &11\tAlt+1"
-
-#~ msgid "&All\tAlt+A"
-#~ msgstr "&Alla\tAlt+A"
-
-#~ msgid "&Add current image\tAlt+I"
-#~ msgstr "&L\xE4gg till aktuell avbildning\tAlt+I"
-
-#~ msgid "&Remove current image\tAlt+K"
-#~ msgstr "&Ta bort aktuell avbildning\tAlt+K"
-
-#~ msgid "Attach &next image\tAlt+N"
-#~ msgstr "Anslut &n\xE4sta avbildning\tAlt+N"
-
-#~ msgid "Attach &previous image\tAlt+B"
-#~ msgstr "Anslut &f\xF6reg\xE5ende avbildning\tAlt+B"
-
-#~ msgid "Attach &tape image...\tAlt+T"
-#~ msgstr "Anslut en &bandavbildningsfil...\tAlt+T"
-
-#~ msgid "Cartridge free&ze\tAlt+Z"
-#~ msgstr "Frys\tAlt+Z"
-
-#~ msgid "&Pause\tAlt+Pause"
-#~ msgstr "&Paus\tAlt+Pause"
-
-#~ msgid "&Monitor\tAlt+M"
-#~ msgstr "&Monitor\tAlt+M"
-
-#~ msgid "&Hard\tCtrl+Alt+R"
-#~ msgstr "&H\xE5rd\tCtrl+Alt+R"
-
-#~ msgid "&Soft\tAlt+R"
-#~ msgstr "&Mjuk\tAlt+R"
-
-#~ msgid "E&xit\tAlt+X"
-#~ msgstr "&Avsluta\tAlt+X"
-
-#~ msgid "&Load quicksnapshot image\tAlt+L"
-#~ msgstr "L\xE4s in &snabb\xF6gonblicksbild\tAlt+L"
-
-#~ msgid "&Save quicksnapshot image\tAlt+S"
-#~ msgstr "Spara sna&bb\xF6gonblicksbildfil\tAlt+S"
-
-#~ msgid "Set Recording Milestone\tAlt+G"
-#~ msgstr "Ange inspelningsbokm\xE4rke\tAlt+G"
-
-#~ msgid "Return to Milestone\tAlt+H"
-#~ msgstr "\xC5terg\xE5 till bokm\xE4rke\tAlt+H"
-
-#~ msgid "Save/stop media file...\tAlt+C"
-#~ msgstr "Starta/stoppa mediafil...\tAlt+C"
-
-#~ msgid "&Warp mode\tAlt+W"
-#~ msgstr "&Warpl\xE4ge\tAlt+W"
-
-#~ msgid "Swap &Joystick\tAlt+J"
-#~ msgstr "V\xE4&xla spelportarna\tAlt+J"
-
-#~ msgid "Fullscreen\tAlt+D"
-#~ msgstr "Fullsk\xE4rm\tAlt+D"
-
-#~ msgid "Can't add fontpath `%s'.\n"
-#~ msgstr "Kan inte l\xE4gga till typsnittss\xF6kv\xE4g \"%s\".\n"
-
-#~ msgid "Set fontpath: `%s'.\n"
-#~ msgstr "S\xE4tt typsnittss\xF6kv\xE4g: \"%s\".\n"
-
-#~ msgid "Cannot load text font %s."
-#~ msgstr "Kan inte l\xE4sa texttypsnitt %s."
-
-#~ msgid "Enable emulation of the 1351 proportional mouse"
-#~ msgstr "Aktivera emulering av proportionell mus 1351"
-
-#~ msgid "Disable emulation of the 1351 proportional mouse"
-#~ msgstr "Inaktivera emulering av proportionell mus 1351"
-
-#, fuzzy
-#~ msgid "Romsetbestand"
-#~ msgstr "ROM-upps\xE4ttning"
-
-#, fuzzy
-#~ msgid "Mouse Port"
-#~ msgstr "Musport"
-
-#~ msgid "*VIC-II settings"
-#~ msgstr "*VIC-II-inst\xE4llningar"
-
-#~ msgid "Commands"
-#~ msgstr "Kommandon"
-
-#~ msgid "DGA1 Resolutions"
-#~ msgstr "DGA1-uppl\xF6sningar"
-
-#~ msgid "DGA2 Resolutions"
-#~ msgstr "DGA2-uppl\xF6sningar"
-
-#~ msgid "Successfully initialized video."
-#~ msgstr "Grafiken har initierats."
-
-#~ msgid "Found %dbit visual."
-#~ msgstr "Hittade %d-bitarsvy."
-
-#~ msgid "Attach debugger to pid %d...\n"
-#~ msgstr "Ansluter fels\xF6kare till pid %d...\n"
-
-#~ msgid "Successfully forked DGA."
-#~ msgstr "Grenade DGA."
-
-#~ msgid "Unable to query DGA1 version."
-#~ msgstr "Kan inte fr\xE5ga om DGA1-version."
-
-#~ msgid "Unable to query DGA1 information."
-#~ msgstr "Kan inte fr\xE5ga om DGA-information."
-
-#~ msgid "Root permissions required to use DGA1."
-#~ msgstr "Rootbeh\xF6righet kr\xE4vs f\xF6r att anv\xE4nda DGA1."
-
-#~ msgid "Problems with DGA - disabling fullscreen."
-#~ msgstr "Problem med DGA - inaktiverar fullsk\xE4rmsl\xE4ge."
-
-#~ msgid "Error switching to fullscreen%s"
-#~ msgstr "Fel vid v\xE4xling till fullsk\xE4rm%s"
-
-#~ msgid "DGA extension: addr:%p, width %d, bank size %d mem size %d\n"
-#~ msgstr "DGA-ut\xF6kning: adr:%p, bredd %d, bankstorlek %d minnesstorlek %d\n"
-
-#~ msgid "Switch to windowmode"
-#~ msgstr "V\xE4xla till f\xF6nsterl\xE4ge"
-
-#~ msgid "Selected mode: %s"
-#~ msgstr "Valt l\xE4ge: %s"
-
-#~ msgid "Attach debugger to pid %d..."
-#~ msgstr "Ansluter fels\xF6kare till pid %d..."
-
-#~ msgid "refresh, not ready, skipping frame"
-#~ msgstr "uppdatera, inte f\xE4rdig, hoppar \xF6ver bild"
-
-#~ msgid "Successfully forked DGA"
-#~ msgstr "Grenade DGA"
-
-#~ msgid "Unable to query video extension version - disabling fullscreen."
-#~ msgstr ""
-#~ "Kunde inte fr\xE5ga efter version f\xF6r grafikut\xF6kningar - inaktiverar "
-#~ "fullsk\xE4msl\xE4ge."
-
-#~ msgid "Unable to query video extension information - disabling fullscreen."
-#~ msgstr ""
-#~ "Kunde inte fr\xE5ga efter information om grafikut\xF6kningar - inaktiverar "
-#~ "fullsk\xE4rmsl\xE4ge."
-
-#~ msgid "Xserver is running an old XFree86-DGA version (%d.%d) "
-#~ msgstr "X-server k\xF6r en gammal XFree86-DGA-version (%d.%d)"
-
-#~ msgid "Minimum required version is %d.%d - disabling fullscreen."
-#~ msgstr "Minst version %d.%d kr\xE4vs - inaktiverar fullsk\xE4rmsl\xE4ge."
-
-#~ msgid "Switch to fullscreen%s"
-#~ msgstr "V\xE4xla till fullsk\xE4rm%s"
-
-#~ msgid "Need root privileges for DGA2 fullscreen"
-#~ msgstr "Beh\xF6ver rootbeh\xF6righeter f\xF6r DGA2-fullsk\xE4rm"
-
-#~ msgid "Error switching to fullscreen (SetMode) %ix%i"
-#~ msgstr "Fel vid v\xE4xling till fullsk\xE4rm (SetMode) %ix%i"
-
-#~ msgid "Error switching to fullscreen (pixmap) %ix%i"
-#~ msgstr "Fel vid v\xE4xling till fullsk\xE4rm (pixmap) %ix%i"
-
-#~ msgid ""
-#~ "Not enough video memory pages in mode %s, disabling fullscreen (%d,%d)."
-#~ msgstr ""
-#~ "Ej tillr\xE4ckligt med bildminnessidor i l\xE4ge %s, avaktiverar fullsk\xE4rm (%d,%"
-#~ "d)."
-
-#~ msgid "Error switching to fullscreen (CreateGC) %ix%i"
-#~ msgstr "Fel vid v\xE4xling till fullsk\xE4rm (CreateGC) %ix%i"
-
-#~ msgid "Couldn't allocate color cache"
-#~ msgstr "Kunde inte allokera f\xE4rgmellanlagring"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Start monitor?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Aktivera monitor?"

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-08 20:44:34 UTC (rev 18978)
+++ trunk/vice/src/ChangeLog	2008-07-09 07:56:34 UTC (rev 18979)
@@ -1,3 +1,7 @@
+2008-07-08  Marco van den Heuvel  <bla...@ya...>
+
+	* translate.c: Updated the dutch translations.
+
 2008-07-08  Spiro Trikaliotis  <spiro.tr...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18978] trunk/vice/po/nl.po

From: <bla...@us...> - 2008-07-08 20:45:43

Revision: 18978
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18978&view=rev
Author:   blackystardust
Date:     2008-07-08 13:44:34 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
Fixed a typo

Modified Paths:
--------------
    trunk/vice/po/nl.po

Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po	2008-07-08 20:29:18 UTC (rev 18977)
+++ trunk/vice/po/nl.po	2008-07-08 20:44:34 UTC (rev 18978)
@@ -58,7 +58,7 @@
 
 #: src/autostart.c:179 src/translate.c.po.c:644
 msgid "On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'"
-msgstr "Bij het autostarten, gebruik gebruik het 'RUN' commando niet met een dubbele punt, dus 'RUN'"
+msgstr "Bij het autostarten, gebruik het 'RUN' commando niet met een dubbele punt, dus 'RUN'"
 
 #: src/autostart.c:270 src/translate.c.po.c:96
 msgid "Cannot load snapshot file."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18977] trunk/vice/po

From: <bla...@us...> - 2008-07-08 20:29:27

Revision: 18977
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18977&view=rev
Author:   blackystardust
Date:     2008-07-08 13:29:18 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
Updated the nl.po translations.

Modified Paths:
--------------
    trunk/vice/po/ChangeLog
    trunk/vice/po/nl.po

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-07-08 18:55:31 UTC (rev 18976)
+++ trunk/vice/po/ChangeLog	2008-07-08 20:29:18 UTC (rev 18977)
@@ -1,3 +1,7 @@
+2008-07-08  Marco van den Heuvel  <bla...@ya...>
+
+	* nl.po: Updated.
+
 2008-07-08  Spiro Trikaliotis  <spi...@gm...>
 
 	* fr.po, de.po, sv.po, nl.po, pl.po, it.po, hu.po: cosmetic

Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po	2008-07-08 18:55:31 UTC (rev 18976)
+++ trunk/vice/po/nl.po	2008-07-08 20:29:18 UTC (rev 18977)
@@ -54,11 +54,11 @@
 
 #: src/autostart.c:177 src/translate.c.po.c:634
 msgid "On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'"
-msgstr ""
+msgstr "Bij het autostarten, bebruik het 'RUN' commando met een dubbele punt, dus 'RUN:'"
 
 #: src/autostart.c:179 src/translate.c.po.c:644
 msgid "On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'"
-msgstr ""
+msgstr "Bij het autostarten, gebruik gebruik het 'RUN' commando niet met een dubbele punt, dus 'RUN'"
 
 #: src/autostart.c:270 src/translate.c.po.c:96
 msgid "Cannot load snapshot file."
@@ -5798,9 +5798,8 @@
 msgstr "Monitor"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1825
-#, fuzzy
 msgid "Continue"
-msgstr "Inhoud"
+msgstr "Doorgaan"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1871 src/arch/unix/x11/xaw/x11ui.c:1788
 msgid "Extend disk image"
@@ -8001,23 +8000,20 @@
 #: src/arch/win32/resc128.rc.po.c:123 src/arch/win32/resc64.rc.po.c:123
 #: src/arch/win32/rescbm2.rc.po.c:92 src/arch/win32/respet.rc.po.c:90
 #: src/arch/win32/resplus4.rc.po.c:102 src/arch/win32/resvic20.rc.po.c:100
-#, fuzzy
 msgid "&Edit"
-msgstr "Editor"
+msgstr "&Bewerken"
 
 #: src/arch/win32/resc128.rc.po.c:125 src/arch/win32/resc64.rc.po.c:125
 #: src/arch/win32/rescbm2.rc.po.c:94 src/arch/win32/respet.rc.po.c:92
 #: src/arch/win32/resplus4.rc.po.c:104 src/arch/win32/resvic20.rc.po.c:102
-#, fuzzy
 msgid "&Copy"
-msgstr "S&top"
+msgstr "&Kopie"
 
 #: src/arch/win32/resc128.rc.po.c:126 src/arch/win32/resc64.rc.po.c:126
 #: src/arch/win32/rescbm2.rc.po.c:95 src/arch/win32/respet.rc.po.c:93
 #: src/arch/win32/resplus4.rc.po.c:105 src/arch/win32/resvic20.rc.po.c:103
-#, fuzzy
 msgid "&Paste"
-msgstr "&Pauze"
+msgstr "&Plakken"
 
 #: src/arch/win32/resc128.rc.po.c:128 src/arch/win32/resc64.rc.po.c:128
 #: src/arch/win32/rescbm2.rc.po.c:97 src/arch/win32/respet.rc.po.c:95
@@ -10249,18 +10245,16 @@
 msgstr "Afsluiten"
 
 #: src/arch/amigaos/intl.c.po.c:699
-#, fuzzy
 msgid "Edit"
-msgstr "Editor"
+msgstr "Bewerken"
 
 #: src/arch/amigaos/intl.c.po.c:708
 msgid "Copy"
-msgstr ""
+msgstr "Kopie"
 
 #: src/arch/amigaos/intl.c.po.c:717
-#, fuzzy
 msgid "Paste"
-msgstr "Fase"
+msgstr "Plakken"
 
 #: src/arch/amigaos/intl.c.po.c:735
 msgid "Load snapshot image..."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18976] trunk/vice/src

From: <st...@us...> - 2008-07-08 18:57:17

Revision: 18976
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18976&view=rev
Author:   strik
Date:     2008-07-08 11:55:31 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
2008-07-08  Spiro Trikaliotis  <spi...@gm...>

	* src/translate.c: 2 new texts for -autostartrunwithcolon.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/translate.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-08 18:52:44 UTC (rev 18975)
+++ trunk/vice/src/ChangeLog	2008-07-08 18:55:31 UTC (rev 18976)
@@ -1,5 +1,7 @@
 2008-07-08  Spiro Trikaliotis  <spi...@gm...>
 
+	* translate.c: 2 new texts for -autostartrunwithcolon.
+
 	* arch/win32/resc128.rc, arch/win32/c128ui.c: cosmetic change:
 	Norwegain -> Norwegian.
 

Modified: trunk/vice/src/translate.c
===================================================================
--- trunk/vice/src/translate.c	2008-07-08 18:52:44 UTC (rev 18975)
+++ trunk/vice/src/translate.c	2008-07-08 18:55:31 UTC (rev 18976)
@@ -659,7 +659,7 @@
 
 /* autostart.c */
 /* en */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON,    "On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'"},
-/* de */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_DE, ""},  /* fuzzy */
+/* de */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_DE, "Bei Autostart soll 'RUN' mit Doppelpunkt ausgef\xFChrt werden ('RUN:')"},
 /* fr */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_FR, ""},  /* fuzzy */
 /* hu */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_HU, ""},  /* fuzzy */
 /* it */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_IT, ""},  /* fuzzy */
@@ -669,7 +669,7 @@
 
 /* autostart.c */
 /* en */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON,    "On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'"},
-/* de */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_DE, ""},  /* fuzzy */
+/* de */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_DE, "Bei Autostart soll 'RUN' ohne Doppelpunkt ausgef\xFChrt werden ('RUN')"},
 /* fr */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_FR, ""},  /* fuzzy */
 /* hu */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_HU, ""},  /* fuzzy */
 /* it */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_IT, ""},  /* fuzzy */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18975] trunk/vice

From: <st...@us...> - 2008-07-08 18:53:02

Revision: 18975
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18975&view=rev
Author:   strik
Date:     2008-07-08 11:52:44 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
2008-07-08  Spiro Trikaliotis  <spi...@gm...>

	* src/arch/win32/resc128.rc, src/arch/win32/c128ui.c: cosmetic
	change: Norwegain -> Norwegian.

	* po/fr.po, po/de.po, po/sv.po, po/nl.po, po/pl.po, po/it.po,
	po/hu.po: cosmetic change: Norwegain -> Norwegian.

	* po/de.po: 2 new texts for -autostartrunwithcolon.

Modified Paths:
--------------
    trunk/vice/po/ChangeLog
    trunk/vice/po/de.po
    trunk/vice/po/fr.po
    trunk/vice/po/hu.po
    trunk/vice/po/it.po
    trunk/vice/po/nl.po
    trunk/vice/po/pl.po
    trunk/vice/po/sv.po
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/win32/c128ui.c
    trunk/vice/src/arch/win32/resc128.rc

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/po/ChangeLog	2008-07-08 18:52:44 UTC (rev 18975)
@@ -1,3 +1,10 @@
+2008-07-08  Spiro Trikaliotis  <spi...@gm...>
+
+	* fr.po, de.po, sv.po, nl.po, pl.po, it.po, hu.po: cosmetic
+	change: Norwegain -> Norwegian.
+
+	* de.po: 2 new texts for -autostartrunwithcolon.
+
 2008-06-22  pottendo  <pot...@ao...>
 
 	* hu.po: Updated by cirix.

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/po/de.po	2008-07-08 18:52:44 UTC (rev 18975)
@@ -54,11 +54,11 @@
 
 #: src/autostart.c:177 src/translate.c.po.c:634
 msgid "On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'"
-msgstr ""
+msgstr "Bei Autostart soll 'RUN' mit Doppelpunkt ausgef\xFChrt werden ('RUN:')"
 
 #: src/autostart.c:179 src/translate.c.po.c:644
 msgid "On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'"
-msgstr ""
+msgstr "Bei Autostart soll 'RUN' ohne Doppelpunkt ausgef\xFChrt werden ('RUN')"
 
 #: src/autostart.c:270 src/translate.c.po.c:96
 msgid "Cannot load snapshot file."
@@ -8734,7 +8734,7 @@
 msgstr "Italienischer Kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3334
-msgid "Norwegain Kernal"
+msgid "Norwegian Kernal"
 msgstr "Norwegischer Kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3336

Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/po/fr.po	2008-07-08 18:52:44 UTC (rev 18975)
@@ -8989,7 +8989,7 @@
 msgstr "Kernal italien"
 
 #: src/arch/win32/resc128.rc.po.c:3334
-msgid "Norwegain Kernal"
+msgid "Norwegian Kernal"
 msgstr "Kernal norv\xE9gien"
 
 #: src/arch/win32/resc128.rc.po.c:3336
@@ -11867,7 +11867,7 @@
 msgid "Amiga mouse"
 msgstr ""
 
-#~ msgid "Specify name of Norwegain Kernal ROM image"
+#~ msgid "Specify name of Norwegian Kernal ROM image"
 #~ msgstr "Sp\xE9cifier le nom de l'image Kernal norv\xE9gienne"
 
 #, fuzzy

Modified: trunk/vice/po/hu.po
===================================================================
--- trunk/vice/po/hu.po	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/po/hu.po	2008-07-08 18:52:44 UTC (rev 18975)
@@ -8772,7 +8772,7 @@
 msgstr "Olasz kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3334
-msgid "Norwegain Kernal"
+msgid "Norwegian Kernal"
 msgstr "Norv\xE9g kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3336

Modified: trunk/vice/po/it.po
===================================================================
--- trunk/vice/po/it.po	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/po/it.po	2008-07-08 18:52:44 UTC (rev 18975)
@@ -8850,7 +8850,7 @@
 msgstr "Kernal italiano"
 
 #: src/arch/win32/resc128.rc.po.c:3334
-msgid "Norwegain Kernal"
+msgid "Norwegian Kernal"
 msgstr "Kernal norvegese"
 
 #: src/arch/win32/resc128.rc.po.c:3336
@@ -11449,7 +11449,7 @@
 msgid "Amiga mouse"
 msgstr ""
 
-#~ msgid "Specify name of Norwegain Kernal ROM image"
+#~ msgid "Specify name of Norwegian Kernal ROM image"
 #~ msgstr "Specifica il nome dell'immagine della ROM del Kernal norvegese"
 
 #, fuzzy

Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/po/nl.po	2008-07-08 18:52:44 UTC (rev 18975)
@@ -8770,7 +8770,7 @@
 msgstr "Italiaanse Kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3334
-msgid "Norwegain Kernal"
+msgid "Norwegian Kernal"
 msgstr "Noorse Kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3336

Modified: trunk/vice/po/pl.po
===================================================================
--- trunk/vice/po/pl.po	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/po/pl.po	2008-07-08 18:52:44 UTC (rev 18975)
@@ -9534,7 +9534,7 @@
 
 #: src/arch/win32/resc128.rc.po.c:3334
 #, fuzzy
-msgid "Norwegain Kernal"
+msgid "Norwegian Kernal"
 msgstr "Za\xB3aduj nowy kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3336
@@ -12579,7 +12579,7 @@
 msgstr ""
 
 #, fuzzy
-#~ msgid "Specify name of Norwegain Kernal ROM image"
+#~ msgid "Specify name of Norwegian Kernal ROM image"
 #~ msgstr "Okre\xB6l nazw\xEA pliku pozycyjnej mapy klawiatury"
 
 #, fuzzy

Modified: trunk/vice/po/sv.po
===================================================================
--- trunk/vice/po/sv.po	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/po/sv.po	2008-07-08 18:52:44 UTC (rev 18975)
@@ -8753,7 +8753,7 @@
 msgstr "Italiensk Kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3334
-msgid "Norwegain Kernal"
+msgid "Norwegian Kernal"
 msgstr "Norsk Kernal"
 
 #: src/arch/win32/resc128.rc.po.c:3336

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/src/ChangeLog	2008-07-08 18:52:44 UTC (rev 18975)
@@ -1,3 +1,8 @@
+2008-07-08  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/resc128.rc, arch/win32/c128ui.c: cosmetic change:
+	Norwegain -> Norwegian.
+
 2008-06-22  pottendo  <pot...@ao...>
 
 	* c128/c128-cmdline-options.c (cmdline_options): cosmetic change:

Modified: trunk/vice/src/arch/win32/c128ui.c
===================================================================
--- trunk/vice/src/arch/win32/c128ui.c	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/src/arch/win32/c128ui.c	2008-07-08 18:52:44 UTC (rev 18975)
@@ -97,7 +97,7 @@
     { UIROM_TYPE_MAIN, TEXT("Italian Kernal"), "KernalITName",
       IDC_C128ROM_KERNALIT_FILE, IDC_C128ROM_KERNALIT_BROWSE,
       IDC_C128ROM_KERNALIT_RESOURCE },
-    { UIROM_TYPE_MAIN, TEXT("Norwegain Kernal"), "KernalNOName",
+    { UIROM_TYPE_MAIN, TEXT("Norwegian Kernal"), "KernalNOName",
       IDC_C128ROM_KERNALNO_FILE, IDC_C128ROM_KERNALNO_BROWSE,
       IDC_C128ROM_KERNALNO_RESOURCE },
     { UIROM_TYPE_MAIN, TEXT("Swedish Kernal"), "KernalSEName",

Modified: trunk/vice/src/arch/win32/resc128.rc
===================================================================
--- trunk/vice/src/arch/win32/resc128.rc	2008-07-08 18:43:53 UTC (rev 18974)
+++ trunk/vice/src/arch/win32/resc128.rc	2008-07-08 18:52:44 UTC (rev 18975)
@@ -3403,7 +3403,7 @@
                     11,58,95,10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     AUTOCHECKBOX    "Italian Kernal",IDC_C128ROM_KERNALIT_RESOURCE,
                     11,73,95,10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-    AUTOCHECKBOX    "Norwegain Kernal",IDC_C128ROM_KERNALNO_RESOURCE,
+    AUTOCHECKBOX    "Norwegian Kernal",IDC_C128ROM_KERNALNO_RESOURCE,
                     11,88,95,10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     AUTOCHECKBOX    "Swedish Kernal",IDC_C128ROM_KERNALSE_RESOURCE,
                     11,103,95,10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
@@ -3676,7 +3676,7 @@
                     11,58,95,10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     AUTOCHECKBOX    "Italian Kernal",IDC_C128ROM_KERNALIT_RESOURCE,
                     11,73,95,10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-    AUTOCHECKBOX    "Norwegain Kernal",IDC_C128ROM_KERNALNO_RESOURCE,
+    AUTOCHECKBOX    "Norwegian Kernal",IDC_C128ROM_KERNALNO_RESOURCE,
                     11,88,95,10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     AUTOCHECKBOX    "Swedish Kernal",IDC_C128ROM_KERNALSE_RESOURCE,
                     11,103,95,10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18974] trunk/vice

From: <st...@us...> - 2008-07-08 18:43:46

Revision: 18974
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18974&view=rev
Author:   strik
Date:     2008-07-08 11:43:53 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
2008-06-22  pottendo  <pot...@ao...>

	* src/c128/c128-cmdline-options.c (cmdline_options): cosmetic
	change: Norwegain -> Norwegian.

	* src/arch/unix/joy.c (new_joystick_init): cosmetic change.

	* po/hu.po: Updated by cirix.

2008-06-11  pottendo  <pot...@ao...>

	* po/de.po: Updated.

	* po/sv.po: Updated by Peter.

Modified Paths:
--------------
    trunk/vice/po/ChangeLog
    trunk/vice/po/de.po
    trunk/vice/po/fr.po
    trunk/vice/po/hu.po
    trunk/vice/po/it.po
    trunk/vice/po/nl.po
    trunk/vice/po/pl.po
    trunk/vice/po/sv.po
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/unix/joy.c
    trunk/vice/src/c128/c128-cmdline-options.c

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-07-08 16:57:09 UTC (rev 18973)
+++ trunk/vice/po/ChangeLog	2008-07-08 18:43:53 UTC (rev 18974)
@@ -1,3 +1,13 @@
+2008-06-22  pottendo  <pot...@ao...>
+
+	* hu.po: Updated by cirix.
+
+2008-06-11  pottendo  <pot...@ao...>
+
+	* de.po: Updated.
+
+	* sv.po: Updated by Peter.
+
 2008-06-30  Marco van den Heuvel  <bla...@ya...>
 
 	* nl.po: Updated.
@@ -864,3 +874,11 @@
 
 	* Started ChangeLog.
 
+--
+You know, you've been hacking Lisp too long, 
+(when...
+ 
+--
+You know, you've been hacking Lisp too long, 
+(when...
+ 

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-07-08 16:57:09 UTC (rev 18973)
+++ trunk/vice/po/de.po	2008-07-08 18:43:53 UTC (rev 18974)
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VICE 1.22\n"
+"Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-07 20:38+0200\n"
+"POT-Creation-Date: 2008-07-08 20:35+0200\n"
 "PO-Revision-Date: 2008-01-02 16:46+0100\n"
 "Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
 "Language-Team: de <de...@li...>\n"
@@ -556,8 +556,8 @@
 msgid "Specify name of Italian Kernal ROM image"
 msgstr "Name f\xFCr italienische Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:118
-msgid "Specify name of Norwegain Kernal ROM image"
+#: src/c128/c128-cmdline-options.c:118 src/translate.c.po.c:734
+msgid "Specify name of Norwegian Kernal ROM image"
 msgstr "Name f\xFCr norwegische Kernal ROM Datei definieren"
 
 #: src/c128/c128-cmdline-options.c:120 src/translate.c.po.c:744
@@ -1416,11 +1416,11 @@
 
 #: src/monitor/monitor.c:997 src/translate.c.po.c:4254
 msgid "Execute monitor commands from file"
-msgstr ""
+msgstr "Monitor Kommandos von Datei ausf\xFChren"
 
 #: src/monitor/monitor.c:999 src/translate.c.po.c:4264
 msgid "Set an initial breakpoint for the monitor"
-msgstr ""
+msgstr "Setze initialen Breakpoint f\xFCr Monitor"
 
 #: src/mouse.c:358 src/translate.c.po.c:4456
 msgid "Enable mouse grab"
@@ -2125,8 +2125,8 @@
 msgstr "Kernel Treiber Version  : 0.8 ??"
 
 #: src/arch/unix/joy.c:402
-msgid "Please update your Joystick driver !"
-msgstr "Bitte Joystick Treiber aktualisieren !"
+msgid "Please update your Joystick driver!"
+msgstr "Bitte Joystick Treiber aktualisieren!"
 
 #: src/arch/unix/joy.c:403
 msgid "Fall back to old api routine"
@@ -5100,7 +5100,6 @@
 msgstr "*Ethernet aktivieren"
 
 #: src/arch/unix/gui/uitfe.c:50
-#, fuzzy
 msgid "*RR-NET compatibility mode"
 msgstr "*RR-NET kompatibler Modus"
 
@@ -5358,9 +5357,8 @@
 "Czirkos Zoltan, Karai Csaba - Ungarisch\n"
 
 #: src/arch/unix/x11/gnome/about.c:105
-#, fuzzy
 msgid "(c) 1998 - 2008 The Vice Team"
-msgstr "(c) 1998 - 2007 Das Vice Team"
+msgstr "(c) 1998 - 2008 Das Vice Team"
 
 #: src/arch/unix/x11/gnome/about.c:116 src/arch/win32/res.rc.po.c:5164
 #: src/arch/amigaos/intl.c.po.c:1716
@@ -6176,9 +6174,8 @@
 msgstr "Video erfolgreich ohne Shared Memory initialisiert."
 
 #: src/arch/unix/x11/xaw/x11video.c:698
-#, fuzzy
 msgid "HW scaling not available"
-msgstr "Welche Kommandozeilen Parameter sind verf\xFCgber?"
+msgstr "HW Skalierung nicht verf\xFCgbar"
 
 #: src/arch/win32/res.rc.po.c:81 src/arch/win32/resc128.rc.po.c:16
 #: src/arch/win32/resc64.rc.po.c:16 src/arch/win32/rescbm2.rc.po.c:15
@@ -6345,44 +6342,36 @@
 msgstr "Version 0.0"
 
 #: src/arch/win32/res.rc.po.c:560
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Andreas Boose"
-msgstr "Copyright (c) 1998-2007 Andreas Boose"
+msgstr "Copyright (c) 1998-2008 Andreas Boose"
 
 #: src/arch/win32/res.rc.po.c:561
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Dag Lem"
-msgstr "Copyright (c) 1998-2007 Dag Lem"
+msgstr "Copyright (c) 1998-2008 Dag Lem"
 
 #: src/arch/win32/res.rc.po.c:562
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Tibor Biczo"
-msgstr "Copyright (c) 1998-2007 Tibor Biczo"
+msgstr "Copyright (c) 1998-2008 Tibor Biczo"
 
 #: src/arch/win32/res.rc.po.c:563
-#, fuzzy
 msgid "Copyright (c) 1999-2008 Andreas Matthies"
-msgstr "Copyright (c) 1999-2007 Andreas Matthies"
+msgstr "Copyright (c) 1999-2008 Andreas Matthies"
 
 #: src/arch/win32/res.rc.po.c:564
-#, fuzzy
 msgid "Copyright (c) 1999-2008 Martin Pottendorfer"
-msgstr "Copyright (c) 1999-2007 Martin Pottendorfer"
+msgstr "Copyright (c) 1999-2008 Martin Pottendorfer"
 
 #: src/arch/win32/res.rc.po.c:565
-#, fuzzy
 msgid "Copyright (c) 2000-2008 Spiro Trikaliotis"
-msgstr "Copyright (c) 2000-2007 Spiro Trikaliotis"
+msgstr "Copyright (c) 2000-2008 Spiro Trikaliotis"
 
 #: src/arch/win32/res.rc.po.c:566
-#, fuzzy
 msgid "Copyright (c) 2005-2008 Marco van den Heuvel"
-msgstr "Copyright (c) 2005-2007 Marco van den Heuvel"
+msgstr "Copyright (c) 2005-2008 Marco van den Heuvel"
 
 #: src/arch/win32/res.rc.po.c:567
-#, fuzzy
 msgid "Copyright (c) 2006-2008 Christian Vogelgsang"
-msgstr "Copyright (c) 2006-2007 Christian Vogelgsang"
+msgstr "Copyright (c) 2006-2008 Christian Vogelgsang"
 
 #: src/arch/win32/res.rc.po.c:568
 #, fuzzy
@@ -7093,7 +7082,7 @@
 
 #: src/arch/win32/res.rc.po.c:5098 src/arch/amigaos/intl.c.po.c:1953
 msgid "Which command line options are available?"
-msgstr "Welche Kommandozeilen Parameter sind verf\xFCgber?"
+msgstr "Welche Kommandozeilen Parameter sind verf\xFCgbar?"
 
 #: src/arch/win32/res.rc.po.c:5099
 msgid "No driver selected or selected driver not supported"
@@ -7446,7 +7435,7 @@
 
 #: src/arch/win32/res.rc.po.c:5194
 msgid "Commodore emulator files (*.prg;*.p00)"
-msgstr ""
+msgstr "Commodore Emulator Dateien (*.prg;*.p00)"
 
 #: src/arch/win32/res.rc.po.c:5195 src/arch/amigaos/intl.c.po.c:3737
 msgid "Flexible"
@@ -7659,9 +7648,8 @@
 #: src/arch/win32/resc128.rc.po.c:34 src/arch/win32/resc64.rc.po.c:34
 #: src/arch/win32/rescbm2.rc.po.c:33 src/arch/win32/respet.rc.po.c:33
 #: src/arch/win32/resplus4.rc.po.c:33 src/arch/win32/resvic20.rc.po.c:33
-#, fuzzy
 msgid "&All"
-msgstr "Alle"
+msgstr "&Alle"
 
 #: src/arch/win32/resc128.rc.po.c:36 src/arch/win32/resc64.rc.po.c:36
 #: src/arch/win32/rescbm2.rc.po.c:35 src/arch/win32/respet.rc.po.c:35
@@ -7672,30 +7660,26 @@
 #: src/arch/win32/resc128.rc.po.c:38 src/arch/win32/resc64.rc.po.c:38
 #: src/arch/win32/rescbm2.rc.po.c:37 src/arch/win32/respet.rc.po.c:37
 #: src/arch/win32/resplus4.rc.po.c:37 src/arch/win32/resvic20.rc.po.c:37
-#, fuzzy
 msgid "&Add current image"
-msgstr "Aktuelles Image hinzuf\xFCgen"
+msgstr "&Aktuelles Image hinzuf\xFCgen"
 
 #: src/arch/win32/resc128.rc.po.c:39 src/arch/win32/resc64.rc.po.c:39
 #: src/arch/win32/rescbm2.rc.po.c:38 src/arch/win32/respet.rc.po.c:38
 #: src/arch/win32/resplus4.rc.po.c:38 src/arch/win32/resvic20.rc.po.c:38
-#, fuzzy
 msgid "&Remove current image"
-msgstr "Aktuelles Image entfernen"
+msgstr "Aktuelles Image entfe&rnen"
 
 #: src/arch/win32/resc128.rc.po.c:40 src/arch/win32/resc64.rc.po.c:40
 #: src/arch/win32/rescbm2.rc.po.c:39 src/arch/win32/respet.rc.po.c:39
 #: src/arch/win32/resplus4.rc.po.c:39 src/arch/win32/resvic20.rc.po.c:39
-#, fuzzy
 msgid "Attach &next image"
-msgstr "N\xE4chstes Image"
+msgstr "&N\xE4chstes Image"
 
 #: src/arch/win32/resc128.rc.po.c:41 src/arch/win32/resc64.rc.po.c:41
 #: src/arch/win32/rescbm2.rc.po.c:40 src/arch/win32/respet.rc.po.c:40
 #: src/arch/win32/resplus4.rc.po.c:40 src/arch/win32/resvic20.rc.po.c:40
-#, fuzzy
 msgid "Attach &previous image"
-msgstr "Voriges Image"
+msgstr "&Voriges Image"
 
 #: src/arch/win32/resc128.rc.po.c:43 src/arch/win32/resc64.rc.po.c:43
 #: src/arch/win32/rescbm2.rc.po.c:42 src/arch/win32/respet.rc.po.c:42
@@ -7712,9 +7696,8 @@
 #: src/arch/win32/resc128.rc.po.c:47 src/arch/win32/resc64.rc.po.c:47
 #: src/arch/win32/rescbm2.rc.po.c:46 src/arch/win32/respet.rc.po.c:46
 #: src/arch/win32/resplus4.rc.po.c:46 src/arch/win32/resvic20.rc.po.c:46
-#, fuzzy
 msgid "Attach &tape image..."
-msgstr "Band Image einlegen..."
+msgstr "&Band Image einlegen..."
 
 #: src/arch/win32/resc128.rc.po.c:48 src/arch/win32/resc64.rc.po.c:48
 #: src/arch/win32/rescbm2.rc.po.c:47 src/arch/win32/respet.rc.po.c:47
@@ -7867,23 +7850,20 @@
 msgstr "Erweiterungsmodul &Image entfernen"
 
 #: src/arch/win32/resc128.rc.po.c:91 src/arch/win32/resc64.rc.po.c:91
-#, fuzzy
 msgid "Cartridge free&ze"
-msgstr "Erweiterungsmodul Freeze"
+msgstr "Erweiterungsmodul Free&ze"
 
 #: src/arch/win32/resc128.rc.po.c:93 src/arch/win32/resc64.rc.po.c:93
 #: src/arch/win32/rescbm2.rc.po.c:61 src/arch/win32/respet.rc.po.c:59
 #: src/arch/win32/resplus4.rc.po.c:71 src/arch/win32/resvic20.rc.po.c:69
-#, fuzzy
 msgid "&Pause"
-msgstr "Pause"
+msgstr "&Pause"
 
 #: src/arch/win32/resc128.rc.po.c:94 src/arch/win32/resc64.rc.po.c:94
 #: src/arch/win32/rescbm2.rc.po.c:63 src/arch/win32/respet.rc.po.c:61
 #: src/arch/win32/resplus4.rc.po.c:73 src/arch/win32/resvic20.rc.po.c:71
-#, fuzzy
 msgid "&Monitor"
-msgstr "Monitor"
+msgstr "&Monitor"
 
 #: src/arch/win32/resc128.rc.po.c:95 src/arch/win32/resc64.rc.po.c:95
 #: src/arch/win32/rescbm2.rc.po.c:64 src/arch/win32/respet.rc.po.c:62
@@ -7894,16 +7874,14 @@
 #: src/arch/win32/resc128.rc.po.c:97 src/arch/win32/resc64.rc.po.c:97
 #: src/arch/win32/rescbm2.rc.po.c:66 src/arch/win32/respet.rc.po.c:64
 #: src/arch/win32/resplus4.rc.po.c:76 src/arch/win32/resvic20.rc.po.c:74
-#, fuzzy
 msgid "&Hard"
-msgstr "Hart"
+msgstr "&Hart"
 
 #: src/arch/win32/resc128.rc.po.c:98 src/arch/win32/resc64.rc.po.c:98
 #: src/arch/win32/rescbm2.rc.po.c:67 src/arch/win32/respet.rc.po.c:65
 #: src/arch/win32/resplus4.rc.po.c:77 src/arch/win32/resvic20.rc.po.c:75
-#, fuzzy
 msgid "&Soft"
-msgstr "Weich"
+msgstr "&Weich"
 
 #: src/arch/win32/resc128.rc.po.c:100 src/arch/win32/resc64.rc.po.c:100
 #: src/arch/win32/rescbm2.rc.po.c:69 src/arch/win32/respet.rc.po.c:67
@@ -7963,30 +7941,26 @@
 #: src/arch/win32/resc128.rc.po.c:115 src/arch/win32/resc64.rc.po.c:115
 #: src/arch/win32/rescbm2.rc.po.c:84 src/arch/win32/respet.rc.po.c:82
 #: src/arch/win32/resplus4.rc.po.c:94 src/arch/win32/resvic20.rc.po.c:92
-#, fuzzy
 msgid "&Main CPU Trace"
-msgstr "&Main CPU Trace\tAlt+F10"
+msgstr "&Haupt CPU Trace"
 
 #: src/arch/win32/resc128.rc.po.c:116 src/arch/win32/resc64.rc.po.c:116
 #: src/arch/win32/rescbm2.rc.po.c:85 src/arch/win32/respet.rc.po.c:83
 #: src/arch/win32/resplus4.rc.po.c:95 src/arch/win32/resvic20.rc.po.c:93
-#, fuzzy
 msgid "Drive&0 CPU Trace"
-msgstr "Laufwerk&0 CPU Trace\tAlt+F11"
+msgstr "Laufwerk&0 CPU Trace"
 
 #: src/arch/win32/resc128.rc.po.c:117 src/arch/win32/resc64.rc.po.c:117
 #: src/arch/win32/rescbm2.rc.po.c:86 src/arch/win32/respet.rc.po.c:84
 #: src/arch/win32/resplus4.rc.po.c:96 src/arch/win32/resvic20.rc.po.c:94
-#, fuzzy
 msgid "Drive&1 CPU Trace"
-msgstr "Laufwerk&1 CPU Trace\tAlt+F12"
+msgstr "Laufwerk&1 CPU Trace"
 
 #: src/arch/win32/resc128.rc.po.c:121 src/arch/win32/resc64.rc.po.c:121
 #: src/arch/win32/rescbm2.rc.po.c:90 src/arch/win32/respet.rc.po.c:88
 #: src/arch/win32/resplus4.rc.po.c:100 src/arch/win32/resvic20.rc.po.c:98
-#, fuzzy
 msgid "E&xit"
-msgstr "Exit"
+msgstr "E&xit"
 
 #: src/arch/win32/resc128.rc.po.c:123 src/arch/win32/resc64.rc.po.c:123
 #: src/arch/win32/rescbm2.rc.po.c:92 src/arch/win32/respet.rc.po.c:90
@@ -8030,16 +8004,14 @@
 #: src/arch/win32/resc128.rc.po.c:132 src/arch/win32/resc64.rc.po.c:132
 #: src/arch/win32/rescbm2.rc.po.c:101 src/arch/win32/respet.rc.po.c:99
 #: src/arch/win32/resplus4.rc.po.c:111 src/arch/win32/resvic20.rc.po.c:109
-#, fuzzy
 msgid "&Load quicksnapshot image"
-msgstr "Snapshot Image laden"
+msgstr "Quick-Snapshot Image &laden"
 
 #: src/arch/win32/resc128.rc.po.c:133 src/arch/win32/resc64.rc.po.c:133
 #: src/arch/win32/rescbm2.rc.po.c:102 src/arch/win32/respet.rc.po.c:100
 #: src/arch/win32/resplus4.rc.po.c:112 src/arch/win32/resvic20.rc.po.c:110
-#, fuzzy
 msgid "&Save quicksnapshot image"
-msgstr "Quick-Snapshot Datei speichern"
+msgstr "Quick-Snapshot Datei &speichern"
 
 #: src/arch/win32/resc128.rc.po.c:135 src/arch/win32/resc64.rc.po.c:135
 #: src/arch/win32/rescbm2.rc.po.c:104 src/arch/win32/respet.rc.po.c:102
@@ -8243,9 +8215,8 @@
 #: src/arch/win32/resc128.rc.po.c:184 src/arch/win32/resc64.rc.po.c:186
 #: src/arch/win32/rescbm2.rc.po.c:153 src/arch/win32/respet.rc.po.c:151
 #: src/arch/win32/resplus4.rc.po.c:163 src/arch/win32/resvic20.rc.po.c:161
-#, fuzzy
 msgid "&Warp mode"
-msgstr "Warp modus"
+msgstr "&Warp modus"
 
 #: src/arch/win32/resc128.rc.po.c:186 src/arch/win32/resc64.rc.po.c:189
 #: src/arch/win32/rescbm2.rc.po.c:156 src/arch/win32/respet.rc.po.c:155
@@ -8290,9 +8261,8 @@
 #: src/arch/win32/resc128.rc.po.c:200 src/arch/win32/resc64.rc.po.c:197
 #: src/arch/win32/rescbm2.rc.po.c:165 src/arch/win32/respet.rc.po.c:161
 #: src/arch/win32/resplus4.rc.po.c:180 src/arch/win32/resvic20.rc.po.c:178
-#, fuzzy
 msgid "Swap &Joystick"
-msgstr "Joystick ports austauschen"
+msgstr "&Joystick ports austauschen"
 
 #: src/arch/win32/resc128.rc.po.c:202 src/arch/win32/resc64.rc.po.c:199
 #: src/arch/win32/rescbm2.rc.po.c:167 src/arch/win32/respet.rc.po.c:163
@@ -8338,9 +8308,8 @@
 msgstr "IEEE&488 Schnittstellen-Emulation"
 
 #: src/arch/win32/resc128.rc.po.c:215 src/arch/win32/resc64.rc.po.c:212
-#, fuzzy
 msgid "&Grab mouse events"
-msgstr "Maus Ereignisse abfangen"
+msgstr "Maus Ereignisse abfan&gen"
 
 #: src/arch/win32/resc128.rc.po.c:217 src/arch/win32/resc64.rc.po.c:214
 #: src/arch/win32/rescbm2.rc.po.c:179 src/arch/win32/respet.rc.po.c:175
@@ -10049,11 +10018,6 @@
 msgid "New &Luminances"
 msgstr "Neue He&lligkeitsemulation"
 
-#: src/translate.c.po.c:734
-#, fuzzy
-msgid "Specify name of Norwegian Kernal ROM image"
-msgstr "Name f\xFCr norwegische Kernal ROM Datei definieren"
-
 #: src/translate.c.po.c:2666
 msgid "<0-2000>"
 msgstr "<0-2000>"

Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po	2008-07-08 16:57:09 UTC (rev 18973)
+++ trunk/vice/po/fr.po	2008-07-08 18:43:53 UTC (rev 18974)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-07 20:38+0200\n"
+"POT-Creation-Date: 2008-07-08 20:35+0200\n"
 "PO-Revision-Date: 2007-07-26 11:57+0200\n"
 "Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
 "Language-Team: fr <fr...@li...>\n"
@@ -584,8 +584,9 @@
 msgid "Specify name of Italian Kernal ROM image"
 msgstr "Sp\xE9cifier le nom de l'image Kernal italienne"
 
-#: src/c128/c128-cmdline-options.c:118
-msgid "Specify name of Norwegain Kernal ROM image"
+#: src/c128/c128-cmdline-options.c:118 src/translate.c.po.c:734
+#, fuzzy
+msgid "Specify name of Norwegian Kernal ROM image"
 msgstr "Sp\xE9cifier le nom de l'image Kernal norv\xE9gienne"
 
 #: src/c128/c128-cmdline-options.c:120 src/translate.c.po.c:744
@@ -2193,7 +2194,8 @@
 msgstr "Version du pilote Kernel : 0.8 ??"
 
 #: src/arch/unix/joy.c:402
-msgid "Please update your Joystick driver !"
+#, fuzzy
+msgid "Please update your Joystick driver!"
 msgstr "SVP, mettre \xE0 jour le pilote du joystick !"
 
 #: src/arch/unix/joy.c:403
@@ -10322,11 +10324,6 @@
 msgid "New &Luminances"
 msgstr "Nouvelles luminescences"
 
-#: src/translate.c.po.c:734
-#, fuzzy
-msgid "Specify name of Norwegian Kernal ROM image"
-msgstr "Sp\xE9cifier le nom de l'image Kernal norv\xE9gienne"
-
 #: src/translate.c.po.c:2666
 msgid "<0-2000>"
 msgstr ""
@@ -11870,6 +11867,9 @@
 msgid "Amiga mouse"
 msgstr ""
 
+#~ msgid "Specify name of Norwegain Kernal ROM image"
+#~ msgstr "Sp\xE9cifier le nom de l'image Kernal norv\xE9gienne"
+
 #, fuzzy
 #~ msgid "Attach raw 32KB Action Replay 4 cartridge image"
 #~ msgstr "Ins\xE9rer une cartouche Action Replay 32KO"

Modified: trunk/vice/po/hu.po
===================================================================
--- trunk/vice/po/hu.po	2008-07-08 16:57:09 UTC (rev 18973)
+++ trunk/vice/po/hu.po	2008-07-08 18:43:53 UTC (rev 18974)
@@ -6,9 +6,9 @@
 # Czirkos Zoltan <ci...@fw...>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: VICE 1.22\n"
+"Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-07 20:38+0200\n"
+"POT-Creation-Date: 2008-07-08 20:35+0200\n"
 "PO-Revision-Date: 2007-07-27 15:58+0200\n"
 "Last-Translator: Karai Csaba <cs...@fr...>\n"
 "Language-Team: Hungarian <hu...@li...>\n"
@@ -51,7 +51,7 @@
 
 #: src/screenshot.c:171 src/translate.c.po.c:221
 msgid "Sorry. Multiple recording is not supported."
-msgstr "Sajn\xE1lom: t\xF6bbsz\xF6r\xF6s fekv\xE9tel nem t\xE1mogatott."
+msgstr "Sajn\xE1lom: t\xF6bbsz\xF6r\xF6s felv\xE9tel nem t\xE1mogatott."
 
 #: src/autostart.c:177 src/translate.c.po.c:634
 msgid "On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'"
@@ -75,7 +75,7 @@
 
 #: src/sound.c:279 src/translate.c.po.c:4556
 msgid "Set sound sample rate to <value> Hz"
-msgstr "Hang mintav\xE9telez\xE9si r\xE1ta be\xE1ll\xEDt\xE1sa Hz-ben <\xE9rt\xE9k>-re"
+msgstr "Hang mintav\xE9telez\xE9si r\xE1ta be\xE1ll\xEDt\xE1sa <\xE9rt\xE9k> Hz-re"
 
 #: src/sound.c:281 src/translate.c.po.c:4566
 msgid "Set sound buffer size to <value> msec"
@@ -207,7 +207,7 @@
 
 #: src/sound.c:671
 msgid "sound device lacks stereo capability"
-msgstr "A hangeszk\xF6z nem stereo"
+msgstr "A hangeszk\xF6z nem sztere\xF3"
 
 #: src/sound.c:721 src/translate.c.po.c:271
 #, c-format
@@ -221,7 +221,7 @@
 
 #: src/sound.c:750 src/translate.c.po.c:291
 msgid "Recording device must be different from playback device"
-msgstr "A felvev\xF5 \xE9s lej\xE1tsz\xF3 eszk\xF6z\xF6knek k\xFCl\xF6nb\xF6znie kell!"
+msgstr "A felvev\xF5 \xE9s lej\xE1tsz\xF3 eszk\xF6z\xF6knek k\xFCl\xF6nb\xF6znie kell"
 
 #: src/sound.c:760 src/translate.c.po.c:303
 #, c-format
@@ -281,12 +281,12 @@
 #: src/event.c:240 src/translate.c.po.c:136
 #, c-format
 msgid "Cannot find mapped name for %s"
-msgstr "A VICE %s lek\xE9pzett nev\xE9t nem tal\xE1lta meg."
+msgstr "A VICE %s lek\xE9pzett nev\xE9t nem tal\xE1lja"
 
 #: src/event.c:620 src/translate.c.po.c:146
 #, c-format
 msgid "Could not create start snapshot file %s."
-msgstr "Nem siker\xFClt a %s pillanatk\xE9p f\xE1jlt l\xE9trehozni."
+msgstr "Nem siker\xFClt a %s kezdeti pillanatk\xE9p f\xE1jlt l\xE9trehozni."
 
 #: src/event.c:639 src/event.c:934 src/translate.c.po.c:156
 #, c-format
@@ -296,7 +296,7 @@
 #: src/event.c:707 src/event.c:901 src/translate.c.po.c:166
 #, c-format
 msgid "Could not create end snapshot file %s."
-msgstr "Nem siker\xFClt az utols\xF3 %s pillanatk\xE9p f\xE1jlt l\xE9trehozni."
+msgstr "Nem siker\xFClt a %s befejez\xF5 pillanatk\xE9p f\xE1jlt l\xE9trehozni."
 
 #: src/event.c:775 src/translate.c.po.c:176
 #, c-format
@@ -314,7 +314,7 @@
 
 #: src/event.c:844 src/translate.c.po.c:211
 msgid "Error reading start snapshot file."
-msgstr "Nem siker\xFClt az els\xF5 pillanatk\xE9p f\xE1jl olvas\xE1sa."
+msgstr "Nem siker\xFClt az ind\xEDt\xF3 pillanatk\xE9p f\xE1jl olvas\xE1sa."
 
 #: src/event.c:1227 src/translate.c.po.c:4244
 msgid "Playback recorded events"
@@ -357,7 +357,7 @@
 
 #: src/debug.c:180 src/translate.c.po.c:4159
 msgid "Do not trace the drive0 CPU"
-msgstr "A 0-s lemezegys\xE9g CPU-j\xE1nak nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
+msgstr "A 0-s lemezegys\xE9g CPU-ja nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
 
 #: src/debug.c:183 src/translate.c.po.c:4169
 msgid "Trace the drive1 CPU"
@@ -365,7 +365,7 @@
 
 #: src/debug.c:186 src/translate.c.po.c:4179
 msgid "Do not trace the drive1 CPU"
-msgstr "Az 1-es lemezegys\xE9g CPU-j\xE1nak nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
+msgstr "Az 1-es lemezegys\xE9g CPU-ja nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
 
 #: src/debug.c:190 src/translate.c.po.c:4190
 msgid "Trace the drive2 CPU"
@@ -373,7 +373,7 @@
 
 #: src/debug.c:193 src/translate.c.po.c:4200
 msgid "Do not trace the drive2 CPU"
-msgstr "A 2-es lemezegys\xE9g CPU-j\xE1nak nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
+msgstr "A 2-es lemezegys\xE9g CPU-ja nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
 
 #: src/debug.c:198 src/translate.c.po.c:4212
 msgid "Trace the drive3 CPU"
@@ -381,7 +381,7 @@
 
 #: src/debug.c:201 src/translate.c.po.c:4222
 msgid "Do not trace the drive3 CPU"
-msgstr "A 3-as lemezegys\xE9g CPU-j\xE1nak nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
+msgstr "A 3-as lemezegys\xE9g CPU-ja nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
 
 #: src/debug.c:205 src/translate.c.po.c:4233
 msgid "Trace mode (0=normal 1=small 2=history)"
@@ -562,8 +562,8 @@
 msgid "Specify name of Italian Kernal ROM image"
 msgstr "Adja meg az olasz Kernal ROM k\xE9pm\xE1s nev\xE9t"
 
-#: src/c128/c128-cmdline-options.c:118
-msgid "Specify name of Norwegain Kernal ROM image"
+#: src/c128/c128-cmdline-options.c:118 src/translate.c.po.c:734
+msgid "Specify name of Norwegian Kernal ROM image"
 msgstr "Adja meg a norv\xE9g Kernal ROM k\xE9pm\xE1s nev\xE9t"
 
 #: src/c128/c128-cmdline-options.c:120 src/translate.c.po.c:744
@@ -572,11 +572,11 @@
 
 #: src/c128/c128-cmdline-options.c:122 src/translate.c.po.c:754
 msgid "Specify name of BASIC ROM image (lower part)"
-msgstr "Adja meg a BASIC ROM k\xE9pm\xE1s nev\xE9t (als\xF3)"
+msgstr "Adja meg a BASIC ROM k\xE9pm\xE1s nev\xE9t (als\xF3 r\xE9sz)"
 
 #: src/c128/c128-cmdline-options.c:124 src/translate.c.po.c:764
 msgid "Specify name of BASIC ROM image (higher part)"
-msgstr "Adja meg a BASIC ROM k\xE9pm\xE1s nev\xE9t (fels\xF5)"
+msgstr "Adja meg a BASIC ROM k\xE9pm\xE1s nev\xE9t (fels\xF5 r\xE9sz)"
 
 #: src/c128/c128-cmdline-options.c:126 src/translate.c.po.c:774
 msgid "Specify name of international character generator ROM image"
@@ -625,12 +625,12 @@
 #: src/c128/c128-cmdline-options.c:146 src/c64/c64-cmdline-options.c:101
 #: src/translate.c.po.c:874
 msgid "<revision>"
-msgstr "<v\xE1ltozatsz\xE1m>"
+msgstr "<v\xE1ltozat>"
 
 #: src/c128/c128-cmdline-options.c:146 src/c64/c64-cmdline-options.c:101
 #: src/translate.c.po.c:884
 msgid "Patch the Kernal ROM to the specified <revision>"
-msgstr "A Kernal ROM \xE1t\xEDr\xE1sa adott <v\xE1ltozatsz\xE1mra>"
+msgstr "A Kernal ROM \xE1t\xEDr\xE1sa adott <v\xE1ltozatra>"
 
 #: src/c128/c128-cmdline-options.c:149 src/c64/c64-cmdline-options.c:104
 #: src/translate.c.po.c:895
@@ -825,7 +825,7 @@
 
 #: src/c64/cart/ide64.c:283 src/translate.c.po.c:1642
 msgid "Set number of cylinders for the IDE64 emulation"
-msgstr "Adja meg a cilinderek sz\xE1m\xE1t IDE64 emul\xE1ci\xF3hoz"
+msgstr "Adja meg a s\xE1vok sz\xE1m\xE1t IDE64 emul\xE1ci\xF3hoz"
 
 #: src/c64/cart/ide64.c:285 src/translate.c.po.c:1652
 msgid "Set number of heads for the IDE64 emulation"
@@ -858,7 +858,7 @@
 #: src/c64/c64_256k.c:212 src/c64/digimax.c:141 src/c64/plus60k.c:251
 #: src/sid/sid-cmdline-options.c:221 src/translate.c.po.c:3456
 msgid "<base address>"
-msgstr "<b\xE1zis c\xEDm>"
+msgstr "<b\xE1zisc\xEDm>"
 
 #: src/c64/c64_256k.c:212 src/translate.c.po.c:4846
 msgid "Base address of the 256K expansion"
@@ -1240,7 +1240,7 @@
 
 #: src/drive/iec/iec-cmdline-options.c:103 src/translate.c.po.c:2144
 msgid "Enable 8KB RAM expansion at $4000-$5FFF"
-msgstr "8KB RAM kiterjesz\xE9s tilt\xE1sa a $4000-$5FFF c\xEDmen"
+msgstr "8KB RAM kiterjesz\xE9s enged\xE9lyez\xE9se a $4000-$5FFF c\xEDmen"
 
 #: src/drive/iec/iec-cmdline-options.c:105 src/translate.c.po.c:2154
 msgid "Disable 8KB RAM expansion at $4000-$5FFF"
@@ -1248,7 +1248,7 @@
 
 #: src/drive/iec/iec-cmdline-options.c:107 src/translate.c.po.c:2164
 msgid "Enable 8KB RAM expansion at $6000-$7FFF"
-msgstr "8KB RAM kiterjesz\xE9s tilt\xE1sa a $6000-$7FFF c\xEDmen"
+msgstr "8KB RAM kiterjesz\xE9s enged\xE9lyez\xE9se a $6000-$7FFF c\xEDmen"
 
 #: src/drive/iec/iec-cmdline-options.c:109 src/translate.c.po.c:2174
 msgid "Disable 8KB RAM expansion at $6000-$7FFF"
@@ -1256,7 +1256,7 @@
 
 #: src/drive/iec/iec-cmdline-options.c:111 src/translate.c.po.c:2184
 msgid "Enable 8KB RAM expansion at $8000-$9FFF"
-msgstr "8KB RAM kiterjesz\xE9s tilt\xE1sa a $8000-$9FFF c\xEDmen"
+msgstr "8KB RAM kiterjesz\xE9s enged\xE9lyez\xE9se a $8000-$9FFF c\xEDmen"
 
 #: src/drive/iec/iec-cmdline-options.c:113 src/translate.c.po.c:2194
 msgid "Disable 8KB RAM expansion at $8000-$9FFF"
@@ -1264,7 +1264,7 @@
 
 #: src/drive/iec/iec-cmdline-options.c:115 src/translate.c.po.c:2204
 msgid "Enable 8KB RAM expansion at $A000-$BFFF"
-msgstr "8KB RAM kiterjesz\xE9s tilt\xE1sa a $A000-$BFFF c\xEDmen"
+msgstr "8KB RAM kiterjesz\xE9s enged\xE9lyez\xE9se a $A000-$BFFF c\xEDmen"
 
 #: src/drive/iec/iec-cmdline-options.c:117 src/translate.c.po.c:2214
 msgid "Disable 8KB RAM expansion at $A000-$BFFF"
@@ -1421,7 +1421,7 @@
 
 #: src/kbdbuf.c:136 src/translate.c.po.c:4426
 msgid "<string>"
-msgstr "<string>"
+msgstr "<sztring>"
 
 #: src/kbdbuf.c:136 src/translate.c.po.c:4436
 msgid "Put the specified string into the keyboard buffer"
@@ -1429,25 +1429,23 @@
 
 #: src/log.c:110 src/translate.c.po.c:4446
 msgid "Specify log file name"
-msgstr "Adja meg a log f\xE1jl nev\xE9t"
+msgstr "Adja meg a napl\xF3f\xE1jl nev\xE9t"
 
 #: src/monitor/monitor.c:997 src/translate.c.po.c:4254
 msgid "Execute monitor commands from file"
-msgstr ""
+msgstr "Monitorprogram parancsok futtat\xE1sa f\xE1jlb\xF3l"
 
 #: src/monitor/monitor.c:999 src/translate.c.po.c:4264
 msgid "Set an initial breakpoint for the monitor"
-msgstr ""
+msgstr "Kezdeti t\xF6r\xE9spont megad\xE1sa a monitorprogramnak"
 
 #: src/mouse.c:358 src/translate.c.po.c:4456
-#, fuzzy
 msgid "Enable mouse grab"
-msgstr "*Eg\xE9r enged\xE9lyez\xE9se"
+msgstr "Eg\xE9r elkap\xE1s enged\xE9lyez\xE9se"
 
 #: src/mouse.c:360 src/translate.c.po.c:4466
-#, fuzzy
 msgid "Disable mouse grab"
-msgstr "Dupla p\xE1szt\xE1z\xE1s tilt\xE1sa"
+msgstr "Eg\xE9r elkap\xE1s tilt\xE1sa"
 
 #: src/mouse.c:362 src/translate.c.po.c:4476
 msgid "Select the joystick port the mouse is attached to"
@@ -1455,11 +1453,11 @@
 
 #: src/mouse.c:364 src/translate.c.po.c:4486
 msgid "Select the mouse type (0 = 1351, 1 = NEOS, 2 = Amiga)"
-msgstr ""
+msgstr "Eg\xE9r t\xEDpus kiv\xE1laszt\xE1sa (0 = 1351, 1 = NEOS, 2 = Amiga)"
 
 #: src/pet/pet-cmdline-options.c:114 src/translate.c.po.c:2406
 msgid "Specify PET model to emulate"
-msgstr "Adja meg az emul\xE1land\xF3 PET modellt"
+msgstr "Adja meg az emul\xE1lt PET modellt"
 
 #: src/pet/pet-cmdline-options.c:120 src/translate.c.po.c:2416
 msgid "Specify name of Editor ROM image"
@@ -1467,15 +1465,15 @@
 
 #: src/pet/pet-cmdline-options.c:124 src/translate.c.po.c:2426
 msgid "Specify 4K extension ROM name at $9***"
-msgstr "Adja meg a $9*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s k\xE9pm\xE1s nev\xE9t"
+msgstr "Adja meg a $9*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s nev\xE9t"
 
 #: src/pet/pet-cmdline-options.c:126 src/translate.c.po.c:2436
 msgid "Specify 4K extension ROM name at $A***"
-msgstr "Adja meg a $A*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s k\xE9pm\xE1s nev\xE9t"
+msgstr "Adja meg a $A*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s nev\xE9t"
 
 #: src/pet/pet-cmdline-options.c:128 src/translate.c.po.c:2446
 msgid "Specify 4K extension ROM name at $B***"
-msgstr "Adja meg a $B*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s k\xE9pm\xE1s nev\xE9t"
+msgstr "Adja meg a $B*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s nev\xE9t"
 
 #: src/pet/pet-cmdline-options.c:130 src/translate.c.po.c:2456
 msgid "Enable PET8296 4K RAM mapping at $9***"
@@ -1515,7 +1513,7 @@
 
 #: src/pet/pet-cmdline-options.c:150 src/translate.c.po.c:2546
 msgid "Do not switch upper/lower case charset"
-msgstr "Ne V\xE1ltson a nagy-/kisbet\xFBs karakterk\xE9szletre"
+msgstr "Ne v\xE1ltson a nagy-/kisbet\xFBs karakterk\xE9szletre"
 
 #: src/pet/pet-cmdline-options.c:152 src/translate.c.po.c:2556
 msgid "EOI blanks screen"
@@ -1527,11 +1525,11 @@
 
 #: src/pet/petpia1.c:120 src/translate.c.po.c:2576
 msgid "Enable userport diagnostic pin"
-msgstr "Userport diagnosztikai t\xFB enged\xE9lyez\xE9se"
+msgstr "Userport diagnosztikai t\xFCske enged\xE9lyez\xE9se"
 
 #: src/pet/petpia1.c:122 src/translate.c.po.c:2586
 msgid "Disable userport diagnostic pin"
-msgstr "Userport diagnosztikai t\xFB tilt\xE1sa"
+msgstr "Userport diagnosztikai t\xFCske tilt\xE1sa"
 
 #: src/pet/petreu.c:210 src/translate.c.po.c:1170
 msgid "Enable the PET Ram and Expansion Unit"
@@ -1623,7 +1621,7 @@
 
 #: src/printerdrv/driver-select.c:129 src/translate.c.po.c:2766
 msgid "Specify name of printer driver for the userport printer"
-msgstr "Adja meg a Userport-os nyomtat\xF3meghajt\xF3 nev\xE9t"
+msgstr "Adja meg a userport nyomtat\xF3meghajt\xF3 nev\xE9t"
 
 #: src/printerdrv/interface-serial.c:122 src/translate.c.po.c:2776
 msgid "Set device type for device #4 (0: NONE, 1: FS, 2: REAL)"
@@ -1635,11 +1633,11 @@
 
 #: src/printerdrv/interface-userport.c:93 src/translate.c.po.c:2796
 msgid "Enable the userport printer emulation"
-msgstr "Userporti nyomtat\xF3 emul\xE1ci\xF3j\xE1nak enged\xE9lyez\xE9se"
+msgstr "Userport nyomtat\xF3 emul\xE1ci\xF3j\xE1nak enged\xE9lyez\xE9se"
 
 #: src/printerdrv/interface-userport.c:96 src/translate.c.po.c:2806
 msgid "Disable the userport printer emulation"
-msgstr "Userporti nyomtat\xF3 emul\xE1ci\xF3j\xE1nak tilt\xE1sa"
+msgstr "Userport nyomtat\xF3 emul\xE1ci\xF3j\xE1nak tilt\xE1sa"
 
 #: src/printerdrv/output-select.c:120 src/translate.c.po.c:2816
 msgid "Specify name of output device for device #4"
@@ -1651,7 +1649,7 @@
 
 #: src/printerdrv/output-select.c:125 src/translate.c.po.c:2836
 msgid "Specify name of output device for the userport printer"
-msgstr "Adja meg a kimeneti eszk\xF6z nev\xE9t a userporti nyomtat\xF3hoz"
+msgstr "Adja meg a kimeneti eszk\xF6z nev\xE9t a userport nyomtat\xF3hoz"
 
 #: src/printerdrv/output-text.c:113 src/printerdrv/output-text.c:115
 #: src/printerdrv/output-text.c:117 src/translate.c.po.c:2846
@@ -1668,7 +1666,7 @@
 
 #: src/printerdrv/output-text.c:126 src/translate.c.po.c:2886
 msgid "Specify printer text output device for userport printer"
-msgstr "Adja meg a sz\xF6vegnyomtat\xF3 eszk\xF6zt a userporti nyomtat\xF3hoz"
+msgstr "Adja meg a sz\xF6vegnyomtat\xF3 eszk\xF6zt a userport nyomtat\xF3hoz"
 
 #: src/ram.c:101 src/translate.c.po.c:4496
 msgid "Set the value for the very first RAM address after powerup"
@@ -1688,11 +1686,11 @@
 
 #: src/raster/raster-cmdline-options.c:59 src/translate.c.po.c:2896
 msgid "Enable the video cache"
-msgstr "Vide\xF3 gyors\xEDt\xF3 t\xE1r enged\xE9lyez\xE9se"
+msgstr "Vide\xF3 gyors\xEDt\xF3t\xE1r enged\xE9lyez\xE9se"
 
 #: src/raster/raster-cmdline-options.c:61 src/translate.c.po.c:2906
 msgid "Disable the video cache"
-msgstr "Vide\xF3 gyors\xEDt\xF3 t\xE1r tilt\xE1sa"
+msgstr "Vide\xF3 gyors\xEDt\xF3t\xE1r tilt\xE1sa"
 
 #: src/rs232drv/rs232drv.c:101 src/translate.c.po.c:2917
 msgid "Specify name of first RS232 device"
@@ -2150,7 +2148,7 @@
 msgstr "Kernel meghajt\xF3 verzi\xF3ja  : 0.8 ??"
 
 #: src/arch/unix/joy.c:402
-msgid "Please update your Joystick driver !"
+msgid "Please update your Joystick driver!"
 msgstr "K\xE9rem friss\xEDtse a Joystick meghajt\xF3j\xE1t!"
 
 #: src/arch/unix/joy.c:403
@@ -2346,15 +2344,15 @@
 
 #: src/arch/unix/gui/c128ui.c:238 src/arch/unix/gui/c64ui.c:270
 msgid "RAM Expansion Unit"
-msgstr "RAM Expansion Unit"
+msgstr "RAM B\xF5v\xEDt\xF5 Egys\xE9g"
 
 #: src/arch/unix/gui/c128ui.c:240 src/arch/unix/gui/c64ui.c:272
 msgid "GEORAM Expansion Unit"
-msgstr "GEORAM Expansion Unit"
+msgstr "GEORAM B\xF5v\xEDt\xF5 Egys\xE9g"
 
 #: src/arch/unix/gui/c128ui.c:242 src/arch/unix/gui/c64ui.c:274
 msgid "RAM Expansion Cart"
-msgstr "RAM Expansion Cart"
+msgstr "RAM B\xF5v\xEDt\xF5 K\xE1rtya"
 
 #: src/arch/unix/gui/c128ui.c:244 src/arch/unix/gui/c64ui.c:282
 msgid "MMC64 emulation"
@@ -2382,9 +2380,8 @@
 msgstr "*IEEE488 interf\xE9sz emul\xE1ci\xF3"
 
 #: src/arch/unix/gui/c128ui.c:259 src/arch/unix/gui/c64ui.c:295
-#, fuzzy
 msgid "*Mouse Emulation"
-msgstr "*1351 eg\xE9r emul\xE1ci\xF3"
+msgstr "*Eg\xE9r emul\xE1ci\xF3"
 
 #: src/arch/unix/gui/c128ui.c:268
 msgid "Load new Int. Kernal ROM"
@@ -2540,11 +2537,11 @@
 
 #: src/arch/unix/gui/c64ui.c:276
 msgid "PLUS60K RAM Expansion"
-msgstr "PLUS60K RAM kiterjeszt\xE9s"
+msgstr "PLUS60K RAM b\xF5v\xEDt\xE9s"
 
 #: src/arch/unix/gui/c64ui.c:278
 msgid "PLUS256K RAM Expansion"
-msgstr "PLUS256K RAM kiterjeszt\xE9s"
+msgstr "PLUS256K RAM b\xF5v\xEDt\xE9s"
 
 #: src/arch/unix/gui/c64ui.c:280
 msgid "256K RAM Expansion"
@@ -2649,7 +2646,7 @@
 
 #: src/arch/unix/gui/cbm2ui.c:236 src/arch/unix/gui/petui.c:299
 msgid "Model defaults"
-msgstr "Alap\xE9rtelmezett modellek"
+msgstr "Modell alap\xE9rtelmez\xE9sei"
 
 #: src/arch/unix/gui/cbm2ui.c:242 src/arch/unix/gui/petui.c:307
 msgid "Memory size"
@@ -2764,7 +2761,7 @@
 
 #: src/arch/unix/gui/petui.c:222
 msgid "PET RAM and Expansion Unit"
-msgstr "PET RAM and Expansion Unit"
+msgstr "PET RAM \xE9s b\xF5v\xEDt\xF5 egys\xE9g"
 
 #: src/arch/unix/gui/petui.c:224
 msgid "SID cartridge"
@@ -2816,7 +2813,7 @@
 
 #: src/arch/unix/gui/petui.c:314
 msgid "*SuperPET I/O enable (disables 8x96)"
-msgstr "*SuperPET I/O enged\xE9lyez\xE9se (8x96-on tiltva)"
+msgstr "*SuperPET I/O enged\xE9lyez\xE9se (8x96-ot tiltja)"
 
 #: src/arch/unix/gui/petui.c:316
 msgid "SuperPET ACIA"
@@ -2913,7 +2910,7 @@
 
 #: src/arch/unix/gui/uiattach.c:98
 msgid "Invalid Disk Image or Filename"
-msgstr "\xC9rv\xE9nytelen lemez k\xE9pm\xE1s, vagy f\xE1jln\xE9v"
+msgstr "\xC9rv\xE9nytelen lemez k\xE9pm\xE1s vagy f\xE1jln\xE9v"
 
 #: src/arch/unix/gui/uiattach.c:113 src/arch/unix/gui/uiattach.c:147
 msgid "Unit #8..."
@@ -2949,7 +2946,7 @@
 
 #: src/arch/unix/gui/uiattach.c:176 src/arch/amigaos/intl.c.po.c:168
 msgid "All"
-msgstr "Mindegyik"
+msgstr "\xD6sszes"
 
 #: src/arch/unix/gui/uiattach.c:182
 msgid "Attach a disk image"
@@ -3114,7 +3111,7 @@
 
 #: src/arch/unix/gui/uic64cart.c:204 src/arch/amigaos/intl.c.po.c:645
 msgid "Cartridge freeze"
-msgstr "Fagyaszt\xE1s Cartridge-el"
+msgstr "Fagyaszt\xE1s Cartridge-dzsel"
 
 #: src/arch/unix/gui/uic64cart.c:206
 msgid "*Cartridge control"
@@ -3151,7 +3148,7 @@
 
 #: src/arch/unix/gui/uicommands.c:115
 msgid "Couldn't run xterm"
-msgstr "Nem siker\xFClt az xterm-et futtatni"
+msgstr "Nem siker\xFClt az xtermet futtatni"
 
 #: src/arch/unix/gui/uicommands.c:120
 msgid "Unknown error while running c1541"
@@ -3159,7 +3156,7 @@
 
 #: src/arch/unix/gui/uicommands.c:150
 msgid "No HTML browser is defined."
-msgstr "Nincs be\xE1ll\xEDtott HTML b\xF6ng\xE9sz\xF5"
+msgstr "Nincs HTML b\xF6ng\xE9sz\xF5 be\xE1ll\xEDtva."
 
 #: src/arch/unix/gui/uicommands.c:179 src/arch/unix/gui/uicommands.c:193
 #: src/arch/unix/gui/uicommands.c:206
@@ -3259,7 +3256,7 @@
 
 #: src/arch/unix/gui/uicommands.c:493
 msgid "Quickload snapshot"
-msgstr "Gyors Pillanatk\xE9p t\xF6lt\xE9s"
+msgstr "Gyors pillanatk\xE9p t\xF6lt\xE9s"
 
 #: src/arch/unix/gui/uicommands.c:496
 msgid "Quicksave snapshot"
@@ -3275,11 +3272,11 @@
 
 #: src/arch/unix/gui/uicommands.c:506
 msgid "Start playing back events"
-msgstr "Esem\xE9nyek visszaj\xE1tsz\xE1s\xE1nak ind\xEDt\xE1sa"
+msgstr "Esem\xE9ny visszaj\xE1tsz\xE1s ind\xEDt\xE1sa"
 
 #: src/arch/unix/gui/uicommands.c:508
 msgid "Stop playing back events"
-msgstr "Esem\xE9nyek visszaj\xE1tsz\xE1s\xE1nak le\xE1ll\xEDt\xE1sa"
+msgstr "Esem\xE9ny visszaj\xE1tsz\xE1s le\xE1ll\xEDt\xE1sa"
 
 #: src/arch/unix/gui/uicommands.c:510
 msgid "Set recording milestone"
@@ -3411,9 +3408,8 @@
 #: src/arch/unix/gui/uicrtc.c:87 src/arch/unix/gui/uited.c:128
 #: src/arch/unix/gui/uivdc.c:79 src/arch/unix/gui/uivic.c:123
 #: src/arch/unix/gui/uivicii.c:164
-#, fuzzy
 msgid "*Fullscreen settings"
-msgstr "Teljesk\xE9perny\xF5s eszk\xF6z"
+msgstr "*Teljes k\xE9perny\xF5s m\xF3d be\xE1ll\xEDt\xE1sai"
 
 #: src/arch/unix/gui/uicrtc.c:90 src/arch/unix/gui/uited.c:131
 #: src/arch/unix/gui/uivdc.c:82 src/arch/unix/gui/uivic.c:126
@@ -3761,7 +3757,7 @@
 
 #: src/arch/unix/gui/uifliplist.c:87
 msgid "Fliplist File"
-msgstr "(Lemezlista F\xE1jl)"
+msgstr "Lemezlista F\xE1jl"
 
 #: src/arch/unix/gui/uifliplist.c:97
 #, c-format
@@ -3810,12 +3806,12 @@
 #: src/arch/unix/gui/uifliplist.c:194
 #, c-format
 msgid "Attach #%d"
-msgstr "Csatol\xE1s #%d"
+msgstr "#%d csatol\xE1sa"
 
 #: src/arch/unix/gui/uifliplist.c:201
 #, c-format
 msgid "Detach #%d"
-msgstr "Lev\xE1laszt\xE1s #%d"
+msgstr "#%d lev\xE1laszt\xE1sa"
 
 #: src/arch/unix/gui/uifliplist.c:217
 msgid "*Write Protect"
@@ -3855,11 +3851,11 @@
 
 #: src/arch/unix/gui/uifullscreen-menu.h:94
 msgid "*Enable fullscreen"
-msgstr "*Teljesk\xE9perny\xF5 enged\xE9lyez\xE9se"
+msgstr "*Teljes k\xE9perny\xF5 enged\xE9lyez\xE9se"
 
 #: src/arch/unix/gui/uifullscreen-menu.h:97
 msgid "*Show Statusbar/Menu"
-msgstr ""
+msgstr "*St\xE1tusz sor \xE9s men\xFC mutat\xE1sa"
 
 #: src/arch/unix/gui/uifullscreen-menu.h:104
 msgid "Fullscreen device"
@@ -4089,9 +4085,8 @@
 
 #: src/arch/unix/gui/uimouse.c:62 src/arch/win32/resmouse.rc.po.c:11
 #: src/arch/amigaos/intl.c.po.c:4799
-#, fuzzy
 msgid "Mouse type"
-msgstr "ROM k\xE9szlet t\xEDpusa"
+msgstr "Eg\xE9r t\xEDpusa"
 
 #: src/arch/unix/gui/uimouse.c:64 src/arch/win32/resmouse.rc.po.c:15
 #: src/arch/amigaos/intl.c.po.c:4817
@@ -4104,7 +4099,7 @@
 
 #: src/arch/unix/gui/uinetplay.c:70
 msgid "Netplay TCP port"
-msgstr "TCP port megad\xE1sa"
+msgstr "Netplay TCP port"
 
 #: src/arch/unix/gui/uinetplay.c:80
 msgid "Invalid TCP port"
@@ -4112,11 +4107,11 @@
 
 #: src/arch/unix/gui/uinetplay.c:88
 msgid "Error starting the netplay server."
-msgstr "Hiba t\xF6rt\xE9nt a j\xE1t\xE9k kiszolg\xE1l\xF3 ind\xEDt\xE1sakor"
+msgstr "Hiba t\xF6rt\xE9nt a j\xE1t\xE9k kiszolg\xE1l\xF3 ind\xEDt\xE1sakor."
 
 #: src/arch/unix/gui/uinetplay.c:93
 msgid "Netplay Server name"
-msgstr "J\xE1t\xE9kkiszolg\xE1l\xF3 n\xE9v"
+msgstr "Netplay kiszolg\xE1l\xF3 n\xE9v"
 
 #: src/arch/unix/gui/uinetplay.c:94
 msgid "Hostname:"
@@ -4157,7 +4152,7 @@
 
 #: src/arch/unix/gui/uipalemu.c:81
 msgid "Scanline Shade in percent"
-msgstr "P\xE1szta \xE1rnyal\xE1s sz\xE1zal\xE9kosban"
+msgstr "P\xE1szta \xE1rnyal\xE1s sz\xE1zal\xE9kban"
 
 #: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
 msgid "New PAL Tint"
@@ -5141,7 +5136,6 @@
 msgstr "*Ethernet enged\xE9lyez\xE9se"
 
 #: src/arch/unix/gui/uitfe.c:50
-#, fuzzy
 msgid "*RR-NET compatibility mode"
 msgstr "*RR-NET kompatibilit\xE1s m\xF3d"
 
@@ -5399,9 +5393,8 @@
 "Czirkos Zoltan, Karai Csaba - magyar\n"
 
 #: src/arch/unix/x11/gnome/about.c:105
-#, fuzzy
 msgid "(c) 1998 - 2008 The Vice Team"
-msgstr "(c) 1998 - 2007 A Vice Csapat"
+msgstr "(c) 1998 - 2008 A Vice Csapat"
 
 #: src/arch/unix/x11/gnome/about.c:116 src/arch/win32/res.rc.po.c:5164
 #: src/arch/amigaos/intl.c.po.c:1716
@@ -5738,11 +5731,11 @@
 
 #: src/arch/unix/x11/gnome/x11ui.c:676
 msgid "event recording"
-msgstr "felv\xE9tel"
+msgstr "esem\xE9ny felv\xE9tel"
 
 #: src/arch/unix/x11/gnome/x11ui.c:695
 msgid "event playback"
-msgstr "visszaj\xE1tsz\xE1s"
+msgstr "esem\xE9ny visszaj\xE1tsz\xE1s"
 
 #: src/arch/unix/x11/gnome/x11ui.c:707
 msgid "click to stop playback"
@@ -5801,7 +5794,7 @@
 
 #: src/arch/unix/x11/gnome/x11ui.c:1823
 msgid "Hard Reset"
-msgstr "Kem\xE9ny Reset"
+msgstr "Hidegind\xEDt\xE1s"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1824 src/arch/amigaos/intl.c.po.c:663
 msgid "Monitor"
@@ -5823,12 +5816,12 @@
 #: src/arch/unix/x11/gnome/x11ui.c:1885
 #, c-format
 msgid "Autostart not possible for unit %d"
-msgstr "Automatikus indul\xE1s nem lehets\xE9ges a %d egys\xE9gen"
+msgstr "Automatikus ind\xEDt\xE1s nem lehets\xE9ges a %d egys\xE9gen"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1893 src/arch/unix/x11/gnome/x11ui.c:1902
 #, c-format
 msgid "Can't autostart selection %d in image %s"
-msgstr "Nem lehet automatikusan elind\xEDtani a %d. kiv\xE1laszt\xE1s\xE1t a %s  k\xE9pm\xE1son."
+msgstr "Nem lehet automatikusan elind\xEDtani a %d. v\xE1laszt\xE1st a %s k\xE9pm\xE1son."
 
 #: src/arch/unix/x11/gnome/x11ui.c:2061 src/arch/unix/x11/gnome/x11ui.c:2071
 msgid "NO IMAGE CONTENTS AVAILABLE"
@@ -5861,7 +5854,7 @@
 
 #: src/arch/unix/x11/ui-cmdline-options.c:42
 msgid "Install a private colormap"
-msgstr "Priv\xE1t sz\xEDnpaletta telep\xEDt\xE9se"
+msgstr "Saj\xE1t paletta telep\xEDt\xE9se"
 
 #: src/arch/unix/x11/ui-cmdline-options.c:45
 msgid "Use the default colormap"
@@ -5870,7 +5863,7 @@
 #: src/arch/unix/x11/ui-cmdline-options.c:48 src/arch/win32/res.rc.po.c:5214
 #: src/arch/amigaos/intl.c.po.c:3323
 msgid "Save settings (resources) on exit"
-msgstr "Er\xF5forr\xE1sbe\xE1ll\xEDt\xE1sok ment\xE9se kil\xE9p\xE9skor"
+msgstr "Be\xE1ll\xEDt\xE1sok (er\xF5forr\xE1sok) ment\xE9se kil\xE9p\xE9skor"
 
 #: src/arch/unix/x11/ui-cmdline-options.c:51 src/arch/win32/res.rc.po.c:5217
 #: src/arch/amigaos/intl.c.po.c:3350
@@ -5885,7 +5878,7 @@
 #: src/arch/unix/x11/ui-cmdline-options.c:57 src/arch/win32/res.rc.po.c:5215
 #: src/arch/amigaos/intl.c.po.c:3332
 msgid "Never save settings (resources) on exit"
-msgstr "Sose mentse az er\xF5forr\xE1sbe\xE1ll\xEDt\xE1sokat kil\xE9p\xE9skor"
+msgstr "Sose mentse a be\xE1ll\xEDt\xE1sokat (er\xF5forr\xE1sokat) kil\xE9p\xE9skor"
 
 #: src/arch/unix/x11/ui-cmdline-options.c:61
 msgid "Enable fullscreen"
@@ -5914,7 +5907,7 @@
 
 #: src/arch/unix/x11/xaw/uicartridge.c:78
 msgid "Save cartridge image file"
-msgstr "Cartridge k\xE9pm\xE1s f\xE1jl ment\xE9se"
+msgstr "Cartridge k\xE9pm\xE1s ment\xE9se"
 
 #: src/arch/unix/x11/xaw/uicartridge.c:128 src/arch/unix/x11/xaw/uiedisk.c:218
 #: src/arch/unix/x11/xaw/uiscreenshot.c:170
@@ -6010,7 +6003,7 @@
 
 #: src/arch/unix/x11/xaw/uicolor.c:95
 msgid "Automatically using a private colormap."
-msgstr "Priv\xE1t sz\xEDnpaletta automatikus haszn\xE1lata."
+msgstr "Priv\xE1t paletta automatikus haszn\xE1lata."
 
 #: src/arch/unix/x11/xaw/uicolor.c:126
 msgid "XCreateImage failed."
@@ -6020,7 +6013,7 @@
 #: src/arch/unix/x11/xaw/uicolor.c:198 src/arch/unix/x11/xaw/uicolor.c:203
 #, c-format
 msgid "Cannot allocate color \"#%04X%04X%04X\"."
-msgstr "Nem siker\xFClt sz\xEDnt lefoglalni \"#%04X%04X%04X\"."
+msgstr "Nem siker\xFClt a \"#%04X%04X%04X\" sz\xEDnt lefoglalni."
 
 #: src/arch/unix/x11/xaw/uicolor.c:156
 msgid "XFreeColors failed."
@@ -6064,7 +6057,7 @@
 
 #: src/arch/unix/x11/xaw/uisnapshot.c:210
 msgid "Save currently attached disks:"
-msgstr "A lcsatolt lemezek elment\xE9se:"
+msgstr "A csatolt lemezek elment\xE9se:"
 
 #: src/arch/unix/x11/xaw/uisnapshot.c:222
 #: src/arch/unix/x11/xaw/uisnapshot.c:261 src/arch/win32/resc128.rc.po.c:82
@@ -6089,7 +6082,7 @@
 #: src/arch/unix/x11/xaw/x11ui.c:527
 #, c-format
 msgid "This display does not support suitable %dbit visuals."
-msgstr "A kijelz\xF5 nem t\xE1mogat megfelel\xF5 %dbit-es \xFCzemm\xF3dot."
+msgstr "A kijelz\xF5 nem t\xE1mogat megfelel\xF5 %d bites \xFCzemm\xF3dot."
 
 #: src/arch/unix/x11/xaw/x11ui.c:530
 msgid "Please select a bit depth supported by your display."
@@ -6098,11 +6091,11 @@
 #: src/arch/unix/x11/xaw/x11ui.c:533 src/arch/unix/x11/xaw/x11ui.c:550
 #, c-format
 msgid "Found %dbit/%s visual."
-msgstr "A VICE %d bites %s kijelz\xF5t tal\xE1lt"
+msgstr "A VICE %d bites %s \xFCzemm\xF3dot tal\xE1lt"
 
 #: src/arch/unix/x11/xaw/x11ui.c:558
 msgid "Cannot autodetect a proper visual."
-msgstr "Nem siker\xFClt automatikusan kijelz\xF5t felismerni."
+msgstr "Nem siker\xFClt automatikusan megfelel\xF5 \xFCzemm\xF3dot tal\xE1lni."
 
 #: src/arch/unix/x11/xaw/x11ui.c:837
 msgid "recording..."
@@ -6114,7 +6107,7 @@
 
 #: src/arch/unix/x11/xaw/x11ui.c:1190
 msgid "Using private colormap."
-msgstr "Priv\xE1t sz\xEDnpaletta haszn\xE1lata."
+msgstr "Priv\xE1t paletta haszn\xE1lata."
 
 #: src/arch/unix/x11/xaw/x11ui.c:1317
 #, c-format
@@ -6123,7 +6116,7 @@
 
 #: src/arch/unix/x11/xaw/x11ui.c:1531
 msgid "Toggling of Statusbar/Menu in Xaw is not supported."
-msgstr ""
+msgstr "A st\xE1tusz sor \xE9s a men\xFC ki-be kapcsol\xE1sa Xaw-ban nem lehets\xE9ges."
 
 #: src/arch/unix/x11/xaw/x11ui.c:1666 src/arch/win32/res.rc.po.c:5050
 msgid "VICE Error!"
@@ -6164,7 +6157,7 @@
 
 #: src/arch/unix/x11/xaw/x11video.c:388
 msgid "Cannot release shared memory!"
-msgstr "Nem siker\xFClt az osztott mem\xF3ri\xE1t elengedni!"
+msgstr "Nem siker\xFClt az osztott mem\xF3ri\xE1t felszabad\xEDtani!"
 
 #: src/arch/unix/x11/xaw/x11video.c:517
 #, c-format
@@ -6203,24 +6196,23 @@
 
 #: src/arch/unix/x11/xaw/x11video.c:622
 msgid ", using"
-msgstr "osztott mem\xF3ri\xE1val"
+msgstr ", ezzel:"
 
 #: src/arch/unix/x11/xaw/x11video.c:622
 msgid " without"
-msgstr "osztott mem\xF3ria n\xE9lk\xFCl"
+msgstr " en\xE9lk\xFCl:"
 
 #: src/arch/unix/x11/xaw/x11video.c:625
 msgid "Performance will be poor."
-msgstr "A teljes\xEDtm\xE9ny gy\xF6nge lesz."
+msgstr "A teljes\xEDtm\xE9ny gyenge lesz."
 
 #: src/arch/unix/x11/xaw/x11video.c:628
 msgid "Successfully initialized without shared memory."
 msgstr "Sikeres indul\xE1s osztott mem\xF3ria n\xE9lk\xFCl."
 
 #: src/arch/unix/x11/xaw/x11video.c:698
-#, fuzzy
 msgid "HW scaling not available"
-msgstr "Milyen parancssori opci\xF3k lehets\xE9gesek?"
+msgstr "Hardveres gyors\xEDt\xE1s nem \xE1ll rendelkez\xE9sre"
 
 #: src/arch/win32/res.rc.po.c:81 src/arch/win32/resc128.rc.po.c:16
 #: src/arch/win32/resc64.rc.po.c:16 src/arch/win32/rescbm2.rc.po.c:15
@@ -6387,44 +6379,36 @@
 msgstr "Verzi\xF3: 0.0"
 
 #: src/arch/win32/res.rc.po.c:560
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Andreas Boose"
-msgstr "Copyright (c) 1998-2007 Andreas Boose"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:561
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Dag Lem"
-msgstr "Copyright (c) 1998-2007 Dag Lem"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:562
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Tibor Biczo"
-msgstr "Copyright (c) 1998-2007 Tibor Biczo"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:563
-#, fuzzy
 msgid "Copyright (c) 1999-2008 Andreas Matthies"
-msgstr "Copyright (c) 1999-2007 Andreas Matthies"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:564
-#, fuzzy
 msgid "Copyright (c) 1999-2008 Martin Pottendorfer"
-msgstr "Copyright (c) 1999-2007 Martin Pottendorfer"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:565
-#, fuzzy
 msgid "Copyright (c) 2000-2008 Spiro Trikaliotis"
-msgstr "Copyright (c) 2000-2007 Spiro Trikaliotis"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:566
-#, fuzzy
 msgid "Copyright (c) 2005-2008 Marco van den Heuvel"
-msgstr "Copyright (c) 2005-2007 Marco van den Heuvel"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:567
-#, fuzzy
 msgid "Copyright (c) 2006-2008 Christian Vogelgsang"
-msgstr "Copyright (c) 2003-2005 Christian Vogelgsang"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:568
 #, fuzzy
@@ -6433,19 +6417,19 @@
 
 #: src/arch/win32/res.rc.po.c:569
 msgid "Copyright (c) 1999-2007 Andreas Dehmel"
-msgstr "Copyright (c) 1999-2007 Andreas Dehmel"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:570
 msgid "Copyright (c) 1999-2005 Thomas Bretz"
-msgstr "Copyright (c) 1999-2005 Thomas Bretz"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:571
 msgid "Copyright (c) 2003-2005 David Hansel"
-msgstr "Copyright (c) 2003-2005 David Hansel"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:572
 msgid "Copyright (c) 2000-2004 Markus Brenner"
-msgstr "Copyright (c) 2000-2004 Markus Brenner"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:573
 msgid " "
@@ -6511,7 +6495,7 @@
 
 #: src/arch/win32/res.rc.po.c:604
 msgid "&Hide non-P00 files"
-msgstr "P00 f\xE1jlok &elrejt\xE9se"
+msgstr "Nem P00 f\xE1jlok &elrejt\xE9se"
 
 #: src/arch/win32/res.rc.po.c:853 src/arch/amigaos/intl.c.po.c:2963
 msgid "Datasette Settings"
@@ -6979,6 +6963,9 @@
 "\n"
 "Start monitor? (No will reset, cancel will continue)"
 msgstr ""
+"%s\n"
+"\n"
+"Monitorprogram ind\xEDt\xE1sa? (Nem \xFAjraind\xEDtja, M\xE9gsem folytatja)"
 
 #: src/arch/win32/res.rc.po.c:5060
 msgid "VICE CPU JAM"
@@ -7101,11 +7088,11 @@
 
 #: src/arch/win32/res.rc.po.c:5089
 msgid "Save keymap file"
-msgstr "Billenty\xFBzetkioszt\xE1s f\xE1jlba \xEDr\xE1sa"
+msgstr "Billenty\xFBzetlek\xE9pez\xE9s f\xE1jlba \xEDr\xE1sa"
 
 #: src/arch/win32/res.rc.po.c:5090
 msgid "Cannot write keymap file"
-msgstr "Nem siker\xFClt a billenty\xFBzetkioszt\xE1st f\xE1jlba \xEDrni"
+msgstr "Nem siker\xFClt a billenty\xFBzetlek\xE9pez\xE9st f\xE1jlba \xEDrni"
 
 #: src/arch/win32/res.rc.po.c:5091
 msgid "Mapping"
@@ -7190,7 +7177,7 @@
 
 #: src/arch/win32/res.rc.po.c:5112 src/arch/amigaos/intl.c.po.c:4196
 msgid "Cannot read snapshot image"
-msgstr "Nem siker\xFClt bet\xF6lteni a pillanatk\xE9p f\xE1jlt"
+msgstr "A pillanatk\xE9p f\xE1jl nem olvashat\xF3"
 
 #: src/arch/win32/res.rc.po.c:5113
 #, c-format
@@ -7452,9 +7439,8 @@
 msgstr "Lemez k\xE9pm\xE1s f\xE1jlok (*.d64;*.d71;*.d80;*.d81;*.d82;*.g64;*.g41;*.x64)"
 
 #: src/arch/win32/res.rc.po.c:5186
-#, fuzzy
 msgid "Tape image files (*.t64;*.tap)"
-msgstr "Szalag k\xE9pm\xE1s f\xE1jlok (*.t64;*.p00;*.tap;*.prg)"
+msgstr "Szalag k\xE9pm\xE1s f\xE1jlok (*.t64;*.tap)"
 
 #: src/arch/win32/res.rc.po.c:5187
 msgid "Zipped files (*.zip;*.bz2;*.gz;*.d6z;*.d7z;*.d8z;*.g6z;*.g4z;*.x6z)"
@@ -7483,11 +7469,11 @@
 
 #: src/arch/win32/res.rc.po.c:5193
 msgid "VICE keymap files (*.vkm)"
-msgstr "VICE billenty\xFB lek\xE9pez\xE9s f\xE1jlok (*.vkm)"
+msgstr "VICE billenty\xFBlek\xE9pez\xE9s f\xE1jlok (*.vkm)"
 
 #: src/arch/win32/res.rc.po.c:5194
 msgid "Commodore emulator files (*.prg;*.p00)"
-msgstr ""
+msgstr "Commodore emul\xE1tor f\xE1jlok (*.prg; *.p00)"
 
 #: src/arch/win32/res.rc.po.c:5195 src/arch/amigaos/intl.c.po.c:3737
 msgid "Flexible"
@@ -7700,9 +7686,8 @@
 #: src/arch/win32/resc128.rc.po.c:34 src/arch/win32/resc64.rc.po.c:34
 #: src/arch/win32/rescbm2.rc.po.c:33 src/arch/win32/respet.rc.po.c:33
 #: src/arch/win32/resplus4.rc.po.c:33 src/arch/win32/resvic20.rc.po.c:33
-#, fuzzy
 msgid "&All"
-msgstr "Mindegyik"
+msgstr "&Mindegyik"
 
 #: src/arch/win32/resc128.rc.po.c:36 src/arch/win32/resc64.rc.po.c:36
 #: src/arch/win32/rescbm2.rc.po.c:35 src/arch/win32/respet.rc.po.c:35
@@ -7713,30 +7698,26 @@
 #: src/arch/win32/resc128.rc.po.c:38 src/arch/win32/resc64.rc.po.c:38
 #: src/arch/win32/rescbm2.rc.po.c:37 src/arch/win32/respet.rc.po.c:37
 #: src/arch/win32/resplus4.rc.po.c:37 src/arch/win32/resvic20.rc.po.c:37
-#, fuzzy
 msgid "&Add current image"
-msgstr "Az aktu\xE1lis k\xE9pm\xE1s hozz\xE1ad\xE1sa"
+msgstr "Az &aktu\xE1lis k\xE9pm\xE1s hozz\xE1ad\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:39 src/arch/win32/resc64.rc.po.c:39
 #: src/arch/win32/rescbm2.rc.po.c:38 src/arch/win32/respet.rc.po.c:38
 #: src/arch/win32/resplus4.rc.po.c:38 src/arch/win32/resvic20.rc.po.c:38
-#, fuzzy
 msgid "&Remove current image"
-msgstr "Az aktu\xE1lis k\xE9pm\xE1s elt\xE1vol\xEDt\xE1sa"
+msgstr "Az aktu\xE1lis k\xE9pm\xE1s &elt\xE1vol\xEDt\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:40 src/arch/win32/resc64.rc.po.c:40
 #: src/arch/win32/rescbm2.rc.po.c:39 src/arch/win32/respet.rc.po.c:39
 #: src/arch/win32/resplus4.rc.po.c:39 src/arch/win32/resvic20.rc.po.c:39
-#, fuzzy
 msgid "Attach &next image"
-msgstr "K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa"
+msgstr "&K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:41 src/arch/win32/resc64.rc.po.c:41
 #: src/arch/win32/rescbm2.rc.po.c:40 src/arch/win32/respet.rc.po.c:40
 #: src/arch/win32/resplus4.rc.po.c:40 src/arch/win32/resvic20.rc.po.c:40
-#, fuzzy
 msgid "Attach &previous image"
-msgstr "El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa"
+msgstr "&El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:43 src/arch/win32/resc64.rc.po.c:43
 #: src/arch/win32/rescbm2.rc.po.c:42 src/arch/win32/respet.rc.po.c:42
@@ -7753,9 +7734,8 @@
 #: src/arch/win32/resc128.rc.po.c:47 src/arch/win32/resc64.rc.po.c:47
 #: src/arch/win32/rescbm2.rc.po.c:46 src/arch/win32/respet.rc.po.c:46
 #: src/arch/win32/resplus4.rc.po.c:46 src/arch/win32/resvic20.rc.po.c:46
-#, fuzzy
 msgid "Attach &tape image..."
-msgstr "Szalag k\xE9pm\xE1s csatol\xE1sa..."
+msgstr "&Szalag k\xE9pm\xE1s csatol\xE1sa..."
 
 #: src/arch/win32/resc128.rc.po.c:48 src/arch/win32/resc64.rc.po.c:48
 #: src/arch/win32/rescbm2.rc.po.c:47 src/arch/win32/respet.rc.po.c:47
@@ -7908,23 +7888,20 @@
 msgstr "Cartridge k\xE9pm\xE1s &lev\xE1laszt\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:91 src/arch/win32/resc64.rc.po.c:91
-#, fuzzy
 msgid "Cartridge free&ze"
-msgstr "Fagyaszt\xE1s Cartridge-el"
+msgstr "&Fagyaszt\xE1s Cartridge-dzsel"
 
 #: src/arch/win32/resc128.rc.po.c:93 src/arch/win32/resc64.rc.po.c:93
 #: src/arch/win32/rescbm2.rc.po.c:61 src/arch/win32/respet.rc.po.c:59
 #: src/arch/win32/resplus4.rc.po.c:71 src/arch/win32/resvic20.rc.po.c:69
-#, fuzzy
 msgid "&Pause"
-msgstr "Sz\xFCnet"
+msgstr "&Sz\xFCnet"
 
 #: src/arch/win32/resc128.rc.po.c:94 src/arch/win32/resc64.rc.po.c:94
 #: src/arch/win32/rescbm2.rc.po.c:63 src/arch/win32/respet.rc.po.c:61
 #: src/arch/win32/resplus4.rc.po.c:73 src/arch/win32/resvic20.rc.po.c:71
-#, fuzzy
 msgid "&Monitor"
-msgstr "Monitor"
+msgstr "&Monitor"
 
 #: src/arch/win32/resc128.rc.po.c:95 src/arch/win32/resc64.rc.po.c:95
 #: src/arch/win32/rescbm2.rc.po.c:64 src/arch/win32/respet.rc.po.c:62
@@ -7935,16 +7912,14 @@
 #: src/arch/win32/resc128.rc.po.c:97 src/arch/win32/resc64.rc.po.c:97
 #: src/arch/win32/rescbm2.rc.po.c:66 src/arch/win32/respet.rc.po.c:64
 #: src/arch/win32/resplus4.rc.po.c:76 src/arch/win32/resvic20.rc.po.c:74
-#, fuzzy
 msgid "&Hard"
-msgstr "Hideg"
+msgstr "&Hideg"
 
 #: src/arch/win32/resc128.rc.po.c:98 src/arch/win32/resc64.rc.po.c:98
 #: src/arch/win32/rescbm2.rc.po.c:67 src/arch/win32/respet.rc.po.c:65
 #: src/arch/win32/resplus4.rc.po.c:77 src/arch/win32/resvic20.rc.po.c:75
-#, fuzzy
 msgid "&Soft"
-msgstr "Meleg"
+msgstr "&Meleg"
 
 #: src/arch/win32/resc128.rc.po.c:100 src/arch/win32/resc64.rc.po.c:100
 #: src/arch/win32/rescbm2.rc.po.c:69 src/arch/win32/respet.rc.po.c:67
@@ -8004,30 +7979,26 @@
 #: src/arch/win32/resc128.rc.po.c:115 src/arch/win32/resc64.rc.po.c:115
 #: src/arch/win32/rescbm2.rc.po.c:84 src/arch/win32/respet.rc.po.c:82
 #: src/arch/win32/resplus4.rc.po.c:94 src/arch/win32/resvic20.rc.po.c:92
-#, fuzzy
 msgid "&Main CPU Trace"
-msgstr "&F\xF5 CPU k\xF6vet\xE9se\tAlt+F10"
+msgstr "&F\xF5 CPU k\xF6vet\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:116 src/arch/win32/resc64.rc.po.c:116
 #: src/arch/win32/rescbm2.rc.po.c:85 src/arch/win32/respet.rc.po.c:83
 #: src/arch/win32/resplus4.rc.po.c:95 src/arch/win32/resvic20.rc.po.c:93
-#, fuzzy
 msgid "Drive&0 CPU Trace"
-msgstr "&0. lemezegys\xE9g CPU k\xF6vet\xE9se\tAlt+F11"
+msgstr "&0. lemezegys\xE9g CPU k\xF6vet\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:117 src/arch/win32/resc64.rc.po.c:117
 #: src/arch/win32/rescbm2.rc.po.c:86 src/arch/win32/respet.rc.po.c:84
 #: src/arch/win32/resplus4.rc.po.c:96 src/arch/win32/resvic20.rc.po.c:94
-#, fuzzy
 msgid "Drive&1 CPU Trace"
-msgstr "&1. lemezegys\xE9g CPU k\xF6vet\xE9se\tAlt+F12"
+msgstr "&1. lemezegys\xE9g CPU k\xF6vet\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:121 src/arch/win32/resc64.rc.po.c:121
 #: src/arch/win32/rescbm2.rc.po.c:90 src/arch/win32/respet.rc.po.c:88
 #: src/arch/win32/resplus4.rc.po.c:100 src/arch/win32/resvic20.rc.po.c:98
-#, fuzzy
 msgid "E&xit"
-msgstr "Kil\xE9p\xE9s"
+msgstr "&Kil\xE9p\xE9s"
 
 #: src/arch/win32/resc128.rc.po.c:123 src/arch/win32/resc64.rc.po.c:123
 #: src/arch/win32/rescbm2.rc.po.c:92 src/arch/win32/respet.rc.po.c:90
@@ -8071,16 +8042,14 @@
 #: src/arch/win32/resc128.rc.po.c:132 src/arch/win32/resc64.rc.po.c:132
 #: src/arch/win32/rescbm2.rc.po.c:101 src/arch/win32/respet.rc.po.c:99
 #: src/arch/win32/resplus4.rc.po.c:111 src/arch/win32/resvic20.rc.po.c:109
-#, fuzzy
 msgid "&Load quicksnapshot image"
-msgstr "Gyors pillanatk\xE9p bet\xF6lt\xE9se"
+msgstr "Gyors pillanatk\xE9p &bet\xF6lt\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:133 src/arch/win32/resc64.rc.po.c:133
 #: src/arch/win32/rescbm2.rc.po.c:102 src/arch/win32/respet.rc.po.c:100
 #: src/arch/win32/resplus4.rc.po.c:112 src/arch/win32/resvic20.rc.po.c:110
-#, fuzzy
 msgid "&Save quicksnapshot image"
-msgstr "Gyors pillanatk\xE9p f\xE1jl ment\xE9se"
+msgstr "Gyors pillanatk\xE9p f\xE1jl &ment\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:135 src/arch/win32/resc64.rc.po.c:135
 #: src/arch/win32/rescbm2.rc.po.c:104 src/arch/win32/respet.rc.po.c:102
@@ -8284,9 +8253,8 @@
 #: src/arch/win32/resc128.rc.po.c:184 src/arch/win32/resc64.rc.po.c:186
 #: src/arch/win32/rescbm2.rc.po.c:153 src/arch/win32/respet.rc.po.c:151
 #: src/arch/win32/resplus4.rc.po.c:163 src/arch/win32/resvic20.rc.po.c:161
-#, fuzzy
 msgid "&Warp mode"
-msgstr "Hipergyors m\xF3d"
+msgstr "&Hipergyors m\xF3d"
 
 #: src/arch/win32/resc128.rc.po.c:186 src/arch/win32/resc64.rc.po.c:189
 #: src/arch/win32/rescbm2.rc.po.c:156 src/arch/win32/respet.rc.po.c:155
@@ -8318,7 +8286,7 @@
 #: src/arch/win32/resplus4.rc.po.c:177 src/arch/win32/resvic20.rc.po.c:175
 #: src/arch/amigaos/intl.c.po.c:1113
 msgid "Scale2x"
-msgstr "2x m\xE9retez"
+msgstr "\xC9lsim\xEDt\xE1s"
 
 #: src/arch/win32/resc128.rc.po.c:192
 msgid "VDC settin&gs"
@@ -8331,9 +8299,8 @@
 #: src/arch/win32/resc128.rc.po.c:200 src/arch/win32/resc64.rc.po.c:197
 #: src/arch/win32/rescbm2.rc.po.c:165 src/arch/win32/respet.rc.po.c:161
 #: src/arch/win32/resplus4.rc.po.c:180 src/arch/win32/resvic20.rc.po.c:178
-#, fuzzy
 msgid "Swap &Joystick"
-msgstr "Botkorm\xE1nyok felcser\xE9l\xE9se"
+msgstr "Botkorm\xE1nyok &felcser\xE9l\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:202 src/arch/win32/resc64.rc.po.c:199
 #: src/arch/win32/rescbm2.rc.po.c:167 src/arch/win32/respet.rc.po.c:163
@@ -8379,9 +8346,8 @@
 msgstr "IEEE&488 interf\xE9sz emul\xE1ci\xF3"
 
 #: src/arch/win32/resc128.rc.po.c:215 src/arch/win32/resc64.rc.po.c:212
-#, fuzzy
 msgid "&Grab mouse events"
-msgstr "&1351 eg\xE9r emul\xE1ci\xF3\tAlt+Q"
+msgstr "Eg\xE9r &esem\xE9nyek elkap\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:217 src/arch/win32/resc64.rc.po.c:214
 #: src/arch/win32/rescbm2.rc.po.c:179 src/arch/win32/respet.rc.po.c:175
@@ -8431,9 +8397,8 @@
 msgstr "&Billenty\xFBzet be\xE1ll\xEDt\xE1sai..."
 
 #: src/arch/win32/resc128.rc.po.c:226 src/arch/win32/resc64.rc.po.c:223
-#, fuzzy
 msgid "Mo&use settings..."
-msgstr "P&lus4 be\xE1ll\xEDt\xE1sai..."
+msgstr "Eg\xE9r &be\xE1ll\xEDt\xE1sai..."
 
 #: src/arch/win32/resc128.rc.po.c:227 src/arch/win32/resc64.rc.po.c:224
 #: src/arch/win32/rescbm2.rc.po.c:189 src/arch/win32/respet.rc.po.c:184
@@ -9408,7 +9373,7 @@
 
 #: src/arch/win32/reside64.rc.po.c:41 src/arch/amigaos/intl.c.po.c:3899
 msgid "Cylinders"
-msgstr "Cilinderek"
+msgstr "S\xE1vok"
 
 #: src/arch/win32/reside64.rc.po.c:42 src/arch/amigaos/intl.c.po.c:3908
 msgid "Heads"
@@ -10091,11 +10056,6 @@
 msgid "New &Luminances"
 msgstr "\xDAj &f\xE9nyer\xF5k"
 
-#: src/translate.c.po.c:734
-#, fuzzy
-msgid "Specify name of Norwegian Kernal ROM image"
-msgstr "Adja meg a norv\xE9g Kernal ROM k\xE9pm\xE1s nev\xE9t"
-
 #: src/translate.c.po.c:2666
 msgid "<0-2000>"
 msgstr "<0-2000>"
@@ -10452,7 +10412,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:1167
 msgid "Virtual device traps"
-msgstr "*Virtu\xE1lis eszk\xF6z\xF6k ciklus kihagy\xE1sa"
+msgstr "Virtu\xE1lis eszk\xF6z\xF6k ciklus kihagy\xE1sa"
 
 #: src/arch/amigaos/intl.c.po.c:1176
 msgid "Drive sync factor"
@@ -10492,7 +10452,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:1266
 msgid "Grab mouse events"
-msgstr ""
+msgstr "Eg\xE9r esem\xE9nyek elkap\xE1sa"
 
 #: src/arch/amigaos/intl.c.po.c:1284
 msgid "Video settings..."
@@ -10547,9 +10507,8 @@
 msgstr "Billenty\xFBzet be\xE1ll\xEDt\xE1sai..."
 
 #: src/arch/amigaos/intl.c.po.c:1410
-#, fuzzy
 msgid "Mouse settings..."
-msgstr "Hang be\xE1ll\xEDt\xE1sai..."
+msgstr "Eg\xE9r be\xE1ll\xEDt\xE1sai..."
 
 #: src/arch/amigaos/intl.c.po.c:1419
 msgid "Sound settings..."
@@ -10665,7 +10624,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:1689
 msgid "About..."
-msgstr "A VICE-r\xF3l..."
+msgstr "N\xE9vjegy..."
 
 #: src/arch/amigaos/intl.c.po.c:1725
 msgid "No warranty"
@@ -10916,7 +10875,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:2936
 msgid "Reset Datasette with CPU"
-msgstr "*Alaphelyzetbe hoz\xE1s CPU Reset eset\xE9n"
+msgstr "Alaphelyzetbe hoz\xE1s CPU Reset eset\xE9n"
 
 #: src/arch/amigaos/intl.c.po.c:2945
 msgid "Additional Delay"
@@ -11186,7 +11145,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:4169
 msgid "Save currently attached disk images"
-msgstr "A jelenleg csatolt lemezek &ment\xE9se"
+msgstr "A je...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18973] branches/marco/ports/vice

From: <bla...@us...> - 2008-07-08 16:57:06

Revision: 18973
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18973&view=rev
Author:   blackystardust
Date:     2008-07-08 09:57:09 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
Updated meta-information

Added Paths:
-----------
    branches/marco/ports/vice/doc/GP2X-Howto.txt
    branches/marco/ports/vice/src/arch/win32/make-msvc-bindist.bat
    branches/marco/ports/vice/src/arch/win32/watcom/make-watcom-bindist.bat
    branches/marco/ports/vice/src/clipboard.c
    branches/marco/ports/vice/src/clipboard.h
    branches/marco/ports/vice/vice-mint.spec

Removed Paths:
-------------
    branches/marco/ports/vice/doc/GP2X-Howto.txt
    branches/marco/ports/vice/src/arch/win32/make-msvc-bindist.bat
    branches/marco/ports/vice/src/arch/win32/watcom/make-watcom-bindist.bat
    branches/marco/ports/vice/src/clipboard.c
    branches/marco/ports/vice/src/clipboard.h
    branches/marco/ports/vice/vice-mint.spec

Property Changed:
----------------
    branches/marco/ports/vice/
    branches/marco/ports/vice/build/
    branches/marco/ports/vice/data/
    branches/marco/ports/vice/data/C128/
    branches/marco/ports/vice/data/C64/
    branches/marco/ports/vice/data/CBM-II/
    branches/marco/ports/vice/data/DRIVES/
    branches/marco/ports/vice/data/PET/
    branches/marco/ports/vice/data/PLUS4/
    branches/marco/ports/vice/data/PRINTER/
    branches/marco/ports/vice/data/VIC20/
    branches/marco/ports/vice/data/fonts/
    branches/marco/ports/vice/doc/
    branches/marco/ports/vice/doc/html/
    branches/marco/ports/vice/man/
    branches/marco/ports/vice/po/
    branches/marco/ports/vice/src/
    branches/marco/ports/vice/src/arch/
    branches/marco/ports/vice/src/arch/amigaos/
    branches/marco/ports/vice/src/arch/beos/
    branches/marco/ports/vice/src/arch/msdos/
    branches/marco/ports/vice/src/arch/os2/
    branches/marco/ports/vice/src/arch/os2/dialogs/
    branches/marco/ports/vice/src/arch/os2/kbd/
    branches/marco/ports/vice/src/arch/os2/snippets/
    branches/marco/ports/vice/src/arch/os2/vac++/
    branches/marco/ports/vice/src/arch/riscos/
    branches/marco/ports/vice/src/arch/unix/
    branches/marco/ports/vice/src/arch/unix/gp2x/
    branches/marco/ports/vice/src/arch/unix/gui/
    branches/marco/ports/vice/src/arch/unix/macosx/
    branches/marco/ports/vice/src/arch/unix/macosx/Resources/
    branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/
    branches/marco/ports/vice/src/arch/unix/macosx/cocoa/
    branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/
    branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/
    branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/
    branches/marco/ports/vice/src/arch/unix/readline/
    branches/marco/ports/vice/src/arch/unix/x11/
    branches/marco/ports/vice/src/arch/unix/x11/gnome/
    branches/marco/ports/vice/src/arch/unix/x11/xaw/
    branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/
    branches/marco/ports/vice/src/arch/win32/
    branches/marco/ports/vice/src/arch/win32/msvc/
    branches/marco/ports/vice/src/arch/win32/utils/
    branches/marco/ports/vice/src/c128/
    branches/marco/ports/vice/src/c64/
    branches/marco/ports/vice/src/c64/cart/
    branches/marco/ports/vice/src/cbm2/
    branches/marco/ports/vice/src/core/
    branches/marco/ports/vice/src/crtc/
    branches/marco/ports/vice/src/diskimage/
    branches/marco/ports/vice/src/drive/
    branches/marco/ports/vice/src/drive/iec/
    branches/marco/ports/vice/src/drive/iec/c64exp/
    branches/marco/ports/vice/src/drive/iec/plus4exp/
    branches/marco/ports/vice/src/drive/iec128dcr/
    branches/marco/ports/vice/src/drive/iecieee/
    branches/marco/ports/vice/src/drive/ieee/
    branches/marco/ports/vice/src/drive/tcbm/
    branches/marco/ports/vice/src/fileio/
    branches/marco/ports/vice/src/fsdevice/
    branches/marco/ports/vice/src/gfxoutputdrv/
    branches/marco/ports/vice/src/iecbus/
    branches/marco/ports/vice/src/imagecontents/
    branches/marco/ports/vice/src/lib/
    branches/marco/ports/vice/src/lib/lpng/
    branches/marco/ports/vice/src/lib/zlib/
    branches/marco/ports/vice/src/monitor/
    branches/marco/ports/vice/src/parallel/
    branches/marco/ports/vice/src/pet/
    branches/marco/ports/vice/src/plus4/
    branches/marco/ports/vice/src/printerdrv/
    branches/marco/ports/vice/src/raster/
    branches/marco/ports/vice/src/resid/
    branches/marco/ports/vice/src/rs232drv/
    branches/marco/ports/vice/src/serial/
    branches/marco/ports/vice/src/sid/
    branches/marco/ports/vice/src/sounddrv/
    branches/marco/ports/vice/src/tape/
    branches/marco/ports/vice/src/vdc/
    branches/marco/ports/vice/src/vdrive/
    branches/marco/ports/vice/src/vic20/
    branches/marco/ports/vice/src/vicii/
    branches/marco/ports/vice/src/video/


Property changes on: branches/marco/ports/vice
___________________________________________________________________
Name: svn:ignore
   + aclocal.m4
.aclocal.out
.autoconf.out
.autoheader.out
autom4te.cache
.automake.out
config.log
config.status
config.status.lineno
configure
depcomp
Makefile
Makefile.in
missing



Property changes on: branches/marco/ports/vice/build
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data
___________________________________________________________________
Name: svn:ignore
   + c1541.exe
c1541.ilk
c1541.pdb
cartconv.exe
cartconv.ilk
cartconv.pdb
genmsvcver.exe
genmsvcver.ilk
genmsvcver.pdb
gentranslate.exe
gentranslate.ilk
gentranslate.pdb
genwinres.exe
genwinres.ilk
genwinres.pdb
Makefile
Makefile.in
petcat.exe
petcat.ilk
petcat.pdb
vice.ini
vice.log
x128.exe
x128.ilk
x128.pdb
x64.exe
x64.ilk
x64.pdb
xcbm2.exe
xcbm2.ilk
xcbm2.pdb
xpet.exe
xpet.ilk
xpet.pdb
xplus4.exe
xplus4.ilk
xplus4.pdb
xvic.exe
xvic.ilk
xvic.pdb



Property changes on: branches/marco/ports/vice/data/C128
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data/C64
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data/CBM-II
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data/DRIVES
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data/PET
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data/PLUS4
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data/PRINTER
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data/VIC20
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/data/fonts
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/doc
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
texinfo.tex


Deleted: branches/marco/ports/vice/doc/GP2X-Howto.txt
===================================================================
--- branches/marco/ports/vice/doc/GP2X-Howto.txt	2008-07-08 07:58:34 UTC (rev 18972)
+++ branches/marco/ports/vice/doc/GP2X-Howto.txt	2008-07-08 16:57:09 UTC (rev 18973)
@@ -1,27 +0,0 @@
-This document describes how to compile the GP2X port.
-
-
-First of all you will need to install DevkitGP2X, and make sure the 
-cross-toolchain binaries are in the PATH.
-
-After installing DevkitGP2X you will need to copy or make links for the 
-following files:
-
-arm-linux-ar     to arm-gp2x-linux-ar
-arm-linux-g++    to arm-gp2x-linux=g++
-arm-linux-gcc    to arm-gp2x-linux-gcc
-arm-linux-ranlib to arm-gp2x-linux-ranlib
-arm-linux-strip  to arm-gp2x-linux-strip
-
-After doing this you will be able to use the --host configure option for 
-VICE to have it build the GP2X port. In other words, you just use:
-
-./configure --host=arm-gp2x-linux
-
-And the configure script will try to find and use the correct 
-cross-toolchain (arm-gp2x-linux-*), and set the correct CFLAGS and LDFLAGS 
-for the GP2X port.
-
-After the compile is done you can use 'make bindist' to create a binary 
-distribution directory, or use 'make bindistzip' to create a binary 
-distribution zip archive.

Copied: branches/marco/ports/vice/doc/GP2X-Howto.txt (from rev 18972, tags/v1.22/v1.22.24/vice/doc/GP2X-Howto.txt)
===================================================================
--- branches/marco/ports/vice/doc/GP2X-Howto.txt	                        (rev 0)
+++ branches/marco/ports/vice/doc/GP2X-Howto.txt	2008-07-08 16:57:09 UTC (rev 18973)
@@ -0,0 +1,27 @@
+This document describes how to compile the GP2X port.
+
+
+First of all you will need to install DevkitGP2X, and make sure the 
+cross-toolchain binaries are in the PATH.
+
+After installing DevkitGP2X you will need to copy or make links for the 
+following files:
+
+arm-linux-ar     to arm-gp2x-linux-ar
+arm-linux-g++    to arm-gp2x-linux=g++
+arm-linux-gcc    to arm-gp2x-linux-gcc
+arm-linux-ranlib to arm-gp2x-linux-ranlib
+arm-linux-strip  to arm-gp2x-linux-strip
+
+After doing this you will be able to use the --host configure option for 
+VICE to have it build the GP2X port. In other words, you just use:
+
+./configure --host=arm-gp2x-linux
+
+And the configure script will try to find and use the correct 
+cross-toolchain (arm-gp2x-linux-*), and set the correct CFLAGS and LDFLAGS 
+for the GP2X port.
+
+After the compile is done you can use 'make bindist' to create a binary 
+distribution directory, or use 'make bindistzip' to create a binary 
+distribution zip archive.


Property changes on: branches/marco/ports/vice/doc/html
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/man
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/po
___________________________________________________________________
Name: svn:ignore
   + cat-id-tbl.c
de.gmo
fr.gmo
hu.gmo
intl2po
it.gmo
Makefile
Makefile.in
nl.gmo
pl.gmo
POTFILES
stamp-cat-id
sv.gmo
vice.pot



Property changes on: branches/marco/ports/vice/src
___________________________________________________________________
Name: svn:ignore
   + c1541
c1541.exe
cartconv
cartconv.exe
config.h
config.h.in
.deps
Makefile
Makefile.in
petcat
petcat.exe
stamp-h1
translate.c.po.c
translate.h
translate_table.h
x128
x128.exe
x64
x64.exe
xcbm2
xcbm2.exe
xpet
xpet.exe
xplus4
xplus4.exe
xvic
xvic.exe



Property changes on: branches/marco/ports/vice/src/arch
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/amigaos
___________________________________________________________________
Name: svn:ignore
   + .deps
intl.c.po.c
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/beos
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/msdos
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/os2
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/os2/dialogs
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/os2/kbd
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/os2/snippets
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/os2/vac++
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/riscos
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix
___________________________________________________________________
Name: svn:ignore
   + .deps
libarch.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/gp2x
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/gui
___________________________________________________________________
Name: svn:ignore
   + .deps
libarchgui.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/macosx
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/cocoa
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/readline
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/x11
___________________________________________________________________
Name: svn:ignore
   + .deps
libx11ui.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/x11/gnome
___________________________________________________________________
Name: svn:ignore
   + .deps
libgnomeui.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/x11/xaw
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/arch/win32
___________________________________________________________________
Name: svn:ignore
   + *.plg
.deps
Debug
libarch.a
libs
Makefile
Makefile.in
menuid.h
res.h
resacia.rc.po.c
resc128.rc.po.c
resc128cat.RES
resc128cat.rc
resc64_256k.rc.po.c
resc64.rc.po.c
resc64cat.RES
resc64cat.rc
rescbm2.rc.po.c
rescbm2cat.RES
rescbm2cat.rc
resdigimax.rc.po.c
resdrivec128.rc.po.c
resdrivec64.rc.po.c
resdrivepetcbm2.rc.po.c
resdriveplus4.rc.po.c
resdrivevic20.rc.po.c
resgeoram.rc.po.c
reside64.rc.po.c
resmmc64.rc.po.c
resmouse.rc.po.c
respet.rc.po.c
respetcat.RES
respetcat.rc
respetreu.rc.po.c
resplus256k.rc.po.c
resplus4.rc.po.c
resplus4cat.RES
resplus4cat.rc
resplus60k.rc.po.c
resramcart.rc.po.c
res.rc.po.c
resreu.rc.po.c
resrs232user.rc.po.c
ressidcart.rc.po.c
ressid.rc.po.c
restfe.rc.po.c
resvic20.rc.po.c
resvic20cat.RES
resvic20cat.rc
resvicii.rc.po.c
vice.ncb
vice.opt


Deleted: branches/marco/ports/vice/src/arch/win32/make-msvc-bindist.bat
===================================================================
--- branches/marco/ports/vice/src/arch/win32/make-msvc-bindist.bat	2008-07-08 07:58:34 UTC (rev 18972)
+++ branches/marco/ports/vice/src/arch/win32/make-msvc-bindist.bat	2008-07-08 16:57:09 UTC (rev 18973)
@@ -1,94 +0,0 @@
-@echo off
-set VICEDIR=WinVICE-2.0
-if not exist ..\..\..\data\x64.exe goto missingmsvc
-if not exist ..\..\..\data\x128.exe goto missingmsvc
-if not exist ..\..\..\data\xcbm2.exe goto missingmsvc
-if not exist ..\..\..\data\xpet.exe goto missingmsvc
-if not exist ..\..\..\data\xplus4.exe goto missingmsvc
-if not exist ..\..\..\data\xvic.exe goto missingmsvc
-if not exist ..\..\..\data\c1541.exe goto missingmsvc
-if not exist ..\..\..\data\cartconv.exe goto missingmsvc
-if not exist ..\..\..\data\petcat.exe goto missingmsvc
-echo generating MSVC WIN32 binary port distribution
-if exist %VICEDIR% goto removedir
-mkdir %VICEDIR%
-copy ..\..\..\data\x64.exe %VICEDIR%
-copy ..\..\..\data\x128.exe %VICEDIR%
-copy ..\..\..\data\xvic.exe %VICEDIR%
-copy ..\..\..\data\xpet.exe %VICEDIR%
-copy ..\..\..\data\xplus4.exe %VICEDIR%
-copy ..\..\..\data\xcbm2.exe %VICEDIR%
-copy ..\..\..\data\c1541.exe %VICEDIR%
-copy ..\..\..\data\petcat.exe %VICEDIR%
-copy ..\..\..\data\cartconv.exe %VICEDIR%
-mkdir %VICEDIR%\C128
-copy ..\..\..\data\C128\basic* %VICEDIR%\C128
-copy ..\..\..\data\C128\*.vpl %VICEDIR%\C128
-copy ..\..\..\data\C128\charg* %VICEDIR%\C128
-copy ..\..\..\data\C128\*.vrs %VICEDIR%\C128
-copy ..\..\..\data\C128\kernal* %VICEDIR%\C128
-copy ..\..\..\data\C128\win_*.v* %VICEDIR%\C128
-mkdir %VICEDIR%\C64
-copy ..\..\..\data\C64\basic %VICEDIR%\C64
-copy ..\..\..\data\C64\*.vpl %VICEDIR%\C64
-copy ..\..\..\data\C64\c64mem.sym %VICEDIR%\C64
-copy ..\..\..\data\C64\chargen %VICEDIR%\C64
-copy ..\..\..\data\C64\*.vrs %VICEDIR%\C64
-copy ..\..\..\data\C64\kernal %VICEDIR%\C64
-copy ..\..\..\data\C64\win_*.v* %VICEDIR%\C64
-mkdir %VICEDIR%\CBM-II
-copy ..\..\..\data\CBM-II\*.vpl %VICEDIR%\CBM-II
-copy ..\..\..\data\CBM-II\basic.* %VICEDIR%\CBM-II
-copy ..\..\..\data\CBM-II\chargen.* %VICEDIR%\CBM-II
-copy ..\..\..\data\CBM-II\kernal* %VICEDIR%\CBM-II
-copy ..\..\..\data\CBM-II\*.vrs %VICEDIR%\CBM-II
-copy ..\..\..\data\CBM-II\win_*.v* %VICEDIR%\CBM-II
-mkdir %VICEDIR%\DRIVES
-copy ..\..\..\data\DRIVES\d* %VICEDIR%\DRIVES
-mkdir %VICEDIR%\PET
-copy ..\..\..\data\PET\*.vpl %VICEDIR%\PET
-copy ..\..\..\data\PET\basic* %VICEDIR%\PET
-copy ..\..\..\data\PET\chargen* %VICEDIR%\PET
-copy ..\..\..\data\PET\edit* %VICEDIR%\PET
-copy ..\..\..\data\PET\kernal* %VICEDIR%\PET
-copy ..\..\..\data\PET\*.vrs %VICEDIR%\PET
-copy ..\..\..\data\PET\win_*.v* %VICEDIR%\PET
-mkdir %VICEDIR%\PLUS4
-copy ..\..\..\data\PLUS4\3plus1* %VICEDIR%\PLUS4
-copy ..\..\..\data\PLUS4\basic %VICEDIR%\PLUS4
-copy ..\..\..\data\PLUS4\*.vpl %VICEDIR%\PLUS4
-copy ..\..\..\data\PLUS4\*.vrs %VICEDIR%\PLUS4
-copy ..\..\..\data\PLUS4\kernal %VICEDIR%\PLUS4
-copy ..\..\..\data\PLUS4\win_*.v* %VICEDIR%\PLUS4
-mkdir %VICEDIR%\PRINTER
-copy ..\..\..\data\PRINTER\cbm1526 %VICEDIR%\PRINTER
-copy ..\..\..\data\PRINTER\mps* %VICEDIR%\PRINTER
-copy ..\..\..\data\PRINTER\*.vpl %VICEDIR%\PRINTER
-copy ..\..\..\data\PRINTER\nl10-cbm %VICEDIR%\PRINTER
-mkdir %VICEDIR%\VIC20
-copy ..\..\..\data\VIC20\basic %VICEDIR%\VIC20
-copy ..\..\..\data\VIC20\chargen %VICEDIR%\VIC20
-copy ..\..\..\data\VIC20\*.vpl %VICEDIR%\VIC20
-copy ..\..\..\data\VIC20\*.vrs %VICEDIR%\VIC20
-copy ..\..\..\data\VIC20\kernal %VICEDIR%\VIC20
-copy ..\..\..\data\VIC20\win_*.v* %VICEDIR%\VIC20
-mkdir %VICEDIR%\fonts
-copy ..\..\..\data\fonts\*.fon %VICEDIR%\fonts
-mkdir %VICEDIR%\html
-copy ..\..\..\doc\html\*.html %VICEDIR%\html
-mkdir %VICEDIR%\html\images
-copy ..\..\..\doc\html\images\* %VICEDIR%\html\images
-mkdir %VICEDIR%\html\plain
-copy ..\..\..\doc\html\plain\* %VICEDIR%\html\plain
-copy ..\..\..\FEEDBACK %VICEDIR%
-copy ..\..\..\README %VICEDIR%
-copy ..\..\..\doc\cartconv.txt %VICEDIR%
-echo WIN32 port binary distribution directory generated as %VICEDIR%
-goto end
-:missingmsvc
-echo executables are missing, please build the project first.
-goto end
-:removedir
-echo %VICEDIR% already exists, please remove %VICEDIR% and run this batch file again.
-:end
-pause

Copied: branches/marco/ports/vice/src/arch/win32/make-msvc-bindist.bat (from rev 18972, tags/v1.22/v1.22.24/vice/src/arch/win32/make-msvc-bindist.bat)
===================================================================
--- branches/marco/ports/vice/src/arch/win32/make-msvc-bindist.bat	                        (rev 0)
+++ branches/marco/ports/vice/src/arch/win32/make-msvc-bindist.bat	2008-07-08 16:57:09 UTC (rev 18973)
@@ -0,0 +1,94 @@
+@echo off
+set VICEDIR=WinVICE-2.0
+if not exist ..\..\..\data\x64.exe goto missingmsvc
+if not exist ..\..\..\data\x128.exe goto missingmsvc
+if not exist ..\..\..\data\xcbm2.exe goto missingmsvc
+if not exist ..\..\..\data\xpet.exe goto missingmsvc
+if not exist ..\..\..\data\xplus4.exe goto missingmsvc
+if not exist ..\..\..\data\xvic.exe goto missingmsvc
+if not exist ..\..\..\data\c1541.exe goto missingmsvc
+if not exist ..\..\..\data\cartconv.exe goto missingmsvc
+if not exist ..\..\..\data\petcat.exe goto missingmsvc
+echo generating MSVC WIN32 binary port distribution
+if exist %VICEDIR% goto removedir
+mkdir %VICEDIR%
+copy ..\..\..\data\x64.exe %VICEDIR%
+copy ..\..\..\data\x128.exe %VICEDIR%
+copy ..\..\..\data\xvic.exe %VICEDIR%
+copy ..\..\..\data\xpet.exe %VICEDIR%
+copy ..\..\..\data\xplus4.exe %VICEDIR%
+copy ..\..\..\data\xcbm2.exe %VICEDIR%
+copy ..\..\..\data\c1541.exe %VICEDIR%
+copy ..\..\..\data\petcat.exe %VICEDIR%
+copy ..\..\..\data\cartconv.exe %VICEDIR%
+mkdir %VICEDIR%\C128
+copy ..\..\..\data\C128\basic* %VICEDIR%\C128
+copy ..\..\..\data\C128\*.vpl %VICEDIR%\C128
+copy ..\..\..\data\C128\charg* %VICEDIR%\C128
+copy ..\..\..\data\C128\*.vrs %VICEDIR%\C128
+copy ..\..\..\data\C128\kernal* %VICEDIR%\C128
+copy ..\..\..\data\C128\win_*.v* %VICEDIR%\C128
+mkdir %VICEDIR%\C64
+copy ..\..\..\data\C64\basic %VICEDIR%\C64
+copy ..\..\..\data\C64\*.vpl %VICEDIR%\C64
+copy ..\..\..\data\C64\c64mem.sym %VICEDIR%\C64
+copy ..\..\..\data\C64\chargen %VICEDIR%\C64
+copy ..\..\..\data\C64\*.vrs %VICEDIR%\C64
+copy ..\..\..\data\C64\kernal %VICEDIR%\C64
+copy ..\..\..\data\C64\win_*.v* %VICEDIR%\C64
+mkdir %VICEDIR%\CBM-II
+copy ..\..\..\data\CBM-II\*.vpl %VICEDIR%\CBM-II
+copy ..\..\..\data\CBM-II\basic.* %VICEDIR%\CBM-II
+copy ..\..\..\data\CBM-II\chargen.* %VICEDIR%\CBM-II
+copy ..\..\..\data\CBM-II\kernal* %VICEDIR%\CBM-II
+copy ..\..\..\data\CBM-II\*.vrs %VICEDIR%\CBM-II
+copy ..\..\..\data\CBM-II\win_*.v* %VICEDIR%\CBM-II
+mkdir %VICEDIR%\DRIVES
+copy ..\..\..\data\DRIVES\d* %VICEDIR%\DRIVES
+mkdir %VICEDIR%\PET
+copy ..\..\..\data\PET\*.vpl %VICEDIR%\PET
+copy ..\..\..\data\PET\basic* %VICEDIR%\PET
+copy ..\..\..\data\PET\chargen* %VICEDIR%\PET
+copy ..\..\..\data\PET\edit* %VICEDIR%\PET
+copy ..\..\..\data\PET\kernal* %VICEDIR%\PET
+copy ..\..\..\data\PET\*.vrs %VICEDIR%\PET
+copy ..\..\..\data\PET\win_*.v* %VICEDIR%\PET
+mkdir %VICEDIR%\PLUS4
+copy ..\..\..\data\PLUS4\3plus1* %VICEDIR%\PLUS4
+copy ..\..\..\data\PLUS4\basic %VICEDIR%\PLUS4
+copy ..\..\..\data\PLUS4\*.vpl %VICEDIR%\PLUS4
+copy ..\..\..\data\PLUS4\*.vrs %VICEDIR%\PLUS4
+copy ..\..\..\data\PLUS4\kernal %VICEDIR%\PLUS4
+copy ..\..\..\data\PLUS4\win_*.v* %VICEDIR%\PLUS4
+mkdir %VICEDIR%\PRINTER
+copy ..\..\..\data\PRINTER\cbm1526 %VICEDIR%\PRINTER
+copy ..\..\..\data\PRINTER\mps* %VICEDIR%\PRINTER
+copy ..\..\..\data\PRINTER\*.vpl %VICEDIR%\PRINTER
+copy ..\..\..\data\PRINTER\nl10-cbm %VICEDIR%\PRINTER
+mkdir %VICEDIR%\VIC20
+copy ..\..\..\data\VIC20\basic %VICEDIR%\VIC20
+copy ..\..\..\data\VIC20\chargen %VICEDIR%\VIC20
+copy ..\..\..\data\VIC20\*.vpl %VICEDIR%\VIC20
+copy ..\..\..\data\VIC20\*.vrs %VICEDIR%\VIC20
+copy ..\..\..\data\VIC20\kernal %VICEDIR%\VIC20
+copy ..\..\..\data\VIC20\win_*.v* %VICEDIR%\VIC20
+mkdir %VICEDIR%\fonts
+copy ..\..\..\data\fonts\*.fon %VICEDIR%\fonts
+mkdir %VICEDIR%\html
+copy ..\..\..\doc\html\*.html %VICEDIR%\html
+mkdir %VICEDIR%\html\images
+copy ..\..\..\doc\html\images\* %VICEDIR%\html\images
+mkdir %VICEDIR%\html\plain
+copy ..\..\..\doc\html\plain\* %VICEDIR%\html\plain
+copy ..\..\..\FEEDBACK %VICEDIR%
+copy ..\..\..\README %VICEDIR%
+copy ..\..\..\doc\cartconv.txt %VICEDIR%
+echo WIN32 port binary distribution directory generated as %VICEDIR%
+goto end
+:missingmsvc
+echo executables are missing, please build the project first.
+goto end
+:removedir
+echo %VICEDIR% already exists, please remove %VICEDIR% and run this batch file again.
+:end
+pause


Property changes on: branches/marco/ports/vice/src/arch/win32/msvc
___________________________________________________________________
Name: svn:ignore
   + msvc_ver.h



Property changes on: branches/marco/ports/vice/src/arch/win32/utils
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in


Deleted: branches/marco/ports/vice/src/arch/win32/watcom/make-watcom-bindist.bat
===================================================================
--- branches/marco/ports/vice/src/arch/win32/watcom/make-watcom-bindist.bat	2008-07-08 07:58:34 UTC (rev 18972)
+++ branches/marco/ports/vice/src/arch/win32/watcom/make-watcom-bindist.bat	2008-07-08 16:57:09 UTC (rev 18973)
@@ -1,94 +0,0 @@
-@echo off
-set VICEDIR=WinVICE-2.0
-if not exist x64.exe goto missingwatcom
-if not exist x128.exe goto missingwatcom
-if not exist xcbm2.exe goto missingwatcom
-if not exist xpet.exe goto missingwatcom
-if not exist xplus4.exe goto missingwatcom
-if not exist xvic.exe goto missingwatcom
-if not exist c1541.exe goto missingwatcom
-if not exist cartconv.exe goto missingwatcom
-if not exist petcat.exe goto missingwatcom
-echo generating OPENWATCOM WIN32 binary port distribution
-if exist %VICEDIR% goto removedir
-mkdir %VICEDIR%
-copy x64.exe %VICEDIR%
-copy x128.exe %VICEDIR%
-copy xvic.exe %VICEDIR%
-copy xpet.exe %VICEDIR%
-copy xplus4.exe %VICEDIR%
-copy xcbm2.exe %VICEDIR%
-copy c1541.exe %VICEDIR%
-copy petcat.exe %VICEDIR%
-copy cartconv.exe %VICEDIR%
-mkdir %VICEDIR%\C128
-copy ..\..\..\..\data\C128\basic* %VICEDIR%\C128
-copy ..\..\..\..\data\C128\*.vpl %VICEDIR%\C128
-copy ..\..\..\..\data\C128\charg* %VICEDIR%\C128
-copy ..\..\..\..\data\C128\*.vrs %VICEDIR%\C128
-copy ..\..\..\..\data\C128\kernal* %VICEDIR%\C128
-copy ..\..\..\..\data\C128\win_*.v* %VICEDIR%\C128
-mkdir %VICEDIR%\C64
-copy ..\..\..\..\data\C64\basic %VICEDIR%\C64
-copy ..\..\..\..\data\C64\*.vpl %VICEDIR%\C64
-copy ..\..\..\..\data\C64\c64mem.sym %VICEDIR%\C64
-copy ..\..\..\..\data\C64\chargen %VICEDIR%\C64
-copy ..\..\..\..\data\C64\*.vrs %VICEDIR%\C64
-copy ..\..\..\..\data\C64\kernal %VICEDIR%\C64
-copy ..\..\..\..\data\C64\win_*.v* %VICEDIR%\C64
-mkdir %VICEDIR%\CBM-II
-copy ..\..\..\..\data\CBM-II\*.vpl %VICEDIR%\CBM-II
-copy ..\..\..\..\data\CBM-II\basic.* %VICEDIR%\CBM-II
-copy ..\..\..\..\data\CBM-II\chargen.* %VICEDIR%\CBM-II
-copy ..\..\..\..\data\CBM-II\kernal* %VICEDIR%\CBM-II
-copy ..\..\..\..\data\CBM-II\*.vrs %VICEDIR%\CBM-II
-copy ..\..\..\..\data\CBM-II\win_*.v* %VICEDIR%\CBM-II
-mkdir %VICEDIR%\DRIVES
-copy ..\..\..\..\data\DRIVES\d* %VICEDIR%\DRIVES
-mkdir %VICEDIR%\PET
-copy ..\..\..\..\data\PET\*.vpl %VICEDIR%\PET
-copy ..\..\..\..\data\PET\basic* %VICEDIR%\PET
-copy ..\..\..\..\data\PET\chargen* %VICEDIR%\PET
-copy ..\..\..\..\data\PET\edit* %VICEDIR%\PET
-copy ..\..\..\..\data\PET\kernal* %VICEDIR%\PET
-copy ..\..\..\..\data\PET\*.vrs %VICEDIR%\PET
-copy ..\..\..\..\data\PET\win_*.v* %VICEDIR%\PET
-mkdir %VICEDIR%\PLUS4
-copy ..\..\..\..\data\PLUS4\3plus1* %VICEDIR%\PLUS4
-copy ..\..\..\..\data\PLUS4\basic %VICEDIR%\PLUS4
-copy ..\..\..\..\data\PLUS4\*.vpl %VICEDIR%\PLUS4
-copy ..\..\..\..\data\PLUS4\*.vrs %VICEDIR%\PLUS4
-copy ..\..\..\..\data\PLUS4\kernal %VICEDIR%\PLUS4
-copy ..\..\..\..\data\PLUS4\win_*.v* %VICEDIR%\PLUS4
-mkdir %VICEDIR%\PRINTER
-copy ..\..\..\..\data\PRINTER\cbm1526 %VICEDIR%\PRINTER
-copy ..\..\..\..\data\PRINTER\mps* %VICEDIR%\PRINTER
-copy ..\..\..\..\data\PRINTER\*.vpl %VICEDIR%\PRINTER
-copy ..\..\..\..\data\PRINTER\nl10-cbm %VICEDIR%\PRINTER
-mkdir %VICEDIR%\VIC20
-copy ..\..\..\..\data\VIC20\basic %VICEDIR%\VIC20
-copy ..\..\..\..\data\VIC20\chargen %VICEDIR%\VIC20
-copy ..\..\..\..\data\VIC20\*.vpl %VICEDIR%\VIC20
-copy ..\..\..\..\data\VIC20\*.vrs %VICEDIR%\VIC20
-copy ..\..\..\..\data\VIC20\kernal %VICEDIR%\VIC20
-copy ..\..\..\..\data\VIC20\win_*.v* %VICEDIR%\VIC20
-mkdir %VICEDIR%\fonts
-copy ..\..\..\..\data\fonts\*.fon %VICEDIR%\fonts
-mkdir %VICEDIR%\html
-copy ..\..\..\..\doc\html\*.html %VICEDIR%\html
-mkdir %VICEDIR%\html\images
-copy ..\..\..\..\doc\html\images\* %VICEDIR%\html\images
-mkdir %VICEDIR%\html\plain
-copy ..\..\..\..\doc\html\plain\* %VICEDIR%\html\plain
-copy ..\..\..\..\FEEDBACK %VICEDIR%
-copy ..\..\..\..\README %VICEDIR%
-copy ..\..\..\..\doc\cartconv.txt %VICEDIR%
-echo WIN32 port binary distribution directory generated as %VICEDIR%
-goto end
-:missingwatcom
-echo executables are missing, please build the project first.
-goto end
-:removedir
-echo %VICEDIR% already exists, please remove %VICEDIR% and run this batch file again.
-:end
-pause

Copied: branches/marco/ports/vice/src/arch/win32/watcom/make-watcom-bindist.bat (from rev 18972, tags/v1.22/v1.22.24/vice/src/arch/win32/watcom/make-watcom-bindist.bat)
===================================================================
--- branches/marco/ports/vice/src/arch/win32/watcom/make-watcom-bindist.bat	                        (rev 0)
+++ branches/marco/ports/vice/src/arch/win32/watcom/make-watcom-bindist.bat	2008-07-08 16:57:09 UTC (rev 18973)
@@ -0,0 +1,94 @@
+@echo off
+set VICEDIR=WinVICE-2.0
+if not exist x64.exe goto missingwatcom
+if not exist x128.exe goto missingwatcom
+if not exist xcbm2.exe goto missingwatcom
+if not exist xpet.exe goto missingwatcom
+if not exist xplus4.exe goto missingwatcom
+if not exist xvic.exe goto missingwatcom
+if not exist c1541.exe goto missingwatcom
+if not exist cartconv.exe goto missingwatcom
+if not exist petcat.exe goto missingwatcom
+echo generating OPENWATCOM WIN32 binary port distribution
+if exist %VICEDIR% goto removedir
+mkdir %VICEDIR%
+copy x64.exe %VICEDIR%
+copy x128.exe %VICEDIR%
+copy xvic.exe %VICEDIR%
+copy xpet.exe %VICEDIR%
+copy xplus4.exe %VICEDIR%
+copy xcbm2.exe %VICEDIR%
+copy c1541.exe %VICEDIR%
+copy petcat.exe %VICEDIR%
+copy cartconv.exe %VICEDIR%
+mkdir %VICEDIR%\C128
+copy ..\..\..\..\data\C128\basic* %VICEDIR%\C128
+copy ..\..\..\..\data\C128\*.vpl %VICEDIR%\C128
+copy ..\..\..\..\data\C128\charg* %VICEDIR%\C128
+copy ..\..\..\..\data\C128\*.vrs %VICEDIR%\C128
+copy ..\..\..\..\data\C128\kernal* %VICEDIR%\C128
+copy ..\..\..\..\data\C128\win_*.v* %VICEDIR%\C128
+mkdir %VICEDIR%\C64
+copy ..\..\..\..\data\C64\basic %VICEDIR%\C64
+copy ..\..\..\..\data\C64\*.vpl %VICEDIR%\C64
+copy ..\..\..\..\data\C64\c64mem.sym %VICEDIR%\C64
+copy ..\..\..\..\data\C64\chargen %VICEDIR%\C64
+copy ..\..\..\..\data\C64\*.vrs %VICEDIR%\C64
+copy ..\..\..\..\data\C64\kernal %VICEDIR%\C64
+copy ..\..\..\..\data\C64\win_*.v* %VICEDIR%\C64
+mkdir %VICEDIR%\CBM-II
+copy ..\..\..\..\data\CBM-II\*.vpl %VICEDIR%\CBM-II
+copy ..\..\..\..\data\CBM-II\basic.* %VICEDIR%\CBM-II
+copy ..\..\..\..\data\CBM-II\chargen.* %VICEDIR%\CBM-II
+copy ..\..\..\..\data\CBM-II\kernal* %VICEDIR%\CBM-II
+copy ..\..\..\..\data\CBM-II\*.vrs %VICEDIR%\CBM-II
+copy ..\..\..\..\data\CBM-II\win_*.v* %VICEDIR%\CBM-II
+mkdir %VICEDIR%\DRIVES
+copy ..\..\..\..\data\DRIVES\d* %VICEDIR%\DRIVES
+mkdir %VICEDIR%\PET
+copy ..\..\..\..\data\PET\*.vpl %VICEDIR%\PET
+copy ..\..\..\..\data\PET\basic* %VICEDIR%\PET
+copy ..\..\..\..\data\PET\chargen* %VICEDIR%\PET
+copy ..\..\..\..\data\PET\edit* %VICEDIR%\PET
+copy ..\..\..\..\data\PET\kernal* %VICEDIR%\PET
+copy ..\..\..\..\data\PET\*.vrs %VICEDIR%\PET
+copy ..\..\..\..\data\PET\win_*.v* %VICEDIR%\PET
+mkdir %VICEDIR%\PLUS4
+copy ..\..\..\..\data\PLUS4\3plus1* %VICEDIR%\PLUS4
+copy ..\..\..\..\data\PLUS4\basic %VICEDIR%\PLUS4
+copy ..\..\..\..\data\PLUS4\*.vpl %VICEDIR%\PLUS4
+copy ..\..\..\..\data\PLUS4\*.vrs %VICEDIR%\PLUS4
+copy ..\..\..\..\data\PLUS4\kernal %VICEDIR%\PLUS4
+copy ..\..\..\..\data\PLUS4\win_*.v* %VICEDIR%\PLUS4
+mkdir %VICEDIR%\PRINTER
+copy ..\..\..\..\data\PRINTER\cbm1526 %VICEDIR%\PRINTER
+copy ..\..\..\..\data\PRINTER\mps* %VICEDIR%\PRINTER
+copy ..\..\..\..\data\PRINTER\*.vpl %VICEDIR%\PRINTER
+copy ..\..\..\..\data\PRINTER\nl10-cbm %VICEDIR%\PRINTER
+mkdir %VICEDIR%\VIC20
+copy ..\..\..\..\data\VIC20\basic %VICEDIR%\VIC20
+copy ..\..\..\..\data\VIC20\chargen %VICEDIR%\VIC20
+copy ..\..\..\..\data\VIC20\*.vpl %VICEDIR%\VIC20
+copy ..\..\..\..\data\VIC20\*.vrs %VICEDIR%\VIC20
+copy ..\..\..\..\data\VIC20\kernal %VICEDIR%\VIC20
+copy ..\..\..\..\data\VIC20\win_*.v* %VICEDIR%\VIC20
+mkdir %VICEDIR%\fonts
+copy ..\..\..\..\data\fonts\*.fon %VICEDIR%\fonts
+mkdir %VICEDIR%\html
+copy ..\..\..\..\doc\html\*.html %VICEDIR%\html
+mkdir %VICEDIR%\html\images
+copy ..\..\..\..\doc\html\images\* %VICEDIR%\html\images
+mkdir %VICEDIR%\html\plain
+copy ..\..\..\..\doc\html\plain\* %VICEDIR%\html\plain
+copy ..\..\..\..\FEEDBACK %VICEDIR%
+copy ..\..\..\..\README %VICEDIR%
+copy ..\..\..\..\doc\cartconv.txt %VICEDIR%
+echo WIN32 port binary distribution directory generated as %VICEDIR%
+goto end
+:missingwatcom
+echo executables are missing, please build the project first.
+goto end
+:removedir
+echo %VICEDIR% already exists, please remove %VICEDIR% and run this batch file again.
+:end
+pause


Property changes on: branches/marco/ports/vice/src/c128
___________________________________________________________________
Name: svn:ignore
   + .deps
libc128.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/c64
___________________________________________________________________
Name: svn:ignore
   + .deps
libc64.a
libc64c128.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/c64/cart
___________________________________________________________________
Name: svn:ignore
   + .deps
libc64cart.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/cbm2
___________________________________________________________________
Name: svn:ignore
   + .deps
libcbm2.a
Makefile
Makefile.in


Deleted: branches/marco/ports/vice/src/clipboard.c
===================================================================
--- branches/marco/ports/vice/src/clipboard.c	2008-07-08 07:58:34 UTC (rev 18972)
+++ branches/marco/ports/vice/src/clipboard.c	2008-07-08 16:57:09 UTC (rev 18973)
@@ -1,97 +0,0 @@
-/*
- * clipboard.c - Common clipboard related functions.
- *
- * Written by
- *  Spiro Trikaliotis <Spi...@gm...>
- *  Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- *  02111-1307  USA.
- *
- */
-
-#include "vice.h"
-
-#include <assert.h>
-#include <string.h>
-
-#include "charset.h"
-#include "lib.h"
-#include "mem.h"
-#include "types.h"
-
-char *clipboard_read_screen_output(char *line_ending)
-{
-    char * outputbuffer = NULL;
-
-    do {
-        WORD base;
-        BYTE allrows, allcols;
-        unsigned int row, col;
-        unsigned int size;
-        unsigned int line_ending_length = strlen(line_ending);
-        unsigned int i;
-        int bank;
-        char * p;
-
-        mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
-
-        size = allrows * (allcols + line_ending_length) + 1;
-
-        outputbuffer = lib_malloc(size);
-        if (outputbuffer == NULL) {
-            break;
-        }
-
-        p = outputbuffer;
-
-        for (row = 0; row < allrows; row++) {
-            char * last_non_whitespace = p - 1;
-
-            for (col = 0; col < allcols; col++) {
-                BYTE data;
-
-                data = mem_bank_peek(bank, base++, NULL);
-                data = charset_p_toascii(charset_screencode_to_petcii(data), 1);
-
-                if (data != ' ') {
-                    last_non_whitespace = p;
-                }
-                *p++ = data;
-            }
-
-            /* trim the line if there are only whitespace at the end */
-
-            if (last_non_whitespace < p) {
-                p = last_non_whitespace + 1;
-            }
-
-            /* add a line-ending */
-
-            for (i = 0; i < line_ending_length; i++)
-              *p++ = line_ending[i];
-        }
-
-        *p = 0;
-
-        assert(p < outputbuffer + size);
-
-    } while (0);
-
-    return outputbuffer;
-}

Copied: branches/marco/ports/vice/src/clipboard.c (from rev 18972, tags/v1.22/v1.22.24/vice/src/clipboard.c)
===================================================================
--- branches/marco/ports/vice/src/clipboard.c	                        (rev 0)
+++ branches/marco/ports/vice/src/clipboard.c	2008-07-08 16:57:09 UTC (rev 18973)
@@ -0,0 +1,97 @@
+/*
+ * clipboard.c - Common clipboard related functions.
+ *
+ * Written by
+ *  Spiro Trikaliotis <Spi...@gm...>
+ *  Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <assert.h>
+#include <string.h>
+
+#include "charset.h"
+#include "lib.h"
+#include "mem.h"
+#include "types.h"
+
+char *clipboard_read_screen_output(char *line_ending)
+{
+    char * outputbuffer = NULL;
+
+    do {
+        WORD base;
+        BYTE allrows, allcols;
+        unsigned int row, col;
+        unsigned int size;
+        unsigned int line_ending_length = strlen(line_ending);
+        unsigned int i;
+        int bank;
+        char * p;
+
+        mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
+
+        size = allrows * (allcols + line_ending_length) + 1;
+
+        outputbuffer = lib_malloc(size);
+        if (outputbuffer == NULL) {
+            break;
+        }
+
+        p = outputbuffer;
+
+        for (row = 0; row < allrows; row++) {
+            char * last_non_whitespace = p - 1;
+
+            for (col = 0; col < allcols; col++) {
+                BYTE data;
+
+                data = mem_bank_peek(bank, base++, NULL);
+                data = charset_p_toascii(charset_screencode_to_petcii(data), 1);
+
+                if (data != ' ') {
+                    last_non_whitespace = p;
+                }
+                *p++ = data;
+            }
+
+            /* trim the line if there are only whitespace at the end */
+
+            if (last_non_whitespace < p) {
+                p = last_non_whitespace + 1;
+            }
+
+            /* add a line-ending */
+
+            for (i = 0; i < line_ending_length; i++)
+              *p++ = line_ending[i];
+        }
+
+        *p = 0;
+
+        assert(p < outputbuffer + size);
+
+    } while (0);
+
+    return outputbuffer;
+}

Deleted: branches/marco/ports/vice/src/clipboard.h
===================================================================
--- branches/marco/ports/vice/src/clipboard.h	2008-07-08 07:58:34 UTC (rev 18972)
+++ branches/marco/ports/vice/src/clipboard.h	2008-07-08 16:57:09 UTC (rev 18973)
@@ -1,35 +0,0 @@
-/*
- * clipboard.c - Common clipboard related functions.
- *
- * Written by
- *  Spiro Trikaliotis <Spi...@gm...>
- *  Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- *  02111-1307  USA.
- *
- */
-
-#ifndef _VICE_CLIPBOARD_H
-#define _VICE_CLIPBOARD_H
-
-#include "vice.h"
-
-extern char *clipboard_read_screen_output(char *line_ending);
-
-#endif

Copied: branches/marco/ports/vice/src/clipboard.h (from rev 18972, tags/v1.22/v1.22.24/vice/src/clipboard.h)
===================================================================
--- branches/marco/ports/vice/src/clipboard.h	                        (rev 0)
+++ branches/marco/ports/vice/src/clipboard.h	2008-07-08 16:57:09 UTC (rev 18973)
@@ -0,0 +1,35 @@
+/*
+ * clipboard.c - Common clipboard related functions.
+ *
+ * Written by
+ *  Spiro Trikaliotis <Spi...@gm...>
+ *  Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#ifndef _VICE_CLIPBOARD_H
+#define _VICE_CLIPBOARD_H
+
+#include "vice.h"
+
+extern char *clipboard_read_screen_output(char *line_ending);
+
+#endif


Property changes on: branches/marco/ports/vice/src/core
___________________________________________________________________
Name: svn:ignore
   + .deps
libcore.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/crtc
___________________________________________________________________
Name: svn:ignore
   + .deps
libcrtc.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/diskimage
___________________________________________________________________
Name: svn:ignore
   + .deps
libdiskimage.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/drive
___________________________________________________________________
Name: svn:ignore
   + .deps
libdrive.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/drive/iec
___________________________________________________________________
Name: svn:ignore
   + .deps
libdriveiec.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/drive/iec/c64exp
___________________________________________________________________
Name: svn:ignore
   + .deps
libdriveiecc64exp.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/drive/iec/plus4exp
___________________________________________________________________
Name: svn:ignore
   + .deps
libdriveiecplus4exp.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/drive/iec128dcr
___________________________________________________________________
Name: svn:ignore
   + .deps
libdriveiec128dcr.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/drive/iecieee
___________________________________________________________________
Name: svn:ignore
   + .deps
libdriveiecieee.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/drive/ieee
___________________________________________________________________
Name: svn:ignore
   + .deps
libdriveieee.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/drive/tcbm
___________________________________________________________________
Name: svn:ignore
   + .deps
libdrivetcbm.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/fileio
___________________________________________________________________
Name: svn:ignore
   + .deps
libfileio.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/fsdevice
___________________________________________________________________
Name: svn:ignore
   + .deps
libfsdevice.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/gfxoutputdrv
___________________________________________________________________
Name: svn:ignore
   + .deps
libgfxoutputdrv.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/iecbus
___________________________________________________________________
Name: svn:ignore
   + .deps
libiecbus.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/imagecontents
___________________________________________________________________
Name: svn:ignore
   + .deps
libimagecontents.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/lib
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/lib/lpng
___________________________________________________________________
Name: svn:ignore
   + .deps
libpng.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/lib/zlib
___________________________________________________________________
Name: svn:ignore
   + .deps
libz.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/monitor
___________________________________________________________________
Name: svn:ignore
   + .deps
libmonitor.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/parallel
___________________________________________________________________
Name: svn:ignore
   + .deps
libparallel.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/pet
___________________________________________________________________
Name: svn:ignore
   + .deps
libpet.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/plus4
___________________________________________________________________
Name: svn:ignore
   + .deps
libplus4.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/printerdrv
___________________________________________________________________
Name: svn:ignore
   + .deps
libprinterdrv.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/raster
___________________________________________________________________
Name: svn:ignore
   + .deps
libraster.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/resid
___________________________________________________________________
Name: svn:ignore
   + aclocal.m4
.aclocal.out
.autoconf.out
autom4te.cache
.automake.out
config.log
config.status
configure
.deps
envelope.cpp
extfilt.cpp
filter.cpp
libresid.a
Makefile
Makefile.in
pot.cpp
sid.cpp
version.cpp
voice.cpp
wave.cpp
wave6581_PST.cpp
wave6581_PS_.cpp
wave6581_P_T.cpp
wave6581__ST.cpp
wave8580_PST.cpp
wave8580_PS_.cpp
wave8580_P_T.cpp
wave8580__ST.cpp



Property changes on: branches/marco/ports/vice/src/rs232drv
___________________________________________________________________
Name: svn:ignore
   + .deps
librs232drv.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/serial
___________________________________________________________________
Name: svn:ignore
   + .deps
libserial.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/sid
___________________________________________________________________
Name: svn:ignore
   + .deps
libsid.a
Makefile
Makefile.in
resid.cpp



Property changes on: branches/marco/ports/vice/src/sounddrv
___________________________________________________________________
Name: svn:ignore
   + .deps
libsounddrv.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/tape
___________________________________________________________________
Name: svn:ignore
   + .deps
libtape.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/vdc
___________________________________________________________________
Name: svn:ignore
   + .deps
libvdc.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/vdrive
___________________________________________________________________
Name: svn:ignore
   + .deps
libvdrive.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/vic20
___________________________________________________________________
Name: svn:ignore
   + .deps
libvic20.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/vicii
___________________________________________________________________
Name: svn:ignore
   + .deps
libvicii.a
Makefile
Makefile.in



Property changes on: branches/marco/ports/vice/src/video
___________________________________________________________________
Name: svn:ignore
   + .deps
libvideo.a
Makefile
Makefile.in


Deleted: branches/marco/ports/vice/vice-mint.spec
===================================================================
--- branches/marco/ports/vice/vice-mint.spec	2008-07-08 07:58:34 UTC (rev 18972)
+++ branches/marco/ports/vice/vice-mint.spec	2008-07-08 16:57:09 UTC (rev 18973)
@@ -1,56 +0,0 @@
-%define version 1.22
-%define rel     1
-%define prefix /usr/
-Summary: VICE, the Versatile Commodore Emulator
-Name: vice
-Version: %version
-Release: %rel
-Copyright: GPL
-Group: X11/Applications/Emulators
-Source: ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/vice-%{version}.tar.gz
-URL: http://www.viceteam.org/
-Packager: Marco van den Heuvel <bla...@ya...>
-BuildRoot: /var/tmp/vice-build-root
-
-%description
-VICE is a set of accurate emulators for the Commodore 64, 128, VIC20,
-PET, Plus4 and CBM-II 8-bit computers, all of which run under the X
-Window System.
-
-%prep
-%setup -q
-
-%build
-CFLAGS="$RPM_OPT_FLAGS -DNO_REGPARM" ./configure --prefix=%{prefix} --with-sdl --host=m68k-atari-mint --x-includes="" --x-libraries="" --without-resid
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make prefix=$RPM_BUILD_ROOT%{prefix} VICEDIR=$RPM_BUILD_ROOT%{prefix}/lib/vice install-strip
-gzip -9 $RPM_BUILD_ROOT%{prefix}/share/man/man1/*
-gzip -9 $RPM_BUILD_ROOT%{prefix}/share/info/*
-mkdir -p $RPM_BUILD_ROOT%{_menudir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-
-%doc AUTHORS FEEDBACK INSTALL README
-
-%{prefix}/bin/x64
-%{prefix}/bin/x128
-%{prefix}/bin/xplus4
-%{prefix}/bin/xvic
-%{prefix}/bin/xpet
-%{prefix}/bin/xcbm2
-%{prefix}/bin/c1541
-%{prefix}/bin/cartconv
-%{prefix}/bin/petcat
-%{prefix}/bin/vsid
-%{prefix}/lib/vice/
-%{prefix}/share/man/man1/*
-%{prefix}/share/info/vice.info*
-
-%changelog

Copied: branches/marco/ports/vice/vice-mint.spec (from rev 18972, tags/v1.22/v1.22.24/vice/vice-mint.spec)
===================================================================
--- branches/marco/ports/vice/vice-mint.spec	                        (rev 0)
+++ branches/marco/ports/vice/vice-mint.spec	2008-07-08 16:57:09 UTC (rev 18973)
@@ -0,0 +1,56 @@
+%define version 1.22
+%define rel     1
+%define prefix /usr/
+Summary: VICE, the Versatile Commodore Emulator
+Name: vice
+Version: %version
+Release: %rel
+Copyright: GPL
+Group: X11/Applications/Emulators
+Source: ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/vice-%{version}.tar.gz
+URL: http://www.viceteam.org/
+Packager: Marco van den Heuvel <bla...@ya...>
+BuildRoot: /var/tmp/vice-build-root
+
+%description
+VICE is a set of accurate emulators for the Commodore 64, 128, VIC20,
+PET, Plus4 and CBM-II 8-bit computers, all of which run under the X
+Window System.
+
+%prep
+%setup -q
+
+%build
+CFLAGS="$RPM_OPT_FLAGS -DNO_REGPARM" ./configure --prefix=%{prefix} --with-sdl --host=m68k-atari-mint --x-includes="" --x-libraries="" --without-resid
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{prefix}
+make prefix=$RPM_BUILD_ROOT%{prefix} VICEDIR=$RPM_BUILD_ROOT%{prefix}/lib/vice install-strip
+gzip -9 $RPM_BUILD_ROOT%{prefix}/share/man/man1/*
+gzip -9 $RPM_BUILD_ROOT%{prefix}/share/info/*
+mkdir -p $RPM_BUILD_ROOT%{_menudir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+
+%doc AUTHORS FEEDBACK INSTALL README
+
+%{prefix}/bin/x64
+%{prefix}/bin/x128
+%{prefix}/bin/xplus4
+%{prefix}/bin/xvic
+%{prefix}/bin/xpet
+%{prefix}/bin/xcbm2
+%{prefix}/bin/c1541
+%{prefix}/bin/cartconv
+%{prefix}/bin/petcat
+%{prefix}/bin/vsid
+%{prefix}/lib/vice/
+%{prefix}/share/man/man1/*
+%{prefix}/share/info/vice.info*
+
+%changelog


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18972] branches/marco/ports/vice

From: <bla...@us...> - 2008-07-08 07:58:25

Revision: 18972
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18972&view=rev
Author:   blackystardust
Date:     2008-07-08 00:58:34 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
Updated to 1.22.24

Modified Paths:
--------------
    branches/marco/ports/vice/ChangeLog
    branches/marco/ports/vice/configure.in
    branches/marco/ports/vice/src/ChangeLog
    branches/marco/ports/vice/src/autostart.c
    branches/marco/ports/vice/src/autostart.h
    branches/marco/ports/vice/src/c64/reu.c
    branches/marco/ports/vice/src/init.c
    branches/marco/ports/vice/src/translate.c
    branches/marco/ports/vice/src/translate.txt
    branches/marco/ports/vice/src/version.h

Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/ChangeLog	2008-07-08 07:58:34 UTC (rev 18972)
@@ -1,3 +1,11 @@
+2008-07-07  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.24
+
+2008-07-07  Marco van den Heuvel  <bla...@ya...>
+
+	* doc/html/plain/NEWS: Updated.
+
 2008-07-04  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.23

Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/configure.in	2008-07-08 07:58:34 UTC (rev 18972)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=23
+VICE_VERSION_BUILD=24
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: branches/marco/ports/vice/src/ChangeLog
===================================================================
--- branches/marco/ports/vice/src/ChangeLog	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/src/ChangeLog	2008-07-08 07:58:34 UTC (rev 18972)
@@ -1,3 +1,40 @@
+2008-07-07  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.24
+
+2008-07-07  Spiro Trikaliotis  <spi...@gm...>
+
+	* c64/reu.c: fixed "end-of-block" for REU compare operation
+	according to Wolfgang Moser's REU reference.
+
+	* init.c, autostart.c, autostart.h, translate.txt, translate.c:
+	Added new command-line options -autostartrunwithcolon and
+	+autostartrunwithcolon along with corresponding vicerc option
+	AutostartRunWithColon=x.
+
+2008-07-07  Marco van den Heuvel  <bla...@ya...>
+
+	* arch/beos/Makefile.am, arch/beos/constants.h, arch/beos/ui.cc,
+	arch/beos/vicemenu.cc: Added copy/paste support.
+
+	* arch/beos/console.c: Fixed a typo.
+
+	* arch/beos/ui_sid.cc: Added a missing variable.
+
+	* arch/os2/ui.c: Fixed a typo.
+
+	* arch/os2/vac++/incl/mainsrc.icc, arch/os2/watcom/mainsrc.tgt,
+	arch/os2/watcom/vice.wpj, arch/win32/watcom/base.tgt,
+	arch/win32/watcom/vice.wpj: Added clipboard.c to the project
+	files.
+
+	* clipboard.h: Changed the _CLIPBOARD_H define to
+	_VICE_CLIPBOARD_H so that it won't interfere with the beos
+	clipboard define.
+
+	* sound.h: Fixed up to return SWORD and use int calculations
+	without casts.
+
 2008-07-04  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.23

Modified: branches/marco/ports/vice/src/autostart.c
===================================================================
--- branches/marco/ports/vice/src/autostart.c	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/src/autostart.c	2008-07-08 07:58:34 UTC (rev 18972)
@@ -37,6 +37,7 @@
 #include "archdep.h"
 #include "autostart.h"
 #include "attach.h"
+#include "cmdline.h"
 #include "datasette.h"
 #include "drive.h"
 #include "fileio.h"
@@ -112,6 +113,89 @@
 static int autostart_wait_for_reset;
 /* ------------------------------------------------------------------------- */
 
+static int AutostartRunWithColon = 0;
+
+static const char * const AutostartRunCommandsAvailable[] = { "RUN\r", "RUN:\r" };
+
+static const char * AutostartRunCommand = NULL;
+
+/*! \internal \brief set the reu to the enabled or disabled state
+
+ \param val
+   if 0, disable the REU; else, enable it.
+
+ \param param
+   unused
+
+ \return
+   0 on success. else -1.
+*/
+static int set_autostart_run_with_colon(int val, void *param)
+{
+    AutostartRunWithColon = val ? 1 : 0;
+
+    AutostartRunCommand = AutostartRunCommandsAvailable[AutostartRunWithColon];
+
+    return 0;
+}
+
+
+/*! \brief integer resources used by the REU module */
+static const resource_int_t resources_int[] = {
+    { "AutostartRunWithColon", 0, RES_EVENT_NO, (resource_value_t)0,
+      &AutostartRunWithColon, set_autostart_run_with_colon, NULL },
+    { NULL }
+};
+
+/*! \brief initialize the resources
+ \return
+   0 on success, else -1.
+
+ \remark
+   Registers the integer resources
+*/
+int autostart_resources_init(void)
+{
+    return resources_register_int(resources_int);
+}
+
+/* ------------------------------------------------------------------------- */
+
+#ifdef HAS_TRANSLATION
+static const cmdline_option_t cmdline_options[] =
+{
+    { "-autostartwithcolon", SET_RESOURCE, 0, NULL, NULL, "AutostartRunWithColon", (resource_value_t)1,
+      0, IDCLS_ENABLE_AUTOSTARTWITHCOLON },
+    { "+autostartwithcolon", SET_RESOURCE, 0, NULL, NULL, "AutostartRunWithColon", (resource_value_t)0,
+      0, IDCLS_DISABLE_AUTOSTARTWITHCOLON },
+    { NULL }
+};
+#else
+static const cmdline_option_t cmdline_options[] =
+{
+    { "-autostartwithcolon", SET_RESOURCE, 0, NULL, NULL, "AutostartRunWithColon", (resource_value_t)1,
+      NULL, N_("On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'") },
+    { "+autostartwithcolon", SET_RESOURCE, 0, NULL, NULL, "AutostartRunWithColon", (resource_value_t)0,
+      NULL, N_("On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'") },
+    { NULL }
+};
+#endif
+
+/*! \brief initialize the command-line options
+
+ \return
+   0 on success, else -1.
+
+ \remark
+   Registers the command-line options
+*/
+int autostart_cmdline_options_init(void)
+{
+    return cmdline_register_options(cmdline_options);
+}
+
+/* ------------------------------------------------------------------------- */
+
 /* Deallocate program name if we have one */
 static void deallocate_program_name(void)
 {
@@ -273,7 +357,7 @@
 static void disk_attention_callback(void)
 {
     if (autostart_run_mode == AUTOSTART_MODE_RUN)
-        kbdbuf_feed("RUN:\r");
+        kbdbuf_feed(AutostartRunCommand);
 
     machine_bus_attention_callback_set(NULL);
 
@@ -333,7 +417,7 @@
     switch (check("READY.", AUTOSTART_WAIT_BLINK)) {
       case YES:
         log_message(autostart_log, "Starting program.");
-        kbdbuf_feed("RUN:\r");
+        kbdbuf_feed(AutostartRunCommand);
         autostartmode = AUTOSTART_DONE;
         break;
       case NO:
@@ -382,7 +466,7 @@
 
         if (!traps) {
             if (autostart_run_mode == AUTOSTART_MODE_RUN)
-                kbdbuf_feed("RUN:\r");
+                kbdbuf_feed(AutostartRunCommand);
             autostartmode = AUTOSTART_DONE;
         } else {
             autostartmode = AUTOSTART_LOADINGDISK;

Modified: branches/marco/ports/vice/src/autostart.h
===================================================================
--- branches/marco/ports/vice/src/autostart.h	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/src/autostart.h	2008-07-08 07:58:34 UTC (rev 18972)
@@ -34,6 +34,9 @@
 #define AUTOSTART_MODE_RUN  0
 #define AUTOSTART_MODE_LOAD 1
 
+extern int autostart_resources_init(void);
+extern int autostart_cmdline_options_init(void);
+
 extern int autostart_init(CLOCK min_cycles, int handle_drive_true_emulation,
                           int blnsw, int pnt, int pntr, int lnmx);
 extern void autostart_shutdown(void);

Modified: branches/marco/ports/vice/src/c64/reu.c
===================================================================
--- branches/marco/ports/vice/src/c64/reu.c	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/src/c64/reu.c	2008-07-08 07:58:34 UTC (rev 18972)
@@ -202,6 +202,7 @@
     unsigned int wrap_around_mask_when_storing; /*!< mask for the wrap around of REU address when putting result back in base_reu and bank_reu */
     BYTE         reg_bank_unused;               /*!< the unused bits (stuck at 1) of REU_REG_RW_BANK; for original REU, it is REU_REG_RW_BANK_UNUSED */
     BYTE         status_preset;                 /*!< preset value for the status (can be 0 or REU_REG_R_STATUS_256K_CHIPS) */
+    unsigned int first_unused_register_address; /*!< the highest address the used REU register occupy */
 };
 
 /*! \brief a complete REC options description */
@@ -270,6 +271,33 @@
     }
 }
 
+/*! \internal \brief set the first unused REU register address
+
+ \param val
+   the end of the used REU register area; should be equal
+   to or bigger than REU_REG_RW_UNUSED.
+
+ \param param
+   unused
+
+ \return
+   0 on success, else -1.
+*/
+static int set_reu_first_unused(int val, void *param)
+{
+    int retval = -1;
+
+    if (val >= REU_REG_RW_UNUSED) {
+        rec_options.first_unused_register_address = val;
+        retval = 0;
+    }
+    else {
+        log_message(reu_log, "Invalid first unused REU address %02x.", val);
+    };
+
+    return retval;
+}
+
 /*! \internal \brief set the size of the reu
 
  \param val
@@ -317,6 +345,7 @@
     rec_options.wrap_around_mask_when_storing = rec_options.wrap_around - 1;
     rec_options.reg_bank_unused = REU_REG_RW_BANK_UNUSED;
     rec_options.status_preset = REU_REG_R_STATUS_256K_CHIPS;
+    rec_options.first_unused_register_address = REU_REG_RW_UNUSED;
 
     switch (val) {
       case 128:
@@ -398,6 +427,8 @@
       &reu_enabled, set_reu_enabled, NULL },
     { "REUsize", 512, RES_EVENT_NO, NULL,
       &reu_size_kb, set_reu_size, NULL },
+    { "REUfirstUnusedRegister", REU_REG_RW_UNUSED, RES_EVENT_NO, NULL,
+      &rec_options.first_unused_register_address, set_reu_first_unused, NULL },
     { NULL }
 };
 
@@ -577,7 +608,7 @@
 {
     BYTE retval = 0xff;
 
-    assert(addr <= REU_REG_LAST_REG);
+    addr &= REU_REG_LAST_REG;
 
     switch (addr) {
       case REU_REG_R_STATUS:
@@ -646,7 +677,7 @@
 */
 static void reu_store_without_sideeffects(WORD addr, BYTE byte)
 {
-    assert(addr <= REU_REG_LAST_REG);
+    addr &= REU_REG_LAST_REG;
 
     switch (addr)
     {
@@ -722,31 +753,32 @@
 {
     BYTE retval;
 
-    addr &= REU_REG_LAST_REG;
+    addr &= 0xff;
 
-    if (addr < REU_REG_RW_UNUSED) {
+    if (addr < rec_options.first_unused_register_address) {
         io_source = IO_SOURCE_REU;
-    }
 
-    retval = reu_read_without_sideeffects(addr);
+        retval = reu_read_without_sideeffects(addr);
 
-    switch (addr) {
-      case REU_REG_R_STATUS:
-        /* Bits 7-5 are cleared when register is read, and pending IRQs are
-           removed. */
-        rec.status &= 
-            ~(REU_REG_R_STATUS_VERIFY_ERROR 
-              | REU_REG_R_STATUS_END_OF_BLOCK 
-              | REU_REG_R_STATUS_INTERRUPT_PENDING
-             );
+        switch (addr) {
+          case REU_REG_R_STATUS:
+            /* Bits 7-5 are cleared when register is read, and pending IRQs are
+               removed. */
+            rec.status &= 
+                ~(REU_REG_R_STATUS_VERIFY_ERROR 
+                  | REU_REG_R_STATUS_END_OF_BLOCK 
+                  | REU_REG_R_STATUS_INTERRUPT_PENDING
+                 );
 
-        maincpu_set_irq(reu_int_num, 0);
-        break;
-      default:
-        break;
+            maincpu_set_irq(reu_int_num, 0);
+            break;
+          default:
+            break;
+        }
+
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "read [$%02X] => $%02X.", addr, retval) );
     }
 
-    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "read [$%02X] => $%02X.", addr, retval) );
     return retval;
 }
 
@@ -762,16 +794,18 @@
 */
 void REGPARM2 reu_store(WORD addr, BYTE byte)
 {
-    addr &= REU_REG_LAST_REG;
+    addr &= 0xff;
 
-    reu_store_without_sideeffects(addr, byte);
+    if (addr < rec_options.first_unused_register_address) {
+        reu_store_without_sideeffects(addr, byte);
 
-    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "store [$%02X] <= $%02X.", addr, (int)byte) );
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "store [$%02X] <= $%02X.", addr, (int)byte) );
 
-    /* write REC command register
-     * DMA only if execution bit (7) set  - RH */
-    if ((addr == REU_REG_RW_COMMAND) && (rec.command & REU_REG_RW_COMMAND_EXECUTE)) {
-        reu_dma(rec.command & REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED);
+        /* write REC command register
+         * DMA only if execution bit (7) set  - RH */
+        if ((addr == REU_REG_RW_COMMAND) && (rec.command & REU_REG_RW_COMMAND_EXECUTE)) {
+            reu_dma(rec.command & REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED);
+        }
     }
 }
 
@@ -920,6 +954,24 @@
     }
 }
 
+/*! \brief Mark END-OF-BLOCK condition
+
+ \return
+   The value to store to the length register (hard-coded to 1)
+
+ \remark
+   Whenever a REU operation completes, the END-OF-BLOCK bit
+   is set. This is done with the help of this function,
+   as this occurs at different places.
+*/
+static int reu_set_end_of_block(void)
+{
+    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+
+    return 0x01; /* the length value to store after the transfer */
+}
+
 /*! \brief DMA operation writing from the host to the REU
 
   \param host_addr
@@ -959,9 +1011,7 @@
         store_to_reu(reu_addr, value);
         host_addr = (host_addr + host_step) & 0xffff;
     }
-    len = 0x1;
-    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
-    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+    len = reu_set_end_of_block();
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -1001,9 +1051,7 @@
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
     }
-    len = 1;
-    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
-    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+    len = reu_set_end_of_block();
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -1048,9 +1096,7 @@
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
     }
-    len = 1;
-    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
-    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+    len = reu_set_end_of_block();
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -1099,6 +1145,13 @@
             DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "VERIFY ERROR") );
             rec.status |= REU_REG_R_STATUS_VERIFY_ERROR;
 
+            /* weird behaviour of the 17xx: If the last or next-to-last byte
+             * failed, the "end of block transfer" bit is set, too.
+             */
+            if ( (len == 0) || (len == 1) ) {
+                len = reu_set_end_of_block();
+            }
+
             if (rec.int_mask_reg & (REU_REG_RW_INTERRUPT_VERIFY_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) {
                 DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Verify Interrupt pending") );
                 rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
@@ -1110,9 +1163,7 @@
 
     if (len < 0) {
         /* all bytes are equal, mark End Of Block */
-        rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
-        len = 1;
-        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+        len = reu_set_end_of_block();
     }
 
     reu_dma_update_regs(host_addr, reu_addr, len);

Modified: branches/marco/ports/vice/src/init.c
===================================================================
--- branches/marco/ports/vice/src/init.c	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/src/init.c	2008-07-08 07:58:34 UTC (rev 18972)
@@ -29,6 +29,7 @@
 
 #include "archdep.h"
 #include "attach.h"
+#include "autostart.h"
 #include "cmdline.h"
 #include "console.h"
 #include "debug.h"
@@ -81,6 +82,10 @@
         init_resource_fail("system file locator");
         return -1;
     }
+    if (autostart_resources_init() < 0) {
+        init_resource_fail("autostart");
+        return -1;
+    }
     if (romset_resources_init() < 0) {
         init_resource_fail("romset");
         return -1;
@@ -166,6 +171,10 @@
         init_cmdline_options_fail("UI");
         return -1;
     }
+    if (autostart_cmdline_options_init() < 0) {
+        init_resource_fail("autostart");
+        return -1;
+    }
     if (fliplist_cmdline_options_init() < 0) {
         init_cmdline_options_fail("flip list");
         return -1;

Modified: branches/marco/ports/vice/src/translate.c
===================================================================
--- branches/marco/ports/vice/src/translate.c	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/src/translate.c	2008-07-08 07:58:34 UTC (rev 18972)
@@ -657,6 +657,26 @@
 
 /* ------------------------ COMMAND LINE OPTION STRINGS -------------------- */
 
+/* autostart.c */
+/* en */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON,    "On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'"},
+/* de */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_DE, ""},  /* fuzzy */
+/* fr */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_FR, ""},  /* fuzzy */
+/* hu */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_HU, ""},  /* fuzzy */
+/* it */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_IT, ""},  /* fuzzy */
+/* nl */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_NL, ""},  /* fuzzy */
+/* pl */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_PL, ""},  /* fuzzy */
+/* sv */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_SV, ""},  /* fuzzy */
+
+/* autostart.c */
+/* en */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON,    "On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'"},
+/* de */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_DE, ""},  /* fuzzy */
+/* fr */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_FR, ""},  /* fuzzy */
+/* hu */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_HU, ""},  /* fuzzy */
+/* it */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_IT, ""},  /* fuzzy */
+/* nl */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_NL, ""},  /* fuzzy */
+/* pl */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_PL, ""},  /* fuzzy */
+/* sv */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_SV, ""},  /* fuzzy */
+
 /* c128/c128-cmdline-options.c, c64/c64-cmdline-options.c,
    c64/psid.c, plus4/plus4-cmdline-options.c,
    vic20/vic20-cmdline-options.c */

Modified: branches/marco/ports/vice/src/translate.txt
===================================================================
--- branches/marco/ports/vice/src/translate.txt	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/src/translate.txt	2008-07-08 07:58:34 UTC (rev 18972)
@@ -163,6 +163,12 @@
 
 /* COMMAND-LINE STRING ID DEFINITIONS */
 
+/* autostart.c */
+IDCLS_ENABLE_AUTOSTARTWITHCOLON
+
+/* autostart.c */
+IDCLS_DISABLE_AUTOSTARTWITHCOLON
+
 /* c128/c128-cmdline-options.c, c64/c64-cmdline-options.c,
    c64/psid.c, plus4/plus4-cmdline-options.c,
    vic20/vic20-cmdline-options.c */

Modified: branches/marco/ports/vice/src/version.h
===================================================================
--- branches/marco/ports/vice/src/version.h	2008-07-07 18:56:11 UTC (rev 18971)
+++ branches/marco/ports/vice/src/version.h	2008-07-08 07:58:34 UTC (rev 18972)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.23"
+#define VERSION "1.22.24"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,23,0
+#define VERSION_RC_NUMBER 1,22,24,0
 #endif
 
 #ifndef PACKAGE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18971] trunk/vice/po

From: <st...@us...> - 2008-07-07 18:56:07

Revision: 18971
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18971&view=rev
Author:   strik
Date:     2008-07-07 11:56:11 -0700 (Mon, 07 Jul 2008)

Log Message:
-----------
Translations of 1.22.24.

Modified Paths:
--------------
    trunk/vice/po/de.po
    trunk/vice/po/fr.po
    trunk/vice/po/hu.po
    trunk/vice/po/it.po
    trunk/vice/po/nl.po
    trunk/vice/po/pl.po
    trunk/vice/po/sv.po

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-07-07 18:42:38 UTC (rev 18970)
+++ trunk/vice/po/de.po	2008-07-07 18:56:11 UTC (rev 18971)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-23 20:38+0200\n"
+"POT-Creation-Date: 2008-07-07 20:38+0200\n"
 "PO-Revision-Date: 2008-01-02 16:46+0100\n"
 "Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
 "Language-Team: de <de...@li...>\n"
@@ -15,11 +15,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/vsync.c:147 src/sid/sid-cmdline-options.c:186
-#: src/sid/sid-cmdline-options.c:189 src/translate.c.po.c:3507
+#: src/sid/sid-cmdline-options.c:189 src/translate.c.po.c:3527
 msgid "<percent>"
 msgstr "<prozent>"
 
-#: src/vsync.c:147 src/translate.c.po.c:4665
+#: src/vsync.c:147 src/translate.c.po.c:4686
 msgid "Limit emulation speed to specified value"
 msgstr "Emulationsgeschwindigkeit auf Wert beschr\xE4nken."
 
@@ -27,19 +27,19 @@
 #: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
 #: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
 #: src/gfxoutputdrv/ffmpegdrv.c:204 src/monitor/monitor.c:999 src/mouse.c:362
-#: src/mouse.c:364 src/ram.c:101 src/translate.c.po.c:1612
+#: src/mouse.c:364 src/ram.c:101 src/translate.c.po.c:1632
 msgid "<value>"
 msgstr "<Wert>"
 
-#: src/vsync.c:149 src/translate.c.po.c:4675
+#: src/vsync.c:149 src/translate.c.po.c:4696
 msgid "Update every <value> frames (`0' for automatic)"
 msgstr "Jedes <Wert> Bild aktualisieren (`0' f\xFCr Automatik)"
 
-#: src/vsync.c:151 src/translate.c.po.c:4685
+#: src/vsync.c:151 src/translate.c.po.c:4706
 msgid "Enable warp mode"
 msgstr "Warp Mode aktivieren"
 
-#: src/vsync.c:153 src/translate.c.po.c:4695
+#: src/vsync.c:153 src/translate.c.po.c:4716
 msgid "Disable warp mode"
 msgstr "Warp Mode deaktivieren"
 
@@ -52,23 +52,31 @@
 msgstr ""
 "Eine Aufnahme ist zur Zeit aktiv. Mehrfache Aufnahme ist nicht m\xF6glich."
 
-#: src/autostart.c:186 src/translate.c.po.c:96
+#: src/autostart.c:177 src/translate.c.po.c:634
+msgid "On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'"
+msgstr ""
+
+#: src/autostart.c:179 src/translate.c.po.c:644
+msgid "On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'"
+msgstr ""
+
+#: src/autostart.c:270 src/translate.c.po.c:96
 msgid "Cannot load snapshot file."
 msgstr "Kann Snapshot Datei nicht laden."
 
-#: src/sound.c:275 src/translate.c.po.c:4515
+#: src/sound.c:275 src/translate.c.po.c:4536
 msgid "Enable sound playback"
 msgstr "Sound Wiedergaben einschalten"
 
-#: src/sound.c:277 src/translate.c.po.c:4525
+#: src/sound.c:277 src/translate.c.po.c:4546
 msgid "Disable sound playback"
 msgstr "Sound Wiedergaben ausschalten"
 
-#: src/sound.c:279 src/translate.c.po.c:4535
+#: src/sound.c:279 src/translate.c.po.c:4556
 msgid "Set sound sample rate to <value> Hz"
 msgstr "Setze Sound Sample Rate zu <Wert> Hz"
 
-#: src/sound.c:281 src/translate.c.po.c:4545
+#: src/sound.c:281 src/translate.c.po.c:4566
 msgid "Set sound buffer size to <value> msec"
 msgstr "Setze Source Buffer Gr\xF6\xDFe zu <Wert> msek"
 
@@ -93,9 +101,9 @@
 #: src/c64/cart/c64cart.c:276 src/c64/cart/c64cart.c:279
 #: src/c64/cart/c64cart.c:282 src/c64/cart/c64cart.c:285
 #: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
-#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
+#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:479
 #: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -146,35 +154,35 @@
 #: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:212
 #: src/vic20/vic20cartridge.c:214 src/vic20/vic20cartridge.c:216
 #: src/vic20/vic20cartridge.c:218 src/vic20/vic20cartridge.c:220
-#: src/video/video-cmdline-options.c:192 src/translate.c.po.c:654
+#: src/video/video-cmdline-options.c:192 src/translate.c.po.c:674
 msgid "<name>"
 msgstr "<Name>"
 
-#: src/sound.c:283 src/translate.c.po.c:4555
+#: src/sound.c:283 src/translate.c.po.c:4576
 msgid "Specify sound driver"
 msgstr "Sound Treiber spezifieren"
 
-#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4565
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4586
 msgid "<args>"
 msgstr "<Argumente>"
 
-#: src/sound.c:285 src/translate.c.po.c:4575
+#: src/sound.c:285 src/translate.c.po.c:4596
 msgid "Specify initialization parameters for sound driver"
 msgstr "Initialisierungsparameter des Sound Treibers spezifizieren"
 
-#: src/sound.c:287 src/translate.c.po.c:4585
+#: src/sound.c:287 src/translate.c.po.c:4606
 msgid "Specify recording sound driver"
 msgstr "Sound Treiber f\xFCr Aufnahme spezifizieren"
 
-#: src/sound.c:289 src/translate.c.po.c:4595
+#: src/sound.c:289 src/translate.c.po.c:4616
 msgid "Specify initialization parameters for recording sound driver"
 msgstr "Initialisierungsparameter f\xFCr Aufnahme Sound Treiber spezifieren"
 
-#: src/sound.c:291 src/translate.c.po.c:4605
+#: src/sound.c:291 src/translate.c.po.c:4626
 msgid "<sync>"
 msgstr "<Sync>"
 
-#: src/sound.c:291 src/translate.c.po.c:4615
+#: src/sound.c:291 src/translate.c.po.c:4636
 msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
 msgstr ""
 "Setze Sound Geschwindigkeit Anpassung (0: flexibel, 1: anpassend, 2: exakt)"
@@ -309,7 +317,7 @@
 msgid "Error reading start snapshot file."
 msgstr "Fehler beim Lesen der Start Snapshot Datei."
 
-#: src/event.c:1227 src/translate.c.po.c:4224
+#: src/event.c:1227 src/translate.c.po.c:4244
 msgid "Playback recorded events"
 msgstr "Wiedergabe von aufgenommener Ereignisse"
 
@@ -336,47 +344,47 @@
 ".\n"
 "Alle genannten Ger\xE4te werden entfernt."
 
-#: src/debug.c:171 src/translate.c.po.c:4109
+#: src/debug.c:171 src/translate.c.po.c:4129
 msgid "Trace the main CPU"
 msgstr "Haupt CPU verfolgen"
 
-#: src/debug.c:174 src/translate.c.po.c:4119
+#: src/debug.c:174 src/translate.c.po.c:4139
 msgid "Do not trace the main CPU"
 msgstr "Haupt CPU nicht verfolgen"
 
-#: src/debug.c:177 src/translate.c.po.c:4129
+#: src/debug.c:177 src/translate.c.po.c:4149
 msgid "Trace the drive0 CPU"
 msgstr "Laufwerk0 CPU verfolgen"
 
-#: src/debug.c:180 src/translate.c.po.c:4139
+#: src/debug.c:180 src/translate.c.po.c:4159
 msgid "Do not trace the drive0 CPU"
 msgstr "Laufwerk0 CPU nicht verfolgen"
 
-#: src/debug.c:183 src/translate.c.po.c:4149
+#: src/debug.c:183 src/translate.c.po.c:4169
 msgid "Trace the drive1 CPU"
 msgstr "Laufwerk1 CPU verfolgen"
 
-#: src/debug.c:186 src/translate.c.po.c:4159
+#: src/debug.c:186 src/translate.c.po.c:4179
 msgid "Do not trace the drive1 CPU"
 msgstr "Laufwerk1 CPU nicht verfolgen"
 
-#: src/debug.c:190 src/translate.c.po.c:4170
+#: src/debug.c:190 src/translate.c.po.c:4190
 msgid "Trace the drive2 CPU"
 msgstr "Laufwerk2 CPU verfolgen"
 
-#: src/debug.c:193 src/translate.c.po.c:4180
+#: src/debug.c:193 src/translate.c.po.c:4200
 msgid "Do not trace the drive2 CPU"
 msgstr "Laufwerk2 CPU nicht verfolgen"
 
-#: src/debug.c:198 src/translate.c.po.c:4192
+#: src/debug.c:198 src/translate.c.po.c:4212
 msgid "Trace the drive3 CPU"
 msgstr "Laufwerk3 CPU verfolgen"
 
-#: src/debug.c:201 src/translate.c.po.c:4202
+#: src/debug.c:201 src/translate.c.po.c:4222
 msgid "Do not trace the drive3 CPU"
 msgstr "Laufwerk3 CPU nicht verfolgen"
 
-#: src/debug.c:205 src/translate.c.po.c:4213
+#: src/debug.c:205 src/translate.c.po.c:4233
 msgid "Trace mode (0=normal 1=small 2=history)"
 msgstr "Verfolgung Modus (0=normal 1=klein 2=Geschichte)"
 
@@ -455,7 +463,7 @@
 msgid "Network out of sync - disconnecting."
 msgstr "Netzwerksynchronisationsproblem - Trenne Verbindung."
 
-#: src/aciacore.c:210 src/translate.c.po.c:3938
+#: src/aciacore.c:210 src/translate.c.po.c:3958
 msgid "Specify RS232 device this ACIA should work on"
 msgstr "RS232 Ger\xE4t f\xFCr welches ACIA funktionieren soll ist zu spezifizieren"
 
@@ -464,162 +472,162 @@
 #: src/drive/iec/c64exp/c64exp-cmdline-options.c:65
 #: src/drive/iec/plus4exp/plus4exp-cmdline-options.c:49
 #: src/printerdrv/interface-serial.c:121 src/printerdrv/interface-serial.c:124
-#: src/translate.c.po.c:2004
+#: src/translate.c.po.c:2024
 msgid "<type>"
 msgstr "<Typ>"
 
-#: src/attach.c:164 src/translate.c.po.c:3948
+#: src/attach.c:164 src/translate.c.po.c:3968
 msgid "Set device type for device #8 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 msgstr "Ger\xE4te Typ f\xFCr Ger\xE4t #8 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 
-#: src/attach.c:167 src/translate.c.po.c:3958
+#: src/attach.c:167 src/translate.c.po.c:3978
 msgid "Set device type for device #9 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 msgstr "Ger\xE4te Typ f\xFCr Ger\xE4t #9 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 
-#: src/attach.c:170 src/translate.c.po.c:3968
+#: src/attach.c:170 src/translate.c.po.c:3988
 msgid "Set device type for device #10 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 msgstr "Ger\xE4te Typ f\xFCr Ger\xE4t #10 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 
-#: src/attach.c:173 src/translate.c.po.c:3978
+#: src/attach.c:173 src/translate.c.po.c:3998
 msgid "Set device type for device #11 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 msgstr "Ger\xE4te Typ f\xFCr Ger\xE4t #11 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 
-#: src/attach.c:176 src/translate.c.po.c:3988
+#: src/attach.c:176 src/translate.c.po.c:4008
 msgid "Attach disk image for drive #8 read only"
 msgstr "Disk Image als Laufwerk #8 benutzen (schreibgesch\xFCtzt)"
 
-#: src/attach.c:179 src/translate.c.po.c:3998
+#: src/attach.c:179 src/translate.c.po.c:4018
 msgid "Attach disk image for drive #8 read write (if possible)"
 msgstr "Disk Image als Laufwerk #8 benutzen (Schreibzugriff, wenn m\xF6glich)"
 
-#: src/attach.c:182 src/translate.c.po.c:4008
+#: src/attach.c:182 src/translate.c.po.c:4028
 msgid "Attach disk image for drive #9 read only"
 msgstr "Disk Image als Laufwerk #9 benutzen (schreibgesch\xFCtzt)"
 
-#: src/attach.c:185 src/translate.c.po.c:4018
+#: src/attach.c:185 src/translate.c.po.c:4038
 msgid "Attach disk image for drive #9 read write (if possible)"
 msgstr "Disk Image als Laufwerk #9 benutzen (Schreibzugriff, wenn m\xF6glich)"
 
-#: src/attach.c:188 src/translate.c.po.c:4028
+#: src/attach.c:188 src/translate.c.po.c:4048
 msgid "Attach disk image for drive #10 read only"
 msgstr "Disk Image als Laufwerk #10 benutzen (schreibgesch\xFCtzt)"
 
-#: src/attach.c:191 src/translate.c.po.c:4038
+#: src/attach.c:191 src/translate.c.po.c:4058
 msgid "Attach disk image for drive #10 read write (if possible)"
 msgstr "Disk Image als Laufwerk #10 benutzen (Schreibzugriff, wenn m\xF6glich)"
 
-#: src/attach.c:194 src/translate.c.po.c:4048
+#: src/attach.c:194 src/translate.c.po.c:4068
 msgid "Attach disk image for drive #11 read only"
 msgstr "Disk Image als Laufwerk #11 benutzen (schreibgesch\xFCtzt)"
 
-#: src/attach.c:197 src/translate.c.po.c:4058
+#: src/attach.c:197 src/translate.c.po.c:4078
 msgid "Attach disk image for drive #11 read write (if possible)"
 msgstr "Disk Image als Laufwerk #11 benutzen (Schreibzugriff, wenn m\xF6glich)"
 
 #: src/c128/c128-cmdline-options.c:104 src/c64/c64-cmdline-options.c:84
 #: src/c64/psid.c:152 src/plus4/plus4-cmdline-options.c:79
-#: src/vic20/vic20-cmdline-options.c:205 src/translate.c.po.c:634
+#: src/vic20/vic20-cmdline-options.c:205 src/translate.c.po.c:654
 msgid "Use PAL sync factor"
 msgstr "PAL Sync Faktor benutzen"
 
 #: src/c128/c128-cmdline-options.c:106 src/c64/c64-cmdline-options.c:86
 #: src/c64/psid.c:155 src/plus4/plus4-cmdline-options.c:81
-#: src/vic20/vic20-cmdline-options.c:207 src/translate.c.po.c:644
+#: src/vic20/vic20-cmdline-options.c:207 src/translate.c.po.c:664
 msgid "Use NTSC sync factor"
 msgstr "NTSC Sync Faktor benutzen"
 
-#: src/c128/c128-cmdline-options.c:108 src/translate.c.po.c:664
+#: src/c128/c128-cmdline-options.c:108 src/translate.c.po.c:684
 msgid "Specify name of international Kernal ROM image"
 msgstr "Bitte Namen f\xFCr internationale Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:110 src/translate.c.po.c:674
+#: src/c128/c128-cmdline-options.c:110 src/translate.c.po.c:694
 msgid "Specify name of German Kernal ROM image"
 msgstr "Name f\xFCr deutsche Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:112 src/translate.c.po.c:684
+#: src/c128/c128-cmdline-options.c:112 src/translate.c.po.c:704
 msgid "Specify name of Finnish Kernal ROM image"
 msgstr "Name f\xFCr finnische Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:114 src/translate.c.po.c:694
+#: src/c128/c128-cmdline-options.c:114 src/translate.c.po.c:714
 msgid "Specify name of French Kernal ROM image"
 msgstr "Name f\xFCr franz\xF6sische Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:116 src/translate.c.po.c:704
+#: src/c128/c128-cmdline-options.c:116 src/translate.c.po.c:724
 msgid "Specify name of Italian Kernal ROM image"
 msgstr "Name f\xFCr italienische Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:118 src/translate.c.po.c:714
+#: src/c128/c128-cmdline-options.c:118
 msgid "Specify name of Norwegain Kernal ROM image"
 msgstr "Name f\xFCr norwegische Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:120 src/translate.c.po.c:724
+#: src/c128/c128-cmdline-options.c:120 src/translate.c.po.c:744
 msgid "Specify name of Swedish Kernal ROM image"
 msgstr "Name f\xFCr schwedische Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:122 src/translate.c.po.c:734
+#: src/c128/c128-cmdline-options.c:122 src/translate.c.po.c:754
 msgid "Specify name of BASIC ROM image (lower part)"
 msgstr "Namen f\xFCr Basic ROM Datei spezifizieren (unterer Teil)"
 
-#: src/c128/c128-cmdline-options.c:124 src/translate.c.po.c:744
+#: src/c128/c128-cmdline-options.c:124 src/translate.c.po.c:764
 msgid "Specify name of BASIC ROM image (higher part)"
 msgstr "Namen f\xFCr Basic ROM Datei spezifizieren (oberer Teil)"
 
-#: src/c128/c128-cmdline-options.c:126 src/translate.c.po.c:754
+#: src/c128/c128-cmdline-options.c:126 src/translate.c.po.c:774
 msgid "Specify name of international character generator ROM image"
 msgstr "Name f\xFCr internationale Charakter ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:128 src/translate.c.po.c:764
+#: src/c128/c128-cmdline-options.c:128 src/translate.c.po.c:784
 msgid "Specify name of German character generator ROM image"
 msgstr "Name f\xFCr deutsche Charakter ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:130 src/translate.c.po.c:774
+#: src/c128/c128-cmdline-options.c:130 src/translate.c.po.c:794
 msgid "Specify name of French character generator ROM image"
 msgstr "Name f\xFCr franz\xF6sische Charakter ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:132 src/translate.c.po.c:784
+#: src/c128/c128-cmdline-options.c:132 src/translate.c.po.c:804
 msgid "Specify name of Swedish character generator ROM image"
 msgstr "Name f\xFCr schwedische Charakter ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:134 src/translate.c.po.c:794
+#: src/c128/c128-cmdline-options.c:134 src/translate.c.po.c:814
 msgid "Specify name of C64 mode Kernal ROM image"
 msgstr "Name f\xFCr C64 Modus Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:136 src/translate.c.po.c:804
+#: src/c128/c128-cmdline-options.c:136 src/translate.c.po.c:824
 msgid "Specify name of C64 mode BASIC ROM image"
 msgstr "Name f\xFCr C64 Modus Basic ROM Datei spezifizieren"
 
 #: src/c128/c128-cmdline-options.c:138 src/c64/c64-cmdline-options.c:97
 #: src/cbm2/cbm2-cmdline-options.c:171 src/pet/pet-cmdline-options.c:156
-#: src/vic20/vic20-cmdline-options.c:217 src/translate.c.po.c:814
+#: src/vic20/vic20-cmdline-options.c:217 src/translate.c.po.c:834
 msgid "Enable emulator identification"
 msgstr "Emulator Identifikation aktivieren"
 
 #: src/c128/c128-cmdline-options.c:140 src/c64/c64-cmdline-options.c:99
 #: src/cbm2/cbm2-cmdline-options.c:173 src/pet/pet-cmdline-options.c:158
-#: src/vic20/vic20-cmdline-options.c:219 src/translate.c.po.c:824
+#: src/vic20/vic20-cmdline-options.c:219 src/translate.c.po.c:844
 msgid "Disable emulator identification"
 msgstr "Emulator Identifikation deaktivieren"
 
-#: src/c128/c128-cmdline-options.c:142 src/translate.c.po.c:834
+#: src/c128/c128-cmdline-options.c:142 src/translate.c.po.c:854
 msgid "Enable the IEEE488 interface emulation"
 msgstr "IEEE488 Schnittstellen-Emulation aktivieren"
 
-#: src/c128/c128-cmdline-options.c:144 src/translate.c.po.c:844
+#: src/c128/c128-cmdline-options.c:144 src/translate.c.po.c:864
 msgid "Disable the IEEE488 interface emulation"
 msgstr "IEEE488 Schnittstellen-Emulation deaktivieren"
 
 #: src/c128/c128-cmdline-options.c:146 src/c64/c64-cmdline-options.c:101
-#: src/translate.c.po.c:854
+#: src/translate.c.po.c:874
 msgid "<revision>"
 msgstr "<Revision>"
 
 #: src/c128/c128-cmdline-options.c:146 src/c64/c64-cmdline-options.c:101
-#: src/translate.c.po.c:864
+#: src/translate.c.po.c:884
 msgid "Patch the Kernal ROM to the specified <revision>"
 msgstr "Kernal ROM auf spezifizierte <Revision> ver\xE4ndern"
 
 #: src/c128/c128-cmdline-options.c:149 src/c64/c64-cmdline-options.c:104
-#: src/translate.c.po.c:875
+#: src/translate.c.po.c:895
 msgid "Enable the $DE** ACIA RS232 interface emulation"
 msgstr "ACIA $DExx RS232 Schnittstellen-Emulation aktivieren"
 
@@ -627,226 +635,226 @@
 #: src/c64/psid.c:164 src/cbm2/cbm2-cmdline-options.c:176
 #: src/pet/pet-cmdline-options.c:161 src/plus4/plus4-cmdline-options.c:102
 #: src/vdc/vdc-cmdline-options.c:68 src/vic20/vic20-cmdline-options.c:226
-#: src/arch/win32/res.rc.po.c:5211 src/translate.c.po.c:896
+#: src/arch/win32/res.rc.po.c:5211 src/translate.c.po.c:916
 msgid "<number>"
 msgstr "<Nummer>"
 
 #: src/c128/c128-cmdline-options.c:155 src/plus4/plus4-cmdline-options.c:102
-#: src/vic20/vic20-cmdline-options.c:226 src/translate.c.po.c:907
+#: src/vic20/vic20-cmdline-options.c:226 src/translate.c.po.c:927
 msgid "Specify index of keymap file (0=symbol, 1=positional)"
 msgstr "Index f\xFCr Kymap Datei festlegen (0=symbol, 1=positional)"
 
 #: src/c128/c128-cmdline-options.c:157 src/c64/c64-cmdline-options.c:112
 #: src/plus4/plus4-cmdline-options.c:104 src/vic20/vic20-cmdline-options.c:228
-#: src/translate.c.po.c:917
+#: src/translate.c.po.c:937
 msgid "Specify name of symbolic keymap file"
 msgstr "Bitte Namen f\xFCr symbolische Keymap Datei definieren"
 
 #: src/c128/c128-cmdline-options.c:159 src/c64/c64-cmdline-options.c:116
 #: src/plus4/plus4-cmdline-options.c:106 src/vic20/vic20-cmdline-options.c:230
-#: src/translate.c.po.c:927
+#: src/translate.c.po.c:947
 msgid "Specify name of positional keymap file"
 msgstr "Bitte Namen f\xFCr positions Keymap Datei definieren"
 
-#: src/c128/c128mmu.c:125 src/translate.c.po.c:938
+#: src/c128/c128mmu.c:125 src/translate.c.po.c:958
 msgid "Activate 40 column mode"
 msgstr "40 Spalten Modus aktivieren"
 
-#: src/c128/c128mmu.c:128 src/translate.c.po.c:948
+#: src/c128/c128mmu.c:128 src/translate.c.po.c:968
 msgid "Activate 80 column mode"
 msgstr "80 Spalten Modus aktivieren"
 
-#: src/c128/c128mmu.c:131 src/translate.c.po.c:958
+#: src/c128/c128mmu.c:131 src/translate.c.po.c:978
 msgid "Always switch to C64 mode on reset"
 msgstr "Immer bei Reset in C64 Modus schalten"
 
-#: src/c128/c128mmu.c:134 src/translate.c.po.c:968
+#: src/c128/c128mmu.c:134 src/translate.c.po.c:988
 msgid "Always switch to C128 mode on reset"
 msgstr "Immer be Reset in C128 Modus schalten"
 
-#: src/c128/functionrom.c:151 src/translate.c.po.c:978
+#: src/c128/functionrom.c:151 src/translate.c.po.c:998
 msgid "Specify name of internal Function ROM image"
 msgstr "Name der internen Funktions ROM Datei definieren"
 
-#: src/c128/functionrom.c:153 src/translate.c.po.c:988
+#: src/c128/functionrom.c:153 src/translate.c.po.c:1008
 msgid "Specify name of external Function ROM image"
 msgstr "Name der externen Funktions ROM Datei definieren"
 
-#: src/c128/functionrom.c:155 src/translate.c.po.c:998
+#: src/c128/functionrom.c:155 src/translate.c.po.c:1018
 msgid "Enable the internal Function ROM"
 msgstr "Internes Funktions ROM aktivieren"
 
-#: src/c128/functionrom.c:157 src/translate.c.po.c:1008
+#: src/c128/functionrom.c:157 src/translate.c.po.c:1028
 msgid "Disable the internal Function ROM"
 msgstr "Internes Funktions ROM deaktivieren"
 
-#: src/c128/functionrom.c:159 src/translate.c.po.c:1018
+#: src/c128/functionrom.c:159 src/translate.c.po.c:1038
 msgid "Enable the external Function ROM"
 msgstr "Externes Funktions ROM aktivieren"
 
-#: src/c128/functionrom.c:161 src/translate.c.po.c:1028
+#: src/c128/functionrom.c:161 src/translate.c.po.c:1048
 msgid "Disable the external Function ROM"
 msgstr "Externes Funktions ROM deaktivieren"
 
 #: src/c64/c64-cmdline-options.c:89 src/c64/psid.c:158
-#: src/translate.c.po.c:1038
+#: src/translate.c.po.c:1058
 msgid "Use old NTSC sync factor"
 msgstr "Alten NTSC Sync Faktor verwenden"
 
 #: src/c64/c64-cmdline-options.c:91 src/cbm2/cbm2-cmdline-options.c:132
 #: src/pet/pet-cmdline-options.c:116 src/plus4/plus4-cmdline-options.c:83
-#: src/vic20/vic20-cmdline-options.c:209 src/translate.c.po.c:1048
+#: src/vic20/vic20-cmdline-options.c:209 src/translate.c.po.c:1068
 msgid "Specify name of Kernal ROM image"
 msgstr "Name von Kernal ROM Datei definieren"
 
 #: src/c64/c64-cmdline-options.c:93 src/cbm2/cbm2-cmdline-options.c:134
 #: src/pet/pet-cmdline-options.c:118 src/plus4/plus4-cmdline-options.c:85
-#: src/vic20/vic20-cmdline-options.c:211 src/translate.c.po.c:1058
+#: src/vic20/vic20-cmdline-options.c:211 src/translate.c.po.c:1078
 msgid "Specify name of BASIC ROM image"
 msgstr "Name von Basic ROM Datei definieren"
 
 #: src/c64/c64-cmdline-options.c:95 src/cbm2/cbm2-cmdline-options.c:136
 #: src/pet/pet-cmdline-options.c:122 src/vic20/vic20-cmdline-options.c:213
-#: src/translate.c.po.c:1068
+#: src/translate.c.po.c:1088
 msgid "Specify name of character generator ROM image"
 msgstr "Name von Druckerausgabe Datei definieren (print.dump)"
 
-#: src/c64/c64-cmdline-options.c:106 src/translate.c.po.c:885
+#: src/c64/c64-cmdline-options.c:106 src/translate.c.po.c:905
 msgid "Disable the $DE** ACIA RS232 interface emulation"
 msgstr "ACIA $DExx RS232 Schnittstellen-Emulation deaktivieren"
 
-#: src/c64/c64-cmdline-options.c:110 src/translate.c.po.c:1079
+#: src/c64/c64-cmdline-options.c:110 src/translate.c.po.c:1099
 msgid "Specify index of keymap file (0=sym, 1=symDE, 2=pos)"
 msgstr "Index f\xFCr Keymap Datei festlegen (0=symbol, 1=symDE, 2=positional)"
 
-#: src/c64/c64-cmdline-options.c:114 src/translate.c.po.c:1089
+#: src/c64/c64-cmdline-options.c:114 src/translate.c.po.c:1109
 msgid "Specify name of symbolic German keymap file"
 msgstr "Name von symbolischer Keymap Datei definieren"
 
-#: src/c64/cart/c64cart.c:240 src/translate.c.po.c:1422
+#: src/c64/cart/c64cart.c:240 src/translate.c.po.c:1442
 msgid "Reset machine if a cartridge is attached or detached"
 msgstr ""
 "Reset der Maschine wenn ein Erweiterungsmodul eingelegt oder entfernt wird"
 
-#: src/c64/cart/c64cart.c:243 src/translate.c.po.c:1432
+#: src/c64/cart/c64cart.c:243 src/translate.c.po.c:1452
 msgid "Do not reset machine if a cartridge is attached or detached"
 msgstr ""
 "Kein Reset der Maschine wenn ein Erweiterungsmodul eingelegt oder entfernt "
 "wird"
 
 #: src/c64/cart/c64cart.c:246 src/arch/win32/res.rc.po.c:5138
-#: src/translate.c.po.c:1442 src/arch/amigaos/intl.c.po.c:2360
+#: src/translate.c.po.c:1462 src/arch/amigaos/intl.c.po.c:2387
 msgid "Attach CRT cartridge image"
 msgstr "CRT Erweiterungsmodul Image einlegen"
 
-#: src/c64/cart/c64cart.c:249 src/translate.c.po.c:1452
+#: src/c64/cart/c64cart.c:249 src/translate.c.po.c:1472
 msgid "Attach generic 8KB cartridge image"
 msgstr "Generisches 8K Erweiterungsmodul Image einlegen"
 
-#: src/c64/cart/c64cart.c:252 src/translate.c.po.c:1462
+#: src/c64/cart/c64cart.c:252 src/translate.c.po.c:1482
 msgid "Attach generic 16KB cartridge image"
 msgstr "Generisches 16K Erweiterungsmodul Image einlegen"
 
-#: src/c64/cart/c64cart.c:255 src/translate.c.po.c:1502
+#: src/c64/cart/c64cart.c:255 src/translate.c.po.c:1522
 msgid "Attach raw 32KB Action Replay cartridge image"
 msgstr "32K Action Replay Image einlegen"
 
-#: src/c64/cart/c64cart.c:258 src/translate.c.po.c:1492
+#: src/c64/cart/c64cart.c:258 src/translate.c.po.c:1512
 msgid "Attach raw 16KB Action Replay III cartridge image"
 msgstr "16KB Action Replay Image III (raw) einlegen"
 
-#: src/c64/cart/c64cart.c:261
+#: src/c64/cart/c64cart.c:261 src/translate.c.po.c:1502
 #, fuzzy
-msgid "Attach raw 32KB Action Replay 4 cartridge image"
+msgid "Attach raw 32KB Action Replay IV cartridge image"
 msgstr "32K Action Replay Image einlegen"
 
-#: src/c64/cart/c64cart.c:264 src/translate.c.po.c:1512
+#: src/c64/cart/c64cart.c:264 src/translate.c.po.c:1532
 msgid "Attach raw 64KB Retro Replay cartridge image"
 msgstr "64K Retro Replay Image einlegen"
 
-#: src/c64/cart/c64cart.c:267 src/translate.c.po.c:1522
+#: src/c64/cart/c64cart.c:267 src/translate.c.po.c:1542
 msgid "Attach raw 64KB IDE64 cartridge image"
 msgstr "64KB IDE64 Image einlegen"
 
-#: src/c64/cart/c64cart.c:270 src/translate.c.po.c:1532
+#: src/c64/cart/c64cart.c:270 src/translate.c.po.c:1552
 msgid "Attach raw 32KB Atomic Power cartridge image"
 msgstr "32KB Atomic Power Image einlegen"
 
-#: src/c64/cart/c64cart.c:273 src/translate.c.po.c:1542
+#: src/c64/cart/c64cart.c:273 src/translate.c.po.c:1562
 msgid "Attach raw 8KB Epyx fastload cartridge image"
 msgstr "8KB Epyx Fastload Image einlegen"
 
-#: src/c64/cart/c64cart.c:276 src/translate.c.po.c:1552
+#: src/c64/cart/c64cart.c:276 src/translate.c.po.c:1572
 msgid "Attach raw 32KB Super Snapshot cartridge image"
 msgstr "32KB Super Snapshot (raw) Image einlegen"
 
-#: src/c64/cart/c64cart.c:279 src/translate.c.po.c:1562
+#: src/c64/cart/c64cart.c:279 src/translate.c.po.c:1582
 msgid "Attach raw 64KB Super Snapshot cartridge image"
 msgstr "64KB Super Snapshot (raw) Image einlegen"
 
-#: src/c64/cart/c64cart.c:282 src/translate.c.po.c:1572
+#: src/c64/cart/c64cart.c:282 src/translate.c.po.c:1592
 msgid "Attach CBM IEEE488 cartridge image"
 msgstr "CBM IEEE488 Erweiterungsmodul einlegen"
 
-#: src/c64/cart/c64cart.c:285 src/translate.c.po.c:1582
+#: src/c64/cart/c64cart.c:285 src/translate.c.po.c:1602
 msgid "Attach raw 16KB Westermann learning cartridge image"
 msgstr "16KB Westermann learning (raw) Image einlegen"
 
-#: src/c64/cart/c64cart.c:288 src/translate.c.po.c:4835
+#: src/c64/cart/c64cart.c:288 src/translate.c.po.c:4856
 msgid "Attach raw Structured Basic cartridge image"
 msgstr "Erweiterungsmodul Structured Basic (raw) Image einlegen"
 
-#: src/c64/cart/c64cart.c:291
+#: src/c64/cart/c64cart.c:291 src/translate.c.po.c:1492
 #, fuzzy
-msgid "Attach raw StarDOS image"
-msgstr "Band Image einlegen"
+msgid "Attach raw 16KB StarDOS cartridge image"
+msgstr "16KB Erweiterungsmodul (raw) Image einlegen"
 
-#: src/c64/cart/c64cart.c:294 src/translate.c.po.c:1592
+#: src/c64/cart/c64cart.c:294 src/translate.c.po.c:1612
 msgid "Enable expert cartridge"
 msgstr "Expert Cartridge aktivieren"
 
-#: src/c64/cart/ide64.c:281 src/translate.c.po.c:1602
+#: src/c64/cart/ide64.c:281 src/translate.c.po.c:1622
 msgid "Specify name of IDE64 image file"
 msgstr "Namen f\xFCr IDE64 Image Datei definieren"
 
-#: src/c64/cart/ide64.c:283 src/translate.c.po.c:1622
+#: src/c64/cart/ide64.c:283 src/translate.c.po.c:1642
 msgid "Set number of cylinders for the IDE64 emulation"
 msgstr "Anzahl der Zylinder f\xFCr IDE64 Emulation"
 
-#: src/c64/cart/ide64.c:285 src/translate.c.po.c:1632
+#: src/c64/cart/ide64.c:285 src/translate.c.po.c:1652
 msgid "Set number of heads for the IDE64 emulation"
 msgstr "Anzahl der Laufwerksk\xF6pfe f\xFCr IDE64 Emulation"
 
-#: src/c64/cart/ide64.c:287 src/translate.c.po.c:1642
+#: src/c64/cart/ide64.c:287 src/translate.c.po.c:1662
 msgid "Set number of sectors for the IDE64 emulation"
 msgstr "Anzahl der Sektoren f\xFCr IDE64 Emulation"
 
-#: src/c64/cart/ide64.c:290 src/translate.c.po.c:1652
+#: src/c64/cart/ide64.c:290 src/translate.c.po.c:1672
 msgid "Autodetect geometry of formatted images"
 msgstr "Geometrie von formatierten Image Dateien automatisch erkennen"
 
-#: src/c64/cart/ide64.c:293 src/translate.c.po.c:1662
+#: src/c64/cart/ide64.c:293 src/translate.c.po.c:1682
 msgid "Do not autodetect geometry of formatted images"
 msgstr "Geometrie von formatierten Image Dateien nicht automatisch erkennen"
 
-#: src/c64/c64_256k.c:206 src/translate.c.po.c:4795
+#: src/c64/c64_256k.c:206 src/translate.c.po.c:4816
 msgid "Enable the 256K RAM expansion"
 msgstr "256K RAM Erweiterung aktivieren"
 
-#: src/c64/c64_256k.c:208 src/translate.c.po.c:4805
+#: src/c64/c64_256k.c:208 src/translate.c.po.c:4826
 msgid "Disable the 256K RAM expansion"
 msgstr "256K RAM Erweiterung deaktivieren"
 
-#: src/c64/c64_256k.c:210 src/translate.c.po.c:4815
+#: src/c64/c64_256k.c:210 src/translate.c.po.c:4836
 msgid "Specify name of 256K image"
 msgstr "Name der 256K Image Datei definieren"
 
 #: src/c64/c64_256k.c:212 src/c64/digimax.c:141 src/c64/plus60k.c:251
-#: src/sid/sid-cmdline-options.c:221 src/translate.c.po.c:3436
+#: src/sid/sid-cmdline-options.c:221 src/translate.c.po.c:3456
 msgid "<base address>"
 msgstr "<Basis Adresse>"
 
-#: src/c64/c64_256k.c:212 src/translate.c.po.c:4825
+#: src/c64/c64_256k.c:212 src/translate.c.po.c:4846
 msgid "Base address of the 256K expansion"
 msgstr "Basis Adresse f\xFCr 256K RAM Erweiterung"
 
@@ -858,469 +866,469 @@
 "Digimax kann mit ReSID nicht benutzt werden\n"
 "Bitte SID Engine auf FastSID setzen"
 
-#: src/c64/digimax.c:137 src/translate.c.po.c:4885
+#: src/c64/digimax.c:137 src/translate.c.po.c:4906
 msgid "Enable the digimax cartridge"
 msgstr "Digimax Cartridge aktivieren"
 
-#: src/c64/digimax.c:139 src/translate.c.po.c:4895
+#: src/c64/digimax.c:139 src/translate.c.po.c:4916
 msgid "Disable the digimax cartridge"
 msgstr "Digimax Cartridge deaktivieren"
 
-#: src/c64/digimax.c:141 src/translate.c.po.c:4905
+#: src/c64/digimax.c:141 src/translate.c.po.c:4926
 msgid "Base address of the digimax cartridge"
 msgstr "Basis Adresse f\xFCr Digimax Erweiterung"
 
-#: src/c64/georam.c:205 src/translate.c.po.c:1100
+#: src/c64/georam.c:256 src/translate.c.po.c:1120
 msgid "Enable the GEORAM expansion unit"
 msgstr "GEORAM Erweiterung aktivieren"
 
-#: src/c64/georam.c:207 src/translate.c.po.c:1110
+#: src/c64/georam.c:258 src/translate.c.po.c:1130
 msgid "Disable the GEORAM expansion unit"
 msgstr "GEORAM Erweiterung deaktivieren"
 
-#: src/c64/georam.c:209 src/translate.c.po.c:1120
+#: src/c64/georam.c:260 src/translate.c.po.c:1140
 msgid "Specify name of GEORAM image"
 msgstr "GEORAM Image Datei definieren"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
-#: src/pet/petreu.c:216 src/translate.c.po.c:1130
+#: src/c64/georam.c:262 src/c64/ramcart.c:286 src/c64/reu.c:481
+#: src/pet/petreu.c:216 src/translate.c.po.c:1150
 msgid "<size in KB>"
 msgstr "<Gr\xF6\xDFe in KB>"
 
-#: src/c64/georam.c:211 src/translate.c.po.c:1140
+#: src/c64/georam.c:262 src/translate.c.po.c:1160
 msgid "Size of the GEORAM expansion unit"
 msgstr "Gr\xF6\xDFe der GEORAM Erweiterung"
 
-#: src/c64/mmc64.c:903 src/translate.c.po.c:1260
+#: src/c64/mmc64.c:903 src/translate.c.po.c:1280
 msgid "Enable the MMC64 expansion"
 msgstr "MMC64 Erweiterung aktivieren"
 
-#: src/c64/mmc64.c:905 src/translate.c.po.c:1270
+#: src/c64/mmc64.c:905 src/translate.c.po.c:1290
 msgid "Disable the MMC64 expansion"
 msgstr "MMC64 Erweiterung deaktivieren"
 
-#: src/c64/mmc64.c:907 src/translate.c.po.c:1280
+#: src/c64/mmc64.c:907 src/translate.c.po.c:1300
 msgid "Specify name of MMC64 BIOS image"
 msgstr "Name f\xFCr MMC64 BIOS Datei spezifizieren"
 
-#: src/c64/mmc64.c:909 src/translate.c.po.c:1290
+#: src/c64/mmc64.c:909 src/translate.c.po.c:1310
 msgid "Specify name of MMC64 image"
 msgstr "Name der MMC64 Image Datei definieren"
 
-#: src/c64/mmc64.c:911 src/translate.c.po.c:1300
+#: src/c64/mmc64.c:911 src/translate.c.po.c:1320
 msgid "Set the MMC64 card to read-only"
 msgstr "MMC64 Karte Schreibschutz"
 
-#: src/c64/mmc64.c:913 src/translate.c.po.c:1310
+#: src/c64/mmc64.c:913 src/translate.c.po.c:1330
 msgid "Set the MMC64 card to read/write"
 msgstr "MMC64 Karte Schreibzugriff"
 
-#: src/c64/mmc64.c:915 src/translate.c.po.c:1320
+#: src/c64/mmc64.c:915 src/translate.c.po.c:1340
 msgid "Save the MMC64 bios when changed"
 msgstr "MMC64 BIOS speichern bei \xC4nderung"
 
-#: src/c64/plus256k.c:171 src/translate.c.po.c:4725
+#: src/c64/plus256k.c:171 src/translate.c.po.c:4746
 msgid "Enable the PLUS256K RAM expansion"
 msgstr "PLUS256K RAM Erweiterung aktivieren"
 
-#: src/c64/plus256k.c:173 src/translate.c.po.c:4735
+#: src/c64/plus256k.c:173 src/translate.c.po.c:4756
 msgid "Disable the PLUS256K RAM expansion"
 msgstr "PLUS256K RAM Erweiterung deaktivieren"
 
-#: src/c64/plus256k.c:175 src/translate.c.po.c:4745
+#: src/c64/plus256k.c:175 src/translate.c.po.c:4766
 msgid "Specify name of PLUS256K image"
 msgstr "Name der PLUS256K Image Datei definieren"
 
-#: src/c64/plus60k.c:245 src/translate.c.po.c:4755
+#: src/c64/plus60k.c:245 src/translate.c.po.c:4776
 msgid "Enable the PLUS60K RAM expansion"
 msgstr "PLUS60K RAM Erweiterung aktivieren"
 
-#: src/c64/plus60k.c:247 src/translate.c.po.c:4765
+#: src/c64/plus60k.c:247 src/translate.c.po.c:4786
 msgid "Disable the PLUS60K RAM expansion"
 msgstr "PLUS60K RAM Erweiterung deaktivieren"
 
-#: src/c64/plus60k.c:249 src/translate.c.po.c:4775
+#: src/c64/plus60k.c:249 src/translate.c.po.c:4796
 msgid "Specify name of PLUS60K image"
 msgstr "Name der PLUS60K Image Datei definieren"
 
-#: src/c64/plus60k.c:251 src/translate.c.po.c:4785
+#: src/c64/plus60k.c:251 src/translate.c.po.c:4806
 msgid "Base address of the PLUS60K expansion"
 msgstr "Basis Adresse f\xFCr PLUS60K Erweiterung"
 
-#: src/c64/psid.c:160 src/translate.c.po.c:1190
+#: src/c64/psid.c:160 src/translate.c.po.c:1210
 msgid "SID player mode"
 msgstr "SID Player Modus"
 
-#: src/c64/psid.c:162 src/translate.c.po.c:1200
+#: src/c64/psid.c:162 src/translate.c.po.c:1220
 msgid "Override PSID settings for Video standard and SID model"
 msgstr "PSID Einstellung f\xFCr Video Standard und SID Modell ver\xE4ndern"
 
-#: src/c64/psid.c:164 src/translate.c.po.c:1210
+#: src/c64/psid.c:164 src/translate.c.po.c:1230
 msgid "Specify PSID tune <number>"
 msgstr "PSID St\xFCck <Nummer> definieren"
 
-#: src/c64/ramcart.c:235 src/translate.c.po.c:1220
+#: src/c64/ramcart.c:280 src/translate.c.po.c:1240
 msgid "Enable the RAMCART expansion"
 msgstr "RAMCART Erweiterung aktivieren"
 
-#: src/c64/ramcart.c:237 src/translate.c.po.c:1230
+#: src/c64/ramcart.c:282 src/translate.c.po.c:1250
 msgid "Disable the RAMCART expansion"
 msgstr "RAMCART Erweiterung deaktivieren"
 
-#: src/c64/ramcart.c:239 src/translate.c.po.c:1240
+#: src/c64/ramcart.c:284 src/translate.c.po.c:1260
 msgid "Specify name of RAMCART image"
 msgstr "Name f\xFCr RAMCART Image Datei definieren"
 
-#: src/c64/ramcart.c:241 src/translate.c.po.c:1250
+#: src/c64/ramcart.c:286 src/translate.c.po.c:1270
 msgid "Size of the RAMCART expansion"
 msgstr "Gr\xF6\xDFe der RAMCART Erweiterung"
 
-#: src/c64/reu.c:442 src/translate.c.po.c:1330
+#: src/c64/reu.c:475 src/translate.c.po.c:1350
 msgid "Enable the RAM expansion unit"
 msgstr "RAM Speichererweiterung aktivieren"
 
-#: src/c64/reu.c:444 src/translate.c.po.c:1340
+#: src/c64/reu.c:477 src/translate.c.po.c:1360
 msgid "Disable the RAM expansion unit"
 msgstr "RAM Speichererweiterung deaktivieren"
 
-#: src/c64/reu.c:446 src/translate.c.po.c:1350
+#: src/c64/reu.c:479 src/translate.c.po.c:1370
 msgid "Specify name of REU image"
 msgstr "Namen f\xFCr REU Image Datei definieren"
 
-#: src/c64/reu.c:448 src/translate.c.po.c:1360
+#: src/c64/reu.c:481 src/translate.c.po.c:1380
 msgid "Size of the RAM expansion unit"
 msgstr "Gr\xF6\xDFe der RAM Speichererweiterung"
 
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1371
+#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
 msgid "Enable the TFE (\"The Final Ethernet\") unit"
 msgstr "TFE (\"the final ethernet\") Erweiterung aktivitieren"
 
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1381
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
 msgid "Disable the TFE (\"The Final Ethernet\") unit"
 msgstr "TFE (\"the final ethernet\") Erweiterung deaktivitieren"
 
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
 msgid "Set the system ethernet interface for TFE emulation"
 msgstr "Setze die System Ethernet Schnittstelle f\xFCr die TFE Emulation"
 
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
 msgid "Enable RRNet mode of TFE emulation"
 msgstr "RRNet Modus der TFE Emulation aktivieren"
 
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
 msgid "Disable RRNet mode of TFE emulation"
 msgstr "RRNet Modus der TFE Emulation deaktivieren"
 
 #: src/cbm2/cbm2-cmdline-options.c:121 src/pet/pet-cmdline-options.c:114
-#: src/translate.c.po.c:1672
+#: src/translate.c.po.c:1692
 msgid "<modelnumber>"
 msgstr "<Modell Nummer>"
 
-#: src/cbm2/cbm2-cmdline-options.c:121 src/translate.c.po.c:1682
+#: src/cbm2/cbm2-cmdline-options.c:121 src/translate.c.po.c:1702
 msgid "Specify CBM-II model to emulate"
 msgstr "CBM-II Modell f\xFCr Emulation definieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:123 src/translate.c.po.c:1692
+#: src/cbm2/cbm2-cmdline-options.c:123 src/translate.c.po.c:1712
 msgid "Specify to use VIC-II"
 msgstr "VIC-II Unterst\xFCtzung aktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:125 src/translate.c.po.c:1702
+#: src/cbm2/cbm2-cmdline-options.c:125 src/translate.c.po.c:1722
 msgid "Specify to use CRTC"
 msgstr "CRTC Unterst\xFCtzung aktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:127 src/translate.c.po.c:1712
+#: src/cbm2/cbm2-cmdline-options.c:127 src/translate.c.po.c:1732
 msgid "<linenumber>"
 msgstr "<Zeilennummer>"
 
-#: src/cbm2/cbm2-cmdline-options.c:127 src/translate.c.po.c:1722
+#: src/cbm2/cbm2-cmdline-options.c:127 src/translate.c.po.c:1742
 msgid "Specify CBM-II model hardware (0=6x0, 1=7x0)"
 msgstr "CBM-II Hardware Modell definieren (0=6x0, 1=7x0)"
 
 #: src/cbm2/cbm2-cmdline-options.c:129 src/plus4/plus4-cmdline-options.c:99
-#: src/translate.c.po.c:1732
+#: src/translate.c.po.c:1752
 msgid "<ramsize>"
 msgstr "<RAM Gr\xF6\xDFe>"
 
-#: src/cbm2/cbm2-cmdline-options.c:129 src/translate.c.po.c:1742
+#: src/cbm2/cbm2-cmdline-options.c:129 src/translate.c.po.c:1762
 msgid "Specify size of RAM (64/128/256/512/1024 kByte)"
 msgstr "RAM Gr\xF6\xDFe definieren (64/128/256/512/1024 kByte)"
 
-#: src/cbm2/cbm2-cmdline-options.c:139 src/translate.c.po.c:1752
+#: src/cbm2/cbm2-cmdline-options.c:139 src/translate.c.po.c:1772
 msgid "Specify name of cartridge ROM image for $1000"
 msgstr "Name f\xFCr ROM Module Image Datei ($1000)"
 
-#: src/cbm2/cbm2-cmdline-options.c:141 src/translate.c.po.c:1762
+#: src/cbm2/cbm2-cmdline-options.c:141 src/translate.c.po.c:1782
 msgid "Specify name of cartridge ROM image for $2000-$3fff"
 msgstr "Name f\xFCr ROM Module Image Datei ($2000-3fff)"
 
-#: src/cbm2/cbm2-cmdline-options.c:143 src/translate.c.po.c:1772
+#: src/cbm2/cbm2-cmdline-options.c:143 src/translate.c.po.c:1792
 msgid "Specify name of cartridge ROM image for $4000-$5fff"
 msgstr "Name f\xFCr ROM Module Image Datei ($4000-5fff)"
 
-#: src/cbm2/cbm2-cmdline-options.c:145 src/translate.c.po.c:1782
+#: src/cbm2/cbm2-cmdline-options.c:145 src/translate.c.po.c:1802
 msgid "Specify name of cartridge ROM image for $6000-$7fff"
 msgstr "Name f\xFCr ROM Module Image Datei ($6000-7fff)"
 
-#: src/cbm2/cbm2-cmdline-options.c:147 src/translate.c.po.c:1792
+#: src/cbm2/cbm2-cmdline-options.c:147 src/translate.c.po.c:1812
 msgid "Enable RAM mapping in $0800-$0FFF"
 msgstr "RAM Zuordnung in $0800-$0FFF aktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:149 src/translate.c.po.c:1802
+#: src/cbm2/cbm2-cmdline-options.c:149 src/translate.c.po.c:1822
 msgid "Disable RAM mapping in $0800-$0FFF"
 msgstr "RAM Zuordnung in $0800-$0FFF deaktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:151 src/translate.c.po.c:1812
+#: src/cbm2/cbm2-cmdline-options.c:151 src/translate.c.po.c:1832
 msgid "Enable RAM mapping in $1000-$1FFF"
 msgstr "RAM Zuordnung in $1000-$1FFF aktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:153 src/translate.c.po.c:1822
+#: src/cbm2/cbm2-cmdline-options.c:153 src/translate.c.po.c:1842
 msgid "Disable RAM mapping in $1000-$1FFF"
 msgstr "RAM Zuordnung in $1000-$1FFF deaktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:155 src/translate.c.po.c:1832
+#: src/cbm2/cbm2-cmdline-options.c:155 src/translate.c.po.c:1852
 msgid "Enable RAM mapping in $2000-$3FFF"
 msgstr "RAM Zuordnung in $2000-3FFF aktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:157 src/translate.c.po.c:1842
+#: src/cbm2/cbm2-cmdline-options.c:157 src/translate.c.po.c:1862
 msgid "Disable RAM mapping in $2000-$3FFF"
 msgstr "RAM Zuordnung in $2000-$3FFF deaktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:159 src/translate.c.po.c:1852
+#: src/cbm2/cbm2-cmdline-options.c:159 src/translate.c.po.c:1872
 msgid "Enable RAM mapping in $4000-$5FFF"
 msgstr "RAM Zuordnung in $4000-$5FFF aktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:161 src/translate.c.po.c:1862
+#: src/cbm2/cbm2-cmdline-options.c:161 src/translate.c.po.c:1882
 msgid "Disable RAM mapping in $4000-$5FFF"
 msgstr "RAM Zuordnung in $4000-$5FFF deaktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:163 src/translate.c.po.c:1872
+#: src/cbm2/cbm2-cmdline-options.c:163 src/translate.c.po.c:1892
 msgid "Enable RAM mapping in $6000-$7FFF"
 msgstr "RAM Zuordnung in $6000-$7FFF aktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:165 src/translate.c.po.c:1882
+#: src/cbm2/cbm2-cmdline-options.c:165 src/translate.c.po.c:1902
 msgid "Disable RAM mapping in $6000-$7FFF"
 msgstr "RAM Zuordnung in $6000-$7FFF deaktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:167 src/translate.c.po.c:1892
+#: src/cbm2/cbm2-cmdline-options.c:167 src/translate.c.po.c:1912
 msgid "Enable RAM mapping in $C000-$CFFF"
 msgstr "RAM Zuordnung in $C000-$CFFF aktivieren"
 
-#: src/cbm2/cbm2-cmdline-options.c:169 src/translate.c.po.c:1902
+#: src/cbm2/cbm2-cmdline-options.c:169 src/translate.c.po.c:1922
 msgid "Disable RAM mapping in $C000-$CFFF"
 msgstr "RAM Zuordnung in $C000-$CFFF deaktivieren"
 
 #: src/cbm2/cbm2-cmdline-options.c:176 src/pet/pet-cmdline-options.c:161
-#: src/translate.c.po.c:1913
+#: src/translate.c.po.c:1933
 msgid "Specify index of keymap file"
 msgstr "Index der Keymap Datei definieren"
 
 #: src/cbm2/cbm2-cmdline-options.c:179 src/pet/pet-cmdline-options.c:164
-#: src/translate.c.po.c:1923
+#: src/translate.c.po.c:1943
 msgid "Specify name of graphics keyboard symbolic keymap file"
 msgstr "Keymap Datei f\xFCr graphics keyboard symbolic definieren"
 
 #: src/cbm2/cbm2-cmdline-options.c:182 src/pet/pet-cmdline-options.c:167
-#: src/translate.c.po.c:1933
+#: src/translate.c.po.c:1953
 msgid "Specify name of graphics keyboard positional keymap file"
 msgstr "Keymap Datei f\xFCr graphics keyboard positional definieren"
 
 #: src/cbm2/cbm2-cmdline-options.c:185 src/pet/pet-cmdline-options.c:170
-#: src/translate.c.po.c:1943
+#: src/translate.c.po.c:1963
 msgid "Specify name of UK business keyboard symbolic keymap file"
 msgstr "Keymap Datei f\xFCr UK business keyboard symbolic definieren"
 
 #: src/cbm2/cbm2-cmdline-options.c:188 src/pet/pet-cmdline-options.c:173
-#: src/translate.c.po.c:1953
+#: src/translate.c.po.c:1973
 msgid "Specify name of UK business keyboard positional keymap file"
 msgstr "Keymap Datei f\xFCr UK business keyboard positional definieren"
 
 #: src/cbm2/cbm2-cmdline-options.c:191 src/pet/pet-cmdline-options.c:176
-#: src/translate.c.po.c:1963
+#: src/translate.c.po.c:1983
 msgid "Specify name of German business keyboard symbolic keymap file"
 msgstr "Keymap Datei f\xFCr German business keyboard symbolic definieren"
 
 #: src/cbm2/cbm2-cmdline-options.c:194 src/pet/pet-cmdline-options.c:179
-#: src/translate.c.po.c:1973
+#: src/translate.c.po.c:1993
 msgid "Specify name of German business keyboard positional keymap file"
 msgstr "Keymap Datei f\xFCr German business keyboard positional definieren"
 
-#: src/datasette.c:175 src/translate.c.po.c:4068
+#: src/datasette.c:175 src/translate.c.po.c:4088
 msgid "Enable automatic Datasette-Reset"
 msgstr "Automatisches Datasette-Reset aktivieren"
 
-#: src/datasette.c:178 src/translate.c.po.c:4078
+#: src/datasette.c:178 src/translate.c.po.c:4098
 msgid "Disable automatic Datasette-Reset"
 msgstr "Automatisches Datasette-Reset deaktivieren"
 
-#: src/datasette.c:181 src/translate.c.po.c:4088
+#: src/datasette.c:181 src/translate.c.po.c:4108
 msgid "Set delay in cycles for a zero in the tap"
 msgstr "Verz\xF6gerung f\xFCr Zero in Zyklen im Tap"
 
-#: src/datasette.c:184 src/translate.c.po.c:4098
+#: src/datasette.c:184 src/translate.c.po.c:4118
 msgid "Set number of cycles added to each gap in the tap"
 msgstr "Setze Anzahl der Zyklen f\xFCr jedes Loch im Tap"
 
-#: src/drive/drive-cmdline-options.c:51 src/translate.c.po.c:1984
+#: src/drive/drive-cmdline-options.c:51 src/translate.c.po.c:2004
 msgid "Enable hardware-level emulation of disk drives"
 msgstr "Hardware Emulation f\xFCr Disklaufwerke aktivieren"
 
-#: src/drive/drive-cmdline-options.c:53 src/translate.c.po.c:1994
+#: src/drive/drive-cmdline-options.c:53 src/translate.c.po.c:2014
 msgid "Disable hardware-level emulation of disk drives"
 msgstr "Hardware Emulation f\xFCr Disklaufwerke deaktivieren"
 
-#: src/drive/drive-cmdline-options.c:69 src/translate.c.po.c:2014
+#: src/drive/drive-cmdline-options.c:69 src/translate.c.po.c:2034
 msgid "Set drive type (0: no drive)"
 msgstr "Setze Laufwerkstyp (0: kein Laufwerk)"
 
 #: src/drive/drive-cmdline-options.c:70 src/drive/iec/iec-cmdline-options.c:96
-#: src/sid/sid-cmdline-options.c:183 src/translate.c.po.c:2024
+#: src/sid/sid-cmdline-options.c:183 src/translate.c.po.c:2044
 msgid "<method>"
 msgstr "<Methode>"
 
-#: src/drive/drive-cmdline-options.c:71 src/translate.c.po.c:2034
+#: src/drive/drive-cmdline-options.c:71 src/translate.c.po.c:2054
 msgid "Set drive 40 track extension policy (0: never, 1: ask, 2: on access)"
 msgstr "40 Spur Erweiterungsmethode (0: nie, 1: R\xFCckfrage, 2: bei Bedarf)"
 
-#: src/drive/iec/iec-cmdline-options.c:82 src/translate.c.po.c:2044
+#: src/drive/iec/iec-cmdline-options.c:82 src/translate.c.po.c:2064
 msgid "Specify name of 1541 DOS ROM image"
 msgstr "Name der 1541 DOS ROM Image Datei definieren"
 
-#: src/drive/iec/iec-cmdline-options.c:84 src/translate.c.po.c:2054
+#: src/drive/iec/iec-cmdline-options.c:84 src/translate.c.po.c:2074
 msgid "Specify name of 1541-II DOS ROM image"
 msgstr "Name der 1541-II DOS ROM Image Datei definieren"
 
-#: src/drive/iec/iec-cmdline-options.c:86 src/translate.c.po.c:2064
+#: src/drive/iec/iec-cmdline-options.c:86 src/translate.c.po.c:2084
 msgid "Specify name of 1570 DOS ROM image"
 msgstr "Name der 1570 DOS ROM Image Datei definieren"
 
-#: src/drive/iec/iec-cmdline-options.c:88 src/translate.c.po.c:2074
+#: src/drive/iec/iec-cmdline-options.c:88 src/translate.c.po.c:2094
 msgid "Specify name of 1571 DOS ROM image"
 msgstr "Name der 1571 DOS ROM Image Datei definieren"
 
-#: src/drive/iec/iec-cmdline-options.c:90 src/translate.c.po.c:2084
+#: src/drive/iec/iec-cmdline-options.c:90 src/translate.c.po.c:2104
 msgid "Specify name of 1581 DOS ROM image"
 msgstr "Name der 1581 DOS ROM Image Datei definieren"
 
-#: src/drive/iec/iec-cmdline-options.c:97 src/translate.c.po.c:2094
+#: src/drive/iec/iec-cmdline-options.c:97 src/translate.c.po.c:2114
 msgid "Set drive idling method (0: no traps, 1: skip cycles, 2: trap idle)"
 msgstr ""
 "Laufwerks idling Methode (0: kein Traps, 1: Zyklen verwerfen, 2: trap idle)"
 
-#: src/drive/iec/iec-cmdline-options.c:99 src/translate.c.po.c:2104
+#: src/drive/iec/iec-cmdline-options.c:99 src/translate.c.po.c:2124
 msgid "Enable 8KB RAM expansion at $2000-$3FFF"
 msgstr "8KB RAM Erweiterung bei $2000-3fff aktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:101 src/translate.c.po.c:2114
+#: src/drive/iec/iec-cmdline-options.c:101 src/translate.c.po.c:2134
 msgid "Disable 8KB RAM expansion at $2000-$3FFF"
 msgstr "8KB RAM Erweiterung bei $2000-3fff deaktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:103 src/translate.c.po.c:2124
+#: src/drive/iec/iec-cmdline-options.c:103 src/translate.c.po.c:2144
 msgid "Enable 8KB RAM expansion at $4000-$5FFF"
 msgstr "8KB RAM Erweiterung bei $4000-5fff aktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:105 src/translate.c.po.c:2134
+#: src/drive/iec/iec-cmdline-options.c:105 src/translate.c.po.c:2154
 msgid "Disable 8KB RAM expansion at $4000-$5FFF"
 msgstr "8KB RAM Erweiterung bei $4000-5fff deaktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:107 src/translate.c.po.c:2144
+#: src/drive/iec/iec-cmdline-options.c:107 src/translate.c.po.c:2164
 msgid "Enable 8KB RAM expansion at $6000-$7FFF"
 msgstr "8KB RAM Erweiterung bei $6000-7fff aktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:109 src/translate.c.po.c:2154
+#: src/drive/iec/iec-cmdline-options.c:109 src/translate.c.po.c:2174
 msgid "Disable 8KB RAM expansion at $6000-$7FFF"
 msgstr "8KB RAM Erweiterung bei $6000-7fff deaktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:111 src/translate.c.po.c:2164
+#: src/drive/iec/iec-cmdline-options.c:111 src/translate.c.po.c:2184
 msgid "Enable 8KB RAM expansion at $8000-$9FFF"
 msgstr "8KB RAM Erweiterung bei $8000-9fff aktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:113 src/translate.c.po.c:2174
+#: src/drive/iec/iec-cmdline-options.c:113 src/translate.c.po.c:2194
 msgid "Disable 8KB RAM expansion at $8000-$9FFF"
 msgstr "8KB RAM Erweiterung bei $8000-9fff deaktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:115 src/translate.c.po.c:2184
+#: src/drive/iec/iec-cmdline-options.c:115 src/translate.c.po.c:2204
 msgid "Enable 8KB RAM expansion at $A000-$BFFF"
 msgstr "8KB RAM Erweiterung bei $A000-Bfff aktivieren"
 
-#: src/drive/iec/iec-cmdline-options.c:117 src/translate.c.po.c:2194
+#: src/drive/iec/iec-cmdline-options.c:117 src/translate.c.po.c:2214
 msgid "Disable 8KB RAM expansion at $A000-$BFFF"
 msgstr "8KB RAM Erweiterung bei $A000-Bfff deaktivieren"
 
-#: src/drive/iec/c64exp/c64exp-cmdline-options.c:59 src/translate.c.po.c:2234
+#: src/drive/iec/c64exp/c64exp-cmdline-options.c:59 src/translate.c.po.c:2254
 msgid "Specify name of Professional DOS 1571 ROM image"
 msgstr "Name von Professional DOS 1571 Datei definieren"
 
-#: src/drive/iec/c64exp/c64exp-cmdline-options.c:66 src/translate.c.po.c:2204
+#: src/drive/iec/c64exp/c64exp-cmdline-options.c:66 src/translate.c.po.c:2224
 msgid "Set parallel cable type (0: none, 1: standard, 2: Dolphin DOS 3)"
 msgstr "Parallelkabel Typ (0: kein, 1: Standard, 2: Dolphin DOS 3)"
 
-#: src/drive/iec/c64exp/c64exp-cmdline-options.c:68 src/translate.c.po.c:2214
+#: src/drive/iec/c64exp/c64exp-cmdline-options.c:68 src/translate.c.po.c:2234
 msgid "Enable Professional DOS"
 msgstr "Professional DOS aktivieren"
 
-#: src/drive/iec/c64exp/c64exp-cmdline-options.c:70 src/translate.c.po.c:2224
+#: src/drive/iec/c64exp/c64exp-cmdline-options.c:70 src/translate.c.po.c:2244
 msgid "Disable Professional DOS"
 msgstr "Professional DOS deaktivieren"
 
 #: src/drive/iec/plus4exp/plus4exp-cmdline-options.c:50
-#: src/translate.c.po.c:2244
+#: src/translate.c.po.c:2264
 msgid "Set parallel cable type (0: none, 1: standard)"
 msgstr "Parallelkabel Typ (0: kein, 1: Standard)"
 
 #: src/drive/iec128dcr/iec128dcr-cmdline-options.c:45
-#: src/translate.c.po.c:2254
+#: src/translate.c.po.c:2274
 msgid "Specify name of 1571CR DOS ROM image"
 msgstr "Name der 1571CR DOS ROM Datei definieren"
 
-#: src/drive/ieee/ieee-cmdline-options.c:53 src/translate.c.po.c:2264
+#: src/drive/ieee/ieee-cmdline-options.c:53 src/translate.c.po.c:2284
 msgid "Specify name of 2031 DOS ROM image"
 msgstr "Name der 2031 DOS ROM Datei definieren"
 
-#: src/drive/ieee/ieee-cmdline-options.c:55 src/translate.c.po.c:2274
+#: src/drive/ieee/ieee-cmdline-options.c:55 src/translate.c.po.c:2294
 msgid "Specify name of 2040 DOS ROM image"
 msgstr "Name der 2040 DOS ROM Datei definieren"
 
-#: src/drive/ieee/ieee-cmdline-options.c:57 src/translate.c.po.c:2284
+#: src/drive/ieee/ieee-cmdline-options.c:57 src/translate.c.po.c:2304
 msgid "Specify name of 3040 DOS ROM image"
 msgstr "Name der 3040 DOS ROM Datei definieren"
 
-#: src/drive/ieee/ieee-cmdline-options.c:59 src/translate.c.po.c:2294
+#: src/drive/ieee/ieee-cmdline-options.c:59 src/translate.c.po.c:2314
 msgid "Specify name of 4040 DOS ROM image"
 msgstr "Name der 4040 DOS ROM Datei definieren"
 
-#: src/drive/ieee/ieee-cmdline-options.c:61 src/translate.c.po.c:2304
+#: src/drive/ieee/ieee-cmdline-options.c:61 src/translate.c.po.c:2324
 msgid "Specify name of 1001/8050/8250 DOS ROM image"
 msgstr "Name der 1001/8040/8205 DOS ROM Datei definieren"
 
-#: src/drive/tcbm/tcbm-cmdline-options.c:45 src/translate.c.po.c:2314
+#: src/drive/tcbm/tcbm-cmdline-options.c:45 src/translate.c.po.c:2334
 msgid "Specify name of 1551 DOS ROM image"
 msgstr "Name der 1551 DOS ROM Datei definieren"
 
-#: src/fliplist.c:121 src/translate.c.po.c:4254
+#: src/fliplist.c:121 src/translate.c.po.c:4274
 msgid "Specify name of the flip list file image"
 msgstr "Namen f\xFCr Fliplist Datei definieren"
 
-#: src/fsdevice/fsdevice-cmdline-options.c:76 src/translate.c.po.c:2324
+#: src/fsdevice/fsdevice-cmdline-options.c:76 src/translate.c.po.c:2344
 msgid "Use <name> as directory for file system device #8"
 msgstr "Benutze <Name> f\xFCr Verzeichnis beim Verzeichniszugriff f\xFCr Ger\xE4t #8"
 
-#: src/fsdevice/fsdevice-cmdline-options.c:78 src/translate.c.po.c:2334
+#: src/fsdevice/fsdevice-cmdline-options.c:78 src/translate.c.po.c:2354
 msgid "Use <name> as directory for file system device #9"
 msgstr "Benutze <Name> f\xFCr Verzeichnis beim Verzeichniszugriff f\xFCr Ger\xE4t #9"
 
-#: src/fsdevice/fsdevice-cmdline-options.c:80 src/translate.c.po.c:2344
+#: src/fsdevice/fsdevice-cmdline-options.c:80 src/translate.c.po.c:2364
 msgid "Use <name> as directory for file system device #10"
 msgstr "Benutze <Name> f\xFCr Verzeichnis beim Verzeichniszugriff f\xFCr Ger\xE4t #10"
 
-#: src/fsdevice/fsdevice-cmdline-options.c:82 src/translate.c.po.c:2354
+#: src/fsdevice/fsdevice-cmdline-options.c:82 src/translate.c.po.c:2374
 msgid "Use <name> as directory for file system device #11"
 msgstr "Benutze <Name> f\xFCr Verzeichnis beim Verzeichniszugriff f\xFCr Ger\xE4t #11"
 
-#: src/gfxoutputdrv/ffmpegdrv.c:201 src/translate.c.po.c:2365
+#: src/gfxoutputdrv/ffmpegdrv.c:201 src/translate.c.po.c:2385
 msgid "Set bitrate for audio stream in media file"
 msgstr "Bitrate f\xFCr Audio Stream f\xFCr Media Datei setzen"
 
-#: src/gfxoutputdrv/ffmpegdrv.c:204 src/translate.c.po.c:2375
+#: src/gfxoutputdrv/ffmpegdrv.c:204 src/translate.c.po.c:2395
 msgid "Set bitrate for video stream in media file"
 msgstr "Bitrate f\xFCr Video Stream f\xFCr Media Datei setzen"
 
@@ -1338,504 +1346,504 @@
 msgstr "ffmpegdrv: \xD6ffnen von %s fehlgeschlagen"
 
 #: src/initcmdline.c:155 src/initcmdline.c:157 src/initcmdline.c:159
-#: src/translate.c.po.c:4263
+#: src/translate.c.po.c:4284
 msgid "Show a list of the available options and exit normally"
 msgstr "Liste von verf\xFCgbaren Optionen zeigen und beenden"
 
-#: src/initcmdline.c:162 src/translate.c.po.c:4274
+#: src/initcmdline.c:162 src/translate.c.po.c:4295
 msgid "Console mode (for music playback)"
 msgstr "Konsolenmodus (f\xFCr Musikwiedergabe)"
 
-#: src/initcmdline.c:164 src/translate.c.po.c:4284
+#: src/initcmdline.c:164 src/translate.c.po.c:4305
 msgid "Allow production of core dumps"
 msgstr "Core Dumps erm\xF6glichen"
 
-#: src/initcmdline.c:166 src/translate.c.po.c:4294
+#: src/initcmdline.c:166 src/translate.c.po.c:4315
 msgid "Do not produce core dumps"
 msgstr "Core Dumps verhindern"
 
-#: src/initcmdline.c:169 src/translate.c.po.c:4304
+#: src/initcmdline.c:169 src/translate.c.po.c:4325
 msgid "Don't call exception handler"
 msgstr "Ausnahmebehandlung vermeiden"
 
-#: src/initcmdline.c:171 src/translate.c.po.c:4314
+#: src/initcmdline.c:171 src/translate.c.po.c:4335
 msgid "Call exception handler (default)"
 msgstr "Ausnahmebehandlung aktivieren (Default)"
 
-#: src/initcmdline.c:206 src/translate.c.po.c:4325
+#: src/initcmdline.c:206 src/translate.c.po.c:4346
 msgid "Restore default (factory) settings"
 msgstr "Wiederherstellen Standard Einstellungen"
 
-#: src/initcmdline.c:208 src/translate.c.po.c:4335
+#: src/initcmdline.c:208 src/translate.c.po.c:4356
 msgid "Attach and autostart tape/disk image <name>"
 msgstr "Einlegen und Autostart Disk/Band Image Datei <Name>"
 
-#: src/initcmdline.c:210 src/translate.c.po.c:4345
+#: src/initcmdline.c:210 src/translate.c.po.c:4366
 msgid "Attach and autoload tape/disk image <name>"
 msgstr "Einlegen und Autoload Disk/Band Image Datei <Name>"
 
-#: src/initcmdline.c:212 src/translate.c.po.c:4355
+#: src/initcmdline.c:212 src/translate.c.po.c:4376
 msgid "Attach <name> as a tape image"
 msgstr "Image Datei <Name> einlegen"
 
-#: src/initcmdline.c:214 src/translate.c.po.c:4365
+#: src/initcmdline.c:214 src/translate.c.po.c:4386
 msgid "Attach <name> as a disk image in drive #8"
 msgstr "Image Datei <Name> im Laufwerk #8 einlegen"
 
-#: src/initcmdline.c:216 src/translate.c.po.c:4375
+#: src/initcmdline.c:216 src/translate.c.po.c:4396
 msgid "Attach <name> as a disk image in drive #9"
 msgstr "Image Datei <Name> im Laufwerk #9 einlegen"
 
-#: src/initcmdline.c:218 src/translate.c.po.c:4385
+#: src/initcmdline.c:218 src/translate.c.po.c:4406
 msgid "Attach <name> as a disk image in drive #10"
 msgstr "Image Datei <Name> im Laufwerk #10 einlegen"
 
-#: src/initcmdline.c:220 src/translate.c.po.c:4395
+#: src/initcmdline.c:220 src/translate.c.po.c:4416
 msgid "Attach <name> as a disk image in drive #11"
 msgstr "Image Datei <Name> im Laufwerk #11 einlegen"
 
-#: src/kbdbuf.c:136 src/translate.c.po.c:4405
+#: src/kbdbuf.c:136 src/translate.c.po.c:4426
 msgid "<string>"
 msgstr "<String>"
 
-#: src/kbdbuf.c:136 src/translate.c.po.c:4415
+#: src/kbdbuf.c:136 src/translate.c.po.c:4436
 msgid "Put the specified string into the keyboard buffer"
 msgstr "Definierte Eingabe in Tastaturpuffer bereitstellen"
 
-#: src/log.c:110 src/translate.c.po.c:4425
+#: src/log.c:110 src/translate.c.po.c:4446
 msgid "Specify log file name"
 msgstr "Logdateiname definieren"
 
-#: src/monitor/monitor.c:997 src/translate.c.po.c:4234
+#: src/monitor/monitor.c:997 src/translate.c.po.c:4254
 msgid "Execute monitor commands from file"
 msgstr ""
 
-#: src/monitor/monitor.c:999 src/translate.c.po.c:4244
+#: src/monitor/monitor.c:999 src/translate.c.po.c:4264
 msgid "Set an initial breakpoint for the monitor"
 msgstr ""
 
-#: src/mouse.c:358 src/translate.c.po.c:4435
+#: src/mouse.c:358 src/translate.c.po.c:4456
 msgid "Enable mouse grab"
 msgstr "Maus aktivieren"
 
-#: src/mouse.c:360 src/translate.c.po.c:4445
+#: src/mouse.c:360 src/translate.c.po.c:4466
 msgid "Disable mouse grab"
 msgstr "Maus deaktivieren"
 
-#: src/mouse.c:362 src/translate.c.po.c:4455
+#: src/mouse.c:362 src/translate.c.po.c:4476
 msgid "Select the joystick port the mouse is attached to"
 msgstr "Joystickport f\xFCr Maus ausw\xE4hlen"
 
-#: src/mouse.c:364 src/translate.c.po.c:4465
+#: src/mouse.c:364 src/translate.c.po.c:4486
 msgid "Select the mouse type (0 = 1351, 1 = NEOS, 2 = Amiga)"
 msgstr "Maus typ w\xE4hlen (0 = 1351, 1 = NEOS, 2 = Amiga)"
 
-#: src/pet/pet-cmdline-options.c:114 src/translate.c.po.c:2386
+#: src/pet/pet-cmdline-options.c:114 src/tra...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18970] tags/v1.22/v1.22.24/

From: <st...@us...> - 2008-07-07 18:42:30

Revision: 18970
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18970&view=rev
Author:   strik
Date:     2008-07-07 11:42:38 -0700 (Mon, 07 Jul 2008)

Log Message:
-----------
Tagged version 1.22.24.

Added Paths:
-----------
    tags/v1.22/v1.22.24/

Copied: tags/v1.22/v1.22.24 (from rev 18969, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18969] trunk/vice

From: <st...@us...> - 2008-07-07 18:42:12

Revision: 18969
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18969&view=rev
Author:   strik
Date:     2008-07-07 11:42:19 -0700 (Mon, 07 Jul 2008)

Log Message:
-----------
2008-07-07  Spiro Trikaliotis  <spi...@gm...>

	* Version 1.22.24

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/configure.in
    trunk/vice/src/ChangeLog
    trunk/vice/src/version.h

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-07-07 18:19:16 UTC (rev 18968)
+++ trunk/vice/ChangeLog	2008-07-07 18:42:19 UTC (rev 18969)
@@ -1,3 +1,7 @@
+2008-07-07  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.24
+
 2008-07-07  Marco van den Heuvel  <bla...@ya...>
 
 	* doc/html/plain/NEWS: Updated.

Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in	2008-07-07 18:19:16 UTC (rev 18968)
+++ trunk/vice/configure.in	2008-07-07 18:42:19 UTC (rev 18969)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=23
+VICE_VERSION_BUILD=24
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-07 18:19:16 UTC (rev 18968)
+++ trunk/vice/src/ChangeLog	2008-07-07 18:42:19 UTC (rev 18969)
@@ -1,5 +1,9 @@
 2008-07-07  Spiro Trikaliotis  <spi...@gm...>
 
+	* Version 1.22.24
+
+2008-07-07  Spiro Trikaliotis  <spi...@gm...>
+
 	* c64/reu.c: fixed "end-of-block" for REU compare operation
 	according to Wolfgang Moser's REU reference.
 

Modified: trunk/vice/src/version.h
===================================================================
--- trunk/vice/src/version.h	2008-07-07 18:19:16 UTC (rev 18968)
+++ trunk/vice/src/version.h	2008-07-07 18:42:19 UTC (rev 18969)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.23"
+#define VERSION "1.22.24"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,23,0
+#define VERSION_RC_NUMBER 1,22,24,0
 #endif
 
 #ifndef PACKAGE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

19 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 1059 1060 1061 1062 1063 .. 1071 > >> (Page 1061 of 1071)