Merge pull request #19550 from hrydgard/yes-more-fixes

Better control profile for Retroid devices, minor fixes and cleanup

Common/CPUDetect.cpp

@@ -546,8 +546,6 @@ std::string CPUInfo::Summarize() {
 const char *GetCompilerABI() {
 #if PPSSPP_ARCH(ARMV7)
 	return "armeabi-v7a";
-#elif PPSSPP_ARCH(ARM)
-	return "armeabi";
 #elif PPSSPP_ARCH(ARM64)
 	return "arm64";
 #elif PPSSPP_ARCH(X86)

Common/Render/Text/draw_text_android.cpp

@@ -94,7 +94,7 @@ void TextDrawerAndroid::MeasureStringInternal(std::string_view str, float *w, fl
 	*w = (float)(size >> 16);
 	*h = (float)(size & 0xFFFF);
 
-	WARN_LOG(Log::G3D, "Measure Modified: '%.*s' size: %fx%f", (int)text.length(), text.data(), *w, *h);
+	// WARN_LOG(Log::G3D, "Measure Modified: '%.*s' size: %fx%f", (int)text.length(), text.data(), *w, *h);
 }
 
 bool TextDrawerAndroid::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStringEntry &entry, Draw::DataFormat texFormat, std::string_view str, int align, bool fullColor) {
@@ -124,7 +124,7 @@ bool TextDrawerAndroid::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextS
 		imageWidth = 1;
 	if (imageHeight <= 0)
 		imageHeight = 1;
-	WARN_LOG(Log::G3D, "Text: '%.*s' (%02x)", (int)str.length(), str.data(), str[0]);
+	// WARN_LOG(Log::G3D, "Text: '%.*s' (%02x)", (int)str.length(), str.data(), str[0]);
 
 	jintArray imageData = (jintArray)env->CallStaticObjectMethod(cls_textRenderer, method_renderText, jstr, size);
 	env->DeleteLocalRef(jstr);

Common/UI/Context.cpp

@@ -78,7 +78,7 @@ void UIContext::Begin() {
 
 void UIContext::BeginNoTex() {
 	draw_->BindSamplerStates(0, 1, &sampler_);
-	UIBegin(ui_pipeline_notex_);
+	ui_draw2d.Begin(ui_pipeline_notex_);
 }
 
 void UIContext::BeginPipeline(Draw::Pipeline *pipeline, Draw::SamplerState *samplerState) {
@@ -89,7 +89,7 @@ void UIContext::BeginPipeline(Draw::Pipeline *pipeline, Draw::SamplerState *samp
 	Draw::Texture *textures[2]{};
 	draw_->BindTextures(1, 2, textures);
 	RebindTexture();
-	UIBegin(pipeline);
+	ui_draw2d.Begin(pipeline);
 }
 
 void UIContext::RebindTexture() const {

Common/UI/PopupScreens.cpp

@@ -141,12 +141,12 @@ void PopupMultiChoice::ChoiceCallback(int num) {
 		UI::EventParams e{};
 		e.v = this;
 		e.a = num;
+		e.b = PostChoiceCallback(num);
 		OnChoice.Trigger(e);
 
 		if (restoreFocus_) {
 			SetFocusedView(this);
 		}
-		PostChoiceCallback(num);
 	}
 }
 

Common/UI/PopupScreens.h

@@ -238,7 +238,7 @@ private:
 	UI::EventReturn HandleClick(UI::EventParams &e);
 
 	void ChoiceCallback(int num);
-	virtual void PostChoiceCallback(int num) {}
+	virtual bool PostChoiceCallback(int num) { return true; }
 
 	I18NCat category_;
 	ScreenManager *screenManager_;
@@ -274,9 +274,15 @@ public:
 	}
 
 protected:
-	void PostChoiceCallback(int num) override {
-		if (valueStr_) {
+	bool PostChoiceCallback(int num) override {
+		if (!valueStr_) {
+			return true;
+		}
+		if (*valueStr_ != choices_[num]) {
 			*valueStr_ = choices_[num];
+			return true;
+		} else {
+			return false;
 		}
 	}
 

Common/UI/UI.cpp

@@ -9,12 +9,3 @@
 
 // TODO: UI should probably not own these.
 DrawBuffer ui_draw2d;
-DrawBuffer ui_draw2d_front;
-
-void UIBegin(Draw::Pipeline *pipeline) {
-	ui_draw2d.Begin(pipeline);
-}
-
-void UIFlush() {
-	ui_draw2d.Flush();
-}

Common/UI/UI.h

@@ -57,9 +57,3 @@ public:
 private:
 	const std::vector<std::string> *items_;
 };
-
-
-// Begins/flushes the two UI drawbuffers together.
-void UIBegin(Draw::Pipeline *shaderSet);
-void UIFlush();
-

Core/Config.cpp

@@ -726,6 +726,19 @@ static bool DefaultShowTouchControls() {
 	}
 }
 
+static bool DefaultShowPauseButton() {
+	switch (System_GetPropertyInt(SYSPROP_DEVICE_TYPE)) {
+	case DEVICE_TYPE_MOBILE:
+	case DEVICE_TYPE_DESKTOP:
+		return true;
+	case DEVICE_TYPE_VR:
+	case DEVICE_TYPE_TV:
+		return false;
+	default:
+		return false;
+	}
+}
+
 static const float defaultControlScale = 1.15f;
 static const ConfigTouchPos defaultTouchPosShow = { -1.0f, -1.0f, defaultControlScale, true };
 static const ConfigTouchPos defaultTouchPosHide = { -1.0f, -1.0f, defaultControlScale, false };
@@ -779,13 +792,9 @@ static const ConfigSetting controlSettings[] = {
 	ConfigSetting("fcombo18X", "fcombo18Y", "comboKeyScale18", "ShowComboKey18", &g_Config.touchCustom[18], defaultTouchPosHide, CfgFlag::PER_GAME),
 	ConfigSetting("fcombo19X", "fcombo19Y", "comboKeyScale19", "ShowComboKey19", &g_Config.touchCustom[19], defaultTouchPosHide, CfgFlag::PER_GAME),
 
-#if defined(_WIN32)
 	// A win32 user seeing touch controls is likely using PPSSPP on a tablet. There it makes
 	// sense to default this to on.
-	ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, true, CfgFlag::DEFAULT),
-#else
-	ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, false, CfgFlag::DEFAULT),
-#endif
+	ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, &DefaultShowPauseButton, CfgFlag::DEFAULT),
 #if defined(USING_WIN_UI)
 	ConfigSetting("IgnoreWindowsKey", &g_Config.bIgnoreWindowsKey, false, CfgFlag::PER_GAME),
 #endif

Core/KeyMap.cpp

@@ -418,11 +418,11 @@ const KeyMap_IntStrPair psp_button_names[] = {
 	{VIRTKEY_AXIS_SWAP, "AxisSwap"},
 
 	{VIRTKEY_FASTFORWARD, "Fast-forward"},
+	{VIRTKEY_PAUSE, "Pause"},
 	{VIRTKEY_SPEED_TOGGLE, "SpeedToggle"},
 	{VIRTKEY_SPEED_CUSTOM1, "Alt speed 1"},
 	{VIRTKEY_SPEED_CUSTOM2, "Alt speed 2"},
 	{VIRTKEY_SPEED_ANALOG, "Analog speed"},
-	{VIRTKEY_PAUSE, "Pause"},
 	{VIRTKEY_RESET_EMULATION, "Reset"},
 	{VIRTKEY_FRAME_ADVANCE, "Frame Advance"},
 #if !defined(MOBILE_DEVICE)
@@ -734,7 +734,7 @@ void RestoreDefault() {
 	} else if (IsMOQII7S(name)) {
 		SetDefaultKeyMap(DEFAULT_MAPPING_MOQI_I7S, false);
 	} else if (IsRetroid(name)) {
-		SetDefaultKeyMap(DEFAULT_MAPPING_RETRO_STATION_CONTROLLER, false);
+		SetDefaultKeyMap(DEFAULT_MAPPING_RETROID_CONTROLLER, false);
 	} else {
 		SetDefaultKeyMap(DEFAULT_MAPPING_ANDROID_PAD, false);
 	}
@@ -855,7 +855,7 @@ void AutoConfForPad(const std::string &name) {
 	if (name.find("Xbox") != std::string::npos) {
 		SetDefaultKeyMap(DEFAULT_MAPPING_ANDROID_XBOX, false);
 	} else if (name == "Retro Station Controller") {
-		SetDefaultKeyMap(DEFAULT_MAPPING_RETRO_STATION_CONTROLLER, false);
+		SetDefaultKeyMap(DEFAULT_MAPPING_RETROID_CONTROLLER, false);
 	} else {
 		SetDefaultKeyMap(DEFAULT_MAPPING_ANDROID_PAD, false);
 	}

Core/KeyMapDefaults.cpp

@@ -200,21 +200,26 @@ static const DefMappingStruct defaultAndroidXboxControllerMap[] = {
 
 // Retroid reports its controller as "Retro Station Controller".
 // It's very similar to the Android Xbox mapping, just with main buttons swapped around.
-static const DefMappingStruct defaultRetroStationControllerMap[] = {
+static const DefMappingStruct defaultRetroidControllerMap[] = {
 	{CTRL_CROSS          , NKCODE_BUTTON_B},
 	{CTRL_CIRCLE         , NKCODE_BUTTON_A},
 	{CTRL_SQUARE         , NKCODE_BUTTON_Y},
 	{CTRL_TRIANGLE       , NKCODE_BUTTON_X},
-	// The hat for DPAD is standard for bluetooth pads, which is the most likely pads on Android I think.
+	{CTRL_LEFT           , JOYSTICK_AXIS_HAT_X, -1},
 	{CTRL_LEFT           , NKCODE_DPAD_LEFT},
+	{CTRL_RIGHT          , JOYSTICK_AXIS_HAT_X, +1},
 	{CTRL_RIGHT          , NKCODE_DPAD_RIGHT},
+	{CTRL_UP             , JOYSTICK_AXIS_HAT_Y, -1},
 	{CTRL_UP             , NKCODE_DPAD_UP},
+	{CTRL_DOWN           , JOYSTICK_AXIS_HAT_Y, +1},
 	{CTRL_DOWN           , NKCODE_DPAD_DOWN},
 	{CTRL_START          , NKCODE_BUTTON_START},
-	{CTRL_SELECT         , NKCODE_BACK},
+	{CTRL_SELECT         , NKCODE_BUTTON_SELECT},
 	{CTRL_LTRIGGER       , NKCODE_BUTTON_L1},
 	{CTRL_RTRIGGER       , NKCODE_BUTTON_R1},
+	{VIRTKEY_FASTFORWARD , NKCODE_BUTTON_R2},
 	{VIRTKEY_FASTFORWARD , JOYSTICK_AXIS_RTRIGGER, +1},
+	{VIRTKEY_PAUSE       , NKCODE_BUTTON_L2},
 	{VIRTKEY_PAUSE       , JOYSTICK_AXIS_LTRIGGER, +1},
 	{VIRTKEY_AXIS_X_MIN, JOYSTICK_AXIS_X, -1},
 	{VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1},
@@ -222,7 +227,6 @@ static const DefMappingStruct defaultRetroStationControllerMap[] = {
 	{VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, -1},
 };
 
-
 static const DefMappingStruct defaultPadMapAndroid[] = {
 	{CTRL_CROSS          , NKCODE_BUTTON_A},
 	{CTRL_CIRCLE         , NKCODE_BUTTON_B},
@@ -415,8 +419,8 @@ void SetDefaultKeyMap(DefaultMaps dmap, bool replace) {
 	case DEFAULT_MAPPING_ANDROID_XBOX:
 		SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultAndroidXboxControllerMap, ARRAY_SIZE(defaultAndroidXboxControllerMap), replace);
 		break;
-	case DEFAULT_MAPPING_RETRO_STATION_CONTROLLER:
-		SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultRetroStationControllerMap, ARRAY_SIZE(defaultRetroStationControllerMap), replace);
+	case DEFAULT_MAPPING_RETROID_CONTROLLER:
+		SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultRetroidControllerMap, ARRAY_SIZE(defaultRetroidControllerMap), replace);
 		break;
 	case DEFAULT_MAPPING_VR_HEADSET:
 		SetDefaultKeyMap(DEVICE_ID_XR_CONTROLLER_LEFT, defaultVRLeftController, ARRAY_SIZE(defaultVRLeftController), replace);

Core/KeyMapDefaults.h

@@ -13,7 +13,7 @@ enum DefaultMaps {
 	DEFAULT_MAPPING_OUYA,
 	DEFAULT_MAPPING_XPERIA_PLAY,
 	DEFAULT_MAPPING_MOQI_I7S,
-	DEFAULT_MAPPING_RETRO_STATION_CONTROLLER,
+	DEFAULT_MAPPING_RETROID_CONTROLLER,
 	DEFAULT_MAPPING_VR_HEADSET,
 };
 

Core/MIPS/JitCommon/JitBlockCache.cpp

@@ -87,7 +87,7 @@ JitBlockCache::~JitBlockCache() {
 bool JitBlock::ContainsAddress(u32 em_address) const {
 	// WARNING - THIS DOES NOT WORK WITH JIT INLINING ENABLED.
 	// However, that doesn't exist yet so meh.
-	return (em_address >= originalAddress && em_address < originalAddress + 4 * originalSize);
+	return em_address >= originalAddress && em_address < originalAddress + 4 * originalSize;
 }
 
 bool JitBlockCache::IsFull() const {
@@ -146,6 +146,8 @@ const JitBlock *JitBlockCache::GetBlock(int no) const {
 }
 
 int JitBlockCache::AllocateBlock(u32 startAddress) {
+	_assert_(num_blocks_ < MAX_NUM_BLOCKS);
+
 	JitBlock &b = blocks_[num_blocks_];
 
 	b.proxyFor = 0;
@@ -177,6 +179,8 @@ int JitBlockCache::AllocateBlock(u32 startAddress) {
 }
 
 void JitBlockCache::ProxyBlock(u32 rootAddress, u32 startAddress, u32 size, const u8 *codePtr) {
+	_assert_(num_blocks_ < MAX_NUM_BLOCKS);
+
 	// If there's an existing block at the startAddress, add rootAddress as a proxy root of that block
 	// instead of creating a new block.
 	int num = GetBlockNumberFromStartAddress(startAddress, false);

GPU/Common/DrawEngineCommon.cpp

@@ -806,6 +806,8 @@ int DrawEngineCommon::ComputeNumVertsToDecode() const {
 	return sum;
 }
 
+// Takes a list of consecutive PRIM opcodes, and extends the current draw call to include them.
+// This is just a performance optimization.
 int DrawEngineCommon::ExtendNonIndexedPrim(const uint32_t *cmd, const uint32_t *stall, u32 vertTypeID, bool clockwise, int *bytesRead, bool isTriangle) {
 	const uint32_t *start = cmd;
 	int prevDrawVerts = numDrawVerts_ - 1;

UI/GameSettingsScreen.cpp

@@ -1098,6 +1098,11 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
 	PopupMultiChoiceDynamic *theme = systemSettings->Add(new PopupMultiChoiceDynamic(&g_Config.sThemeName, sy->T("Theme"), GetThemeInfoNames(), I18NCat::THEMES, screenManager()));
 	theme->OnChoice.Add([=](EventParams &e) {
 		UpdateTheme(screenManager()->getUIContext());
+		// Reset the tint/saturation if the theme changed.
+		if (e.b) {
+			g_Config.fUITint = 0.0f;
+			g_Config.fUISaturation = 1.0f;
+		}
 		return UI::EVENT_CONTINUE;
 	});
 

UI/MainScreen.cpp

@@ -794,7 +794,9 @@ void GameBrowser::Refresh() {
 			topBar->Add(new Choice(ImageID("I_FOLDER_OPEN"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::BrowseClick);
 #else
 			if ((browseFlags_ & BrowseFlags::BROWSE) && System_GetPropertyBool(SYSPROP_HAS_FOLDER_BROWSER)) {
-				topBar->Add(new Choice(mm->T("Browse"), ImageID("I_FOLDER_OPEN"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::BrowseClick);
+				// Collapse the button title on very small screens (Retroid Pocket).
+				std::string_view browseTitle = g_display.pixel_xres <= 640 ? "" : mm->T("Browse");
+				topBar->Add(new Choice(browseTitle, ImageID("I_FOLDER_OPEN"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::BrowseClick);
 			}
 			if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_TV) {
 				topBar->Add(new Choice(mm->T("Enter Path"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Add([=](UI::EventParams &) {

UI/Store.cpp

@@ -523,9 +523,9 @@ void StoreScreen::CreateViews() {
 	LinearLayout *topBar = root_->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, 64.0f)));
 	topBar->Add(new Choice(di->T("Back"), new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT)))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
 	titleText_ = new TextView(mm->T("PPSSPP Homebrew Store"), ALIGN_VCENTER, false, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT));
+	titleText_->SetTextColor(screenManager()->getUIContext()->GetTheme().itemFocusedStyle.fgColor);
 	topBar->Add(titleText_);
-	UI::Drawable solid(0xFFbd9939);
-	topBar->SetBG(solid);
+	topBar->SetBG(screenManager()->getUIContext()->GetTheme().itemFocusedStyle.background);
 
 	LinearLayout *content;
 	if (connectionError_ || loading_) {

android/jni/Locals.mk

@@ -47,16 +47,6 @@ ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
 
   LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32
 endif
-ifeq ($(TARGET_ARCH_ABI),armeabi)
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavformat.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavcodec.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libswresample.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libswscale.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavutil.a
-  LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv6/include
-
-  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -march=armv6
-endif
 
 ifeq ($(TARGET_ARCH_ABI),x86_64)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libavformat.a

android/src/org/ppsspp/ppsspp/PpssppActivity.java

@@ -29,7 +29,6 @@ public class PpssppActivity extends NativeActivity {
 	// Key used for debugging.
 	public static final String ARGS_EXTRA_KEY = "org.ppsspp.ppsspp.Args";
 
-	private static boolean m_hasUnsupportedABI = false;
 	private static boolean m_hasNoNativeBinary = false;
 
 	public static boolean libraryLoaded = false;
@@ -42,16 +41,12 @@ public class PpssppActivity extends NativeActivity {
 	private static final int STORAGE_ERROR_ALREADY_EXISTS = -4;
 
 	public static void CheckABIAndLoadLibrary() {
-		if (Build.CPU_ABI.equals("armeabi")) {
-			m_hasUnsupportedABI = true;
-		} else {
-			try {
-				System.loadLibrary("ppsspp_jni");
-				libraryLoaded = true;
-			} catch (UnsatisfiedLinkError e) {
-				Log.e(TAG, "LoadLibrary failed, UnsatifiedLinkError: " + e);
-				m_hasNoNativeBinary = true;
-			}
+		try {
+			System.loadLibrary("ppsspp_jni");
+			libraryLoaded = true;
+		} catch (UnsatisfiedLinkError e) {
+			Log.e(TAG, "LoadLibrary failed, UnsatifiedLinkError: " + e);
+			m_hasNoNativeBinary = true;
 		}
 	}
 
@@ -65,17 +60,13 @@ public class PpssppActivity extends NativeActivity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
-		if (m_hasUnsupportedABI || m_hasNoNativeBinary) {
+		if (m_hasNoNativeBinary) {
 			new Thread() {
 				@Override
 				public void run() {
 					Looper.prepare();
 					AlertDialog.Builder builder = new AlertDialog.Builder(PpssppActivity.this);
-					if (m_hasUnsupportedABI) {
-						builder.setMessage(Build.CPU_ABI + " target is not supported.").setTitle("Error starting PPSSPP").create().show();
-					} else {
-						builder.setMessage("The native part of PPSSPP for ABI " + Build.CPU_ABI + " is missing. Try downloading an official build?").setTitle("Error starting PPSSPP").create().show();
-					}
+					builder.setMessage("The native part of PPSSPP for ABI " + Build.CPU_ABI + " is missing. Try downloading an official build?").setTitle("Error starting PPSSPP").create().show();
 					Looper.loop();
 				}
 			}.start();

assets/lang/ar_AE.ini

@@ -1299,6 +1299,8 @@ JIT using IR = JIT using IR
 Language = ‎اللغة
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = ‎installed.txt مسار الحفظ في
+Memory Stick in My Documents = ‎مسار الحفظ في مستنداتي
 Memory Stick size = Memory Stick size
 Change Nickname = ‎تغيير الأسم المستعار
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1362,8 +1364,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = ‎إلي الإفتراضي PPSSPP's إعادة إعدادات
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = ‎ترجيع تردد اللقطة (يأكل الذاكرة)
-Save path in installed.txt = ‎installed.txt مسار الحفظ في
-Save path in My Documents = ‎مسار الحفظ في مستنداتي
 Savestate Slot = ‎منطقة حفظ الحالة
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = ‎PNG إحفظ لقطة الشاشة في صيغة

assets/lang/az_AZ.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Language
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Change nickname
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Restore PPSSPP's settings to default
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format

assets/lang/bg_BG.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Език
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Промени прякор
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Възстанови първоначалните настройки на PPSSPP
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind snapshot честота („яде“ памет)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = слот за запазено състояние
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Запази снимка в PNG формат

assets/lang/ca_ES.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Llengua
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Change nickname
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Restore PPSSPP's settings to default
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format

assets/lang/cz_CZ.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Jazyk
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Cesta pro uložení dat je installed.txt
+Memory Stick in My Documents = Cesta pro uložení dat je v Dokumentech
 Memory Stick size = Memory Stick size
 Change Nickname = Změnit přezdívku
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Obnovit výchozí nastavení PPSSPP
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Četnost snímků přetočení (žrout paměti)
-Save path in installed.txt = Cesta pro uložení dat je installed.txt
-Save path in My Documents = Cesta pro uložení dat je v Dokumentech
 Savestate Slot = Pozice uložené hry
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Ukládat snímky obrazovky ve formátu PNG

assets/lang/da_DK.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Sprog
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Gem sti i installed.txt
+Memory Stick in My Documents = Gem sti i Mine Dokumenter
 Memory Stick size = Memory Stick size
 Change Nickname = Ændre kaldenavn
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Sæt PPSSPP's indstillinger tilbage til standard
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Tilbagespol snapshot frekvens (mem hog)
-Save path in installed.txt = Gem sti i installed.txt
-Save path in My Documents = Gem sti i Mine Dokumenter
 Savestate Slot = Lagerplads for spil-status
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Gem skærmdumps i PNG format

assets/lang/de_DE.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Sprache
 Loaded plugin: %1 = Plugin geladen: %1
 Memory Stick folder = Memory Stick Ordner
+Memory Stick in installed.txt = Speicherpfad in installed.txt
+Memory Stick in My Documents = Speicherpfad in "Meine Dokumente"
 Memory Stick size = Memory Stick Größe
 Change Nickname = Spitznamen ändern
 ChangingMemstickPath = Speicherstände oder ähnliche Daten werden nicht in diesen Ordner kopiert.\n\nÄndere Ordner auf dem Memorystick??
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Zurücksetzen der Aufnahme bei Laden/Speich
 Restore Default Settings = Auf Standardeinstellungen zurücksetzen
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Zurückspulen-Snapshot Frequenz (Speicherfresser)
-Save path in installed.txt = Speicherpfad in installed.txt
-Save path in My Documents = Speicherpfad in "Meine Dokumente"
 Savestate Slot = Speicherplatz
 Savestate slot backups = Backups für Speicherplatz
 Screenshots as PNG = Screenshots im PNG-Format speichern

assets/lang/dr_ID.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Bahasa
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Sullei Nickname
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Restore PPSSPP's settings to default
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Alai gambara'na PNG

assets/lang/en_US.ini

@@ -1299,6 +1299,8 @@ Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 JIT using IR = JIT using IR
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Change nickname
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1368,8 +1370,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Restore PPSSPP's settings to default
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format

assets/lang/es_ES.ini

@@ -1292,6 +1292,8 @@ JIT using IR = JIT using IR
 Language = Idioma
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Directorio de Memory Stick
+Memory Stick in installed.txt = Carpeta de guardado en "installed.txt"
+Memory Stick in My Documents = Carpeta de guardado en "Mis documentos"
 Memory Stick size = Cambiar tamaño de Memory Stick (GB)
 Change Nickname = Cambiar apodo PSP
 ChangingMemstickPath = Partidas guardadas, estados y otros datos no serán copiados a este directorio.\n\n¿Cambiar directorio de la Memory Stick?
@@ -1355,8 +1357,6 @@ Reset Recording on Save/Load State = Reiniciar grabación al cargar/guardar esta
 Restore Default Settings = Reestablecer ajustes
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Intervalo de rebobinado
-Save path in installed.txt = Carpeta de guardado en "installed.txt"
-Save path in My Documents = Carpeta de guardado en "Mis documentos"
 Savestate Slot = Ranura de estado guardado
 Savestate slot backups = Ranura de backups de estados guardados
 Screenshots as PNG = Capturas en PNG

assets/lang/es_LA.ini

@@ -1293,6 +1293,8 @@ JIT using IR = JIT using IR
 Language = Idioma
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Carpeta del Memory Stick
+Memory Stick in installed.txt = Guardar ruta en installed.txt
+Memory Stick in My Documents = Guardar ruta en "C:/Users/(tu usuario)/Documents"
 Memory Stick size = Tamaño del Memory Stick
 Change Nickname = Cambiar nombre de usuario
 ChangingMemstickPath = Datos de juego, estados guardados, y otros archivos no son copiados a esta carpeta.\n\n¿Quieres cambiar de carpeta de Memory Stick?
@@ -1356,8 +1358,6 @@ Reset Recording on Save/Load State = Reiniciar grabación al abrir/guardar estad
 Restore Default Settings = Reestablecer ajustes
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Frecuencia de rebobinado\n(consume memoria)
-Save path in installed.txt = Guardar ruta en installed.txt
-Save path in My Documents = Guardar ruta en "C:/Users/(tu usuario)/Documents"
 Savestate Slot = Ranura de estado guardado
 Savestate slot backups = Copias de seguridad de estado guardado
 Screenshots as PNG = Capturas en PNG

assets/lang/fa_IR.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = ‎زبان
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = ذخیره در داکیومنت‌ها
 Memory Stick size = Memory Stick size
 Change Nickname = ‎تغییر نام
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = ‎به حالت اولیه PPSSPP بازگشت تنظیمات
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = ‎تعداد فریم ذخیره شده برای به عقب رفتن (مصرف زیاد رم)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = ذخیره در داکیومنت‌ها
 Savestate Slot = Savestate slot
 Savestate slot backups = پشتیبان گیری از داده
 Screenshots as PNG = ‎باشد PNG اسکرین شات با فرمت

assets/lang/fi_FI.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Kieli
 Loaded plugin: %1 = Ladattu liitännäinen: %1
 Memory Stick folder = Muistikortin kansio
+Memory Stick in installed.txt = Tallennuskansio installed.txt-tiedostossa
+Memory Stick in My Documents = Tallennuskansio Omat tiedostot -kansiossa
 Memory Stick size = Muistikortin koko
 Change Nickname = Vaihda nimimerkkiä
 ChangingMemstickPath = Pelien tallennukset, tilatallennukset, ja muita tietoja ei kopioida tähän kansioon.\n\nHaluatko vaihtaa muistikortin kansiota?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Nollaa nauhoitus tallennettaessa/ladattaess
 Restore Default Settings = Palauta PPSSPP:n oletusasetukset
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Pikakelaa tilannevedosten välit (muistisyöppö)
-Save path in installed.txt = Tallennuskansio installed.txt-tiedostossa
-Save path in My Documents = Tallennuskansio Omat tiedostot -kansiossa
 Savestate Slot = Tilatallennuksen lohko
 Savestate slot backups = Tallennustilan lohkon varmuuskopiot
 Screenshots as PNG = Tallenna kuvankaappaukset PNG-muodossa

assets/lang/fr_FR.ini

@@ -1282,6 +1282,8 @@ JIT using IR = JIT using IR
 Language = Langue
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Changer le dossier de la Memory Stick
+Memory Stick in installed.txt = Chemin de sauvegarde dans "installed.txt"
+Memory Stick in My Documents = Chemin de sauvegarde dans "Mes documents"
 Memory Stick size = Changer la taille de la Memory Stick (Go)
 Change Nickname = Changer de pseudo
 ChangingMemstickPath = Les sauvegardes, états, et autres données ne peuvent pas être enregistrés dans ce dossier.\n\nChanger le dossier de la Memory Stick ?
@@ -1345,8 +1347,6 @@ Reset Recording on Save/Load State = Redémarrer l'enregistrement lors de la sau
 Restore Default Settings = Restaurer les paramètres par défaut
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Fréquence instantanés rembobinage (+ de mémoire)
-Save path in installed.txt = Chemin de sauvegarde dans "installed.txt"
-Save path in My Documents = Chemin de sauvegarde dans "Mes documents"
 Savestate Slot = Emplacement d'état
 Savestate slot backups = Emplacement d'état de secours
 Screenshots as PNG = Enregistrer les captures d'écran au format .png

assets/lang/gl_ES.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Idioma
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Carpeta de gardado en installed.txt
+Memory Stick in My Documents = Carpeta de gardado en Meus documentos
 Memory Stick size = Memory Stick size
 Change Nickname = Cambiar alcume PSP
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Reestablecer axustes
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Frecuencia de rebobinado de instantánea (mem hog)
-Save path in installed.txt = Carpeta de gardado en installed.txt
-Save path in My Documents = Carpeta de gardado en Meus documentos
 Savestate Slot = Ranura de estado gardado
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Capturas en PNG

assets/lang/gr_EL.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Γλώσσα
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Αλλαγή φακέλου Memory Stick
+Memory Stick in installed.txt = Αποθήκευση διαδρομής στο installed.txt
+Memory Stick in My Documents = Αποθήκευση διαδρομής στα Έγγραφα μου
 Memory Stick size = Memory Stick size
 Change Nickname = Αλλαγή Ψευδωνύμου
 ChangingMemstickPath = Τα δεδομένα αποθήκευσης παιχνιδιών, καταστάσεων και άλλων δεδομένων δεν θα αντιγραφούν σε αυτόν τον φάκελο.\n\nΑλλαγή του φακέλου Memory Stick;
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Επαναφορά της εγγραφής
 Restore Default Settings = Επαναφορά προεπιλεγμένων ρυθμίσεων του PPSSPP
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Συχνότητα Αντιστροφής Στιγμιότυπου (mem hog)
-Save path in installed.txt = Αποθήκευση διαδρομής στο installed.txt
-Save path in My Documents = Αποθήκευση διαδρομής στα Έγγραφα μου
 Savestate Slot = Slot Σημείου Αποθήκευσης
 Savestate slot backups = Αντίγραφα ασφαλείας slot σημείων αποθήκευσης
 Screenshots as PNG = Αποθήκευση Στιγμιοτύπων ως PNG

assets/lang/he_IL.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = שפה
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = שנה כינוי
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Restore PPSSPP's settings to default
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = שמור צילום מסך כ PNG

assets/lang/he_IL_invert.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = הפש
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = יוניכ הנש
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Restore PPSSPP's settings to default
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = PNG כ ךסמ םוליצ רומש

assets/lang/hr_HR.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Jezik
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Promijeni mapu Memorijskoga sticka
+Memory Stick in installed.txt = Spremi put u installed.txt
+Memory Stick in My Documents = Spremi put u My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Promijeni nadimak
 ChangingMemstickPath = Spremljene igre, save state-ovi, i drugi podatci neće biti kopirani na ovu mapu.\n\nPromijeni mapu Memorijskoga sticka?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Ponovo postavi snimak na Save/Load state
 Restore Default Settings = Vrati PPSSPP opcije na zadano
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Vrati snapshot frekvenciju (mem hog)
-Save path in installed.txt = Spremi put u installed.txt
-Save path in My Documents = Spremi put u My Documents
 Savestate Slot = Savestate mjesto
 Savestate slot backups = Savestate mjesto backup-ovi
 Screenshots as PNG = Spremi snimak zaslona u PNG formatu

assets/lang/hu_HU.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Nyelv
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memóriakártya mappájának megváltoztatása
+Memory Stick in installed.txt = Mentés helye installed.txt-ben
+Memory Stick in My Documents = Mentés helye a Dokumentumok mappában
 Memory Stick size = Memóriakártya mérete
 Change Nickname = Becenév
 ChangingMemstickPath = A mentések, állapotmentések és egyéb adatok nem kerülnek másolásra ebbe a mappába.\n\nMegváltoztatod a Memóriakártya mappáját?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Rögzítés leállítása állapotmentés k
 Restore Default Settings = PPSSPP beállításainak alapértelmezettre állítása
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Visszatekerési állapotmentések gyakorisága (lefogja a memóriát)
-Save path in installed.txt = Mentés helye installed.txt-ben
-Save path in My Documents = Mentés helye a Dokumentumok mappában
 Savestate Slot = Állapotmentés sorszáma
 Savestate slot backups = Állapotmentések sorszámonkénti biztonsági másolata
 Screenshots as PNG = Képek mentése PNG formátumban

assets/lang/id_ID.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Bahasa
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Berkas Memory Stick
+Memory Stick in installed.txt = Simpan jalur dalam installed.txt
+Memory Stick in My Documents = Simpan jalur dalam dokumen saya
 Memory Stick size = Ukuran Memory Stick
 Change Nickname = Ganti nama panggilan
 ChangingMemstickPath = Menyimpan permainan, menyimpan status, dan data lainnya tidak akan disalin ke berkas ini.\n\nUbah berkas Memory Stick?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Atur ulang rekaman pada status simpan/muat
 Restore Default Settings = Atur ulang pengaturan PPSSPP ke awal
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Putar ulang frekuensi foto (memory hog)
-Save path in installed.txt = Simpan jalur dalam installed.txt
-Save path in My Documents = Simpan jalur dalam dokumen saya
 Savestate Slot = Slot simpanan status
 Savestate slot backups = Slot cadangan simpanan status
 Screenshots as PNG = Simpan tangkapan layar dalam format PNG

assets/lang/it_IT.ini

@@ -1292,6 +1292,8 @@ JIT using IR = JIT using IR
 Language = Lingua
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Cartella della Memory Stick
+Memory Stick in installed.txt = Salva il percorso in "installed.txt"
+Memory Stick in My Documents = Salva il percorso in "Documenti"
 Memory Stick size = Cambia dimensioni Memory Stick
 Change Nickname = Cambia Nick
 ChangingMemstickPath = I salvataggi, gli stati e altri dati non verranno copiati in questa cartella.\n\nCambiare la cartella del Memory Stick?
@@ -1362,8 +1364,6 @@ Record Display = Registra Display
 Reset Recording on Save/Load State = Reset della registrazione al Salvataggio/Caricamento stato
 Restore Default Settings = Ripristina Impostazioni di PPSSPP
 Rewind Snapshot Interval = Frequenza riavvolgimento snapshot (+ memoria)
-Save path in installed.txt = Salva il percorso in "installed.txt"
-Save path in My Documents = Salva il percorso in "Documenti"
 Savestate Slot = Slot di salvataggio stato
 Savestate slot backups = Backup dello slot di salvataggio stato
 Screenshots as PNG = Salva screenshot in formato PNG

assets/lang/ja_JP.ini

@@ -1289,6 +1289,8 @@ JIT using IR = IRを使用したJIT
 Language = 言語
 Loaded plugin: %1 = 読み込まれたプラグイン: %1
 Memory Stick folder = メモリースティックフォルダを変更する
+Memory Stick in installed.txt = パスを installed.txt に保存する
+Memory Stick in My Documents = パスを My Documents に保存する
 Memory Stick size = メモリースティックの容量の変更 (GB)
 Change Nickname = ニックネームを変更する
 ChangingMemstickPath = ゲームのセーブ, セーブステート, その他のデータはこのフォルダにコピーされません。\n\nメモリースティックフォルダを変更しますか？
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = ステートをセーブ/ロードしたら
 Restore Default Settings = 設定をデフォルトに戻す
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = スナップショットの巻き戻し頻度 (メモリを消費)
-Save path in installed.txt = パスを installed.txt に保存する
-Save path in My Documents = パスを My Documents に保存する
 Savestate Slot = セーブステートのスロット
 Savestate slot backups = セーブステートのスロットをバックアップする
 Screenshots as PNG = スクリーンショットをPNG形式で保存する

assets/lang/jv_ID.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Basa
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Nyimpen path ing installed.txt
+Memory Stick in My Documents = Nyimpen path ing Dokumen kulo
 Memory Stick size = Memory Stick size
 Change Nickname = Ganti Jeneng
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Mulihake setelan PPSSPP kanggo gawan
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Frekuensi gambar asli seko mundur (mem hog)
-Save path in installed.txt = Nyimpen path ing installed.txt
-Save path in My Documents = Nyimpen path ing Dokumen kulo
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Gambar minangka PNG

assets/lang/ko_KR.ini

@@ -1275,6 +1275,8 @@ Dynarec/JIT (recommended) = 동적 재컴파일/JIT (추천)
 JIT using IR = IR을 이용한 JIT
 Loaded plugin: %1 = 로드된 플러그인: %1
 Memory Stick folder = 메모리 스틱 폴더
+Memory Stick in installed.txt = install.txt에 경로 저장
+Memory Stick in My Documents = 내 문서에 경로 저장
 Memory Stick size = 메모리 스틱 크기
 Change Nickname = 별명 변경
 ChangingMemstickPath = 게임 저장, 상태 저장, 기타 데이터는 이 폴더에 복사되지 않습니다.\n\n메모리 스틱 폴더를 변경하겠습니까?
@@ -1344,8 +1346,6 @@ Reset Recording on Save/Load State = 저장/불러오기 상태에서 녹화 재
 Restore Default Settings = PPSSPP의 설정을 기본값으로 복원
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = 되감기 스냅샷 빈도 (메모리 호그)
-Save path in installed.txt = install.txt에 경로 저장
-Save path in My Documents = 내 문서에 경로 저장
 Savestate Slot = 저장 상태 슬롯
 Savestate slot backups = 저장 상태 슬롯 백업
 Screenshots as PNG = 스크린샷을 PNG 형식으로 저장

assets/lang/ku_SO.ini

@@ -1290,6 +1290,8 @@ Enable plugins = Enable plugins
 JIT using IR = JIT using IR
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = فۆڵدەری میمۆری
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = قەبارەی میمۆری
 Change Nickname = گۆڕینی نازناو
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1358,8 +1360,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Restore PPSSPP's settings to default
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = PNG خەزن کردنی سکریین شۆت بە شیوەی

assets/lang/lo_LA.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = ພາສາ
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = ບັນທຶກຂໍ້ມູນໃນ installed.txt
+Memory Stick in My Documents = ບັນທຶກຂໍ້ມູນໄວ້ທີ່ My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = ປ່ຽນຊື່ຫຼິ້ນ
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = "ຄືນຄ່າການຕັ້ງຄ່າຂອງ PPSSPP ເປັນຄ່າເລີ່ມຕົ້ນ"
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = ບັນທຶກຂໍ້ມູນໃນ installed.txt
-Save path in My Documents = ບັນທຶກຂໍ້ມູນໄວ້ທີ່ My Documents
 Savestate Slot = ຊ່ອງເກັບເຊບ
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = ຈັບພາບໜ້າຈໍເປັນ PNG

assets/lang/lt-LT.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Kalba
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Pakeisti slapyvardį
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Nustatyti "PPSSPP" parametrus į numatytuosius
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = "Vėjinti" momentinės nuotraukos dažnį (atminties "rijikas")
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Išsaugojimo statuso vieta
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Išsaugoti nuotraukas PNG formatu

assets/lang/ms_MY.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Bahasa
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Tukar nama samaran
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Kembalikan tetapan PPSSPP ke lalai
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Kekerapan pusingan gambar skrin (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Slot Savestate
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Simpan pembidik skrin sebagai format PNG

assets/lang/nl_NL.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Taal
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Opslagpad in installed.txt
+Memory Stick in My Documents = Opslagpad in Mijn documenten
 Memory Stick size = Memory Stick size
 Change Nickname = Gebruikersnaam wijzigen
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Opname opnieuw opstarten bij opslaan/laden
 Restore Default Settings = PPSSPP's standaardinstellingen herstellen
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Terugspoelfrequentie (kost geheugen)
-Save path in installed.txt = Opslagpad in installed.txt
-Save path in My Documents = Opslagpad in Mijn documenten
 Savestate Slot = Savestatesleuf
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Screenshots opslaan in PNG-formaat

assets/lang/no_NO.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Language
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Endre Kallenavn
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Restore PPSSPP's settings to default
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format

assets/lang/pl_PL.ini

@@ -1296,6 +1296,8 @@ JIT using IR = JIT używając IR
 Language = Język
 Loaded plugin: %1 = Załadowano plugin: %1
 Memory Stick folder = Zmień folder Karty Pamięci
+Memory Stick in installed.txt = Ścieżka zapisu w installed.txt
+Memory Stick in My Documents = Ścieżka zapisu w Dokumentach
 Memory Stick size = Rozmiar Karty Pamięci
 Change Nickname = Zmień pseudonim
 ChangingMemstickPath = Zapisy gier, zapisy stanu i inne dane nie zostaną skopiowane do tego folderu.\n\nZmienić ścieżkę do folderu Karty Pamięci?
@@ -1359,8 +1361,6 @@ Reset Recording on Save/Load State = Resetuj nagrywanie przy zapisie/wczytaniu s
 Restore Default Settings = Przywróć domyślne ustawienia
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Częstotl. zapisu stanów przewijania (wymaga pamięci)
-Save path in installed.txt = Ścieżka zapisu w installed.txt
-Save path in My Documents = Ścieżka zapisu w Dokumentach
 Savestate Slot = Slot zapisu stanu
 Savestate slot backups = Kopie zapasowe slota zapisu stanu
 Screenshots as PNG = Zapisuj zrzuty ekranu jako PNG

assets/lang/pt_BR.ini

@@ -1299,6 +1299,8 @@ Dynarec/JIT (recommended) = Dynarec/JIT (recomendado)
 JIT using IR = JIT usando o IR
 Loaded plugin: %1 = Plugin carregado: %1
 Memory Stick folder = Pasta do cartão de memória
+Memory Stick in installed.txt = Caminho do save em installed.txt
+Memory Stick in My Documents = Caminho do save em Meus Documentos
 Memory Stick size = Tamanho do cartão de memória
 Change Nickname = Mudar apelido
 ChangingMemstickPath = Jogos salvos, states salvos e outros dados não serão copiados pra esta pasta.\n\nMudar a pasta do cartão de memória?
@@ -1368,8 +1370,6 @@ Reset Recording on Save/Load State = Resetar a gravação ao salvar/carregar o s
 Restore Default Settings = Restaurar as configurações do PPSSPP para os padrões
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Retroceder a frequência dos snapshots (consome muita memória)
-Save path in installed.txt = Caminho do save em installed.txt
-Save path in My Documents = Caminho do save em Meus Documentos
 Savestate Slot = Slot do state salvo
 Savestate slot backups = Backups dos slots dos states salvos
 Screenshots as PNG = Salvar as screenshots no formato PNG

assets/lang/pt_PT.ini

@@ -1304,6 +1304,8 @@ JIT using IR = JIT using IR
 Language = Idioma
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Pasta do cartão de memória
+Memory Stick in installed.txt = Caminho do salvamento em installed.txt
+Memory Stick in My Documents = Caminho do salvamento em "Meus Documentos"
 Memory Stick size = Tamanho do cartão de memória
 Change Nickname = Mudar Apelido
 ChangingMemstickPath = Jogos salvos, Estados salvos e outros dados não serão copiados para esta pasta.\n\nMudar a pasta do cartão de memória?
@@ -1370,8 +1372,6 @@ Reset Recording on Save/Load State = Reiniciar a gravação ao salvar/carregar o
 Restore Default Settings = Restaurar as definições do PPSSPP para os padrões
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rebobinar a frequência dos snapshots (consome memória)
-Save path in installed.txt = Caminho do salvamento em installed.txt
-Save path in My Documents = Caminho do salvamento em "Meus Documentos"
 Savestate Slot = Espaço do estado salvo
 Savestate slot backups = Backups dos espaços dos estados salvos
 Screenshots as PNG = Salvar as Capturas de Tela em formato .png

assets/lang/ro_RO.ini

@@ -1292,6 +1292,8 @@ JIT using IR = JIT using IR
 Language = Limbă
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Schimbă nume
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1355,8 +1357,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Adu la setări PPSSPP inițiale
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Slot salvare
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Salvează instantanee în format PNG

assets/lang/ru_RU.ini

@@ -1288,6 +1288,8 @@ JIT using IR = JIT с использованием IR
 Language = Язык
 Loaded plugin: %1 = Загружен плагин: %1
 Memory Stick folder = Изменить папку с картой памяти
+Memory Stick in installed.txt = Путь до сохранений в installed.txt
+Memory Stick in My Documents = Путь до сохранений в "Мои документы"
 Memory Stick size = Изменить размер карты памяти (Гб)
 Change Nickname = Изменить ник
 ChangingMemstickPath = Сохранения, состояния и другие данные НЕ будут скопированы в эту папку.\n\nИзменить папку с картой памяти?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Сбрасывать запись при с
 Restore Default Settings = Сбросить настройки PPSSPP
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Частота сохранения состояний
-Save path in installed.txt = Путь до сохранений в installed.txt
-Save path in My Documents = Путь до сохранений в "Мои документы"
 Savestate Slot = Слот состояния
 Savestate slot backups = Резервные копии слота состояния
 Screenshots as PNG = Сохранять скриншоты в PNG

assets/lang/sv_SE.ini

@@ -1291,6 +1291,8 @@ Game crashed = Game crashed
 JIT using IR = JIT using IR
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick-mapp
+Memory Stick in installed.txt = Sparkatalog från installed.txt
+Memory Stick in My Documents = Sparkatalog i Dokument
 Memory Stick size = Memory Stick-storlek
 Change Nickname = Ändra nickname
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1355,8 +1357,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = Återställ standard-inställningar
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = Sparkatalog från installed.txt
-Save path in My Documents = Sparkatalog i Dokument
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Skärmdumpar som PNG

assets/lang/tg_PH.ini

@@ -1294,6 +1294,8 @@ JIT using IR = JIT gamit ang IR
 Language = Wika
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Folder ng Memory Stickd
+Memory Stick in installed.txt = I-save ang sinasabing 'path' sa installed.txt
+Memory Stick in My Documents = I-save ang sinasabing 'path' sa "My Documents" ng iyong Kompyuter
 Memory Stick size = Size ng Memory Stick
 Change Nickname = Baguhin ang palayaw
 ChangingMemstickPath = Ang pag-save ng mga laro, estado, at iba pang mga data ay hindi makokopya sa folder na ito.\n\n Papalitan ba ang folder ng Memory Stick?
@@ -1357,8 +1359,6 @@ Reset Recording on Save/Load State = Reset Recording on Save/Load state
 Restore Default Settings = Ibalik ang settings sa dati nitong ayos
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
-Save path in installed.txt = I-save ang sinasabing 'path' sa installed.txt
-Save path in My Documents = I-save ang sinasabing 'path' sa "My Documents" ng iyong Kompyuter
 Savestate Slot = Savestate Slot
 Savestate slot backups = Pag-backup ng save state slot
 Screenshots as PNG = I-save ang Screenshot sa PNG na pormat

assets/lang/th_TH.ini

@@ -1365,6 +1365,8 @@ Language = ภาษา
 Loaded plugin: %1 = ปลั๊กอินถูกโหลดใช้แล้ว: %1
 Memory Stick folder = เปลี่ยนแหล่งที่เก็บข้อมูล (เม็มโมรี่ สติ๊ก)
 Memory Stick Folder = โฟลเดอร์แหล่งที่เก็บข้อมูล (เม็มโมรี่ สติ๊ก)
+Memory Stick in installed.txt = บันทึกข้อมูลตามเส้นทางที่เลือกไว้
+Memory Stick in My Documents = บันทึกข้อมูลไว้ที่ My Documents
 Memory Stick inserted = ใส่ที่เก็บบันทึกข้อมูล (เม็มโมรี่ สติ๊ก)
 Memory Stick size = เปลี่ยนขนาดของแหล่งที่เก็บข้อมูล (กิ๊กกะไบต์)
 MHz, 0:default = MHz, 0 = ค่าเริ่มต้น
@@ -1392,8 +1394,6 @@ Reset Recording on Save/Load State = เริ่มการอัดบัน
 Restore Default Settings = รีเซ็ตการตั้งค่าของ PPSSPP ทั้งหมด
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = เซฟสเตทพื้นหลังแบบอัตโนมัติ (สูบแรม)
-Save path in installed.txt = บันทึกข้อมูลตามเส้นทางที่เลือกไว้
-Save path in My Documents = บันทึกข้อมูลไว้ที่ My Documents
 Savestate Slot = ช่องเก็บเซฟสเตทเกม
 Savestate slot backups = สำรองข้อมูลเซฟสเตท
 Screenshots as PNG = จับภาพหน้าจอเป็นไฟล์ PNG

assets/lang/tr_TR.ini

@@ -1292,6 +1292,8 @@ JIT using IR = IR kullanarak JIT
 Language = Dil
 Loaded plugin: %1 = Yüklenen uzantı: %1
 Memory Stick folder = Hafıza Kartı klasörü
+Memory Stick in installed.txt = Yolu installed.txt'ye kaydet
+Memory Stick in My Documents = Dosyaları "Belgeler"'e kaydet
 Memory Stick size = Hafıza Kartı boyutu
 Change Nickname = Kullanıcı adını değiştir
 ChangingMemstickPath = Oyun kayıtları, durum kayıtları ve diğer veriler bu klasöre kopyalanmayacak.\n\nHafıza Kartı klasörü değiştirilsin mi?
@@ -1355,8 +1357,6 @@ Reset Recording on Save/Load State = Kaydet/Yükle durumunda kaydı sıfırla
 Restore Default Settings = Varsayılan ayarları yükle
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Geri sarma görüntüsü sıklığı (mem hog)
-Save path in installed.txt = Yolu installed.txt'ye kaydet
-Save path in My Documents = Dosyaları "Belgeler"'e kaydet
 Savestate Slot = Durum kaydı yeri
 Savestate slot backups = Durum kaydı slot yedekleri
 Screenshots as PNG = Ekran görüntülerini PNG olarak kaydet

assets/lang/uk_UA.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Мова
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Змінити папку для карти пам'яті
+Memory Stick in installed.txt = Шлях до збережень в installed.txt
+Memory Stick in My Documents = Шлях до збережень в Моїх документах
 Memory Stick size = Memory Stick size
 Change Nickname = Змінити ім'я
 ChangingMemstickPath = Збереження, стан і інші дані НЕ будуть скопійовані в цю папку..\n\nЗмінити папку для карти пам'яті?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Скидати запис при збере
 Restore Default Settings = Скинути налаштування
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Змінити частоту кадрів (багато пам'яті)
-Save path in installed.txt = Шлях до збережень в installed.txt
-Save path in My Documents = Шлях до збережень в Моїх документах
 Savestate Slot = Слот пам'яті
 Savestate slot backups = Резервні копії слота стану
 Screenshots as PNG = Скріншот в PNG

assets/lang/vi_VN.ini

@@ -1291,6 +1291,8 @@ JIT using IR = JIT using IR
 Language = Ngôn ngữ
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = Memory Stick in installed.txt
+Memory Stick in My Documents = Memory Stick in My Documents
 Memory Stick size = Memory Stick size
 Change Nickname = Đổi nickname
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1354,8 +1356,6 @@ Reset Recording on Save/Load State = Đặt lại ghi trên trạng thái Save/L
 Restore Default Settings = Chỉnh các thiết lập về mặc định
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Tần số Rewind snapshot
-Save path in installed.txt = Save path in installed.txt
-Save path in My Documents = Save path in My Documents
 Savestate Slot = Ô save
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Chụp ảnh màn hình bằng định dạng PNG

assets/lang/zh_CN.ini

@@ -1276,6 +1276,8 @@ Dynarec/JIT (recommended) = 动态重编译 (推荐)
 Enable plugins = 启用插件
 JIT using IR = 动态重编译 (IR模式)
 Loaded plugin: %1 = 已加载插件: %1
+Memory Stick in installed.txt = 记忆棒目录使用“installed.txt”
+Memory Stick in My Documents = 记忆棒目录使用“我的文档”
 Only JPG and PNG images are supported = 只支持JPG和PNG图片
 Pause when not focused = 后台运行时自动暂停
 Plugins = 插件
@@ -1348,8 +1350,6 @@ Record Display = 录制视频
 Reset Recording on Save/Load State = 保存/载入存档时重置录制
 Restore Default Settings = 恢复默认PPSSPP设置
 Rewind Snapshot Interval = 倒带快照频率
-Save path in installed.txt = 记忆棒目录使用“installed.txt”
-Save path in My Documents = 记忆棒目录使用“我的文档”
 Savestate Slot = 即时存档插槽
 Savestate slot backups = 即时存档备份
 Screenshots as PNG = 将截图保存为PNG格式

assets/lang/zh_TW.ini

@@ -1278,6 +1278,8 @@ JIT using IR = JIT 使用 IR
 Language = 語言
 Loaded plugin: %1 = 載入的外掛程式: %1
 Memory Stick folder = 記憶棒資料夾
+Memory Stick in installed.txt = 儲存路徑於 installed.txt
+Memory Stick in My Documents = 儲存路徑於「我的文件」
 Memory Stick size = 記憶棒大小
 Change Nickname = 變更暱稱
 ChangingMemstickPath = 遊戲、存檔和其他資料將不會複製到這個資料夾\n\n要變更記憶棒資料夾嗎？
@@ -1344,8 +1346,6 @@ Reset Recording on Save/Load State = 儲存/載入存檔時重設錄製
 Restore Default Settings = 將 PPSSPP 設定重設為預設值
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = 倒轉快照間隔
-Save path in installed.txt = 儲存路徑於 installed.txt
-Save path in My Documents = 儲存路徑於「我的文件」
 Savestate Slot = 存檔插槽
 Savestate slot backups = 存檔插槽備份
 Screenshots as PNG = 以 PNG 格式儲存螢幕截圖

ext/miniupnp-build/Android.mk

@@ -30,8 +30,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../miniupnp/miniupnpc/src $(L
 
 ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
 LOCAL_CFLAGS := $(LOCAL_CFLAGS)
-else ifeq ($(TARGET_ARCH_ABI),armeabi)
-LOCAL_CFLAGS := $(LOCAL_CFLAGS) -march=armv6
 else ifeq ($(TARGET_ARCH_ABI),x86)
 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86
 else ifeq ($(TARGET_ARCH_ABI),x86_64)