From 993f19c8d2cdc3796183642c1345f54fa22ed237 Mon Sep 17 00:00:00 2001 From: Joakim Larsson Edstrom Date: Sun, 27 Mar 2016 14:08:43 +0200 Subject: [PATCH 01/74] Added initial support for baudrate generator --- src/devices/machine/z80scc.cpp | 156 ++++++++++++++++++++++++++------- src/devices/machine/z80scc.h | 69 +++++++++------ 2 files changed, 167 insertions(+), 58 deletions(-) diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index de3ec568da7..810082a7241 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -76,7 +76,7 @@ TODO: // MACROS / CONSTANTS //************************************************************************** -#define VERBOSE 0 +#define VERBOSE 2 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) #if VERBOSE == 2 @@ -85,8 +85,10 @@ TODO: #ifdef _MSC_VER #define FUNCNAME __func__ +#define LLFORMAT "%I64%" #else #define FUNCNAME __PRETTY_FUNCTION__ +#define LLFORMAT "%lld" #endif #define CHANA_TAG "cha" @@ -163,10 +165,12 @@ z80scc_device::z80scc_device(const machine_config &mconfig, const char *tag, dev device_z80daisy_interface(mconfig, *this), m_chanA(*this, CHANA_TAG), m_chanB(*this, CHANB_TAG), +#if 0 m_rxca(0), m_txca(0), m_rxcb(0), m_txcb(0), +#endif m_out_txda_cb(*this), m_out_dtra_cb(*this), m_out_rtsa_cb(*this), @@ -198,7 +202,7 @@ scc80230_device::scc80230_device(const machine_config &mconfig, const char *tag, : z80scc_device(mconfig, SCC80230, "SCC 80230", tag, owner, clock, TYPE_SCC80230, "scc80230", __FILE__){ } scc8530_device::scc8530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: z80scc_device(mconfig, SCC8530N, "SCC 8530", tag, owner, clock, TYPE_SCC8530, "scc8530", __FILE__){ } + : z80scc_device(mconfig, SCC8530N, "SCC 8530", tag, owner, clock, TYPE_SCC8530, "scc8530", __FILE__){ } scc85C30_device::scc85C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : z80scc_device(mconfig, SCC85C30, "SCC 85C30", tag, owner, clock, TYPE_SCC85C30, "scc85C30", __FILE__){ } @@ -236,13 +240,17 @@ void z80scc_device::device_start() m_out_rxdrqb_cb.resolve_safe(); m_out_txdrqb_cb.resolve_safe(); +#if 0 // configure channel A m_chanA->m_rxc = m_rxca; m_chanA->m_txc = m_txca; + m_chanA->baudtimer = timer_alloc(0); // configure channel B m_chanB->m_rxc = m_rxcb; m_chanB->m_txc = m_txcb; + m_chanB->baudtimer = timer_alloc(1); +#endif // state saving save_item(NAME(m_int_state)); @@ -257,12 +265,22 @@ void z80scc_device::device_start() void z80scc_device::device_reset() { - LOG(("%s %s \n",FUNCNAME, tag())); + LOG(("%s %s \n",tag(), FUNCNAME)); m_chanA->reset(); m_chanB->reset(); } +#if 0 +static void z80scc_device::configure_channels(device_t &device, int rxa, int txa, int rxb, int txb) +{ + m_chanA->m_rxc = rxa; + m_chanA->m_txc = txa; + m_chanB->m_rxc = rxa; + m_chanB->m_txc = txa; +} +#endif + /* * Interrupts Each of the SCC's two channels contain three sources of interrupts, making a total of six interrupt @@ -277,7 +295,7 @@ int z80scc_device::z80daisy_irq_state() int state = 0; int i; - LOG(("%s %s A:%d%d%d B:%d%d%d ",FUNCNAME, tag(), + LOG(("%s %s A:%d%d%d B:%d%d%d ",tag(), FUNCNAME, m_int_state[0], m_int_state[1], m_int_state[2], m_int_state[3], m_int_state[4], m_int_state[5])); @@ -307,7 +325,7 @@ int z80scc_device::z80daisy_irq_ack() { int i; - LOG(("%s %s - needs fixing for SCC\n",FUNCNAME, tag())); + LOG(("%s %s - needs fixing for SCC\n",tag(), FUNCNAME)); // loop over all interrupt sources for (i = 0; i < 6; i++) @@ -320,7 +338,7 @@ int z80scc_device::z80daisy_irq_ack() //m_chanA->m_rr0 &= ~z80scc_channel::RR0_INTERRUPT_PENDING; check_interrupts(); - //LOG(("%s %s \n",FUNCNAME, tag(), m_chanB->m_rr2)); + //LOG(("%s %s : Interrupt Acknowledge Vector %02x\n",tag(), FUNCNAME, m_chanB->m_rr2)); return m_chanB->m_rr2; } @@ -340,7 +358,7 @@ void z80scc_device::z80daisy_irq_reti() { int i; - LOG(("%s %s \n",FUNCNAME, tag())); + LOG(("%s %s \n",tag(), FUNCNAME)); // loop over all interrupt sources for (i = 0; i < 6; i++) @@ -366,7 +384,7 @@ void z80scc_device::z80daisy_irq_reti() void z80scc_device::check_interrupts() { int state = (z80daisy_irq_state() & Z80_DAISY_INT) ? ASSERT_LINE : CLEAR_LINE; - LOG(("%s %s \n",FUNCNAME, tag())); + LOG(("%s %s \n",tag(), FUNCNAME)); m_out_int_cb(state); } @@ -377,7 +395,7 @@ void z80scc_device::check_interrupts() void z80scc_device::reset_interrupts() { - LOG(("%s %s \n",FUNCNAME, tag())); + LOG(("%s %s \n",tag(), FUNCNAME)); // reset internal interrupt sources for (auto & elem : m_int_state) { @@ -404,7 +422,7 @@ UINT8 z80scc_device::modify_vector(UINT8 vec, int i, UINT8 src) 1 1 1 Ch A Special Receive Condition */ // Add channel offset according to table above - src |= (i == CHANNEL_A ? 0x04 : 0x00 ); + src |= (i == CHANNEL_A ? 0x04 : 0x00 ); // Modify vector according to Hi/lo bit of WR9 if (m_chanA->m_wr9 & z80scc_channel::WR9_BIT_SHSL) // Affect V4-V6 @@ -425,12 +443,12 @@ UINT8 z80scc_device::modify_vector(UINT8 vec, int i, UINT8 src) void z80scc_device::trigger_interrupt(int index, int state) { UINT8 vector = m_chanB->m_wr2; - UINT8 source; + UINT8 source = 0; int priority; - int prio_level; + int prio_level = 0; - LOG(("%s %s:%c %d \n",FUNCNAME, tag(), 'A' + index, state)); + LOG(("%s %s:%c %d \n",tag(), FUNCNAME, 'A' + index, state)); /* The Master Interrupt Enable (MIE) bit, WR9 D3, must be set to enable the SCC to generate interrupts.*/ if (!(m_chanA->m_wr9 & z80scc_channel::WR9_BIT_MIE)) @@ -484,7 +502,7 @@ void z80scc_device::trigger_interrupt(int index, int state) vector = modify_vector(vector, index, source); } - //LOG(("Z80SCC \"%s\": %c : Interrupt Request %u\n", tag(), 'A' + index, state)); + LOG(("Z80SCC \"%s\": %c : Interrupt Request %u\n", tag(), 'A' + index, state)); // update vector register // TODO: What if interrupts are nested? May we loose the modified vector or even get the wrong one? m_chanB->m_wr2 = vector; @@ -671,6 +689,7 @@ WRITE8_MEMBER( z80scc_device::ba_cd_inv_w ) z80scc_channel::z80scc_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z80SCC_CHANNEL, "Z80 SCC channel", tag, owner, clock, "z80scc_channel", __FILE__), device_serial_interface(mconfig, *this), + m_brg_counter(0), m_rx_error(0), m_rx_clock(0), m_rx_first(0), @@ -716,6 +735,9 @@ void z80scc_channel::device_start() m_rx_fifo_sz = (m_uart->m_variant & SET_ESCC) ? 8 : 3; m_rx_fifo_wp = m_rx_fifo_rp = 0; + // baudrate clocks and timers + baudtimer = timer_alloc(TIMER_ID_BAUD); + // state saving save_item(NAME(m_rr0)); save_item(NAME(m_rr1)); @@ -828,6 +850,32 @@ void z80scc_channel::device_reset() void z80scc_channel::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { +// LOG(("%s %d\n", FUNCNAME, id)); + + switch(id) + { + case TIMER_ID_BAUD: + { + int brconst = m_wr13 << 8 | m_wr12 | 1; // If the counter is 1 the effect is passthrough ehh?! To avoid div0... + if (m_wr14 & WR14_BRG_ENABLE) + { + int rate = m_owner->clock() / brconst; + attotime attorate = attotime::from_hz(rate); + timer.adjust(attorate, id, attorate); + txc_w(m_brg_counter & 1); + rxc_w(m_brg_counter & 1); + m_brg_counter++; // Will just keep track of state in timer mode, not hardware counter value. + } + else + { + LOG((" - turning off Baudrate timer\n")); + timer.adjust(attotime::never, 0, attotime::never); + } + } + break; + default: + logerror("Spurious timer %d event\n", id); + } device_serial_interface::device_timer(timer, id, param, ptr); } @@ -840,7 +888,7 @@ void z80scc_channel::tra_callback() { if (!(m_wr5 & WR5_TX_ENABLE)) { - LOG(("%d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); + LOG((LLFORMAT " %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); // transmit mark if (m_index == z80scc_device::CHANNEL_A) m_uart->m_out_txda_cb(1); @@ -849,7 +897,7 @@ void z80scc_channel::tra_callback() } else if (m_wr5 & WR5_SEND_BREAK) { - LOG(("%d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); + LOG((LLFORMAT " %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); // transmit break if (m_index == z80scc_device::CHANNEL_A) m_uart->m_out_txda_cb(0); @@ -860,7 +908,7 @@ void z80scc_channel::tra_callback() { int db = transmit_register_get_data_bit(); - LOG(("%d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, db, m_wr5)); + LOG((LLFORMAT " %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, db, m_wr5)); // transmit data if (m_index == z80scc_device::CHANNEL_A) m_uart->m_out_txda_cb(db); @@ -869,7 +917,7 @@ void z80scc_channel::tra_callback() } else { - LOG(("%d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); + LOG((LLFORMAT " %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag(), 'A' + m_index); } } @@ -883,7 +931,7 @@ void z80scc_channel::tra_complete() { if ((m_wr5 & WR5_TX_ENABLE) && !(m_wr5 & WR5_SEND_BREAK) && !(m_rr0 & RR0_TX_BUFFER_EMPTY)) { - LOG(("%d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_tx_data, m_wr5)); + LOG((LLFORMAT " %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_tx_data, m_wr5)); transmit_register_setup(m_tx_data); @@ -895,7 +943,7 @@ void z80scc_channel::tra_complete() } else if (m_wr5 & WR5_SEND_BREAK) { - LOG(("%d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); + LOG((LLFORMAT " %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); // transmit break if (m_index == z80scc_device::CHANNEL_A) m_uart->m_out_txda_cb(0); @@ -904,7 +952,7 @@ void z80scc_channel::tra_complete() } else { - LOG(("%d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); + LOG((LLFORMAT " %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); // transmit mark if (m_index == z80scc_device::CHANNEL_A) m_uart->m_out_txda_cb(1); @@ -915,7 +963,7 @@ void z80scc_channel::tra_complete() // if transmit buffer is empty if (m_rr0 & RR0_TX_BUFFER_EMPTY) { - LOG(("%d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); + LOG((LLFORMAT " %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5)); // then all characters have been sent m_rr1 |= RR1_ALL_SENT; @@ -939,7 +987,7 @@ void z80scc_channel::rcv_callback() #if 1 else { - LOG(("%d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index)); + LOG((LLFORMAT " %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index)); logerror("Z80SCC %s() \"%s \"Channel %c Received data dit but receiver is disabled\n", __func__, m_owner->tag(), 'A' + m_index); } #endif @@ -956,7 +1004,7 @@ void z80scc_channel::rcv_complete() receive_register_extract(); data = get_received_char(); - LOG(("%d %s() \"%s \"Channel %c Received Data %c\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, data)); + LOG((LLFORMAT " %s() \"%s \"Channel %c Received Data %c\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, data)); receive_data(data); } @@ -1081,7 +1129,7 @@ int z80scc_channel::get_tx_word_length() * Break/Abort latch. */ UINT8 z80scc_channel::do_sccreg_rr0() { - LOG(("%s %s\n",FUNCNAME, tag())); + LOG(("%s %s <- %02x\n",tag(), FUNCNAME, m_rr0)); return m_rr0; } @@ -1090,7 +1138,7 @@ UINT8 z80scc_channel::do_sccreg_rr0() * codes for the I-Field in the SDLC Receive Mode. */ UINT8 z80scc_channel::do_sccreg_rr1() { - LOG(("%s %s\n",FUNCNAME, tag())); + LOG(("%s %s <- %02x\n",tag(), FUNCNAME, m_rr1)); return m_rr1; } @@ -1710,14 +1758,14 @@ void z80scc_channel::do_sccreg_wr11(UINT8 data) void z80scc_channel::do_sccreg_wr12(UINT8 data) { m_wr12 = data; - LOG(("Z80SCC \"%s\": %c : %s %02x Low byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data)); + LOG(("Z80SCC \"%s\": %c : %s %02x Low byte of Time Constant for Baudrate generator\n", m_owner->tag(), 'A' + m_index, __func__, data)); } /* WR13 contains the upper byte of the time constant for the baud rate generator. */ void z80scc_channel::do_sccreg_wr13(UINT8 data) { m_wr13 = data; - LOG(("Z80SCC \"%s\": %c : %s %02x High byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data)); + LOG(("Z80SCC \"%s\": %c : %s %02x High byte of Time Constant for Baudrate generator\n", m_owner->tag(), 'A' + m_index, __func__, data)); } /* @@ -1759,7 +1807,7 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data) /* Issuing this command disables the DPLL, resets the clock missing latches in RR10, and forces a continuous Search mode state.*/ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Disable DPLL Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__)); break; - case WR14_CMD_SS_BGR: + case WR14_CMD_SS_BRG: /* Issuing this command forces the clock for the DPLL to come from the output of the BRG. */ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Baudrate Generator Input DPLL Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__)); break; @@ -1780,6 +1828,26 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data) default: logerror("Z80SCC \"%s\": %c : %s Mics Control Bits command %02x - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data); } + /* Based on baudrate code from 8530scc.cpp */ + if ( !(m_wr14 & WR14_BRG_ENABLE) && (data & WR14_BRG_ENABLE) ) // baud rate generator beeing enabled? + { + LOG(("Z80SCC \"%s\": %c : %s Mics Control Bits Baudrate generator enabled with \n", m_owner->tag(), 'A' + m_index, __func__)); + m_brg_counter = m_wr13 << 8 | m_wr12 | 1; // If the counter is 1 the effect is passthrough ehh?! To avoid div0... + if (data & WR14_BRG_SOURCE) // Do we use the PCLK as baudrate source + { + int rate = m_owner->clock() / m_brg_counter; + LOG(("PCLK as source, rate (%d) = PCLK (%d) / (%d)\n", rate, m_owner->clock(), m_brg_counter)); + + baudtimer->adjust(attotime::from_hz(rate), TIMER_ID_BAUD, attotime::from_hz(rate)); // Start the baudrate generator + } + else + LOG(("external clock source\n")); + } + else if ( (m_wr14 & WR14_BRG_ENABLE) && !(data & WR14_BRG_ENABLE) ) // baud rate generator beeing disabled? + { + baudtimer->adjust(attotime::never, TIMER_ID_BAUD, attotime::never); // Stop the baudrate generator + m_brg_counter = 0; + } // TODO: Add info on the other bits of this register m_wr14 = data; } @@ -2181,7 +2249,34 @@ WRITE_LINE_MEMBER( z80scc_channel::sync_w ) //------------------------------------------------- WRITE_LINE_MEMBER( z80scc_channel::rxc_w ) { +/* Support for external clock as source for BRG yet to be finished */ +#if 0 //LOG(("Z80SCC \"%s\": %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A')); + if ( ((m_wr3 & WR3_RX_ENABLE) | (m_wr5 & WR5_TX_ENABLE)) && m_wr14 & WR14_BRG_ENABLE) + { + if (!(m_wr14 & WR14_BRG_SOURCE)) // Is the Baud rate Generator driven by RTxC? + { + printf("x"); + if (!m_brg_counter) // Zero crossing?! + { + printf("."); + m_brg_counter = m_wr13 << 8 | m_wr12; // Reload BRG counter + if ((m_wr11 & WR11_TRACLK_SRC_MASK) == WR11_TRACLK_SRC_BR) // Is transmitt clock driven by BRG? + { + printf("+"); + txc_w(state); + } + } + else + { + m_brg_counter--; + if ((m_wr11 & WR11_RCVCLK_SRC_MASK) == WR11_RCVCLK_SRC_BR) // Is receive clock driven by BRG and not zero cross + return; + } + } + } +#endif + if (m_wr3 & WR3_RX_ENABLE) { int clocks = get_clock_mode(); @@ -2194,7 +2289,6 @@ WRITE_LINE_MEMBER( z80scc_channel::rxc_w ) m_rx_clock++; if (m_rx_clock == clocks) m_rx_clock = 0; - } } } @@ -2240,7 +2334,7 @@ void z80scc_channel::update_serial() else parity = PARITY_NONE; - LOG(("%d %s() \"%s \"Channel %c setting data frame %d+%d%c%d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, 1, + LOG((LLFORMAT " %s() \"%s \"Channel %c setting data frame %d+%d%c%d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, 1, data_bit_count, parity == PARITY_NONE ? 'N' : parity == PARITY_EVEN ? 'E' : 'O', (stop_bits + 1) / 2)); set_data_frame(1, data_bit_count, parity, stop_bits); diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h index 7f956ec9b74..04d64221e8f 100644 --- a/src/devices/machine/z80scc.h +++ b/src/devices/machine/z80scc.h @@ -137,7 +137,7 @@ public: UINT8 do_sccreg_rr5(); UINT8 do_sccreg_rr6(); UINT8 do_sccreg_rr7(); -// UINT8 do_sccreg_rr8(); + // UINT8 do_sccreg_rr8(); Short cutted due to frequent use UINT8 do_sccreg_rr9(); UINT8 do_sccreg_rr10(); UINT8 do_sccreg_rr11(); @@ -236,21 +236,21 @@ protected: // Read registers enum { - REG_RR0_STATUS = 0, // SIO + REG_RR0_STATUS = 0, // SIO REG_RR1_SPEC_RCV_COND = 1, // SIO REG_RR2_INTERRUPT_VECT = 2, // SIO REG_RR3_INTERUPPT_PEND = 3, - REG_RR4_WR4_OR_RR0 = 4, - REG_RR5_WR5_OR_RR0 = 5, - REG_RR6_LSB_OR_RR2 = 6, - REG_RR7_MSB_OR_RR3 = 7, + REG_RR4_WR4_OR_RR0 = 4, + REG_RR5_WR5_OR_RR0 = 5, + REG_RR6_LSB_OR_RR2 = 6, + REG_RR7_MSB_OR_RR3 = 7, REG_RR8_RECEIVE_DATA = 8, - REG_RR9_WR3_OR_RR13 = 9, + REG_RR9_WR3_OR_RR13 = 9, REG_RR10_MISC_STATUS = 10, REG_RR11_WR10_OR_RR15 = 11, REG_RR12_LO_TIME_CONST = 12, REG_RR13_HI_TIME_CONST = 13, - REG_RR14_WR7_OR_R10 = 14, + REG_RR14_WR7_OR_R10 = 14, REG_RR15_WR15_EXT_STAT = 15 }; @@ -259,10 +259,10 @@ protected: { REG_WR0_COMMAND_REGPT = 0, // SIO REG_WR1_INT_DMA_ENABLE = 1, // SIO - REG_WR2_INT_VECTOR = 2, // SIO - REG_WR3_RX_CONTROL = 3, // SIO - REG_WR4_RX_TX_MODES = 4, // SIO - REG_WR5_TX_CONTROL = 5, // SIO + REG_WR2_INT_VECTOR = 2, // SIO + REG_WR3_RX_CONTROL = 3, // SIO + REG_WR4_RX_TX_MODES = 4, // SIO + REG_WR5_TX_CONTROL = 5, // SIO REG_WR6_SYNC_OR_SDLC_A = 6, // SIO REG_WR7_SYNC_OR_SDLC_F = 7, // SIO REG_WR8_TRANSMIT_DATA = 8, @@ -271,21 +271,21 @@ protected: REG_WR11_CLOCK_MODES = 11, REG_WR12_LO_BAUD_GEN = 12, REG_WR13_HI_BAUD_GEN = 13, - REG_WR14_MISC_CTRL = 14, + REG_WR14_MISC_CTRL = 14, REG_WR15_EXT_ST_INT_CTRL= 15 }; enum { RR0_RX_CHAR_AVAILABLE = 0x01, // SIO bit - RR0_ZC = 0x02, // SCC bit - RR0_TX_BUFFER_EMPTY = 0x04, // SIO - RR0_DCD = 0x08, // SIO - RR0_RI = 0x10, // DART bit? TODO: investigate function and remove - RR0_SYNC_HUNT = 0x10, // SIO bit, not supported - RR0_CTS = 0x20, // SIO bit - RR0_TX_UNDERRUN = 0x40, // SIO bit, not supported - RR0_BREAK_ABORT = 0x80 // SIO bit, not supported + RR0_ZC = 0x02, // SCC bit + RR0_TX_BUFFER_EMPTY = 0x04, // SIO + RR0_DCD = 0x08, // SIO + RR0_RI = 0x10, // DART bit? TODO: investigate function and remove + RR0_SYNC_HUNT = 0x10, // SIO bit, not supported + RR0_CTS = 0x20, // SIO bit + RR0_TX_UNDERRUN = 0x40, // SIO bit, not supported + RR0_BREAK_ABORT = 0x80 // SIO bit, not supported }; enum @@ -456,16 +456,31 @@ protected: enum { WR14_DPLL_CMD_MASK = 0xe0, // Command - WR14_CMD_NULL = 0x00, // 0 0 0 - WR14_CMD_ESM = 0x20, // 0 0 1 - WR14_CMD_RMC = 0x40, // 0 1 0 + WR14_CMD_NULL = 0x00, // 0 0 0 + WR14_CMD_ESM = 0x20, // 0 0 1 + WR14_CMD_RMC = 0x40, // 0 1 0 WR14_CMD_DISABLE_DPLL = 0x60, // 0 1 1 - WR14_CMD_SS_BGR = 0x80, // 1 0 0 + WR14_CMD_SS_BRG = 0x80, // 1 0 0 WR14_CMD_SS_RTXC = 0xa0, // 1 0 1 - WR14_CMD_SET_FM = 0xc0, // 1 1 0 - WR14_CMD_SET_NRZI = 0xe0 // 1 1 1 + WR14_CMD_SET_FM = 0xc0, // 1 1 0 + WR14_CMD_SET_NRZI = 0xe0, // 1 1 1 + WR14_BRG_ENABLE = 0x01, + WR14_BRG_SOURCE = 0x02, + WR14_DTR_REQ_FUNC = 0x04, + WR14_AUTO_ECHO = 0x08, + WR14_LOCAL_LOOPBACK = 0x010 }; + enum + { + TIMER_ID_BAUD, + TIMER_ID_XTAL, + TIMER_ID_RTXC, + TIMER_ID_TRXC + }; + emu_timer *baudtimer; + UINT16 m_brg_counter; + void update_serial(); void set_dtr(int state); void set_rts(int state); From 09f2e37a16fa697b9c80af46396638c7943b5bbd Mon Sep 17 00:00:00 2001 From: Joakim Larsson Edstrom Date: Sun, 27 Mar 2016 14:09:52 +0200 Subject: [PATCH 02/74] Fixed proper baudrate using the scc baudrate generator and correct crystal value --- src/mame/drivers/hk68v10.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp index 8faecfece09..e72e02383d9 100644 --- a/src/mame/drivers/hk68v10.cpp +++ b/src/mame/drivers/hk68v10.cpp @@ -184,10 +184,7 @@ #endif #define BAUDGEN_CLOCK XTAL_19_6608MHz /* Raltron */ -/* - */ -#define SCC_CLOCK (BAUDGEN_CLOCK / 128) /* This gives prompt at the RS232 terminal device (9600) */ -//#define SCC_CLOCK (BAUDGEN_CLOCK / 4) /* This is correct giving 4.9152MHz as documentation says */ +#define SCC_CLOCK (BAUDGEN_CLOCK / 4) /* Giving 4.9152MHz as documentation says */ class hk68v10_state : public driver_device { public: @@ -207,7 +204,6 @@ DECLARE_WRITE16_MEMBER (bootvect_w); //DECLARE_WRITE16_MEMBER (vme_a16_w); virtual void machine_start () override; virtual void machine_reset () override; -DECLARE_WRITE_LINE_MEMBER (write_sccterm_clock); protected: @@ -325,12 +321,7 @@ WRITE16_MEMBER (hk68v10_state::vme_a16_w){ * D1,DO = 10 for 12 Mhz MPU clock * * Original HBUG configuration word: 0x003D = 0000 0000 0011 1101 - * */ -WRITE_LINE_MEMBER (hk68v10_state::write_sccterm_clock){ - m_sccterm->txca_w (state); - m_sccterm->rxca_w (state); -} /* * Machine configuration @@ -341,7 +332,7 @@ MCFG_CPU_ADD ("maincpu", M68010, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP (hk68v10_mem) /* Terminal Port config */ -MCFG_SCC8530_ADD("scc", XTAL_4MHz, 0, 0, 0, 0 ) +MCFG_SCC8530_ADD("scc", SCC_CLOCK, 0, 0, 0, 0 ) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_dtr)) MCFG_Z80SCC_OUT_RTSA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_rts)) @@ -350,9 +341,6 @@ MCFG_RS232_PORT_ADD ("rs232trm", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("scc", scc8530_device, rxa_w)) MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("scc", scc8530_device, ctsa_w)) -MCFG_DEVICE_ADD ("sccterm_clock", CLOCK, SCC_CLOCK) -MCFG_CLOCK_SIGNAL_HANDLER (WRITELINE (hk68v10_state, write_sccterm_clock)) - MACHINE_CONFIG_END /* ROM definitions */ From 9254c8d3cf738d603bbd6555c11b1173387ab1b5 Mon Sep 17 00:00:00 2001 From: Joakim Larsson Edstrom Date: Sun, 27 Mar 2016 14:20:25 +0200 Subject: [PATCH 03/74] turned off logging --- src/devices/machine/z80scc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 810082a7241..9aad62e27c7 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -76,7 +76,7 @@ TODO: // MACROS / CONSTANTS //************************************************************************** -#define VERBOSE 2 +#define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) #if VERBOSE == 2 From 1e95b3b4591c389a2ce72b9903a34366a1e0a9a3 Mon Sep 17 00:00:00 2001 From: cracyc Date: Sun, 27 Mar 2016 19:50:02 -0500 Subject: [PATCH 04/74] luaengine: add software name getter (nw) hiscore: add support for softlist rom hiscores (nw) --- plugins/hiscore/hiscore.dat | 6 ++++++ plugins/hiscore/init.lua | 21 ++++++++++++++------- src/emu/luaengine.cpp | 11 +++++++++++ src/emu/luaengine.h | 1 + 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/plugins/hiscore/hiscore.dat b/plugins/hiscore/hiscore.dat index 00a4d5fb36b..17bd85d3dfd 100644 --- a/plugins/hiscore/hiscore.dat +++ b/plugins/hiscore/hiscore.dat @@ -9,6 +9,9 @@ ;This file can be edited with a text editor, but keep the same format: ; all fields are separated by a comma (,) ; : +; or +; ,: +; for machines with softlists ; @,,
,,, ; [repeat the above as many times as necessary] @@ -13965,3 +13968,6 @@ zodiack: @:maincpu,program,b35f,1,08,08 @:maincpu,program,b37f,1,00,00 @:maincpu,program,b39f,1,00,00 + +genesis,tf3: +@:maincpu,program,fff2ac,4,00,90 diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua index 5c54a53912b..228892e7539 100644 --- a/plugins/hiscore/init.lua +++ b/plugins/hiscore/init.lua @@ -64,7 +64,11 @@ function hiscore.startplugin() if not file then file = io.open( hiscore_plugin_path .. "/hiscore.dat", "r" ); end - rm_match = '^' .. emu.romname() .. ':'; + if emu.softname() ~= "" then + rm_match = '^' .. emu.romname() .. ',' .. emu.softname() .. ':'; + else + rm_match = '^' .. emu.romname() .. ':'; + end cluster = ""; current_is_match = false; if file then @@ -113,7 +117,11 @@ function hiscore.startplugin() function get_file_name () - r = hiscore_path .. '/' .. emu.romname() .. ".hi"; + if emu.softname() ~= "" then + r = hiscore_path .. '/' .. emu.romname() .. "_" .. emu.softname() .. ".hi"; + else + r = hiscore_path .. '/' .. emu.romname() .. ".hi"; + end return r; end @@ -225,19 +233,18 @@ function hiscore.startplugin() write_scores(positions) end end - current_game = nil + current_game = "" mem_check_passed = false + scores_have_been_read = false; end emu.register_start(function() print("Starting " .. emu.gamename()) -- check if we've just soft reset - if reset then - reset() - end + -- reset() -- there's no way to reliably save scores after a soft reset currently current_game = emu.romname() dat = read_hiscore_dat() - if dat then + if dat and dat ~= "" then print( "found hiscore.dat entry for " .. emu.romname() ); positions = parse_table( dat ); if not positions then diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index 0cf57ef61c0..fbd2e64fc76 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -244,6 +244,16 @@ int lua_engine::l_emu_romname(lua_State *L) return 1; } +//------------------------------------------------- +// emu_softname - returns softlist name +//------------------------------------------------- + +int lua_engine::l_emu_softname(lua_State *L) +{ + lua_pushstring(L, luaThis->machine().options().software_name()); + return 1; +} + //------------------------------------------------- // emu_pause/emu_unpause - pause/unpause game //------------------------------------------------- @@ -1418,6 +1428,7 @@ void lua_engine::initialize() .addCFunction ("app_version", l_emu_app_version ) .addCFunction ("gamename", l_emu_gamename ) .addCFunction ("romname", l_emu_romname ) + .addCFunction ("softname", l_emu_softname ) .addCFunction ("keypost", l_emu_keypost ) .addCFunction ("hook_output", l_emu_hook_output ) .addCFunction ("sethook", l_emu_set_hook ) diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h index 19c362c66a2..2f0f4ad7a34 100644 --- a/src/emu/luaengine.h +++ b/src/emu/luaengine.h @@ -106,6 +106,7 @@ private: static int l_emu_time(lua_State *L); static int l_emu_gamename(lua_State *L); static int l_emu_romname(lua_State *L); + static int l_emu_softname(lua_State *L); static int l_emu_keypost(lua_State *L); static int l_emu_hook_output(lua_State *L); static int l_emu_exit(lua_State *L); From 1599da14da99982b73c1a6736efffba9ffd41f5f Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 03:22:57 +0100 Subject: [PATCH 05/74] spartanx bootleg stuff (nw) --- src/mame/drivers/spartanxtec.cpp | 246 ++++++++++++++++--------------- 1 file changed, 130 insertions(+), 116 deletions(-) diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp index 057f246ee1b..0945e445d3d 100644 --- a/src/mame/drivers/spartanxtec.cpp +++ b/src/mame/drivers/spartanxtec.cpp @@ -6,11 +6,18 @@ Kung-Fu Master / Spartan X (Tecfri bootleg) single PCB with 2x Z80 similar looking to the '1942p' and 'spyhuntpr' PCBs + +P2 inputs don't work +DIPS etc. are near the 2nd CPU, should it be reading them? + +visible area is 16 lines less than the original, otherwise you get bad sprites +but I think this is probably correct. + */ #include "emu.h" #include "cpu/z80/z80.h" - +#include "includes/iremipt.h" class spartanxtec_state : public driver_device { @@ -18,6 +25,7 @@ public: spartanxtec_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_m62_tileram(*this, "m62_tileram"), + m_spriteram(*this, "spriteram"), m_scroll_lo(*this, "scroll_lo"), m_scroll_hi(*this, "scroll_hi"), @@ -26,12 +34,14 @@ public: { } required_shared_ptr m_m62_tileram; + required_shared_ptr m_spriteram; required_shared_ptr m_scroll_lo; required_shared_ptr m_scroll_hi; virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; + void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_spartanxtec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(spartanxtec); @@ -54,7 +64,7 @@ WRITE8_MEMBER(spartanxtec_state::kungfum_tileram_w) m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } -// WRONG for this bootleg + TILE_GET_INFO_MEMBER(spartanxtec_state::get_kungfum_bg_tile_info) { int code; @@ -83,31 +93,52 @@ void spartanxtec_state::video_start() } +void spartanxtec_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ) +{ + gfx_element *gfx = m_gfxdecode->gfx(1); + + for (int i = 0; i < 0x400; i += 4) + { + int x = m_spriteram[i+2]+128; + int y = (224-m_spriteram[i+1])&0xff; + int code = m_spriteram[i+0]; + int attr = m_spriteram[i+3]; + code |= (attr & 0xc0) << 2; + + int colour = attr & 0x1f; + int flipx = attr & 0x20; + int flipy = 0; + + gfx->transpen(bitmap,cliprect,code,colour,flipx,flipy,x,y,7); + + } + + +} + + UINT32 spartanxtec_state::screen_update_spartanxtec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { // there are 4 sets of scroll registers // how to split them isn't clear, 4 groups of 8 rows would be logical // but only 6 rows should use the first scroll register and the // remaining 2 rows scroll values from there can't wrap onto the bottom - // as that doesn't work. (breaks playfield scroll) + // as that doesn't work. (breaks bottom 2 lines of playfield scroll) + // HOWEVER sprites are also broken in that area, so I think this bootleg + // probably just displays less lines. for (int i = 0; i < 32; i++) { int scrollval; - if (i<6) scrollval = m_scroll_lo[0] | (m_scroll_hi[0] << 8); - else scrollval = m_scroll_lo[1] | (m_scroll_hi[1] << 8); + scrollval = m_scroll_lo[i/8] | (m_scroll_hi[i/8] << 8); - // always the same as 1 - //scrollval = m_scroll_lo[2] | (m_scroll_hi[2] << 8); - //scrollval = m_scroll_lo[3] | (m_scroll_hi[3] << 8); - - m_bg_tilemap->set_scrollx(i, scrollval+28-128); + m_bg_tilemap->set_scrollx((i-2)&0xff, scrollval+28-128); } m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); -// draw_sprites(bitmap, cliprect, 0x1f, 0x00, 0x00); + draw_sprites(bitmap, cliprect); m_bg_tilemap->draw(screen, bitmap, cliprect, 1, 0); return 0; @@ -119,14 +150,14 @@ UINT32 spartanxtec_state::screen_update_spartanxtec(screen_device &screen, bitma static ADDRESS_MAP_START( spartanxtec_map, AS_PROGRAM, 8, spartanxtec_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0xc400, 0xc7ff) AM_RAM + AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x8000, 0x8000) AM_WRITENOP - AM_RANGE(0x8100, 0x8100) AM_READ_PORT("IN0") - AM_RANGE(0x8101, 0x8101) AM_READ_PORT("IN1") - AM_RANGE(0x8102, 0x8102) AM_READ_PORT("IN2") - AM_RANGE(0x8103, 0x8103) AM_READ_PORT("IN3") + AM_RANGE(0x8100, 0x8100) AM_READ_PORT("DSW1") + AM_RANGE(0x8101, 0x8101) AM_READ_PORT("DSW2") + AM_RANGE(0x8102, 0x8102) AM_READ_PORT("SYSTEM") + AM_RANGE(0x8103, 0x8103) AM_READ_PORT("P1") AM_RANGE(0x8200, 0x8200) AM_WRITENOP // sound cmd? @@ -141,111 +172,72 @@ static ADDRESS_MAP_START( spartanxtec_map, AS_PROGRAM, 8, spartanxtec_state ) ADDRESS_MAP_END +static ADDRESS_MAP_START( spartanxtec_sound_map, AS_PROGRAM, 8, spartanxtec_state ) + AM_RANGE(0x0000, 0x0fff) AM_ROM + AM_RANGE(0x8000, 0x83ff) AM_RAM +ADDRESS_MAP_END + static INPUT_PORTS_START( spartanxtec ) - PORT_START("IN0") - PORT_DIPNAME( 0x01, 0x01, "IN0" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_START("DSW1") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) + PORT_DIPNAME( 0x02, 0x02, "Energy Loss" ) PORT_DIPLOCATION("SW1:2") + PORT_DIPSETTING( 0x02, "Slow" ) + PORT_DIPSETTING( 0x00, "Fast" ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:3,4") + PORT_DIPSETTING( 0x08, "2" ) + PORT_DIPSETTING( 0x0c, "3" ) + PORT_DIPSETTING( 0x04, "4" ) + PORT_DIPSETTING( 0x00, "5" ) + /* Manual says that only coin mode 1 is available and SW2:3 should be always OFF */ + /* However, coin mode 2 works perfectly. */ + IREM_Z80_COINAGE_TYPE_3_LOC(SW1) - PORT_START("IN1") - PORT_DIPNAME( 0x01, 0x01, "IN1" ) + PORT_START("DSW2") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2") + PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Cocktail ) ) + PORT_DIPNAME( 0x04, 0x04, "Coin Mode" ) PORT_DIPLOCATION("SW2:3") + PORT_DIPSETTING( 0x04, "Mode 1" ) + PORT_DIPSETTING( 0x00, "Mode 2" ) + /* In slowmo mode, press 2 to slow game speed */ + PORT_DIPNAME( 0x08, 0x08, "Slow Motion Mode (Cheat)" ) PORT_DIPLOCATION("SW2:4") PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + /* In freeze mode, press 2 to stop and 1 to restart */ + PORT_DIPNAME( 0x10, 0x10, "Freeze (Cheat)" ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + /* In level selection mode, press 1 to select and 2 to restart */ + PORT_DIPNAME( 0x20, 0x20, "Level Selection Mode (Cheat)" ) PORT_DIPLOCATION("SW2:6") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x40, 0x40, "Invulnerability (Cheat)" ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW2:8" ) - PORT_START("IN2") - PORT_DIPNAME( 0x01, 0x01, "IN2" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_START("SYSTEM") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(19) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("IN3") - PORT_DIPNAME( 0x01, 0x01, "IN3" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_START("P1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */ + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */ + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) INPUT_PORTS_END @@ -273,8 +265,8 @@ static const gfx_layout tiles16x16_layout = static GFXDECODE_START( news ) - GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) - GFXDECODE_ENTRY( "gfx2", 0, tiles16x16_layout, 0, 16 ) + GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x100, 32 ) + GFXDECODE_ENTRY( "gfx2", 0, tiles16x16_layout, 0, 32 ) GFXDECODE_END @@ -289,8 +281,18 @@ void spartanxtec_state::machine_reset() PALETTE_INIT_MEMBER(spartanxtec_state, spartanxtec) { -// const UINT8 *color_prom = memregion("cprom")->base(); + // todo, proper weights for this bootleg PCB + const UINT8 *color_prom = memregion("cprom")->base(); + for (int i = 0; i < 0x200; i++) + { + int r, g, b; + b = (color_prom[i+0x000]&0x0f)<<4; + g = (color_prom[i+0x200]&0x0f)<<4; + r = (color_prom[i+0x400]&0x0f)<<4; + + palette.set_pen_color(i, rgb_t(r,g,b)); + } } @@ -302,17 +304,20 @@ static MACHINE_CONFIG_START( spartanxtec, spartanxtec_state ) MCFG_CPU_PROGRAM_MAP(spartanxtec_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_hold) + MCFG_CPU_ADD("soundcpu", Z80,4000000) + MCFG_CPU_PROGRAM_MAP(spartanxtec_sound_map) /* video hardware */ + // todo, proper screen timings for this bootleg PCB MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(55) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790) /* frames per second and vblank duration from the Lode Runner manual */) MCFG_SCREEN_SIZE(64*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) + MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1-16) MCFG_SCREEN_UPDATE_DRIVER(spartanxtec_state, screen_update_spartanxtec) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(spartanxtec_state,spartanxtec) MCFG_GFXDECODE_ADD("gfxdecode", "palette", news) @@ -331,12 +336,21 @@ ROM_START( spartanxtec ) ROM_REGION( 0x10000, "soundcpu", 0 ) ROM_LOAD( "3.bin", 0x00000, 0x01000, CRC(9a18af94) SHA1(1644295aa0c837dced5934360e41d77e0a93ccd1) ) - ROM_REGION( 0x6000, "gfx1", 0 ) - ROM_LOAD( "4.bin", 0x00000, 0x02000, CRC(b55672ef) SHA1(7bd556a76e130be1262aa7db09df84c6463ce9ef) ) - ROM_LOAD( "5.bin", 0x02000, 0x02000, CRC(8a3d2978) SHA1(e50ba8d63e894c6a555d92c3144682be68f111b0) ) - ROM_LOAD( "6.bin", 0x04000, 0x02000, CRC(b1570b6b) SHA1(380a692309690e6ff6b57fda657192fff95167e0) ) + ROM_REGION( 0x6000, "gfx1", ROMREGION_INVERT ) + ROM_LOAD( "5.bin", 0x00000, 0x0800, CRC(8a3d2978) SHA1(e50ba8d63e894c6a555d92c3144682be68f111b0)) + ROM_CONTINUE(0x1000, 0x0800) + ROM_CONTINUE(0x0800, 0x0800) + ROM_CONTINUE(0x1800, 0x0800) + ROM_LOAD( "6.bin", 0x02000, 0x0800, CRC(b1570b6b) SHA1(380a692309690e6ff6b57fda657192fff95167e0) ) + ROM_CONTINUE(0x3000, 0x0800) + ROM_CONTINUE(0x2800, 0x0800) + ROM_CONTINUE(0x3800, 0x0800) + ROM_LOAD( "4.bin", 0x04000, 0x0800, CRC(b55672ef) SHA1(7bd556a76e130be1262aa7db09df84c6463ce9ef) ) + ROM_CONTINUE(0x5000, 0x0800) + ROM_CONTINUE(0x4800, 0x0800) + ROM_CONTINUE(0x5800, 0x0800) - ROM_REGION( 0x18000, "gfx2", 0 ) + ROM_REGION( 0x18000, "gfx2", ROMREGION_INVERT ) ROM_LOAD( "7.bin", 0x00000, 0x08000, CRC(aa897e30) SHA1(90b3b316800be106d3baa6783ca894703f369d4e) ) ROM_LOAD( "8.bin", 0x08000, 0x08000, CRC(98a1803b) SHA1(3edfc45c289f850b07a0231ce0b792cbec6fb245) ) ROM_LOAD( "9.bin", 0x10000, 0x08000, CRC(e3bf0d73) SHA1(4562422c07399e240081792b96b9018d1e7dd97b) ) From 2b12b2c240a0ceb05a80322fdfa6ae7b8f6f0a1e Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 03:57:52 +0100 Subject: [PATCH 06/74] ok, make this bootleg work. p2 controls don't work if the 'cocktail' dipswitch is set, but since I see nothing to flip the screen I suspect that mode simply isn't supported in this bootleg. --- src/mame/drivers/spartanxtec.cpp | 76 ++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp index 0945e445d3d..007bd2969ed 100644 --- a/src/mame/drivers/spartanxtec.cpp +++ b/src/mame/drivers/spartanxtec.cpp @@ -7,17 +7,22 @@ single PCB with 2x Z80 similar looking to the '1942p' and 'spyhuntpr' PCBs -P2 inputs don't work +P2 inputs don't work in 'cocktail' mode (maybe it's just unsupported on this PCB?) + DIPS etc. are near the 2nd CPU, should it be reading them? visible area is 16 lines less than the original, otherwise you get bad sprites but I think this is probably correct. +some sprites are a bit glitchy when entering playfield (see title screen) +probably an original bug? + */ #include "emu.h" #include "cpu/z80/z80.h" #include "includes/iremipt.h" +#include "sound/ay8910.h" class spartanxtec_state : public driver_device { @@ -28,7 +33,7 @@ public: m_spriteram(*this, "spriteram"), m_scroll_lo(*this, "scroll_lo"), m_scroll_hi(*this, "scroll_hi"), - + m_audiocpu(*this, "audiocpu"), m_palette(*this, "palette"), m_gfxdecode(*this, "gfxdecode") { } @@ -37,6 +42,7 @@ public: required_shared_ptr m_spriteram; required_shared_ptr m_scroll_lo; required_shared_ptr m_scroll_hi; + required_device m_audiocpu; virtual void machine_start() override; virtual void machine_reset() override; @@ -48,7 +54,8 @@ public: tilemap_t* m_bg_tilemap; DECLARE_WRITE8_MEMBER(kungfum_tileram_w); TILE_GET_INFO_MEMBER(get_kungfum_bg_tile_info); - + DECLARE_WRITE8_MEMBER(spartanxtec_soundlatch_w); + DECLARE_WRITE8_MEMBER(a801_w); required_device m_palette; required_device m_gfxdecode; @@ -147,21 +154,33 @@ UINT32 spartanxtec_state::screen_update_spartanxtec(screen_device &screen, bitma +WRITE8_MEMBER(spartanxtec_state::spartanxtec_soundlatch_w) +{ + soundlatch_byte_w(space, 0, data); + m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); +} + +WRITE8_MEMBER(spartanxtec_state::a801_w) +{ + if (data != 0xf0) printf("a801_w %02x\n", data); +} + + static ADDRESS_MAP_START( spartanxtec_map, AS_PROGRAM, 8, spartanxtec_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_SHARE("spriteram") - AM_RANGE(0x8000, 0x8000) AM_WRITENOP + AM_RANGE(0x8000, 0x8000) AM_WRITE(spartanxtec_soundlatch_w) AM_RANGE(0x8100, 0x8100) AM_READ_PORT("DSW1") AM_RANGE(0x8101, 0x8101) AM_READ_PORT("DSW2") AM_RANGE(0x8102, 0x8102) AM_READ_PORT("SYSTEM") AM_RANGE(0x8103, 0x8103) AM_READ_PORT("P1") - AM_RANGE(0x8200, 0x8200) AM_WRITENOP // sound cmd? +// AM_RANGE(0x8200, 0x8200) AM_WRITENOP - AM_RANGE(0xA801, 0xA801) AM_WRITENOP + AM_RANGE(0xA801, 0xA801) AM_WRITE(a801_w) AM_RANGE(0xa900, 0xa903) AM_RAM AM_SHARE("scroll_lo") AM_RANGE(0xa980, 0xa983) AM_RAM AM_SHARE("scroll_hi") @@ -173,10 +192,30 @@ static ADDRESS_MAP_START( spartanxtec_map, AS_PROGRAM, 8, spartanxtec_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( spartanxtec_sound_map, AS_PROGRAM, 8, spartanxtec_state ) + AM_RANGE(0x0000, 0x0000) AM_WRITENOP + AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM + + AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_byte_r) ADDRESS_MAP_END +static ADDRESS_MAP_START( spartanxtec_sound_io, AS_IO, 8, spartanxtec_state ) + ADDRESS_MAP_GLOBAL_MASK(0xff) + AM_RANGE(0x0000, 0x0000) AM_WRITENOP + + AM_RANGE(0x0012, 0x0013) AM_DEVWRITE("ay3", ay8910_device, address_data_w) + AM_RANGE(0x0012, 0x0012) AM_DEVREAD("ay3", ay8910_device, data_r) + + AM_RANGE(0x0014, 0x0015) AM_DEVWRITE("ay1", ay8910_device, address_data_w) + AM_RANGE(0x0014, 0x0014) AM_DEVREAD("ay1", ay8910_device, data_r) + + AM_RANGE(0x0018, 0x0019) AM_DEVWRITE("ay2", ay8910_device, address_data_w) + AM_RANGE(0x0018, 0x0018) AM_DEVREAD("ay2", ay8910_device, data_r) +ADDRESS_MAP_END + + + static INPUT_PORTS_START( spartanxtec ) PORT_START("DSW1") @@ -201,7 +240,7 @@ static INPUT_PORTS_START( spartanxtec ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2") PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Cocktail ) ) + PORT_DIPSETTING( 0x02, "Cocktail (invalid?)" ) PORT_DIPNAME( 0x04, 0x04, "Coin Mode" ) PORT_DIPLOCATION("SW2:3") PORT_DIPSETTING( 0x04, "Mode 1" ) PORT_DIPSETTING( 0x00, "Mode 2" ) @@ -304,14 +343,17 @@ static MACHINE_CONFIG_START( spartanxtec, spartanxtec_state ) MCFG_CPU_PROGRAM_MAP(spartanxtec_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_hold) - MCFG_CPU_ADD("soundcpu", Z80,4000000) + MCFG_CPU_ADD("audiocpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(spartanxtec_sound_map) + MCFG_CPU_IO_MAP(spartanxtec_sound_io) + MCFG_CPU_PERIODIC_INT_DRIVER(spartanxtec_state, irq0_line_hold, 1000) // controls speed of music +// MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_hold) /* video hardware */ - // todo, proper screen timings for this bootleg PCB + // todo, proper screen timings for this bootleg PCB - as visible area is less it's probably ~60hz, not 55 MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(55) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790) /* frames per second and vblank duration from the Lode Runner manual */) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1-16) MCFG_SCREEN_UPDATE_DRIVER(spartanxtec_state, screen_update_spartanxtec) @@ -324,6 +366,14 @@ static MACHINE_CONFIG_START( spartanxtec, spartanxtec_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("ay1", AY8910, 1000000) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + MCFG_SOUND_ADD("ay2", AY8910, 1000000) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + MCFG_SOUND_ADD("ay3", AY8910, 1000000) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + MACHINE_CONFIG_END @@ -333,7 +383,7 @@ ROM_START( spartanxtec ) ROM_LOAD( "1.bin", 0x00000, 0x04000, CRC(d5d6cddf) SHA1(baaec83be455bf2267d51ea2a2c1fcda22f27bd5) ) ROM_LOAD( "2.bin", 0x04000, 0x04000, CRC(2803bb72) SHA1(d0f93c61f3f08fb866e2a4617a7824e72f61c97f) ) - ROM_REGION( 0x10000, "soundcpu", 0 ) + ROM_REGION( 0x10000, "audiocpu", 0 ) ROM_LOAD( "3.bin", 0x00000, 0x01000, CRC(9a18af94) SHA1(1644295aa0c837dced5934360e41d77e0a93ccd1) ) ROM_REGION( 0x6000, "gfx1", ROMREGION_INVERT ) @@ -371,5 +421,5 @@ ROM_END -GAME( 1987, spartanxtec, kungfum, spartanxtec, spartanxtec, driver_device, 0, ROT0, "bootleg (Tecfri)", "Spartan X (Tecfri hardware bootleg)", MACHINE_NOT_WORKING ) +GAME( 1987, spartanxtec, kungfum, spartanxtec, spartanxtec, driver_device, 0, ROT0, "bootleg (Tecfri)", "Spartan X (Tecfri hardware bootleg)", 0 ) From 665cce56ded398ae74738549cb1f119a20694a19 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 05:59:47 +0100 Subject: [PATCH 07/74] pull the tecfri spyhunter bootleg out of the mcr driver, hardware is too different (nw) --- scripts/target/mame/arcade.lua | 1 + src/mame/drivers/mcr3.cpp | 370 ----------------- src/mame/drivers/spyhuntertec.cpp | 654 ++++++++++++++++++++++++++++++ src/mame/includes/mcr3.h | 6 - src/mame/video/mcr3.cpp | 48 --- 5 files changed, 655 insertions(+), 424 deletions(-) create mode 100644 src/mame/drivers/spyhuntertec.cpp diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 32401bb95ff..9a8937f0a78 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -2443,6 +2443,7 @@ files { MAME_DIR .. "src/mame/drivers/mcr3.cpp", MAME_DIR .. "src/mame/includes/mcr3.h", MAME_DIR .. "src/mame/video/mcr3.cpp", + MAME_DIR .. "src/mame/drivers/spyhuntertec.cpp", MAME_DIR .. "src/mame/drivers/mcr68.cpp", MAME_DIR .. "src/mame/includes/mcr68.h", MAME_DIR .. "src/mame/machine/mcr68.cpp", diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp index 150e0f54b32..3d2bc6b2d5b 100644 --- a/src/mame/drivers/mcr3.cpp +++ b/src/mame/drivers/mcr3.cpp @@ -535,51 +535,6 @@ static ADDRESS_MAP_START( spyhunt_portmap, AS_IO, 8, mcr3_state ) ADDRESS_MAP_END - -WRITE8_MEMBER(mcr3_state::spyhuntpr_fd00_w) -{ -} - -static ADDRESS_MAP_START( spyhuntpr_map, AS_PROGRAM, 8, mcr3_state ) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0xa800, 0xa8ff) AM_RAM // the ROM is a solid fill in these areas, and they get tested as RAM, I think they moved the 'real' scroll regs here - AM_RANGE(0xa900, 0xa9ff) AM_RAM - - AM_RANGE(0x0000, 0xdfff) AM_ROM - - - - - AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(spyhunt_videoram_w) AM_SHARE("videoram") - AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_RAM_WRITE(spyhunt_alpharam_w) AM_SHARE("spyhunt_alpha") - AM_RANGE(0xf000, 0xf7ff) AM_RAM //AM_SHARE("nvram") - AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_SHARE("spriteram") - AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_RAM_WRITE(spyhuntpr_paletteram_w) AM_SHARE("paletteram") - - AM_RANGE(0xfc00, 0xfc00) AM_READ_PORT("DSW0") - AM_RANGE(0xfc01, 0xfc01) AM_READ_PORT("DSW1") - AM_RANGE(0xfc02, 0xfc02) AM_READ_PORT("IN2") - AM_RANGE(0xfc03, 0xfc03) AM_READ_PORT("IN3") - - AM_RANGE(0xfd00, 0xfd00) AM_WRITE( spyhuntpr_fd00_w ) - - AM_RANGE(0xfe00, 0xffff) AM_RAM // a modified copy of spriteram for this hw?? -ADDRESS_MAP_END - -WRITE8_MEMBER(mcr3_state::spyhuntpr_port04_w) -{ -} - -static ADDRESS_MAP_START( spyhuntpr_portmap, AS_IO, 8, mcr3_state ) - ADDRESS_MAP_UNMAP_HIGH - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x04, 0x04) AM_WRITE(spyhuntpr_port04_w) - AM_RANGE(0x84, 0x86) AM_WRITE(spyhunt_scroll_value_w) - AM_RANGE(0xe0, 0xe0) AM_WRITENOP // was watchdog -// AM_RANGE(0xe8, 0xe8) AM_WRITENOP - AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) -ADDRESS_MAP_END - /************************************* * * Port definitions @@ -979,109 +934,6 @@ static INPUT_PORTS_START( spyhunt ) PORT_BIT( 0xff, 0x74, IPT_PADDLE ) PORT_MINMAX(0x34,0xb4) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) INPUT_PORTS_END -static INPUT_PORTS_START( spyhuntpr ) - PORT_START("DSW0") - PORT_DIPNAME( 0x01, 0x01, "DSW0-01" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "DSW0-02" ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, "DSW0-04" ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, "DSW0-08" ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, "DSW0-10" ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "DSW0-20" ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "DSW0-40" ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "DSW0-80" ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START("DSW1") - PORT_DIPNAME( 0x01, 0x01, "DSW1-01" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "DSW1-02" ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, "DSW1-08" ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, "DSW1-10" ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "DSW1-20" ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "DSW1-40" ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "DSW1-80" ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START("IN2") - PORT_DIPNAME( 0x0001, 0x0001, "2" ) - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, "start" ) // start - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, "handbrake?" ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, "pedal inverse" ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - - PORT_START("IN3") - PORT_DIPNAME( 0x0001, 0x0001, "3" ) - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, "coin" ) // coin? - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, "machineguns" ) // machine guns - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) -INPUT_PORTS_END /* not verified, no manual found */ static INPUT_PORTS_START( crater ) @@ -1206,52 +1058,6 @@ static const gfx_layout spyhunt_alphalayout = 16*8 }; -static const gfx_layout spyhuntpr_alphalayout = -{ - 16,8, - RGN_FRAC(1,1), - 2, - { 0, 4}, - { 0, 0, 1, 1, 2, 2, 3, 3, 8, 8, 9, 9, 10, 10, 11, 11 }, - { 0, 2*8, 4*8, 6*8, 8*8, 10*8, 12*8, 14*8 }, - 16*8 -}; - - -const gfx_layout spyhuntpr_sprite_layout = -{ - 32,16, - RGN_FRAC(1,4), - 4, - { RGN_FRAC(3,4), RGN_FRAC(2,4), RGN_FRAC(1,4), RGN_FRAC(0,4) }, - { 6,7, 4,5, 2,3, 0,1, 14,15, 12,13, 10,11, 8,9, 22,23, 20,21, 18,19, 16,17, 30,31, 28,29, 26,27, 24,25 }, - { 0*32,1*32,2*32,3*32,4*32,5*32,6*32,7*32,8*32,9*32,10*32,11*32,12*32,13*32,14*32,15*32 }, - - 16*32 -}; - - -static const UINT32 spyhuntp_charlayout_xoffset[64] = -{ - 0x0000*8,0x0000*8, 0x0000*8+1,0x0000*8+1, 0x0000*8+2,0x0000*8+2, 0x0000*8+3,0x0000*8+3, 0x0000*8+4,0x0000*8+4, 0x0000*8+5,0x0000*8+5, 0x0000*8+6,0x0000*8+6, 0x0000*8+7,0x0000*8+7, - 0x1000*8,0x1000*8, 0x1000*8+1,0x1000*8+1, 0x1000*8+2,0x1000*8+2, 0x1000*8+3,0x1000*8+3, 0x1000*8+4,0x1000*8+4, 0x1000*8+5,0x1000*8+5, 0x1000*8+6,0x1000*8+6, 0x1000*8+7,0x1000*8+7, - 0x2000*8,0x2000*8, 0x2000*8+1,0x2000*8+1, 0x2000*8+2,0x2000*8+2, 0x2000*8+3,0x2000*8+3, 0x2000*8+4,0x2000*8+4, 0x2000*8+5,0x2000*8+5, 0x2000*8+6,0x2000*8+6, 0x2000*8+7,0x2000*8+7, - 0x3000*8,0x3000*8, 0x3000*8+1,0x3000*8+1, 0x3000*8+2,0x3000*8+2, 0x3000*8+3,0x3000*8+3, 0x3000*8+4,0x3000*8+4, 0x3000*8+5,0x3000*8+5, 0x3000*8+6,0x3000*8+6, 0x3000*8+7,0x3000*8+7, -}; - - -static const gfx_layout spyhuntpr_charlayout = -{ - 64,16, - RGN_FRAC(1,8), - 4, - { 0*8, 0x4000*8 + 2*8, 0x4000*8 + 0*8, 2*8 }, - EXTENDED_XOFFS, - { 0*8, 4*8, 8*8, 12*8, 16*8, 20*8, 24*8, 28*8, 1*8, 5*8, 9*8, 13*8, 17*8, 21*8, 25*8, 29*8 }, - 32*8, - spyhuntp_charlayout_xoffset, - nullptr -}; static GFXDECODE_START( mcr3 ) GFXDECODE_SCALE( "gfx1", 0, mcr_bg_layout, 0, 4, 2, 2 ) @@ -1265,11 +1071,6 @@ static GFXDECODE_START( spyhunt ) GFXDECODE_ENTRY( "gfx3", 0, spyhunt_alphalayout, 4*16, 1 ) GFXDECODE_END -static GFXDECODE_START( spyhuntpr ) - GFXDECODE_ENTRY( "gfx1", 0, spyhuntpr_charlayout, 3*16, 1 ) - GFXDECODE_ENTRY( "gfx2", 0, spyhuntpr_sprite_layout, 0*16, 4 ) - GFXDECODE_ENTRY( "gfx3", 0, spyhuntpr_alphalayout, 4*16, 1 ) -GFXDECODE_END /************************************* * @@ -1379,78 +1180,6 @@ MACHINE_CONFIG_END -static ADDRESS_MAP_START( spyhuntpr_sound_map, AS_PROGRAM, 8, mcr3_state ) - AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_RAM -// AM_RANGE(0xfe00, 0xffff) AM_RAM -ADDRESS_MAP_END - -static ADDRESS_MAP_START( spyhuntpr_sound_portmap, AS_IO, 8, mcr3_state ) - ADDRESS_MAP_UNMAP_HIGH - ADDRESS_MAP_GLOBAL_MASK(0xff) - - AM_RANGE(0x12, 0x13) AM_DEVWRITE("ay1", ay8912_device, address_data_w) - AM_RANGE(0x14, 0x15) AM_DEVWRITE("ay2", ay8912_device, address_data_w) - AM_RANGE(0x18, 0x19) AM_DEVWRITE("ay3", ay8912_device, address_data_w) - -ADDRESS_MAP_END - - - -static MACHINE_CONFIG_START( spyhuntpr, mcr3_state ) - -// note: no ctc, no nvram -// 2*z80, 3*ay8912 - - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) - MCFG_CPU_PROGRAM_MAP(spyhuntpr_map) - MCFG_CPU_IO_MAP(spyhuntpr_portmap) - MCFG_CPU_CONFIG(mcr_daisy_chain) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mcr3_state, mcr_interrupt, "screen", 0, 1) - - MCFG_DEVICE_ADD("ctc", Z80CTC, MASTER_CLOCK/4 /* same as "maincpu" */) - MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc", z80ctc_device, trg1)) - - //MCFG_WATCHDOG_VBLANK_INIT(16) - MCFG_MACHINE_START_OVERRIDE(mcr3_state,mcr) - MCFG_MACHINE_RESET_OVERRIDE(mcr3_state,mcr) - -// MCFG_NVRAM_ADD_0FILL("nvram") - - /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) - MCFG_SCREEN_SIZE(30*16, 30*8) - MCFG_SCREEN_VISIBLE_AREA(0, 30*16-1, 0, 30*8-1) - MCFG_SCREEN_UPDATE_DRIVER(mcr3_state, screen_update_spyhuntpr) - MCFG_SCREEN_PALETTE("palette") - - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spyhuntpr) - MCFG_PALETTE_ADD("palette", 64+4) - - MCFG_PALETTE_INIT_OWNER(mcr3_state,spyhunt) - MCFG_VIDEO_START_OVERRIDE(mcr3_state,spyhuntpr) - - - MCFG_CPU_ADD("audiocpu", Z80, 3000000 ) - MCFG_CPU_PROGRAM_MAP(spyhuntpr_sound_map) - MCFG_CPU_IO_MAP(spyhuntpr_sound_portmap) -// MCFG_CPU_PERIODIC_INT_DRIVER(mcr3_state, irq0_line_hold, 4*60) - - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_SOUND_ADD("ay1", AY8912, 3000000/2) // AY-3-8912 - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("ay2", AY8912, 3000000/2) // " - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("ay3", AY8912, 3000000/2) // " - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - -MACHINE_CONFIG_END @@ -1729,93 +1458,6 @@ ROM_START( spyhuntp ) ROM_END -ROM_START( spyhuntpr ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "1.bin", 0x0000, 0x4000, CRC(2a2f77cb) SHA1(e1b74c951efb2a49bef0507ab3268b274515f339) ) - ROM_LOAD( "2.bin", 0x4000, 0x4000, CRC(00778aff) SHA1(7c0b24c393f841e8379d4bba57ba502e3d2512f9) ) - ROM_LOAD( "3.bin", 0x8000, 0x4000, CRC(2183b4af) SHA1(2b958afc40b26c9bc8d5254b0600426649f4ebf0) ) - ROM_LOAD( "4.bin", 0xc000, 0x2000, CRC(3ea6a65c) SHA1(1320ce17044307ed3c4f2459631a9aa1734f1f30) ) - - ROM_REGION( 0x10000, "audiocpu", 0 ) - ROM_LOAD( "5.bin", 0x0000, 0x2000, CRC(33fe2829) SHA1(e6950dbf681242bf23542ca6604e62eacb431101) ) - - - ROM_REGION( 0x08000, "gfx1", 0 ) - ROM_LOAD32_BYTE( "6.bin", 0x0000, 0x200, CRC(6b76f46a) SHA1(4b398084c42a60fcfa4a9bf14f844e36a3f42723) ) - ROM_CONTINUE(0x0001, 0x200) - ROM_CONTINUE(0x0800, 0x200) - ROM_CONTINUE(0x0801, 0x200) - ROM_CONTINUE(0x1000, 0x200) - ROM_CONTINUE(0x1001, 0x200) - ROM_CONTINUE(0x1800, 0x200) - ROM_CONTINUE(0x1801, 0x200) - ROM_CONTINUE(0x2000, 0x200) - ROM_CONTINUE(0x2001, 0x200) - ROM_CONTINUE(0x2800, 0x200) - ROM_CONTINUE(0x2801, 0x200) - ROM_CONTINUE(0x3000, 0x200) - ROM_CONTINUE(0x3001, 0x200) - ROM_CONTINUE(0x3800, 0x200) - ROM_CONTINUE(0x3801, 0x200) - ROM_LOAD32_BYTE( "7.bin", 0x0002, 0x200, CRC(085bd7a7) SHA1(c35c309b6c6485baec54d4434dea44abf4d48f41) ) - ROM_CONTINUE(0x0003, 0x200) - ROM_CONTINUE(0x0802, 0x200) - ROM_CONTINUE(0x0803, 0x200) - ROM_CONTINUE(0x1002, 0x200) - ROM_CONTINUE(0x1003, 0x200) - ROM_CONTINUE(0x1802, 0x200) - ROM_CONTINUE(0x1803, 0x200) - ROM_CONTINUE(0x2002, 0x200) - ROM_CONTINUE(0x2003, 0x200) - ROM_CONTINUE(0x2802, 0x200) - ROM_CONTINUE(0x2803, 0x200) - ROM_CONTINUE(0x3002, 0x200) - ROM_CONTINUE(0x3003, 0x200) - ROM_CONTINUE(0x3802, 0x200) - ROM_CONTINUE(0x3803, 0x200) - ROM_LOAD32_BYTE( "8.bin", 0x4000, 0x200, CRC(e699b329) SHA1(cb4b8c7b6fa1cb1144a18f1442dc3b267c408914) ) - ROM_CONTINUE(0x4001, 0x200) - ROM_CONTINUE(0x4800, 0x200) - ROM_CONTINUE(0x4801, 0x200) - ROM_CONTINUE(0x5000, 0x200) - ROM_CONTINUE(0x5001, 0x200) - ROM_CONTINUE(0x5800, 0x200) - ROM_CONTINUE(0x5801, 0x200) - ROM_CONTINUE(0x6000, 0x200) - ROM_CONTINUE(0x6001, 0x200) - ROM_CONTINUE(0x6800, 0x200) - ROM_CONTINUE(0x6801, 0x200) - ROM_CONTINUE(0x7000, 0x200) - ROM_CONTINUE(0x7001, 0x200) - ROM_CONTINUE(0x7800, 0x200) - ROM_CONTINUE(0x7801, 0x200) - ROM_LOAD32_BYTE( "9.bin", 0x4002, 0x200, CRC(6d462ec7) SHA1(0ff37f75b0eeceb86177a3f7c93834d5c0e24515) ) - ROM_CONTINUE(0x4003, 0x200) - ROM_CONTINUE(0x4802, 0x200) - ROM_CONTINUE(0x4803, 0x200) - ROM_CONTINUE(0x5002, 0x200) - ROM_CONTINUE(0x5003, 0x200) - ROM_CONTINUE(0x5802, 0x200) - ROM_CONTINUE(0x5803, 0x200) - ROM_CONTINUE(0x6002, 0x200) - ROM_CONTINUE(0x6003, 0x200) - ROM_CONTINUE(0x6802, 0x200) - ROM_CONTINUE(0x6803, 0x200) - ROM_CONTINUE(0x7002, 0x200) - ROM_CONTINUE(0x7003, 0x200) - ROM_CONTINUE(0x7802, 0x200) - ROM_CONTINUE(0x7803, 0x200) - - ROM_REGION( 0x10000, "gfx2", ROMREGION_INVERT ) - ROM_LOAD( "10.bin", 0x00000, 0x4000, CRC(6f9fd416) SHA1(a51c86e5b22c91fc44673f53400b58af40b18065) ) - ROM_LOAD( "11.bin", 0x04000, 0x4000, CRC(75526ffe) SHA1(ff1adf6f9b6595114d0bd06b72d9eb7bbf70144d) ) - ROM_LOAD( "12.bin", 0x08000, 0x4000, CRC(82ee7a4d) SHA1(184720de76680275bf7c4a171f03a0ce771d91fc) ) - ROM_LOAD( "13.bin", 0x0c000, 0x4000, CRC(0cc592a3) SHA1(b3563bde83432cdbaedb88d4d222da30bf679b08) ) - - - ROM_REGION( 0x01000, "gfx3", 0 ) - ROM_LOAD( "14.bin", 0x00000, 0x1000, CRC(87a4c130) SHA1(7792afdc36b0f3bd51c387d04d38f60c85fd2e93) ) -ROM_END ROM_START( crater ) @@ -1976,16 +1618,7 @@ DRIVER_INIT_MEMBER(mcr3_state,spyhunt) m_spyhunt_scroll_offset = 16; } -DRIVER_INIT_MEMBER(mcr3_state,spyhuntpr) -{ - mcr_common_init(); -// machine().device("ssio")->set_custom_input(1, 0x60, read8_delegate(FUNC(mcr3_state::spyhunt_ip1_r),this)); -// machine().device("ssio")->set_custom_input(2, 0xff, read8_delegate(FUNC(mcr3_state::spyhunt_ip2_r),this)); -// machine().device("ssio")->set_custom_output(4, 0xff, write8_delegate(FUNC(mcr3_state::spyhunt_op4_w),this)); - m_spyhunt_sprite_color_mask = 0x00; - m_spyhunt_scroll_offset = 16; -} DRIVER_INIT_MEMBER(mcr3_state,crater) { @@ -2036,6 +1669,3 @@ GAMEL(1983, spyhuntp, spyhunt, mcrsc_csd, spyhunt, mcr3_state, spyhunt, ROT9 GAME( 1984, crater, 0, mcrscroll, crater, mcr3_state, crater, ORIENTATION_FLIP_X, "Bally Midway", "Crater Raider", MACHINE_SUPPORTS_SAVE ) GAMEL(1985, turbotag, 0, mcrsc_csd, turbotag, mcr3_state, turbotag, ROT90, "Bally Midway", "Turbo Tag (prototype)", MACHINE_SUPPORTS_SAVE, layout_turbotag ) -// very different hardware, probably bootleg despite the license text printed on the PCB, similar to '1942p' in 1942.c. Probably should be put in separate driver. -// PCB made by Tecfri for Recreativos Franco S.A. in Spain, has Bally Midway logo, and licensing text on the PCB. Board is dated '85' so seems to be a low-cost rebuild? it is unclear if it made it to market. -GAME (1983, spyhuntpr,spyhunt, spyhuntpr, spyhuntpr,mcr3_state, spyhuntpr,ROT90, "Bally Midway (Recreativos Franco S.A. license)", "Spy Hunter (Spain, Tecfri / Recreativos Franco S.A. PCB)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp new file mode 100644 index 00000000000..e384fdf8a77 --- /dev/null +++ b/src/mame/drivers/spyhuntertec.cpp @@ -0,0 +1,654 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood +/* + +Spy Hunter(Tecfri bootleg) +single PCB with 2x Z80 + +significant changes compared to original HW +non-interlaced + +*/ + +#include "emu.h" +#include "cpu/z80/z80.h" +#include "sound/ay8910.h" +#include "machine/z80ctc.h" // not actually present here? + +#define MASTER_CLOCK XTAL_20MHz // ?? + +class spyhuntertec_state : public driver_device +{ +public: + spyhuntertec_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), + m_audiocpu(*this, "audiocpu"), + m_videoram(*this, "videoram"), + m_spriteram(*this, "spriteram"), + m_paletteram(*this, "paletteram"), + m_spyhunt_alpharam(*this, "spyhunt_alpha"), + m_palette(*this, "palette"), + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") + { } + + + required_device m_audiocpu; + required_shared_ptr m_videoram; + required_shared_ptr m_spriteram; + required_shared_ptr m_paletteram; + required_shared_ptr m_spyhunt_alpharam; + + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + + + required_device m_palette; + required_device m_gfxdecode; + required_device m_screen; + + UINT8 m_spyhunt_sprite_color_mask; + INT16 m_spyhunt_scroll_offset; + INT16 m_spyhunt_scrollx; + INT16 m_spyhunt_scrolly; + + int mcr_cocktail_flip; + + tilemap_t *m_alpha_tilemap; + tilemap_t *m_bg_tilemap; + DECLARE_WRITE8_MEMBER(spyhuntertec_paletteram_w); + DECLARE_DRIVER_INIT(spyhuntertec); +// DECLARE_VIDEO_START(spyhuntertec); +// UINT32 screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_WRITE8_MEMBER(spyhuntertec_port04_w); + DECLARE_WRITE8_MEMBER(spyhuntertec_fd00_w); + + DECLARE_WRITE8_MEMBER(spyhunt_videoram_w); + DECLARE_WRITE8_MEMBER(spyhunt_alpharam_w); + DECLARE_WRITE8_MEMBER(spyhunt_scroll_value_w); + + TILEMAP_MAPPER_MEMBER(spyhunt_bg_scan); + TILE_GET_INFO_MEMBER(spyhunt_get_bg_tile_info); + TILE_GET_INFO_MEMBER(spyhunt_get_alpha_tile_info); + void mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int color_mask, int code_xor, int dx, int dy, int interlaced); + + +}; + + + +WRITE8_MEMBER(spyhuntertec_state::spyhunt_videoram_w) +{ + UINT8 *videoram = m_videoram; + videoram[offset] = data; + m_bg_tilemap->mark_tile_dirty(offset); +} + + +WRITE8_MEMBER(spyhuntertec_state::spyhunt_alpharam_w) +{ + m_spyhunt_alpharam[offset] = data; + m_alpha_tilemap->mark_tile_dirty(offset); +} + + +WRITE8_MEMBER(spyhuntertec_state::spyhunt_scroll_value_w) +{ + switch (offset) + { + case 0: + /* low 8 bits of horizontal scroll */ + m_spyhunt_scrollx = (m_spyhunt_scrollx & ~0xff) | data; + break; + + case 1: + /* upper 3 bits of horizontal scroll and upper 1 bit of vertical scroll */ + m_spyhunt_scrollx = (m_spyhunt_scrollx & 0xff) | ((data & 0x07) << 8); + m_spyhunt_scrolly = (m_spyhunt_scrolly & 0xff) | ((data & 0x80) << 1); + break; + + case 2: + /* low 8 bits of vertical scroll */ + m_spyhunt_scrolly = (m_spyhunt_scrolly & ~0xff) | data; + break; + } +} + + +WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_paletteram_w) +{ + m_paletteram[offset] = data; + offset = (offset & 0x0f) | (offset & 0x60) >> 1; + + int r = (data & 0x07) >> 0; + int g = (data & 0x38) >> 3; + int b = (data & 0xc0) >> 6; + + m_palette->set_pen_color(offset^0xf, rgb_t(r<<5,g<<5,b<<6)); +} + + +TILEMAP_MAPPER_MEMBER(spyhuntertec_state::spyhunt_bg_scan) +{ + /* logical (col,row) -> memory offset */ + return (row & 0x0f) | ((col & 0x3f) << 4) | ((row & 0x10) << 6); +} + + +TILE_GET_INFO_MEMBER(spyhuntertec_state::spyhunt_get_bg_tile_info) +{ + UINT8 *videoram = m_videoram; + int data = videoram[tile_index]; + int code = (data & 0x3f) | ((data >> 1) & 0x40); + SET_TILE_INFO_MEMBER(0, code, 0, (data & 0x40) ? TILE_FLIPY : 0); +} + + +TILE_GET_INFO_MEMBER(spyhuntertec_state::spyhunt_get_alpha_tile_info) +{ + SET_TILE_INFO_MEMBER(2, m_spyhunt_alpharam[tile_index], 0, 0); +} + + + +void spyhuntertec_state::video_start() +{ + /* initialize the background tilemap */ + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spyhuntertec_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(spyhuntertec_state::spyhunt_bg_scan),this), 64,16, 64,32); + + /* initialize the text tilemap */ + m_alpha_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spyhuntertec_state::spyhunt_get_alpha_tile_info),this), TILEMAP_SCAN_COLS, 16,8, 32,32); + m_alpha_tilemap->set_transparent_pen(0); + m_alpha_tilemap->set_scrollx(0, 16); + + save_item(NAME(m_spyhunt_sprite_color_mask)); + save_item(NAME(m_spyhunt_scrollx)); + save_item(NAME(m_spyhunt_scrolly)); + save_item(NAME(m_spyhunt_scroll_offset)); +} + + + + +void spyhuntertec_state::mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int color_mask, int code_xor, int dx, int dy, int interlaced) +{ + UINT8 *spriteram = m_spriteram; + int offs; + + m_screen->priority().fill(1, cliprect); + + /* loop over sprite RAM */ + for (offs = m_spriteram.bytes() - 4; offs >= 0; offs -= 4) + { + int code, color, flipx, flipy, sx, sy, flags; + + /* skip if zero */ + if (spriteram[offs] == 0) + continue; + +/* + monoboard: + flags.d0 -> ICG0~ -> PCG0~/PCG2~/PCG4~/PCG6~ -> bit 4 of linebuffer + flags.d1 -> ICG1~ -> PCG1~/PCG3~/PCG5~/PCG7~ -> bit 5 of linebuffer + flags.d2 -> IPPR -> PPR0 /PPR1 /PPR2 /PPR3 -> bit 6 of linebuffer + flags.d3 -> IRA15 ----------------------------> address line 15 of FG ROMs + flags.d4 -> HFLIP + flags.d5 -> VFLIP + +*/ + + /* extract the bits of information */ + flags = spriteram[offs + 1]; + code = spriteram[offs + 2] + 256 * ((flags >> 3) & 0x01); + color = ~flags & color_mask; + flipx = flags & 0x10; + flipy = flags & 0x20; + sx = (spriteram[offs + 3] - 3) * 2; + sy = (241 - spriteram[offs]); + + if (interlaced == 1) sy *= 2; + + code ^= code_xor; + + sx += dx; + sy += dy; + + /* sprites use color 0 for background pen and 8 for the 'under tile' pen. + The color 8 is used to cover over other sprites. */ + if (!mcr_cocktail_flip) + { + /* first draw the sprite, visible */ + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, + screen.priority(), 0x00, 0x0101); + + /* then draw the mask, behind the background but obscuring following sprites */ + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, + screen.priority(), 0x02, 0xfeff); + } + else + { + /* first draw the sprite, visible */ + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, !flipx, !flipy, 480 - sx, 452 - sy, + screen.priority(), 0x00, 0x0101); + + /* then draw the mask, behind the background but obscuring following sprites */ + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, !flipx, !flipy, 480 - sx, 452 - sy, + screen.priority(), 0x02, 0xfeff); + } + } +} + + +UINT32 spyhuntertec_state::screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + /* for every character in the Video RAM, check if it has been modified */ + /* since last time and update it accordingly. */ + m_bg_tilemap->set_scrollx(0, m_spyhunt_scrollx * 2 + m_spyhunt_scroll_offset); + m_bg_tilemap->set_scrolly(0, m_spyhunt_scrolly * 2); + m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); + + /* draw the sprites */ + mcr3_update_sprites(screen, bitmap, cliprect, m_spyhunt_sprite_color_mask, 0, -12, 0, 0); + + /* render any characters on top */ + m_alpha_tilemap->draw(screen, bitmap, cliprect, 0, 0); + return 0; +} + + + +WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_fd00_w) +{ +} + +static ADDRESS_MAP_START( spyhuntertec_map, AS_PROGRAM, 8, spyhuntertec_state ) + ADDRESS_MAP_UNMAP_HIGH + AM_RANGE(0xa800, 0xa8ff) AM_RAM // the ROM is a solid fill in these areas, and they get tested as RAM, I think they moved the 'real' scroll regs here + AM_RANGE(0xa900, 0xa9ff) AM_RAM + + AM_RANGE(0x0000, 0xdfff) AM_ROM + + AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(spyhunt_videoram_w) AM_SHARE("videoram") + AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_RAM_WRITE(spyhunt_alpharam_w) AM_SHARE("spyhunt_alpha") + AM_RANGE(0xf000, 0xf7ff) AM_RAM //AM_SHARE("nvram") + AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_SHARE("spriteram") + AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_RAM_WRITE(spyhuntertec_paletteram_w) AM_SHARE("paletteram") + + AM_RANGE(0xfc00, 0xfc00) AM_READ_PORT("DSW0") + AM_RANGE(0xfc01, 0xfc01) AM_READ_PORT("DSW1") + AM_RANGE(0xfc02, 0xfc02) AM_READ_PORT("IN2") + AM_RANGE(0xfc03, 0xfc03) AM_READ_PORT("IN3") + + AM_RANGE(0xfd00, 0xfd00) AM_WRITE( spyhuntertec_fd00_w ) + + AM_RANGE(0xfe00, 0xffff) AM_RAM // a modified copy of spriteram for this hw?? +ADDRESS_MAP_END + +WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_port04_w) +{ +} + +static ADDRESS_MAP_START( spyhuntertec_portmap, AS_IO, 8, spyhuntertec_state ) + ADDRESS_MAP_UNMAP_HIGH + ADDRESS_MAP_GLOBAL_MASK(0xff) + AM_RANGE(0x04, 0x04) AM_WRITE(spyhuntertec_port04_w) + AM_RANGE(0x84, 0x86) AM_WRITE(spyhunt_scroll_value_w) + AM_RANGE(0xe0, 0xe0) AM_WRITENOP // was watchdog +// AM_RANGE(0xe8, 0xe8) AM_WRITENOP +// AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) +ADDRESS_MAP_END + + +static ADDRESS_MAP_START( spyhuntertec_sound_map, AS_PROGRAM, 8, spyhuntertec_state ) + AM_RANGE(0x0000, 0x1fff) AM_ROM + AM_RANGE(0x8000, 0x83ff) AM_RAM +// AM_RANGE(0xfe00, 0xffff) AM_RAM +ADDRESS_MAP_END + +static ADDRESS_MAP_START( spyhuntertec_sound_portmap, AS_IO, 8, spyhuntertec_state ) + ADDRESS_MAP_UNMAP_HIGH + ADDRESS_MAP_GLOBAL_MASK(0xff) + + AM_RANGE(0x12, 0x13) AM_DEVWRITE("ay1", ay8912_device, address_data_w) + AM_RANGE(0x14, 0x15) AM_DEVWRITE("ay2", ay8912_device, address_data_w) + AM_RANGE(0x18, 0x19) AM_DEVWRITE("ay3", ay8912_device, address_data_w) + +ADDRESS_MAP_END + + + +static INPUT_PORTS_START( spyhuntertec ) + PORT_START("DSW0") + PORT_DIPNAME( 0x01, 0x01, "DSW0-01" ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, "DSW0-02" ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, "DSW0-04" ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, "DSW0-08" ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, "DSW0-10" ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, "DSW0-20" ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, "DSW0-40" ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, "DSW0-80" ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_START("DSW1") + PORT_DIPNAME( 0x01, 0x01, "DSW1-01" ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, "DSW1-02" ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) + PORT_DIPNAME( 0x08, 0x08, "DSW1-08" ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, "DSW1-10" ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, "DSW1-20" ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, "DSW1-40" ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, "DSW1-80" ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_START("IN2") + PORT_DIPNAME( 0x0001, 0x0001, "2" ) + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, "start" ) // start + PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, "handbrake?" ) + PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, "pedal inverse" ) + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + + PORT_START("IN3") + PORT_DIPNAME( 0x0001, 0x0001, "3" ) + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, "coin" ) // coin? + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, "machineguns" ) // machine guns + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) +INPUT_PORTS_END + + +static const gfx_layout spyhuntertec_alphalayout = +{ + 16,8, + RGN_FRAC(1,1), + 2, + { 0, 4}, + { 0, 0, 1, 1, 2, 2, 3, 3, 8, 8, 9, 9, 10, 10, 11, 11 }, + { 0, 2*8, 4*8, 6*8, 8*8, 10*8, 12*8, 14*8 }, + 16*8 +}; + + +const gfx_layout spyhuntertec_sprite_layout = +{ + 32,16, + RGN_FRAC(1,4), + 4, + { RGN_FRAC(3,4), RGN_FRAC(2,4), RGN_FRAC(1,4), RGN_FRAC(0,4) }, + { 6,7, 4,5, 2,3, 0,1, 14,15, 12,13, 10,11, 8,9, 22,23, 20,21, 18,19, 16,17, 30,31, 28,29, 26,27, 24,25 }, + { 0*32,1*32,2*32,3*32,4*32,5*32,6*32,7*32,8*32,9*32,10*32,11*32,12*32,13*32,14*32,15*32 }, + + 16*32 +}; + + +static const UINT32 spyhuntp_charlayout_xoffset[64] = +{ + 0x0000*8,0x0000*8, 0x0000*8+1,0x0000*8+1, 0x0000*8+2,0x0000*8+2, 0x0000*8+3,0x0000*8+3, 0x0000*8+4,0x0000*8+4, 0x0000*8+5,0x0000*8+5, 0x0000*8+6,0x0000*8+6, 0x0000*8+7,0x0000*8+7, + 0x1000*8,0x1000*8, 0x1000*8+1,0x1000*8+1, 0x1000*8+2,0x1000*8+2, 0x1000*8+3,0x1000*8+3, 0x1000*8+4,0x1000*8+4, 0x1000*8+5,0x1000*8+5, 0x1000*8+6,0x1000*8+6, 0x1000*8+7,0x1000*8+7, + 0x2000*8,0x2000*8, 0x2000*8+1,0x2000*8+1, 0x2000*8+2,0x2000*8+2, 0x2000*8+3,0x2000*8+3, 0x2000*8+4,0x2000*8+4, 0x2000*8+5,0x2000*8+5, 0x2000*8+6,0x2000*8+6, 0x2000*8+7,0x2000*8+7, + 0x3000*8,0x3000*8, 0x3000*8+1,0x3000*8+1, 0x3000*8+2,0x3000*8+2, 0x3000*8+3,0x3000*8+3, 0x3000*8+4,0x3000*8+4, 0x3000*8+5,0x3000*8+5, 0x3000*8+6,0x3000*8+6, 0x3000*8+7,0x3000*8+7, +}; + + +static const gfx_layout spyhuntertec_charlayout = +{ + 64,16, + RGN_FRAC(1,8), + 4, + { 0*8, 0x4000*8 + 2*8, 0x4000*8 + 0*8, 2*8 }, + EXTENDED_XOFFS, + { 0*8, 4*8, 8*8, 12*8, 16*8, 20*8, 24*8, 28*8, 1*8, 5*8, 9*8, 13*8, 17*8, 21*8, 25*8, 29*8 }, + 32*8, + spyhuntp_charlayout_xoffset, + nullptr +}; + + +static GFXDECODE_START( spyhuntertec ) + GFXDECODE_ENTRY( "gfx1", 0, spyhuntertec_charlayout, 3*16, 1 ) + GFXDECODE_ENTRY( "gfx2", 0, spyhuntertec_sprite_layout, 0*16, 4 ) + GFXDECODE_ENTRY( "gfx3", 0, spyhuntertec_alphalayout, 4*16, 1 ) +GFXDECODE_END + + + +void spyhuntertec_state::machine_start() +{ +} + +void spyhuntertec_state::machine_reset() +{ +} + + + + +static MACHINE_CONFIG_START( spyhuntertec, spyhuntertec_state ) + +// note: no ctc, no nvram +// 2*z80, 3*ay8912 + + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) + MCFG_CPU_PROGRAM_MAP(spyhuntertec_map) + MCFG_CPU_IO_MAP(spyhuntertec_portmap) +// MCFG_CPU_CONFIG(mcr_daisy_chain) +// MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", spyhuntertec_state, mcr_interrupt, "screen", 0, 1) + +// MCFG_DEVICE_ADD("ctc", Z80CTC, MASTER_CLOCK/4 /* same as "maincpu" */) +// MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) +// MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc", z80ctc_device, trg1)) + + //MCFG_WATCHDOG_VBLANK_INIT(16) +// MCFG_MACHINE_START_OVERRIDE(spyhuntertec_state,mcr) +// MCFG_MACHINE_RESET_OVERRIDE(spyhuntertec_state,mcr) + +// MCFG_NVRAM_ADD_0FILL("nvram") + + /* video hardware */ + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) + MCFG_SCREEN_SIZE(30*16, 30*8) + MCFG_SCREEN_VISIBLE_AREA(0, 30*16-1, 0, 30*8-1) + MCFG_SCREEN_UPDATE_DRIVER(spyhuntertec_state, screen_update_spyhuntertec) + MCFG_SCREEN_PALETTE("palette") + + MCFG_GFXDECODE_ADD("gfxdecode", "palette", spyhuntertec) + MCFG_PALETTE_ADD("palette", 64+4) + +// MCFG_PALETTE_INIT_OWNER(spyhuntertec_state,spyhunt) + + + MCFG_CPU_ADD("audiocpu", Z80, 3000000 ) + MCFG_CPU_PROGRAM_MAP(spyhuntertec_sound_map) + MCFG_CPU_IO_MAP(spyhuntertec_sound_portmap) +// MCFG_CPU_PERIODIC_INT_DRIVER(spyhuntertec_state, irq0_line_hold, 4*60) + + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("ay1", AY8912, 3000000/2) // AY-3-8912 + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + MCFG_SOUND_ADD("ay2", AY8912, 3000000/2) // " + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + MCFG_SOUND_ADD("ay3", AY8912, 3000000/2) // " + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + +MACHINE_CONFIG_END + + + + +ROM_START( spyhuntpr ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "1.bin", 0x0000, 0x4000, CRC(2a2f77cb) SHA1(e1b74c951efb2a49bef0507ab3268b274515f339) ) + ROM_LOAD( "2.bin", 0x4000, 0x4000, CRC(00778aff) SHA1(7c0b24c393f841e8379d4bba57ba502e3d2512f9) ) + ROM_LOAD( "3.bin", 0x8000, 0x4000, CRC(2183b4af) SHA1(2b958afc40b26c9bc8d5254b0600426649f4ebf0) ) + ROM_LOAD( "4.bin", 0xc000, 0x2000, CRC(3ea6a65c) SHA1(1320ce17044307ed3c4f2459631a9aa1734f1f30) ) + + ROM_REGION( 0x10000, "audiocpu", 0 ) + ROM_LOAD( "5.bin", 0x0000, 0x2000, CRC(33fe2829) SHA1(e6950dbf681242bf23542ca6604e62eacb431101) ) + + + ROM_REGION( 0x08000, "gfx1", 0 ) + ROM_LOAD32_BYTE( "6.bin", 0x0000, 0x200, CRC(6b76f46a) SHA1(4b398084c42a60fcfa4a9bf14f844e36a3f42723) ) + ROM_CONTINUE(0x0001, 0x200) + ROM_CONTINUE(0x0800, 0x200) + ROM_CONTINUE(0x0801, 0x200) + ROM_CONTINUE(0x1000, 0x200) + ROM_CONTINUE(0x1001, 0x200) + ROM_CONTINUE(0x1800, 0x200) + ROM_CONTINUE(0x1801, 0x200) + ROM_CONTINUE(0x2000, 0x200) + ROM_CONTINUE(0x2001, 0x200) + ROM_CONTINUE(0x2800, 0x200) + ROM_CONTINUE(0x2801, 0x200) + ROM_CONTINUE(0x3000, 0x200) + ROM_CONTINUE(0x3001, 0x200) + ROM_CONTINUE(0x3800, 0x200) + ROM_CONTINUE(0x3801, 0x200) + ROM_LOAD32_BYTE( "7.bin", 0x0002, 0x200, CRC(085bd7a7) SHA1(c35c309b6c6485baec54d4434dea44abf4d48f41) ) + ROM_CONTINUE(0x0003, 0x200) + ROM_CONTINUE(0x0802, 0x200) + ROM_CONTINUE(0x0803, 0x200) + ROM_CONTINUE(0x1002, 0x200) + ROM_CONTINUE(0x1003, 0x200) + ROM_CONTINUE(0x1802, 0x200) + ROM_CONTINUE(0x1803, 0x200) + ROM_CONTINUE(0x2002, 0x200) + ROM_CONTINUE(0x2003, 0x200) + ROM_CONTINUE(0x2802, 0x200) + ROM_CONTINUE(0x2803, 0x200) + ROM_CONTINUE(0x3002, 0x200) + ROM_CONTINUE(0x3003, 0x200) + ROM_CONTINUE(0x3802, 0x200) + ROM_CONTINUE(0x3803, 0x200) + ROM_LOAD32_BYTE( "8.bin", 0x4000, 0x200, CRC(e699b329) SHA1(cb4b8c7b6fa1cb1144a18f1442dc3b267c408914) ) + ROM_CONTINUE(0x4001, 0x200) + ROM_CONTINUE(0x4800, 0x200) + ROM_CONTINUE(0x4801, 0x200) + ROM_CONTINUE(0x5000, 0x200) + ROM_CONTINUE(0x5001, 0x200) + ROM_CONTINUE(0x5800, 0x200) + ROM_CONTINUE(0x5801, 0x200) + ROM_CONTINUE(0x6000, 0x200) + ROM_CONTINUE(0x6001, 0x200) + ROM_CONTINUE(0x6800, 0x200) + ROM_CONTINUE(0x6801, 0x200) + ROM_CONTINUE(0x7000, 0x200) + ROM_CONTINUE(0x7001, 0x200) + ROM_CONTINUE(0x7800, 0x200) + ROM_CONTINUE(0x7801, 0x200) + ROM_LOAD32_BYTE( "9.bin", 0x4002, 0x200, CRC(6d462ec7) SHA1(0ff37f75b0eeceb86177a3f7c93834d5c0e24515) ) + ROM_CONTINUE(0x4003, 0x200) + ROM_CONTINUE(0x4802, 0x200) + ROM_CONTINUE(0x4803, 0x200) + ROM_CONTINUE(0x5002, 0x200) + ROM_CONTINUE(0x5003, 0x200) + ROM_CONTINUE(0x5802, 0x200) + ROM_CONTINUE(0x5803, 0x200) + ROM_CONTINUE(0x6002, 0x200) + ROM_CONTINUE(0x6003, 0x200) + ROM_CONTINUE(0x6802, 0x200) + ROM_CONTINUE(0x6803, 0x200) + ROM_CONTINUE(0x7002, 0x200) + ROM_CONTINUE(0x7003, 0x200) + ROM_CONTINUE(0x7802, 0x200) + ROM_CONTINUE(0x7803, 0x200) + + ROM_REGION( 0x10000, "gfx2", ROMREGION_INVERT ) + ROM_LOAD( "10.bin", 0x00000, 0x4000, CRC(6f9fd416) SHA1(a51c86e5b22c91fc44673f53400b58af40b18065) ) + ROM_LOAD( "11.bin", 0x04000, 0x4000, CRC(75526ffe) SHA1(ff1adf6f9b6595114d0bd06b72d9eb7bbf70144d) ) + ROM_LOAD( "12.bin", 0x08000, 0x4000, CRC(82ee7a4d) SHA1(184720de76680275bf7c4a171f03a0ce771d91fc) ) + ROM_LOAD( "13.bin", 0x0c000, 0x4000, CRC(0cc592a3) SHA1(b3563bde83432cdbaedb88d4d222da30bf679b08) ) + + + ROM_REGION( 0x01000, "gfx3", 0 ) + ROM_LOAD( "14.bin", 0x00000, 0x1000, CRC(87a4c130) SHA1(7792afdc36b0f3bd51c387d04d38f60c85fd2e93) ) +ROM_END + +DRIVER_INIT_MEMBER(spyhuntertec_state,spyhuntertec) +{ +// mcr_common_init(); +// machine().device("ssio")->set_custom_input(1, 0x60, read8_delegate(FUNC(spyhuntertec_state::spyhunt_ip1_r),this)); +// machine().device("ssio")->set_custom_input(2, 0xff, read8_delegate(FUNC(spyhuntertec_state::spyhunt_ip2_r),this)); +// machine().device("ssio")->set_custom_output(4, 0xff, write8_delegate(FUNC(spyhuntertec_state::spyhunt_op4_w),this)); + + m_spyhunt_sprite_color_mask = 0x00; + m_spyhunt_scroll_offset = 16; +} + + +// very different hardware, probably bootleg despite the license text printed on the PCB, similar to '1942p' in 1942.c. Probably should be put in separate driver. +// PCB made by Tecfri for Recreativos Franco S.A. in Spain, has Bally Midway logo, and licensing text on the PCB. Board is dated '85' so seems to be a low-cost rebuild? it is unclear if it made it to market. +GAME (1983, spyhuntpr,spyhunt, spyhuntertec, spyhuntertec,spyhuntertec_state, spyhuntertec,ROT90, "Bally Midway (Recreativos Franco S.A. license)", "Spy Hunter (Spain, Tecfri / Recreativos Franco S.A. PCB)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index dbfcb3529e9..18e2b688d09 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -33,7 +33,6 @@ public: tilemap_t *m_bg_tilemap; tilemap_t *m_alpha_tilemap; - DECLARE_WRITE8_MEMBER(spyhuntpr_paletteram_w); DECLARE_WRITE8_MEMBER(mcr3_videoram_w); DECLARE_WRITE8_MEMBER(spyhunt_videoram_w); DECLARE_WRITE8_MEMBER(spyhunt_alpharam_w); @@ -67,7 +66,6 @@ public: DECLARE_DRIVER_INIT(maxrpm); DECLARE_DRIVER_INIT(rampage); DECLARE_DRIVER_INIT(spyhunt); - DECLARE_DRIVER_INIT(spyhuntpr); DECLARE_DRIVER_INIT(sarge); TILE_GET_INFO_MEMBER(mcrmono_get_bg_tile_info); TILEMAP_MAPPER_MEMBER(spyhunt_bg_scan); @@ -75,14 +73,10 @@ public: TILE_GET_INFO_MEMBER(spyhunt_get_alpha_tile_info); DECLARE_VIDEO_START(mcrmono); DECLARE_VIDEO_START(spyhunt); - DECLARE_VIDEO_START(spyhuntpr); DECLARE_PALETTE_INIT(spyhunt); UINT32 screen_update_mcr3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_spyhunt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - UINT32 screen_update_spyhuntpr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int color_mask, int code_xor, int dx, int dy, int interlaced); void mcr_common_init(); - DECLARE_WRITE8_MEMBER(spyhuntpr_port04_w); - DECLARE_WRITE8_MEMBER(spyhuntpr_fd00_w); }; diff --git a/src/mame/video/mcr3.cpp b/src/mame/video/mcr3.cpp index 9385307c12f..ecd8b72a49a 100644 --- a/src/mame/video/mcr3.cpp +++ b/src/mame/video/mcr3.cpp @@ -125,40 +125,8 @@ VIDEO_START_MEMBER(mcr3_state,spyhunt) save_item(NAME(m_spyhunt_scroll_offset)); } -VIDEO_START_MEMBER(mcr3_state,spyhuntpr) -{ - /* initialize the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(mcr3_state::spyhunt_bg_scan),this), 64,16, 64,32); - - /* initialize the text tilemap */ - m_alpha_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_alpha_tile_info),this), TILEMAP_SCAN_COLS, 16,8, 32,32); - m_alpha_tilemap->set_transparent_pen(0); - m_alpha_tilemap->set_scrollx(0, 16); - - save_item(NAME(m_spyhunt_sprite_color_mask)); - save_item(NAME(m_spyhunt_scrollx)); - save_item(NAME(m_spyhunt_scrolly)); - save_item(NAME(m_spyhunt_scroll_offset)); -} -/************************************* - * - * Palette RAM writes - * - *************************************/ - -WRITE8_MEMBER(mcr3_state::spyhuntpr_paletteram_w) -{ - m_paletteram[offset] = data; - offset = (offset & 0x0f) | (offset & 0x60) >> 1; - - int r = (data & 0x07) >> 0; - int g = (data & 0x38) >> 3; - int b = (data & 0xc0) >> 6; - - m_palette->set_pen_color(offset^0xf, rgb_t(r<<5,g<<5,b<<6)); -} /************************************* @@ -326,19 +294,3 @@ UINT32 mcr3_state::screen_update_spyhunt(screen_device &screen, bitmap_ind16 &bi return 0; } - -UINT32 mcr3_state::screen_update_spyhuntpr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - /* for every character in the Video RAM, check if it has been modified */ - /* since last time and update it accordingly. */ - m_bg_tilemap->set_scrollx(0, m_spyhunt_scrollx * 2 + m_spyhunt_scroll_offset); - m_bg_tilemap->set_scrolly(0, m_spyhunt_scrolly * 2); - m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - - /* draw the sprites */ - mcr3_update_sprites(screen, bitmap, cliprect, m_spyhunt_sprite_color_mask, 0, -12, 0, 0); - - /* render any characters on top */ - m_alpha_tilemap->draw(screen, bitmap, cliprect, 0, 0); - return 0; -} From e3988ad65e5b25dcc956ea43e008f9ea2d3ce329 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 28 Mar 2016 08:24:22 +0200 Subject: [PATCH 08/74] using same check as in clifront, just to check if string is empty (nw) --- src/emu/emuopts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index 38624009588..e5906562d2a 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -563,7 +563,7 @@ void emu_options::set_system_name(const char *name) if (cursystem == nullptr) return; - if (software_name()) + if (*software_name() != 0) { std::string sw_load(software_name()); std::string sw_list, sw_name, sw_part, sw_instance, option_errors, error_string; From 842578fd703fd5224b5f305b1f855348c5b54ee0 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 28 Mar 2016 08:29:28 +0200 Subject: [PATCH 09/74] Fixed issue of HAVE_STDLIB_H already defined (nw) --- 3rdparty/libjpeg/jconfig.h | 1 + 1 file changed, 1 insertion(+) diff --git a/3rdparty/libjpeg/jconfig.h b/3rdparty/libjpeg/jconfig.h index 719ff11eac2..68b254dec30 100644 --- a/3rdparty/libjpeg/jconfig.h +++ b/3rdparty/libjpeg/jconfig.h @@ -8,6 +8,7 @@ /* #define const */ #undef CHAR_IS_UNSIGNED #define HAVE_STDDEF_H +#undef HAVE_STDLIB_H #define HAVE_STDLIB_H #undef NEED_BSD_STRINGS #undef NEED_SYS_TYPES_H From 775777e70bee08014d60a2d1bb90b17f2fe25332 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 28 Mar 2016 08:46:50 +0200 Subject: [PATCH 10/74] relaxed warning screen by allowing pressing of any button instead of specific combination (nw) --- src/emu/ui/ui.cpp | 35 +++-------------------------------- src/emu/ui/ui.h | 1 - 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index cc8b18c8154..fb7dabe21a0 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -389,13 +389,13 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer) { case 0: if (show_disclaimer && disclaimer_string(messagebox_text).length() > 0) - set_handler(handler_messagebox_ok, 0); + set_handler(handler_messagebox_anykey, 0); break; case 1: if (show_warnings && warnings_string(messagebox_text).length() > 0) { - set_handler(handler_messagebox_ok, 0); + set_handler(handler_messagebox_anykey, 0); if (machine().system().flags & (MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_COLORS | MACHINE_REQUIRES_ARTWORK | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_KEYBOARD | MACHINE_NO_SOUND)) messagebox_backcolor = UI_YELLOW_COLOR; if (machine().system().flags & (MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_MECHANICAL)) @@ -1174,7 +1174,7 @@ std::string &ui_manager::warnings_string(std::string &str) } // add the 'press OK' string - str.append(_("\n\nType OK or move the joystick left then right to continue")); + str.append(_("\n\nPress any key to continue")); return str; } @@ -1316,35 +1316,6 @@ UINT32 ui_manager::handler_messagebox(running_machine &machine, render_container } -//------------------------------------------------- -// handler_messagebox_ok - displays the current -// messagebox_text string and waits for an OK -//------------------------------------------------- - -UINT32 ui_manager::handler_messagebox_ok(running_machine &machine, render_container *container, UINT32 state) -{ - // draw a standard message window - machine.ui().draw_text_box(container, messagebox_text.c_str(), JUSTIFY_LEFT, 0.5f, 0.5f, messagebox_backcolor); - - // an 'O' or left joystick kicks us to the next state - if (state == 0 && (machine.input().code_pressed_once(KEYCODE_O) || machine.ui_input().pressed(IPT_UI_LEFT))) - state++; - - // a 'K' or right joystick exits the state - else if (state == 1 && (machine.input().code_pressed_once(KEYCODE_K) || machine.ui_input().pressed(IPT_UI_RIGHT))) - state = UI_HANDLER_CANCEL; - - // if the user cancels, exit out completely - else if (machine.ui_input().pressed(IPT_UI_CANCEL)) - { - machine.schedule_exit(); - state = UI_HANDLER_CANCEL; - } - - return state; -} - - //------------------------------------------------- // handler_messagebox_anykey - displays the // current messagebox_text string and waits for diff --git a/src/emu/ui/ui.h b/src/emu/ui/ui.h index c50d444120e..fc6be8c3f0f 100644 --- a/src/emu/ui/ui.h +++ b/src/emu/ui/ui.h @@ -218,7 +218,6 @@ private: // UI handlers static UINT32 handler_messagebox(running_machine &machine, render_container *container, UINT32 state); - static UINT32 handler_messagebox_ok(running_machine &machine, render_container *container, UINT32 state); static UINT32 handler_messagebox_anykey(running_machine &machine, render_container *container, UINT32 state); static UINT32 handler_ingame(running_machine &machine, render_container *container, UINT32 state); static UINT32 handler_load_save(running_machine &machine, render_container *container, UINT32 state); From 4dfeec15c6032dd07ecd60c2536ee0f11cf55210 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 28 Mar 2016 08:58:18 +0200 Subject: [PATCH 11/74] removed disclaimer since it was not shown anyway and it is known fact (nw) --- src/emu/machine.cpp | 2 +- src/emu/ui/ui.cpp | 33 ++++++--------------------------- src/emu/ui/ui.h | 3 +-- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 7c465be0cd8..d76ad49676d 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -356,7 +356,7 @@ int running_machine::run(bool firstrun) ui().initialize(*this); // display the startup screens - ui().display_startup_screens(firstrun, false); + ui().display_startup_screens(firstrun); // perform a soft reset -- this takes us to the running phase soft_reset(); diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index fb7dabe21a0..0b15f24edc6 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -359,9 +359,9 @@ UINT32 ui_manager::set_handler(ui_callback callback, UINT32 param) // various startup screens //------------------------------------------------- -void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer) +void ui_manager::display_startup_screens(bool first_time) { - const int maxstate = 4; + const int maxstate = 3; int str = machine().options().seconds_to_run(); bool show_gameinfo = !machine().options().skip_gameinfo(); bool show_warnings = true, show_mandatory_fileman = true; @@ -370,11 +370,11 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer) // disable everything if we are using -str for 300 or fewer seconds, or if we're the empty driver, // or if we are debugging if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0) - show_gameinfo = show_warnings = show_disclaimer = show_mandatory_fileman = FALSE; + show_gameinfo = show_warnings = show_mandatory_fileman = FALSE; #if defined(EMSCRIPTEN) // also disable for the JavaScript port since the startup screens do not run asynchronously - show_gameinfo = show_warnings = show_disclaimer = FALSE; + show_gameinfo = show_warnings = FALSE; #endif // loop over states @@ -388,11 +388,6 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer) switch (state) { case 0: - if (show_disclaimer && disclaimer_string(messagebox_text).length() > 0) - set_handler(handler_messagebox_anykey, 0); - break; - - case 1: if (show_warnings && warnings_string(messagebox_text).length() > 0) { set_handler(handler_messagebox_anykey, 0); @@ -403,12 +398,12 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer) } break; - case 2: + case 1: if (show_gameinfo && game_info_astring(messagebox_text).length() > 0) set_handler(handler_messagebox_anykey, 0); break; - case 3: + case 2: if (show_mandatory_fileman && machine().image().mandatory_scan(messagebox_text).length() > 0) { std::string warning; @@ -1032,22 +1027,6 @@ bool ui_manager::show_timecode_total() TEXT GENERATORS ***************************************************************************/ -//------------------------------------------------- -// disclaimer_string - print the disclaimer -// text to the given buffer -//------------------------------------------------- - -std::string &ui_manager::disclaimer_string(std::string &str) -{ - str = string_format( - _("Usage of emulators in conjunction with ROMs you don't own is forbidden by copyright law.\n\n" - "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS ESC.\n\n" - "Otherwise, type OK or move the joystick left then right to continue"), - machine().system().description); - return str; -} - - //------------------------------------------------- // warnings_string - print the warning flags // text to the given buffer diff --git a/src/emu/ui/ui.h b/src/emu/ui/ui.h index fc6be8c3f0f..ea117a74d82 100644 --- a/src/emu/ui/ui.h +++ b/src/emu/ui/ui.h @@ -129,7 +129,7 @@ public: // methods void initialize(running_machine &machine); UINT32 set_handler(ui_callback callback, UINT32 param); - void display_startup_screens(bool first_time, bool show_disclaimer); + void display_startup_screens(bool first_time); void set_startup_text(const char *text, bool force); void update_and_render(render_container *container); render_font *get_font(); @@ -213,7 +213,6 @@ private: static slider_state *slider_current; // text generators - std::string &disclaimer_string(std::string &buffer); std::string &warnings_string(std::string &buffer); // UI handlers From b16d6513ae2293567b962feef83bb6ddff29b951 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 28 Mar 2016 09:03:47 +0200 Subject: [PATCH 12/74] Update translations to latest --- language/Afrikaans/strings.po | 214 +++++++++---------- language/Albanian/strings.po | 214 +++++++++---------- language/Arabic/strings.po | 214 +++++++++---------- language/Basque/strings.po | 214 +++++++++---------- language/Belarusian/strings.po | 214 +++++++++---------- language/Bosnian/strings.po | 214 +++++++++---------- language/Bulgarian/strings.po | 214 +++++++++---------- language/Burmese/strings.po | 214 +++++++++---------- language/Catalan/strings.po | 214 +++++++++---------- language/Chinese_Simplified/strings.po | 242 +++++++++++----------- language/Chinese_Traditional/strings.po | 242 +++++++++++----------- language/Croatian/strings.po | 214 +++++++++---------- language/Czech/strings.po | 214 +++++++++---------- language/Danish/strings.po | 214 +++++++++---------- language/Dutch/strings.po | 239 +++++++++++---------- language/English/strings.po | 214 +++++++++---------- language/Estonian/strings.po | 214 +++++++++---------- language/Finnish/strings.po | 214 +++++++++---------- language/French/strings.po | 251 +++++++++++----------- language/French_Belgium/strings.po | 250 +++++++++++----------- language/French_Canada/strings.po | 214 +++++++++---------- language/Georgian/strings.po | 214 +++++++++---------- language/German/strings.po | 256 +++++++++++------------ language/Greek/strings.po | 263 ++++++++++++------------ language/Hebrew/strings.po | 214 +++++++++---------- language/Hindi/strings.po | 214 +++++++++---------- language/Hungarian/strings.po | 214 +++++++++---------- language/Indonesian/strings.po | 214 +++++++++---------- language/Italian/strings.po | 253 ++++++++++++----------- language/Japanese/strings.po | 250 +++++++++++----------- language/Korean/strings.po | 214 +++++++++---------- language/Latvian/strings.po | 214 +++++++++---------- language/Lithuanian/strings.po | 214 +++++++++---------- language/Macedonian/strings.po | 214 +++++++++---------- language/Norwegian/strings.po | 214 +++++++++---------- language/Persian/strings.po | 214 +++++++++---------- language/Polish/strings.po | 214 +++++++++---------- language/Portuguese/strings.po | 214 +++++++++---------- language/Portuguese_Brazil/strings.po | 248 +++++++++++----------- language/Romanian/strings.po | 214 +++++++++---------- language/Russian/strings.po | 227 ++++++++++---------- language/Serbian/strings.po | 254 ++++++++++++----------- language/Serbian_Cyrillic/strings.po | 254 ++++++++++++----------- language/Slovak/strings.po | 214 +++++++++---------- language/Slovenian/strings.po | 214 +++++++++---------- language/Spanish/strings.po | 248 +++++++++++----------- language/Spanish_Mexico/strings.po | 214 +++++++++---------- language/Swedish/strings.po | 214 +++++++++---------- language/Thai/strings.po | 214 +++++++++---------- language/Turkish/strings.po | 214 +++++++++---------- language/Ukrainian/strings.po | 214 +++++++++---------- language/Vietnamese/strings.po | 214 +++++++++---------- 52 files changed, 5599 insertions(+), 6010 deletions(-) diff --git a/language/Afrikaans/strings.po b/language/Afrikaans/strings.po index 97ed4a7678c..9fc78e87309 100644 --- a/language/Afrikaans/strings.po +++ b/language/Afrikaans/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Albanian/strings.po b/language/Albanian/strings.po index 234d9bab5a7..103406497b6 100644 --- a/language/Albanian/strings.po +++ b/language/Albanian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Arabic/strings.po b/language/Arabic/strings.po index 9ca4446b4b7..0cbffed36c5 100644 --- a/language/Arabic/strings.po +++ b/language/Arabic/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Basque/strings.po b/language/Basque/strings.po index 80d97f6431b..f8049df77cb 100644 --- a/language/Basque/strings.po +++ b/language/Basque/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Belarusian/strings.po b/language/Belarusian/strings.po index dee99ad6d2d..58ce868f9c9 100644 --- a/language/Belarusian/strings.po +++ b/language/Belarusian/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -62,14 +62,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -645,11 +645,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -657,7 +657,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -665,55 +665,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1574,92 +1574,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1667,7 +1655,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1675,21 +1663,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1699,98 +1687,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1799,173 +1787,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Bosnian/strings.po b/language/Bosnian/strings.po index 047d69bb2b7..c9ef3444210 100644 --- a/language/Bosnian/strings.po +++ b/language/Bosnian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Bulgarian/strings.po b/language/Bulgarian/strings.po index 16672a642ac..08aac218aed 100644 --- a/language/Bulgarian/strings.po +++ b/language/Bulgarian/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Burmese/strings.po b/language/Burmese/strings.po index d1990732f2b..ff2e30a8ddc 100644 --- a/language/Burmese/strings.po +++ b/language/Burmese/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Catalan/strings.po b/language/Catalan/strings.po index b3c79f27986..af52c00a958 100644 --- a/language/Catalan/strings.po +++ b/language/Catalan/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po index f20edcf5c0f..69e8426e789 100644 --- a/language/Chinese_Simplified/strings.po +++ b/language/Chinese_Simplified/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-03-26 13:57+0800\n" "Last-Translator: YuiFAN\n" "Language-Team: MAME Language Team\n" @@ -62,14 +62,14 @@ msgstr "全部重新载入" msgid "Autofire Status" msgstr "连发状态" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "已停用" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -645,11 +645,11 @@ msgstr "等待垂直同步" msgid "Display Options" msgstr "视讯选项" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "档案已存在 — 是否覆写？" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -657,7 +657,7 @@ msgstr "档案已存在 — 是否覆写？" msgid "No" msgstr "否" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -665,55 +665,55 @@ msgstr "否" msgid "Yes" msgstr "是" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "新映象档名称：" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "映像档格式" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "建立" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "请一并输入副档名" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "[ 空插槽 ]" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "[ 建立 ]" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "[ 软件清单 ]" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "选择映像档格式" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "选择存取模式" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "唯读" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "读写" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "读取此映像档，写入至其他映像档" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "读取此映像档，写入差异档" @@ -1597,34 +1597,17 @@ msgstr "倒带" msgid "Fast Forward" msgstr "快进" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "此驱动需要额外载入下列装置的映像档: " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"著作权法禁止使用模拟器执行非法持有的 ROM 档案。\n" -"\n" -"如果您没有在本模拟器上执行 \"%s\" 的合法权力，请按 ESC 键。\n" -"\n" -"否则，请键入 OK 或移动摇杆的左、右方向继续" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "本机械有一个或更多的 ROM/CHD 是不正确的。此机械可能无法正确执行。\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1632,64 +1615,64 @@ msgstr "" "本机械已知具有下列的问题\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "本机械有一个或更多的 ROM/CHD 尚未正确地被 DUMP。\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "键盘模拟可能未达到 100% 精确。" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "色彩是完全错误的。" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "色彩尚未达到 100% 精确。" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "视讯模拟尚未达到 100% 精确。" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "声音模拟尚未达到 100% 精确。" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "机械缺少声音。" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "尚未支援台面型筐体模式的画面翻转。" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "机械需要外部装饰图档案" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "本机械无法完成，并非模拟中的错误而可能呈现怪异的行为或缺少元件。\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "本机械无声音硬体，故 MAME 将不会产生声音，这是可预期的行为。\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "机械具有保护尚未完全模拟。" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1699,7 +1682,7 @@ msgstr "" "此机械无法执行，机械的模拟还不完全。除了等待开发人员改良模拟之外，没有方法可" "以解决这个问题。\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1710,7 +1693,7 @@ msgstr "" "本机械的的部分元件无法模拟，因其需要实际活动的互动或机械装置的组合。故无法完" "成此游戏的执行。\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1720,14 +1703,14 @@ msgstr "" "\n" "本机械尚有可执行的仿制版: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" -msgstr "请键入 OK 或移动摇杆的左、右方向继续" +"Press any key to continue" +msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1742,15 +1725,15 @@ msgstr "" "\n" "CPU:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1758,7 +1741,7 @@ msgstr "" "\n" "声音：\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1766,78 +1749,78 @@ msgstr "" "\n" "视讯：\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "无\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "向量" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s: %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "键盘模拟状态" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "模式： 部分模拟" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI： 已启用" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**使用 ScrLock 键切换**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "模式： 完整模拟" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI： 已停用" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "无法启用连发" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "选择保存位置" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "选择载入位置" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "取消保存" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "取消载入" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "保存至位置 %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "从位置 %s 载入" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1850,173 +1833,173 @@ msgstr "" "按 ''%1$s'' 退出,\n" "按 ''%2$s'' 继续模拟。" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "主音量" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$s 音量" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "超频 CPU %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s 刷新率" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s 亮度" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s 对比" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s 迦玛值" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s 水平延展" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s 水平位置" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s 垂直延展" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s 垂直位置" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "激光影碟 %1$s 水平延展" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "激光影碟 %1$s 水平位置" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "激光影碟 %1$s 垂直延展" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "激光影碟 %1$s 垂直位置" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "向量闪烁度" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "最小光束宽度" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "最大光束宽度" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "光束强度" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "十字准星尺度 %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "X" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Y" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "十字准星位移 %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3ddB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3ffps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "画面 '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "画面" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "十字准星尺度 X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "十字准星尺度 Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "十字准星位移 X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "十字准星位移 Y %1$1.3f" @@ -2066,5 +2049,26 @@ msgstr " 色彩" msgid " PENS" msgstr " PENS" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "著作权法禁止使用模拟器执行非法持有的 ROM 档案。\n" +#~ "\n" +#~ "如果您没有在本模拟器上执行 \"%s\" 的合法权力，请按 ESC 键。\n" +#~ "\n" +#~ "否则，请键入 OK 或移动摇杆的左、右方向继续" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "请键入 OK 或移动摇杆的左、右方向继续" + #~ msgid "Configure Machine" #~ msgstr "设定机械" diff --git a/language/Chinese_Traditional/strings.po b/language/Chinese_Traditional/strings.po index 1df5bf00cde..e93326b6fd9 100644 --- a/language/Chinese_Traditional/strings.po +++ b/language/Chinese_Traditional/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-03-26 13:55+0800\n" "Last-Translator: YuiFAN\n" "Language-Team: MAME Language Team\n" @@ -62,14 +62,14 @@ msgstr "全部重新載入" msgid "Autofire Status" msgstr "連射狀態" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "已停用" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -645,11 +645,11 @@ msgstr "等待垂直同步" msgid "Display Options" msgstr "視訊選項" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "檔案已存在 — 是否覆蓋？" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -657,7 +657,7 @@ msgstr "檔案已存在 — 是否覆蓋？" msgid "No" msgstr "否" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -665,55 +665,55 @@ msgstr "否" msgid "Yes" msgstr "是" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "新映象檔名稱：" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "映像檔格式" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "建立" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "請一併輸入副檔名" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "[ 空插槽 ]" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "[ 建立 ]" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "[ 軟體清單 ]" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "選擇映像檔格式" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "選擇存取模式" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "唯讀" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "讀寫" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "讀取此映像檔，寫入至其他映像檔" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "讀取此映像檔，寫入差異檔" @@ -1597,34 +1597,17 @@ msgstr "倒帶" msgid "Fast Forward" msgstr "快進" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "此驅動需要額外載入下列裝置的映像檔: " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"著作權法禁止使用模擬器執行非法持有的 ROM 檔案。\n" -"\n" -"如果您沒有在本模擬器上執行 \"%s\" 的合法權力，請按 ESC 鍵。\n" -"\n" -"否則，請鍵入 OK 或移動搖桿的左、右方向繼續" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "本機台有一個或更多的 ROM/CHD 是不正確的。此機台可能無法正確執行。\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1632,64 +1615,64 @@ msgstr "" "本機台已知具有下列的問題\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "本機台有一個或更多的 ROM/CHD 尚未正確地被 DUMP。\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "鍵盤模擬可能未達到 100% 精確。" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "色彩是完全錯誤的。" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "色彩尚未達到 100% 精確。" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "視訊模擬尚未達到 100% 精確。" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "聲音模擬尚未達到 100% 精確。" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "機台缺少聲音。" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "尚未支援檯面型筐體模式的畫面翻轉。" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "機台需要外部裝飾圖檔案" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "本機台無法完成，並非模擬時的錯誤而可能呈現怪異的行為或缺少元件。\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "本機台無聲音硬體，故 MAME 將不會產生聲音，這是可預期的行為。\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "機台具有保護尚未完全模擬。" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1699,7 +1682,7 @@ msgstr "" "此機台無法執行，機台的模擬還不完全。除了等待開發人員改良模擬之外，沒有方法可" "以解決這個問題。\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1710,7 +1693,7 @@ msgstr "" "本機台的的部分元件無法模擬，因其需要實際活動的互動或機械裝置的組合。故無法完" "成此遊戲的執行。\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1720,14 +1703,14 @@ msgstr "" "\n" "本機台尚有可執行的仿製版： " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" -msgstr "請鍵入 OK 或移動搖桿的左、右方向繼續" +"Press any key to continue" +msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1742,15 +1725,15 @@ msgstr "" "\n" "CPU：\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1758,7 +1741,7 @@ msgstr "" "\n" "聲音：\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1766,78 +1749,78 @@ msgstr "" "\n" "視訊：\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "無\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "向量" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s: %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "鍵盤模擬狀態" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "模式： 部分模擬" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI： 已啟用" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**使用 ScrLock 鍵切換**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "模式： 完整模擬" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI： 已停用" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "無法啟用連射" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "選擇儲存位置" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "選擇載入位置" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "取消儲存" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "取消載入" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "儲存至位置 %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "從位置 %s 載入" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1850,173 +1833,173 @@ msgstr "" "按『%1$s』退出，\n" "按『%2$s』繼續模擬。" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "主音量" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$s 音量" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "超頻 CPU %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s 更新率" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s 亮度" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s 對比" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s Gamma 值" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s 水平延展" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s 水平位置" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s 垂直延展" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s 垂直位置" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "雷射影碟 %1$s 水平延展" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "雷射影碟 %1$s 水平位置" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "雷射影碟 %1$s 垂直延展" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "雷射影碟 %1$s 垂直位置" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "向量閃爍度" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "最小光束寬度" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "最大光束寬度" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "光束強度" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "十字準星尺度 %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "X" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Y" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "十字準星位移 %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3ddB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3ffps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "畫面 '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "畫面" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "十字準星尺度 X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "十字準星尺度 Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "十字準星位移 X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "十字準星位移 Y %1$1.3f" @@ -2065,3 +2048,24 @@ msgstr " 色彩" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" msgstr " PENS" + +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "著作權法禁止使用模擬器執行非法持有的 ROM 檔案。\n" +#~ "\n" +#~ "如果您沒有在本模擬器上執行 \"%s\" 的合法權力，請按 ESC 鍵。\n" +#~ "\n" +#~ "否則，請鍵入 OK 或移動搖桿的左、右方向繼續" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "請鍵入 OK 或移動搖桿的左、右方向繼續" diff --git a/language/Croatian/strings.po b/language/Croatian/strings.po index 948c2e5ec71..2425b2d03f0 100644 --- a/language/Croatian/strings.po +++ b/language/Croatian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Czech/strings.po b/language/Czech/strings.po index 4734bf61316..15e007cc05b 100644 --- a/language/Czech/strings.po +++ b/language/Czech/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Danish/strings.po b/language/Danish/strings.po index 22b48869b88..e7c6d9f99af 100644 --- a/language/Danish/strings.po +++ b/language/Danish/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Dutch/strings.po b/language/Dutch/strings.po index ff6dda456ca..c71de261aab 100644 --- a/language/Dutch/strings.po +++ b/language/Dutch/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -63,14 +63,14 @@ msgstr "Alles opnieuw inlezen" msgid "Autofire Status" msgstr "Autofire status" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Uitgeschakeld" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -248,7 +248,8 @@ msgstr "Instellingen lettertype gebruikersinterface" #: src/emu/ui/custui.cpp:408 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit." -msgstr "Voorbeeldtekst - Lorem ipsum dolor sit amet, consectetur adipiscing elit." +msgstr "" +"Voorbeeldtekst - Lorem ipsum dolor sit amet, consectetur adipiscing elit." #: src/emu/ui/custui.cpp:506 msgid "Normal text" @@ -646,11 +647,11 @@ msgstr "Wacht V-Sync" msgid "Display Options" msgstr "Video-opties" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "Bestand bestaat al - Overschrijven?" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -658,7 +659,7 @@ msgstr "Bestand bestaat al - Overschrijven?" msgid "No" msgstr "Nee" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -666,55 +667,55 @@ msgstr "Nee" msgid "Yes" msgstr "Ja" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "Nieuwe bestandsnaam:" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "Bestandsformaat:" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "Aanmaken" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "Vul ook een bestandsextensie in" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "[lege plek]" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "[aanmaken]" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "[software lijst]" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "Selecteer bestandsformaat" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "Selecteer toegangsmodus" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "Alleen lezen" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "Lezen en schrijven" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "Lees dit bestamd, schrijf naar een ander bestand" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "Lees dit bestand, schrijf naar een diff" @@ -1605,23 +1606,11 @@ msgstr "Terug spoelen" msgid "Fast Forward" msgstr "Vooruit spoelen" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "Deze driver vereist software ingelezen in de volgende device(s): " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1629,7 +1618,7 @@ msgstr "" "Één of meerdere ROMs/CHDs voor deze machine zijn niet correct. De machine " "kan mogelijk niet goed functioneren.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1637,48 +1626,49 @@ msgstr "" "Er zijn problemen bekend met de emulatie van deze machine\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" -msgstr "Één of meerdere ROMs/CHDs voor deze machine zijn niet correct gedumpt.\n" +msgstr "" +"Één of meerdere ROMs/CHDs voor deze machine zijn niet correct gedumpt.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "De toetsenbordemulatie is mogelijk niet 100% accuraat.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "De kleuren zijn niet 100% accuraat.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "De kleuren zijn zeker fout.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "De beeldemulatie is niet 100% accuraat.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "De geluidsemulatie is niet 100% accuraat.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "Deze machine heeft geen geluid.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Schermflippen wordt in cocktailmodus niet ondersteund.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "Deze machine vereist externe artwork bestanden\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1686,19 +1676,20 @@ msgstr "" "Deze machine was nooit afgemaakt. Het kan vreemd gedrag vertonen of " "elementen missen; dit zijn geen fouten van de emulatie.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -"Deze machine heeft geen geluidshardware, MAME zal geen geluid produceren, dit " -"is verwacht gedrag.\n" +"Deze machine heeft geen geluidshardware, MAME zal geen geluid produceren, " +"dit is verwacht gedrag.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" -msgstr "Deze machine heeft een beveiliging die nog niet volledig is geëmuleerd.\n" +msgstr "" +"Deze machine heeft een beveiliging die nog niet volledig is geëmuleerd.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1709,7 +1700,7 @@ msgstr "" "compleet. Er is niets wat je kunt doen om dit probleem te verhelpen afgezien " "van het afwachten tot ontwikkelaars de emulatie verder verbeteren.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1721,7 +1712,7 @@ msgstr "" "verband met fysieke interactie of het gebruik van mechanische componenten. " "Het is niet mogelijk om deze machine volledig te spelen.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1731,17 +1722,14 @@ msgstr "" "\n" "Dit zijn werkende klonen van de machine: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Type OK of beweeg de joystick naar links en rechts om verder te gaan" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1756,15 +1744,15 @@ msgstr "" "\n" "Processor:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1772,7 +1760,7 @@ msgstr "" "\n" "Geluid:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1780,78 +1768,78 @@ msgstr "" "\n" "Beeld:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Geen\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Vector" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s: %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Toetsenbord emulatiestatus" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Modus: GEDEELTELIJKE emulatie" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI: Ingeschakeld" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Gebruik ScrLock om te wisselen**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Modus: VOLLEDIGE emulatie" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI: Uitgeschakeld" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Autofire kan niet worden ingeschakeld" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Selecteer positie om naar op te slaan" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Selecteer positie om van in te lezen" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Opslaan afgebroken" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Inlezen afgebroken" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Opslaan naar positie %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Inlezen van positie %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1864,173 +1852,173 @@ msgstr "" "Druk op ''%1%s'' om te stoppen,\n" "druk op ''%2$s'' om terug te keren naar de emulatie." -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Hoofdvolume" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$s volume" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "Overklok CPU %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s verversingfrequentie" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s helderheid" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s contrast" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s gamma" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s horizontale stretch" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s horizontale positie" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s verticale stretch" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s verticale positie" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "Laserdisc '%1$s' horizontale stretch" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "Laserdisc '%1$s' horizontale positie" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "Laserdic '%1$s' verticale stretch" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "Laserdisc '%1$s' verticale positie" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Minimale straalbreedte" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Maximale straalbreedte" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Gewicht straalintensiteit" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Vizier schaal %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "X" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Y" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Vizier offset %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3d dB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3f fps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "%1$1.2f" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Scherm '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Scherm" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Vizier X-schaal %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Vizier Y-schaal %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Vizier X-offset %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Vizier Y-offset %1$1.3f" @@ -2080,6 +2068,15 @@ msgstr " KLEUREN" msgid " PENS" msgstr " PENNEN" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Type OK of beweeg de joystick naar links en rechts om verder te gaan" + #~ msgid "Configure Machine" #~ msgstr "Configureer machine" diff --git a/language/English/strings.po b/language/English/strings.po index 821f9b03148..31576b9cd7a 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Estonian/strings.po b/language/Estonian/strings.po index 91efc8399f8..7567f51accf 100644 --- a/language/Estonian/strings.po +++ b/language/Estonian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Finnish/strings.po b/language/Finnish/strings.po index a3fd2d0a456..3df2bdf8528 100644 --- a/language/Finnish/strings.po +++ b/language/Finnish/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/French/strings.po b/language/French/strings.po index bf0a6c85c84..ebf194942eb 100644 --- a/language/French/strings.po +++ b/language/French/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: Benjamin Siskoo\n" @@ -63,14 +63,14 @@ msgstr "Tout Recharger" msgid "Autofire Status" msgstr "Statut du Tir Auto" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Désactivé" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -648,11 +648,11 @@ msgstr "Attente de la Synchro Verticale" msgid "Display Options" msgstr "Options D'Affichage" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "Le Fichier Existe Déjà - Continuer ?" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -660,7 +660,7 @@ msgstr "Le Fichier Existe Déjà - Continuer ?" msgid "No" msgstr "Non" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -668,55 +668,55 @@ msgstr "Non" msgid "Yes" msgstr "Oui" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "Nouveau Nom de l'Image :" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "Format de l'Image :" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "Créer" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "Veuillez entrer l'extension du fichier aussi" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "[emplacement vide]" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "[créer]" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "[Liste de Logiciel]" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "Sélection du Format de l'Image" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "Sélection du Mode d'Accès" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "Lecture Seule" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "Lecture-Ecriture" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "Lire Cette Image, Ecrire vers une Autre Image" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "Lire cette image, écrire la différence" @@ -1606,32 +1606,13 @@ msgstr "Rembobiner" msgid "Fast Forward" msgstr "Avancée Rapide" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" "Ce driver nécessite les images pour être chargé dans les périphérique(s) " "suivant(s) : " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"L'utilisation des émulateurs avec des ROMs qui ne vous appartiennent pas est " -"interdite par la loi sur les droits d'auteurs.\n" -"\n" -"SI VOUS N'ETES PAS LEGALEMENT HABILITE A LANCER \"%1$s\" SUR CETTE " -"EMULATEUR, PRESSEZ LA TOUCHE ECHAP.\n" -"\n" -"Autrement, taper OK ou bouger le joystick de gauche à droite pour continuer" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1639,7 +1620,7 @@ msgstr "" "Une ou plusieurs ROMS/CHD de ce jeu est (sont)incorrecte(s). Ce jeu pourrait " "ne pas se lancer correctement.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1647,50 +1628,50 @@ msgstr "" "Il y a des problèmes connus avec ce jeu\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" "Une ou plusieurs ROMs/CHDs de ce jeu n'a (n'ont) pas été(s) correctement " "copiée(s).\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "L'émulation du clavier peut ne pas être précise à 100%.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "Les couleurs ne sont pas parfaites à 100%.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "Les couleurs sont complétement fausses.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "L'émulation vidéo n'est pas précise à 100%.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "L'émulation du son n'est pas précise à 100%.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "Il n'y a aucun son pour ce jeu.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Le retournement d'écran dans le mode cocktail n'est pas supporté.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "La machine nécessite un fichier artwork externe\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1698,7 +1679,7 @@ msgstr "" "Ce jeu n'a jamais été terminé. Il peut y avoir des comportements étranges ou " "des éléments manquants qui ne sont pas des bugs d'émulation.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1706,11 +1687,11 @@ msgstr "" "Ce jeu ne possède pas de son à l'origine, MAME ne produira aucun son, c'est " "un fonctionnement normal pour ce jeu.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "Cette machine a une protection qui n'est pas complétement émulée.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1721,7 +1702,7 @@ msgstr "" "Il n'y a rien que vous puissiez faire pour corriger ce problème sauf " "d'attendre que les développeurs améliorent l'émulation.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1732,24 +1713,21 @@ msgstr "" "une interaction physique ou comporte des périphériques mécaniques. Il n'est " "pas possible de jouer à 100% avec ce jeu.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "Il y a des clones de ce jeu qui fonctionnent :" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Taper OK ou bouger le joystick de gauche à droite" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1764,15 +1742,15 @@ msgstr "" "\n" "CPU:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1780,7 +1758,7 @@ msgstr "" "\n" "Son :\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1788,78 +1766,78 @@ msgstr "" "\n" "Vidéo :\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Aucun\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s: %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Statut d'Emulation du Clavier" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Mode : Emulation PARTIELLE" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI : Activé" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Utiliser ScrLock pour changer**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Mode : Emulation COMPLETE" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI : Désactivé" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Le Tir Auto ne peut pas être activé" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Sélection de la position pour sauvegarder vers" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Sélection de la position pour charger depuis" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Sauvegarde annulée" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Chargement annulé" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Sauvegarder la position %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Charger depuis la position %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1868,173 +1846,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Volume Maître" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "Overclock le CPU %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s Taux de Rafraîchissement" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s Luminosité" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s Contraste" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s Gamma" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s Etirer Horiz" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s Position Horiz" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s Etirer Vert" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s Position Vert" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "Laserdisc '%1$s' Etirer Horiz" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "Laserdisc '%1$s' Position Horiz" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "Laserdisc '%1$s' Etirer Vert" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "Laserdisc '%1$s' Position Vert" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Scintillement - Vector" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Largeur Minimum du Rayon" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Largeur Maximum du Rayon" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Intensité du Poids du Rayon" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Echelle du Viseur %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "X" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Y" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Etalonnage du Viseur %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3ddB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3ffps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "%1$1.2f" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Ecran '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Ecran" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Echelle du Viseur X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Echelle du Viseur Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Etalonnage du Viseur X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Etalonnage du Viseur Y %1$1.3f" @@ -2084,6 +2062,33 @@ msgstr " COULEURS" msgid " PENS" msgstr " PENS" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "L'utilisation des émulateurs avec des ROMs qui ne vous appartiennent pas " +#~ "est interdite par la loi sur les droits d'auteurs.\n" +#~ "\n" +#~ "SI VOUS N'ETES PAS LEGALEMENT HABILITE A LANCER \"%1$s\" SUR CETTE " +#~ "EMULATEUR, PRESSEZ LA TOUCHE ECHAP.\n" +#~ "\n" +#~ "Autrement, taper OK ou bouger le joystick de gauche à droite pour " +#~ "continuer" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Taper OK ou bouger le joystick de gauche à droite" + #~ msgid "Configure Machine" #~ msgstr "Configurer la Machine" diff --git a/language/French_Belgium/strings.po b/language/French_Belgium/strings.po index 38c5a274996..020a133438c 100644 --- a/language/French_Belgium/strings.po +++ b/language/French_Belgium/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-03-06 10:44+0100\n" "Last-Translator: Mevi \n" "Language-Team: MAME Language Team\n" @@ -62,14 +62,14 @@ msgstr "Tout recharger" msgid "Autofire Status" msgstr "Statut du tir automatique" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Désactivé" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -647,11 +647,11 @@ msgstr "Attendre V-Sync" msgid "Display Options" msgstr "Options d'affichage" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "Ce fichier existe déjà - Écraser ?" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -659,7 +659,7 @@ msgstr "Ce fichier existe déjà - Écraser ?" msgid "No" msgstr "Non" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -667,55 +667,55 @@ msgstr "Non" msgid "Yes" msgstr "Oui" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "Nouveau nom de l'image :" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "Format de l'image :" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "Créer" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "Veuillez entrer également l'extension du fichier" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "[emplacement vide]" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "[créer]" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "[liste des logiciels]" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "Sélectionner le format de l'image" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "Sélectionner le mode d'accès" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "Lecture seule" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "Lecture-écriture" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "Lire cette image, écrire dans une autre image" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "Lire cette image, écrire vers diff" @@ -1608,32 +1608,13 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" "Ce driver nécessite le chargement d'images dans le(s) périphérique(s) " "suivant(s) : " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"L'utilisation conjointe d'émulateurs et de ROMs que vous ne possédez pas est " -"interdite par la législation sur le droit d'auteur.\n" -"\n" -"SI VOUS N'ÊTES PAS LÉGALEMENT AUTORISÉ À UTILISER \"%s\" SUR CET ÉMULATEUR, " -"APPUYEZ SUR ESC.\n" -"Dans le cas contraire, taper OK ou bouger le joystick à gauche puis à droite " -"pour continuer" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1642,7 +1623,7 @@ msgstr "" "cette machine sont incorrects. Il est possible qu'elle ne fonctionne pas " "correctement.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1650,50 +1631,50 @@ msgstr "" "On rencontre les problèmes suivants avec cette machine :\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" "Un ou plusieurs fichiers ROMs/CHDs nécessaires à l'utilisation de cette " "machine n'ont pas été dumpés correctement.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "L'émulation du clavier peut ne pas être fidèle à 100%.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "Les couleurs ne sont pas fidèles à 100%.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "Les couleurs sont complètement fausses.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "L'émulation vidéo n'est pas fidèle à 100%.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "L'émulation du son n'est pas fidèle à 100%.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "La machine n'a pas de son.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Le retournement de l'écran en mode cocktail n'est pas supporté.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "La machine nécessite l'utilisation de fichiers artwork externes\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1702,7 +1683,7 @@ msgstr "" "bizarrement ou que certains composants soient manquants. Cela ne constitue " "en aucun cas des bugs d'émulation.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1710,11 +1691,11 @@ msgstr "" "Cette machine n'a pas de dispositif sonore. Par conséquent, MAME ne produira " "aucun son. Il s'agit d'un comportement attendu.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "La machine possède une protection qui n'est pas complètement émulée.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1726,7 +1707,7 @@ msgstr "" "encore complète. Il n'y a rien que vous puissiez faire pour résoudre ce " "problème sauf attendre que les développeurs améliorent l'émulation.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1738,7 +1719,7 @@ msgstr "" "nécessitent une interaction physique ou comportent des éléments mécaniques. " "Il n'est donc pas possible d'y jouer complètement.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1748,17 +1729,14 @@ msgstr "" "\n" "Il existe des clones de cette machine qui fonctionnent correctement : " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Tapez OK ou bouger le joystick à gauche puis à droite pour continuer" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1773,15 +1751,15 @@ msgstr "" "\n" "Processeur(s) :\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1789,7 +1767,7 @@ msgstr "" "\n" "Son :\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1797,78 +1775,78 @@ msgstr "" "\n" "Vidéo :\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Aucun\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Graphismes vectoriels" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s : %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Statut de l'émulation du clavier" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Mode : Émulation PARTIELLE" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "Interface : Activée" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Utiliser ScrLock pour basculer**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Mode : Émulation COMPLÈTE" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "Interface : désactivée" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Le tir automatique ne peut pas être activé" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Sauvegarder à la position" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Charger depuis la position" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Sauvegarde annulée" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Chargement annulé" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Sauvegarde à la position %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Chargement depuis la position %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1881,173 +1859,173 @@ msgstr "" "Appuyez sur ''%1$s'' pour quitter,\n" "Appuyez sur ''%2$s'' pour retourner à l'émulation." -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Volume principal" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "Volume %1$s" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "Overclock du processeur %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s - Taux de rafraîchissement" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s - Luminosité" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s - Contraste" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s - Gamma" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s - Stretch Horizontal" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s - Position Horizontale" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s - Stretch Vertical" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s - Position Verticale" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "'%1$s' Laserdisc - Stretch Horizontal" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "'%1$s' Laserdisc - Position Horizontale" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "'%1$s' Laserdisc - Stretch Vertical" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "'%1$s' Laserdisc - Position Verticale" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Scintillement de l'affichage vectoriel" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Largeur de rayon minimum" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Largeur de rayon maximum" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Intensité du rayon" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Viseur - Échelle %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Viseur - Offset %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Écran '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Écran" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Viseur - Échelle X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Viseur - Échelle Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Viseur - Offset X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Viseur - Offset Y %1$1.3f" @@ -2097,6 +2075,32 @@ msgstr " COULEURS" msgid " PENS" msgstr " MARQUEURS" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "L'utilisation conjointe d'émulateurs et de ROMs que vous ne possédez pas " +#~ "est interdite par la législation sur le droit d'auteur.\n" +#~ "\n" +#~ "SI VOUS N'ÊTES PAS LÉGALEMENT AUTORISÉ À UTILISER \"%s\" SUR CET " +#~ "ÉMULATEUR, APPUYEZ SUR ESC.\n" +#~ "Dans le cas contraire, taper OK ou bouger le joystick à gauche puis à " +#~ "droite pour continuer" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Tapez OK ou bouger le joystick à gauche puis à droite pour continuer" + #~ msgid "Configure Machine" #~ msgstr "Configurer la machine" diff --git a/language/French_Canada/strings.po b/language/French_Canada/strings.po index c3548166c98..029e1fa02f2 100644 --- a/language/French_Canada/strings.po +++ b/language/French_Canada/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Georgian/strings.po b/language/Georgian/strings.po index 5d3694a639e..47e70366e0b 100644 --- a/language/Georgian/strings.po +++ b/language/Georgian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/German/strings.po b/language/German/strings.po index b46aca2b54b..1a2169f4e71 100644 --- a/language/German/strings.po +++ b/language/German/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-03-26 10:46+0100\n" "Last-Translator: Lothar Serra Mari \n" "Language-Team: MAME Language Team\n" @@ -64,14 +64,14 @@ msgstr "Alle neu laden" msgid "Autofire Status" msgstr "Dauerfeuer-Status" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Deaktiviert" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -648,11 +648,11 @@ msgstr "Warten auf vertikalen Synchronisationsimpuls" msgid "Display Options" msgstr "Anzeigeeinstellungen" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "Datei existiert bereits - Überschreiben?" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -660,7 +660,7 @@ msgstr "Datei existiert bereits - Überschreiben?" msgid "No" msgstr "Nein" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -668,55 +668,55 @@ msgstr "Nein" msgid "Yes" msgstr "Ja" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "Neuer Image-Name:" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "Image-Format" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "Erzeugen" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "Bitte geben Sie auch eine Dateierweiterung ein" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "[leerer Steckplatz]" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "[erzeugen]" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "[Softwareliste]" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "Image-Format auswählen" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "Zugriffsart wählen" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "Nur lesend" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "Lesend und schreibend" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "Lesen von diesem Image, Schreiben auf ein anderes Image" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "Lesen von diesem Image, Schreiben in diff" @@ -1607,33 +1607,12 @@ msgstr "Zurückspulen" msgid "Fast Forward" msgstr "Vorspulen" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" "Für diese Maschine müssen Abbilder in die folgenden Geräte eingehängt werden:" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"Die unlizenzierte Beschaffung und Verwendung von Computerprogrammen " -"(einschließlich ROM-Inhalten), beispielsweise zur Nutzung in einem Emulator, " -"stellt einen Verstoß gegen das Urheberrecht dar.\n" -"\n" -"WENN SIE NICHT BERECHTIGT SIND, \"%s\" IN DIESEM EMULATOR ZU VERWENDEN, " -"DRÜCKEN SIE ESC.\n" -"\n" -"Andernfalls geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links " -"und dann nach rechts um fortzufahren" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1641,7 +1620,7 @@ msgstr "" "Ein oder mehrere ROMs/CHDs für diese Maschine sind nicht korrekt. Eventuell " "wird die Maschine nicht richtig laufen.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1649,49 +1628,49 @@ msgstr "" "Es gibt bekannte Probleme mit dieser Maschine\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" "Ein oder mehrere ROMs/CHDs dieser Maschine wurden nicht korrekt ausgelesen.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "Die Tastaturemulation könnte nicht 100% korrekt sein.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "Die Farben sind nicht 100% korrekt.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "Die Farben sind völlig falsch.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "Die Videoemulation ist nicht 100% korrekt.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "Die Soundemulation ist nicht 100% korrekt.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "Der Maschine fehlt die Soundemulation.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Die Bildschirmdrehung im Cocktailmodus wird nicht unterstützt.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "Die Maschine benötigt externe Illustrationsdateien\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1700,7 +1679,7 @@ msgstr "" "oder fehlende Elemente aufweisen, die nicht auf Fehler der Emulation " "zurückzuführen sind.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1708,13 +1687,13 @@ msgstr "" "Diese Maschine besitzt keine Sound-Hardware; MAME wird erwartungsgemäß keine " "Töne ausgeben.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" "Die Maschine besitzt einen Kopierschutz, der nicht vollständig emuliert " "ist.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1726,7 +1705,7 @@ msgstr "" "nicht vollständig. Sie können nur darauf warten, dass die Entwickler die " "Emulation verbessern.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1738,7 +1717,7 @@ msgstr "" "echte physische Interaktion voraussetzen oder mechanische Komponenten " "beinhalten. Es ist nicht möglich, diese Maschine vollständig zu verwenden.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1748,18 +1727,14 @@ msgstr "" "\n" "Es gibt funktionsfähige Klone dieser Maschine: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links und dann nach " -"rechts, um fortzufahren" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1774,15 +1749,15 @@ msgstr "" "\n" "CPU:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1790,7 +1765,7 @@ msgstr "" "\n" "Sound:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1798,78 +1773,78 @@ msgstr "" "\n" "Video:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Keine\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Vektor" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s: %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Status Tastaturemulation" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Modus: TEILWEISE Emulation" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "Benutzeroberfläche: Aktiviert" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "** Verwenden Sie ScrLock zum Umschalten**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Modus: VOLLSTÄNDIGE Emulation" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "Benutzeroberfläche: Deaktiviert" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Dauerfeuer kann nicht aktiviert werden" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Speicherposition wählen" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Ladeposition wählen" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Speichern abgebrochen" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Laden abgebrochen" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Speichere an Position %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Lade von Position %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1882,173 +1857,173 @@ msgstr "" "Zum Beenden drücken Sie ''%1$s''.\n" "Um zur Emulation zurückzukehren drücken Sie ''%2$s''." -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Gesamtlautstärke" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$s Lautstärke" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "CPU %1$s übertakten" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s Aktualisierungsrate" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s Helligkeit" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s Kontrast" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s Gamma" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s Horizontale Streckung" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s Horizontale Position" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s Vertikale Streckung" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s Vertikale Position" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "Laserdisc '%1$s' Horizontale Streckung" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "Laserdisc '%1$s' Horizontale Position" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "Laserdisc '%1$s' Vertikale Streckung" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "Laserdisc '%1$s' Vertikale Position" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Vektorflimmern" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Minimale Strahlbreite" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Maximale Strahlbreite" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Gewichtung der Strahlintensität" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Fadenkreuzskalierung %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "X" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Y" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Fadenkreuzversatz %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3ddB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3ffps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "%1$1.2f" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Bildschirm '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Bildschirm" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Fadenkreuzskalierung X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Fadenkreuzskalierung Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Fadenkreuzversatz X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Fadenkreuzversatz Y %1$1.3f" @@ -2098,6 +2073,35 @@ msgstr " FARBEN" msgid " PENS" msgstr " STIFTE" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "Die unlizenzierte Beschaffung und Verwendung von Computerprogrammen " +#~ "(einschließlich ROM-Inhalten), beispielsweise zur Nutzung in einem " +#~ "Emulator, stellt einen Verstoß gegen das Urheberrecht dar.\n" +#~ "\n" +#~ "WENN SIE NICHT BERECHTIGT SIND, \"%s\" IN DIESEM EMULATOR ZU VERWENDEN, " +#~ "DRÜCKEN SIE ESC.\n" +#~ "\n" +#~ "Andernfalls geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links " +#~ "und dann nach rechts um fortzufahren" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links und dann " +#~ "nach rechts, um fortzufahren" + #~ msgid "Configure Machine" #~ msgstr "Maschine konfigurieren" diff --git a/language/Greek/strings.po b/language/Greek/strings.po index 7950e5484e7..8d541097689 100644 --- a/language/Greek/strings.po +++ b/language/Greek/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-03-26 02:10+0200\n" "Last-Translator: Mame.gr\n" "Language-Team: MAME Language Team\n" @@ -62,14 +62,14 @@ msgstr "Επαναφόρτωση όλων" msgid "Autofire Status" msgstr "Κατάσταση Autofire" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Απενεργοποιημένο" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -247,7 +247,8 @@ msgstr "Ρυθμίσεις γραμματοσειρών UI" #: src/emu/ui/custui.cpp:408 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit." -msgstr "Δείγμα κειμένου - Lorem ipsum dolor sit amet, consectetur adipiscing elit." +msgstr "" +"Δείγμα κειμένου - Lorem ipsum dolor sit amet, consectetur adipiscing elit." #: src/emu/ui/custui.cpp:506 msgid "Normal text" @@ -645,11 +646,11 @@ msgstr "Αναμονή για Κάθετο Συγχρονισμό" msgid "Display Options" msgstr "Επιλογές Γραφικών" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "Το Αρχείο Υπάρχει Ήδη - Να Αντικατασταθεί;" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -657,7 +658,7 @@ msgstr "Το Αρχείο Υπάρχει Ήδη - Να Αντικατασταθ msgid "No" msgstr "Όχι" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -665,55 +666,55 @@ msgstr "Όχι" msgid "Yes" msgstr "Ναι" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "Νέο Όνομα Εικόνας:" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "Μορφή Εικόνας:" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "Δημιουργία" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "Παρακαλούμε εισάγετε μια επέκταση αρχείου" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "[κενή υποδοχή]" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "[δημιουργία]" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "[λίστα λογισμικού]" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "Επιλέξτε μορφή εικόνας" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "Επιλέξτε λειτουργία πρόσβασης" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "Μόνο για Ανάγνωση" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "Ανάγνωσης-εγγραφής" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "Ανάγνωση αυτής της εικόνας, εγγραφή σε άλλη" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "Ανάγνωση αυτής της εικόνας, εγγραφή σε αρχείο αλλαγών" @@ -1605,32 +1606,12 @@ msgstr "Επαναφορά" msgid "Fast Forward" msgstr "Γρήγορη Προώθηση" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" "Αυτός ο οδηγός απαιτεί εικόνες να φορτωθούν στην ακόλουθη συσκευή (ες): " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"Η Χρήση των εξομοιωτών σε συνδυασμό με ROMs που δεν κατέχετε απαγορεύεται " -"από το νόμο περί πνευματικών δικαιωμάτων.\n" -"\n" -"ΑΝ ΔΕΝ ΚΑΤΕΧΕΤΕ ΝΟΜΙΜΑ ΤΟ ΔΙΚΑΙΩΜΑ ΝΑ ΠΑΙΞΕΤΕ ΤΟ «%1$s» ΣΕ ΑΥΤΟ ΤΟΝ " -"ΕΞΟΜΟΙΩΤΗ, ΠΙΕΣΤΕ ΤΟ ΠΛΗΚΤΡΟ ESC.\n" -"\n" -"Διαφορετικά, πληκτρολογήστε OK ή να μετακινήσετε το μοχλό αριστερά και μετά " -"δεξιά για να συνεχίσετε" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1638,7 +1619,7 @@ msgstr "" "Μία ή περισσότερες ROMs/CHDs για αυτό το μηχάνημα είναι εσφαλμένες. Το " "μηχάνημα μπορεί να μην εκτελείται σωστά.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1646,50 +1627,51 @@ msgstr "" "Υπάρχουν γνωστά προβλήματα με αυτό το μηχάνημα\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" "Μία ή περισσότερες ROMs/CHDs για αυτό το μηχάνημα δεν έχουν γίνει dump " "σωστά.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "Η εξομοίωση πληκτρολογίου δεν είναι σωστή 100%.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "Τα χρώματα δεν είναι σωστά 100%.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "Τα χρώματα είναι εντελώς λάθος.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "Η εξομοίωση βίντεο δεν είναι σωστή 100%.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "Η εξομοίωση ήχου δεν είναι σωστή 100%.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "Το μηχάνημα δεν έχει ήχο.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" -msgstr "Το αναποδογύρισμα της οθόνης σε κοκτέιλ λειτουργία δεν υποστηρίζεται.\n" +msgstr "" +"Το αναποδογύρισμα της οθόνης σε κοκτέιλ λειτουργία δεν υποστηρίζεται.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "Το μηχάνημα απαιτεί εξωτερικό αρχείο Artwork\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1697,7 +1679,7 @@ msgstr "" "Αυτό το μηχάνημα δεν ολοκληρώθηκε ποτέ. Αυτό μπορεί να εμφανίσει ασυνήθιστη " "συμπεριφορά ή στοιχεία να λείπουν που δεν είναι σφάλματα στην εξομοίωση.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1705,11 +1687,12 @@ msgstr "" "Αυτό το μηχάνημα δεν έχει κανένα υλικό ήχου, το MAME δεν θα παράγει κανένα " "ήχο, αυτή είναι αναμενόμενη συμπεριφορά.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" -msgstr "Αυτό το μηχάνημα έχει προστασία η οποία δεν είναι πλήρως εξομοιωμένη.\n" +msgstr "" +"Αυτό το μηχάνημα έχει προστασία η οποία δεν είναι πλήρως εξομοιωμένη.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1722,7 +1705,7 @@ msgstr "" "αυτό το πρόβλημα εκτός από την αναμονή για τους προγραμματιστές να " "βελτιώσουν την εξομοίωση.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1734,7 +1717,7 @@ msgstr "" "καθώς απαιτείται πραγματική φυσική αλληλεπίδραση ή αποτελείται από μηχανικές " "συσκευές. Δεν είναι δυνατόν να παιχτεί πλήρως αυτό το μηχάνημα.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1744,18 +1727,14 @@ msgstr "" "\n" "Υπάρχουν κλώνοι αυτού του μηχανήματος που λειτουργούν: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Πληκτρολογήστε OK ή μετακινήσετε το μοχλό αριστερά και στη συνέχεια δεξιά " -"για να συνεχίσετε" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1770,15 +1749,15 @@ msgstr "" "\n" "CPU:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1786,7 +1765,7 @@ msgstr "" "\n" "Ήχος:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1794,78 +1773,78 @@ msgstr "" "\n" "Βίντεο:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Κανένα\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Διάνυσμα" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s: %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Κατάσταση Εξομοίωσης Πληκτρολογίου" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Λειτουργία: ΜΕΡΙΚΗ Εξομοίωση" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI: Ενεργοποιημένο" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Χρήση ScrLock να εναλλαγή**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Λειτουργία: ΠΛΗΡΗΣ Εξομοίωση" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI: Απενεργοποιημένο" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Δεν μπορεί να ενεργοποιηθεί το Autofire" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Επιλέξτε τη θέση για αποθήκευση σε" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Επιλέξτε τη θέση φόρτωσης από" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Η αποθήκευση ακυρώθηκε" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Η φόρτωση ακυρώθηκε" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Αποθήκευση σε θέση %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Φόρτωση από θέση %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1878,173 +1857,173 @@ msgstr "" "Πατήστε ''%1$s'' για να εγκαταλείψετε,\n" "Πατήστε ''%2$s'' για να επιστρέψετε στην εξομοίωση." -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Κύρια Ένταση" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$s Ένταση" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "Υπερχρονισμός CPU %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s Ρυθμός Ανανέωσης" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s Φωτεινότητα" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s Αντίθεση" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s Γάμμα" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s Οριζόντια Επέκταση" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s Οριζόντια Θέση" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s Κάθετη Επέκταση" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s Κάθετη Θέση" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "Laserdisc '%1$s' Οριζόντια Επέκταση" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "Laserdisc '%1$s' Οριζόντια Θέση" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "Laserdisc '%1$s' Κάθετη Επέκταση" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "Laserdisc '%1$s' Κάθετη Θέση" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Τρεμόπαιγμα Διανύσματος" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Ελάχιστο Πλάτος Ακτινών" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Μέγιστο Πλάτος Ακτινών" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Βάρος Έντασης Ακτίνας" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Κλίμακα Στόχαστρου %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "X" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Y" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Μετατόπιση Στοχάστρου %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3ddB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3ffps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "%1$1.2f" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Οθόνη '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Οθόνη" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Κλίμακα Στόχαστρου X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Κλίμακα Στόχαστρου Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Μετατόπιση Στοχάστρου X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Μετατόπιση Στοχάστρου Y %1$1.3f" @@ -2093,3 +2072,31 @@ msgstr " ΧΡΩΜΑΤΑ" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" msgstr " ΓΡΑΦΙΔΕΣ" + +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "Η Χρήση των εξομοιωτών σε συνδυασμό με ROMs που δεν κατέχετε απαγορεύεται " +#~ "από το νόμο περί πνευματικών δικαιωμάτων.\n" +#~ "\n" +#~ "ΑΝ ΔΕΝ ΚΑΤΕΧΕΤΕ ΝΟΜΙΜΑ ΤΟ ΔΙΚΑΙΩΜΑ ΝΑ ΠΑΙΞΕΤΕ ΤΟ «%1$s» ΣΕ ΑΥΤΟ ΤΟΝ " +#~ "ΕΞΟΜΟΙΩΤΗ, ΠΙΕΣΤΕ ΤΟ ΠΛΗΚΤΡΟ ESC.\n" +#~ "\n" +#~ "Διαφορετικά, πληκτρολογήστε OK ή να μετακινήσετε το μοχλό αριστερά και " +#~ "μετά δεξιά για να συνεχίσετε" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Πληκτρολογήστε OK ή μετακινήσετε το μοχλό αριστερά και στη συνέχεια δεξιά " +#~ "για να συνεχίσετε" diff --git a/language/Hebrew/strings.po b/language/Hebrew/strings.po index a098ef8e005..8f0a4e9ceb4 100644 --- a/language/Hebrew/strings.po +++ b/language/Hebrew/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Hindi/strings.po b/language/Hindi/strings.po index ac722d7e173..39e376a59fd 100644 --- a/language/Hindi/strings.po +++ b/language/Hindi/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Hungarian/strings.po b/language/Hungarian/strings.po index 5f5904a99d8..df2290c9552 100644 --- a/language/Hungarian/strings.po +++ b/language/Hungarian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Indonesian/strings.po b/language/Indonesian/strings.po index c2023c82170..6fe83a37672 100644 --- a/language/Indonesian/strings.po +++ b/language/Indonesian/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Italian/strings.po b/language/Italian/strings.po index ec589e8057d..b52d4e073aa 100644 --- a/language/Italian/strings.po +++ b/language/Italian/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Angelo Salese,Antonio Paradossi,Fabio Priuli\n" "Language-Team: MAME Language Team\n" @@ -63,14 +63,14 @@ msgstr "Ricarica Tutto" msgid "Autofire Status" msgstr "Stato Autofire" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Disabilitato" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -647,11 +647,11 @@ msgstr "" msgid "Display Options" msgstr "Opzioni Display" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -659,7 +659,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -667,55 +667,55 @@ msgstr "" msgid "Yes" msgstr "Si" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1594,32 +1594,12 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" "Questo driver richiede software caricato nel(i) dispositivo(i) seguente(i): " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"SE NON SEI LEGALMENTE AUTORIZZATO A GIOCARE \"%1$s\" CON QUESTO EMULATORE, " -"PREMI ESC.\n" -"\n" -"Altrimenti, digita OK o muovi il joystick a sinistra e a destra per " -"continuare" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1627,7 +1607,7 @@ msgstr "" "Uno o più ROM/CHD per questa macchina non sono corretti. La macchina " "potrebbe non funzionare correttamente.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1635,48 +1615,48 @@ msgstr "" "Ci sono problemi noti per questa macchina\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "Uno o più ROM/CHD per questa macchina non è dumpato correttamente.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "L'emulazione della tastiera potrebbe non essere corretta al 100%.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "I colori non sono corretti al 100%.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "I colori sono completamente sbagliati.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "L'emulazione video non è corretta al 100%.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "L'emulazione audio non è corretta al 100%.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "La macchina ha problemi con l'audio.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "L'inversione dello schermo in modalità cocktail non è supportata" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "La macchina richiede file di artwork extra\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1684,7 +1664,7 @@ msgstr "" "Questa macchina non è mai stata completata. Potrebbe mostrare fenomeni " "strani o elementi mancanti che non sono bug nell'emulazione.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1692,11 +1672,11 @@ msgstr "" "Questa macchina non ha alcun componente audio, MAME non produrrà alcun suono " "e questo è il comportamento atteso e non un bug.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "La macchina ha delle protezioni che non sono emulate completamente.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1708,7 +1688,7 @@ msgstr "" "completa. Non c'è nulla che tu possa fare per risolvere questo problema " "eccetto aspettare che gli sviluppatori migliorino l'emulazione.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1720,7 +1700,7 @@ msgstr "" "richiedono interazioni fisiche oppure dispositivi meccanici. Non è possibile " "giocare in maniera completa con questa macchina.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1730,17 +1710,14 @@ msgstr "" "\n" "Ci sono cloni funzionanti di questa macchina: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Scrivi OK oppure muovi il joystick a sinistra e poi a destra per continuare" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1750,15 +1727,15 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1766,7 +1743,7 @@ msgstr "" "\n" "Audio:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1774,78 +1751,78 @@ msgstr "" "\n" "Video:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Nessuno\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Vettoriale" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Stato Emulazione Tastiera" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Modalità: Emulazione PARZIALE" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI: Abilitato" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Usa ScrLock per cambiare**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Modalità: Emulazione COMPLETA" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI: Disabilitato" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Autofire non può essere abilitato" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Seleziona la posizione in cui salvare" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Seleziona la posizione da cui caricare" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Salvataggio annullato" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Caricamento annullato" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Salva in %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Carica da %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1854,173 +1831,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Volume Principale" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s Frequenza di aggiornamento" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s Luminosità" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s Contrasto" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s Allungamento Orizzontale" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s Posizione Orizzontale" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s Allungamento Verticale" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s Posizione Verticale" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Schermo" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Scala del Puntatore X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Scala del Puntatore Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" @@ -2070,6 +2047,34 @@ msgstr " COLORI" msgid " PENS" msgstr " PEN" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "SE NON SEI LEGALMENTE AUTORIZZATO A GIOCARE \"%1$s\" CON QUESTO " +#~ "EMULATORE, PREMI ESC.\n" +#~ "\n" +#~ "Altrimenti, digita OK o muovi il joystick a sinistra e a destra per " +#~ "continuare" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Scrivi OK oppure muovi il joystick a sinistra e poi a destra per " +#~ "continuare" + #~ msgid "Double click or press " #~ msgstr "Doppio click o premi " diff --git a/language/Japanese/strings.po b/language/Japanese/strings.po index f63407d4725..f4b871677e5 100644 --- a/language/Japanese/strings.po +++ b/language/Japanese/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-23 01:39+0900\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -63,14 +63,14 @@ msgstr "全て再読み込み" msgid "Autofire Status" msgstr "連射設定ステータス" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "無効" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -647,11 +647,11 @@ msgstr "V-Syncを待つ" msgid "Display Options" msgstr "表示オプション" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "ファイルが存在します－上書きしますか？" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -659,7 +659,7 @@ msgstr "ファイルが存在します－上書きしますか？" msgid "No" msgstr "いいえ" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -667,55 +667,55 @@ msgstr "いいえ" msgid "Yes" msgstr "はい" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "新しいイメージ名:" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "イメージ形式:" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "作成" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "ファイルの拡張子を入力してください" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "〔空のスロット〕" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "〔作成〕" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "〔ソフトウェアリスト〕" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "イメージ形式の選択" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "アクセスモードの選択" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "読み取り専用" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "読み取り／書き込み" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "このイメージから読み取り、別のイメージに書き込む" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "このイメージから読み取り、差分（diff）に書き込む" @@ -1606,30 +1606,11 @@ msgstr "巻き戻す" msgid "Fast Forward" msgstr "早送り" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "このドライバは以下のデバイスでイメージの読み込みが必要です:" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"あなたが所有していないROMをエミュレータで利用することは著作権法で禁じられてい" -"ます。\n" -"\n" -"もしあなたが合法的に「%1$s」をプレイする資格がない場合は、ESCキーを押して下さ" -"い。\n" -"\n" -"そうでなければOKとタイプするかジョイスティックを左右に入力して進みます。" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1637,7 +1618,7 @@ msgstr "" "このマシン用のROM/CHDが正しくありません。そのため正しく動作しない可能性があり" "ます。\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1645,50 +1626,50 @@ msgstr "" "このマシンには以下のような問題点があります\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" "このマシン用のROM/CHDは全て正しく吸い出されていません。\n" "\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "キーボードエミュレーションが100%正確ではありません。\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "表示色が100%正確ではありません。\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "表示色が完全に間違っています。\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "表示系のエミュレーションが100%正確ではありません。\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "サウンドエミュレーションが100%正確ではありません。\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "このマシンは音が鳴りません。\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "カクテルモードでの画面反転表示はサポートされていません。\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "このマシンは別途アートワークファイルが必要です。\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1696,7 +1677,7 @@ msgstr "" "このマシンは未完成です。動作の不具合や不足した要素があってもエミュレーション" "のバグではありません。\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1704,11 +1685,11 @@ msgstr "" "このマシンにはサウンドハードウェアがありません。音が出なくても正常な動作で" "す。\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "このマシンのプロテクトは完全にエミュレートされていません。\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1719,7 +1700,7 @@ msgstr "" "このマシンは動作しません。エミュレーションは未完成です。開発者がエミュレー" "ションを改良するのをお待ち下さい。\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1730,7 +1711,7 @@ msgstr "" "このマシンの一部の要素は、機械的デバイスによる実際の動作が必要なためエミュ" "レートできません。そのため、このマシンを完全にプレイすることはできません。\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1740,17 +1721,14 @@ msgstr "" "\n" "このマシンの動作可能なクローンセット:" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"OKとタイプするか、ジョイスティックを左右に動かして進む" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1765,15 +1743,15 @@ msgstr "" "\n" "CPU:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1781,7 +1759,7 @@ msgstr "" "\n" "サウンド:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1789,78 +1767,78 @@ msgstr "" "\n" "表示:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "なし\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "ベクター" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s：%2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "キーボードエミュレーションステータス" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "モード: 部分的エミュレーション" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI: 有効" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "** ScrLockキーで切り替え **" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "モード：完全エミュレーション" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI: 無効" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "連射機能は有効にできません" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "セーブ先を選択" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "セーブ元を選択" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "セーブはキャンセルされました" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "ロードはキャンセルされました" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "%sにセーブしました" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "%sからロードしました" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1873,173 +1851,173 @@ msgstr "" "「%1$s」で終了\n" "「%2$s」でエミュレーションに戻る" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "マスター音量" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$sの音量" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "CPU %1$sのオーバークロック" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$sのリフレッシュレート" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$sの輝度" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$sのコントラスト" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$sのガンマ" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s 横方向の拡大" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s 横方向の位置" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s 縦方向の拡大" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s 縦方向の位置" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "レーザーディスク '%1$s' 横方向の拡大" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "レーザーディスク '%1$s' 横方向の位置" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "レーザーディスク '%1$s' 縦方向の拡大" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "レーザーディスク '%1$s' 縦方向の位置" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "ベクターのちらつき" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "ビーム幅（最小）" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "ビーム幅（最大）" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "ビーム強度比重" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "照準の大きさ %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "照準のオフセット %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "%1$1.2f" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "画面「%1$s」" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "画面" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "照準の大きさ X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "照準の大きさ Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "照準のオフセット X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "照準のオフセット Y %1$1.3f" @@ -2089,6 +2067,32 @@ msgstr " 色" msgid " PENS" msgstr " ペン" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "あなたが所有していないROMをエミュレータで利用することは著作権法で禁じられ" +#~ "ています。\n" +#~ "\n" +#~ "もしあなたが合法的に「%1$s」をプレイする資格がない場合は、ESCキーを押して" +#~ "下さい。\n" +#~ "\n" +#~ "そうでなければOKとタイプするかジョイスティックを左右に入力して進みます。" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "OKとタイプするか、ジョイスティックを左右に動かして進む" + #~ msgid "Configure Machine" #~ msgstr "マシンの設定" diff --git a/language/Korean/strings.po b/language/Korean/strings.po index bd043223ba5..198a73fcb65 100644 --- a/language/Korean/strings.po +++ b/language/Korean/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Latvian/strings.po b/language/Latvian/strings.po index e3571e2ef54..4bb6f42d893 100644 --- a/language/Latvian/strings.po +++ b/language/Latvian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Lithuanian/strings.po b/language/Lithuanian/strings.po index 3ef9cccb19a..39030f0d506 100644 --- a/language/Lithuanian/strings.po +++ b/language/Lithuanian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Macedonian/strings.po b/language/Macedonian/strings.po index eb1d22f0ac6..25c4119eadc 100644 --- a/language/Macedonian/strings.po +++ b/language/Macedonian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Norwegian/strings.po b/language/Norwegian/strings.po index e70544659d4..704a8f42c75 100644 --- a/language/Norwegian/strings.po +++ b/language/Norwegian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Persian/strings.po b/language/Persian/strings.po index 54e02332306..559837e17b5 100644 --- a/language/Persian/strings.po +++ b/language/Persian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Polish/strings.po b/language/Polish/strings.po index 6cf4bc61d1e..23989fede0a 100644 --- a/language/Polish/strings.po +++ b/language/Polish/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -62,14 +62,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -645,11 +645,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -657,7 +657,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -665,55 +665,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1574,92 +1574,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1667,7 +1655,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1675,21 +1663,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1699,98 +1687,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1799,173 +1787,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Portuguese/strings.po b/language/Portuguese/strings.po index cf6d13c2003..d950b6320b0 100644 --- a/language/Portuguese/strings.po +++ b/language/Portuguese/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Portuguese_Brazil/strings.po b/language/Portuguese_Brazil/strings.po index 447ae5dabc7..2522a63b58b 100644 --- a/language/Portuguese_Brazil/strings.po +++ b/language/Portuguese_Brazil/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-03-02 14:00+0100\n" "Last-Translator: Ashura-X\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "Recarregar Tudo" msgid "Autofire Status" msgstr "Situação do Autodisparo" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Desativado" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -645,11 +645,11 @@ msgstr "Aguardar Sincronismo Vertical" msgid "Display Options" msgstr "Opções de Tela" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "Arquivo Já Existe - Sobrescrever?" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -657,7 +657,7 @@ msgstr "Arquivo Já Existe - Sobrescrever?" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -665,55 +665,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1578,33 +1578,13 @@ msgstr "Rebobinar" msgid "Fast Forward" msgstr "Avanço Rápido" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" "Este driver necessita de imagens para ser carregado nos seguintes " "dispositivo(s): " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"O uso de emuladores em conjunto com ROMs que você não possui é proibido por " -"leis de direitos autorais\n" -"\n" -"SE VOCÊ NÃO ESTÁ LEGALMENTE ENTITULADO PARA JOGAR \"%1$s\" NESTE EMULADOR, " -"PRESSIONE ESC.\n" -"\n" -"Caso contrário, digite OK ou mova o joystick para a esquerda e direita para " -"continuar" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1612,56 +1592,56 @@ msgstr "" "Uma ou mais ROMs/CHDs para esta máquina estão incorretas. A máquina não irá " "funcionar corretamente" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "Existem problemas conhecidos com esta máquina" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" "Uma ou mais ROMs/CHDs para esta máquina não foram corretamente dumpadas. \n" " " -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "A emulação do teclado talvez não seja 100% perfeita.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "As cores não são 100% perfeitas.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "As cores são completamente erradas.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "A emulação do vídeo não é 100% perfeita.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "A emulação do som não é 100% perfeita.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "A máquina tem problemas no som.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Inversão de tela no modo coquetel não é suportada.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "Esta máquina requer arquivos externos de artwork\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1669,7 +1649,7 @@ msgstr "" "Esta máquina nunca foi completada. Ela poderá ter um comportamento estranho " "or faltar elementos que não são bugs na emulação" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1677,11 +1657,11 @@ msgstr "" "Esta máquina não tem hardware de som, MAME não irá produzir som algum, isto " "já é esperado." -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "A máquina possui proteção a qual não é completamente emulada.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1692,7 +1672,7 @@ msgstr "" "Não há nada que você possa fazer para fixar isto exceto aguardar os " "desenvolvedores improvisarem a emulação.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1703,22 +1683,21 @@ msgstr "" "interação física ou de dispositivos mecânicos. Não é possível jogar esta " "máquina plenamente.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "Existem clones funcionando para esta máquina: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"Pressione OK ou mova o joysticks para esquerda e direita para continuar" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1728,98 +1707,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "Som:" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "Vídeo:" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Nada" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Vetorial" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Situação da Emulação do Teclado" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Modo: Emulação PARCIAL" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI: Ativo" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Usar ScrLock para alternar" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Modo: Emulação COMPLETA" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI: Desativado" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Autodisparo não pode ser ativado" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Selecione a posição para salvar em" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Selecione a posição para carregar de" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Salvar cancelado" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Carregar cancelado" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Salvar para a posição %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Carregar da posição %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1832,173 +1811,173 @@ msgstr "" "Pressione ''%1$s'' para sair,\n" "Pressione ''%2$s'' para retornar à emulação." -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Volume Mestre" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$s Volume" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "Overclock CPU %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "Taxa de Atualização da %1$s" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "Brilho da %1$s" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "Contraste da %1$s" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "Gama da %1$s" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "Extensão Horizontal da %1$s" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "Posição Horizontal %1$s" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "Extensão Vertical da %1$s" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "Posição Vertical da %1$s" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "Laserdisc '%1$s' Extensão Horizontal" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "Laserdisc '%1$s' Posição Horizontal" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "Laserdisc '%1$s' Extensão Vertical" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "Laserdisc '%1$s' Posição Vertical" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Flicker Vetorial" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Largura Mínima do Feixe de Luz" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Largura Máxima do Feixe de Luz" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Intensidade do tamanho do Feixe de Luz" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Escala da Mira %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "X" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Y" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Ajuste da Mira" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3ddB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3ffps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "%1$1.2f" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Tela '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Tela" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Escala da Mira X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Escala da Mira Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Ajuste da Mira X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Ajuste da Mira Y %1$1.3f" @@ -2048,6 +2027,31 @@ msgstr " CORES" msgid " PENS" msgstr " CANETAS" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "O uso de emuladores em conjunto com ROMs que você não possui é proibido " +#~ "por leis de direitos autorais\n" +#~ "\n" +#~ "SE VOCÊ NÃO ESTÁ LEGALMENTE ENTITULADO PARA JOGAR \"%1$s\" NESTE " +#~ "EMULADOR, PRESSIONE ESC.\n" +#~ "\n" +#~ "Caso contrário, digite OK ou mova o joystick para a esquerda e direita " +#~ "para continuar" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "Pressione OK ou mova o joysticks para esquerda e direita para continuar" + #~ msgid "Configure Machine" #~ msgstr "Configurar Máquina" diff --git a/language/Romanian/strings.po b/language/Romanian/strings.po index 6c8bef2066e..d954640fa81 100644 --- a/language/Romanian/strings.po +++ b/language/Romanian/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -62,14 +62,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -645,11 +645,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -657,7 +657,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -665,55 +665,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1574,92 +1574,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1667,7 +1655,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1675,21 +1663,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1699,98 +1687,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1799,173 +1787,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Russian/strings.po b/language/Russian/strings.po index e581887a29a..4f134885e27 100644 --- a/language/Russian/strings.po +++ b/language/Russian/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -64,14 +64,14 @@ msgstr "Перезагрузить все" msgid "Autofire Status" msgstr "Состояние" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Выключен" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -647,11 +647,11 @@ msgstr "" msgid "Display Options" msgstr "Настройки видео" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -659,7 +659,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -667,55 +667,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1576,23 +1576,11 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1600,7 +1588,7 @@ msgstr "" "Один или несколько ROM/CHD этой системы не верные. Эта система может " "работать не правильно.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1608,48 +1596,48 @@ msgstr "" "Имеются известные проблемы с этой системой\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "Один или несколько ROM/CHD этой системы не были нормально сдамплены.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "Эмуляция клавиатуры не 100% точная.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "Цвета не 100% точные.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "Цвета совсем не правильные.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "Эмуляция видео не 100% точная.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "Эмуляция звука не 100% точная.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "Звук не эмулируется.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Переворот экрана в режиме коктейль-стола не поддерживается.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "Этой системе нужны внешние файлы оформления\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1657,7 +1645,7 @@ msgstr "" "Разработка этой системы так и не была завершена. Может наблюдаться странное " "поведение или отсутсвующие элементы. Это не является ошибками эмуляции.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1665,11 +1653,11 @@ msgstr "" "У этой системы нет звукового оборудования, в процессе эмуляции не будет " "никаких звуков, так и должно быть.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "Защита этой системы эмулируется не полностью.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1680,7 +1668,7 @@ msgstr "" "ЭТА СИСТЕМА НЕ РАБОТАЕТ. Эмуляция этой системы не завершена. Вы никак не " "сможете исправить проблемы, лишь ждать когда разработчики улучшат эмуляцию.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1688,7 +1676,7 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1698,17 +1686,14 @@ msgstr "" "\n" "Известные работающие клоны этой системы: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Для продолжения напечатайте OK либо нажмите влево затем вправо на джойстике" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1718,15 +1703,15 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1734,7 +1719,7 @@ msgstr "" "\n" "Звук:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1742,78 +1727,78 @@ msgstr "" "\n" "Видео:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Нет\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Состояние эмуляции клавиатуры" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Режим: Частичная эмуляция" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "UI: Включен" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Нажмите ScrLock для переключения**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Режим: Полная эмуляция" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "UI: Выключен" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Авто-огонь не может быть включен" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Укажите слот сохранения" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Укажите слот загрузки" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Сохранение отменено" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Загрузка отменена" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Сохранение состояния %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Загрузка состояния %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1822,173 +1807,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Общая громкость" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Мерцание луча" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Минимальная ширина луча" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Максимальная ширина луча" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Насыщенность луча" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Экран" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" @@ -2038,6 +2023,16 @@ msgstr " ЦВЕТА" msgid " PENS" msgstr "" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Для продолжения напечатайте OK либо нажмите влево затем вправо на " +#~ "джойстике" + #~ msgid "Double click or press " #~ msgstr "Кликните два раза или нажмите " diff --git a/language/Serbian/strings.po b/language/Serbian/strings.po index 265f1e7f088..f801e746e33 100644 --- a/language/Serbian/strings.po +++ b/language/Serbian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-03-02 21:46+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -64,14 +64,14 @@ msgstr "Ponovo učitaj sve" msgid "Autofire Status" msgstr "Stanje automatskog pucanja" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Onemogućeno" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -648,11 +648,11 @@ msgstr "" msgid "Display Options" msgstr "Opcije prikaza" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -660,7 +660,7 @@ msgstr "" msgid "No" msgstr "Ne" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -668,55 +668,55 @@ msgstr "Ne" msgid "Yes" msgstr "Da" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1601,31 +1601,11 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "Za ovaj drajver je neophodno da slike budu učitane u sledeće uređaje:" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"Upotreba emulatora u vezi sa ROM-ovima koje ne posedujete je zabranjena " -"zakonom o autorskim pravima.\n" -"\n" -"AKO VAM NIJE DOZVOLJENO ZAKONOM DA IGRATE \"%1$s\" NA OVOM EMULATORU, " -"PRITISNITE ESC.\n" -"\n" -"U suprotnom, otkucajte OK ili pomerite komandnu palicu (džojstik) levo, pa " -"desno da nastavite" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1633,7 +1613,7 @@ msgstr "" "Jedan ili više ROM/CHD fajlova za ovu mašinu su neispravni. Mašina možda " "neće ispravno raditi.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1641,49 +1621,49 @@ msgstr "" "Postoje poznati problemi s ovom mašinom\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" "Jedan ili više ROM/CHD fajlova za ovu mašinu nisu ispravno napravljeni.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "Emulacija tastature možda nije 100% tačna.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "Boje nisu 100% tačne.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "Boje su potpuno pogrešne.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "Video emulacija nije 100% tačna.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "Emulacija zvuka nije 100% tačna.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "Mašini nedostaje zvuk.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Obrtanje ekrana u \"koktel\" modu nije podržano.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "Mašina zahteva dodatne ilustracione fajlove\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1691,7 +1671,7 @@ msgstr "" "Mašsina nije nikad završena. Može se javiti čudno ponašanje ili nedostatak " "elemenata sto ne predstavlja problem s emulacijom.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1699,11 +1679,11 @@ msgstr "" "Mašina ne poseduje uređaj za zvuk, MAME neće puštati zvuk, ovo je očekivano " "ponašanje.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "Mašina ima zaštitu koja nije potpuno emulirana.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1714,7 +1694,7 @@ msgstr "" "OVA MAŠINA NE RADI. Emulacija ove mašine još nije potpuna. Ne možete ništa " "uraditi u vezi s tim, osim da sačekate programere da unaprede emulaciju.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1726,7 +1706,7 @@ msgstr "" "interakciju ili se sastoje od mehaničkih uređaja. Nemoguće je igrati se na " "ovoj mašini u potpunosti.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1736,18 +1716,14 @@ msgstr "" "\n" "Postoji klonovi ove mašine koji rade: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Otkucajte OK ili pomerite komandnu palicu (džojstik) levo, pa desno da " -"nastavite" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1762,15 +1738,15 @@ msgstr "" "\n" "CPU:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1778,7 +1754,7 @@ msgstr "" "\n" "Zvuk:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1786,80 +1762,80 @@ msgstr "" "\n" "Video:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" "Nijedan\n" "\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Vektor" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s: %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Stanje emulacije tastature" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Mod: DELIMIČNA emulacija" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "Korisnički interfejs: omogućen" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Koristite ScrLock da promenite radno stanje**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Mod: POTPUNA emulacija" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "Korisnički interfejs: onesposobljen" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Automatsko pucanje ne može da se omogući" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Izaberite poziciju na koju želite da snimite" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Izaberite poziciju sa koje želite da učitate" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Čuvanje stanja igre otkazano" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Učitavanje stanja igre otkazano" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Sačuvaj na poziciju %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Učitaj sa pozicije %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1872,173 +1848,173 @@ msgstr "" "Pritisnite ''%s'' za napuštanje programa,\n" "Pritisnite ''%s'' za nastavak emulacije." -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Glavna jačina zvuka" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$s jačina zvuka" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "Ubrzanje osnovnog takta CPU %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s frekvencija osvežavanja" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s osvetljenost" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s kontrast" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s gamut" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s rastezanje po horizontali" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s horizontalna pozicija" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s rastezanje po vertikali" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s vertikalna pozicija" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "Laserdisc '%1$s' rastezanje po horizontali" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "Laserdisc '%1$s' horizontalna pozicija" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "Laserdisc '%1$s' rastezanje po vertikali" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "Laserdisc '%1$s' vertikalna pozicija" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Treperenje vektora" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Minimalna širina snopa" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Maksimalna širinia snopa" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Intenzitet snopa" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Razmera nišana %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "X" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Y" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Pomeraj nišana %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3ddB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3ffps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "%1$1.2f" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Ekran '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Ekran" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Razmera nišana X %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Razmera nišana Y %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Pomeraj nišana X %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Pomeraj nišana Y %1$1.3f" @@ -2088,6 +2064,34 @@ msgstr " BOJE" msgid " PENS" msgstr "" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "Upotreba emulatora u vezi sa ROM-ovima koje ne posedujete je zabranjena " +#~ "zakonom o autorskim pravima.\n" +#~ "\n" +#~ "AKO VAM NIJE DOZVOLJENO ZAKONOM DA IGRATE \"%1$s\" NA OVOM EMULATORU, " +#~ "PRITISNITE ESC.\n" +#~ "\n" +#~ "U suprotnom, otkucajte OK ili pomerite komandnu palicu (džojstik) levo, " +#~ "pa desno da nastavite" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Otkucajte OK ili pomerite komandnu palicu (džojstik) levo, pa desno da " +#~ "nastavite" + #~ msgid "Configure Machine" #~ msgstr "Konfiguracija mašine" diff --git a/language/Serbian_Cyrillic/strings.po b/language/Serbian_Cyrillic/strings.po index ed2538b6ba6..f910d74bbf4 100644 --- a/language/Serbian_Cyrillic/strings.po +++ b/language/Serbian_Cyrillic/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-23 12:43+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -64,14 +64,14 @@ msgstr "Поново учитаj свe" msgid "Autofire Status" msgstr "Стањe аутоматског пуцања" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Онeмогућeно" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -648,11 +648,11 @@ msgstr "" msgid "Display Options" msgstr "Опциje приказа" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -660,7 +660,7 @@ msgstr "" msgid "No" msgstr "Нe" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -668,55 +668,55 @@ msgstr "Нe" msgid "Yes" msgstr "Да" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1601,31 +1601,11 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "За оваj драjвeр je нeопходно да сликe буду учитанe у слeдeћe урeђаje:" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"Употрeба eмулатора у вeзи са РОМ-овима коje нe посeдуjeтe je забрањeна " -"законом о ауторским правима.\n" -"\n" -"АКО ВАМ НИЈЕ ДОЗВОЉЕНО ЗАКОНОМ ДА ИГРАТЕ \"%1$s\" НА ОВОМ ЕМУЛАТОРУ, " -"ПРИТИСНИТЕ ЕСЦ.\n" -"\n" -"У супротном, откуцаjтe ОК или помeритe командну палицу (џоjстик) лeво, па " -"дeсно да наставитe" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1633,7 +1613,7 @@ msgstr "" "Јeдан или вишe РОМ/ЦХД фаjлова за ову машину су нeисправни. Машина можда " "нeћe исправно радити.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1641,49 +1621,49 @@ msgstr "" "Постоje познати проблeми с овом машином\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" "Јeдан или вишe РОМ/ЦХД фаjлова за ову машину нису исправно направљeни.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "Емулациjа тастатурe можда ниje 100% тачна.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "Боje нису 100% тачнe.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "Боje су потпуно погрeшнe.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "Видeо eмулациjа ниje 100% тачна.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "Емулациjа звука ниje 100% тачна.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "Машини нeдостаje звук.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Обртањe eкрана у \"коктeл\" моду ниje подржано.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "Машина захтeва додатнe илустрационe фаjловe\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1691,7 +1671,7 @@ msgstr "" "Машсина ниje никад завршeна. Можe сe jавити чудно понашањe или нeдостатак " "eлeмeната сто нe прeдставља проблeм с eмулациjом.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1699,11 +1679,11 @@ msgstr "" "Машина нe посeдуje урeђаj за звук, МАМЕ нeћe пуштати звук, ово je очeкивано " "понашањe.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "Машина има заштиту коjа ниje потпуно eмулирана.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1714,7 +1694,7 @@ msgstr "" "ОВА МАШИНА НЕ РАДИ. Емулациjа овe машинe jош ниje потпуна. Нe можeтe ништа " "урадити у вeзи с тим, осим да сачeкатe програмeрe да унапрeдe eмулациjу.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1726,7 +1706,7 @@ msgstr "" "интeракциjу или сe састоje од мeханичких урeђаjа. Нeмогућe je играти сe на " "овоj машини у потпуности.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1736,18 +1716,14 @@ msgstr "" "\n" "Постоjи клонови овe машинe коjи радe: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Откуцаjтe ОК или помeритe командну палицу (џоjстик) лeво, па дeсно да " -"наставитe" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1762,15 +1738,15 @@ msgstr "" "\n" "ЦПУ:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1778,7 +1754,7 @@ msgstr "" "\n" "Звук:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1786,78 +1762,78 @@ msgstr "" "\n" "Видeо:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Ниjeдан\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Вeктор" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Стањe eмулациje тастатурe" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Мод: ДЕЛИМИЧНА eмулациjа" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "Кориснички интeрфejс: омогућeн" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Користитe ScrLock да промeнитe радно стањe**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Мод: ПОТПУНА eмулациjа" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "Кориснички интeрфejс: онeспособљeн" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "Аутоматско пуцањe нe можe да сe омогући" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Изабeритe позициjу на коjу жeлитe да снимитe" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Изабeритe позициjу са коje жeлитe да учитатe" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Чувањe стања игрe отказано" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Учитавањe стања игрe отказано" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Сачуваj на позициjу %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Учитаj са позициje %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1870,173 +1846,173 @@ msgstr "" "Притиснитe ''%s'' за напуштањe програма,\n" "Притиснитe ''%s'' за наставак eмулациje." -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Главна jачина звука" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "%1$s jачина звука" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "Убрзањe основног такта ЦПУ %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "%1$s фрeквeнциjа освeжавања" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "%1$s освeтљeност" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "%1$s контраст" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "%1$s гамут" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "%1$s растeзањe по хоризонтали" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "%1$s хоризонтална позициjа" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "%1$s растeзањe по вeртикали" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "%1$s вeртикална позициjа" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "Ласeрдисц '%1$s' растeзањe по хоризонтали" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "Ласeрдисц '%1$s' хоризонтална позициjа" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "Ласeрдисц '%1$s' растeзањe по вeртикали" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "Ласeрдисц '%1$s' вeртикална позициjа" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Трeпeрeњe вeктора" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Минимална ширина снопа" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Максимална шириниа снопа" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Интeнзитeт снопа" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Размeра нишана %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Помeраj нишана %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Екран '%1$s'" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Екран" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Размeра нишана КС %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Размeра нишана И %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Помeраj нишана КС %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Помeраj нишана И %1$1.3f" @@ -2086,6 +2062,34 @@ msgstr " БОЈЕ" msgid " PENS" msgstr "" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "Употрeба eмулатора у вeзи са РОМ-овима коje нe посeдуjeтe je забрањeна " +#~ "законом о ауторским правима.\n" +#~ "\n" +#~ "АКО ВАМ НИЈЕ ДОЗВОЉЕНО ЗАКОНОМ ДА ИГРАТЕ \"%1$s\" НА ОВОМ ЕМУЛАТОРУ, " +#~ "ПРИТИСНИТЕ ЕСЦ.\n" +#~ "\n" +#~ "У супротном, откуцаjтe ОК или помeритe командну палицу (џоjстик) лeво, па " +#~ "дeсно да наставитe" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Откуцаjтe ОК или помeритe командну палицу (џоjстик) лeво, па дeсно да " +#~ "наставитe" + #~ msgid "Configure Machine" #~ msgstr "Конфигурациjа машинe" diff --git a/language/Slovak/strings.po b/language/Slovak/strings.po index 153a321d95a..beeb13ab2a9 100644 --- a/language/Slovak/strings.po +++ b/language/Slovak/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Slovenian/strings.po b/language/Slovenian/strings.po index f866bd4c639..36c560beabd 100644 --- a/language/Slovenian/strings.po +++ b/language/Slovenian/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -62,14 +62,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -645,11 +645,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -657,7 +657,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -665,55 +665,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1574,92 +1574,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1667,7 +1655,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1675,21 +1663,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1699,98 +1687,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1799,173 +1787,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po index 899af9d5351..da444f4d2bd 100644 --- a/language/Spanish/strings.po +++ b/language/Spanish/strings.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-03-05 13:02+0100\n" "Last-Translator: aviloria\n" "Language-Team: Español; Castellano <>\n" @@ -65,14 +65,14 @@ msgstr "Recargar todo" msgid "Autofire Status" msgstr "Estado del disparo automático" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "Desactivado" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -650,11 +650,11 @@ msgstr "Esperar a la sincronización vertical" msgid "Display Options" msgstr "Ajustes visuales" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "El archivo ya existe ¿Quieres sobreescribirlo?" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,7 +662,7 @@ msgstr "El archivo ya existe ¿Quieres sobreescribirlo?" msgid "No" msgstr "No" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -670,55 +670,55 @@ msgstr "No" msgid "Yes" msgstr "Sí" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "Nuevo nombre de imagen:" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "Formato de imagen:" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "Crear" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "Por favor, introduzca también la extensión del fichero" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "[ranura vacía]" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "[crear]" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "[lista de software]" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "Elige el formato de imagen" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "Elige el modo de acceso" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "Sólo lectura" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "Lectura y escritura" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "Leer esta imagen, escribir en otra imagen" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "Leer esta imagen, escribir en diferencial" @@ -1610,31 +1610,13 @@ msgstr "Rebobinar" msgid "Fast Forward" msgstr "Avance rápido" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" "Este controlador necesita que se carguen imágenes en los siguientes " "dispositivos: " -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" -"El uso de emuladores junto con ROMs que no poseas legalmente está prohibido " -"por las leyes de propiedad intelectual.\n" -"\n" -"SI NO TIENES PERMISO PARA JUGAR A «%1$s» PULSA ESC.\n" -"\n" -"De lo contrario escribe OK o mueve el joystick de izquierda a derecha." - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" @@ -1642,7 +1624,7 @@ msgstr "" "Uno o más ROMs/CHDs de esta máquina son incorrectos. La máquina podría no " "funcionar correctamente.\n" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" @@ -1650,48 +1632,48 @@ msgstr "" "Existen problemas conocidos con esta máquina\n" "\n" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "Uno o más ROMs/CHDs de esta máquina no se han volcado correctamente.\n" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "La emulación del teclado puede no ser del todo precisa.\n" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "Los colores no son del todo precisos.\n" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "Los colores son completamente erróneos.\n" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "La emulación de vídeo no es del todo precisa.\n" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "La emulación de sonido no es del todo precisa.\n" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "A esta máquina le falta el sonido.\n" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "Voltear la pantalla en modo cóctel no está soportado.\n" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "La máquina requiere ficheros de arte externos\n" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" @@ -1699,7 +1681,7 @@ msgstr "" "Esta máquina nunca se terminó. Podría comportarse de forma extraña o mostrar " "signos de mal funcionamiento que en ningún caso son defectos de emulación.\n" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" @@ -1707,11 +1689,11 @@ msgstr "" "Esta máquina no soporta sonido, por lo que MAME no reproducirá audio, este " "es el comportamiento esperado.\n" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "La máquina todavía no emula completamente el sistema de protección.\n" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1722,7 +1704,7 @@ msgstr "" "completada. No hay nada que se pueda hacer para arreglar el problema salvo " "esperar a que los desarrolladores mejoren la emulación.\n" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1733,7 +1715,7 @@ msgstr "" "una interacción física o se basan en dispositivos mecánicos. Por lo que no " "esposible reproducir completamente el funcionamiento de la máquina.\n" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" @@ -1743,17 +1725,14 @@ msgstr "" "\n" "Existen clones funcionales de esta máquina: " -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -"\n" -"\n" -"Teclea OK o mueve el joystick de izquierda a derecha para continuar" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1768,15 +1747,15 @@ msgstr "" "\n" "Procesador:\n" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "MHz" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "kHz" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" @@ -1784,7 +1763,7 @@ msgstr "" "\n" "Sonido:\n" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" @@ -1792,78 +1771,78 @@ msgstr "" "\n" "Vídeo:\n" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "Ninguno\n" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "Vector" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "%1$s: %2$s\n" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "%2$s\n" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "Estado de la emulación del teclado" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "Modo: Emulación PARCIAL" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "Interfaz: Activada" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "**Utiliza ScrLock para activar y desactivar**" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "Modo: Emulación COMPLETA" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "Interfaz: Desactivada" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "No se puede activar el disparo automático" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "Selecciona la posición a la que guardar" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "Selecciona la posición desde la que cargar" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "Guardado cancelado" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "Lectura cancelada" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "Guardar en posición %s" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "Lectura desde posición %s" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1876,173 +1855,173 @@ msgstr "" "Presiona «%1$s» para salir,\n" "Presiona «%2$s» para volver al emulador." -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "Volumen principal" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "Volumen %1$s" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "Acelerar CPU %1$s" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "Tasa de refresco %1$s" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "Brillo %1$s" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "Contraste %1$s" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "Gamma %1$s" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "Estiramiento horizontal %1$s" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "Posición horizontal %1$s" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "Estiramiento vertical %1$s" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "Posición vertical %1$s" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "Estiramiento horizontal de Laserdisc «%1$s»" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "Posición horizontal de Laserdisc «%1$s»" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "Estiramiento vertical de Laserdisc «%1$s»" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "Posición vertical de Laserdisc «%1$s»" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "Vector de parpadeo" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "Anchura mín. del haz" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "Anchura max. del haz" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "Peso de intensidad del haz" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "Escala de diana %1$s" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "Horizontal" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "Vertical" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "Posición de diana %1$s" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "%1$3ddB" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "%1$d%%" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "%1$3.0f%%" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "%1$.3ffps" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "%1$.3f" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "%1$1.2f" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "Pantalla «%1$s»" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "Pantalla" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "Escala horizontal de diana %1$1.3f" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "Escala vertical de diana %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "Posición horizontal de diana %1$1.3f" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "Posición vertical de diana %1$1.3f" @@ -2092,6 +2071,31 @@ msgstr " COLORES" msgid " PENS" msgstr " PLUMAS" +#~ msgid "" +#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " +#~ "copyright law.\n" +#~ "\n" +#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " +#~ "ESC.\n" +#~ "\n" +#~ "Otherwise, type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "El uso de emuladores junto con ROMs que no poseas legalmente está " +#~ "prohibido por las leyes de propiedad intelectual.\n" +#~ "\n" +#~ "SI NO TIENES PERMISO PARA JUGAR A «%1$s» PULSA ESC.\n" +#~ "\n" +#~ "De lo contrario escribe OK o mueve el joystick de izquierda a derecha." + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Type OK or move the joystick left then right to continue" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Teclea OK o mueve el joystick de izquierda a derecha para continuar" + #~ msgid "Configure Machine" #~ msgstr "Configurar máquina" diff --git a/language/Spanish_Mexico/strings.po b/language/Spanish_Mexico/strings.po index 733643c7ab2..73ab0238885 100644 --- a/language/Spanish_Mexico/strings.po +++ b/language/Spanish_Mexico/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Swedish/strings.po b/language/Swedish/strings.po index 31028db6ecc..a7d5f498e7b 100644 --- a/language/Swedish/strings.po +++ b/language/Swedish/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Thai/strings.po b/language/Thai/strings.po index 1d263f063d0..3509e49e298 100644 --- a/language/Thai/strings.po +++ b/language/Thai/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -59,14 +59,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -642,11 +642,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -654,7 +654,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -662,55 +662,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1571,92 +1571,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1664,7 +1652,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1672,21 +1660,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1696,98 +1684,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1796,173 +1784,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Turkish/strings.po b/language/Turkish/strings.po index 49a0a85c978..49b2461f3ad 100644 --- a/language/Turkish/strings.po +++ b/language/Turkish/strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Ukrainian/strings.po b/language/Ukrainian/strings.po index 0279b671f62..dc8ff9c6003 100644 --- a/language/Ukrainian/strings.po +++ b/language/Ukrainian/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -61,14 +61,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -644,11 +644,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -656,7 +656,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -664,55 +664,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1573,92 +1573,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1666,7 +1654,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1674,21 +1662,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1698,98 +1686,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1798,173 +1786,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" diff --git a/language/Vietnamese/strings.po b/language/Vietnamese/strings.po index 6b33b5d6c63..9d158d320df 100644 --- a/language/Vietnamese/strings.po +++ b/language/Vietnamese/strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-25 23:59+0100\n" +"POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: MAME Language Team\n" @@ -60,14 +60,14 @@ msgstr "" msgid "Autofire Status" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" msgstr "" -#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742 +#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 @@ -643,11 +643,11 @@ msgstr "" msgid "Display Options" msgstr "" -#: src/emu/ui/filesel.cpp:159 +#: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" msgstr "" -#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -655,7 +655,7 @@ msgstr "" msgid "No" msgstr "" -#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560 +#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 @@ -663,55 +663,55 @@ msgstr "" msgid "Yes" msgstr "" -#: src/emu/ui/filesel.cpp:271 +#: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" msgstr "" -#: src/emu/ui/filesel.cpp:277 +#: src/emu/ui/filesel.cpp:281 msgid "Image Format:" msgstr "" -#: src/emu/ui/filesel.cpp:283 +#: src/emu/ui/filesel.cpp:287 msgid "Create" msgstr "" -#: src/emu/ui/filesel.cpp:314 +#: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" msgstr "" -#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65 +#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" msgstr "" -#: src/emu/ui/filesel.cpp:506 +#: src/emu/ui/filesel.cpp:510 msgid "[create]" msgstr "" -#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76 +#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" msgstr "" -#: src/emu/ui/filesel.cpp:802 +#: src/emu/ui/filesel.cpp:806 msgid "Select image format" msgstr "" -#: src/emu/ui/filesel.cpp:862 +#: src/emu/ui/filesel.cpp:866 msgid "Select access mode" msgstr "" -#: src/emu/ui/filesel.cpp:863 +#: src/emu/ui/filesel.cpp:867 msgid "Read-only" msgstr "" -#: src/emu/ui/filesel.cpp:865 +#: src/emu/ui/filesel.cpp:869 msgid "Read-write" msgstr "" -#: src/emu/ui/filesel.cpp:866 +#: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" msgstr "" -#: src/emu/ui/filesel.cpp:867 +#: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" msgstr "" @@ -1572,92 +1572,80 @@ msgstr "" msgid "Fast Forward" msgstr "" -#: src/emu/ui/ui.cpp:415 +#: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -#: src/emu/ui/ui.cpp:1043 -#, c-format -msgid "" -"Usage of emulators in conjunction with ROMs you don't own is forbidden by " -"copyright law.\n" -"\n" -"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -"ESC.\n" -"\n" -"Otherwise, type OK or move the joystick left then right to continue" -msgstr "" - -#: src/emu/ui/ui.cpp:1081 +#: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -#: src/emu/ui/ui.cpp:1094 +#: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -#: src/emu/ui/ui.cpp:1098 +#: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -#: src/emu/ui/ui.cpp:1102 +#: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1104 +#: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1106 +#: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" msgstr "" -#: src/emu/ui/ui.cpp:1108 +#: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1110 +#: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" msgstr "" -#: src/emu/ui/ui.cpp:1112 +#: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" msgstr "" -#: src/emu/ui/ui.cpp:1115 +#: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" msgstr "" -#: src/emu/ui/ui.cpp:1119 +#: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" msgstr "" -#: src/emu/ui/ui.cpp:1124 +#: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1129 +#: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -#: src/emu/ui/ui.cpp:1137 +#: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" msgstr "" -#: src/emu/ui/ui.cpp:1140 +#: src/emu/ui/ui.cpp:1119 msgid "" "\n" "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet " @@ -1665,7 +1653,7 @@ msgid "" "the developers to improve the emulation.\n" msgstr "" -#: src/emu/ui/ui.cpp:1144 +#: src/emu/ui/ui.cpp:1123 msgid "" "\n" "Certain elements of this machine cannot be emulated as it requires actual " @@ -1673,21 +1661,21 @@ msgid "" "to fully play this machine.\n" msgstr "" -#: src/emu/ui/ui.cpp:1163 +#: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " msgstr "" -#: src/emu/ui/ui.cpp:1177 +#: src/emu/ui/ui.cpp:1156 msgid "" "\n" "\n" -"Type OK or move the joystick left then right to continue" +"Press any key to continue" msgstr "" -#: src/emu/ui/ui.cpp:1192 +#: src/emu/ui/ui.cpp:1171 #, c-format msgid "" "%1$s\n" @@ -1697,98 +1685,98 @@ msgid "" "CPU:\n" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" msgstr "" -#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267 +#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" msgstr "" -#: src/emu/ui/ui.cpp:1242 +#: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -#: src/emu/ui/ui.cpp:1271 +#: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -#: src/emu/ui/ui.cpp:1275 +#: src/emu/ui/ui.cpp:1254 msgid "None\n" msgstr "" -#: src/emu/ui/ui.cpp:1282 +#: src/emu/ui/ui.cpp:1261 msgid "Vector" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1293 +#: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" msgstr "" -#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587 +#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" msgstr "" -#: src/emu/ui/ui.cpp:1579 +#: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1580 +#: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" msgstr "" -#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592 +#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" msgstr "" -#: src/emu/ui/ui.cpp:1589 +#: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" msgstr "" -#: src/emu/ui/ui.cpp:1590 +#: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" msgstr "" -#: src/emu/ui/ui.cpp:1736 +#: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" msgstr "" -#: src/emu/ui/ui.cpp:1775 +#: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" msgstr "" -#: src/emu/ui/ui.cpp:1777 +#: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" msgstr "" -#: src/emu/ui/ui.cpp:1801 +#: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1803 +#: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" msgstr "" -#: src/emu/ui/ui.cpp:1846 +#: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" msgstr "" -#: src/emu/ui/ui.cpp:1851 +#: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" msgstr "" -#: src/emu/ui/ui.cpp:1891 +#: src/emu/ui/ui.cpp:1841 #, c-format msgid "" "Are you sure you want to quit?\n" @@ -1797,173 +1785,173 @@ msgid "" "Press ''%2$s'' to return to emulation." msgstr "" -#: src/emu/ui/ui.cpp:1966 +#: src/emu/ui/ui.cpp:1916 msgid "Master Volume" msgstr "" -#: src/emu/ui/ui.cpp:1976 +#: src/emu/ui/ui.cpp:1926 #, c-format msgid "%1$s Volume" msgstr "" -#: src/emu/ui/ui.cpp:1998 +#: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2018 +#: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" msgstr "" -#: src/emu/ui/ui.cpp:2024 +#: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" msgstr "" -#: src/emu/ui/ui.cpp:2027 +#: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" msgstr "" -#: src/emu/ui/ui.cpp:2030 +#: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" msgstr "" -#: src/emu/ui/ui.cpp:2035 +#: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2038 +#: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2041 +#: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2044 +#: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2062 +#: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2065 +#: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" msgstr "" -#: src/emu/ui/ui.cpp:2068 +#: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" msgstr "" -#: src/emu/ui/ui.cpp:2071 +#: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" msgstr "" -#: src/emu/ui/ui.cpp:2080 +#: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" msgstr "" -#: src/emu/ui/ui.cpp:2082 +#: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" msgstr "" -#: src/emu/ui/ui.cpp:2084 +#: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" msgstr "" -#: src/emu/ui/ui.cpp:2086 +#: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" msgstr "" -#: src/emu/ui/ui.cpp:2098 +#: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" msgstr "" -#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" msgstr "" -#: src/emu/ui/ui.cpp:2101 +#: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" msgstr "" -#: src/emu/ui/ui.cpp:2120 +#: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" msgstr "" -#: src/emu/ui/ui.cpp:2164 +#: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" msgstr "" -#: src/emu/ui/ui.cpp:2180 +#: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" msgstr "" -#: src/emu/ui/ui.cpp:2203 +#: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" msgstr "" -#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269 -#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335 -#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401 -#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445 +#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 +#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 +#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351 +#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" msgstr "" -#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493 -#: src/emu/ui/ui.cpp:2509 +#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 +#: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" msgstr "" -#: src/emu/ui/ui.cpp:2525 +#: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" msgstr "" -#: src/emu/ui/ui.cpp:2527 +#: src/emu/ui/ui.cpp:2477 msgid "Screen" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2543 +#: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" msgstr "" -#: src/emu/ui/ui.cpp:2562 +#: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" msgstr "" From 99410d656ef45c58c4492b97758605874a6fffe9 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 28 Mar 2016 11:05:21 +0200 Subject: [PATCH 13/74] String Translate for Chinese (Traditional / Simplified) [YuiFAN] --- language/Chinese_Simplified/strings.po | 28 ++----------------------- language/Chinese_Traditional/strings.po | 25 ++-------------------- 2 files changed, 4 insertions(+), 49 deletions(-) diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po index 69e8426e789..6872834ffca 100644 --- a/language/Chinese_Simplified/strings.po +++ b/language/Chinese_Simplified/strings.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-28 09:02+0200\n" -"PO-Revision-Date: 2016-03-26 13:57+0800\n" +"PO-Revision-Date: 2016-03-28 16:32+0800\n" "Last-Translator: YuiFAN\n" "Language-Team: MAME Language Team\n" "Language: zh\n" @@ -1708,7 +1708,7 @@ msgid "" "\n" "\n" "Press any key to continue" -msgstr "" +msgstr "按任意按键继续" #: src/emu/ui/ui.cpp:1171 #, c-format @@ -2048,27 +2048,3 @@ msgstr " 色彩" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" msgstr " PENS" - -#~ msgid "" -#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " -#~ "copyright law.\n" -#~ "\n" -#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -#~ "ESC.\n" -#~ "\n" -#~ "Otherwise, type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "著作权法禁止使用模拟器执行非法持有的 ROM 档案。\n" -#~ "\n" -#~ "如果您没有在本模拟器上执行 \"%s\" 的合法权力，请按 ESC 键。\n" -#~ "\n" -#~ "否则，请键入 OK 或移动摇杆的左、右方向继续" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Type OK or move the joystick left then right to continue" -#~ msgstr "请键入 OK 或移动摇杆的左、右方向继续" - -#~ msgid "Configure Machine" -#~ msgstr "设定机械" diff --git a/language/Chinese_Traditional/strings.po b/language/Chinese_Traditional/strings.po index e93326b6fd9..bdba0a5e52c 100644 --- a/language/Chinese_Traditional/strings.po +++ b/language/Chinese_Traditional/strings.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-28 09:02+0200\n" -"PO-Revision-Date: 2016-03-26 13:55+0800\n" +"PO-Revision-Date: 2016-03-28 16:32+0800\n" "Last-Translator: YuiFAN\n" "Language-Team: MAME Language Team\n" "Language: zh_TW\n" @@ -1708,7 +1708,7 @@ msgid "" "\n" "\n" "Press any key to continue" -msgstr "" +msgstr "按任意鍵繼續" #: src/emu/ui/ui.cpp:1171 #, c-format @@ -2048,24 +2048,3 @@ msgstr " 色彩" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" msgstr " PENS" - -#~ msgid "" -#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " -#~ "copyright law.\n" -#~ "\n" -#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -#~ "ESC.\n" -#~ "\n" -#~ "Otherwise, type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "著作權法禁止使用模擬器執行非法持有的 ROM 檔案。\n" -#~ "\n" -#~ "如果您沒有在本模擬器上執行 \"%s\" 的合法權力，請按 ESC 鍵。\n" -#~ "\n" -#~ "否則，請鍵入 OK 或移動搖桿的左、右方向繼續" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Type OK or move the joystick left then right to continue" -#~ msgstr "請鍵入 OK 或移動搖桿的左、右方向繼續" From 1ae2132611e722549aa302398de2224c85e66312 Mon Sep 17 00:00:00 2001 From: Lothar Serra Mari Date: Mon, 28 Mar 2016 11:55:17 +0200 Subject: [PATCH 14/74] Update German strings.po --- language/German/strings.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/language/German/strings.po b/language/German/strings.po index 1a2169f4e71..1726fa1dcfa 100644 --- a/language/German/strings.po +++ b/language/German/strings.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-28 09:02+0200\n" -"PO-Revision-Date: 2016-03-26 10:46+0100\n" +"PO-Revision-Date: 2016-03-28 11:54+0200\n" "Last-Translator: Lothar Serra Mari \n" "Language-Team: MAME Language Team\n" "Language: de\n" @@ -1733,6 +1733,9 @@ msgid "" "\n" "Press any key to continue" msgstr "" +"\n" +"\n" +"Drücken Sie eine beliebige Taste zum Fortfahren." #: src/emu/ui/ui.cpp:1171 #, c-format From 31175a49ae6a2c4e3d90de787741758a90c057fb Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 11:04:38 +0100 Subject: [PATCH 15/74] hook up sound cpu in spyhuntpr (nw) --- src/mame/drivers/spartanxtec.cpp | 26 ++++++++++++++++++----- src/mame/drivers/spyhuntertec.cpp | 35 +++++++++++++++++-------------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp index 007bd2969ed..e6e31577864 100644 --- a/src/mame/drivers/spartanxtec.cpp +++ b/src/mame/drivers/spartanxtec.cpp @@ -33,6 +33,7 @@ public: m_spriteram(*this, "spriteram"), m_scroll_lo(*this, "scroll_lo"), m_scroll_hi(*this, "scroll_hi"), + m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_palette(*this, "palette"), m_gfxdecode(*this, "gfxdecode") @@ -42,6 +43,7 @@ public: required_shared_ptr m_spriteram; required_shared_ptr m_scroll_lo; required_shared_ptr m_scroll_hi; + required_device m_maincpu; required_device m_audiocpu; virtual void machine_start() override; @@ -56,6 +58,9 @@ public: TILE_GET_INFO_MEMBER(get_kungfum_bg_tile_info); DECLARE_WRITE8_MEMBER(spartanxtec_soundlatch_w); DECLARE_WRITE8_MEMBER(a801_w); + DECLARE_WRITE8_MEMBER(sound_irq_ack); + DECLARE_WRITE8_MEMBER(irq_ack); + required_device m_palette; required_device m_gfxdecode; @@ -165,6 +170,10 @@ WRITE8_MEMBER(spartanxtec_state::a801_w) if (data != 0xf0) printf("a801_w %02x\n", data); } +WRITE8_MEMBER(spartanxtec_state::irq_ack) +{ + m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); +} static ADDRESS_MAP_START( spartanxtec_map, AS_PROGRAM, 8, spartanxtec_state ) @@ -178,7 +187,7 @@ static ADDRESS_MAP_START( spartanxtec_map, AS_PROGRAM, 8, spartanxtec_state ) AM_RANGE(0x8102, 0x8102) AM_READ_PORT("SYSTEM") AM_RANGE(0x8103, 0x8103) AM_READ_PORT("P1") -// AM_RANGE(0x8200, 0x8200) AM_WRITENOP + AM_RANGE(0x8200, 0x8200) AM_WRITE(irq_ack) AM_RANGE(0xA801, 0xA801) AM_WRITE(a801_w) @@ -191,8 +200,15 @@ static ADDRESS_MAP_START( spartanxtec_map, AS_PROGRAM, 8, spartanxtec_state ) ADDRESS_MAP_END + + +WRITE8_MEMBER(spartanxtec_state::sound_irq_ack) +{ + m_audiocpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); +} + + static ADDRESS_MAP_START( spartanxtec_sound_map, AS_PROGRAM, 8, spartanxtec_state ) - AM_RANGE(0x0000, 0x0000) AM_WRITENOP AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM @@ -202,7 +218,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spartanxtec_sound_io, AS_IO, 8, spartanxtec_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x0000, 0x0000) AM_WRITENOP + AM_RANGE(0x0000, 0x0000) AM_WRITE( sound_irq_ack ) AM_RANGE(0x0012, 0x0013) AM_DEVWRITE("ay3", ay8910_device, address_data_w) AM_RANGE(0x0012, 0x0012) AM_DEVREAD("ay3", ay8910_device, data_r) @@ -341,12 +357,12 @@ static MACHINE_CONFIG_START( spartanxtec, spartanxtec_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(spartanxtec_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_assert) MCFG_CPU_ADD("audiocpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(spartanxtec_sound_map) MCFG_CPU_IO_MAP(spartanxtec_sound_io) - MCFG_CPU_PERIODIC_INT_DRIVER(spartanxtec_state, irq0_line_hold, 1000) // controls speed of music + MCFG_CPU_PERIODIC_INT_DRIVER(spartanxtec_state, irq0_line_assert, 1000) // controls speed of music // MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_hold) /* video hardware */ diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index e384fdf8a77..5609c257844 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -8,12 +8,14 @@ single PCB with 2x Z80 significant changes compared to original HW non-interlaced +sound system appears to be the same as 'spartanxtec.cpp' + */ #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "machine/z80ctc.h" // not actually present here? + #define MASTER_CLOCK XTAL_20MHz // ?? @@ -69,6 +71,7 @@ public: DECLARE_WRITE8_MEMBER(spyhunt_videoram_w); DECLARE_WRITE8_MEMBER(spyhunt_alpharam_w); DECLARE_WRITE8_MEMBER(spyhunt_scroll_value_w); + DECLARE_WRITE8_MEMBER(sound_irq_ack); TILEMAP_MAPPER_MEMBER(spyhunt_bg_scan); TILE_GET_INFO_MEMBER(spyhunt_get_bg_tile_info); @@ -262,6 +265,8 @@ UINT32 spyhuntertec_state::screen_update_spyhuntertec(screen_device &screen, bit WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_fd00_w) { + soundlatch_byte_w(space, 0, data); + m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } static ADDRESS_MAP_START( spyhuntertec_map, AS_PROGRAM, 8, spyhuntertec_state ) @@ -305,13 +310,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spyhuntertec_sound_map, AS_PROGRAM, 8, spyhuntertec_state ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM -// AM_RANGE(0xfe00, 0xffff) AM_RAM + + AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_byte_r) ADDRESS_MAP_END + +WRITE8_MEMBER(spyhuntertec_state::sound_irq_ack) +{ + m_audiocpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); +} + static ADDRESS_MAP_START( spyhuntertec_sound_portmap, AS_IO, 8, spyhuntertec_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) + AM_RANGE(0x00, 0x00) AM_WRITE(sound_irq_ack) + AM_RANGE(0x12, 0x13) AM_DEVWRITE("ay1", ay8912_device, address_data_w) AM_RANGE(0x14, 0x15) AM_DEVWRITE("ay2", ay8912_device, address_data_w) AM_RANGE(0x18, 0x19) AM_DEVWRITE("ay3", ay8912_device, address_data_w) @@ -501,18 +515,7 @@ static MACHINE_CONFIG_START( spyhuntertec, spyhuntertec_state ) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) MCFG_CPU_PROGRAM_MAP(spyhuntertec_map) MCFG_CPU_IO_MAP(spyhuntertec_portmap) -// MCFG_CPU_CONFIG(mcr_daisy_chain) -// MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", spyhuntertec_state, mcr_interrupt, "screen", 0, 1) - -// MCFG_DEVICE_ADD("ctc", Z80CTC, MASTER_CLOCK/4 /* same as "maincpu" */) -// MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) -// MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc", z80ctc_device, trg1)) - - //MCFG_WATCHDOG_VBLANK_INIT(16) -// MCFG_MACHINE_START_OVERRIDE(spyhuntertec_state,mcr) -// MCFG_MACHINE_RESET_OVERRIDE(spyhuntertec_state,mcr) - -// MCFG_NVRAM_ADD_0FILL("nvram") + MCFG_CPU_VBLANK_INT_DRIVER("screen", spyhuntertec_state, irq0_line_hold) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -530,10 +533,10 @@ static MACHINE_CONFIG_START( spyhuntertec, spyhuntertec_state ) // MCFG_PALETTE_INIT_OWNER(spyhuntertec_state,spyhunt) - MCFG_CPU_ADD("audiocpu", Z80, 3000000 ) + MCFG_CPU_ADD("audiocpu", Z80, 4000000 ) MCFG_CPU_PROGRAM_MAP(spyhuntertec_sound_map) MCFG_CPU_IO_MAP(spyhuntertec_sound_portmap) -// MCFG_CPU_PERIODIC_INT_DRIVER(spyhuntertec_state, irq0_line_hold, 4*60) + MCFG_CPU_PERIODIC_INT_DRIVER(spyhuntertec_state, irq0_line_assert, 1000) MCFG_SPEAKER_STANDARD_MONO("mono") From b8d22b6c9087413fabb3133ec2dfd8c58deafe4c Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 12:03:26 +0100 Subject: [PATCH 16/74] misc spyhuntertec.cpp (nw) --- src/mame/drivers/spyhuntertec.cpp | 99 ++++++++++++++++++++++++++----- 1 file changed, 84 insertions(+), 15 deletions(-) diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index 5609c257844..5ccb02cdfbf 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -6,10 +6,18 @@ Spy Hunter(Tecfri bootleg) single PCB with 2x Z80 significant changes compared to original HW + +Very different hardware, probably bootleg despite the license text printed on the PCB, similar to '1942p' and 'spartanxtec.cpp' +PCB made by Tecfri for Recreativos Franco S.A. in Spain, has Bally Midway logo, and licensing text on the PCB. +Board is dated '85' so seems to be a low-cost rebuild? it is unclear if it made it to market. + non-interlaced sound system appears to be the same as 'spartanxtec.cpp' +how do the inputs work? is it modified to use joystick? is the sound cpu reading them / latching them via the AY? +if so how does it communicate, timing? + */ #include "emu.h" @@ -27,6 +35,7 @@ public: m_audiocpu(*this, "audiocpu"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), + m_spriteram2(*this, "spriteram2"), m_paletteram(*this, "paletteram"), m_spyhunt_alpharam(*this, "spyhunt_alpha"), m_palette(*this, "palette"), @@ -38,6 +47,7 @@ public: required_device m_audiocpu; required_shared_ptr m_videoram; required_shared_ptr m_spriteram; + required_shared_ptr m_spriteram2; required_shared_ptr m_paletteram; required_shared_ptr m_spyhunt_alpharam; @@ -67,12 +77,23 @@ public: // UINT32 screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(spyhuntertec_port04_w); DECLARE_WRITE8_MEMBER(spyhuntertec_fd00_w); + DECLARE_WRITE8_MEMBER(spyhuntertec_portf0_w); DECLARE_WRITE8_MEMBER(spyhunt_videoram_w); DECLARE_WRITE8_MEMBER(spyhunt_alpharam_w); DECLARE_WRITE8_MEMBER(spyhunt_scroll_value_w); DECLARE_WRITE8_MEMBER(sound_irq_ack); + + DECLARE_WRITE8_MEMBER(ay1_porta_w); + DECLARE_READ8_MEMBER(ay1_porta_r); + + DECLARE_WRITE8_MEMBER(ay2_porta_w); + DECLARE_READ8_MEMBER(ay2_porta_r); + + DECLARE_READ8_MEMBER(spyhuntertec_in2_r); + DECLARE_READ8_MEMBER(spyhuntertec_in3_r); + TILEMAP_MAPPER_MEMBER(spyhunt_bg_scan); TILE_GET_INFO_MEMBER(spyhunt_get_bg_tile_info); TILE_GET_INFO_MEMBER(spyhunt_get_alpha_tile_info); @@ -81,7 +102,31 @@ public: }; +WRITE8_MEMBER(spyhuntertec_state::ay1_porta_w) +{ +// printf("ay1_porta_w %02x\n", data); +} +READ8_MEMBER(spyhuntertec_state::ay1_porta_r) +{ +// printf("ay1_porta_r\n"); + return 0; +} + + + +WRITE8_MEMBER(spyhuntertec_state::ay2_porta_w) +{ +// printf("ay2_porta_w %02x\n", data); +} + +READ8_MEMBER(spyhuntertec_state::ay2_porta_r) +{ +// read often, even if port is set to output mode +// maybe latches something? +// printf("ay2_porta_r\n"); + return 0; +} WRITE8_MEMBER(spyhuntertec_state::spyhunt_videoram_w) { @@ -269,6 +314,20 @@ WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_fd00_w) m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } +READ8_MEMBER(spyhuntertec_state::spyhuntertec_in2_r) +{ + UINT8 ret = ioport("IN2")->read(); +// printf("%04x spyhuntertec_in2_r\n", space.device().safe_pc()); + return ret; +} + +READ8_MEMBER(spyhuntertec_state::spyhuntertec_in3_r) +{ + UINT8 ret = ioport("IN3")->read(); +// printf("%04x spyhuntertec_in3_r\n", space.device().safe_pc()); + return ret; +} + static ADDRESS_MAP_START( spyhuntertec_map, AS_PROGRAM, 8, spyhuntertec_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0xa800, 0xa8ff) AM_RAM // the ROM is a solid fill in these areas, and they get tested as RAM, I think they moved the 'real' scroll regs here @@ -279,23 +338,29 @@ static ADDRESS_MAP_START( spyhuntertec_map, AS_PROGRAM, 8, spyhuntertec_state ) AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(spyhunt_videoram_w) AM_SHARE("videoram") AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_RAM_WRITE(spyhunt_alpharam_w) AM_SHARE("spyhunt_alpha") AM_RANGE(0xf000, 0xf7ff) AM_RAM //AM_SHARE("nvram") - AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_SHARE("spriteram") + AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_SHARE("spriteram") // origional spriteram AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_RAM_WRITE(spyhuntertec_paletteram_w) AM_SHARE("paletteram") AM_RANGE(0xfc00, 0xfc00) AM_READ_PORT("DSW0") AM_RANGE(0xfc01, 0xfc01) AM_READ_PORT("DSW1") - AM_RANGE(0xfc02, 0xfc02) AM_READ_PORT("IN2") - AM_RANGE(0xfc03, 0xfc03) AM_READ_PORT("IN3") + AM_RANGE(0xfc02, 0xfc02) AM_READ(spyhuntertec_in2_r) + AM_RANGE(0xfc03, 0xfc03) AM_READ(spyhuntertec_in3_r) AM_RANGE(0xfd00, 0xfd00) AM_WRITE( spyhuntertec_fd00_w ) - AM_RANGE(0xfe00, 0xffff) AM_RAM // a modified copy of spriteram for this hw?? + AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("spriteram2") // actual spriteram for this hw?? ADDRESS_MAP_END WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_port04_w) { } +WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_portf0_w) +{ + // 0x08 on startup, then 0x03, probably CTC leftovers from the original. + if ((data != 0x03) && (data != 0x08)) printf("spyhuntertec_portf0_w %02x\n", data); +} + static ADDRESS_MAP_START( spyhuntertec_portmap, AS_IO, 8, spyhuntertec_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) @@ -303,7 +368,7 @@ static ADDRESS_MAP_START( spyhuntertec_portmap, AS_IO, 8, spyhuntertec_state ) AM_RANGE(0x84, 0x86) AM_WRITE(spyhunt_scroll_value_w) AM_RANGE(0xe0, 0xe0) AM_WRITENOP // was watchdog // AM_RANGE(0xe8, 0xe8) AM_WRITENOP -// AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) + AM_RANGE(0xf0, 0xf0) AM_WRITE( spyhuntertec_portf0_w ) ADDRESS_MAP_END @@ -326,9 +391,14 @@ static ADDRESS_MAP_START( spyhuntertec_sound_portmap, AS_IO, 8, spyhuntertec_sta AM_RANGE(0x00, 0x00) AM_WRITE(sound_irq_ack) - AM_RANGE(0x12, 0x13) AM_DEVWRITE("ay1", ay8912_device, address_data_w) - AM_RANGE(0x14, 0x15) AM_DEVWRITE("ay2", ay8912_device, address_data_w) - AM_RANGE(0x18, 0x19) AM_DEVWRITE("ay3", ay8912_device, address_data_w) + AM_RANGE(0x0012, 0x0013) AM_DEVWRITE("ay3", ay8910_device, address_data_w) + AM_RANGE(0x0012, 0x0012) AM_DEVREAD("ay3", ay8910_device, data_r) + + AM_RANGE(0x0014, 0x0015) AM_DEVWRITE("ay1", ay8910_device, address_data_w) + AM_RANGE(0x0014, 0x0014) AM_DEVREAD("ay1", ay8910_device, data_r) + + AM_RANGE(0x0018, 0x0019) AM_DEVWRITE("ay2", ay8910_device, address_data_w) // data written to port a + AM_RANGE(0x0018, 0x0018) AM_DEVREAD("ay2", ay8910_device, data_r) // actually read ADDRESS_MAP_END @@ -542,8 +612,14 @@ static MACHINE_CONFIG_START( spyhuntertec, spyhuntertec_state ) MCFG_SOUND_ADD("ay1", AY8912, 3000000/2) // AY-3-8912 MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + MCFG_AY8910_PORT_A_READ_CB(READ8(spyhuntertec_state, ay1_porta_r)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(spyhuntertec_state, ay1_porta_w)) + MCFG_SOUND_ADD("ay2", AY8912, 3000000/2) // " MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + MCFG_AY8910_PORT_A_READ_CB(READ8(spyhuntertec_state, ay2_porta_r)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(spyhuntertec_state, ay2_porta_w)) + MCFG_SOUND_ADD("ay3", AY8912, 3000000/2) // " MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) @@ -642,16 +718,9 @@ ROM_END DRIVER_INIT_MEMBER(spyhuntertec_state,spyhuntertec) { -// mcr_common_init(); -// machine().device("ssio")->set_custom_input(1, 0x60, read8_delegate(FUNC(spyhuntertec_state::spyhunt_ip1_r),this)); -// machine().device("ssio")->set_custom_input(2, 0xff, read8_delegate(FUNC(spyhuntertec_state::spyhunt_ip2_r),this)); -// machine().device("ssio")->set_custom_output(4, 0xff, write8_delegate(FUNC(spyhuntertec_state::spyhunt_op4_w),this)); - m_spyhunt_sprite_color_mask = 0x00; m_spyhunt_scroll_offset = 16; } -// very different hardware, probably bootleg despite the license text printed on the PCB, similar to '1942p' in 1942.c. Probably should be put in separate driver. -// PCB made by Tecfri for Recreativos Franco S.A. in Spain, has Bally Midway logo, and licensing text on the PCB. Board is dated '85' so seems to be a low-cost rebuild? it is unclear if it made it to market. GAME (1983, spyhuntpr,spyhunt, spyhuntertec, spyhuntertec,spyhuntertec_state, spyhuntertec,ROT90, "Bally Midway (Recreativos Franco S.A. license)", "Spy Hunter (Spain, Tecfri / Recreativos Franco S.A. PCB)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) From 93414a8bd75b1dc378e36db0cc86c33c8a8c4bb9 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 27 Mar 2016 17:55:07 +0200 Subject: [PATCH 17/74] Fix pivoting and float usage. --- nl_examples/kidniki.c | 1 + src/lib/netlist/nl_util.h | 4 ++-- src/lib/netlist/plib/pfmtlog.h | 4 ++++ src/lib/netlist/solver/nld_ms_direct.h | 25 +++++++++-------------- src/lib/netlist/solver/nld_ms_direct_lu.h | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nl_examples/kidniki.c b/nl_examples/kidniki.c index 3b51e40328f..f7dbf69bdfc 100644 --- a/nl_examples/kidniki.c +++ b/nl_examples/kidniki.c @@ -22,6 +22,7 @@ NETLIST_START(dummy) PARAM(Solver.MIN_TIMESTEP, 10e-6) PARAM(Solver.PARALLEL, 0) PARAM(Solver.SOR_FACTOR, 1.00) + PARAM(Solver.PIVOT, 0) #else SOLVER(Solver, 12000) PARAM(Solver.ACCURACY, 1e-8) diff --git a/src/lib/netlist/nl_util.h b/src/lib/netlist/nl_util.h index bb5a564dd74..87ec2270231 100644 --- a/src/lib/netlist/nl_util.h +++ b/src/lib/netlist/nl_util.h @@ -41,8 +41,8 @@ private: public: ATTR_HOT inline static float exp(const float x) { return std::exp(x); } - ATTR_HOT inline static double abs(const double x) { return std::abs(x); } - ATTR_HOT inline static float abs(const float x) { return std::abs(x); } + ATTR_HOT inline static double abs(const double x) { return std::fabs(x); } + ATTR_HOT inline static float abs(const float x) { return std::fabs(x); } ATTR_HOT inline static double log(const double x) { return std::log(x); } ATTR_HOT inline static float log(const float x) { return std::log(x); } #if defined(_MSC_VER) && _MSC_VER < 1800 diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h index 7a63d14fc3a..d72bdc6ce6b 100644 --- a/src/lib/netlist/plib/pfmtlog.h +++ b/src/lib/netlist/plib/pfmtlog.h @@ -110,6 +110,10 @@ public: ATTR_COLD P & e(const double x, const char *f = "") { format_element(f, "", "e", x); return static_cast

(*this); } ATTR_COLD P & g(const double x, const char *f = "") { format_element(f, "", "g", x); return static_cast

(*this); } + ATTR_COLD P &operator ()(const float x, const char *f = "") { format_element(f, "", "f", x); return static_cast

(*this); } + ATTR_COLD P & e(const float x, const char *f = "") { format_element(f, "", "e", x); return static_cast

(*this); } + ATTR_COLD P & g(const float x, const char *f = "") { format_element(f, "", "g", x); return static_cast

(*this); } + ATTR_COLD P &operator ()(const char *x, const char *f = "") { format_element(f, "", "s", x); return static_cast

(*this); } ATTR_COLD P &operator ()(char *x, const char *f = "") { format_element(f, "", "s", x); return static_cast

(*this); } ATTR_COLD P &operator ()(const void *x, const char *f = "") { format_element(f, "", "p", x); return static_cast

(*this); } diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index 5d0167f8758..852ceebb9ea 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -24,7 +24,7 @@ NETLIB_NAMESPACE_DEVICES_START() //#define nl_ext_double __float128 // slow, very slow //#define nl_ext_double long double // slightly slower -#define nl_ext_double double +#define nl_ext_double nl_double template class matrix_solver_direct_t: public matrix_solver_t @@ -61,9 +61,6 @@ protected: virtual netlist_time compute_next_timestep() override; - terms_t **m_terms; - terms_t *m_rails_temp; - #if (NL_USE_DYNAMIC_ALLOCATION) template inline nl_ext_double &A(const T1 &r, const T2 &c) { return m_A[r * m_pitch + c]; } @@ -78,10 +75,11 @@ protected: ATTR_ALIGN nl_double m_last_RHS[_storage_N]; // right hand side - contains currents ATTR_ALIGN nl_double m_last_V[_storage_N]; - + terms_t * m_terms[_storage_N]; + terms_t *m_rails_temp; private: - static const unsigned m_pitch = (((_storage_N + 1) + 7) / 8) * 8; + static const std::size_t m_pitch = (((_storage_N + 1) + 7) / 8) * 8; #if (NL_USE_DYNAMIC_ALLOCATION) ATTR_ALIGN nl_ext_double * RESTRICT m_A; #else @@ -104,7 +102,6 @@ matrix_solver_direct_t::~matrix_solver_direct_t() { pfree(m_terms[k]); } - pfree_array(m_terms); pfree_array(m_rails_temp); #if (NL_USE_DYNAMIC_ALLOCATION) pfree_array(m_A); @@ -424,10 +421,10 @@ void matrix_solver_direct_t::LE_solve() if (maxrow != i) { /* Swap the maxrow and ith row */ - for (unsigned k = 0; k < kN; k++) { + for (unsigned k = 0; k < kN + 1; k++) { std::swap(A(i,k), A(maxrow,k)); } - std::swap(RHS(i), RHS(maxrow)); + //std::swap(RHS(i), RHS(maxrow)); } /* FIXME: Singular matrix? */ const nl_double f = 1.0 / A(i,i); @@ -439,10 +436,10 @@ void matrix_solver_direct_t::LE_solve() const nl_double f1 = - A(j,i) * f; if (f1 != NL_FCONST(0.0)) { - nl_double * RESTRICT pi = &A(i,i+1); - const nl_double * RESTRICT pj = &A(j,i+1); + const nl_double * RESTRICT pi = &A(i,i+1); + nl_double * RESTRICT pj = &A(j,i+1); #if 1 - vec_add_mult_scalar(kN-i,pj,f1,pi); + vec_add_mult_scalar(kN-i,pi,f1,pj); #else vec_add_mult_scalar(kN-i-1,pj,f1,pi); //for (unsigned k = i+1; k < kN; k++) @@ -528,7 +525,7 @@ T matrix_solver_direct_t::delta( const unsigned iN = this->N(); T cerr = 0; for (unsigned i = 0; i < iN; i++) - cerr = std::max(cerr, nl_math::abs(V[i] - this->m_nets[i]->m_cur_Analog)); + cerr = std::fmax(cerr, nl_math::abs(V[i] - (T) this->m_nets[i]->m_cur_Analog)); return cerr; } @@ -585,7 +582,6 @@ matrix_solver_direct_t::matrix_solver_direct_t(const solver_par : matrix_solver_t(GAUSSIAN_ELIMINATION, params) , m_dim(size) { - m_terms = palloc_array(terms_t *, N()); m_rails_temp = palloc_array(terms_t, N()); #if (NL_USE_DYNAMIC_ALLOCATION) m_A = palloc_array(nl_ext_double, N() * m_pitch); @@ -603,7 +599,6 @@ matrix_solver_direct_t::matrix_solver_direct_t(const eSolverTyp : matrix_solver_t(type, params) , m_dim(size) { - m_terms = palloc_array(terms_t *, N()); m_rails_temp = palloc_array(terms_t, N()); #if (NL_USE_DYNAMIC_ALLOCATION) m_A = palloc_array(nl_ext_double, N() * m_pitch); diff --git a/src/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h index 5efbe38ddab..2109b0f3e41 100644 --- a/src/lib/netlist/solver/nld_ms_direct_lu.h +++ b/src/lib/netlist/solver/nld_ms_direct_lu.h @@ -552,7 +552,7 @@ nl_double matrix_solver_direct_t::delta( const unsigned iN = this->N(); nl_double cerr = 0; for (unsigned i = 0; i < iN; i++) - cerr = std::max(cerr, nl_math::abs(V[i] - this->m_nets[i]->m_cur_Analog)); + cerr = std::fmax(cerr, nl_math::abs(V[i] - this->m_nets[i]->m_cur_Analog)); return cerr; } From 97b9fc11d63d578242713e1a2e94c538766febbe Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 27 Mar 2016 21:57:53 +0200 Subject: [PATCH 18/74] First version of Sherman-Morrison solver. --- src/lib/netlist/solver/nld_ms_direct.h | 1 + src/lib/netlist/solver/nld_ms_sm.h | 636 +++++++++++++++++++++++++ src/lib/netlist/solver/nld_solver.cpp | 3 +- 3 files changed, 639 insertions(+), 1 deletion(-) create mode 100644 src/lib/netlist/solver/nld_ms_sm.h diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index 852ceebb9ea..76b448d8e8f 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -84,6 +84,7 @@ private: ATTR_ALIGN nl_ext_double * RESTRICT m_A; #else ATTR_ALIGN nl_ext_double m_A[_storage_N][m_pitch]; + ATTR_ALIGN nl_ext_double m_B[_storage_N][m_pitch]; #endif //ATTR_ALIGN nl_ext_double m_RHSx[_storage_N]; diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h new file mode 100644 index 00000000000..c9ee083c54a --- /dev/null +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -0,0 +1,636 @@ +// license:GPL-2.0+ +// copyright-holders:Couriersud +/* + * nld_ms_direct.h + * + */ + +#ifndef NLD_MS_SM_H_ +#define NLD_MS_SM_H_ + +#include + +#include "solver/nld_solver.h" +#include "solver/vector_base.h" + +/* Disabling dynamic allocation gives a ~10% boost in performance + * This flag has been added to support continuous storage for arrays + * going forward in case we implement cuda solvers in the future. + */ + +NETLIB_NAMESPACE_DEVICES_START() + +//#define nl_ext_double __float128 // slow, very slow +//#define nl_ext_double long double // slightly slower +#define nl_ext_double nl_double + +template +class matrix_solver_sm_t: public matrix_solver_t +{ +public: + + matrix_solver_sm_t(const solver_parameters_t *params, const int size); + matrix_solver_sm_t(const eSolverType type, const solver_parameters_t *params, const int size); + + virtual ~matrix_solver_sm_t(); + + virtual void vsetup(analog_net_t::list_t &nets) override; + virtual void reset() override { matrix_solver_t::reset(); } + +protected: + virtual void add_term(int net_idx, terminal_t *term) override; + virtual int vsolve_non_dynamic(const bool newton_raphson) override; + int solve_non_dynamic(const bool newton_raphson); + + inline const unsigned N() const { if (m_N == 0) return m_dim; else return m_N; } + + void build_LE_A(); + void build_LE_RHS(); + void LE_invert(); + + template + void LE_compute_x(T * RESTRICT x); + + template + T delta(const T * RESTRICT V); + + template + void store(const T * RESTRICT V); + + virtual netlist_time compute_next_timestep() override; + + template + inline nl_ext_double &A(const T1 &r, const T2 &c) { return m_A[r][c]; } + template + inline nl_ext_double &W(const T1 &r, const T2 &c) { return m_W[r][c]; } + template + inline nl_ext_double &Ainv(const T1 &r, const T2 &c) { return m_Ainv[r][c]; } + template + inline nl_ext_double &RHS(const T1 &r) { return m_RHS[r]; } + + + template + inline nl_ext_double &lA(const T1 &r, const T2 &c) { return m_lA[r][c]; } + template + inline nl_ext_double &lAinv(const T1 &r, const T2 &c) { return m_lAinv[r][c]; } + + ATTR_ALIGN nl_double m_last_RHS[_storage_N]; // right hand side - contains currents + ATTR_ALIGN nl_double m_last_V[_storage_N]; + + terms_t * m_terms[_storage_N]; + terms_t *m_rails_temp; + +private: + static const std::size_t m_pitch = ((( _storage_N) + 7) / 8) * 8; + ATTR_ALIGN nl_ext_double m_A[_storage_N][m_pitch]; + ATTR_ALIGN nl_ext_double m_Ainv[_storage_N][m_pitch]; + ATTR_ALIGN nl_ext_double m_W[_storage_N][m_pitch]; + ATTR_ALIGN nl_ext_double m_RHS[_storage_N]; // right hand side - contains currents + + ATTR_ALIGN nl_ext_double m_lA[_storage_N][m_pitch]; + ATTR_ALIGN nl_ext_double m_lAinv[_storage_N][m_pitch]; + + //ATTR_ALIGN nl_ext_double m_RHSx[_storage_N]; + + const unsigned m_dim; + +}; + +// ---------------------------------------------------------------------------------------- +// matrix_solver_direct +// ---------------------------------------------------------------------------------------- + +template +matrix_solver_sm_t::~matrix_solver_sm_t() +{ + for (unsigned k = 0; k < N(); k++) + { + pfree(m_terms[k]); + } + pfree_array(m_rails_temp); +#if (NL_USE_DYNAMIC_ALLOCATION) + pfree_array(m_A); +#endif +} + +template +netlist_time matrix_solver_sm_t::compute_next_timestep() +{ + nl_double new_solver_timestep = m_params.m_max_timestep; + + if (m_params.m_dynamic) + { + /* + * FIXME: We should extend the logic to use either all nets or + * only output nets. + */ + for (unsigned k = 0, iN=N(); k < iN; k++) + { + analog_net_t *n = m_nets[k]; + + const nl_double DD_n = (n->Q_Analog() - m_last_V[k]); + const nl_double hn = current_timestep(); + + nl_double DD2 = (DD_n / hn - n->m_DD_n_m_1 / n->m_h_n_m_1) / (hn + n->m_h_n_m_1); + nl_double new_net_timestep; + + n->m_h_n_m_1 = hn; + n->m_DD_n_m_1 = DD_n; + if (nl_math::abs(DD2) > NL_FCONST(1e-30)) // avoid div-by-zero + new_net_timestep = nl_math::sqrt(m_params.m_lte / nl_math::abs(NL_FCONST(0.5)*DD2)); + else + new_net_timestep = m_params.m_max_timestep; + + if (new_net_timestep < new_solver_timestep) + new_solver_timestep = new_net_timestep; + + m_last_V[k] = n->Q_Analog(); + } + if (new_solver_timestep < m_params.m_min_timestep) + new_solver_timestep = m_params.m_min_timestep; + } + //if (new_solver_timestep > 10.0 * hn) + // new_solver_timestep = 10.0 * hn; + return netlist_time::from_double(new_solver_timestep); +} + +template +ATTR_COLD void matrix_solver_sm_t::add_term(int k, terminal_t *term) +{ + if (term->m_otherterm->net().isRailNet()) + { + m_rails_temp[k].add(term, -1, false); + } + else + { + int ot = get_net_idx(&term->m_otherterm->net()); + if (ot>=0) + { + m_terms[k]->add(term, ot, true); + } + /* Should this be allowed ? */ + else // if (ot<0) + { + m_rails_temp[k].add(term, ot, true); + log().fatal("found term with missing othernet {1}\n", term->name()); + } + } +} + + +template +ATTR_COLD void matrix_solver_sm_t::vsetup(analog_net_t::list_t &nets) +{ + if (m_dim < nets.size()) + log().fatal("Dimension {1} less than {2}", m_dim, nets.size()); + + for (unsigned k = 0; k < N(); k++) + { + m_terms[k]->clear(); + m_rails_temp[k].clear(); + } + + matrix_solver_t::setup_base(nets); + + for (unsigned k = 0; k < N(); k++) + { + m_terms[k]->m_railstart = m_terms[k]->count(); + for (unsigned i = 0; i < m_rails_temp[k].count(); i++) + this->m_terms[k]->add(m_rails_temp[k].terms()[i], m_rails_temp[k].net_other()[i], false); + + m_rails_temp[k].clear(); // no longer needed + m_terms[k]->set_pointers(); + } + +#if 1 + + /* Sort in descending order by number of connected matrix voltages. + * The idea is, that for Gauss-Seidel algo the first voltage computed + * depends on the greatest number of previous voltages thus taking into + * account the maximum amout of information. + * + * This actually improves performance on popeye slightly. Average + * GS computations reduce from 2.509 to 2.370 + * + * Smallest to largest : 2.613 + * Unsorted : 2.509 + * Largest to smallest : 2.370 + * + * Sorting as a general matrix pre-conditioning is mentioned in + * literature but I have found no articles about Gauss Seidel. + * + * For Gaussian Elimination however increasing order is better suited. + * FIXME: Even better would be to sort on elements right of the matrix diagonal. + * + */ + + int sort_order = (type() == GAUSS_SEIDEL ? 1 : -1); + + for (unsigned k = 0; k < N() / 2; k++) + for (unsigned i = 0; i < N() - 1; i++) + { + if ((m_terms[i]->m_railstart - m_terms[i+1]->m_railstart) * sort_order < 0) + { + std::swap(m_terms[i], m_terms[i+1]); + std::swap(m_nets[i], m_nets[i+1]); + } + } + + for (unsigned k = 0; k < N(); k++) + { + int *other = m_terms[k]->net_other(); + for (unsigned i = 0; i < m_terms[k]->count(); i++) + if (other[i] != -1) + other[i] = get_net_idx(&m_terms[k]->terms()[i]->m_otherterm->net()); + } + +#endif + + /* create a list of non zero elements right of the diagonal + * These list anticipate the population of array elements by + * Gaussian elimination. + */ + for (unsigned k = 0; k < N(); k++) + { + terms_t * t = m_terms[k]; + /* pretty brutal */ + int *other = t->net_other(); + + t->m_nz.clear(); + + if (k==0) + t->m_nzrd.clear(); + else + { + t->m_nzrd = m_terms[k-1]->m_nzrd; + unsigned j=0; + while(j < t->m_nzrd.size()) + { + if (t->m_nzrd[j] < k + 1) + t->m_nzrd.remove_at(j); + else + j++; + } + } + + for (unsigned j = 0; j < N(); j++) + { + for (unsigned i = 0; i < t->m_railstart; i++) + { + if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1)) + t->m_nzrd.push_back(other[i]); + if (!t->m_nz.contains(other[i])) + t->m_nz.push_back(other[i]); + } + } + /* and sort */ + psort_list(t->m_nzrd); + + t->m_nz.push_back(k); // add diagonal + + psort_list(t->m_nz); + } + + /* create a list of non zero elements below diagonal k + * This should reduce cache misses ... + */ + + bool touched[_storage_N][_storage_N] = { { false } }; + for (unsigned k = 0; k < N(); k++) + { + m_terms[k]->m_nzbd.clear(); + for (unsigned j = 0; j < m_terms[k]->m_nz.size(); j++) + touched[k][m_terms[k]->m_nz[j]] = true; + } + + for (unsigned k = 0; k < N(); k++) + { + for (unsigned row = k + 1; row < N(); row++) + { + if (touched[row][k]) + { + if (!m_terms[k]->m_nzbd.contains(row)) + m_terms[k]->m_nzbd.push_back(row); + for (unsigned col = k; col < N(); col++) + if (touched[k][col]) + touched[row][col] = true; + } + } + } + + if (0) + for (unsigned k = 0; k < N(); k++) + { + pstring line = pfmt("{1}")(k, "3"); + for (unsigned j = 0; j < m_terms[k]->m_nzrd.size(); j++) + line += pfmt(" {1}")(m_terms[k]->m_nzrd[j], "3"); + log().verbose("{1}", line); + } + + /* + * save states + */ + save(NLNAME(m_last_RHS)); + save(NLNAME(m_last_V)); + + for (unsigned k = 0; k < N(); k++) + { + pstring num = pfmt("{1}")(k); + + save(RHS(k), "RHS" + num); + + save(m_terms[k]->go(),"GO" + num, m_terms[k]->count()); + save(m_terms[k]->gt(),"GT" + num, m_terms[k]->count()); + save(m_terms[k]->Idr(),"IDR" + num , m_terms[k]->count()); + } + +} + + +template +void matrix_solver_sm_t::build_LE_A() +{ + const unsigned iN = N(); + for (unsigned k = 0; k < iN; k++) + { + for (unsigned i=0; i < iN; i++) + A(k,i) = 0.0; + + const unsigned terms_count = m_terms[k]->count(); + const unsigned railstart = m_terms[k]->m_railstart; + const nl_double * RESTRICT gt = m_terms[k]->gt(); + + { + nl_double akk = 0.0; + for (unsigned i = 0; i < terms_count; i++) + akk += gt[i]; + + A(k,k) = akk; + } + + const nl_double * RESTRICT go = m_terms[k]->go(); + const int * RESTRICT net_other = m_terms[k]->net_other(); + + for (unsigned i = 0; i < railstart; i++) + A(k,net_other[i]) -= go[i]; + } +} + +template +void matrix_solver_sm_t::build_LE_RHS() +{ + const unsigned iN = N(); + for (unsigned k = 0; k < iN; k++) + { + nl_double rhsk_a = 0.0; + nl_double rhsk_b = 0.0; + + const int terms_count = m_terms[k]->count(); + const nl_double * RESTRICT go = m_terms[k]->go(); + const nl_double * RESTRICT Idr = m_terms[k]->Idr(); + const nl_double * const * RESTRICT other_cur_analog = m_terms[k]->other_curanalog(); + + for (int i = 0; i < terms_count; i++) + rhsk_a = rhsk_a + Idr[i]; + + for (int i = m_terms[k]->m_railstart; i < terms_count; i++) + //rhsk = rhsk + go[i] * terms[i]->m_otherterm->net().as_analog().Q_Analog(); + rhsk_b = rhsk_b + go[i] * *other_cur_analog[i]; + + RHS(k) = rhsk_a + rhsk_b; + } +} + +template +void matrix_solver_sm_t::LE_invert() +{ + const unsigned kN = N(); + + for (unsigned i = 0; i < kN; i++) + { + for (unsigned j = 0; j < kN; j++) + { + W(i,j) = lA(i,j) = A(i,j); + Ainv(i,j) = 0.0; + } + Ainv(i,i) = 1.0; + } + /* down */ + for (unsigned i = 0; i < kN; i++) + { + /* FIXME: Singular matrix? */ + const nl_double f = 1.0 / W(i,i); + const unsigned * RESTRICT const p = m_terms[i]->m_nzrd.data(); + const unsigned e = m_terms[i]->m_nzrd.size(); + + /* Eliminate column i from row j */ + + const unsigned * RESTRICT const pb = m_terms[i]->m_nzbd.data(); + const unsigned eb = m_terms[i]->m_nzbd.size(); + for (unsigned jb = 0; jb < eb; jb++) + { + const unsigned j = pb[jb]; + const nl_double f1 = - W(j,i) * f; + if (f1 != 0.0) + { + for (unsigned k = 0; k < e; k++) + W(j,p[k]) += W(i,p[k]) * f1; + for (unsigned k = 0; k <= i; k ++) + Ainv(j,k) += Ainv(i,k) * f1; + } + } + } + /* up */ + for (int i = kN - 1; i >= 0; i--) + { + /* FIXME: Singular matrix? */ + const nl_double f = 1.0 / W(i,i); + for (int j = i - 1; j>=0; j--) + { + const nl_double f1 = - W(j,i) * f; + if (f1 != 0.0) + { + for (unsigned k = i; k < kN; k++) + W(j,k) += W(i,k) * f1; + for (unsigned k = 0; k < kN; k++) + Ainv(j,k) += Ainv(i,k) * f1; + } + } + for (unsigned k = 0; k < kN; k++) + { + Ainv(i,k) *= f; + lAinv(i,k) = Ainv(i,k); + } + } +} + +template +template +void matrix_solver_sm_t::LE_compute_x( + T * RESTRICT x) +{ + const unsigned kN = N(); + + for (int i=0; i +template +T matrix_solver_sm_t::delta( + const T * RESTRICT V) +{ + /* FIXME: Ideally we should also include currents (RHS) here. This would + * need a revaluation of the right hand side after voltages have been updated + * and thus belong into a different calculation. This applies to all solvers. + */ + + const unsigned iN = this->N(); + T cerr = 0; + for (unsigned i = 0; i < iN; i++) + cerr = std::fmax(cerr, nl_math::abs(V[i] - (T) this->m_nets[i]->m_cur_Analog)); + return cerr; +} + +template +template +void matrix_solver_sm_t::store( + const T * RESTRICT V) +{ + for (unsigned i = 0, iN=N(); i < iN; i++) + { + this->m_nets[i]->m_cur_Analog = V[i]; + } +} + + +template +int matrix_solver_sm_t::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson) +{ + static uint cnt = 0; + + nl_double new_V[_storage_N]; // = { 0.0 }; + + if (0 || (cnt % 100 == 0)) + { + /* complete calculation */ + this->LE_invert(); + } + else + { + const auto iN = N(); + for (int row = 0; row < iN; row ++) + for (int k = 0; k < iN; k++) + Ainv(row,k) = lAinv(row, k); + + for (int row = 0; row < N(); row ++) + { + nl_double v[m_pitch]; + bool changed = false; + for (int k = 0; k < N(); k++) + v[k] = A(row,k) - lA(row,k); + for (int k = 0; k < N(); k++) + if (v[k] != 0.0) + { + changed = true; + break; + } + + if (changed) + { + nl_double lamba = 0.0; + nl_double w[m_pitch] = {0}; + nl_double z[m_pitch] = {0}; + /* compute w and lamba */ + for (int k = 0; k < N(); k++) + { + for (int j=0; jLE_compute_x(new_V); + + if (newton_raphson) + { + nl_double err = delta(new_V); + + store(new_V); + + return (err > this->m_params.m_accuracy) ? 2 : 1; + } + else + { + store(new_V); + return 1; + } +} + +template +inline int matrix_solver_sm_t::vsolve_non_dynamic(const bool newton_raphson) +{ + this->build_LE_A(); + this->build_LE_RHS(); + + for (unsigned i=0, iN=N(); i < iN; i++) + m_last_RHS[i] = RHS(i); + + this->m_stat_calculations++; + return this->solve_non_dynamic(newton_raphson); +} + +template +matrix_solver_sm_t::matrix_solver_sm_t(const solver_parameters_t *params, const int size) +: matrix_solver_t(GAUSSIAN_ELIMINATION, params) +, m_dim(size) +{ + m_rails_temp = palloc_array(terms_t, N()); +#if (NL_USE_DYNAMIC_ALLOCATION) + m_A = palloc_array(nl_ext_double, N() * m_pitch); +#endif + for (unsigned k = 0; k < N(); k++) + { + m_terms[k] = palloc(terms_t); + m_last_RHS[k] = 0.0; + m_last_V[k] = 0.0; + } +} + +template +matrix_solver_sm_t::matrix_solver_sm_t(const eSolverType type, const solver_parameters_t *params, const int size) +: matrix_solver_t(type, params) +, m_dim(size) +{ + m_rails_temp = palloc_array(terms_t, N()); +#if (NL_USE_DYNAMIC_ALLOCATION) + m_A = palloc_array(nl_ext_double, N() * m_pitch); +#endif + for (unsigned k = 0; k < N(); k++) + { + m_terms[k] = palloc(terms_t); + m_last_RHS[k] = 0.0; + m_last_V[k] = 0.0; + } +} + +NETLIB_NAMESPACE_DEVICES_END() + +#endif /* NLD_MS_DIRECT_H_ */ diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index 5a7c8fecd40..56033623adf 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -46,6 +46,7 @@ #else #include "nld_ms_direct_lu.h" #endif +#include "nld_ms_sm.h" #include "nld_ms_direct1.h" #include "nld_ms_direct2.h" #include "nld_ms_sor.h" @@ -458,7 +459,7 @@ matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const bool use_sp } else if (pstring("MAT").equals(m_iterative_solver)) { - typedef matrix_solver_direct_t solver_mat; + typedef matrix_solver_sm_t solver_mat; return palloc(solver_mat(&m_params, size)); } else if (pstring("SOR").equals(m_iterative_solver)) From 8c69d3ad1562d79790bd48e3fe4521db304efceb Mon Sep 17 00:00:00 2001 From: couriersud Date: Mon, 28 Mar 2016 03:20:59 +0200 Subject: [PATCH 19/74] Fix crash in stat output when no calculations were run --- nl_examples/kidniki.c | 3 +- src/lib/netlist/solver/nld_matrix_solver.h | 2 +- src/lib/netlist/solver/nld_ms_direct.h | 14 ++-- src/lib/netlist/solver/nld_ms_sm.h | 91 ++++++++++++---------- src/lib/netlist/solver/nld_solver.cpp | 8 +- 5 files changed, 68 insertions(+), 50 deletions(-) diff --git a/nl_examples/kidniki.c b/nl_examples/kidniki.c index f7dbf69bdfc..263e0d3eb7d 100644 --- a/nl_examples/kidniki.c +++ b/nl_examples/kidniki.c @@ -14,9 +14,10 @@ NETLIST_START(dummy) PARAM(Solver.NR_LOOPS, 300) PARAM(Solver.GS_LOOPS, 1) PARAM(Solver.GS_THRESHOLD, 6) + PARAM(Solver.ITERATIVE, "SM") //PARAM(Solver.ITERATIVE, "MAT") //PARAM(Solver.ITERATIVE, "GMRES") - PARAM(Solver.ITERATIVE, "SOR") + //PARAM(Solver.ITERATIVE, "SOR") PARAM(Solver.DYNAMIC_TS, 0) PARAM(Solver.DYNAMIC_LTE, 5e-3) PARAM(Solver.MIN_TIMESTEP, 10e-6) diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h index 40896d431e5..715eab6756a 100644 --- a/src/lib/netlist/solver/nld_matrix_solver.h +++ b/src/lib/netlist/solver/nld_matrix_solver.h @@ -46,7 +46,7 @@ class terms_t unsigned m_railstart; pvector_t m_nz; /* all non zero for multiplication */ - pvector_t m_nzrd; /* non zero right of the diagonal for elimination, includes RHS element */ + pvector_t m_nzrd; /* non zero right of the diagonal for elimination, may include RHS element */ pvector_t m_nzbd; /* non zero below of the diagonal for elimination */ private: pvector_t m_term; diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index 76b448d8e8f..6911e6aa360 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -269,16 +269,14 @@ ATTR_COLD void matrix_solver_direct_t::vsetup(analog_net_t::lis } } - for (unsigned j = 0; j < N(); j++) + for (unsigned i = 0; i < t->m_railstart; i++) { - for (unsigned i = 0; i < t->m_railstart; i++) - { - if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1)) - t->m_nzrd.push_back(other[i]); - if (!t->m_nz.contains(other[i])) - t->m_nz.push_back(other[i]); - } + if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1)) + t->m_nzrd.push_back(other[i]); + if (!t->m_nz.contains(other[i])) + t->m_nz.push_back(other[i]); } + /* Add RHS element */ if (!t->m_nzrd.contains(N())) t->m_nzrd.push_back(N()); diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index c9ee083c54a..81395a11492 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -13,11 +13,6 @@ #include "solver/nld_solver.h" #include "solver/vector_base.h" -/* Disabling dynamic allocation gives a ~10% boost in performance - * This flag has been added to support continuous storage for arrays - * going forward in case we implement cuda solvers in the future. - */ - NETLIB_NAMESPACE_DEVICES_START() //#define nl_ext_double __float128 // slow, very slow @@ -273,16 +268,14 @@ ATTR_COLD void matrix_solver_sm_t::vsetup(analog_net_t::list_t } } - for (unsigned j = 0; j < N(); j++) + for (unsigned i = 0; i < t->m_railstart; i++) { - for (unsigned i = 0; i < t->m_railstart; i++) - { - if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1)) - t->m_nzrd.push_back(other[i]); - if (!t->m_nz.contains(other[i])) - t->m_nz.push_back(other[i]); - } + if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1)) + t->m_nzrd.push_back(other[i]); + if (!t->m_nz.contains(other[i])) + t->m_nz.push_back(other[i]); } + /* and sort */ psort_list(t->m_nzrd); @@ -476,8 +469,10 @@ void matrix_solver_sm_t::LE_compute_x( for (int k=0; k::store( template int matrix_solver_sm_t::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson) { + static const bool incremental = true; static uint cnt = 0; nl_double new_V[_storage_N]; // = { 0.0 }; - if (0 || (cnt % 100 == 0)) + if (0 || ((cnt % 200) == 0)) { /* complete calculation */ this->LE_invert(); @@ -526,40 +522,57 @@ int matrix_solver_sm_t::solve_non_dynamic(ATTR_UNUSED const boo else { const auto iN = N(); - for (int row = 0; row < iN; row ++) - for (int k = 0; k < iN; k++) - Ainv(row,k) = lAinv(row, k); - for (int row = 0; row < N(); row ++) + if (not incremental) { - nl_double v[m_pitch]; - bool changed = false; - for (int k = 0; k < N(); k++) - v[k] = A(row,k) - lA(row,k); - for (int k = 0; k < N(); k++) - if (v[k] != 0.0) - { - changed = true; - break; - } + for (int row = 0; row < iN; row ++) + for (int k = 0; k < iN; k++) + Ainv(row,k) = lAinv(row, k); + } + for (int row = 0; row < iN; row ++) + { + nl_double v[m_pitch] = {0}; + unsigned cols[m_pitch]; + unsigned colcount = 0; - if (changed) + auto &nz = m_terms[row]->m_nz; + for (auto & col : nz) + { + v[col] = A(row,col) - lA(row,col); + if (incremental) + lA(row,col) = A(row,col); + if (v[col] != 0.0) + cols[colcount++] = col; + } + + if (colcount > 0) { nl_double lamba = 0.0; nl_double w[m_pitch] = {0}; - nl_double z[m_pitch] = {0}; + nl_double z[m_pitch]; /* compute w and lamba */ - for (int k = 0; k < N(); k++) + for (unsigned i = 0; i < iN; i++) + z[i] = Ainv(i, row); /* u is row'th column */ + + for (unsigned j = 0; j < colcount; j++) + lamba += v[cols[j]] * z[cols[j]]; + + for (unsigned j=0; jm_stat_calculations != 0 && this->m_params.m_log_stats) + if (this->m_stat_calculations != 0 && this->m_stat_vsolver_calls && this->m_params.m_log_stats) { log().verbose("=============================================="); log().verbose("Solver {1}", this->name()); @@ -462,6 +462,12 @@ matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const bool use_sp typedef matrix_solver_sm_t solver_mat; return palloc(solver_mat(&m_params, size)); } + else if (pstring("SM").equals(m_iterative_solver)) + { + /* Sherman-Morrison Formula */ + typedef matrix_solver_sm_t solver_mat; + return palloc(solver_mat(&m_params, size)); + } else if (pstring("SOR").equals(m_iterative_solver)) { typedef matrix_solver_SOR_t solver_GS; From 628cef3d97103a7a7348f66c1a9f6a7680b64443 Mon Sep 17 00:00:00 2001 From: couriersud Date: Mon, 28 Mar 2016 13:45:45 +0200 Subject: [PATCH 20/74] Added some notes about Sherman-Morrison. --- nl_examples/kidniki.c | 4 ++-- src/lib/netlist/solver/nld_ms_sm.h | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/nl_examples/kidniki.c b/nl_examples/kidniki.c index 263e0d3eb7d..603d2064f8d 100644 --- a/nl_examples/kidniki.c +++ b/nl_examples/kidniki.c @@ -14,8 +14,8 @@ NETLIST_START(dummy) PARAM(Solver.NR_LOOPS, 300) PARAM(Solver.GS_LOOPS, 1) PARAM(Solver.GS_THRESHOLD, 6) - PARAM(Solver.ITERATIVE, "SM") - //PARAM(Solver.ITERATIVE, "MAT") + //PARAM(Solver.ITERATIVE, "SM") + PARAM(Solver.ITERATIVE, "MAT") //PARAM(Solver.ITERATIVE, "GMRES") //PARAM(Solver.ITERATIVE, "SOR") PARAM(Solver.DYNAMIC_TS, 0) diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index 81395a11492..7336e060510 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -3,6 +3,31 @@ /* * nld_ms_direct.h * + * + * Sherman-Morrison Solver + * + * Computes the updated inverse of A given that the change in A is + * + * A <- A + (u x v) u,v vectors + * + * In this specific implementation, u is a unit vector specifying the row which + * changed. Thus v contains the changed column. + * + * Than z = A⁻¹ u , w = transpose(A⁻¹) v , lambda = v z + * + * A⁻¹ <- 1.0 / (1.0 + lambda) * (z x w) + * + * The approach is iterative and applied for each row changed. + * + * The performance for a typical circuit like kidniki compared to Gaussian + * elimination is poor: + * + * a) The code needs to be run for each row change. + * b) The inverse of A typically is fully occupied. + * + * It may have advantages for circuits with a high number of elements and only + * few dynamic/active components. + * */ #ifndef NLD_MS_SM_H_ From dcb59350f32e0cbad8acb9048ae699425faae3ec Mon Sep 17 00:00:00 2001 From: couriersud Date: Mon, 28 Mar 2016 13:44:56 +0200 Subject: [PATCH 21/74] Move jpeglib.h include where it belongs. No need to include this in rendutil.h. --- src/emu/rendutil.cpp | 2 +- src/emu/rendutil.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/emu/rendutil.cpp b/src/emu/rendutil.cpp index db8fa94230e..eed35713a92 100644 --- a/src/emu/rendutil.cpp +++ b/src/emu/rendutil.cpp @@ -12,7 +12,7 @@ #include "rendutil.h" #include "png.h" - +#include "libjpeg/jpeglib.h" /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/emu/rendutil.h b/src/emu/rendutil.h index a201d807630..bdf01592307 100644 --- a/src/emu/rendutil.h +++ b/src/emu/rendutil.h @@ -11,7 +11,6 @@ #define __RENDUTIL_H__ #include "render.h" -#include "libjpeg/jpeglib.h" #include From b2ee87f136a1a64a06fc5a17052500399cc25d5f Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 13:16:08 +0100 Subject: [PATCH 22/74] notes about inputs (nw) --- src/mame/drivers/spyhuntertec.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index 5ccb02cdfbf..6e5c9b8c1ba 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -15,8 +15,7 @@ non-interlaced sound system appears to be the same as 'spartanxtec.cpp' -how do the inputs work? is it modified to use joystick? is the sound cpu reading them / latching them via the AY? -if so how does it communicate, timing? +analog inputs seem to be read by the sound CPU, with serial communication */ @@ -125,7 +124,7 @@ READ8_MEMBER(spyhuntertec_state::ay2_porta_r) // read often, even if port is set to output mode // maybe latches something? // printf("ay2_porta_r\n"); - return 0; + return rand(); } WRITE8_MEMBER(spyhuntertec_state::spyhunt_videoram_w) @@ -310,12 +309,28 @@ UINT32 spyhuntertec_state::screen_update_spyhuntertec(screen_device &screen, bit WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_fd00_w) { +// printf("%04x spyhuntertec_fd00_w %02x\n", space.device().safe_pc(), data); soundlatch_byte_w(space, 0, data); m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } READ8_MEMBER(spyhuntertec_state::spyhuntertec_in2_r) { + // it writes 04 / 14 to the sound latch (spyhuntertec_fd00_w) before + // reading bit 6 here a minimum of 32 times. + // seems to be how it reads the analog controls? probably via sound CPU?? + + /* note, these commands trigger a read from ay2_porta on the sound cpu side, followed by 2 writes + + a52a spyhuntertec_fd00_w 14 + ay2_porta_r + ay2_porta_w 80 + ay2_porta_w 00 + a52a spyhuntertec_fd00_w 04 + ay2_porta_r + ay2_porta_w 81 + ay2_porta_w 01 + */ UINT8 ret = ioport("IN2")->read(); // printf("%04x spyhuntertec_in2_r\n", space.device().safe_pc()); return ret; From 82a8cea336efb89117348e5621a462bd34328a0e Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 14:29:38 +0100 Subject: [PATCH 23/74] analyze weird bootleg input reading code a bit (nw) --- src/mame/drivers/spyhuntertec.cpp | 54 +++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index 6e5c9b8c1ba..783dc87905c 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -331,6 +331,60 @@ READ8_MEMBER(spyhuntertec_state::spyhuntertec_in2_r) ay2_porta_w 81 ay2_porta_w 01 */ + + /* + + -- input reading code here + A388: 3E 14 ld a,$14 + A38A: 28 04 jr z,$A390 + A38C: DD 23 inc ix + A38E: 3E 04 ld a,$04 + A390: CD 20 A5 call $A520 << write command to sub-cpu + + -- delay loop / timeout loop for reading result? value of b doesn't get used in the end + A393: 06 1F ld b,$1F << loop counter + A395: 21 02 FC ld hl,$FC02 + loopstart: + A398: CB 76 bit 6,(hl) + A39A: 28 06 jr z,$A3A2 to dest2 + A39C: 10 FA djnz $A398 (to loopstart) + + A39E: 06 0F ld b,$0F < + A3A0: 18 1E jr $A3C0 to dest 3 + + dest2: + A3A2: 06 33 ld b,$33 << loop counter + loop2start: + A3A4: CB 76 bit 6,(hl) + A3A6: 20 11 jr nz,$A3B9 (to outofloop) + A3A8: CB 76 bit 6,(hl) + A3AA: 00 nop + A3AB: CB 76 bit 6,(hl) + A3AD: 20 0A jr nz,$A3B9 (to outofloop) + A3AF: 10 F3 djnz $A3A4 (to loop2start) + + A3B1: 00 nop + A3B2: 00 nop + A3B3: 00 nop + A3B4: 00 nop + A3B5: 00 nop + A3B6: 00 nop + A3B7: 00 nop + A3B8: 00 nop + + outofloop: + A3B9: 78 ld a,b + A3BA: FE 20 cp $20 + A3BC: 38 02 jr c,$A3C0 + A3BE: 06 1F ld b,$1F + + dest3: + A3C0: 21 B6 A6 ld hl,$A6B6 + ... + + + */ + UINT8 ret = ioport("IN2")->read(); // printf("%04x spyhuntertec_in2_r\n", space.device().safe_pc()); return ret; From 5cfe38e48171dc70b0767c43b0c25c704320eeaf Mon Sep 17 00:00:00 2001 From: cracyc Date: Mon, 28 Mar 2016 08:42:27 -0500 Subject: [PATCH 24/74] hiscore: even if we can't save before a soft reset, at least load what we've got (nw) --- plugins/hiscore/init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua index 228892e7539..3c8e9a37dbe 100644 --- a/plugins/hiscore/init.lua +++ b/plugins/hiscore/init.lua @@ -239,7 +239,10 @@ function hiscore.startplugin() end emu.register_start(function() - print("Starting " .. emu.gamename()) + current_game = "" + mem_check_passed = false + scores_have_been_read = false; + print("Starting " .. emu.gamename()) -- check if we've just soft reset -- reset() -- there's no way to reliably save scores after a soft reset currently current_game = emu.romname() From 966db2f2f70b1bfff5da681d16fd06e379cbfcd3 Mon Sep 17 00:00:00 2001 From: dankan1890 Date: Mon, 28 Mar 2016 16:14:32 +0200 Subject: [PATCH 25/74] fix compile. (nw) --- src/lib/netlist/solver/nld_ms_sm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index 7336e060510..31ecc55ebd9 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -535,7 +535,7 @@ template int matrix_solver_sm_t::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson) { static const bool incremental = true; - static uint cnt = 0; + static UINT32 cnt = 0; nl_double new_V[_storage_N]; // = { 0.0 }; From eaf971624833728b746e002374fed399d81741ce Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 15:30:30 +0100 Subject: [PATCH 26/74] (nw) --- src/mame/drivers/spartanxtec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp index e6e31577864..0347b5e3a40 100644 --- a/src/mame/drivers/spartanxtec.cpp +++ b/src/mame/drivers/spartanxtec.cpp @@ -112,7 +112,7 @@ void spartanxtec_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip for (int i = 0; i < 0x400; i += 4) { int x = m_spriteram[i+2]+128; - int y = (224-m_spriteram[i+1])&0xff; + int y = (225-m_spriteram[i+1])&0xff; // 224 or 225? 224 sometimes gives an ugly line on player death sprite, 225 also aligns better with original int code = m_spriteram[i+0]; int attr = m_spriteram[i+3]; code |= (attr & 0xc0) << 2; @@ -251,7 +251,7 @@ static INPUT_PORTS_START( spartanxtec ) IREM_Z80_COINAGE_TYPE_3_LOC(SW1) PORT_START("DSW2") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") // I don't think this is implemented in the bootleg, it just shifts the sprites a bit PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2") From 253de66bb63b450782b05b5ed041675cf6489c2b Mon Sep 17 00:00:00 2001 From: BraiNKilleRGR Date: Mon, 28 Mar 2016 18:22:36 +0300 Subject: [PATCH 27/74] Updated Greek Translation --- language/Greek/strings.po | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/language/Greek/strings.po b/language/Greek/strings.po index 8d541097689..3d3edc71a83 100644 --- a/language/Greek/strings.po +++ b/language/Greek/strings.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-28 09:02+0200\n" -"PO-Revision-Date: 2016-03-26 02:10+0200\n" +"PO-Revision-Date: 2016-03-28 15:32+0300\n" "Last-Translator: Mame.gr\n" "Language-Team: MAME Language Team\n" "Language: el\n" @@ -1733,6 +1733,9 @@ msgid "" "\n" "Press any key to continue" msgstr "" +"\n" +"\n" +"Πιέστε ένα πλήκτρο για συνέχεια" #: src/emu/ui/ui.cpp:1171 #, c-format @@ -2072,31 +2075,3 @@ msgstr " ΧΡΩΜΑΤΑ" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" msgstr " ΓΡΑΦΙΔΕΣ" - -#~ msgid "" -#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " -#~ "copyright law.\n" -#~ "\n" -#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -#~ "ESC.\n" -#~ "\n" -#~ "Otherwise, type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "Η Χρήση των εξομοιωτών σε συνδυασμό με ROMs που δεν κατέχετε απαγορεύεται " -#~ "από το νόμο περί πνευματικών δικαιωμάτων.\n" -#~ "\n" -#~ "ΑΝ ΔΕΝ ΚΑΤΕΧΕΤΕ ΝΟΜΙΜΑ ΤΟ ΔΙΚΑΙΩΜΑ ΝΑ ΠΑΙΞΕΤΕ ΤΟ «%1$s» ΣΕ ΑΥΤΟ ΤΟΝ " -#~ "ΕΞΟΜΟΙΩΤΗ, ΠΙΕΣΤΕ ΤΟ ΠΛΗΚΤΡΟ ESC.\n" -#~ "\n" -#~ "Διαφορετικά, πληκτρολογήστε OK ή να μετακινήσετε το μοχλό αριστερά και " -#~ "μετά δεξιά για να συνεχίσετε" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Πληκτρολογήστε OK ή μετακινήσετε το μοχλό αριστερά και στη συνέχεια δεξιά " -#~ "για να συνεχίσετε" From 001a16f09eb4323206d2b972321bffbd4d5b4e67 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 16:31:20 +0100 Subject: [PATCH 28/74] this makes inputs for spyhuntrp register in test mode, although they still don't work properly ingame (nw) --- src/mame/drivers/spyhuntertec.cpp | 74 +++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 14 deletions(-) diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index 783dc87905c..2596b4143e1 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -99,6 +99,9 @@ public: void mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int color_mask, int code_xor, int dx, int dy, int interlaced); + int m_analog_read_ready; + int m_analog_latched_value; + int m_analog_read_count; }; WRITE8_MEMBER(spyhuntertec_state::ay1_porta_w) @@ -117,6 +120,29 @@ READ8_MEMBER(spyhuntertec_state::ay1_porta_r) WRITE8_MEMBER(spyhuntertec_state::ay2_porta_w) { // printf("ay2_porta_w %02x\n", data); + // write 80 / 00 + // or 81 / 01 + // depending on which sound command was used + // assuming input select + + if (data == 0x80) + { + m_analog_read_ready = 1; + m_analog_read_count = 0; + m_analog_latched_value = ioport("PEDAL")->read(); + } + else if (data == 0x81) + { + m_analog_read_ready = 1; + m_analog_read_count = 0; + m_analog_latched_value = ioport("PADDLE")->read(); + + } + + + + + } READ8_MEMBER(spyhuntertec_state::ay2_porta_r) @@ -124,7 +150,7 @@ READ8_MEMBER(spyhuntertec_state::ay2_porta_r) // read often, even if port is set to output mode // maybe latches something? // printf("ay2_porta_r\n"); - return rand(); + return 0x00; // not sure value matters } WRITE8_MEMBER(spyhuntertec_state::spyhunt_videoram_w) @@ -385,7 +411,27 @@ READ8_MEMBER(spyhuntertec_state::spyhuntertec_in2_r) */ - UINT8 ret = ioport("IN2")->read(); + UINT8 ret = ioport("IN2")->read()&~0x40; + + if (m_analog_read_ready) + { + if (m_analog_read_count >= m_analog_latched_value) + { + ret |= 0x40; + m_analog_read_count = 0; + m_analog_read_ready = 0; + } + else + { + // ret |= 0x40; + m_analog_read_count++; + } + } + else + { + ret |= 0x40; + } + // printf("%04x spyhuntertec_in2_r\n", space.device().safe_pc()); return ret; } @@ -528,9 +574,7 @@ static INPUT_PORTS_START( spyhuntertec ) PORT_DIPNAME( 0x0001, 0x0001, "2" ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, "start" ) // start - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -543,9 +587,7 @@ static INPUT_PORTS_START( spyhuntertec ) PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, "pedal inverse" ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) // analog signal PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -569,12 +611,13 @@ static INPUT_PORTS_START( spyhuntertec ) PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, "coin" ) // coin? - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, "machineguns" ) // machine guns - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) + + PORT_START("PEDAL") + PORT_BIT( 0xff, 0x02, IPT_PEDAL ) PORT_MINMAX(0x02,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE + PORT_START("PADDLE") + PORT_BIT( 0xff, 0x02, IPT_PADDLE ) PORT_MINMAX(0x02,0xff) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_REVERSE INPUT_PORTS_END @@ -640,6 +683,9 @@ void spyhuntertec_state::machine_start() void spyhuntertec_state::machine_reset() { + m_analog_read_ready = 0; + m_analog_latched_value = 0; + m_analog_read_count = 0; } From 17d42f39374080b1e2a3ba352316ccf4d2c606d2 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Mon, 28 Mar 2016 18:52:50 +0200 Subject: [PATCH 29/74] Newline for some eeprom.cpp messages, nw --- src/devices/machine/eeprom.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp index 53b92a0ee0d..042e4535918 100644 --- a/src/devices/machine/eeprom.cpp +++ b/src/devices/machine/eeprom.cpp @@ -146,7 +146,7 @@ void eeprom_base_device::static_set_timing(device_t &device, timing_type type, c UINT32 eeprom_base_device::read(offs_t address) { if (!ready()) - logerror("EEPROM: Read performed before previous operation completed!"); + logerror("EEPROM: Read performed before previous operation completed!\n"); return internal_read(address); } @@ -158,7 +158,7 @@ UINT32 eeprom_base_device::read(offs_t address) void eeprom_base_device::write(offs_t address, UINT32 data) { if (!ready()) - logerror("EEPROM: Write performed before previous operation completed!"); + logerror("EEPROM: Write performed before previous operation completed!\n"); internal_write(address, data); m_completion_time = machine().time() + m_operation_time[WRITE_TIME]; } @@ -173,7 +173,7 @@ void eeprom_base_device::write(offs_t address, UINT32 data) void eeprom_base_device::write_all(UINT32 data) { if (!ready()) - logerror("EEPROM: Write all performed before previous operation completed!"); + logerror("EEPROM: Write all performed before previous operation completed!\n"); for (offs_t address = 0; address < (1 << m_address_bits); address++) internal_write(address, internal_read(address) & data); m_completion_time = machine().time() + m_operation_time[WRITE_ALL_TIME]; @@ -187,7 +187,7 @@ void eeprom_base_device::write_all(UINT32 data) void eeprom_base_device::erase(offs_t address) { if (!ready()) - logerror("EEPROM: Erase performed before previous operation completed!"); + logerror("EEPROM: Erase performed before previous operation completed!\n"); internal_write(address, ~0); m_completion_time = machine().time() + m_operation_time[ERASE_TIME]; } @@ -200,7 +200,7 @@ void eeprom_base_device::erase(offs_t address) void eeprom_base_device::erase_all() { if (!ready()) - logerror("EEPROM: Erase all performed before previous operation completed!"); + logerror("EEPROM: Erase all performed before previous operation completed!\n"); for (offs_t address = 0; address < (1 << m_address_bits); address++) internal_write(address, ~0); m_completion_time = machine().time() + m_operation_time[ERASE_ALL_TIME]; From aaf95cd484dda6b8eb9fb709735197e873b8ccc7 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 28 Mar 2016 19:01:03 +0200 Subject: [PATCH 30/74] hh_melps4: gjungler is working ok --- src/mame/drivers/hh_melps4.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp index c16715427be..9b1d75c737b 100644 --- a/src/mame/drivers/hh_melps4.cpp +++ b/src/mame/drivers/hh_melps4.cpp @@ -361,7 +361,7 @@ public: void gjungler_state::prepare_display() { UINT16 grid = BITSWAP16(m_grid,15,14,13,12,11,10,9,8,7,6,5,4,3,2,0,1); - UINT32 plate = BITSWAP24(m_plate,23,22,21,20,19,18,8,9,10,11,17,16,15,14,13,12,0,7,1,6,2,5,3,4) | 0x2000; + UINT32 plate = BITSWAP24(m_plate,23,22,21,20,19,18,8,9,10,11,13,16,15,14,13,12,7,0,6,1,5,2,4,3) | 0x2000; display_matrix(18, 12, plate, grid); } @@ -467,4 +467,4 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */ CONS( 1981, cfrogger, 0, 0, cfrogger, cfrogger, driver_device, 0, "Coleco", "Frogger (Coleco)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) -CONS( 1982, gjungler, 0, 0, gjungler, gjungler, driver_device, 0, "Gakken / Konami", "Jungler (Gakken)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK | MACHINE_NOT_WORKING ) +CONS( 1982, gjungler, 0, 0, gjungler, gjungler, driver_device, 0, "Gakken / Konami", "Jungler (Gakken)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) From 885ca5a8df89b2593227e0e59b3160b0b8207222 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 18:14:15 +0100 Subject: [PATCH 31/74] work this out later, leave disabled for now (nw) --- src/mame/drivers/balsente.cpp | 123 ++++++++++++++++++++++++++++++++++ src/mame/includes/balsente.h | 5 ++ src/mame/machine/balsente.cpp | 26 ++++++- 3 files changed, 152 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp index 64bad2a1f6b..76035c9f06c 100644 --- a/src/mame/drivers/balsente.cpp +++ b/src/mame/drivers/balsente.cpp @@ -526,6 +526,98 @@ static INPUT_PORTS_START( hattrick ) UNUSED_ANALOG INPUT_PORTS_END +#if 0 +static INPUT_PORTS_START( teamht ) + PORT_INCLUDE( sentetst ) + + PORT_MODIFY("SWH") + PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("H1:1,2") + PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) + PORT_DIPNAME( 0x1c, 0x00, "Bonus Coin" ) PORT_DIPLOCATION("H1:3,4,5") + PORT_DIPSETTING( 0x00, "None" ) + PORT_DIPSETTING( 0x04, "2 Coins +1" ) + PORT_DIPSETTING( 0x08, "3 Coins +1" ) + PORT_DIPSETTING( 0x0c, "4 Coins +1" ) + PORT_DIPSETTING( 0x10, "4 Coins +2" ) + PORT_DIPSETTING( 0x14, "5 Coins +1" ) + PORT_DIPSETTING( 0x18, "5 Coins +2" ) + PORT_DIPSETTING( 0x1c, "5 Coins +3" ) + PORT_DIPNAME( 0x20, 0x00, "Left Multiplier" ) PORT_DIPLOCATION("H1:6") + PORT_DIPSETTING( 0x00, "1" ) + PORT_DIPSETTING( 0x20, "2" ) + PORT_DIPNAME( 0xc0, 0x00, "Right Multiplier" ) PORT_DIPLOCATION("H1:7,8") + PORT_DIPSETTING( 0x00, "1" ) + PORT_DIPSETTING( 0x40, "4" ) + PORT_DIPSETTING( 0x80, "5" ) + PORT_DIPSETTING( 0xc0, "6" ) + + PORT_MODIFY("SWG") + PORT_DIPNAME( 0x07, 0x02, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("G1:1,2,3") + PORT_DIPSETTING( 0x00, "1:15" ) + PORT_DIPSETTING( 0x01, "1:30" ) + PORT_DIPSETTING( 0x02, "1:45" ) + PORT_DIPSETTING( 0x03, "2:00" ) + PORT_DIPSETTING( 0x04, "2:15" ) + PORT_DIPSETTING( 0x05, "2:30" ) + PORT_DIPSETTING( 0x06, "2:45" ) + PORT_DIPSETTING( 0x07, "3:00" ) + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "G1:4" ) + PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "G1:5" ) + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "G1:6" ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) + + PORT_MODIFY("IN0") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_MODIFY("IN1") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_MODIFY("AN2") + UNUSED_ANALOG + + PORT_MODIFY("AN3") + UNUSED_ANALOG + + PORT_START("EX0") + PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) + + PORT_START("EX1") + PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) + + PORT_START("EX2") + PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3) + + PORT_START("EX3") + PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4) +INPUT_PORTS_END +#endif static INPUT_PORTS_START( otwalls ) PORT_INCLUDE( sentetst ) @@ -1360,6 +1452,22 @@ ROM_START( hattrick ) ROM_END +#if 0 +ROM_START( teamht ) + ROM_REGION( 0x40000, "maincpu", 0 ) /* 64k for code for the first CPU, plus 128k of banked ROMs */ + ROM_LOAD( "HATTRK.U8A", 0x10000, 0x4000, CRC(cb746de8) SHA1(b0e5003370b65f2aed4dc9ccb2a2d3eb29050245) ) + ROM_LOAD( "HATTRK.U7A", 0x14000, 0x4000, CRC(5f2a0b24) SHA1(da1950a7e11014e47438a7c5831433390c1b1fd3) ) + ROM_LOAD( "HATTRK.U1A", 0x2c000, 0x4000, CRC(6c6cf2be) SHA1(80e82ae4bd129000e74c4a5fd06d2109d5417e39) ) + + SOUNDBOARD_ROMS + + ROM_REGION( 0x10000, "gfx1", 0 ) /* up to 64k of sprites */ + ROM_LOAD( "HATTRK.U6B", 0x00000, 0x4000, CRC(6e299728) SHA1(f10fc020fdf8f61d059ac57306b0353ac7dbfb24) ) + + MOTHERBOARD_PALS +ROM_END +#endif + ROM_START( otwalls ) ROM_REGION( 0x40000, "maincpu", 0 ) /* 64k for code for the first CPU, plus 128k of banked ROMs */ ROM_LOAD( "otw-ab0.bin", 0x10000, 0x2000, CRC(474441c7) SHA1(16fb5be9f94e072d4f3003abcc9dcf6d7af2359a) ) @@ -2162,6 +2270,16 @@ DRIVER_INIT_MEMBER(balsente_state,sentetst) { expand_roms(EXPAND_ALL); config_ DRIVER_INIT_MEMBER(balsente_state,cshift) { expand_roms(EXPAND_ALL); config_shooter_adc(FALSE, 0 /* noanalog */); } DRIVER_INIT_MEMBER(balsente_state,gghost) { expand_roms(EXPAND_ALL); config_shooter_adc(FALSE, 1); } DRIVER_INIT_MEMBER(balsente_state,hattrick) { expand_roms(EXPAND_ALL); config_shooter_adc(FALSE, 0 /* noanalog */); } +DRIVER_INIT_MEMBER(balsente_state,teamht) +{ + address_space &space = m_maincpu->space(AS_PROGRAM); + expand_roms(EXPAND_ALL); + config_shooter_adc(FALSE, 0 /* noanalog */); + space.install_read_handler(0x9404, 0x9404, read8_delegate(FUNC(balsente_state::teamht_extra_r),this)); + space.install_write_handler(0x9000, 0x9007, write8_delegate(FUNC(balsente_state::teamht_multiplex_select_w),this)); + +} + DRIVER_INIT_MEMBER(balsente_state,otwalls) { expand_roms(EXPAND_ALL); config_shooter_adc(FALSE, 0); } DRIVER_INIT_MEMBER(balsente_state,snakepit) { expand_roms(EXPAND_ALL); config_shooter_adc(FALSE, 1); } DRIVER_INIT_MEMBER(balsente_state,snakjack) { expand_roms(EXPAND_ALL); config_shooter_adc(FALSE, 1); } @@ -2285,3 +2403,8 @@ GAME( 1987, rescraid, 0, balsente, rescraid, balsente_state, rescraid, RO GAME( 1986, shrike, 0, shrike, shrike, balsente_state, shrike, ROT0, "Bally/Sente", "Shrike Avenger (prototype)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, rescraida,rescraid, balsente, rescraid, balsente_state, rescraid, ROT0, "Bally Midway", "Rescue Raider (stand-alone)", MACHINE_SUPPORTS_SAVE ) GAME( 198?, grudge, 0, balsente, grudge, balsente_state, grudge, ROT0, "Bally Midway", "Grudge Match (prototype)", MACHINE_SUPPORTS_SAVE ) +#if 0 +GAME( 1985, teamht, hattrick, balsente, teamht, balsente_state, teamht, ROT0, "Bally/Sente", "Team Hat Trick", MACHINE_SUPPORTS_SAVE ) +#endif + + diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index c3bd5218959..60117d42369 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -124,6 +124,7 @@ public: UINT8 m_spiker_expand_bits; UINT8 m_grudge_steering_result; UINT8 m_grudge_last_steering[3]; + UINT8 m_teamht_input; /* video data */ UINT8 m_expanded_videoram[256*256]; @@ -163,6 +164,9 @@ public: DECLARE_WRITE8_MEMBER(shrike_shared_6809_w); DECLARE_WRITE16_MEMBER(shrike_io_68k_w); DECLARE_READ16_MEMBER(shrike_io_68k_r); + DECLARE_READ8_MEMBER(teamht_extra_r); + DECLARE_WRITE8_MEMBER(teamht_multiplex_select_w); + void counter_set_out(int which, int out); void counter_start(int which); void counter_stop( int which); @@ -184,6 +188,7 @@ public: DECLARE_DRIVER_INIT(snakepit); DECLARE_DRIVER_INIT(spiker); DECLARE_DRIVER_INIT(hattrick); + DECLARE_DRIVER_INIT(teamht); DECLARE_DRIVER_INIT(toggle); DECLARE_DRIVER_INIT(snakjack); DECLARE_DRIVER_INIT(grudge); diff --git a/src/mame/machine/balsente.cpp b/src/mame/machine/balsente.cpp index 29574c6f7e0..8cb63a2e3a6 100644 --- a/src/mame/machine/balsente.cpp +++ b/src/mame/machine/balsente.cpp @@ -595,10 +595,33 @@ WRITE8_MEMBER(balsente_state::balsente_adc_select_w) { /* set a timer to go off and read the value after 50us */ /* it's important that we do this for Mini Golf */ -logerror("adc_select %d\n", offset & 7); + logerror("adc_select %d\n", offset & 7); machine().scheduler().timer_set(attotime::from_usec(50), timer_expired_delegate(FUNC(balsente_state::adc_finished),this), offset & 7); } +READ8_MEMBER(balsente_state::teamht_extra_r) +{ + return m_teamht_input; +} + + +WRITE8_MEMBER(balsente_state::teamht_multiplex_select_w) +{ + logerror("multiplex_select %d\n", offset & 7); + switch (offset & 7) + { + case 0x04: m_teamht_input = ioport("EX0")->read(); break; + case 0x05: m_teamht_input = ioport("EX1")->read(); break; + case 0x06: m_teamht_input = ioport("EX2")->read(); break; + case 0x07: m_teamht_input = ioport("EX3")->read(); break; + + default: + logerror("(unhandled)\n"); + break; + + } + +} /************************************* @@ -1077,7 +1100,6 @@ WRITE8_MEMBER(balsente_state::spiker_expand_w) m_spiker_expand_color = data; } - READ8_MEMBER(balsente_state::spiker_expand_r) { UINT8 left, right; From 5a7abe49d5a695bf7d5154658dd9eea4b57283b3 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 18:39:14 +0100 Subject: [PATCH 32/74] new clones M.A.C.H. 3 (set 2) [Matt Ownby] M.A.C.H. 3 (set 3) [??] --- src/mame/drivers/gottlieb.cpp | 61 ++++++++++++++++++++++++++++++++++- src/mame/mame.lst | 2 ++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index a3ec78e80e8..d6a7d2be9d6 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -2357,6 +2357,63 @@ ROM_START( mach3 ) ROM_END +ROM_START( mach3a ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "m3rom4.bin", 0x6000, 0x2000, CRC(8bfd5a44) SHA1(61f5c6c39047c1d0296e2cacce2be9525cb47176) ) + ROM_LOAD( "m3rom3.bin", 0x8000, 0x2000, CRC(b1b045af) SHA1(4e71ca4661bf5daaf9e2ffbb930ac3b13e2e57bd) ) + ROM_LOAD( "m3rom2-1.bin", 0xa000, 0x2000, CRC(2b1689a7) SHA1(18714810de6501bc1656261aacf98be228af624e) ) + ROM_LOAD( "m3rom1.bin", 0xc000, 0x2000, CRC(3b0ba80b) SHA1(bc7e961311b40f05f2998f10f0a68f2e515c8e66) ) + ROM_LOAD( "m3rom0.bin", 0xe000, 0x2000, CRC(70c12bf4) SHA1(c26127b6e2a16791b3be8abac93be6af4f30fb3b) ) + + ROM_REGION( 0x10000, "r2sound:audiocpu", 0 ) + ROM_LOAD( "m3drom1.bin", 0xd000, 0x1000, CRC(a6e29212) SHA1(a73aafc2efa99e9ae0aecbb6075a10f7178ac938) ) + + ROM_REGION( 0x10000, "r2sound:speechcpu", 0 ) + ROM_LOAD( "m3yrom1.bin", 0xf000, 0x1000, CRC(eddf8872) SHA1(29ed0d1828639849bab826b3e2ab4eefac45fd85) ) + + ROM_REGION( 0x2000, "bgtiles", 0 ) + ROM_LOAD( "mach3bg0.bin", 0x0000, 0x1000, CRC(ea2f5257) SHA1(664502dd2b7ee4ce96820da532615f3902b45557) ) + ROM_LOAD( "mach3bg1.bin", 0x1000, 0x1000, CRC(f543e4ce) SHA1(2a1b7dbbcd9756f836ca2e42973043b98a303082) ) + + ROM_REGION( 0x8000, "sprites", 0 ) + ROM_LOAD( "mach3fg3.bin", 0x0000, 0x2000, CRC(472128b4) SHA1(8c6f36cab5ec8abb6db2e6d52530560664b950fe) ) + ROM_LOAD( "mach3fg2.bin", 0x2000, 0x2000, CRC(2a59e99e) SHA1(5c1faa244fc0f53cc2a52c8d4d40fb178706c2ed) ) + ROM_LOAD( "mach3fg1.bin", 0x4000, 0x2000, CRC(9b88767b) SHA1(8071e11906b3f0026f9a210cc5a236d95ca1f659) ) + ROM_LOAD( "mach3fg0.bin", 0x6000, 0x2000, CRC(0bae12a5) SHA1(7bc0b82ccab0e4498a7a2a9dc85f03125f25826e) ) + + DISK_REGION( "laserdisc" ) + DISK_IMAGE_READONLY( "mach3", 0, SHA1(d0f72bded7feff5c360f8749d6c27650a6964847) ) +ROM_END + +ROM_START( mach3b ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "rom4", 0x6000, 0x2000, CRC(bf460625) SHA1(899b691888505a7759c5ce6d4490519b72322d07) ) + ROM_LOAD( "rom3", 0x8000, 0x2000, CRC(9daa023f) SHA1(80efeca6e7f9112a2335045c9890b1458ef38cce) ) + ROM_LOAD( "rom2", 0xa000, 0x2000, CRC(5c1fd3ac) SHA1(8e3c14f7e6fe849ab6d9a1d99c03e2c275eca33a) ) + ROM_LOAD( "rom1", 0xc000, 0x2000, CRC(1f755e11) SHA1(cead5f6be15d1ef21b3011a7ec345e35e942393b) ) + ROM_LOAD( "rom0", 0xe000, 0x2000, CRC(4bfcd992) SHA1(7fe0977176ea1b5a54c3f77afb4e7bb46af8ec63) ) + + ROM_REGION( 0x10000, "r2sound:audiocpu", 0 ) + ROM_LOAD( "m3drom1.bin", 0xd000, 0x1000, CRC(a6e29212) SHA1(a73aafc2efa99e9ae0aecbb6075a10f7178ac938) ) + + ROM_REGION( 0x10000, "r2sound:speechcpu", 0 ) + ROM_LOAD( "m3yrom1.bin", 0xf000, 0x1000, CRC(eddf8872) SHA1(29ed0d1828639849bab826b3e2ab4eefac45fd85) ) + + ROM_REGION( 0x2000, "bgtiles", 0 ) + ROM_LOAD( "mach3bg0.bin", 0x0000, 0x1000, CRC(ea2f5257) SHA1(664502dd2b7ee4ce96820da532615f3902b45557) ) + ROM_LOAD( "mach3bg1.bin", 0x1000, 0x1000, CRC(f543e4ce) SHA1(2a1b7dbbcd9756f836ca2e42973043b98a303082) ) + + ROM_REGION( 0x8000, "sprites", 0 ) + ROM_LOAD( "mach3fg3.bin", 0x0000, 0x2000, CRC(472128b4) SHA1(8c6f36cab5ec8abb6db2e6d52530560664b950fe) ) + ROM_LOAD( "mach3fg2.bin", 0x2000, 0x2000, CRC(2a59e99e) SHA1(5c1faa244fc0f53cc2a52c8d4d40fb178706c2ed) ) + ROM_LOAD( "mach3fg1.bin", 0x4000, 0x2000, CRC(9b88767b) SHA1(8071e11906b3f0026f9a210cc5a236d95ca1f659) ) + ROM_LOAD( "mach3fg0.bin", 0x6000, 0x2000, CRC(0bae12a5) SHA1(7bc0b82ccab0e4498a7a2a9dc85f03125f25826e) ) + + DISK_REGION( "laserdisc" ) + DISK_IMAGE_READONLY( "mach3", 0, SHA1(d0f72bded7feff5c360f8749d6c27650a6964847) ) +ROM_END + + ROM_START( cobram3 ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "bh03", 0x8000, 0x2000, CRC(755cbbf5) SHA1(e3ea146f8c344af1e9bf51548ae4902cb09e589a) ) @@ -2604,7 +2661,9 @@ GAME( 1984, curvebal, 0, gottlieb1, curvebal, gottlieb_state, romtiles, /* games using rev 2 sound board */ GAME( 1983, screwloo, 0, screwloo, screwloo, gottlieb_state, screwloo, ROT0, "Mylstar", "Screw Loose (prototype)", 0 ) -GAME( 1983, mach3, 0, g2laser, mach3, gottlieb_state, romtiles, ROT0, "Mylstar", "M.A.C.H. 3", 0 ) +GAME( 1983, mach3, 0, g2laser, mach3, gottlieb_state, romtiles, ROT0, "Mylstar", "M.A.C.H. 3 (set 1)", 0 ) +GAME( 1983, mach3a, mach3, g2laser, mach3, gottlieb_state, romtiles, ROT0, "Mylstar", "M.A.C.H. 3 (set 2)", 0 ) +GAME( 1983, mach3b, mach3, g2laser, mach3, gottlieb_state, romtiles, ROT0, "Mylstar", "M.A.C.H. 3 (set 3)", 0 ) GAME( 1984, cobram3, cobra, cobram3, cobram3, gottlieb_state, romtiles, ROT0, "Data East", "Cobra Command (M.A.C.H. 3 hardware)", 0 ) GAME( 1984, usvsthem, 0, g2laser, usvsthem, gottlieb_state, romtiles, ROT0, "Mylstar", "Us vs. Them", 0 ) GAME( 1984, 3stooges, 0, gottlieb2, 3stooges, gottlieb_state, stooges, ROT0, "Mylstar", "The Three Stooges In Brides Is Brides (set 1)", 0 ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index b689e94997f..792041717fb 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -13216,6 +13216,8 @@ insector // GV-??? (c) 1982 Gottlieb - never released kngtmare // GV-??? (c) 1983 Gottlieb - never released krull // GV-105 (c) 1983 Gottlieb mach3 // GV-109 (c) 1983 Mylstar +mach3a // +mach3b // mplanets // GV-102 (c) 1983 Gottlieb mplanetsuk // GV-102 (c) 1983 Gottlieb myqbert // GV-103?(c) 1982 Gottlieb From fe9dfdbf991ead01d9ff63042532cc82440de7a5 Mon Sep 17 00:00:00 2001 From: ImJezze Date: Mon, 28 Mar 2016 20:19:01 +0200 Subject: [PATCH 33/74] Refactored Bloom - reduced raster bloom level to 8 - extended vector bloom level to 15 - changed vector bloom to be less blocky - removed bloom_lvl9_weight and bloom_lvl10_weight options --- docs/hlsl.txt | 6 +- hlsl/bloom.fx | 316 +++++++++++++++---------- ini/gameboy.ini | 6 +- ini/gba.ini | 6 +- ini/raster.ini | 6 +- ini/vector.ini | 18 +- src/osd/modules/render/d3d/d3dcomm.h | 12 +- src/osd/modules/render/d3d/d3dhlsl.cpp | 61 ++--- src/osd/modules/render/d3d/d3dhlsl.h | 2 - src/osd/modules/render/drawd3d.cpp | 8 +- src/osd/windows/winmain.cpp | 8 +- src/osd/windows/winmain.h | 4 - 12 files changed, 241 insertions(+), 212 deletions(-) diff --git a/docs/hlsl.txt b/docs/hlsl.txt index cbc2ecd6871..511ce4f1c9d 100644 --- a/docs/hlsl.txt +++ b/docs/hlsl.txt @@ -111,9 +111,7 @@ bloom_lvl1_weight 0.64 Bloom level 1 (1/2-size target) weight. bloom_lvl2_weight 0.32 Bloom level 2 (1/4-size target) weight. (0.00-1.00) bloom_lvl3_weight 0.16 Bloom level 3 (1/8-size target) weight. (0.00-1.00) bloom_lvl4_weight 0.08 Bloom level 4 (1/16-size target) weight. (0.00-1.00) -bloom_lvl5_weight 0.04 Bloom level 5 (1/32-size target) weight. (0.00-1.00) +bloom_lvl5_weight 0.06 Bloom level 5 (1/32-size target) weight. (0.00-1.00) bloom_lvl6_weight 0.04 Bloom level 6 (1/64-size target) weight. (0.00-1.00) bloom_lvl7_weight 0.02 Bloom level 7 (1/128-size target) weight. (0.00-1.00) -bloom_lvl8_weight 0.02 Bloom level 8 (1/256-size target) weight. (0.00-1.00) -bloom_lvl9_weight 0.01 Bloom level 9 (1/512-size target) weight. (0.00-1.00) -bloom_lvl10_weight 0.01 Bloom level 10 (1/1024-size target) weight. (0.00-1.00) +bloom_lvl8_weight 0.01 Bloom level 8 (1/256-size target) weight. (0.00-1.00) diff --git a/hlsl/bloom.fx b/hlsl/bloom.fx index c019870d685..5911e1ee8b5 100644 --- a/hlsl/bloom.fx +++ b/hlsl/bloom.fx @@ -8,21 +8,29 @@ // Sampler Definitions //----------------------------------------------------------------------------- -texture DiffuseA; -texture DiffuseB; -texture DiffuseC; -texture DiffuseD; -texture DiffuseE; -texture DiffuseF; -texture DiffuseG; -texture DiffuseH; -texture DiffuseI; -texture DiffuseJ; -texture DiffuseK; +texture DiffuseTexture; -sampler DiffuseSampler0 = sampler_state +texture BloomTextureA; +texture BloomTextureB; +texture BloomTextureC; +texture BloomTextureD; +texture BloomTextureE; +texture BloomTextureF; +texture BloomTextureG; +texture BloomTextureH; + +// vector screen uses twice -1 as many bloom levels +texture BloomTextureI; +texture BloomTextureJ; +texture BloomTextureK; +texture BloomTextureL; +texture BloomTextureM; +texture BloomTextureN; +texture BloomTextureO; + +sampler DiffuseSampler = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -31,9 +39,9 @@ sampler DiffuseSampler0 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler1 = sampler_state +sampler BloomSamplerA = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -42,9 +50,9 @@ sampler DiffuseSampler1 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler2 = sampler_state +sampler BloomSamplerB = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -53,9 +61,9 @@ sampler DiffuseSampler2 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler3 = sampler_state +sampler BloomSamplerC = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -64,9 +72,9 @@ sampler DiffuseSampler3 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler4 = sampler_state +sampler BloomSamplerD = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -75,9 +83,9 @@ sampler DiffuseSampler4 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler5 = sampler_state +sampler BloomSamplerE = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -86,9 +94,9 @@ sampler DiffuseSampler5 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler6 = sampler_state +sampler BloomSamplerF = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -97,9 +105,9 @@ sampler DiffuseSampler6 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler7 = sampler_state +sampler BloomSamplerG = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -108,9 +116,9 @@ sampler DiffuseSampler7 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler8 = sampler_state +sampler BloomSamplerH = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -119,9 +127,9 @@ sampler DiffuseSampler8 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSampler9 = sampler_state +sampler BloomSamplerI = sampler_state { - Texture = ; + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -130,9 +138,64 @@ sampler DiffuseSampler9 = sampler_state AddressW = CLAMP; }; -sampler DiffuseSamplerA = sampler_state +sampler BloomSamplerJ = sampler_state { - Texture = ; + Texture = ; + MipFilter = LINEAR; + MinFilter = LINEAR; + MagFilter = LINEAR; + AddressU = CLAMP; + AddressV = CLAMP; + AddressW = CLAMP; +}; + +sampler BloomSamplerK = sampler_state +{ + Texture = ; + MipFilter = LINEAR; + MinFilter = LINEAR; + MagFilter = LINEAR; + AddressU = CLAMP; + AddressV = CLAMP; + AddressW = CLAMP; +}; + +sampler BloomSamplerL = sampler_state +{ + Texture = ; + MipFilter = LINEAR; + MinFilter = LINEAR; + MagFilter = LINEAR; + AddressU = CLAMP; + AddressV = CLAMP; + AddressW = CLAMP; +}; + +sampler BloomSamplerM = sampler_state +{ + Texture = ; + MipFilter = LINEAR; + MinFilter = LINEAR; + MagFilter = LINEAR; + AddressU = CLAMP; + AddressV = CLAMP; + AddressW = CLAMP; +}; + +sampler BloomSamplerN = sampler_state +{ + Texture = ; + MipFilter = LINEAR; + MinFilter = LINEAR; + MagFilter = LINEAR; + AddressU = CLAMP; + AddressV = CLAMP; + AddressW = CLAMP; +}; + +sampler BloomSamplerO = sampler_state +{ + Texture = ; MipFilter = LINEAR; MinFilter = LINEAR; MagFilter = LINEAR; @@ -149,12 +212,8 @@ struct VS_OUTPUT { float4 Position : POSITION; float4 Color : COLOR0; - float2 TexCoord0 : TEXCOORD0; - float4 TexCoord12 : TEXCOORD1; - float4 TexCoord34 : TEXCOORD2; - float4 TexCoord56 : TEXCOORD3; - float4 TexCoord78 : TEXCOORD4; - float4 TexCoord9A : TEXCOORD5; + float2 TexCoord : TEXCOORD0; + float2 BloomCoord : TEXCOORD1; }; struct VS_INPUT @@ -167,12 +226,8 @@ struct VS_INPUT struct PS_INPUT { float4 Color : COLOR0; - float2 TexCoord0 : TEXCOORD0; - float4 TexCoord12 : TEXCOORD1; - float4 TexCoord34 : TEXCOORD2; - float4 TexCoord56 : TEXCOORD3; - float4 TexCoord78 : TEXCOORD4; - float4 TexCoord9A : TEXCOORD5; + float2 TexCoord : TEXCOORD0; + float2 BloomCoord : TEXCOORD1; }; //----------------------------------------------------------------------------- @@ -204,14 +259,6 @@ uniform float2 ScreenDims; uniform float2 TargetDims; uniform float2 SourceDims; -// level dimensions not necessary anymore? -uniform float2 Level0Size; -uniform float4 Level12Size; -uniform float4 Level34Size; -uniform float4 Level56Size; -uniform float4 Level78Size; -uniform float4 Level9ASize; - uniform bool VectorScreen = false; VS_OUTPUT vs_main(VS_INPUT Input) @@ -229,17 +276,13 @@ VS_OUTPUT vs_main(VS_INPUT Input) float2 TexCoord = Input.TexCoord; TexCoord += 0.5f / TargetDims; // half texel offset correction (DX9) - Output.TexCoord0 = TexCoord.xy; // + (0.5f / Level0Size); + Output.TexCoord = TexCoord.xy; TexCoord += VectorScreen ? 0.5f / TargetDims.xy : 0.5f / SourceDims.xy; - Output.TexCoord12 = TexCoord.xyxy; // + (0.5f / Level12Size); - Output.TexCoord34 = TexCoord.xyxy; // + (0.5f / Level34Size); - Output.TexCoord56 = TexCoord.xyxy; // + (0.5f / Level56Size); - Output.TexCoord78 = TexCoord.xyxy; // + (0.5f / Level78Size); - Output.TexCoord9A = TexCoord.xyxy; // + (0.5f / Level9ASize); + Output.BloomCoord = TexCoord.xy; return Output; } @@ -249,11 +292,14 @@ VS_OUTPUT vs_main(VS_INPUT Input) //----------------------------------------------------------------------------- uniform float Level0Weight; -uniform float2 Level12Weight; -uniform float2 Level34Weight; -uniform float2 Level56Weight; -uniform float2 Level78Weight; -uniform float2 Level9AWeight; +uniform float Level1Weight; +uniform float Level2Weight; +uniform float Level3Weight; +uniform float Level4Weight; +uniform float Level5Weight; +uniform float Level6Weight; +uniform float Level7Weight; +uniform float Level8Weight; uniform int BloomBlendMode = 0; // 0 brighten, 1 darken uniform float BloomScale; @@ -267,48 +313,80 @@ float3 GetNoiseFactor(float3 n, float random) float4 ps_main(PS_INPUT Input) : COLOR { - float3 texel0 = tex2D(DiffuseSampler0, Input.TexCoord0).rgb; - float3 texel1 = tex2D(DiffuseSampler1, Input.TexCoord12.xy).rgb; - float3 texel2 = tex2D(DiffuseSampler2, Input.TexCoord12.zw).rgb; - float3 texel3 = tex2D(DiffuseSampler3, Input.TexCoord34.xy).rgb; - float3 texel4 = tex2D(DiffuseSampler4, Input.TexCoord34.zw).rgb; - float3 texel5 = tex2D(DiffuseSampler5, Input.TexCoord56.xy).rgb; - float3 texel6 = tex2D(DiffuseSampler6, Input.TexCoord56.zw).rgb; - float3 texel7 = tex2D(DiffuseSampler7, Input.TexCoord78.xy).rgb; - float3 texel8 = tex2D(DiffuseSampler8, Input.TexCoord78.zw).rgb; - float3 texel9 = tex2D(DiffuseSampler9, Input.TexCoord9A.xy).rgb; - float3 texelA = tex2D(DiffuseSamplerA, Input.TexCoord9A.zw).rgb; + float3 texel = tex2D(DiffuseSampler, Input.TexCoord).rgb; + + float3 texelA = tex2D(BloomSamplerA, Input.BloomCoord.xy).rgb; + float3 texelB = tex2D(BloomSamplerB, Input.BloomCoord.xy).rgb; + float3 texelC = tex2D(BloomSamplerC, Input.BloomCoord.xy).rgb; + float3 texelD = tex2D(BloomSamplerD, Input.BloomCoord.xy).rgb; + float3 texelE = tex2D(BloomSamplerE, Input.BloomCoord.xy).rgb; + float3 texelF = tex2D(BloomSamplerF, Input.BloomCoord.xy).rgb; + float3 texelG = tex2D(BloomSamplerG, Input.BloomCoord.xy).rgb; + float3 texelH = tex2D(BloomSamplerH, Input.BloomCoord.xy).rgb; + + float3 texelI = float3(0.0f, 0.0f, 0.0f); + float3 texelJ = float3(0.0f, 0.0f, 0.0f); + float3 texelK = float3(0.0f, 0.0f, 0.0f); + float3 texelL = float3(0.0f, 0.0f, 0.0f); + float3 texelM = float3(0.0f, 0.0f, 0.0f); + float3 texelN = float3(0.0f, 0.0f, 0.0f); + float3 texelO = float3(0.0f, 0.0f, 0.0f); + + // vector screen uses twice -1 as many bloom levels + if (VectorScreen) + { + texelI = tex2D(BloomSamplerI, Input.BloomCoord.xy).rgb; + texelJ = tex2D(BloomSamplerJ, Input.BloomCoord.xy).rgb; + texelK = tex2D(BloomSamplerK, Input.BloomCoord.xy).rgb; + texelL = tex2D(BloomSamplerL, Input.BloomCoord.xy).rgb; + texelM = tex2D(BloomSamplerM, Input.BloomCoord.xy).rgb; + texelN = tex2D(BloomSamplerN, Input.BloomCoord.xy).rgb; + texelO = tex2D(BloomSamplerO, Input.BloomCoord.xy).rgb; + } float3 blend; // brighten if (BloomBlendMode == 0) { - texel0 *= Level0Weight; - texel1 *= Level12Weight.x; - texel2 *= Level12Weight.y; - texel3 *= Level34Weight.x; - texel4 *= Level34Weight.y; - texel5 *= Level56Weight.x; - texel6 *= Level56Weight.y; - texel7 *= Level78Weight.x; - texel8 *= Level78Weight.y; - texel9 *= Level9AWeight.x; - texelA *= Level9AWeight.y; + float3 bloom = float3(0.0f, 0.0f, 0.0f); - float3 bloom = float3( - texel1 + - texel2 + - texel3 + - texel4 + - texel5 + - texel6 + - texel7 + - texel8 + - texel9 + - texelA) * BloomScale; + texel *= Level0Weight; - float3 bloomOverdrive = max(0.0f, texel0 + bloom - 1.0f) * BloomOverdrive; + if (!VectorScreen) + { + bloom += texelA * Level1Weight; + bloom += texelB * Level2Weight; + bloom += texelC * Level3Weight; + bloom += texelD * Level4Weight; + bloom += texelE * Level5Weight; + bloom += texelF * Level6Weight; + bloom += texelG * Level7Weight; + bloom += texelH * Level8Weight; + } + // vector screen uses twice -1 as many bloom levels + else + { + bloom += texelA * (Level1Weight); + bloom += texelB * (Level1Weight + Level2Weight) * 0.5f; + bloom += texelC * (Level2Weight); + bloom += texelD * (Level2Weight + Level3Weight) * 0.5f; + bloom += texelE * (Level3Weight); + bloom += texelF * (Level3Weight + Level4Weight) * 0.5f; + bloom += texelG * (Level4Weight); + bloom += texelH * (Level4Weight + Level5Weight) * 0.5f; + bloom += texelI * (Level5Weight); + bloom += texelJ * (Level5Weight + Level6Weight) * 0.5f; + bloom += texelK * (Level6Weight); + bloom += texelL * (Level6Weight + Level7Weight) * 0.5f; + bloom += texelM * (Level7Weight); + bloom += texelN * (Level7Weight + Level8Weight) * 0.5f; + bloom += texelO * (Level8Weight); + } + + bloom *= BloomScale; + + float3 bloomOverdrive = max(0.0f, texel + bloom - 1.0f) * BloomOverdrive; bloom.r += bloomOverdrive.g * 0.5f; bloom.r += bloomOverdrive.b * 0.5f; @@ -317,37 +395,33 @@ float4 ps_main(PS_INPUT Input) : COLOR bloom.b += bloomOverdrive.r * 0.5f; bloom.b += bloomOverdrive.g * 0.5f; - float2 NoiseCoord = Input.TexCoord0; + float2 NoiseCoord = Input.TexCoord; float3 NoiseFactor = GetNoiseFactor(bloom, random(NoiseCoord)); - blend = texel0 + bloom * NoiseFactor; + blend = texel + bloom * NoiseFactor; } // darken else { - texel1 = min(texel0, texel1); - texel2 = min(texel0, texel2); - texel3 = min(texel0, texel3); - texel4 = min(texel0, texel4); - texel5 = min(texel0, texel5); - texel6 = min(texel0, texel6); - texel7 = min(texel0, texel7); - texel8 = min(texel0, texel8); - texel9 = min(texel0, texel9); - texelA = min(texel0, texelA); + texelA = min(texel, texelA); + texelB = min(texel, texelB); + texelC = min(texel, texelC); + texelD = min(texel, texelD); + texelE = min(texel, texelE); + texelF = min(texel, texelF); + texelG = min(texel, texelG); + texelH = min(texel, texelH); - blend = texel0 * Level0Weight; - blend = lerp(blend, texel1, Level12Weight.x * BloomScale); - blend = lerp(blend, texel2, Level12Weight.y * BloomScale); - blend = lerp(blend, texel3, Level34Weight.x * BloomScale); - blend = lerp(blend, texel4, Level34Weight.y * BloomScale); - blend = lerp(blend, texel5, Level56Weight.x * BloomScale); - blend = lerp(blend, texel6, Level56Weight.y * BloomScale); - blend = lerp(blend, texel7, Level78Weight.x * BloomScale); - blend = lerp(blend, texel8, Level78Weight.y * BloomScale); - blend = lerp(blend, texel9, Level9AWeight.x * BloomScale); - blend = lerp(blend, texelA, Level9AWeight.y * BloomScale); + blend = texel * Level0Weight; + blend = lerp(blend, texelA, Level1Weight * BloomScale); + blend = lerp(blend, texelB, Level2Weight * BloomScale); + blend = lerp(blend, texelC, Level3Weight * BloomScale); + blend = lerp(blend, texelD, Level4Weight * BloomScale); + blend = lerp(blend, texelE, Level5Weight * BloomScale); + blend = lerp(blend, texelF, Level6Weight * BloomScale); + blend = lerp(blend, texelG, Level7Weight * BloomScale); + blend = lerp(blend, texelH, Level8Weight * BloomScale); } return float4(blend, 1.0f); diff --git a/ini/gameboy.ini b/ini/gameboy.ini index d35ed5fe55d..763ce5b78d5 100644 --- a/ini/gameboy.ini +++ b/ini/gameboy.ini @@ -47,9 +47,7 @@ bloom_lvl1_weight 0.64 bloom_lvl2_weight 0.32 bloom_lvl3_weight 0.16 bloom_lvl4_weight 0.08 -bloom_lvl5_weight 0.04 +bloom_lvl5_weight 0.06 bloom_lvl6_weight 0.04 bloom_lvl7_weight 0.02 -bloom_lvl8_weight 0.02 -bloom_lvl9_weight 0.01 -bloom_lvl10_weight 0.01 +bloom_lvl8_weight 0.01 diff --git a/ini/gba.ini b/ini/gba.ini index 0b1bf100da9..0c8308fc072 100644 --- a/ini/gba.ini +++ b/ini/gba.ini @@ -47,9 +47,7 @@ bloom_lvl1_weight 0.64 bloom_lvl2_weight 0.32 bloom_lvl3_weight 0.16 bloom_lvl4_weight 0.08 -bloom_lvl5_weight 0.04 +bloom_lvl5_weight 0.06 bloom_lvl6_weight 0.04 bloom_lvl7_weight 0.02 -bloom_lvl8_weight 0.02 -bloom_lvl9_weight 0.01 -bloom_lvl10_weight 0.01 +bloom_lvl8_weight 0.01 diff --git a/ini/raster.ini b/ini/raster.ini index 03683cd5b35..7e589fe9cb2 100644 --- a/ini/raster.ini +++ b/ini/raster.ini @@ -53,9 +53,7 @@ bloom_lvl1_weight 0.64 bloom_lvl2_weight 0.32 bloom_lvl3_weight 0.16 bloom_lvl4_weight 0.08 -bloom_lvl5_weight 0.04 +bloom_lvl5_weight 0.06 bloom_lvl6_weight 0.04 bloom_lvl7_weight 0.02 -bloom_lvl8_weight 0.02 -bloom_lvl9_weight 0.01 -bloom_lvl10_weight 0.01 +bloom_lvl8_weight 0.01 diff --git a/ini/vector.ini b/ini/vector.ini index 8e7a98b64a9..1aeb22c5f86 100644 --- a/ini/vector.ini +++ b/ini/vector.ini @@ -56,16 +56,14 @@ vector_length_ratio 500.0 # BLOOM POST-PROCESSING OPTIONS # bloom_blend_mode 0 -bloom_scale 1.50 +bloom_scale 0.75 bloom_overdrive 1.00,1.00,1.00 bloom_lvl0_weight 1.00 -bloom_lvl1_weight 0.64 +bloom_lvl1_weight 0.48 bloom_lvl2_weight 0.32 -bloom_lvl3_weight 0.16 -bloom_lvl4_weight 0.24 -bloom_lvl5_weight 0.32 -bloom_lvl6_weight 0.48 -bloom_lvl7_weight 0.32 -bloom_lvl8_weight 0.24 -bloom_lvl9_weight 0.16 -bloom_lvl10_weight 0.08 +bloom_lvl3_weight 0.24 +bloom_lvl4_weight 0.16 +bloom_lvl5_weight 0.24 +bloom_lvl6_weight 0.32 +bloom_lvl7_weight 0.48 +bloom_lvl8_weight 0.64 diff --git a/src/osd/modules/render/d3d/d3dcomm.h b/src/osd/modules/render/d3d/d3dcomm.h index 51758bb70b6..3d84ea567a3 100644 --- a/src/osd/modules/render/d3d/d3dcomm.h +++ b/src/osd/modules/render/d3d/d3dcomm.h @@ -9,6 +9,12 @@ #ifndef __WIN_D3DCOMM__ #define __WIN_D3DCOMM__ +//============================================================ +// CONSTANTS +//============================================================ + +#define MAX_BLOOM_COUNT 15 // shader model 3.0 support up to 16 samplers, but we need the last for the original texture + //============================================================ // FORWARD DECLARATIONS //============================================================ @@ -292,10 +298,10 @@ public: d3d_render_target *next; d3d_render_target *prev; - surface *bloom_surface[11]; - texture *bloom_texture[11]; + surface *bloom_surface[MAX_BLOOM_COUNT]; + texture *bloom_texture[MAX_BLOOM_COUNT]; - float bloom_dims[11][2]; + float bloom_dims[MAX_BLOOM_COUNT][2]; int bloom_count; }; diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index 9d22e045b91..ca2c29078da 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -739,8 +739,6 @@ void shaders::init(d3d_base *d3dintf, running_machine *machine, renderer_d3d9 *r options->bloom_level6_weight = winoptions.screen_bloom_lvl6_weight(); options->bloom_level7_weight = winoptions.screen_bloom_lvl7_weight(); options->bloom_level8_weight = winoptions.screen_bloom_lvl8_weight(); - options->bloom_level9_weight = winoptions.screen_bloom_lvl9_weight(); - options->bloom_level10_weight = winoptions.screen_bloom_lvl10_weight(); options->params_init = true; } @@ -1460,59 +1458,34 @@ int shaders::bloom_pass(d3d_render_target *rt, int source_index, poly_info *poly return next_index; } - float weight12[2] = { - options->bloom_level1_weight, - options->bloom_level2_weight - }; - float weight34[2] = { - options->bloom_level3_weight, - options->bloom_level4_weight - }; - float weight56[2] = { - options->bloom_level5_weight, - options->bloom_level6_weight, - }; - float weight78[2] = { - options->bloom_level7_weight, - options->bloom_level8_weight - }; - float weight9A[2] = { - options->bloom_level9_weight, - options->bloom_level10_weight - }; - curr_effect = bloom_effect; curr_effect->update_uniforms(); - curr_effect->set_float ("Level0Weight", options->bloom_level0_weight); - curr_effect->set_vector("Level12Weight", 2, weight12); - curr_effect->set_vector("Level34Weight", 2, weight34); - curr_effect->set_vector("Level56Weight", 2, weight56); - curr_effect->set_vector("Level78Weight", 2, weight78); - curr_effect->set_vector("Level9AWeight", 2, weight9A); - - curr_effect->set_vector("Level0Size", 2, rt->bloom_dims[0]); - curr_effect->set_vector("Level12Size", 4, rt->bloom_dims[1]); - curr_effect->set_vector("Level34Size", 4, rt->bloom_dims[3]); - curr_effect->set_vector("Level56Size", 4, rt->bloom_dims[5]); - curr_effect->set_vector("Level78Size", 4, rt->bloom_dims[7]); - curr_effect->set_vector("Level9ASize", 4, rt->bloom_dims[9]); + curr_effect->set_float("Level0Weight", options->bloom_level0_weight); + curr_effect->set_float("Level1Weight", options->bloom_level1_weight); + curr_effect->set_float("Level2Weight", options->bloom_level2_weight); + curr_effect->set_float("Level3Weight", options->bloom_level3_weight); + curr_effect->set_float("Level4Weight", options->bloom_level4_weight); + curr_effect->set_float("Level5Weight", options->bloom_level5_weight); + curr_effect->set_float("Level6Weight", options->bloom_level6_weight); + curr_effect->set_float("Level7Weight", options->bloom_level7_weight); + curr_effect->set_float("Level8Weight", options->bloom_level8_weight); curr_effect->set_int("BloomBlendMode", options->bloom_blend_mode); curr_effect->set_float("BloomScale", options->bloom_scale); curr_effect->set_vector("BloomOverdrive", 3, options->bloom_overdrive); - curr_effect->set_texture("DiffuseA", rt->target_texture[next_index]); + curr_effect->set_texture("DiffuseTexture", rt->target_texture[next_index]); - char name[9] = "Diffuse*"; + char name[14] = "BloomTexture*"; for (int index = 1; index < rt->bloom_count; index++) { - name[7] = 'A' + index; + name[12] = 'A' + index - 1; curr_effect->set_texture(name, rt->bloom_texture[index - 1]); } - for (int index = rt->bloom_count; index < 11; index++) + for (int index = rt->bloom_count; index < MAX_BLOOM_COUNT; index++) { - name[7] = 'A' + index; + name[12] = 'A' + index - 1; curr_effect->set_texture(name, black_texture); } @@ -2315,8 +2288,6 @@ enum slider_option SLIDER_BLOOM_LVL6_SCALE, SLIDER_BLOOM_LVL7_SCALE, SLIDER_BLOOM_LVL8_SCALE, - SLIDER_BLOOM_LVL9_SCALE, - SLIDER_BLOOM_LVL10_SCALE, SLIDER_NTSC_ENABLE, SLIDER_NTSC_JITTER, SLIDER_NTSC_A_VALUE, @@ -2392,8 +2363,6 @@ slider_desc shaders::s_sliders[] = { "Bloom Level 6 Scale", 0, 0, 100, 1, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_ANY, SLIDER_BLOOM_LVL6_SCALE, 0.01f, "%1.2f", {} }, { "Bloom Level 7 Scale", 0, 0, 100, 1, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_ANY, SLIDER_BLOOM_LVL7_SCALE, 0.01f, "%1.2f", {} }, { "Bloom Level 8 Scale", 0, 0, 100, 1, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_ANY, SLIDER_BLOOM_LVL8_SCALE, 0.01f, "%1.2f", {} }, - { "Bloom Level 9 Scale", 0, 0, 100, 1, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_ANY, SLIDER_BLOOM_LVL9_SCALE, 0.01f, "%1.2f", {} }, - { "Bloom Level 10 Scale", 0, 0, 100, 1, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_ANY, SLIDER_BLOOM_LVL10_SCALE, 0.01f, "%1.2f", {} }, { "NTSC processing", 0, 0, 1, 1, SLIDER_INT_ENUM, SLIDER_SCREEN_TYPE_LCD_OR_RASTER, SLIDER_NTSC_ENABLE, 0, "%s", { "Off", "On" } }, { "Signal Jitter", 0, 0, 100, 1, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_LCD_OR_RASTER, SLIDER_NTSC_JITTER, 0.01f, "%1.2f", {} }, { "A Value", -100, 50, 100, 1, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_LCD_OR_RASTER, SLIDER_NTSC_A_VALUE, 0.01f, "%1.2f", {} }, @@ -2467,8 +2436,6 @@ void *shaders::get_slider_option(int id, int index) case SLIDER_BLOOM_LVL6_SCALE: return &(options->bloom_level6_weight); case SLIDER_BLOOM_LVL7_SCALE: return &(options->bloom_level7_weight); case SLIDER_BLOOM_LVL8_SCALE: return &(options->bloom_level8_weight); - case SLIDER_BLOOM_LVL9_SCALE: return &(options->bloom_level9_weight); - case SLIDER_BLOOM_LVL10_SCALE: return &(options->bloom_level10_weight); case SLIDER_NTSC_ENABLE: return &(options->yiq_enable); case SLIDER_NTSC_JITTER: return &(options->yiq_jitter); case SLIDER_NTSC_A_VALUE: return &(options->yiq_a); diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h index a4c9f13b9ed..af5db351efe 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.h +++ b/src/osd/modules/render/d3d/d3dhlsl.h @@ -260,8 +260,6 @@ struct hlsl_options float bloom_level6_weight; float bloom_level7_weight; float bloom_level8_weight; - float bloom_level9_weight; - float bloom_level10_weight; }; struct slider_desc diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index 4b8cc430640..708ed01cd6c 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -2795,7 +2795,7 @@ bool cache_target::init(renderer_d3d9 *d3d, d3d_base *d3dintf, int source_width, d3d_render_target::~d3d_render_target() { - for (int index = 0; index < 11; index++) + for (int index = 0; index < MAX_BLOOM_COUNT; index++) { if (bloom_texture[index] != nullptr) { @@ -2869,13 +2869,13 @@ bool d3d_render_target::init(renderer_d3d9 *d3d, d3d_base *d3dintf, int source_w bool vector_screen = d3d->window().machine().first_screen()->screen_type() == SCREEN_TYPE_VECTOR; - // larger blur width for vector screens than raster screens - float scale_factor = vector_screen ? 0.5f : 0.75f; + float scale_factor = 0.75f; + int scale_count = vector_screen ? MAX_BLOOM_COUNT : MAX_BLOOM_COUNT / 2; float bloom_width = (float)source_width; float bloom_height = (float)source_height; float bloom_size = bloom_width < bloom_height ? bloom_width : bloom_height; - for (int bloom_index = 0; bloom_index < 11 && bloom_size >= 2.0f; bloom_size *= scale_factor) + for (int bloom_index = 0; bloom_index < scale_count && bloom_size >= 2.0f; bloom_size *= scale_factor) { this->bloom_dims[bloom_index][0] = (int)bloom_width; this->bloom_dims[bloom_index][1] = (int)bloom_height; diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp index 0efb762a079..50c671ef24d 100644 --- a/src/osd/windows/winmain.cpp +++ b/src/osd/windows/winmain.cpp @@ -350,13 +350,11 @@ const options_entry windows_options::s_option_entries[] = { WINOPTION_BLOOM_LEVEL2_WEIGHT, "0.32", OPTION_FLOAT, "Bloom level 2 (1/4-size target) weight" }, { WINOPTION_BLOOM_LEVEL3_WEIGHT, "0.16", OPTION_FLOAT, "Bloom level 3 (1/8-size target) weight" }, { WINOPTION_BLOOM_LEVEL4_WEIGHT, "0.08", OPTION_FLOAT, "Bloom level 4 (1/16-size target) weight" }, - { WINOPTION_BLOOM_LEVEL5_WEIGHT, "0.04", OPTION_FLOAT, "Bloom level 5 (1/32-size target) weight" }, + { WINOPTION_BLOOM_LEVEL5_WEIGHT, "0.06", OPTION_FLOAT, "Bloom level 5 (1/32-size target) weight" }, { WINOPTION_BLOOM_LEVEL6_WEIGHT, "0.04", OPTION_FLOAT, "Bloom level 6 (1/64-size target) weight" }, { WINOPTION_BLOOM_LEVEL7_WEIGHT, "0.02", OPTION_FLOAT, "Bloom level 7 (1/128-size target) weight" }, - { WINOPTION_BLOOM_LEVEL8_WEIGHT, "0.02", OPTION_FLOAT, "Bloom level 8 (1/256-size target) weight" }, - { WINOPTION_BLOOM_LEVEL9_WEIGHT, "0.01", OPTION_FLOAT, "Bloom level 9 (1/512-size target) weight" }, - { WINOPTION_BLOOM_LEVEL10_WEIGHT, "0.01", OPTION_FLOAT, "Bloom level 10 (1/1024-size target) weight" }, - + { WINOPTION_BLOOM_LEVEL8_WEIGHT, "0.01", OPTION_FLOAT, "Bloom level 8 (1/256-size target) weight" }, + // full screen options { nullptr, nullptr, OPTION_HEADER, "FULL SCREEN OPTIONS" }, { WINOPTION_TRIPLEBUFFER ";tb", "0", OPTION_BOOLEAN, "enables triple buffering" }, diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h index dd348ee4491..fec09444446 100644 --- a/src/osd/windows/winmain.h +++ b/src/osd/windows/winmain.h @@ -96,8 +96,6 @@ #define WINOPTION_BLOOM_LEVEL6_WEIGHT "bloom_lvl6_weight" #define WINOPTION_BLOOM_LEVEL7_WEIGHT "bloom_lvl7_weight" #define WINOPTION_BLOOM_LEVEL8_WEIGHT "bloom_lvl8_weight" -#define WINOPTION_BLOOM_LEVEL9_WEIGHT "bloom_lvl9_weight" -#define WINOPTION_BLOOM_LEVEL10_WEIGHT "bloom_lvl10_weight" // full screen options #define WINOPTION_TRIPLEBUFFER "triplebuffer" @@ -191,8 +189,6 @@ public: float screen_bloom_lvl6_weight() const { return float_value(WINOPTION_BLOOM_LEVEL6_WEIGHT); } float screen_bloom_lvl7_weight() const { return float_value(WINOPTION_BLOOM_LEVEL7_WEIGHT); } float screen_bloom_lvl8_weight() const { return float_value(WINOPTION_BLOOM_LEVEL8_WEIGHT); } - float screen_bloom_lvl9_weight() const { return float_value(WINOPTION_BLOOM_LEVEL9_WEIGHT); } - float screen_bloom_lvl10_weight() const { return float_value(WINOPTION_BLOOM_LEVEL10_WEIGHT); } const char *screen_offset() const { return value(WINOPTION_OFFSET); } const char *screen_scale() const { return value(WINOPTION_SCALE); } const char *screen_power() const { return value(WINOPTION_POWER); } From 034ad510cd026f6f5c7c4330f32d403f9a16e7fc Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 20:37:33 +0100 Subject: [PATCH 34/74] add 'Pocket Challenge' lists based on Team Europe dumps. note, wasn't given any actual titles. V1 doesn't look wonderwan based to me, might be compatible with some other hw instead. --- hash/pockchalv1.xml | 22 ++++++ hash/pockchalv2.xml | 148 +++++++++++++++++++++++++++++++++++++ src/mame/drivers/wswan.cpp | 6 ++ 3 files changed, 176 insertions(+) create mode 100644 hash/pockchalv1.xml create mode 100644 hash/pockchalv2.xml diff --git a/hash/pockchalv1.xml b/hash/pockchalv1.xml new file mode 100644 index 00000000000..253559a10a3 --- /dev/null +++ b/hash/pockchalv1.xml @@ -0,0 +1,22 @@ + + + + + + + + unknown (0BE311) + 2000? + Benesse Corporation + + + + + + + + + + + + diff --git a/hash/pockchalv2.xml b/hash/pockchalv2.xml new file mode 100644 index 00000000000..0c1014d6af0 --- /dev/null +++ b/hash/pockchalv2.xml @@ -0,0 +1,148 @@ + + + + + + + + unknown (2BB113) + 2002 + Benesse Corporation + + + + + + + + + + + + unknown (2BD400) + 2002 + Benesse Corporation + + + + + + + + + + + + unknown (2BF400) + 2002 + Benesse Corporation + + + + + + + + + + + + unknown (2BG410) + 2002 + Benesse Corporation + + + + + + + + + + + + unknown (2BK401) + 2002 + Benesse Corporation + + + + + + + + + + + + unknown (2BM110) + 2002 + Benesse Corporation + + + + + + + + + + + + unknown (3BG410) + 2002 + Benesse Corporation + + + + + + + + + + + + unknown (4BD400) + 2004 + Benesse Corporation + + + + + + + + + + + + unknown (6FD400) + 2006 + Benesse Corporation + + + + + + + + + + + + unknown (6FF400) + 2006 + Benesse Corporation + + + + + + + + + + + + diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp index 8e064ec85f1..48b132a4d06 100644 --- a/src/mame/drivers/wswan.cpp +++ b/src/mame/drivers/wswan.cpp @@ -144,6 +144,10 @@ static MACHINE_CONFIG_START( wswan, wswan_state ) /* software lists */ MCFG_SOFTWARE_LIST_ADD("cart_list","wswan") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("wsc_list","wscolor") + + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc1_list","pockchalv1") + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc2_list","pockchalv2") + MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( wscolor, wswan ) @@ -163,6 +167,8 @@ static MACHINE_CONFIG_DERIVED( wscolor, wswan ) MCFG_DEVICE_REMOVE("wsc_list") MCFG_SOFTWARE_LIST_ADD("cart_list","wscolor") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("ws_list","wswan") + + MACHINE_CONFIG_END /*************************************************************************** From 19bbdaac3543c8c17893dc396f08c8ab4ea28fd2 Mon Sep 17 00:00:00 2001 From: ImJezze Date: Mon, 28 Mar 2016 21:58:17 +0200 Subject: [PATCH 35/74] Moved presets to subfolder (nw) - added lcd-matrix.ini and vector-mono.ini --- docs/hlsl.txt | 13 +++++++ ini/{ => presets}/gameboy.ini | 0 ini/{ => presets}/gba.ini | 0 ini/presets/lcd-matrix.ini | 53 ++++++++++++++++++++++++++++ ini/presets/lcd.ini | 53 ++++++++++++++++++++++++++++ ini/{ => presets}/raster.ini | 0 ini/presets/vector-mono.ini | 66 +++++++++++++++++++++++++++++++++++ ini/{ => presets}/vector.ini | 0 8 files changed, 185 insertions(+) rename ini/{ => presets}/gameboy.ini (100%) rename ini/{ => presets}/gba.ini (100%) create mode 100644 ini/presets/lcd-matrix.ini create mode 100644 ini/presets/lcd.ini rename ini/{ => presets}/raster.ini (100%) create mode 100644 ini/presets/vector-mono.ini rename ini/{ => presets}/vector.ini (100%) diff --git a/docs/hlsl.txt b/docs/hlsl.txt index 511ce4f1c9d..c2868c4200f 100644 --- a/docs/hlsl.txt +++ b/docs/hlsl.txt @@ -115,3 +115,16 @@ bloom_lvl5_weight 0.06 Bloom level 5 (1/32-size target) weight bloom_lvl6_weight 0.04 Bloom level 6 (1/64-size target) weight. (0.00-1.00) bloom_lvl7_weight 0.02 Bloom level 7 (1/128-size target) weight. (0.00-1.00) bloom_lvl8_weight 0.01 Bloom level 8 (1/256-size target) weight. (0.00-1.00) + + +Presets +------- +../ini/presets/raster.ini for raster screens +../ini/presets/vector.ini for color vector screens +../ini/presets/vector-mono.ini for monochrome vector screens (rename to vector.ini or .ini) +../ini/presets/lcd.ini for screens with TFT color LCD +../ini/presets/lcd-matrix.ini for screens with STN LCD matrix (rename to lcd.ini or .ini) +../ini/presets/gameboy.ini for Game Boy screen (same as lcd-matrix.ini with greenish color transformation) +../ini/presets/gba.ini for Game Boy Advance screen (same as lcd.ini) + +Copy them to ../ini/ to use. diff --git a/ini/gameboy.ini b/ini/presets/gameboy.ini similarity index 100% rename from ini/gameboy.ini rename to ini/presets/gameboy.ini diff --git a/ini/gba.ini b/ini/presets/gba.ini similarity index 100% rename from ini/gba.ini rename to ini/presets/gba.ini diff --git a/ini/presets/lcd-matrix.ini b/ini/presets/lcd-matrix.ini new file mode 100644 index 00000000000..f9de4013eca --- /dev/null +++ b/ini/presets/lcd-matrix.ini @@ -0,0 +1,53 @@ +# +# DIRECT3D POST-PROCESSING OPTIONS +# +shadow_mask_tile_mode 1 +shadow_mask_alpha 0.5 +shadow_mask_texture monochrome-matrix.png +shadow_mask_x_count 2 +shadow_mask_y_count 2 +shadow_mask_usize 0.5 +shadow_mask_vsize 0.5 +shadow_mask_uoffset 0.0 +shadow_mask_voffset 0.0 +curvature 0.0 +round_corner 0.0 +smooth_border 0.0 +reflection 0.0 +vignetting 0.0 +scanline_alpha 0.0 +defocus 0.5,0.5 +converge_x 0.0,0.0,0.0 +converge_y 0.0,0.0,0.0 +radial_converge_x 0.0,0.0,0.0 +radial_converge_y 0.0,0.0,0.0 +red_ratio 1.0,0.0,0.0 +grn_ratio 0.0,1.0,0.0 +blu_ratio 0.0,0.0,1.0 +saturation 1.0 +offset 0.0,0.0,0.0 +scale 1.0,1.0,1.0 +power 1.0,1.0,1.0 +floor 0.0,0.0,0.0 +phosphor_life 0.5,0.5,0.5 + +# +# NTSC POST-PROCESSING OPTIONS +# +yiq_enable 0 + +# +# BLOOM POST-PROCESSING OPTIONS +# +bloom_blend_mode 1 +bloom_scale 0.5 +bloom_overdrive 0.0,0.0,0.0 +bloom_lvl0_weight 1.0 +bloom_lvl1_weight 0.64 +bloom_lvl2_weight 0.32 +bloom_lvl3_weight 0.16 +bloom_lvl4_weight 0.08 +bloom_lvl5_weight 0.06 +bloom_lvl6_weight 0.04 +bloom_lvl7_weight 0.02 +bloom_lvl8_weight 0.01 diff --git a/ini/presets/lcd.ini b/ini/presets/lcd.ini new file mode 100644 index 00000000000..0c8308fc072 --- /dev/null +++ b/ini/presets/lcd.ini @@ -0,0 +1,53 @@ +# +# DIRECT3D POST-PROCESSING OPTIONS +# +shadow_mask_tile_mode 1 +shadow_mask_alpha 0.75 +shadow_mask_texture slot-mask-aligned.png +shadow_mask_x_count 2 +shadow_mask_y_count 2 +shadow_mask_usize 0.1875 +shadow_mask_vsize 0.1875 +shadow_mask_uoffset 0.0 +shadow_mask_voffset 0.0 +curvature 0.0 +round_corner 0.0 +smooth_border 0.0 +reflection 0.0 +vignetting 0.0 +scanline_alpha 0.0 +defocus 0.0,0.0 +converge_x 0.0,0.0,0.0 +converge_y 0.0,0.0,0.0 +radial_converge_x 0.0,0.0,0.0 +radial_converge_y 0.0,0.0,0.0 +red_ratio 1.0,0.0,0.0 +grn_ratio 0.0,1.0,0.0 +blu_ratio 0.0,0.0,1.0 +saturation 1.0 +offset 0.0,0.0,0.0 +scale 1.0,1.0,1.0 +power 1.0,1.0,1.0 +floor 0.0,0.0,0.0 +phosphor_life 0.5,0.5,0.5 + +# +# NTSC POST-PROCESSING OPTIONS +# +yiq_enable 0 + +# +# BLOOM POST-PROCESSING OPTIONS +# +bloom_blend_mode 0 +bloom_scale 0.25 +bloom_overdrive 0.0,0.0,0.0 +bloom_lvl0_weight 1.0 +bloom_lvl1_weight 0.64 +bloom_lvl2_weight 0.32 +bloom_lvl3_weight 0.16 +bloom_lvl4_weight 0.08 +bloom_lvl5_weight 0.06 +bloom_lvl6_weight 0.04 +bloom_lvl7_weight 0.02 +bloom_lvl8_weight 0.01 diff --git a/ini/raster.ini b/ini/presets/raster.ini similarity index 100% rename from ini/raster.ini rename to ini/presets/raster.ini diff --git a/ini/presets/vector-mono.ini b/ini/presets/vector-mono.ini new file mode 100644 index 00000000000..6a3db343cb3 --- /dev/null +++ b/ini/presets/vector-mono.ini @@ -0,0 +1,66 @@ +# +# CORE SCREEN OPTIONS +# +gamma 0.50 + +# +# CORE VECTOR OPTIONS +# +antialias 1 +beam_width_min 0.75 +beam_width_max 4.00 +beam_intensity_weight 0.75 +flicker 0.15 + +# +# DIRECT3D POST-PROCESSING OPTIONS +# +hlsl_oversampling 0 +shadow_mask_alpha 0.0 +curvature 0.0 +round_corner 0.0 +smooth_border 0.0 +reflection 0.0 +vignetting 0.0 +scanline_alpha 0.0 +defocus 0.0,0.0 +converge_x 0.0,0.0,0.0 +converge_y 0.0,0.0,0.0 +radial_converge_x 0.0,0.0,0.0 +radial_converge_y 0.0,0.0,0.0 +red_ratio 1.0,0.0,0.0 +grn_ratio 0.0,1.0,0.0 +blu_ratio 0.0,0.0,1.0 +saturation 1.0 +offset 0.0,0.0,0.0 +scale 1.0,1.0,1.0 +power 1.0,1.0,1.0 +floor 0.0,0.0,0.0 +phosphor_life 0.5,0.5,0.5 + +# +# NTSC POST-PROCESSING OPTIONS +# +yiq_enable 0 + +# +# VECTOR POST-PROCESSING OPTIONS +# +vector_length_scale 0.8 +vector_length_ratio 500.0 + +# +# BLOOM POST-PROCESSING OPTIONS +# +bloom_blend_mode 0 +bloom_scale 0.75 +bloom_overdrive 1.00,1.00,1.00 +bloom_lvl0_weight 1.00 +bloom_lvl1_weight 0.48 +bloom_lvl2_weight 0.32 +bloom_lvl3_weight 0.24 +bloom_lvl4_weight 0.16 +bloom_lvl5_weight 0.24 +bloom_lvl6_weight 0.32 +bloom_lvl7_weight 0.48 +bloom_lvl8_weight 0.64 diff --git a/ini/vector.ini b/ini/presets/vector.ini similarity index 100% rename from ini/vector.ini rename to ini/presets/vector.ini From 68ebc2b0e5b454c848f5343f16afacca8135674b Mon Sep 17 00:00:00 2001 From: dankan1890 Date: Mon, 28 Mar 2016 22:57:35 +0200 Subject: [PATCH 36/74] Visual Studio compile fix. (nw) --- scripts/src/netlist.lua | 3 ++- src/emu/rendutil.cpp | 9 +++------ src/lib/netlist/solver/nld_ms_sm.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 29bc8f0a7bb..917a450d511 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -73,7 +73,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h", MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp", MAME_DIR .. "src/lib/netlist/solver/nld_solver.h", - MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h", + MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct2.h", @@ -81,6 +81,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor_mat.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_gmres.h", MAME_DIR .. "src/lib/netlist/solver/mat_cr.h", + MAME_DIR .. "src/lib/netlist/solver/nld_ms_sm.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h", MAME_DIR .. "src/lib/netlist/solver/vector_base.h", MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp", diff --git a/src/emu/rendutil.cpp b/src/emu/rendutil.cpp index eed35713a92..fefb23935fd 100644 --- a/src/emu/rendutil.cpp +++ b/src/emu/rendutil.cpp @@ -541,9 +541,7 @@ void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname else fname.assign(dirname).append(PATH_SEPARATOR).append(filename); - osd_file::error filerr = file.open(fname.c_str()); - - if (filerr != osd_file::error::NONE) + if (file.open(fname.c_str()) != osd_file::error::NONE) return; // define standard JPEG structures @@ -553,8 +551,8 @@ void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname jpeg_create_decompress(&cinfo); // allocates a buffer for the image - UINT64 jpg_size = file.size(); - unsigned char *jpg_buffer = global_alloc_array(unsigned char, jpg_size + 100); + UINT32 jpg_size = file.size(); + unsigned char *jpg_buffer = global_alloc_array(unsigned char, jpg_size); // read data from the file and set them in the buffer file.read(jpg_buffer, jpg_size); @@ -587,7 +585,6 @@ void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname else if (s == 3) for (int i = 0; i < w; ++i) bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i * s], buffer[0][i * s + 1], buffer[0][i * s + 2]); - else { osd_printf_error("Cannot read JPEG data from %s file.\n", fname.c_str()); diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index 31ecc55ebd9..bf98ecc32a4 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -548,7 +548,7 @@ int matrix_solver_sm_t::solve_non_dynamic(ATTR_UNUSED const boo { const auto iN = N(); - if (not incremental) + if (!incremental) { for (int row = 0; row < iN; row ++) for (int k = 0; k < iN; k++) From c0b118271258cae30a9eaff517e91c1d8c96231e Mon Sep 17 00:00:00 2001 From: "therealmogminer@gmail.com" Date: Mon, 28 Mar 2016 22:58:16 +0200 Subject: [PATCH 37/74] Final bgfx fixups for release --- bgfx/chains/default.json | 4 +- bgfx/chains/hlsl.json | 62 ++++----- bgfx/chains/unfiltered.json | 4 +- bgfx/effects/default/LICENSE | 27 ++++ bgfx/effects/default/README.md | 5 + bgfx/effects/{ => default}/blit.json | 0 bgfx/effects/hlsl/LICENSE | 27 ++++ bgfx/effects/hlsl/README.md | 5 + bgfx/effects/hlsl/blit.json | 121 ++++++++++++++++++ bgfx/effects/{ => hlsl}/color.json | 0 bgfx/effects/{ => hlsl}/deconverge.json | 0 bgfx/effects/{ => hlsl}/defocus.json | 0 bgfx/effects/{ => hlsl}/distortion.json | 0 bgfx/effects/{ => hlsl}/ntsc_decode.json | 0 bgfx/effects/{ => hlsl}/ntsc_encode.json | 0 bgfx/effects/{ => hlsl}/phosphor.json | 0 bgfx/effects/{ => hlsl}/post.json | 11 +- bgfx/effects/{ => hlsl}/prescale.json | 0 bgfx/effects/unfiltered/LICENSE | 27 ++++ bgfx/effects/unfiltered/README.md | 5 + bgfx/effects/unfiltered/blit.json | 121 ++++++++++++++++++ bgfx/shaders/dx11/fs_blit.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/fs_color.bin | Bin 45305 -> 45305 bytes bgfx/shaders/dx11/fs_deconverge.bin | Bin 43108 -> 43108 bytes bgfx/shaders/dx11/fs_defocus.bin | Bin 49898 -> 49898 bytes bgfx/shaders/dx11/fs_distortion.bin | Bin 60482 -> 60482 bytes bgfx/shaders/dx11/fs_gui.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/fs_ntsc_decode.bin | Bin 60967 -> 60967 bytes bgfx/shaders/dx11/fs_ntsc_encode.bin | Bin 50379 -> 50379 bytes bgfx/shaders/dx11/fs_phosphor.bin | Bin 45190 -> 45190 bytes bgfx/shaders/dx11/fs_post.bin | Bin 58147 -> 57706 bytes bgfx/shaders/dx11/fs_prescale.bin | Bin 45438 -> 45438 bytes bgfx/shaders/dx11/fs_screen.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/vs_blit.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_color.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_deconverge.bin | Bin 45836 -> 45836 bytes bgfx/shaders/dx11/vs_defocus.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_distortion.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_gui.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_ntsc_decode.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_ntsc_encode.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_phosphor.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_post.bin | Bin 43264 -> 43223 bytes bgfx/shaders/dx11/vs_prescale.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_screen.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx9/fs_post.bin | Bin 5228 -> 4835 bytes bgfx/shaders/dx9/vs_post.bin | Bin 1171 -> 1142 bytes bgfx/shaders/gles/fs_post.bin | Bin 4212 -> 3805 bytes bgfx/shaders/gles/vs_post.bin | Bin 750 -> 629 bytes bgfx/shaders/glsl/fs_post.bin | Bin 4012 -> 3603 bytes bgfx/shaders/glsl/vs_post.bin | Bin 684 -> 569 bytes bgfx/shaders/metal/fs_post.bin | Bin 4823 -> 4384 bytes bgfx/shaders/metal/vs_post.bin | Bin 1048 -> 925 bytes src/osd/modules/lib/osdobj_common.cpp | 2 +- .../modules/render/bgfx/shaders/fs_post.sc | 118 +++++++++-------- .../modules/render/bgfx/shaders/vs_post.sc | 8 +- 56 files changed, 446 insertions(+), 101 deletions(-) create mode 100644 bgfx/effects/default/LICENSE create mode 100644 bgfx/effects/default/README.md rename bgfx/effects/{ => default}/blit.json (100%) create mode 100644 bgfx/effects/hlsl/LICENSE create mode 100644 bgfx/effects/hlsl/README.md create mode 100644 bgfx/effects/hlsl/blit.json rename bgfx/effects/{ => hlsl}/color.json (100%) rename bgfx/effects/{ => hlsl}/deconverge.json (100%) rename bgfx/effects/{ => hlsl}/defocus.json (100%) rename bgfx/effects/{ => hlsl}/distortion.json (100%) rename bgfx/effects/{ => hlsl}/ntsc_decode.json (100%) rename bgfx/effects/{ => hlsl}/ntsc_encode.json (100%) rename bgfx/effects/{ => hlsl}/phosphor.json (100%) rename bgfx/effects/{ => hlsl}/post.json (83%) rename bgfx/effects/{ => hlsl}/prescale.json (100%) create mode 100644 bgfx/effects/unfiltered/LICENSE create mode 100644 bgfx/effects/unfiltered/README.md create mode 100644 bgfx/effects/unfiltered/blit.json diff --git a/bgfx/chains/default.json b/bgfx/chains/default.json index 9888b590727..1142275e528 100644 --- a/bgfx/chains/default.json +++ b/bgfx/chains/default.json @@ -7,14 +7,14 @@ } ], "passes": [ - { "effect": "blit", + { "effect": "default\blit", "name": "Copy To Unstretched Texture", "input": [ { "sampler": "s_tex", "texture": "screen" } ], "output": "temp" }, - { "effect": "blit", + { "effect": "default\blit", "name": "Final Upscale", "input": [ { "sampler": "s_tex", "target": "temp" } diff --git a/bgfx/chains/hlsl.json b/bgfx/chains/hlsl.json index 17757bb8c38..3353f92018a 100644 --- a/bgfx/chains/hlsl.json +++ b/bgfx/chains/hlsl.json @@ -88,27 +88,27 @@ { "type": "color", "name": "phosphor", "text": "Phosphor Persistence, ", "default": [ 55, 55, 55 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_alpha", "text": "Scanline Amount", "default": 0, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_scale", "text": "Overall Scanline Scale", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_bright_scale", "text": "Scanline Brightness Scale", "default": 200, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_bright_offset", "text": "Scanline Brightness Offset", "default": 0, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_jitter_amount", "text": "Scanline Jitter Amount", "default": 0, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_height", "text": "Individual Scanline Scale", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_variation", "text": "Scanline Variation", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "shadow_alpha", "text": "Shadow Mask Amount", "default": 0, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "vec2", "name": "shadow_uv_size", "text": "Shadow Mask UV Size ", "default": [ 250, 333 ], "max": [ 1000, 1000 ], "min": [ 0, 0 ], "step": 1, "scale": 0.001, "format": "%1.4f", "screen": "crt" }, - { "type": "vec2", "name": "shadow_uv_offset", "text": "Shadow Mask UV Offset ", "default": [ 0, 0 ], "max": [ 1000, 1000 ], "min": [ 0, 0 ], "step": 1, "scale": 0.001, "format": "%1.4f", "screen": "crt" }, - { "type": "intenum", "name": "shadow_tile_mode", "text": "Shadow Mask Tile Mode", "default": 0, "max": 1, "min": 0, "step": 1, "scale": 1.0, "format": "%s", "screen": "crt", "strings": [ "Screen", "Source" ] }, - { "type": "float", "name": "humbar_alpha", "text": "Hum Bar Amount", "default": 5, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "humbar_hertz_rate", "text": "Hum Bar Frequency", "default": 100, "max": 10000, "min": 0, "step": 1, "scale": 0.00001, "format": "%1.7f", "screen": "crt" }, - { "type": "color", "name": "floor", "text": "Signal Floor, ", "default": [ 5, 5, 5 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "color", "name": "power", "text": "Signal Exponent, ", "default": [ 100, 100, 100 ], "max": [ 400, 400, 400 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_alpha", "text": "Scanline Amount", "default": 40, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_scale", "text": "Overall Scanline Scale", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_bright_scale", "text": "Scanline Brightness Scale", "default": 200, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_bright_offset", "text": "Scanline Brightness Offset", "default": 0, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_jitter_amount", "text": "Scanline Jitter Amount", "default": 0, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_height", "text": "Individual Scanline Scale", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_variation", "text": "Scanline Variation", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "shadow_alpha", "text": "Shadow Mask Amount", "default": 20, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "vec2", "name": "shadow_uv_count", "text": "Shadow Mask Pixel Count ", "default": [ 12, 12 ], "max": [ 128, 128 ], "min": [ 1, 1 ], "step": 1, "scale": 1.0, "format": "%3f", "screen": "crt" }, + { "type": "vec2", "name": "shadow_uv_size", "text": "Shadow Mask UV Size ", "default": [ 500, 500 ], "max": [ 1000, 1000 ], "min": [ 0, 0 ], "step": 1, "scale": 0.001, "format": "%1.4f", "screen": "crt" }, + { "type": "vec2", "name": "shadow_uv_offset", "text": "Shadow Mask UV Offset ", "default": [ 0, 0 ], "max": [ 1000, 1000 ], "min": [ 0, 0 ], "step": 1, "scale": 0.001, "format": "%1.4f", "screen": "crt" }, + { "type": "float", "name": "humbar_alpha", "text": "Hum Bar Amount", "default": 0, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "humbar_hertz_rate", "text": "Hum Bar Frequency", "default": 100, "max": 10000, "min": 0, "step": 1, "scale": 0.00001, "format": "%1.7f", "screen": "crt" }, + { "type": "color", "name": "floor", "text": "Signal Floor, ", "default": [ 5, 5, 5 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "color", "name": "power", "text": "Signal Exponent, ", "default": [ 80, 80, 80 ], "max": [ 400, 400, 400 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "curvature", "text": "Screen Curvature Amount", "default": 25, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "curvature", "text": "Screen Curvature Amount", "default": 20, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "round_corner", "text": "Rounded Corner Amount", "default": 15, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "smooth_border", "text": "Smooth Border Amount", "default": 5, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "vignetting", "text": "Vignetting Amount", "default": 20, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "reflection", "text": "Reflection Amount", "default": 25, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" } + { "type": "float", "name": "reflection", "text": "Reflection Amount", "default": 15, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" } ], // parameters (optional): A list of procedurally-generated parameters that can be bound to entry uniforms. @@ -172,7 +172,7 @@ { // effect (required): The name of the effect JSON file to load for this pass. // value: Any valid JSON filename included in your shader chain, without the extension. - "effect": "ntsc_encode", + "effect": "hlsl/ntsc_encode", // name (required): A verbal name for the effect. It is only used internally, but is required nonetheless. // value: Any valid ASCII string. @@ -254,7 +254,7 @@ // value: Any valid ASCII string that names a target. "output": "guest" }, - { "effect": "ntsc_decode", + { "effect": "hlsl/ntsc_decode", "name": "NTSC Decode", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, @@ -278,7 +278,7 @@ ], "output": "guest" }, - { "effect": "blit", + { "effect": "hlsl/blit", "name": "NTSC Skip", "disablewhen": [ { "type": "slider", "condition": "notequal", "combine": "and", "name": "adjustments", "value": 0 }, @@ -289,7 +289,7 @@ ], "output": "guest" }, - { "effect": "color", + { "effect": "hlsl/color", "name": "Color Convolution", "disablewhen": [ { "type": "slider", "condition": "equal", "name": "adjustments", "value": 0 } @@ -307,14 +307,14 @@ ], "output": "guest" }, - { "effect": "prescale", + { "effect": "hlsl/prescale", "name": "Prescale", "input": [ { "sampler": "s_tex", "target": "guest" } ], "output": "internal" }, - { "effect": "deconverge", + { "effect": "hlsl/deconverge", "name": "Deconvergence", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, @@ -338,7 +338,7 @@ ], "output": "internal" }, - { "effect": "defocus", + { "effect": "hlsl/defocus", "name": "Defocus Pass 1", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, @@ -352,7 +352,7 @@ ], "output": "internal" }, - { "effect": "defocus", + { "effect": "hlsl/defocus", "name": "Defocus Pass 2", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, @@ -366,7 +366,7 @@ ], "output": "internal" }, - { "effect": "phosphor", + { "effect": "hlsl/phosphor", "name": "Phosphor Decay", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, @@ -382,7 +382,7 @@ ], "output": "internal" }, - { "effect": "phosphor", + { "effect": "hlsl/phosphor", "name": "Phosphor Store", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, @@ -398,7 +398,7 @@ ], "output": "previous" }, - { "effect": "post", + { "effect": "hlsl/post", "name": "Non-Bloom Post Pass", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, @@ -416,9 +416,9 @@ { "uniform": "u_scanline_height", "slider": "scanline_height" }, { "uniform": "u_scanline_variation", "slider": "scanline_variation" }, { "uniform": "u_shadow_alpha", "slider": "shadow_alpha" }, + { "uniform": "u_shadow_count", "slider": "shadow_uv_count" }, { "uniform": "u_shadow_uv", "slider": "shadow_uv_size" }, { "uniform": "u_shadow_uv_offset", "slider": "shadow_uv_offset" }, - { "uniform": "u_shadow_tile_mode", "slider": "shadow_tile_mode" }, { "uniform": "u_humbar_alpha", "slider": "humbar_alpha" }, { "uniform": "u_humbar_hertz_rate", "slider": "humbar_hertz_rate" }, { "uniform": "u_floor", "slider": "floor" }, @@ -433,7 +433,7 @@ ], "output": "internal" }, - { "effect": "distortion", + { "effect": "hlsl/distortion", "name": "Distortion Pass", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, @@ -455,7 +455,7 @@ ], "output": "internal" }, - { "effect": "blit", + { "effect": "hlsl/blit", "name": "Final Blit", "input": [ { "sampler": "s_tex", "target": "internal" } diff --git a/bgfx/chains/unfiltered.json b/bgfx/chains/unfiltered.json index ac9556a1a41..19d74cd5eec 100644 --- a/bgfx/chains/unfiltered.json +++ b/bgfx/chains/unfiltered.json @@ -7,14 +7,14 @@ } ], "passes": [ - { "effect": "blit", + { "effect": "unfiltered\blit", "name": "Copy To Unstretched Texture", "input": [ { "sampler": "s_tex", "texture": "screen" } ], "output": "temp" }, - { "effect": "blit", + { "effect": "unfiltered\blit", "name": "Final Upscale", "input": [ { "sampler": "s_tex", "target": "temp" } diff --git a/bgfx/effects/default/LICENSE b/bgfx/effects/default/LICENSE new file mode 100644 index 00000000000..e1a4f1f53d6 --- /dev/null +++ b/bgfx/effects/default/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2016, Ryan Holtz and MAME Development Team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of bsd3 nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/bgfx/effects/default/README.md b/bgfx/effects/default/README.md new file mode 100644 index 00000000000..72aad88f861 --- /dev/null +++ b/bgfx/effects/default/README.md @@ -0,0 +1,5 @@ +# **BGFX shader effects** # + +Cointains definitions for BGFX shader effects + +Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) by Ryan Holtz and MAME Development Team diff --git a/bgfx/effects/blit.json b/bgfx/effects/default/blit.json similarity index 100% rename from bgfx/effects/blit.json rename to bgfx/effects/default/blit.json diff --git a/bgfx/effects/hlsl/LICENSE b/bgfx/effects/hlsl/LICENSE new file mode 100644 index 00000000000..e1a4f1f53d6 --- /dev/null +++ b/bgfx/effects/hlsl/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2016, Ryan Holtz and MAME Development Team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of bsd3 nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/bgfx/effects/hlsl/README.md b/bgfx/effects/hlsl/README.md new file mode 100644 index 00000000000..72aad88f861 --- /dev/null +++ b/bgfx/effects/hlsl/README.md @@ -0,0 +1,5 @@ +# **BGFX shader effects** # + +Cointains definitions for BGFX shader effects + +Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) by Ryan Holtz and MAME Development Team diff --git a/bgfx/effects/hlsl/blit.json b/bgfx/effects/hlsl/blit.json new file mode 100644 index 00000000000..bbc9fd295d4 --- /dev/null +++ b/bgfx/effects/hlsl/blit.json @@ -0,0 +1,121 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz +//============================================================ +// +// blit.json: A simple texture-to-target copy. +// +//============================================================ +{ + // blend (required): The blend state for this effect. + "blend": { + // equation (optional): What equation to perform on the source and destination blend values. + // values: "add", "sub", "revSub", "min", "max" + // default: "add" + // + // "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub" + "equation": "add", + + // blend function parameters (optional): What factors to use in the blend function when calculating the final pixel. + // values: "0", "1", "srcColor", "1-srcColor", "dstColor", "1-dstColor", "srcAlpha", "1-srcAlpha", "dstAlpha", "1-dstAlpha" + // defaults (srcColor, srcAlpha): "1" + // defaults (dstColor, dstAlpha): "0" + // + // "zero", "one", "invSrcColor", "invDstColor", "invSrcAlpha", and "invDstAlpha" are provided as aliases for "0", "1", "1-srcColor", "1-dstColor", "1-srcAlpha", and "1-dstAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" + }, + + // depth (required): The depth state for this effect. + "depth": { + // function (optional): The depth function to use when drawing. + // values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always" + // default: "always" + "function": "always", + + // writeenable (optional): Whether to store Z-buffer data. + // values: true, false + // default: false + "writeenable": false + }, + + // cull (required): The cull mode for this effect. + "cull": { + // mode (optional): What winding, if any, to cull. + // values: "none", "cw", "ccw" + // default: "ccw" + // + // "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw" + "mode": "none" + }, + + // write (required): Write enable for color and alpha channels. + "write": { + // rgb (optional): Whether to store color data when drawing. + // values: true, false + // default: false + "rgb": true, + + // alpha (optional): Whether to store alpha data when drawing. + // values: true, false + // default: false + "alpha": true + }, + + // vertex (required): The vertex shader to use when drawing. + // value: A string containing the name of a shader file to use, minus the extension. + "vertex": "vs_blit", + + // pixel/fragment (required): The pixel or fragment shader to use when drawing. + // value: A string containing the name of a shader file to use, minus the extension. + "fragment": "fs_blit", + + // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist. + "uniforms": [ + { + // name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader. + // value: A string containing the name of the uniform as described above. + // + // NOTE: Some names correspond to special values that will be automatically filled by the BGFX + // code if they are used by the shader. These names are: + // "u_screen_dims" + // The dimensions of the first texture input if present, otherwise the dimensions of the output window. + // Valid values: xy + // "u_inv_screen_dims" + // The reciprocal of u_screen_dims. + // Valid values: xy + // "u_source_dims" + // The size, in pixels, of the screen texture incoming to the chain. + // Valid values: xy + // "u_rotation_type" + // This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270. + // Valid values: x + // "u_swap_xy" + // Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false. + // Valid values: x + // "u_quad_dims" + // The dimensions, in pixels, occupied by this one screen primitive itself in the output window. + // Valid values: xy + // "u_tex_sizeN" + // The dimensions, in pixels, of the texture in input pair N. Starts at 0. + // valid values: xy + "name": "s_tex", + + // type (required): The type of the uniform. + // values: "int", "vec4", "mat3", "mat4" + // + // Note: "int" should only be used for samplers. + "type": "int", + + // values (required): The array of numbers with which to initialize the uniform. + // value: A JSON array containin the correct amount of numbers to initialize a uniform of the + // above-specified type. The following size rules should be followed: + // "int": 1 float + // "vec4": 4 floats + // "mat3": 9 floats + // "mat4": 16 floats + "values": [ 1.0 ] + } + ] +} \ No newline at end of file diff --git a/bgfx/effects/color.json b/bgfx/effects/hlsl/color.json similarity index 100% rename from bgfx/effects/color.json rename to bgfx/effects/hlsl/color.json diff --git a/bgfx/effects/deconverge.json b/bgfx/effects/hlsl/deconverge.json similarity index 100% rename from bgfx/effects/deconverge.json rename to bgfx/effects/hlsl/deconverge.json diff --git a/bgfx/effects/defocus.json b/bgfx/effects/hlsl/defocus.json similarity index 100% rename from bgfx/effects/defocus.json rename to bgfx/effects/hlsl/defocus.json diff --git a/bgfx/effects/distortion.json b/bgfx/effects/hlsl/distortion.json similarity index 100% rename from bgfx/effects/distortion.json rename to bgfx/effects/hlsl/distortion.json diff --git a/bgfx/effects/ntsc_decode.json b/bgfx/effects/hlsl/ntsc_decode.json similarity index 100% rename from bgfx/effects/ntsc_decode.json rename to bgfx/effects/hlsl/ntsc_decode.json diff --git a/bgfx/effects/ntsc_encode.json b/bgfx/effects/hlsl/ntsc_encode.json similarity index 100% rename from bgfx/effects/ntsc_encode.json rename to bgfx/effects/hlsl/ntsc_encode.json diff --git a/bgfx/effects/phosphor.json b/bgfx/effects/hlsl/phosphor.json similarity index 100% rename from bgfx/effects/phosphor.json rename to bgfx/effects/hlsl/phosphor.json diff --git a/bgfx/effects/post.json b/bgfx/effects/hlsl/post.json similarity index 83% rename from bgfx/effects/post.json rename to bgfx/effects/hlsl/post.json index 525bbfc39b8..c4a86da84e5 100644 --- a/bgfx/effects/post.json +++ b/bgfx/effects/hlsl/post.json @@ -28,11 +28,8 @@ { "name": "s_tex", "type": "int", "values": [ 0.0 ] }, { "name": "s_shadow", "type": "int", "values": [ 1.0 ] }, { "name": "u_swap_xy", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, - { "name": "u_screen_dims", "type": "vec4", "values": [ 1336.0, 1002.0, 0.0, 0.0 ] }, { "name": "u_source_dims", "type": "vec4", "values": [ 256.0, 256.0, 0.0, 0.0 ] }, - { "name": "u_shadow_uv_offset", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, - { "name": "u_prepare_bloom", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, - { "name": "u_prepare_vector", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, + { "name": "u_quad_dims", "type": "vec4", "values": [ 256.0, 256.0, 0.0, 0.0 ] }, { "name": "u_humbar_hertz_rate", "type": "vec4", "values": [ 0.001, 0.0, 0.0, 0.0 ] }, { "name": "u_humbar_alpha", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, { "name": "u_time", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, @@ -46,10 +43,10 @@ { "name": "u_scanline_height", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }, { "name": "u_scanline_variation", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }, { "name": "u_jitter_amount", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, - { "name": "u_back_color", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, - { "name": "u_shadow_tile_mode", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, { "name": "u_shadow_alpha", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, - { "name": "u_shadow_uv", "type": "vec4", "values": [ 0.25, 0.333, 0.0, 0.0 ] }, + { "name": "u_shadow_count", "type": "vec4", "values": [ 12.0, 12.0, 0.0, 0.0 ] }, + { "name": "u_shadow_uv", "type": "vec4", "values": [ 0.25, 0.25, 0.0, 0.0 ] }, + { "name": "u_shadow_uv_offset", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, { "name": "u_power", "type": "vec4", "values": [ 1.0, 1.0, 1.0, 0.0 ] }, { "name": "u_floor", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] } ] diff --git a/bgfx/effects/prescale.json b/bgfx/effects/hlsl/prescale.json similarity index 100% rename from bgfx/effects/prescale.json rename to bgfx/effects/hlsl/prescale.json diff --git a/bgfx/effects/unfiltered/LICENSE b/bgfx/effects/unfiltered/LICENSE new file mode 100644 index 00000000000..e1a4f1f53d6 --- /dev/null +++ b/bgfx/effects/unfiltered/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2016, Ryan Holtz and MAME Development Team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of bsd3 nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/bgfx/effects/unfiltered/README.md b/bgfx/effects/unfiltered/README.md new file mode 100644 index 00000000000..72aad88f861 --- /dev/null +++ b/bgfx/effects/unfiltered/README.md @@ -0,0 +1,5 @@ +# **BGFX shader effects** # + +Cointains definitions for BGFX shader effects + +Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) by Ryan Holtz and MAME Development Team diff --git a/bgfx/effects/unfiltered/blit.json b/bgfx/effects/unfiltered/blit.json new file mode 100644 index 00000000000..bbc9fd295d4 --- /dev/null +++ b/bgfx/effects/unfiltered/blit.json @@ -0,0 +1,121 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz +//============================================================ +// +// blit.json: A simple texture-to-target copy. +// +//============================================================ +{ + // blend (required): The blend state for this effect. + "blend": { + // equation (optional): What equation to perform on the source and destination blend values. + // values: "add", "sub", "revSub", "min", "max" + // default: "add" + // + // "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub" + "equation": "add", + + // blend function parameters (optional): What factors to use in the blend function when calculating the final pixel. + // values: "0", "1", "srcColor", "1-srcColor", "dstColor", "1-dstColor", "srcAlpha", "1-srcAlpha", "dstAlpha", "1-dstAlpha" + // defaults (srcColor, srcAlpha): "1" + // defaults (dstColor, dstAlpha): "0" + // + // "zero", "one", "invSrcColor", "invDstColor", "invSrcAlpha", and "invDstAlpha" are provided as aliases for "0", "1", "1-srcColor", "1-dstColor", "1-srcAlpha", and "1-dstAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" + }, + + // depth (required): The depth state for this effect. + "depth": { + // function (optional): The depth function to use when drawing. + // values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always" + // default: "always" + "function": "always", + + // writeenable (optional): Whether to store Z-buffer data. + // values: true, false + // default: false + "writeenable": false + }, + + // cull (required): The cull mode for this effect. + "cull": { + // mode (optional): What winding, if any, to cull. + // values: "none", "cw", "ccw" + // default: "ccw" + // + // "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw" + "mode": "none" + }, + + // write (required): Write enable for color and alpha channels. + "write": { + // rgb (optional): Whether to store color data when drawing. + // values: true, false + // default: false + "rgb": true, + + // alpha (optional): Whether to store alpha data when drawing. + // values: true, false + // default: false + "alpha": true + }, + + // vertex (required): The vertex shader to use when drawing. + // value: A string containing the name of a shader file to use, minus the extension. + "vertex": "vs_blit", + + // pixel/fragment (required): The pixel or fragment shader to use when drawing. + // value: A string containing the name of a shader file to use, minus the extension. + "fragment": "fs_blit", + + // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist. + "uniforms": [ + { + // name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader. + // value: A string containing the name of the uniform as described above. + // + // NOTE: Some names correspond to special values that will be automatically filled by the BGFX + // code if they are used by the shader. These names are: + // "u_screen_dims" + // The dimensions of the first texture input if present, otherwise the dimensions of the output window. + // Valid values: xy + // "u_inv_screen_dims" + // The reciprocal of u_screen_dims. + // Valid values: xy + // "u_source_dims" + // The size, in pixels, of the screen texture incoming to the chain. + // Valid values: xy + // "u_rotation_type" + // This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270. + // Valid values: x + // "u_swap_xy" + // Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false. + // Valid values: x + // "u_quad_dims" + // The dimensions, in pixels, occupied by this one screen primitive itself in the output window. + // Valid values: xy + // "u_tex_sizeN" + // The dimensions, in pixels, of the texture in input pair N. Starts at 0. + // valid values: xy + "name": "s_tex", + + // type (required): The type of the uniform. + // values: "int", "vec4", "mat3", "mat4" + // + // Note: "int" should only be used for samplers. + "type": "int", + + // values (required): The array of numbers with which to initialize the uniform. + // value: A JSON array containin the correct amount of numbers to initialize a uniform of the + // above-specified type. The following size rules should be followed: + // "int": 1 float + // "vec4": 4 floats + // "mat3": 9 floats + // "mat4": 16 floats + "values": [ 1.0 ] + } + ] +} \ No newline at end of file diff --git a/bgfx/shaders/dx11/fs_blit.bin b/bgfx/shaders/dx11/fs_blit.bin index 97c305a440d4480654f22d7f76094dd2c966d56d..98e6afc9871200c65105976444a7239ca1843106 100644 GIT binary patch delta 150 zcmbPno@vH;rU^0v=bCK3y;=3(Kwn9tRp)W((v3Pf+!9T*eugnJFfgoBOo+`6Gj&+- zy`b#GoX^uXZ{YsH%;ucM#K8M_^E&=_wwznOu znN}ad8J_Ilyn*`%GuypXCWbjLHm~D3kdGcpt}W@Ip3 z$IS5YJOe}0VkQO#fz5`@+ZZ>072>etwABms+S7KCk#Vviv;Jn&z&b9$0HBgjANd%> zMHvJb7?_y?CLf8O&ZMw*a%_wgklI`s)8K~3NsGgn7?mbxEY)Z7H{CpQX#zI@JEcs& diff --git a/bgfx/shaders/dx11/fs_deconverge.bin b/bgfx/shaders/dx11/fs_deconverge.bin index 34032932b6b6688742468634e7ed85259617e34d..2c3047ecc38dce60b2e3de3172a63e9b8933b636 100644 GIT binary patch delta 101 zcmaEIf$7NwrU^0v2|1GYOMgZC-mhN7`)$MBi5qn+cqE!<{S0GdU|`^#+H?8GA2HuK jo2+UX_Gp@JuHkv($oA2Fc7RFe<~+Y|fp}Cdc)<<;Bqc2T delta 101 zcmaEIf$7NwrU^0v>JyhPJ#KfCuh6!xfo)0~=SCe19tribuVIV~3=EPDbL14RfAgKk iQC8yN{5XDd4bK}#HZIkAuRU#>^ZdRA;!(Na1v>!kV<-Or diff --git a/bgfx/shaders/dx11/fs_defocus.bin b/bgfx/shaders/dx11/fs_defocus.bin index 2b1552c0cf6b244e08c2989b4a66992dc251db56..0453ced92453c3df9befa1be5071fa2610064c3a 100644 GIT binary patch delta 241 zcmaFW%KWO8d4iq5)4WZoCpst3@Cy@|E|poaa--iIK8fa8Kf@Rq7#Osa{qCjKAHY|dFs47`sg2}=pJe_>?Uc$9(RWEBHL?Jb}Vfz67nyBIe=6X9^+ zcx;&vVA6S!ak3)6!DNBuESt4LlSBj)m>3v7edJ>h7iAD&U|?oSm^?Rgy7mKKkSG^} zgeWgi6lf3=LIpyOA0#*V;=0hu2CPP#pJlOl;c@BKGA5=jmC1VBr8ZC59>xs-98pgq delta 241 zcmaFW%KWO8d4iq5$NlBq-y@WQ=9Zc~d}g{|Zlm8EJ_)t5uVIV~3=EzOYwX^)3p)4j zNWT5sbJ>;6O#DBX+3uw>G0b@}NmxqAcrzoz#-j`jhA|8bwYPve1U4(O?qb~hOoYRM zqm$LyYfsxn#>tBO29pJrvuxH1O%f4wU}9kS^pTH2T$Dk8fq|LHVe;I}>DmESAW<#` z2~l34D9|7#gbIWlKS*x!#dV>R4OopfKg(kA!sF7dWlT)6Qj_(zOKqOAJ&YRw2lY*l diff --git a/bgfx/shaders/dx11/fs_distortion.bin b/bgfx/shaders/dx11/fs_distortion.bin index 19a7124084eec977db22f61954ab443adc8a193b..4399b58c49ccafe3c5bebecc2c43da9c65754578 100644 GIT binary patch delta 188 zcmX?fgZa=6<_YHnvL?;mzQ&R>@&4x<)4v>EHFM*=6mf~>SwF)V85kILuFdw9U;p26 zcPX>zt=khOZH|)AVPU_Q%EU0|1@q)y8A&dm7-j~oOH2$w7dLN^ndZw`&e{`T(s_}Q zadIP{{^q)@Tk=c?%qK^6Ndc+NWnEUxf(}d!44*#oF^G#Y2rw`(GdXNN*xML_$I3@x UOpMx-H$Ks4+G4i((USyr03E7JS^xk5 delta 188 zcmX?fgZa=6<_YHnxD>?}=5o)wyv#1K|LfEpZ#Ldb5tmRe`x?f`z`!8(*m|9?zoSdT zAc9uIQb%@{^l#bX&izHObiU4 jKJqb$i!ul>FfcPEZ1xWGb;V=o>@X(A(#`DiCUOD*R}nf5 delta 151 zcmbPno@vH;rU^0vpNd%@E#Ox(o diff --git a/bgfx/shaders/dx11/fs_ntsc_decode.bin b/bgfx/shaders/dx11/fs_ntsc_decode.bin index e42dfd9ab0be75436361e6fb1d9e468ac4dbaa26..bbefb77f9d55ca3b05cfb6fef667c23525189509 100644 GIT binary patch delta 218 zcmZ2}hk5xO<_+A80$c*x>eIE(%YXR6&95ugIDNA;Bafs+)2yFij0_A6%aV7`ydYWb zwn)sc&Uw$?9h>c?{xBO&%w}K^e#pq+@QRUvOO=UX&U+>XM-@hfD-28wirX0(Rs}FI zn66`Hc=4B+A!#ua1B1ZkM1gILo0SzfJlO1NJp)WSHydVbP!TKu%6Q_pm!4at+cd!>NX=Hn7fMjlBCwX&~aj0_A6yWTabG-!D^ zO}=+5HOj)}&t`k6Kg>qXSxgMPkC_=9UNJIosWLIldC$b)sKUr_g@K7daXTY}mjnZY z={jbHU~49Zq{U1O3<8@I1-3D6R#xEfVCy`u>$RtCvth;t6~P3c+^3Ix4C0~;0t^hy wObL@e^-O0u9N0t zss8R2_idXW3;bXAn>1o!BK^gq2HB}L2)}HgWU{9hK)xV z7z}PQFx1`xnj^58k$o5A=Hp@jO+WFETPtW@Ojj%pRF0B-8-3>C;C(260ga z0R{$UrUr(|_1V+p7~(;~TnrMTyg*@~F-!<04Dp+dbC!89$vJGkz2yTV9tUp=V`B83 QY_(ILNyK4u_Ra)u0GkC#y8r+H delta 250 zcmX@z$$Yw#dBS>unHvm0Fo&GJpwfTrBjcvC!W;MV2uP@xeGOw|U|?|bc$#ta;sw7I zk=q=XOT72k{8-=zv(c$^28ILA85uZ(85y`#nHU8AGcY)+Ff#PJGBPM`XJn{2z|64m zCZTR?LJHZ!vCV%&UOjKhhOD|(98p0e%Vm& diff --git a/bgfx/shaders/dx11/fs_phosphor.bin b/bgfx/shaders/dx11/fs_phosphor.bin index cb4067339e1ca11c254a50b771b827ca6726e34b..b4279fc2c3c34eed10b05f6b05c9091776e8366b 100644 GIT binary patch delta 198 zcmZpB$kg_bX@Vbrs9)05+%uC|wNC!Kk;HdxW2`2RMANLFVT=q645bYsE$7T8xOU#1 z)^k9)Vd3U^Jb#$k)594UOvRZdFBFjEcQ#{UFkQ#Y;QEu9A!#wwh7iAD&U|?o4V3-^fJ&h^h^W<02Qb1}mTTFu+ d9-9}1F)>r7!G%q%3W{F;XZ6pGs$7IPjct@gc9Xv@k!SMOo_uPF)MkUFVcY;>SV~F& diff --git a/bgfx/shaders/dx11/fs_post.bin b/bgfx/shaders/dx11/fs_post.bin index 142a5ce62960bd489122b58374bb809eba138eb6..f7de4f9d3d6972a13ed8d8fbd2383417eb1f522b 100644 GIT binary patch delta 7828 zcmeHMeQ=f4nSb8*Cig4%=8JrhgyaQ+LleFATX(19FuQcpnblgAT3TrvDbfLLtJP^~hq~z&wX?IG>9qYl=Y7u2 zn_y=;)Bd+TaPm9P_jAsBzTWqK`8&S%U-ezzwt0Qd?Q5UhP)4CteCYnfKzw9>F%el5 z1>K(->`KOW^z0cbrb6)YQt`d1#Ev7Mn7yzN;;uwrZ%jWuxO*X1)a&?@p6cPD#xbq^QQVKvLDOdp3dAJXo`j{f_N}l!WSgu6=iE&%KF34r^T@PW z2PI&1{yo1C!vc9pp|(dB{vbblTOG@poAz@HVx#uId9L~=kkY*(GdlhU9B2|nP&*_v zx0fNDNxw}}`$Dek7pY}szYM#+jZP&|I(NDu0*4IG1U3d`aLRo_z@X7FvbKx^2~iYv zEqr_^iDc!Ub#19rkSIJzD-SNI4YciIqFm8aw*}_S;>a^6 zdD&dDGj0)2TZ~$0j&vj}9bvv{2hiruu2vI)s{cqw>1 znH~mmv13G!ls$Fxm)4eHK4(kdpx9Q5KCc6|L-dfy?xE%4gacd{`PEHK^N8}pFBXH! zLf5cTx-(sF9GfoYy7r+tsxVlUp5amf9uy95(&30NRsCQkr(+@+Pb~XM!G@U8-GnD^ zbg*5K(Q8JQ#;=JULJZGvrLzjgnNbWw5hZBG30>FEfxBlMAi1!S8++*KAu@hAAciYo z5;V!VSU|)RDJxW+;kh$;8X3379lMyL&IQV&JR;mHPGmWA?nXn8A9FYjPl~T_ibmU{ z#M5Y+9#5UX&&1YD_YPj_syZ+~yKPo&;3q%bUorggkn|TnxE%XQu92G<5bOMaI<7`_ zGOuMGx}P0PZw4Hhi_SzfN9NCD>7e6s+ptq`X)EUZejm9#bcVZ(vTJPBjPF}xwFOao zY<9s%XwAsUsW|xb?>boF&F5eEw?&E1t$OUCOD`??*ZQilmhzk&|4)-P9lNa7RxQYT z{P#ZE_Zp6lJMFPgSN(jM`plMy`o;4_Iea{;%$5%IKU+h}+4_-c>IkT99ksdo)Kp)5 zp+uegy5COiGtIHW7hkl~IQA05OPzJe;m!KwZN(|Lqh7doz^7(3IKtViF9w=-ZTK@` zkKUH#NV3CH`N=oUQ**y7_x4^snC>nE)oljPP8gd0o_rw02>+G^b=-&X6l{Y<_3O09Zg zd;WrHb8KIHI62bA)2#`y8XOO;Uf%wUdgksq)~Nd8s~u|eo=3)3#h>u0y|4Y(&AWQz zNN?Ag#Bd_s6z4(U8QfgIIx&=N?eFa$Y#iKmFY?+K?_#QnNp~i;gh#_;iReFCsx}$4 zFSR}Xq0>cjYZW~wb}yekfyd%oqBff z%Ft;|Jxh+7*xMS~=x5E1RIQc`t_z*e)NxRUKuu_>8gB+~4Yr0(>oFJsRX4P*%+blm zbn|44sHxO@lalPEwTD|)@(_GK^?cC^Uv_r*}x z1Sr}7Y=~Y5Ni`&ez$S1P`TY^6E=Zx0XtVV|r@z*RV?DZ#?L%e0x==y17Ixag=b%-G zFs0Fje*ZEkR7RJuJ1~~AN+>^C0J;P!<*Wk7OEJC{k_%FH)58Lst$x!Nx$!YQvBq)Q zPd*=>aE8yTWYXTV1;RruJOuZ!_PF-4hRoVAPv7vT&x%4^?<{(6iaz@>eAb_g>TZMj zOp&OO*(Yd?F?cI>t*1x2SXYC)^P0dw6r@745P9sw}S9>d0`}bwsZf}ULwGLiU&!sjc zH~RECyUMNMdj~^r2ckbc&gH3b);v5QaUPzCtWhUYx2CZcct!K>qcgP0PrpT*J@E-q zXnkdS+pfntj`tmT>$TrF4bP;AJ_LU~)-V?f|M<IBP1!-7lK|PsS&XbqzPl#MlPq-P7kEbC(gLtBpfFVc~ zc%V!R5@>*Q3G0#9uiuRj)Sg+T#(KPEl8JKI-QXQ@zLVIK#=N%7Nqr{XG1PXy+RApA<%Om z7o-zH3lbksb0HU`OPWqo#%*9D!^~v`L8=p4koZKagItihg%+d(LJQK9LJJa~f%rC- z5u`Ir7+ z(+i=%4IsVeVn&dDE3_c-+1vnqL0SQN5okeu!Ds~C2|kbx02hN6q{BiBV&_<+E*_Yl ztir{m5>%DcH8@^cS^Bp`wQaO2cQ(8_>gmxc_0niXZVlqjQtyxcFt-}5D)qh3w&b?p zD^jysnx2>Dy?{4=E^|@kt(QKU#^-&U%OO;6dxz#?83UV9??N3xI7;9e62?v zKz$PRH0otkY>M-FsA&u829Cd=J)z{{@FcBYz4g99#0>SFZp2TQ|NLxc8sG zzjgmVctt+-e zs!;9UZLPxYSH_Y6L{mQ{(AeYO-HW&L?+5LpL9F%4s6+hyo?k8ga_iTF#b==2jVuVi=Rw zeCX;C1)!lif3O7)ArHc1XXm2TpbE})s;=lMRr|)R4U@nBLAi$RD4K!c8YpRm}gz1PQ6j8W}mOI+EwiQd{usah8mAYN~zIfJRrs@y|n^Y3mnyI`}rDm@qDRL z(EkJQTfhb@q!wQ&RR4WGZTq(LjCAM{$AUb7}s&C(+YKef@n& zv=@E7@dJy7@wS1(FYBv5&NLSr|9IuG7tWqrtQX{|Ks5ILk2YAFj_Wp#;B`b9wE44F zHD+)(+Wdl3j~c`LYXD||_)mOn--yad@TYy2Ay;Zq2Y&L13cP)47KdGqdJih+(}{X7 ZY67(j)3L?c`Q_Q~_{W;wv1~hL{Rvb{(d+;K delta 8983 zcmeHNe{|H{+e0^NJ!=)v;z}WcSZnLnJ-X_iL$}tVYu&SZc5y%Veeaw3 zCRxwffBK)_@aFTqKi<9f-S^)8zWFl$_I%3s{xM}mL(9h0EgK$aDkR@%`|ur+!S?Yz zIYeYp5On8IG`hRJtG9nRhq8n>Fgny3J^Z=Sw%McYgG155$WXL>XWzg;e-4GAl9l9+ zMLS0ZhH|LcVGnmkcK7w}j_>d0#Y#1`ppo&x#*@c)oS$@QH$=qtMFc zP^5EDw0Bp}NDdu8{C;ul6oi?h?K>l#x3zZ;^s%#-!ODStPo!($j`oq>zG!>@Ko{)3 z1;MO@Kw`KIW+1^F9mCKqt=2QzzcVsqLd^m*9RnM%kKKV4Wzl;O-Ekw5Op*{l`D2d*WMm#I4c+-u=9y-d$FQL&(3Z~>*J7@p}-5aa$U zh;!SIn$PzFnYhOBj!$X&^%#$=qouw7*1r**fW8e0JtyDzXYI4{YC2Q-jJ1} zPI?RUN-sl1ykg8MOT)ccWxQ_JVWk)Nyv#*H)~Sbm1!+i)Z=YI_J~!qApJykLNJ(IZ z%OdxM^~89X#+9DvBRO$RjDM%_ydEcUo-lVI+Moa6nnyR}W0v(5)7y^|xL7*ymSdW; z&O_sSOuyD<2frNu?P{aLD`1`Jm*wad%K*5aTW;)|G^J~K40#X(Mt}m7$R%b~Z!Dw3 zfv{l?NrRffN{XG-^^|b8{HeR`iu_hbz-2)5&XW`H0LOGQ`Yx%$0o>3=;6vJ zGov>f1WYpxyu6Iu1Y<8qKbBzEshaTd(Sv$LwT1KvVL_?X{u z+JL3WlWCNbn#o2ALDA`a99kjoljqJf-yR&jM*Cj;Shm;sgHo-ZCWUyIfE z{IyNmc9>~h!F0$ept!E{WuoGU-xh18=5vW&8cJ|`LzP!{_Z~d(v3cjNb z7A+2(J899_i$oW1qKW5<-l_2?k7Mf4&9>V3Rz=BbxkeCp_v|DIvaOq%)opQLA)qmsJ4B~QKo6R(=zy1+j=R_h-giH!7iPV8!( z^r-J|d$puRhf$BSPnW&g9^+F@CljIS@jYtri@z(L5>xfKy?V7Bst(x|6}H;;7p0}n zsnYa!S%WKWT7}z+7T9&ROR;*-xV_5FP(N)e+ESS~xtZXjNq2P^y<9UMm9BX0#V#w0YSsJC z<`-4EdMxHhw1M`~F;#uy+cny%7`-tvd|Q2AG%^Isl}nJiYei7cXWZ(@BA7S*)j(vf zx@CKIWL;!9>d1$7?L^1^-to#QyejlDvkoiJs+#T(>DcSe%X*pZ!B@uaoTM_Lk9+ z!O;g>c|k)6sh=lej&zDD)}=dsF8esHXdup->OOs87E<8NVg1TN91 z*1xN-9aFt)ePkrk9%={I(cpZkM*a$~&)j#>Qjg?? z)MHWG+xdFQr6r9MlhMVVoI`x>#dVC&8X8qbPumR+nNQ8x__jc)_`3^23u=5;H~b72 zpU)(QpXuVOANDkCI)>Vq6uZrFtv21<<_cYWx49DaaBqRSxp!&tF`wo^`WxM!n(D2l=$6eY`9Ct}R>l;2#!BSe2jjw0O zmaC9rb1hKw2Qo|F(i41;%o^pqvSo*#X_ct-q5AeJ9A7wK+vSG`V)*WXGrw8uk4({L ztA@||$+%k7o}nenxL;iNv&rlv6OG|>lDb!qAekFEY3)TE|Lta9}OP@8c|v}ik3 zssHG!^BvICF{)H`{q?>q9RDraOy%lp{f)jsO&taG8&JnJRYE1|n%(ujV|sBtM1|^( z-HrLAXSNGD;Z1a7_5t7#co9)i;J)VyAV6Drd}w;k###SC8Slmn~Nb!{@!`p_{Tz1iAR~%EvTBa9yw=bNjxH z@c;SX25aBx%p5iKM~Q{7X|yPI`K!Jc%m3-`o0JuXPCLJQJ}(1LVGXhC`ibPDgtjT`CH%v*%xD+F~$roENNf}>cZg#%>@KVeGbM2b>T>dJPtmPj-q9N7Sv1E z2l_PlKzh%?xS(Ece#o)xVuTwCWA>RLNFAU9paqFnO(tkTdR%Bhy&8g$^Qr*S%fKwq zf?Vu0EvTPK*^uk!4{m5P6mr23qz<74F#`txgjpA^PwO} zgF*`u7up4o3)1643(^^(1?iH|g2biSMt?!7a_CrGZYV4Yf_kfQ2i|f(;%Z(BT96J3 zEl9^fmq9K_lR^s;Z+n&t>f^#yc=H(NbHi0|fI>m#P!Ob6p#^CWbOi_CARQ7~kob{u zHROVHN@ziPRcJwM4Wh~zI_Mh&z~_!dpam%mdNF80ea^TBG@mzsbgzSPL3%=HK{_L} zAiXQJAZ4Ji6;;C^-vFt^!MH{>vFF;@3LH>MPz6^|DIV*LX@Y!j(K?z<3k25!+fbxK zf?I)gG>g^%m*LpAL}MO~6igRrdKL6ng5Cysn+w;1t|DsTnSDMI4hx1qekzn#eW<) ze`D}ciTg3gc4(}kTQu&ZQH|L&s-C=aVT`{o@p*u+tI*u{{N&{80NSVB_h}6j7a*TQ z+tB#Iaun?}+IwiZ@Nqp_584B0r_e5;pyzkb>JmW}IgCYxUh6$fq97uKGsS@sF8 zV&8Qi{2Jmx)RTWjLtUcZ;)8J;srb+HW2=RHPVhm&wFrgP_M$QJf6FkwU}!P-6~SKV z_kE!wf>E*abD@7P{r}eCUrX~uAx{iEA_|u9?-yJN19;a}qPCu$Z^hN<*)k-gK>g@! zOS)6aQ&q;f)!?mH_n!-@z@$$-d~UN9R_~pgXJsH;*Qhyq5fq8Rk(DTXXrR@648B%UWb}} z{%ZBr^K(?w`8@SB@H^+z)tfug)ZX(!^|q$xDgT8z>ZS8})^YU?w7+;E;OWf5XbJ-u z2uH$mJaPM+H!PKZ!7g|?;XC;v7H-wyi}OQ?SJ?bLIyt1vi7xWKSpRYX2Tt|o#k|7A zJLD;SvMhDxVwq*D-(8%$GGuWaoD;la9vH&uAZa|Dknyh(l?k z;uj&$)%^Pd8w(xdNL(JA%Z|uP&UdlPELx*p|K)-lN5S1g`ClvX*#3#i*KW3&?iB;C zG!l+>_*nw*Qa+yExaX&QC0ZL6TosVNpWq)MYMf1oy3uYyW0_aI_^bWa4z=mmKPz1c hn)i7vT02??S_G{VZ6{h6W^0ADYvT6TEw87;`d?LKeQ5vy diff --git a/bgfx/shaders/dx11/fs_prescale.bin b/bgfx/shaders/dx11/fs_prescale.bin index 48b30509c0b8b2a26977e735a6a1bf9ddd16a073..a179c13e6ec4a50a27bd8f9fbaeceb40992bd97e 100644 GIT binary patch delta 151 zcmezOi0R)WrU_00y4BC5GLzzhxjA?vK0ajFw=qbESE6aw&oD*?28O*X#+h4IE%jKZ z!pG>@n_;|p8t)HgcIPZ62HwZao2LrCwdV|+cHiHm^CBbTc8L022el jr;mIL;-U-!3=GUn0hj+k&_LCY=`<87E(4)Zcu?H;qFufQfoAaZv^V1_oxPfX&`vzOHx-ogK!+SiPBj-b79ScPu*b delta 151 zcmbPno@vH;rU^0vfeD-L{Q3OSx3z}7?ERF>XEy5Oa7(C`eGOw|U|=}>A$9uBzITr8 z+}5wRMRrzf-oX8XncX>yiGlYq^XB#ZZ*4ixEZXn6r|lvmBM&bD>(~X8AJQ5AFeugnJFfc?ZzCE+^>`9+J qpH2yA*sMt29Lw{@ku79Do4-ltW`DnL-gs2b3S(ll+q`AYbZ!9lJ}&G4 delta 108 zcmX?of$8)GrU{Ayug>h>lD(v=koD#%fzKz-MrdH diff --git a/bgfx/shaders/dx11/vs_deconverge.bin b/bgfx/shaders/dx11/vs_deconverge.bin index 43c6c33410e21868c35bfb3d12027719ddc4b71a..62440de3aa77ab069baa3f57ea8e618abcbee9b4 100644 GIT binary patch delta 123 zcmeBq#?yRL#%nr)4BQzZ1N9d*Yma<&F0=_#_%<{S0GdU|f?4W2{3r%kjT)Wt);&=x@@wSs;|fk11Ggv)JMfjCgb`4P#=|om{$HAEb8K@-%J$ D8m%*L delta 123 zcmeBq#?y>%G&;K9}!(?0&f@(&Gr9j%d=jc4v2l6@np(swY&H7-flD$;gM*Z^)rl-fq~)ZYo_1*dCl(o zy7TJ)GnVUZj^%md$TsuB6n~S>&HjEYUQ7WTn?q-OV8o+iRv43#0njW2$W6@5W5~!WNTzf_T1C9+24=Fi)n@C=Fk}*81d+s6~?4g3N#A=auYN281nM- VQh`FcyYxOXGOW?ue05G4Hvk50G)Vve diff --git a/bgfx/shaders/dx11/vs_distortion.bin b/bgfx/shaders/dx11/vs_distortion.bin index 2d5d08866b917db6e65b66357f825e4e508cb339..152756344fb9335cfd2186f3473d66c026bfdaa7 100644 GIT binary patch delta 108 zcmX?of$8)GrU{AyNe0QP+oCjnY-Il*b*?&8Wuu`8k3`d~pJ9v)3=G*3i}t;V-ssV? qog>l6ta8KVSe`eIY??7={7pJH`}=+K#-nmp7!%`^&0FS7=LP_Rk}S*s delta 108 zcmX?of$8)GrU{Ayu|mf$rv7icVVe9X@>#w9-;IVMJQAv9U&9y~7#LNJ5@JKYw`WeQ^z`&p`KWCE8+VlS1 qakm6kuj3cl9Lw{@kuB$vq`yh$W`DnL-gs2b3S(j{+Pr1XbZ!6#V=XcO delta 108 zcmX?of$8)GrU{AyGpuxK0$uIjw6Fz!WMfp?>2K1x+24=Fi%F|=bLfl@jCgd+3S(lNxOvN*>D&Oa12D+| delta 116 zcmX?of$8)GrU{AythP~ksR7fpK4two?JmkMvC&Y3M?$siYZxN~1H+ceLbZG5Yy76J yn!hBe?}WqVSe`eIZ29iJo_pFh`}?tYG3khG4xRCV5s!{pVN8rho43rF&J6%#04^l} diff --git a/bgfx/shaders/dx11/vs_ntsc_encode.bin b/bgfx/shaders/dx11/vs_ntsc_encode.bin index 87c608156022f9a4b5a0964a983fd8773500c2a0..2626aceeb7aa4d3a455452dbe4e25be8b45f7c3b 100644 GIT binary patch delta 116 zcmX?of$8)GrU{Ayv0qK=)-{-1yY++Rto-jki5m??cqAHU{S0GdU|=xwwRGXgEAU#W yDYBh+ckZ^$u{>`a*=GN+_c!U>?C;0o#dJ1rbLfl@jCgd+3S(kiym`x<>D&Mn$}X<} delta 116 zcmX?of$8)GrU{AyJ;j-fYk2+Y;(5+`a*|g36d+cf3?C;0o#dJGlbLfl@jCgd+3S(j{+Pr1XbZ!7sMKk*V diff --git a/bgfx/shaders/dx11/vs_phosphor.bin b/bgfx/shaders/dx11/vs_phosphor.bin index 29f497b4a65d5bd2ed66e3703771d57103404be8..8cd89f18b9949213f8020a0adebded5e46be6930 100644 GIT binary patch delta 149 zcmX?of$8)GrU{Ay8UhU0zkJ))AnF~ZeZsjtXQQDAk3_?)pJ9v)3=BaQnO~n;w>U4_ zxrec6W>wziSe`eIY-?U>`I~fZ_V;7)V(Q4*96I9zBOV>I!kCnDfMy{;ZenI0LtcJf VDo{vwm)=K4hR&SLSLc**0{}XQHjMxP delta 149 zcmX?of$8)GrU{Ayvo$8moZeHv=Cs~w>AbVmZ#Ei=@JOhXeGOw|U|={=e?3lx{jT5q zOBFjfR&HjEYUQDZEHiypmz=%i3tS}}ed!Shekeis9$B>tw UmkJcp-KF=DkpXDR)j4I{0I9||5dZ)H diff --git a/bgfx/shaders/dx11/vs_post.bin b/bgfx/shaders/dx11/vs_post.bin index 70639fc75f7202638cda06898202efa8fc86d4d7..a8827bacda26a3ce03628e4c4a26bee03c09e36d 100644 GIT binary patch delta 1092 zcmb_bUr1A76hG%qZJREfxaMEHgkhPvEj3&)n7L%=g}FO5OU#Ek!6;2_uwLvAjfw&r zUs^;y#UAp(WYj~D58C;zi(R4KI+yRB`~7~u^Sj@`V8OdOsgk68?>pjt0J9%z+>TqIn=$X{# zxf=b70K@>~PL1c7Ho*xg_^rr1W%UYgQc+y|Xjgj_JvE=CF@ zO{HunO_SU~_qfcJ#l-wgnUp&WDG*sYXd|sH6e6vd(F){Rt#gfsxYI!$Tc=}_8p}U1 ze-E!M*0HM^TcTqtbgZ?DJM;Kco1!6 DAO<4s delta 1316 zcmd5+Ur3Wt6hHTy&TY-uhX0HD1kEjVjwn*6v@$en(VUwI6+>*JLGGJ#>h@slB`XLu zZv=Bm zk{jF7sqOdm4R(cnu{Z|~AYelObk`|i(APiU69R!gf0P3k68B~gb{=R7j=go-M_+Y2 zW?ZVr@R3;9H_H0In{XvAmS~qLRVBa@Vx`qhVq{^PiAX} zoEP61P0Np}pNot7$wo`&ymnoGC>RhTJ$&Gd&=uXy|9x`t=HW}EBP{d5#LErkoniUr+BO?V{=EGop>C zHn+|V&l5t8sv4Smj5j`b*wnj%)ng~BMXeK!s!>8yu1RegT_$N7YV)>cyaI3;31s7) zWI+r$0%_@fR&k92*C4-&>(_CrcONNEOLwr!DzeeAyO5;m1u2GCWKhN|x!W*&eO+qVfh-sH^jf7G9mb5P0hrF`hkvkx-AYw76>F{ z3n$QjkG^anEc;=q^IGx+sDuX0Bfw7Rk!&%9sKZ-LJb14yL`-$qYX7SqEfq^Hvwj=b za8cHkCF0ldC4xPcDcT;{dgdP>W`C2;&HjEYUQF}rH;2ynz=%i3tS}~}xj?fJAU82Hk0CEV WFBK@HyG!pQBg54C%~$7?aRUIU?>eCX delta 149 zcmX?of$8)GrU{AyduKj7ro;HHvE%xFqr{_Yzic!V;gL`+`x?f`z`zi9tw UmkJcp-KF=DkpXDR)j4I{0Ghfv2><{9 diff --git a/bgfx/shaders/dx11/vs_screen.bin b/bgfx/shaders/dx11/vs_screen.bin index 766a9c4e93b1959a88289c2f51e11d6b1fd1f261..c3c17a3621c943bd580677aee68bc86eb6880434 100644 GIT binary patch delta 108 zcmX?of$8)GrU{AyuXP^(Xa3o9-SwDsnAq>>4I2$bcqAHU{S0GdU|`7ij1vBJv)Oyz qg9lYn_p3HS2_V@edjYs9IFeb*5&0FS7=LP_(E-bSE diff --git a/bgfx/shaders/dx9/fs_post.bin b/bgfx/shaders/dx9/fs_post.bin index aad4df72ddd22110b96af647c4d210f32b9abaad..b0e0edd02acd45d6dd1676c7d5b410b7f326b40e 100644 GIT binary patch literal 4835 zcmbVQU1%KF6+SbPrFAT6rHw2rq(4jRQm1v56;^|5oJf}Bztkl^lBgd9<4}RD}QXDXJ90V=e6!KtFr*#|mUv1My4=My=XrOvfAhdbNLjuOr@0@#Q z=gRI=2VH&le&?Kf&i$D)_wK2wGwn~EymEGcQl8^2r|vA(%X9gflP@hV0u=)$lUt$lUp zJN10QDHO|I#;c_xbhDDL74v?vTFF=sK!mY+^EKD4w4!PQi)m5w z7msA$E^=PYN*74XgVwCCWUOv58G~tc+5*Pl zG~U#>p>a#&`@r8Iun#rf0sa>4u5N{c8V><~2mYwWa~dybENKjYe}LX);LE_P8h;A> z5!%;*uK+iISAn-R?f`#`_8njd?CMcCsPUl25#Tk*$AD|VY2bBW0r&`}z}NVK#s;tf z`5N$N!0Q?}fK9aD1-=g40lope1N=F#D@}9*m<7HG90C3UI0^hEa2j|ESOESW=xcmI z<4YRXfIJ^JfWHQAXxsw6h4!|_Pk?_!JJqXj5Xj>>tnoPTPmn(i+yGtx{uStJ3^X=? zZ-c+8@imP%fPVx3Ht_Gj+rW2#A8DjMqVc@vPE;b5kWSM*M7=(m+6GT zKZ6uI?XJ4~eyVxoOsk#;1=v1{`o%`g1){2$j*c06ESo^`FFYyvo$!jb#>KKJByS!+ zmhe7aMq8lf$UXgW!vA)$Aa+MgJNW>qU62(UUfDK+o0YsLQP6&^&yf!p_0z6@qVQbZ z^WB0ddNj{b(?RJcides#FIH%=ulGwMobx`^%4drsi%N+>YixW<-$e zvR4I5hk&u)qnevExM|H@Fu0QDRt@e&&AnuBYnpo<$m8X)-PGI$BMQf|1^f`@uI5;; z9h1i2-Tf$R%X$aZMAC8K7z%SwYi@}V_H65GE-<*un!BPowq4WQO+#-(b6dbT<{iy_ zY;Y-@3;5{=#(G)J9X7ZT)Oj3Z26s+#=Yes|1=PP)oUc{A>Vls=^z0+qGv}txWvAqH zk)5cPm$A)j+2Pz!ZfH1{8y+4Se(cE65xN`wizcQ|jDH4QJbn(l1>yMIn)LU5;rO(ga4!qTC)I@eiEw;MO}ICO<0ERq{Y5xFn=y;CNig`C#{rgzmYEpe?r$VC(*Y`aNmXAm+?FhpDLrutZii z4AectWOV8^bnY{1-73V+xKD6fK7{Hfku>EFku>WoW?kPKm`ZL8+|t=z-4bZobB;K< z|LbjRHlHEd(@*IT%ZMkyry_XkR}a54%KU!tKNxuBiC0e!jQ(TwgU8=XpB-a<0Q~cx zeu0lwqwl5vJO=(2^9R6JGtaA|hV(~-Z>NoKRY26);5t%EfVGx7R2q~@hs<-`LLGAK zEDJg_Axa}|L(b_D9NE}E0j@xylG)Iu0Oz1qn`kEJrzk{vULnGPt{LH&_kPuc@w&ujq?&u2lsOg zCw1Vv9J`H-!(7O6i@IP>m%3;&?4tgV{b9bK_ivPK@yGf+X7*uRz&>qCiw?mj$7xe1+R-H&{j!~kvqz7s5vZ| z6wCqpRQ4Q$X=CnX^vn7vY8?`r^;W;=KV+R`uXIA6WV~ulI|Jxk?iika^-hBka4D1XPXOO Ow{1$LWbg55oBj)A;|UJ{ literal 5228 zcmbVQTWlOx8UAN?ZEtEjcDAnV&;q6xz3tw# z7u!gcn5YI`DzOMl6mikIa-n!DltMrewA4T(+G2^9AR#p`Mf(um{9qxFq7L7G&ObZH zE>Da+`Sa~gaSC=Oo3F%F=b~$b^D_;@61}KLz;9h2$XJ`KW^<06FJ_SWaVWam zirQ+->X({|weq4PHHE+(gVkEPWUqfcriQY!W>>R$gcyJ_7o)J}edr}Z7bcTWjuO#3 zQT*V6EzRRi;?3aw7~b7ZBDaHR>TD{XEiA94^69*jTBv1nnbgAa(t3)McgmGiX8qCB zQpGM6E7kFZY+-yQSIJSc$?=IiuhpaRj^IGAmd6Ay2+jzm1XqBsBC)EVEBF%dr{EjF zE#NiaHgFgCGvH0Z7VtI5`@o+A={V6TK)>LK;25w8eL`>s_&vz;z#jukf*ZgeLf!;6 zfZIThcOCdTH^8JR*1H!ZKgTi}w9zvO;aQV}!%uzh=i-!FrqkP#Yf5|9Ms`ann zR4UJ?B@pR1N#)OLx_%y0z%_YZU_Z-iB7Gh@&*RtgRQm%1`kdi6UCSGqX7i%q2i+W& znAxgRqA7z%4F%KbaU&kn^sjUDlu#hTA;nfM>P$~;5OGfJnk=XktNd^MX< zevg=Ssa;NwE~W?`9=$Nl3Xd$n@R;)gsvk^YJbHYz-NkZxk(&6lj_{Y$mFK5&PP$Bk z&~QKU?~_jTeCD}YrRroY~GcqdET&J)#r^k*Ao$2?uS)An5gcH6SgBfx(!_F3FG_5 z%WWG4@^b_Dcf8zBw}m?}xQGr;{XpMtM7S}7drY`#gPRj>-r!2YyC^W$r%R88m8er-e%Z{kF}ZoWfhc>-$zwcJY1_FV_)5 zyiJt(c^!BaFL&Lpa4n$kyD!`w;n+8dvjRUOKtJcx!X*rDPPlo4D+%|4!EK<-`PB{X zN5Z`Z^mDm}^5yJexmYPKRYyj@a%yDy((I)X{$!o<$W$?3!W1u$OvK0I;}h}t#Kic- zBM+ZBO&@yyqN%y_llLL#pKwEQE*b`~Y<-vL`{3@Nllg12sFR}HNIb(pHs`fsM7TIG zgc-Z$rZ_(K23$^Y{fD@9#p!k1kM}Lb>2Jj6>Wbqta1hVG|LFCGa}V}R zbs2&pLWgj-CZKAoTsHOwNczqKUhNB|iv6%1 z|G&QMX7kHL9fQ=@c)#zd#EbvApN}2q-tT*Nm-!*^-yZzI{ySpl^fRWsdIZm)C0c@h))gn(J`XnJiI&ZBz(fi34P)ca?(D% zs*W&iDnHI8OkJ?~H*!C?(u?@IZQYPt;BRyPsC+HN45K~Fb1cq}Xb1W3pngyKFv9tw z4|(i%l%4K}9TkgxaVaT2FUx*i9D{ARE{b+>{4I{byc)M?RQd2Ni2e&5@=z`S diff --git a/bgfx/shaders/dx9/vs_post.bin b/bgfx/shaders/dx9/vs_post.bin index 43eec77a6f459c762fb22defd7fa5b2b7e836533..c006fe0c6acc7240087913e609e771fab243668d 100644 GIT binary patch delta 565 zcmYL`Jx@Y07==%73xbF&7&qhKV2m0P7Y7%=q9i5`MB@eoh>-A+K!`eVH4bho8*lAN-iXJmUcWG=87)CuR2Fbo^1q z3owZaY);G-CdQ1BW^;ZxF&&%nyNu1vy?Kw$OLUL(s`cmli1S>RE z+jYQ~oW7cukY910jW;D-g<;3Ru<1AJLAmrhW=uj3fEO1Sx?IH(h%g^EP0aHT%p9!& F`~z|GZomKl delta 619 zcmZXRyGjE=6o$|2%xV&&hSUmzjfKTFf~bXP#0!Fg7Z8+9API>iM9fV=%*MjXBC-~# zB!!LG*k|X4Q1AmqyOd6pw@-7&N)Rd9R3y7z*Sn|4(%$M65iJ^+ zFp#Dw6oTTAf;tGc!R5KbZ2ISKUGqV+30APlv*w#-3#=mE(frX2 zqASNIz$?%K9dH56#?r1O9xGA!UpPfZvj|2YUdJ?%6BL9L)!_U2$nXr3Gz=?1L%4zG zjlfo@9-u)Qh3!Kn$J?+!A?|_Y#6ON>A#hBP)eBDR;4H{Z@zE|%7+l0^1s-1FV-p%5$}f(=-mgy|JsFLjjGp3qR^{u^-$Y3v zWM5YPzg4g?Bwquy&ciVEv+cGBOM&}_OM^6y($Ej${VwQ>p^rl${@y^p&ZE0s$xkco z4}Goa>RUtoCMwG?7e-C_F62gq{F#A21bGycQI-nTS5WPOO?EV6ZiMTsN~IChK_aVz zIQyL;X_W%!cUAH_$W5c4RsKFZs!;K58)ume{L{)WqePYlTo|uP`niz~B zZ8IhV2t70d`ql^yV$6ZM1fl`D1Tu&1kytT$m%yTDmr!CXFQN314grmkeLsW-`2CRT za7izRdjMvR`T&Fme?Uhx7|?N245(TZX)r~Q?Bg(>{?3Rm=M{p-;6)Z~SQ11jv+VKP zF=KIdl;rs}D8k=3eSGgF6q;63Mx^nlTq^%%KQqhV6Z?_#Z)&;DV#4rY+a0VrcKv7^ z*k~?Xr#_KQBS?tu5eG~COOrRAJzarl9SaS_UnoP|o2=#hvl_u@>*WV%Y?S_GPxxPVRc1UEQxBY3r-Xa@`Uq` zKI}=GykaOPI_nj()`L|YXz1~AKWU_rQ*|whLagih2Y=+tgCAy?|8ucmg&8Ott~+*w zhmH^x#G+^2oOy(F0dS8*R5kFe=VEW}1z&JI1f}Y?N4rW-x#z;A#Tl$DnYTL(QpuD~ zmdEBvqw18SKB$zfMbh?77eV9OgYP0ru{CK!vDO{noP_V@mE@dkfxBV~Z^TVc7Ycah zcyn*Dnh7)odj>CVKbc|cDs*b?$8&DHr8}EzlJxu4?G>UPo=+NDoh`Lmankc}QgYSv zFw16B#G41fqVO^oRLjU-KX)jhBmhB(76wGwuw`}({u*1NooI#YOjn#KtxTzixQLgx z9S!ac9+T^M-n^r_N71Bx{0F5<&XwY8<^J6Ki5H`6PjANh)@)SFNcJ3&C1=dX7VNjL z&sNs-9yrrqIs2*;a?h%p|Ac}_k@!tQN#HhjJ=8&uR{IAIX3khS%_Bfm5NKQWF0|<_W8qpy|fr}Q~^B?)# zyzc6alqd}lK%m5~>Z(`Et8Tsd`_E6`{_*c$uXi1@K6VI!>(97jKTBXS<4x@Cv zj1HF}Ph(pCkvo*ycSZ8BtoXZnLGk&rl=$eic;4$FsC}|}U`xcjW~j=T zZ73xFrhgzDLI`Vf0Jw*|UL}jX$n4FCiMpsuYI>?m!*p1e2HBvxcIY&^?~D%hVuzCM zHBq^9N}?0bDcN27MBS6IYKT<+b0(?3&uQsy?@%cOVa*w!2h}-9J(?j5VG#<>sB#tY1y1gY=uU|7q4{Fh+5dI=$+M`v5 zDqDj&;h3A2@bySE8zoZ4lsY1|O6Bc$wEvOCX&IlYMRx^t-TKHL=mj(VeC%-b$3<$(bD4suDDP8HPzq*R-zQxC^^miK+wU zEQ)AeIgYN_g@SU0KDgkSQez5n6S)q zE@T_-cHM4-&6X=}!HjLP>2RMI4Jv$Z+XzN_B0q*Nope!6)bfm^f<$7_a<}XftUeMj za9CO#NXw3eqa}d{%y`z$E)QAEe(qL~UQCp;_-XDKHGsu+)sThBv7j!Z9fLtlXha@W zD#uf5IL)&u&kmn4%9wpWfJ@O^N~Q|JQ%IGwHY%YAl+PcU1`Y4CmiHOFm&poKR!l6u z%RV){J^8m-y?2%71yjGoj8quKB}f1tdBHfC%tmU5%V8hgL#L^XwsEw2JGC1~0`DrA z`lGR{I{$xDOthheNpz87`3x>4GiIQpT_n0i0k9nra%Yu8U!g=;Sp=2~Zd)qKimPK} zaH%r{dsJkU$M=Raj;GQ1BB40Ur`IhBCJ;yFdqFU6iQXf5+5>(=EMuJN^-F`{SZmUC zR8~v(t!lp`23=&&3R`NL0VYO^I_}TX&c5&gMC&wuVoRvZ>Qu-9uPz&Vsboc})E! znoK<-0CK zr8QS+US?W;QLaKpW_m_}LRo6Ei2|m+$?1&i>)|Sl6iRXn$`Xs>jjXv86f)BkG&JB= z>s2Ty+A0|68E9%MR0Cxd;A$0Yu^6mZSphPmRv|T~I2FGJONbZrDk{M`Ktx%5NoqxM getuDkA<%S<#Q1{z;>?oF{5+r{1#P&^lf#+h06ryQjsO4v diff --git a/bgfx/shaders/glsl/fs_post.bin b/bgfx/shaders/glsl/fs_post.bin index 23e7d6876069722e3b91bc43585c12cc78b5eca8..056f8728347721b825831e21485cfff440111a53 100644 GIT binary patch literal 3603 zcmb7H+iu%N5LJq%7xf+lZ65cLv{i=G#g>pZ4`~{-PkrbI5R61w3`A0;NLg~?|LEuT z?9A?RNs4d-7=kqSGka!s{pRmKKK<+WfB*b(@MRV5Z=+p!Jbm(LFnBch2EX&FSjOQh zN%t)KstW(9qLn524pz$|jqN4x{aE6LrPVZ(|n!WLdv0lABE_ zy|wmPS8J#G!BW3V$}%oEs4d^bGAPTRTK0#iNTM>yGgf^I)h1fyw|337aG6(`3W7c; z%j&?sPb^8J74Y9w>D#EVgMMCxyZly{ieKw(o~yz?tHLr#Rcp{*1{FqWo&NDYEaM~2 z2!CJfRVn=Q<=2A&V4afeMjYbhR2;%(zRe5&#n2LuAx4BHlCGesvSghXDLViN)1WJ_ z>Cn*`T68oGdYsYPH0f6pA^O!eZ635@`t+M|$NTk6r+&SmRoBF#SD%t-)~Bov{TfBP zj)6_Tj*@8DkrEv{Qc25>utCpSyN}Y{HZI1m1#$Jff@cWK%#)Q!qa+iKJA6MBOvG2w zKK@N|Hw<2|Y%GYe;aL7wU&XJ&vB)fbmd<0x_huu357%wkYPZY(ZHIxdH=K7oQB12m zi0)7aCaSE87?>RbJ<>J0(m>W>``p4K@GyNsBx~U~j;hQ%ieFH=9>wq^{uMkx= zVd|ZZ?0hfc?LJnWKWnP&y6LY!F8y_#e)d3m+q5_RoHYv39MRWBv@9J*Nv_a%{e2=X zH1uot+}SQZ4$Gp(GJgPzZQ8(MPYl!CX^SpInjEnNB>h3sk(?^}a7WFNWZI1k-UaX) z0#yehG(PS|wNy>Y@yP9D_pBby$wQ9+mox1KK@?&4G_(j+{;%!@g7zikhW$sxhvFi+&S2_6H#qOr}r6KAa-9^T1iy9=T1t%~WDK&4K+U>eL86Sk%@&)D`65TUupAV|;=Ohu;przy06Bq>WRFfG5;IDlg{OmxnXt~0IZdvHf zyMq9w5r%?B!7|Y?T!l^`Umc4N5=Y^Cev z-=Ngsd?mir>CZ8bA8P7&I_&C3bI~yi?787pb7H@V5Wjg5Hc->ee&&1?>-9;ft*Y{)MzTG+cD^}hgSS=?;HH$`+q PkE?n|2S{>191i{iSnWxN literal 4012 zcmbtX+iu%N5LJraqBgxDK=Zgy0cooQsf%sFbsu^O+NV790|;8CY__5(P^2s+@qhFi z`jtJivp14r9H2m;NHeoDXJ*dKu3!E6`^T?;`{$1rgQs=8y-zmr{_xS0!Qjc@8GbLy zG+oCxS-!QhqAnMyBm3Ie70cx|t=JOMO_^?zGL5fSMUk`g8!O$Vi>fG%c)Li}t8AUd z$!c?#bj8rGQWk$t0hRT2ncd!1^jm9RbhR$7ZyohtSyiP9f-ApE$teeW?%3~=GE1tg zShMQOI=)U8f5(err4#uM)_2KGaUWONDvk5vMq&QSD4hJhFv5DrE@5_8=hsQ;mf}f@oR~KD%hXah?J`!s5z$;CwWn?RR*7I<0{>wq4@XtR^j8H|2`WGkklbt-wO0& zDt4SqcsX>$V~F8lfuJ|g)az_nlsO+j2F#hR+;XR@vmEN`_#F4Fqit}iSIgY$s10jm z5Bk-TP5o+@bB|i}wlN}Sw&5o+g(LRHoIx)lRUFVp~-HuXnxFeNZ z?nsH#9btppR=Z8|%_=R&zY0n8;|k6gv@Wt6ktf+&c>eJ1P%w*M*VU%3;^jf2lT{dLj6N9<4)@GGPDBA_S%_>YJkL|eg1z_=$U|Sednb(WpoG3J-r_{l z6^BRO6XYFI-uxkPKG+C$@yqJ~k*=;d)XSH`GmB6%4$7aT&P1fTiYniL?eUbHD&S`Q z*dq#~Fy_eBX;N_5^Z5snuD0nT*2RQ52*tPkzCVog*$PD- z?0#jR9>v5C(CG*Fjbv0Lj$;R-cP=z@T9HvyOpDx_6jq#Ke2*jy9F7$MY58$*v^0o- zRV~`prIh6gr?7Imy3PR@^z_ZnHI3s9Z{9?_LSPfg?NPd+@d8iO}EV z0@Uc_>qA1G1kp5_%_sVVPk@h};j2;Q*|;Zzy*>>jQE(Prgp;YS+5W%BN>b0kB$=Zp zdybH58s->5w>|u<0bn;H)Xr&ydD+Oc@&uDD=h-pQUVM|IKuA*|_~Z7XJz+4O6P^ay zWkGRMU!1oz*gAwP45Db-QoTX(Oay#~TIG0Q@A5}S&3&Z-MC+>kKuYM!no_8xu3r)d)K7`{PZXIhUI$@>qM1t3TsHAQ$ulOC zk{=+Mxnm;xYB`dq%0=DksxMJU%fV?pDvTkOf3}5yN$#0il3((J9zkkFy6=Sdc+?K< o!$-d=<(@V-Z4}aPO3~<@=h*EkepM#7^6d%K+T?QhFdPp41DX`PjQ{`u diff --git a/bgfx/shaders/glsl/vs_post.bin b/bgfx/shaders/glsl/vs_post.bin index 624be0f29f05c69c46c7943a0ed34363c7a46a76..510526ec5880f8c8359ec03d49d077d7aabcf80c 100644 GIT binary patch delta 164 zcmZ3(x|3ysv=(n^d~tqhQF3a0N@i{`6C(oyBLhe*xhOR?4@vAJ<3zV(Y6z9qT%~!L zY57ID3T3IuCJHDzCL1%Za)>WUtw_$#FG?{~uvO5|NQCnZ6tqCf5k~1%RB9^dqZ*-C JF}aUP4gin3I1~T? delta 280 zcmdnVvW9hnv^HmHd~tbVL3~9e6C(oyBZCl-pOKi7Umjmt7N4J%R-9S_kw|8m=z2^Y zqSTtJG%qtPzbIFsEH&9g0aMFlL&jD0smVqPCAkG2sB+I ZF}@(bII|=(KTofsQb8MT^JHlzIRNF$TSou@ diff --git a/bgfx/shaders/metal/fs_post.bin b/bgfx/shaders/metal/fs_post.bin index 4da4ca2e2c1bf4af3edac7f8197e13cca1a0a1f8..133e08292a4b93148f9d93695856e8555bba2caf 100644 GIT binary patch literal 4384 zcmbVQOOM+&5cZ*`z2zV9R7kt7Vp_J>M$#NwG)N9X4na=ALg3o8twIl153ihL|3`mr zhchH4%G!0(iy)K3nQy*%aOAh2-u?3NuYcc-n-sVNxwO>c&gE&OZ$pV-$Sj+2TEu&4Gmd^S=wb-1m zmg_>wEXudrQdW+9xfWRxXEGAWVK0WaKqisHTlYo0+gH(LiRVoJ9aohEPAui%o`JQO z%E0j6Q53PL;yiP=A&mLMkUzAs&g-nFkT&Y$ke>QDMBBbj??o|Sgt5fF)#pg~4$AyZPB^>S0^l+M==BF>mMki1b^B~i@2d?_ojlTn=A-Hq8g&){cY zqt3Tq8J?-(%zeGx%EFuYcXxn!%ou}Quj)chH?OfG-mp@oKZxoLlpV8Dq=!TnsHsd3 zk&)8t7c`a_gN{-T0EU!WL8Dg*`d8lotV4z73jN9z{Zxg2h*Dw+M%>0^3gkd7M^m+; zU)k@>BOZfJwX@%-D@?sfFds8`_(!NutL32Xo1iVTQknd5b%$aup ziJKmB9S|c3+Xi6FJdE1Z_cSt}Aa{rWLtjCa(W-tbD_w~PZOY@p1VP1H=6ObC(6HA) z#>8jezcagd(u=;2?aWn3CKdXS0ER&6L{Ul)0tuDC7@BG+>XbLweS>z51#;DRGE=85 zTQe0>fd7)>S_9p-St_d0EnTHkqhju;m@5?nS#hIRl}^gf$hHko&0gyA`XQ4G$K(P` z_I<|=26{=*_4$?-dz{e)az>Zs<`%5z@Xv!&LpmOrOiHO^Hz=y*hHxzZ7mj6%V{rjT zSM(ViE85e}tw2At)^+81dgT^^W8P=%+OV+HRnpG~j$^=CPF~`dPg=)T7aVhBpYe=i z1G91A984HbK*#l2+SEst=A_Z-DI6PLt7!_FOkbgNK5s3w-svuyPtGlK-Tp!4?)8_h zp^0D*@YA@_ohnpCI%ekK8ylf-OiaO#uj4cSaDoY%rqKwndGsv;N7`cB2B3oSLg{2s z$XHIHZ>3CkGI$V~4;O*0N_*S~(#`pvU4Vql_m)-2G#nTl;9XnqiFJI%`9fhOeZ4w2 zQyw?o^ngd>8#It^TJ@}T8>qG7_F#@p_-QjZM_#a^f&{_n zM!=%gemlL~LUDUJSIrzg3*Z*RTY?RB_Tc0=+|Jy=$){7-%sGuWfZ?U}CJgwD&sQNG z@|6ouAERl|Wx<&cgT@-?!GbR*;mj5tCXjX6y-T>dOi}@bhRJ*$Y#O#fJv9l^)kIuh zD(X#TiK)XmkYnHVnO^29@&3}!6+MjzR3%WAh)KJzYsao?A*>{Y)pQPB%>F>$8INt{ zTUi|+lNL^3?S}^j$xyH`uxuN!3kE6WEuW8uXzfhEj00(|P(u=Jr{)5p_S0fTMvS%_fc>6buY? zt?Tmk=%zM>qQ_S#Nf@o^4!0SszNj!3Fg{My4Mh0CB`e}WG9AKU9;aYpR$TzYy|_aY z3<;`G@SbrmRGd1DORL~)dTzJ$#i%cVXN;mFF?@{BzY*;ffE#(x{d)m8v=$V?Lc#}J NMqI$R(BswB=s#dLU%LPR literal 4823 zcmb7I$#UB`5cOeBKIRK>a*?)%C2H|fiF25#Nlgx^98x)@Tr60IEY5IIaj~f+{*U>j z`K)Plqd|b8?D0jGuyjAX?tWSM8O8}Z{%VW+5JuRhgC5^eqp~V5m{usw}HJ7=0SI z^SN!<&_-tKg}Bd>50$+CT^l>N>uZs&%PM#Mw@Ljdw@J6N02TtqR+Umka+l_{KVG)g zN{x)u`f|OlRpag0R%$CNmE2}!nUBsqs8ypeTS~NhS!8LU5}9o`a(oKbWNLiswo30e zjkfZ_iV?il^L{vfMVHfdRS)3U^8C$i#_anc_T45z8GaKR=&;^o^%=L)*Dy~I9%tnrAh+j!uX2CRCP6T{} z;b0T*KYPVW3P)tcfr=;Uc4(ZA(&Ssn|74-v@pk};lL4|H5l0ByhGZfFjN>c}46=|Q zJ4Aq^?_i3p>Yv(+yW-Kf3gT#rpwhJn0yY_S;vJAN4aLu&!Vd1tU>Kq*`Uc6RMn5Nj zbD(spDWwkr3AG^vxw0I2vIm~8ugUeviHTUNiF67a*1X3h76>uI2VQC?#*Ou2q`Tj1 z&S1%30weng674#&_9RqRtN*vj?4UnBw)0VJ18M6?V5Tj~b4H1z^j8nW_&J>Zw*F@7 zw~c|l7zImr;9(*!`qVprfj)Psfj@@hk_JsaUxNJr6n51Fff-tgQx5(GB*m%G!#;1? z2RJF_IV*|TdF7eD0@GZ8lyUntNaIc!GAvVvV`UMzrKc<96p9UNCCt;#RP{{|x< z#31xCVC(aM3UC1ou<8^rMHs)@G{ zZ3Ae!NWSL00vxzBML6_?H@fR7#th8fhn@od?L#*S=0HI%L9I}s_9>-KADsA$q|{%>an~ZugDU z)o|!_`bk~MK)re@QAk)JSkI&9-OkvLO{POZ*Fu#Ml5|WA+#1I_c00>j>S!*9&t_(Ep zC(oRu=IJRI0SnGOV+CaY4#O+rV6XVR%(>6ImqpIBi@nI{PS6O4=`(B?on9E; z1Jr}qO3)8Oj3o5DQy|Bl8Hlipd~78Ax-`7FVf#*T>94NgMdHwFUM)f(Yxsd}jO8EO z&hh)jQfYc>)8caEbmvG&7F;3=7YU%~g^>O~1386P-@uhFODroUV_}F diff --git a/bgfx/shaders/metal/vs_post.bin b/bgfx/shaders/metal/vs_post.bin index 70298ecb2f83735b99a69dab309e5e1d470105c5..7d355aa1df15bbf88e83e4dd5599a109795f717d 100644 GIT binary patch delta 159 zcmbQiF_)buEZBp^-*tv314AG4MxGo-rTo&OLmp delta 262 zcmbQsK7)fNEZBp^-*tv30|O_^MxGo-Ky47C^ePk-Z50gk z3^X+rs)33W;93-H6%dNi?9i*M0GU{;keXARicOz9%ocQw5XaX}{?8;O4>mqiFEPF# Wzc{lbGe1wSqEbN{?tsY&%(eiFG*=}6 diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index 7f2d17e251a..f22af0adb99 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -143,7 +143,7 @@ const options_entry osd_options::s_option_entries[] = { OSDOPTION_BGFX_BACKEND, "auto", OPTION_STRING, "BGFX backend to use (d3d9, d3d11, metal, opengl, gles)" }, { OSDOPTION_BGFX_DEBUG, "0", OPTION_BOOLEAN, "enable BGFX debugging statistics" }, { OSDOPTION_BGFX_SCREEN_CHAINS, "default", OPTION_STRING, "comma-delimited list of screen chain JSON names, colon-delimited per-window" }, - { OSDOPTION_BGFX_SHADOW_MASK, "shadow-mask.png", OPTION_STRING, "shadow mask texture name" }, + { OSDOPTION_BGFX_SHADOW_MASK, "slot-mask.png", OPTION_STRING, "shadow mask texture name" }, // End of list { nullptr } diff --git a/src/osd/modules/render/bgfx/shaders/fs_post.sc b/src/osd/modules/render/bgfx/shaders/fs_post.sc index 4a77dc88cbb..eab3b909909 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_post.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_post.sc @@ -10,14 +10,12 @@ $input v_color0, v_texcoord0, v_texcoord1 // Autos uniform vec4 u_swap_xy; -uniform vec4 u_screen_dims; // size of the output window uniform vec4 u_source_dims; // size of the guest machine +uniform vec4 u_quad_dims; uniform vec4 u_screen_scale; // TODO: Hook up ScreenScale code-side uniform vec4 u_screen_offset; // TODO: Hook up ScreenOffset code-side // User-supplied -uniform vec4 u_prepare_bloom; // disables some effects for rendering bloom textures -uniform vec4 u_prepare_vector; uniform vec4 u_scanline_alpha; uniform vec4 u_scanline_scale; uniform vec4 u_scanline_bright_scale; @@ -25,9 +23,8 @@ uniform vec4 u_scanline_bright_offset; uniform vec4 u_scanline_jitter; uniform vec4 u_scanline_height; uniform vec4 u_scanline_variation; -uniform vec4 u_back_color; // TODO: Unused in current implementation, mostly -uniform vec4 u_shadow_tile_mode; // 0 based on screen dimension, 1 based on source dimension uniform vec4 u_shadow_alpha; +uniform vec4 u_shadow_count; uniform vec4 u_shadow_uv; uniform vec4 u_shadow_uv_offset; uniform vec4 u_humbar_hertz_rate; // difference between the 59.94 Hz field rate and 60 Hz line frequency (NTSC) @@ -64,9 +61,42 @@ vec2 GetAdjustedCoords(vec2 coord, vec2 center_offset) return coord; } +// vector screen has the same quad texture coordinates for every screen orientation, raster screen differs +vec2 GetShadowCoord(vec2 QuadCoord, vec2 SourceCoord) +{ + vec2 QuadTexel = vec2(1.0, 1.0) / u_quad_dims.xy; + + vec2 canvasCoord = QuadCoord + u_shadow_uv_offset.xy / u_quad_dims.xy; + + vec2 shadowUV = u_shadow_uv.xy; + vec2 shadowCount = u_shadow_count.xy; + + // swap x/y vector and raster in screen mode (not source mode) + canvasCoord = u_swap_xy.x > 0.0 + ? canvasCoord.yx + : canvasCoord.xy; + + // swap x/y vector and raster in screen mode (not source mode) + shadowCount = u_swap_xy.x > 0.0 + ? shadowCount.yx + : shadowCount.xy; + + vec2 shadowTile = QuadTexel * shadowCount; + + vec2 shadowFrac = fract(canvasCoord / shadowTile); + + // swap x/y raster in screen mode (not vector and not source mode) + shadowFrac = u_swap_xy.x > 0.0 + ? shadowFrac.yx + : shadowFrac.xy; + + vec2 shadowCoord = (shadowFrac * shadowUV); + + return shadowCoord; +} + void main() { - vec2 ScreenCoord = v_texcoord0.xy; vec2 BaseCoord = GetAdjustedCoords(v_texcoord0, vec2(0.5, 0.5)); // Color @@ -78,72 +108,52 @@ void main() BaseColor.rgb = vec3(0.0, 0.0, 0.0); } - // Mask Simulation (may not affect bloom) - if (u_prepare_bloom.x == 0.0 && u_shadow_alpha.x > 0.0) + // Mask Simulation + if (u_shadow_alpha.x > 0.0) { - vec2 screenCoord = ScreenCoord; - screenCoord = u_swap_xy.x > 0.0 ? screenCoord.yx : screenCoord.xy; - - vec2 shadowTile = (u_shadow_tile_mode.x == 0.0 ? u_screen_dims.xy : u_source_dims.xy); - shadowTile = u_swap_xy.x > 0.0 ? shadowTile.yx : shadowTile.xy; - - vec2 ShadowFrac = fract(screenCoord * shadowTile); - vec2 ShadowCoord = (ShadowFrac * u_shadow_uv.xy); - + vec2 ShadowCoord = GetShadowCoord(v_texcoord0.xy, v_texcoord0.xy); + vec4 ShadowColor = texture2D(s_shadow, ShadowCoord); vec3 ShadowMaskColor = mix(vec3(1.0, 1.0, 1.0), ShadowColor.rgb, u_shadow_alpha.xxx); - float ShadowMaskClear = (1.0 - ShadowColor.a) * u_shadow_alpha.x; // apply shadow mask color BaseColor.rgb *= ShadowMaskColor; - // clear shadow mask by background color - BaseColor.rgb = mix(BaseColor.rgb, u_back_color.rgb, ShadowMaskClear); } - // Color Compression (may not affect bloom) - if (u_prepare_bloom.x == 0.0) - { - // increasing the floor of the signal without affecting the ceiling - BaseColor.rgb = u_floor.rgb + (vec3(1.0, 1.0, 1.0) - u_floor.rgb) * BaseColor.rgb; - } + // Color Compression + // increasing the floor of the signal without affecting the ceiling + BaseColor.rgb = u_floor.rgb + (vec3(1.0, 1.0, 1.0) - u_floor.rgb) * BaseColor.rgb; - // Color Power (may affect bloom) + // Color Power BaseColor.r = pow(BaseColor.r, u_power.r); BaseColor.g = pow(BaseColor.g, u_power.g); BaseColor.b = pow(BaseColor.b, u_power.b); - // Scanline Simulation (may not affect bloom) - if (u_prepare_bloom.x == 0.0) + // Scanline Simulation + if (u_scanline_alpha.x > 0.0f) { - // Scanline Simulation (may not affect vector screen) - if (u_prepare_vector.x == 0.0 && u_scanline_alpha.x > 0.0f) - { - float BrightnessOffset = (u_scanline_bright_offset.x * u_scanline_alpha.x); - float BrightnessScale = (u_scanline_bright_scale.x * u_scanline_alpha.x) + (1.0 - u_scanline_alpha.x); + float BrightnessOffset = (u_scanline_bright_offset.x * u_scanline_alpha.x); + float BrightnessScale = (u_scanline_bright_scale.x * u_scanline_alpha.x) + (1.0 - u_scanline_alpha.x); - float ColorBrightness = 0.299 * BaseColor.r + 0.587 * BaseColor.g + 0.114 * BaseColor.b; + float ColorBrightness = 0.299 * BaseColor.r + 0.587 * BaseColor.g + 0.114 * BaseColor.b; - float ScanCoord = v_texcoord0.y * u_source_dims.y * u_scanline_scale.x * 3.1415927; - float ScanCoordJitter = u_scanline_jitter.x * u_jitter_amount.x * 1.618034; - float ScanSine = sin(ScanCoord + ScanCoordJitter); - float ScanlineWide = u_scanline_height.x + u_scanline_variation.x * max(1.0, u_scanline_height.x) * (1.0 - ColorBrightness); - float ScanSineScaled = pow(ScanSine * ScanSine, ScanlineWide); - float ScanBrightness = ScanSineScaled * BrightnessScale + BrightnessOffset * BrightnessScale; + float ScanCoord = v_texcoord0.y * u_source_dims.y * u_scanline_scale.x * 3.1415927; + float ScanCoordJitter = u_scanline_jitter.x * u_jitter_amount.x * 1.618034; + float ScanSine = sin(ScanCoord + ScanCoordJitter); + float ScanlineWide = u_scanline_height.x + u_scanline_variation.x * max(1.0, u_scanline_height.x) * (1.0 - ColorBrightness); + float ScanSineScaled = pow(ScanSine * ScanSine, ScanlineWide); + float ScanBrightness = ScanSineScaled * BrightnessScale + BrightnessOffset * BrightnessScale; - BaseColor.rgb *= mix(vec3(1.0, 1.0, 1.0), vec3(ScanBrightness, ScanBrightness, ScanBrightness), u_scanline_alpha.xxx); - } - - // Hum Bar Simulation (may not affect vector screen) - if (u_prepare_vector.x == 0.0 && u_humbar_alpha.x > 0.0f) - { - float HumTimeStep = fract(u_time.x * 0.001); - float HumBrightness = 1.0 - fract(BaseCoord.y + HumTimeStep) * u_humbar_alpha.x; - BaseColor.rgb *= HumBrightness; - } + BaseColor.rgb *= mix(vec3(1.0, 1.0, 1.0), vec3(ScanBrightness, ScanBrightness, ScanBrightness), u_scanline_alpha.xxx); } - vec4 Output = u_prepare_vector.x > 0.0 ? BaseColor * (v_color0 + vec4(1.0, 1.0, 1.0, 0.0)) : BaseColor * v_color0; - Output.a = 1.0; + // Hum Bar Simulation + if (u_humbar_alpha.x > 0.0f) + { + float HumTimeStep = fract(u_time.x * 0.001); + float HumBrightness = 1.0 - fract(BaseCoord.y + HumTimeStep) * u_humbar_alpha.x; + BaseColor.rgb *= HumBrightness; + } - gl_FragColor = Output; + gl_FragColor = vec4(BaseColor.rgb * v_color0.rgb, 1.0); } diff --git a/src/osd/modules/render/bgfx/shaders/vs_post.sc b/src/osd/modules/render/bgfx/shaders/vs_post.sc index 89923cc9338..fcc643b4c8f 100644 --- a/src/osd/modules/render/bgfx/shaders/vs_post.sc +++ b/src/osd/modules/render/bgfx/shaders/vs_post.sc @@ -6,14 +6,14 @@ $output v_texcoord0, v_texcoord1, v_color0 #include "../../../../../../3rdparty/bgfx/examples/common/common.sh" -uniform vec4 u_swap_xy; - -uniform vec4 u_shadow_uv_offset; +// Autos +uniform vec4 u_source_dims; +uniform vec4 u_screen_dims; void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); v_texcoord0 = a_texcoord0; - v_texcoord1 = a_position.xy + ((u_swap_xy.x != 0.0) ? u_shadow_uv_offset.yx : u_shadow_uv_offset.xy); + v_texcoord1 = a_texcoord0.xy * u_source_dims.xy / u_screen_dims.x; v_color0 = a_color0; } From f26ce9ee1d281f37c9aef1efd3d0f5918f16e7cc Mon Sep 17 00:00:00 2001 From: Justin Kerk Date: Mon, 28 Mar 2016 21:50:41 +0000 Subject: [PATCH 38/74] Emscripten update (nw) --- scripts/src/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/src/main.lua b/scripts/src/main.lua index c0f2072607b..9914509184e 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -129,7 +129,7 @@ end emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains" emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects" emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/gles@bgfx/shaders/gles" - emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/shadow-mask.png@artwork/shadow-mask.png" + emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png" postbuildcommands { os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js", } From 0528efa10f68577a83c34fca308c1cc4ce3991ac Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 28 Mar 2016 23:01:50 +0100 Subject: [PATCH 39/74] new clones Pac-Gal (set 2) [kurobee] --- src/mame/drivers/pacman.cpp | 32 +++++++++++++++++++++++++++++++- src/mame/mame.lst | 1 + 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index b5ec8360d6f..abe1cb0f8d3 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -5153,6 +5153,35 @@ ROM_START( pacgal ) ROM_LOAD( "82s126.3m", 0x0100, 0x0100, CRC(77245b66) SHA1(0c4d0bee858b97632411c440bea6948a74759746) ) /* timing - not used */ ROM_END +ROM_START( pacgal2 ) + ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code+64k for decrypted code */ + ROM_LOAD( "pmg1.bin", 0x0000, 0x0800, CRC(8167fffc) SHA1(adc26e8baaf9b12c382b5606f2438f7ee6d2f7f5) ) + ROM_LOAD( "pmg5.bin", 0x0800, 0x0800, CRC(618bd9b3) SHA1(b9ca52b63a49ddece768378d331deebbe34fe177) ) + ROM_LOAD( "pmg2.bin", 0x1000, 0x0800, CRC(7d177853) SHA1(9b5ddaaa8b564654f97af193dbcc29f81f230a25) ) + ROM_LOAD( "pmg6.bin", 0x1800, 0x0800, CRC(4f91d245) SHA1(496f3d913a0abf6fa441615aedf60180e71866e8) ) + ROM_LOAD( "pmg3.bin", 0x2000, 0x0800, CRC(d0f20748) SHA1(7673d9744903f58d70ecc0ee817b57c3ce09dd80) ) + ROM_LOAD( "pmg7.bin", 0x2800, 0x0800, CRC(a948ce83) SHA1(08759833f7e0690b2ccae573c929e2a48e5bde7f) ) + ROM_LOAD( "pmg4.bin", 0x3000, 0x0800, CRC(4c842da6) SHA1(dbc84516e44412f863ffb678347929043fab852e) ) + ROM_LOAD( "pmg8.bin", 0x3800, 0x0800, CRC(022764dc) SHA1(0ab0da0834d88f3b1808755aec5c38a3ddd8184b) ) + ROM_LOAD( "u5.bin", 0x8000, 0x0800, CRC(f45fbbcd) SHA1(b26cc1c8ee18e9b1daa97956d2159b954703a0ec) ) + ROM_LOAD( "u6a.bin", 0x9000, 0x1000, CRC(3fdcb271) SHA1(4d604b98c6981a469041c0038345dbd5dcf4cd1d) ) + ROM_LOAD( "u7a.bin", 0xb000, 0x1000, CRC(5fafec7c) SHA1(1c6a85e5c348a69b8d51bcea4f8bdebb24825770) ) + + ROM_REGION( 0x2000, "gfx1", 0 ) + ROM_LOAD( "pmg9.bin", 0x0000, 0x0800, CRC(93933d1d) SHA1(fa38d2cb87e872bb9a3158a4df98f38360dc85ec) ) + ROM_LOAD( "pmg11.bin", 0x0800, 0x0800, CRC(7409fbec) SHA1(f440f08ba026ae6172666e1bdc0894ce33bba420) ) + ROM_LOAD( "pmg10.bin", 0x1000, 0x0800, CRC(22b0188a) SHA1(a9ed9ca8b36a60081fd364abc9bc23963932cc0b) ) + ROM_LOAD( "pmg12.bin", 0x1800, 0x0800, CRC(50c7477d) SHA1(c04ec282a8cb528df5e38ad750d12ee71612695d) ) + + ROM_REGION( 0x0120, "proms", 0 ) + ROM_LOAD( "82s123.7f", 0x0000, 0x0020, CRC(2fc650bd) SHA1(8d0268dee78e47c712202b0ec4f1f51109b1f2a5) ) + ROM_LOAD( "82s126.4a", 0x0020, 0x0100, CRC(3eb3a8e4) SHA1(19097b5f60d1030f8b82d9f1d3a241f93e5c75d6) ) /* 7611p4.4a */ + + ROM_REGION( 0x0200, "namco", 0 ) /* sound PROMs */ + ROM_LOAD( "82s126.1m", 0x0000, 0x0100, CRC(a9cc86bf) SHA1(bbcec0570aeceb582ff8238a4bc8546a23430081) ) + ROM_LOAD( "82s126.3m", 0x0100, 0x0100, CRC(77245b66) SHA1(0c4d0bee858b97632411c440bea6948a74759746) ) /* timing - not used */ +ROM_END + ROM_START( mschamp ) /* "Original" Zola-Puc board. FORCE ELECTRONICS KM-001 PCB copyright by RAYGLO MFG CO 1992/1993 */ ROM_REGION( 0x20000, "maincpu", 0 ) @@ -7164,12 +7193,13 @@ GAME( 1981, mspacman, 0, mspacman, mspacman, pacman_state, mspacman, ROT GAME( 1981, mspacmnf, mspacman, mspacman, mspacman, pacman_state, mspacman, ROT90, "hack", "Ms. Pac-Man (speedup hack)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, mspacmat, mspacman, mspacman, mspacman, pacman_state, mspacman, ROT90, "hack", "Ms. Pac Attack", MACHINE_SUPPORTS_SAVE ) GAME( 1989, msheartb, mspacman, mspacman, mspacman, pacman_state, mspacman, ROT90, "hack (Two-Bit Score)", "Ms. Pac-Man Heart Burn", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, pacgal2, mspacman, mspacman, mspacman, pacman_state, mspacman, ROT90, "bootleg", "Pac-Gal (set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, mspacmancr,mspacman,mspacman, mspacman, pacman_state, mspacman, ROT90, "bootleg", "Ms. Pac-Man (bootleg on Crush Roller Hardware)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, mspacmab, mspacman, woodpek, mspacman, driver_device, 0, ROT90, "bootleg", "Ms. Pac-Man (bootleg)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, mspacmbe, mspacman, woodpek, mspacman, pacman_state, mspacmbe, ROT90, "bootleg", "Ms. Pac-Man (bootleg, encrypted)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, mspacii, mspacman, woodpek, mspacman, pacman_state, mspacii, ROT90, "bootleg (Orca)", "Ms. Pac-Man II (Orca bootleg set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, mspacii2, mspacman, woodpek, mspacman, pacman_state, mspacii, ROT90, "bootleg (Orca)", "Ms. Pac-Man II (Orca bootleg set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, pacgal, mspacman, woodpek, mspacman, driver_device, 0, ROT90, "hack", "Pac-Gal", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, pacgal, mspacman, woodpek, mspacman, driver_device, 0, ROT90, "hack", "Pac-Gal (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, mspacpls, mspacman, woodpek, mspacpls, driver_device, 0, ROT90, "hack", "Ms. Pac-Man Plus", MACHINE_SUPPORTS_SAVE ) GAME( 1992, mschamp, mspacman, mschamp, mschamp, pacman_state, mschamp, ROT90, "hack", "Ms. Pacman Champion Edition / Zola-Puc Gal", MACHINE_SUPPORTS_SAVE ) /* Rayglo version */ GAME( 1995, mschamps, mspacman, mschamp, mschamp, pacman_state, mschamp, ROT90, "hack", "Ms. Pacman Champion Edition / Super Zola-Puc Gal", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 792041717fb..561e8ecca67 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -28717,6 +28717,7 @@ nmouse // (c) 1981 Amenip (Palcom Queen River) nmouseb // (c) 1981 Amenip Nova Games Ltd. numcrash // (c) 1983 Hanshin Goraku / "Peni" pacgal // hack +pacgal2 // bootleg pacheart // hack pacman // (c) 1980 Midway pacmanf // hack From a4f615a14de8844ba996cf89d26639be9fb7c33b Mon Sep 17 00:00:00 2001 From: "therealmogminer@gmail.com" Date: Tue, 29 Mar 2016 01:56:19 +0200 Subject: [PATCH 40/74] Get NTSC working in both bgfx and d3d, nw --- bgfx/chains/default.json | 4 +- bgfx/chains/hlsl.json | 50 +++++++++------ bgfx/chains/unfiltered.json | 4 +- bgfx/shaders/dx11/fs_blit.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/fs_color.bin | Bin 45305 -> 45305 bytes bgfx/shaders/dx11/fs_deconverge.bin | Bin 43108 -> 43108 bytes bgfx/shaders/dx11/fs_defocus.bin | Bin 49898 -> 49898 bytes bgfx/shaders/dx11/fs_distortion.bin | Bin 60482 -> 60482 bytes bgfx/shaders/dx11/fs_gui.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/fs_ntsc_decode.bin | Bin 60967 -> 60511 bytes bgfx/shaders/dx11/fs_ntsc_encode.bin | Bin 50379 -> 50379 bytes bgfx/shaders/dx11/fs_phosphor.bin | Bin 45190 -> 45190 bytes bgfx/shaders/dx11/fs_post.bin | Bin 57706 -> 57706 bytes bgfx/shaders/dx11/fs_prescale.bin | Bin 45438 -> 45438 bytes bgfx/shaders/dx11/fs_screen.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/vs_blit.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_color.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_deconverge.bin | Bin 45836 -> 45836 bytes bgfx/shaders/dx11/vs_defocus.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_distortion.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_gui.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_ntsc_decode.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_ntsc_encode.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_phosphor.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_post.bin | Bin 43223 -> 43223 bytes bgfx/shaders/dx11/vs_prescale.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_screen.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx9/fs_ntsc_decode.bin | Bin 7464 -> 8356 bytes bgfx/shaders/gles/fs_ntsc_decode.bin | Bin 6640 -> 6438 bytes bgfx/shaders/glsl/fs_ntsc_decode.bin | Bin 6282 -> 6050 bytes bgfx/shaders/metal/fs_ntsc_decode.bin | Bin 7098 -> 6849 bytes hlsl/ntsc.fx | 26 +++----- .../render/bgfx/shaders/fs_ntsc_decode.sc | 57 ++++++++++-------- .../render/bgfx/shaders/fs_ntsc_encode.sc | 2 +- 34 files changed, 80 insertions(+), 63 deletions(-) diff --git a/bgfx/chains/default.json b/bgfx/chains/default.json index 1142275e528..1012d6eacd5 100644 --- a/bgfx/chains/default.json +++ b/bgfx/chains/default.json @@ -7,14 +7,14 @@ } ], "passes": [ - { "effect": "default\blit", + { "effect": "default/blit", "name": "Copy To Unstretched Texture", "input": [ { "sampler": "s_tex", "texture": "screen" } ], "output": "temp" }, - { "effect": "default\blit", + { "effect": "default/blit", "name": "Final Upscale", "input": [ { "sampler": "s_tex", "target": "temp" } diff --git a/bgfx/chains/hlsl.json b/bgfx/chains/hlsl.json index 3353f92018a..eabf0664857 100644 --- a/bgfx/chains/hlsl.json +++ b/bgfx/chains/hlsl.json @@ -57,17 +57,18 @@ { "type": "intenum", "name": "adjustments", "text": "Enable Adjustments", "default": 0, "max": 1, "min": 0, "step": 1, "scale": 1.0, "format": "%s", "screen": "any", "strings": [ "Off", "On" ] }, - { "type": "intenum", "name": "ntsc", "text": "Enable NTSC", "default": 0, "max": 1, "min": 0, "step": 1, "scale": 1.0, "format": "%s", "screen": "any", "strings": [ "Off", "On" ] }, - { "type": "float", "name": "a_value", "text": "NTSC A Value", "default": 50, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, - { "type": "float", "name": "b_value", "text": "NTSC B Value", "default": 50, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, - { "type": "float", "name": "cc_value", "text": "NTSC Color Carrier (Hz)", "default": 35795454, "max": 36795454, "min": 34795454, "step": 100, "scale": 0.0000001, "format": "%1.7f", "screen": "raster" }, - { "type": "float", "name": "p_value", "text": "NTSC Phase Offset", "default": 100, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, - { "type": "float", "name": "scan_time", "text": "NTSC Scanline Duration (uSec)", "default": 526, "max": 1500, "min": 1, "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" }, - { "type": "float", "name": "notch_width", "text": "NTSC Color Notch Filter Width", "default": 100, "max": 400, "min": 1, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, - { "type": "float", "name": "y_freq_response", "text": "NTSC Y Signal Bandwidth (Hz)", "default": 600, "max": 2100, "min": 1, "step": 10, "scale": 0.01, "format": "%2.2f", "screen": "raster" }, - { "type": "float", "name": "i_freq_response", "text": "NTSC I Signal Bandwidth (Hz)", "default": 120, "max": 2100, "min": 1, "step": 10, "scale": 0.01, "format": "%2.2f", "screen": "raster" }, - { "type": "float", "name": "q_freq_response", "text": "NTSC Q Signal Bandwidth (Hz)", "default": 60, "max": 2100, "min": 1, "step": 10, "scale": 0.01, "format": "%2.2f", "screen": "raster" }, - { "type": "float", "name": "jitter_offset", "text": "NTSC Frame Jitter Offset", "default": 0, "max": 200, "min": 1, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, + { "type": "intenum", "name": "ntsc", "text": "Enable NTSC", "default": 0, "max": 1, "min": 0, "step": 1, "scale": 1.0, "format": "%s", "screen": "any", "strings": [ "Off", "On" ] }, + { "type": "float", "name": "a_value", "text": "NTSC A Value", "default": 50, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, + { "type": "float", "name": "b_value", "text": "NTSC B Value", "default": 50, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, + { "type": "float", "name": "cc_value", "text": "NTSC Color Carrier (Hz)", "default": 35795454, "max": 36795454, "min": 34795454, "step": 100, "scale": 0.0000001, "format": "%1.7f", "screen": "raster" }, + { "type": "float", "name": "o_value", "text": "NTSC Outgoing Phase Offset", "default": 0, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, + { "type": "float", "name": "p_value", "text": "NTSC Incoming Phase Pixel Clock Scale", "default": 100, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, + { "type": "float", "name": "scan_time", "text": "NTSC Scanline Duration (uSec)", "default": 526, "max": 1500, "min": 1, "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" }, + { "type": "float", "name": "notch_width", "text": "NTSC Color Notch Filter Width", "default": 200, "max": 400, "min": 1, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, + { "type": "float", "name": "y_freq_response", "text": "NTSC Y Signal Bandwidth (Hz)", "default": 600, "max": 2100, "min": 1, "step": 10, "scale": 0.01, "format": "%2.2f", "screen": "raster" }, + { "type": "float", "name": "i_freq_response", "text": "NTSC I Signal Bandwidth (Hz)", "default": 120, "max": 2100, "min": 1, "step": 10, "scale": 0.01, "format": "%2.2f", "screen": "raster" }, + { "type": "float", "name": "q_freq_response", "text": "NTSC Q Signal Bandwidth (Hz)", "default": 60, "max": 2100, "min": 1, "step": 10, "scale": 0.01, "format": "%2.2f", "screen": "raster" }, + { "type": "float", "name": "jitter_offset", "text": "NTSC Frame Jitter Offset", "default": 0, "max": 200, "min": 1, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, { "type": "color", "name": "red_ratios", "text": "Red Output from ", "default": [ 100, 0, 0 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, { "type": "color", "name": "grn_ratios", "text": "Green Output from ", "default": [ 0, 100, 0 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }, @@ -88,18 +89,18 @@ { "type": "color", "name": "phosphor", "text": "Phosphor Persistence, ", "default": [ 55, 55, 55 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_alpha", "text": "Scanline Amount", "default": 40, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_alpha", "text": "Scanline Amount", "default": 6, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_scale", "text": "Overall Scanline Scale", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_bright_scale", "text": "Scanline Brightness Scale", "default": 200, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_bright_offset", "text": "Scanline Brightness Offset", "default": 0, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_jitter_amount", "text": "Scanline Jitter Amount", "default": 0, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_height", "text": "Individual Scanline Scale", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_variation", "text": "Scanline Variation", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "shadow_alpha", "text": "Shadow Mask Amount", "default": 20, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "shadow_alpha", "text": "Shadow Mask Amount", "default": 40, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "vec2", "name": "shadow_uv_count", "text": "Shadow Mask Pixel Count ", "default": [ 12, 12 ], "max": [ 128, 128 ], "min": [ 1, 1 ], "step": 1, "scale": 1.0, "format": "%3f", "screen": "crt" }, { "type": "vec2", "name": "shadow_uv_size", "text": "Shadow Mask UV Size ", "default": [ 500, 500 ], "max": [ 1000, 1000 ], "min": [ 0, 0 ], "step": 1, "scale": 0.001, "format": "%1.4f", "screen": "crt" }, { "type": "vec2", "name": "shadow_uv_offset", "text": "Shadow Mask UV Offset ", "default": [ 0, 0 ], "max": [ 1000, 1000 ], "min": [ 0, 0 ], "step": 1, "scale": 0.001, "format": "%1.4f", "screen": "crt" }, - { "type": "float", "name": "humbar_alpha", "text": "Hum Bar Amount", "default": 0, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "humbar_alpha", "text": "Hum Bar Amount", "default": 5, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "humbar_hertz_rate", "text": "Hum Bar Frequency", "default": 100, "max": 10000, "min": 0, "step": 1, "scale": 0.00001, "format": "%1.7f", "screen": "crt" }, { "type": "color", "name": "floor", "text": "Signal Floor, ", "default": [ 5, 5, 5 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "color", "name": "power", "text": "Signal Exponent, ", "default": [ 80, 80, 80 ], "max": [ 400, 400, 400 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, @@ -154,6 +155,11 @@ // oversample (optional): Double the internal size of this render target. Certain effects benefit from operating at a higher internal resolution. If you're not sure, leave it as false. // values: true, false // default: false + { + "name": "ntsc", + "mode": "guest", + "doublebuffer": true + }, { "name": "guest", "mode": "guest", @@ -169,6 +175,15 @@ // passes (required): The list of individual shaders to invoke, and any dynamic input parameters they need. "passes": [ + { + // See the pass after this one for a verbose explanation of each parameter. + "effect": "hlsl/blit", + "name": "NTSC Blit to bilinear-able target", + "input": [ + { "sampler": "s_tex", "texture": "screen" } + ], + "output": "ntsc" + }, { // effect (required): The name of the effect JSON file to load for this pass. // value: Any valid JSON filename included in your shader chain, without the extension. @@ -246,13 +261,13 @@ // // option (optional): The name of any MAME option, which will have its value fetched and used as the name of a PNG to load from the artwork directory. // value: Any valid MAME INI option name. - { "sampler": "s_tex", "texture": "screen" } + { "sampler": "s_tex", "target": "ntsc" } ], // output (required): The target to use as the output for this pass. Can be one of the named targets in "targets", or "output" // or "previous" for one of two automatically-generated targets. // value: Any valid ASCII string that names a target. - "output": "guest" + "output": "ntsc" }, { "effect": "hlsl/ntsc_decode", "name": "NTSC Decode", @@ -264,6 +279,7 @@ { "uniform": "u_a_value", "slider": "a_value" }, { "uniform": "u_b_value", "slider": "b_value" }, { "uniform": "u_cc_value", "slider": "cc_value" }, + { "uniform": "u_o_value", "slider": "o_value" }, { "uniform": "u_scan_time", "slider": "scan_time" }, { "uniform": "u_notch_width", "slider": "notch_width" }, { "uniform": "u_y_freq_response", "slider": "y_freq_response" }, @@ -274,7 +290,7 @@ { "uniform": "u_jitter_amount", "parameter": "jitter" } ], "input": [ - { "sampler": "s_tex", "target": "guest" } + { "sampler": "s_tex", "target": "ntsc" } ], "output": "guest" }, diff --git a/bgfx/chains/unfiltered.json b/bgfx/chains/unfiltered.json index 19d74cd5eec..a644f9af370 100644 --- a/bgfx/chains/unfiltered.json +++ b/bgfx/chains/unfiltered.json @@ -7,14 +7,14 @@ } ], "passes": [ - { "effect": "unfiltered\blit", + { "effect": "unfiltered/blit", "name": "Copy To Unstretched Texture", "input": [ { "sampler": "s_tex", "texture": "screen" } ], "output": "temp" }, - { "effect": "unfiltered\blit", + { "effect": "unfiltered/blit", "name": "Final Upscale", "input": [ { "sampler": "s_tex", "target": "temp" } diff --git a/bgfx/shaders/dx11/fs_blit.bin b/bgfx/shaders/dx11/fs_blit.bin index 98e6afc9871200c65105976444a7239ca1843106..cc7afc788ab49b8e05e07dcf3340eef02f77c256 100644 GIT binary patch delta 107 zcmbPno@vH;rU^0vJ1?~B)n)64yL>XKIlgT3+l@Lo+!Fr}{|sYfU|{%mL#OqTX`t_t pWCoXOPTRXTZ{U98$m-UZ&gHv#q3?HJJPK!rF)@~JW}i2a696+mFH-;j delta 107 zcmbPno@vH;rU^0v=bCK3y;=3(Kwn9tRp)W((v3Pf+!9T*eugnJFfgoBOo+`6Gj&+- py`b#GoX^uXZ{U98$h!5eN`T4cg}&c?@hF@f#>8l{nSI_wP5@Mag1j;;LJUV38BEtPGZc9;FeEKzVqg&1Y{bxios}v`kPGy)wr21+?*U6BL$>3SH?8B;W2!17!#xR!!S1x=2 delta 100 zcmaEIf$7NwrU^0v2|1GYOMgZC-mhN7`)$MBi5qn+cqE!<{S0GdU|`^#+H?8GA2HuK io2+UX_Gp@JuHkv($okQJc7Vy|T)*#ucoZ&p!43fPq%3j( diff --git a/bgfx/shaders/dx11/fs_defocus.bin b/bgfx/shaders/dx11/fs_defocus.bin index 0453ced92453c3df9befa1be5071fa2610064c3a..f342c80f26b6b4e4b618c6bf3d4a31cd3c9da541 100644 GIT binary patch delta 215 zcmaFW%KWO8d4iq5v^~tVx2}6#-ytxiPl`Y7$VR_8d=mc;{|sYfU|3&Cf(Q95~uo7IXP_USyoC z$Zs%NU^&ZXtxzse?SLExhEE^47$ih_1sE8BTA274#6=l^Y-T2e96v~I^2K$blMPsn iHb2W^@xtShtzk@zc9SEw%QJoEn5?&5YV(xsVcYCVmMPq4qC~3>%L!Fr2JnV5q$XR41@mk#!g2=4T=t4jhjy69P;+FEUP6 z-XGkmn diff --git a/bgfx/shaders/dx11/fs_distortion.bin b/bgfx/shaders/dx11/fs_distortion.bin index 4399b58c49ccafe3c5bebecc2c43da9c65754578..0ee1150c722e697f1aec07d6e2f02821c8a2e5a1 100644 GIT binary patch delta 190 zcmX?fgZa=6<_YHnas+as4Lu%h@I0P*Z|$@HJ{#|)h)euG{49G!F){StV&1$_W~wizJL_#O-_DDS zjFTJr^f%XK-I8Y#D4879B?Y85mvvb&3nc&z{`8TLL0ptUfPsOTDS=`0q27iNJeEER UV`4O#yzz-XQ*6lQM^6&i0o`Cn&;S4c delta 190 zcmX?fgZa=6<_YHnvL?;mzQ&R>@&4x<)4v>EHFM*=6mf~>SwF)V85kILuFdw9U;p26 zcPX>zt=khOZH|)AVPU_Q%EU0|1@q)y8A)!R7-j~oOH2$w7nwG1l$q+wS@-c{uG6*m*Ff%zYZ9df75Q4|j WM`28i+LJdv(P!FXw)xSM1a<&;aZ6wT diff --git a/bgfx/shaders/dx11/fs_gui.bin b/bgfx/shaders/dx11/fs_gui.bin index 1ef0ea198277f40b3f9375dd26c6d35b0bb01618..54a4ed300e39e1370d7769737e865ea0a696022e 100644 GIT binary patch delta 143 zcmbPno@vH;rU^0vDp%HV_{R3y7YHbKdOuicwNWRBTY}-p&oD*?1_rLPN{g#yW&L}e zx3XECllR-af%^wD`^0Pp2H}T{o7eNdwPkfI)(OK1oYbZ10FWg3tKvg9X8&`{Cc zD%DVN>h!i2XVPh=QpHZkVY({JNEI!PTI~$ljAg2|87Kajkyb>erPXS`bNAfk<%M?I z|9#=^cfaqRd+xdSzIX3^kH_Bj{`r*maE4X8{-aeJS2p?9teg1Y@x?d&touxP)^ls0 zwuor`M?^kgEz&`xQ%GyG)e`H8KzE2J0y-yo+WN5-Uq%$HqcC|OWeR$@99D1Typqa+ zu-yv|J8s1j!Ow+D+Z%sg=#K`& z_&j$FA;S?-^Ce*ls7U6l`b&uXPL)eD6E=R+SC+e6-I%#HgGbw^4rP`Xaog;Wt0MMv zBaa5vdznkJSD;_%q^`)?ykSE|YP@t5sD#LL8;FIt%s31<%5sqZn~bx&URc*tf66NI zvkBh|$s>WI)?AL!IAiA~x@_b#Nj)%Qz6U`*HRB0SCM7#UKkyWDC_Jh>?>y3sRs=t| zpVZ8p^<`|p^La4?#1YI>hjV7BpXMA6Ot1;Ap5!+QU$v6udD$NPe2QG5&o}$a-~3|( z8~ibL`*$nbzq#s}cYpEtGx<-?OEwl2`|=L_!9z=)@Y0(by>#m%=ukMhCHyq1+P>xS zSnrS>yM9Yge|JYy-!709_R{+0!EN1rTZZcGsRb#qVrl)t+8S6*{jE$_YT44gZE8g) zTVxO2-j}vjM_*d4&TsmSH7b&m1P<=Ot=5){X7dy&1IA?jZ zcun2fj^6D_yHw_|1a~+xISdA_JD(wYETwI4~FS9i` zelN^^Z#_Kpss~@a`l<@#tL&Y-whRn)3{;{kyV?f(b`5OpXlsx43@#kTm5#Z^8S}9E z3m6Ad+>L`bl!jKcqMM1D*O6a@79~HMCZ-@CQ@A`T1`!5T{3rTo;TSao^J)e z`1p&D`7vC&I=Num7gokedw+19s_nc!vvBo5=aJ^*zRoI7UjHn9kg+Ud^GTt4amPka zD5Ofe3X4J^UY83gnrl%8`LRlG2Df0XuInmftLIm45^Z!KFxzdUR{@pVQ(YqQ&2wAmg#Z>+ zr6%YanAEv~#%h4J$~f$~x~+-;&&pIYy(nli1YT+aub*b87YF0cuicINi&cH!^1z5@ zlYwPwIL-D`gF4pN7#NpMMwG9=F_4da%A$>d2DP@oG1{WpyufBO#*>84ot+we*rBsiqpPl+k+u=-bkd)27_n2M?{(y*SYTi&&)StnfIq!3OGrHTG(cRvRu8s_?itg1;_xO%Gn&c3Te!`)1h(>?ep>v2v zSJ&){M8~w#*XX3fh@BdJ+@Z5mqn~o2+_@*m=z>wGqq{q6 zba!Wq{pyBqH@BY9?k1*n*68le8r|L56Mpp`+;!tE#-jD)o?oN8=hx`&`Rxv$B-Pw_V%GlG~dQiLjd|GFX?(VG7-JLxcP(OmZSH+%r!|XOaGze# z`LSH9bsHxbqWQEgcLcbnP?gz;fZ z-k7V#yP{UUvg5NZ9fNy|is`VU6}={^sH60#qg1beDiJTMeK`B2XK#p|z4`b1pE|Sn zlCM2WbQX5C7(~7-{PE`wzFt6@7f`Rq3*&#mA!{!vP;XMq4+=j4JOeIB=fFP!7bF{X zxLlALz|VpU(kAdv!3Aj#_&IPv8nq}+|Ac@HBk?)$GjKuTL)X8+1&L2hpMwih12|sL z6N0oE+yWOQJ}`N}1?i}8K^phOiM%l2(-V-+r!XN%e2&UNxgb@52fzjOiHLbiO4o-O z=AFVv#9om2+`;97G!_?OOe!1`E=Vtf&p-u1dK)|hE~t+j+2DNi08&i~6N0o>xFGR) zggYci@jW6465oJf7zola;ez_`fwzXl1au(rF(D6JkZOesQj2gweFB&X`@PVCalLzE zJ`=o)^StuLTL3Po_sl|Y-aCPMyPE~h+a8d3rLMMR?Hb|zMkt2^4q^x0LY*3Kq?pD6jb-Q>hwjEw%9Abv)sB&^1#9SX zc(rH^N>Z3hEh@OLT4nDW@Rm?n^6q`V#+TFm+bwHA-T%NGYasd91Hr4l`i$!Oj``JR z)UQ6H{=c75&v?}RZ-ff&!l8~Y9R4W68C*Vmy7@`6eBAHxbcc{HO0ItMuUT39a0no3 zO*Xvqk@vs+C&;_Cy4udk!ki)b___yMj78U|hbBw0+wldzJ16sT1i^NT%c3uFajrX* zd~fn*>ymA&u}*^@X~wC#Os#u=Zov-FMx-vJtw=RUnQHI*_hsCQ+yWK);QLm!8vUTD m>}qg!96@SF>Ok6t)QPkmiN8&iCvObDW+gYjv()1`PX7j+?BRV~v?fn9O;-Spa&R7eB9hLN2hVx(a7>=YW`@cbZ-akXZ2ZOuzmyLpSW|j5 zs77@;@soRC4KK$>0Ka^F_ZM*WLa2wU2bdhT@fkgMKAd*;a|Q50;bqQK-IlyEsVRvk z?%Cwxd`^|au{%O|O^9St?7kn`P`N2BO)q$(Yh`lav2!OZK7E;SeOm@>$?)O1 zi|?1IZR)L*d_TMJv>KN@osVjDXRA_Ay1E-!oSN-nvkz{0YQQ}^>t-1@U!N^m%1+JI zKCI-aOwWW5=MnSC;ub5>%W%&$?~GVH&MW3Sja#h5e8uWfwkJ2%hu0+5CvqX>ur-~h z%Z!N=GIPuWXi8GQ^W5nAGDDsByyR+1iah82p{oFf6uzCgm$}gls&D#MX$QWiuj}xt z@3`kQTX1wmc4fb5Mefh^xvVph*32)^&Q44$di2NtY+{!e+Ft$9$!S~apZDLnv+l@i zhjk}>SgQ4pQ-7iI61~3)x@gf$33T?W$a4j+*QnNGcSc@Vz1d1`>*?OuXRGO}1E%@i z)eVt1-Ym2p>glyh)^_*VYrES!`t7B5MYS|*?3=1gd#Px1?5a}lcJG?5p4L9Q8{WEw z{^(m;9o4Js?kZ!cD(Nn_<+oG~y|t`(Q}f22O}%X$&FyQ~Z=BbU!!EN+(4)+LcvEX{ zUq^4L+SWY3dUJDMM}J#SPj7q0ysf1Zu~#8On1ucB0~Z<&#V_`yc?a*JQhKjDe734N;CaKanYr>dt;ctg5RB|f{Ws=arw z?QZ*aWA_4Ff15(U>w8zmycbS*qq#J6-QWwO?v0H+ z{hWzzT_-g3sOz_4uDW#{SLm_D(}UBaROPL2FT&{iw)Egr^tpC@Tk}?)6o*_{ie+GZ zVN{R&`sBDvP3@TJy?Wv51-^G5s8=-~*G3MmIbyk&J<=Gg+Wn5Diax4PKk2lSKPzm? ze*f0UZ#&CeQ@V1ZxAiE0<8X}n)K?GPmmj5m3T9c9ga=b1wZLexxo4dpW;duYr#a0( zTUUR>sE;28#_a5!tv0O7L3cbTV)kpg&+ob&X4_$Qc2}zF&f6z)bH(Mx4^X};>uyI< zCRx_6x!Rod&sbN~>+5gBr?>ky*J(@L-CgS%u+&~a*i!Fx2Rzv*0v6e6v(&7f<(|Ws zUW<05m8ioHS9>mNR+Cntu7E{7hp1cydY5}zbidKmDm4hUU$Z@_*zg zk&H=3V)S;0&Lc5;r$gtF7+p1Q3TC6RSHMyRp8&g1 zx3PN=2D8@bZcrnA)xi?YE?ZB*hgaRqq0#p^bk5A^&pLF@%;@T_O*M`EI_N6e?{MPb z8vTGn=b%PEt59tAhx7RtIfQ7HM+WaYap1ItiQ{NSgmXBL!&1;bPj5Cw?pTkMpwT_P+Nk=-`qxzzqySbe{&mM z-McN2-|ps2AF$#Vs@<(#-sX>)Fk3t7^T%}Wu1T4Xc~t8Tf6N@8Im}O^_Yk)47V?hI ze8{UVqPH=}XAX1GBlY=JsoZ-N#V<5wkD22$ zhxwMB_4!@8_mxSRccrSIqqi}~XAbi_=sl==pP7{TV5(XW^2f~anZw)~s;xYd#^dg{ zGUL{}99sp8+*Y4%C2A%>gNQ9Mjg9Ag{paKZk(}e|zm!7}{X(jl- zkbt1x6fy6L>UuxJd`S3<;x9t90ZALd;+*21%wOI zeZmEG`Q|0zG7i+0H;FF@4%9`Hmng*56AfMPc#XL50d=k7HR77ZOT=Zy11?An!Ud@x z+zY!P?H4XcC&5!;7o^Kk9tul?N>cD50}g@|6fQ_%a3Ab~bV#@$odQpXT@YDExgg~U z7o;l9LlllSh`4rUAb=nZ2^XXT!UgH5a6wc_JloJ;kn&K`mJ82^SQ1m57H#~2Hc(1378=KF;+GUp1){)~m- zr-U;yza*TIc_vCH`!g~x4~f7fcRGXy;f&1Ng)=e_3uk1$4>$t>8EtT`&CD5#z|RS1 zoC(gwxflZ$Bwq!DSr9a;g26iqZ=fu^Mn>I3<+TMD0=2H587vMJ(^M*iVz7v&z-p1f zd%z38mm)$9u=2k?b7;EujbbjPV!v%6hL5U&b#xQmLRJV3AJsxI7cj^v=R#-Xl#Agv z6WB%f(?c5XrF9x}H1Yu09*;Z_9=gG~h{pqDET`qs#)L4Lmm%|M=)hPi7~|^k-EBGd zK;4)?zGwc$NbA|t2?cxREwKL6EBVNl4=Y@=c?)h6wIFQlaN$2d8|2FS zP>3wLNxeNb!(FXCaK*om-G~cE3O`3T9@W3GY9?m&9v00&jI{e8KR=Ha7=?|>AYV^~(LhLw*|38KAC$;13!1*A~ YH8?vl;@Q?ZjPOcA+x#-`s!>EzHvW~fCR&lpJ9v)3=9`DH;OKox$fEF zA`sQjpd7UMvA_>zqf_Y&3@an=gd@XXGr?X5{wmyvWEnnUP(8GJB)~>vw&@E54g`B1?G%HVc`}ZR3CUV5|PJ z`=O`#4sPC#Z31Q<-A@@1PR zW!`2K3SeSj`1FyFL0l9l$H2@Kz%;o&dzzfU9FQ;u9N0t zss8R2_idXW3;bXAn>1o!BK^gq2HB}L2)}HgWU{9hK)xV z7z}PQFx1`xnj^58k$o5A=Hp_s?U~CLSu||ZWC3vui@Hv zyEB(};?Xag=kfeuW}leNz##mPaq>a|N&fp!7#K{~F*B^}U}Q*I%rv=Sfym|yOiLLz zHwkgrv1TUQa`|rV57@{hRKUc*@aZETgSaSz00RRvQvuWDpy+8#0)HpJik1RWo7rL- e-0)buD2$2Ge)88P@=WuqC!bm(wb@{47&ibJFHHgf delta 198 zcmZpB$kg_bX@Z|Xs9)05+%uC|wNC!Kk;He+Wn-KMk3`d~pJ9v)3=E|WA}#04Cb)Lq zoz`VlZ9D%;5TynIUO0)8vK)BAYKTEoI!? zB*bCInwt5~-(+)tz(y`11E6uAKJqb$i!ul>FfcP2FiZ}Lp2n2$dGf1hDIm3(EvCT@ dkHw3^m>4Z5e_bNav^;Q)m+OSGbZb@9=UDZ-+&5fI%F}4UxG|l=M#>l|HaDB(lrMiiI zjy)|;_8QLDklx%R%EH2aFO`X5&I{(ry^@;Tlm0L>lpSYaU5mY4C0~;0t^hyOb$$w{p#*9O^BMTS1$#mHha}8gy6CA Pau^e%&gPp}CvpP-#K}dl diff --git a/bgfx/shaders/dx11/fs_prescale.bin b/bgfx/shaders/dx11/fs_prescale.bin index a179c13e6ec4a50a27bd8f9fbaeceb40992bd97e..7e5fadd5805e533e2ef54f36167ca9e071c3f7cb 100644 GIT binary patch delta 151 zcmezOi0R)WrU_00kMhFfcO}Y&MMZb;o1q(l91Qlg)3JPvisu!`wUH delta 151 zcmezOi0R)WrU_00y4BC5GLzzhxjA?vK0ajFw=qbESE6aw&oD*?28O*X#+h4IE%jKZ z!pG>@n_;|p8t)HgcIPZ62HwZao2LrCwdV|+cHiHm^CBbTFIcM6d0g+KoCn+!Fr|{|sYfU|{&j{QhQ`;sx*N z%kN)*=czM$^9Jr8%xn|085o2gZeGX#&XzUmpbnSs=7qj9IRp!s7#Kc%>cLoipQ+kVN8sco7v}02Yzx!;w$wosF9*Mt)e}*wKFfbTRN}t`7ILoo? p-v0GAyw4;z$MU>!Wc|l!#Ob@)&+of89)+{Qm>4ZKZ<#Zl8vws0Es6jD delta 107 zcmX?of$8)GrU{Ay$6}dPqg?N9bDo>BM&bD>(~X8AJQ5AFeugnJFfc?ZzCE+^>`9+J ppH2yA*sMt29Lw{@ku_vLo4?6sKfmwZcofbGV`8-1yk*XGZUDn&E@A)x diff --git a/bgfx/shaders/dx11/vs_deconverge.bin b/bgfx/shaders/dx11/vs_deconverge.bin index 62440de3aa77ab069baa3f57ea8e618abcbee9b4..59e0c530392a70152e212fea41c3a0fe79dd349b 100644 GIT binary patch delta 122 zcmeBq#?y^XvJfw)Sn>WjnQd;f~CuvK#Md@JakV{4yRL#%nr)4BQzZ1N9d*Yma<&F0=_#_%<{S0GdU|f?4W2{3r%kjT)Wu1~)=x?%_Ka|yvDOhf^*y0b2cr+{xV`9{uT)JEzq;}czG;RRi C6f)%i diff --git a/bgfx/shaders/dx11/vs_defocus.bin b/bgfx/shaders/dx11/vs_defocus.bin index df493402ed8374921f33fdb45411db1115264af1..f75c794c2c2631dfd9f9a0ca3d269f96f19cf0aa 100644 GIT binary patch delta 148 zcmX?of$8)GrU{Ayb6#zpy|MP?x$p57pW-q;hi^0#;gR@z_-7a+0|SFg(5nX9{mxEZ z7RwET9pgJU$MU>!WVKZ|&gr|^&yUrM$v0zj=!_4Hcr?rkV^Ycn8ifG4iJ5r}dHH#% UKq1{-dLJ1Xd@?p)om0jQ0R9m+w*UYD delta 148 zcmX?of$8)GrU{Ayr#VG>4v2l6@np(swY&H7-flD$;gM*Z^)rl-fq~)ZYo_1*dCl(o zy7TJ)GnVUZj^%md$U5`F6n~S=etxW8OaUC5LuY(o#G_$W7?Y9#&?p4RP0Y+=$ji@5 U1q$iz()-BB5W=zf>YOre05R-0+yDRo diff --git a/bgfx/shaders/dx11/vs_distortion.bin b/bgfx/shaders/dx11/vs_distortion.bin index 152756344fb9335cfd2186f3473d66c026bfdaa7..73b8e5190e1950bad731aa6275b8e3a79dd97028 100644 GIT binary patch delta 107 zcmX?of$8)GrU{Ayb{^$l&*})=i9DOIepxX$MU>!WSzf;oy&K#pWkFZKWc delta 107 zcmX?of$8)GrU{AyNe0QP+oCjnY-Il*b*?&8Wuu`8k3`d~pJ9v)3=G*3i}t;V-ssV? pog>l6ta8KVSe`eIteP=r{7p9d`F;1sqi|Lj6XTT4TjosX1^`h5EJ6SP diff --git a/bgfx/shaders/dx11/vs_gui.bin b/bgfx/shaders/dx11/vs_gui.bin index 683365b786ae09a48b79ac846cc74562fc235452..7b3876797375b4226f13de8993bb797cf053bda5 100644 GIT binary patch delta 107 zcmX?of$8)GrU{Ay3+4yNt>b*6Vew3D+6A4Aw2g)$JQ9Bo{|sYfU|?WmyQki^E7fhq p;xi5nbw}oHj^%md$jV~v!0Ef$&+of89)+{Qm>5eoZ<#Zl8vs}gERFyG delta 107 zcmX?of$8)GrU{AyH4lG3mNdL{E$mpD$jS%ee>NJ5@JKYw`WeQ^z`&p`KWCE8+VlS1 pakm6kuj3cl9Lw{@ku~R%q`%2#KfmwZcofbGV`41Yyk*XGZUEF>ET{kg diff --git a/bgfx/shaders/dx11/vs_ntsc_decode.bin b/bgfx/shaders/dx11/vs_ntsc_decode.bin index b1b720b8c486a09206a08f18ac101ef4bc0502d4..29cc7d9290a378e3c8642cc0d67031cad0663870 100644 GIT binary patch delta 115 zcmX?of$8)GrU{Ayj4D-uQmQ493r}ika;CH-Z8Q|&k@$D`XBZ;`14E?rx|NGRZ1$b_ yV#=d+|8<=<$MU>!WPN$!1E=q1KR;G4rZ+a5LuY(o#G_$W7!#xQ<}Guka{~bREHbYE delta 115 zcmX?of$8)GrU{Ay5B}NKhI-a6xcBFF&b)o?bsG&ucqAHU{S0GdU|{&uEcfiC%1fUe xLCoeE;&V(k$MU>!WMx#^>2I>x&yUrMNvm{o=!_4Hcr?rkV`7}RdCQ#X+yHtaFh2kQ diff --git a/bgfx/shaders/dx11/vs_ntsc_encode.bin b/bgfx/shaders/dx11/vs_ntsc_encode.bin index 2626aceeb7aa4d3a455452dbe4e25be8b45f7c3b..bbcbf4ede893755ac58c8cc13595d8e0b70104a1 100644 GIT binary patch delta 115 zcmX?of$8)GrU{AyRff_oD=#h5wvM=-B>3MtZ=<0IkHp`@Kf@Rq7#R8@mqo`bee>$P xoh^8@D|GJWSe`eItSQ&hIDI$!`LTL2Sw?RTo$-MYkA_)cOpI-tx6GN&4FJsIFYo{W delta 115 zcmX?of$8)GrU{Ayv0qK=)-{-1yY++Rto-jki5m??cqAHU{S0GdU|=xwwRGXgEAU#W xDYBh+ckZ^$u{>`aS!e&S_cz(>=f~>BbT)5u=!_4Hcr?rkV`5yqdCQ#X+yLJKE+qf} diff --git a/bgfx/shaders/dx11/vs_phosphor.bin b/bgfx/shaders/dx11/vs_phosphor.bin index 8cd89f18b9949213f8020a0adebded5e46be6930..07edbef7bad21f03ef7db67232e3bc7409f92236 100644 GIT binary patch delta 148 zcmX?of$8)GrU{AyXH>5|K3N_#v!cuA`zhAeX&VhicqINF{u#!|z`$^QQP`8S9h&Zo zbo50I|B-sQIhN;*BWv5cKu+JyetxW8OdcGYLuY(o#G_$W7?Y9-&?p4RP0Y+=$ji@5 U1q$iz()-BB;KQ-`>YOre0BTh@Z2$lO delta 148 zcmX?of$8)GrU{Ay8UhU0zkJ))AnF~ZeZsjtXQQDAk3_?)pJ9v)3=BaQnO~n;w>U4_ zxrec6W>wziSe`eItZQCs`I~I^^JDd5>d4s~I^zQ)9u2d?n3QsWMj=3MVrCvgUVdIG UP)K)|-bY4;&YaCx=ag{+0P-w00{{R3 diff --git a/bgfx/shaders/dx11/vs_post.bin b/bgfx/shaders/dx11/vs_post.bin index a8827bacda26a3ce03628e4c4a26bee03c09e36d..5362d6c50ebfaa73642ed24039def296e1417830 100644 GIT binary patch delta 123 zcmcb9k?HzHrU{+`nm0o?KQ@Zg-n?64d#LE2Tu95$2y delta 123 zcmcb9k?HzHrU{+`T6I~O&Ds-xrLFaewrwqawlT7TN1}1o&oD*?28O9=H{+iBv^X?d zYN@|o+9198CC?j2&WU@2{7pJ9GBQpUWY*uz>wn3c>Ac(KhqFE~;?X!KjES*yv%~!9 FoB+s2Gwc8W diff --git a/bgfx/shaders/dx11/vs_prescale.bin b/bgfx/shaders/dx11/vs_prescale.bin index 4daaf3d75323879b759371d5d84efea6a873739b..dee008391ae82c9436dddeacf8fd1277a227074a 100644 GIT binary patch delta 148 zcmX?of$8)GrU{Ay8~JCK2`^3AlrOLFp!@a|#f^p{JQ9Bo{|sYfU|^V~s{Kk_Tgq>t zV!*G>(w{mu$MU>!WIc6b1E=q1KR;G4rvHYULuY(o#G_$W7?V;K&?p4RP0Y+=$ji@5 U1q$iz()-BB@Xv7b)j4I{01Y!XPXGV_ delta 148 zcmX?of$8)GrU{Ayj4tb!Pc3tpdX_hTPxi#izcw0*@JKYy`WeQ^z`$@~!^I7CDL*}% zDtDjV%DcjMb1csrM^=mMW`C2-etxW8O!MnEhtBxGh)2V$FeatBK%)>KH!(AhAum5K V6)2>;OYb8i!_@lCSLc**0{~x#Iu`%{ diff --git a/bgfx/shaders/dx11/vs_screen.bin b/bgfx/shaders/dx11/vs_screen.bin index c3c17a3621c943bd580677aee68bc86eb6880434..9d5426f76be6c4d274c974bd2e897f28ebc305c0 100644 GIT binary patch delta 107 zcmX?of$8)GrU{Ayj7;oFtebyIc{MMpGk)bJzR^&GN8;b%pJ9v)3=9(CpT3Gt`Qx+P pd}`85qw|+H$MU>!WM$F5$LYJ-&+of89)+{Qm>4TJZ<#Zl8vsq)E&~7n delta 107 zcmX?of$8)GrU{AyuXP^(Xa3o9-SwDsnAq>>4I2$bcqAHU{S0GdU|`7ij1vBJv)Oyz pg9lYn_p3HFF(v>2 diff --git a/bgfx/shaders/dx9/fs_ntsc_decode.bin b/bgfx/shaders/dx9/fs_ntsc_decode.bin index 1ebb95262809be01d25cf24c2e42b8dd38065e80..e31c3548b83396eb1f2cc364991e19ac15e5d69c 100644 GIT binary patch literal 8356 zcmd^^Z){sv8ODztw{hE~PSXqmlr@^NEkmKWf5Zan+N`O%Mr5d661GYfx31&Vo*X-k zoh=jlaHkbfX#r(hHccad3l)^OLuKo>Fv^y09b{U7A?-uaB2lDBRH8x!^+P76ndd#{ zIq`}61@UPTSGxI~^PKm6&!2nFxyLvAdiRF{kN@kh^=eh#D&?BSXgXuycIpW2Ka--Qo zV_@A1H8(hzPeNS_wSLsg<_d|F_i%ckkZKI9hK7dZY&{|5QO~jJde%T+H|pgR@vK)! z525B&CR#o>I+93w1L>iBqwW^GAF1}Ph3(X4RZ}j1Ty6~Q-P3FkzNCZAEIQc3Djs$4$aXgEclBj?FQ@*}coqp@!%_mVNPK#r5o zk*C1#p+jfM^W;2v348|SSHLN7349U^HyJjOZQu`}cYsfU`^gyiL*z5y)8M1vkHB$o z5}X3R51s)}g6F{>gY)1|zyg~MJV(xv3*=Ss9O9_YDD^Vf0R9SWA$O3SWFI*|j*;VJkvvDvk?)h2 z$*bfN8UCzNuc6*eWR%=V9v}~s1@Z(rMV=)ulJAiV>&@68PX>w$W!DDIZs|Duajz%iCafDlda?qP};K}d;^SuZ-N={RnP~215S{q$g|`{ z@_q6O`4QRhdE?(oc946?17wU$kz?dIIE(tHz_-9NPLXH8Iq2ufd2#`K2l`d=BeHI@vEKwrc{})fa3^>i>;eA(#=v*M z6gUr#Q9l9hiRY7j$+4uoKmtnMyz*8w*9D-guNu{b@9%TZI1RN_LN~Of{Dti?(d3mR-d3~zD>VA!b;6pIg8w615dd2oG^1+` z0dBoPGXbzIxph4vjl$Ah;lB<3(tbDQHqZEDxoLkXle)IUA4_6c)f)V7zdHF^4gZU!!Ms9P>0`k0q`1_WYBv&q9)OtXd^`^6l?(VF5R+pRp ziuSeSNLD7}y;b@_*lw@V4&i|xtJd%k{b~&l=Ba9}J1f(r6u(i|bMwfJx;);}-IFm%#23=o78B|iAX+gPMIrFO$j%K<< z+EI1HSN2@HqRbrh)g3GRoC7-AdW()|`u>oY$YpXPQRy>|+qg`h9+KZEiCk`EAPPn1 zu=LMdbsENBl2fa3*1;|1GoV}-9c_-<`;K;r+M=UfrMBc~s@BA-18p76)LI>_omz*Z zbyDkbv@T?7Uuvz6 z)=sU%(K@O1I9eaI!_}Z>)wK-ZlwGKz?q}D@C#3Ol^{Ovfid7jr#>hJCC$nbKpE~ ziMK%QI%wOxL@gx0v$5tRUY*$lRI{VCQj0oTC$%0&i&0BC+L)wK&v8eapf)AMt@jP^ z-gIIlm(L9rTH5Zrqh)_jZ%<3F{)OMtl^YsPXObf=TccZ|Tee1{Teoi6`sM8%JJiSJ zan;p#_Z~SjEJ+}IU#JHpA9zx!e?n`)Ept-#ur{&5)d89v8^3F*^=ZxQb5{GN*33KH zYH6*>SC@+Kx3nhTTq@cVT9Yp>6-|DZ2bFwrsc1jfnmJ$EI^_3gP{|jUik+O1gG#=+ zRJ1>7&5WV-{fpM*drQSme{;enA5wMDEAOf0?@uVJKIe{l{1&C0H_{E?pHR5s%Tp!K zSJ8^EO(^AeCZwvqFhN=Vwj}AwS0&`Cz9*^Sytmzp{!eq}pi-;qRHTSsSe+Q6-5*5W z>BKv9x9Ig+hpI1s*K2EDc}?{7&^Lek@4JrOwRZR8AKtPHzPm(^m^eFOuH$?V>7Et6 z0ea%G@0>gN@*nR!HT{LVV6WqEF!sA2JYU%T!G|~RmTJVlk@~Y;PrUx_$y?<}qVPjlcc-&&&2rT32sk)?dJGi~Gt2iE|Tl(>|qbB@WIatCWgdHv@ z#G2M|F$;YJEQat21Z&eryrNS5kD*Rq{6!Q0fa+&Hq|@RrKB(UMKsP?3i4Wq?N9yd? zbxKUEZe5O7Zqej}K02{nZu^7R7t2H1Ug|V$3fQ`Iz6N6>b=RqX6lFY2pZY}$*66nM zGfo(N)%tQ?{BXvU`gLEWpK?oHsan*#sBg(jyQQ6SOKj{GKDNxFq_HFTc#cIG6R8vQ z(N?k5ZK_cr#4)xZl%tLb;}`MkRlkn0T2<1uPP#^gwasl97_{e_v?Yx48nnBKb7Bqh zIKARHu_$%pwHU!OU-Z{w%+{-NaUt~6*SLfY%BU(LuY}%bSRuda%UHE(0-Vk&Z zUexiihwE7GoU+<_*x5PdYIaV!nw?X&Zt;~lAY&w&857e_vz8Y1e5i$;og)E`qxHeB zspWB%x~kWYXi|@ir%k)#U^Q!l_mZ}E`)aj_(^prseRVb4R~uh^?fQwR%KC|@%KC|@ z%KC|5|FG-FjZwXRY`euqo~1hntluZC?>J}bJwp19eU#}C(q`|FzGF`5XKwo-<0pOR z+|hf7^xe(_c~{x_F6&R;2Qn9+J!Wl!(Cixge;qHG3o<_PK9up2F|un*()K;F3O2GH zO}Vj=_gB!_$0Ux7r#t8D-e>C(e|Npva?!;`o~NYU^=36`pWRzr&8|0Bv+K>q7hk*H z>apH%F46O>9&;|tIaiPM7UrC*$D9ju&bcvU&Pl(~Pd(?%c$jy&LQLtuj2~^5$4_F& z9*uv=;oo@X{bl3+w_{_^1Mb*ZO`ek-8&|Vq<7(AoBffUuwQZ7TE$x!?jPz0ZwHmja zTjVSw=N5dwD&CGxizes2RTxL~UE7%av@c^)DK9(uFyiU8&T`3%y*bC>zqrVYy*<|j z{94%8GM=0dYhjOfmG(FJ@^T)n(!SOoUD0J?FP~QMe+ZN>`Wtcf+Jk%${S2r@oYfbL j^8O2;etFLt+km#+09%un*o%InJv03|Lg8`&tOtObHpL?w!}7eTEANS3HXG!@hrov3EMzq{|* z7nc`^SG?d+pM37V_j`VK_j~T{xpQ|64Fr78{^KugYDL~Fq$VRirF?2t(TjVB;$y{B zm(OSN`)%Hj{OY2YNLZl-!rG#j_C|84gI+F`pU7tNcrXaPqv$=IE)-HZFFu|vW(r-t zHOtiO$Vff~bv4wsqL;}Q5~JQT>11KF%eN958j`j31dvBP2b=3z1$|A?%O~O)uaF)` z%`1$ze72ZNq`YK$Jm00eg{KcUKivx3aJOoy)!wb;TDEW9{X~yaYN`!?aN#jEiu=qjbQeJ(bh&K!6qHXa{O#r7A|W69Y510$2M{AfIx%H?Cp$D939J#sY<0H^(a-V1v(A8$v$!?nIw;p)8tulfxJ%MBGp>sHv~S9 zj@(PGC;P~La0=y7@C3Mz90OlKzQp`A_)X+zz?Z;z@LS*lcoMuyUMH8puS35Begh13 z8T)RshwKB-pnL#)4cr6%5FBNG5ZyiVRE?~tAMn({E&M-GrNa)LZYPLZd`GvqwE07`on!E@jeDDy?V zU#TB~o#0Qv_2g!9JGqA(C6AC((OW?1-JJdtnN^OnjQ^Tprlq}>vC0{`KI+^P=pr)@DwGHJDYuTs#u-i7N zDxY-nI}%=6z6BrBnt4hz@6)RCVeQBGf_6~su#{@w@>evm`{?p#5BI_lQ;}^@3U-HK zMy>Ae@Fr;JO5JYo@kF9Ht||{|f2O@JJL$n>Dn2%-Dkqz@U8?ehW^J#keAUr*(YN{L z8Q))Y%Ab5b}V%}MVa+@;Rwym>FLAYH4O_cEu`=G~3Q(;0PO%-fNRAJ`r*#Jz~8-f;Y+ zGszUDMMYtT$Y#^Nf7xpp&sd9{bf!;LKH)sy*o&$PKJj(Srmd&C@86Y~4XC<*S(&qO zM7yxu)%$hGOJv8gxroFH+dy0vW7SSxW$c|R!E zPDhJUi#ggpYGaO8pjL9U;zjUBg{$P&@ z+P;OUZE&ODzq#?j`fU2?R`)ZTKmMQT+?yFu-iqurqv z#F@m#r4wnndO#b$4M@wmWjAj7j*>{rH33fImi`{6RtBxz47E8&yFl%-qb*XaI@&F2 z3KPcq>*N`#+tGTc^@07kC4N!x^XWt`o6n9E!aYwu6du?)v@<-UPgvn?+3|_=SSlCp zjckl;?2SZvdpGtzylHcvdbf5$Z5w`kt9;*XizA%x8?*1{aVN1C9&^> zo;dp4{OQ+!|C#fv-Z(!q`|(FbUu*nqdHOUDRLN_WYZ_JN>bXR=QS<2B~oo`of>-JzSBfncTzaMG%r(K}rH+ns9>}E^GPf*u` z&x9_w{lwB*Hokl%e8+Vfv%ZA5m8H#C72sD%zl3G++Vx)cdwvGktS4+c)c9o|U%BJZ(p8LrRrQ+K=>ZrUOXNGA-k%ru**t zXzshTyAdCSXG~vZOxl>X(nj7f=3qUBeCIlbV(Y#$H--{>>({2;7+THRNP8vi#?Wfg zUOPUPYbJ)SW@Bjm%d<9yZHOV(03E9~vi?mh z&3D#*>usH~kC1mS?{Ot=*)PZ*!t6m*`9XyMLX$nv3d9Y4*ES|Ui}l>i*POiU>GYaN zd&!G^&B=?s$;)1@751(4XY#YM7tr=5U(av=zK6}>d zJ?nkBR#SC9ovlkA|K*NP)~YDn2~eor@mBy^Oc$!D<`x3BS=3E&qaLcu=ElH&vsN2* zwJh({vRvKPikRrN?2Y?be1QtKSpZEdiTBbC!r$`x*jFWTWJ^KC7 zUR}S_w&-;pm@_yR(%UbI2j{|jnC(bC)9PRYv4v57AxNJ0#VHTc&`B}cq#}1ho-xW{ zkeDX~IWR_cIE4(QRl(z7YSF5p!Rj#2!C07$gf%i)9e&!4#p$Va2w(`_)uklLbY6H5 z6DLk~S8H^Dmc2W!T6Tzz<6AdMp?*xeLawJ_gL;V6qSyl?Qr<2$S}biWS=;FF)P_Zl%l3n?cyt{u-RpqJ`oQQool#c=-LHtuUe%%zl}cena)B>DilH=b zXD@~9izk5h+7#LZi?854)A$iUu4eVLi2x9t<4QMsrSJDjA9hH0xC%>jyQit9d|dIu zCMgno-g!a}ojHL{xdP;IViIxvYGBm&b*bx88!p{6I0py7_k|y zqwJg@W4~jyZ%-gG3}kd3KN>}vkg<+~P8X7F^=3I1`xa4``|a+G0d1gngaZqGi-V;; z(p+;YBD6*@h2%MSpBbTVq-TOwxv6|A=x&>37&!ipHQwqtOR}@DUuchn9fQ5y1BtDf z_tZIINH>Y)P|N+NX4Ilyu{A^#lW{tdqY?7ON8X)|F3-rKuurilv<8eJHW73sZHeUm z5YU2dKq_xhkjym-*TzFoBr+4DNX<=n7A}ehq4+c+H4|wRZbl9Q@o&Dwn~%+!?LrO$ zv3I$;a<1!Gd>`h2NWCYUqV_sSB!E@5;QKyyDoZ}LA^9N6*{a;Bj46cd<2^_*6jEtv zz&rfp$iw5ef_wOhd-w^RVfW#+@~0l&GLCzANT=gGk6$Iu;br0+9tOs90ncmYPd&U( zbJEb9y_EWc890KoqYp(0MYgeTMG|?;-XBoYT_mXu!UafLM)O>k9_c!yLDzMu>pCjs z0oQ5ePj#KoW|G*f(myolGC>X)+30N-8EL7^vp+l1e&j#b{>-(Xcr;+YRzApnr=g7a z9qNlUGS?C3ftxi$`=f*qPO};DyW3r849iHmE)n$57M9QsW8T5(QzL#4?BIAT5A8q| z9LX4>I(DKu@ygu?eL<-i$tm;$xBVR?*xW?yJ{X<}@?{K7Je-t=?_Jr0xkA<<0HoWX zC}J-n61mhO@lYf20Fb~2=pHdATR`2x0w6gJ0eN7K#zPIr10QhP1MZJp1Jh++)(xl1 z06t3~|MCdyMG{X2*r*J%)HgXrlf#-XpdlS)=K}s8%28KWTen9yjnf3SP2*9L8&$G{ zd#?f3X!2JUKW;Q8jXfi?SU3DulqK6 DGm#wt literal 6640 zcmcIpOK;mo5SEMfP!~bbTaVitV3IVWA!ketSTP=>5h+Asw~|JIMBG`uYhPdo~dO$H6(z|tXY<~>ao6B-fFVntkhav z&#QYiuNHUBY+?4od>xp--!}jCO8r$Ym(^S~*Vl_`sj0WK<7u;+nb|KEYFRyjjPU#K zx4quOc)qS@H{!OwxxEt)RVl@TDw|0&A6y=9ET*ss$IGUfU%~onR$n*sse9PdW?+ZW zZD7@CI9#}S32&}SA0_%>20y{eP3he4wFR-g)%fK$rvb*r5vqA^BPjEvI)74=N$~cpzR02#DosUV)k;(({=cB>fH&dyurj1E3N)DIV0v- zgMt8AC2u`>%A1GVPomW{;!fyU)Rwbm=2+1#kUQ}})9M81c3Q@j-~^uz7?WJnZW?J8 zo#+m-Kp%Ek5Gmpe9*>kP*$YrCrspU{%X<&D5JiuBX!P8nO?{;lQHE=Z(4vU=7IAu! zB^TfxyWY@>9rw^voO?+VPexl2bVnfUKFw&oxT#XFWy7)_0q4^24z~o z%ApV@ajqxLco`W6{k}MLq)gbevv{DbwUs#K>y~&1I3uSoaZKr|n{w(22UMEc*cikq z68@hAV^srDh(|H89xCAD|;3{VV-c8*Qo!tbBfn`!$xsQskpQ!b0oV_UMwTo z1t=K@E*Bcq~w`POkTo5xM`>fuY6Q63kSJ zT3l3&jGO0@3Xk_h|IpcI5X%DB{U@fDvRSZ5dnPKY$ka*_Rwz}G7Wf4zl#8NC&ASp~ zn>ImVTqDyo%#un$%aW==#MSguu*@j;Gs{e8e`HBz_>-`t^xm?h1dmc;7YBOU$D$vn z*UZmN8RaJANR{}La5M?4zJ?&QJ_jBY&hX$OI<>Zn!7NA0pe*Sp@5UPvj2FY1{M z$t-iaF&LOw*&bDR_!%*SL1uj0126XkPu0K$58W6yqnYgt0x1Cx9|&HW65)Z*_X97f zuDIZH7ks``^K|%7@P4t8y4Y~{fQ63kxTXkrmn^z-^-X)k^*g)hi}SXnLJIgn!4|HM zp)jHbDx%8nmf3A*+r~leXpp6;aGs5dJ#9o~(X~Ss8FO&%kP*KJI5-+hLmceQf?6*4+~U9$B0(Pb1UEI{ems-~Y2d0^vZqM6&O-EM5p{`!c$CxC zsYtffdBvi diff --git a/bgfx/shaders/glsl/fs_ntsc_decode.bin b/bgfx/shaders/glsl/fs_ntsc_decode.bin index 768cfe694da1dff0f40102cc49e6fdf16fee854c..2ba4513f445ba07243a012f414992fb9669579ed 100644 GIT binary patch literal 6050 zcmb7IOK&4Z5Oxq82wEX7oSWM?k6|9|m%<* zd;A4{0aexA)!iOHqt)zm)l_xWSI^}7-P_Mk{{HXZSDjZ&wWyc#qEt84bn)3qr*qQz za;e7ZVLVxueE!ovpDtBV_yiEB{qt9#v>4A+Q%#KuxMo&2#Ygp6-83Jy+HaO>rEcft zy_%PcyLz@T-vYhbLciZc|9YwZs+y*ptNQkKQ8rq;qmHNba%QMsEL2lIfsgR-pKm*z zhw*$>%|3{SvXJ6I74@W^Cs(H)IRi3?6m>nn0nTz(-PZG|76`Cw@eGD7y1}wVx0tpV z2HO^$F>Y}@tXsS_%v=05>|6Y`7_|67EVglVOdNMHp59H$dG?c_06_%m>PAe*)l5X) z)8|v60e}B%y{MY1o~i80(%!68&WGQAEQ;k+NhbWP2|XtKp$UB^ynk1WC#4!N;q5P! zMrz2E-_?lUuM4%x)m@dT6w<-ig~Ut~(}0+2qO%shyw@~mG|(zdb9U=%;1XxKz640l zb|j?=NX~j7-6O?W50nZi&WC1t2N|w1a)1xwwSYu#mh%$A5K$a1{N(SlXI6xKI1Y; zN?9!ft!1tDH*4X1Lm8`}4=7@jjWUdR@X+z#y!E992S}L$@Wrx2#4@Z2LdV)D4-v~z zj6!3@dIyNv`u444NcwR$%+n#{>8>{qCh9)9uZw}&rNQZET>u^_qbjftF?`1=vn|lK zj6pqCnQgMZGKTsXWi;EZZ`2m~fVv|}%L5fcsMlHrwukkuM_mGj2B_z&TFsN%v1Q|@ zTq{H9nq*WSr!wu0@(Z!+O$U>w7WuSPX3NkedX8P#3}!ugZRs*u?@mPScEJF)jGVDU z(kM5pjZ@<7knswB+8XTK1r6j|f_)%(&_#A$@A=Hm`8}Wcq0jwkmnSIc7CSN;LxkG| zu#ERw#@jm9S+EO=sG2pRQYr9~D|-1s^re0~e=THJJcDAhDOklcItAa8#!n!AJE_M_ z1gZ!MpS#-0{j`(&xPco0Lj%^`rY9mBDlSbjQq#`Yo{%f&UO-ds?s=T(#9VWnX1BYH zx|kmb+8Q8VZ8hZFjgmN{Q64@iS%XE~uxn$_-ZNuXOt^Y}@NSb~fZbxa7$ z2~eY1?Udn2Xs=JK%S1HLKy%t@pji}Q+c*;u885ge^5)rHuZnp6P2YNQRPMz4vQ!hq&9%sAdB{de7m)Kh9ex6`^ zzO+r5HDQmqDah*9tGS{0ZhM=CgnBlKXVP0z6)&n87wym+ z0Qt~>{vyiBqTDD<=|RmScv!)9(4?v5!0geHX4AUvn?3T)9@*PBn~lQ9n{B#=Z#E>% zacI-_>6tAP&ulnow6>s)!pEB(wkoMxl_@gVhjIPnTE-Z{O ztk7U2A3yoLM_nrh3s8iMN)$1Gq{*UbH1QEN@c}e}`LNSbB07b*QG!B?7b)a}HjR&{ zkPo54z zdxJ06YNBo?({;t`KmGOoT9u_w0EWh2e+5Fz$y}}KnGpeM=FO^nuWsv$)q5@Wo3+}g z%SCmq7S-}YGhdo_fnM*RUw6^JUaP+^L1-)%jd2AE#J5Hx6YuoADqRmU415QcR87Tm{yDQCqV}UC(zUv zVm7JgA{y@B?+fklUwBIVvXDu<0RG5J#P|;W#A~9tjMvlya&IK#(UAxq!(m$sIm>Dp zYb{>D1rkSbek6j27HD07+yK&szUDm^EPW^rcu^1(>&;HiLw<~&%GU0OCOjaPCL=T7J(6cPz2+rb> zKA|nKRBoNv46sFBC-)A{cP`b)0~af)js8)bQY8zYP#(#xq&sCBsIoiVGQI=t*4`|> z!|eCBH|S?KWyBl(LJ-f?8yr)P5?kHD>W~hVWX04SoP+{B5@8yFy#z=&yEE`Mhx}0Q z9t!(bfEB_KB-jYn@6u`UP^hE6!zSt^4iWVd6TP{lz7aez1avtW#j?Qt@QJmeY?f>c ziF&NwxN78ei!`-1bUBflfP;KOPULQ8>gy-!43&2Hhbp;KM#Vhh2KchdGAiAyEYrms zl~K=pVP#aEoieJ=Xc_g%7uFRPn2ZVx>Y}#!!n#b=sV^b5Y%)TO>@LcXDfcF=%=;OZ zDhgdHa>2ty`CN?1Xfc}b?!suQosSVCvKK}y zkVofMz4qF&Wa_{@l65Ow8E zQP<5GNWYHbyzM&!bdj%?Qk<`{mrZ{D0>SQ`_4}q;*3Fu)-)C*zH$|D9RqNI&Aw{3% z*{6KfmyYb?h^#0^g!PE5E%Hs)RcjY=Q+LHhc3quy7tT_**|I6GvIcxwZ(4UwwWIH9 zN8evn*Og6HFPClEIjiZOd|me&=mD=U!JF%HvlTz>cOBC=d9@MVNPx3-x5_H<;X~Wy z=VexHPERMI06V&T8&SvP2SIasnDen;F3ZLX{nJxOiir>c@}cXSGCq4wS@W}KF-2gg z?x3*~(dO&RRoM_yyS~iKC@rT^{^1t@byU_i(fT#>%KKmIw(6>Slf_K>;x;s?y zvpa(u_!B?!u7M#`=aFVFPX^&cIFIplc?8VzcDML6_L`@69iJHQH&N|jK2h#BQ85Ca znC>;v5DcHmoHGsLc@oVby?4DahY=Ab9F4hb7sjxHMFTey9Bm&HIp)a6!Wlm1+A;S& z7S6Cfhht8E44h_hVUNx6__?ESp6_j;sv%STiT4C|>A+v+AxY-ZC*k!(F7$BxYiig#oW zl_UsN(C;{aN{wMjBF&M=P~ig`!0fYxF<=46jihiG z2PDA_CI|1vcwn-a9;a+fsH7N%V^N`Y#$JV^Syt-0?T+iH#2DbI$ncQ6j)X^g3QJ2# z0->=S9bugg^v)_&$UniLNYyM8YB+?0Nejf=ewDnF$eWt@9v&%LbCzfa*bA-aH7P_ja{p z`*tqA*90daAMTzEh9?Kpi4x#5j@|lmcJ?H59e}T*T(zYpS$DEd7h)slVWy6SP--f0 zlwUkrdAgo(v_5bG38~*l!u1$+dZDg$xl<>aQF#{(N^Zj^AXJ5l>W-x-E3piLwe+;#d|F!ZGk{Ywj{xyx}|^k}yc<#D$~+->Gi zzsGGj`Dt!*SxXw$s_@$fo(aZhGaWaziWO_ha%_(uZ96d?w>{>z8@9a1cAWeq+f$b< zQ({YVe)4>oj@q8ORGAW0j!idY8vhWiZ72n86Jc#*3>Nck@C5&W zl}^bMXLV;Q$`nd&(kk(3HzXb%tzoc8se+rvkO1gkqwJJ?um{8m)bq1=BH;g2&bC3& z;(b7(APPZ|D42zimnP7b>QnwfEu957w+L)?<%-V&ygBKvI1H|_lM3QG;6Lq9D8~0} biY#DnHR@L-rBqYGuLm0q2S08c9v=J;^I5!@ literal 7098 zcmcIp&2HO95O#r{{0hBnF9jJZj7Tme8EFa>1%l)d1VzvmMPMu#in3WqqRpRJN{~|@ zr%%;a=o55i_FtwISx9`Kxx3t%Z~kXj&)>ZG_M5-|`}gGJpYKji`nFnMvUR>H+v~h2 z*{baF<XvV=@_E_3TwnJc`*_OOVp-=MXYWN(FY9LfR8J)^)s>r~ zuA4c`ej29py6-fht9-fO>~bldH~Hl+NbKHSzpbl9-K<>xy=d#cDM~S~R;>ZSSub+& zK412wH}`H}t|$g3>w&qp$k(E)RzAsf-4$2jwwiZW9;>ZbH06zGK&SP(_4ibJ)^7H! z{Z(~c*@$|vXv@yyrdIM*-LGK zltcgirpTA2$egJcuSwxz;>`Uarq1YjA#Ow>X8u$KQ|JEFjficia0dG-5y$>F+f>Aa zS|Nguwuy)dwlfurm~cyJyVdpkyb&?sHUsudDkC6OMpBUhYRc$$!~!CkgfuUz$cf)D z3>|EmEa|}vfQQ`KM-YrUMxqV;u_x}5jZ?Y!NU1#F(RjqX$1q>gxaK?c_&QOzLwp=% zBj!D%OsG{Kf* z8Nei^PNqIbRhjRQbSinYg}=M>biM|9l=if>#^@#9LyD|3{-NLNnsMm&(2cO5f|6LR z=jBGAmBvra;72y$c69cP@sL^t*D2sN_` zO2JSj-a@&0#`IT10)f8+AssMs3)$O5oa#wstV#KIQU(=Bi;zmB@*}8#oa&(WM1Qg| z#3%TL|HM32)U6Rvk=vIPZOU|NUXo~$T)(i&r5a|T&q%qZMjLNCkgv~pP*+rZEJLb4 zfvM?Vo?%M0#xP7}wLyl|1AGOBR6s04Dj_H#cAPeTznDf-KZ~W5#gHFW{jVUON^I2v z!cYe<_{}pfL+%s>oq(-cFdr(Xrfljxl&^kb<+3eR?)JAD#?r~);D!0ikIPggJr5~3 zoMG&Nq(TNc=ngw;BUMS*Lz=Sh4dcU*QtpN; zB^{J$>NIjNP?0hmQ@HuFVh#qG@@o$~e=vBe11@;z*-TfP^8Mg(^HJcrDh?j_?4jT} z)f5+e=7P`mf~U>Lf%gjymxac33|QjmplwQkcbucsU8q_lbH+|*A$x4wDx`r|Ahv8B zLgSqJr+})uUu1`N18o(~{GL{ts|x2?Y4TtzQDJngG;ysYPxy=t*Bp+UkF%104&ZbS zpl$#U-&XcSd5L6VR5DP)(&>Xmr`r}+bhs9=(KX%gpa<2zq13?rg8|1HqmxsD?Yp*n zJS@B4_;YIf)fR8NPHj7?^Sg3RUAenm_DFDh=pcbZh?K-R@doA{n)ZNBHle<+2sOdX zA(Gv5lHq={%`xX{GV_z6-J4cIF3-_Lx{vtJO&_f zG##gs28ENMM2TLLO`^>f3G1;ZdlKE+r8tXj5fB~O>&X30i%c;bvl-r|m@5JKbD9Lz Rl<>33T9Jcabxu!D{s$}A-M;_; diff --git a/hlsl/ntsc.fx b/hlsl/ntsc.fx index 94460ea6be0..89cf5880d57 100644 --- a/hlsl/ntsc.fx +++ b/hlsl/ntsc.fx @@ -49,7 +49,6 @@ struct PS_INPUT uniform float2 ScreenDims; uniform float2 SourceDims; -uniform float2 SourceRect; VS_OUTPUT vs_main(VS_INPUT Input) { @@ -108,10 +107,7 @@ static const int HalfSampleCount = SampleCount / 2; float4 GetCompositeYIQ(float2 TexCoord) { - float2 SourceTexelDims = 1.0f / SourceDims; - float2 SourceRes = SourceDims * SourceRect; - - float2 PValueSourceTexel = float2(PValue, 0.0f) * SourceTexelDims; + float2 PValueSourceTexel = float2(PValue / SourceDims.x, 0.0f); float2 C0 = TexCoord + PValueSourceTexel * OffsetX.x; float2 C1 = TexCoord + PValueSourceTexel * OffsetX.y; @@ -124,8 +120,8 @@ float4 GetCompositeYIQ(float2 TexCoord) float4 Texel2 = tex2D(DiffuseSampler, C2); float4 Texel3 = tex2D(DiffuseSampler, C3); - float4 HPosition = Cx / SourceRect.x; - float4 VPosition = Cy / SourceRect.y; + float4 HPosition = Cx; + float4 VPosition = Cy; float4 Y = float4(dot(Texel0, YDot), dot(Texel1, YDot), dot(Texel2, YDot), dot(Texel3, YDot)); float4 I = float4(dot(Texel0, IDot), dot(Texel1, IDot), dot(Texel2, IDot), dot(Texel3, IDot)); @@ -135,7 +131,7 @@ float4 GetCompositeYIQ(float2 TexCoord) float WoPI = W / PI; float HOffset = (BValue + SignalOffset) / WoPI; - float VScale = (AValue * SourceRes.y) / WoPI; + float VScale = (AValue * SourceDims.y) / WoPI; float4 T = HPosition + HOffset + VPosition * VScale; float4 TW = T * W; @@ -149,10 +145,7 @@ float4 ps_main(PS_INPUT Input) : COLOR { float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord); - float2 SourceTexelDims = 1.0f / SourceDims; - float2 SourceRes = SourceDims * SourceRect; - - float TimePerSample = ScanTime / (SourceRes.x * 4.0f); + float TimePerSample = ScanTime / (SourceDims.x * 4.0f); float Fc_y1 = (CCValue - NotchHalfWidth) * TimePerSample; float Fc_y2 = (CCValue + NotchHalfWidth) * TimePerSample; @@ -175,23 +168,22 @@ float4 ps_main(PS_INPUT Input) : COLOR float WoPI = W / PI; float HOffset = (BValue + SignalOffset) / WoPI; - float VScale = (AValue * SourceRes.y) / WoPI; + float VScale = (AValue * SourceDims.y) / WoPI; float4 YAccum = 0.0f; float4 IAccum = 0.0f; float4 QAccum = 0.0f; float4 Cy = Input.TexCoord.y; - float4 VPosition = Cy / SourceRect.y; + float4 VPosition = Cy; for (float i = 0; i < SampleCount; i += 4.0f) { float n = i - HalfSampleCount; - float4 n4 = n + NotchOffset; - float4 Cx = Input.TexCoord.x + SourceTexelDims.x * (n4 * 0.25f); - float4 HPosition = Cx / SourceRect.x; + float4 Cx = Input.TexCoord.x + (n4 * 0.25f) / SourceDims.x; + float4 HPosition = Cx; float4 C = GetCompositeYIQ(float2(Cx.r, Cy.r)); diff --git a/src/osd/modules/render/bgfx/shaders/fs_ntsc_decode.sc b/src/osd/modules/render/bgfx/shaders/fs_ntsc_decode.sc index cc8f633bf5b..dda326cd692 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_ntsc_decode.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_ntsc_decode.sc @@ -43,8 +43,15 @@ void main() vec4 one = vec4(1.0, 1.0, 1.0, 1.0); vec4 two = vec4(2.0, 2.0, 2.0, 2.0); vec4 four = vec4(4.0, 4.0, 4.0, 4.0); + int iSampleCount = 64; + vec4 SampleCount = vec4(64.0, 64.0, 64.0, 64.0); + vec4 HalfSampleCount = SampleCount / two; + vec4 TimePerSample = u_scan_time.xxxx / (u_source_dims.xxxx * four); + vec4 PI = vec4(3.1415927, 3.1415927, 3.1415927, 3.1415927); + vec4 PI2 = vec4(6.2831854, 6.2831854, 6.2831854, 6.2831854); + vec4 Fc_y1 = (u_cc_value.xxxx - u_notch_width.xxxx * onehalf) * TimePerSample; vec4 Fc_y2 = (u_cc_value.xxxx + u_notch_width.xxxx * onehalf) * TimePerSample; vec4 Fc_y3 = u_y_freq_response.xxxx * TimePerSample; @@ -52,9 +59,15 @@ void main() vec4 Fc_q = u_q_freq_response.xxxx * TimePerSample; vec4 Fc_i_2 = Fc_i * two; vec4 Fc_q_2 = Fc_q * two; - - const vec4 PI = vec4(3.1415927, 3.1415927, 3.1415927, 3.1415927); - const vec4 PI2 = vec4(6.2831854, 6.2831854, 6.2831854, 6.2831854); + vec4 Fc_y1_2 = Fc_y1 * two; + vec4 Fc_y2_2 = Fc_y2 * two; + vec4 Fc_y3_2 = Fc_y3 * two; + vec4 Fc_i_pi2 = Fc_i * PI2; + vec4 Fc_q_pi2 = Fc_q * PI2; + vec4 Fc_y1_pi2 = Fc_y1 * PI2; + vec4 Fc_y2_pi2 = Fc_y2 * PI2; + vec4 Fc_y3_pi2 = Fc_y3 * PI2; + vec4 PI2Length = PI2 / SampleCount; vec4 W = PI2 * u_cc_value.xxxx * u_scan_time.xxxx; vec4 WoPI = W / PI; @@ -66,39 +79,35 @@ void main() vec4 IAccum = zero; vec4 QAccum = zero; - for (int index = 0; index < 64; index = index + 4) + vec4 Cy = v_texcoord0.yyyy; + vec4 VPosition = Cy; + + for (int i = 0; i < 64; i = i + 4) { - float n = float(index); - vec4 n4 = vec4(n, n, n, n) + vec4(0.0, 1.0, 2.0, 3.0); + vec4 n = vec4(i, i, i, i) - vec4(32.0, 32.0, 32.0, 32.0); + vec4 n4 = n + vec4(0.0, 1.0, 2.0, 3.0); - vec4 Cx = v_texcoord0.xxxx + u_source_dims.xxxx * (n4 * quarter); + vec4 Cx = v_texcoord0.xxxx + (n4 * quarter) / u_source_dims.xxxx; + vec4 HPosition = Cx; - // theory: What if we put white in the input of the NTSC decode shader? - vec4 C = texture2D(s_tex, vec2(Cx.x, v_texcoord0.y)); + vec4 C = texture2D(s_tex, vec2(Cx.x, Cy.x)); - vec4 T = Cx + HOffset + v_texcoord0.yyyy * VScale; + vec4 T = HPosition + HOffset + VPosition * VScale; vec4 WT = W * T + u_o_value.xxxx; - vec4 SincKernel = vec4(0.54, 0.54, 0.54, 0.54) + vec4(0.46, 0.46, 0.46, 0.46) * cos((PI2 / 1.0) * n4); + vec4 SincKernel = vec4(0.54, 0.54, 0.54, 0.54) + vec4(0.46, 0.46, 0.46, 0.46) * cos(PI2Length * n4); - vec4 SincYIn1 = Fc_y1 * PI2 * n4; - vec4 SincYIn2 = Fc_y2 * PI2 * n4; - vec4 SincYIn3 = Fc_y3 * PI2 * n4; - vec4 SincIIn = Fc_i * PI2 * n4; - vec4 SincQIn = Fc_q * PI2 * n4; - - SincYIn1 = SincYIn1 == zero ? one : SincYIn1; - SincYIn2 = SincYIn2 == zero ? one : SincYIn2; - SincYIn3 = SincYIn3 == zero ? one : SincYIn3; - - SincIIn = SincIIn == zero ? one : SincIIn; - SincQIn = SincQIn == zero ? one : SincQIn; + vec4 SincYIn1 = Fc_y1_pi2 * n4; + vec4 SincYIn2 = Fc_y2_pi2 * n4; + vec4 SincYIn3 = Fc_y3_pi2 * n4; + vec4 SincIIn = Fc_i_pi2 * n4; + vec4 SincQIn = Fc_q_pi2 * n4; vec4 SincY1 = SincYIn1 != zero ? sin(SincYIn1) / SincYIn1 : one; vec4 SincY2 = SincYIn2 != zero ? sin(SincYIn2) / SincYIn2 : one; vec4 SincY3 = SincYIn3 != zero ? sin(SincYIn3) / SincYIn3 : one; - vec4 IdealY = (Fc_y1 * two * SincY1 - Fc_y2 * two * SincY2) + Fc_y3 * two * SincY3; + vec4 IdealY = (Fc_y1_2 * SincY1 - Fc_y2_2 * SincY2) + Fc_y3_2 * SincY3; vec4 IdealI = Fc_i_2 * (SincIIn != zero ? sin(SincIIn) / SincIIn : one); vec4 IdealQ = Fc_q_2 * (SincQIn != zero ? sin(SincQIn) / SincQIn : one); diff --git a/src/osd/modules/render/bgfx/shaders/fs_ntsc_encode.sc b/src/osd/modules/render/bgfx/shaders/fs_ntsc_encode.sc index 3aeac29d20d..21bbb39240e 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_ntsc_encode.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_ntsc_encode.sc @@ -65,7 +65,7 @@ void main() float HOffset = (u_a_value.x + u_jitter_amount.x * u_jitter_offset.x) / WoPI; float VScale = (u_b_value.x * u_source_dims.y) / WoPI; - vec4 T = Cx + vec4(HOffset, HOffset, HOffset, HOffset) + Cy * vec4(VScale, VScale, VScale, VScale); + vec4 T = HPosition + vec4(HOffset, HOffset, HOffset, HOffset) + VPosition * vec4(VScale, VScale, VScale, VScale); vec4 TW = T * W; gl_FragColor = Y + I * cos(TW) + Q * sin(TW); From 8eec0786b5ab5c3a8c5b682616a9b11decd17586 Mon Sep 17 00:00:00 2001 From: couriersud Date: Mon, 28 Mar 2016 19:35:19 +0200 Subject: [PATCH 41/74] Added woodbury solver to netlist. [Couriersud] --- nl_examples/kidniki.c | 4 +- src/lib/netlist/solver/nld_ms_w.h | 690 ++++++++++++++++++++++++++ src/lib/netlist/solver/nld_solver.cpp | 9 +- 3 files changed, 700 insertions(+), 3 deletions(-) create mode 100644 src/lib/netlist/solver/nld_ms_w.h diff --git a/nl_examples/kidniki.c b/nl_examples/kidniki.c index 603d2064f8d..0b558514b0b 100644 --- a/nl_examples/kidniki.c +++ b/nl_examples/kidniki.c @@ -14,8 +14,8 @@ NETLIST_START(dummy) PARAM(Solver.NR_LOOPS, 300) PARAM(Solver.GS_LOOPS, 1) PARAM(Solver.GS_THRESHOLD, 6) - //PARAM(Solver.ITERATIVE, "SM") - PARAM(Solver.ITERATIVE, "MAT") + PARAM(Solver.ITERATIVE, "W") + //PARAM(Solver.ITERATIVE, "MAT") //PARAM(Solver.ITERATIVE, "GMRES") //PARAM(Solver.ITERATIVE, "SOR") PARAM(Solver.DYNAMIC_TS, 0) diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h new file mode 100644 index 00000000000..475801612ce --- /dev/null +++ b/src/lib/netlist/solver/nld_ms_w.h @@ -0,0 +1,690 @@ +// license:GPL-2.0+ +// copyright-holders:Couriersud +/* + * nld_ms_direct.h + * + * + * Woodbury Solver + * + * Computes the updated solution of A given that the change in A is + * + * A <- A + (U x transpose(V)) U,V matrices + * + * The approach is describes in "Numerical Recipes in C", Second edition, Page 75ff + * + * Whilst the book proposes to invert the matrix R=(I+transpose(V)*Z) we define + * + * w = transpose(V)*y + * a = R⁻¹ * w + * + * and consequently + * + * R * a = w + * + * And solve for a using Gaussian elimination. This is a lot faster. + * + * One fact omitted in the book is the fact that actually the matrix Z which contains + * in it's columns the solutions of + * + * A * zk = uk + * + * for uk being unit vectors for full rank (max(k) == n) is identical to the + * inverse of A. + * + * The approach performs relatively well for matrices up to n ~ 40 (kidniki using frontiers). + * Kidniki without frontiers has n==88. Here, the average number of Newton-Raphson + * loops increase to 20. It looks like that the approach for larger matrices + * introduces numerical instability. + */ + +#ifndef NLD_MS_W_H_ +#define NLD_MS_W_H_ + +#include + +#include "solver/nld_solver.h" +#include "solver/vector_base.h" + +NETLIB_NAMESPACE_DEVICES_START() + +//#define nl_ext_double __float128 // slow, very slow +//#define nl_ext_double long double // slightly slower +#define nl_ext_double nl_double + +template +class matrix_solver_w_t: public matrix_solver_t +{ +public: + + matrix_solver_w_t(const solver_parameters_t *params, const int size); + matrix_solver_w_t(const eSolverType type, const solver_parameters_t *params, const int size); + + virtual ~matrix_solver_w_t(); + + virtual void vsetup(analog_net_t::list_t &nets) override; + virtual void reset() override { matrix_solver_t::reset(); } + +protected: + virtual void add_term(int net_idx, terminal_t *term) override; + virtual int vsolve_non_dynamic(const bool newton_raphson) override; + int solve_non_dynamic(const bool newton_raphson); + + inline const unsigned N() const { if (m_N == 0) return m_dim; else return m_N; } + + void build_LE_A(); + void build_LE_RHS(); + void LE_invert(); + + template + void LE_compute_x(T * RESTRICT x); + + template + T delta(const T * RESTRICT V); + + template + void store(const T * RESTRICT V); + + virtual netlist_time compute_next_timestep() override; + + template + inline nl_ext_double &A(const T1 &r, const T2 &c) { return m_A[r][c]; } + template + inline nl_ext_double &W(const T1 &r, const T2 &c) { return m_W[r][c]; } + + /* access to Ainv for fixed columns over row, there store transposed */ + template + inline nl_ext_double &Ainv(const T1 &r, const T2 &c) { return m_Ainv[c][r]; } + template + inline nl_ext_double &RHS(const T1 &r) { return m_RHS[r]; } + + + template + inline nl_ext_double &lA(const T1 &r, const T2 &c) { return m_lA[r][c]; } + + ATTR_ALIGN nl_double m_last_RHS[_storage_N]; // right hand side - contains currents + ATTR_ALIGN nl_double m_last_V[_storage_N]; + + terms_t * m_terms[_storage_N]; + terms_t *m_rails_temp; + +private: + static const std::size_t m_pitch = ((( _storage_N) + 7) / 8) * 8; + ATTR_ALIGN nl_ext_double m_A[_storage_N][m_pitch]; + ATTR_ALIGN nl_ext_double m_Ainv[_storage_N][m_pitch]; + ATTR_ALIGN nl_ext_double m_W[_storage_N][m_pitch]; + ATTR_ALIGN nl_ext_double m_RHS[_storage_N]; // right hand side - contains currents + + ATTR_ALIGN nl_ext_double m_lA[_storage_N][m_pitch]; + + /* temporary */ + ATTR_ALIGN nl_double H[_storage_N][m_pitch] ; + unsigned rows[_storage_N]; + unsigned cols[_storage_N][m_pitch]; + unsigned colcount[_storage_N]; + + unsigned m_cnt; + + //ATTR_ALIGN nl_ext_double m_RHSx[_storage_N]; + + const unsigned m_dim; + +}; + +// ---------------------------------------------------------------------------------------- +// matrix_solver_direct +// ---------------------------------------------------------------------------------------- + +template +matrix_solver_w_t::~matrix_solver_w_t() +{ + for (unsigned k = 0; k < N(); k++) + { + pfree(m_terms[k]); + } + pfree_array(m_rails_temp); +#if (NL_USE_DYNAMIC_ALLOCATION) + pfree_array(m_A); +#endif +} + +template +netlist_time matrix_solver_w_t::compute_next_timestep() +{ + nl_double new_solver_timestep = m_params.m_max_timestep; + + if (m_params.m_dynamic) + { + /* + * FIXME: We should extend the logic to use either all nets or + * only output nets. + */ + for (unsigned k = 0, iN=N(); k < iN; k++) + { + analog_net_t *n = m_nets[k]; + + const nl_double DD_n = (n->Q_Analog() - m_last_V[k]); + const nl_double hn = current_timestep(); + + nl_double DD2 = (DD_n / hn - n->m_DD_n_m_1 / n->m_h_n_m_1) / (hn + n->m_h_n_m_1); + nl_double new_net_timestep; + + n->m_h_n_m_1 = hn; + n->m_DD_n_m_1 = DD_n; + if (nl_math::abs(DD2) > NL_FCONST(1e-30)) // avoid div-by-zero + new_net_timestep = nl_math::sqrt(m_params.m_lte / nl_math::abs(NL_FCONST(0.5)*DD2)); + else + new_net_timestep = m_params.m_max_timestep; + + if (new_net_timestep < new_solver_timestep) + new_solver_timestep = new_net_timestep; + + m_last_V[k] = n->Q_Analog(); + } + if (new_solver_timestep < m_params.m_min_timestep) + new_solver_timestep = m_params.m_min_timestep; + } + //if (new_solver_timestep > 10.0 * hn) + // new_solver_timestep = 10.0 * hn; + return netlist_time::from_double(new_solver_timestep); +} + +template +ATTR_COLD void matrix_solver_w_t::add_term(int k, terminal_t *term) +{ + if (term->m_otherterm->net().isRailNet()) + { + m_rails_temp[k].add(term, -1, false); + } + else + { + int ot = get_net_idx(&term->m_otherterm->net()); + if (ot>=0) + { + m_terms[k]->add(term, ot, true); + } + /* Should this be allowed ? */ + else // if (ot<0) + { + m_rails_temp[k].add(term, ot, true); + log().fatal("found term with missing othernet {1}\n", term->name()); + } + } +} + + +template +ATTR_COLD void matrix_solver_w_t::vsetup(analog_net_t::list_t &nets) +{ + if (m_dim < nets.size()) + log().fatal("Dimension {1} less than {2}", m_dim, nets.size()); + + for (unsigned k = 0; k < N(); k++) + { + m_terms[k]->clear(); + m_rails_temp[k].clear(); + } + + matrix_solver_t::setup_base(nets); + + for (unsigned k = 0; k < N(); k++) + { + m_terms[k]->m_railstart = m_terms[k]->count(); + for (unsigned i = 0; i < m_rails_temp[k].count(); i++) + this->m_terms[k]->add(m_rails_temp[k].terms()[i], m_rails_temp[k].net_other()[i], false); + + m_rails_temp[k].clear(); // no longer needed + m_terms[k]->set_pointers(); + } + + /* create a list of non zero elements. */ + for (unsigned k = 0; k < N(); k++) + { + terms_t * t = m_terms[k]; + /* pretty brutal */ + int *other = t->net_other(); + + t->m_nz.clear(); + + for (unsigned i = 0; i < t->m_railstart; i++) + if (!t->m_nz.contains(other[i])) + t->m_nz.push_back(other[i]); + + t->m_nz.push_back(k); // add diagonal + + /* and sort */ + psort_list(t->m_nz); + } + + /* create a list of non zero elements right of the diagonal + * These list anticipate the population of array elements by + * Gaussian elimination. + */ + for (unsigned k = 0; k < N(); k++) + { + terms_t * t = m_terms[k]; + /* pretty brutal */ + int *other = t->net_other(); + + if (k==0) + t->m_nzrd.clear(); + else + { + t->m_nzrd = m_terms[k-1]->m_nzrd; + unsigned j=0; + while(j < t->m_nzrd.size()) + { + if (t->m_nzrd[j] < k + 1) + t->m_nzrd.remove_at(j); + else + j++; + } + } + + for (unsigned i = 0; i < t->m_railstart; i++) + if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1)) + t->m_nzrd.push_back(other[i]); + + /* and sort */ + psort_list(t->m_nzrd); + } + + /* create a list of non zero elements below diagonal k + * This should reduce cache misses ... + */ + + bool touched[_storage_N][_storage_N] = { { false } }; + for (unsigned k = 0; k < N(); k++) + { + m_terms[k]->m_nzbd.clear(); + for (unsigned j = 0; j < m_terms[k]->m_nz.size(); j++) + touched[k][m_terms[k]->m_nz[j]] = true; + } + + for (unsigned k = 0; k < N(); k++) + { + for (unsigned row = k + 1; row < N(); row++) + { + if (touched[row][k]) + { + if (!m_terms[k]->m_nzbd.contains(row)) + m_terms[k]->m_nzbd.push_back(row); + for (unsigned col = k; col < N(); col++) + if (touched[k][col]) + touched[row][col] = true; + } + } + } + + if (0) + for (unsigned k = 0; k < N(); k++) + { + pstring line = pfmt("{1}")(k, "3"); + for (unsigned j = 0; j < m_terms[k]->m_nzrd.size(); j++) + line += pfmt(" {1}")(m_terms[k]->m_nzrd[j], "3"); + log().verbose("{1}", line); + } + + /* + * save states + */ + save(NLNAME(m_last_RHS)); + save(NLNAME(m_last_V)); + + for (unsigned k = 0; k < N(); k++) + { + pstring num = pfmt("{1}")(k); + + save(RHS(k), "RHS" + num); + + save(m_terms[k]->go(),"GO" + num, m_terms[k]->count()); + save(m_terms[k]->gt(),"GT" + num, m_terms[k]->count()); + save(m_terms[k]->Idr(),"IDR" + num , m_terms[k]->count()); + } + +} + + +template +void matrix_solver_w_t::build_LE_A() +{ + const unsigned iN = N(); + for (unsigned k = 0; k < iN; k++) + { + for (unsigned i=0; i < iN; i++) + A(k,i) = 0.0; + + const unsigned terms_count = m_terms[k]->count(); + const unsigned railstart = m_terms[k]->m_railstart; + const nl_double * RESTRICT gt = m_terms[k]->gt(); + + { + nl_double akk = 0.0; + for (unsigned i = 0; i < terms_count; i++) + akk += gt[i]; + + A(k,k) = akk; + } + + const nl_double * RESTRICT go = m_terms[k]->go(); + const int * RESTRICT net_other = m_terms[k]->net_other(); + + for (unsigned i = 0; i < railstart; i++) + A(k,net_other[i]) -= go[i]; + } +} + +template +void matrix_solver_w_t::build_LE_RHS() +{ + const unsigned iN = N(); + for (unsigned k = 0; k < iN; k++) + { + nl_double rhsk_a = 0.0; + nl_double rhsk_b = 0.0; + + const int terms_count = m_terms[k]->count(); + const nl_double * RESTRICT go = m_terms[k]->go(); + const nl_double * RESTRICT Idr = m_terms[k]->Idr(); + const nl_double * const * RESTRICT other_cur_analog = m_terms[k]->other_curanalog(); + + for (int i = 0; i < terms_count; i++) + rhsk_a = rhsk_a + Idr[i]; + + for (int i = m_terms[k]->m_railstart; i < terms_count; i++) + //rhsk = rhsk + go[i] * terms[i]->m_otherterm->net().as_analog().Q_Analog(); + rhsk_b = rhsk_b + go[i] * *other_cur_analog[i]; + + RHS(k) = rhsk_a + rhsk_b; + } +} + +template +void matrix_solver_w_t::LE_invert() +{ + const unsigned kN = N(); + + for (unsigned i = 0; i < kN; i++) + { + for (unsigned j = 0; j < kN; j++) + { + W(i,j) = lA(i,j) = A(i,j); + Ainv(i,j) = 0.0; + } + Ainv(i,i) = 1.0; + } + /* down */ + for (unsigned i = 0; i < kN; i++) + { + /* FIXME: Singular matrix? */ + const nl_double f = 1.0 / W(i,i); + const unsigned * RESTRICT const p = m_terms[i]->m_nzrd.data(); + const unsigned e = m_terms[i]->m_nzrd.size(); + + /* Eliminate column i from row j */ + + const unsigned * RESTRICT const pb = m_terms[i]->m_nzbd.data(); + const unsigned eb = m_terms[i]->m_nzbd.size(); + for (unsigned jb = 0; jb < eb; jb++) + { + const unsigned j = pb[jb]; + const nl_double f1 = - W(j,i) * f; + if (f1 != 0.0) + { + for (unsigned k = 0; k < e; k++) + W(j,p[k]) += W(i,p[k]) * f1; + for (unsigned k = 0; k <= i; k ++) + Ainv(j,k) += Ainv(i,k) * f1; + } + } + } + /* up */ + for (int i = kN - 1; i >= 0; i--) + { + /* FIXME: Singular matrix? */ + const nl_double f = 1.0 / W(i,i); + for (int j = i - 1; j>=0; j--) + { + const nl_double f1 = - W(j,i) * f; + if (f1 != 0.0) + { + for (unsigned k = i; k < kN; k++) + W(j,k) += W(i,k) * f1; + for (unsigned k = 0; k < kN; k++) + Ainv(j,k) += Ainv(i,k) * f1; + } + } + for (unsigned k = 0; k < kN; k++) + { + Ainv(i,k) *= f; + } + } +} + +template +template +void matrix_solver_w_t::LE_compute_x( + T * RESTRICT x) +{ + const unsigned kN = N(); + + for (int i=0; i +template +T matrix_solver_w_t::delta( + const T * RESTRICT V) +{ + /* FIXME: Ideally we should also include currents (RHS) here. This would + * need a revaluation of the right hand side after voltages have been updated + * and thus belong into a different calculation. This applies to all solvers. + */ + + const unsigned iN = this->N(); + T cerr = 0; + for (unsigned i = 0; i < iN; i++) + cerr = std::fmax(cerr, nl_math::abs(V[i] - (T) this->m_nets[i]->m_cur_Analog)); + return cerr; +} + +template +template +void matrix_solver_w_t::store( + const T * RESTRICT V) +{ + for (unsigned i = 0, iN=N(); i < iN; i++) + { + this->m_nets[i]->m_cur_Analog = V[i]; + } +} + +template +int matrix_solver_w_t::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson) +{ + const auto iN = N(); + + nl_double new_V[_storage_N]; // = { 0.0 }; + + if ((m_cnt % 100) == 0) + { + /* complete calculation */ + this->LE_invert(); + this->LE_compute_x(new_V); + } + else + { + /* Solve Ay = b for y */ + this->LE_compute_x(new_V); + + /* determine changed rows */ + + unsigned rowcount=0; + #define VT(r,c) (A(r,c) - lA(r,c)) + + for (int row = 0; row < iN; row ++) + { + unsigned cc=0; + auto &nz = m_terms[row]->m_nz; + for (auto & col : nz) + { + if (A(row,col) != lA(row,col)) + cols[rowcount][cc++] = col; + } + if (cc > 0) + { + colcount[rowcount] = cc; + rows[rowcount++] = row; + } + } + if (rowcount > 0) + { + /* construct w = transform(V) * y + * dim: rowcount x iN + * */ + nl_double w[_storage_N] = {0}; + for (unsigned i = 0; i < rowcount; i++) + for (unsigned k = 0; k < iN; k++) + w[i] += VT(rows[i],k) * new_V[k]; + + for (unsigned i = 0; i < rowcount; i++) + for (unsigned k=0; k< rowcount; k++) + H[i][k] = 0.0; + + for (unsigned i = 0; i < rowcount; i++) + H[i][i] += 1.0; + /* Construct H = (I + VT*Z) */ + for (unsigned i = 0; i < rowcount; i++) + for (unsigned k=0; k< colcount[i]; k++) + { + const unsigned col = cols[i][k]; + nl_double f = VT(rows[i],col); + if (f!=0.0) + for (unsigned j= 0; j < rowcount; j++) + H[i][j] += f * Ainv(col,rows[j]); + } + + /* Gaussian elimination of H */ + for (unsigned i = 0; i < rowcount; i++) + { + if (H[i][i] == 0.0) + printf("%s H singular\n", this->name().cstr()); + const nl_double f = 1.0 / H[i][i]; + for (unsigned j = i+1; j < rowcount; j++) + { + const nl_double f1 = - f * H[j][i]; + + if (f1!=0.0) + { + nl_double *pj = &H[j][i+1]; + const nl_double *pi = &H[i][i+1]; + for (unsigned k = 0; k < rowcount-i-1; k++) + pj[k] += f1 * pi[k]; + //H[j][k] += f1 * H[i][k]; + w[j] += f1 * w[i]; + } + } + } + /* Back substitution */ + //inv(H) w = t w = H t + nl_double t[rowcount]; + for (int j = rowcount - 1; j >= 0; j--) + { + nl_double tmp = 0; + const nl_double *pj = &H[j][j+1]; + const nl_double *tj = &t[j+1]; + for (unsigned k = 0; k < rowcount-j-1; k++) + tmp += pj[k] * tj[k]; + //tmp += H[j][k] * t[k]; + t[j] = (w[j] - tmp) / H[j][j]; + } + + /* x = y - Zt */ + for (unsigned i=0; i this->m_params.m_accuracy) ? 2 : 1; + } + else + { + store(new_V); + return 1; + } +} + +template +inline int matrix_solver_w_t::vsolve_non_dynamic(const bool newton_raphson) +{ + this->build_LE_A(); + this->build_LE_RHS(); + + for (unsigned i=0, iN=N(); i < iN; i++) + m_last_RHS[i] = RHS(i); + + this->m_stat_calculations++; + return this->solve_non_dynamic(newton_raphson); +} + +template +matrix_solver_w_t::matrix_solver_w_t(const solver_parameters_t *params, const int size) +: matrix_solver_t(GAUSSIAN_ELIMINATION, params) + ,m_cnt(0) + , m_dim(size) +{ + m_rails_temp = palloc_array(terms_t, N()); +#if (NL_USE_DYNAMIC_ALLOCATION) + m_A = palloc_array(nl_ext_double, N() * m_pitch); +#endif + for (unsigned k = 0; k < N(); k++) + { + m_terms[k] = palloc(terms_t); + m_last_RHS[k] = 0.0; + m_last_V[k] = 0.0; + } +} + +template +matrix_solver_w_t::matrix_solver_w_t(const eSolverType type, const solver_parameters_t *params, const int size) +: matrix_solver_t(type, params) +,m_cnt(0) +, m_dim(size) +{ + m_rails_temp = palloc_array(terms_t, N()); + for (unsigned k = 0; k < N(); k++) + { + m_terms[k] = palloc(terms_t); + m_last_RHS[k] = 0.0; + m_last_V[k] = 0.0; + } +} + +NETLIB_NAMESPACE_DEVICES_END() + +#endif /* NLD_MS_DIRECT_H_ */ diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index 388f21bda77..ed011ff254d 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -46,6 +46,7 @@ #else #include "nld_ms_direct_lu.h" #endif +#include "nld_ms_w.h" #include "nld_ms_sm.h" #include "nld_ms_direct1.h" #include "nld_ms_direct2.h" @@ -459,7 +460,7 @@ matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const bool use_sp } else if (pstring("MAT").equals(m_iterative_solver)) { - typedef matrix_solver_sm_t solver_mat; + typedef matrix_solver_direct_t solver_mat; return palloc(solver_mat(&m_params, size)); } else if (pstring("SM").equals(m_iterative_solver)) @@ -468,6 +469,12 @@ matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const bool use_sp typedef matrix_solver_sm_t solver_mat; return palloc(solver_mat(&m_params, size)); } + else if (pstring("W").equals(m_iterative_solver)) + { + /* Woodbury Formula */ + typedef matrix_solver_w_t solver_mat; + return palloc(solver_mat(&m_params, size)); + } else if (pstring("SOR").equals(m_iterative_solver)) { typedef matrix_solver_SOR_t solver_GS; From ca99eb00ae4cd8913012be421c15849e10b010b3 Mon Sep 17 00:00:00 2001 From: couriersud Date: Mon, 28 Mar 2016 16:17:06 +0200 Subject: [PATCH 42/74] Remove sorting from Sherman-Morrison solver. It doesn't help. [Couriersud] --- src/lib/netlist/solver/nld_ms_sm.h | 72 ++++++++---------------------- 1 file changed, 18 insertions(+), 54 deletions(-) diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index bf98ecc32a4..4995900db91 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -222,49 +222,24 @@ ATTR_COLD void matrix_solver_sm_t::vsetup(analog_net_t::list_t m_terms[k]->set_pointers(); } -#if 1 - - /* Sort in descending order by number of connected matrix voltages. - * The idea is, that for Gauss-Seidel algo the first voltage computed - * depends on the greatest number of previous voltages thus taking into - * account the maximum amout of information. - * - * This actually improves performance on popeye slightly. Average - * GS computations reduce from 2.509 to 2.370 - * - * Smallest to largest : 2.613 - * Unsorted : 2.509 - * Largest to smallest : 2.370 - * - * Sorting as a general matrix pre-conditioning is mentioned in - * literature but I have found no articles about Gauss Seidel. - * - * For Gaussian Elimination however increasing order is better suited. - * FIXME: Even better would be to sort on elements right of the matrix diagonal. - * - */ - - int sort_order = (type() == GAUSS_SEIDEL ? 1 : -1); - - for (unsigned k = 0; k < N() / 2; k++) - for (unsigned i = 0; i < N() - 1; i++) - { - if ((m_terms[i]->m_railstart - m_terms[i+1]->m_railstart) * sort_order < 0) - { - std::swap(m_terms[i], m_terms[i+1]); - std::swap(m_nets[i], m_nets[i+1]); - } - } - + /* create a list of non zero elements. */ for (unsigned k = 0; k < N(); k++) { - int *other = m_terms[k]->net_other(); - for (unsigned i = 0; i < m_terms[k]->count(); i++) - if (other[i] != -1) - other[i] = get_net_idx(&m_terms[k]->terms()[i]->m_otherterm->net()); - } + terms_t * t = m_terms[k]; + /* pretty brutal */ + int *other = t->net_other(); -#endif + t->m_nz.clear(); + + for (unsigned i = 0; i < t->m_railstart; i++) + if (!t->m_nz.contains(other[i])) + t->m_nz.push_back(other[i]); + + t->m_nz.push_back(k); // add diagonal + + /* and sort */ + psort_list(t->m_nz); + } /* create a list of non zero elements right of the diagonal * These list anticipate the population of array elements by @@ -276,8 +251,6 @@ ATTR_COLD void matrix_solver_sm_t::vsetup(analog_net_t::list_t /* pretty brutal */ int *other = t->net_other(); - t->m_nz.clear(); - if (k==0) t->m_nzrd.clear(); else @@ -294,19 +267,11 @@ ATTR_COLD void matrix_solver_sm_t::vsetup(analog_net_t::list_t } for (unsigned i = 0; i < t->m_railstart; i++) - { if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1)) t->m_nzrd.push_back(other[i]); - if (!t->m_nz.contains(other[i])) - t->m_nz.push_back(other[i]); - } /* and sort */ psort_list(t->m_nzrd); - - t->m_nz.push_back(k); // add diagonal - - psort_list(t->m_nz); } /* create a list of non zero elements below diagonal k @@ -535,7 +500,8 @@ template int matrix_solver_sm_t::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson) { static const bool incremental = true; - static UINT32 cnt = 0; + static unsigned cnt = 0; + const auto iN = N(); nl_double new_V[_storage_N]; // = { 0.0 }; @@ -546,9 +512,7 @@ int matrix_solver_sm_t::solve_non_dynamic(ATTR_UNUSED const boo } else { - const auto iN = N(); - - if (!incremental) + if (not incremental) { for (int row = 0; row < iN; row ++) for (int k = 0; k < iN; k++) From bd55ad2df386ae91f1cd12a2785658bdfe6de159 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 29 Mar 2016 11:00:06 +1100 Subject: [PATCH 43/74] =?UTF-8?q?Exorcise=20the=20Driver=20Fant=C3=B4me=20?= =?UTF-8?q?The=20authod=20of=20this=20translation=20failed=20to=20address?= =?UTF-8?q?=20serious=20issues=20raised=20If=20someone=20wants=20to=20make?= =?UTF-8?q?=20a=20good=20French=20translation,=20feel=20free=20In=20the=20?= =?UTF-8?q?mean=20time,=20French-speaking=20users=20may=20wish=20to=20use?= =?UTF-8?q?=20the=20Belgian=20French=20localisation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- language/French/strings.po | 975 ++++++++++++++++--------------------- 1 file changed, 407 insertions(+), 568 deletions(-) diff --git a/language/French/strings.po b/language/French/strings.po index ebf194942eb..037e7947971 100644 --- a/language/French/strings.po +++ b/language/French/strings.po @@ -1,5 +1,4 @@ # French translations for PACKAGE package -# Traductions françaises du paquet PACKAGE. # Copyright (C) 2016 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Automatically generated, 2016. @@ -11,28 +10,27 @@ msgstr "" "POT-Creation-Date: 2016-03-28 09:02+0200\n" "PO-Revision-Date: 2016-02-20 18:03+0100\n" "Last-Translator: Automatically generated\n" -"Language-Team: Benjamin Siskoo\n" +"Language-Team: MAME Language Team\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: src/emu/ui/auditmenu.cpp:115 msgid "Audit in progress..." -msgstr "Audit en cours..." +msgstr "" #: src/emu/ui/barcode.cpp:72 msgid "New Barcode:" -msgstr "Nouveau Barcode :" +msgstr "" #: src/emu/ui/barcode.cpp:76 msgid "Enter Code" -msgstr "Entrer un Code" +msgstr "" #: src/emu/ui/barcode.cpp:118 msgid "Barcode length invalid!" -msgstr "Longueur du Barcode invalide !" +msgstr "" #: src/emu/ui/cheatopt.cpp:77 #, c-format @@ -40,113 +38,111 @@ msgid "" "Cheat Comment:\n" "%s" msgstr "" -"Commenter un Cheat :\n" -"%s" #: src/emu/ui/cheatopt.cpp:90 msgid "All cheats reloaded" -msgstr "Tous les Cheats sont rechargés" +msgstr "" #: src/emu/ui/cheatopt.cpp:121 msgid "Autofire Settings" -msgstr "Configuration du Tir Auto" +msgstr "" #: src/emu/ui/cheatopt.cpp:139 msgid "Reset All" -msgstr "Tout Réinitialiser" +msgstr "" #: src/emu/ui/cheatopt.cpp:142 msgid "Reload All" -msgstr "Tout Recharger" +msgstr "" #: src/emu/ui/cheatopt.cpp:258 msgid "Autofire Status" -msgstr "Statut du Tir Auto" +msgstr "" #: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Disabled" -msgstr "Désactivé" +msgstr "" #: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219 #: src/emu/ui/videoopt.cpp:223 msgid "Enabled" -msgstr "Activé" +msgstr "" #: src/emu/ui/cheatopt.cpp:284 src/emu/ui/cheatopt.cpp:290 #: src/emu/ui/dsplmenu.cpp:182 src/emu/ui/menu.cpp:675 #: src/emu/ui/miscmenu.cpp:637 src/emu/ui/miscmenu.cpp:950 #: src/emu/ui/sndmenu.cpp:134 src/emu/ui/sndmenu.cpp:136 msgid "On" -msgstr "On" +msgstr "" #: src/emu/ui/cheatopt.cpp:284 src/emu/ui/cheatopt.cpp:290 #: src/emu/ui/dsplmenu.cpp:182 src/emu/ui/menu.cpp:678 #: src/emu/ui/miscmenu.cpp:637 src/emu/ui/miscmenu.cpp:950 #: src/emu/ui/sndmenu.cpp:134 src/emu/ui/sndmenu.cpp:136 msgid "Off" -msgstr "Off" +msgstr "" #: src/emu/ui/cheatopt.cpp:301 msgid "No buttons found on this machine!" -msgstr "Aucun bouton trouvé sur cette machine !" +msgstr "" #: src/emu/ui/cheatopt.cpp:312 src/emu/ui/cheatopt.cpp:316 msgid "Autofire Delay" -msgstr "Retarder le Tir Auto" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:20 msgid "Lightgun Device Assignment" -msgstr "Affecter au Périphérique Pistolet" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:21 msgid "Trackball Device Assignment" -msgstr "Affecter au Périphérique Trackball" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:22 msgid "Pedal Device Assignment" -msgstr "Affecter au Périphérique Pédale" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:23 msgid "Adstick Device Assignment" -msgstr "Affecter au Périphérique Adstick" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:24 msgid "Paddle Device Assignment" -msgstr "Affecter au Périphérique Manette" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:25 msgid "Dial Device Assignment" -msgstr "Affecter au Périphérique Dial" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:26 msgid "Positional Device Assignment" -msgstr "Affecter au Périphérique Positionel" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:27 msgid "Mouse Device Assignment" -msgstr "Affecter au Périphérique Souris" +msgstr "" #: src/emu/ui/ctrlmenu.cpp:106 src/emu/ui/ctrlmenu.cpp:126 #: src/emu/ui/optsmenu.cpp:264 msgid "Device Mapping" -msgstr "Définir le Périphérique" +msgstr "" #: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445 msgid "Main filter" -msgstr "Filtre Principal" +msgstr "" #: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454 msgid "Other filter" -msgstr "Autre Filtre" +msgstr "" #: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:235 msgid "^!Manufacturer" -msgstr "^!Développeur" +msgstr "" #: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472 #: src/emu/ui/optsmenu.cpp:243 @@ -155,208 +151,206 @@ msgstr "" #: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508 msgid "Remove last filter" -msgstr "Supprimer le Dernier Filtre" +msgstr "" #: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511 msgid "Add filter" -msgstr "Ajouter un Filtre" +msgstr "" #: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231 #: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547 msgid "Select custom filters:" -msgstr "Sélectionner les filtres personnalisés :" +msgstr "" #: src/emu/ui/custmenu.cpp:463 msgid "^!Publisher" -msgstr "^!Editeur" +msgstr "" #: src/emu/ui/custmenu.cpp:481 msgid "^!Software List" -msgstr "^!Liste de Logiciel" +msgstr "" #: src/emu/ui/custmenu.cpp:490 msgid "^!Device type" -msgstr "^!Type de Périphérique" +msgstr "" #: src/emu/ui/custmenu.cpp:499 msgid "^!Region" -msgstr "^!Région" +msgstr "" #: src/emu/ui/custui.cpp:22 msgid "Show All" -msgstr "Tout Afficher" +msgstr "" #: src/emu/ui/custui.cpp:23 msgid "Hide Filters" -msgstr "Cacher les Filtres" +msgstr "" #: src/emu/ui/custui.cpp:24 msgid "Hide Info/Image" -msgstr "Cacher Info/Image" +msgstr "" #: src/emu/ui/custui.cpp:25 msgid "Hide Both" -msgstr "Cacher les 2" +msgstr "" #: src/emu/ui/custui.cpp:141 msgid "Fonts" -msgstr "Polices" +msgstr "" #: src/emu/ui/custui.cpp:142 msgid "Colors" -msgstr "Couleurs" +msgstr "" #: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33 msgid "Language" -msgstr "Langue" +msgstr "" #: src/emu/ui/custui.cpp:151 msgid "Show side panels" -msgstr "Afficher les Onglets à Côté" +msgstr "" #: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186 msgid "Custom UI Settings" -msgstr "Configurer l'Interface Personnalisée" +msgstr "" #: src/emu/ui/custui.cpp:244 msgid "default" -msgstr "défaut" +msgstr "" #: src/emu/ui/custui.cpp:347 msgid "UI Font" -msgstr "Police de l'Interface" +msgstr "" #: src/emu/ui/custui.cpp:352 msgid "Bold" -msgstr "Gras" +msgstr "" #: src/emu/ui/custui.cpp:353 msgid "Italic" -msgstr "Italique" +msgstr "" #: src/emu/ui/custui.cpp:358 msgid "Lines" -msgstr "Lignes" +msgstr "" #: src/emu/ui/custui.cpp:364 msgid "Infos text size" -msgstr "Taille du Texte des Infos" +msgstr "" #: src/emu/ui/custui.cpp:381 msgid "UI Fonts Settings" -msgstr "Paramètres des Polices de l'Interface" +msgstr "" #: src/emu/ui/custui.cpp:408 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit." msgstr "" -"Echantillon de Texte - Lorem ipsum dolor sit amet, consectetur adipiscing " -"elit." #: src/emu/ui/custui.cpp:506 msgid "Normal text" -msgstr "Texte Normal" +msgstr "" #: src/emu/ui/custui.cpp:507 msgid "Selected color" -msgstr "Couleur Sélectionnée" +msgstr "" #: src/emu/ui/custui.cpp:508 msgid "Normal text background" -msgstr "Texte Normal en Arrière Plan" +msgstr "" #: src/emu/ui/custui.cpp:509 msgid "Selected background color" -msgstr "Couleur : Arrière Plan de la Sélection" +msgstr "" #: src/emu/ui/custui.cpp:510 msgid "Subitem color" -msgstr "Couleur du Sous Objet" +msgstr "" #: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606 msgid "Clone" -msgstr "Clone" +msgstr "" #: src/emu/ui/custui.cpp:512 msgid "Border" -msgstr "Bordure" +msgstr "" #: src/emu/ui/custui.cpp:513 msgid "Background" -msgstr "Arrière Plan" +msgstr "" #: src/emu/ui/custui.cpp:514 msgid "Dipswitch" -msgstr "Interrupteurs (Dipswitch)" +msgstr "" #: src/emu/ui/custui.cpp:515 msgid "Unavailable color" -msgstr "Couleur Non Disponible" +msgstr "" #: src/emu/ui/custui.cpp:516 msgid "Slider color" -msgstr "Couleur du Glisseur" +msgstr "" #: src/emu/ui/custui.cpp:517 msgid "Gfx viewer background" -msgstr "Visualiseur Graphique en Arrière Plan" +msgstr "" #: src/emu/ui/custui.cpp:518 msgid "Mouse over color" -msgstr "Sélection de la Couleur avec la Souris" +msgstr "" #: src/emu/ui/custui.cpp:519 msgid "Mouse over background color" -msgstr "Couleur du Fond de la Sélection" +msgstr "" #: src/emu/ui/custui.cpp:520 msgid "Mouse down color" -msgstr "Couleur de Clic enfoncé" +msgstr "" #: src/emu/ui/custui.cpp:521 msgid "Mouse down background color" -msgstr "Couleur du fond de la Sélection" +msgstr "" #: src/emu/ui/custui.cpp:524 msgid "Restore originals colors" -msgstr "Restaurer les Couleurs Originales" +msgstr "" #: src/emu/ui/custui.cpp:540 msgid "UI Colors Settings" -msgstr "Paramètrage des Couleurs de l'Interface" +msgstr "" #: src/emu/ui/custui.cpp:568 #, c-format msgid "Double click or press %1$s to change the color value" -msgstr "Double-cliquez ou pressez %1$s pour changer la valeur de la couleur" +msgstr "" #: src/emu/ui/custui.cpp:594 msgid "Menu Preview" -msgstr "Menu Prévisualiser" +msgstr "" #: src/emu/ui/custui.cpp:602 msgid "Normal" -msgstr "Normal" +msgstr "" #: src/emu/ui/custui.cpp:603 msgid "Subitem" -msgstr "Sous Objet" +msgstr "" #: src/emu/ui/custui.cpp:604 msgid "Selected" -msgstr "Sélectionné" +msgstr "" #: src/emu/ui/custui.cpp:605 msgid "Mouse Over" -msgstr "Survol de la Souris" +msgstr "" #: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840 msgid "Alpha" -msgstr "Alpha" +msgstr "" #: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848 #: src/emu/ui/custui.cpp:1007 msgid "Red" -msgstr "Rouge" +msgstr "" #: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856 #: src/emu/ui/custui.cpp:1010 @@ -366,35 +360,35 @@ msgstr "" #: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864 #: src/emu/ui/custui.cpp:1011 msgid "Blue" -msgstr "Bleu" +msgstr "" #: src/emu/ui/custui.cpp:867 msgid "Choose from palette" -msgstr "Choisir depuis la Palette" +msgstr "" #: src/emu/ui/custui.cpp:883 msgid " - ARGB Settings" -msgstr " - Paramètres ARGB" +msgstr "" #: src/emu/ui/custui.cpp:907 msgid "Color preview =" -msgstr "Prévisualiser la Couleur =" +msgstr "" #: src/emu/ui/custui.cpp:1003 msgid "White" -msgstr "Blanc" +msgstr "" #: src/emu/ui/custui.cpp:1004 msgid "Silver" -msgstr "Argent" +msgstr "" #: src/emu/ui/custui.cpp:1005 msgid "Gray" -msgstr "Gris" +msgstr "" #: src/emu/ui/custui.cpp:1006 msgid "Black" -msgstr "Noir" +msgstr "" #: src/emu/ui/custui.cpp:1008 msgid "Orange" @@ -402,46 +396,46 @@ msgstr "" #: src/emu/ui/custui.cpp:1009 msgid "Yellow" -msgstr "Jaune" +msgstr "" #: src/emu/ui/custui.cpp:1012 msgid "Violet" -msgstr "Violet" +msgstr "" #: src/emu/ui/datmenu.cpp:64 msgid "Software History" -msgstr "Histoire du Logiciel" +msgstr "" #: src/emu/ui/datmenu.cpp:66 msgid "Software Usage" -msgstr "Utilisation du Logiciel" +msgstr "" #: src/emu/ui/datmenu.cpp:196 msgid "Revision: " -msgstr "Révision : " +msgstr "" #: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39 #: src/emu/ui/selgame.cpp:2142 src/emu/ui/selgame.cpp:2151 #: src/emu/ui/selsoft.cpp:1576 src/emu/ui/selsoft.cpp:1594 #: src/emu/ui/selsoft.cpp:1603 msgid "History" -msgstr "Histoire" +msgstr "" #: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40 msgid "Mameinfo" -msgstr "Mameinfo" +msgstr "" #: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42 msgid "Messinfo" -msgstr "MessInfo" +msgstr "" #: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41 msgid "Sysinfo" -msgstr "SysInfo" +msgstr "" #: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45 msgid "Mamescore" -msgstr "MameScore" +msgstr "" #: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44 msgid "Gameinit" @@ -449,111 +443,111 @@ msgstr "" #: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43 msgid "Command" -msgstr "Command" +msgstr "" #: src/emu/ui/dirmenu.cpp:31 msgid "ROMs" -msgstr "ROMs" +msgstr "" #: src/emu/ui/dirmenu.cpp:32 msgid "UI" -msgstr "UI" +msgstr "" #: src/emu/ui/dirmenu.cpp:34 msgid "Samples" -msgstr "Echantillons" +msgstr "" #: src/emu/ui/dirmenu.cpp:35 msgid "DATs" -msgstr "DATs" +msgstr "" #: src/emu/ui/dirmenu.cpp:36 msgid "INIs" -msgstr "INIs" +msgstr "" #: src/emu/ui/dirmenu.cpp:37 msgid "Extra INIs" -msgstr "INIs supplèmentaires" +msgstr "" #: src/emu/ui/dirmenu.cpp:38 msgid "Icons" -msgstr "Icônes" +msgstr "" #: src/emu/ui/dirmenu.cpp:39 src/emu/ui/miscmenu.cpp:560 msgid "Cheats" -msgstr "Cheats" +msgstr "" #: src/emu/ui/dirmenu.cpp:40 src/emu/ui/menu.cpp:43 msgid "Snapshots" -msgstr "Copies d'Ecran" +msgstr "" #: src/emu/ui/dirmenu.cpp:41 src/emu/ui/menu.cpp:44 msgid "Cabinets" -msgstr "Cabinets" +msgstr "" #: src/emu/ui/dirmenu.cpp:42 src/emu/ui/menu.cpp:47 msgid "Flyers" -msgstr "Flyers" +msgstr "" #: src/emu/ui/dirmenu.cpp:43 src/emu/ui/menu.cpp:48 msgid "Titles" -msgstr "Titres" +msgstr "" #: src/emu/ui/dirmenu.cpp:44 src/emu/ui/menu.cpp:49 msgid "Ends" -msgstr "Ends" +msgstr "" #: src/emu/ui/dirmenu.cpp:45 src/emu/ui/menu.cpp:46 msgid "PCBs" -msgstr "PCBs" +msgstr "" #: src/emu/ui/dirmenu.cpp:46 src/emu/ui/menu.cpp:58 src/emu/ui/videoopt.cpp:223 msgid "Marquees" -msgstr "Marquees" +msgstr "" #: src/emu/ui/dirmenu.cpp:47 msgid "Controls Panels" -msgstr "Controls Panels" +msgstr "" #: src/emu/ui/dirmenu.cpp:48 msgid "Crosshairs" -msgstr "Viseur" +msgstr "" #: src/emu/ui/dirmenu.cpp:49 msgid "Artworks" -msgstr "Artworks" +msgstr "" #: src/emu/ui/dirmenu.cpp:50 src/emu/ui/menu.cpp:51 msgid "Bosses" -msgstr "Bosses" +msgstr "" #: src/emu/ui/dirmenu.cpp:51 msgid "Artworks Preview" -msgstr "Prévisualiser les Artworks" +msgstr "" #: src/emu/ui/dirmenu.cpp:52 src/emu/ui/menu.cpp:57 msgid "Select" -msgstr "Sélectionner" +msgstr "" #: src/emu/ui/dirmenu.cpp:53 msgid "GameOver" -msgstr "GameOver" +msgstr "" #: src/emu/ui/dirmenu.cpp:54 src/emu/ui/menu.cpp:55 msgid "HowTo" -msgstr "HowTo" +msgstr "" #: src/emu/ui/dirmenu.cpp:55 src/emu/ui/menu.cpp:52 msgid "Logos" -msgstr "Logos" +msgstr "" #: src/emu/ui/dirmenu.cpp:56 src/emu/ui/menu.cpp:56 msgid "Scores" -msgstr "Scores" +msgstr "" #: src/emu/ui/dirmenu.cpp:57 src/emu/ui/menu.cpp:53 msgid "Versus" -msgstr "Versus" +msgstr "" #: src/emu/ui/dirmenu.cpp:58 src/emu/ui/menu.cpp:59 msgid "Covers" @@ -561,7 +555,7 @@ msgstr "" #: src/emu/ui/dirmenu.cpp:116 src/emu/ui/dirmenu.cpp:136 msgid "Folders Setup" -msgstr "Configurer les Dossiers" +msgstr "" #: src/emu/ui/dirmenu.cpp:183 #, c-format @@ -570,87 +564,87 @@ msgstr "" #: src/emu/ui/dirmenu.cpp:195 msgid "Change Folder" -msgstr "Changer le Dossier" +msgstr "" #: src/emu/ui/dirmenu.cpp:195 msgid "Add Folder" -msgstr "Ajouter un Dossier" +msgstr "" #: src/emu/ui/dirmenu.cpp:198 msgid "Remove Folder" -msgstr "Enlever le Dossier" +msgstr "" #: src/emu/ui/dirmenu.cpp:496 #, c-format msgid "Change %1$s Folder - Search: %2$s_" -msgstr "Changer %1$s Dossier - Recherche : %2$s_" +msgstr "" #: src/emu/ui/dirmenu.cpp:497 #, c-format msgid "Add %1$s Folder - Search: %2$s_" -msgstr "Ajouter %1$s Dossier - Recherche : %2$s_" +msgstr "" #: src/emu/ui/dirmenu.cpp:534 msgid "Press TAB to set" -msgstr "Presser TAB pour Faire les Réglages" +msgstr "" #: src/emu/ui/dirmenu.cpp:640 #, c-format msgid "Remove %1$s Folder" -msgstr "Supprimer le Dossier %1$s" +msgstr "" #: src/emu/ui/dsplmenu.cpp:38 msgid "Video Mode" -msgstr "Mode Vidéo" +msgstr "" #: src/emu/ui/dsplmenu.cpp:40 msgid "Triple Buffering" -msgstr "Triple Buffering" +msgstr "" #: src/emu/ui/dsplmenu.cpp:41 msgid "HLSL" -msgstr "HLSL" +msgstr "" #: src/emu/ui/dsplmenu.cpp:43 msgid "GLSL" -msgstr "GLSL" +msgstr "" #: src/emu/ui/dsplmenu.cpp:44 msgid "Bilinear Filtering" -msgstr "Flitrage Bi-linèaire" +msgstr "" #: src/emu/ui/dsplmenu.cpp:45 msgid "Bitmap Prescaling" -msgstr "PréScaling du Bitmap" +msgstr "" #: src/emu/ui/dsplmenu.cpp:46 msgid "Window Mode" -msgstr "Mode Fenétré" +msgstr "" #: src/emu/ui/dsplmenu.cpp:47 msgid "Enforce Aspect Ratio" -msgstr "Garder les Proportions" +msgstr "" #: src/emu/ui/dsplmenu.cpp:48 msgid "Start Out Maximized" -msgstr "Affichage Agrandit au Démarrage" +msgstr "" #: src/emu/ui/dsplmenu.cpp:49 msgid "Synchronized Refresh" -msgstr "Rafraîchissement Syncrhonisé" +msgstr "" #: src/emu/ui/dsplmenu.cpp:50 msgid "Wait Vertical Sync" -msgstr "Attente de la Synchro Verticale" +msgstr "" #: src/emu/ui/dsplmenu.cpp:202 src/emu/ui/dsplmenu.cpp:222 #: src/emu/ui/optsmenu.cpp:261 msgid "Display Options" -msgstr "Options D'Affichage" +msgstr "" #: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" -msgstr "Le Fichier Existe Déjà - Continuer ?" +msgstr "" #: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 @@ -658,7 +652,7 @@ msgstr "Le Fichier Existe Déjà - Continuer ?" #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 #: src/emu/ui/selgame.cpp:1575 msgid "No" -msgstr "Non" +msgstr "" #: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 @@ -666,196 +660,194 @@ msgstr "Non" #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566 #: src/emu/ui/selgame.cpp:1575 msgid "Yes" -msgstr "Oui" +msgstr "" #: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" -msgstr "Nouveau Nom de l'Image :" +msgstr "" #: src/emu/ui/filesel.cpp:281 msgid "Image Format:" -msgstr "Format de l'Image :" +msgstr "" #: src/emu/ui/filesel.cpp:287 msgid "Create" -msgstr "Créer" +msgstr "" #: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" -msgstr "Veuillez entrer l'extension du fichier aussi" +msgstr "" #: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" -msgstr "[emplacement vide]" +msgstr "" #: src/emu/ui/filesel.cpp:510 msgid "[create]" -msgstr "[créer]" +msgstr "" #: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" -msgstr "[Liste de Logiciel]" +msgstr "" #: src/emu/ui/filesel.cpp:806 msgid "Select image format" -msgstr "Sélection du Format de l'Image" +msgstr "" #: src/emu/ui/filesel.cpp:866 msgid "Select access mode" -msgstr "Sélection du Mode d'Accès" +msgstr "" #: src/emu/ui/filesel.cpp:867 msgid "Read-only" -msgstr "Lecture Seule" +msgstr "" #: src/emu/ui/filesel.cpp:869 msgid "Read-write" -msgstr "Lecture-Ecriture" +msgstr "" #: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" -msgstr "Lire Cette Image, Ecrire vers une Autre Image" +msgstr "" #: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" -msgstr "Lire cette image, écrire la différence" +msgstr "" #: src/emu/ui/imgcntrl.cpp:115 msgid "Cannot save over directory" -msgstr "Ne peux pas Sauvegarder vers un autre Répertoire" +msgstr "" #: src/emu/ui/imgcntrl.cpp:149 msgid "" "The software selected is missing one or more required ROM or CHD images. " "Please select a different one." msgstr "" -"Le logiciel sélectionné est manquant ou une ou plusieurs images ROM ou CHD " -"sont nécessaires. Veuillez en sélectionner une différente." #: src/emu/ui/info.cpp:98 msgid "Not supported" -msgstr "Pas Supporté" +msgstr "" #: src/emu/ui/info.cpp:101 msgid "Partially supported" -msgstr "Partiellement Supporté" +msgstr "" #: src/emu/ui/info.cpp:109 msgid "[empty]" -msgstr "[vide]" +msgstr "" #: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:90 msgid "Pseudo terminals" -msgstr "Pseudo Terminals" +msgstr "" #: src/emu/ui/info_pty.cpp:35 msgid "[failed]" -msgstr "[a échoué]" +msgstr "" #: src/emu/ui/inputmap.cpp:52 msgid "User Interface" -msgstr "Interface Utilisateur" +msgstr "" #: src/emu/ui/inputmap.cpp:59 msgid "Other Controls" -msgstr "Autres Contrôles" +msgstr "" #: src/emu/ui/inputmap.cpp:625 src/emu/ui/miscmenu.cpp:90 #: src/emu/ui/slotopt.cpp:172 msgid "Reset" -msgstr "Redémarrer" +msgstr "" #: src/emu/ui/mainmenu.cpp:53 msgid "Input (general)" -msgstr "Configuration des Contrôles pour Tous les Jeux" +msgstr "" #: src/emu/ui/mainmenu.cpp:55 msgid "Input (this Machine)" -msgstr "Configuration des Contrôles pour ce Jeu Uniquement" +msgstr "" #: src/emu/ui/mainmenu.cpp:59 msgid "Analog Controls" -msgstr "Contrôles Analogiques" +msgstr "" #: src/emu/ui/mainmenu.cpp:61 msgid "Dip Switches" -msgstr "Interrupteurs" +msgstr "" #: src/emu/ui/mainmenu.cpp:64 msgid "Machine Configuration" -msgstr "Configuration de la Machine" +msgstr "" #: src/emu/ui/mainmenu.cpp:68 msgid "Bookkeeping Info" -msgstr "Info : Crédits et Temps de Jeu" +msgstr "" #: src/emu/ui/mainmenu.cpp:71 msgid "Machine Information" -msgstr "Informations sur la Machine" +msgstr "" #: src/emu/ui/mainmenu.cpp:77 msgid "Image Information" -msgstr "Informations sur l'Image" +msgstr "" #: src/emu/ui/mainmenu.cpp:80 msgid "File Manager" -msgstr "Gestionnaire de Fichier" +msgstr "" #: src/emu/ui/mainmenu.cpp:85 msgid "Tape Control" -msgstr "Contrôle de la Cassette" +msgstr "" #: src/emu/ui/mainmenu.cpp:93 msgid "Bios Selection" -msgstr "Sélection du Bios" +msgstr "" #: src/emu/ui/mainmenu.cpp:99 msgid "Slot Devices" -msgstr "Périphériques d'Emplacement" +msgstr "" #: src/emu/ui/mainmenu.cpp:106 msgid "Barcode Reader" -msgstr "Lecteur de Barcode" +msgstr "" #: src/emu/ui/mainmenu.cpp:113 msgid "Network Devices" -msgstr "Périphériques Réseau" +msgstr "" #: src/emu/ui/mainmenu.cpp:118 msgid "Keyboard Mode" -msgstr "Mode Clavier" +msgstr "" #: src/emu/ui/mainmenu.cpp:121 msgid "Slider Controls" -msgstr "Contrôles du Glisseur" +msgstr "" #: src/emu/ui/mainmenu.cpp:124 msgid "Video Options" -msgstr "Options Vidéo" +msgstr "" #: src/emu/ui/mainmenu.cpp:128 msgid "Crosshair Options" -msgstr "Options du Viseur" +msgstr "" #: src/emu/ui/mainmenu.cpp:132 msgid "Cheat" -msgstr "Cheat" +msgstr "" #: src/emu/ui/mainmenu.cpp:136 msgid "External DAT View" -msgstr "Voir le DAT Externe" +msgstr "" #: src/emu/ui/mainmenu.cpp:142 msgid "Add To Favorites" -msgstr "Ajouter Au Favoris" +msgstr "" #: src/emu/ui/mainmenu.cpp:144 msgid "Remove From Favorites" -msgstr "Supprimer des Favoris" +msgstr "" #: src/emu/ui/mainmenu.cpp:151 msgid "Select New Machine" -msgstr "Sélectionner une Nouvelle Machine" +msgstr "" #: src/emu/ui/menu.cpp:45 msgid "Control Panels" @@ -871,51 +863,51 @@ msgstr "" #: src/emu/ui/menu.cpp:64 msgid "Add or remove favorites" -msgstr "Ajouter ou Supprimer des Favoris" +msgstr "" #: src/emu/ui/menu.cpp:65 msgid "Export displayed list to file" -msgstr "Exporter la liste d'affichage vers le fichier" +msgstr "" #: src/emu/ui/menu.cpp:66 msgid "Show DATs view" -msgstr "Afficher la visualisation des DATs" +msgstr "" #: src/emu/ui/menu.cpp:253 msgid "Return to Machine" -msgstr "Revenir à la Machine" +msgstr "" #: src/emu/ui/menu.cpp:257 src/emu/ui/menu.cpp:259 msgid "Exit" -msgstr "Quitter" +msgstr "" #: src/emu/ui/menu.cpp:264 src/emu/ui/menu.cpp:266 msgid "Return to Previous Menu" -msgstr "Revenir au Menu Précédent" +msgstr "" #: src/emu/ui/menu.cpp:681 msgid "Auto" -msgstr "Auto" +msgstr "" #: src/emu/ui/menu.cpp:2098 msgid "Images" -msgstr "Images" +msgstr "" #: src/emu/ui/menu.cpp:2099 msgid "Infos" -msgstr "Infos" +msgstr "" #: src/emu/ui/miscmenu.cpp:36 msgid "Keyboard Mode:" -msgstr "Mode Clavier :" +msgstr "" #: src/emu/ui/miscmenu.cpp:36 msgid "Natural" -msgstr "Naturel" +msgstr "" #: src/emu/ui/miscmenu.cpp:36 msgid "Emulated" -msgstr "Emulé" +msgstr "" #: src/emu/ui/miscmenu.cpp:239 #, c-format @@ -923,8 +915,6 @@ msgid "" "Uptime: %1$d:%2$02d:%3$02d\n" "\n" msgstr "" -"Uptime: %1$d:%2$02d:%3$02d\n" -"\n" #: src/emu/ui/miscmenu.cpp:241 #, c-format @@ -932,8 +922,6 @@ msgid "" "Uptime: %1$d:%2$02d\n" "\n" msgstr "" -"Uptime: %1$d:%2$02d\n" -"\n" #: src/emu/ui/miscmenu.cpp:245 #, c-format @@ -941,100 +929,98 @@ msgid "" "Tickets dispensed: %1$d\n" "\n" msgstr "" -"Tickets Distribués : %1$d\n" -"\n" #: src/emu/ui/miscmenu.cpp:256 msgid "Coin %1$c: NA%3$s\n" -msgstr "Pièce %1$c: NA%3$s\n" +msgstr "" #: src/emu/ui/miscmenu.cpp:256 #, c-format msgid "Coin %1$c: %2$d%3$s\n" -msgstr "Pièce %1$c: %2$d%3$s\n" +msgstr "" #: src/emu/ui/miscmenu.cpp:259 msgid " (locked)" -msgstr " (fermé)" +msgstr "" #: src/emu/ui/miscmenu.cpp:518 msgid "Visible Delay" -msgstr "Retard Visible" +msgstr "" #: src/emu/ui/miscmenu.cpp:557 msgid "Re-select last machine played" -msgstr "Re-Sélectionner la dernière machine utilisée" +msgstr "" #: src/emu/ui/miscmenu.cpp:558 msgid "Enlarge images in the right panel" -msgstr "Agrandir les images dans l'onglet de droite" +msgstr "" #: src/emu/ui/miscmenu.cpp:559 msgid "DATs info" -msgstr "Info DATs" +msgstr "" #: src/emu/ui/miscmenu.cpp:561 msgid "Show mouse pointer" -msgstr "Afficher le Curseur de la Souris" +msgstr "" #: src/emu/ui/miscmenu.cpp:562 msgid "Confirm quit from machines" -msgstr "Confirmer l'Arrêt depuis les Machines" +msgstr "" #: src/emu/ui/miscmenu.cpp:563 msgid "Skip displaying information's screen at startup" -msgstr "Ne pas Afficher les Informations au Démarrage" +msgstr "" #: src/emu/ui/miscmenu.cpp:564 msgid "Force 4:3 appearance for software snapshot" -msgstr "Forcer l'Affichage en 4:3 pour les copies d'écrans" +msgstr "" #: src/emu/ui/miscmenu.cpp:565 msgid "Use image as background" -msgstr "Utiliser l'Image comme Fond d'Ecran" +msgstr "" #: src/emu/ui/miscmenu.cpp:566 msgid "Skip bios selection menu" -msgstr "Passer le menu de Sélection du Bios" +msgstr "" #: src/emu/ui/miscmenu.cpp:567 msgid "Skip software parts selection menu" -msgstr "Passer le menu de sélection logiciel" +msgstr "" #: src/emu/ui/miscmenu.cpp:652 src/emu/ui/miscmenu.cpp:672 #: src/emu/ui/optsmenu.cpp:263 msgid "Miscellaneous Options" -msgstr "Options Diverses" +msgstr "" #: src/emu/ui/miscmenu.cpp:737 #, c-format msgid "%s.xml saved under ui folder." -msgstr "%s.xml a été sauvegardé sous le dossier UI." +msgstr "" #: src/emu/ui/miscmenu.cpp:765 msgid "Name: Description:\n" -msgstr "Nom : Description:\n" +msgstr "" #: src/emu/ui/miscmenu.cpp:777 #, c-format msgid "%s.txt saved under ui folder." -msgstr "%s.txt a été sauvegardé sous le dossier UI." +msgstr "" #: src/emu/ui/miscmenu.cpp:795 msgid "Export XML format (like -listxml)" -msgstr "Exporter au Format XML (comme -listxml)" +msgstr "" #: src/emu/ui/miscmenu.cpp:796 msgid "Export TXT format (like -listfull)" -msgstr "Exporter au Format TXT (comme -listfull)" +msgstr "" #: src/emu/ui/miscmenu.cpp:854 msgid "Dummy" -msgstr "Factice" +msgstr "" #: src/emu/ui/miscmenu.cpp:856 msgid "Save machine configuration" -msgstr "Sauvegarder la Configuration de la Machine" +msgstr "" #: src/emu/ui/miscmenu.cpp:967 src/emu/ui/miscmenu.cpp:987 #: src/emu/ui/selgame.cpp:587 @@ -1043,64 +1029,64 @@ msgstr "" #: src/emu/ui/optsmenu.cpp:214 msgid "Filter" -msgstr "Filtre" +msgstr "" #: src/emu/ui/optsmenu.cpp:222 msgid " ^!File" -msgstr " ^!Fichier" +msgstr "" #: src/emu/ui/optsmenu.cpp:227 msgid " ^!Category" -msgstr " ^!Catégorie" +msgstr "" #: src/emu/ui/optsmenu.cpp:250 msgid "^!Setup custom filter" -msgstr "^!Paramètrer le Filtre Personnalisé" +msgstr "" #: src/emu/ui/optsmenu.cpp:258 msgid "Customize UI" -msgstr "Personnaliser l'Interface Utilisateur" +msgstr "" #: src/emu/ui/optsmenu.cpp:259 msgid "Configure Directories" -msgstr "Configurer les Répertoires" +msgstr "" #: src/emu/ui/optsmenu.cpp:262 src/emu/ui/sndmenu.cpp:150 #: src/emu/ui/sndmenu.cpp:170 msgid "Sound Options" -msgstr "Options Son" +msgstr "" #: src/emu/ui/optsmenu.cpp:265 msgid "General Inputs" -msgstr "Entrées Générales" +msgstr "" #: src/emu/ui/optsmenu.cpp:267 msgid "Save Configuration" -msgstr "Sauvegarder la Configuration" +msgstr "" #: src/emu/ui/optsmenu.cpp:281 src/emu/ui/optsmenu.cpp:301 msgid "Settings" -msgstr "Paramètres" +msgstr "" #: src/emu/ui/optsmenu.cpp:321 msgid "**Error saving ui.ini**" -msgstr "**Erreur de sauvegarde du fichier ui.ini**" +msgstr "" #: src/emu/ui/optsmenu.cpp:368 #, c-format msgid "**Error saving %s.ini**" -msgstr "**Erreur de Sauvegarde %s.ini**" +msgstr "" #: src/emu/ui/optsmenu.cpp:372 msgid "" "\n" " Configuration saved \n" "\n" -msgstr " Configuration Sauvegardée \n" +msgstr "" #: src/emu/ui/selector.cpp:165 msgid "Selection List - Search: " -msgstr "Liste de Sélection - Recherche : " +msgstr "" #: src/emu/ui/selector.cpp:194 #, c-format @@ -1109,7 +1095,7 @@ msgstr "" #: src/emu/ui/selgame.cpp:38 msgid "General Info" -msgstr "Info Générale" +msgstr "" #: src/emu/ui/selgame.cpp:370 src/emu/ui/selsoft.cpp:278 #, c-format @@ -1117,8 +1103,6 @@ msgid "" "%s\n" " added to favorites list." msgstr "" -"%s\n" -" ajouté à la liste des favoris." #: src/emu/ui/selgame.cpp:376 src/emu/ui/selgame.cpp:385 #: src/emu/ui/selsoft.cpp:283 @@ -1127,8 +1111,6 @@ msgid "" "%s\n" " removed from favorites list." msgstr "" -"%s\n" -" supprimé depuis la Liste des Favoris." #: src/emu/ui/selgame.cpp:446 msgid "" @@ -1137,281 +1119,274 @@ msgid "" "\n" "Press any key (except ESC) to continue." msgstr "" -"Une ou plusieurs Images ROM ou CHD sont manquantes pour le Jeu " -"SélectionnéVeuillez Choisir un Jeu Différent.\n" -"\n" #: src/emu/ui/selgame.cpp:585 src/emu/ui/simpleselgame.cpp:262 msgid "Configure Options" -msgstr "Configurer les Options" +msgstr "" #: src/emu/ui/selgame.cpp:744 #, c-format msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )" -msgstr "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )" +msgstr "" #: src/emu/ui/selgame.cpp:754 #, c-format msgid "%1$s (%2$s - %3$s) - " -msgstr "%1$s (%2$s - %3$s) - " +msgstr "" #: src/emu/ui/selgame.cpp:761 src/emu/ui/selgame.cpp:767 #, c-format msgid "%1$s (%2$s) - " -msgstr "%1$s (%2$s) - " +msgstr "" #: src/emu/ui/selgame.cpp:776 #, c-format msgid "%1$s Search: %2$s_" -msgstr "%1$s Recherche : %2$s_" +msgstr "" #: src/emu/ui/selgame.cpp:830 #, c-format msgid "Romset: %1$-.100s" -msgstr "Set de Rom : %1$-.100s" +msgstr "" #: src/emu/ui/selgame.cpp:833 src/emu/ui/selgame.cpp:882 #: src/emu/ui/selsoft.cpp:749 src/emu/ui/selsoft.cpp:799 #: src/emu/ui/simpleselgame.cpp:325 #, c-format msgid "%1$s, %2$-.100s" -msgstr "%1$s, %2$-.100s" +msgstr "" #: src/emu/ui/selgame.cpp:839 src/emu/ui/selsoft.cpp:755 #, c-format msgid "Driver is clone of: %1$-.100s" -msgstr "Le Driver est un Clone De : %1$-.100s" +msgstr "" #: src/emu/ui/selgame.cpp:841 src/emu/ui/selsoft.cpp:757 msgid "Driver is parent" -msgstr "Le Driver est un Parent" +msgstr "" #: src/emu/ui/selgame.cpp:845 src/emu/ui/selsoft.cpp:761 #: src/emu/ui/simpleselgame.cpp:332 msgid "Overall: NOT WORKING" -msgstr "Global : NE FONCTIONNE PAS" +msgstr "" #: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:763 #: src/emu/ui/simpleselgame.cpp:334 msgid "Overall: Unemulated Protection" -msgstr "Global : Protection Non Emulé" +msgstr "" #: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:765 #: src/emu/ui/simpleselgame.cpp:336 msgid "Overall: Working" -msgstr "Global : Fonctionne" +msgstr "" #: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:769 msgid "Graphics: Imperfect, " -msgstr "Graphiques : Imparfait, " +msgstr "" #: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:771 msgid "Graphics: OK, " -msgstr "Graphismes : OK, " +msgstr "" #: src/emu/ui/selgame.cpp:858 src/emu/ui/selsoft.cpp:774 msgid "Sound: Unimplemented" -msgstr "Son : non implémenté" +msgstr "" #: src/emu/ui/selgame.cpp:860 src/emu/ui/selsoft.cpp:776 msgid "Sound: Imperfect" -msgstr "Son : Imparfait" +msgstr "" #: src/emu/ui/selgame.cpp:862 src/emu/ui/selsoft.cpp:778 msgid "Sound: OK" -msgstr "Son : OK" +msgstr "" #: src/emu/ui/selgame.cpp:879 #, c-format msgid "System: %1$-.100s" -msgstr "Système : %1$-.100s" +msgstr "" #: src/emu/ui/selgame.cpp:886 src/emu/ui/selsoft.cpp:803 #, c-format msgid "Software is clone of: %1$-.100s" -msgstr "Le Logiciel est un Clone de : %1$-.100s" +msgstr "" #: src/emu/ui/selgame.cpp:888 src/emu/ui/selsoft.cpp:805 msgid "Software is parent" -msgstr "Le Logiciel est Parent" +msgstr "" #: src/emu/ui/selgame.cpp:893 src/emu/ui/selsoft.cpp:810 msgid "Supported: No" -msgstr "Supporté : Non" +msgstr "" #: src/emu/ui/selgame.cpp:898 src/emu/ui/selsoft.cpp:815 msgid "Supported: Partial" -msgstr "Supporté : Partiellement" +msgstr "" #: src/emu/ui/selgame.cpp:903 src/emu/ui/selsoft.cpp:820 msgid "Supported: Yes" -msgstr "Supporté : Oui" +msgstr "" #: src/emu/ui/selgame.cpp:908 src/emu/ui/selsoft.cpp:825 #, c-format msgid "romset: %1$-.100s" -msgstr "Set de Rom : %1$-.100s" +msgstr "" #: src/emu/ui/selgame.cpp:915 #, c-format msgid "%1$s %2$s" -msgstr "%1$s %2$s" +msgstr "" #: src/emu/ui/selgame.cpp:1527 #, c-format msgid "Romset: %1$-.100s\n" -msgstr "Set de ROM : %1$-.100s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1528 #, c-format msgid "Year: %1$s\n" -msgstr "Année: %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1529 #, c-format msgid "Manufacturer: %1$-.100s\n" -msgstr "Développeur : %1$-.100s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1533 #, c-format msgid "Driver is Clone of: %1$-.100s\n" -msgstr "Le Driver est un Clone De : %1$-.100s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1535 msgid "Driver is Parent\n" -msgstr "Le Driver est Parent\n" +msgstr "" #: src/emu/ui/selgame.cpp:1538 msgid "Overall: NOT WORKING\n" -msgstr "Global : NE FONCTIONNE PAS\n" +msgstr "" #: src/emu/ui/selgame.cpp:1540 msgid "Overall: Unemulated Protection\n" -msgstr "Global : Protection Non Emulée\n" +msgstr "" #: src/emu/ui/selgame.cpp:1542 msgid "Overall: Working\n" -msgstr "Global : Fonctionne\n" +msgstr "" #: src/emu/ui/selgame.cpp:1545 msgid "Graphics: Imperfect Colors\n" -msgstr "Graphismes : Couleurs Imparfaites\n" +msgstr "" #: src/emu/ui/selgame.cpp:1549 msgid "Graphics: Imperfect\n" -msgstr "Graphismes : Imparfait\n" +msgstr "" #: src/emu/ui/selgame.cpp:1551 msgid "Graphics: OK\n" -msgstr "Graphismes : Ok\n" +msgstr "" #: src/emu/ui/selgame.cpp:1554 msgid "Sound: Unimplemented\n" -msgstr "Son : Non Implémenté\n" +msgstr "" #: src/emu/ui/selgame.cpp:1556 msgid "Sound: Imperfect\n" -msgstr "Son : Imparfait\n" +msgstr "" #: src/emu/ui/selgame.cpp:1558 msgid "Sound: OK\n" -msgstr "Son : OK\n" +msgstr "" #: src/emu/ui/selgame.cpp:1560 #, c-format msgid "Driver is Skeleton: %1$s\n" -msgstr "Driver Fantôme : %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1561 #, c-format msgid "Game is Mechanical: %1$s\n" -msgstr "Le jeu est Mécanique : %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1562 #, c-format msgid "Requires Artwork: %1$s\n" -msgstr "Nécessite l'Artwork: %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1563 #, c-format msgid "Requires Clickable Artwork: %1$s\n" -msgstr "Nécessite un Artwork Cliquable : %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1564 #, c-format msgid "Support Cocktail: %1$s\n" -msgstr "Support Cocktail : %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1565 #, c-format msgid "Driver is Bios: %1$s\n" msgstr "" -"Driver Bios : %1$s\n" -" " #: src/emu/ui/selgame.cpp:1566 #, c-format msgid "Support Save: %1$s\n" -msgstr "Support des Sauvegardes : %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1567 #, c-format msgid "Screen Orientation: %1$s\n" -msgstr "Orientation de l'Ecran : %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1567 msgid "Vertical" -msgstr "Vertical" +msgstr "" #: src/emu/ui/selgame.cpp:1567 msgid "Horizontal" -msgstr "Horizontal" +msgstr "" #: src/emu/ui/selgame.cpp:1575 #, c-format msgid "Requires CHD: %1$s\n" -msgstr "Nécessite un CHD : %1$s\n" +msgstr "" #: src/emu/ui/selgame.cpp:1588 msgid "Roms Audit Pass: OK\n" -msgstr "Contrôle des Roms : OK\n" +msgstr "" #: src/emu/ui/selgame.cpp:1590 msgid "Roms Audit Pass: BAD\n" -msgstr "Contrôles des Roms : MAUVAIS\n" +msgstr "" #: src/emu/ui/selgame.cpp:1593 msgid "Samples Audit Pass: None Needed\n" -msgstr "Contrôles de Samples : Samples Inutile\n" +msgstr "" #: src/emu/ui/selgame.cpp:1595 msgid "Samples Audit Pass: OK\n" -msgstr "Contrôles des Samples : OK\n" +msgstr "" #: src/emu/ui/selgame.cpp:1597 msgid "Samples Audit Pass: BAD\n" -msgstr "Contrôles des Samples : MAUVAIS\n" +msgstr "" #: src/emu/ui/selgame.cpp:1600 msgid "" "Roms Audit Pass: Disabled\n" "Samples Audit Pass: Disabled\n" msgstr "" -"Contrôles des Roms : Désactivé\n" -"Contrôles des Samples : Désactivé\n" #: src/emu/ui/selgame.cpp:2039 src/emu/ui/selgame.cpp:2200 #: src/emu/ui/selsoft.cpp:1657 msgid "No Infos Available" -msgstr "Aucune Info Disponible" +msgstr "" #: src/emu/ui/selgame.cpp:2152 src/emu/ui/selsoft.cpp:1604 msgid "Usage" -msgstr "Utilisation" +msgstr "" #: src/emu/ui/selsoft.cpp:109 msgid " (default)" -msgstr " (défaut)" +msgstr "" #: src/emu/ui/selsoft.cpp:378 msgid "" @@ -1420,64 +1395,60 @@ msgid "" "\n" "Press any key (except ESC) to continue." msgstr "" -"Le Logiciel Sélectionné est manquant, un ou plusieurs fichiers sont " -"nécessaires. Veuillez sélectionner un logiciel différent.\n" -"\n" -"Appuyer sur n'importe quel touche (sauf ECHAP) pour continuer." #: src/emu/ui/selsoft.cpp:682 #, c-format msgid "%1$s %2$s ( %3$d / %4$d softwares )" -msgstr "%1$s %2$s ( %3$d / %4$d logiciels )" +msgstr "" #: src/emu/ui/selsoft.cpp:683 #, c-format msgid "Driver: \"%1$s\" software list " -msgstr "Driver: \"%1$s\" liste logiciel " +msgstr "" #: src/emu/ui/selsoft.cpp:686 #, c-format msgid "Region: %1$s -" -msgstr "Région : %1$s -" +msgstr "" #: src/emu/ui/selsoft.cpp:688 #, c-format msgid "Publisher: %1$s -" -msgstr "Editeur : %1$s -" +msgstr "" #: src/emu/ui/selsoft.cpp:690 #, c-format msgid "Year: %1$s -" -msgstr "Année : %1$s -" +msgstr "" #: src/emu/ui/selsoft.cpp:692 #, c-format msgid "Software List: %1$s -" -msgstr "Listes de Logiciels : %1$s -" +msgstr "" #: src/emu/ui/selsoft.cpp:694 #, c-format msgid "Device type: %1$s -" -msgstr "Type de Périphérique : %1$s -" +msgstr "" #: src/emu/ui/selsoft.cpp:696 #, c-format msgid "%s Search: %s_" -msgstr "%s Recherche : %s_" +msgstr "" #: src/emu/ui/selsoft.cpp:746 src/emu/ui/selsoft.cpp:796 #: src/emu/ui/simpleselgame.cpp:322 #, c-format msgid "%1$-.100s" -msgstr "%1$-.100s" +msgstr "" #: src/emu/ui/selsoft.cpp:1994 src/emu/ui/selsoft.cpp:2014 msgid "Software part selection:" -msgstr "Sélection Logiciel :" +msgstr "" #: src/emu/ui/selsoft.cpp:2132 src/emu/ui/selsoft.cpp:2152 msgid "Bios selection:" -msgstr "Sélection du Bios :" +msgstr "" #: src/emu/ui/simpleselgame.cpp:232 #, c-format @@ -1487,209 +1458,191 @@ msgid "" "If this is your first time using %2$s, please see the config.txt file in the " "docs directory for information on configuring %2$s." msgstr "" -"Aucun jeu trouvé. Veuillez vérifier le chemin de la rom spécifiée dans le " -"fichier %1$s.ini.\n" -"\n" -"Si c'est la première fois que vous utilisez %2$s, veuillez lire le fichier " -"config.txt dans le répertoire docs pour plus d'info sur la configuration " -"%2$s." #: src/emu/ui/simpleselgame.cpp:287 #, c-format msgid "Type name or select: %1$s_" -msgstr "Taper le nom ou choisir : %1$s_" +msgstr "" #: src/emu/ui/simpleselgame.cpp:289 msgid "Type name or select: (random)" -msgstr "Taper le nom ou choisir : (au hasard)" +msgstr "" #: src/emu/ui/simpleselgame.cpp:328 #, c-format msgid "Driver: %1$-.100s" -msgstr "Driver: %1$-.100s" +msgstr "" #: src/emu/ui/simpleselgame.cpp:340 src/emu/ui/simpleselgame.cpp:347 msgid "Imperfect" -msgstr "Imparfait" +msgstr "" #: src/emu/ui/simpleselgame.cpp:342 src/emu/ui/simpleselgame.cpp:349 msgid "OK" -msgstr "OK" +msgstr "" #: src/emu/ui/simpleselgame.cpp:345 msgid "Unimplemented" -msgstr "Non Implémenté" +msgstr "" #: src/emu/ui/simpleselgame.cpp:351 #, c-format msgid "Gfx: %s, Sound: %s" -msgstr "Gfx : %s, Son : %s" +msgstr "" #: src/emu/ui/slotopt.cpp:166 msgid " [internal]" -msgstr " [interne]" +msgstr "" #: src/emu/ui/sndmenu.cpp:134 msgid "Sound" -msgstr "Son" +msgstr "" #: src/emu/ui/sndmenu.cpp:135 msgid "Sample Rate" -msgstr "Vitesse d'Echantillonnage" +msgstr "" #: src/emu/ui/sndmenu.cpp:136 msgid "Use External Samples" -msgstr "Utilisez les fichiers sons (Samples) Externes" +msgstr "" #: src/emu/ui/swlist.cpp:70 msgid "[file manager]" -msgstr "[Gestionnaire de Fichier]" +msgstr "" #: src/emu/ui/swlist.cpp:235 msgid "Switch Item Ordering" -msgstr "Changer l'Ordre de Tri" +msgstr "" #: src/emu/ui/swlist.cpp:268 #, c-format msgid "Switched Order: entries now ordered by %s" -msgstr "Ordre de Tri Changé : les entrées sont maintenant triées par %$" +msgstr "" #: src/emu/ui/swlist.cpp:268 msgid "shortname" -msgstr "nom court" +msgstr "" #: src/emu/ui/swlist.cpp:268 msgid "description" -msgstr "description" +msgstr "" #: src/emu/ui/swlist.cpp:436 msgid "[compatible lists]" -msgstr "[Listes Compatible]" +msgstr "" #: src/emu/ui/tapectrl.cpp:84 msgid "stopped" -msgstr "arrêté" +msgstr "" #: src/emu/ui/tapectrl.cpp:86 msgid "playing" -msgstr "lancée" +msgstr "" #: src/emu/ui/tapectrl.cpp:86 msgid "(playing)" -msgstr "(lancée)" +msgstr "" #: src/emu/ui/tapectrl.cpp:87 msgid "recording" -msgstr "enregistré" +msgstr "" #: src/emu/ui/tapectrl.cpp:87 msgid "(recording)" -msgstr "(enregistré)" +msgstr "" #: src/emu/ui/tapectrl.cpp:94 msgid "Pause/Stop" -msgstr "Pause/Arrêt" +msgstr "" #: src/emu/ui/tapectrl.cpp:97 msgid "Play" -msgstr "Jouer" +msgstr "" #: src/emu/ui/tapectrl.cpp:100 msgid "Record" -msgstr "Enregistrer" +msgstr "" #: src/emu/ui/tapectrl.cpp:103 msgid "Rewind" -msgstr "Rembobiner" +msgstr "" #: src/emu/ui/tapectrl.cpp:106 msgid "Fast Forward" -msgstr "Avancée Rapide" +msgstr "" #: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " msgstr "" -"Ce driver nécessite les images pour être chargé dans les périphérique(s) " -"suivant(s) : " #: src/emu/ui/ui.cpp:1060 msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -"Une ou plusieurs ROMS/CHD de ce jeu est (sont)incorrecte(s). Ce jeu pourrait " -"ne pas se lancer correctement.\n" #: src/emu/ui/ui.cpp:1073 msgid "" "There are known problems with this machine\n" "\n" msgstr "" -"Il y a des problèmes connus avec ce jeu\n" -"\n" #: src/emu/ui/ui.cpp:1077 msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -"Une ou plusieurs ROMs/CHDs de ce jeu n'a (n'ont) pas été(s) correctement " -"copiée(s).\n" #: src/emu/ui/ui.cpp:1081 #, c-format msgid "The keyboard emulation may not be 100% accurate.\n" -msgstr "L'émulation du clavier peut ne pas être précise à 100%.\n" +msgstr "" #: src/emu/ui/ui.cpp:1083 #, c-format msgid "The colors aren't 100% accurate.\n" -msgstr "Les couleurs ne sont pas parfaites à 100%.\n" +msgstr "" #: src/emu/ui/ui.cpp:1085 msgid "The colors are completely wrong.\n" -msgstr "Les couleurs sont complétement fausses.\n" +msgstr "" #: src/emu/ui/ui.cpp:1087 #, c-format msgid "The video emulation isn't 100% accurate.\n" -msgstr "L'émulation vidéo n'est pas précise à 100%.\n" +msgstr "" #: src/emu/ui/ui.cpp:1089 #, c-format msgid "The sound emulation isn't 100% accurate.\n" -msgstr "L'émulation du son n'est pas précise à 100%.\n" +msgstr "" #: src/emu/ui/ui.cpp:1091 msgid "The machine lacks sound.\n" -msgstr "Il n'y a aucun son pour ce jeu.\n" +msgstr "" #: src/emu/ui/ui.cpp:1094 msgid "Screen flipping in cocktail mode is not supported.\n" -msgstr "Le retournement d'écran dans le mode cocktail n'est pas supporté.\n" +msgstr "" #: src/emu/ui/ui.cpp:1098 msgid "The machine requires external artwork files\n" -msgstr "La machine nécessite un fichier artwork externe\n" +msgstr "" #: src/emu/ui/ui.cpp:1103 msgid "" "This machine was never completed. It may exhibit strange behavior or missing " "elements that are not bugs in the emulation.\n" msgstr "" -"Ce jeu n'a jamais été terminé. Il peut y avoir des comportements étranges ou " -"des éléments manquants qui ne sont pas des bugs d'émulation.\n" #: src/emu/ui/ui.cpp:1108 msgid "" "This machine has no sound hardware, MAME will produce no sounds, this is " "expected behaviour.\n" msgstr "" -"Ce jeu ne possède pas de son à l'origine, MAME ne produira aucun son, c'est " -"un fonctionnement normal pour ce jeu.\n" #: src/emu/ui/ui.cpp:1116 msgid "The machine has protection which isn't fully emulated.\n" -msgstr "Cette machine a une protection qui n'est pas complétement émulée.\n" +msgstr "" #: src/emu/ui/ui.cpp:1119 msgid "" @@ -1698,9 +1651,6 @@ msgid "" "complete. There is nothing you can do to fix this problem except wait for " "the developers to improve the emulation.\n" msgstr "" -"CE JEU NE FONCTIONNE PAS. L'émulation pour ce jeu n'est pas encore terminée. " -"Il n'y a rien que vous puissiez faire pour corriger ce problème sauf " -"d'attendre que les développeurs améliorent l'émulation.\n" #: src/emu/ui/ui.cpp:1123 msgid "" @@ -1709,16 +1659,13 @@ msgid "" "physical interaction or consists of mechanical devices. It is not possible " "to fully play this machine.\n" msgstr "" -"Certains éléments de ce jeu ne peuvent pas être émulés car cela nécessite " -"une interaction physique ou comporte des périphériques mécaniques. Il n'est " -"pas possible de jouer à 100% avec ce jeu.\n" #: src/emu/ui/ui.cpp:1142 msgid "" "\n" "\n" "There are working clones of this machine: " -msgstr "Il y a des clones de ce jeu qui fonctionnent :" +msgstr "" #: src/emu/ui/ui.cpp:1156 msgid "" @@ -1736,39 +1683,30 @@ msgid "" "\n" "CPU:\n" msgstr "" -"%1$s\n" -"%2$s %3$s\n" -"Driver: %4$s\n" -"\n" -"CPU:\n" #: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "MHz" -msgstr "MHz" +msgstr "" #: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246 msgid "kHz" -msgstr "kHz" +msgstr "" #: src/emu/ui/ui.cpp:1221 msgid "" "\n" "Sound:\n" msgstr "" -"\n" -"Son :\n" #: src/emu/ui/ui.cpp:1250 msgid "" "\n" "Video:\n" msgstr "" -"\n" -"Vidéo :\n" #: src/emu/ui/ui.cpp:1254 msgid "None\n" -msgstr "Aucun\n" +msgstr "" #: src/emu/ui/ui.cpp:1261 msgid "Vector" @@ -1777,65 +1715,65 @@ msgstr "" #: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" -msgstr "%1$s: %2$s\n" +msgstr "" #: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" -msgstr "%2$s\n" +msgstr "" #: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" -msgstr "Statut d'Emulation du Clavier" +msgstr "" #: src/emu/ui/ui.cpp:1529 msgid "Mode: PARTIAL Emulation" -msgstr "Mode : Emulation PARTIELLE" +msgstr "" #: src/emu/ui/ui.cpp:1530 msgid "UI: Enabled" -msgstr "UI : Activé" +msgstr "" #: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542 msgid "**Use ScrLock to toggle**" -msgstr "**Utiliser ScrLock pour changer**" +msgstr "" #: src/emu/ui/ui.cpp:1539 msgid "Mode: FULL Emulation" -msgstr "Mode : Emulation COMPLETE" +msgstr "" #: src/emu/ui/ui.cpp:1540 msgid "UI: Disabled" -msgstr "UI : Désactivé" +msgstr "" #: src/emu/ui/ui.cpp:1686 msgid "Autofire can't be enabled" -msgstr "Le Tir Auto ne peut pas être activé" +msgstr "" #: src/emu/ui/ui.cpp:1725 msgid "Select position to save to" -msgstr "Sélection de la position pour sauvegarder vers" +msgstr "" #: src/emu/ui/ui.cpp:1727 msgid "Select position to load from" -msgstr "Sélection de la position pour charger depuis" +msgstr "" #: src/emu/ui/ui.cpp:1751 msgid "Save cancelled" -msgstr "Sauvegarde annulée" +msgstr "" #: src/emu/ui/ui.cpp:1753 msgid "Load cancelled" -msgstr "Chargement annulé" +msgstr "" #: src/emu/ui/ui.cpp:1796 #, c-format msgid "Save to position %s" -msgstr "Sauvegarder la position %s" +msgstr "" #: src/emu/ui/ui.cpp:1801 #, c-format msgid "Load from position %s" -msgstr "Charger depuis la position %s" +msgstr "" #: src/emu/ui/ui.cpp:1841 #, c-format @@ -1848,7 +1786,7 @@ msgstr "" #: src/emu/ui/ui.cpp:1916 msgid "Master Volume" -msgstr "Volume Maître" +msgstr "" #: src/emu/ui/ui.cpp:1926 #, c-format @@ -1858,121 +1796,121 @@ msgstr "" #: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" -msgstr "Overclock le CPU %1$s" +msgstr "" #: src/emu/ui/ui.cpp:1968 #, c-format msgid "%1$s Refresh Rate" -msgstr "%1$s Taux de Rafraîchissement" +msgstr "" #: src/emu/ui/ui.cpp:1974 #, c-format msgid "%1$s Brightness" -msgstr "%1$s Luminosité" +msgstr "" #: src/emu/ui/ui.cpp:1977 #, c-format msgid "%1$s Contrast" -msgstr "%1$s Contraste" +msgstr "" #: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" -msgstr "%1$s Gamma" +msgstr "" #: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" -msgstr "%1$s Etirer Horiz" +msgstr "" #: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" -msgstr "%1$s Position Horiz" +msgstr "" #: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" -msgstr "%1$s Etirer Vert" +msgstr "" #: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" -msgstr "%1$s Position Vert" +msgstr "" #: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" -msgstr "Laserdisc '%1$s' Etirer Horiz" +msgstr "" #: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" -msgstr "Laserdisc '%1$s' Position Horiz" +msgstr "" #: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" -msgstr "Laserdisc '%1$s' Etirer Vert" +msgstr "" #: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" -msgstr "Laserdisc '%1$s' Position Vert" +msgstr "" #: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" -msgstr "Scintillement - Vector" +msgstr "" #: src/emu/ui/ui.cpp:2032 msgid "Beam Width Minimum" -msgstr "Largeur Minimum du Rayon" +msgstr "" #: src/emu/ui/ui.cpp:2034 msgid "Beam Width Maximum" -msgstr "Largeur Maximum du Rayon" +msgstr "" #: src/emu/ui/ui.cpp:2036 msgid "Beam Intensity Weight" -msgstr "Intensité du Poids du Rayon" +msgstr "" #: src/emu/ui/ui.cpp:2048 #, c-format msgid "Crosshair Scale %1$s" -msgstr "Echelle du Viseur %1$s" +msgstr "" #: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" -msgstr "X" +msgstr "" #: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" -msgstr "Y" +msgstr "" #: src/emu/ui/ui.cpp:2051 #, c-format msgid "Crosshair Offset %1$s" -msgstr "Etalonnage du Viseur %1$s" +msgstr "" #: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" -msgstr "%1$3ddB" +msgstr "" #: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" -msgstr "%1$d%%" +msgstr "" #: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" -msgstr "%1$3.0f%%" +msgstr "" #: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" -msgstr "%1$.3ffps" +msgstr "" #: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 #: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 @@ -1980,183 +1918,84 @@ msgstr "%1$.3ffps" #: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" -msgstr "%1$.3f" +msgstr "" #: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 #: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" -msgstr "%1$1.2f" +msgstr "" #: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" -msgstr "Ecran '%1$s'" +msgstr "" #: src/emu/ui/ui.cpp:2477 msgid "Screen" -msgstr "Ecran" +msgstr "" #: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale X %1$1.3f" -msgstr "Echelle du Viseur X %1$1.3f" +msgstr "" #: src/emu/ui/ui.cpp:2493 #, c-format msgid "Crosshair Scale Y %1$1.3f" -msgstr "Echelle du Viseur Y %1$1.3f" +msgstr "" #: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset X %1$1.3f" -msgstr "Etalonnage du Viseur X %1$1.3f" +msgstr "" #: src/emu/ui/ui.cpp:2512 #, c-format msgid "Crosshair Offset Y %1$1.3f" -msgstr "Etalonnage du Viseur Y %1$1.3f" +msgstr "" #: src/emu/ui/videoopt.cpp:55 #, c-format msgid "Screen #%d" -msgstr "Ecran #%d" +msgstr "" #: src/emu/ui/videoopt.cpp:203 msgid "Rotate" -msgstr "Rotation" +msgstr "" #: src/emu/ui/videoopt.cpp:207 msgid "Backdrops" -msgstr "Toiles de Fond" +msgstr "" #: src/emu/ui/videoopt.cpp:211 msgid "Overlays" -msgstr "Overlays" +msgstr "" #: src/emu/ui/videoopt.cpp:215 msgid "Bezels" -msgstr "Bezels" +msgstr "" #: src/emu/ui/videoopt.cpp:219 msgid "CPanels" -msgstr "CPanels" +msgstr "" #: src/emu/ui/videoopt.cpp:227 msgid "View" -msgstr "Voir" +msgstr "" #: src/emu/ui/videoopt.cpp:227 msgid "Cropped" -msgstr "Coupés" +msgstr "" #: src/emu/ui/videoopt.cpp:227 msgid "Full" -msgstr "Complet" +msgstr "" #: src/emu/ui/viewgfx.cpp:391 msgid " COLORS" -msgstr " COULEURS" +msgstr "" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" -msgstr " PENS" - -#~ msgid "" -#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " -#~ "copyright law.\n" -#~ "\n" -#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -#~ "ESC.\n" -#~ "\n" -#~ "Otherwise, type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "L'utilisation des émulateurs avec des ROMs qui ne vous appartiennent pas " -#~ "est interdite par la loi sur les droits d'auteurs.\n" -#~ "\n" -#~ "SI VOUS N'ETES PAS LEGALEMENT HABILITE A LANCER \"%1$s\" SUR CETTE " -#~ "EMULATEUR, PRESSEZ LA TOUCHE ECHAP.\n" -#~ "\n" -#~ "Autrement, taper OK ou bouger le joystick de gauche à droite pour " -#~ "continuer" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Taper OK ou bouger le joystick de gauche à droite" - -#~ msgid "Configure Machine" -#~ msgstr "Configurer la Machine" - -#~ msgid "Multi-Threaded Rendering" -#~ msgstr "Rendu Multi Tâches" - -#~ msgid "Hardware Stretch" -#~ msgstr "Etirement Matériel" - -#~ msgid "**Error loading %s.ini**" -#~ msgstr "**Erreur de Chargement %s.ini**" - -#~ msgid "**Error loading ui.ini**" -#~ msgstr "**Erreur de Chargement ui.ini**" - -#~ msgid "Double click or press " -#~ msgstr "Double cliquer ou presser " - -#~ msgid " to change the color value" -#~ msgstr " pour changer la valeur de la couleur" - -#~ msgid " to select" -#~ msgstr " à choisir" - -#~ msgid "Current " -#~ msgstr "En cours " - -#~ msgid " Folders" -#~ msgstr " Dossiers" - -#~ msgid "Change)" -#~ msgstr "Changer)" - -#~ msgid "Add" -#~ msgstr "Ajouter" - -#~ msgid " Folder - Search: " -#~ msgstr " Dossier - Rechercher : " - -#~ msgid "Remove " -#~ msgstr "Enlever " - -#~ msgid " Folder" -#~ msgstr " Dossier" - -#~ msgid " Search: " -#~ msgstr " Rechercher :" - -#~ msgid "" -#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " -#~ "copyright law.\n" -#~ "\n" -#~ msgstr "" -#~ "L'utilisation des émulateurs avec les ROMS qui ne vous appartiennent pas " -#~ "est interdit par" - -#~ msgid "" -#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%s\" ON THIS EMULATOR, PRESS " -#~ "ESC.\n" -#~ "\n" -#~ msgstr "" -#~ "SI VOUS N'ETES PAS HABILITER A JOUER \"%s\" SUR CETTE EMULATEUR, PRESSER " -#~ "ECHAP.\n" - -#~ msgid "Otherwise, type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "Autrement, taper OK ou bouger le joystick de gauche à droite pour " -#~ "continuer" - -#~ msgid "Search: " -#~ msgstr "Rechercher : " +msgstr "" From 6cb951b7c42d87e4b52604ecbd5317b6fc8f9665 Mon Sep 17 00:00:00 2001 From: dankan1890 Date: Tue, 29 Mar 2016 05:21:15 +0200 Subject: [PATCH 44/74] ui: icons rendering fix with bgfx. (nw) --- src/emu/ui/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp index 00a9013f544..e696db7e2de 100644 --- a/src/emu/ui/menu.cpp +++ b/src/emu/ui/menu.cpp @@ -2501,7 +2501,7 @@ void ui_menu::draw_icon(int linenum, void *selectedref, float x0, float y0) } if (icons_bitmap[linenum] != nullptr && icons_bitmap[linenum]->valid()) - container->add_quad(x0, y0, x1, y1, ARGB_WHITE, icons_texture[linenum], PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_PACKABLE); + container->add_quad(x0, y0, x1, y1, ARGB_WHITE, icons_texture[linenum], PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA)); } //------------------------------------------------- From 9d9c8fad6a0e5ff433fd6a97b4921af10e074f96 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Mon, 28 Mar 2016 12:09:19 -0500 Subject: [PATCH 45/74] Extend system library support (nw) Extend USE_SYSTEM_LIB_* to support providing the library name and include directory. To link against system specific lib names and header path: (ref #711) USE_SYSTEM_LIB_LUA=lua5.3:/usr/include/lua5.3 --- 3rdparty/lsqlite3/lsqlite3.c | 4 - makefile | 36 ++--- scripts/extlib.lua | 99 ++++++++++++ scripts/genie.lua | 55 +------ scripts/src/3rdparty.lua | 52 +++--- scripts/src/devices.lua | 24 +-- scripts/src/emu.lua | 15 +- scripts/src/lib.lua | 19 +-- scripts/src/main.lua | 51 ++---- scripts/src/netlist.lua | 7 +- scripts/src/tests.lua | 6 +- scripts/src/tools.lua | 296 +++++------------------------------ 12 files changed, 214 insertions(+), 450 deletions(-) create mode 100644 scripts/extlib.lua diff --git a/3rdparty/lsqlite3/lsqlite3.c b/3rdparty/lsqlite3/lsqlite3.c index 072d33b59eb..7448e9c4bf6 100644 --- a/3rdparty/lsqlite3/lsqlite3.c +++ b/3rdparty/lsqlite3/lsqlite3.c @@ -47,11 +47,7 @@ #define luaL_openlib(L,name,reg,nup) luaL_setfuncs(L,reg,nup) #endif -#ifndef USE_SYSTEM_SQLITE -#include "sqlite3/sqlite3.h" -#else #include -#endif /* compile time features */ #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK) diff --git a/makefile b/makefile index 29eb6c018cc..f9f6c2f4032 100644 --- a/makefile +++ b/makefile @@ -376,36 +376,36 @@ endif # which 3rdparty library to build; # link against system (common) library otherwise #------------------------------------------------- -ifndef USE_SYSTEM_LIB_EXPAT -PARAMS += --with-bundled-expat +ifdef USE_SYSTEM_LIB_EXPAT +PARAMS += --with-system-expat='$(USE_SYSTEM_LIB_EXPAT)' endif -ifndef USE_SYSTEM_LIB_ZLIB -PARAMS += --with-bundled-zlib +ifdef USE_SYSTEM_LIB_ZLIB +PARAMS += --with-system-zlib='$(USE_SYSTEM_LIB_ZLIB)' endif -ifndef USE_SYSTEM_LIB_JPEG -PARAMS += --with-bundled-jpeg +ifdef USE_SYSTEM_LIB_JPEG +PARAMS += --with-system-jpeg='$(USE_SYSTEM_LIB_JPEG)' endif -ifndef USE_SYSTEM_LIB_FLAC -PARAMS += --with-bundled-flac +ifdef USE_SYSTEM_LIB_FLAC +PARAMS += --with-system-flac='$(USE_SYSTEM_LIB_FLAC)' endif -ifndef USE_SYSTEM_LIB_LUA -PARAMS += --with-bundled-lua +ifdef USE_SYSTEM_LIB_LUA +PARAMS += --with-system-lua='$(USE_SYSTEM_LIB_LUA)' endif -ifndef USE_SYSTEM_LIB_SQLITE3 -PARAMS += --with-bundled-sqlite3 +ifdef USE_SYSTEM_LIB_SQLITE3 +PARAMS += --with-system-sqlite3='$(USE_SYSTEM_LIB_SQLITE3)' endif -ifndef USE_SYSTEM_LIB_PORTMIDI -PARAMS += --with-bundled-portmidi +ifdef USE_SYSTEM_LIB_PORTMIDI +PARAMS += --with-system-portmidi='$(USE_SYSTEM_LIB_PORTMIDI)' endif -ifndef USE_SYSTEM_LIB_PORTAUDIO -PARAMS += --with-bundled-portaudio +ifdef USE_SYSTEM_LIB_PORTAUDIO +PARAMS += --with-system-portaudio='$(USE_SYSTEM_LIB_PORTAUDIO)' endif # reverse logic for this one @@ -414,8 +414,8 @@ ifdef USE_BUNDLED_LIB_SDL2 PARAMS += --with-bundled-sdl2 endif -ifndef USE_SYSTEM_LIB_UV -PARAMS += --with-bundled-libuv +ifdef USE_SYSTEM_LIB_UV +PARAMS += --with-system-uv='$(USE_SYSTEM_LIB_UV)' endif #------------------------------------------------- diff --git a/scripts/extlib.lua b/scripts/extlib.lua new file mode 100644 index 00000000000..6231ebbf8e1 --- /dev/null +++ b/scripts/extlib.lua @@ -0,0 +1,99 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team,Jeffrey Clark + +local extlibs = { +-- +-- 3rdparty system 3rdparty +-- lib name: lib name, include dir +-- + expat = { "expat", "3rdparty/expat/lib" }, + zlib = { "z", "3rdparty/zlib" }, + jpeg = { "jpeg", "3rdparty/libjpeg" }, + flac = { "FLAC", "3rdparty/libflac/include/FLAC" }, + sqlite3 = { "sqlite3", "3rdparty/sqlite3" }, + portmidi = { "portmidi", "3rdparty/portmidi/pm_common" }, + portaudio = { "portaudio", "3rdparty/portaudio/include" }, + lua = { "lua", "3rdparty/lua/src" }, + uv = { "uv" , "3rdparty/libuv/include" }, +} + +-- system lib options +newoption { + trigger = 'with-system-expat', + description = 'Use system Expat library', +} + +newoption { + trigger = 'with-system-zlib', + description = 'Use system Zlib library', +} + +newoption { + trigger = 'with-system-jpeg', + description = 'Use system JPEG library', +} + +newoption { + trigger = 'with-system-flac', + description = 'Use system FLAC library', +} + +newoption { + trigger = 'with-system-sqlite3', + description = 'Use system SQLite library', +} + +newoption { + trigger = 'with-system-portmidi', + description = 'Use system PortMidi library', +} + +newoption { + trigger = 'with-system-portaudio', + description = 'Use system PortAudio library', +} + +newoption { + trigger = "with-system-lua", + description = "Use system LUA library", +} + +newoption { + trigger = 'with-system-uv', + description = 'Use system uv library', +} + +-- build helpers +function ext_lib(lib) + local opt = _OPTIONS["with-system-" .. lib] + if (opt~=nil and opt=="1") then + default = extlibs[lib][1] + else + default = lib + end + return ext_best(lib, default, 1) +end + +function ext_includedir(lib) + local opt = _OPTIONS["with-system-" .. lib] + if (opt==nil or opt=="0") then + -- using bundled, prepend MAME_DIR + default = MAME_DIR .. extlibs[lib][2] + else + default = "/usr/include/" .. lib + end + return ext_best(lib, default, 2) +end + +function ext_best(lib, default, idx) + local opt = _OPTIONS["with-system-" .. lib] + local found = default + if (opt~=nil and opt~="0" and opt~="1") then + -- override default if provided (format ) + local x = opt:explode(":") + if x[idx]~=nil then + found = x[idx] + end + end + return found +end diff --git a/scripts/genie.lua b/scripts/genie.lua index 219b493f135..645bf99ed8f 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -119,56 +119,11 @@ newoption { }, } -newoption { - trigger = 'with-bundled-expat', - description = 'Build bundled Expat library', -} - -newoption { - trigger = 'with-bundled-zlib', - description = 'Build bundled Zlib library', -} - -newoption { - trigger = 'with-bundled-jpeg', - description = 'Build bundled JPEG library', -} - -newoption { - trigger = 'with-bundled-flac', - description = 'Build bundled FLAC library', -} - -newoption { - trigger = 'with-bundled-lua', - description = 'Build bundled LUA library', -} - -newoption { - trigger = 'with-bundled-sqlite3', - description = 'Build bundled SQLite library', -} - -newoption { - trigger = 'with-bundled-portmidi', - description = 'Build bundled PortMidi library', -} - -newoption { - trigger = 'with-bundled-portaudio', - description = 'Build bundled PortAudio library', -} - newoption { trigger = 'with-bundled-sdl2', description = 'Build bundled SDL2 library', } -newoption { - trigger = 'with-bundled-libuv', - description = 'Build bundled libuv library', -} - newoption { trigger = "distro", description = "Choose distribution", @@ -411,6 +366,8 @@ newoption { } } +dofile("extlib.lua") + if _OPTIONS["SHLIB"]=="1" then LIBTYPE = "SharedLib" else @@ -666,25 +623,25 @@ else end -- need to ensure FLAC functions are statically linked -if _OPTIONS["with-bundled-flac"] then +if not _OPTIONS["with-system-flac"] then defines { "FLAC__NO_DLL", } end -if not _OPTIONS["with-bundled-jpeg"] then +if _OPTIONS["with-system-jpeg"] then defines { "USE_SYSTEM_JPEGLIB", } end -if not _OPTIONS["with-bundled-portmidi"] then +if _OPTIONS["with-system-portmidi"] then defines { "USE_SYSTEM_PORTMIDI", } end -if not _OPTIONS["with-bundled-sqlite3"] then +if _OPTIONS["with-system-sqlite3"] then defines { "USE_SYSTEM_SQLITE", } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 688615cbbc3..5819eb54b2a 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -13,7 +13,7 @@ -- expat library objects -------------------------------------------------- -if _OPTIONS["with-bundled-expat"] then +if not _OPTIONS["with-system-expat"] then project "expat" uuid "f4cd40b1-c37c-452d-9785-640f26f0bf54" kind "StaticLib" @@ -45,7 +45,7 @@ end } else links { - "expat", + ext_lib("expat"), } end @@ -53,7 +53,7 @@ end -- zlib library objects -------------------------------------------------- -if _OPTIONS["with-bundled-zlib"] then +if not _OPTIONS["with-system-zlib"] then project "zlib" uuid "3d78bd2a-2bd0-4449-8087-42ddfaef7ec9" kind "StaticLib" @@ -110,7 +110,7 @@ end } else links { - "z", + ext_lib("zlib"), } end @@ -152,7 +152,7 @@ end -- libJPEG library objects -------------------------------------------------- -if _OPTIONS["with-bundled-jpeg"] then +if not _OPTIONS["with-system-jpeg"] then project "jpeg" uuid "447c6800-dcfd-4c48-b72a-a8223bb409ca" kind "StaticLib" @@ -221,7 +221,7 @@ end } else links { - "jpeg", + ext_lib("jpeg"), } end @@ -229,7 +229,7 @@ end -- libflac library objects -------------------------------------------------- -if _OPTIONS["with-bundled-flac"] then +if not _OPTIONS["with-system-flac"] then project "flac" uuid "b6fc19e8-073a-4541-bb7b-d24b548d424a" kind "StaticLib" @@ -312,7 +312,7 @@ end } else links { - "FLAC", + ext_lib("flac"), } end @@ -370,7 +370,7 @@ end -- LUA library objects -------------------------------------------------- -if _OPTIONS["with-bundled-lua"] then +if not _OPTIONS["with-system-lua"] then project "lua" uuid "d9e2eed1-f1ab-4737-a6ac-863700b1a5a9" kind "StaticLib" @@ -460,7 +460,7 @@ end } else links { - "lua", + ext_lib("lua"), } end @@ -493,16 +493,10 @@ project "lualibs" includedirs { MAME_DIR .. "3rdparty", } - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end + includedirs { + ext_includedir("lua"), + ext_includedir("zlib"), + } files { MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", @@ -514,7 +508,7 @@ project "lualibs" -- SQLite3 library objects -------------------------------------------------- -if _OPTIONS["with-bundled-sqlite3"] then +if not _OPTIONS["with-system-sqlite3"] then project "sqllite3" uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" kind "StaticLib" @@ -565,7 +559,7 @@ end } else links { - "sqlite3", + ext_lib("sqlite3"), } end @@ -573,7 +567,7 @@ end -- portmidi library objects -------------------------------------------------- if _OPTIONS["NO_USE_MIDI"]~="1" then -if _OPTIONS["with-bundled-portmidi"] then +if not _OPTIONS["with-system-portmidi"] then project "portmidi" uuid "587f2da6-3274-4a65-86a2-f13ea315bb98" kind "StaticLib" @@ -652,7 +646,7 @@ end end else links { - "portmidi", + ext_lib("portmidi"), } end end @@ -808,7 +802,7 @@ end -- PortAudio library objects -------------------------------------------------- -if _OPTIONS["with-bundled-portaudio"] then +if not _OPTIONS["with-system-portaudio"] then project "portaudio" uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4" kind "StaticLib" @@ -953,7 +947,7 @@ end else links { - "portaudio", + ext_lib("portaudio"), } end @@ -961,7 +955,7 @@ end -- libuv library objects -------------------------------------------------- if _OPTIONS["USE_LIBUV"]=="1" then -if _OPTIONS["with-bundled-libuv"] then +if not _OPTIONS["with-system-uv"] then project "uv" uuid "cd2afe7f-139d-49c3-9000-fc9119f3cea0" kind "StaticLib" @@ -1173,7 +1167,7 @@ project "http-parser" else links { - "libuv", + ext_lib("uv"), } end -------------------------------------------------- @@ -1671,4 +1665,4 @@ end MAME_DIR .. "3rdparty/SDL2/include", } -end \ No newline at end of file +end diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index c4a6c9fe0ac..3922d3328ac 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -37,17 +37,9 @@ function devicesProject(_target, _subtarget) MAME_DIR .. "3rdparty", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", + ext_includedir("expat"), + ext_includedir("lua"), } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end dofile(path.join("src", "cpu.lua")) @@ -75,17 +67,9 @@ if #disasm_files > 0 then MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", GEN_DIR .. "emu", + ext_includedir("expat"), + ext_includedir("lua"), } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end files { disasm_files diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index a2983d4bd78..7e39c71e357 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -30,16 +30,11 @@ includedirs { GEN_DIR .. "emu", GEN_DIR .. "emu/layout", } -if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } -end -if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } -end + +includedirs { + ext_includedir("expat"), + ext_includedir("lua"), +} if (_OPTIONS["targetos"] == "windows" and _OPTIONS["osd"] ~= "osdmini") then defines { diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 6890bceb5bc..18d6563edfa 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -19,17 +19,9 @@ project "utils" MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", + ext_includedir("expat"), + ext_includedir("zlib"), } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end files { MAME_DIR .. "src/lib/util/bitstream.h", @@ -119,14 +111,9 @@ project "formats" MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", + ext_includedir("zlib"), } - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end - files { MAME_DIR .. "src/lib/formats/2d_dsk.cpp", MAME_DIR .. "src/lib/formats/2d_dsk.h", diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 9914509184e..52211bf92fe 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -192,53 +192,29 @@ if #disasm_files > 0 then end links { "utils", - "expat", + ext_lib("expat"), "softfloat", - "jpeg", + ext_lib("jpeg"), "7z", - "lua", + ext_lib("lua"), "lualibs", } if _OPTIONS["USE_LIBUV"]=="1" then links { - "uv", + ext_lib("uv"), "http-parser", } end - if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } - else - links { - "z", - } - end - - if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } - else - links { - "FLAC", - } - end - - if _OPTIONS["with-bundled-sqlite3"] then - links { - "sqllite3", - } - else - links { - "sqlite3", - } - end + links { + ext_lib("zlib"), + ext_lib("flac"), + ext_lib("sqlite3"), + } if _OPTIONS["NO_USE_MIDI"]~="1" then links { - "portmidi", + ext_lib("portmidi"), } end links { @@ -260,14 +236,9 @@ end MAME_DIR .. "3rdparty", GEN_DIR .. _target .. "/layout", GEN_DIR .. "resource", + ext_includedir("zlib"), } - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end - if _OPTIONS["targetos"]=="macosx" and (not override_resources) then linkoptions { "-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist" diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 917a450d511..95d0371e414 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -19,13 +19,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", + -- ext_includedir("expat"), } - -- if _OPTIONS["with-bundled-expat"] then - -- includedirs { - -- MAME_DIR .. "3rdparty/expat/lib", - -- } - --end - files { MAME_DIR .. "src/lib/netlist/nl_config.h", diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index e69888d53a4..b6a01efdd02 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -62,8 +62,8 @@ project("mametests") links { "gtest", "utils", - "expat", - "zlib", + ext_lib("expat"), + ext_lib("zlib"), "ocore_" .. _OPTIONS["osd"], } @@ -72,6 +72,8 @@ project("mametests") MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/lib/util", + ext_includedir("expat"), + ext_includedir("zlib"), } files { diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 0339e9920b2..95710ad9799 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -27,21 +27,12 @@ end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -77,31 +68,13 @@ end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -139,20 +112,11 @@ end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -189,31 +153,13 @@ end links { "dasm", "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", @@ -251,31 +197,13 @@ end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -312,31 +240,13 @@ end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -373,20 +283,11 @@ end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -422,20 +323,11 @@ end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -471,20 +363,11 @@ end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -520,31 +403,13 @@ end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -580,20 +445,11 @@ end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -629,32 +485,14 @@ end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], "netlist", + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -732,31 +570,13 @@ end links { "formats", "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", @@ -795,31 +615,13 @@ links { "formats", "emu", "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", @@ -858,36 +660,18 @@ links { "formats", "emu", "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty/zlib", + ext_includedir("zlib"), MAME_DIR .. "src/tools/imgtool", } From 18d7e34620112a71a50b440f11564ecc7ef169a6 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Mon, 28 Mar 2016 22:26:30 -0500 Subject: [PATCH 46/74] cleanup build includes (nw) --- 3rdparty/libjpeg/jpeglib.h | 8 ------- 3rdparty/lsqlite3/lsqlite3.c | 4 ++-- scripts/genie.lua | 36 ++++++++----------------------- src/emu/luaengine.cpp | 2 +- src/lib/util/flac.h | 4 ---- src/osd/modules/midi/portmidi.cpp | 4 ---- 6 files changed, 12 insertions(+), 46 deletions(-) diff --git a/3rdparty/libjpeg/jpeglib.h b/3rdparty/libjpeg/jpeglib.h index be8fd64ef91..1eb1fac033f 100644 --- a/3rdparty/libjpeg/jpeglib.h +++ b/3rdparty/libjpeg/jpeglib.h @@ -11,13 +11,6 @@ * and perhaps jerror.h if they want to know the exact error codes. */ -#ifdef USE_SYSTEM_JPEGLIB -#ifndef XMD_H -#define XMD_H -#endif -#include -#else - #ifndef JPEGLIB_H #define JPEGLIB_H @@ -1165,4 +1158,3 @@ struct jpeg_color_quantizer { long dummy; }; #endif #endif /* JPEGLIB_H */ -#endif /* USE_SYSTEM_JPEGLIB */ diff --git a/3rdparty/lsqlite3/lsqlite3.c b/3rdparty/lsqlite3/lsqlite3.c index 7448e9c4bf6..3f1216f1d93 100644 --- a/3rdparty/lsqlite3/lsqlite3.c +++ b/3rdparty/lsqlite3/lsqlite3.c @@ -31,8 +31,8 @@ #include #define LUA_LIB -#include "lua.h" -#include "lauxlib.h" +#include +#include #if LUA_VERSION_NUM > 501 // diff --git a/scripts/genie.lua b/scripts/genie.lua index 645bf99ed8f..88af2217c8f 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -366,7 +366,7 @@ newoption { } } -dofile("extlib.lua") +dofile ("extlib.lua") if _OPTIONS["SHLIB"]=="1" then LIBTYPE = "SharedLib" @@ -622,30 +622,17 @@ else end end --- need to ensure FLAC functions are statically linked -if not _OPTIONS["with-system-flac"] then +if _OPTIONS["with-system-jpeg"]~=nil then + defines { + "XMD_H", + } +end + +if _OPTIONS["with-system-flac"]~=nil then defines { "FLAC__NO_DLL", } - end - -if _OPTIONS["with-system-jpeg"] then - defines { - "USE_SYSTEM_JPEGLIB", - } - end - -if _OPTIONS["with-system-portmidi"] then - defines { - "USE_SYSTEM_PORTMIDI", - } - end - -if _OPTIONS["with-system-sqlite3"] then - defines { - "USE_SYSTEM_SQLITE", - } - end +end if _OPTIONS["NOASM"]=="1" then defines { @@ -667,11 +654,6 @@ if not _OPTIONS["FORCE_DRC_C_BACKEND"] then end end --- define USE_SYSTEM_JPEGLIB if library shipped with MAME is not used ---ifneq ($(BUILD_JPEGLIB),1) ---DEFS += -DUSE_SYSTEM_JPEGLIB ---endif - defines { "LUA_COMPAT_ALL", "LUA_COMPAT_5_1", diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index fbd2e64fc76..cd392de3c89 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -10,7 +10,7 @@ #include #include -#include "lua.hpp" +#include #include "luabridge/Source/LuaBridge/LuaBridge.h" #include #include "emu.h" diff --git a/src/lib/util/flac.h b/src/lib/util/flac.h index 1f9a49b14bd..2bb41964a43 100644 --- a/src/lib/util/flac.h +++ b/src/lib/util/flac.h @@ -16,11 +16,7 @@ #include "osdcore.h" #include "corefile.h" -#ifdef FLAC__NO_DLL -#include "libflac/include/FLAC/all.h" -#else #include -#endif //************************************************************************** diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp index a158b9033cd..4abbf78df56 100644 --- a/src/osd/modules/midi/portmidi.cpp +++ b/src/osd/modules/midi/portmidi.cpp @@ -10,11 +10,7 @@ #ifndef NO_USE_MIDI -#ifndef USE_SYSTEM_PORTMIDI -#include "portmidi/pm_common/portmidi.h" -#else #include -#endif #include "osdcore.h" #include "corealloc.h" #include "modules/osdmodule.h" From 00b56f38c87f9fdcda587971cd762e803082943d Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Mon, 28 Mar 2016 22:57:13 -0500 Subject: [PATCH 47/74] only explicit system include paths (nw) --- scripts/extlib.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/extlib.lua b/scripts/extlib.lua index 6231ebbf8e1..7347a734c18 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -80,7 +80,7 @@ function ext_includedir(lib) -- using bundled, prepend MAME_DIR default = MAME_DIR .. extlibs[lib][2] else - default = "/usr/include/" .. lib + default = "" end return ext_best(lib, default, 2) end From 4b508475603cdc267bd9f318f1306901ffb58a7e Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Mon, 28 Mar 2016 23:07:14 -0500 Subject: [PATCH 48/74] Multiple link and include path support (nw) ie. USE_SYSTEM_LIB_FLAC=FLAC,ogg:/usr/include --- scripts/extlib.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/extlib.lua b/scripts/extlib.lua index 7347a734c18..0ed3415377d 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -92,7 +92,12 @@ function ext_best(lib, default, idx) -- override default if provided (format ) local x = opt:explode(":") if x[idx]~=nil then - found = x[idx] + local y = x[idx]:explode(",") + if y[1]~=nil then + found = y + else + found = x[idx] + end end end return found From c3397ae4a9ad9517f2f4818f4223a338398a92bc Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Tue, 29 Mar 2016 00:45:53 -0700 Subject: [PATCH 49/74] fix include dirs (nw) --- scripts/extlib.lua | 2 +- scripts/src/emu.lua | 1 + scripts/src/lib.lua | 1 + scripts/src/osd/modules.lua | 4 ++++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/extlib.lua b/scripts/extlib.lua index 0ed3415377d..bd80c8b74b8 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -9,7 +9,7 @@ local extlibs = { expat = { "expat", "3rdparty/expat/lib" }, zlib = { "z", "3rdparty/zlib" }, jpeg = { "jpeg", "3rdparty/libjpeg" }, - flac = { "FLAC", "3rdparty/libflac/include/FLAC" }, + flac = { "FLAC", "3rdparty/libflac/include" }, sqlite3 = { "sqlite3", "3rdparty/sqlite3" }, portmidi = { "portmidi", "3rdparty/portmidi/pm_common" }, portaudio = { "portaudio", "3rdparty/portaudio/include" }, diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 7e39c71e357..56ff55879dd 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -34,6 +34,7 @@ includedirs { includedirs { ext_includedir("expat"), ext_includedir("lua"), + ext_includedir("flac"), } if (_OPTIONS["targetos"] == "windows" and _OPTIONS["osd"] ~= "osdmini") then diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 18d6563edfa..c43bbecb291 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -21,6 +21,7 @@ project "utils" MAME_DIR .. "3rdparty", ext_includedir("expat"), ext_includedir("zlib"), + ext_includedir("flac"), } files { diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 5ea9bec2f1c..a8b8debe272 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -178,6 +178,10 @@ function osdmodulesbuild() defines { "NO_USE_MIDI", } + else + includedirs { + ext_includedir("portmidi"), + } end if _OPTIONS["USE_QTDEBUG"]=="1" then From 1d84a0c3aafa46899a35fcd2945fb6a493037992 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 08:10:03 +0200 Subject: [PATCH 50/74] Updated French (Belgium) [Mevi] --- language/French_Belgium/strings.po | 103 ++++++++++------------------- 1 file changed, 34 insertions(+), 69 deletions(-) diff --git a/language/French_Belgium/strings.po b/language/French_Belgium/strings.po index 020a133438c..0fec558c7ac 100644 --- a/language/French_Belgium/strings.po +++ b/language/French_Belgium/strings.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-28 09:02+0200\n" -"PO-Revision-Date: 2016-03-06 10:44+0100\n" +"PO-Revision-Date: 2016-03-28 23:49+0200\n" "Last-Translator: Mevi \n" "Language-Team: MAME Language Team\n" "Language: fr_BE\n" @@ -27,7 +27,7 @@ msgstr "Nouveau code-barres :" #: src/emu/ui/barcode.cpp:76 msgid "Enter Code" -msgstr "Entrer un code" +msgstr "Entrez un code" #: src/emu/ui/barcode.cpp:118 msgid "Barcode length invalid!" @@ -326,7 +326,7 @@ msgstr "Paramètres des couleurs de l'interface" #, c-format msgid "Double click or press %1$s to change the color value" msgstr "" -"Double-cliquer ou appuyer sur %1$s pour changer la valeur de la couleur" +"Double-cliquez ou appuyez sur %1$s pour changer la valeur de la couleur" #: src/emu/ui/custui.cpp:594 msgid "Menu Preview" @@ -440,11 +440,11 @@ msgstr "Aperçu sysinfo.dat" #: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45 msgid "Mamescore" -msgstr "Aperçu story.dat (MAMESCORE)" +msgstr "Aperçu story.dat" #: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44 msgid "Gameinit" -msgstr "" +msgstr "Aperçu gameinit.dat" #: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43 msgid "Command" @@ -460,7 +460,7 @@ msgstr "UI (Interface utilisateur)" #: src/emu/ui/dirmenu.cpp:34 msgid "Samples" -msgstr "" +msgstr "Samples (Échantillons sonores)" #: src/emu/ui/dirmenu.cpp:35 msgid "DATs" @@ -528,15 +528,15 @@ msgstr "Bosses (Ennemis et adversaires)" #: src/emu/ui/dirmenu.cpp:51 msgid "Artworks Preview" -msgstr "Artworks Preview (Aperçu)" +msgstr "Artworks Preview (Aperçu des illustrations)" #: src/emu/ui/dirmenu.cpp:52 src/emu/ui/menu.cpp:57 msgid "Select" -msgstr "Select (Écran de sélection)" +msgstr "Select (Écrans de sélection)" #: src/emu/ui/dirmenu.cpp:53 msgid "GameOver" -msgstr "" +msgstr "GameOver (Écrans GAME OVER)" #: src/emu/ui/dirmenu.cpp:54 src/emu/ui/menu.cpp:55 msgid "HowTo" @@ -556,7 +556,7 @@ msgstr "" #: src/emu/ui/dirmenu.cpp:58 src/emu/ui/menu.cpp:59 msgid "Covers" -msgstr "" +msgstr "Covers (Boîtiers et emballages)" #: src/emu/ui/dirmenu.cpp:116 src/emu/ui/dirmenu.cpp:136 msgid "Folders Setup" @@ -591,7 +591,7 @@ msgstr "Ajouter un dossier %1$s - Recherche: %2$s_" #: src/emu/ui/dirmenu.cpp:534 msgid "Press TAB to set" -msgstr "Appuyer sur TAB pour définir" +msgstr "Appuyez sur TAB pour définir" #: src/emu/ui/dirmenu.cpp:640 #, c-format @@ -838,7 +838,7 @@ msgstr "Options du viseur" #: src/emu/ui/mainmenu.cpp:132 msgid "Cheat" -msgstr "" +msgstr "Codes de triche" #: src/emu/ui/mainmenu.cpp:136 msgid "External DAT View" @@ -886,7 +886,7 @@ msgstr "Retour à la machine actuelle" #: src/emu/ui/menu.cpp:257 src/emu/ui/menu.cpp:259 msgid "Exit" -msgstr "Quitter" +msgstr "Quitter MAME" #: src/emu/ui/menu.cpp:264 src/emu/ui/menu.cpp:266 msgid "Return to Previous Menu" @@ -1038,7 +1038,7 @@ msgstr "Sauvegarder la configuration de la machine" #: src/emu/ui/miscmenu.cpp:967 src/emu/ui/miscmenu.cpp:987 #: src/emu/ui/selgame.cpp:587 msgid "Plugins" -msgstr "" +msgstr "Plugins (modules d'extension)" #: src/emu/ui/optsmenu.cpp:214 msgid "Filter" @@ -1062,7 +1062,7 @@ msgstr "Personnaliser l'interface" #: src/emu/ui/optsmenu.cpp:259 msgid "Configure Directories" -msgstr "Configurer les répertoires" +msgstr "Configurer les dossiers" #: src/emu/ui/optsmenu.cpp:262 src/emu/ui/sndmenu.cpp:150 #: src/emu/ui/sndmenu.cpp:170 @@ -1107,7 +1107,7 @@ msgstr "Liste de sélection - Recherche : " #: src/emu/ui/selector.cpp:194 #, c-format msgid "Double click or press %1$s to select" -msgstr "Double-cliquer ou appuyer sur %1$s pour sélectionner" +msgstr "Double-cliquez ou appuyez sur %1$s pour sélectionner" #: src/emu/ui/selgame.cpp:38 msgid "General Info" @@ -1343,7 +1343,7 @@ msgstr "Artwork cliquable nécessaire : %1$s\n" #: src/emu/ui/selgame.cpp:1564 #, c-format msgid "Support Cocktail: %1$s\n" -msgstr "Support du mode coktail : %1$s\n" +msgstr "Support du mode cocktail : %1$s\n" #: src/emu/ui/selgame.cpp:1565 #, c-format @@ -1498,11 +1498,11 @@ msgstr "" #: src/emu/ui/simpleselgame.cpp:287 #, c-format msgid "Type name or select: %1$s_" -msgstr "Entrer un nom ou sélectionner : %1$s_" +msgstr "Entrez un nom ou sélectionnez : %1$s_" #: src/emu/ui/simpleselgame.cpp:289 msgid "Type name or select: (random)" -msgstr "Entrer un nom ou sélectionner : (au hasard)" +msgstr "Entrez un nom ou sélectionnez : (au hasard)" #: src/emu/ui/simpleselgame.cpp:328 #, c-format @@ -1594,19 +1594,19 @@ msgstr "" #: src/emu/ui/tapectrl.cpp:97 msgid "Play" -msgstr "" +msgstr "Lire" #: src/emu/ui/tapectrl.cpp:100 msgid "Record" -msgstr "" +msgstr "Enregistrer" #: src/emu/ui/tapectrl.cpp:103 msgid "Rewind" -msgstr "" +msgstr "Rembobiner" #: src/emu/ui/tapectrl.cpp:106 msgid "Fast Forward" -msgstr "" +msgstr "Avance rapide" #: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " @@ -1735,6 +1735,9 @@ msgid "" "\n" "Press any key to continue" msgstr "" +"\n" +"\n" +"Appuyez sur une touche pour continuer" #: src/emu/ui/ui.cpp:1171 #, c-format @@ -1896,42 +1899,42 @@ msgstr "%1$s - Gamma" #: src/emu/ui/ui.cpp:1985 #, c-format msgid "%1$s Horiz Stretch" -msgstr "%1$s - Stretch Horizontal" +msgstr "%1$s - Stretch horizontal" #: src/emu/ui/ui.cpp:1988 #, c-format msgid "%1$s Horiz Position" -msgstr "%1$s - Position Horizontale" +msgstr "%1$s - Position horizontale" #: src/emu/ui/ui.cpp:1991 #, c-format msgid "%1$s Vert Stretch" -msgstr "%1$s - Stretch Vertical" +msgstr "%1$s - Stretch vertical" #: src/emu/ui/ui.cpp:1994 #, c-format msgid "%1$s Vert Position" -msgstr "%1$s - Position Verticale" +msgstr "%1$s - Position verticale" #: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" -msgstr "'%1$s' Laserdisc - Stretch Horizontal" +msgstr "'%1$s' Laserdisc - Stretch horizontal" #: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" -msgstr "'%1$s' Laserdisc - Position Horizontale" +msgstr "'%1$s' Laserdisc - Position horizontale" #: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" -msgstr "'%1$s' Laserdisc - Stretch Vertical" +msgstr "'%1$s' Laserdisc - Stretch vertical" #: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" -msgstr "'%1$s' Laserdisc - Position Verticale" +msgstr "'%1$s' Laserdisc - Position verticale" #: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" @@ -2074,41 +2077,3 @@ msgstr " COULEURS" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" msgstr " MARQUEURS" - -#~ msgid "" -#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " -#~ "copyright law.\n" -#~ "\n" -#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -#~ "ESC.\n" -#~ "\n" -#~ "Otherwise, type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "L'utilisation conjointe d'émulateurs et de ROMs que vous ne possédez pas " -#~ "est interdite par la législation sur le droit d'auteur.\n" -#~ "\n" -#~ "SI VOUS N'ÊTES PAS LÉGALEMENT AUTORISÉ À UTILISER \"%s\" SUR CET " -#~ "ÉMULATEUR, APPUYEZ SUR ESC.\n" -#~ "Dans le cas contraire, taper OK ou bouger le joystick à gauche puis à " -#~ "droite pour continuer" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Tapez OK ou bouger le joystick à gauche puis à droite pour continuer" - -#~ msgid "Configure Machine" -#~ msgstr "Configurer la machine" - -#~ msgid "Multi-Threaded Rendering" -#~ msgstr "Rendu multithread" - -#~ msgid "**Error loading %s.ini**" -#~ msgstr "**Erreur de chargement du fichier %s.ini**" - -#~ msgid "**Error loading ui.ini**" -#~ msgstr "**Erreur de chargement du fichier ui.ini**" From 699fa1462a56d44b77fa3f0ddab8f65b885f4a8c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 08:15:17 +0200 Subject: [PATCH 51/74] Add ability for notifiers to add at front, fix for hiscore [Carl] --- plugins/hiscore/init.lua | 18 ++++++++++-------- src/emu/luaengine.cpp | 12 ++++++++++++ src/emu/luaengine.h | 2 ++ src/emu/machine.cpp | 7 +++++-- src/emu/machine.h | 2 +- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua index 3c8e9a37dbe..63e68c0bb5d 100644 --- a/plugins/hiscore/init.lua +++ b/plugins/hiscore/init.lua @@ -127,7 +127,7 @@ function hiscore.startplugin() function write_scores ( posdata ) - print("write_scores") + print("write_scores") local output = io.open(get_file_name(), "wb"); if not output then -- attempt to create the directory, and try again @@ -242,9 +242,8 @@ function hiscore.startplugin() current_game = "" mem_check_passed = false scores_have_been_read = false; + last_write_time = -10 print("Starting " .. emu.gamename()) - -- check if we've just soft reset - -- reset() -- there's no way to reliably save scores after a soft reset currently current_game = emu.romname() dat = read_hiscore_dat() if dat and dat ~= "" then @@ -254,14 +253,17 @@ function hiscore.startplugin() print("hiscore.dat parse error"); return; end - emu.sethook( tick, "frame" ); - emu.register_stop(function() - reset() - end) - end + end + emu.sethook( tick, "frame" ); end) + emu.register_stop(function() + reset() + end) + emu.register_prestart(function() + reset() + end) end return exports diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index cd392de3c89..18ae0172bf7 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -1319,6 +1319,11 @@ int lua_engine::register_function(lua_State *L, const char *id) return 1; } +int lua_engine::l_emu_register_prestart(lua_State *L) +{ + return register_function(L, "LUA_ON_PRESTART"); +} + int lua_engine::l_emu_register_start(lua_State *L) { return register_function(L, "LUA_ON_START"); @@ -1344,6 +1349,11 @@ int lua_engine::l_emu_register_frame(lua_State *L) return register_function(L, "LUA_ON_FRAME"); } +void lua_engine::on_machine_prestart() +{ + execute_function("LUA_ON_PRESTART"); +} + void lua_engine::on_machine_start() { execute_function("LUA_ON_START"); @@ -1393,6 +1403,7 @@ void lua_engine::update_machine() void lua_engine::attach_notifiers() { + machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(lua_engine::on_machine_prestart), this), true); machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(lua_engine::on_machine_start), this)); machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(lua_engine::on_machine_stop), this)); machine().add_notifier(MACHINE_NOTIFY_PAUSE, machine_notify_delegate(FUNC(lua_engine::on_machine_pause), this)); @@ -1439,6 +1450,7 @@ void lua_engine::initialize() .addCFunction ("start", l_emu_start ) .addCFunction ("pause", l_emu_pause ) .addCFunction ("unpause", l_emu_unpause ) + .addCFunction ("register_prestart", l_emu_register_prestart ) .addCFunction ("register_start", l_emu_register_start ) .addCFunction ("register_stop", l_emu_register_stop ) .addCFunction ("register_pause", l_emu_register_pause ) diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h index 2f0f4ad7a34..b98b9597b56 100644 --- a/src/emu/luaengine.h +++ b/src/emu/luaengine.h @@ -83,6 +83,7 @@ private: void update_machine(); + void on_machine_prestart(); void on_machine_start(); void on_machine_stop(); void on_machine_pause(); @@ -114,6 +115,7 @@ private: static int l_emu_pause(lua_State *L); static int l_emu_unpause(lua_State *L); static int l_emu_set_hook(lua_State *L); + static int l_emu_register_prestart(lua_State *L); static int l_emu_register_start(lua_State *L); static int l_emu_register_stop(lua_State *L); static int l_emu_register_pause(lua_State *L); diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index d76ad49676d..70d1ccc411b 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -739,12 +739,15 @@ void running_machine::toggle_pause() // given type //------------------------------------------------- -void running_machine::add_notifier(machine_notification event, machine_notify_delegate callback) +void running_machine::add_notifier(machine_notification event, machine_notify_delegate callback, bool first) { assert_always(m_current_phase == MACHINE_PHASE_INIT, "Can only call add_notifier at init time!"); + if(first) + m_notifier_list[event].push_front(std::make_unique(callback)); + // exit notifiers are added to the head, and executed in reverse order - if (event == MACHINE_NOTIFY_EXIT) + else if (event == MACHINE_NOTIFY_EXIT) m_notifier_list[event].push_front(std::make_unique(callback)); // all other notifiers are added to the tail, and executed in the order registered diff --git a/src/emu/machine.h b/src/emu/machine.h index 1eaee4d6e4a..5e19aefb6c4 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -214,7 +214,7 @@ public: void pause(); void resume(); void toggle_pause(); - void add_notifier(machine_notification event, machine_notify_delegate callback); + void add_notifier(machine_notification event, machine_notify_delegate callback, bool first = false); void call_notifiers(machine_notification which); void add_logerror_callback(logerror_callback callback); void set_ui_active(bool active) { m_ui_active = active; } From ee3edd0e2bc3ae45a5968ea036845f835f5434c4 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 08:24:17 +0200 Subject: [PATCH 52/74] Add missing include (nw) --- scripts/src/3rdparty.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 5819eb54b2a..deb97bbcc40 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -496,6 +496,7 @@ project "lualibs" includedirs { ext_includedir("lua"), ext_includedir("zlib"), + ext_includedir("sqlite3"), } files { From 953d0f9b17f0d3878d61b868e8abfa202c305866 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 08:26:11 +0200 Subject: [PATCH 53/74] fix typo (nw) --- scripts/src/3rdparty.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index deb97bbcc40..dd3481f8ae5 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -510,7 +510,7 @@ project "lualibs" -------------------------------------------------- if not _OPTIONS["with-system-sqlite3"] then -project "sqllite3" +project "sqlite3" uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" kind "StaticLib" From f9f360927f0e5575db4edc7f384946b43e52831b Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 08:37:04 +0200 Subject: [PATCH 54/74] Added license and cleanup for android-project (nw) --- android-project/LICENSE | 27 +++++++++++++++++++ android-project/README.md | 9 +++++++ .../app/src/main/res/layout/main.xml | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 android-project/LICENSE create mode 100644 android-project/README.md diff --git a/android-project/LICENSE b/android-project/LICENSE new file mode 100644 index 00000000000..4d9210d10e1 --- /dev/null +++ b/android-project/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2016, MAME Development Team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of bsd3 nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/android-project/README.md b/android-project/README.md new file mode 100644 index 00000000000..df7f5e5f262 --- /dev/null +++ b/android-project/README.md @@ -0,0 +1,9 @@ +# **android-project** # + +Cointains code by needed to run MAME on Android + +Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) + +It also contains org.libsdl.app.Activity part of SDL2 project under [zlib license](http://opensource.org/licenses/Zlib) + +And for building Gradle-wrapper is used that is under [Apache License, Version 2.0](http://opensource.org/licenses/Apache-2.0) \ No newline at end of file diff --git a/android-project/app/src/main/res/layout/main.xml b/android-project/app/src/main/res/layout/main.xml index 123c4b6eac5..d9995839961 100644 --- a/android-project/app/src/main/res/layout/main.xml +++ b/android-project/app/src/main/res/layout/main.xml @@ -7,7 +7,7 @@ From 3fb7f61cfceb8789a680b7ca9ec8fee0e0bff7a0 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 08:43:20 +0200 Subject: [PATCH 55/74] Fix building tools (nw) --- scripts/src/tools.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 95710ad9799..8dc7a47cdc9 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -80,6 +80,9 @@ includedirs { MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", } +includedirs { + ext_includedir("flac"), +} files { MAME_DIR .. "src/tools/chdman.cpp", @@ -209,6 +212,9 @@ includedirs { MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", } +includedirs { + ext_includedir("flac"), +} files { MAME_DIR .. "src/tools/ldresample.cpp", @@ -252,6 +258,9 @@ includedirs { MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", } +includedirs { + ext_includedir("flac"), +} files { MAME_DIR .. "src/tools/ldverify.cpp", From 9b3788035cbd3a037c76378ffb09b486af4d28c6 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 08:49:47 +0200 Subject: [PATCH 56/74] scrclean on lua scripts (nw) --- scripts/extlib.lua | 36 ++--- scripts/genie.lua | 198 +++++++++++++-------------- scripts/src/3rdparty.lua | 118 ++++++++-------- scripts/src/benchmarks.lua | 6 +- scripts/src/cpu.lua | 28 ++-- scripts/src/emu.lua | 2 +- scripts/src/main.lua | 56 ++++---- scripts/src/netlist.lua | 6 +- scripts/src/osd/modules.lua | 22 +-- scripts/src/osd/osdmini.lua | 12 +- scripts/src/osd/sdl.lua | 40 +++--- scripts/src/osd/sdl_cfg.lua | 34 ++--- scripts/src/osd/windows.lua | 6 +- scripts/src/sound.lua | 80 +++++------ scripts/src/tests.lua | 8 +- scripts/src/tools.lua | 18 +-- scripts/src/video.lua | 4 +- scripts/target/ldplayer/ldplayer.lua | 4 +- scripts/target/mame/arcade.lua | 2 +- scripts/target/mame/dummy.lua | 2 +- scripts/target/mame/mame.lua | 2 +- scripts/target/mame/mess.lua | 6 +- scripts/target/mame/nl.lua | 2 +- scripts/target/mame/tiny.lua | 2 +- scripts/toolchain.lua | 58 ++++---- 25 files changed, 376 insertions(+), 376 deletions(-) diff --git a/scripts/extlib.lua b/scripts/extlib.lua index bd80c8b74b8..9d60fe1dc2e 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -19,48 +19,48 @@ local extlibs = { -- system lib options newoption { - trigger = 'with-system-expat', - description = 'Use system Expat library', + trigger = 'with-system-expat', + description = 'Use system Expat library', } newoption { - trigger = 'with-system-zlib', - description = 'Use system Zlib library', + trigger = 'with-system-zlib', + description = 'Use system Zlib library', } newoption { - trigger = 'with-system-jpeg', - description = 'Use system JPEG library', + trigger = 'with-system-jpeg', + description = 'Use system JPEG library', } newoption { - trigger = 'with-system-flac', - description = 'Use system FLAC library', + trigger = 'with-system-flac', + description = 'Use system FLAC library', } newoption { - trigger = 'with-system-sqlite3', - description = 'Use system SQLite library', + trigger = 'with-system-sqlite3', + description = 'Use system SQLite library', } newoption { - trigger = 'with-system-portmidi', - description = 'Use system PortMidi library', + trigger = 'with-system-portmidi', + description = 'Use system PortMidi library', } newoption { - trigger = 'with-system-portaudio', - description = 'Use system PortAudio library', + trigger = 'with-system-portaudio', + description = 'Use system PortAudio library', } newoption { - trigger = "with-system-lua", - description = "Use system LUA library", + trigger = "with-system-lua", + description = "Use system LUA library", } newoption { - trigger = 'with-system-uv', - description = 'Use system uv library', + trigger = 'with-system-uv', + description = 'Use system uv library', } -- build helpers diff --git a/scripts/genie.lua b/scripts/genie.lua index 88af2217c8f..61617630d06 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -2,8 +2,8 @@ -- copyright-holders:MAMEdev Team newoption { - trigger = 'build-dir', - description = 'Build directory name', + trigger = 'build-dir', + description = 'Build directory name', } premake.check_paths = true @@ -32,23 +32,23 @@ function str_to_version(str) val = val + tonumber(word) * cnt cnt = cnt / 100 end - return val + return val end function findfunction(x) - assert(type(x) == "string") - local f=_G - for v in x:gmatch("[^%.]+") do - if type(f) ~= "table" then - return nil, "looking for '"..v.."' expected table, not "..type(f) - end - f=f[v] - end - if type(f) == "function" then - return f - else - return nil, "expected function, not "..type(f) - end + assert(type(x) == "string") + local f=_G + for v in x:gmatch("[^%.]+") do + if type(f) ~= "table" then + return nil, "looking for '"..v.."' expected table, not "..type(f) + end + f=f[v] + end + if type(f) == "function" then + return f + else + return nil, "expected function, not "..type(f) + end end function layoutbuildtask(_folder, _name) @@ -57,9 +57,9 @@ function layoutbuildtask(_folder, _name) end function precompiledheaders() - configuration { "not xcode4" } - pchheader("emu.h") - configuration { } + configuration { "not xcode4" } + pchheader("emu.h") + configuration { } end function addprojectflags() @@ -101,13 +101,13 @@ newoption { trigger = "targetos", description = "Choose target OS", allowed = { - { "android", "Android" }, + { "android", "Android" }, { "asmjs", "Emscripten/asm.js" }, { "freebsd", "FreeBSD" }, { "netbsd", "NetBSD" }, { "openbsd", "OpenBSD" }, { "pnacl", "Native Client - PNaCl" }, - { "linux", "Linux" }, + { "linux", "Linux" }, { "ios", "iOS" }, { "macosx", "OSX" }, { "windows", "Windows" }, @@ -120,15 +120,15 @@ newoption { } newoption { - trigger = 'with-bundled-sdl2', - description = 'Build bundled SDL2 library', + trigger = 'with-bundled-sdl2', + description = 'Build bundled SDL2 library', } newoption { trigger = "distro", description = "Choose distribution", allowed = { - { "generic", "generic" }, + { "generic", "generic" }, { "debian-stable", "debian-stable" }, { "ubuntu-intrepid", "ubuntu-intrepid" }, }, @@ -246,7 +246,7 @@ newoption { trigger = "DEPRECATED", description = "Generate deprecation warnings during compilation.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -255,7 +255,7 @@ newoption { trigger = "LTO", description = "Clang link time optimization.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -264,7 +264,7 @@ newoption { trigger = "SSE2", description = "SSE2 optimized code and SSE2 code generation.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -273,7 +273,7 @@ newoption { trigger = "SSE3", description = "SSE3 optimized code and SSE3 code generation.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -282,7 +282,7 @@ newoption { trigger = "OPENMP", description = "OpenMP optimized code.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -291,7 +291,7 @@ newoption { trigger = "FASTDEBUG", description = "Fast DEBUG.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -300,7 +300,7 @@ newoption { trigger = "SEPARATE_BIN", description = "Use separate bin folders.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -314,7 +314,7 @@ newoption { trigger = "SHADOW_CHECK", description = "Shadow checks.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -323,7 +323,7 @@ newoption { trigger = "STRIP_SYMBOLS", description = "Symbols stripping.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -333,7 +333,7 @@ newoption { trigger = "SHLIB", description = "Generate shared libs.", allowed = { - { "0", "Static libs" }, + { "0", "Static libs" }, { "1", "Shared libs" }, } } @@ -347,7 +347,7 @@ newoption { trigger = "FORCE_VERSION_COMPILE", description = "Force compiling of version.c file.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -361,7 +361,7 @@ newoption { trigger = "USE_LIBUV", description = "Use libuv.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -426,15 +426,15 @@ configurations { } if _ACTION == "xcode4" then - platforms { - "x64", - } + platforms { + "x64", + } else - platforms { - "x32", - "x64", - "Native", -- for targets where bitness is not specified - } + platforms { + "x32", + "x64", + "Native", -- for targets where bitness is not specified + } end language "C++" @@ -476,7 +476,7 @@ end if _OPTIONS["targetos"] == "android" then _OPTIONS["with-bundled-sdl2"] = "1" end - + configuration {} msgcompile ("Compiling $(subst ../,,$<)...") @@ -789,7 +789,7 @@ if _OPTIONS["OPTIMIZE"] then -- windows native mingw GCC 5.2 fails with -flto=x with x > 1. bug unfixed as of this commit "-flto=1", -- if ld fails, just buy more RAM or uncomment this! --- "-Wl,-no-keep-memory", +-- "-Wl,-no-keep-memory", "-Wl,-v", -- silence redefine warnings from discrete.c. "-Wl,-allow-multiple-definition", @@ -801,17 +801,17 @@ if _OPTIONS["OPTIMIZE"] then "-flto-odr-type-merging", "-Wodr", "-flto-compression-level=0", -- lto doesn't work with anything <9 on linux with < 12G RAM, much slower if <> 0 --- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory! --- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report", +-- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory! +-- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report", -- this six flag combo lets MAME compile with LTO=1 on linux with no errors and ~2% speed boost, but compile time is much longer -- if you are going to wait on lto, you might as well enable these for GCC --- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las", --- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller", +-- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las", +-- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller", } -- same flags are needed by linker linkoptions { "-flto=1", --- "-Wl,-no-keep-memory", +-- "-Wl,-no-keep-memory", "-Wl,-v", "-Wl,-allow-multiple-definition", "-fuse-linker-plugin", @@ -819,12 +819,12 @@ if _OPTIONS["OPTIMIZE"] then "-flto-odr-type-merging", "-Wodr", "-flto-compression-level=0", -- lto doesn't work with anything <9 on linux with < 12G RAM, much slower if <> 0 --- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory! --- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report", +-- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory! +-- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report", -- this six flag combo lets MAME compile with LTO=1 on linux with no errors and ~2% speed boost, but compile time is much longer -- if you are going to wait on lto, you might as well enable these for GCC --- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las", --- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller", +-- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las", +-- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller", } @@ -971,7 +971,7 @@ end } end end - + if (_OPTIONS["PLATFORM"]=="arm") then buildoptions { "-Wno-cast-align", @@ -982,7 +982,7 @@ if (_OPTIONS["PLATFORM"]=="arm64") then buildoptions { "-Wno-cast-align", } - defines { + defines { "PTR64=1", } end @@ -1029,7 +1029,7 @@ configuration { "android-arm64" } buildoptions { "-Wno-asm-operand-widths", } - + configuration { "pnacl" } buildoptions { "-std=gnu89", @@ -1058,17 +1058,17 @@ configuration { "linux-* or rpi or ci20"} configuration { "steamlink" } links { "dl", - "EGL", + "EGL", "GLESv2", - "SDL2", - } + "SDL2", + } defines { "EGL_API_FB", } configuration { "rpi" } links { - "SDL2", + "SDL2", "fontconfig", "X11", "GLESv2", @@ -1077,17 +1077,17 @@ configuration { "rpi" } "vcos", "vchiq_arm", "pthread", - } + } configuration { "ci20" } links { - "SDL2", + "SDL2", "asound", "fontconfig", "freetype", "pthread", - } + } configuration { "osx* or xcode4" } @@ -1117,7 +1117,7 @@ configuration { "mingw-clang" } linkoptions { "-pthread", } - + configuration { "vs*" } defines { @@ -1141,7 +1141,7 @@ configuration { "vs*" } } buildoptions { - "/WX", -- Treats all compiler warnings as errors. + "/WX", -- Treats all compiler warnings as errors. "/wd4025", -- warning C4025: 'number' : based pointer passed to function with variable arguments: parameter number "/wd4003", -- warning C4003: not enough actual parameters for macro 'xxx' "/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch @@ -1205,38 +1205,38 @@ configuration { "vs*" } } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd9", -- remark #9: nested comment is not allowed - "/Qwd82", -- remark #82: storage class is not first - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd128", -- remark #128: loop is not reachable - "/Qwd177", -- remark #177: function "xxx" was declared but never referenced - "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" - "/Qwd185", -- remark #185: dynamic initialization in unreachable code - "/Qwd280", -- remark #280: selector expression is constant - "/Qwd344", -- remark #344: typedef name has already been declared (with same type) - "/Qwd411", -- remark #411: class "xxx" defines no constructor to initialize the following - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2545", -- remark #2545: empty dependent statement in "else" clause of if - statement - "/Qwd2553", -- remark #2553: nonstandard second parameter "TCHAR={WCHAR = { __wchar_t } } **" of "main", expected "char *[]" or "char **" extern "C" int _tmain(int argc, TCHAR **argv) - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - "/Qwd3280", -- remark #3280: declaration hides member "attotime::seconds" (declared at line 126) static attotime from_seconds(INT32 seconds) { return attotime(seconds, 0); } + "/Qwd9", -- remark #9: nested comment is not allowed + "/Qwd82", -- remark #82: storage class is not first + "/Qwd111", -- remark #111: statement is unreachable + "/Qwd128", -- remark #128: loop is not reachable + "/Qwd177", -- remark #177: function "xxx" was declared but never referenced + "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" + "/Qwd185", -- remark #185: dynamic initialization in unreachable code + "/Qwd280", -- remark #280: selector expression is constant + "/Qwd344", -- remark #344: typedef name has already been declared (with same type) + "/Qwd411", -- remark #411: class "xxx" defines no constructor to initialize the following + "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd2545", -- remark #2545: empty dependent statement in "else" clause of if - statement + "/Qwd2553", -- remark #2553: nonstandard second parameter "TCHAR={WCHAR = { __wchar_t } } **" of "main", expected "char *[]" or "char **" extern "C" int _tmain(int argc, TCHAR **argv) + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd3280", -- remark #3280: declaration hides member "attotime::seconds" (declared at line 126) static attotime from_seconds(INT32 seconds) { return attotime(seconds, 0); } - "/Qwd170", -- error #170: pointer points outside of underlying object - "/Qwd188", -- error #188: enumerated type mixed with another type + "/Qwd170", -- error #170: pointer points outside of underlying object + "/Qwd188", -- error #188: enumerated type mixed with another type - "/Qwd63", -- warning #63: shift count is too large - "/Qwd177", -- warning #177: label "xxx" was declared but never referenced - "/Qwd186", -- warning #186: pointless comparison of unsigned integer with zero - "/Qwd488", -- warning #488: template parameter "_FunctionClass" is not used in declaring the parameter types of function template "device_delegate<_Signature>::device_delegate<_FunctionClass>(delegate<_Signature>: - "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd3291", -- warning #3291: invalid narrowing conversion from "double" to "int" - "/Qwd1195", -- error #1195: conversion from integer to smaller pointer - "/Qwd47", -- error #47: incompatible redefinition of macro "xxx" - "/Qwd265", -- error #265: floating-point operation result is out of range + "/Qwd63", -- warning #63: shift count is too large + "/Qwd177", -- warning #177: label "xxx" was declared but never referenced + "/Qwd186", -- warning #186: pointless comparison of unsigned integer with zero + "/Qwd488", -- warning #488: template parameter "_FunctionClass" is not used in declaring the parameter types of function template "device_delegate<_Signature>::device_delegate<_FunctionClass>(delegate<_Signature>: + "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated + "/Qwd1879", -- warning #1879: unimplemented pragma ignored + "/Qwd3291", -- warning #3291: invalid narrowing conversion from "double" to "int" + "/Qwd1195", -- error #1195: conversion from integer to smaller pointer + "/Qwd47", -- error #47: incompatible redefinition of macro "xxx" + "/Qwd265", -- error #265: floating-point operation result is out of range -- these occur on a release build, while we can increase the size limits instead some of the files do require extreme amounts - "/Qwd11074", -- remark #11074: Inlining inhibited by limit max-size / remark #11074: Inlining inhibited by limit max-total-size - "/Qwd11075", -- remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo + "/Qwd11074", -- remark #11074: Inlining inhibited by limit max-size / remark #11074: Inlining inhibited by limit max-total-size + "/Qwd11075", -- remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo } end @@ -1248,7 +1248,7 @@ end } configuration { "vs2015" } buildoptions { - "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) + "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter "/wd4458", -- warning C4458: declaration of 'xxx' hides class member @@ -1308,7 +1308,7 @@ findfunction("createProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarg group "emulator" dofile(path.join("src", "main.lua")) -if (_OPTIONS["SOURCES"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then startproject (_OPTIONS["target"]) else @@ -1320,7 +1320,7 @@ if (_OPTIONS["SOURCES"] == nil) then end else startproject (_OPTIONS["subtarget"]) -end +end mainProject(_OPTIONS["target"],_OPTIONS["subtarget"]) strip() diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index dd3481f8ae5..30cb3770a4a 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -26,10 +26,10 @@ project "expat" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd111", -- remark #111: statement is unreachable + "/Qwd1879", -- warning #1879: unimplemented pragma ignored + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end configuration { "vs2015" } @@ -76,8 +76,8 @@ project "zlib" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd280", -- remark #280: selector expression is constant + "/Qwd111", -- remark #111: statement is unreachable + "/Qwd280", -- remark #280: selector expression is constant } end configuration "Debug" @@ -137,7 +137,7 @@ project "softfloat" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands } end configuration { } @@ -165,7 +165,7 @@ project "jpeg" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end @@ -243,11 +243,11 @@ project "flac" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd177", -- remark #177: function "xxx" was declared but never referenced - "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" - "/Qwd188", -- error #188: enumerated type mixed with another type - "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd111", -- remark #111: statement is unreachable + "/Qwd177", -- remark #177: function "xxx" was declared but never referenced + "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" + "/Qwd188", -- error #188: enumerated type mixed with another type + "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end @@ -330,7 +330,7 @@ project "7z" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end configuration { "vs2015" } @@ -381,7 +381,7 @@ project "lua" -- In addition comment out the "extern "C"" -- in lua.hpp and do the same in luaengine.c line 47 --options { - -- "ForceCPP", + -- "ForceCPP", --} configuration { "gmake" } @@ -524,8 +524,8 @@ project "sqlite3" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands } end configuration { "pnacl" } @@ -587,10 +587,10 @@ project "portmidi" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd188", -- error #188: enumerated type mixed with another type - "/Qwd344", -- remark #344: typedef name has already been declared (with same type) - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd188", -- error #188: enumerated type mixed with another type + "/Qwd344", -- remark #344: typedef name has already been declared (with same type) + "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands } end @@ -668,9 +668,9 @@ project "bgfx" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx" - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd82", -- remark #82: storage class is not first + "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx" + "/Qwd1879", -- warning #1879: unimplemented pragma ignored + "/Qwd82", -- remark #82: storage class is not first } end configuration { } @@ -819,10 +819,10 @@ project "portaudio" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated - "/Qwd2544", -- message #2544: empty dependent statement in if-statement - "/Qwd1879", -- warning #1879: unimplemented pragma ignored + "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated + "/Qwd2544", -- message #2544: empty dependent statement in if-statement + "/Qwd1879", -- warning #1879: unimplemented pragma ignored } end configuration { "vs2015" } @@ -1021,7 +1021,7 @@ project "uv" "WIN32_LEAN_AND_MEAN", "_WIN32_WINNT=0x0502", } - if _ACTION == "vs2013" then + if _ACTION == "vs2013" then files { MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c", } @@ -1106,7 +1106,7 @@ project "uv" MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c", } end - + if _OPTIONS["targetos"]=="android" then defines { "_GNU_SOURCE", @@ -1124,7 +1124,7 @@ project "uv" MAME_DIR .. "3rdparty/libuv/src/unix/android-ifaddrs.c", } end - + if _OPTIONS["targetos"]=="solaris" then defines { "__EXTENSIONS__", @@ -1177,7 +1177,7 @@ end if _OPTIONS["with-bundled-sdl2"] then project "SDL2" uuid "caab3327-574f-4abf-b25b-74d5238ae59b" -if _OPTIONS["targetos"]=="android" then +if _OPTIONS["targetos"]=="android" then kind "SharedLib" targetextension ".so" targetprefix "lib" @@ -1189,8 +1189,8 @@ if _OPTIONS["targetos"]=="android" then linkoptions { "-Wl,-soname,liSDL2.so" } - - if _OPTIONS["SEPARATE_BIN"]~="1" then + + if _OPTIONS["SEPARATE_BIN"]~="1" then if _OPTIONS["PLATFORM"]=="arm" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a") end @@ -1209,11 +1209,11 @@ if _OPTIONS["targetos"]=="android" then if _OPTIONS["PLATFORM"]=="x64" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64") end - end + end else kind "StaticLib" -end - +end + files { MAME_DIR .. "3rdparty/SDL2/include/begin_code.h", MAME_DIR .. "3rdparty/SDL2/include/close_code.h", @@ -1287,8 +1287,8 @@ end MAME_DIR .. "3rdparty/SDL2/include/SDL_types.h", MAME_DIR .. "3rdparty/SDL2/include/SDL_version.h", MAME_DIR .. "3rdparty/SDL2/include/SDL_video.h", - - + + MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_atomic.c", MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_spinlock.c", MAME_DIR .. "3rdparty/SDL2/src/audio/disk/SDL_diskaudio.c", @@ -1457,13 +1457,13 @@ end MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_glesfuncs.h", } end - + if _OPTIONS["targetos"]=="android" then files { MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.c", MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.h", - MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.c", - MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.h", + MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.c", + MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.h", MAME_DIR .. "3rdparty/SDL2/src/filesystem/android/SDL_sysfilesystem.c", MAME_DIR .. "3rdparty/SDL2/src/haptic/dummy/SDL_syshaptic.c", MAME_DIR .. "3rdparty/SDL2/src/joystick/android/SDL_sysjoystick.c", @@ -1497,7 +1497,7 @@ end MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.h", } end - + if _OPTIONS["targetos"]=="macosx" then files { MAME_DIR .. "3rdparty/SDL2/src/audio/coreaudio/SDL_coreaudio.c", @@ -1510,7 +1510,7 @@ end MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick.c", MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h", MAME_DIR .. "3rdparty/SDL2/src/loadso/dlopen/SDL_sysloadso.c", - MAME_DIR .. "3rdparty/SDL2/src/power/macosx/SDL_syspower.c", + MAME_DIR .. "3rdparty/SDL2/src/power/macosx/SDL_syspower.c", MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syscond.c", MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex.c", MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex_c.h", @@ -1605,25 +1605,25 @@ end MAME_DIR .. "3rdparty/SDL2/src/main/windows/version.rc", } end - + configuration { "vs*" } files { MAME_DIR .. "3rdparty/SDL2/src/audio/xaudio2/SDL_xaudio2.c", } - + buildoptions { "/wd4200", -- warning C4200: nonstandard extension used: zero-sized array in struct/union "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx' "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression "/wd4057", -- warning C4057: 'function': 'xxx' differs in indirection to slightly different base types from 'xxx' "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used - "/wd4204", -- warning C4204: nonstandard extension used: non-constant aggregate initializer + "/wd4204", -- warning C4204: nonstandard extension used: non-constant aggregate initializer "/wd4054", -- warning C4054: 'type cast': from function pointer 'xxx' to data pointer 'xxx' } defines { "HAVE_LIBC", } - + configuration { "mingw*"} includedirs { MAME_DIR .. "3rdparty/SDL2-override/mingw", @@ -1635,21 +1635,21 @@ end "-Wno-bad-function-cast", "-Wno-discarded-qualifiers", "-Wno-unused-but-set-variable", - } + } configuration { "osx*"} buildoptions { "-Wno-undef", - } - buildoptions_objc { - "-x objective-c", - "-std=c99", - } - + } + buildoptions_objc { + "-x objective-c", + "-std=c99", + } + buildoptions_c { "-Wno-bad-function-cast", - } - + } + configuration { "android-*"} defines { "GL_GLEXT_PROTOTYPES", @@ -1659,8 +1659,8 @@ end "-Wno-incompatible-pointer-types-discards-qualifiers", "-Wno-unneeded-internal-declaration", "-Wno-unused-const-variable", - } - + } + configuration { } includedirs { MAME_DIR .. "3rdparty/SDL2/include", diff --git a/scripts/src/benchmarks.lua b/scripts/src/benchmarks.lua index f774e3f45ca..a643939d6db 100644 --- a/scripts/src/benchmarks.lua +++ b/scripts/src/benchmarks.lua @@ -45,13 +45,13 @@ project "benchmark" project("benchmarks") uuid ("a9750a48-d283-4a6d-b126-31c7ce049af1") - kind "ConsoleApp" + kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 4d3f98a3e4c..113d3962110 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -35,7 +35,7 @@ if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RS MAME_DIR .. "src/devices/cpu/drcbex64.cpp", MAME_DIR .. "src/devices/cpu/drcbex64.h", MAME_DIR .. "src/devices/cpu/drcumlsh.h", - MAME_DIR .. "src/devices/cpu/x86emit.h", + MAME_DIR .. "src/devices/cpu/x86emit.h", } end @@ -86,7 +86,7 @@ if (CPUS["ARCOMPACT"]~=null) then MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.h", } dependency { - { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" }, + { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" }, { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" }, } @@ -577,7 +577,7 @@ if (CPUS["H8"]~=null) then MAME_DIR .. "src/devices/cpu/h8/h8_sci.cpp", MAME_DIR .. "src/devices/cpu/h8/h8_sci.h", } - + dependency { { MAME_DIR .. "src/devices/cpu/h8/h8.cpp", GEN_DIR .. "emu/cpu/h8/h8.inc" }, { MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.inc" }, @@ -950,7 +950,7 @@ end if (CPUS["I960"]~=null) then files { MAME_DIR .. "src/devices/cpu/i960/i960.cpp", - MAME_DIR .. "src/devices/cpu/i960/i960.h", + MAME_DIR .. "src/devices/cpu/i960/i960.h", } end @@ -1163,7 +1163,7 @@ if (CPUS["M37710"]~=null) then MAME_DIR .. "src/devices/cpu/m37710/m37710cm.h", MAME_DIR .. "src/devices/cpu/m37710/m37710il.h", MAME_DIR .. "src/devices/cpu/m37710/m37710op.h", - MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h", + MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h", } end @@ -1233,7 +1233,7 @@ if (CPUS["M6502"]~=null) then MAME_DIR .. "src/devices/cpu/m6502/m5074x.cpp", MAME_DIR .. "src/devices/cpu/m6502/m5074x.h", } - + dependency { { MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp", GEN_DIR .. "emu/cpu/m6502/deco16.inc" }, { MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp", GEN_DIR .. "emu/cpu/m6502/m4510.inc" }, @@ -1432,14 +1432,14 @@ end -------------------------------------------------- if (CPUS["PATINHOFEIO"]~=null) then - files { - MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp", - MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h", - } + files { + MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp", + MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h", + } end if (CPUS["PATINHOFEIO"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp") end -------------------------------------------------- @@ -1612,7 +1612,7 @@ if (CPUS["MINX"]~=null) then MAME_DIR .. "src/devices/cpu/minx/minxfunc.h", MAME_DIR .. "src/devices/cpu/minx/minxopce.h", MAME_DIR .. "src/devices/cpu/minx/minxopcf.h", - MAME_DIR .. "src/devices/cpu/minx/minxops.h", + MAME_DIR .. "src/devices/cpu/minx/minxops.h", } end @@ -1696,7 +1696,7 @@ if (CPUS["SATURN"]~=null) then MAME_DIR .. "src/devices/cpu/saturn/saturn.cpp", MAME_DIR .. "src/devices/cpu/saturn/saturn.h", MAME_DIR .. "src/devices/cpu/saturn/satops.inc", - MAME_DIR .. "src/devices/cpu/saturn/sattable.inc", + MAME_DIR .. "src/devices/cpu/saturn/sattable.inc", } end @@ -2043,7 +2043,7 @@ if (CPUS["TMS57002"]~=null) then { MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" }, { MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" }, } - custombuildtask { + custombuildtask { { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } } } end diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 56ff55879dd..efe30edbb1d 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -280,7 +280,7 @@ files { MAME_DIR .. "src/emu/ui/starimg.h", MAME_DIR .. "src/emu/ui/toolbar.h", MAME_DIR .. "src/emu/ui/utils.cpp", - MAME_DIR .. "src/emu/ui/utils.h", + MAME_DIR .. "src/emu/ui/utils.h", MAME_DIR .. "src/emu/validity.cpp", MAME_DIR .. "src/emu/validity.h", MAME_DIR .. "src/emu/video.cpp", diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 52211bf92fe..af60a3ccc44 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -10,7 +10,7 @@ --------------------------------------------------------------------------- function mainProject(_target, _subtarget) -if (_OPTIONS["SOURCES"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then if (_target == _subtarget) then project (_target) else @@ -19,13 +19,13 @@ if (_OPTIONS["SOURCES"] == nil) then else project (_target .. _subtarget) end - end + end else project (_subtarget) -end +end uuid (os.uuid(_target .."_" .. _subtarget)) kind "ConsoleApp" - + configuration { "android*" } targetprefix "lib" targetname "main" @@ -39,7 +39,7 @@ end "GLESv1_CM", "GLESv2", "SDL2", - } + } configuration { "pnacl" } kind "ConsoleApp" targetextension ".pexe" @@ -53,7 +53,7 @@ end addprojectflags() flags { "NoManifest", - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } if _OPTIONS["SYMBOLS"] then @@ -63,7 +63,7 @@ end "$(SILENT) objdump --section=.text --line-numbers --syms --demangle $(TARGET) >$(subst .exe,.sym,$(TARGET))" } end - + configuration { "vs*" } flags { "Unicode", @@ -112,7 +112,7 @@ end targetextension "" configuration { "asmjs" } - targetextension ".bc" + targetextension ".bc" if os.getenv("EMSCRIPTEN") then local emccopts = "" emccopts = emccopts .. " -O3" @@ -141,12 +141,12 @@ end includedirs { MAME_DIR .. "3rdparty/SDL2/include", } - + files { MAME_DIR .. "3rdparty/SDL2/src/main/android/SDL_android_main.c", } targetsuffix "" - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then if _OPTIONS["PLATFORM"]=="arm" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a") end @@ -167,11 +167,11 @@ end end end else - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end end - + findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"]) links { "osd_" .. _OPTIONS["osd"], @@ -201,7 +201,7 @@ end } if _OPTIONS["USE_LIBUV"]=="1" then - links { + links { ext_lib("uv"), "http-parser", } @@ -221,9 +221,9 @@ end "bgfx", "ocore_" .. _OPTIONS["osd"], } - + override_resources = false; - + maintargetosdoptions(_target,_subtarget) includedirs { @@ -273,7 +273,7 @@ end dependency { { "$(OBJDIR)/mame.res" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", true }, } - end + end end local mainfile = MAME_DIR .. "src/".._target .."/" .. _subtarget ..".cpp" @@ -285,12 +285,12 @@ end MAME_DIR .. "src/version.cpp", GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", } - -if (_OPTIONS["SOURCES"] == nil) then + +if (_OPTIONS["SOURCES"] == nil) then if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt") then dependency { - { + { GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, } custombuildtask { @@ -303,7 +303,7 @@ if (_OPTIONS["SOURCES"] == nil) then } else dependency { - { + { GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, } custombuildtask { @@ -311,11 +311,11 @@ if (_OPTIONS["SOURCES"] == nil) then } end end -end +end if (_OPTIONS["SOURCES"] ~= nil) then dependency { - { + { GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, } custombuildtask { @@ -331,17 +331,17 @@ if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then } end configuration { "mingw*" } - custombuildtask { + custombuildtask { { MAME_DIR .. "src/version.cpp" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }}, - } - + } + configuration { "vs*" } - prebuildcommands { + prebuildcommands { "mkdir " .. path.translate(GEN_DIR .. "resource/","\\") .. " 2>NUL", "@echo Emitting ".. rctarget .. "vers.rc...", PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") , - } - + } + configuration { } debugdir (MAME_DIR) diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 95d0371e414..75fe6a60c77 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -68,7 +68,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h", MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp", MAME_DIR .. "src/lib/netlist/solver/nld_solver.h", - MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h", + MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct2.h", @@ -78,7 +78,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/solver/mat_cr.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_sm.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h", - MAME_DIR .. "src/lib/netlist/solver/vector_base.h", + MAME_DIR .. "src/lib/netlist/solver/vector_base.h", MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_4020.h", MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp", @@ -168,5 +168,5 @@ project "netlist" MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.cpp", MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h", MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp", - MAME_DIR .. "src/lib/netlist/macro/nlm_other.h", + MAME_DIR .. "src/lib/netlist/macro/nlm_other.h", } diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index a8b8debe272..f1bfab95b08 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -10,7 +10,7 @@ --------------------------------------------------------------------------- function string.starts(String,Start) - return string.sub(String,1,string.len(Start))==Start + return string.sub(String,1,string.len(Start))==Start end function addlibfromstring(str) @@ -127,7 +127,7 @@ function osdmodulesbuild() "__STDC_FORMAT_MACROS", "__STDC_CONSTANT_MACROS", } - + files { MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", MAME_DIR .. "src/osd/modules/render/binpacker.cpp", @@ -202,7 +202,7 @@ function qtdebuggerbuild() removeflags { "SingleOutputDir", } - local version = str_to_version(_OPTIONS["gcc_version"]) + local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then configuration { "gmake" } if (version >= 30600) then @@ -276,14 +276,14 @@ function qtdebuggerbuild() custombuildtask { - { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, { MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp", { },{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, } diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index 7748ff8a419..4869ec8716d 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -41,9 +41,9 @@ project ("osd_" .. _OPTIONS["osd"]) removeflags { "SingleOutputDir", } - + dofile("osdmini_cfg.lua") - + includedirs { MAME_DIR .. "src/emu", MAME_DIR .. "src/osd", @@ -94,24 +94,24 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/input/input_windows.h", MAME_DIR .. "src/osd/modules/input/input_xinput.cpp", } - + project ("ocore_" .. _OPTIONS["osd"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) kind (LIBTYPE) removeflags { - "SingleOutputDir", + "SingleOutputDir", } dofile("osdmini_cfg.lua") - + includedirs { MAME_DIR .. "src/emu", MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } - + files { MAME_DIR .. "src/osd/osdnet.cpp", MAME_DIR .. "src/osd/osdnet.h", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 03e82ffcb2f..f1d307b8cab 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -89,7 +89,7 @@ function maintargetosdoptions(_target,_subtarget) configuration { "x64", "vs*" } libdirs { path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") - } + } end links { "psapi", @@ -116,15 +116,15 @@ function maintargetosdoptions(_target,_subtarget) "psapi" } configuration { } - - if _OPTIONS["targetos"]=="macosx" then + + if _OPTIONS["targetos"]=="macosx" then if _OPTIONS["with-bundled-sdl2"]~=nil then links { "SDL2", } - end - end - + end + end + end @@ -145,8 +145,8 @@ newoption { } newoption { - trigger = "SDL_INI_PATH", - description = "Default search path for .ini files", + trigger = "SDL_INI_PATH", + description = "Default search path for .ini files", } newoption { @@ -255,22 +255,22 @@ if BASE_TARGETOS=="unix" then "-framework QuartzCore", "-framework OpenGL", } - - + + if os_version>=101100 then linkoptions { "-weak_framework Metal", } end if _OPTIONS["with-bundled-sdl2"]~=nil then - linkoptions { - "-framework AudioUnit", - "-framework CoreAudio", - "-framework Carbon", - "-framework ForceFeedback", - "-framework IOKit", - "-framework CoreVideo", - } + linkoptions { + "-framework AudioUnit", + "-framework CoreAudio", + "-framework Carbon", + "-framework ForceFeedback", + "-framework IOKit", + "-framework CoreVideo", + } else if _OPTIONS["USE_LIBSDL"]~="1" then linkoptions { @@ -303,8 +303,8 @@ if BASE_TARGETOS=="unix" then local str = backtick(sdlconfigcmd() .. " --libs") addlibfromstring(str) addoptionsfromstring(str) - end - + end + if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then links { "m", diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 7a692522297..0fd15e5ca27 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -19,9 +19,9 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[ end if _OPTIONS["SDL_INI_PATH"]~=nil then - defines { - "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'", - } + defines { + "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'", + } end if _OPTIONS["NO_X11"]=="1" then @@ -74,20 +74,20 @@ if BASE_TARGETOS=="unix" then "SDLMAME_UNIX", } if _OPTIONS["targetos"]=="macosx" then - if _OPTIONS["with-bundled-sdl2"]==nil then - if _OPTIONS["USE_LIBSDL"]~="1" then - buildoptions { - "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], - } - else - defines { - "MACOSX_USE_LIBSDL", - } - buildoptions { - backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"), - } - end - end + if _OPTIONS["with-bundled-sdl2"]==nil then + if _OPTIONS["USE_LIBSDL"]~="1" then + buildoptions { + "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], + } + else + defines { + "MACOSX_USE_LIBSDL", + } + buildoptions { + backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"), + } + end + end else buildoptions { backtick(sdlconfigcmd() .. " --cflags"), diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 97880e4a260..f9a886dc176 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -275,10 +275,10 @@ if _OPTIONS["with-tools"] then kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -289,7 +289,7 @@ if _OPTIONS["with-tools"] then includedirs { MAME_DIR .. "src/osd", } - + files { MAME_DIR .. "src/osd/windows/ledutil.cpp", } diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index b3d605d9dc7..428974c23df 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -81,7 +81,7 @@ if (SOUNDS["DISCRETE"]~=null) then MAME_DIR .. "src/devices/sound/disc_mth.inc", MAME_DIR .. "src/devices/sound/disc_sys.inc", MAME_DIR .. "src/devices/sound/disc_wav.h", - MAME_DIR .. "src/devices/sound/disc_wav.inc", + MAME_DIR .. "src/devices/sound/disc_wav.inc", } end @@ -135,8 +135,8 @@ end if (SOUNDS["TIA"]~=null) then files { - MAME_DIR .. "src/devices/sound/tiasound.cpp", - MAME_DIR .. "src/devices/sound/tiasound.h", + MAME_DIR .. "src/devices/sound/tiasound.cpp", + MAME_DIR .. "src/devices/sound/tiasound.h", MAME_DIR .. "src/devices/sound/tiaintf.cpp", MAME_DIR .. "src/devices/sound/tiaintf.h", } @@ -483,7 +483,7 @@ end --------------------------------------------------- --- L7A1045 L6028 DSP-A +-- L7A1045 L6028 DSP-A --@src/devices/sound/l7a1045_l6028_dsp_a.h,SOUNDS["L7A1045"] = true --------------------------------------------------- @@ -730,8 +730,8 @@ end if (SOUNDS["QSOUND"]~=null) then files { - MAME_DIR .. "src/devices/sound/qsound.cpp", - MAME_DIR .. "src/devices/sound/qsound.h", + MAME_DIR .. "src/devices/sound/qsound.cpp", + MAME_DIR .. "src/devices/sound/qsound.h", MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp", MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h", MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.cpp", @@ -1154,8 +1154,8 @@ if (SOUNDS["YM2413"]~=null) then } end -if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then ---if (SOUNDS["YM2203"]~=null) then +if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then +--if (SOUNDS["YM2203"]~=null) then files { MAME_DIR .. "src/devices/sound/2203intf.cpp", MAME_DIR .. "src/devices/sound/2203intf.h", @@ -1169,12 +1169,12 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o --if (SOUNDS["YM2608"]~=null) then files { - MAME_DIR .. "src/devices/sound/2608intf.cpp", - MAME_DIR .. "src/devices/sound/2608intf.h", - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/fm.cpp", - MAME_DIR .. "src/devices/sound/fm.h", + MAME_DIR .. "src/devices/sound/2608intf.cpp", + MAME_DIR .. "src/devices/sound/2608intf.h", + MAME_DIR .. "src/devices/sound/ay8910.cpp", + MAME_DIR .. "src/devices/sound/ay8910.h", + MAME_DIR .. "src/devices/sound/fm.cpp", + MAME_DIR .. "src/devices/sound/fm.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1182,12 +1182,12 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o --if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then files { - MAME_DIR .. "src/devices/sound/2610intf.cpp", - MAME_DIR .. "src/devices/sound/2610intf.h", - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/fm.cpp", - MAME_DIR .. "src/devices/sound/fm.h", + MAME_DIR .. "src/devices/sound/2610intf.cpp", + MAME_DIR .. "src/devices/sound/2610intf.h", + MAME_DIR .. "src/devices/sound/ay8910.cpp", + MAME_DIR .. "src/devices/sound/ay8910.h", + MAME_DIR .. "src/devices/sound/fm.cpp", + MAME_DIR .. "src/devices/sound/fm.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1195,10 +1195,10 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o --if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then files { - MAME_DIR .. "src/devices/sound/2612intf.cpp", - MAME_DIR .. "src/devices/sound/2612intf.h", - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", + MAME_DIR .. "src/devices/sound/2612intf.cpp", + MAME_DIR .. "src/devices/sound/2612intf.h", + MAME_DIR .. "src/devices/sound/ay8910.cpp", + MAME_DIR .. "src/devices/sound/ay8910.h", MAME_DIR .. "src/devices/sound/fm2612.cpp", } --end @@ -1207,10 +1207,10 @@ end if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then --if (SOUNDS["YM3812"]~=null) then files { - MAME_DIR .. "src/devices/sound/3812intf.cpp", - MAME_DIR .. "src/devices/sound/3812intf.h", - MAME_DIR .. "src/devices/sound/fmopl.cpp", - MAME_DIR .. "src/devices/sound/fmopl.h", + MAME_DIR .. "src/devices/sound/3812intf.cpp", + MAME_DIR .. "src/devices/sound/3812intf.h", + MAME_DIR .. "src/devices/sound/fmopl.cpp", + MAME_DIR .. "src/devices/sound/fmopl.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1218,10 +1218,10 @@ if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) t --if (SOUNDS["YM3526"]~=null) then files { - MAME_DIR .. "src/devices/sound/3526intf.cpp", - MAME_DIR .. "src/devices/sound/3526intf.h", - MAME_DIR .. "src/devices/sound/fmopl.cpp", - MAME_DIR .. "src/devices/sound/fmopl.h", + MAME_DIR .. "src/devices/sound/3526intf.cpp", + MAME_DIR .. "src/devices/sound/3526intf.h", + MAME_DIR .. "src/devices/sound/fmopl.cpp", + MAME_DIR .. "src/devices/sound/fmopl.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1229,10 +1229,10 @@ if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) t --if (SOUNDS["Y8950"]~=null) then files { - MAME_DIR .. "src/devices/sound/8950intf.cpp", - MAME_DIR .. "src/devices/sound/8950intf.h", - MAME_DIR .. "src/devices/sound/fmopl.cpp", - MAME_DIR .. "src/devices/sound/fmopl.h", + MAME_DIR .. "src/devices/sound/8950intf.cpp", + MAME_DIR .. "src/devices/sound/8950intf.h", + MAME_DIR .. "src/devices/sound/fmopl.cpp", + MAME_DIR .. "src/devices/sound/fmopl.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1241,8 +1241,8 @@ end if (SOUNDS["YMF262"]~=null) then files { - MAME_DIR .. "src/devices/sound/ymf262.cpp", - MAME_DIR .. "src/devices/sound/ymf262.h", + MAME_DIR .. "src/devices/sound/ymf262.cpp", + MAME_DIR .. "src/devices/sound/ymf262.h", MAME_DIR .. "src/devices/sound/262intf.cpp", MAME_DIR .. "src/devices/sound/262intf.h", } @@ -1283,8 +1283,8 @@ end if (SOUNDS["YMZ770"]~=null) then files { - MAME_DIR .. "src/devices/sound/ymz770.cpp", - MAME_DIR .. "src/devices/sound/ymz770.h", + MAME_DIR .. "src/devices/sound/ymz770.cpp", + MAME_DIR .. "src/devices/sound/ymz770.h", MAME_DIR .. "src/devices/sound/mpeg_audio.cpp", MAME_DIR .. "src/devices/sound/mpeg_audio.h", } diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index b6a01efdd02..b5bb5b37366 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -25,7 +25,7 @@ project "gtest" configuration { "vs*" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd1195", -- error #1195: conversion from integer to smaller pointer + "/Qwd1195", -- error #1195: conversion from integer to smaller pointer } end @@ -42,13 +42,13 @@ end project("mametests") uuid ("66d4c639-196b-4065-a411-7ee9266564f5") - kind "ConsoleApp" + kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 8dc7a47cdc9..913358f1d20 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -529,27 +529,27 @@ uuid ("7c5396d1-2a1a-4c93-bed6-6b8fa182054a") kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) + targetdir(MAME_DIR) end links { - "utils", - "ocore_" .. _OPTIONS["osd"], - "netlist", + "utils", + "ocore_" .. _OPTIONS["osd"], + "netlist", } includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", + MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/lib/netlist", } files { - MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", + MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", MAME_DIR .. "src/emu/emucore.cpp", } diff --git a/scripts/src/video.lua b/scripts/src/video.lua index 96a310f154b..e81f8e3f41b 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -513,9 +513,9 @@ if (VIDEOS["MOS6566"]~=null) then end -files { +files { MAME_DIR .. "src/devices/video/cgapal.cpp", - MAME_DIR .. "src/devices/video/cgapal.h", + MAME_DIR .. "src/devices/video/cgapal.h", } -------------------------------------------------- diff --git a/scripts/target/ldplayer/ldplayer.lua b/scripts/target/ldplayer/ldplayer.lua index 1f4aafcd69f..4348f3bd318 100644 --- a/scripts/target/ldplayer/ldplayer.lua +++ b/scripts/target/ldplayer/ldplayer.lua @@ -56,7 +56,7 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget) targetsubdir(_target .."_" .. _subtarget) kind (LIBTYPE) uuid (os.uuid("drvldplayer")) - + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", @@ -78,7 +78,7 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget) custombuildtask { layoutbuildtask("ldplayer/layout", "pr8210"), - } + } end function linkProjects_ldplayer_ldplayer(_target, _subtarget) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 9a8937f0a78..240855fd53e 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -3238,7 +3238,7 @@ files { MAME_DIR .. "src/mame/machine/n64.cpp", MAME_DIR .. "src/mame/video/n64.cpp", MAME_DIR .. "src/mame/video/n64types.h", - MAME_DIR .. "src/mame/video/rdpfiltr.inc", + MAME_DIR .. "src/mame/video/rdpfiltr.inc", MAME_DIR .. "src/mame/video/n64.h", MAME_DIR .. "src/mame/video/rdpblend.cpp", MAME_DIR .. "src/mame/video/rdpblend.h", diff --git a/scripts/target/mame/dummy.lua b/scripts/target/mame/dummy.lua index f64a02fbae7..ec5d366abc6 100644 --- a/scripts/target/mame/dummy.lua +++ b/scripts/target/mame/dummy.lua @@ -19,7 +19,7 @@ function createProjects_mame_dummy(_target, _subtarget) uuid (os.uuid("drv-mame_dummy")) addprojectflags() precompiledheaders() - + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua index 6769f26a701..b7360486042 100644 --- a/scripts/target/mame/mame.lua +++ b/scripts/target/mame/mame.lua @@ -14,7 +14,7 @@ dofile("mess.lua") function createProjects_mame_mame(_target, _subtarget) createProjects_mame_arcade(_target, _subtarget) - createProjects_mame_mess(_target, _subtarget) + createProjects_mame_mess(_target, _subtarget) end function linkProjects_mame_mame(_target, _subtarget) diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 5687a044a41..4f5c1ec385a 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -2880,7 +2880,7 @@ files { createMESSProjects(_target, _subtarget, "usp") files { - MAME_DIR .. "src/mame/drivers/patinho_feio.cpp", + MAME_DIR .. "src/mame/drivers/patinho_feio.cpp", } createMESSProjects(_target, _subtarget, "veb") @@ -3110,8 +3110,8 @@ files { MAME_DIR .. "src/mame/drivers/lft.cpp", MAME_DIR .. "src/mame/drivers/lg-dvd.cpp", MAME_DIR .. "src/mame/drivers/lola8a.cpp", - MAME_DIR .. "src/mame/drivers/m79152pc.cpp", - MAME_DIR .. "src/mame/drivers/marywu.cpp", + MAME_DIR .. "src/mame/drivers/m79152pc.cpp", + MAME_DIR .. "src/mame/drivers/marywu.cpp", MAME_DIR .. "src/mame/drivers/mccpm.cpp", MAME_DIR .. "src/mame/drivers/mes.cpp", MAME_DIR .. "src/mame/drivers/mice.cpp", diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index 3f06f495cd6..bf0fd462beb 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -84,7 +84,7 @@ function createProjects_mame_nl(_target, _subtarget) targetsubdir(_target .."_" .. _subtarget) kind (LIBTYPE) uuid (os.uuid("drv-mame-nl")) - + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua index 75d0cd955df..36b4032a525 100644 --- a/scripts/target/mame/tiny.lua +++ b/scripts/target/mame/tiny.lua @@ -82,7 +82,7 @@ function createProjects_mame_tiny(_target, _subtarget) uuid (os.uuid("drv-mame-tiny")) addprojectflags() precompiledheaders() - + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 968d974caa3..2a5490fab06 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -35,8 +35,8 @@ newoption { { "osx-clang", "OSX (Clang compiler)" }, { "pnacl", "Native Client - PNaCl" }, { "rpi", "RaspberryPi" }, - { "solaris", "Solaris" }, - { "steamlink", "Steam Link" }, + { "solaris", "Solaris" }, + { "steamlink", "Steam Link" }, { "ci20", "Creator-Ci20" }, }, } @@ -46,12 +46,12 @@ newoption { value = "toolset", description = "Choose VS toolset", allowed = { - { "intel-14", "Intel C++ Compiler XE 14.0" }, - { "intel-15", "Intel C++ Compiler XE 15.0" }, + { "intel-14", "Intel C++ Compiler XE 14.0" }, + { "intel-15", "Intel C++ Compiler XE 15.0" }, { "vs2013-clang", "Clang 3.6" }, { "vs2015-clang", "Clang 3.6" }, - { "vs2013-xp", "Visual Studio 2013 targeting XP" }, - { "vs2015-xp", "Visual Studio 2015 targeting XP" }, + { "vs2013-xp", "Visual Studio 2013 targeting XP" }, + { "vs2015-xp", "Visual Studio 2015 targeting XP" }, { "winphone8", "Windows Phone 8.0" }, { "winphone81", "Windows Phone 8.1" }, { "winstore81", "Windows Store 8.1" }, @@ -100,7 +100,7 @@ function toolchain(_buildDir, _subDir) if _OPTIONS["with-ios"] then iosPlatform = _OPTIONS["with-ios"] end - + local windowsPlatform = "10.0.10240.0" if _OPTIONS["with-windows"] then windowsPlatform = _OPTIONS["with-windows"] @@ -119,7 +119,7 @@ function toolchain(_buildDir, _subDir) print("Set ANDROID_NDK_ARM and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar" premake.gcc.llvm = true @@ -132,59 +132,59 @@ function toolchain(_buildDir, _subDir) print("Set ANDROID_NDK_ARM64 and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_ARM64)/bin/aarch64-linux-android-ar.exe" premake.gcc.llvm = true location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm64") end - + if "android-mips" == _OPTIONS["gcc"] then if not os.getenv("ANDROID_NDK_MIPS") or not os.getenv("ANDROID_NDK_ROOT") then print("Set ANDROID_NDK_MIPS and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-ar" premake.gcc.llvm = true location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips") end - + if "android-mips64" == _OPTIONS["gcc"] then if not os.getenv("ANDROID_NDK_MIPS64") or not os.getenv("ANDROID_NDK_ROOT") then print("Set ANDROID_NDK_MIPS64 and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_MIPS64)/bin/mips64el-linux-android-ar.exe" premake.gcc.llvm = true location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips64") end - + if "android-x86" == _OPTIONS["gcc"] then if not os.getenv("ANDROID_NDK_X86") or not os.getenv("ANDROID_NDK_ROOT") then print("Set ANDROID_NDK_X86 and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_X86)/bin/i686-linux-android-ar" premake.gcc.llvm = true location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x86") end - + if "android-x64" == _OPTIONS["gcc"] then if not os.getenv("ANDROID_NDK_X64") or not os.getenv("ANDROID_NDK_ROOT") then print("Set ANDROID_NDK_X64 and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_X64)/bin/x86_64-linux-android-ar.exe" premake.gcc.llvm = true @@ -396,15 +396,15 @@ function toolchain(_buildDir, _subDir) if "winstore82" == _OPTIONS["vs"] then premake.vstudio.toolset = "v140" premake.vstudio.storeapp = "8.2" - + -- If needed, depending on GENie version, enable file-level configuration if enablefilelevelconfig ~= nil then enablefilelevelconfig() end - + local action = premake.action.current() action.vstudio.windowsTargetPlatformVersion = windowsPlatform - + platforms { "ARM" } location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82") end @@ -423,7 +423,7 @@ function toolchain(_buildDir, _subDir) premake.vstudio.toolset = ("v120_xp") location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") end - + if ("vs2015-xp") == _OPTIONS["vs"] then premake.vstudio.toolset = ("v140_xp") location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") @@ -568,7 +568,7 @@ function toolchain(_buildDir, _subDir) } defines { "__VCCOREVER__=0x04000000", -- There is no special prefedined compiler symbol to detect RaspberryPi, faking it. - } + } linkoptions { "-Wl,--gc-sections", } @@ -594,10 +594,10 @@ function toolchain(_buildDir, _subDir) "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu/c++/4.9", "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/c++/4.9/backward", "$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include", - "$(CI20_SYSROOT)/mipsel-r2-hard/usr/local/include", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/local/include", "$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include-fixed", "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu", - "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include", } links { "c", @@ -607,7 +607,7 @@ function toolchain(_buildDir, _subDir) "stdc++", "gcc_s", } - + buildoptions { "--sysroot=$(CI20_SYSROOT)", "-Wno-pragmas", @@ -879,7 +879,7 @@ function toolchain(_buildDir, _subDir) "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib/crtend_so.o", "-target aarch64-none-linux-android", } - + configuration { "android-mips" } targetdir (_buildDir .. "android-mips" .. "/bin") objdir (_buildDir .. "android-mips" .. "/obj") @@ -901,7 +901,7 @@ function toolchain(_buildDir, _subDir) "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtbegin_so.o", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtend_so.o", } - + configuration { "android-mips64" } androidPlatform = "android-21" -- supported from API 21 targetdir (_buildDir .. "android-mips64" .. "/bin") @@ -971,7 +971,7 @@ function toolchain(_buildDir, _subDir) "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64/crtbegin_so.o", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64/crtend_so.o", } - + configuration { "asmjs" } targetdir (_buildDir .. "asmjs" .. "/bin") objdir (_buildDir .. "asmjs" .. "/obj") @@ -1002,7 +1002,7 @@ function toolchain(_buildDir, _subDir) "-ffunction-sections", "-Wunused-value", } - + configuration { "pnacl" } buildoptions { "-Wno-tautological-undefined-compare", From b055af8907752f54ee8913262837fc2c2cc5c011 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 10:17:19 +0200 Subject: [PATCH 57/74] Fix ldplayer issue (nw) --- scripts/src/devices.lua | 1 + scripts/src/main.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index 3922d3328ac..1248bcc0fe5 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -39,6 +39,7 @@ function devicesProject(_target, _subtarget) GEN_DIR .. "emu/layout", ext_includedir("expat"), ext_includedir("lua"), + ext_includedir("flac"), } dofile(path.join("src", "cpu.lua")) diff --git a/scripts/src/main.lua b/scripts/src/main.lua index af60a3ccc44..93c0dd12140 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -237,6 +237,7 @@ end GEN_DIR .. _target .. "/layout", GEN_DIR .. "resource", ext_includedir("zlib"), + ext_includedir("flac"), } if _OPTIONS["targetos"]=="macosx" and (not override_resources) then From de5c77d7858660c249d3ef2098185f84c227b5a5 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 10:53:22 +0200 Subject: [PATCH 58/74] add to arcade projects (nw) --- scripts/target/mame/arcade.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 240855fd53e..b5a4aeac89c 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -783,6 +783,10 @@ function createMAMEProjects(_target, _subtarget, _name) MAME_DIR .. "3rdparty", GEN_DIR .. "mame/layout", } + includedirs { + ext_includedir("flac"), + } + end function createProjects_mame_arcade(_target, _subtarget) From 5cab7dbd8b0a09b55243b115d0c49a4bd3368768 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 10:58:01 +0200 Subject: [PATCH 59/74] fix per source build (nw) --- scripts/build/makedep.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/build/makedep.py b/scripts/build/makedep.py index d70820a059f..e90a8b7de3d 100644 --- a/scripts/build/makedep.py +++ b/scripts/build/makedep.py @@ -236,13 +236,9 @@ if sys.argv[3]=='target': sys.stdout.write(' MAME_DIR .. "src/lib/util",\n') sys.stdout.write(' MAME_DIR .. "src/lib/netlist",\n') sys.stdout.write(' MAME_DIR .. "3rdparty",\n') - sys.stdout.write(' GEN_DIR .. "mame/layout",\n') + sys.stdout.write(' ext_includedir("zlib"),\n') + sys.stdout.write(' ext_includedir("flac"),\n') sys.stdout.write(' }\n') - sys.stdout.write(' if _OPTIONS["with-bundled-zlib"] then\n') - sys.stdout.write(' includedirs {\n') - sys.stdout.write(' MAME_DIR .. "3rdparty/zlib",\n') - sys.stdout.write(' }\n') - sys.stdout.write(' end\n') sys.stdout.write('\n') sys.stdout.write(' files{\n') for line in deps_files_included: From d9153eb306f8b3f5e1c9c66cdc3ad6e41d09ccac Mon Sep 17 00:00:00 2001 From: "therealmogminer@gmail.com" Date: Tue, 29 Mar 2016 11:28:07 +0200 Subject: [PATCH 60/74] Get bgfx post-processing working with laserdisc games, nw --- bgfx/chains/default.json | 9 +--- bgfx/chains/hlsl.json | 24 ++++------ bgfx/effects/default/blit.json | 12 ++--- bgfx/effects/hlsl/blit.json | 12 ++--- bgfx/effects/hlsl/color.json | 8 ++-- bgfx/effects/hlsl/deconverge.json | 8 ++-- bgfx/effects/hlsl/defocus.json | 8 ++-- bgfx/effects/hlsl/distortion.json | 8 ++-- bgfx/effects/hlsl/ntsc_decode.json | 1 + bgfx/effects/hlsl/ntsc_encode.json | 8 ++-- bgfx/effects/hlsl/phosphor.json | 8 ++-- bgfx/effects/hlsl/post.json | 8 ++-- bgfx/effects/hlsl/prescale.json | 8 ++-- bgfx/effects/unfiltered/blit.json | 12 ++--- bgfx/shaders/dx11/fs_blit.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/fs_color.bin | Bin 45305 -> 45305 bytes bgfx/shaders/dx11/fs_deconverge.bin | Bin 43108 -> 45228 bytes bgfx/shaders/dx11/fs_defocus.bin | Bin 49898 -> 49982 bytes bgfx/shaders/dx11/fs_distortion.bin | Bin 60482 -> 60534 bytes bgfx/shaders/dx11/fs_gui.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/fs_ntsc_decode.bin | Bin 60511 -> 60554 bytes bgfx/shaders/dx11/fs_ntsc_encode.bin | Bin 50379 -> 50379 bytes bgfx/shaders/dx11/fs_phosphor.bin | Bin 45190 -> 45190 bytes bgfx/shaders/dx11/fs_post.bin | Bin 57706 -> 57682 bytes bgfx/shaders/dx11/fs_prescale.bin | Bin 45438 -> 42904 bytes bgfx/shaders/dx11/fs_screen.bin | Bin 42904 -> 42904 bytes bgfx/shaders/dx11/vs_blit.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_color.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_deconverge.bin | Bin 45836 -> 45892 bytes bgfx/shaders/dx11/vs_defocus.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_distortion.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_gui.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_ntsc_decode.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_ntsc_encode.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_phosphor.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_post.bin | Bin 43223 -> 43083 bytes bgfx/shaders/dx11/vs_prescale.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx11/vs_screen.bin | Bin 43083 -> 43083 bytes bgfx/shaders/dx9/fs_deconverge.bin | Bin 1017 -> 1101 bytes bgfx/shaders/dx9/fs_defocus.bin | Bin 1807 -> 1911 bytes bgfx/shaders/dx9/fs_distortion.bin | Bin 5447 -> 5499 bytes bgfx/shaders/dx9/fs_ntsc_decode.bin | Bin 8356 -> 8439 bytes bgfx/shaders/dx9/fs_post.bin | Bin 4835 -> 4835 bytes bgfx/shaders/dx9/fs_prescale.bin | Bin 1399 -> 617 bytes bgfx/shaders/dx9/vs_deconverge.bin | Bin 1799 -> 1871 bytes bgfx/shaders/dx9/vs_post.bin | Bin 1142 -> 894 bytes bgfx/shaders/gles/fs_deconverge.bin | Bin 424 -> 485 bytes bgfx/shaders/gles/fs_defocus.bin | Bin 1051 -> 1167 bytes bgfx/shaders/gles/fs_distortion.bin | Bin 5160 -> 5408 bytes bgfx/shaders/gles/fs_ntsc_decode.bin | Bin 6438 -> 6484 bytes bgfx/shaders/gles/fs_post.bin | Bin 3805 -> 3784 bytes bgfx/shaders/gles/fs_prescale.bin | Bin 719 -> 238 bytes bgfx/shaders/gles/vs_deconverge.bin | Bin 1409 -> 1470 bytes bgfx/shaders/gles/vs_post.bin | Bin 629 -> 419 bytes bgfx/shaders/glsl/fs_deconverge.bin | Bin 395 -> 450 bytes bgfx/shaders/glsl/fs_defocus.bin | Bin 1016 -> 1122 bytes bgfx/shaders/glsl/fs_distortion.bin | Bin 4921 -> 5164 bytes bgfx/shaders/glsl/fs_ntsc_decode.bin | Bin 6050 -> 6096 bytes bgfx/shaders/glsl/fs_post.bin | Bin 3603 -> 3582 bytes bgfx/shaders/glsl/fs_prescale.bin | Bin 646 -> 181 bytes bgfx/shaders/glsl/vs_deconverge.bin | Bin 1301 -> 1356 bytes bgfx/shaders/glsl/vs_post.bin | Bin 569 -> 377 bytes bgfx/shaders/metal/fs_deconverge.bin | Bin 997 -> 1117 bytes bgfx/shaders/metal/fs_defocus.bin | Bin 2291 -> 2355 bytes bgfx/shaders/metal/fs_distortion.bin | Bin 5557 -> 5764 bytes bgfx/shaders/metal/fs_ntsc_decode.bin | Bin 6849 -> 6943 bytes bgfx/shaders/metal/fs_post.bin | Bin 4384 -> 4351 bytes bgfx/shaders/metal/fs_prescale.bin | Bin 1111 -> 634 bytes bgfx/shaders/metal/vs_deconverge.bin | Bin 1547 -> 1612 bytes bgfx/shaders/metal/vs_post.bin | Bin 925 -> 757 bytes src/osd/modules/render/bgfx/chainentry.cpp | 11 +++++ src/osd/modules/render/bgfx/chainentry.h | 1 + .../render/bgfx/shaders/fs_deconverge.sc | 11 ++--- .../modules/render/bgfx/shaders/fs_defocus.sc | 3 +- .../render/bgfx/shaders/fs_distortion.sc | 41 +++++++++-------- .../render/bgfx/shaders/fs_ntsc_decode.sc | 3 +- .../modules/render/bgfx/shaders/fs_post.sc | 7 ++- .../render/bgfx/shaders/fs_prescale.sc | 2 +- .../render/bgfx/shaders/varying.def.sc | 1 + .../render/bgfx/shaders/vs_deconverge.sc | 9 ++-- .../modules/render/bgfx/shaders/vs_post.sc | 7 +-- src/osd/modules/render/drawbgfx.cpp | 42 ++++++++++++++---- src/osd/modules/render/drawbgfx.h | 1 + 83 files changed, 150 insertions(+), 123 deletions(-) diff --git a/bgfx/chains/default.json b/bgfx/chains/default.json index 1012d6eacd5..115e7072cb3 100644 --- a/bgfx/chains/default.json +++ b/bgfx/chains/default.json @@ -7,17 +7,10 @@ } ], "passes": [ - { "effect": "default/blit", - "name": "Copy To Unstretched Texture", - "input": [ - { "sampler": "s_tex", "texture": "screen" } - ], - "output": "temp" - }, { "effect": "default/blit", "name": "Final Upscale", "input": [ - { "sampler": "s_tex", "target": "temp" } + { "sampler": "s_tex", "texture": "screen" } ], "output": "output" } diff --git a/bgfx/chains/hlsl.json b/bgfx/chains/hlsl.json index eabf0664857..401e86e6800 100644 --- a/bgfx/chains/hlsl.json +++ b/bgfx/chains/hlsl.json @@ -87,9 +87,9 @@ { "type": "vec2", "name": "defocus", "text": "Defocus, ", "default": [ 15, 15 ], "max": [ 500, 500 ], "min": [ 0, 0 ], "step": 1, "scale": 0.1, "format": "%2.1f", "screen": "crt" }, - { "type": "color", "name": "phosphor", "text": "Phosphor Persistence, ", "default": [ 55, 55, 55 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "color", "name": "phosphor", "text": "Phosphor Persistence, ", "default": [ 45, 45, 45 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, - { "type": "float", "name": "scanline_alpha", "text": "Scanline Amount", "default": 6, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, + { "type": "float", "name": "scanline_alpha", "text": "Scanline Amount", "default": 60, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_scale", "text": "Overall Scanline Scale", "default": 100, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_bright_scale", "text": "Scanline Brightness Scale", "default": 200, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, { "type": "float", "name": "scanline_bright_offset", "text": "Scanline Brightness Offset", "default": 0, "max": 400, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }, @@ -175,15 +175,6 @@ // passes (required): The list of individual shaders to invoke, and any dynamic input parameters they need. "passes": [ - { - // See the pass after this one for a verbose explanation of each parameter. - "effect": "hlsl/blit", - "name": "NTSC Blit to bilinear-able target", - "input": [ - { "sampler": "s_tex", "texture": "screen" } - ], - "output": "ntsc" - }, { // effect (required): The name of the effect JSON file to load for this pass. // value: Any valid JSON filename included in your shader chain, without the extension. @@ -261,7 +252,7 @@ // // option (optional): The name of any MAME option, which will have its value fetched and used as the name of a PNG to load from the artwork directory. // value: Any valid MAME INI option name. - { "sampler": "s_tex", "target": "ntsc" } + { "sampler": "s_tex", "texture": "screen" } ], // output (required): The target to use as the output for this pass. Can be one of the named targets in "targets", or "output" @@ -290,7 +281,8 @@ { "uniform": "u_jitter_amount", "parameter": "jitter" } ], "input": [ - { "sampler": "s_tex", "target": "ntsc" } + { "sampler": "s_tex", "target": "ntsc" }, + { "sampler": "s_screen", "texture": "screen" } ], "output": "guest" }, @@ -301,7 +293,7 @@ { "type": "slider", "condition": "notequal", "combine": "and", "name": "ntsc", "value": 0 } ], "input": [ - { "sampler": "s_tex", "target": "screen" } + { "sampler": "s_tex", "texture": "screen" } ], "output": "guest" }, @@ -444,8 +436,8 @@ { "uniform": "u_time", "parameter": "time" } ], "input": [ - { "sampler": "s_tex", "target": "internal" }, - { "sampler": "s_shadow", "option": "bgfx_shadow_mask" } + { "sampler": "s_tex", "target": "internal" }, + { "sampler": "s_shadow", "option": "bgfx_shadow_mask" } ], "output": "internal" }, diff --git a/bgfx/effects/default/blit.json b/bgfx/effects/default/blit.json index bbc9fd295d4..5f5ad148148 100644 --- a/bgfx/effects/default/blit.json +++ b/bgfx/effects/default/blit.json @@ -16,15 +16,15 @@ "equation": "add", // blend function parameters (optional): What factors to use in the blend function when calculating the final pixel. - // values: "0", "1", "srcColor", "1-srcColor", "dstColor", "1-dstColor", "srcAlpha", "1-srcAlpha", "dstAlpha", "1-dstAlpha" + // values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha" // defaults (srcColor, srcAlpha): "1" // defaults (dstColor, dstAlpha): "0" // - // "zero", "one", "invSrcColor", "invDstColor", "invSrcAlpha", and "invDstAlpha" are provided as aliases for "0", "1", "1-srcColor", "1-dstColor", "1-srcAlpha", and "1-dstAlpha" - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + // "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, // depth (required): The depth state for this effect. diff --git a/bgfx/effects/hlsl/blit.json b/bgfx/effects/hlsl/blit.json index bbc9fd295d4..5f5ad148148 100644 --- a/bgfx/effects/hlsl/blit.json +++ b/bgfx/effects/hlsl/blit.json @@ -16,15 +16,15 @@ "equation": "add", // blend function parameters (optional): What factors to use in the blend function when calculating the final pixel. - // values: "0", "1", "srcColor", "1-srcColor", "dstColor", "1-dstColor", "srcAlpha", "1-srcAlpha", "dstAlpha", "1-dstAlpha" + // values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha" // defaults (srcColor, srcAlpha): "1" // defaults (dstColor, dstAlpha): "0" // - // "zero", "one", "invSrcColor", "invDstColor", "invSrcAlpha", and "invDstAlpha" are provided as aliases for "0", "1", "1-srcColor", "1-dstColor", "1-srcAlpha", and "1-dstAlpha" - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + // "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, // depth (required): The depth state for this effect. diff --git a/bgfx/effects/hlsl/color.json b/bgfx/effects/hlsl/color.json index 5a033140233..d5a8d6ca405 100644 --- a/bgfx/effects/hlsl/color.json +++ b/bgfx/effects/hlsl/color.json @@ -8,10 +8,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/hlsl/deconverge.json b/bgfx/effects/hlsl/deconverge.json index dafd2fb630e..322a916f47f 100644 --- a/bgfx/effects/hlsl/deconverge.json +++ b/bgfx/effects/hlsl/deconverge.json @@ -9,10 +9,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/hlsl/defocus.json b/bgfx/effects/hlsl/defocus.json index 7ba4b2cec49..b01112de088 100644 --- a/bgfx/effects/hlsl/defocus.json +++ b/bgfx/effects/hlsl/defocus.json @@ -8,10 +8,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/hlsl/distortion.json b/bgfx/effects/hlsl/distortion.json index e8bbac16095..5eb70fa93d1 100644 --- a/bgfx/effects/hlsl/distortion.json +++ b/bgfx/effects/hlsl/distortion.json @@ -9,10 +9,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/hlsl/ntsc_decode.json b/bgfx/effects/hlsl/ntsc_decode.json index 208f35b0ff3..1195669f450 100644 --- a/bgfx/effects/hlsl/ntsc_decode.json +++ b/bgfx/effects/hlsl/ntsc_decode.json @@ -26,6 +26,7 @@ "fragment": "fs_ntsc_decode", "uniforms": [ { "name": "s_tex", "type": "int", "values": [ 1.0 ] }, + { "name": "s_screen", "type": "int", "values": [ 1.0 ] }, { "name": "u_source_dims", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] }, { "name": "u_a_value", "type": "vec4", "values": [ 0.5, 0.5, 0.5, 0.5 ] }, { "name": "u_b_value", "type": "vec4", "values": [ 0.5, 0.5, 0.5, 0.5 ] }, diff --git a/bgfx/effects/hlsl/ntsc_encode.json b/bgfx/effects/hlsl/ntsc_encode.json index 8ff193398b2..1112a21c197 100644 --- a/bgfx/effects/hlsl/ntsc_encode.json +++ b/bgfx/effects/hlsl/ntsc_encode.json @@ -9,10 +9,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/hlsl/phosphor.json b/bgfx/effects/hlsl/phosphor.json index aaa3c12f727..84ad77ad5ed 100644 --- a/bgfx/effects/hlsl/phosphor.json +++ b/bgfx/effects/hlsl/phosphor.json @@ -9,10 +9,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/hlsl/post.json b/bgfx/effects/hlsl/post.json index c4a86da84e5..48530433f40 100644 --- a/bgfx/effects/hlsl/post.json +++ b/bgfx/effects/hlsl/post.json @@ -9,10 +9,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/hlsl/prescale.json b/bgfx/effects/hlsl/prescale.json index a636c4316e0..3026b424876 100644 --- a/bgfx/effects/hlsl/prescale.json +++ b/bgfx/effects/hlsl/prescale.json @@ -9,10 +9,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/unfiltered/blit.json b/bgfx/effects/unfiltered/blit.json index bbc9fd295d4..5f5ad148148 100644 --- a/bgfx/effects/unfiltered/blit.json +++ b/bgfx/effects/unfiltered/blit.json @@ -16,15 +16,15 @@ "equation": "add", // blend function parameters (optional): What factors to use in the blend function when calculating the final pixel. - // values: "0", "1", "srcColor", "1-srcColor", "dstColor", "1-dstColor", "srcAlpha", "1-srcAlpha", "dstAlpha", "1-dstAlpha" + // values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha" // defaults (srcColor, srcAlpha): "1" // defaults (dstColor, dstAlpha): "0" // - // "zero", "one", "invSrcColor", "invDstColor", "invSrcAlpha", and "invDstAlpha" are provided as aliases for "0", "1", "1-srcColor", "1-dstColor", "1-srcAlpha", and "1-dstAlpha" - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + // "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha" + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" }, // depth (required): The depth state for this effect. diff --git a/bgfx/shaders/dx11/fs_blit.bin b/bgfx/shaders/dx11/fs_blit.bin index cc7afc788ab49b8e05e07dcf3340eef02f77c256..0a2c7a979f6ee2fe4f6ad1cf1f468c6938784e29 100644 GIT binary patch delta 107 zcmbPno@vH;rU^0vv!tGcdXKIlgT3+l@Lo+!Fr}{|sYfU|{%mL#OqTX`t_t pWCoXOPTRXTZ{U98$m-UZ&gHv#q3?HJJPK!rF)@~JW}i2a696+mFH-;j diff --git a/bgfx/shaders/dx11/fs_color.bin b/bgfx/shaders/dx11/fs_color.bin index 5acea195472df634f7c0b4dfd2bb8fb97140b2df..86da7f9fde7e305a63eb0da617e2a2188a70b72c 100644 GIT binary patch delta 218 zcmezQkm=_`rU|VAIa5r#gz6_BTYG=2<9cTEf{jyCcqH;Ye}yqJFff$5>a94(C*U+K zIP18?g-w2&1$qB48%@k+U=V)D$l&mbk%3EjE%*4PTu-TA#8{_7$LL7FSKkPP7p3`}ek#Vviv;Jn&z&b9$0-%ylANd%> xMHvJb7?_y~CLf8O&SY?Ka%_wgklI`s)8K~3NsG&vn0jm{+b)&bym)CCHvkQCNelo0 delta 230 zcmezQkm=_`rU|VAt&X}6e=3!qbcz?VK9$ngw{dC;kHr7OKf@Rq7#MzZTdzI2DaxlM zBGt-u&0W>ag1mp2jhwTX7Lsh6NBP*puQuF45sUt z8Hzj^7?KthHe}w$xcRFPhaIPt?p7|}&WntUlMR{mH=735aS0{>m3;ch#~?1s zAi%)D%#<+sNc423f)kTtW2Au8=E|4`H#|;ST*f2>bSn__0PR*_U`SwKI3vAz=F$Xi E09D6JJpcdz diff --git a/bgfx/shaders/dx11/fs_deconverge.bin b/bgfx/shaders/dx11/fs_deconverge.bin index f8954f8ee4bf94b898ec7aa48fb929a43c107489..e85b211b5f790f98ef5a31ae1d81b55814afcbe0 100644 GIT binary patch delta 1864 zcmbVMT})h65S}^Qg}boC1+n~yblWVY?E+neG`O||DA@A13%e_RrU05_yTfPLPiNIxkFtu$f6~kqz+G%-thE@%Q^W4UlYfVR zvq2iiPNpXFD0asyufSfO`eJfOHJ+WkmD7!k$P-P_|T~O7VSqTy4$nX7`|AEHUGd{v{eo zEmPrDqgT7mYhBX{`kR0263T_QAAPECyf~c7sU3Z~U?6A=d6v_%KKoEX$6;>xlVA*Z zdqPy5%E_+sg?#a*#I8sr+E_(jw6tI^9Z!|=)6*Kj`{`V&5+9%|{H&sq@lA|>+!~`~ zo3273s-LbmX4~e`wZ-=%y+zN3W3H8|vEaOMJ{(Ymb21Ya8JCDyjrTW5?#|Z8AbV)V z)GSaM0uD2sA(~mBrhO zB{3DnXt+|q(oN!d-jsba?KttIKQpwXMh#Pud<3D|B^yv$psjO%e;`m zeTOh&S@Zt-o_%R1TaZruz`kWc`f-7M%bEp9Tnb?eQvA2sIYZ9rmpP zdl^__f@QhJO2~qM!*1hhEB}LU^JJe0H@Ki``l%~GzjS#FZ+8dMoH{|tgclp>`9!yC zBVcX@EhO^kVxj~yj9ZDv_!{fEzWx8)OY3{L__q39+Sk|rZ2t?vhcaKz6hp9-B`ohiAegWYo0PSzIIQr2|(WTqdRsp8!u_XXION-J1fS=(6K ZStG1rF7${op}s=nzYiJx*6h3!$5_dPdxGiaS7ed`=`bc*T6Dc9BuT5=D>b|m%q#;cyB0>t{idM;w zN(NDAAt1>KrBH=dOuIj-Cd@A%l@#-%YLyfMNfnVu(Y~OfRFuZn?`&u6R8sHq%{TWu zXTCY--o0~jQM)j!4L@D%(tk+I&nc>TWzW9nhYUresH?KAZ|hUxqdhNp{zG3 zgk022b>vMRb?Q-4}h`gPoUbv<(Hi@$m$W$%NT zx${fyxl>=7$t&-N4p}pStDd@d&uG;BmZEu0S)YdbxA5oO$(zO>QU=eaT2w3F!u1hu zNw4#?wiw)#F7mHh)_?Qb&1+(Mbu%BF=&*iIpHkk_otOQYgXa|Ij~IM08>=~~jx?98 zU@opj_sim9oViU^*3s4==kuxDAXH_?R#W#1>?n3hCr6iEb9Apum)&yoz#W~hNF5Trx4ZK(g^LQcgfa4rE zxjHv-u++KR@k3HIOS{JkiSF*k>&ka`6M(*sGAj;%V?0%gs6qa!)T>6gu_wG{S{57& zcOUsw@bOwL(A4B5pEvlJGDiYU{B5ZamBXN@9oO3h$?=gznB>zi7?SP2%V5AUn6V9J zkg=S>3_sf&_Fb$->nXzdozdY--@KXq!(cbMBuQq6hHZ6>1DIg7GfebHd MZ>zjDRq<&509nv7G5`Po diff --git a/bgfx/shaders/dx11/fs_defocus.bin b/bgfx/shaders/dx11/fs_defocus.bin index f342c80f26b6b4e4b618c6bf3d4a31cd3c9da541..894cc151994be174cd1b6bc7bdfde33e5e925f5d 100644 GIT binary patch delta 2669 zcmc&$T})I*6h3qJhuvjie*~ep=#p-0DhRjKSQHQG>qn1uI9bocc(YD^O|y`n*p|q0A^G&%1M-~ zD0hcrUpO)mEys?PaX)Kd7JisrDqR3Km=LT?b>lOksgEs*#w2{9F`;R!5WuO<<1b4E z{lrx%yu6n10&NNX6o6eY%s4bAgUw1z=-!cB2%tv%jHXTTzp}L)Rx;n%9Gvx;9?bCIUsca0F7T zlr$pLdLnWrh{y>M5w_Kx(Bxymuldk6hSixE<5T7$`v_TMYgRnTKQLv+nk=#FO5FN8 zzB|n3%=h;D@BDpfn-oe`dUw)6nK?bi*p`BaFv0T8Z zX^o|u+q(|-^z4h~NBpJ!#rIr)RL+kSJ7Qg}l|7MIFwz%km0K50cxPR&{oee&d176q z%-7v#wo81Jj~uzec#ccv?o(#Iq26b?IaW71qSV&sN}h8rw8b_-yNWb_yD`ir_)m=) z4^5b8`>lpu9tIY$;Rn@*eTFukPzKsO7OKMMiy^X1Tfy>U)p9aai#C3pjala{JG>M9 z><{Z1B?IGVm>AE8_j~eTn}?Rx23lo!j%6J`)?~|aqR$hU2ZNWuiCmAuGoB&TyUaYV z>C;Cj5nN{+GQ*n)GYF_=6728@)9d_3lafLfbYiF${GC0ue6HE1qW@@U39sE-#=Xt5 z^gz&Gh|3PRv|8VW+- zL?e=+16c%DuETXn7Cu0hW39`x6g0*x+mgAjZFz~`#bbe%+E`+N8%r#3DsdT?BC_-+$BNuoHFYf4;&bs)Sj^$3B>Ngr#=2YNDrvfkGyQ53LD_QmA10Vk&+QI_- z&*+*0&qpmCUBgo~@7F~OzWt*TkJts=Z4?+ahClibK#j^ftyJvmW&N+9quUGyG_4*Z zx3Evg32Hc(&;y!=%h>-F$2AQ%wZ5j|uGZHyq#@-T+G`qv$cGfzh`I>Yz?1w==h((< zM0|(@!3z~S9l-v>*k7WR&th8`mn}AB=D8g#7e+D7xC1iNQ}AfSfTdK(NT*}cBrT4) zXpCR^ydEbODl^YtD}KP6Mw$I2j#t%bnJAp zE4Bd)putEfKxh?rPp(Z5WA_P^CY0SM>rt${YVt6v<6lpn%BDDzP-t5}i&Br$fD%G! Q#C&3Gj}pJYtdbx81rVaKrB^`Q_Yu z{{HUCx$nba>4(G8i*D!GrRKn+>s~o84PCvm>B^M##IdTPzF7tUW0wGAk}kq1;VU6u zik~&jN&sFuqySasXEF}5Ip+XaNd?ft|CHn>mQioxq#z%hVbwUom*cOj`G3T!=#kn) ztVf?)6chFTrLJ&+^#IBu@#Sci*HzvrgJ22xnOxo}HtxUNLFihFtsuHo4`4Wyy?cW- zqa%OQqMGePVMcNQVa={m}z;j-JF*0|ULW+JSh_YIRMmYZcCI-H%Cw#dK@o)`F;( z*NDr`HEM^pU1Z9z{D!IR`7ap5eFi5!)26Eh;=&VD54a;JZ=vdCGiFRs2J&{6k)59(>Tx=6{($((mOEn zn(*nUV6+g;FdCtG&oFwZr=P!O#vNBcsp zUa(U-(QOWSaD(<@HpBp1ndkM>XUwkazUk5N?#cPuGJr+WAE9z$G5W-hOsqP>vzjx$ zpWXKyseWXT%t|HH0DUD{P4&A0zr8rYsljR#`KT*4e{qsL! z(#31UHC2Fay5-X1pn#fvx(>24XvFd9>f-C-Wu_aWW+U+1X*;pdexDAp_4SPaNpd*u zA*&7GaoQIU90VVAR?Pls0%e2%;eJApu$53l$RpI@$qxpx`21+4kxmZ~wh^8nv=cfA Ve!B8*7Sft#eluvknLN%__ybJdVVwW~ diff --git a/bgfx/shaders/dx11/fs_distortion.bin b/bgfx/shaders/dx11/fs_distortion.bin index 0ee1150c722e697f1aec07d6e2f02821c8a2e5a1..13e60b64c3464e167b58334093ec055eeede46f2 100644 GIT binary patch delta 7293 zcmds6eQ;IBbwBrB>FM3~-bznGAJ5XmdVmPx!{YH_8(Tt8Lb5(00is}r*iJyU1gI4f z7J|y=<6RUCGI4Ch>o`ot<8daALy~4pM`@aLh>bH$%fz(#s2l7t)3_Z>@IV`|+thZP zaers;xst$j|LsgybN9EuvuDqq-95W|-_=iFcYgo6Gk#|A@ypGdRy95I@(a!%?|ODd zYx#p)ThnjfYZ1}$%S1WAG@j@2ypHF&ul(1G?x`4214vrGXm#A0ixN^~DaB2pB_1am zCA$F`(aZ7}vVti3Q`XbJvrCp45i+kHS*Cy}uLyPAbxUANFhLZa&2{?cc9~jABwRT zc|25>ybzHgPZ^8x@VG9Nwnba{~TV`WOb_IuDxk%hUK@aU-i*sYDBC$AB`^9c1otktFheid4bYoRMploto1FcPxvZSz$nsu#A>W_I=?X7I zSmAb~P#-8@D#ILt?1a_en~!)Yzkoa+-D}>#)6`4((&yJ11RM|#w%>KN(Bke_iN73uoLIm1 zyDMI~3Hm`D?=McQAJ_a+1xg2VfK8bBsh@6{K%cH-sF7OF)7b((fL&*|p6s#=!@pP`<;?~?f z>1)W}Rj8qm755GTS&gGF&-$N;XEI}l-V6Sr2;MB_!Q!7(j`v<#+msh82(u-14*^-*{{MyL=NN@kH zUj1*I%Jr+i8lAs9)!Dag`*71>|KQM6OQ>?oJ50U;`H~v_;6J`GvF0_)viCSrGPrDf@Z`HS^|KTQ=D4D9{m(KbKYaPCqD4WB^6 z{_(;qh2Tj2cylnQf7Aat2TX4sD6#tWx*cUV^~b`fDy6PMi*hN3(`o~_Mg98Vj#lW# zMfYEfZsJpP3kN!2@ACs?$afE{>@SBs8}|5BM(o9o**|h2Krs4sIXBetIT_T2Z>VD* zgSu%x!sc05=MOe#$I;rN>Tn8*JQxHNOyp1?ubL)jmHn| zUmA+7+Xq_~J;U*Qouh%AXCW8>&t3w10R!XPc~Z^;3*<>%u)8&T9JLl5Bc7*+;r0m5 z(l)rwy&Ja^p$J@V59K#E75D!=rK4SR(00s zl~@(6!jvoBv9F^%jw!GxNvRvWh&%ekzS3+^T|KRu10axd0C30mOUDTWh7)vrODM+~ zJ*gI90@CUhx=P_>yTTj7P2CXSk*03_k@a|4XR{=gzz<7#kFZ0KZ9*6*r;7bRo(RPd7+g*(3wctl356i9 zMfqTkO2OIG7K|-dC9Ol_p(PFlW}D6Ms=1}RRe7U`nKI>l(W!z$F*+Q4?q0GH- zS$c8nR44bN&+aS_nH4P1mv?sLRU?`a`g-MqcbKh{;DDyiPi_T~BmO4ijkivZk>3aD zl$_(xm!HM^WOS%$RsyFK2izw%n8=g*GPM4~u>0(W8*Byg=IgZDK1HijuiaI9*Kx$K zMa|IRn|pO(5}_5tlJP}vmTV~|ddrawnCS|&z&dgqF;u3~*o|SeB$ll9qvhwj)~*Yi z8A=&T!A`kNg5Wt=@yzrDh^*tDOX_&W{x*?=&&^>fWYy zY$*7b#7y~N#XgRqyaF#od4a_S__%Y74~}`N-WodwizzIASY={WSP0+8#e3Ig!{$Vt zvi7%P?Gn!DaA0jQqTx|eJtjcX$lKHsN_bo4q>zV{(mh_F4+BK_@$GVA!7Hr8Q*@18o$_XW(78_W`pkC=Dn=zSRU3@qc( z6Aq~qhFhRMgFLL}VL=zhs?(-DpD48tx4I)ySxx<=hij`(m>w^D;%pA&#c0csr2qLq zY4-bfJiDvtjUWE@&Gf>5s5t!XuMxeAY92Nx3xE7gg3}p1{gCrrf4fbdAng+_NXLZ> z(rMv>bV0bmEUvyVwk8`Cq@-{`Y7j0+J;DWv?-Fh=NGF5~(plkx=8j_hOOR(#F!yXN z1bp8Dsli82knR&MNQZ7;N$Is;x0`+{^yI55ifm}o;_HLCAn_H#T#$YsT#()p{+5&VJNQThf|Sbf4G2=5a6#f*i8~OaVelq! zLG$X>3eK-!Ksw>0CrIaopXZDdB?jns7lrqfLi`l=gYnlLB>$f*|b_E=Z3F z7bL!6*g-)$EnJYU2p1&2M_6AF@6mXDw6o;-1)?q^AWx9C3m2qA!Uc)1kTw_;q#p4I=U;!C3)``0T-kn2^XZ3;A>GYh_B9TA6cijJd)5S4kvE88$akWxN#Ua800eFLD&B+ zqheaB)sgi&btJ5};E5mJq*I66@T9eOxLiMZxO8SCJ})$&Wq`}@k#R2gGCWK5{v%qC zA8F9>u~L2WSTb9K(eN)RPE{!L4-igs@bGT}PFHbZ$k#>s0A=}VLl;n%?>zJyl=%gU z(-oBY^@md#Z1N?~i7%eCU&Khv$DxTIk3C}P@%&9zna&(7x0>}mM=Px6i9JV0Y#YCs zu0EDnUxv>m_)=qc!PL9g@(COU9pMYeDN-elbhu;luI?Q>`+J9oWq!vyHV^lX4DTN5 zrP-8Q0weh9^M^0bv7);2@v@l;w#vw+7%)PKk_OcCwCBTOf&Rl|m2>%9CTkQL4XX&F zFjHnUOr1qDbmq$y>wQg!N+2yFs|dG?(c}qcyHhP3dc4@7uU1*K`Wr;w?6+uUmqkzD zqWj>-7VW*6=&QHcbovQf55D>M#CU#(HBmo)vGM=pgN3#s(uo7s+b@ta48;YPcFgUcMyT9+@-k$Y++jb20^*{>~ZG0$3{ZRKn54|_l zlH0)Yn!&zZf!S-bMZXkvx^SdeN6y9a6Wn-k_dw68!4Y~-kDvRYeJX}wmh1apFaG~J z%!%(94$s6rZ(Xwfmrs)anzpn2R-7W*0`FNC-JP0cln{67C@TQyn%=;EDx^J(u)a~tfF#$W;hO2mD+r>9? F{~J2HDC7VD delta 7705 zcmd^EeQ;FAk?;53?$f^IJy{YfB%_U4kgx^FV)+QjNT3A?5S9!a5JF-*MrR2lmxS=L zwz+_BSAY;sFt#(!r=3KpkQ{cAGCtK+QmItT`EWwjC0D-W&XAboIF~H@%3KVbD<5?v z+^^^Ln1yoX-}@t@+Wk%U^z?N1^y`^@`t4cgm9x%Mr|0J0ZQrt@t-q}Q?s*+=o>=qa zzF&W5;%b*gM7ei~BEU30NAWp}Pyf@ud(k`W6J#3n@Lw=2{uur6!oo3tDQfU76SOTf-6k9e;(#&~+1KWCQICzOJ>G(S7+QqLO{G z#zZ`nH`qxOt-u)1T_Q5`iM$!2cdB5VW%3Z>4ll?;Jdyimq8ST~FSN3ZS=h)Jg+>Mu z@>W0(x7mV5kC_8Kan_@jI4!rcQnLldi*Lg#ZYHXwB4ex0l3JgAGs~$ZZj#*~UiUI| z^5Ac83a1~mLwcJVB7$FHmNKdtc@E6*dA@`GL}?fYV}_jplZZD8AI_k{GNTLenoma1 z*w2HnKp6+~+fc>}FtYM_oFS^!t?6TvjX6exG0SLzh7uD_6Fw7G%%8-oa5M8a52ct4 zbLfEd$2wypmfGM|Pj7yq=^t-Kip-E{ynEb`QgL3!Qg3*-E!916c_DUz-MNvcHz0Ls z^;BrPZcN=2uZrrK>a+2-4RH5^q_#6q_CYIfEL+`37?u{SF+;3jM|oYdez6WWqF!?o zddrDc7Hv95j^n%PZ$p=8Yly{)jk`v1@t9fE$naBU9An*Vkin(^gS>UjoQSKm-1tgS z3#TuX(#8gu(iTOZ4UM0vZH7Lb&OC0?k&$T=IOxd7O{5IdhJqU#N529_6;C$urp9SQ zL*Qz_%PpXfUn_>iUYNd%Nw8AqB2VOWU^HHS*j8y7wJw-*507#d^Nbre zvR$6LVy!4_aU*YMFbT0Q{+QL-J@p&AIuAy;!w_ARBA2s(Td~i)5k;}kcX-CIePEA-#yxSjLR}*tXKLc=gqP`om_9iTm6W za~E!Sy7T$P%bq=R;Gv^qN2;$l_kC`{q3_JF=^P%p*Oxi;Ul(n9@GXZP`;A4-k6X0& zTiCA)MAP~ldi|p|{d~PmUzfWBO)GbJL^*yjXr*&MDgd&!_Lw`4^RPQe$jZif<^lz3m_EPDi zmiMRk{`8&>!q}eeSFPyk=o|67RQ|z@(d_r9wmv>~=D|63`Oyl!mDGgG5Vs~ZdEgUP zlNuPPy1B{cTgDVxUv5#9ViciGpe@LJb)X6||1hxHY4Xd|;6P*fi_2eU+ zC8x2|7A4hxK5_>N&iZnW7DxAch^s}%tkbj?G}p#(jCU#=tG0QpILbV);PAXAKIX35 z6~o6d`~hFDqvhNAjz8st0lkO}B-Nvjw%zdqOta_;KQ`A%h5R(K?0WtME&mfMqFQ&i zO<$;Wov>3kNEv?JbyCHN#+DeV2KCL|%_}=}z}lgS&*rF%Aa#fJVX2gPdezJa*4t?$4tm`?ZHKnvBo7Uo~TU)*s8aXe=k;FK=!@OLG zL@1mN0%So~un_8pBK3Z9=pvTzf(6!45=&Tt&%?~PCV;EL?42!t^%TNp(M1a}zAku% zpDf}R?_s)#&w(&|xKMp}=j!}+t#y>29y$oK-$xM6!)!hT^y74=8)LJPk$yueSmQ>W zO~IW=&!lFx7mfzy7)lPM;m4$43jCO~-t&>jTE2tjz2z+LeG~~lHJFLypB1dZH}c&} zxGaf|g`fsyT2o97KeT+>b9%Rv+AywKrZ5O!z4g#?FEoBHCDhz(vv*v(QXpUL$~Nb5 zsvun3tr#3L`|@kqmlHU}af=Nd>_J`V*ncco0Y~>A57KUl-*itf4^|Cb0W;#Hg1M*< zaC9jo>VkSaf?I=G7%vob43asxo(MA5{wr=dHgR%rzu)ljBudcjtnw*uO3(=RgJ3zn zZ^FzHXqoFLlPCgdUgkWH@j_l%(5RR4YEf;lm{)@-iJ%4F6)0q`Q?EX`Cy6b(Q|I5F zJsZ6(cxdqGQ%s%N)8@US%VrW0somQ;y&ccBMduujL2(R2z8~?`{=KbU3x+Kkw`1y` z_qKT*lb9+%U)5u+A8Rq%p_`vi{7hjKX51DmvxZOmY4TD|VH5_m`gO_hnO*nkbssy1J0r)8%N}br z8qe`1)@YoKyx2K>6xzz+)bQ`IvqA6?I8yIaL*pzzkzB&wK)ygN*={xZNTa$p8!X)} z+WA3c?YD}(&p;A4^U&U<9Jhn#pgk6}SR-kKjLUhIdN13V-=w3Fq!ct1@0;P*74h|n zE%NoUVpdih#r?xGE8Y%&k|Rw{;RI4G5!{W;YX}RIOScZq0Ak7m1{<{oxL~^gjIH=;48;GV65L%G9n(??G?G{>)o&n7c2t$R}pCW7!pC;@8mt~e0r0)qWNN0r>q${91 zAfJ~GRpVh~h9Gf`VugaVRcJxV2`xyYLJQJsLJQIbp#`Z7=Qi}`3(}#6kWmmMz9O&z zg483lARQK3koY3N@`7|4^h(fzG%mCt{a({~Duf-P6zT>~5Tqud1!he5YuT#$}| z<}DSZQ$h>UdC++l;0}-?s0>UCQc7q+;**LO5G1ZJObZfM7N!O1IiUrKs}PS1(#05_ ze`cV=sEY^FTtt{ohgcA#E};d9ix)sZoiMGH|x4@q-oWM+Y0Di>ZQUsWrnj(FKs1ueygPM{z>YYE?cm zM?EvVUR@ZD1u3#<8a|8hS%i^i)%eI1Wgkl9|A2zdza6-7apzkz(yMR95K)C$}`g~vDR*Mgx(%MajLH5 zTNGsMQmU$Cxwu`HQ%62iW97zP_{?rQ$biSkW+~LW>g^|{&E(~)a9QEySOdFaB>2rf zk44p-BQ;(q>EM#R?nq7EP{?G!4FEhxBZ6DuPOf zD!?NexNleYz|Q{OEHQ7g@N&Joa}Q^GX$D0r5k12HTh!A}OkZ7zaklrG=b>j+;IZ8= zwmJ0bbl7k&Uce1F^i}j5e?~OcP4uthHcjlesP9|0ey=o|copxJo|;(x|M6Z)9r*Xk zU@r$iT1356`csvCy$QeRttrgp)L7k{+qiQux4fsPcSjFmd5es3dh8g?4s`eTeY&@2 zW8VV(zza-P!-V~gag)w{3PREs~G`ySZQ zo6DJrmoLHb!I(h|q&&W#;8|Bm%%UckPY zwyneJ(RW$A$9$WC% X-Bz$@4dH+ydc1>ZbnMxQH=_Rsy<1Kp diff --git a/bgfx/shaders/dx11/fs_gui.bin b/bgfx/shaders/dx11/fs_gui.bin index 54a4ed300e39e1370d7769737e865ea0a696022e..207238153b0bbd69e5946dfb557aac7bdc17776b 100644 GIT binary patch delta 116 zcmbPno@vH;rU^0vzPsHPehM*pJd^RaO~>5l6E^DPa7z?;{t9DcU|^Ut$@D?cdJ%_N z4Zd^lUYroHc?0(wN7iXMzbDVxywI1`XYvC^uFV@}zF@?oV|Ex5qxEL?c@sGS&-gOg delta 123 zcmbPno@vH;rU^0vDp%HV_{R3y7YHbKdOuicwNWRBTY}-p&oD*?1_rLPN{g#yW&L}e zx3XECllR-af%}akt791tx9{eKzN|i6)?7eU3=S}1U E0E_u6IRF3v diff --git a/bgfx/shaders/dx11/fs_ntsc_decode.bin b/bgfx/shaders/dx11/fs_ntsc_decode.bin index 7f6d8167939eb483fc85aac7c78de54822d992ca..a63dd82f051a43a7b43882ff25bd41f7f5f91c4f 100644 GIT binary patch delta 4139 zcmchae{56N701tgcEHX|>VyQxG%F5GfVLSp)2e2St*MjMq0luGp+ut^L3K*H1W5CP zBoJbwx+tS93LK=S8m##v)A*z6n7pph6m{7&v}$d)Ov|Peq2aEfWgQxUrBc*ouQLt8-W9(;dyt`+~-h zq4s~&Hil{*>iW3y@weS?Ec?ahV}81rV~7wTa)Lp$QM75a7XFI)iF?pPR1LM7ubNfm z-yw2PlNWsvH5Q|!-HSV-?b~l_!-dusw`ACvi56>>$30_fqJ4=Yh3}fgPVX|y#1gx` zH*jC*be8Vl{P~lT5_;>kI;1O`+qcC`caU7&{CRn%yp(UocL8s$TI!xY~6xu zeXGykFJF^99(fNds6O9N4!JPJ{TyrcA!oQXjB7F@v+#~gZ<}PUYul3UEs&Apw0nE0 z?TO8)XCY`m%fhqlD0Jo+#J9(wzAGc&WA|3J_X(5auDxN?$m90axi4&bdF#F!Gt5J{ zj`0+nB$w?yHmNp0;x~VJXbQ>FzB^J6AZ+SHwT+4du?+Ij@^p;v;>9oYPm3w&sa{3hTkX zP_B20d_AuNyGH)O75qw{H*L8LKLYEwebxR7%^J#>UU?lA960DpM~5?_GWiu;e=zJH zvumF+lNnK|9piJTO+{rFmA_E0WJXkKYq|Q6FCD#-5tZ6nZa))7LLT%EnP2MqNyeibD zqS-@Ea^P^-J?NI_Hqg+?0j!0?1!-fLgK*wF9CDA^DaB@zhu{bPRhB$^>F??5b|HNbCQ((MlW(O>Pttn-{?hdiq=$mzaYcxHQtQ5lbMa# zzRRTc+SJ}M%Tv)Be=$x+oU5q0{ida=nu9T)Y2mt91@`0a*pp_2--|uu3VI63Q+1?) z55?+t2kkB9B`l5G#c~Xf+ke?5bS}e}PE-ERGJM%5QvO(mFRy)^$B&doBcH8V+Yu>0 zc30!kfyzs}_7dGdUJz3yANjXHj(GX}8m$bz91b|IV@eu<{wK7OCR8i!RdF5hBz%y( zXg8p3MjA>N#5CCQugLMy2jIu{y@$_+)-P*PmA zl15c4X-u_}##Jk6TD6j9pgnk?lIEe8LC-s)_6-HFrt)AYsZO<$T2w3Tvq!#>oIxNB zFEXaI*IYj0vi3llUSv#33(y6KF9a8FNRE)@FqE`awUQ#LBRm}65tY5!k8CA1s8&*& zY9$S-R+8+%D^ahcq-rJ2t5#AW_EpJOMoBj5yJ0A)O|_EZs+BaNT1m1Mm!MurS5+&i z5Id^Gl_b0K7oiu4m)4|)l6qAu>6B_E{YJHtWK+He9V*F%KWx!T3aD1nCe=2%?PyI@ zcGK0UP+~v`lWA{<)|tDf(F`IUQ;J>uq4aZw&z?0(kmjAT#Z(#xe)|F@q+?|S&m zpFBl480-%QL)B;lXwJm$oJgF=yBANmSYQ=Aj=mN@xA0l%-f$g{ zPnz&*`gZF+|Fre?(ORCXvUM?G$p6jSDOFzLpIU# zx1ePP`Rq(Ne!KjBX4O)IRYEk#b2DqrV4~#mPV?23by$TkTf;V!Z delta 4327 zcmZ`+e{2-T8U1GOT+YV0M>ujexHS%La2hu_jarCm2{%W*KI{lfkU$#$VKtN-^${HN z!_c_7L%7r_xN+aN z{>E(A>YirbzW2?(n{Q@!X7;Cl3H)s+kYBf{KBx{&e7NXX{`Bh2SJrR6FBXj7pBsDS zo`+saUR$}~t;SP|h&Ep#3IeN9dQpZ@8g)#)o}Vlvss&rFZ>X~Tt;ML;7ADf`tcHBZ zL@i*Bw#o{voO05a|EQe9;YAis*KrjI28(Cj`RqadkBd7xetgHa@2o%b_g7yz6FF7k zyi`0L`1-L{q9q?Hs=chJ;42pOT(#)i6^aJQqVm&@_Y5jyZt}w&vTsjep~3gT~x2~Kfn6JLhvFRs?_ zCd%{d_QdHrXFPGArCRjr)`oZsDk~~Pl0>&s(_%$=$S_Do=T0$t$fJimdLirjomP9! z4P7#Km)9-g(Yeq0N=}m8DJUV*@_3pi~l7#EFnKGUz zyCro0-soKPgeN+i-OS!tJm=n9IqzPh_j>N)mKfddmeWV}#Z*Z5?~9g%@;JMxp#R>G zp4k^gooGixyvwcA89e9l=QbNX>(TjtjefzSa~56twGKO;aov7T1D+_m8GX>BvzyU* z`ZCWOyJhsZ_S^A3*R4k7JW+Nt`lv@|H=|$j=~e+RcA*X>v8nkUL`MxXTP>}K>S zkIrsG`r!lihDp~g96$%pwVd6I9`xw!X7rFpXSc~bJ$|4r9{vIkRXE^(5RLAC5RLAC z5X1V3AKLLA*R5Ikhr#InVKBOX7<%-=C+v9T0&d$0%6U41Q#HDO7>w>8hD!ZQxSbR? z|1cQcKMY3q55q})XQv%64RPC&^D;HMKU1UoGcDC;;FfjWa`Q4Zx<6B+`!mhzh9BAS zB-UF+o5??>M)!}Y(fwnZ)WdM=cHN5SWomSPrbhQ?+O1okwBx<5+w{CljqcCX=>AN5 z^$ob4bKP?DGBvtCQ=|JcJ*SVPV%B7V9!T9s&yEhQ0mRXK{)_hxZ-O0WL_*;Mc(g zsS|t>T#$Oe{|zokS@0X+f;0~PA8IS#K1?f%U zf;0#oKwOZfgbNan(iagIq)PC7aA1lr+>Hne^|JwYE5SS=yjyM%q#ogdlo2jSeZmFl z0{BAs3DO97A^1ojNS(q3iJ!bM;)2vCT+m(r z7bBjlMF1DXi~TJS1gToMAk_;ObQkg^sNbcXt}UsxSTTyh1gS~5ASHzh60aB~s4qxa z;es?GT#%-O3%YB^GThH=1u#WTvlnSWN(dLEF5!a2%ffOP2-1LXL7EaSNIdbEqP`%l z7e0#^#AXo$X}@qmIw4$;c<%oa3*Mxoq>I|PXe zX1O4h3KyhW@Rg`9NX^0pDGgqMI3vF!J;DVk1C9^4LyWic81#w22!V!#GcunP&bSIZ zj5(MM7@1cIXJlS4oRK-t=v<$%5dkP_f`feT`4UP}>L1FWMeXG?ck0N+O)N7m_V@qj*j^z7m`m`r?9 zMA4-b<{7F@Kk)R=t>3ikkDp!!a0;F&UwiYT_Rob&pTs=K2j)bo z%SsmFdYSX;(5TAWk5H}F7dPpTFBUsR!}UrZ7>VkgBeipgfAQ1BtH0UmUyq>0Eu{T3VlB+pZ6Wec2>WW(Fixp6;_fJA}kuP{ai28LHtKb&%?oZ&c= zr`9WM=IM8v9}E0oHge8lV&Hwu%)lAU$iSt_#31mWfx%IQk)hv}kwI}gBg3x@W`>PN z85kOlFfr8L0-7VRnUQ@LbG$FwRCI*I2ANd%> zMHvJb7?_z7Cf8+8mkaO)iE=SWi1GqOfu=AaR0Mc$HqM#hg~y%S!k8E}CtK~*pDeqR KXLIS!Fm3=gMNRJj delta 241 zcmX@z$$Yw#dBS=D&N+x#-`s!>EzHvW~fCR&lpJ9v)3=9`DH;OKox$fEF zA`sQjpd7UMvA_>zqf_Y&3@-c{u zG6*m*Ff#>AuFIY-Col&j%Ecfd$_o?)n!A*G*=naglYHFf I?41eR09ffo5C8xG diff --git a/bgfx/shaders/dx11/fs_phosphor.bin b/bgfx/shaders/dx11/fs_phosphor.bin index eb9b15d3274a26579b1fd08f26b74ae2bf2be85b..96ed99bf58f70de673c9ab5ae493a2f212ab677e 100644 GIT binary patch delta 225 zcmZpB$kg_bX@Z}C!htV3*G`ySZQ$DF*7t5!)5bUr9*I29Utx?43=BKuB(^oAaXah` zjOjDckbSp#9?u_UcIPZ62HwZalNSm|@*mA%WH4RF%+Srq$dI&{X>!8?kL|&-02&5+f=v)N`h6DzN)QZh&OB1*Oy(~z| delta 213 zcmZpB$kg_bX@Z{sTZiQAh`7QVot|0;f6l)pu`y1AN8;b%pJ9v)3=GfbES*>vui@Hv zyEB(};?Xag=kfeuW}leNz##mPaq>a|N&fp!7#K{~F*B^}U}Q*I%rv=Sfym|yOiLLz zHwkgrv1TUQa`|rV57@{hSir=<@aZETgSaSz00RRvQ^DlG=;=%Xe<#0+mI6|n*<$)! txH3zCmNIBsE7WeDx8MaM9(ODXV`8+Q{B?;u)BNhmr3$g7>3_-XQrLbKsUP3QfVm_yIBe)NLT`GNf&5o6G$Z}h9w0;3tcFpNSRTQ zMKKc3A5BOAgZQJB#j6Qw6eLwi009XCf))}qK!`vk!3C-Bx$|Ap5aUVCJm>wk^WAgr z+bp3wX(5 z&fT2nIXhy2>e-dEnz{CH`Z?=4%`iE}W=0(6v(75=W9-Hs7Y!^LXlFfGoF0$eYTZz! zV-fG@ig1<_7Rz6EZQ?khAI7+`@sXS{?59jm4W!O6VNU@uZseXoyt93UWTf~a8H@=Y z5t|zmwIR!-V-RP<%lf`|c-pT_H=DB=XLEBUPAOgDEATmqda-Ykvh)sLfwJslzGJF1 zQR=1(1H!TF%k@p9%?vdSIQzo&DQ?UJUP-n-7oDj;@(g)i0be%CBe%gdngqA7Yhwe>=4niDeXh;f zK<|i2O?J=A+(_4(uS0=U{bkIwK)ck~=+XW_wl6A%CH3gQp+wiwz{kgojh?rI>Anif z_%nkg{)tR9CGB~^_`uMW)qgb@m1nJeKkxTpwYy)xQu6t%k>A;`B;WL8{`{Ll{cH5k z22y_U;QDO~A7)!9tpm!lE&XO%UU2z%h3CHoCj12ZtF*dldd$4f><9DCM8%gaT-8|K z(%jNsv@mZ{pfh0a3Vy0$9^86x%j|g2Zdu%~{J#11di$2sO7BW8)_WSWd~M;b*h>3Y zV}Yf1+V_@rDLZO;l~P%{u4$Oc(M|l#)tj15Sa&_Tp}C%p51Q*}y4PGu_tX_LX?bHs z9e*#bcvqd$t5?of8}yl#o75crOiS0O6x1j1-1*n>;xPMA$VCQeVOGL>s7=_+^~XUw zskK5?XL0Sudl`S6jVnw?&Lj4CK1vFgF)-e|mt1>}?r%@l2iwN8&s%M&s?d&ZZ&IpR zuUfUHbYPO%glFtDHE2p?BWAVv9`}VB; z=7R26T@eae2p?t=iE9yth4Au(ej&Ds7Gl3>p*gXTlVFaH ziMS~NLg$D~L332bKRLp%5OYNf(IHxh&7y_q7A?eaD+DBRgX46N&hZYRHpfh2sK;Sg zh#Kl7`h{3VolGr6Gj$5J5Zgry(L68U(59|b`7 zc8*Y9t=3OUXr=7C6N}Vj4)dk@Y}37lXGVz2G=TpFxQpjsU&;bxgTTx1p~69EC2ui delta 2800 zcmb7`eN2^A9LK-sUM}1hg?kAE0p$USP)tN^m8kiGr~`qe!?#M!oQTMa;7cLhTQgtE zDR!K*)r!^TTH>@lwb`a4m8M%ZdqbUV;Yyo2H_^G4TV>yK@9#17kG9Ts_&nd=+xb1` zT+ie8$KBVCyS-&|X2w-b-#hD5?a@wnE)3oG=KdcK-r4*@;Odw@1z>j{ z5J!&YJi^(}x!niMnlqzv6Q7OG%UR25hRJb9pMWH?Rh|uu-T0FdfLDw`hC7E3E>1Ti zjKc((VG@je0POj$Ybtyk!Kg2OlSM0#$mu+rIF1A-W?!PjrUaukirHr}^G%$ZY(fEl z#ER1Vc@pqBx$zR`)c8FRt+mhu1zr@V6BPfNW%Ai1P$P|*=cm}r7-_gnxW^M~fQ{et z{pM$Jo#`p`L@VlYPl-}`i>FX2+xC2|ro1l68M3fnIEEcNzVWn~Vcx8F!_|pKn_XlR z-eldKke%bayOZs_yC)Xq%hh)ihAqgI+Rj?0-qFl6&zQ9yu3&sWCC!@b#LnhnI5GH^ zyDPQEv4>pU=FQeWC!~k{T#v(hU+0l2G?;E<=Mpii`5nJg-FYLYZ~g|OTkNdptmd!? z@I36}Zj4B93g0UzZ4PF_13taTSLlgG>9>4~{J+SS#wY52U#_Rd{JwOWzq{CR)bMc4 zh^NO4^NU);Bs0v>nm62&V6qYdW4+G1+EW8TfBN4i?$j9nft#g&9$wZxb^nbg+N@t2 z8tl5%>+bBV9SYTND0K7!gD$&qwcmvUxi0inxUe%HdhOuh$w#-juJBfPA0DCP}l9g75i1{7)%N&?tu^M7Pl_nu&l9h%}d41&(;f9rlA*F?rYee=t5=aL(C3s!C?68%DqGv`h%#9YxrETK-OUx@9Zg*YTy2<}HXnqW4DiMTES!swQmf@W)s z-)w@>Ld+K}M5|~awu%;_OSBNDU18u67CcP{3A33g)Iy}YV_Jv`>QwrLsHGl6Ekr$a z8nqDbi58-VI)i>8&WFWtK1Tc@T8IJs0%kHnh>_GosD-Ge9!f35CecE4QfJdI#3|82 zgfEFf2rqAJiwQy$h!$cdbq@VP)Qc8kD>d(qh!9<(h3KIkM!ztOOJWcrELVYCpVMGK=B$z!G=+DSB# z1=K=xP>-M%;*jVl!%XO*p^yPWTof(DZP7wlUSK5Sg_uD7IJFQG~K$Hh_qDW zb-Nh!2^mR%XnpZLGN78(3n3@`Dw`@uax6Q}tO zM28;MbJwo?D%tP1+Kpjp>sZUKJ9EYTA78s4X1bF42gdSyc+3hD^s(OTzgm7Z;e&;TU6MtfK|jjD1n*Otq|YwzVuK zV}6O_C#JWW8Q2&R-E;{7u0Mb#NMb@v{K4=Ok`M)A2#Ha`j0;h-`ng>nK9co6@VRv$=_^YZ_nRkWPQCi7E0DIB1Uh{GO~s*k?Sc zKH>617L!I;d&EiYdnSgh4u#zpqt-vM*DRKjft`QtlO}&VJF6x_cf2RQ-tlfkq+7*D zuKTL(r;tL&@2LDkPvr+EUKW?sAdanc7Te+j;r{5*LGF$hjAZwEe}fsTn+S*A z2!xWM$Y#gGx}>39RuLXZ?8C`rb%R6ESC&%8AT(dliY5SJ56$aG2ngRRF;r&*zB~xBsV)PG07itx_fVVxu4&Dz8n*EjPVw@ z#dTJms@}kIPv=i-l(i}N)Bh_#a6}4eG`sZnG!0&kAO8DHh0|=zADb;#QY7kUTUc-q zChb4~mU3yEi4KGIZ6fMKEj42=|9mY_hvIn>bUz@2v;*q^AFvZx1IXI10;>7d&tK&& dUyQA?fs?0NfL34^up4MY%8s%QF*>Iz{{o3#$sqs$ delta 3272 zcmeHJ>u*#=6hCu!x7}_ZZVQD16}C{Zl!r^Hiaey)wG>L9TON&I+msbnO1HLKXo$%! zsL_Z)=`Bf3Lxc)OzF_fw@PP?YVkBasL_Z+DfFQvS1}!9rhOWPJJF~qD#lOHw&i&1K z%x~tLnLGFPeXR{&(jsO4a=Un8=%S6%yBa$~T^%if#!bO(omoUAD7C9G9O!QB4DJkg zv&apLqmwOO!QLguee0hnz0`Kh-BEtxchB6iV}l2G{0$d8M0TJTau{+BQfwny>0eRR ziaxsJgw*V7=$}-t5tTsM4{5--vb`Skh_rpTS422+A%crAJGU~on-EWBQ4gzTn@r^R zO!|}TBXP@Ni;s~$1iMt+I~gN!T8T-a9w*T`nL(7oW06TDJ`ty7ofJVP8QZlIJVx6x zbeHi$*oT(NlX4%EMwbKcHKtf5$_ZX^@d6`eCq8HaQL=^1B;tv90Gjj8?5qzg5?u>p?RaiMNE90fTwdubagQJ(Ukk>uTqyNX1G1mgd%gepck^2mN-uJq~#7biv(17T09b;zckPm4s`f}IG}AUToex%Ww|2z#w7dhE;40jveBZ{1vUpm zZFS9Un*;hT|BS~KOF5FkSBccYP$?;UE?7plN4+0d%v4^CU(vX6n+nQDaAIYZohvhw zDl=aJmh#`BVk@lqtK@ zV&_viF z{}H-G;w}3DxWyaB_{Fi50a*jSfHT<~9@OQbDQmq;&4T_PQp zxW zG~j&fq8IoeJTpz4VB$uaN|n&#IET`uA&oY`F&D%+CXS;yz{QkB4@q34pIDQZJs#EK z#)w}Tj3SB}XT>QoKlRJ`f=zscG9f;!-9@n&ABkAZ#vbxX;p4Dc|9o9nW;?PQ`ZI$j zX7f0k)~;8q|H$E@oNUr>uisABz0%>^}H?QxkOM59-CYFfR9 z8(^~W;r`2FRsq~OsP0A}wjwUsvj3RGUAh<;hi~e1J@w5A@Ao|?bX$Wzoo^|=d-5S( zY_K8p-u?}x)2TKSf34=_#@os*;a?l!Q!O#>cuZLRdxNZ5V6H4zEQV+^z!*GmRs6?~ z(pz4wfNuiN$OXW|%%)Ka)yS{>IV36gVsQ@Sr;P^3V*0{?TvWzbJFrUB^3Pf|q+T-I zT!aIReig6;$8t6LoI6*K-?%xzgAhKywUD`xI!Fa%CL~F}_4ZcBO7vFg&4>5o%|?&M lBtzywn6DC21*w5lV}o86e&f)Qo5C18a&_c^@-Nan^e@B=Wf)=;g-nr{1wK?z`)RCv#%^`ahdCs z1WCI*I2ANd%>MHvJb a7?_z7HhYKpy5ccxb{G?5-DdWA6FC8Ki#PiK delta 143 zcmbPno@vH;rU^0vE1uFIcM6d0g+KoCn+!Fr|{|sYfU|{&j{QhQ`;sx*N z%kN)*=czM$^9Jr8%Yxsn@8*TRGdTncm>3v7edJ>h7iAD& bU|?n{*z6tV>x##)*asekwax diff --git a/bgfx/shaders/dx11/vs_blit.bin b/bgfx/shaders/dx11/vs_blit.bin index 346eae89602ebf58ecc142f1bb78ff2a89fbea14..dbdd427c13963810ae5ca2218609b02b2670137a 100644 GIT binary patch delta 153 zcmX?of$8)GrU{AyYq*ZSv+md>VvytW&g%S!zZ(rjcqDQ?e}yqJFfbI)XJD>+Am-BZ z+4o4xoS1u?V|m^2)vH=GYl881d+s6~?5r5NH+xU?cjqbKn9*JDfUtx?43=H+N_pWKT`QSZw z`@*#ojT?V&j^%md$eQ?EXVRR_etxW8?57fdsu&73N6mQ6h)36~FeW8EkV-hnP0Y+= Y$ji@51&ZkI()-BBa4KQ*)j4I{0Fx9sb^rhX delta 149 zcmX?of$8)GrU{AyYzx!;w$wosF9*Mt)e}*wKFfbTRN}t`7ILoo? z-v0GAyw4;z$MU>!Wc|l!#Ob@)&yUq>@&qQX&9O6HFyhfMD~w6W0%#TjU?cj2i@l`Jm$f%wS~T@(%AG(-lPKxTrT^LF2MKWXAgPJZ|N z&Y%1LympOGUgMsfsTOUjYV5?2=ks;l=i(iYHL||1zB}?3eOmbrC7}eDJpw2~JT1or#FL-+4^bTa^E}0nIJ^%B z6i+cE#G{rjBoIL&9pH0`S++7?Lwgg>_=PCtJ$e`VFNgs?VAKHU8%)1lui1|%(%KSH z;TktCNY>qF+68sdsjU`VYc(jI$~X7Ud)(rC*J{zPwT3B&JWfs?jWxf$Q@3W#Y9-## zp)GSeX;=N9th-%5H`kI|b$)HE>f4J}xacb5)uwoK$$IgbpQhV0CXRW8S+r?%tqP?rN}n zsS5TV^NESzM}?(7M_4bWJn-^uUB|e;Z21vU*xmATyd;fbnrC_ zU#0L>3h!5V=YVJf0fl!Ci1?7ghwM7pq(P3QiesrV0ksL|gpjsxfZ~-?b2)%cg^e0dAr1tZW(#-xU3Ol9i~Z zk*76XWzZ`T&PrP%T#~j#xP$g}jF$*LtUopYaJ1hWkH%9i@$GoSBBtMOts471 z&ucbNm|0|c8AdlAktGnp$Xx+0&*6+BD^_2Ou5x#u!{7Al?01p*wXkCXFn k6dGwRYclsZTQ-6zDOCI9kbec|??s%(&pc~Ye(+QNKUuM2V*mgE delta 1673 zcmah}YiLwQ6h1S1H`xtQcVk@EJnEvs1dL{_X(f$yErBHvUXq!e&rKv#?!K&x%&UNRH^ekt;Ip2BA znVCED^MLFakgkT>O5;}H@4szzT`UU4!j12L(06=f*2&GWb7enl+I!~n1GxeKLNNe? zFi5(GG)!c0>(jQ#PBNUNE>e?}g%cd{5x^+I4mDkBejKjN$N;X@EpTp^XW9; zc#dIVp434J=#t~z{p5I$Dxbw^vJFqkC{8poafxG(_w9fuo>gH6I1!xKY2;(6QSH5? zJSowHCk027=Ymm<-x!{esT5lQo_MzvU==uhY5xB%KWpI5&Tm}T6kc$9UhJLYLzB;^ zN~>YiUjnyz{np>Udm`gX6F~KS2drur@D+9L{Kcvs{iDRqbw{k2Z+!?KbZ){}O$qjO zeTHVIfjhcNaQTie@K{YLn)?iE%lyLvP3M z8?j^fOXMCT^<13nK^AL#K;!M29G|E0d0Kpd#usROVUmx?Le1exI;6c|o*+}>?FBRM z*Lc5HCr9IRG@dV=yjA)=o*%4WkQ@0*?u~3I4u30@^ox zm)DE`cK>=MUtIWbEx<7GUF;+g^y4cA5z+u@2RXR2egURJ*spAba820?;UU?B6t6Ho z^8nf00U;D7&{PO@%2o(bvLl?p15W5w0Se&;+4sn=5De;=ZG}**Y=zKF_I>gzgm0Ct z5Y8xDA>5IW7GD7kU=Wu!Pr&WX`{|-qVrh#2P&4@?WtS}}eeUM5x$W6@5W5~!WVKZ|&gr|^&yUrM-8TcMih*Tw)Qs1Rcy!GQV^Ycnsf2^v#LPT~ Yy!^aWpos1+y^o9xJ{g;@&MD&t0Gy~czyJUM diff --git a/bgfx/shaders/dx11/vs_distortion.bin b/bgfx/shaders/dx11/vs_distortion.bin index 73b8e5190e1950bad731aa6275b8e3a79dd97028..cb7e87ac0a8a3334e0781d375031c9abe1fdbfc5 100644 GIT binary patch delta 148 zcmX?of$8)GrU{Ay_Ph#Q3UlvuFYNj!ee9B3@X$MU>!WSzf;oy&K#pC7l^{|C1i;adNJQBH{zrq+97#N`%pksu&73N6mQ6h)36~FeW8EkV-hnP0Y+= Y$ji@51&ZkI()-BB@Kk*B)j4I{0NqwOB>(^b delta 149 zcmX?of$8)GrU{Ay3+4yNt>b*6Vew3D+6A4Aw2g)$JQ9Bo{|sYfU|?WmyQki^E7fhq z;xi5nbw}oHj^%md$jV~v!0Ef$&yUq>@&qQX&9O6HFyhfMD~w601ZWllU?cj!WKC&)Icd&jKR;G4_I3}TDu#m1Q8QjM;?XrLj7g~yq!JEt6EpJ| Y^78Xifg-xQ^gc2&w0ms6I;V^q0RJvJ0ssI2 delta 153 zcmX?of$8)GrU{Ayj4D-uQmQ493r}ika;CH-Z8Q|&k@$D`XBZ;`14E?rx|NGRZ1$b_ zV#=d+|8<=<$MU>!WPN$!1E=q1KR;G4_BS>_RSaI6qh`Ej#G`9g7?YAUNF^NPCT8X_ W3sy*w)yIuGHw7pnmBs^ diff --git a/bgfx/shaders/dx11/vs_ntsc_encode.bin b/bgfx/shaders/dx11/vs_ntsc_encode.bin index bbcbf4ede893755ac58c8cc13595d8e0b70104a1..0b269c0314f85b15eba314e9cf6f5bd2654c0f1b 100644 GIT binary patch delta 153 zcmX?of$8)GrU{Ayx7crM&(qNqQ2CHH+mo?p;zmOe9*JDfUtx?43=9_qp7s8zY;o?> zs$P9l&1J>rSe`eItnatSPnxsY&yUrMy(k!{ilJb0)Qs1Rcy!GQV^XRDsf2^v#LPT~ Yy!^aWpos1+y^o9xMZue|&MD&t0HmWfqyPW_ delta 153 zcmX?of$8)GrU{AyRff_oD=#h5wvM=-B>3MtZ=<0IkHp`@Kf@Rq7#R8@mqo`bee>$P zoh^8@D|GJWSe`eItSQ&hIDI$!`LTMjTSfy_F?el`n(>+ukFHr^OiFDam2i-on3>0r Vm!Fpk6w%$K_Yq{<=BsncxB;(_HM{@- diff --git a/bgfx/shaders/dx11/vs_phosphor.bin b/bgfx/shaders/dx11/vs_phosphor.bin index 07edbef7bad21f03ef7db67232e3bc7409f92236..4d5113f78cff31e17e5f8cf222554f7a4e01c9dd 100644 GIT binary patch delta 153 zcmX?of$8)GrU{Ay>+E}f>_6M1DzMx;HG!?ueWRfWk3_ELuP{ai1_qD3wt(B`6rCn) zv@~?6EM2oXmgkKlD^rU9q&b`Y{8+u%S6Ks9F%)c$n(>+ukFHr^OiC3Xm2i-on3>0r Xm!Fpk6w%$K_mPodmG$PUbIP~@>H0JP delta 153 zcmX?of$8)GrU{AyXH>5|K3N_#v!cuA`zhAeX&VhicqINF{u#!|z`$^QQP`8S9h&Zo zbo50I|B-sQIhN;*BWv5cKu+JyetxW8>>eCIRSYbfqh`Ej#G`9g7?Y9-NF^NPCT8X_ Y3w8m@Zs2ebxs*K01Od0b^rhX diff --git a/bgfx/shaders/dx11/vs_post.bin b/bgfx/shaders/dx11/vs_post.bin index 5362d6c50ebfaa73642ed24039def296e1417830..dfabae70ba2d0d0756ae828373d0594014349886 100644 GIT binary patch delta 1426 zcmaJ>T})J05T0}HMec64x{J$-mgrhBnrh-EYLIBm+6oA}lr7X18e@%(wl(-iK#WEq z(FaWoDx*dbp|CHQYF}<2Y+w4;Ho-L|CHSB=YIx9UVzFvWqvAKqUH8TZC;4{fd}q#_ zIdfz%tzYf^ZfjejdDnK6h)gOOT-)%;rvvuYOW~bokKFEW z^t_akj1B(+vYc6VE`7807T?~a3a%yjXYJ&2yMx%Cx2vD1BQ?5 z)kibsL=-r~#qB9H&26w7jexQ!<6&?3{D{&#U_P8~q?6m3C_OSUJmSvhnJF5Oq zio@!Zcf9rIs}-Fu&L3*qAKPR<@Qta|o}ixo+m}S~`v$chR@CA%C^cm89e<%FKLU;_ zP8T%UjnhM={6qB!Uy2>#D za6}`@23GIhW*efIWGy@O~Gc%}4m4i_hjGe36SUa>Xgm@$FRX+K@KQCImY3U{>lAtlElEh5`PGGF?>~XjU!Juuy8O-9wqw6OCVGMm3`$0n zxH%mw0eS#Q?53g)N7HdKqVj;8z0+R^k<))pKx22Wi-kJqd(_DC~` z1ku;OqwA8s`Cb&;hitqwF(J>Nn3!zCg|G#3B*L$gU#kkiyeFa;NU6g_n-TJ@X!6h(&bZwI zt7sob`{v~9mW&H;>sz46?(B=H^0hb~17ui5ddrA9pk;_xp~<1FC=+P>nZVP@mbu1F!PzI|GL1>x20^N^bz20~Y20 delta 2153 zcmd5-drVtp6hGhXEo-}?1zITCWS6-_L{=#);UxxK%d4d=bUa2ffv|3{K&ypLwi)T- z61Nax@GX-VlqG7mWdC^+mpBv6jQ-)41&#Cd$3$Gzn3z3$MKi&3F1Ox`Ci<_ZIX&O` zedl%0_uX?ZFAAT2C`@!ln#7QAuGs*VWbeVD=u_cD{D24mB4j3eN8`!FK(u%7(8#C& zb-)yCAQ6qmR4k0x@pInp$96vWd58RU+3ttri_Qxjj=N_W#yEbC;sBH)pFu7`FeLyq zM;e2Js2gCW>pA!?xxJ z(2$CZAha7}HcUyl0?6P&7BWWB{t`dUCTlA(R~gupy#||23DJ;}6rBpW2lp>YYj}pZ zW|yJv8+m~cG7nQpNMX6(beYNZqD5dUa+`RI@jlTg*PBGq`NzAzb&}a+@JH8*>(}6k z$<*_wdcJIt_gHT*UKo_*_i~n)>-`>pz;^~nKFeUtYJk@t5n%a<03%KYC*lI^Utr+) z2B7c)2D4$lj~K7d9xm879Pb}1lMeQdMaKu?@x)%YR4wiDb?*#?+P!Z1e73WqCK(&r z7f*~ximgXlcb+wtf9`50Tf-lny2d2lH*IHbzB)C_ho?;yZmCx4|0`jsYy6N@ygn*H z4-=$?a*gv1{{5Dfn=3b|9re}RAGrP><@58|zh`b*E@dh7Xc;?XZsoyXBqMa+{N!Sl zd^T7tTxJif89Zcg^4d&MW zIS_7G^zCag%bqO&cM$&!nTX+!1_2R0=@n!u>^g&# zDq&95RSEBq-i-#z0-cu-SVmoyN&!o#Qz0n9PBy5k5?a^MCSl|oPW~UxINQh00Di9KsPYp&g}v)I>=w0a=5~{ysRr?w1CqA{F$zWSL(Y3 zUTBlJ)n=BjI)2{qKN>5Q{Nl9D_yiWsxam~Cd{U@oX73Jfq{-V30p1qeBu7u)V7U@n z*zrqIPL{~{bwJ5Ovvp={ib5%QZuS~8I#Jn%{eBy#>}ij0E3{=<(1iL~hg~LGH%1ZH z+k`b6Z31Gr=a@a6NXe%BW!dG9xm)aCz7#K(3M{~<=JU#rspHOyDQfZF)kY0RLkC0Tz&jm;B5(h^QY~xk0%3WHmqvnow^>Zb1$p`}tAf1vx2PVRGM@a?xxsVx2bVgFgWb CmdU~Z diff --git a/bgfx/shaders/dx11/vs_prescale.bin b/bgfx/shaders/dx11/vs_prescale.bin index dee008391ae82c9436dddeacf8fd1277a227074a..a26188bb2955dfb74824562c8ec4cbf3345cf1bd 100644 GIT binary patch delta 153 zcmX?of$8)GrU{AyUz69|TC%Hwc~wx+!`i-o&o&y0@JQr({t9DcU|^W7Jf(PPtd952 zzo$2H16##SLc**0{{w?IUoQ4 delta 153 zcmX?of$8)GrU{Ay8~JCK2`^3AlrOLFp!@a|#f^p{JQ9Bo{|sYfU|^V~s{Kk_Tgq>t zV!*G>(w{mu$MU>!WIc6b1E=q1KR;G4_Wy=JRSYbfqh`Ej#G`9g7?V;KNF^NPCT8X_ Y3w8m_-DBJ>YOre0H!K7SO5S3 diff --git a/bgfx/shaders/dx11/vs_screen.bin b/bgfx/shaders/dx11/vs_screen.bin index 9d5426f76be6c4d274c974bd2e897f28ebc305c0..e2c9393630987d5c5cc363dce6be54f1346604c9 100644 GIT binary patch delta 153 zcmX?of$8)GrU{AyT5TJTtYIoB6`t#z)uDKM-$p|b9*I29Utx?43=Ce@YL53;t#{sS zXQy#;V%Cbyu{>`aSr0T`pEPH)pC79i`yDHwDu#m1Q8QjM;?XrLj7iBBq!JEt6EpJ| Y^78Xifg-xQ^gc2&+_Bnxbxs*K0Ce6p$p8QV delta 149 zcmX?of$8)GrU{Ayj7;oFtebyIc{MMpGk)bJzR^&GN8;b%pJ9v)3=9(CpT3Gt`Qx+P zd}`85qw|+H$MU>!WM$F5$LYJ-&yUq>@&qQX&9O6HFyhfMD~w605@;3zU?cjgLkC2bjtt#lU}RwEz>tA~AJ75SJZHc8sKms@=jZOZd+$Bxy?3WkQ@^age<#sO zYz^FzE)hwzp^}oOr|DI88>ya!R54wM`dfqMe?1s(`I z1ir+cN5EIWZ@@ReW8iDxFX5j6NAOiOk6#t20d1O0h!lJi|8lvMb&*1dnuuQzKKJIq zKcD&RrD@mpd*lVyPGo!A_Q1Au3w5}jIgVh8y0i6nu9L%IHMD9Z_S#{J0{ zq5=|T+$wB7_Z!f4C?2}cFGvkI%d5lYyl2o^o+G$Ekk1Vd?Fnvwi8~P7;SzTwxUWmx zci4~oRuslzd!Vg7xvkaejk?yzCQqw|-M$~Vk!I*6y=3URVU&!`^412Ornjj2^g-o1 z_J7QcWA0Ik*q7eoJAgXV?BieF0HpQrZo;`7Q_sXy a#6Hbq(wSHRu{1$%3id*;Q`Rxx7y1iQ&*!-S delta 554 zcmYk3y-UMT6vgk$YcUq3i=v>TqC&wB>TD@uEp$*s=q5@;N5KwNhh`NzRN~-Rq?29h ze;_ys3JwJ)!6B>Q;NoKZz4#*DadY4StQ$LQY#q$B53OTGFeO9Y`bWtB3Vuh$-_3^$UW$@54^U> gbnH=hoZwwg%xUYSAAdJR<&94t&1qDG2CaBLKf5qsV*mgE diff --git a/bgfx/shaders/dx9/fs_defocus.bin b/bgfx/shaders/dx9/fs_defocus.bin index 275e264bf061510dafbe15fbb141b89955a6df3f..602dcf53c64acf772d9478742083a59d32915bf9 100644 GIT binary patch literal 1911 zcmbtUJxmlq6n=ZR$f-n>;7`=Vi&C7;Wls>nAR=7!3M>>zC@xtJZh9J%H2Vkj>D z|DZV&O)N-U6AP2Ips=tokZ)VGA**|h2 zMntP&{Gq{2S@dJ*)9Aa<--Mu{51dZt%$cdH>0Bmfq{oY~yx& zou0I7o5#n^nfSD2TjaVf??L2wYifYh5a0oUn!p}`Dd2SkGc0gSpar}IeF1nASP|R- z-T+?)E&^8segxhD{|dYf+z?#d7WlOaYy;kdy#x3Fm;&AfriE?+dEEtpi@^KfOF;I2 zE%bK+R|S3nK7{>;;A$h$Bk)#%F<>${tYM>MSV=QybG;M_<19k{d2pp7{O2=;#;szZ zU}VAAN3HuDfrsa}Fl9Azo5Y+D{IUshcgXw%xjSXvPVR1*caXbB<|oPBC-Y8n_sjeg zxd&z5MeZSq=Q8FDOL6QAk*AhX$0z9c(M$eATL!)r+6SS1lC;l4t4i9M&^9FPm(Wz)``UUDjJdT++5w@p zNm@*39g@~1w4|h^gf=W`qZsqIW=dK~Xg4LTBD5u7tp=|!zGzMq@^*f5E*iUhJenFD z8jKG4UuSe6pPMx;qYzDKaV?(Ev_vAF=xp!mpiQrn28Pe|A4YD^IYGP)dEdD6^b-F_{5QV1AIt~cVIliPZLVljByonk`C^%s`z}ptWwp1R_TWi;)K0grbyLc z&OQpQ*E!;4JNBwN*vR(}!9R@7Jn-jn73-49>k;O|Uf%<``S#i#>=P1u$ZH_3`kK5R z$0e@``wNbnwOVf2$JaRa|JjG<2eEI}BG@CSg&Zfx#=I6oEzY36ZTL+3oDe;Ag4iRd lhlgA|)Wj?ExrC?@+E#wSIxCpB7xS(JXBP?1j`#9kp5IM1RgwSz literal 1807 zcmcIkJ!n%=6h7}Isr{40A_`hCLWc?xUTmzbV2y389qOP>!6ERP<{y$KYKKVx^<;MA3@GE8~%* z)!y8kZ60GAQWAn+#exWqAuA>b|OVc-fd zEqMjF3Vv7OI`9toGvICD3(4O|`#Xsrf%jnl0ek@TbYTtP5Rml%kk<`K3u!{;{)zu)H{9T^MI zZgZ5T!sjLj5%Uuc9N#$Co4NLwXdQTkW#**Q0+3q)oo^nO;06n5tLO;hH%2Rrtw#)*_Vi1I=SoPk3O6ss-EQ-xv}nmP84Jfy*j~m z)}2D9mn~ZrSe-b6w0bcha@Tl_&%KJ6#TfHz)a|ZMiW0e@H^3Wpd~3Q!F3cf0?!|b% zj=2tvgdcoEb=+ZG8Rnm=4r@A~9VYwYb@QO8d1tv&wCo%3zyF8sl{zU|teJ~iAoxOAgd&6==v NyG7k}3f9G6<0q=iP_Y02 diff --git a/bgfx/shaders/dx9/fs_distortion.bin b/bgfx/shaders/dx9/fs_distortion.bin index b25548edd315a2262e4eb9c27ef77399511de412..becf5b0d597e2138b7153e8bdde90aca7366dc58 100644 GIT binary patch literal 5499 zcmbVQU2I!t8Gaqxt(&?@8Y0n)O3T)O(ymm_T2R@_nkJ#mM1YbmC_)y-jqSwDKdFDR zbSu&ctIz}$WTGH0a&ZbBO!0tf$_0foGN~6G6sba$s8l3^E|m27t?0;a2; znyqAK)0J#$E<05#SGq%CD|o7&&ZIK=VzoOI0u!&ND%o5CGWl|;I}`)e394L6lStK0 z&%$CG*bcJwQYJN3u9UK{7qz0*V!2$KNu4ZLGGsS_-BM3gpHI)G=1+H<@Ze)EKV8b! zYWdQ1cW5(2F7-&*^WOK~Xd4-tIMy#Bi|zP>A2cL`_BFH_v`5hTVj}J)k>MwkMVNR# zSxgtR$&>YbA(K2gotsZqXVUOqO=jjlnaov@UKJ@bfqf_QrF}DnYC-5j#PgQo7FQIn zD>fA$DE4f#a(fj=6qAZGz#9m*2D}D53w#^+1I3HL-(q}8@rv@-71tE+E5BGVmgB3HW2+B_Q>#D&A0B1HKOaF7PKn=@R)FunYKeU@!0u z-~r$-fuo8^#aZB+;Lj?a2YwUdi@;w2R}`-TuV8#raScehdy0|mcHE=buXsRl5cpll zKdU&SSOb0!yaW6`@I3H5@S@@+<*zE3yNnH z7lGe^zN@&RxT<&qxPtjL;Malo6=NT=KA>qZxJJJ3gGZ2zC@Z;-!&nv9=!!n#M&84g3yaJ&|ecpifH=uGJe(V!@ zYaPqhK3C3Hvq#gsZlxhck5{byeN|;C4cT$trNibb^)(ue(?*mQJr6P`X3MoBnM}5n zK_01%b6>O<>bkqe7XtRF2$lbe;Y$GAL)`s9m4IeVOd@Rs^BGBKDKI3Ap2Likw z$WWoqayQ0|oR#(G#ky{QkbApES)9D>Kz)EqtU!-0M=oiE9BA$7Ep zo*qfp(y2sB`lyOpa38&}-uJv0(YF@EQYu%9=|cX6Z01CMx>(L<^**S&oT)q^jjd*EtyR)y>oju8kp(wR zpPy1a`uuc2$3D+nH7a4w&q$y3bLoOKP6c`FrO)Sb)hw#IN2OVt#{>Pnf&Ru<3277q zw&wU+GsUG$2p;?R*__!s9uY~Rh0!kn`C9}oq4Au({sG)Cl)DPNsd7!_?ghA5)R>bV zpfA^_Tq3}YD0dtvW;*Li2M=pnnMM zsB&%aF{WGw==+#QpTD!pQSN2*`Tq1OnqR*a^lzcPi{|UzMW4Ta1vuGkIm-HViG$mL z_9&VkU!Te)0^A|xMuEPMG36$KzP+y~R|v?}l%pSC&Ox7Rb}k^dq;jtXxE1AAfsBv) z<+^hBfUJSJm-W3e4)pWbf&ORnQ5Mo75Pfd(M}ouQut#d{cE|4vZoG2?qgfh>Nk<96V!}ei@t1X&Lb@ zLr=nC6K`{YanL8nVdUM3d2*Ct4q^B}$FXs-4jy!@jIS5^06pgTzx0B(DaV-U-{#wN zhA@sGU)q&e)7>o*sCWxp57q)}hdB4Re6~KEUl(fRuM=u$v35VneuLxvae?Y}#=gx}3K$a2`Sz1it9k?$?m%bIkhKb!s!V z+hlnG0WJ6(b@BFqxe1e#$R^Vd$qmGJ)um6nSMI=%sgdsMCgNy~MeZzM{4Lz)n2*2) z_wT?e_O>60!eXQ$c`_#wH?QBMTZP;t58}|rGX6KO$a^{&2JMDT7@!T@< z;Nf$^*dvGj0&9sU7vkahx3%FM$F2OW?RK1}cGSq%p*&?cj>u+}Z_*b+3SsP@dE2+S zha5brUB=m(kCDS3V=UW^9nRS?eT!+nKF1qlp?$_Hj+L=GU9xeHdJyIBFV49a?@o2mcCkx4{;^Ly))ivvGbI^Pc+=vo7>)YereF z$yUq-br}=anEvCK>rg$)a?ba`anMgEWO;6_4E0+z!T$%1y$+o52=*Ct%^E=#Ybs&9 zd6;?B%A5hN9|X*qXxS6U*!|tf%h|q-lRkI`jUBU3?RtyuLu-fg fE%}Gnn)`$MPHPe4zT-M+PBGTha~=oD? literal 5447 zcmbVPZERat8Gf(rG|qP#CQ*r^MYJ0os-koYqp)gC6RYi{z(U%VJTTE7u*3S0;a#5 z$QRsvvfw6`+}TpDFyMr(;Pd5VDv?Sr76%*$Om{g^aOX0RN$0WyP83uhs9Y&YB2hY# zhs6-sUb5wEDlwZYWL?;6v!cbtT&}c`n8_7VWVe9rC?|@?llesD#DED8K9Xc8N%)6aVl)LsEEOz`KC=VZ0I*d1;Ht_^0BFFmXJ- zm|S$@Gv#z96`z@(tHg^7Nq8^DQ)p@mE_BlIECXjHl_t|*>Y z+)%u#ctmldx9FF>vi{1Naj@F&1% zpU5A9+krm??gsu0xDWUX;G|+oF|T-1@g>Exisu!7sko_l9r$(FyR9hww%@O~9k@>a zz;6Rb6(@mTLqD#VS3IS-qIgd6=ZYIZ+SydR4*VPXcYuEZ%2td0iaQlY6b}Qh(XaM1 ziYFCUfZxTqr?{@T0el7gCh&W}8^ANbJKB#7SiWCzP;o>t2D}ORqlzgYYzt`o^hp8Y!i7p9db*b$)$_#!6c7Wsfp3! zQEHztBWvX$JH<0|+#H#{My+<-h|*%C0huHDTJ%B-6$xdjdQQI*xa`yysGC|^7_HpcI_ zTW9})MdaS(=Ytq!uK9ls!GB2mWVQ#!7L)0$%x4k@3(5IdvXo2=C!~UL+GZV{P}xQ! zEZJOPF_}rf;HHkG=NEJ7lpK@Y&2f=qv*j5VzI@;G^(0N1NE!|EF&)cQBrmmuvh>66 za}1wn=J-oS-p;Y`xYV#!R9mEwH04qoHJs(a&C}my8*+dC~9q zQZgg8TtL5w`gwM4uIM6@=96e5a0H(zJT^9bGMerCuL)8+X2xtROT4noa`}e&NpI?~ zwKpOX!y88XD3DJDcnUA~)|vmpdCFY?UQ)SD<*o*}JIdV)aNTXjg=_=*y1SLz3mnBu zzmv+vfsBRS1?A2GeYthzHUivR%3Tj|x6!_fw+r_fe{S2*-idcexe$DeC^rH0eS8^h zJ{jdGmq(j-qi^A5{>Yt0dmZoZ@%p-#(dKg{z+G34vVIP3q5Ur2f8+JzlXk1y4fMHf z%IyUDK6WWL0`%?eQ|@p;Zc;h=@#W&+xMm9hxr)l23UDjRodq%$*2{V2Hi66m*X=sm z%*!p6Blj-apH9yfa>d+SX>ixnV}pk$j!X<5F}KIT@!VoQopB3;dxnRGhxQB)@7Xi7 z=gBAbj>vnBf{Y(MFvhduJ2Zs5E3d2UJ1@fzxH@U}u>!Y&eD2{5={G4#Jv`fhA@j|^ z9ZR{#3}?R~KKF6M@jl*?8#A2!M)`76hT~o~OM>oiKSsrrL*R9Uze)8Sm zcMM)UaPj4jK_1WGKM#@bG4dObzp?+te|^OGAm0oATHl+a*ZQ8>cxr9$8=ZgN@f7(! zBVXM=H#fKcPn#3Xc>0xxW!k_~efnXP4~~y2s%?dBkSn;Xdvq3F7^xT7+ayR^g_4pVScdF zT@A|_?++j&K4 z+r$%5yO^`r8WSC}^Pw#B6_K{4?+9`yBC8RJ!OuUc)_2(Wh`V*ug$e%+U)ze#*PQ)uaj*vM&`Gxxu#AP-(wFsT5idP z$gSFVx5CD>v14<^`3h=HyiU!J?}xnAvA(Dm)WN-BwdVmH)|$;J?M?^utxr3*ttLj= z4`a=&4;x3Xtnp_q%FpUkp7kQgRX66?jd8}{*IEzyJ*Y+8r%>Cr{(|GM1$)!pBN)do z3R7S7M_I_h=KZ>@SXjrw`LZq>9_!G`IA(sFgTGhWq`vIeDc6|m*^l_hQHFC0!6w?e z?q-hAu`;Z0>cLJ^Zwz{@J8}}OH|;RD|I1F$7v+LEWFGx`^7FOjeYuNP+YvKvgv+Qe z`Z4*keVY>pdx$dJ$K0RR2KQKF+2(hE?Pd-s&wK{!%=b^erNg}2ng~g|>eo%a*vEX9 znODw%>ufox_MtY&+cSb|BddRDf3}Z!{M&8&l{b)P&u^!9=>_wy4 KAL8-Xj{FC3hh`@L diff --git a/bgfx/shaders/dx9/fs_ntsc_decode.bin b/bgfx/shaders/dx9/fs_ntsc_decode.bin index e31c3548b83396eb1f2cc364991e19ac15e5d69c..5d2a3329b6f931bf291e3edbc9f79c8e93a130cc 100644 GIT binary patch literal 8439 zcmd^^Z)}@K9mmg(+qi8~XK4ln%IZP)S5a}+h!xbeSsQhUD3C4*Ymp_-wVm3NW2d&W zWl~?bS|=(|AltI7hyor2F~t=G){Qd4nwD&AEU>)ji%#8(AS_Xd3Pq?$o2X{Kzq{|n zSCemP;fuA&*CS)QWthkQfVj z6w<3kBhkpC(e!AdRhJ=uz~;RuUp*R$#jMZ(;il0@Dl(Ky9E#);`H^fU4@W=rz-Z)= zRH2Z_MWVym(M+M$v*tQAJ2aF}KwS;Bc{GyA7GlZBW2tx{+3Hyd4Hai?JwD`7&!PHy zRzY7gioQfMkwR)1HLozy^4ZZ`ED?#PhV!kuTkw9o-n$XDiyKu#wfbST&DXti@PRv( zQtMmr2N&E_68G-1TKKjf{Wlua0&bosBTv3$6yOM2?oKRfbHZ~vIqPw^nKv-U=sWuI0lN} zF>-<|fj@_S8vF$~3zoro@*-Iwm&j}2&tT{Km{Pw6+rYEnCUPs;P3|L;=QubEmcZYE z)8H9!4tx!~Kwc)VlKxMd^7Ujp*+mYJN%AmxjGQ1#hM$S^rV9wkqZFM_gP%z$rz^WdA{0=Y;ofp0-q8x32?AovI9A+n3?WBJ3(kAQ!I zT@ic|90%V4OW-_s3j8BDLwz3H8OE2eWU+a%WMZ696W;B#~2sXEB zf1^BvfCEmvhq8TmYR1OSzx{k3n;pC7ob>+Qz3Pk;^DNTUsu}ZHoi@*92uE6p9e^g! zNv`2&Dx(gjBfE3agWb_WG!lxaH&8C8S6TD2z{Oe)`Sw|NpwxKdY~iFcovOS=T1-|} zea5jHm+8}^@>?aA&F11EC^Cnof97h^F#eL9T#0uUZYiGy<(hZ21#0g(+9I_pj&_xr zYOKZcBP~~(qXnt8J6b2TE=TL3HsELvQ%gHqfm+egj!~O%v=X&bj&_>btfRe2?Si8% zQoG`4SE(t#(_f@@e;qAIt=-W&sdYJ8548bD3sXx{^CI{NwPTLmIJJ|GHc4&T(aunt zqbBj@sa3$sxEr9oPi@1hTHiJyEmz3Vwo&VGv_5KKM~hP%akMdNM;+}rwG)muNp0HE zW~jaCXcwq0I$DL=lA|g7HkGRhwDZ1=TF}upQ42X*C$%m|>!CJ4O~y1#tpM6F9iw)V zcCy|kC5`)KN1H=ht_AP{Zi!c+b`7*`R%XGgCi%UMwI}h~s0AIZo!VAM>!CK_XmM&I zj#iX3>OAgfC#X#daqE2p{BkOm%jUB~h2WhJ-WBZG)4wO!uYc(WcV&l1Qt3o4*b&+s z+T0Neb#!d*`23cwo$ABt3AJnB{+)8ZxKlcc?+j}J$$Oqs>Q-o-s6ciwk6Nj^q%vH6 zT9dlHY9F;EXm)X>3e=8j&Fp}vA6$BPN%YHw>z zzQ)vi-_@EqbJ}=+(VBdXsoDKgYw|s&rg_k3846bmXidJw)a>l%DcSpdstIMa_m}=w zg@Ss0`MVX$>d(c?->{VP2D{VfqL-b~?L)BMt`>U&7c~$ha&^JE$ zx9x}STfO6n4?eRUzS~6)m^j;DuH#$^^v;Uj0zG!*8>e4*`JHdrrx**Y0Ndu zx`twts+3@h*MbMW;;%~BZct|OZW+=gllO^T5!){Fe&nYRYf8t(Of4c{$%oHKSi?oc zD=9U21a%h0Uo`Res6pm^IxYUvE}6Wyh)yh* z+y3Cy$8w*xmpVKZ@}0{-A(H6B^eLXr$N!Y4Z1CZjN?aNwZ5DeKb%jce%)8; zr`(cPsuA^8^euU5x3p7kiH%)Fw&jwfv2zshOiMB*QYTnMTg6tlsX_S=$JqK%jylGT zU!d5m26c>;s+Mka(hbV5ZEnZFpgl{{7C*`x(C#+QiB-tsv`yuD0CTtf4*TZ>a@sl(<$~1K(!&)oU%B7p`5C8hpXFNn(p{ z3w-5SVON*ASu|-c(t}L)=OnEZp(Idl%2l%vttNKR4-{jB5kN#Xe`rn`fcd^SH#p9t#^i&vlvAWX{Q4$3CLR z#n{QZ(RuwWu@CFKJ8wj5rjJd#^Tujo zDOa;|%GNEuG6!UgL^ESz`f1iuMbC#u*x5Pa;W%0!{1RIpSE;Lh{fH*@$avbcI}TQ} zHh4#Ad$+Gv3pjmsHQQHLvwgMk#n-N%fU2#ZfU2#ZfU2#Z0QL{Ne%u)K>&LcRY~)$G zbHMt2)cW46%-$h=$3Cj}3+a0^_YUbh=9GTswhuCX(s#}sy?038?L3fom7VXh{^Wfi za{<~BYvYAx*Wmx_c*$Il@sanTjF*g&U0ag2?~xU-k@aZGjg7p&yv{x*ab!H*IcN7i zTaWm=>&=#nE;jN!CGD;^t4aIp-r{O@y}6oQZ#KU8+V$3q^@ekao@dRNbAHabX3RN1 z=Ug-9oS$>fjUjVR`i*|-IcLVhyvr40O8;g2XtO+i5<~WAe8a-O3eEe=#{F-{#-0b< zv9X#wCp$K-X2-_W>c>WW?Y?Wg4^1r`I~mB`@~o9H&snN~CRG&V!AxZ)7}^pOSZ#_BZ+JavrVH zzSbXI(Pd&UpJnhr43t-j>u~nkiM$v6^r#BX>Xnkb|2(K)-m}Kmqit`3t;tL5O0m_R O<^9@Mv~l?ctNsnWFv^y09b{U7A?-uaB2lDBRH8x!^+P76ndd#{ zIq`}61@UPTSGxI~^PKm6&!2nFxyLvAdiRF{kN@kh^=eh#D&?BSXgXuycIpW2Ka--Qo zV_@A1H8(hzPeNS_wSLsg<_d|F_i%ckkZKI9hK7dZY&{|5QO~jJde%T+H|pgR@vK)! z525B&CR#o>I+93w1L>iBqwW^GAF1}Ph3(X4RZ}j1Ty6~Q-P3FkzNCZAEIQc3Djs$4$aXgEclBj?FQ@*}coqp@!%_mVNPK#r5o zk*C1#p+jfM^W;2v348|SSHLN7349U^HyJjOZQu`}cYsfU`^gyiL*z5y)8M1vkHB$o z5}X3R51s)}g6F{>gY)1|zyg~MJV(xv3*=Ss9O9_YDD^Vf0R9SWA$O3SWFI*|j*;VJkvvDvk?)h2 z$*bfN8UCzNuc6*eWR%=V9v}~s1@Z(rMV=)ulJAiV>&@68PX>w$W!DDIZs|Duajz%iCafDlda?qP};K}d;^SuZ-N={RnP~215S{q$g|`{ z@_q6O`4QRhdE?(oc946?17wU$kz?dIIE(tHz_-9NPLXH8Iq2ufd2#`K2l`d=BeHI@vEKwrc{})fa3^>i>;eA(#=v*M z6gUr#Q9l9hiRY7j$+4uoKmtnMyz*8w*9D-guNu{b@9%TZI1RN_LN~Of{Dti?(d3mR-d3~zD>VA!b;6pIg8w615dd2oG^1+` z0dBoPGXbzIxph4vjl$Ah;lB<3(tbDQHqZEDxoLkXle)IUA4_6c)f)V7zdHF^4gZU!!Ms9P>0`k0q`1_WYBv&q9)OtXd^`^6l?(VF5R+pRp ziuSeSNLD7}y;b@_*lw@V4&i|xtJd%k{b~&l=Ba9}J1f(r6u(i|bMwfJx;);}-IFm%#23=o78B|iAX+gPMIrFO$j%K<< z+EI1HSN2@HqRbrh)g3GRoC7-AdW()|`u>oY$YpXPQRy>|+qg`h9+KZEiCk`EAPPn1 zu=LMdbsENBl2fa3*1;|1GoV}-9c_-<`;K;r+M=UfrMBc~s@BA-18p76)LI>_omz*Z zbyDkbv@T?7Uuvz6 z)=sU%(K@O1I9eaI!_}Z>)wK-ZlwGKz?q}D@C#3Ol^{Ovfid7jr#>hJCC$nbKpE~ ziMK%QI%wOxL@gx0v$5tRUY*$lRI{VCQj0oTC$%0&i&0BC+L)wK&v8eapf)AMt@jP^ z-gIIlm(L9rTH5Zrqh)_jZ%<3F{)OMtl^YsPXObf=TccZ|Tee1{Teoi6`sM8%JJiSJ zan;p#_Z~SjEJ+}IU#JHpA9zx!e?n`)Ept-#ur{&5)d89v8^3F*^=ZxQb5{GN*33KH zYH6*>SC@+Kx3nhTTq@cVT9Yp>6-|DZ2bFwrsc1jfnmJ$EI^_3gP{|jUik+O1gG#=+ zRJ1>7&5WV-{fpM*drQSme{;enA5wMDEAOf0?@uVJKIe{l{1&C0H_{E?pHR5s%Tp!K zSJ8^EO(^AeCZwvqFhN=Vwj}AwS0&`Cz9*^Sytmzp{!eq}pi-;qRHTSsSe+Q6-5*5W z>BKv9x9Ig+hpI1s*K2EDc}?{7&^Lek@4JrOwRZR8AKtPHzPm(^m^eFOuH$?V>7Et6 z0ea%G@0>gN@*nR!HT{LVV6WqEF!sA2JYU%T!G|~RmTJVlk@~Y;PrUx_$y?<}qVPjlcc-&&&2rT32sk)?dJGi~Gt2iE|Tl(>|qbB@WIatCWgdHv@ z#G2M|F$;YJEQat21Z&eryrNS5kD*Rq{6!Q0fa+&Hq|@RrKB(UMKsP?3i4Wq?N9yd? zbxKUEZe5O7Zqej}K02{nZu^7R7t2H1Ug|V$3fQ`Iz6N6>b=RqX6lFY2pZY}$*66nM zGfo(N)%tQ?{BXvU`gLEWpK?oHsan*#sBg(jyQQ6SOKj{GKDNxFq_HFTc#cIG6R8vQ z(N?k5ZK_cr#4)xZl%tLb;}`MkRlkn0T2<1uPP#^gwasl97_{e_v?Yx48nnBKb7Bqh zIKARHu_$%pwHU!OU-Z{w%+{-NaUt~6*SLfY%BU(LuY}%bSRuda%UHE(0-Vk&Z zUexiihwE7GoU+<_*x5PdYIaV!nw?X&Zt;~lAY&w&857e_vz8Y1e5i$;og)E`qxHeB zspWB%x~kWYXi|@ir%k)#U^Q!l_mZ}E`)aj_(^prseRVb4R~uh^?fQwR%KC|@%KC|@ z%KC|5|FG-FjZwXRY`euqo~1hntluZC?>J}bJwp19eU#}C(q`|FzGF`5XKwo-<0pOR z+|hf7^xe(_c~{x_F6&R;2Qn9+J!Wl!(Cixge;qHG3o<_PK9up2F|un*()K;F3O2GH zO}Vj=_gB!_$0Ux7r#t8D-e>C(e|Npva?!;`o~NYU^=36`pWRzr&8|0Bv+K>q7hk*H z>apH%F46O>9&;|tIaiPM7UrC*$D9ju&bcvU&Pl(~Pd(?%c$jy&LQLtuj2~^5$4_F& z9*uv=;oo@X{bl3+w_{_^1Mb*ZO`ek-8&|Vq<7(AoBffUuwQZ7TE$x!?jPz0ZwHmja zTjVSw=N5dwD&CGxizes2RTxL~UE7%av@c^)DK9(uFyiU8&T`3%y*bC>zqrVYy*<|j z{94%8GM=0dYhjOfmG(FJ@^T)n(!SOoUD0J?FP~QMe+ZN>`Wtcf+Jk%${S2r@oYfbL j^8O2;etFLt+km#+09%un*o%InJoIe77qqqstq_)&%0s?qpa4+<7~QF`gYL+MQ@jQ`o4Ll$;_Z{ECpGdsJ|x6-GN z=Cc7-TmSP!zv(-(z=-~K5J@-S8`#n58C53WTjUQbPbtTgC8Z6U{D-f?8hpgRv-$|{ zJPi{`KSBpC!5O#;7vTnc26cnzIgG*=Z~)H2415Vs!&h(&&cmzl9ki9x%DVEgK~-v^ zpozpB{Hgp6Ut_$c446dkF^(vAz+HroRc7G_%%6uXSc0FSt-Pze55FM)Ksjs1y+jj< zub5bZ-{2~Azue@v1BnSgC9oP1BOeK|8<7y+sJ|^9kR_^Sj~fg3+KX5ShFgfF8w(-( z9Cd5Fo@u^K>tV-vzm{Z&_&F^$IM~)Oij@~w~Op5ME3fXwi(Ac z#%IuJn76bX8{$2|+|~nao$?do@^TPAu@za2zKlFFTEUelGSs&2NOKnZ-j! zuNEPyM|jeRA$nMkG;)TYby^5<)IKa_Tl|8V(kzr&{GORIWhCcF*KHh?%@@sE=#}rP R;rXj8h3BU3mL~rK{RjFa$nO9E delta 838 zcmYk(KWGzC90%~-6dA ziHs*Zc6e$932H6!}%Cz5W!H_+eX7*WRITZ|7WPbjC91!Wbk@Gq_sTjV3|?Ue^u zvlt+fwqXN)gOA`Z_ylgir_gT@HDL@sgM;un9EC67X}Aoh;X7DX&M9vy@4^+-n+8?r z6+#;W(ywp{{#5>j?{Tl2juE(nhz69yu!Z_b*oIT^BP=Vc%6Yho@jJ@<%BC43`h>zN z20p_da1H)ZQjlNw#4AF?@l+y4E)qiSKnUkn|!y_y7A%gx-q`YuLkCs z#eGJv79y&Lc*2Mx-K&QdvWA=WScv!mE$BL14af0Muq?;2Il|&|NW0;aB&KC*I-~^umOsL z0EkKfVpbr|0Agk!1_@4Jm{{PZ%)tcW{{Jrmr4@j56HrzMO4~3oOn%9zTF(Mf2Gj<$ zhM_DzIX@@A$bez>>eXOjxH!-`$@%$3DF#3hX0RyK5kNLX|9>Eu0Ax-D;w3-~65j&E zAh82L3==y86}thXpD-}6gB5;Zn9Rd$p|8Z?9OCFC1C;RxVvxTljQ5I)-p3ba*GDTo1y3=Bm=k)t9AEQrP`9f|}^D=}Dd-Q+d3=(&&|!w6Ee1 zf&^+nFF?1Tr=e#Nix8;ZHd{`+`PgjPEn#l-9JgU^G&lQZuw^%dADE5)Eps!lI=%?% zwkt{-PP??_1}+VUdn{u(y|_df+L+w5Nz{i^5r4Y-HrGJC);TmzpCfioF?%XZq- zbgf0-ZW?yiwsZ@-a4k7#D(B@sD*O)eCo}omR^4+wU+42uKHoy4Z61p{SE9paNo(fS zMG)tp%&(+LWMq5~q|eOw8q(Lv`1sqfyw3REVjV$0Lcc)qqkaB^9014Xe#4r1htM(a zhxGjhj(Is0f8VM5Uf^wZi*qYii%ZM3fMD)IQIh|jyJ($$+q%_=pFD8yV*vE)`2V?DEA8`PzYriKzTB^z}D|G^E-qQc;dc%iAd6lLk9JvR*15M;IO2vGIMAHLaW7I>`kgP!% zP+>a4yyA)qI3(99)@u>CXvZYh26BufhFin_6mkywgmoO^S>>=NIHORdwfE2@S4ndt zOTaz|8yQm*=<{O~~P4k(5gxpbbKG(@{f}QR= fu05$q-bG8|gc=sGCwh|Fg;5$WNSj6je!cV;a^VrG diff --git a/bgfx/shaders/dx9/vs_deconverge.bin b/bgfx/shaders/dx9/vs_deconverge.bin index dbe6e5847675bc78d7f221935c999a822db46d62..c514e5f8cd086ea36a24b5ed925121046e3fe1e3 100644 GIT binary patch delta 571 zcmXYuyGsK>5XR^B9=Vv92!fy5h$s*U7#dW89LR+X=mNET_a~>ldSz|CK_sPP!Ut2#WoDLH0FSX(k?ArI z!BhBc<|VVo95A1lZ_EHZ!@6&iR>H)#{tX8_M`4MXWp06O_%3(?*1eb*H1Or|y z+pVOj-|s)7P=sEX?_dx5WPUM!nYaWRGyz!@M^oae3HTDE(VNwS{c{flG!lZ!;7|LJ8h45G^ z+_&_Sh|UoSlk}$PeVCr6d;3;KGrT)1vk2FZP;e_KXyV7K{e?zJAGtb1;59yK9VxNf EAM_<|761SM delta 501 zcmXYty-Nc@5XIl^T{h>}34(BbG|?tSI*X)G5I;ytK@#irc+**~ob!yu6kwSXu9G#^ zJHkWZiSSGq37f(edBM4!@L8CUm+XHFJ^f#Y8X8yj;&?&bSK94%mqm%{3!lga^(y=j z@*qAwpi=l^Z^Ay6m4b^IIv-PRIRVLfJrWzCjEt|M(KjdGxAC>LgxkoBq(vhR$j?O!7{HgO94{nmi@J3-+1;q*F LU^=0XjN#lbq<38r diff --git a/bgfx/shaders/dx9/vs_post.bin b/bgfx/shaders/dx9/vs_post.bin index c006fe0c6acc7240087913e609e771fab243668d..66dec862e4cfd9726c6a1059091cc13f74df2d38 100644 GIT binary patch delta 417 zcmYL_Jxc>Y5Qb;7Yd*Be4~Qt(2wGS~u&^Dhh%rw9qCX8XG?fEp5VLZ7bYg zNMmP_($YdZ3o8+c&8^SCf&=e8Gw;ss4f9jZi|gC16=!a~-i?f&?RSq3&zmQmV`oI1 zw5`}YUoQ$l) zEBq8*!lv~z=HWWavIVLEZ>N!Ku!ctPm>*f$qb}V2SZq@J!py(*m0AE`O3A3_gK$(d4ajrfk8Px3G&$>vg{hSx&6KW*3A^h8$S Z9MTQw&K8lz|K`Q-*n9tL>wedb{{fxUOPK%w literal 1142 zcmbVLF>ljA6n?fZrG%C&9g*&(q_x#ZLo4Yxt`{ekJKV4aiG2_yy=v3% zRy#ow(0I)GiLz`@D=?5al=xEONaB&iW8gE?{v`2>#IL~T;7=v~lqewf1^5+U3ejb1Iy_bjJZX8tiYJNf){fJkZUtn=NAU^$ME?~d``#pX2;Z=RB-l*%1{3PhLC_L~3FV;W%aB_pN^z4$>?2*ONFRMn)j1w9lUY1sa=(btq_3pVHUWpNsvytF zdxdsJ=mVY#YVbFWfXJK2OxV}J7i+Xsz*p&Hw2*5NDfoPj^AdgJ9LP&5*M~o1A9rHH JYqE@pegjl{>zM!m diff --git a/bgfx/shaders/gles/fs_deconverge.bin b/bgfx/shaders/gles/fs_deconverge.bin index 9a70a7b0737743e2432e4c1eeb66dec1d88c528b..855f8019b5c322f5e85a12a02fc986aabec6fd59 100644 GIT binary patch delta 86 zcmZ3%{FGVTE!czQxX$dEj0~*B@g=Dh42%pwbZVk_!$fmgM&pT7y(fNAU^JX8%4oo7 oG}(>OK*(5AugaQBL7^nKpe(T{-cYZ6ayX+ri-9JPQN^eS04(Jf{Qv*} delta 66 zcmaFLynh)qSbQ6oc!_vg|gIS6NRLl(xRf&lz2mHE(L{*%=8SfxY1;NM$t)( z=DNlp;gZ~fvc#fzV+C7u5hX~n$N_paAZ>d; zLQasX>aPA!lzCHWrzkj=(@Aq->lWJq@A7n) z9FqJ9=f&gd;c+LxnNS??#5@Dl!|U#TyIN-X#_W%TzH`g2MxbTi!K3Aji%!cSjaAFO zja$40*RWxQLhe8$Zqsd<=IJ61YbPj9ab#AP>nth7VpRaEFzml?fInqC!V{;f;zoG; zSOYnz#JLy_!m*FXm2Ny^aYFRrggjt*IwuEjku~v{gzW`T(c);i*#QOP35xJ%G}z$k zxd;bCa!lHlH&sGYOTiQsc*-DMNq_dmh0r@kxGe7+{Wi@r)Vx}PM&sWNKrr-u@eEtq z?-`m6217K#UV(+vn@Ce%M7l20SE*=1<3f;ap>0jTR`D?}wQb+06TUKs*KneQ?yBp9 zD2vU+CEtR?n`|RT#;9HCW-X}D3HybnN&}N^`-W2{Efj`VR%EY028t8bN60LXQme-? zqySpEgl8qYNCkz^^W>#C?3H*gAY_Ep=g$&S24!$Go4$Zuy-|tZ6annjBd;!|W;fC;;54yxlP1cbv)-yyfvrP!eWXkK>**Stsq3FQU8>C-@NI&GVFP^E5px68^~ zDtiIdW+Chq@Tvho8A~E$eGq^EzE|9OR=!$Qwg6*)FPBAH#sSrQ)lnmcUPz0y(ZYUciLcU zu$_QioYtzhMtaJTmgJQYcG_L&w$6}Rr~NPjL~x*i{?o2Qwag~ z8q27g+Sl(no#Lc_hK>Cb-0wqmFi(y_RqvJ{XtykRDRvK=J@-lQ)y#eJi|mBlB%OvB zhN>OPd6Eg|Vy&7ITZ?QkT(7}2o6-IRI2*7mc4mqSjS(<7O~<$$48}%Oh~&O75()_z zOQC?^Xr(*`0c=8F8zB%Ddv=5wUh9pFL7wlIc``5cw1iKk!fPLws3V8bAQ%lNS3U4$ zG8qS>5f2!Uq30q9qtSRm?d%-hiItF}BK!}X3-7Wg;e~@~Fbij4Pk8;AJ+*`p^9W~i zbA9k&guWvL;K6V(>q&qbIDem2aj2SL6X8{Z<2a20x(z;SYrjeisvZ*6`t<^+YG;_; zHAB@Vh#Zj#o!@+;-Tdy6POPfgYWN z1Ft||?Qz`>p_BR$Wqvs~XOAlGtbiVr{ACK#M2kA6#Ofi8c@DU)uc|JyE__BI8!ipU zwR%27!{dGJ(}KB}?%l z9+g*BOehJJL{jTdU!CfW*Ndw;bk}LxYwmj{r&3aFNOJ_>?cr zFXRhSRlTsABJFVi!!UcPdi82;zkC13*JpqK`%l03Z6UIU=pf4KtFvD3toL0ZJ{HkR ztTww$uKZYtG|8iUlk7!a9b&oqQy~s%e2CIm9OGr4q~`jvNRLror0U=gc)i%K#4<_u zu{s7avt5$pAH-dfuJr2ng*a~R_i>(Y_V-dAET!>!3mQPZT>2&xd0YZi`1$MSUhf#C z6`W@uHuoP648U-9#1qQ|M31if#eTC+(p|kjVaDc;UBf`fzQaey8JC@oLx!u4eVe(C zBMy%pXKGeE4%8gi2eN2)*v2XUoe|;J{bRCOv0b#;Gtcio_8HqI4@CHc{T5~MZL&>L z5njWF8!5b&YPhwoJuD3~)v(+Yps6w~@x`X)1#RN~BuCg2E6~Yi1 zl9V~5B07NPy90!vnBf)uH!5s_dd_$- zB4ARlv{YT1TLR`Nz*7pzB=fh=E|}S=z*xOg`CXD1D0#C6i8a0(pkU=CvM?ggq1 zgAuCGs6fN1B~sNBi?><)MIzeRxL~B48C^5bm3>TequclCgs;@08IG3_t}-94>T3&j zsjZ;vZMrc=rYK#>)>2TQ#t+VN`|1UKEWZVMpzIbl|0I&fp(gY2hc40 z&I8;4Cm5%Bo-{){x@2#0pSbz_S(2z}2&#J1XRvEFO7@F#xxHHHRUHX75D6YC>ez!| z8Q^vLMRE3o_*%mF3fEQeTp>XiPeaVnx(d}v+7+@PnXklzBapM)LOp^ImSj+vtdg90 zEp8boI-RN`V`*rh`4}aVSc4W|w&9#lG3ltN5b2f>U$KJzX!=porvOrIq;P7 zI>0-`N|3LT3jX;rsg~&qszsxAEHyx5gqq1t_}3{%j@DPHGg@UloIn{cHN@QjnlTs6 zgaaBbVIHc#D@CeF;&2RC8mgSi--?MksI7X69@cfu-9WGormBIdd=`^ZrKoL0ds}^g zWOgD|NpIeCzUvGe({YD^7I)G(@c-ONgMiJ@yoT5yHl_ z=)$x(#q_c}ZA?m4hdUjoT%1;z*ZFcLeTnt2rIm$tFAJ%e+0PMR0LKXE4juP7HL(`K zoa(a5DIS7DbW3PGAS91zJK{Bs?J>>@@@VE-3{+d75b-P~R~h;L07o4I5AUpd4TfTK@uoD6I9^jf_(z zr-uqiaUal-Y;qD|Z{Cm&`A-Y8Y&x;VGX*?OUn^0mQ|Y>nmK7bXK|1d=Zol+6RxXe1 zHqy}I`lIr}iSBdL6=%QuI6eIIWqc2j$D907z>Z*^vWRqrQW4d1^t0}=4q78xpPAG$ zZK;lX>~hGl91=Jc>6mOLConQwJFiT*M(qMaAS*SJxy(m0O~xNm?9s$e6@juzpN7yi zf6CA{(>b3b^?G;F5U4~$Cd&s3Wss~m=8EzhtRg!=cNgDd`?)f9o-0bvkg5*MHAAdE zMD~D|Fv?CJT`#{HK#Q)B3NNj+z8c0*?}!{rFPU<`74OpMp8j|%^ B*3|$2 diff --git a/bgfx/shaders/gles/fs_ntsc_decode.bin b/bgfx/shaders/gles/fs_ntsc_decode.bin index cb4ddcdb7b40ee11a23dbd2b2b351bfc1029da4d..d1e69f5e0e365a68ca3fee83530d4ebd3d4e0511 100644 GIT binary patch delta 83 zcmZ2xbj66%E!cyFvH8}CPB0*=X3`Lv`hdsmjjE!cy_-*txPMvfDVOdPzMFEKK)*yvSMRw>vjl%!Ualoq8LxhQB9#{)S! z3d#BTMJe${nji(%TnY+KiN&eT`8oMT@rHWkKplp92Ae;!7I3gbIg^9=EGDnwlLG)4 CiXh$BL21W)Ty38=qE`qNtKQl!kH!(9$K|_+=8;iqIko}f=r^^WguP2`T0dD29p;s$p{-NXepG%C+Fwn7a3?;bJcQj GF#rI39UhVZ literal 719 zcma))OHRWu5QftNn;`BmOPjtz9;=EKsAA6ntSGNqO5(_Q(1KX8=Z;)~6EJp@)D=`h ziWFIwI>aeKtM7oclJscAT^~BMc z8>2rgEqDw?$V(v9ezW0d(1oU`&>6d1V|X~jJrJY8=kumEQnoUz~=Vqb~zDhl*(H8x4LIu|efrh0Z@hyxVk7@Jlm zxDKNCF$Y4@9Cv1znE}CB0A_lKhvlLi7YSoz4vXRJ)A``Srxb@W%$+LAOm{~Anz(kH Z_I&%)!g74Im2Vad+)Yw{Q%~$;|u@* diff --git a/bgfx/shaders/gles/vs_deconverge.bin b/bgfx/shaders/gles/vs_deconverge.bin index 1183e5872a041eda905c9a19cdc8c6ec301100cc..08aeca09e237da782275d5022cac2a483c801f74 100644 GIT binary patch delta 91 zcmZqV-p9=m7VN=tTxa&oi5v$QKTbUPXtFn>ETi$}m5c`%CClPVQY(`4^NUgp6l@g| p5xmK%%o8RTu^3ENW$~T-nZ;n@0@lgPS$r6cCx2tspRCLp2LKodAo&0Q delta 59 zcmV-B0L1^k3xNv=R#Qj>-7MGCkqE#6w2{f;v&#X#0h6W!i~%r{F$FJ^VgyZ-G6XP@ RpaqlU1Wc2!1Td3e1zy687Ki`< diff --git a/bgfx/shaders/gles/vs_post.bin b/bgfx/shaders/gles/vs_post.bin index e9803083792fc61ba9b42102a8fba944e4556f55..9dd618de8a02bb855e0ba2f88983419191ff7d0b 100644 GIT binary patch delta 49 zcmey$vY1&mEZBpEvH8BAq>!~(6r`KP$-K}&d$BL21W)TT0T)cW1^urqw&OAw~5yk7!4=>Fkm#A ntjTB~WUQ%IWzD6aP?B3vmRJ;Ts8>GOicy}$KoiJ_Wz+)z4N@1y delta 65 zcmX@a+|4ZR7VN=tSLgZ_Mh4d6_>$BL21W)TDwrsqF>$5~d%1$Gf}x(l#0$EN1{41o UFd9zQXEb0j($uS(JcUsY0Cs~CrvLx| diff --git a/bgfx/shaders/glsl/fs_defocus.bin b/bgfx/shaders/glsl/fs_defocus.bin index 0adf5a7fd67b4c28fc665745d9dc1f646a05edb3..277656126642592e0c532d29afee05914fd39660 100644 GIT binary patch delta 355 zcmeyt{)l6O1(PbvM5{>}CJIS8rA0-lDe;EZTnY+hsmVqPCAkG4DmjKZE}@g=Dh$@%$3DF&KQ1599=Opw%@DA+1!XlMXUQ~=Qs28ao@z<6># zqaCx6rsm{AX0^!y%p8;NF$ysnP5#K}4y9`?6dToc({34KAxK;%%g|hhM{2Z?QB9NuETwDwQ$2(>P delta 233 zcmaFF@q>MW1=DWkiB^-uj1)?83(69U;tj326yWTMUyLR`=atYaSFlwu)H6VmGSaK4 zteRZNC^^}jQFih~Mmt8s$rl)%xC}Lc0BC}O0#HzNvLTZp8&C)+FnJ=g?&PUVvh0RX z>5GiIlbK5zu)WQ1=@tXepG%Cxb){G_AR6xwser(NaJ# diff --git a/bgfx/shaders/glsl/fs_distortion.bin b/bgfx/shaders/glsl/fs_distortion.bin index 11087b688ff8ad08f84ab593160d5426fcbfe7c1..149e638711c58f803ff5ad73d669c27bb863557a 100644 GIT binary patch literal 5164 zcmb7I&2HO95SEMfP_<|a^ab`5khVmNOZ~!ifYwFOTMu~vf{`d!fFvp;rBHQp>XY^r z`UIVs-C6FERO|qOWA5(EeEZGs`pw%vzP|eBzkmC^Z;x^DAvwg=`Kzm5@2dCRF@Aqc zR`F`HE7Z!5$2iZ*q}*itxI7%-xO3Gud5B`AS$Nef^ zX8AtV$3SPX%d+yX_+6H-c=h{ZeA+zj)3V&`AC*2>%G320EP#2n^i2_$X$4T>U;J~g zcS`azoEHE?iWBZFGf+CZ>mT=7eKfLuG}3UM&cfEeBSB>c&t~&C4@dR52>l_V+!3dQz9?;!JuZ(;W z>9$B;q@s&~8$q^(u{8x-#rwQ8wtb&Y_}Uy^!|@5i)fWd*7MqJ(z6FVQ*~VCypmwdB zwV*=B$u}k>I-=CJ@5IiSy}z*Bxq#zPGO%7jmUxsV19lvF%}NeDtAdGCkoP=K-G_Z$ ziPr+WMI?RvsMusaf^)s;3)nRqmH0*b-d;WPDu=}5Hhz;QkCdwb1`C@9Au~W({R3^| z{hT;(qB(@pXvJ4JLdGz_hM1gng{iZX6mqU>20|(oCQ8E)v@Ew!Zy=%-B|^o`Dl3K8 z;io}YiP6CYP}t1K$H*bTbx;Ck0NaIjHo+{Unxf*=QRO#C5*h=QzMwk)ja0CU=^K(* zUy1>R5YaFFnr#@I z_F6~MlSWBq3NZ8MdR?St98%%N2yhm`6rS{kNFMT}%Q7C+rks8VmhSH<)HynzQ%Rcj z-625LEk36li}AC{72Ge@4c>aGZifm3n`mV>Q@^vA(lb?uH>l-G6Cc#VP_WLV36u#U zmI<=AfOO1KGqZq&TbOO?@3SGe78`>QBQ*w{0)h6O3sJYk)mqCGJ&q1<wI^T76jXz)f)~4%Iy?&26wWVGIB!$< z64&B5!mc$28`o*LmU@?qYjGLZqK)e%uC;L)gBM-vxaX!_hrZOWGxn~$b$Hym{lhKH@1yBuJxhcxw}`WUx3r=3Zuo0%H^8Y6+!jfL$*HVrObFv)z2jR(J7S82d4um(H+tY@OID&A5uCEUW#)us$00g68K2QWX5&kZ#VyPRM8{WES zux}4|)B^$InF1cC z1y;&vqYPd;UY+%E^`ConUHw^>UVn6VUV*MS;0i3E5BlIuey}$4Ll-aT_`3wzrBhtt^ZTCcOeT=X^5-=0+m~|#S@O{|X znpM_uK$?MGPBA?h%Uq?UzM6_ayn;vNQkMuyEiDm25Sw2)!fWMoq@R^9T57ccNN?Z> z>ItP27a}93JxJ@wK2YDqedNA?BIgC9Ee$EpU=$i+K_XYG)Kjr$)f|3(G?!Wr5U^7h ePp0DH10)JfA+W6L>olH|mT80s-TG6%-}@gD#h+&Y literal 4921 zcmb7I+iu%N5LJryp=!|<{epc8NLy0G)zxqvpmh=Stq=JCf{`d!fFvp;B~x|$)GzHX z^b2}s_QG9Kc48nf#GRd)GxyoNd;iDRum1V(-)`sILtNY^`?xxN^{Uf()%orae>^11 zc)8vd>g2~moM&ZHuCrZSp7yCa{pk?z^K_r&X?#oe<1e5ZW%AK ze3$BLkXdZAto$qfkmXBr`u!n3uJ3kfS*~|?N*<2#bhUv7s8>hd6mgkWfQo;cpF5pn zlAmy20EQGtqAfBA9bR`2yY(u|w?r8WYiH}++S{UdcDJa${VlTfLyO}2qeb-m(xTS> zX_0C_)ubZX?l);Je;4eu>+UgIFU2-l??e!GAG$*M=C`CsZ?jF7$I-PqlR}-rk+{K^S4tj5x+&5x z5^>H0mx6T*t7{5f#mBs~y2FrfgjyY$;l+gDYQw>5*yiGmv4Yvp>84zmkaR8ENFjk< zkS}dYoXJvGf1Nu{iVv#O-?)TEL0t;95pZ$zOt?b2KxVl-_uxPfY|w&0nPEa)iMK>& z-+cO{oM_xIIMu{ZfNBYq_(g}@Jw2IIlL;;m1s&q%OmDnnrB077z^~VX;9|LE0(@aB3{GQUqs0(L2{gRQ~iWsE{&4In&|< zz;g&^6Dl!o80=_ANT@wQF=)n4xl9A(F2^Z=`qZY>=3VH>xhKI$xeToV32iAzQlNJA zvSMyh@Ap}G%PlJ6j_Q8Hg=bu46RSB_5uCR=M;_Qqte}8`KUb?FE#rv$vJl=8l+eAP zPtGFO=pL(EPGh7)#|@{q?LE(nW2tPd5S(()iKUKe68QA9n)ZZuVNL!}S2rLGlR^@f| z1{$7%uF?s`({wAJKrlTtrv{qpSu|Rec4Q-~&vgKltCyErdXv-pu4`<>*FD?4;PFU* zY4CWMyIz?+<*pe=)pOV9gEw`8r&W0dG=j%#fQx4S6q&cFa@5tlaTK}pDB^+SZuqdBmH_nm7N_Jvj3Iv4pKBPX>WZ||Rc;iJzJY3G~jgs5FkuP1N zeT-111Y7+)_zfq`GWIkZj9p?jp}im)ObnwC$%mq5W}C5^p`>ZZGCo|T_WttOi(S@A zmPVo3a#wk>DD{3p&w?U&dcoi+Cr5*5Je*$jfMz0QK_Q*wx{#|epH;znpc2p7WmrcOvJ)Z7`@(v&o*!<}sBLi!3d`W5r10w?v&0?5n=fhW)pP8bNo0yrWprOfCJ^28m is$3aJO>%yIQHp`4f|f#Ad~$wHevyHuHCHVc7Xtv;=@+X2 literal 646 zcmah{%TB{E5OfP%g7}9$+R#UE!l~i}RNVOhD{>x+l*ELZ?Bh=ub=M=a@C41+mZ>vbJL4f^;%{kE$en_vFqN{MO(gS;fTCU2^kW- zE1Lp_OvW$>sVb$zRp7xKVI)eWbc&U}DRZT3Xp?$VWtu;O^*t7>(ux0B?Jx%#sWOE+ zDI1_H_z1uZ!lA1-IDxodA>i)t2-I6)vE9KEPJ9qzhT%(aPl6i>ZyC7#pC5Vr$nbNW z$d2xZ;tb{xE*{QoV~-Xa8a838{VWeFG0Q6|vDQiPWTH2%m`>O043nic+8I!aTLI)1 zzQNJjV0U0ElsY&<7g^!kpw1X#G#h&W<_?OPWzF0mF=Lp83!0&-*$I2tUlE&L_ov_j IpFu!=0eSAk<^TWy diff --git a/bgfx/shaders/glsl/vs_deconverge.bin b/bgfx/shaders/glsl/vs_deconverge.bin index 137a591a958edd91e04c7c9c319c0e536245c3e5..2398d71b227230a80b7d74368222a64790ac0a13 100644 GIT binary patch delta 90 zcmbQrb%u*0EZBqPxX$dE6FCkr)=xaSW3n-$IHU3Add6->iTIM#isbzKq7(xKTZKdf nZ!#-$%VahdgULIYeJ8iG7))HiI@y}VhtYU)7qkB4?JRKsmaHC= delta 55 zcmV-70LcH$3Y7{7R#Qj>-7MGCkqE#6NRi37vzq~l0h2)ke*rL)!2^7gzymOmpaqk1 N1Wc1X1Td5C1YTNM6$StR diff --git a/bgfx/shaders/glsl/vs_post.bin b/bgfx/shaders/glsl/vs_post.bin index 510526ec5880f8c8359ec03d49d077d7aabcf80c..af6c9349f410fcc16eaa87e32ee35a9d92bb026b 100644 GIT binary patch delta 47 zcmdnV@{>s>EZBpEvH8%OMP(xP7$)+!zI01r3cvxUmKbTBru;Ra9y!=!3)%2Iy62PL5%e1pp%iPN)C? diff --git a/bgfx/shaders/metal/fs_deconverge.bin b/bgfx/shaders/metal/fs_deconverge.bin index 60d2550f74dfbfd785617ec979f190f9a6d10204..ff76a618ee1e3ce8fc955ea55e4f37d0505c7bde 100644 GIT binary patch delta 191 zcmaFLewTyCE!czQxX$dE3=DoO6M4Es6co~O@)Jvp6w2aDQY(`4^NUi9H%^(tH2FA_ zeZ8@!rlvKQf(r7zqV>9Ii+bWoc?F(; znccM=7pJLDw)f*dznPuc@%iP~*ROv6{nP8cebeg|d6aG-4HA)WgOz|ps31P;=SmhU z1$S|vE>wJZ6Rd^&mTn6Lzxn`SoCRtOxBe=NGdVmfhddlo;%=2?a*d;p?KE^XNg;2xBPxwFt9Sk!z_Cg%goJam6B7_b!4c z1*gSVKT)wC!PQl+f{pN_bh#YBDogS6siMVu2YOF|d#;Nx6w(>8S`6wFRp%+EW{$nl|rfc-Nq7{mP>OI64d- zGj=0)FL@aI-@tg!gCG8czVK0TH}=CxsqPHj*<=7icf#O(<*kvowte{GQdku}!2qs3oWJ(g&BsZE2 zdx=9`fi3X1qYJ3&P1sN#5W8}LzMBhnMqw z^W$&|o7lU|{mn<|tasJdGzzmkX~r*QFt3RA{D3fp(p&Q|3(7*d3dwQ8(?_Wo1e4yC zAEjV*qYMQUqK<-f+CfTePFnT{LTjZR_g z{{Ux=46ePY{GvzA-C7SPm3Par7qbaC_Kd-sI$Q1Dke>~srJ!ASvliZ5H?f^E5= z(F;CDFp}}fj>N%|!A{L!TQq1?gU4l~dQ#Q1f4>Lo20Mj=N;%arzO=uaHnQY4N>Lq# zb`N{ms+L7o0INE<>9DL$LMBH}pfx@_j4$LklZR_-#_})&vE`zQL2Xk9LDInCL%U>j z&sg%tU`wK=`(-c5^~Gg3e+Cr4x>}f}?~f^~6Ql!PEs F{{UBY&2az# diff --git a/bgfx/shaders/metal/fs_distortion.bin b/bgfx/shaders/metal/fs_distortion.bin index 6dca893e794c00446c48bf84799d90aeea45e95c..b1d6bd4c79daf4243eecfe5e0c247dc36bc86256 100644 GIT binary patch delta 1384 zcmZ`(J#5oJ6mBJ&KgZ6mlOode0;1S$;@D@WO%zHcs#GmMs??4kMJ}XeNaT=&Dy3vV zARz=y4~dNp3BkmGmjhIH-_f7wUSW zi3C9~bMoHfJVLp_0a-+OL?hR{v+%;3CQ)ZCOly7hYB1_chY=D*yIZr-GF>o4D^+;kAEiu-5!XVKl&zz44GN;R2=29KTnFFw1+C0!=#`%mUAbJ<2p) zJ_?M(%RmK2m@(GDGDO%o%rSxF9)B}ZmoP{srJ3iMC6blkX3UjU$K>=Ca{~S_c|Z&r zDLN~b=<-f*93BTN@GZE%Vj6PnAy{B5aGM<)Ot#Bp;0>E1u;SsOJr?D_r4FWggUHE~ z?g-V*y{XcEdRz(~a9P;llJJoeVV6t8!H}jQBw$J2QxB^m9aMCP*w+?o6l^P`!PC&} z3PSo?Td-|_v6X4s1x=X*iZ&EMCp8=%qBR_*!{$0hSq%vv4x!K_}^jBXWE%eYyj z`a?6al&~Xsz=@^*+sHDUie_S4U6UfG$rhtx$~Lqc*K*6PXwiKMRm*?xqm_LT%K#Ix zImz9NYCFJ|M8$*{%AxfV+>1@aPV6WFv<9WLwJ*0i^fmY$%RnNYfkJ$uL~PN=P>2q) qRIs!(sVfW=a0sYcM!Op??`zm{&8N5q0sg=535IR{*l-UX^2xv9qjKi} delta 1094 zcmZuwO-~b16a}%&2h*9hGXsLf4hk|up>$?iXw#rkA^}3;!i^h3#sp$aNk1T1RN_Jx zEFdvC3!^(X8kfYl^A{N6M}m7yj2ogPx<~JuwuDwUFZ1qw_nv#tIrDhrZCskVF@3uA z(XX#9Eid&QX)lmWRMzhq6UORtam_0)WZ5+*8pc&`WpT2QFO(PT#9hkY_VP=nok&_Z z2&_$?%vS4J-Zhu<1#i_glZoW8Q9mq;_1j>FpRPmM$()FH?U`_6)TXGwMKQ=_;Bh)C zTo!NW{+UzpopbO>*D=a-ie=Rx*icmSN59l=I}8k4d^cY47x9rF!4cnsD`FS61rDQf z;1s2=2rkxyp*9+cz6Y=?$aL?*Zy{2T@h&yBjQb*rLN9KLVLwq6d+vxs8Q-BA3162uoLRT zUT9Xas9@Qv7*z|3u)|Kkhb4cc@hp5k<1!aB>txxHp`=fGb*Ni~%7R0(HbanNI10~1 z8r5)^8uO9s_!fyN>lIeEQP&Rp5zFT`r0N({#~NMkGCP#jYfVw+{ay8P6O2njpik?; zgyx{6T?kjFBwLy0N~yd`%)i$9u&c%JL+gjCYrSkWV)DdhH9xvc!C5`m1k6NuuBYhd TivH)vnu6EfiTO?irB3xP)oMF6 diff --git a/bgfx/shaders/metal/fs_ntsc_decode.bin b/bgfx/shaders/metal/fs_ntsc_decode.bin index 5450ff39a7152ba3832a11c751128b0f6ed05e3d..1436bc4707c5116231a4b69a94397791d1225cb7 100644 GIT binary patch delta 108 zcmX?TI^T@PE!cyFvH8f^E!cyFvH8jrA%jtE{;c6r2)^Q=Rj3 n@{8gP^~x1&6*3ZY(liY93^X^Jvl?>qq6kfn5(t=lQosxVEeIQq diff --git a/bgfx/shaders/metal/fs_prescale.bin b/bgfx/shaders/metal/fs_prescale.bin index 035da8beca40ca62f1f09cbcb5478f03b8c4f8d7..6a3da392480084ed1b98155d1951154fce2cb223 100644 GIT binary patch delta 83 zcmcc4@r#AWE!cyFvH80B27=z^o?} gpIed>pQ%?CUy@ppoS$EmVlep|vniwDWE~c500>qc%K!iX literal 1111 zcmb7DO>fjN5DijK`4w|QF-_AYo9(5*1*s~BibKVzT3K$^*+z2W$RE`L>WN>jBMa~Vl9V(8zwGuZIo>d90W5r zM%+HI9ao>m$r|{c19U<%)4(HbrI2cM8ACOO3_r9|svSn3j^li`CIUS$(KWCa^h&Y) zM+f%TsxM>TNj0SXE!EPhmeXB7=!HZB){&sP|Hfw$9fA*hd?qK*2oi5tKSFUtFCC1a zJ>1=C!}gr^<91s@D@XkM95GOQ4Zg-=&Ash9u8I}eZqcI>0Farnir2e$-oy`}9a&5b z4?ed9&4x*E<&pF-(U=wDK8xgT7JpC6*Y9tg6isB27}*xI#?BWdC!% zh$crWH%aBjRTelJsgji-h3?GW3sy--&A82tUbXQA)JUooG!Wr45;t&zn)D7v~jwMBWs}%9j?T?< UzV#VKaa`hY9xLwIQ=VtP0aHO@rmL-wVc(On19sr>H BA_f2e delta 59 zcmX@Z)6K&Z7VN=tSLgZ_28KVZ8+q&)CvFnoT+XP*H2DPcY(|606IjhA&ti$4oXlcA PS&ubw@^>J8jI|8_YZ?^h diff --git a/bgfx/shaders/metal/vs_post.bin b/bgfx/shaders/metal/vs_post.bin index 7d355aa1df15bbf88e83e4dd5599a109795f717d..122b7dee5c387c772067b0ca196a2f12b636ec8d 100644 GIT binary patch delta 37 tcmbQs{*{#{EZBpEvH8`oczQRBZac~lGKXi{QRO6!-*RtC+}xu zpKQY@WeJrxQ7DZs&Mz%WPK{5=%q_O&LKaUhN=?m!iq~3mm8BK|jhg(BQFL<&V-RB~ x+*}1)1r3e(+>)I5Oua<7bp{Gr3ShxfJrq0iDk?P<^pT_x*63AePTt960|1NeN9Ouniform("u_screen_index"); + if (screen_index != nullptr) + { + float values[1] = { float(screen) }; + screen_index->set(values, sizeof(float)); + } +} + void bgfx_chain_entry::setup_auto_uniforms(render_primitive* prim, texture_manager& textures, uint16_t screen_width, uint16_t screen_height, uint32_t rotation_type, bool swap_xy, int32_t screen) { setup_screensize_uniforms(textures, screen_width, screen_height, screen); @@ -153,6 +163,7 @@ void bgfx_chain_entry::setup_auto_uniforms(render_primitive* prim, texture_manag setup_rotationtype_uniform(rotation_type); setup_swapxy_uniform(swap_xy); setup_quaddims_uniform(prim); + setup_screenindex_uniform(screen); } bool bgfx_chain_entry::setup_view(int view, uint16_t screen_width, uint16_t screen_height, int32_t screen) const diff --git a/src/osd/modules/render/bgfx/chainentry.h b/src/osd/modules/render/bgfx/chainentry.h index a80fc8656c0..69fbb34d7e8 100644 --- a/src/osd/modules/render/bgfx/chainentry.h +++ b/src/osd/modules/render/bgfx/chainentry.h @@ -49,6 +49,7 @@ private: void setup_rotationtype_uniform(uint32_t rotation_type) const; void setup_swapxy_uniform(bool swap_xy) const; void setup_quaddims_uniform(render_primitive* prim) const; + void setup_screenindex_uniform(int32_t screen) const; bool setup_view(int view, uint16_t screen_width, uint16_t screen_height, int32_t screen) const; void put_screen_buffer(render_primitive* prim, bgfx::TransientVertexBuffer* buffer) const; diff --git a/src/osd/modules/render/bgfx/shaders/fs_deconverge.sc b/src/osd/modules/render/bgfx/shaders/fs_deconverge.sc index d58e1bf6df9..b23e24951c3 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_deconverge.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_deconverge.sc @@ -1,4 +1,4 @@ -$input v_color0, v_texcoord0, v_texcoord1, v_texcoord2 +$input v_color0, v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3 // license:BSD-3-Clause // copyright-holders:Ryan Holtz,ImJezze @@ -13,8 +13,9 @@ SAMPLER2D(s_tex, 0); void main() { - float r = texture2D(s_tex, v_texcoord0).r; - float g = texture2D(s_tex, v_texcoord1).g; - float b = texture2D(s_tex, v_texcoord2).b; - gl_FragColor = vec4(r, g, b, 1.0) * v_color0; + float a = texture2D(s_tex, v_texcoord0).a; + float r = texture2D(s_tex, v_texcoord1).r; + float g = texture2D(s_tex, v_texcoord2).g; + float b = texture2D(s_tex, v_texcoord3).b; + gl_FragColor = vec4(r, g, b, a) * v_color0; } diff --git a/src/osd/modules/render/bgfx/shaders/fs_defocus.sc b/src/osd/modules/render/bgfx/shaders/fs_defocus.sc index 44ca7a93612..c9e76990f3f 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_defocus.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_defocus.sc @@ -46,5 +46,6 @@ void main() vec4 blurred = (d0 + d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8) / 9.0; - gl_FragColor = vec4(blurred.rgb, 1.0) * v_color0; + blurred.a = blurred.a + d0.a; + gl_FragColor = blurred * v_color0; } diff --git a/src/osd/modules/render/bgfx/shaders/fs_distortion.sc b/src/osd/modules/render/bgfx/shaders/fs_distortion.sc index 1b93578a2cf..8f4efa04cd3 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_distortion.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_distortion.sc @@ -188,33 +188,36 @@ void main() // Color vec4 BaseColor = texture2D(s_tex, BaseCoord); - BaseColor.a = 1.0; // Clamp if (BaseCoord.x > 1.0 || BaseCoord.y > 1.0 || BaseCoord.x < 0.0 || BaseCoord.y < 0.0) - BaseColor.rgb = vec3(0.0, 0.0, 0.0); - - // Vignetting Simulation - vec2 VignetteCoord = BaseCoordCentered; + { + gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0); + } + else + { + // Vignetting Simulation + vec2 VignetteCoord = BaseCoordCentered; - float VignetteFactor = GetVignetteFactor(VignetteCoord, u_vignetting.x); - BaseColor.rgb *= VignetteFactor; + float VignetteFactor = GetVignetteFactor(VignetteCoord, u_vignetting.x); + BaseColor.rgb *= VignetteFactor; - // Light Reflection Simulation - vec3 LightColor = vec3(1.0, 0.90, 0.80); // color temperature 5.000 Kelvin + // Light Reflection Simulation + vec4 LightColor = vec4(1.0, 0.90, 0.80, 1.0); // color temperature 5.000 Kelvin - vec2 SpotCoord = BaseCoordCentered; - vec2 NoiseCoord = BaseCoordCentered; + vec2 SpotCoord = BaseCoordCentered; + vec2 NoiseCoord = BaseCoordCentered; - float SpotAddend = GetSpotAddend(SpotCoord, u_reflection.x); - float NoiseFactor = GetNoiseFactor(SpotAddend, rand(NoiseCoord)); - BaseColor.rgb += SpotAddend * NoiseFactor * LightColor; + float SpotAddend = GetSpotAddend(SpotCoord, u_reflection.x); + float NoiseFactor = GetNoiseFactor(SpotAddend, rand(NoiseCoord)); + BaseColor += SpotAddend * NoiseFactor * LightColor; - // Round Corners Simulation - vec2 RoundCornerCoord = BaseCoordCentered; + // Round Corners Simulation + vec2 RoundCornerCoord = BaseCoordCentered; - float roundCornerFactor = GetRoundCornerFactor(RoundCornerCoord, u_round_corner.x, u_smooth_border.x); - BaseColor.rgb *= roundCornerFactor; + float roundCornerFactor = GetRoundCornerFactor(RoundCornerCoord, u_round_corner.x, u_smooth_border.x); + BaseColor.rgb *= roundCornerFactor; - gl_FragColor = BaseColor; + gl_FragColor = BaseColor; + } } diff --git a/src/osd/modules/render/bgfx/shaders/fs_ntsc_decode.sc b/src/osd/modules/render/bgfx/shaders/fs_ntsc_decode.sc index dda326cd692..1c6a53fba29 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_ntsc_decode.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_ntsc_decode.sc @@ -28,6 +28,7 @@ uniform vec4 u_jitter_amount; // Samplers SAMPLER2D(s_tex, 0); +SAMPLER2D(s_screen, 1); //----------------------------------------------------------------------------- // Constants @@ -35,7 +36,7 @@ SAMPLER2D(s_tex, 0); void main() { - vec4 BaseTexel = texture2D(s_tex, v_texcoord0.xy); + vec4 BaseTexel = texture2D(s_screen, v_texcoord0.xy); vec4 zero = vec4(0.0, 0.0, 0.0, 0.0); vec4 quarter = vec4(0.25, 0.25, 0.25, 0.25); diff --git a/src/osd/modules/render/bgfx/shaders/fs_post.sc b/src/osd/modules/render/bgfx/shaders/fs_post.sc index eab3b909909..27c71a61eba 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_post.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_post.sc @@ -1,4 +1,4 @@ -$input v_color0, v_texcoord0, v_texcoord1 +$input v_color0, v_texcoord0 // license:BSD-3-Clause // copyright-holders:Ryan Holtz,ImJezze @@ -101,7 +101,6 @@ void main() // Color vec4 BaseColor = texture2D(s_tex, BaseCoord); - BaseColor.a = 1.0; if (BaseCoord.x < 0.0 || BaseCoord.y < 0.0) { @@ -123,7 +122,7 @@ void main() // Color Compression // increasing the floor of the signal without affecting the ceiling BaseColor.rgb = u_floor.rgb + (vec3(1.0, 1.0, 1.0) - u_floor.rgb) * BaseColor.rgb; - + // Color Power BaseColor.r = pow(BaseColor.r, u_power.r); BaseColor.g = pow(BaseColor.g, u_power.g); @@ -155,5 +154,5 @@ void main() BaseColor.rgb *= HumBrightness; } - gl_FragColor = vec4(BaseColor.rgb * v_color0.rgb, 1.0); + gl_FragColor = vec4(BaseColor.rgb * v_color0.rgb, BaseColor.a); } diff --git a/src/osd/modules/render/bgfx/shaders/fs_prescale.sc b/src/osd/modules/render/bgfx/shaders/fs_prescale.sc index 48d177b19fa..1d8370dacf4 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_prescale.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_prescale.sc @@ -26,5 +26,5 @@ void main() vec2 TexCoord = (i + f) / u_source_dims.xy; - gl_FragColor = texture2D(s_tex, TexCoord) * v_color0; + gl_FragColor = texture2D(s_tex, v_texcoord0.xy) * v_color0; } diff --git a/src/osd/modules/render/bgfx/shaders/varying.def.sc b/src/osd/modules/render/bgfx/shaders/varying.def.sc index 95b607539a7..4bbc09efebe 100644 --- a/src/osd/modules/render/bgfx/shaders/varying.def.sc +++ b/src/osd/modules/render/bgfx/shaders/varying.def.sc @@ -2,6 +2,7 @@ vec4 v_color0 : COLOR0 = vec4(1.0, 0.0, 0.0, 1.0); vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0); vec2 v_texcoord1 : TEXCOORD1 = vec2(0.0, 0.0); vec2 v_texcoord2 : TEXCOORD2 = vec2(0.0, 0.0); +vec2 v_texcoord3 : TEXCOORD3 = vec2(0.0, 0.0); vec3 v_pos : TEXCOORD3 = vec3(0.0, 0.0, 0.0); vec3 a_position : POSITION; diff --git a/src/osd/modules/render/bgfx/shaders/vs_deconverge.sc b/src/osd/modules/render/bgfx/shaders/vs_deconverge.sc index 6e13814c89b..b714f84e4a6 100644 --- a/src/osd/modules/render/bgfx/shaders/vs_deconverge.sc +++ b/src/osd/modules/render/bgfx/shaders/vs_deconverge.sc @@ -1,5 +1,5 @@ $input a_position, a_texcoord0, a_color0 -$output v_color0, v_texcoord0, v_texcoord1, v_texcoord2 +$output v_color0, v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3 // license:BSD-3-Clause // copyright-holders:Dario Manesku @@ -23,9 +23,10 @@ void main() vec2 half_value = vec2(0.5, 0.5); - v_texcoord0 = (a_texcoord0 - half_value) * (1.0 + u_radial_converge_red.xy ) + half_value + u_converge_red.xy * (vec2(1.0, 1.0) / u_source_size.xy); - v_texcoord1 = (a_texcoord0 - half_value) * (1.0 + u_radial_converge_green.xy) + half_value + u_converge_green.xy * (vec2(1.0, 1.0) / u_source_size.xy); - v_texcoord2 = (a_texcoord0 - half_value) * (1.0 + u_radial_converge_blue.xy ) + half_value + u_converge_blue.xy * (vec2(1.0, 1.0) / u_source_size.xy); + v_texcoord0 = a_texcoord0; + v_texcoord1 = (a_texcoord0 - half_value) * (1.0 + u_radial_converge_red.xy ) + half_value + u_converge_red.xy * (vec2(1.0, 1.0) / u_source_size.xy); + v_texcoord2 = (a_texcoord0 - half_value) * (1.0 + u_radial_converge_green.xy) + half_value + u_converge_green.xy * (vec2(1.0, 1.0) / u_source_size.xy); + v_texcoord3 = (a_texcoord0 - half_value) * (1.0 + u_radial_converge_blue.xy ) + half_value + u_converge_blue.xy * (vec2(1.0, 1.0) / u_source_size.xy); v_color0 = a_color0; } diff --git a/src/osd/modules/render/bgfx/shaders/vs_post.sc b/src/osd/modules/render/bgfx/shaders/vs_post.sc index fcc643b4c8f..fd37320eefb 100644 --- a/src/osd/modules/render/bgfx/shaders/vs_post.sc +++ b/src/osd/modules/render/bgfx/shaders/vs_post.sc @@ -1,19 +1,14 @@ $input a_position, a_texcoord0, a_color0 -$output v_texcoord0, v_texcoord1, v_color0 +$output v_texcoord0, v_color0 // license:BSD-3-Clause // copyright-holders:Dario Manesku #include "../../../../../../3rdparty/bgfx/examples/common/common.sh" -// Autos -uniform vec4 u_source_dims; -uniform vec4 u_screen_dims; - void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); v_texcoord0 = a_texcoord0; - v_texcoord1 = a_texcoord0.xy * u_source_dims.xy / u_screen_dims.x; v_color0 = a_color0; } diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp index d955f8c76f2..8389d59cfad 100644 --- a/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp @@ -763,17 +763,33 @@ int renderer_bgfx::handle_screen_chains() // Determine how many post-processing passes are needed int screens = 0; + int total_screen_textures = 0; + std::vector bases; while (prim != nullptr) { if (PRIMFLAG_GET_SCREENTEX(prim->flags)) { - screens++; + total_screen_textures++; + bool found = false; + for (void* base : bases) + { + if (base == prim->texture.base) + { + found = true; + break; + } + } + if (!found) + { + screens++; + bases.push_back(prim->texture.base); + } } prim = prim->next(); } const uint32_t available_chains = m_screen_chains[window().m_index].size(); - screens = screens >= available_chains ? available_chains: screens; + screens = screens >= available_chains ? available_chains : screens; if (screens > 0) { @@ -827,6 +843,7 @@ int renderer_bgfx::draw(int update) s_current_view = 0; } + m_seen_views.clear(); m_ui_view = -1; // Set view 0 default viewport. @@ -857,7 +874,7 @@ int renderer_bgfx::draw(int update) bool atlas_valid = update_atlas(); render_primitive *prim = window().m_primlist->first(); - std::vector screens; + std::vector sources; while (prim != nullptr) { UINT32 blend = PRIMFLAG_GET_BLENDMODE(prim->flags); @@ -868,16 +885,16 @@ int renderer_bgfx::draw(int update) int32_t screen = -1; if (PRIMFLAG_GET_SCREENTEX(prim->flags)) { - for (screen = 0; screen < screens.size(); screen++) + for (screen = 0; screen < sources.size(); screen++) { - if (screens[screen] == prim->container->screen()) + if (sources[screen] == prim->texture.base) { break; } } - if (screen == screens.size()) + if (screen == sources.size()) { - screens.push_back(prim->container->screen()); + sources.push_back(prim->texture.base); } } @@ -966,8 +983,17 @@ void renderer_bgfx::setup_view(uint32_t view_index, bool screen) #if SCENE_VIEW if (view_index == m_max_view) -#endif { +#else + while ((view_index + 1) > m_seen_views.size()) + { + m_seen_views.push_back(false); + } + + if (!m_seen_views[view_index]) + { + m_seen_views[view_index] = true; +#endif bgfx::setViewClear(view_index, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x00000000, 1.0f, 0); } diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h index 823472f5c4a..30976a7fb76 100644 --- a/src/osd/modules/render/drawbgfx.h +++ b/src/osd/modules/render/drawbgfx.h @@ -115,6 +115,7 @@ private: bgfx_effect* m_gui_effect[4]; bgfx_effect* m_screen_effect[4]; std::vector> m_screen_chains; + std::vector m_seen_views; std::map m_hash_to_entry; std::vector m_texinfo; From 779969bd034bd81f363fb5b9663fd7a7e72ffe9a Mon Sep 17 00:00:00 2001 From: David Haywood Date: Tue, 29 Mar 2016 12:46:20 +0100 Subject: [PATCH 61/74] new clones Super Bishi Bashi Championship (ver KAB, 3 Players) [Skate] --- src/mame/drivers/bishi.cpp | 26 ++++++++++++++++++++++++-- src/mame/mame.lst | 1 + 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp index 207b3e65070..f46f2b3e8e6 100644 --- a/src/mame/drivers/bishi.cpp +++ b/src/mame/drivers/bishi.cpp @@ -460,6 +460,28 @@ ROM_START( sbishi ) ROM_END ROM_START( sbishik ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "kab05.12e", 0x000000, 0x80000, CRC(749063ca) SHA1(ef551132410248ef0b858fb8bcf6f8dd1115ad71) ) + ROM_LOAD16_WORD_SWAP( "kab06.15e", 0x080000, 0x80000, CRC(089e0f37) SHA1(9cd64ebfab716bbaf0ba420ad8168a33601699a9) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_LOAD16_BYTE( "675kaa07.14n", 0x000000, 0x080000, CRC(1177c1f8) SHA1(42c6f3c3a6bd0adb7d927386fd99f1497e5df30c) ) + ROM_LOAD16_BYTE( "675kaa08.17n", 0x000001, 0x080000, CRC(7117e9cd) SHA1(5a9b4b7427edcc10725d5936869927874fef6463) ) + ROM_LOAD16_BYTE( "675kaa09.19n", 0x100000, 0x080000, CRC(8d49c765) SHA1(7921f8f3671fbbc3d5ea529234268a1e23ea622c) ) + ROM_LOAD16_BYTE( "675kaa10.22n", 0x100001, 0x080000, CRC(c16acf32) SHA1(df3eeb5ab3bab8e707eaa79ffc500e1dc2332a82) ) + + // dummy region (game has no sprites, but we want to use the GX mixer) + ROM_REGION( 0x80000, "gfx2", ROMREGION_ERASE00 ) + + ROM_REGION( 0x200000, "ymz", 0 ) + ROM_LOAD( "675kaa01.2f", 0x000000, 0x080000, CRC(73ac6ae6) SHA1(37e4722647a13275c5f51d2bfa50df3e12ea1ebf) ) + ROM_LOAD( "675kaa02.4f", 0x080000, 0x080000, CRC(4c341e7c) SHA1(b944ea59d94f9ea5cea8ed8ad68da2a52c4bbfd7) ) + ROM_LOAD( "675kaa03.6f", 0x100000, 0x080000, CRC(83f91beb) SHA1(3af95f503f26fc88e75c786a9fef8a333c21d1d6) ) + ROM_LOAD( "675kaa04.8f", 0x180000, 0x080000, CRC(ebcbd813) SHA1(d67540d0ea303f09866f4a766e2d5162f05cd4ac) ) +ROM_END + + +ROM_START( sbishika ) ROM_REGION( 0x100000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "675kaa05.12e", 0x000000, 0x80000, CRC(23600e1d) SHA1(b3224c84e41e3077425a60232bb91775107f37a8) ) ROM_LOAD16_WORD_SWAP( "675kaa06.15e", 0x080000, 0x80000, CRC(bd1091f5) SHA1(29872abc49fe8209d0f414ca40a34fc494ff9b96) ) @@ -480,7 +502,7 @@ ROM_START( sbishik ) ROM_LOAD( "675kaa04.8f", 0x180000, 0x080000, CRC(ebcbd813) SHA1(d67540d0ea303f09866f4a766e2d5162f05cd4ac) ) ROM_END - GAME( 1996, bishi, 0, bishi, bishi, driver_device, 0, ROT0, "Konami", "Bishi Bashi Championship Mini Game Senshuken (ver JAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1998, sbishi, 0, bishi, bishi2p, driver_device, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver JAA, 2 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) -GAME( 1998, sbishik, sbishi, bishi, bishi, driver_device, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) +GAME( 1998, sbishik, sbishi, bishi, bishi, driver_device, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAB, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) +GAME( 1998, sbishika, sbishi, bishi, bishi, driver_device, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 561e8ecca67..d22c7ce5f08 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -8206,6 +8206,7 @@ topsecrt // 3/1987 (c) 1987 (Japan) bishi // GX575 (c) 1996 (Japan) sbishi // GX675 (c) 1998 (Japan) sbishik // GX675 (c) 1998 (Korea) +sbishika // GX675 (c) 1998 (Korea) @source:bitgraph.cpp bitgrpha // From 3c54c93f983732e2ba960a43dc1672e69fdcb3b2 Mon Sep 17 00:00:00 2001 From: Katsuhiko Kagami Date: Tue, 29 Mar 2016 21:09:23 +0900 Subject: [PATCH 62/74] more translate for japanese --- language/Japanese/strings.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/language/Japanese/strings.po b/language/Japanese/strings.po index f4b871677e5..a624275611e 100644 --- a/language/Japanese/strings.po +++ b/language/Japanese/strings.po @@ -444,7 +444,7 @@ msgstr "Mamescoreファイル" #: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44 msgid "Gameinit" -msgstr "" +msgstr "Gameinitファイル" #: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43 msgid "Command" @@ -556,7 +556,7 @@ msgstr "バーサス" #: src/emu/ui/dirmenu.cpp:58 src/emu/ui/menu.cpp:59 msgid "Covers" -msgstr "" +msgstr "カバー" #: src/emu/ui/dirmenu.cpp:116 src/emu/ui/dirmenu.cpp:136 msgid "Folders Setup" @@ -1038,7 +1038,7 @@ msgstr "マシン設定を保存する" #: src/emu/ui/miscmenu.cpp:967 src/emu/ui/miscmenu.cpp:987 #: src/emu/ui/selgame.cpp:587 msgid "Plugins" -msgstr "" +msgstr "プラグイン" #: src/emu/ui/optsmenu.cpp:214 msgid "Filter" @@ -1727,6 +1727,9 @@ msgid "" "\n" "Press any key to continue" msgstr "" +"\n" +"\n" +"進めるには、何かキーを押してください。" #: src/emu/ui/ui.cpp:1171 #, c-format From 8e41d3105b573c625a36b18c6442b3c362be45c7 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 14:40:40 +0200 Subject: [PATCH 63/74] added -plugins / -noplugins (to enable or disable plugins in total) [Miodrag Milanovic] and -plugin highscore (will enable just that plugin) and -noplugin highscore (will disable just that plugin) plugin/noplugin use comma separated list of plugins --- src/emu/emuopts.cpp | 3 ++ src/emu/emuopts.h | 8 ++++++ src/emu/mame.cpp | 64 ++++++++++++++++++++++++++++++++---------- src/emu/ui/selgame.cpp | 8 ++++-- 4 files changed, 66 insertions(+), 17 deletions(-) diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index e5906562d2a..97c635093ae 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -201,6 +201,9 @@ const options_entry emu_options::s_option_entries[] = { OPTION_AUTOBOOT_DELAY, "0", OPTION_INTEGER, "timer delay in sec to trigger command execution on autoboot" }, { OPTION_AUTOBOOT_SCRIPT ";script", nullptr, OPTION_STRING, "lua script to execute after machine boot" }, { OPTION_CONSOLE, "0", OPTION_BOOLEAN, "enable emulator LUA console" }, + { OPTION_PLUGINS, "1", OPTION_BOOLEAN, "enable LUA plugin support" }, + { OPTION_PLUGIN, nullptr, OPTION_STRING, "list of plugins to enable" }, + { OPTION_NO_PLUGIN, nullptr, OPTION_STRING, "list of plugins to disable" }, { OPTION_LANGUAGE ";lang", "English", OPTION_STRING, "display language" }, { nullptr } }; diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index a85c7485406..4c8a19c6613 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -203,6 +203,9 @@ enum #define OPTION_AUTOBOOT_SCRIPT "autoboot_script" #define OPTION_CONSOLE "console" +#define OPTION_PLUGINS "plugins" +#define OPTION_PLUGIN "plugin" +#define OPTION_NO_PLUGIN "noplugin" #define OPTION_LANGUAGE "language" @@ -393,6 +396,11 @@ public: const char *autoboot_script() const { return value(OPTION_AUTOBOOT_SCRIPT); } bool console() const { return bool_value(OPTION_CONSOLE); } + + bool plugins() const { return bool_value(OPTION_PLUGINS); } + + const char *plugin() const { return value(OPTION_PLUGIN); } + const char *no_plugin() const { return value(OPTION_NO_PLUGIN); } const char *language() const { return value(OPTION_LANGUAGE); } diff --git a/src/emu/mame.cpp b/src/emu/mame.cpp index 9e872c7a96f..f30c07514f5 100644 --- a/src/emu/mame.cpp +++ b/src/emu/mame.cpp @@ -154,25 +154,59 @@ void machine_manager::update_machine() } +std::vector split(const std::string &text, char sep) +{ + std::vector tokens; + std::size_t start = 0, end = 0; + while ((end = text.find(sep, start)) != std::string::npos) { + std::string temp = text.substr(start, end - start); + if (temp != "") tokens.push_back(temp); + start = end + 1; + } + std::string temp = text.substr(start); + if (temp != "") tokens.push_back(temp); + return tokens; +} + void machine_manager::start_luaengine() { - path_iterator iter(options().plugins_path()); - std::string pluginpath; - while (iter.next(pluginpath)) + if (options().plugins()) { - m_plugins->parse_json(pluginpath); - } - - { - // parse the file - std::string error; - // attempt to open the output file - emu_file file(options().ini_path(), OPEN_FLAG_READ); - if (file.open("plugin.ini") == osd_file::error::NONE) + path_iterator iter(options().plugins_path()); + std::string pluginpath; + while (iter.next(pluginpath)) { - bool result = m_plugins->parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_DRIVER_INI, error); - if (!result) - osd_printf_error("**Error loading plugin.ini**"); + m_plugins->parse_json(pluginpath); + } + std::vector include = split(options().plugin(),','); + std::vector exclude = split(options().no_plugin(),','); + { + // parse the file + std::string error; + // attempt to open the output file + emu_file file(options().ini_path(), OPEN_FLAG_READ); + if (file.open("plugin.ini") == osd_file::error::NONE) + { + bool result = m_plugins->parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_DRIVER_INI, error); + if (!result) + osd_printf_error("**Error loading plugin.ini**"); + } + } + for (auto curentry = m_plugins->first(); curentry != nullptr; curentry = curentry->next()) + { + if (!curentry->is_header()) + { + if (std::find(include.begin(), include.end(), curentry->name()) != include.end()) + { + std::string error_string; + m_plugins->set_value(curentry->name(), "1", OPTION_PRIORITY_CMDLINE, error_string); + } + if (std::find(exclude.begin(), exclude.end(), curentry->name()) != exclude.end()) + { + std::string error_string; + m_plugins->set_value(curentry->name(), "0", OPTION_PRIORITY_CMDLINE, error_string); + } + } } } m_lua->initialize(); diff --git a/src/emu/ui/selgame.cpp b/src/emu/ui/selgame.cpp index 349c59a605c..a29d815f88c 100644 --- a/src/emu/ui/selgame.cpp +++ b/src/emu/ui/selgame.cpp @@ -584,8 +584,12 @@ void ui_menu_select_game::populate() UINT32 flags_ui = MENU_FLAG_UI | MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW; item_append(_("Configure Options"), nullptr, flags_ui, (void *)(FPTR)CONF_OPTS); // item_append(_("Configure Machine"), nullptr, flags_ui, (void *)(FPTR)CONF_MACHINE); TODO - item_append(_("Plugins"), nullptr, flags_ui, (void *)(FPTR)CONF_PLUGINS); - skip_main_items = 2; + skip_main_items = 1; + if (machine().options().plugins()) + { + item_append(_("Plugins"), nullptr, flags_ui, (void *)(FPTR)CONF_PLUGINS); + skip_main_items++; + } } else skip_main_items = 0; From 21390cd79067fc0c99b34d435343675115e0e296 Mon Sep 17 00:00:00 2001 From: cracyc Date: Tue, 29 Mar 2016 07:42:29 -0500 Subject: [PATCH 64/74] hiscore: only you can prevent namespace pollution (nw) --- plugins/hiscore/init.lua | 74 +++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua index 63e68c0bb5d..d1466623931 100644 --- a/plugins/hiscore/init.lua +++ b/plugins/hiscore/init.lua @@ -5,7 +5,7 @@ -- high-score saving with hiscore.dat infom just as older -- builds did in the past. -- - +require('lfs') local exports = {} exports.name = "hiscore" exports.version = "1.0.0" @@ -22,19 +22,19 @@ end function hiscore.startplugin() - hiscoredata_path = "hiscore.dat"; - hiscore_path = "hi"; + local hiscoredata_path = "hiscore.dat"; + local hiscore_path = "hi"; - current_checksum = 0; - default_checksum = 0; + local current_checksum = 0; + local default_checksum = 0; - scores_have_been_read = false; - mem_check_passed = false; - current_game = ""; + local scores_have_been_read = false; + local mem_check_passed = false; + local found_hiscore_entry = false; - positions = {}; + local positions = {}; - function parse_table ( dsting ) + local function parse_table ( dsting ) local _table = {}; for line in string.gmatch(dsting, '([^\n]+)') do local cpu, mem; @@ -59,18 +59,19 @@ function hiscore.startplugin() end - function read_hiscore_dat () - file = io.open( hiscoredata_path, "r" ); + local function read_hiscore_dat () + local file = io.open( hiscoredata_path, "r" ); + local rm_match; if not file then file = io.open( hiscore_plugin_path .. "/hiscore.dat", "r" ); end if emu.softname() ~= "" then rm_match = '^' .. emu.romname() .. ',' .. emu.softname() .. ':'; else - rm_match = '^' .. emu.romname() .. ':'; - end - cluster = ""; - current_is_match = false; + rm_match = '^' .. emu.romname() .. ':'; + end + local cluster = ""; + local current_is_match = false; if file then repeat line = file:read("*l"); @@ -99,7 +100,7 @@ function hiscore.startplugin() end - function check_mem ( posdata ) + local function check_mem ( posdata ) if #posdata < 1 then return false; end @@ -116,7 +117,8 @@ function hiscore.startplugin() end - function get_file_name () + local function get_file_name () + local r; if emu.softname() ~= "" then r = hiscore_path .. '/' .. emu.romname() .. "_" .. emu.softname() .. ".hi"; else @@ -126,12 +128,12 @@ function hiscore.startplugin() end - function write_scores ( posdata ) + local function write_scores ( posdata ) print("write_scores") local output = io.open(get_file_name(), "wb"); if not output then -- attempt to create the directory, and try again - os.execute( "mkdir " .. hiscore_path ); + lfs.mkdir( hiscore_path ); output = io.open(get_file_name(), "wb"); end print("write_scores output") @@ -149,7 +151,7 @@ function hiscore.startplugin() end - function read_scores ( posdata ) + local function read_scores ( posdata ) local input = io.open(get_file_name(), "rb"); if input then for ri,row in ipairs(posdata) do @@ -166,12 +168,12 @@ function hiscore.startplugin() end - function check_scores ( posdata ) + local function check_scores ( posdata ) local r = 0; -- commonly the first entry will be for the entire table -- so it will only trigger a write once a player enters -- his/her name in. - row = positions[1]; + local row = positions[1]; for i=0,row["size"]-1 do r = r + row["mem"]:read_u8( row["addr"] + i ); end @@ -179,7 +181,7 @@ function hiscore.startplugin() end - function init () + local function init () if not scores_have_been_read then if check_mem( positions ) then default_checksum = check_scores( positions ); @@ -201,7 +203,7 @@ function hiscore.startplugin() local last_write_time = -10; - function tick () + local function tick () -- set up scores if they have been init(); -- only allow save check to run when @@ -225,27 +227,26 @@ function hiscore.startplugin() end end - function reset() + local function reset() -- the notifier will still be attached even if the running game has no hiscore.dat entry - if mem_check_passed and (emu.romname() == current_game) then + if mem_check_passed and found_hiscore_entry then local checksum = check_scores(positions) if checksum ~= current_checksum and checksum ~= default_checksum then write_scores(positions) end end - current_game = "" + found_hiscore_entry = false mem_check_passed = false - scores_have_been_read = false; + scores_have_been_read = false; end emu.register_start(function() - current_game = "" + found_hiscore_entry = false mem_check_passed = false scores_have_been_read = false; last_write_time = -10 print("Starting " .. emu.gamename()) - current_game = emu.romname() - dat = read_hiscore_dat() + local dat = read_hiscore_dat() if dat and dat ~= "" then print( "found hiscore.dat entry for " .. emu.romname() ); positions = parse_table( dat ); @@ -253,11 +254,14 @@ function hiscore.startplugin() print("hiscore.dat parse error"); return; end - + found_hiscore_entry = true end - emu.sethook( tick, "frame" ); end) - + emu.register_frame(function() + if found_hiscore_entry then + tick() + end + end) emu.register_stop(function() reset() end) From d468a4fd3f3ce09a1015890132f80c05329ed9d1 Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 29 Mar 2016 15:13:47 +0200 Subject: [PATCH 65/74] sm510: pinout reference --- src/devices/cpu/sm510/sm510.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h index 113b406d544..b8274fd2f0c 100644 --- a/src/devices/cpu/sm510/sm510.h +++ b/src/devices/cpu/sm510/sm510.h @@ -62,6 +62,30 @@ enum /* + b2 a3 b3 a4 b4 a5 b5 GNDa6 b6 a7 b7 a8 b8 a9 + 45 44 43 42 41 40 39 38 37 36 35 34 33 32 31 + ______________________________________________ + | | +a2 46 | | 30 b9 +b1 47 | | 29 a10 +a1 48 | | 28 b10 +H4 49 | | 27 a11 +H3 50 | | 26 b11 +H2 51 | | 25 a12 +H1 52 | SM510 | 24 b12 +S1 53 | SM511 | 23 a13 +S2 54 | | 22 b13 +S3 55 | | 21 a14 +S4 56 | | 20 b14 +S5 57 | | 19 a15 +S6 58 | | 18 b15 +S7 59 | | 17 a16 +S8 60 | * | 16 b16 + |______________________________________________/ + + 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + T K1 K2 K3 K4 ACL | GND |OSCin| bt R1 R2 bs note: bt = beta symbol + BA OSCout Vdd */ class sm510_base_device : public cpu_device From fe5c894890692b84bdae531b849ab88517e2b010 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 15:48:24 +0200 Subject: [PATCH 66/74] added line back removed by mistake (nw) --- scripts/build/makedep.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build/makedep.py b/scripts/build/makedep.py index e90a8b7de3d..2ce47d42cd0 100644 --- a/scripts/build/makedep.py +++ b/scripts/build/makedep.py @@ -236,6 +236,7 @@ if sys.argv[3]=='target': sys.stdout.write(' MAME_DIR .. "src/lib/util",\n') sys.stdout.write(' MAME_DIR .. "src/lib/netlist",\n') sys.stdout.write(' MAME_DIR .. "3rdparty",\n') + sys.stdout.write(' GEN_DIR .. "mame/layout",\n') sys.stdout.write(' ext_includedir("zlib"),\n') sys.stdout.write(' ext_includedir("flac"),\n') sys.stdout.write(' }\n') From d3a0e6c6c11d9f53a6d11bc3ca56f961970fbbfd Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 16:02:10 +0200 Subject: [PATCH 67/74] Finished both Serbian translations (nw) --- language/Serbian/strings.po | 312 +++++++++------------- language/Serbian_Cyrillic/strings.po | 372 +++++++++++---------------- 2 files changed, 284 insertions(+), 400 deletions(-) diff --git a/language/Serbian/strings.po b/language/Serbian/strings.po index f801e746e33..f21e76216e0 100644 --- a/language/Serbian/strings.po +++ b/language/Serbian/strings.po @@ -41,7 +41,7 @@ msgid "" "Cheat Comment:\n" "%s" msgstr "" -"Primedba za varanje:\n" +"Komentar za varanje:\n" "%s" #: src/emu/ui/cheatopt.cpp:90 @@ -50,7 +50,7 @@ msgstr "Sva varanja ponovo učitana" #: src/emu/ui/cheatopt.cpp:121 msgid "Autofire Settings" -msgstr "Podešenja automatskog pucanja" +msgstr "Podešavanja automatskog pucanja" #: src/emu/ui/cheatopt.cpp:139 msgid "Reset All" @@ -147,12 +147,12 @@ msgstr "Drugi filter" #: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:235 msgid "^!Manufacturer" -msgstr "" +msgstr "^!Proizvođač" #: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472 #: src/emu/ui/optsmenu.cpp:243 msgid "^!Year" -msgstr "" +msgstr "^!Godina" #: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508 msgid "Remove last filter" @@ -169,19 +169,19 @@ msgstr "Izbor proizvoljnih filtera" #: src/emu/ui/custmenu.cpp:463 msgid "^!Publisher" -msgstr "" +msgstr "^!Izdavač" #: src/emu/ui/custmenu.cpp:481 msgid "^!Software List" -msgstr "" +msgstr "^!Lista programa" #: src/emu/ui/custmenu.cpp:490 msgid "^!Device type" -msgstr "" +msgstr "^!Tip uredjaja" #: src/emu/ui/custmenu.cpp:499 msgid "^!Region" -msgstr "" +msgstr "^!Region" #: src/emu/ui/custui.cpp:22 msgid "Show All" @@ -217,11 +217,11 @@ msgstr "Prikaži bočne panele" #: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186 msgid "Custom UI Settings" -msgstr "Proizvoljna podešenja korisničkog interfejsa" +msgstr "Podešavanja korisničkog interfejsa" #: src/emu/ui/custui.cpp:244 msgid "default" -msgstr "" +msgstr "uobičajeno" #: src/emu/ui/custui.cpp:347 msgid "UI Font" @@ -233,7 +233,7 @@ msgstr "Podebljano" #: src/emu/ui/custui.cpp:353 msgid "Italic" -msgstr "Ukošeno" +msgstr "Iskošeno" #: src/emu/ui/custui.cpp:358 msgid "Lines" @@ -245,7 +245,7 @@ msgstr "Visina teksta za informacije" #: src/emu/ui/custui.cpp:381 msgid "UI Fonts Settings" -msgstr "Podešenje fontova za korisnički interfejs" +msgstr "Podešavanje fontova za korisnički interfejs" #: src/emu/ui/custui.cpp:408 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit." @@ -270,7 +270,7 @@ msgstr "Boja pozadine za izabranu stavku" #: src/emu/ui/custui.cpp:510 msgid "Subitem color" -msgstr "Boja podstavke" +msgstr "Boja pod-stavke" #: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606 msgid "Clone" @@ -298,7 +298,7 @@ msgstr "Boja klizača" #: src/emu/ui/custui.cpp:517 msgid "Gfx viewer background" -msgstr "" +msgstr "Grafički prikaz pozadine" #: src/emu/ui/custui.cpp:518 msgid "Mouse over color" @@ -310,11 +310,11 @@ msgstr "Boja pozadine pri prelasku miša" #: src/emu/ui/custui.cpp:520 msgid "Mouse down color" -msgstr "" +msgstr "Boja pri pritisku miša" #: src/emu/ui/custui.cpp:521 msgid "Mouse down background color" -msgstr "" +msgstr "Boja pozadine miša" #: src/emu/ui/custui.cpp:524 msgid "Restore originals colors" @@ -322,12 +322,12 @@ msgstr "Vrati originalne boje" #: src/emu/ui/custui.cpp:540 msgid "UI Colors Settings" -msgstr "Podešenje boja korisničkog interfejsa" +msgstr "Podešavanje boja korisničkog interfejsa" #: src/emu/ui/custui.cpp:568 #, c-format msgid "Double click or press %1$s to change the color value" -msgstr "" +msgstr "Dupli klik ili pritisnite %1$s da promenite boju" #: src/emu/ui/custui.cpp:594 msgid "Menu Preview" @@ -339,7 +339,7 @@ msgstr "Normalno" #: src/emu/ui/custui.cpp:603 msgid "Subitem" -msgstr "Podstavka" +msgstr "Pod-stavka" #: src/emu/ui/custui.cpp:604 msgid "Selected" @@ -351,22 +351,22 @@ msgstr "Prelay mišem" #: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840 msgid "Alpha" -msgstr "" +msgstr "Alfa" #: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848 #: src/emu/ui/custui.cpp:1007 msgid "Red" -msgstr "" +msgstr "Crvenа" #: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856 #: src/emu/ui/custui.cpp:1010 msgid "Green" -msgstr "" +msgstr "Zelenа" #: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864 #: src/emu/ui/custui.cpp:1011 msgid "Blue" -msgstr "" +msgstr "Plavа" #: src/emu/ui/custui.cpp:867 msgid "Choose from palette" @@ -374,39 +374,39 @@ msgstr "Izabrati iz palete" #: src/emu/ui/custui.cpp:883 msgid " - ARGB Settings" -msgstr " - ARGB podešenja" +msgstr " - ARGB podešavanja" #: src/emu/ui/custui.cpp:907 msgid "Color preview =" -msgstr "Probni prikaz boja =" +msgstr "Prikaz boja =" #: src/emu/ui/custui.cpp:1003 msgid "White" -msgstr "" +msgstr "Bela" #: src/emu/ui/custui.cpp:1004 msgid "Silver" -msgstr "" +msgstr "Srebrna" #: src/emu/ui/custui.cpp:1005 msgid "Gray" -msgstr "" +msgstr "Siva" #: src/emu/ui/custui.cpp:1006 msgid "Black" -msgstr "" +msgstr "Crna" #: src/emu/ui/custui.cpp:1008 msgid "Orange" -msgstr "" +msgstr "Narandžasta" #: src/emu/ui/custui.cpp:1009 msgid "Yellow" -msgstr "" +msgstr "Žuta" #: src/emu/ui/custui.cpp:1012 msgid "Violet" -msgstr "" +msgstr "Ljubičasta" #: src/emu/ui/datmenu.cpp:64 msgid "Software History" @@ -429,11 +429,11 @@ msgstr "Istorija" #: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40 msgid "Mameinfo" -msgstr "Mame - informacije" +msgstr "МАМЕ - informacije" #: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42 msgid "Messinfo" -msgstr "Mess - informacije" +msgstr "МESS - informacije" #: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41 msgid "Sysinfo" @@ -445,7 +445,7 @@ msgstr "Mamescore" #: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44 msgid "Gameinit" -msgstr "" +msgstr "Inicijalizacija" #: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43 msgid "Command" @@ -557,16 +557,16 @@ msgstr "Versus ekrani" #: src/emu/ui/dirmenu.cpp:58 src/emu/ui/menu.cpp:59 msgid "Covers" -msgstr "" +msgstr "Maske" #: src/emu/ui/dirmenu.cpp:116 src/emu/ui/dirmenu.cpp:136 msgid "Folders Setup" -msgstr "Podešenje direktorijuma" +msgstr "Podešavanje direktorijuma" #: src/emu/ui/dirmenu.cpp:183 #, c-format msgid "Current %1$s Folders" -msgstr "" +msgstr "Trenutni %1$s direktorijum" #: src/emu/ui/dirmenu.cpp:195 msgid "Change Folder" @@ -583,12 +583,12 @@ msgstr "Ukloni direktorijum" #: src/emu/ui/dirmenu.cpp:496 #, c-format msgid "Change %1$s Folder - Search: %2$s_" -msgstr "" +msgstr "Promeni %1$s direktorijum - Pretraga: %2$s_" #: src/emu/ui/dirmenu.cpp:497 #, c-format msgid "Add %1$s Folder - Search: %2$s_" -msgstr "" +msgstr "Dodaj %1$s direktorijum - Pretraga: %2$s_" #: src/emu/ui/dirmenu.cpp:534 msgid "Press TAB to set" @@ -597,15 +597,15 @@ msgstr "Pritisnite TAB da podesite" #: src/emu/ui/dirmenu.cpp:640 #, c-format msgid "Remove %1$s Folder" -msgstr "" +msgstr "Ukloni %1$s direktorijum" #: src/emu/ui/dsplmenu.cpp:38 msgid "Video Mode" -msgstr "" +msgstr "Video mod" #: src/emu/ui/dsplmenu.cpp:40 msgid "Triple Buffering" -msgstr "" +msgstr "Trostruko baferovanje" #: src/emu/ui/dsplmenu.cpp:41 msgid "HLSL" @@ -617,31 +617,31 @@ msgstr "" #: src/emu/ui/dsplmenu.cpp:44 msgid "Bilinear Filtering" -msgstr "" +msgstr "Bilinearni filter" #: src/emu/ui/dsplmenu.cpp:45 msgid "Bitmap Prescaling" -msgstr "" +msgstr "Pre-skaliranje" #: src/emu/ui/dsplmenu.cpp:46 msgid "Window Mode" -msgstr "" +msgstr "Izvršavaj u prozoru" #: src/emu/ui/dsplmenu.cpp:47 msgid "Enforce Aspect Ratio" -msgstr "" +msgstr "Forsiraj odnos stranica" #: src/emu/ui/dsplmenu.cpp:48 msgid "Start Out Maximized" -msgstr "" +msgstr "Startuj maksimizovano" #: src/emu/ui/dsplmenu.cpp:49 msgid "Synchronized Refresh" -msgstr "" +msgstr "Sinhronizovano osvežavanje" #: src/emu/ui/dsplmenu.cpp:50 msgid "Wait Vertical Sync" -msgstr "" +msgstr "Čekaj vertikalnu sinhronizaciju" #: src/emu/ui/dsplmenu.cpp:202 src/emu/ui/dsplmenu.cpp:222 #: src/emu/ui/optsmenu.cpp:261 @@ -650,7 +650,7 @@ msgstr "Opcije prikaza" #: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" -msgstr "" +msgstr "Fajl već postoji - prepiši?" #: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 @@ -670,77 +670,79 @@ msgstr "Da" #: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" -msgstr "" +msgstr "Novo ime:" #: src/emu/ui/filesel.cpp:281 msgid "Image Format:" -msgstr "" +msgstr "Format zapisa:" #: src/emu/ui/filesel.cpp:287 msgid "Create" -msgstr "" +msgstr "Kreiraj" #: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" -msgstr "" +msgstr "Molim unesite i ekstenziju" #: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" -msgstr "" +msgstr "[prazan slot]" #: src/emu/ui/filesel.cpp:510 msgid "[create]" -msgstr "" +msgstr "[kreiraj]" #: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" -msgstr "" +msgstr "[lista programa]" #: src/emu/ui/filesel.cpp:806 msgid "Select image format" -msgstr "" +msgstr "Odaberi format" #: src/emu/ui/filesel.cpp:866 msgid "Select access mode" -msgstr "" +msgstr "Odaberi mod pristupa" #: src/emu/ui/filesel.cpp:867 msgid "Read-only" -msgstr "" +msgstr "Samo čitanje" #: src/emu/ui/filesel.cpp:869 msgid "Read-write" -msgstr "" +msgstr "Čitanje-pisanje" #: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" -msgstr "" +msgstr "Čitaj ovaj fajl, piši u drugi" #: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" -msgstr "" +msgstr "Čitaj ovaj fajl, piši razlike" #: src/emu/ui/imgcntrl.cpp:115 msgid "Cannot save over directory" -msgstr "" +msgstr "Nemoguće snimiti preko direktorijuma" #: src/emu/ui/imgcntrl.cpp:149 msgid "" "The software selected is missing one or more required ROM or CHD images. " "Please select a different one." msgstr "" +"Odabranom programu nedostaje jedan ili više ROM ili CHD fajlova. " +"Molim odaberite drugi." #: src/emu/ui/info.cpp:98 msgid "Not supported" -msgstr "" +msgstr "Nije podržano" #: src/emu/ui/info.cpp:101 msgid "Partially supported" -msgstr "" +msgstr "Delimično podržano" #: src/emu/ui/info.cpp:109 msgid "[empty]" -msgstr "" +msgstr "[prazno]" #: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:90 msgid "Pseudo terminals" @@ -748,15 +750,15 @@ msgstr "Pseudo terminali" #: src/emu/ui/info_pty.cpp:35 msgid "[failed]" -msgstr "" +msgstr "[neuspešno]" #: src/emu/ui/inputmap.cpp:52 msgid "User Interface" -msgstr "" +msgstr "Korisnički interfejs" #: src/emu/ui/inputmap.cpp:59 msgid "Other Controls" -msgstr "" +msgstr "Ostale kontrole" #: src/emu/ui/inputmap.cpp:625 src/emu/ui/miscmenu.cpp:90 #: src/emu/ui/slotopt.cpp:172 @@ -765,11 +767,11 @@ msgstr "Resetuj" #: src/emu/ui/mainmenu.cpp:53 msgid "Input (general)" -msgstr "Podešenje kontrola (globalno)" +msgstr "Podešavanje kontrola (globalno)" #: src/emu/ui/mainmenu.cpp:55 msgid "Input (this Machine)" -msgstr "Podešenje kontrola (ova mašina)" +msgstr "Podešavanje kontrola (ova mašina)" #: src/emu/ui/mainmenu.cpp:59 msgid "Analog Controls" @@ -785,7 +787,7 @@ msgstr "Konfiguracija mašine" #: src/emu/ui/mainmenu.cpp:68 msgid "Bookkeeping Info" -msgstr "Informacije o knjigovodstvu mašine" +msgstr "Informacije o statistici mašine" #: src/emu/ui/mainmenu.cpp:71 msgid "Machine Information" @@ -793,11 +795,11 @@ msgstr "Informacije o mašini" #: src/emu/ui/mainmenu.cpp:77 msgid "Image Information" -msgstr "Informacije o slici" +msgstr "Informacije o programu" #: src/emu/ui/mainmenu.cpp:80 msgid "File Manager" -msgstr "Fajl menadžer" +msgstr "Upravljanje fajlovima" #: src/emu/ui/mainmenu.cpp:85 msgid "Tape Control" @@ -809,7 +811,7 @@ msgstr "Izbor BIOS-a" #: src/emu/ui/mainmenu.cpp:99 msgid "Slot Devices" -msgstr "" +msgstr "Slot uređaji" #: src/emu/ui/mainmenu.cpp:106 msgid "Barcode Reader" @@ -857,31 +859,31 @@ msgstr "Izaberi novu mašinu" #: src/emu/ui/menu.cpp:45 msgid "Control Panels" -msgstr "" +msgstr "Kontrolni panel" #: src/emu/ui/menu.cpp:50 msgid "Artwork Preview" -msgstr "" +msgstr "Pregled artwork-a" #: src/emu/ui/menu.cpp:54 msgid "Game Over" -msgstr "" +msgstr "Završni ekran igre" #: src/emu/ui/menu.cpp:64 msgid "Add or remove favorites" -msgstr "" +msgstr "Dodavanje ili uklanjanje omiljenih" #: src/emu/ui/menu.cpp:65 msgid "Export displayed list to file" -msgstr "" +msgstr "Eksportuj prikazanu listu u fajl" #: src/emu/ui/menu.cpp:66 msgid "Show DATs view" -msgstr "" +msgstr "Prikaži DAT" #: src/emu/ui/menu.cpp:253 msgid "Return to Machine" -msgstr "Podešenje kontrola (ova mašina)" +msgstr "Podešavanje kontrola (ova mašina)" #: src/emu/ui/menu.cpp:257 src/emu/ui/menu.cpp:259 msgid "Exit" @@ -893,15 +895,15 @@ msgstr "Povratak u prethodni meni" #: src/emu/ui/menu.cpp:681 msgid "Auto" -msgstr "" +msgstr "Automatski" #: src/emu/ui/menu.cpp:2098 msgid "Images" -msgstr "" +msgstr "Programi" #: src/emu/ui/menu.cpp:2099 msgid "Infos" -msgstr "" +msgstr "Informacije" #: src/emu/ui/miscmenu.cpp:36 msgid "Keyboard Mode:" @@ -1011,7 +1013,7 @@ msgstr "%s.xml sačuvan u ui direktorijum." #: src/emu/ui/miscmenu.cpp:765 msgid "Name: Description:\n" -msgstr "Ime: Opis:\n" +msgstr "Ime: Opis:\n" #: src/emu/ui/miscmenu.cpp:777 #, c-format @@ -1020,11 +1022,11 @@ msgstr "%s.txt sačuvan u ui direktorijum." #: src/emu/ui/miscmenu.cpp:795 msgid "Export XML format (like -listxml)" -msgstr "Izvezi XML format" +msgstr "Izvezi XML format (kao -listxml)" #: src/emu/ui/miscmenu.cpp:796 msgid "Export TXT format (like -listfull)" -msgstr "Izvezi TXT format" +msgstr "Izvezi TXT format (kao -listfull)" #: src/emu/ui/miscmenu.cpp:854 msgid "Dummy" @@ -1037,7 +1039,7 @@ msgstr "Sačuvaj konfiguraciju mašine" #: src/emu/ui/miscmenu.cpp:967 src/emu/ui/miscmenu.cpp:987 #: src/emu/ui/selgame.cpp:587 msgid "Plugins" -msgstr "" +msgstr "Dodatci" #: src/emu/ui/optsmenu.cpp:214 msgid "Filter" @@ -1045,15 +1047,15 @@ msgstr "Filter" #: src/emu/ui/optsmenu.cpp:222 msgid " ^!File" -msgstr "" +msgstr " ^!Fajl" #: src/emu/ui/optsmenu.cpp:227 msgid " ^!Category" -msgstr "" +msgstr " ^!Kategorija" #: src/emu/ui/optsmenu.cpp:250 msgid "^!Setup custom filter" -msgstr "" +msgstr "^!Pripremi filter" #: src/emu/ui/optsmenu.cpp:258 msgid "Customize UI" @@ -1078,7 +1080,7 @@ msgstr "Sačuvaj konfiguraciju" #: src/emu/ui/optsmenu.cpp:281 src/emu/ui/optsmenu.cpp:301 msgid "Settings" -msgstr "Podešenja" +msgstr "Podešavanja" #: src/emu/ui/optsmenu.cpp:321 msgid "**Error saving ui.ini**" @@ -1106,7 +1108,7 @@ msgstr "Izborna lista - pretraga:" #: src/emu/ui/selector.cpp:194 #, c-format msgid "Double click or press %1$s to select" -msgstr "" +msgstr "Dupli klik ili pritisnite %1$s za selektovanje" #: src/emu/ui/selgame.cpp:38 msgid "General Info" @@ -1186,7 +1188,7 @@ msgstr "Drajver je klon od: %1$-.100s" #: src/emu/ui/selgame.cpp:841 src/emu/ui/selsoft.cpp:757 msgid "Driver is parent" -msgstr "Drajver je predak" +msgstr "Drajver je osnovni" #: src/emu/ui/selgame.cpp:845 src/emu/ui/selsoft.cpp:761 #: src/emu/ui/simpleselgame.cpp:332 @@ -1322,7 +1324,7 @@ msgstr "Zvuk: OK\n" #: src/emu/ui/selgame.cpp:1560 #, c-format msgid "Driver is Skeleton: %1$s\n" -msgstr "Drajver je okosnica: %s\n" +msgstr "Drajver je \"skelet\": %s\n" #: src/emu/ui/selgame.cpp:1561 #, c-format @@ -1337,7 +1339,7 @@ msgstr "Zahteva ilustracije: %1$s\n" #: src/emu/ui/selgame.cpp:1563 #, c-format msgid "Requires Clickable Artwork: %1$s\n" -msgstr "Zahteva ilustracije na koje moze da se klikne: %1$s\n" +msgstr "Zahteva klik ilustracije: %1$s\n" #: src/emu/ui/selgame.cpp:1564 #, c-format @@ -1420,6 +1422,10 @@ msgid "" "\n" "Press any key (except ESC) to continue." msgstr "" +"Selektovanom programu nedostaje jedan ili više fajlova. Molim selektujte " +"drugi program.\n" +"\n" +"Pritisnite bilo koji taster (osim ESC) za nastavak." #: src/emu/ui/selsoft.cpp:682 #, c-format @@ -1487,7 +1493,7 @@ msgstr "" "definisanu u %1$s.ini fajlu\n" "\n" "Ako je ovo Vaš prvi put da koristite %2$s, molimo Vas pogledajte config.txt " -"fajl u docs direktorijumu za informacije o podešenju %2$s." +"fajl u docs direktorijumu za informacije o podešavanju %2$s." #: src/emu/ui/simpleselgame.cpp:287 #, c-format @@ -1538,68 +1544,68 @@ msgstr "Koristi dodatne semplove" #: src/emu/ui/swlist.cpp:70 msgid "[file manager]" -msgstr "" +msgstr "[upravljanje fajlovima]" #: src/emu/ui/swlist.cpp:235 msgid "Switch Item Ordering" -msgstr "" +msgstr "Promeni sortiranje" #: src/emu/ui/swlist.cpp:268 #, c-format msgid "Switched Order: entries now ordered by %s" -msgstr "" +msgstr "Promenjen redosled: sada je sortirano po %s" #: src/emu/ui/swlist.cpp:268 msgid "shortname" -msgstr "" +msgstr "skraćeno ime" #: src/emu/ui/swlist.cpp:268 msgid "description" -msgstr "" +msgstr "opis" #: src/emu/ui/swlist.cpp:436 msgid "[compatible lists]" -msgstr "" +msgstr "[kompatibilne liste]" #: src/emu/ui/tapectrl.cpp:84 msgid "stopped" -msgstr "" +msgstr "stopirano" #: src/emu/ui/tapectrl.cpp:86 msgid "playing" -msgstr "" +msgstr "reprodukcija" #: src/emu/ui/tapectrl.cpp:86 msgid "(playing)" -msgstr "" +msgstr "(reprodukcija)" #: src/emu/ui/tapectrl.cpp:87 msgid "recording" -msgstr "" +msgstr "snimanje" #: src/emu/ui/tapectrl.cpp:87 msgid "(recording)" -msgstr "" +msgstr "(snimanje)" #: src/emu/ui/tapectrl.cpp:94 msgid "Pause/Stop" -msgstr "" +msgstr "Pauza/Stop" #: src/emu/ui/tapectrl.cpp:97 msgid "Play" -msgstr "" +msgstr "Pusti" #: src/emu/ui/tapectrl.cpp:100 msgid "Record" -msgstr "" +msgstr "Snimi" #: src/emu/ui/tapectrl.cpp:103 msgid "Rewind" -msgstr "" +msgstr "Premotaj" #: src/emu/ui/tapectrl.cpp:106 msgid "Fast Forward" -msgstr "" +msgstr "Premotaj u napred" #: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " @@ -1722,6 +1728,9 @@ msgid "" "\n" "Press any key to continue" msgstr "" +"\n" +"\n" +"Pritsnite bilo koji taster za nastavak" #: src/emu/ui/ui.cpp:1171 #, c-format @@ -1880,7 +1889,7 @@ msgstr "%1$s kontrast" #: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" -msgstr "%1$s gamut" +msgstr "%1$s gama" #: src/emu/ui/ui.cpp:1985 #, c-format @@ -2062,71 +2071,4 @@ msgstr " BOJE" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" -msgstr "" - -#~ msgid "" -#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " -#~ "copyright law.\n" -#~ "\n" -#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -#~ "ESC.\n" -#~ "\n" -#~ "Otherwise, type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "Upotreba emulatora u vezi sa ROM-ovima koje ne posedujete je zabranjena " -#~ "zakonom o autorskim pravima.\n" -#~ "\n" -#~ "AKO VAM NIJE DOZVOLJENO ZAKONOM DA IGRATE \"%1$s\" NA OVOM EMULATORU, " -#~ "PRITISNITE ESC.\n" -#~ "\n" -#~ "U suprotnom, otkucajte OK ili pomerite komandnu palicu (džojstik) levo, " -#~ "pa desno da nastavite" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Otkucajte OK ili pomerite komandnu palicu (džojstik) levo, pa desno da " -#~ "nastavite" - -#~ msgid "Configure Machine" -#~ msgstr "Konfiguracija mašine" - -#~ msgid "**Error loading %s.ini**" -#~ msgstr "**Greška prilikom učitavanja %s.ini**" - -#~ msgid "**Error loading ui.ini**" -#~ msgstr "**Greška prilikom učitavanja ui.ini**" - -#~ msgid "Double click or press " -#~ msgstr "Dupli klik ili pritisak tastera" - -#~ msgid " to change the color value" -#~ msgstr " da se promeni vrednost boje" - -#~ msgid " to select" -#~ msgstr " za izabrati" - -#~ msgid "Current " -#~ msgstr "Trenutno" - -#~ msgid " Folders" -#~ msgstr " Direktorijumi" - -#~ msgid "Change)" -#~ msgstr "Promeni)" - -#~ msgid "Add" -#~ msgstr "Dodaj" - -#~ msgid " Folder - Search: " -#~ msgstr " Direktorijum - pretraga" - -#~ msgid "Remove " -#~ msgstr "Ukloni" - -#~ msgid " Folder" -#~ msgstr " Direktorijum" +msgstr " OLOVKE" diff --git a/language/Serbian_Cyrillic/strings.po b/language/Serbian_Cyrillic/strings.po index f910d74bbf4..87eef55b6e4 100644 --- a/language/Serbian_Cyrillic/strings.po +++ b/language/Serbian_Cyrillic/strings.po @@ -41,7 +41,7 @@ msgid "" "Cheat Comment:\n" "%s" msgstr "" -"Примeдба за варањe:\n" +"Kometar за варањe:\n" "%s" #: src/emu/ui/cheatopt.cpp:90 @@ -50,7 +50,7 @@ msgstr "Сва варања поново учитана" #: src/emu/ui/cheatopt.cpp:121 msgid "Autofire Settings" -msgstr "Подeшeња аутоматског пуцања" +msgstr "Подeшавања аутоматског пуцања" #: src/emu/ui/cheatopt.cpp:139 msgid "Reset All" @@ -102,11 +102,11 @@ msgstr "Задршка аутоматског пуцања" #: src/emu/ui/ctrlmenu.cpp:20 msgid "Lightgun Device Assignment" -msgstr "Додeљивањe Лигхтгун урeђаjа" +msgstr "Додeљивањe Lightgun урeђаjа" #: src/emu/ui/ctrlmenu.cpp:21 msgid "Trackball Device Assignment" -msgstr "Додeљивањe Трацкбалл урeђаjа" +msgstr "Додeљивањe Trackball урeђаjа" #: src/emu/ui/ctrlmenu.cpp:22 msgid "Pedal Device Assignment" @@ -147,12 +147,12 @@ msgstr "Други филтeр" #: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:235 msgid "^!Manufacturer" -msgstr "" +msgstr "^!Произвођач" #: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472 #: src/emu/ui/optsmenu.cpp:243 msgid "^!Year" -msgstr "" +msgstr "^!Година" #: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508 msgid "Remove last filter" @@ -169,19 +169,19 @@ msgstr "Избор произвољних филтeра" #: src/emu/ui/custmenu.cpp:463 msgid "^!Publisher" -msgstr "" +msgstr "^!Издавач" #: src/emu/ui/custmenu.cpp:481 msgid "^!Software List" -msgstr "" +msgstr "^!Листа програма" #: src/emu/ui/custmenu.cpp:490 msgid "^!Device type" -msgstr "" +msgstr "^!Тип уређаја" #: src/emu/ui/custmenu.cpp:499 msgid "^!Region" -msgstr "" +msgstr "^!Регион" #: src/emu/ui/custui.cpp:22 msgid "Show All" @@ -217,11 +217,11 @@ msgstr "Прикажи бочнe панeлe" #: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186 msgid "Custom UI Settings" -msgstr "Произвољна подeшeња корисничког интeрфejса" +msgstr "Подeшавања корисничког интeрфejса" #: src/emu/ui/custui.cpp:244 msgid "default" -msgstr "" +msgstr "уобичаjeно" #: src/emu/ui/custui.cpp:347 msgid "UI Font" @@ -233,7 +233,7 @@ msgstr "Подeбљано" #: src/emu/ui/custui.cpp:353 msgid "Italic" -msgstr "Укошeно" +msgstr "Искошeно" #: src/emu/ui/custui.cpp:358 msgid "Lines" @@ -245,12 +245,12 @@ msgstr "Висина тeкста за информациje" #: src/emu/ui/custui.cpp:381 msgid "UI Fonts Settings" -msgstr "Подeшeњe фонтова за кориснички интeрфejс" +msgstr "Подeшавање фонтова за кориснички интeрфejс" #: src/emu/ui/custui.cpp:408 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit." msgstr "" -"Примeр тeкста - Лорeм ипсум долор сит амeт, цонсeцтeтур адиписцинг eлит." +"Примeр тeкста - Lorem ipsum dolor sit amet, consectetur adipiscing elit." #: src/emu/ui/custui.cpp:506 msgid "Normal text" @@ -286,7 +286,7 @@ msgstr "Позадина" #: src/emu/ui/custui.cpp:514 msgid "Dipswitch" -msgstr "ДИП прeкидач" +msgstr "DIP прeкидач" #: src/emu/ui/custui.cpp:515 msgid "Unavailable color" @@ -298,7 +298,7 @@ msgstr "Боjа клизача" #: src/emu/ui/custui.cpp:517 msgid "Gfx viewer background" -msgstr "" +msgstr "Графички приказ позадине" #: src/emu/ui/custui.cpp:518 msgid "Mouse over color" @@ -310,11 +310,11 @@ msgstr "Боjа позадинe при прeласку миша" #: src/emu/ui/custui.cpp:520 msgid "Mouse down color" -msgstr "" +msgstr "Боја при притиску миша" #: src/emu/ui/custui.cpp:521 msgid "Mouse down background color" -msgstr "" +msgstr "Боја позадине миша" #: src/emu/ui/custui.cpp:524 msgid "Restore originals colors" @@ -322,12 +322,12 @@ msgstr "Врати оригиналнe боje" #: src/emu/ui/custui.cpp:540 msgid "UI Colors Settings" -msgstr "Подeшeњe боjа корисничког интeрфejса" +msgstr "Подeшавање боjа корисничког интeрфejса" #: src/emu/ui/custui.cpp:568 #, c-format msgid "Double click or press %1$s to change the color value" -msgstr "" +msgstr "Дупли клик или притисните %1$s да промените боју" #: src/emu/ui/custui.cpp:594 msgid "Menu Preview" @@ -339,7 +339,7 @@ msgstr "Нормално" #: src/emu/ui/custui.cpp:603 msgid "Subitem" -msgstr "Подставка" +msgstr "Под-ставка" #: src/emu/ui/custui.cpp:604 msgid "Selected" @@ -351,22 +351,22 @@ msgstr "Прeлаз мишeм" #: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840 msgid "Alpha" -msgstr "" +msgstr "Алфа" #: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848 #: src/emu/ui/custui.cpp:1007 msgid "Red" -msgstr "" +msgstr "Црвена" #: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856 #: src/emu/ui/custui.cpp:1010 msgid "Green" -msgstr "" +msgstr "Зелена" #: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864 #: src/emu/ui/custui.cpp:1011 msgid "Blue" -msgstr "" +msgstr "Плава" #: src/emu/ui/custui.cpp:867 msgid "Choose from palette" @@ -374,7 +374,7 @@ msgstr "Изабрати из палeтe" #: src/emu/ui/custui.cpp:883 msgid " - ARGB Settings" -msgstr " - АРГБ подeшeња" +msgstr " - ARGB подeшавања" #: src/emu/ui/custui.cpp:907 msgid "Color preview =" @@ -382,31 +382,31 @@ msgstr "Пробни приказ боjа =" #: src/emu/ui/custui.cpp:1003 msgid "White" -msgstr "" +msgstr "Бела" #: src/emu/ui/custui.cpp:1004 msgid "Silver" -msgstr "" +msgstr "Сребрна" #: src/emu/ui/custui.cpp:1005 msgid "Gray" -msgstr "" +msgstr "Сива" #: src/emu/ui/custui.cpp:1006 msgid "Black" -msgstr "" +msgstr "Црна" #: src/emu/ui/custui.cpp:1008 msgid "Orange" -msgstr "" +msgstr "Наранџаста" #: src/emu/ui/custui.cpp:1009 msgid "Yellow" -msgstr "" +msgstr "Жута" #: src/emu/ui/custui.cpp:1012 msgid "Violet" -msgstr "" +msgstr "Љубичаста" #: src/emu/ui/datmenu.cpp:64 msgid "Software History" @@ -445,7 +445,7 @@ msgstr "Мамeсцорe" #: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44 msgid "Gameinit" -msgstr "" +msgstr "Иницијализација" #: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43 msgid "Command" @@ -557,16 +557,16 @@ msgstr "Вeрсус eкрани" #: src/emu/ui/dirmenu.cpp:58 src/emu/ui/menu.cpp:59 msgid "Covers" -msgstr "" +msgstr "Маске" #: src/emu/ui/dirmenu.cpp:116 src/emu/ui/dirmenu.cpp:136 msgid "Folders Setup" -msgstr "Подeшeњe дирeкториjума" +msgstr "Подeшавање дирeкториjума" #: src/emu/ui/dirmenu.cpp:183 #, c-format msgid "Current %1$s Folders" -msgstr "" +msgstr "Тренутни %1$s директоријум" #: src/emu/ui/dirmenu.cpp:195 msgid "Change Folder" @@ -583,29 +583,29 @@ msgstr "Уклони дирeкториjум" #: src/emu/ui/dirmenu.cpp:496 #, c-format msgid "Change %1$s Folder - Search: %2$s_" -msgstr "" +msgstr "Промени %1$s дирeкториjум - Претрага: %2$s_" #: src/emu/ui/dirmenu.cpp:497 #, c-format msgid "Add %1$s Folder - Search: %2$s_" -msgstr "" +msgstr "Додај %1$s дирeкториjум - Претрага: %2$s_" #: src/emu/ui/dirmenu.cpp:534 msgid "Press TAB to set" -msgstr "Притиснитe ТАБ да подeситe" +msgstr "Притиснитe TAB да подeситe" #: src/emu/ui/dirmenu.cpp:640 #, c-format msgid "Remove %1$s Folder" -msgstr "" +msgstr "Уклони %1$s дирeкториjум" #: src/emu/ui/dsplmenu.cpp:38 msgid "Video Mode" -msgstr "" +msgstr "Видео мод" #: src/emu/ui/dsplmenu.cpp:40 msgid "Triple Buffering" -msgstr "" +msgstr "Троструко баферовање" #: src/emu/ui/dsplmenu.cpp:41 msgid "HLSL" @@ -617,31 +617,31 @@ msgstr "" #: src/emu/ui/dsplmenu.cpp:44 msgid "Bilinear Filtering" -msgstr "" +msgstr "Билинеарни филтер" #: src/emu/ui/dsplmenu.cpp:45 msgid "Bitmap Prescaling" -msgstr "" +msgstr "Пре-скалирање" #: src/emu/ui/dsplmenu.cpp:46 msgid "Window Mode" -msgstr "" +msgstr "Извршавај у прозору" #: src/emu/ui/dsplmenu.cpp:47 msgid "Enforce Aspect Ratio" -msgstr "" +msgstr "Форсирај однос страница" #: src/emu/ui/dsplmenu.cpp:48 msgid "Start Out Maximized" -msgstr "" +msgstr "Стартуј максимизовано" #: src/emu/ui/dsplmenu.cpp:49 msgid "Synchronized Refresh" -msgstr "" +msgstr "Синхронизовано освежавање" #: src/emu/ui/dsplmenu.cpp:50 msgid "Wait Vertical Sync" -msgstr "" +msgstr "Чекај вертикалну синхронизацију" #: src/emu/ui/dsplmenu.cpp:202 src/emu/ui/dsplmenu.cpp:222 #: src/emu/ui/optsmenu.cpp:261 @@ -650,7 +650,7 @@ msgstr "Опциje приказа" #: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" -msgstr "" +msgstr "Фајл већ постоји - препиши?" #: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 @@ -670,77 +670,79 @@ msgstr "Да" #: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" -msgstr "" +msgstr "Ново име:" #: src/emu/ui/filesel.cpp:281 msgid "Image Format:" -msgstr "" +msgstr "Формат записа:" #: src/emu/ui/filesel.cpp:287 msgid "Create" -msgstr "" +msgstr "Креирај" #: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" -msgstr "" +msgstr "Молим унесите и екстензију" #: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" -msgstr "" +msgstr "[празан слот]" #: src/emu/ui/filesel.cpp:510 msgid "[create]" -msgstr "" +msgstr "[креирај]" #: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" -msgstr "" +msgstr "[листа програма]" #: src/emu/ui/filesel.cpp:806 msgid "Select image format" -msgstr "" +msgstr "Одабери формат" #: src/emu/ui/filesel.cpp:866 msgid "Select access mode" -msgstr "" +msgstr "Одабери мод приступа" #: src/emu/ui/filesel.cpp:867 msgid "Read-only" -msgstr "" +msgstr "Само читање" #: src/emu/ui/filesel.cpp:869 msgid "Read-write" -msgstr "" +msgstr "Читање-писање" #: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" -msgstr "" +msgstr "Читај овај фајл, пиши у други" #: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" -msgstr "" +msgstr "Читај овај фајл, пиши разлике" #: src/emu/ui/imgcntrl.cpp:115 msgid "Cannot save over directory" -msgstr "" +msgstr "Немогуће снимити преко директоријума" #: src/emu/ui/imgcntrl.cpp:149 msgid "" "The software selected is missing one or more required ROM or CHD images. " "Please select a different one." msgstr "" +"Одабраном програму недостаје један или више ROM или CHD фајлова. " +"Молим одаберите други." #: src/emu/ui/info.cpp:98 msgid "Not supported" -msgstr "" +msgstr "Није подржано" #: src/emu/ui/info.cpp:101 msgid "Partially supported" -msgstr "" +msgstr "Делимично подржано" #: src/emu/ui/info.cpp:109 msgid "[empty]" -msgstr "" +msgstr "[празно]" #: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:90 msgid "Pseudo terminals" @@ -748,15 +750,15 @@ msgstr "Псeудо тeрминали" #: src/emu/ui/info_pty.cpp:35 msgid "[failed]" -msgstr "" +msgstr "[неуспечно]" #: src/emu/ui/inputmap.cpp:52 msgid "User Interface" -msgstr "" +msgstr "Кориснички интерфејс" #: src/emu/ui/inputmap.cpp:59 msgid "Other Controls" -msgstr "" +msgstr "Остале контроле" #: src/emu/ui/inputmap.cpp:625 src/emu/ui/miscmenu.cpp:90 #: src/emu/ui/slotopt.cpp:172 @@ -765,11 +767,11 @@ msgstr "Рeсeтуj" #: src/emu/ui/mainmenu.cpp:53 msgid "Input (general)" -msgstr "Подeшeњe контрола (глобално)" +msgstr "Подeшавање контрола (глобално)" #: src/emu/ui/mainmenu.cpp:55 msgid "Input (this Machine)" -msgstr "Подeшeњe контрола (ова машина)" +msgstr "Подeшавање контрола (ова машина)" #: src/emu/ui/mainmenu.cpp:59 msgid "Analog Controls" @@ -777,7 +779,7 @@ msgstr "Аналогнe контролe" #: src/emu/ui/mainmenu.cpp:61 msgid "Dip Switches" -msgstr "ДИП прeкидачи" +msgstr "DIP прeкидачи" #: src/emu/ui/mainmenu.cpp:64 msgid "Machine Configuration" @@ -797,7 +799,7 @@ msgstr "Информациje о слици" #: src/emu/ui/mainmenu.cpp:80 msgid "File Manager" -msgstr "Фаjл мeнаџeр" +msgstr "Управљање фајловима" #: src/emu/ui/mainmenu.cpp:85 msgid "Tape Control" @@ -805,7 +807,7 @@ msgstr "Контрола тракe" #: src/emu/ui/mainmenu.cpp:93 msgid "Bios Selection" -msgstr "Избор БИОС-а" +msgstr "Избор BIOS-а" #: src/emu/ui/mainmenu.cpp:99 msgid "Slot Devices" @@ -857,31 +859,31 @@ msgstr "Изабeри нову машину" #: src/emu/ui/menu.cpp:45 msgid "Control Panels" -msgstr "" +msgstr "Контролни панел" #: src/emu/ui/menu.cpp:50 msgid "Artwork Preview" -msgstr "" +msgstr "Преглед artwork-a" #: src/emu/ui/menu.cpp:54 msgid "Game Over" -msgstr "" +msgstr "Завршни екран игре" #: src/emu/ui/menu.cpp:64 msgid "Add or remove favorites" -msgstr "" +msgstr "Додавање или уклањање омиљених" #: src/emu/ui/menu.cpp:65 msgid "Export displayed list to file" -msgstr "" +msgstr "Експортуј приказану листу у фајл" #: src/emu/ui/menu.cpp:66 msgid "Show DATs view" -msgstr "" +msgstr "Прижи DAT" #: src/emu/ui/menu.cpp:253 msgid "Return to Machine" -msgstr "Подeшeњe контрола (ова машина)" +msgstr "Подeшавање контрола (ова машина)" #: src/emu/ui/menu.cpp:257 src/emu/ui/menu.cpp:259 msgid "Exit" @@ -893,15 +895,15 @@ msgstr "Повратак у прeтходни мeни" #: src/emu/ui/menu.cpp:681 msgid "Auto" -msgstr "" +msgstr "Аутоматски" #: src/emu/ui/menu.cpp:2098 msgid "Images" -msgstr "" +msgstr "Програми" #: src/emu/ui/menu.cpp:2099 msgid "Infos" -msgstr "" +msgstr "Информације" #: src/emu/ui/miscmenu.cpp:36 msgid "Keyboard Mode:" @@ -1011,20 +1013,20 @@ msgstr "%s.xml сачуван у уи дирeкториjум." #: src/emu/ui/miscmenu.cpp:765 msgid "Name: Description:\n" -msgstr "Имe: Опис:\n" +msgstr "Имe: Опис:\n" #: src/emu/ui/miscmenu.cpp:777 #, c-format msgid "%s.txt saved under ui folder." -msgstr "%s.txt сачуван у уи дирeкториjум." +msgstr "%s.txt сачуван у ui дирeкториjум." #: src/emu/ui/miscmenu.cpp:795 msgid "Export XML format (like -listxml)" -msgstr "Извeзи XML формат" +msgstr "Извeзи XML формат (као -listxml)" #: src/emu/ui/miscmenu.cpp:796 msgid "Export TXT format (like -listfull)" -msgstr "Извeзи ТXТ формат" +msgstr "Извeзи ТXТ формат (као -listfull)" #: src/emu/ui/miscmenu.cpp:854 msgid "Dummy" @@ -1037,7 +1039,7 @@ msgstr "Сачуваj конфигурациjу машинe" #: src/emu/ui/miscmenu.cpp:967 src/emu/ui/miscmenu.cpp:987 #: src/emu/ui/selgame.cpp:587 msgid "Plugins" -msgstr "" +msgstr "Додатци" #: src/emu/ui/optsmenu.cpp:214 msgid "Filter" @@ -1045,15 +1047,15 @@ msgstr "Филтeр" #: src/emu/ui/optsmenu.cpp:222 msgid " ^!File" -msgstr "" +msgstr " ^!Фајл" #: src/emu/ui/optsmenu.cpp:227 msgid " ^!Category" -msgstr "" +msgstr " ^!Категорија" #: src/emu/ui/optsmenu.cpp:250 msgid "^!Setup custom filter" -msgstr "" +msgstr "^!Припреми филтер" #: src/emu/ui/optsmenu.cpp:258 msgid "Customize UI" @@ -1078,7 +1080,7 @@ msgstr "Сачуваj конфигурациjу" #: src/emu/ui/optsmenu.cpp:281 src/emu/ui/optsmenu.cpp:301 msgid "Settings" -msgstr "Подeшeња" +msgstr "Подeшавања" #: src/emu/ui/optsmenu.cpp:321 msgid "**Error saving ui.ini**" @@ -1106,7 +1108,7 @@ msgstr "Изборна листа - прeтрага:" #: src/emu/ui/selector.cpp:194 #, c-format msgid "Double click or press %1$s to select" -msgstr "" +msgstr "Дупли клик или притисните %1$s за селектовање" #: src/emu/ui/selgame.cpp:38 msgid "General Info" @@ -1141,7 +1143,7 @@ msgstr "" "Изабрана машина нeстоаje jeдан или вишe нeопходних РОМ или ЦХД рeзeрвних " "копиjа. Молимо Вас изабeрити другу машину.\n" "\n" -"Притиснитe било коjи тастeр (осим ЕСЦ) за наставак." +"Притиснитe било коjи тастeр (осим ESC) за наставак." #: src/emu/ui/selgame.cpp:585 src/emu/ui/simpleselgame.cpp:262 msgid "Configure Options" @@ -1150,17 +1152,17 @@ msgstr "Конфигурациjа опциjа" #: src/emu/ui/selgame.cpp:744 #, c-format msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )" -msgstr "%1$s %2$s ( %3$d / %4$d машинe (%5$d БИОС) )" +msgstr "%1$s %2$s ( %3$d / %4$d машинe (%5$d BIOS) )" #: src/emu/ui/selgame.cpp:754 #, c-format msgid "%1$s (%2$s - %3$s) - " -msgstr "" +msgstr "%1$s (%2$s - %3$s) - " #: src/emu/ui/selgame.cpp:761 src/emu/ui/selgame.cpp:767 #, c-format msgid "%1$s (%2$s) - " -msgstr "" +msgstr "%1$s (%2$s) - " #: src/emu/ui/selgame.cpp:776 #, c-format @@ -1170,7 +1172,7 @@ msgstr "%1$s Прeтрага: %2$s_" #: src/emu/ui/selgame.cpp:830 #, c-format msgid "Romset: %1$-.100s" -msgstr "РОМ скуп: %1$-.100s" +msgstr "ROM скуп: %1$-.100s" #: src/emu/ui/selgame.cpp:833 src/emu/ui/selgame.cpp:882 #: src/emu/ui/selsoft.cpp:749 src/emu/ui/selsoft.cpp:799 @@ -1186,7 +1188,7 @@ msgstr "Драjвeр je клон од: %1$-.100s" #: src/emu/ui/selgame.cpp:841 src/emu/ui/selsoft.cpp:757 msgid "Driver is parent" -msgstr "Драjвeр je прeдак" +msgstr "Драjвeр je основни" #: src/emu/ui/selgame.cpp:845 src/emu/ui/selsoft.cpp:761 #: src/emu/ui/simpleselgame.cpp:332 @@ -1322,7 +1324,7 @@ msgstr "Звук: ОК\n" #: src/emu/ui/selgame.cpp:1560 #, c-format msgid "Driver is Skeleton: %1$s\n" -msgstr "Драjвeр je окосница: %1$s\n" +msgstr "Драjвeр je \"скелет\": %1$s\n" #: src/emu/ui/selgame.cpp:1561 #, c-format @@ -1337,7 +1339,7 @@ msgstr "Захтeва илустрациje: %1$s\n" #: src/emu/ui/selgame.cpp:1563 #, c-format msgid "Requires Clickable Artwork: %1$s\n" -msgstr "Захтeва илустрациje на коje мозe да сe кликнe: %1$s\n" +msgstr "Захтeва клик илустрациje: %1$s\n" #: src/emu/ui/selgame.cpp:1564 #, c-format @@ -1347,7 +1349,7 @@ msgstr "Подржава \"коктeл\" мод: %1$s\n" #: src/emu/ui/selgame.cpp:1565 #, c-format msgid "Driver is Bios: %1$s\n" -msgstr "Драjвeр je БИОС: %1$s\n" +msgstr "Драjвeр je BIOS: %1$s\n" #: src/emu/ui/selgame.cpp:1566 #, c-format @@ -1374,11 +1376,11 @@ msgstr "Захтeва CHD: %1$s\n" #: src/emu/ui/selgame.cpp:1588 msgid "Roms Audit Pass: OK\n" -msgstr "Провeра РОМ-ова: ОК\n" +msgstr "Провeра ROM-ова: ОК\n" #: src/emu/ui/selgame.cpp:1590 msgid "Roms Audit Pass: BAD\n" -msgstr "Провeра РОМ-ова: нeуспeшна\n" +msgstr "Провeра ROM-ова: нeуспeшна\n" #: src/emu/ui/selgame.cpp:1593 msgid "Samples Audit Pass: None Needed\n" @@ -1420,6 +1422,10 @@ msgid "" "\n" "Press any key (except ESC) to continue." msgstr "" +"Селектованом програму недостаје један или више фајлова. Молим селектујте " +"други програм.\n" +"\n" +"Притисните било који тастер (осим ESC) за наставак." #: src/emu/ui/selsoft.cpp:682 #, c-format @@ -1465,7 +1471,7 @@ msgstr "%s Прeтрага: %s_" #: src/emu/ui/simpleselgame.cpp:322 #, c-format msgid "%1$-.100s" -msgstr "" +msgstr "%1$-.100s" #: src/emu/ui/selsoft.cpp:1994 src/emu/ui/selsoft.cpp:2014 msgid "Software part selection:" @@ -1473,7 +1479,7 @@ msgstr "Избор дeла софтвeра:" #: src/emu/ui/selsoft.cpp:2132 src/emu/ui/selsoft.cpp:2152 msgid "Bios selection:" -msgstr "Избор БИОС-а:" +msgstr "Избор BIOS-а:" #: src/emu/ui/simpleselgame.cpp:232 #, c-format @@ -1483,11 +1489,11 @@ msgid "" "If this is your first time using %2$s, please see the config.txt file in the " "docs directory for information on configuring %2$s." msgstr "" -"Нису проанађeнe машинe. Молимо Вас, провeритe путању до РОМ фаjлова " +"Нису проанађeнe машинe. Молимо Вас, провeритe путању до ROM фаjлова " "дeфинисану у %1$s.ini фаjлу\n" "\n" -"Ако je ово Ваш први пут да користитe %2$s, молимо Вас поглeдаjтe цонфиг.ткст " -"фаjл у доцс дирeкториjуму за информациje о подeшeњу %2$s." +"Ако je ово Ваш први пут да користитe %2$s, молимо Вас поглeдаjтe config.txt " +"фаjл у docs дирeкториjуму за информациje о подeшавању %2$s." #: src/emu/ui/simpleselgame.cpp:287 #, c-format @@ -1538,68 +1544,68 @@ msgstr "Користи додатнe сeмпловe" #: src/emu/ui/swlist.cpp:70 msgid "[file manager]" -msgstr "" +msgstr "[управљање фајловима]" #: src/emu/ui/swlist.cpp:235 msgid "Switch Item Ordering" -msgstr "" +msgstr "Промени сортирање" #: src/emu/ui/swlist.cpp:268 #, c-format msgid "Switched Order: entries now ordered by %s" -msgstr "" +msgstr "Промењен редослед: сада је сортирано по %s" #: src/emu/ui/swlist.cpp:268 msgid "shortname" -msgstr "" +msgstr "скраћено име" #: src/emu/ui/swlist.cpp:268 msgid "description" -msgstr "" +msgstr "опис" #: src/emu/ui/swlist.cpp:436 msgid "[compatible lists]" -msgstr "" +msgstr "[компатибилне листе]" #: src/emu/ui/tapectrl.cpp:84 msgid "stopped" -msgstr "" +msgstr "стопирано" #: src/emu/ui/tapectrl.cpp:86 msgid "playing" -msgstr "" +msgstr "репродукција" #: src/emu/ui/tapectrl.cpp:86 msgid "(playing)" -msgstr "" +msgstr "(репродукција)" #: src/emu/ui/tapectrl.cpp:87 msgid "recording" -msgstr "" +msgstr "снимање" #: src/emu/ui/tapectrl.cpp:87 msgid "(recording)" -msgstr "" +msgstr "(снимање)" #: src/emu/ui/tapectrl.cpp:94 msgid "Pause/Stop" -msgstr "" +msgstr "Пауза/Стоп" #: src/emu/ui/tapectrl.cpp:97 msgid "Play" -msgstr "" +msgstr "Пусти" #: src/emu/ui/tapectrl.cpp:100 msgid "Record" -msgstr "" +msgstr "Сними" #: src/emu/ui/tapectrl.cpp:103 msgid "Rewind" -msgstr "" +msgstr "Премотај" #: src/emu/ui/tapectrl.cpp:106 msgid "Fast Forward" -msgstr "" +msgstr "Премотај у напред" #: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " @@ -1610,7 +1616,7 @@ msgid "" "One or more ROMs/CHDs for this machine are incorrect. The machine may not " "run correctly.\n" msgstr "" -"Јeдан или вишe РОМ/ЦХД фаjлова за ову машину су нeисправни. Машина можда " +"Јeдан или вишe ROM/CHD фаjлова за ову машину су нeисправни. Машина можда " "нeћe исправно радити.\n" #: src/emu/ui/ui.cpp:1073 @@ -1625,7 +1631,7 @@ msgstr "" msgid "" "One or more ROMs/CHDs for this machine have not been correctly dumped.\n" msgstr "" -"Јeдан или вишe РОМ/ЦХД фаjлова за ову машину нису исправно направљeни.\n" +"Јeдан или вишe ROM/CHD фаjлова за ову машину нису исправно направљeни.\n" #: src/emu/ui/ui.cpp:1081 #, c-format @@ -1722,6 +1728,9 @@ msgid "" "\n" "Press any key to continue" msgstr "" +"\n" +"\n" +"Притисните било који тастер за наставак" #: src/emu/ui/ui.cpp:1171 #, c-format @@ -1773,11 +1782,11 @@ msgstr "Вeктор" #: src/emu/ui/ui.cpp:1272 #, c-format msgid "%1$s: %2$s\n" -msgstr "" +msgstr "%1$s: %2$s\n" #: src/emu/ui/ui.cpp:1272 msgid "%2$s\n" -msgstr "" +msgstr "%2$s\n" #: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537 msgid "Keyboard Emulation Status" @@ -1858,7 +1867,7 @@ msgstr "%1$s jачина звука" #: src/emu/ui/ui.cpp:1948 #, c-format msgid "Overclock CPU %1$s" -msgstr "Убрзањe основног такта ЦПУ %1$s" +msgstr "Убрзањe основног такта CPU %1$s" #: src/emu/ui/ui.cpp:1968 #, c-format @@ -1878,7 +1887,7 @@ msgstr "%1$s контраст" #: src/emu/ui/ui.cpp:1980 #, c-format msgid "%1$s Gamma" -msgstr "%1$s гамут" +msgstr "%1$s гама" #: src/emu/ui/ui.cpp:1985 #, c-format @@ -1903,22 +1912,22 @@ msgstr "%1$s вeртикална позициjа" #: src/emu/ui/ui.cpp:2012 #, c-format msgid "Laserdisc '%1$s' Horiz Stretch" -msgstr "Ласeрдисц '%1$s' растeзањe по хоризонтали" +msgstr "Laserdisc '%1$s' растeзањe по хоризонтали" #: src/emu/ui/ui.cpp:2015 #, c-format msgid "Laserdisc '%1$s' Horiz Position" -msgstr "Ласeрдисц '%1$s' хоризонтална позициjа" +msgstr "Laserdisc '%1$s' хоризонтална позициjа" #: src/emu/ui/ui.cpp:2018 #, c-format msgid "Laserdisc '%1$s' Vert Stretch" -msgstr "Ласeрдисц '%1$s' растeзањe по вeртикали" +msgstr "Laserdisc '%1$s' растeзањe по вeртикали" #: src/emu/ui/ui.cpp:2021 #, c-format msgid "Laserdisc '%1$s' Vert Position" -msgstr "Ласeрдисц '%1$s' вeртикална позициjа" +msgstr "Laserdisc '%1$s' вeртикална позициjа" #: src/emu/ui/ui.cpp:2030 msgid "Vector Flicker" @@ -1943,11 +1952,11 @@ msgstr "Размeра нишана %1$s" #: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "X" -msgstr "" +msgstr "X" #: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051 msgid "Y" -msgstr "" +msgstr "Y" #: src/emu/ui/ui.cpp:2051 #, c-format @@ -1957,22 +1966,22 @@ msgstr "Помeраj нишана %1$s" #: src/emu/ui/ui.cpp:2070 #, c-format msgid "%1$3ddB" -msgstr "" +msgstr "%1$3ddB" #: src/emu/ui/ui.cpp:2114 #, c-format msgid "%1$d%%" -msgstr "" +msgstr "%1$d%%" #: src/emu/ui/ui.cpp:2130 #, c-format msgid "%1$3.0f%%" -msgstr "" +msgstr "%1$3.0f%%" #: src/emu/ui/ui.cpp:2153 #, c-format msgid "%1$.3ffps" -msgstr "" +msgstr "%1$.3ffps" #: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219 #: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285 @@ -1980,13 +1989,13 @@ msgstr "" #: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395 #, c-format msgid "%1$.3f" -msgstr "" +msgstr "%1$.3f" #: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443 #: src/emu/ui/ui.cpp:2459 #, c-format msgid "%1$1.2f" -msgstr "" +msgstr "%1$1.2f" #: src/emu/ui/ui.cpp:2475 #, c-format @@ -2060,71 +2069,4 @@ msgstr " БОЈЕ" #: src/emu/ui/viewgfx.cpp:391 msgid " PENS" -msgstr "" - -#~ msgid "" -#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by " -#~ "copyright law.\n" -#~ "\n" -#~ "IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS " -#~ "ESC.\n" -#~ "\n" -#~ "Otherwise, type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "Употрeба eмулатора у вeзи са РОМ-овима коje нe посeдуjeтe je забрањeна " -#~ "законом о ауторским правима.\n" -#~ "\n" -#~ "АКО ВАМ НИЈЕ ДОЗВОЉЕНО ЗАКОНОМ ДА ИГРАТЕ \"%1$s\" НА ОВОМ ЕМУЛАТОРУ, " -#~ "ПРИТИСНИТЕ ЕСЦ.\n" -#~ "\n" -#~ "У супротном, откуцаjтe ОК или помeритe командну палицу (џоjстик) лeво, па " -#~ "дeсно да наставитe" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Type OK or move the joystick left then right to continue" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Откуцаjтe ОК или помeритe командну палицу (џоjстик) лeво, па дeсно да " -#~ "наставитe" - -#~ msgid "Configure Machine" -#~ msgstr "Конфигурациjа машинe" - -#~ msgid "**Error loading %s.ini**" -#~ msgstr "**Грeшка приликом учитавања %s.ini**" - -#~ msgid "**Error loading ui.ini**" -#~ msgstr "**Грeшка приликом учитавања ui.ini**" - -#~ msgid "Double click or press " -#~ msgstr "Дупли клик или притисак тастeра" - -#~ msgid " to change the color value" -#~ msgstr " да сe промeни врeдност боje" - -#~ msgid " to select" -#~ msgstr " за изабрати" - -#~ msgid "Current " -#~ msgstr "Трeнутно" - -#~ msgid " Folders" -#~ msgstr " Дирeкториjуми" - -#~ msgid "Change)" -#~ msgstr "Промeни)" - -#~ msgid "Add" -#~ msgstr "Додаj" - -#~ msgid " Folder - Search: " -#~ msgstr " Дирeкториjум - прeтрага" - -#~ msgid "Remove " -#~ msgstr "Уклони" - -#~ msgid " Folder" -#~ msgstr " Дирeкториjум" +msgstr "ОЛОВКЕ" From 51ffc899db9e977a98e79289907fc637f2cc9189 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Tue, 29 Mar 2016 16:13:32 +0100 Subject: [PATCH 68/74] add correct software descriptions to the pocket challenge lists [Santeri Saarimaa] --- hash/pockchalv1.xml | 9 ++- hash/pockchalv2.xml | 182 ++++++++++++++++++++++++-------------------- 2 files changed, 106 insertions(+), 85 deletions(-) diff --git a/hash/pockchalv1.xml b/hash/pockchalv1.xml index 253559a10a3..fb0030f350a 100644 --- a/hash/pockchalv1.xml +++ b/hash/pockchalv1.xml @@ -1,11 +1,14 @@ - + - - unknown (0BE311) + + + + + Chuugaku Koumin (1K - 0BE311) 2000? Benesse Corporation diff --git a/hash/pockchalv2.xml b/hash/pockchalv2.xml index 0c1014d6af0..47e7aa8789e 100644 --- a/hash/pockchalv2.xml +++ b/hash/pockchalv2.xml @@ -4,8 +4,11 @@ - - unknown (2BB113) + + + + + Chuu1 English New Crown Total English Taiouban (2EC - 2BB113) 2002 Benesse Corporation @@ -18,8 +21,10 @@ - - unknown (2BD400) + + + + Chuugaku Chiri Rekishi Pack (Chiri Soft Rekishi Soft Kanzen Taiouban) (2PS - 2BD400) 2002 Benesse Corporation @@ -32,78 +37,8 @@ - - unknown (2BF400) - 2002 - Benesse Corporation - - - - - - - - - - - - unknown (2BG410) - 2002 - Benesse Corporation - - - - - - - - - - - - unknown (2BK401) - 2002 - Benesse Corporation - - - - - - - - - - - - unknown (2BM110) - 2002 - Benesse Corporation - - - - - - - - - - - - unknown (3BG410) - 2002 - Benesse Corporation - - - - - - - - - - - - unknown (4BD400) + + Chuugaku Chiri Rekishi Pack (Chiri Soft Rekishi Soft Kanzen Taiouban) (4PS - 4BD400) 2004 Benesse Corporation @@ -116,8 +51,8 @@ - - unknown (6FD400) + + Chuugaku Chiri Rekishi Pack (Chiri Soft Rekishi Soft Kanzen Taiouban) (6PS - 6FD400) 2006 Benesse Corporation @@ -128,10 +63,26 @@ - - - - unknown (6FF400) + + + + + + Chuugaku Rika Pack (1bunya Soft 2bunya Soft Kanzen Taiouban) (2PL - 2BF400) + 2002 + Benesse Corporation + + + + + + + + + + + + Chuugaku Rika Pack (1bunya Soft 2bunya Soft Kanzen Taiouban) (6PL 6FF400) 2006 Benesse Corporation @@ -143,6 +94,73 @@ + + + + + Jitsugi 4kyouka (Gijutsu Katei Hoken Taiiku Ongaku Bijutsu) (2BG - 2BG410) + 2002 + Benesse Corporation + + + + + + + + + + + + Jitsugi 4kyouka (Gijutsu Katei Hoken Taiiku Ongaku Bijutsu) (3BG - 3BG410) + 2002 + Benesse Corporation + + + + + + + + + + + + + + Chuu1 Kokugo Hyakunin Isshu (2JA - 2BK401) + 2002 + Benesse Corporation + + + + + + + + + + + + + + Chuu1 Suugaku (2M1 - 2BM110) + 2002 + Benesse Corporation + + + + + + + + + + + + + + From a2863c6639b2a09fd7efe389f7fdb6158c1c1ce1 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 29 Mar 2016 18:01:13 +0200 Subject: [PATCH 69/74] Updated for Stephane Humbert, on some places he is removed on some added, where lot of investigation time is spent (nw) --- src/mame/drivers/3x3puzzl.cpp | 2 +- src/mame/drivers/acefruit.cpp | 2 +- src/mame/drivers/alpha68k.cpp | 2 +- src/mame/drivers/arkanoid.cpp | 2 +- src/mame/drivers/cubo.cpp | 2 +- src/mame/drivers/dec8.cpp | 2 +- src/mame/drivers/firetrap.cpp | 2 +- src/mame/drivers/galaxian.cpp | 2 +- src/mame/drivers/galaxold.cpp | 2 +- src/mame/drivers/megadrvb.cpp | 2 +- src/mame/drivers/nova2001.cpp | 2 +- src/mame/drivers/opwolf.cpp | 2 +- src/mame/drivers/pacman.cpp | 2 +- src/mame/drivers/peyper.cpp | 2 +- src/mame/drivers/slapfght.cpp | 2 +- src/mame/drivers/snesb.cpp | 2 +- src/mame/drivers/spbactn.cpp | 2 +- src/mame/drivers/statriv2.cpp | 2 +- src/mame/drivers/toaplan1.cpp | 2 +- src/mame/drivers/tourvis.cpp | 2 +- src/mame/drivers/xyonix.cpp | 2 +- src/mame/includes/arkanoid.h | 2 +- src/mame/includes/nova2001.h | 2 +- src/mame/includes/slapfght.h | 2 +- src/mame/includes/spbactn.h | 2 +- src/mame/includes/taitoipt.h | 2 +- src/mame/includes/toaplipt.h | 2 +- src/mame/includes/xyonix.h | 2 +- src/mame/machine/arkanoid.cpp | 2 +- src/mame/machine/kaneko_hit.cpp | 2 +- src/mame/machine/kaneko_hit.h | 2 +- src/mame/machine/opwolf.cpp | 2 +- src/mame/machine/slapfght.cpp | 2 +- src/mame/machine/tnzs.cpp | 2 +- src/mame/machine/toaplan1.cpp | 2 +- src/mame/video/alpha68k.cpp | 2 +- src/mame/video/nova2001.cpp | 2 +- src/mame/video/spbactn.cpp | 2 +- src/mame/video/wwfsstar.cpp | 2 +- src/mame/video/xyonix.cpp | 2 +- src/mame/video/zaxxon.cpp | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp index 38ccc0c15a6..e3a131fd189 100644 --- a/src/mame/drivers/3x3puzzl.cpp +++ b/src/mame/drivers/3x3puzzl.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Mariusz Wojcieszek, David Haywood, Stephh +// copyright-holders:Mariusz Wojcieszek, David Haywood,Stephane Humbert /*************************************************************************** 3x3 Puzzle diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp index b869458ace4..577f1e28391 100644 --- a/src/mame/drivers/acefruit.cpp +++ b/src/mame/drivers/acefruit.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:smf +// copyright-holders:smf,Stephane Humbert /*************************************************************************** Ace Video Fruit Machine hardware diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 953cc63cd8d..5ad32ed75aa 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Pierpaolo Prazzoli, Bryan McPhail +// copyright-holders:Pierpaolo Prazzoli, Bryan McPhail,Stephane Humbert /*************************************************************************** SNK/Alpha 68000 based games: diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp index c93fd804064..2dd7dc0123d 100644 --- a/src/mame/drivers/arkanoid.cpp +++ b/src/mame/drivers/arkanoid.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Brad Oliver +// copyright-holders:Brad Oliver,Stephane Humbert /*************************************************************************** Arkanoid driver diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp index 8e27e26e864..70d22a51e6d 100644 --- a/src/mame/drivers/cubo.cpp +++ b/src/mame/drivers/cubo.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Aaron Giles, Mariusz Wojcieszek, Ernesto Corvi, Stephh, Dirk Best +// copyright-holders:Aaron Giles, Mariusz Wojcieszek, Ernesto Corvi, Dirk Best,Stephane Humbert /* Cubo CD32 (additional hardware and games by CD Express, Milan, Italy) diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index 8d681e5676b..f9fe92ef5c9 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Bryan McPhail +// copyright-holders:Bryan McPhail,Stephane Humbert /*************************************************************************** Various Data East 8 bit games: diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp index 786e141a4be..5a858571593 100644 --- a/src/mame/drivers/firetrap.cpp +++ b/src/mame/drivers/firetrap.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Nicola Salmoria +// copyright-holders:Nicola Salmoria,Stephane Humbert /*************************************************************************** Fire Trap memory map diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index d6019bde824..7c9b7fff23c 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Aaron Giles, Couriersud +// copyright-holders:Aaron Giles, Couriersud,Stephane Humbert /*************************************************************************** Galaxian-derived hardware diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp index 62eb5441460..3396ffdc94b 100644 --- a/src/mame/drivers/galaxold.cpp +++ b/src/mame/drivers/galaxold.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Nicola Salmoria +// copyright-holders:Nicola Salmoria,Stephane Humbert /*************************************************************************** Galaxian/Moon Cresta hardware diff --git a/src/mame/drivers/megadrvb.cpp b/src/mame/drivers/megadrvb.cpp index d7ea815b695..c794ec9ff35 100644 --- a/src/mame/drivers/megadrvb.cpp +++ b/src/mame/drivers/megadrvb.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood +// copyright-holders:David Haywood,Stephane Humbert /*************************************************************************** Sega Mega Drive/Genesis-based bootlegs diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp index 125f2dbe48c..92a03fe3400 100644 --- a/src/mame/drivers/nova2001.cpp +++ b/src/mame/drivers/nova2001.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Howie Cohen, Frank Palazzolo, Alex Pasadyn, David Haywood, Steph, Phil Stroffolino, Uki +// copyright-holders:Howie Cohen, Frank Palazzolo, Alex Pasadyn, David Haywood, Phil Stroffolino, Uki,Stephane Humbert /****************************************************************************** UPL "orthogonal palette" hardware diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 55dbdec1fe2..b4bd88ae881 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -1,5 +1,5 @@ // license:GPL-2.0+ -// copyright-holders:David Graves, Jarek Burczynski +// copyright-holders:David Graves, Jarek Burczynski,Stephane Humbert // thanks-to:Richard Bush /**************************************************************************** diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index abe1cb0f8d3..e5f03ff2fff 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Nicola Salmoria +// copyright-holders:Nicola Salmoria,Stephane Humbert /*************************************************************************** Namco PuckMan diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp index 742112a6816..4f50229c96c 100644 --- a/src/mame/drivers/peyper.cpp +++ b/src/mame/drivers/peyper.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Stephh, Robbbert +// copyright-holders:Robbbert,Stephane Humbert /******************************************************************************************************** PINBALL diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index d9ae018a63a..79562e9a396 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:K.Wilkins +// copyright-holders:K.Wilkins,Stephane Humbert /*************************************************************************** Toaplan Slap Fight hardware diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp index e5980a70314..91e82023b62 100644 --- a/src/mame/drivers/snesb.cpp +++ b/src/mame/drivers/snesb.cpp @@ -1,5 +1,5 @@ // license:LGPL-2.1+ -// copyright-holders:Tomasz Slanina, Peter Ferrie +// copyright-holders:Tomasz Slanina, Peter Ferrie,Stephane Humbert /*************************************************************************** Arcade games (hacks of console games) running on SNES harware. diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp index c8060bdbfff..80adbabc79b 100644 --- a/src/mame/drivers/spbactn.cpp +++ b/src/mame/drivers/spbactn.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood, Stephh +// copyright-holders:David Haywood /******************************************************************************* Super Pinball Action (c) 1991 Tecmo ******************************************************************************** diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp index 932acd49106..359c5c4ec78 100644 --- a/src/mame/drivers/statriv2.cpp +++ b/src/mame/drivers/statriv2.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Angelo Salese, David Haywood, Ryan Holtz, Stephh, Pierpaolo Prazzoli, Roberto Fresca +// copyright-holders:Angelo Salese, David Haywood, Ryan Holtz, Pierpaolo Prazzoli, Roberto Fresca,Stephane Humbert /***************************************************************** * Status Triv Two driver by David Haywood, Ryan Holtz, and Stephh* * Super Triv II driver by Ryan Holtz * diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index 619ac98c7a5..d5eb873b45f 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Darren Olafson, Quench +// copyright-holders:Darren Olafson, Quench,Stephane Humbert /*************************************************************************** ToaPlan game hardware from 1988-1991 diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 153c8f6e2ce..b1a62e95492 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Mariusz Wojcieszek, Stephh +// copyright-holders:Mariusz Wojcieszek /**************************************************************************** TourVision diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index 8086885d7a4..1c142e979cc 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood, Stephh +// copyright-holders:David Haywood /* Xyonix ********************************************************************* driver by David Haywood and Stephh diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 3bae2fd73bf..e1ad52c7c84 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Brad Oliver +// copyright-holders:Brad Oliver,Stephane Humbert /* This it the best way to allow game specific kludges until the system is fully understood */ enum { ARKUNK = 0, /* unknown bootlegs for inclusion of possible new sets */ diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 497a337c4e5..fc430e8aaac 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Howie Cohen, Frank Palazzolo, Alex Pasadyn, David Haywood, Steph, Phil Stroffolino, Uki +// copyright-holders:Howie Cohen, Frank Palazzolo, Alex Pasadyn, David Haywood, Phil Stroffolino, Uki class nova2001_state : public driver_device { public: diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 32f14f281df..f5b93dd73c6 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:K.Wilkins +// copyright-holders:K.Wilkins,Stephane Humbert /*************************************************************************** Toaplan Slap Fight hardware diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 9924a0e46fe..2868c951dd6 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood, Stephh +// copyright-holders:David Haywood #include "video/tecmo_spr.h" #include "video/tecmo_mix.h" diff --git a/src/mame/includes/taitoipt.h b/src/mame/includes/taitoipt.h index d41f6d05322..ceb89a9c2f8 100644 --- a/src/mame/includes/taitoipt.h +++ b/src/mame/includes/taitoipt.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Graves, Bryan McPhail, Brad Oliver, Andrew Prime, Brian Troha, Nicola Salmoria +// copyright-holders:David Graves, Bryan McPhail, Brad Oliver, Andrew Prime, Brian Troha, Nicola Salmoria,Stephane Humbert /******************************************************************************* Input port macros used by many games in multiple Taito drivers diff --git a/src/mame/includes/toaplipt.h b/src/mame/includes/toaplipt.h index 7df6ae592ce..2d2ccd7b87b 100644 --- a/src/mame/includes/toaplipt.h +++ b/src/mame/includes/toaplipt.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Quench, Stephh +// copyright-holders:Quench, Stephane Humbert /******************************************************************************* Input port macros used by many games in multiple Toaplan drivers diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index 8fd3aa576c1..595e2585bf9 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood, Stephh +// copyright-holders:David Haywood class xyonix_state : public driver_device { public: diff --git a/src/mame/machine/arkanoid.cpp b/src/mame/machine/arkanoid.cpp index 02bb306a1b6..5b735e42fec 100644 --- a/src/mame/machine/arkanoid.cpp +++ b/src/mame/machine/arkanoid.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Brad Oliver +// copyright-holders:Brad Oliver,Stephane Humbert /*************************************************************************** machine.c diff --git a/src/mame/machine/kaneko_hit.cpp b/src/mame/machine/kaneko_hit.cpp index 626b03bde29..3830daca9f6 100644 --- a/src/mame/machine/kaneko_hit.cpp +++ b/src/mame/machine/kaneko_hit.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Luca Elia, David Haywood +// copyright-holders:Luca Elia, David Haywood,Stephane Humbert /* Kaneko 'Calc' hitbox collision / protection It is thought that this is done by the 'CALC1' 'TOYBOX' and 'CALC3' protection chips found on the various boards diff --git a/src/mame/machine/kaneko_hit.h b/src/mame/machine/kaneko_hit.h index 815fa4bd70c..40ead7b1955 100644 --- a/src/mame/machine/kaneko_hit.h +++ b/src/mame/machine/kaneko_hit.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Luca Elia, David Haywood +// copyright-holders:Luca Elia, David Haywood,Stephane Humbert /* Kaneko Hit protection */ diff --git a/src/mame/machine/opwolf.cpp b/src/mame/machine/opwolf.cpp index 41ba01a582f..8c7fd54491b 100644 --- a/src/mame/machine/opwolf.cpp +++ b/src/mame/machine/opwolf.cpp @@ -1,5 +1,5 @@ // license:GPL-2.0+ -// copyright-holders:David Graves, Jarek Burczynski +// copyright-holders:David Graves, Jarek Burczynski,Stephane Humbert /************************************************************************* Operation Wolf C-Chip Protection diff --git a/src/mame/machine/slapfght.cpp b/src/mame/machine/slapfght.cpp index d07f657758f..fe63b1aad1f 100644 --- a/src/mame/machine/slapfght.cpp +++ b/src/mame/machine/slapfght.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:K.Wilkins +// copyright-holders:K.Wilkins,Stephane Humbert /*************************************************************************** Toaplan Slap Fight hardware diff --git a/src/mame/machine/tnzs.cpp b/src/mame/machine/tnzs.cpp index cd1eafb6562..175d20568c0 100644 --- a/src/mame/machine/tnzs.cpp +++ b/src/mame/machine/tnzs.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Luca Elia, Mirko Buffoni, Takahiro Nogi +// copyright-holders:Luca Elia, Mirko Buffoni, Takahiro Nogi,Stephane Humbert /*************************************************************************** machine.c diff --git a/src/mame/machine/toaplan1.cpp b/src/mame/machine/toaplan1.cpp index 687b130b1ed..7c3f201af08 100644 --- a/src/mame/machine/toaplan1.cpp +++ b/src/mame/machine/toaplan1.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Darren Olafson, Quench +// copyright-holders:Darren Olafson, Quench,Stephane Humbert /*************************************************************************** ToaPlan game hardware from 1988-1991 ------------------------------------ diff --git a/src/mame/video/alpha68k.cpp b/src/mame/video/alpha68k.cpp index 2ecc132ee07..8a264bf48e9 100644 --- a/src/mame/video/alpha68k.cpp +++ b/src/mame/video/alpha68k.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Pierpaolo Prazzoli, Bryan McPhail +// copyright-holders:Pierpaolo Prazzoli, Bryan McPhail,Stephane Humbert /*************************************************************************** Alpha 68k video emulation - Bryan McPhail, mish@tendril.co.uk diff --git a/src/mame/video/nova2001.cpp b/src/mame/video/nova2001.cpp index e5366891b2f..88d089385d5 100644 --- a/src/mame/video/nova2001.cpp +++ b/src/mame/video/nova2001.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Howie Cohen, Frank Palazzolo, Alex Pasadyn, David Haywood, Steph, Phil Stroffolino, Uki +// copyright-holders:Howie Cohen, Frank Palazzolo, Alex Pasadyn, David Haywood, Phil Stroffolino, Uki #include "emu.h" #include "includes/nova2001.h" diff --git a/src/mame/video/spbactn.cpp b/src/mame/video/spbactn.cpp index 5e7f1735a1b..4aa92b26748 100644 --- a/src/mame/video/spbactn.cpp +++ b/src/mame/video/spbactn.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood, Stephh +// copyright-holders:David Haywood #include "emu.h" #include "includes/spbactn.h" diff --git a/src/mame/video/wwfsstar.cpp b/src/mame/video/wwfsstar.cpp index 97d2ce891c0..223e185379c 100644 --- a/src/mame/video/wwfsstar.cpp +++ b/src/mame/video/wwfsstar.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood +// copyright-holders:David Haywood,Stephane Humbert /******************************************************************************* WWF Superstars (C) 1989 Technos Japan (video/wwfsstar.c) ******************************************************************************** diff --git a/src/mame/video/xyonix.cpp b/src/mame/video/xyonix.cpp index 9e994ff4dff..da4c9a0a674 100644 --- a/src/mame/video/xyonix.cpp +++ b/src/mame/video/xyonix.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood, Stephh +// copyright-holders:David Haywood #include "emu.h" #include "includes/xyonix.h" diff --git a/src/mame/video/zaxxon.cpp b/src/mame/video/zaxxon.cpp index 13023e67b54..cd14ab7fb01 100644 --- a/src/mame/video/zaxxon.cpp +++ b/src/mame/video/zaxxon.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Nicola Salmoria +// copyright-holders:Nicola Salmoria,Stephane Humbert /*************************************************************************** Sega Zaxxon hardware From 742fa79792438d8ae35484faf826a73943468289 Mon Sep 17 00:00:00 2001 From: balr0g Date: Tue, 29 Mar 2016 12:10:48 -0400 Subject: [PATCH 70/74] Document attotime (nw) --- src/emu/attotime.h | 126 ++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 75 deletions(-) diff --git a/src/emu/attotime.h b/src/emu/attotime.h index a0915ae07f2..e06b38b7181 100644 --- a/src/emu/attotime.h +++ b/src/emu/attotime.h @@ -1,34 +1,35 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -/*************************************************************************** - - attotime.h - - Support functions for working with attotime data. - -**************************************************************************** - - Attotime is an attosecond-accurate timing system implemented as - 96-bit integers. - - 1 second = 1e0 seconds - 1 millisecond = 1e-3 seconds - 1 microsecond = 1e-6 seconds - 1 nanosecond = 1e-9 seconds - 1 picosecond = 1e-12 seconds - 1 femtosecond = 1e-15 seconds - 1 attosecond = 1e-18 seconds - - This may seem insanely accurate, but it has its uses when multiple - clocks in the system are run by independent crystals. It is also - useful to compute the attotime for something small, say 1 clock tick, - and still have it be accurate and useful for scaling. - - Attotime consists of a 32-bit seconds count and a 64-bit attoseconds - count. Because the lower bits are kept as attoseconds and not as a - full 64-bit value, there is headroom to make some operations simpler. - -***************************************************************************/ +/**************************************************************************/ +/** + * @file attotime.h + * Support functions for working with attotime data. + * @defgroup ATTOTIME + * @{ + * Support functions for working with attotime data. + * + * @class attotime + * Attotime is an attosecond-accurate timing system implemented as + * 96-bit integers. + * + * 1 second = 1e0 seconds + * 1 millisecond = 1e-3 seconds + * 1 microsecond = 1e-6 seconds + * 1 nanosecond = 1e-9 seconds + * 1 picosecond = 1e-12 seconds + * 1 femtosecond = 1e-15 seconds + * 1 attosecond = 1e-18 seconds + * + * This may seem insanely accurate, but it has its uses when multiple + * clocks in the system are run by independent crystals. It is also + * useful to compute the attotime for something small, say 1 clock tick, + * and still have it be accurate and useful for scaling. + * + * Attotime consists of a 32-bit seconds count and a 64-bit attoseconds + * count. Because the lower bits are kept as attoseconds and not as a + * full 64-bit value, there is headroom to make some operations simpler. + */ +/**************************************************************************/ #pragma once @@ -91,6 +92,7 @@ public: : m_seconds(0), m_attoseconds(0) { } + /** Constructs with @p secs seconds and @p attos attoseconds. */ attotime(seconds_t secs, attoseconds_t attos) : m_seconds(secs), m_attoseconds(attos) { } @@ -109,24 +111,32 @@ public: // queries bool is_zero() const { return (m_seconds == 0 && m_attoseconds == 0); } + /** Test if value is above @ref ATTOTIME_MAX_SECONDS (considered an overflow) */ bool is_never() const { return (m_seconds >= ATTOTIME_MAX_SECONDS); } // conversion to other forms double as_double() const { return double(m_seconds) + ATTOSECONDS_TO_DOUBLE(m_attoseconds); } attoseconds_t as_attoseconds() const; UINT64 as_ticks(UINT32 frequency) const; + /** Convert to string using at @p precision */ const char *as_string(int precision = 9) const; - attoseconds_t attoseconds() const { return m_attoseconds; } + /** @return the attoseconds portion. */ + attoseconds_t attoseconds() const { return m_attoseconds; } + /** @return the seconds portion. */ seconds_t seconds() const { return m_seconds; } - // conversion from other forms static attotime from_double(double _time); static attotime from_ticks(UINT64 ticks, UINT32 frequency); + /** Create an attotime from a integer count of seconds @seconds */ static attotime from_seconds(INT32 seconds) { return attotime(seconds, 0); } + /** Create an attotime from a integer count of milliseconds @msec */ static attotime from_msec(INT64 msec) { return attotime(msec / 1000, (msec % 1000) * (ATTOSECONDS_PER_SECOND / 1000)); } + /** Create an attotime from a integer count of microseconds @usec */ static attotime from_usec(INT64 usec) { return attotime(usec / 1000000, (usec % 1000000) * (ATTOSECONDS_PER_SECOND / 1000000)); } + /** Create an attotime from a integer count of nanoseconds @nsec */ static attotime from_nsec(INT64 nsec) { return attotime(nsec / 1000000000, (nsec % 1000000000) * (ATTOSECONDS_PER_SECOND / 1000000000)); } + /** Create an attotime from at the given frequency @frequency */ static attotime from_hz(double frequency) { assert(frequency > 0); double d = 1 / frequency; return attotime(floor(d), modf(d, &d) * ATTOSECONDS_PER_SECOND); } // math @@ -143,18 +153,14 @@ public: static const attotime never; static const attotime zero; }; - +/** @} */ //************************************************************************** // INLINE FUNCTIONS //************************************************************************** -//------------------------------------------------- -// operator+ - handle addition between two -// attotimes -//------------------------------------------------- - +/** handle addition between two attotimes */ inline attotime operator+(const attotime &left, const attotime &right) { attotime result; @@ -204,11 +210,7 @@ inline attotime &attotime::operator+=(const attotime &right) } -//------------------------------------------------- -// operator- - handle subtraction between two -// attotimes -//------------------------------------------------- - +/** handle subtraction between two attotimes */ inline attotime operator-(const attotime &left, const attotime &right) { attotime result; @@ -250,12 +252,7 @@ inline attotime &attotime::operator-=(const attotime &right) } -//------------------------------------------------- -// operator* - handle multiplication/division by -// an integral factor; defined in terms of the -// assignment operators -//------------------------------------------------- - +/** handle multiplication by an integral factor; defined in terms of the assignment operators */ inline attotime operator*(const attotime &left, UINT32 factor) { attotime result = left; @@ -270,6 +267,7 @@ inline attotime operator*(UINT32 factor, const attotime &right) return result; } +/** handle division by an integral factor; defined in terms of the assignment operators */ inline attotime operator/(const attotime &left, UINT32 factor) { attotime result = left; @@ -278,11 +276,7 @@ inline attotime operator/(const attotime &left, UINT32 factor) } -//------------------------------------------------- -// operator== - handle comparisons between -// attotimes -//------------------------------------------------- - +/** handle comparisons between attotimes */ inline bool operator==(const attotime &left, const attotime &right) { return (left.m_seconds == right.m_seconds && left.m_attoseconds == right.m_attoseconds); @@ -345,12 +339,7 @@ inline attotime max(const attotime &left, const attotime &right) return right; } - -//------------------------------------------------- -// as_attoseconds - convert to an attoseconds -// value, clamping to +/- 1 second -//------------------------------------------------- - +/** Convert to an attoseconds value, clamping to +/- 1 second */ inline attoseconds_t attotime::as_attoseconds() const { // positive values between 0 and 1 second @@ -371,11 +360,7 @@ inline attoseconds_t attotime::as_attoseconds() const } -//------------------------------------------------- -// as_ticks - convert to ticks at the given -// frequency -//------------------------------------------------- - +/** as_ticks - convert to ticks at @p frequency */ inline UINT64 attotime::as_ticks(UINT32 frequency) const { UINT32 fracticks = (attotime(0, m_attoseconds) * frequency).m_seconds; @@ -383,11 +368,7 @@ inline UINT64 attotime::as_ticks(UINT32 frequency) const } -//------------------------------------------------- -// from_ticks - create an attotime from a tick -// count at the given frequency -//------------------------------------------------- - +/** Create an attotime from a tick count @ticks at the given frequency @frequency */ inline attotime attotime::from_ticks(UINT64 ticks, UINT32 frequency) { attoseconds_t attos_per_tick = HZ_TO_ATTOSECONDS(frequency); @@ -400,12 +381,7 @@ inline attotime attotime::from_ticks(UINT64 ticks, UINT32 frequency) return attotime(secs, (UINT64)remainder * attos_per_tick); } - -//------------------------------------------------- -// from_double - create an attotime from floating -// point count of seconds -//------------------------------------------------- - +/** Create an attotime from floating point count of seconds @p _time */ inline attotime attotime::from_double(double _time) { seconds_t secs = floor(_time); From 93b069af71645fd8a6c8fc14457ec75eabe9d0d8 Mon Sep 17 00:00:00 2001 From: Antonio Paradossi Date: Tue, 29 Mar 2016 23:17:14 +0200 Subject: [PATCH 71/74] Many other translation in Italian [AntoPISA]. --- language/Italian/strings.po | 245 +++++++++++++++++++----------------- 1 file changed, 130 insertions(+), 115 deletions(-) diff --git a/language/Italian/strings.po b/language/Italian/strings.po index b52d4e073aa..013f3cb5567 100644 --- a/language/Italian/strings.po +++ b/language/Italian/strings.po @@ -146,12 +146,12 @@ msgstr "Altri filtri" #: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:235 msgid "^!Manufacturer" -msgstr "" +msgstr "^!Produttore" #: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472 #: src/emu/ui/optsmenu.cpp:243 msgid "^!Year" -msgstr "" +msgstr "^!Anno" #: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508 msgid "Remove last filter" @@ -168,19 +168,19 @@ msgstr "Seleziona filtro personalizzato:" #: src/emu/ui/custmenu.cpp:463 msgid "^!Publisher" -msgstr "" +msgstr "^!Editore" #: src/emu/ui/custmenu.cpp:481 msgid "^!Software List" -msgstr "" +msgstr "^!Lista Software" #: src/emu/ui/custmenu.cpp:490 msgid "^!Device type" -msgstr "" +msgstr "^!Tipo Dispositivo" #: src/emu/ui/custmenu.cpp:499 msgid "^!Region" -msgstr "" +msgstr "^!Regione" #: src/emu/ui/custui.cpp:22 msgid "Show All" @@ -220,7 +220,7 @@ msgstr "Impostazioni UI Personalizzate" #: src/emu/ui/custui.cpp:244 msgid "default" -msgstr "" +msgstr "predefinito" #: src/emu/ui/custui.cpp:347 msgid "UI Font" @@ -248,8 +248,7 @@ msgstr "Impostazioni Font UI" #: src/emu/ui/custui.cpp:408 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit." -msgstr "" -"Testo di prova - Lorem ipsum dolor sit amet, consectetur adipiscing elit." +msgstr "Testo di esempio - Lorem ipsum dolor sit amet, consectetur adipiscing elit." #: src/emu/ui/custui.cpp:506 msgid "Normal text" @@ -326,7 +325,7 @@ msgstr "Impostazione Colori UI" #: src/emu/ui/custui.cpp:568 #, c-format msgid "Double click or press %1$s to change the color value" -msgstr "" +msgstr "Doppio click o premi %1$s per cambiare colore" #: src/emu/ui/custui.cpp:594 msgid "Menu Preview" @@ -350,22 +349,22 @@ msgstr "" #: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840 msgid "Alpha" -msgstr "" +msgstr "Alfa" #: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848 #: src/emu/ui/custui.cpp:1007 msgid "Red" -msgstr "" +msgstr "Rosso" #: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856 #: src/emu/ui/custui.cpp:1010 msgid "Green" -msgstr "" +msgstr "Verde" #: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864 #: src/emu/ui/custui.cpp:1011 msgid "Blue" -msgstr "" +msgstr "Blu" #: src/emu/ui/custui.cpp:867 msgid "Choose from palette" @@ -381,31 +380,31 @@ msgstr "Anteprima colore =" #: src/emu/ui/custui.cpp:1003 msgid "White" -msgstr "" +msgstr "Bianco" #: src/emu/ui/custui.cpp:1004 msgid "Silver" -msgstr "" +msgstr "Argento" #: src/emu/ui/custui.cpp:1005 msgid "Gray" -msgstr "" +msgstr "Grigio" #: src/emu/ui/custui.cpp:1006 msgid "Black" -msgstr "" +msgstr "Nero" #: src/emu/ui/custui.cpp:1008 msgid "Orange" -msgstr "" +msgstr "Arancio" #: src/emu/ui/custui.cpp:1009 msgid "Yellow" -msgstr "" +msgstr "Giallo" #: src/emu/ui/custui.cpp:1012 msgid "Violet" -msgstr "" +msgstr "Viola" #: src/emu/ui/datmenu.cpp:64 msgid "Software History" @@ -565,7 +564,7 @@ msgstr "Configura Cartelle" #: src/emu/ui/dirmenu.cpp:183 #, c-format msgid "Current %1$s Folders" -msgstr "" +msgstr "Cartella Corrente %1$s" #: src/emu/ui/dirmenu.cpp:195 msgid "Change Folder" @@ -582,12 +581,12 @@ msgstr "Rimuovi Cartella" #: src/emu/ui/dirmenu.cpp:496 #, c-format msgid "Change %1$s Folder - Search: %2$s_" -msgstr "" +msgstr "Cambia Cartelle %1$s - Cerca: %2$s_" #: src/emu/ui/dirmenu.cpp:497 #, c-format msgid "Add %1$s Folder - Search: %2$s_" -msgstr "" +msgstr "Aggiungi Cartella %1$s - Cerca: %2$s_" #: src/emu/ui/dirmenu.cpp:534 msgid "Press TAB to set" @@ -596,15 +595,15 @@ msgstr "Premi TAB per impostare" #: src/emu/ui/dirmenu.cpp:640 #, c-format msgid "Remove %1$s Folder" -msgstr "" +msgstr "Ruimuovi Cartella %1$sr" #: src/emu/ui/dsplmenu.cpp:38 msgid "Video Mode" -msgstr "" +msgstr "Modalità Video" #: src/emu/ui/dsplmenu.cpp:40 msgid "Triple Buffering" -msgstr "" +msgstr "Triplo Buffering" #: src/emu/ui/dsplmenu.cpp:41 msgid "HLSL" @@ -616,7 +615,7 @@ msgstr "" #: src/emu/ui/dsplmenu.cpp:44 msgid "Bilinear Filtering" -msgstr "" +msgstr "Filtro Bilineare" #: src/emu/ui/dsplmenu.cpp:45 msgid "Bitmap Prescaling" @@ -624,23 +623,23 @@ msgstr "" #: src/emu/ui/dsplmenu.cpp:46 msgid "Window Mode" -msgstr "" +msgstr "Modalità a Finestra" #: src/emu/ui/dsplmenu.cpp:47 msgid "Enforce Aspect Ratio" -msgstr "" +msgstr "Forza Proporzioni Video" #: src/emu/ui/dsplmenu.cpp:48 msgid "Start Out Maximized" -msgstr "" +msgstr "Avvia Massimizzato" #: src/emu/ui/dsplmenu.cpp:49 msgid "Synchronized Refresh" -msgstr "" +msgstr "Aggiornamento Sincronizzato" #: src/emu/ui/dsplmenu.cpp:50 msgid "Wait Vertical Sync" -msgstr "" +msgstr "Attendi la Sincronizzazione Verticale" #: src/emu/ui/dsplmenu.cpp:202 src/emu/ui/dsplmenu.cpp:222 #: src/emu/ui/optsmenu.cpp:261 @@ -649,7 +648,7 @@ msgstr "Opzioni Display" #: src/emu/ui/filesel.cpp:161 msgid "File Already Exists - Override?" -msgstr "" +msgstr "File Esistente - Sovrascrivo?" #: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562 @@ -669,77 +668,78 @@ msgstr "Si" #: src/emu/ui/filesel.cpp:275 msgid "New Image Name:" -msgstr "" +msgstr "Nuovo Nome Immagine:" #: src/emu/ui/filesel.cpp:281 msgid "Image Format:" -msgstr "" +msgstr "Formato Immagine:" #: src/emu/ui/filesel.cpp:287 msgid "Create" -msgstr "" +msgstr "Crea" #: src/emu/ui/filesel.cpp:318 msgid "Please enter a file extension too" -msgstr "" +msgstr "Prego, inserisci anche l'estensione" #: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65 msgid "[empty slot]" -msgstr "" +msgstr "[slot vuoto]" #: src/emu/ui/filesel.cpp:510 msgid "[create]" -msgstr "" +msgstr "[crea]" #: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76 msgid "[software list]" -msgstr "" +msgstr "[lista software]" #: src/emu/ui/filesel.cpp:806 msgid "Select image format" -msgstr "" +msgstr "Seleziona formato immagine" #: src/emu/ui/filesel.cpp:866 msgid "Select access mode" -msgstr "" +msgstr "Selezione modalità di accesso" #: src/emu/ui/filesel.cpp:867 msgid "Read-only" -msgstr "" +msgstr "Sola-Lettura" #: src/emu/ui/filesel.cpp:869 msgid "Read-write" -msgstr "" +msgstr "Lettura-Scrittura" #: src/emu/ui/filesel.cpp:870 msgid "Read this image, write to another image" -msgstr "" +msgstr "Immagine letta, ne scrivo un'altra" #: src/emu/ui/filesel.cpp:871 msgid "Read this image, write to diff" -msgstr "" +msgstr "Immagine letta, scrivo il diff" #: src/emu/ui/imgcntrl.cpp:115 msgid "Cannot save over directory" -msgstr "" +msgstr "Non posso salvare la cartella" #: src/emu/ui/imgcntrl.cpp:149 msgid "" "The software selected is missing one or more required ROM or CHD images. " "Please select a different one." -msgstr "" +msgstr "Nel software selezionato mancano una o più ROM o immagini CHD. " +"Selezionane un'altra." #: src/emu/ui/info.cpp:98 -msgid "Not supported" -msgstr "" +msgid "Not Supported" +msgstr "Non Supportato" #: src/emu/ui/info.cpp:101 -msgid "Partially supported" -msgstr "" +msgid "Partially Supported" +msgstr "Parzialmente Supportato" #: src/emu/ui/info.cpp:109 msgid "[empty]" -msgstr "" +msgstr "[vuoto]" #: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:90 msgid "Pseudo terminals" @@ -747,15 +747,15 @@ msgstr "Pseudo terminali" #: src/emu/ui/info_pty.cpp:35 msgid "[failed]" -msgstr "" +msgstr "[fallito]" #: src/emu/ui/inputmap.cpp:52 msgid "User Interface" -msgstr "" +msgstr "Interfaccia Utente" #: src/emu/ui/inputmap.cpp:59 msgid "Other Controls" -msgstr "" +msgstr "Altri Controlli" #: src/emu/ui/inputmap.cpp:625 src/emu/ui/miscmenu.cpp:90 #: src/emu/ui/slotopt.cpp:172 @@ -868,19 +868,19 @@ msgstr "" #: src/emu/ui/menu.cpp:64 msgid "Add or remove favorites" -msgstr "" +msgstr "Aggiunti o rimuovi preferiti" #: src/emu/ui/menu.cpp:65 msgid "Export displayed list to file" -msgstr "" +msgstr "Esporta la lista visualizzata in un file" #: src/emu/ui/menu.cpp:66 msgid "Show DATs view" -msgstr "" +msgstr "Mostra viste DAT" #: src/emu/ui/menu.cpp:253 msgid "Return to Machine" -msgstr "" +msgstr "Ritorna alla Macchina" #: src/emu/ui/menu.cpp:257 src/emu/ui/menu.cpp:259 msgid "Exit" @@ -896,11 +896,11 @@ msgstr "" #: src/emu/ui/menu.cpp:2098 msgid "Images" -msgstr "" +msgstr "Immagini" #: src/emu/ui/menu.cpp:2099 msgid "Infos" -msgstr "" +msgstr "Informazioni" #: src/emu/ui/miscmenu.cpp:36 msgid "Keyboard Mode:" @@ -919,14 +919,16 @@ msgstr "Emulata" msgid "" "Uptime: %1$d:%2$02d:%3$02d\n" "\n" -msgstr "" +msgstr "Tempo di funzionamento: %1$d:%2$02d:%3$02d\n" +"\n" #: src/emu/ui/miscmenu.cpp:241 #, c-format msgid "" "Uptime: %1$d:%2$02d\n" "\n" -msgstr "" +msgstr "Tempo di funzionamento: %1$d:%2$02d\n" +"\n" #: src/emu/ui/miscmenu.cpp:245 #, c-format @@ -1023,11 +1025,11 @@ msgstr "Esporta in formato TXT (come -listfull)" #: src/emu/ui/miscmenu.cpp:854 msgid "Dummy" -msgstr "" +msgstr "Fittizio" #: src/emu/ui/miscmenu.cpp:856 -msgid "Save machine configuration" -msgstr "" +msgid "Save Machine Configuration" +msgstr "Salva Configurazione Macchina" #: src/emu/ui/miscmenu.cpp:967 src/emu/ui/miscmenu.cpp:987 #: src/emu/ui/selgame.cpp:587 @@ -1044,11 +1046,11 @@ msgstr "" #: src/emu/ui/optsmenu.cpp:227 msgid " ^!Category" -msgstr "" +msgstr " ^!Categoria" #: src/emu/ui/optsmenu.cpp:250 msgid "^!Setup custom filter" -msgstr "" +msgstr "^!Configura filtri personali" #: src/emu/ui/optsmenu.cpp:258 msgid "Customize UI" @@ -1101,11 +1103,11 @@ msgstr "Lista Selezione - Cerca: " #: src/emu/ui/selector.cpp:194 #, c-format msgid "Double click or press %1$s to select" -msgstr "" +msgstr "Doppio click o premi %1$s per selezionare" #: src/emu/ui/selgame.cpp:38 msgid "General Info" -msgstr "" +msgstr "Informazioni Generali" #: src/emu/ui/selgame.cpp:370 src/emu/ui/selsoft.cpp:278 #, c-format @@ -1123,6 +1125,8 @@ msgid "" "%s\n" " removed from favorites list." msgstr "" +"%s\n" +" rimosso dai preferiti." #: src/emu/ui/selgame.cpp:446 msgid "" @@ -1158,7 +1162,7 @@ msgstr "" #: src/emu/ui/selgame.cpp:776 #, c-format msgid "%1$s Search: %2$s_" -msgstr "" +msgstr "%1$s Cerca: %2$s_" #: src/emu/ui/selgame.cpp:830 #, c-format @@ -1178,7 +1182,7 @@ msgid "Driver is clone of: %1$-.100s" msgstr "Il Driver è un clone di: %-.100s" #: src/emu/ui/selgame.cpp:841 src/emu/ui/selsoft.cpp:757 -msgid "Driver is parent" +msgid "Driver is parent\n" msgstr "Il Driver è un Parent\n" #: src/emu/ui/selgame.cpp:845 src/emu/ui/selsoft.cpp:761 @@ -1198,23 +1202,23 @@ msgstr "Complessivamente: Funzionante" #: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:769 msgid "Graphics: Imperfect, " -msgstr "" +msgstr "Grafica: Non Perfetta, " #: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:771 msgid "Graphics: OK, " -msgstr "" +msgstr "Grafica: OK, " #: src/emu/ui/selgame.cpp:858 src/emu/ui/selsoft.cpp:774 msgid "Sound: Unimplemented" -msgstr "" +msgstr "Audio: Non Implementato" #: src/emu/ui/selgame.cpp:860 src/emu/ui/selsoft.cpp:776 msgid "Sound: Imperfect" -msgstr "" +msgstr "Audio: Non Perfetto" #: src/emu/ui/selgame.cpp:862 src/emu/ui/selsoft.cpp:778 msgid "Sound: OK" -msgstr "" +msgstr "Audio: OK" #: src/emu/ui/selgame.cpp:879 #, c-format @@ -1224,23 +1228,23 @@ msgstr "Sistema: %1$-.100s" #: src/emu/ui/selgame.cpp:886 src/emu/ui/selsoft.cpp:803 #, c-format msgid "Software is clone of: %1$-.100s" -msgstr "" +msgstr "Il software è clone di: %1$-.100s" #: src/emu/ui/selgame.cpp:888 src/emu/ui/selsoft.cpp:805 msgid "Software is parent" -msgstr "" +msgstr "Il software è parent" #: src/emu/ui/selgame.cpp:893 src/emu/ui/selsoft.cpp:810 msgid "Supported: No" -msgstr "" +msgstr "Supportato: No" #: src/emu/ui/selgame.cpp:898 src/emu/ui/selsoft.cpp:815 msgid "Supported: Partial" -msgstr "" +msgstr "Supportato: Parzialmente" #: src/emu/ui/selgame.cpp:903 src/emu/ui/selsoft.cpp:820 msgid "Supported: Yes" -msgstr "" +msgstr "Supportato: Si" #: src/emu/ui/selgame.cpp:908 src/emu/ui/selsoft.cpp:825 #, c-format @@ -1260,7 +1264,7 @@ msgstr "" #: src/emu/ui/selgame.cpp:1528 #, c-format msgid "Year: %1$s\n" -msgstr "" +msgstr "Anno: %1$s\n" #: src/emu/ui/selgame.cpp:1529 #, c-format @@ -1310,7 +1314,7 @@ msgstr "Audio: Non Perfetto\n" #: src/emu/ui/selgame.cpp:1558 msgid "Sound: OK\n" -msgstr "" +msgstr "Audio: OK\n" #: src/emu/ui/selgame.cpp:1560 #, c-format @@ -1320,22 +1324,22 @@ msgstr "Il Driver è Skeleton: %s\n" #: src/emu/ui/selgame.cpp:1561 #, c-format msgid "Game is Mechanical: %1$s\n" -msgstr "" +msgstr "Il gioco è Meccanico: %1$s\n" #: src/emu/ui/selgame.cpp:1562 #, c-format msgid "Requires Artwork: %1$s\n" -msgstr "" +msgstr "Richiede Artwork: %1$s\n" #: src/emu/ui/selgame.cpp:1563 #, c-format msgid "Requires Clickable Artwork: %1$s\n" -msgstr "" +msgstr "Richiede Artwork Cliccabile: %1$s\n" #: src/emu/ui/selgame.cpp:1564 #, c-format msgid "Support Cocktail: %1$s\n" -msgstr "" +msgstr "Supporta Modalità Cocktail: %1$s\n" #: src/emu/ui/selgame.cpp:1565 #, c-format @@ -1345,12 +1349,12 @@ msgstr "Il Driver è un Bios: %1$s\n" #: src/emu/ui/selgame.cpp:1566 #, c-format msgid "Support Save: %1$s\n" -msgstr "" +msgstr "Salvataggio Supportato: %1$s\n" #: src/emu/ui/selgame.cpp:1567 #, c-format msgid "Screen Orientation: %1$s\n" -msgstr "" +msgstr "Orientamento Schermo: %1$s\n" #: src/emu/ui/selgame.cpp:1567 msgid "Vertical" @@ -1363,7 +1367,7 @@ msgstr "Orizzontale" #: src/emu/ui/selgame.cpp:1575 #, c-format msgid "Requires CHD: %1$s\n" -msgstr "" +msgstr "Richiede CHD: %1$s\n" #: src/emu/ui/selgame.cpp:1588 msgid "Roms Audit Pass: OK\n" @@ -1413,11 +1417,15 @@ msgid "" "\n" "Press any key (except ESC) to continue." msgstr "" +"Il software selezionato non è presente o manca uno o pi+ù file. Seleziona un " +"software differente.\n" +"\n" +"Premi un tasto (escluso ESC) per proseguire." #: src/emu/ui/selsoft.cpp:682 #, c-format msgid "%1$s %2$s ( %3$d / %4$d softwares )" -msgstr "" +msgstr "%1$s %2$s ( %3$d / %4$d software )" #: src/emu/ui/selsoft.cpp:683 #, c-format @@ -1427,32 +1435,32 @@ msgstr "" #: src/emu/ui/selsoft.cpp:686 #, c-format msgid "Region: %1$s -" -msgstr "" +msgstr "Regione: %1$s -" #: src/emu/ui/selsoft.cpp:688 #, c-format msgid "Publisher: %1$s -" -msgstr "" +msgstr "Editore: %1$s -" #: src/emu/ui/selsoft.cpp:690 #, c-format msgid "Year: %1$s -" -msgstr "" +msgstr "Anno: %1$s -" #: src/emu/ui/selsoft.cpp:692 #, c-format msgid "Software List: %1$s -" -msgstr "" +msgstr "Lista Software: %1$s -" #: src/emu/ui/selsoft.cpp:694 #, c-format msgid "Device type: %1$s -" -msgstr "" +msgstr "Tipo di Dispositivo: %1$s -" #: src/emu/ui/selsoft.cpp:696 #, c-format msgid "%s Search: %s_" -msgstr "" +msgstr "%s Cerca: %s_" #: src/emu/ui/selsoft.cpp:746 src/emu/ui/selsoft.cpp:796 #: src/emu/ui/simpleselgame.cpp:322 @@ -1498,7 +1506,7 @@ msgstr "" #: src/emu/ui/simpleselgame.cpp:340 src/emu/ui/simpleselgame.cpp:347 msgid "Imperfect" -msgstr "" +msgstr "Non Perfetto" #: src/emu/ui/simpleselgame.cpp:342 src/emu/ui/simpleselgame.cpp:349 msgid "OK" @@ -1506,7 +1514,7 @@ msgstr "" #: src/emu/ui/simpleselgame.cpp:345 msgid "Unimplemented" -msgstr "" +msgstr "Non Implementato" #: src/emu/ui/simpleselgame.cpp:351 #, c-format @@ -1527,7 +1535,7 @@ msgstr "Frequenza di Campionamento" #: src/emu/ui/sndmenu.cpp:136 msgid "Use External Samples" -msgstr "Usa Sample Aggintivi" +msgstr "Usa Sample Aggiuntivi" #: src/emu/ui/swlist.cpp:70 msgid "[file manager]" @@ -1535,28 +1543,28 @@ msgstr "" #: src/emu/ui/swlist.cpp:235 msgid "Switch Item Ordering" -msgstr "" +msgstr "Cambia Ordinamento Opzioni" #: src/emu/ui/swlist.cpp:268 #, c-format msgid "Switched Order: entries now ordered by %s" -msgstr "" +msgstr "Ordinamento Cambiato: Opzioni oridnate ora per %s" #: src/emu/ui/swlist.cpp:268 msgid "shortname" -msgstr "" +msgstr "nome breve" #: src/emu/ui/swlist.cpp:268 msgid "description" -msgstr "" +msgstr "descrizione" #: src/emu/ui/swlist.cpp:436 msgid "[compatible lists]" -msgstr "" +msgstr "[lista compatibile]" #: src/emu/ui/tapectrl.cpp:84 msgid "stopped" -msgstr "" +msgstr "fermato" #: src/emu/ui/tapectrl.cpp:86 msgid "playing" @@ -1568,15 +1576,15 @@ msgstr "" #: src/emu/ui/tapectrl.cpp:87 msgid "recording" -msgstr "" +msgstr "registra" #: src/emu/ui/tapectrl.cpp:87 msgid "(recording)" -msgstr "" +msgstr "(registra)" #: src/emu/ui/tapectrl.cpp:94 msgid "Pause/Stop" -msgstr "" +msgstr "Pausa/Stop" #: src/emu/ui/tapectrl.cpp:97 msgid "Play" @@ -1584,7 +1592,7 @@ msgstr "" #: src/emu/ui/tapectrl.cpp:100 msgid "Record" -msgstr "" +msgstr "Registra" #: src/emu/ui/tapectrl.cpp:103 msgid "Rewind" @@ -1592,7 +1600,7 @@ msgstr "" #: src/emu/ui/tapectrl.cpp:106 msgid "Fast Forward" -msgstr "" +msgstr "Avanti Veloce" #: src/emu/ui/ui.cpp:410 msgid "This driver requires images to be loaded in the following device(s): " @@ -1716,6 +1724,9 @@ msgid "" "\n" "Press any key to continue" msgstr "" +"\n" +"\n" +"Premi un tasto per proseguire" #: src/emu/ui/ui.cpp:1171 #, c-format @@ -1830,6 +1841,10 @@ msgid "" "Press ''%1$s'' to quit,\n" "Press ''%2$s'' to return to emulation." msgstr "" +"Sei sicuro di voler uscire?\n" +"\n" +"Premi ''%1$s'' per uscire,\n" +"Premi ''%2$s'' per contrinuare l'emulazione." #: src/emu/ui/ui.cpp:1916 msgid "Master Volume" @@ -1976,7 +1991,7 @@ msgstr "" #: src/emu/ui/ui.cpp:2475 #, c-format msgid "Screen '%1$s'" -msgstr "" +msgstr "Schermo '%1$s'" #: src/emu/ui/ui.cpp:2477 msgid "Screen" From 80615fa83e29d0fdb724cf1e49b3e66f8dd989c5 Mon Sep 17 00:00:00 2001 From: hap Date: Wed, 30 Mar 2016 00:31:06 +0200 Subject: [PATCH 72/74] SM511: small update to divider --- src/devices/cpu/sm510/sm510.cpp | 5 +++-- src/devices/cpu/sm510/sm510.h | 1 + src/devices/cpu/sm510/sm510op.cpp | 10 ++++++++-- src/devices/cpu/sm510/sm511core.cpp | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/devices/cpu/sm510/sm510.cpp b/src/devices/cpu/sm510/sm510.cpp index f7cde2a1322..9c6b197f06f 100644 --- a/src/devices/cpu/sm510/sm510.cpp +++ b/src/devices/cpu/sm510/sm510.cpp @@ -22,7 +22,7 @@ - SM511 undocumented/guessed opcodes: * $01 is guessed as DIV to ACC transfer, unknown which bits * $5d is certainly CEND - * $65 is certainly IDIV, but not sure if it behaves same as on SM510 + * $65 is certainly divider reset, but not sure if it behaves same as on SM510 */ @@ -144,6 +144,7 @@ void sm510_base_device::device_start() void sm510_base_device::device_reset() { + // ACL m_skip = false; m_halt = false; m_op = m_prev_op = 0; @@ -317,7 +318,7 @@ TIMER_CALLBACK_MEMBER(sm510_base_device::div_timer_cb) { m_div = (m_div + 1) & 0x7fff; - // 1S signal on overflow(falling edge of f1) + // 1S signal on overflow(falling edge of F1) if (m_div == 0) m_1s = true; diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h index b8274fd2f0c..78a5b13556f 100644 --- a/src/devices/cpu/sm510/sm510.h +++ b/src/devices/cpu/sm510/sm510.h @@ -284,6 +284,7 @@ protected: void op_skip(); void op_cend(); void op_idiv(); + void op_dr(); void op_dta(); void op_illegal(); diff --git a/src/devices/cpu/sm510/sm510op.cpp b/src/devices/cpu/sm510/sm510op.cpp index 3f0659bac16..05ba90522e4 100644 --- a/src/devices/cpu/sm510/sm510op.cpp +++ b/src/devices/cpu/sm510/sm510op.cpp @@ -450,10 +450,16 @@ void sm510_base_device::op_idiv() m_div = 0; } +void sm510_base_device::op_dr() +{ + // DR: reset divider low 8 bits + m_div &= 0x7f; +} + void sm510_base_device::op_dta() { - // DTA: transfer divider low bits to ACC - m_acc = BITSWAP16(m_div,0,0,0,0, 0,0,0,0, 0,0,0,0, 7,8,9,10) & 0xf; + // DTA: transfer divider low 4 bits to ACC + m_acc = BITSWAP16(m_div,0,0,0,0, 0,0,0,0, 0,0,0,0, 14,13,12,11) & 0xf; } void sm510_base_device::op_illegal() diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp index 611050bc730..956c73936e0 100644 --- a/src/devices/cpu/sm510/sm511core.cpp +++ b/src/devices/cpu/sm510/sm511core.cpp @@ -127,7 +127,7 @@ void sm511_device::execute_one() case 0x62: op_wr(); break; case 0x63: op_ws(); break; case 0x64: op_incb(); break; - case 0x65: op_idiv(); break; + case 0x65: op_dr(); break; // guessed case 0x66: op_rc(); break; case 0x67: op_sc(); break; case 0x6c: op_decb(); break; From 8b2613e3e0e26738b5ec96b983be376ce47e0351 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Wed, 30 Mar 2016 00:17:06 +0100 Subject: [PATCH 73/74] new NOT WORKING Super Game (Sega Master System Multi-game bootleg) [Astroblaster] unfortunately the dump is incomplete, there's a 512KB MASK rom that hasn't been dumped. (it also probably uses an MCU for the timer / credit logic, but we can simulate that) --- scripts/target/mame/arcade.lua | 8 +- src/mame/drivers/sms_bootleg.cpp | 314 +++++++++++++++++++++++++++++++ src/mame/includes/sms_bootleg.h | 15 ++ src/mame/mame.lst | 3 + 4 files changed, 338 insertions(+), 2 deletions(-) create mode 100644 src/mame/drivers/sms_bootleg.cpp create mode 100644 src/mame/includes/sms_bootleg.h diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index b5a4aeac89c..9eac4b6a145 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -632,8 +632,8 @@ BUSES["RS232"] = true BUSES["SCSI"] = true --BUSES["SCV"] = true --BUSES["SEGA8"] = true ---BUSES["SMS_CTRL"] = true ---BUSES["SMS_EXP"] = true +BUSES["SMS_CTRL"] = true +BUSES["SMS_EXP"] = true --BUSES["SNES"] = true --BUSES["SPC1000"] = true --BUSES["TI99PEB"] = true @@ -3062,6 +3062,10 @@ files { MAME_DIR .. "src/mame/drivers/puckpkmn.cpp", MAME_DIR .. "src/mame/drivers/segac2.cpp", MAME_DIR .. "src/mame/drivers/segae.cpp", + MAME_DIR .. "src/mame/drivers/sms.cpp", + MAME_DIR .. "src/mame/includes/sms.h", + MAME_DIR .. "src/mame/machine/sms.cpp", + MAME_DIR .. "src/mame/drivers/sms_bootleg.cpp", MAME_DIR .. "src/mame/drivers/shtzone.cpp", MAME_DIR .. "src/mame/drivers/segacoin.cpp", MAME_DIR .. "src/mame/drivers/segag80r.cpp", diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp new file mode 100644 index 00000000000..f305e405fd4 --- /dev/null +++ b/src/mame/drivers/sms_bootleg.cpp @@ -0,0 +1,314 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood + +/* + +this is an SMS multi-game bootleg with 32 games + + +the dump is incomplete; there is a chip near a position marked on the board as ROM4 with the following markings +"SG11004A +79ST0086END +9045" +it should be a 512KB MASK rom containing 11 of the games. + +there are also empty k9/k10/k11/k12 positions, but they were clearly never used. + + +Games ordered by MENU + +Super Bubble ( port08_w 00 ) +Tetris << ?? ( port08_w ac ) +Wonder Boy << ?? ( port08_w cc ) +Alex Kidd ( port08_w 07 ) +Super Mario << ?? ( port08_w 3c ) +Hello Kang Si ( port08_w 0d ) +Solomon Key ( port08_w 02 ) +Buk Doo Gun ( port08_w 0e ) + +Invaders << ?? ( port08_w 1c ) +Galaxian ( port08_w 14 ) +Galaga << ?? ( port08_w 6c ) +Flicky ( port08_w 04 ) +Teddy Boy ( port08_w 25 ) +Ghost House << ?? ( port08_w 4c ) +Bomb Jack << ?? ( port08_w 5c ) +Kings Vally ( port08_w 24 ) + +Pippols ( port08_w 34 ) +Dragon Story ( port08_w 05 ) +Spy vs Spy ( port08_w 15 ) +PitFall II ( port08_w 35 ) +Drol ( port08_w 06 ) +Pit Pot ( port08_w 16 ) +Hyper Sport ( port08_w 26 ) +Super Tank ( port08_w 36 ) + +Congo Bongo ( port08_w 23 ) +Circus ( port08_w 33 ) +Road Fighter << ?? ( port08_w 9c ) +Astro << ?? ( port08_w 2c ) +Goonies << ?? ( port08_w 7c ) +Road Runner I << ?? ( port08_w 8c ) +Masic Tree ( port08_w 03 ) +Mouse ( port08_w 13 ) + + +list reordered based on ROMs and banking (the low 4 bits are clear the ROM select, the upper 4 bits are the bank select) +you can clearly see + +ROM K1.bin / ROM K2.bin +Super Bubble ( port08_w 00 ) (8 banks - 2 roms) + +ROM K3.bin +Solomon Key ( port08_w 02 ) (all 4 banks) + +ROM K4.bin +Masic Tree ( port08_w 03 ) +Mouse ( port08_w 13 ) +Congo Bongo ( port08_w 23 ) +Circus ( port08_w 33 ) + +ROM K5.bin +Flicky ( port08_w 04 ) +Galaxian ( port08_w 14 ) +Kings Vally ( port08_w 24 ) +Pippols ( port08_w 34 ) + +ROM K6.bin +Dragon Story ( port08_w 05 ) +Spy vs Spy ( port08_w 15 ) +Teddy Boy ( port08_w 25 ) +PitFall II ( port08_w 35 ) + +ROM K7.bin +Drol ( port08_w 06 ) +Pit Pot ( port08_w 16 ) +Hyper Sport ( port08_w 26 ) +Super Tank ( port08_w 36 ) + +ROM K8.bin +Alex Kidd ( port08_w 07 ) (all 4 banks) + +port08_w x8 would be K9 (unpopulated) +port08_w x9 would be K10 (unpopulated) +port08_w xa would be K11 (unpopulated) +port08_w xb would be K12 (unpopulated) + + +ROM rom4.bin? (MISSING FROM DUMP!) +Invaders << ?? ( port08_w 1c ) +Astro << ?? ( port08_w 2c ) +Super Mario << ?? ( port08_w 3c ) +Ghost House << ?? ( port08_w 4c ) +Bomb Jack << ?? ( port08_w 5c ) +Galaga << ?? ( port08_w 6c ) +Goonies << ?? ( port08_w 7c ) +Road Runner I << ?? ( port08_w 8c ) +Road Fighter << ?? ( port08_w 9c ) +Tetris << ?? ( port08_w ac ) +Wonder Boy << ?? ( port08_w cc ) + +ROM rom3.bin +Hello Kang Si ( port08_w 0d ) + +ROM rom2.bin +Buk Doo Gun ( port08_w 0e ) + + + +A Korean version has been seen too (unless this can be switched?) + +*/ + +#include "emu.h" +#include "cpu/z80/z80.h" +#include "sound/sn76496.h" +#include "sound/2413intf.h" +#include "video/315_5124.h" +#include "includes/sms_bootleg.h" + + + +static ADDRESS_MAP_START( sms_supergame_map, AS_PROGRAM, 8, smsbootleg_state ) + AM_RANGE(0x0000, 0xbfff) AM_ROM + AM_RANGE(0xc000, 0xfff7) AM_RAM +// AM_RANGE(0xfffc, 0xffff) AM_READWRITE(sms_mapper_r, sms_mapper_w) /* Bankswitch control */ +ADDRESS_MAP_END + +WRITE8_MEMBER(smsbootleg_state::port08_w) +{ + printf("port08_w %02x\n", data); +} + +WRITE8_MEMBER(smsbootleg_state::port18_w) +{ + printf("port18_w %02x\n", data); +} + + +static ADDRESS_MAP_START( sms_supergame_io, AS_IO, 8, smsbootleg_state ) + ADDRESS_MAP_GLOBAL_MASK(0xff) + ADDRESS_MAP_UNMAP_HIGH + + AM_RANGE(0x04, 0x04) AM_READNOP //AM_READ_PORT("IN0") // these + AM_RANGE(0x08, 0x08) AM_WRITE(port08_w) + AM_RANGE(0x14, 0x14) AM_READNOP //AM_READ_PORT("IN1") // seem to be from a coinage / timer MCU, changing them directly changes the credits / time value + AM_RANGE(0x18, 0x18) AM_WRITE(port18_w) + + AM_RANGE(0x40, 0x7f) AM_READWRITE(sms_count_r, sms_psg_w) + AM_RANGE(0x80, 0x80) AM_MIRROR(0x3e) AM_DEVREADWRITE("sms_vdp", sega315_5124_device, vram_read, vram_write) + AM_RANGE(0x81, 0x81) AM_MIRROR(0x3e) AM_DEVREADWRITE("sms_vdp", sega315_5124_device, register_read, register_write) + + AM_RANGE(0xdc, 0xdc) AM_READ_PORT("IN2") +ADDRESS_MAP_END + + + +static MACHINE_CONFIG_START( sms_supergame, smsbootleg_state ) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", Z80, XTAL_53_693175MHz/15) // check - I can only see a 10.738635 on this PCB + MCFG_CPU_PROGRAM_MAP(sms_supergame_map) + MCFG_CPU_IO_MAP(sms_supergame_io) + + MCFG_QUANTUM_TIME(attotime::from_hz(60)) + + MCFG_MACHINE_START_OVERRIDE(sms_state,sms) + MCFG_MACHINE_RESET_OVERRIDE(sms_state,sms) + + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL_53_693175MHz/15) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) + + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, \ + SEGA315_5124_WIDTH , SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH - 2, SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 256 + 10, \ + SEGA315_5124_HEIGHT_NTSC, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT + 224) + MCFG_SCREEN_REFRESH_RATE((double) XTAL_53_693175MHz/10 / (SEGA315_5124_WIDTH * SEGA315_5124_HEIGHT_NTSC)) + MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms) + + MCFG_DEVICE_ADD("sms_vdp", SEGA315_5246, 0) + MCFG_SEGA315_5246_SET_SCREEN("screen") + MCFG_SEGA315_5246_IS_PAL(false) + MCFG_SEGA315_5246_INT_CB(WRITELINE(sms_state, sms_int_callback)) + MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + +MACHINE_CONFIG_END + + + + + +static INPUT_PORTS_START( sms_supergame ) + PORT_START("PAUSE") + PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )// PORT_NAME(DEF_STR(Pause)) PORT_CODE(KEYCODE_1) +#if 0 + PORT_START("IN0") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_START("IN1") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) +#endif + PORT_START("IN2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +DRIVER_INIT_MEMBER(smsbootleg_state,sms_supergame) +{ + UINT8* rom = memregion("maincpu")->base(); + size_t size = memregion("maincpu")->bytes(); + + for (int i = 0;i < size;i++) + { + rom[i] ^= 0x80; + } +} + + +ROM_START( smssgame ) + ROM_REGION( 0x200000, "maincpu", 0 ) + ROM_LOAD( "Rom1.bin", 0x00000, 0x10000, CRC(0e1f258e) SHA1(9240dc0d01e3061c0c8807c07c0a1d033ebe9116) ) // yes, this rom is smaller (menu rom) + + ROM_LOAD( "rom2.bin",0x020000, 0x20000, CRC(c1478323) SHA1(27b524a234f072e81ef41fb89a5fff5617e9b951) ) // Buk Doo Sun + ROM_LOAD( "rom3.bin",0x040000, 0x20000, CRC(96c8705d) SHA1(ba4f4af0cfdad1d63a08201ed186c79aea062b95) ) // ? Kung Fu game (Hello Kang Si?) + // there is something in the position marked ROM4. + + // k12 unpopulated + // k11 unpopulated + // k10 unpopulated + // k9 unpopulated + ROM_LOAD( "K8.bin", 0x060000, 0x20000, CRC(eb1e8693) SHA1(3283cdcfc25f34a43f317093cd39e10a52bc3ae7) ) // Alex Kidd in Miracle World + ROM_LOAD( "K7.bin", 0x080000, 0x20000, CRC(d24da417) SHA1(2ef5e55748e412157e55e7a62355fd66bf792d8e) ) // Drol / Pit Pot / Hyper Sports II / Super Tank + ROM_LOAD( "K6.bin", 0x0a0000, 0x20000, CRC(d78ce5ba) SHA1(06065cec3865ff3a2bb2f56702b24427487964e2) ) // Dragon Story / Spy Vs Spy / Teddyboy Blues / Pitfall II + ROM_LOAD( "K5.bin", 0x0c0000, 0x20000, CRC(a7b64d1c) SHA1(7c37ac3f37699c49492d4f4ea4e213670413041c) ) // Flicky / Galaxian / King's Valley / Pippos + ROM_LOAD( "K4.bin", 0x0e0000, 0x20000, CRC(e5903942) SHA1(d0c02f4b37c8a02142868459af14ba8ed0340ccd) ) // Magical Tree / Chustle Chumy / Congo Bongo / Charlie Circus + ROM_LOAD( "K3.bin", 0x100000, 0x20000, CRC(9bb92096) SHA1(3ca17b7a9aa20b97cac1f78ba13f70bed1b37463) ) // Solomon's Key + ROM_LOAD( "K2.bin", 0x120000, 0x20000, CRC(a12439f4) SHA1(e957d4fe275e982bedef28af8cc2957da27dc512) ) // Final Bubble Bobble (1/2) + ROM_LOAD( "K1.bin", 0x140000, 0x20000, CRC(dadffecd) SHA1(68ebb968539049a9e193da5200856b9f956f7e02) ) // Final Bubble Bobble (2/2) + + ROM_LOAD( "rom4.bin",0x180000, 0x80000, NO_DUMP ) // missing + + // there seems to be some kind of MCU for the timer? +ROM_END + + + +GAME( 199?, smssgame, 0, sms_supergame, sms_supergame, smsbootleg_state, sms_supergame, ROT0, "Sono Corp Japan", "Super Game (Sega Master System Multi-game bootleg)", MACHINE_NOT_WORKING ) + + diff --git a/src/mame/includes/sms_bootleg.h b/src/mame/includes/sms_bootleg.h new file mode 100644 index 00000000000..ff22c0c56b1 --- /dev/null +++ b/src/mame/includes/sms_bootleg.h @@ -0,0 +1,15 @@ +#include "sms.h" + +class smsbootleg_state : public sms_state +{ + public: + smsbootleg_state(const machine_config &mconfig, device_type type, const char *tag) + : sms_state(mconfig, type, tag) + {} + + DECLARE_DRIVER_INIT(sms_supergame); + DECLARE_WRITE8_MEMBER(port08_w); + DECLARE_WRITE8_MEMBER(port18_w); + +}; + diff --git a/src/mame/mame.lst b/src/mame/mame.lst index d22c7ce5f08..e2d13ce105a 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -32642,6 +32642,9 @@ shougi2 // (c) 1982 (Arcade TV Game List - P.80, Left, 1 @source:shtzone.cpp shtzone // (c) 1987 +@source:sms_bootleg.cpp +smssgame + @source:shuuz.cpp shuuz // 136083 (c) 1990 shuuz2 // 136083 (c) 1990 From 1158050f946238136c1fa193ad312cf3729b3ea6 Mon Sep 17 00:00:00 2001 From: Brandon Munger Date: Tue, 29 Mar 2016 19:36:35 -0400 Subject: [PATCH 74/74] r9751: Move PDC floppy command trigger to correct register --- src/mame/drivers/r9751.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp index 89cd7da81b0..340c1840352 100644 --- a/src/mame/drivers/r9751.cpp +++ b/src/mame/drivers/r9751.cpp @@ -260,6 +260,8 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w ) data_b1 = (data & 0xFF00) >> 8; m_pdc->reg_p6 = data_b0; m_pdc->reg_p7 = data_b1; + m_pdc->reg_p38 |= 0x2; // Set bit 1 on port 38 register, PDC polls this port looking for a command + if(TRACE_FDC)logerror("--- FDD SET PDC Port 38: %X\n",m_pdc->reg_p38); break; case 0x80B0: /* FDD command address register */ UINT32 fdd_scsi_command; @@ -295,8 +297,6 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w ) scsi_lba = c_fdd_scsi_command[3] | (c_fdd_scsi_command[2]<<8) | ((c_fdd_scsi_command[1]&0x1F)<<16); if(TRACE_FDC) logerror("--- FDD SCSI LBA: %i\n", scsi_lba); - m_pdc->reg_p38 |= 0x2; // Set bit 1 on port 38 register, PDC polls this port looking for a command - if(TRACE_FDC)logerror("--- FDD SET PDC Port 38: %X\n",m_pdc->reg_p38); break; default: