summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-08-30 12:12:29 +1000
committer Vas Crabb <vas@vastheman.com>2017-08-30 12:12:29 +1000
commitdbae1f4e05cac302e75d3779cf91d9ff8e928f85 (patch)
treeb155127a6e2846dae5ea205bd193628f1c12c2b8
parentd9bf844429645d869388c15d9fdb3b8826cd8035 (diff)
parent2beedc540f14267850036f8b2aba81e874895ade (diff)
Merge tag 'mame0189'
MAME 0.189
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--hash/lynx.xml2
-rw-r--r--hash/pico.xml4
-rw-r--r--language/Turkish/strings.po32
-rw-r--r--makefile4
5 files changed, 23 insertions, 23 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 7b235a4b2fd..bd1e1beab2e 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
- android:versionCode="188"
- android:versionName="0.188"
+ android:versionCode="189"
+ android:versionName="0.189"
android:installLocation="auto">
<!-- Android 5.0 -->
diff --git a/hash/lynx.xml b/hash/lynx.xml
index 0a1b689064d..1b6a161e96e 100644
--- a/hash/lynx.xml
+++ b/hash/lynx.xml
@@ -248,7 +248,7 @@ Known undumped prototypes:
</part>
</software>
- <software name="cmines2bt" cloneof="cmines2">
+ <software name="cmines2bt" cloneof="cmines2">
<description>Crystal Mines II - Buried Treasure (Euro, USA)</description>
<year>2003</year>
<publisher>Songbird Productions</publisher>
diff --git a/hash/pico.xml b/hash/pico.xml
index a4fe3a5b646..a82d8f50d7f 100644
--- a/hash/pico.xml
+++ b/hash/pico.xml
@@ -304,7 +304,7 @@ Published by Others (T-yyy*** serial codes, for yyy depending on the publisher)
</part>
</software>
- <software name="poohcornsw" cloneof="poohcorn">
+ <software name="poohcornsw" cloneof="poohcorn">
<description>Ett Ã…r med Nalle Puh (Swe)</description>
<year>1995</year>
<publisher>Sega</publisher>
@@ -436,7 +436,7 @@ Published by Others (T-yyy*** serial codes, for yyy depending on the publisher)
</part>
</software>
-<software name="anpanwpk">
+ <software name="anpanwpk">
<description>Anpanman Pico Wakuwaku Pan Koujou (Jpn)</description>
<year>2001</year>
<publisher>Bandai</publisher>
diff --git a/language/Turkish/strings.po b/language/Turkish/strings.po
index 2acc24454dd..9fba3265b47 100644
--- a/language/Turkish/strings.po
+++ b/language/Turkish/strings.po
@@ -1,5 +1,5 @@
# Turkish translations for PACKAGE package
-# PACKAGE paketi için Türkçe çeviriler.
+# PACKAGE paketi için Türkçe çeviriler.
# Copyright (C) 2016 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Automatically generated, 2016.
@@ -31,7 +31,7 @@ msgstr ""
#: src/frontend/mame/ui/auditmenu.cpp:104
#, c-format
msgid "(results will be saved to %1$s)"
-msgstr ""
+msgstr "(sonuçlar %1$s 'a kaydedilecek)"
#: src/frontend/mame/ui/auditmenu.cpp:130
#, c-format
@@ -42,7 +42,7 @@ msgstr ""
#: src/frontend/mame/ui/auditmenu.cpp:142
msgid "Start Audit"
-msgstr ""
+msgstr "Denetlemeyi BaÅŸlat"
#: src/frontend/mame/ui/imgcntrl.cpp:116
msgid "Cannot save over directory"
@@ -61,23 +61,23 @@ msgstr ""
#: src/frontend/mame/ui/filesel.cpp:261
msgid "[create]"
-msgstr ""
+msgstr "[oluÅŸtur]"
#: src/frontend/mame/ui/filesel.cpp:265 src/frontend/mame/ui/swlist.cpp:94
msgid "[software list]"
-msgstr ""
+msgstr "[yazılım listesi]"
#: src/frontend/mame/ui/filesel.cpp:525
msgid "Select access mode"
-msgstr ""
+msgstr "Erişim tipini seçin"
#: src/frontend/mame/ui/filesel.cpp:526
msgid "Read-only"
-msgstr ""
+msgstr "Salt-okunur"
#: src/frontend/mame/ui/filesel.cpp:528
msgid "Read-write"
-msgstr ""
+msgstr "Salt-yazılır"
#: src/frontend/mame/ui/filesel.cpp:529
msgid "Read this image, write to another image"
@@ -89,7 +89,7 @@ msgstr ""
#: src/frontend/mame/ui/dirmenu.cpp:35
msgid "ROMs"
-msgstr ""
+msgstr "ROMlar"
#: src/frontend/mame/ui/dirmenu.cpp:36
msgid "Software Media"
@@ -101,7 +101,7 @@ msgstr ""
#: src/frontend/mame/ui/dirmenu.cpp:38 src/frontend/mame/ui/custui.cpp:157
msgid "Language"
-msgstr ""
+msgstr "Dil"
#: src/frontend/mame/ui/dirmenu.cpp:39
msgid "Samples"
@@ -109,27 +109,27 @@ msgstr ""
#: src/frontend/mame/ui/dirmenu.cpp:40
msgid "DATs"
-msgstr ""
+msgstr "DATlar"
#: src/frontend/mame/ui/dirmenu.cpp:41
msgid "INIs"
-msgstr ""
+msgstr "INIler"
#: src/frontend/mame/ui/dirmenu.cpp:42
msgid "Category INIs"
-msgstr ""
+msgstr "Kategori INIleri"
#: src/frontend/mame/ui/dirmenu.cpp:43
msgid "Icons"
-msgstr ""
+msgstr "Simgeler"
#: src/frontend/mame/ui/dirmenu.cpp:44 src/frontend/mame/ui/submenu.cpp:25
msgid "Cheats"
-msgstr ""
+msgstr "Hileler"
#: src/frontend/mame/ui/dirmenu.cpp:45 src/frontend/mame/ui/selmenu.cpp:49
msgid "Snapshots"
-msgstr ""
+msgstr "Ekran Görüntüleri"
#: src/frontend/mame/ui/dirmenu.cpp:46 src/frontend/mame/ui/selmenu.cpp:50
msgid "Cabinets"
diff --git a/makefile b/makefile
index 5cd780d7dd7..e55d1485f43 100644
--- a/makefile
+++ b/makefile
@@ -1546,14 +1546,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.188"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.189"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
- @echo #define BARE_BUILD_VERSION "0.188" > $@
+ @echo #define BARE_BUILD_VERSION "0.189" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@