i18n: Remove our awkward ampersand-escape support, except in [DesktopUI]

2025-04-02 11:01:50 -04:00 · 2024-05-31 08:55:12 +02:00 · 2024-05-31 08:55:12 +02:00 · 5999690af5
commit 5999690af5
parent 1f7310d4cf
62 changed files with 228 additions and 216 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -385,9 +385,11 @@ if(NOT MSVC)
 			-Wno-deprecated-register
 			-Wno-sign-conversion
 			-Wno-shorten-64-to-32
-			# Hack around a bad check for __GNUC__ in basis_universal that makes it use old stuff on iOS
-			-Wno-deprecated-builtins
 		)
+		if(MACOSX OR IOS)
+			# Hack around a bad check for __GNUC__ in basis_universal that makes it use old stuff on iOS
+			add_definitions(-Wno-deprecated-builtins)
+		endif()
 	endif()

 	if(USE_ASAN)
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@ -521,6 +521,16 @@
    <ClInclude Include="Render\TextureAtlas.h" />
    <ClInclude Include="Render\Text\draw_text.h" />
    <ClInclude Include="Render\Text\draw_text_android.h" />
+    <ClInclude Include="Render\Text\draw_text_cocoa.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
    <ClInclude Include="Render\Text\draw_text_qt.h" />
    <ClInclude Include="Render\Text\draw_text_sdl.h" />
    <ClInclude Include="Render\Text\draw_text_uwp.h" />
@ -1059,6 +1069,16 @@
    <None Include="..\ext\basis_universal\basisu_transcoder_tables_dxt1_6.inc" />
    <None Include="..\ext\basis_universal\basisu_transcoder_tables_pvrtc2_45.inc" />
    <None Include="..\ext\basis_universal\basisu_transcoder_tables_pvrtc2_alpha_33.inc" />
+    <None Include="Render\Text\draw_text_cocoa.mm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@ -557,6 +557,9 @@
    <ClInclude Include="..\ext\at3_standalone\mem.h">
      <Filter>ext\at3_standalone</Filter>
    </ClInclude>
+    <ClInclude Include="Render\Text\draw_text_cocoa.h">
+      <Filter>Render\Text</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="ABI.cpp" />
@ -1200,5 +1203,8 @@
    <None Include="..\ext\basis_universal\basisu_transcoder_tables_pvrtc2_alpha_33.inc">
      <Filter>ext\basis_universal</Filter>
    </None>
+    <None Include="Render\Text\draw_text_cocoa.mm">
+      <Filter>Render\Text</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/Common/Data/Text/I18n.cpp
+++ b/Common/Data/Text/I18n.cpp
@ -112,6 +112,11 @@ void I18NCategory::SetMap(const std::map<std::string, std::string> &m) {
 	}
 }

