diff --git a/Android/res/drawable-hdpi/ic_forum.png b/Android/res/drawable-hdpi/ic_discord.png
similarity index 100%
rename from Android/res/drawable-hdpi/ic_forum.png
rename to Android/res/drawable-hdpi/ic_discord.png
diff --git a/Android/res/drawable-mdpi/ic_forum.png b/Android/res/drawable-mdpi/ic_discord.png
similarity index 100%
rename from Android/res/drawable-mdpi/ic_forum.png
rename to Android/res/drawable-mdpi/ic_discord.png
diff --git a/Android/res/drawable-xhdpi/ic_forum.png b/Android/res/drawable-xhdpi/ic_discord.png
similarity index 100%
rename from Android/res/drawable-xhdpi/ic_forum.png
rename to Android/res/drawable-xhdpi/ic_discord.png
diff --git a/Android/res/menu/gallery_drawer.xml b/Android/res/menu/gallery_drawer.xml
index 8e044c58c..4f9c43137 100644
--- a/Android/res/menu/gallery_drawer.xml
+++ b/Android/res/menu/gallery_drawer.xml
@@ -6,8 +6,8 @@
android:id="@+id/menuItem_settings"
android:icon="@drawable/ic_settings"/>
+ android:id="@+id/menuItem_discord"
+ android:icon="@drawable/ic_discord" />
diff --git a/Android/src/emu/project64/GalleryActivity.java b/Android/src/emu/project64/GalleryActivity.java
index 407d0eb22..7fd9bf5f1 100644
--- a/Android/src/emu/project64/GalleryActivity.java
+++ b/Android/src/emu/project64/GalleryActivity.java
@@ -252,7 +252,7 @@ public class GalleryActivity extends AppCompatActivity implements IabBroadcastLi
void UpdateLanguage()
{
Strings.SetMenuTitle(mDrawerList.getMenu(), R.id.menuItem_settings, LanguageStringID.ANDROID_SETTINGS);
- Strings.SetMenuTitle(mDrawerList.getMenu(), R.id.menuItem_forum, LanguageStringID.ANDROID_FORUM);
+ Strings.SetMenuTitle(mDrawerList.getMenu(), R.id.menuItem_discord, LanguageStringID.ANDROID_DISCORD);
Strings.SetMenuTitle(mDrawerList.getMenu(), R.id.menuItem_reportBug, LanguageStringID.ANDROID_REPORT_BUG);
Strings.SetMenuTitle(mDrawerList.getMenu(), R.id.menuItem_about, LanguageStringID.ANDROID_ABOUT);
}
@@ -401,8 +401,8 @@ public class GalleryActivity extends AppCompatActivity implements IabBroadcastLi
Intent SettingsIntent = new Intent(this, SettingsActivity.class);
startActivity( SettingsIntent );
return true;
- case R.id.menuItem_forum:
- Intent ForumIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://forum.pj64-emu.com/forumdisplay.php?f=13"));
+ case R.id.menuItem_discord:
+ Intent ForumIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://discord.gg/sbYbnda"));
startActivity(ForumIntent);
return true;
case R.id.menuItem_reportBug:
diff --git a/Android/src/emu/project64/jni/LanguageStringID.java b/Android/src/emu/project64/jni/LanguageStringID.java
index 40354211b..aba6ed063 100644
--- a/Android/src/emu/project64/jni/LanguageStringID.java
+++ b/Android/src/emu/project64/jni/LanguageStringID.java
@@ -229,7 +229,8 @@ public enum LanguageStringID
TAB_ROMNOTES(408),
TAB_SHORTCUTS(409),
TAB_ROMSTATUS(410),
- TAB_RECOMPILER(411), //Added in 1.7.0.50
+ TAB_RECOMPILER(411),
+ TAB_DEFAULTS(412),
//Plugin Dialog
PLUG_ABOUT(420),
@@ -282,6 +283,7 @@ public enum LanguageStringID
RB_UP(490),
RB_DOWN(491),
RB_REFRESH(492),
+ RB_FILEEXT(493),
//Advanced Options
ADVANCE_INFO(500),
@@ -321,6 +323,8 @@ public enum LanguageStringID
ROM_COUNTPERBYTE(537),
ROM_32BIT(538),
ROM_DELAY_DP(539),
+ ROM_OVER_CLOCK_MODIFIER(5400),
+ ROM_UNALIGNED_DMA(5410),
//Core Styles
CORE_INTERPTER(540),
@@ -384,6 +388,7 @@ public enum LanguageStringID
STR_FR_DLS(701),
STR_FR_PERCENT(702),
STR_FR_DLS_VIS(703),
+ STR_FR_NONE(704),
// Increase speed
STR_INSREASE_SPEED(710),
@@ -573,6 +578,7 @@ public enum LanguageStringID
ANDROID_ABOUT_REVISION(3018),
ANDROID_ABOUT_TEXT(3019),
ANDROID_ABOUT_PJ64_AUTHORS(3020),
+ ANDROID_DISCORD(3021),
//In game menu
ANDROID_MENU_SETTINGS(3100),
diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang
index 4041f80e8..5688890f2 100644
--- a/Lang/English.pj.Lang
+++ b/Lang/English.pj.Lang
@@ -547,6 +547,7 @@
#3018# "Revision"
#3019# "Project64 for Android\u2122 is a port of the windows version of project64.The Android\u2122 version can play most N64 games."
#3020# "Project64 Authors."
+#3021# "Discord"
//In game menu
#3100# "Settings"
diff --git a/Source/Project64-core/Multilanguage.h b/Source/Project64-core/Multilanguage.h
index d054cfe85..b3cdece37 100644
--- a/Source/Project64-core/Multilanguage.h
+++ b/Source/Project64-core/Multilanguage.h
@@ -582,7 +582,8 @@ enum LanguageStringID
ANDROID_ABOUT_LICENCE = 3017,
ANDROID_ABOUT_REVISION = 3018,
ANDROID_ABOUT_TEXT = 3019,
- ANDROID_ABOUT_PJ64_AUTHORS = 3020,
+ ANDROID_ABOUT_PJ64_AUTHORS = 3020,
+ ANDROID_DISCORD = 3021,
//In game menu
ANDROID_MENU_SETTINGS = 3100,
diff --git a/Source/Project64-core/Multilanguage/LanguageClass.cpp b/Source/Project64-core/Multilanguage/LanguageClass.cpp
index 7377fbcf1..bbf486dc1 100644
--- a/Source/Project64-core/Multilanguage/LanguageClass.cpp
+++ b/Source/Project64-core/Multilanguage/LanguageClass.cpp
@@ -549,6 +549,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(ANDROID_ABOUT_REVISION, "Revision");
DEF_STR(ANDROID_ABOUT_TEXT, "Project64 for Android\u2122 is a port of the windows version of project64.The Android\u2122 version can play most N64 games.");
DEF_STR(ANDROID_ABOUT_PJ64_AUTHORS, "Project64 Authors.");
+ DEF_STR(ANDROID_DISCORD, "Discord");
//In game menu
DEF_STR(ANDROID_MENU_SETTINGS, "Settings");