Skip to content

Commit

Permalink
Merge tag 'mame0263' into rel263
Browse files Browse the repository at this point in the history
MAME 0.263
  • Loading branch information
mahlemiut committed Feb 28, 2024
2 parents aee5ddd + 93d8318 commit 6fa96a8
Show file tree
Hide file tree
Showing 64 changed files with 85 additions and 78 deletions.
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ distributions.


MAME
Copyright (c) 1997-2023 MAMEdev and contributors
Copyright (c) 1997-2024 MAMEdev and contributors

This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2, as provided
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ is required to use the "MAME" name, logo, or wordmark.
<img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
</a>

Copyright (C) 1997-2021 MAMEDev and contributors
Copyright (c) 1997-2024 MAMEdev and contributors

This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2, as provided in
Expand Down
2 changes: 1 addition & 1 deletion android-project/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 1997-2023, MAMEdev and contributors
Copyright (c) 1997-2024, MAMEdev and contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
4 changes: 2 additions & 2 deletions android-project/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="262"
android:versionName="0.262"
android:versionCode="263"
android:versionName="0.263"
android:installLocation="auto">

<!-- OpenGL ES 2.0 -->
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@

# General information about the project.
project = u'MAME Documentation'
copyright = u'1997-2023, MAMEdev and contributors'
copyright = u'1997-2024, MAMEdev and contributors'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.262'
version = '0.263'
# The full version, including alpha/beta/rc tags.
release = '0.262'
release = '0.263'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ would encourage new contributors to distribute files under this license.
Please note that MAME is a registered trademark of Gregory Ember, and permission
is required to use the “MAME” name, logo, or wordmark.

Copyright (C) 1997-2023 MAMEDev and contributors
Copyright (c) 1997-2024 MAMEDev and contributors

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion docs/source/whatis.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ that were its initial focus.

|
| **MAME®**
| **Copyright © 1997-2023 MAMEdev and contributors**
| **Copyright © 1997-2024 MAMEdev and contributors**
| **MAME is a registered trademark of Gregory Ember**
|
Expand Down
20 changes: 10 additions & 10 deletions hash/bbc_rom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ license:CC0-1.0
</software>

<software name="adt177c" cloneof="adt">
<description>Advanced Disc Toolkit 1.77 [cracked]</description>
<description>Advanced Disc Toolkit 1.77 (cracked)</description>
<year>1986</year>
<publisher>Advanced Computer Products</publisher>
<part name="rom" interface="bbc_rom">
Expand Down Expand Up @@ -2057,7 +2057,7 @@ license:CC0-1.0
</software>

<software name="beebfonta" cloneof="beebfont">
<description>BeebFont [alt]</description>
<description>BeebFont (alt)</description>
<year>1984</year>
<publisher>Watford Electronics</publisher>
<part name="rom1" interface="bbc_rom">
Expand Down Expand Up @@ -3903,7 +3903,7 @@ license:CC0-1.0
</software>

<software name="digitisra">
<description>Digitiser 1.00 [alt]</description>
<description>Digitiser 1.00 (alt)</description>
<year>1985</year>
<publisher>Watford Electronics</publisher>
<part name="rom1" interface="bbc_rom">
Expand Down Expand Up @@ -6169,7 +6169,7 @@ license:CC0-1.0
</software>

<software name="iwordh" cloneof="iword">
<description>Inter-Word 1.02 [hack]</description>
<description>Inter-Word 1.02 (hack)</description>
<year>1986</year>
<publisher>Computer Concepts</publisher>
<part name="rom1" interface="bbc_rom">
Expand All @@ -6185,7 +6185,7 @@ license:CC0-1.0
</software>

<software name="iworda1" cloneof="iword">
<description>Inter-Word 1.O2 [alt1]</description>
<description>Inter-Word 1.O2 (alt 1)</description>
<year>1986</year>
<publisher>Computer Concepts</publisher>
<part name="rom1" interface="bbc_rom">
Expand All @@ -6197,7 +6197,7 @@ license:CC0-1.0
</software>

<software name="iworda2" cloneof="iword">
<description>Inter-Word 1.O2 [alt2]</description>
<description>Inter-Word 1.O2 (alt 2)</description>
<year>1986</year>
<publisher>Computer Concepts</publisher>
<part name="rom1" interface="bbc_rom">
Expand Down Expand Up @@ -7057,7 +7057,7 @@ license:CC0-1.0
</software>

<software name="metaasm2ra" cloneof="metaasm2">
<description>Meta Assembler 2.13R [alt]</description>
<description>Meta Assembler 2.13R (alt)</description>
<year>1985</year>
<publisher>Crash Barrier</publisher>
<part name="rom1" interface="bbc_rom">
Expand Down Expand Up @@ -7681,7 +7681,7 @@ license:CC0-1.0
</software>

<software name="mforth83a" cloneof="mforth83">
<description>Multi-FORTH 83 [alt]</description>
<description>Multi-FORTH 83 (alt)</description>
<year>1984</year>
<publisher>Skywave</publisher>
<info name="usage" value="*FORTH-83" />
Expand Down Expand Up @@ -8967,7 +8967,7 @@ license:CC0-1.0
</software>

<software name="ramrodma" cloneof="ramrod">
<description>Ramrod MS4.00c [alt]</description>
<description>Ramrod MS4.00c (alt)</description>
<year>1987</year>
<publisher>Clares</publisher>
<sharedfeat name="compatibility" value="M"/>
Expand Down Expand Up @@ -10561,7 +10561,7 @@ license:CC0-1.0
</software>

<software name="stldfs22k2">
<description>Solidisk DFS 2.2k Issue 2 [hack]</description>
<description>Solidisk DFS 2.2k Issue 2 (hack)</description>
<year>1986</year>
<publisher>Solidisk</publisher>
<info name="usage" value="Requires Solidisk 1770 DDFS Issue 2 FDC" />
Expand Down
2 changes: 1 addition & 1 deletion language/Afrikaans/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Afrikaans translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Albanian/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Albanian translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Arabic/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Arabic translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Basque/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Basque translations for MAME package
# MAME paketearen Ingelesezko itzulpena.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Belarusian/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Belarusian translations for MAME package
# Беларускі пераклад для MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Bosnian/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Bosnian translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Bulgarian/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Bulgarian translations for MAME package
# Български превод за пакет MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Burmese/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Burmese translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Catalan/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Catalan translations for MAME package
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Jordi Mallach <jordi@debian.org>, 2016
#
Expand Down
2 changes: 1 addition & 1 deletion language/Chinese_Simplified/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Chinese Simplified translations for MAME package
# MAME 套件的简体中文翻译
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Chinese_Traditional/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Chinese Traditional translations for MAME package
# MAME 套件的正體中文翻譯
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Croatian/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Croatian translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Czech/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Czech translations for MAME package.
# České preklady pre balík MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Danish/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Danish translations for MAME package
# Danske oversættelser for pakke MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Dutch/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dutch translations for MAME package
# Nederlandse vertalingen voor het pakket MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/English/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# English translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Estonian/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Estonian translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Finnish/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Finnish translations for MAME package
# Suomenkielinen käännös MAME-paketille.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/French/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Traductions françaises du paquet MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/French_Belgium/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Traductions françaises du paquet MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/French_Canada/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# French translations for MAME package
# Traductions françaises du paquet MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Georgian/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Georgian translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/German/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# German translations for MAME package
# German translation for MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Greek/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Greek translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
msgid ""
Expand Down
2 changes: 1 addition & 1 deletion language/Hebrew/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Hebrew translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Hindi/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Hindi translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Indonesian/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Indonesian translations for MAME package
# Terjemahan bahasa inggris untuk paket MAME.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Italian/strings.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Japanese/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MAME パッケージに対する英訳.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Korean/strings.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Korean translations for MAME package
# MAME 패키지에 대한 한국어 번역문.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Latvian/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Latvian translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
2 changes: 1 addition & 1 deletion language/Lithuanian/strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Lithuanian translations for MAME package.
# Copyright (C) 1997-2023 MAMEdev and contributors
# Copyright (C) 1997-2024 MAMEdev and contributors
# This file is distributed under the same license as the MAME package.
# Automatically generated, 2023.
#
Expand Down
Loading

0 comments on commit 6fa96a8

Please sign in to comment.