+std::map<std::string, std::string> I18NCategory::Missed() const {
+	std::lock_guard<std::mutex> guard(missedKeyLock_);
+	return missedKeyLog_;
+}
+
 std::shared_ptr<I18NCategory> I18NRepo::GetCategory(I18NCat category) {
 	std::lock_guard<std::mutex> guard(catsLock_);
 	if (category != I18NCat::NONE)
--- a/Common/Data/Text/I18n.h
+++ b/Common/Data/Text/I18n.h
@ -64,19 +64,12 @@ enum class I18NCat : uint8_t {
 };

 struct I18NEntry {
-	I18NEntry(const std::string &t) : text(t), readFlag(false) {}
+	I18NEntry(std::string_view t) : text(t), readFlag(false) {}
 	I18NEntry() : readFlag(false) {}
 	std::string text;
 	bool readFlag;
 };

-struct I18NCandidate {
-	I18NCandidate() : key(0), defVal(0) {}
-	I18NCandidate(const char *k, const char *d) : key(k), defVal(d) {}
-	const char *key;
-	const char *defVal;
-};
-
 class I18NCategory {
 public:
 	I18NCategory() {}
@ -88,10 +81,7 @@ public:
 	// Try to avoid this. Still useful in snprintf.
 	const char *T_cstr(const char *key, const char *def = nullptr);

-	std::map<std::string, std::string> Missed() const {
-		std::lock_guard<std::mutex> guard(missedKeyLock_);
-		return missedKeyLog_;
-	}
+	std::map<std::string, std::string> Missed() const;

 	const std::map<std::string, I18NEntry, std::less<>> &GetMap() { return map_; }
 	void ClearMissed() { missedKeyLog_.clear(); }
@ -155,4 +145,4 @@ inline std::string_view T(I18NCat category, std::string_view key, std::string_vi

 inline const char *T_cstr(I18NCat category, const char *key, const char *def = "") {
 	return g_i18nrepo.T_cstr(category, key, def);
-}
+}
--- a/Common/Render/DrawBuffer.cpp
+++ b/Common/Render/DrawBuffer.cpp
@ -461,13 +461,6 @@ float AtlasWordWrapper::MeasureWidth(std::string_view str) {
 	float w = 0.0f;
 	for (UTF8 utf(str); !utf.end(); ) {
 		uint32_t c = utf.next();
-		if (c == '&') {
-			// Skip ampersand prefixes ("&&" is an ampersand.)
-			if (utf.end()) {
-				break;
-			}
-			c = utf.next();
-		}
 		const AtlasChar *ch = atlasfont_.getChar(c);
 		if (!ch) {
 			ch = atlasfont_.getChar('?');
--- a/Common/Render/Text/draw_text.h
+++ b/Common/Render/Text/draw_text.h
@ -23,11 +23,13 @@ namespace Draw {
 }

 struct TextStringEntry {
-	Draw::Texture *texture;
-	int width;
-	int height;
-	int bmWidth;
-	int bmHeight;
+	TextStringEntry(int frameCount) : lastUsedFrame(frameCount) {}
+
+	Draw::Texture *texture = nullptr;
+	int width = 0;
+	int height = 0;
+	int bmWidth = 0;
+	int bmHeight = 0;
 	int lastUsedFrame;
 };

--- a/Common/Render/Text/draw_text_android.cpp
+++ b/Common/Render/Text/draw_text_android.cpp
@ -78,10 +78,6 @@ void TextDrawerAndroid::SetFont(uint32_t fontHandle) {
 	}
 }

-std::string TextDrawerAndroid::NormalizeString(std::string str) {
-	return ReplaceAll(str, "&&", "&");
-}
-
 void TextDrawerAndroid::MeasureString(std::string_view str, float *w, float *h) {
 	if (str.empty()) {
 		*w = 0.0;
@ -102,8 +98,9 @@ void TextDrawerAndroid::MeasureString(std::string_view str, float *w, float *h)
 		} else {
 			ERROR_LOG(G3D, "Missing font");
 		}
-		std::string text(NormalizeString(std::string(str)));
+		std::string text(str);
 		auto env = getEnv();
+		// Unfortunate that we can't create a jstr from a std::string_view directly.
 		jstring jstr = env->NewStringUTF(text.c_str());
 		uint32_t size = env->CallStaticIntMethod(cls_textRenderer, method_measureText, jstr, scaledSize);
 		env->DeleteLocalRef(jstr);
@ -152,7 +149,7 @@ void TextDrawerAndroid::MeasureStringRect(std::string_view str, const Bounds &bo
 		if (iter != sizeCache_.end()) {
 			entry = iter->second.get();
 		} else {
-			std::string text(NormalizeString(lines[i]));
+			std::string text(lines[i]);
 			jstring jstr = env->NewStringUTF(text.c_str());
 			uint32_t size = env->CallStaticIntMethod(cls_textRenderer, method_measureText, jstr, scaledSize);
 			env->DeleteLocalRef(jstr);
@ -252,31 +249,27 @@ void TextDrawerAndroid::DrawString(DrawBuffer &target, std::string_view str, flo
 	if (str.empty())
 		return;

-	std::string text(NormalizeString(std::string(str)));
-	if (text.empty())
-		return;
-
 	CacheKey key{ std::string(str), fontHash_ };
 	target.Flush(true);

 	TextStringEntry *entry;
-
+	
 	auto iter = cache_.find(key);
 	if (iter != cache_.end()) {
 		entry = iter->second.get();
 		entry->lastUsedFrame = frameCount_;
 	} else {
 		DataFormat texFormat = use4444Format_ ? Draw::DataFormat::R4G4B4A4_UNORM_PACK16 : Draw::DataFormat::R8_UNORM;
-		bool emoji = AnyEmojiInString(text.c_str(), text.size());
+		bool emoji = AnyEmojiInString(str.data(), str.length());
 		if (emoji) {
 			texFormat = Draw::DataFormat::R8G8B8A8_UNORM;
 		}

-		entry = new TextStringEntry();
+		entry = new TextStringEntry(frameCount_);

 		TextureDesc desc{};
 		std::vector<uint8_t> bitmapData;
-		DrawStringBitmap(bitmapData, *entry, texFormat, text, align);
+		DrawStringBitmap(bitmapData, *entry, texFormat, str, align);
 		desc.initData.push_back(&bitmapData[0]);

 		desc.type = TextureType::LINEAR2D;
--- a/Common/Render/Text/draw_text_android.h
+++ b/Common/Render/Text/draw_text_android.h
@ -32,8 +32,6 @@ protected:
 	void ClearCache() override;

 private:
-	std::string NormalizeString(std::string str);
-
 	// JNI functions
 	jclass cls_textRenderer;
 	jmethodID method_measureText;
--- a/Common/Render/Text/draw_text_cocoa.mm
+++ b/Common/Render/Text/draw_text_cocoa.mm
@ -255,7 +255,7 @@ void TextDrawerCocoa::DrawString(DrawBuffer &target, std::string_view str, float
 		else
 			texFormat = Draw::DataFormat::R8G8B8A8_UNORM;

-		entry = new TextStringEntry();
+		entry = new TextStringEntry(frameCount_);

 		bool emoji = AnyEmojiInString(key.text.c_str(), key.text.size());
 		if (emoji)
--- a/Common/Render/Text/draw_text_qt.cpp
+++ b/Common/Render/Text/draw_text_qt.cpp
@ -110,7 +110,7 @@ bool TextDrawerQt::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextString
 	painter.setFont(*font);
 	painter.setPen(0xFFFFFFFF);
 	// TODO: Involve ALIGN_HCENTER (bounds etc.)
-	painter.drawText(image.rect(), Qt::AlignTop | Qt::AlignLeft, QString::fromUtf8(str.data(), str.length()).replace("&&", "&"));
+	painter.drawText(image.rect(), Qt::AlignTop | Qt::AlignLeft, QString::fromUtf8(str.data(), str.length()));
 	painter.end();

 	entry.texture = nullptr;
@ -157,7 +157,7 @@ void TextDrawerQt::DrawString(DrawBuffer &target, std::string_view str, float x,
 	} else {
 		DataFormat texFormat = Draw::DataFormat::R4G4B4A4_UNORM_PACK16;

-		entry = new TextStringEntry();
+		entry = new TextStringEntry(frameCount_);

 		TextureDesc desc{};
 		std::vector<uint8_t> bitmapData;
--- a/Common/Render/Text/draw_text_sdl.cpp
+++ b/Common/Render/Text/draw_text_sdl.cpp
@ -385,7 +385,7 @@ void TextDrawerSDL::DrawString(DrawBuffer &target, std::string_view str, float x
 			texFormat = Draw::DataFormat::B4G4R4A4_UNORM_PACK16;
 		}

-		entry = new TextStringEntry();
+		entry = new TextStringEntry(frameCount_);

 		TextureDesc desc{};
 		std::vector<uint8_t> bitmapData;
@ -422,8 +422,7 @@ bool TextDrawerSDL::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStrin
 		return false;
 	}

-	// Replace "&&" with "&"
-	std::string processedStr = ReplaceAll(str, "&&", "&");
+	std::string processedStr(str);

 	// If a string includes only newlines, SDL2_ttf will refuse to render it
 	// thinking it is empty. Add a space to avoid that. 
--- a/Common/Render/Text/draw_text_uwp.cpp
+++ b/Common/Render/Text/draw_text_uwp.cpp
@ -213,7 +213,7 @@ void TextDrawerUWP::MeasureString(std::string_view str, float *w, float *h) {
 		}
 		if (!format) return;

-		std::wstring wstr = ConvertUTF8ToWString(ReplaceAll(ReplaceAll(std::string(str), "\n", "\r\n"), "&&", "&"));
+		std::wstring wstr = ConvertUTF8ToWString(ReplaceAll(std::string(str), "\n", "\r\n"));

 		format->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_LEADING);
 		
@ -273,7 +273,7 @@ void TextDrawerUWP::MeasureStringRect(std::string_view str, const Bounds &bounds
 		if (iter != sizeCache_.end()) {
 			entry = iter->second.get();
 		} else {
-			std::wstring wstr = ConvertUTF8ToWString(lines[i].length() == 0 ? " " : ReplaceAll(lines[i], "&&", "&"));
+			std::wstring wstr = lines[i].empty() ? L" " : ConvertUTF8ToWString(lines[i]);

 			if (align & ALIGN_HCENTER)
 				format->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER);
@ -318,7 +318,7 @@ bool TextDrawerUWP::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStrin
 		return false;
 	}

-	std::wstring wstr = ConvertUTF8ToWString(ReplaceAll(ReplaceAll(str, "\n", "\r\n"), "&&", "&"));
+	std::wstring wstr = ConvertUTF8ToWString(ReplaceAll(str, "\n", "\r\n"));
 	SIZE size;

 	IDWriteTextFormat *format = nullptr;
@ -470,7 +470,7 @@ void TextDrawerUWP::DrawString(DrawBuffer &target, std::string_view str, float x
 		if (emoji)
 			texFormat = Draw::DataFormat::R8G8B8A8_UNORM;

-		entry = new TextStringEntry();
+		entry = new TextStringEntry(frameCount_);

 		// Convert the bitmap to a Thin3D compatible array of 16-bit pixels. Can't use a single channel format
 		// because we need white. Well, we could using swizzle, but not all our backends support that.
--- a/Common/Render/Text/draw_text_win.cpp
+++ b/Common/Render/Text/draw_text_win.cpp
@ -134,7 +134,7 @@ void TextDrawerWin32::MeasureString(std::string_view str, float *w, float *h) {
 			SelectObject(ctx_->hDC, iter->second->hFont);
 		}

-		std::string toMeasure = ReplaceAll(std::string(str), "&&", "&");
+		std::string toMeasure(str);

 		std::vector<std::string_view> lines;
 		SplitString(toMeasure, '\n', lines);
@ -190,7 +190,7 @@ void TextDrawerWin32::MeasureStringRect(std::string_view str, const Bounds &boun
 			entry = iter->second.get();
 		} else {
 			SIZE size;
-			std::wstring wstr = ConvertUTF8ToWString(lines[i].empty() ? " " : ReplaceAll(lines[i], "&&", "&"));
+			std::wstring wstr = lines[i].empty() ? L" " : ConvertUTF8ToWString(lines[i]);
 			GetTextExtentPoint32(ctx_->hDC, wstr.c_str(), (int)wstr.size(), &size);

 			entry = new TextMeasureEntry();
@ -233,7 +233,7 @@ bool TextDrawerWin32::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStr
 	UINT dtAlign = (align & ALIGN_HCENTER) == 0 ? DT_LEFT : DT_CENTER;

 	RECT textRect = { 0 };
-	DrawTextExW(ctx_->hDC, (LPWSTR)wstr.c_str(), (int)wstr.size(), &textRect, DT_HIDEPREFIX | DT_TOP | dtAlign | DT_CALCRECT, 0);
+	DrawTextExW(ctx_->hDC, (LPWSTR)wstr.c_str(), (int)wstr.size(), &textRect, DT_NOPREFIX | DT_TOP | dtAlign | DT_CALCRECT, 0);
 	size.cx = textRect.right;
 	size.cy = textRect.bottom;

@ -241,13 +241,11 @@ bool TextDrawerWin32::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStr
 		size.cx = MAX_TEXT_WIDTH;
 	if (size.cy > MAX_TEXT_HEIGHT)
 		size.cy = MAX_TEXT_HEIGHT;
-	// Prevent zero-sized textures, which can occur. Not worth to avoid
-	// creating the texture altogether in this case. One example is a string
-	// containing only '\r\n', see issue #10764.
-	if (size.cx == 0)
-		size.cx = 1;
-	if (size.cy == 0)
-		size.cy = 1;
+
+	if (size.cx == 0 || size.cy == 0) {
+		// Don't draw zero-sized textures.
+		return false;
+	}

 	entry.texture = nullptr;
 	entry.width = size.cx;
@ -260,7 +258,7 @@ bool TextDrawerWin32::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStr
 	rc.right = entry.bmWidth;
 	rc.bottom = entry.bmHeight;
 	FillRect(ctx_->hDC, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH));
-	DrawTextExW(ctx_->hDC, (LPWSTR)wstr.c_str(), (int)wstr.size(), &rc, DT_HIDEPREFIX | DT_TOP | dtAlign, 0);
+	DrawTextExW(ctx_->hDC, (LPWSTR)wstr.c_str(), (int)wstr.size(), &rc, DT_NOPREFIX | DT_TOP | dtAlign, 0);

 	// Convert the bitmap to a Thin3D compatible array of 16-bit pixels. Can't use a single channel format
 	// because we need white. Well, we could using swizzle, but not all our backends support that.
@ -332,13 +330,18 @@ void TextDrawerWin32::DrawString(DrawBuffer &target, std::string_view str, float
 		else
 			texFormat = Draw::DataFormat::R8G8B8A8_UNORM;

-		entry = new TextStringEntry();
+		entry = new TextStringEntry(frameCount_);

 		// Convert the bitmap to a Thin3D compatible array of 16-bit pixels. Can't use a single channel format
 		// because we need white. Well, we could using swizzle, but not all our backends support that.
 		TextureDesc desc{};
 		std::vector<uint8_t> bitmapData;
-		DrawStringBitmap(bitmapData, *entry, texFormat, str, align);
+		if (!DrawStringBitmap(bitmapData, *entry, texFormat, str, align)) {
+			// Nothing drawn. Store that fact in the cache.
+			cache_[key] = std::unique_ptr<TextStringEntry>(entry);
+			return;
+		}
+
 		desc.initData.push_back(&bitmapData[0]);

 		desc.type = TextureType::LINEAR2D;
@ -354,15 +357,14 @@ void TextDrawerWin32::DrawString(DrawBuffer &target, std::string_view str, float

 	if (entry->texture) {
 		draw_->BindTexture(0, entry->texture);
-	}

-	// Okay, the texture is bound, let's draw.
-	float w = entry->width * fontScaleX_ * dpiScale_;
-	float h = entry->height * fontScaleY_ * dpiScale_;
-	float u = entry->width / (float)entry->bmWidth;
-	float v = entry->height / (float)entry->bmHeight;
-	DrawBuffer::DoAlign(align, &x, &y, &w, &h);
-	if (entry->texture) {
+		// Okay, the texture is bound, let's draw.
+		float w = entry->width * fontScaleX_ * dpiScale_;
+		float h = entry->height * fontScaleY_ * dpiScale_;
+		float u = entry->width / (float)entry->bmWidth;
+		float v = entry->height / (float)entry->bmHeight;
+		DrawBuffer::DoAlign(align, &x, &y, &w, &h);
+
 		target.DrawTexRect(x, y, x + w, y + h, 0.0f, 0.0f, u, v, color);
 		target.Flush(true);
 	}
--- a/Core/Util/PPGeDraw.cpp
+++ b/Core/Util/PPGeDraw.cpp
@ -126,10 +126,13 @@ struct PPGeTextDrawerCacheKey {
 	int align;
 	float wrapWidth;
 };
+
 struct PPGeTextDrawerImage {
+	PPGeTextDrawerImage() : entry(0) {}
 	TextStringEntry entry;
 	u32 ptr;
 };
+
 static std::map<PPGeTextDrawerCacheKey, PPGeTextDrawerImage> textDrawerImages;

 void PPGeSetDrawContext(Draw::DrawContext *draw) {
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@ -392,7 +392,7 @@ void GameSettingsScreen::CreateGraphicsSettings(UI::ViewGroup *graphicsSettings)
 		}
 #endif
 		// Display Layout Editor: To avoid overlapping touch controls on large tablets, meet geeky demands for integer zoom/unstretched image etc.
-		displayEditor_ = graphicsSettings->Add(new Choice(gr->T("Display Layout && Effects")));
+		displayEditor_ = graphicsSettings->Add(new Choice(gr->T("Display layout & effects")));
 		displayEditor_->OnClick.Add([&](UI::EventParams &) -> UI::EventReturn {
 			screenManager()->push(new DisplayLayoutScreen(gamePath_));
 			return UI::EVENT_DONE;
--- a/UI/PauseScreen.cpp
+++ b/UI/PauseScreen.cpp
@ -412,7 +412,7 @@ void GamePauseScreen::CreateViews() {
 		rightColumnItems->Add(new Choice(pa->T("Settings")))->OnClick.Handle(this, &GamePauseScreen::OnGameSettings);
 		rightColumnItems->Add(new Choice(pa->T("Create Game Config")))->OnClick.Handle(this, &GamePauseScreen::OnCreateConfig);
 	}
-	UI::Choice *displayEditor_ = rightColumnItems->Add(new Choice(gr->T("Display Layout && Effects")));
+	UI::Choice *displayEditor_ = rightColumnItems->Add(new Choice(gr->T("Display layout & effects")));
 	displayEditor_->OnClick.Add([&](UI::EventParams &) -> UI::EventReturn {
 		screenManager()->push(new DisplayLayoutScreen(gamePath_));
 		return UI::EVENT_DONE;
--- a/UI/SavedataScreen.cpp
+++ b/UI/SavedataScreen.cpp
@ -268,8 +268,7 @@ UI::EventReturn SavedataPopupScreen::OnDeleteButtonClick(UI::EventParams &e) {
 }

 static std::string CleanSaveString(const std::string &str) {
-	std::string s = ReplaceAll(str, "&", "&&");
-	s = ReplaceAll(s, "\n", " ");
+	std::string s = ReplaceAll(s, "\n", " ");
 	s = ReplaceAll(s, "\r", " ");
 	return s;
 }
--- a/assets/lang/ar_AE.ini
+++ b/assets/lang/ar_AE.ini
@ -27,17 +27,17 @@ Contacting RetroAchievements server... = . . .RetroAchivements يتم الإتص
 Customize = تخصيص
 Earned = حصلت
 Encore Mode = وضع الإعادة
-Failed logging in to RetroAchievements = RetroAchievements فشل تسجيل الدخول في 
-Failed to connect to RetroAchievements. Achievements will not unlock. = . لن يتم فتح الانجازات RetroAchievements فشل الإتصال في 
+Failed logging in to RetroAchievements = RetroAchievements فشل تسجيل الدخول في
+Failed to connect to RetroAchievements. Achievements will not unlock. = . لن يتم فتح الانجازات RetroAchievements فشل الإتصال في
 Failed to identify game. Achievements will not unlock. = فشلت في تحديد اللعبة. لن يتم فتح الإنجازات.
 Hardcore Mode (no savestates) = الوضع المشدد (لا لحالات الحفظ)
 Hardcore Mode = الوضع المشدد
-How to use RetroAchievements = RetroAchievements كيف تستعمل 
+How to use RetroAchievements = RetroAchievements كيف تستعمل
 In Encore mode - listings may be wrong below = في وضع الإعادة - قد تكون القوائم خاطئة ادناه
 Leaderboard attempt started or failed = بدأت محاولة قائمة المتصدرين او فشلت
 Leaderboard result submitted = تم تقديم نتائج قائمة المتصدرين
 Leaderboard score submission = تقديم نتيجة قائمة المتصدرين
-Leaderboard submission is enabled =  تم تفعيل تقديم قائمة المتصدرين 
+Leaderboard submission is enabled =  تم تفعيل تقديم قائمة المتصدرين
 Leaderboard tracker = مقتفي قائمة المتصدرين
 Leaderboards = قوائم المتصدرين
 Links = الروابط
@ -47,7 +47,7 @@ Mastered %1 = %تم اتقان 1
 Notifications = الإشعارات
 Recently unlocked achievements = الإنجازات التي تم فتحها مؤخرا
 Reconnected to RetroAchievements. = RetroAchievements يتم إعادة الإتصال في
-Register on www.retroachievements.org =  www.retroachievements.org سجل في 
+Register on www.retroachievements.org =  www.retroachievements.org سجل في
 RetroAchievements are not available for this game = RetroAchievements الإنجازات غير متوفرة لهذه اللعبة
 RetroAchievements website = RetroAchievements موقع
 Rich Presence = حالة ديسكورد
@ -407,7 +407,7 @@ Grid = Grid
 Inactive = غير نشط
 Installing... = جاري التحميل
 InternalError = حدث عطل داخلي
-Links = الروابط 
+Links = الروابط
 Load = ‎تحميل
 Load completed = ‎التحميل إكتمل.
 Loading = ‎تحميل\nمن فضلك إنتظر...
@ -416,7 +416,7 @@ Log in = تسجيل الدخول
 Log out = تسجيل الخروج
 Logged in! = تم تسحيل الدخول
 Logging in... = جاري تسجيل الدخول...
-More information... = المزيد من المعلومات 
+More information... = المزيد من المعلومات
 Move = ‎تحريك
 Move Down = تحريك للأسفل
 Move Up = تحريك للأعلى
@ -612,7 +612,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = ‎أظهر مُعدل النسق
+Display layout & effects = ‎أظهر مُعدل النسق
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,7 +740,7 @@ You can press ESC to cancel. = ‎يمكنك ضغط علي زر الخروج ل

 [MainMenu]
 Browse = ‎تصفح...
-Buy PPSSPP Gold = الذهبي PPSSPP اشتر 
+Buy PPSSPP Gold = الذهبي PPSSPP اشتر
 Choose folder = اختر المجلد
 Credits = ‎الحقوق
 PPSSPP Homebrew Store = ‎PPSSPP Homebrew Store
@ -748,9 +748,9 @@ Exit = ‎خروج
 Game Settings = ‎الإعدادات
 Games = ‎الألعاب
 Give PPSSPP permission to access storage = ‎الأذون للوصول إلي مساحة التخزين PPSSPP أعطي الـ
-Homebrew & Demos = Homebrew && Demos
+Homebrew & Demos = Homebrew & Demos
 How to get games = ‎كيف يمكنني الحصول على الألعاب
-How to get homebrew & demos = How can I get homebrew && demos?
+How to get homebrew & demos = How can I get homebrew & demos?
 Load = ‎تحميل
 Loading... = ...تحميل
 PinPath = ‎تثبيت
@ -810,7 +810,7 @@ Mute toggle = Mute toggle
 Next Slot = Next slot
 None = None
 Note = Note
-OpenChat = فتح المحادثة 
+OpenChat = فتح المحادثة
 Pause = ‎توقف مؤقت
 Previous Slot = Previous Slot
 R = R
@ -867,7 +867,7 @@ Done! = !تم
 EasyUSBAccess = USBالوصول السهل للـ
 Failed to move some files! = فشل في نقل بعض الملفات
 Failed to save config = فشل في حفظ الإعدادات
-Free space = المساحة المتوفرة 
+Free space = المساحة المتوفرة
 Manually specify PSP folder = Manually specify PSP folder
 MemoryStickDescription = Choose where to keep PSP data (Memory Stick)
 Move Data = نقل البيانات
@ -902,8 +902,8 @@ Disconnected from AdhocServer = AdhocServer تم قطع الاتصال في سي
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = تفعيل الشات عبر الشبكه
-Enable networking = networking/WLAN تفعيل 
-Enable UPnP = (يحتاج لبعض الوقت للكشف) UPnP تفعيل 
+Enable networking = networking/WLAN تفعيل
+Enable UPnP = (يحتاج لبعض الوقت للكشف) UPnP تفعيل
 EnableQuickChat = تفعيل الشات السريع
 Enter a new PSP nickname = اختيار اسم البي اس بي الجديد
 Enter Quick Chat 1 = الدخول الى الشات السريع  1
@ -950,7 +950,7 @@ Auto = تلقائي
 Chinese (simplified) = صينية(مبسطة)
 Chinese (traditional) = صينية(التقليدية)
 Dutch = هُولَندي
-English = إنجليزية 
+English = إنجليزية
 French = فرنسية
 Game language = لغة اللعبة
 German = إلماني
@ -1127,7 +1127,7 @@ Unselected Overall Description = ‎هل هذه اللعبة تمت لعبتها
 View Feedback = ‎أظهر كل المراجاعات

 [Savedata]
-Date = التاريخ 
+Date = التاريخ
 Filename = إسم الملف
 No screenshot = ‎لا تصور الشاشة
 None yet. Things will appear here after you save. = ‎ليس بعد. الأشياء سوف تظهر هنا بعد الحفظ.
@ -1296,7 +1296,7 @@ Decrease size = تقليص الحجم
 Developer Tools = ‎ادوات المطور
 Display Extra Info = إظهار معلومات أكثر
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = ‎المحاكاة
 Enable Cheats = ‎فعل الشفرات
@ -1338,7 +1338,7 @@ PSP-2000/3000 = PSP-2000/3000
 Recent games = الألعاب السابقة
 Record Audio = ‎تسجيل الصوت
 Record Display = ‎سجل الفيديو
-Recording = جاري التسجيل 
+Recording = جاري التسجيل
 Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = ‎إلي الإفتراضي PPSSPP's إعادة إعدادات
 RetroAchievements = RetroAchievements
--- a/assets/lang/az_AZ.ini
+++ b/assets/lang/az_AZ.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,9 +740,9 @@ Exit = Çıxış
 Game Settings = Settings
 Games = Games
 Give PPSSPP permission to access storage = Give PPSSPP permission to access storage
-Homebrew & Demos = Homebrew && Demos
+Homebrew & Demos = Homebrew & Demos
 How to get games = How can I get games?
-How to get homebrew & demos = How can I get homebrew && demos?
+How to get homebrew & demos = How can I get homebrew & demos?
 Load = Yüklə...
 Loading... = Loading...
 PinPath = Pin
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Developer tools
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulation
 Enable Cheats = Enable cheats
--- a/assets/lang/bg_BG.ini
+++ b/assets/lang/bg_BG.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,9 +740,9 @@ Exit = Изход
 Game Settings = Настройки
 Games = Директории
 Give PPSSPP permission to access storage = Give PPSSPP permission to access storage
-Homebrew & Demos = Homebrew && Demos
+Homebrew & Demos = Homebrew & Demos
 How to get games = Как да се сдобия с игри?
-How to get homebrew & demos = Как да се сдобия с homebrew && demos?
+How to get homebrew & demos = Как да се сдобия с Homebrew & Demos?
 Load = Зареди игра
 Loading... = Loading...
 PinPath = Pin
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Инсрументи на разработчик
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Емулация
 Enable Cheats = Включи чиитове
--- a/assets/lang/ca_ES.ini
+++ b/assets/lang/ca_ES.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Desactivat
-Display Layout && Effects = Editor de l'àrea de pantalla
+Display layout & effects = Editor de l'àrea de pantalla
 Display Resolution (HW scaler) = Resolució de pantalla (escalat per maquinari)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Developer tools
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulation
 Enable Cheats = Activar trucs
--- a/assets/lang/cz_CZ.ini
+++ b/assets/lang/cz_CZ.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Zobrazit editor rozvržení
+Display layout & effects = Zobrazit editor rozvržení
 Display Resolution (HW scaler) = Rozlišení obrazovky (Hardwarové zvětšení)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Nástroje pro vývojáře
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulace
 Enable Cheats = Povolit Cheaty
--- a/assets/lang/da_DK.ini
+++ b/assets/lang/da_DK.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Skærmopløsning (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Udvikler værktøjer
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulation
 Enable Cheats = Tillad snyd
--- a/assets/lang/de_DE.ini
+++ b/assets/lang/de_DE.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Deaktiviert
-Display Layout && Effects = Bildschirmlayout Editor
+Display layout & effects = Bildschirmlayout Editor
 Display Resolution (HW scaler) = Bildschirmauflösung (HW Skalierung)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,9 +740,9 @@ Exit = Beenden
 Game Settings = Einstellungen
 Games = Spiele
 Give PPSSPP permission to access storage = PPSSPP Speicherzugriff erlauben
-Homebrew & Demos = Homebrew && Demos
+Homebrew & Demos = Homebrew & Demos
 How to get games = Woher bekomme ich Spiele?
-How to get homebrew & demos = Woher bekomme ich Homebrew && Demos?
+How to get homebrew & demos = Woher bekomme ich Homebrew & Demos?
 Load = Laden...
 Loading... = Lädt...
 PinPath = Anheften
@ -1288,7 +1288,7 @@ Decrease size = Verkleinern
 Developer Tools = Entwicklerwerkzeuge
 Display Extra Info = Zeige weitere Infos
 Display Games on a grid = Zeige "Spiele" als Grid
-Display Homebrew on a grid = Zeige "Homebrew && Demos" als Grid
+Display Homebrew on a grid = Zeige "Homebrew & Demos" als Grid
 Display Recent on a grid = Zeige "Zuletzt gespielt" als Grid
 Emulation = Emulation
 Enable Cheats = Cheats aktivieren
--- a/assets/lang/dr_ID.ini
+++ b/assets/lang/dr_ID.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -742,7 +742,7 @@ Games = Paningoan
 Give PPSSPP permission to access storage = Give PPSSPP permission to access storage
 Homebrew & Demos = Homebrew Sola Demo
 How to get games = Matumbaki' nampa' paningoan?
-How to get homebrew & demos = Matumbaki' nampa' homebrew && demo?
+How to get homebrew & demos = Matumbaki' nampa' homebrew & demo?
 Load = Bukka'...
 Loading... = Loading...
 PinPath = Pin
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Pakakasa'na to panggaraga
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Pang-emulasi
 Enable Cheats = Pajalanni to Cheat
--- a/assets/lang/en_US.ini
+++ b/assets/lang/en_US.ini
@ -18,7 +18,7 @@
 # The hotkeys are only supported currently in the DesktopUI section, however.
 #
 # Example 1: &File. This will make it so when you press ALT + F on Windows, it'll open the File menu.
-# Example 2: Homebrew && Demos. This would show one real ampersand in the menu.
+# Example 2: Homebrew & Demos. This would show one real ampersand in the menu.
 #
 # Happy translating.

@ -610,6 +610,7 @@ Copy to texture = Copy to texture
 Current GPU Driver = Current GPU Driver
 Default GPU driver = Default GPU driver
 Disable culling = Disable culling
+Display layout & effects = Display layout & effects
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
@ -631,7 +632,6 @@ Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Enable Cardboard VR = Enable Cardboard VR
 FPS = FPS
@ -764,9 +764,9 @@ Exit = Exit
 Game Settings = Settings
 Games = Games
 Give PPSSPP permission to access storage = Give PPSSPP permission to access storage
-Homebrew & Demos = Homebrew && Demos
+Homebrew & Demos = Homebrew & Demos
 How to get games = How can I get games?
-How to get homebrew & demos = How can I get homebrew && demos?
+How to get homebrew & demos = How can I get homebrew & demos?
 Load = Load...
 Loading... = Loading...
 PinPath = Pin
@ -1296,7 +1296,7 @@ Decrease size = Decrease size
 Developer Tools = Developer tools
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulation
 Enable Cheats = Enable cheats
--- a/assets/lang/es_ES.ini
+++ b/assets/lang/es_ES.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Desactivado
-Display Layout && Effects = Editar pantalla y Shaders
+Display layout & effects = Editar pantalla y Shaders
 Display Resolution (HW scaler) = Resolución de pantalla (escalado por hardware)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
--- a/assets/lang/es_LA.ini
+++ b/assets/lang/es_LA.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Apagado
-Display Layout && Effects = Editar pantalla y Shaders
+Display layout & effects = Editar pantalla y Shaders
 Display Resolution (HW scaler) = Resolución de pantalla (escalado por HW)
 Driver requires Android API version %1, current is %2 = El controlador requiere la versión de API de Android %1, la actual es %2
 Drivers = Drivers
--- a/assets/lang/fa_IR.ini
+++ b/assets/lang/fa_IR.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = ‎ویرایشگر چیدمان صفحه
+Display layout & effects = ‎ویرایشگر چیدمان صفحه
 Display Resolution (HW scaler) = ‎رزولوشن صفحه
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = ‎تنظیمات توسعه دهندگان
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = ‎شبیه سازی
 Enable Cheats = ‎فعال کردن کدهای تقلب
--- a/assets/lang/fi_FI.ini
+++ b/assets/lang/fi_FI.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Poista taustapintojen hylkääminen
 Disabled = Poistettu käytöstä
-Display Layout && Effects = Näyttöasettelu ja -efektit
+Display layout & effects = Näyttöasettelu ja -efektit
 Display Resolution (HW scaler) = Näyttöresoluutio (Laitteiston skaalaaja)
 Driver requires Android API version %1, current is %2 = Ajurin vaatima Android API -versio on %1, nykyinen versio on %2
 Drivers = Ajurit
--- a/assets/lang/fr_FR.ini
+++ b/assets/lang/fr_FR.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Désactivé
-Display Layout && Effects = Éditeur d'affichage
+Display layout & effects = Éditeur d'affichage
 Display Resolution (HW scaler) = Définition d'affichage (mise à l'échelle matérielle)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,7 +740,7 @@ Exit = Quitter
 Game Settings = Paramètres
 Games = Jeux
 Give PPSSPP permission to access storage = Autoriser PPSSPP à accéder au stockage
-Homebrew & Demos = Homebrews && Démos
+Homebrew & Demos = Homebrews & Démos
 How to get games = Comment obtenir des jeux ?
 How to get homebrew & demos = Comment obtenir des homebrews et des démos ?
 Load = Charger...
--- a/assets/lang/gl_ES.ini
+++ b/assets/lang/gl_ES.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Resolución de pantalla (escalado por hardware)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Ferramentas de desenrolo
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulación
 Enable Cheats = Activar trucos
--- a/assets/lang/gr_EL.ini
+++ b/assets/lang/gr_EL.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Απενεργοποιημένο
-Display Layout && Effects = Επεξεργασία διάταξης οθόνης
+Display layout & effects = Επεξεργασία διάταξης οθόνης
 Display Resolution (HW scaler) = Ανάλυση οθόνης (Κλιμακοτής hardware)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,7 +740,7 @@ Exit = Έξοδος
 Game Settings = Ρυθμίσεις Παιχνιδιού
 Games = Παιχνίδια
 Give PPSSPP permission to access storage = Αδειοδότηση PPSSPP για πρόσβαση σε χώρο αποθήκευσης
-Homebrew & Demos = Προγράμματα && Demos
+Homebrew & Demos = Προγράμματα & Demos
 How to get games = Πώς να πάρετε τα παιχνίδια
 How to get homebrew & demos = Πώς να κατεβάσετε homebrew & demos
 Load = Φόρτωση
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Εργαλεία Προγραμματιστών
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Εξομοίωση
 Enable Cheats = Ενεργοποίηση Κωδικών
--- a/assets/lang/he_IL.ini
+++ b/assets/lang/he_IL.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = כלי פיתוח
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = סימולציה
 Enable Cheats = אפשר צ'יטים
--- a/assets/lang/he_IL_invert.ini
+++ b/assets/lang/he_IL_invert.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = חותיפ ילכ
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = היצלומיס
 Enable Cheats = םיטי'צ רשפא
--- a/assets/lang/hr_HR.ini
+++ b/assets/lang/hr_HR.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Isključeno
-Display Layout && Effects = Prikaz layout uređivača
+Display layout & effects = Prikaz layout uređivača
 Display Resolution (HW scaler) = Prikaz rezolucije (HW mjeritelj)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,9 +740,9 @@ Exit = Izlaz
 Game Settings = Postavke
 Games = Igre
 Give PPSSPP permission to access storage = Dopusti PPSSPP dozvolu za pristup datotekama
-Homebrew & Demos = Homebrew && Demos
+Homebrew & Demos = Homebrew & Demos
 How to get games = Kako mogu nabaviti igre?
-How to get homebrew & demos = Kako mogu nabaviti homebrew && demos?
+How to get homebrew & demos = Kako mogu nabaviti Homebrew & Demos?
 Load = Učitaj...
 Loading... = Loading...
 PinPath = Prikvači mapu
--- a/assets/lang/hu_HU.ini
+++ b/assets/lang/hu_HU.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Letiltva
-Display Layout && Effects = Elrendezés szerkesztő
+Display layout & effects = Elrendezés szerkesztő
 Display Resolution (HW scaler) = Megjelenítési felbontás (HW skálázó)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
--- a/assets/lang/id_ID.ini
+++ b/assets/lang/id_ID.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Nonaktif
-Display Layout && Effects = Penyesuaian tata letak tampilan
+Display layout & effects = Penyesuaian tata letak tampilan
 Display Resolution (HW scaler) = Resolusi tampilan (penskala HW)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,9 +740,9 @@ Exit = Keluar
 Game Settings = Pengaturan
 Games = Permainan
 Give PPSSPP permission to access storage = Berikan PPSSPP izin untuk mengakses penyimpanan
-Homebrew & Demos = Paket Permainan && Demos
+Homebrew & Demos = Paket Permainan & Demos
 How to get games = Bagaimana caranya mendapatkan permainan?
-How to get homebrew & demos = Bagaimana caranya mendapatkan Paket Permainan && Demos?
+How to get homebrew & demos = Bagaimana caranya mendapatkan Paket Permainan & Demos?
 Load = Memuat
 Loading... = Memuat...
 PinPath = Sematkan
--- a/assets/lang/it_IT.ini
+++ b/assets/lang/it_IT.ini
@ -605,7 +605,7 @@ Direct3D 11 = Direct3D 11
 #Disable slower effects (speedup) = Disattiva gli effetti più lenti (veloce)
 Disable culling = Disable culling
 Disabled = Disabilitato
-Display Layout && Effects = Editor Display
+Display layout & effects = Editor Display
 Display Resolution (HW scaler) = Risoluzione Display (scaler HW)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,7 +740,7 @@ Exit = Esci
 Game Settings = Impostazioni
 Games = Giochi
 Give PPSSPP permission to access storage = Da' a PPSSPP il permesso di accedere alla memoria di massa
-Homebrew & Demos = Homebrew && Demo
+Homebrew & Demos = Homebrew & Demo
 How to get games = Come ottenere giochi?
 How to get homebrew & demos = Come ottenere homebrew o demo?
 Load = Carica...
@ -1289,7 +1289,7 @@ Decrease size = Riduci dimensioni
 Developer Tools = Strumenti Sviluppatore
 Display Extra Info = Mostra altre informazioni
 Display Games on a grid = Mostra "Giochi" a icona
-Display Homebrew on a grid = Mostra "Homebrew && Demo" a icona
+Display Homebrew on a grid = Mostra "Homebrew & Demo" a icona
 Display Recent on a grid = Mostra "Recenti" a icona
 Emulation = Emulazione
 Enable Cheats = Attiva i Trucchi
--- a/assets/lang/ja_JP.ini
+++ b/assets/lang/ja_JP.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = カリングを無効化
 Disabled = 無効
-Display Layout && Effects = 画面のレイアウトを編集する
+Display layout & effects = 画面のレイアウトを編集する
 Display Resolution (HW scaler) = 画面解像度 (HWスケーラー)
 Driver requires Android API version %1, current is %2 = ドライバーはAndroid API version %1を要求していますが, 現在 %2です
 Drivers = ドライバー
--- a/assets/lang/jv_ID.ini
+++ b/assets/lang/jv_ID.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Tata letak Tampilan editor
+Display layout & effects = Tata letak Tampilan editor
 Display Resolution (HW scaler) = Resolusi tampilan (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,9 +740,9 @@ Exit = Metu
 Game Settings = Setelan Dolanan
 Games = Dolanan
 Give PPSSPP permission to access storage = Menehi PPSSPP ijin kanggo ngakses panyimpenan
-Homebrew & Demos = Homebrew && Demo
+Homebrew & Demos = Homebrew & Demo
 How to get games = Dapatno dolanan
-How to get homebrew & demos = Cara mendapatkan Homebrew && demo
+How to get homebrew & demos = Cara mendapatkan Homebrew & demo
 Load = Mbukak...
 Loading... = Loading...
 PinPath = Pin
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Pengembang Pribadi
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulasi
 Enable Cheats = Ngatifke Cheat
--- a/assets/lang/ko_KR.ini
+++ b/assets/lang/ko_KR.ini
@ -586,6 +586,7 @@ Copy to texture = 텍스처에 복사
 Current GPU Driver = 현재 GPU 드라이버
 Default GPU driver = 기본 GPU 드라이버
 Disable culling = 컬링 비활성화
+Display layout & effects = 화면 레이아웃 편집기
 Driver requires Android API version %1, current is %2 = 드라이버에는 Android API 버전 %1이(가) 필요하며, 현재는 %2입니다.
 Drivers = 드라이버
 GPUReadbackRequired = 경고: 이 게임은 "GPU 다시 읽기 건너뛰기"를 꺼짐으로 설정해야 합니다.
@ -607,7 +608,6 @@ Device = 장치
 Direct3D 9 = 다이렉트3D 9
 Direct3D 11 = 다이렉트3D 11
 Disabled = 비활성화
-Display Layout && Effects = 화면 레이아웃 편집기
 Display Resolution (HW scaler) = 화면 해상도(HW 스케일러)
 Enable Cardboard VR = 카드보드 VR 활성화
 FPS = FPS
@ -740,7 +740,7 @@ Exit = 종료
 Game Settings = 설정
 Games = 게임
 Give PPSSPP permission to access storage = PPSSPP에 저장공간 접속 권한 부여
-Homebrew & Demos = 홈브류 && 데모
+Homebrew & Demos = 홈브류 & 데모
 How to get games = 게임을 어떻게 구할 수 있나요?
 How to get homebrew & demos = 홈브류 및 데모를 어떻게 구할 수 있나요?
 Load = 불러오기...
--- a/assets/lang/ku_SO.ini
+++ b/assets/lang/ku_SO.ini
@ -5,7 +5,7 @@
 # considered to be a part of the actual translations.
 #
 # Example 1: &File. This will make it so when you press ALT + F on Windows, it'll open the File menu.
-# Example 2: Homebrew && Demos. This would show one real ampersand in the menu.
+# Example 2: Homebrew & Demos. This would show one real ampersand in the menu.
 # I've Added a font named Rabar_014 because my language font looks better with it.
 # وەرگێڕان کراوە لەلایەن محمد عمر حسێن، [ناوی بەڕێزت]
 # تکایە هەر بەڕێزێک لەدوای من وەرگێڕانی کرد تەنها بە بەکارهێنانی بەرنامەی وەرگێران نەیکات
@ -53,7 +53,7 @@ Notifications = ئاگادارکردنەوەکان
 Recently unlocked achievements = دەستکەوتە تازە کراوەکان
 Reconnected to RetroAchievements. = RetroAchievements دووبارە پەیوەست بوویتەوە بە
 Register on www.retroachievements.org = www.retroachievements.org خۆت تۆماربکە لە
-RetroAchievements are not available for this game = بەردەست نییە بۆ ئەم یاریە RetroAchievements 
+RetroAchievements are not available for this game = بەردەست نییە بۆ ئەم یاریە RetroAchievements
 RetroAchievements website = RetroAchievements وێبسایتی
 Rich Presence = Rich Presence
 Save state loaded without achievement data = Save state loaded without achievement data
@ -73,9 +73,9 @@ Unofficial achievements = دەستکەوتە نافەرمیەکان
 [Audio]
 Alternate speed volume = خێرایی دەنگی جێگرەوە
 Audio backend = باکئێندی دەنگ (پێویستە کە ئاپەکە دووبارە بکرێتەوە)
-Audio file format not supported. Must be WAV or MP3. = بێت WAV, MP3 شێوازی دەنگەکە پاڵپشتی نەکراوە، مەرجە کە شێوازی 
+Audio file format not supported. Must be WAV or MP3. = بێت WAV, MP3 شێوازی دەنگەکە پاڵپشتی نەکراوە، مەرجە کە شێوازی
 Audio Error = هەڵەی دەنگ ڕوویدا
-AudioBufferingForBluetooth = (خاوتر) Bluetooth بەفەرێک باشبێت بۆ  
+AudioBufferingForBluetooth = (خاوتر) Bluetooth بەفەرێک باشبێت بۆ
 Auto = Auto
 Device = ئامێر
 Disabled = لەکار خراوە
@ -102,7 +102,7 @@ Analog trigger threshold = ئاستی کارپێکردنی ئەنالۆگ
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Auto
 Auto-centering analog stick = هێنانە ناوەڕاستی ستیکی ئەنالۆگ بە شێوەی ئۆتۆماتیکی
-Auto-hide buttons after delay = شاردنەوەی دوگمەکان بە شێوەی ئۆتۆماتیکی پاش  
+Auto-hide buttons after delay = شاردنەوەی دوگمەکان بە شێوەی ئۆتۆماتیکی پاش
 Auto-rotation speed = خێرایی خولانەوەی ئۆتۆماتیکی
 Binds = بەستنەوەکان
 Button Binding = بەستنەوەی دوگمەکان
@ -223,8 +223,8 @@ Enable Sound = بەکارکردنی دەنگ
 Exit = دەرچوون
 Extract File... = گواستنەوەی فایل...
 File = فایل
-Frame Skipping = Frame پەڕاندنی 
-Frame Skipping Type = Frame شیوازی پەڕاندنی 
+Frame Skipping = Frame پەڕاندنی
+Frame Skipping Type = Frame شیوازی پەڕاندنی
 Fullscreen = Fu&llscreen
 Game Settings = سێتینگی یاریەکە
 GE Debugger... = GE debugge&r...
@ -380,7 +380,7 @@ Center Left = ناوەڕاست چەپ
 Center Right = لە ناوەڕاستدا ڕاست
 Channel: = کەناڵ:
 Changing this setting requires PPSSPP to restart. = PPSSPP گۆڕینی ئەم ڕێکخستنە پێویستی بە هەیە کە دووبارە دەستپێبکاتەوە.
-Choose PPSSPP save folder = هەڵبژێرە PPSSPP فۆڵدەری خەزن کردنی 
+Choose PPSSPP save folder = هەڵبژێرە PPSSPP فۆڵدەری خەزن کردنی
 Confirm Overwrite = دەتەوێت زانیاریەکان دووبارە بنووسیتەوە لەسەر هەمان شوێن؟
 Confirm Save = ئایا دەتەوێت زانیاریەکان خەزن بکەیت؟
 ConfirmLoad = ئەم زانیاریانا لۆد ئەکەیت؟
@ -600,6 +600,7 @@ Copy to texture = Copy to texture
 Current GPU Driver = Current GPU Driver
 Default GPU driver = Default GPU driver
 Disable culling = Disable culling
+Display layout & effects = Display layout & effects
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
@ -621,7 +622,6 @@ Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Enable Cardboard VR = Enable Cardboard VR
 FPS = FPS
@ -753,10 +753,10 @@ PPSSPP Homebrew Store = PPSSPP Homebrew Store
 Exit = دەرچوون
 Game Settings = سێتینگ
 Games = یاریەکان
-Give PPSSPP permission to access storage = بدە کە دەسەڵاتی خەزن کردنی هەبێت PPSSPP ڕێگە بە 
+Give PPSSPP permission to access storage = بدە کە دەسەڵاتی خەزن کردنی هەبێت PPSSPP ڕێگە بە
 Homebrew & Demos = یاری دێمۆ و دروستکراوە بچووکەکان
 How to get games = چۆن یاریم دەست بکەوێت؟
-How to get homebrew & demos = How can I get homebrew && demos?
+How to get homebrew & demos = How can I get homebrew & demos?
 Load = Load...
 Loading... = Loading...
 PinPath = Pin
@ -771,7 +771,7 @@ www.ppsspp.org = www.ppsspp.org

 [MainSettings]
 Audio = دەنگ
-Controls = کۆنترۆڵەکان 
+Controls = کۆنترۆڵەکان
 Graphics = گرافیکەکان
 Networking = نێتوۆرک
 System = سیستەم
@ -1278,7 +1278,7 @@ ChangingMemstickPathInvalid = That path couldn't be used to save Memory Stick fi
 Cheats = Cheats
 Clear Recent = سڕینەوەی "دوایین یاریەکان"
 Clear Recent Games List = "دوایین یاریەکان" سڕینەوەی لیستی
-Clear UI background = UI لابردنی باکگراوندی 
+Clear UI background = UI لابردنی باکگراوندی
 Confirmation Button = دوگمەی پشتڕاستکردنەوە(Confirm)
 Date Format = Date format
 Day Light Saving = Daylight savings
@ -1286,7 +1286,7 @@ DDMMYYYY = DDMMYYYY
 Decrease size = کەم کردنەوەی قەبارە
 Developer Tools = Developer tools
 Display Extra Info = زانیاری زیادە پیشان بدە
-Display Games on a grid =  نیشاندانەوەی "یاریەکان" لەسەر خشتەیەک  
+Display Games on a grid =  نیشاندانەوەی "یاریەکان" لەسەر خشتەیەک
 Display Homebrew on a grid = نیشاندانەوەی "دێمۆ و دروستکراوە بچووکەکان" لەسەر خشتەیەک
 Display Recent on a grid = نیشاندانەوەی "دوایین یاریەکان" لەسەر خشتەیەک
 Emulation = Emulation
@ -1345,7 +1345,7 @@ Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = PNG خەزن کردنی سکریین شۆت بە شیوەی
 Set Memory Stick folder = Set Memory Stick folder
-Set UI background... = UI گۆڕینی باکگراوندی 
+Set UI background... = UI گۆڕینی باکگراوندی
 Show ID = Show ID
 Show region flag = Show region flag
 Simulate UMD delays = Simulate UMD delays
@ -1365,10 +1365,10 @@ UI background animation = UI ئەنیمەیشنی باکگراوندی
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
-Use O to confirm = بەکاربهێنە بۆ پشتراست کردنەوە (O) دوگمەی 
+Use O to confirm = بەکاربهێنە بۆ پشتراست کردنەوە (O) دوگمەی
 Use output buffer (with overlay) for recording = Use output buffer (with overlay) for recording
 Use system native keyboard = Use system native keyboard
-Use X to confirm = بەکاربهێنە بۆ پشتراست کردنەوە (X) دوگمەی 
+Use X to confirm = بەکاربهێنە بۆ پشتراست کردنەوە (X) دوگمەی
 VersionCheck = Check for new versions of PPSSPP
 WARNING: Android battery save mode is on = WARNING: Android battery save mode is On
 WARNING: Battery save mode is on = WARNING: Battery save mode is on
--- a/assets/lang/lo_LA.ini
+++ b/assets/lang/lo_LA.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = ແກ້ໄຂຮູບແບບໜ້າຈໍ
+Display layout & effects = ແກ້ໄຂຮູບແບບໜ້າຈໍ
 Display Resolution (HW scaler) = ຄວາມລະອຽດໜ້າຈໍ (ຕາມຮາດແວຣ໌)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = ເຄື່ອງມືສຳລັບນັກພັດທະນາ
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulation
 Enable Cheats = ເປີດໃຊ້ງານສູດໂກງ
--- a/assets/lang/lt-LT.ini
+++ b/assets/lang/lt-LT.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Ekrano rezoliucija ("HW" ištiesinimas)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Kurėjų įrankiai
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emuliacija
 Enable Cheats = Įjungti kodus
--- a/assets/lang/ms_MY.ini
+++ b/assets/lang/ms_MY.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,9 +740,9 @@ Exit = Keluar
 Game Settings = Tetapan
 Games = Permainan
 Give PPSSPP permission to access storage = Give PPSSPP permission to access storage
-Homebrew & Demos = Homebrew && Demo
+Homebrew & Demos = Homebrew & Demo
 How to get games = Bagaimana saya dapatkan permainan?
-How to get homebrew & demos = Bagaimana saya dapatkan homebrew && demo?
+How to get homebrew & demos = Bagaimana saya dapatkan homebrew & demo?
 Load = Muatkan...
 Loading... = Loading...
 PinPath = Pin
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Alatan Pengeluar
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulasi
 Enable Cheats = Upayakan cheat
--- a/assets/lang/nl_NL.ini
+++ b/assets/lang/nl_NL.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Schermweergave bewerken
+Display layout & effects = Schermweergave bewerken
 Display Resolution (HW scaler) = Schermresolutie (hardware)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Ontwikkelaarsopties
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulatie
 Enable Cheats = Cheats inschakelen
--- a/assets/lang/no_NO.ini
+++ b/assets/lang/no_NO.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -740,9 +740,9 @@ Exit = Avslutt
 Game Settings = Instillinger
 Games = Spill
 Give PPSSPP permission to access storage = Give PPSSPP permission to access storage
-Homebrew & Demos = Hjemmebrygg && Demoer
+Homebrew & Demos = Hjemmebrygg & Demoer
 How to get games = Hvordan få spill
-How to get homebrew & demos = Hvordan man skaffer Hjemmebrygg && Demoer
+How to get homebrew & demos = Hvordan man skaffer Hjemmebrygg & Demoer
 Load = Laster...
 Loading... = Loading...
 PinPath = Pin
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Utviklerverktøy
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulation
 Enable Cheats = Juks
--- a/assets/lang/pl_PL.ini
+++ b/assets/lang/pl_PL.ini
@ -608,7 +608,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Wył.
-Display Layout && Effects = Edytor położenia obrazu
+Display layout & effects = Edytor położenia obrazu
 Display Resolution (HW scaler) = Rozdzielczość ekranu (skaler sprz.)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
--- a/assets/lang/pt_BR.ini
+++ b/assets/lang/pt_BR.ini
@ -18,7 +18,7 @@
 # The hotkeys are only supported currently in the DesktopUI section, however.
 #
 # Example 1: &File. This will make it so when you press ALT + F on Windows, it'll open the File menu.
-# Example 2: Homebrew && Demos. This would show one real ampersand in the menu.
+# Example 2: Homebrew & Demos. This would show one real ampersand in the menu.
 #
 # Happy translating.

@ -610,6 +610,7 @@ Copy to texture = Copiar pra textura
 Current GPU Driver = Driver da GPU Atual
 Default GPU driver = Driver padrão da GPU
 Disable culling = Desativar o culling
+Display layout & effects = Exibir esquema & efeitos
 Driver requires Android API version %1, current is %2 = O driver requer a versão da API do Android %1, a atual é %2
 Drivers = Drivers
 GPUReadbackRequired = Aviso: Este jogo requer que o "Ignorar Leituras da GPU" esteja definido como Desligado.
@ -631,7 +632,6 @@ Device = Dispositivo
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disabled = Desativado
-Display Layout && Effects = Exibir esquema && efeitos
 Display Resolution (HW scaler) = Resolução da tela (Dimensionador do hardware)
 Enable Cardboard VR = Ativa o cartaz da realidade virtual
 FPS = FPS
@ -764,9 +764,9 @@ Exit = Sair
 Game Settings = Configurações
 Games = Jogos
 Give PPSSPP permission to access storage = Dê ao PPSSPP permissão pra acessar a armazenagem
-Homebrew & Demos = Homebrew && Demos
+Homebrew & Demos = Homebrew & Demos
 How to get games = Como eu posso obter jogos?
-How to get homebrew & demos = Como eu posso obter homebrew && demos?
+How to get homebrew & demos = Como eu posso obter Homebrew & Demos?
 Load = Carregar...
 Loading... = Carregando...
 PinPath = Fixar
@ -1297,7 +1297,7 @@ Decrease size = Diminuir tamanho
 Developer Tools = Ferramentas do desenvolvedor
 Display Extra Info = Exibir informações extras
 Display Games on a grid = Exibir "Jogos" em uma grade
-Display Homebrew on a grid = Exibir "Homebrew && Demos" em uma grade
+Display Homebrew on a grid = Exibir "Homebrew & Demos" em uma grade
 Display Recent on a grid = Exibir "Recentes" em uma grade
 Emulation = Emulação
 Enable Cheats = Ativar trapaças
--- a/assets/lang/pt_PT.ini
+++ b/assets/lang/pt_PT.ini
@ -18,7 +18,7 @@
 # The hotkeys are only supported currently in the DesktopUI section, however.
 #
 # Example 1: &File. This will make it so when you press ALT + F on Windows, it'll open the File menu.
-# Example 2: Homebrew && Demos. This would show one real ampersand in the menu.
+# Example 2: Homebrew & Demos. This would show one real ampersand in the menu.
 #
 # Happy translating.

@ -628,7 +628,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Desativado
-Display Layout && Effects = Mostrar o editor dos esquemas
+Display layout & effects = Mostrar o editor dos esquemas
 Display Resolution (HW scaler) = Resolução da tela (Dimensionador do hardware)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
--- a/assets/lang/ro_RO.ini
+++ b/assets/lang/ro_RO.ini
@ -605,7 +605,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Rezoluție ecran (scalare HW)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -741,9 +741,9 @@ Exit = Ieșire
 Game Settings = Setări
 Games = Jocuri
 Give PPSSPP permission to access storage = Give PPSSPP permission to access storage
-Homebrew & Demos = Homebrew && Demo-uri
+Homebrew & Demos = Homebrew & Demo-uri
 How to get games = Cum pot obține jocuri?
-How to get homebrew & demos = Cum pot obține homebrew && demo-uri?
+How to get homebrew & demos = Cum pot obține homebrew & demo-uri?
 Load = Deschide...
 Loading... = Loading...
 PinPath = Pin
@ -1289,7 +1289,7 @@ Decrease size = Decrease size
 Developer Tools = Utilități dezvoltator
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulare
 Enable Cheats = Activează trișare
--- a/assets/lang/ru_RU.ini
+++ b/assets/lang/ru_RU.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Отключить отбраковку
 Disabled = Отключено
-Display Layout && Effects = Расположение экрана и эффектов
+Display layout & effects = Расположение экрана и эффектов
 Display Resolution (HW scaler) = Разрешение экрана (аппаратное)
 Driver requires Android API version %1, current is %2 = Для драйвера требуется Android API версии %1, текущая - %2
 Drivers = Драйверы
--- a/assets/lang/sv_SE.ini
+++ b/assets/lang/sv_SE.ini
@ -605,7 +605,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Avstängd
-Display Layout && Effects = Skärmlayout och effekter
+Display layout & effects = Skärmlayout och effekter
 Display Resolution (HW scaler) = Skärmupplösning (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -741,9 +741,9 @@ Exit = Avsluta
 Game Settings = Inställningar
 Games = Spel
 Give PPSSPP permission to access storage = Ge PPSSPP tillstånd att komma åt lagring
-Homebrew & Demos = Homebrew && Demos
+Homebrew & Demos = Homebrew & Demos
 How to get games = Hur man skaffar spel
-How to get homebrew & demos = Hur man skaffar homebrew && demos
+How to get homebrew & demos = Hur man skaffar Homebrew & Demos
 Load = Ladda...
 Loading... = Loading...
 PinPath = Fäst
@ -1288,7 +1288,7 @@ Decrease size = Minska storlek
 Developer Tools = Utvecklarverktyg
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Emulering
 Enable Cheats = Fusk
--- a/assets/lang/tg_PH.ini
+++ b/assets/lang/tg_PH.ini
@ -605,7 +605,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Disabled
-Display Layout && Effects = Display layout && effects
+Display layout & effects = Display layout & effects
 Display Resolution (HW scaler) = Display resolution (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1291,7 +1291,7 @@ Decrease size = Paliitin ang sukat
 Developer Tools = Gamit ng developers
 Display Extra Info = Ipakita ang ekstrang impormasyon
 Display Games on a grid = Display "Mga laro" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Nakaraang nilaro" on a grid
 Emulation = Emulation
 Enable Cheats = Paganahin ang pandaraya
--- a/assets/lang/th_TH.ini
+++ b/assets/lang/th_TH.ini
@ -608,7 +608,7 @@ Direct3D 9 = ไดเร็คท์ 3D 9
 Direct3D 11 = ไดเร็คท์ 3D 11
 Disable culling = ปิดการใช้งาน culling
 Disabled = ปิดการใช้งาน
-Display Layout && Effects = รูปแบบหน้าจอ และเอฟเฟ็คท์
+Display layout & effects = รูปแบบหน้าจอ และเอฟเฟ็คท์
 Display Resolution (HW scaler) = ความละเอียดหน้าจอ (ตามฮาร์ดแวร์)
 Driver requires Android API version %1, current is %2 = ไดรเวอร์นี้ต้องการแอนดรอยด์ API ที่เวอร์ชั่น %1, แต่มือถือนี้ใช้เวอร์ชั่น %2
 Drivers = ไดรเวอร์
@ -746,9 +746,9 @@ Exit = ออก
 Game Settings = ตั้งค่าเกม
 Games = เกมอื่นๆ
 Give PPSSPP permission to access storage = อนุญาตให้สิทธิ์เข้าถึงพื้นที่เก็บข้อมูลเครื่องผ่าน PPSSPP
-Homebrew & Demos = เกมโฮมบริว&&เกมทดลองเล่น
+Homebrew & Demos = เกมโฮมบริว&เกมทดลองเล่น
 How to get games = ต้องทำอย่างไรถึงจะได้รอมเกมมา?
-How to get homebrew & demos = วิธีการรับเกมโฮมบริว&&เกมทดลองเล่น?
+How to get homebrew & demos = วิธีการรับเกมโฮมบริว&เกมทดลองเล่น?
 Load = โหลด...
 Loading... = กำลังโหลด...
 PinPath = ปักหมุด
--- a/assets/lang/tr_TR.ini
+++ b/assets/lang/tr_TR.ini
@ -606,7 +606,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Ayırma işlemini devre dışı bırak
 Disabled = Devre dışı
-Display Layout && Effects = Görüntü Düzeni Düzenleyicisi
+Display layout & effects = Görüntü Düzeni Düzenleyicisi
 Display Resolution (HW scaler) = Görüntü Çözünürlüğü (HW scaler)
 Driver requires Android API version %1, current is %2 = Sürücü, Android API'nin %1 sürümünü gerektiriyor, şu anki sürüm %2
 Drivers = Sürücüler
--- a/assets/lang/uk_UA.ini
+++ b/assets/lang/uk_UA.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Вимкнено
-Display Layout && Effects = Редактор розташування екрану
+Display layout & effects = Редактор розташування екрану
 Display Resolution (HW scaler) = Розширення екрану (HW масштабування)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Зменшити розмір
 Developer Tools = Інструменти розробника
 Display Extra Info = Відобразити додаткову інформацію
 Display Games on a grid = Відображати "Ігри" на сітці
-Display Homebrew on a grid = Відображати "Homebrew && Demos" на сітці
+Display Homebrew on a grid = Відображати "Homebrew & Demos" на сітці
 Display Recent on a grid = Відображати "Останні" в сітці
 Emulation = Емуляція
 Enable Cheats = Ввімкнути чит-коди
--- a/assets/lang/vi_VN.ini
+++ b/assets/lang/vi_VN.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = Disable culling
 Disabled = Vô hiệu hóa
-Display Layout && Effects = Chỉnh bố trí hiển thị
+Display layout & effects = Chỉnh bố trí hiển thị
 Display Resolution (HW scaler) = Độ phân giải màn hình (HW scaler)
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
@ -1288,7 +1288,7 @@ Decrease size = Decrease size
 Developer Tools = Công cụ NPH
 Display Extra Info = Display extra info
 Display Games on a grid = Display "Games" on a grid
-Display Homebrew on a grid = Display "Homebrew && Demos" on a grid
+Display Homebrew on a grid = Display "Homebrew & Demos" on a grid
 Display Recent on a grid = Display "Recent" on a grid
 Emulation = Giả lập
 Enable Cheats = mở cheat
--- a/assets/lang/zh_CN.ini
+++ b/assets/lang/zh_CN.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = 关闭遮挡剔除
 Disabled = 禁用
-Display Layout && Effects = 屏幕布局和滤镜
+Display layout & effects = 屏幕布局和滤镜
 Display Resolution (HW scaler) = 屏幕分辨率
 Driver requires Android API version %1, current is %2 = 驱动需要Android API版本 %1, 目前仅满足%2
 Drivers = 驱动程序
--- a/assets/lang/zh_TW.ini
+++ b/assets/lang/zh_TW.ini
@ -604,7 +604,7 @@ Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
 Disable culling = 停用揀選
 Disabled = 已停用
-Display Layout && Effects = 顯示版面配置與效果
+Display layout & effects = 顯示版面配置與效果
 Display Resolution (HW scaler) = 顯示解析度 (硬體縮放)
 Driver requires Android API version %1, current is %2 = 驅動程式需要 Android API 版本為 %1，目前為 %2
 Drivers = 驅動程式