Merge pull request #17726 from hrydgard/more-achievement-translation-work

More achievement translation work

Common/StringUtils.cpp

@@ -368,3 +368,31 @@ std::string UnescapeMenuString(const char *input, char *shortcutChar) {
 	}
 	return output;
 }
+
+std::string ApplySafeSubstitutions(const char *format, const std::string &string1, const std::string &string2, const std::string &string3) {
+	size_t formatLen = strlen(format);
+	std::string output;
+	output.reserve(formatLen + 20);
+	for (size_t i = 0; i < formatLen; i++) {
+		char c = format[i];
+		if (c != '%') {
+			output.push_back(c);
+			continue;
+		}
+		if (i >= formatLen - 1) {
+			break;
+		}
+		switch (format[i + 1]) {
+		case '1':
+			output += string1; i++;
+			break;
+		case '2':
+			output += string2; i++;
+			break;
+		case '3':
+			output += string3; i++;
+			break;
+		}
+	}
+	return output;
+}

Common/StringUtils.h

@@ -111,3 +111,7 @@ inline void CharArrayFromFormat(char (& out)[Count], const char* format, ...)
 
 // "C:/Windows/winhelp.exe" to "C:/Windows/", "winhelp", ".exe"
 bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, std::string* _pExtension);
+
+// Replaces %1, %2, %3 in format with arg1, arg2, arg3.
+// Much safer than snprintf and friends.
+std::string ApplySafeSubstitutions(const char *format, const std::string &string1, const std::string &string2 = "", const std::string &string3 = "");

Common/UI/View.cpp

@@ -531,7 +531,7 @@ void Choice::Draw(UIContext &dc) {
 
 std::string Choice::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(u->T("%1 choice"), "%1", text_);
+	return ApplySafeSubstitutions(u->T("%1 choice"), text_);
 }
 
 InfoItem::InfoItem(const std::string &text, const std::string &rightText, LayoutParams *layoutParams)
@@ -579,7 +579,7 @@ void InfoItem::Draw(UIContext &dc) {
 
 std::string InfoItem::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(ReplaceAll(u->T("%1: %2"), "%1", text_), "%2", rightText_);
+	return ApplySafeSubstitutions(u->T("%1: %2"), text_, rightText_);
 }
 
 ItemHeader::ItemHeader(const std::string &text, LayoutParams *layoutParams)
@@ -609,7 +609,7 @@ void ItemHeader::GetContentDimensionsBySpec(const UIContext &dc, MeasureSpec hor
 
 std::string ItemHeader::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(u->T("%1 heading"), "%1", text_);
+	return ApplySafeSubstitutions(u->T("%1 heading"), text_);
 }
 
 void BorderView::Draw(UIContext &dc) {
@@ -674,7 +674,7 @@ void PopupHeader::Draw(UIContext &dc) {
 
 std::string PopupHeader::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(u->T("%1 heading"), "%1", text_);
+	return ApplySafeSubstitutions(u->T("%1 heading"), text_);
 }
 
 void CheckBox::Toggle() {
@@ -755,7 +755,7 @@ void CheckBox::Draw(UIContext &dc) {
 
 std::string CheckBox::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	std::string text = ReplaceAll(u->T("%1 checkbox"), "%1", text_);
+	std::string text = ApplySafeSubstitutions(u->T("%1 checkbox"), text_);
 	if (!smallText_.empty()) {
 		text += "\n" + smallText_;
 	}
@@ -858,7 +858,7 @@ void Button::GetContentDimensions(const UIContext &dc, float &w, float &h) const
 
 std::string Button::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(u->T("%1 button"), "%1", GetText());
+	return ApplySafeSubstitutions(u->T("%1 button"), GetText());
 }
 
 void Button::Click() {
@@ -920,7 +920,7 @@ void RadioButton::GetContentDimensions(const UIContext &dc, float &w, float &h)
 
 std::string RadioButton::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(u->T("%1 radio button"), "%1", text_);
+	return ApplySafeSubstitutions(u->T("%1 radio button"), text_);
 }
 
 void RadioButton::Click() {
@@ -1108,7 +1108,7 @@ void TextEdit::GetContentDimensions(const UIContext &dc, float &w, float &h) con
 
 std::string TextEdit::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(u->T("%1 text field"), "%1", GetText());
+	return ApplySafeSubstitutions(u->T("%1 text field"), GetText());
 }
 
 // Handles both windows and unix line endings.
@@ -1299,7 +1299,7 @@ void ProgressBar::Draw(UIContext &dc) {
 std::string ProgressBar::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
 	float percent = progress_ * 100.0f;
-	return ReplaceAll(u->T("Progress: %1%"), "%1", StringFromInt((int)percent));
+	return ApplySafeSubstitutions(u->T("Progress: %1%"), StringFromInt((int)percent));
 }
 
 void Spinner::GetContentDimensions(const UIContext &dc, float &w, float &h) const {

Core/RetroAchievements.cpp

@@ -228,7 +228,7 @@ static void event_handler_callback(const rc_client_event_t *event, rc_client_t *
 		const rc_client_game_t *gameInfo = rc_client_get_game_info(g_rcClient);
 
 		// TODO: Translation?
-		std::string title = ReplaceAll(ac->T("Mastered %1"), "%1", gameInfo->title);
+		std::string title = ApplySafeSubstitutions(ac->T("Mastered %1"), gameInfo->title);
 		rc_client_user_game_summary_t summary;
 		rc_client_get_user_game_summary(g_rcClient, &summary);
 
@@ -244,16 +244,18 @@ static void event_handler_callback(const rc_client_event_t *event, rc_client_t *
 	case RC_CLIENT_EVENT_LEADERBOARD_STARTED:
 		// A leaderboard attempt has started. The handler may show a message with the leaderboard title and /or description indicating the attempt started.
 		INFO_LOG(ACHIEVEMENTS, "Leaderboard attempt started: %s", event->leaderboard->title);
-		g_OSD.Show(OSDType::MESSAGE_INFO, ReplaceAll(ac->T("%1: Leaderboard attempt started"), "%1", event->leaderboard->title), DeNull(event->leaderboard->description), 3.0f);
+		g_OSD.Show(OSDType::MESSAGE_INFO, ApplySafeSubstitutions(ac->T("%1: Leaderboard attempt started"), event->leaderboard->title), DeNull(event->leaderboard->description), 3.0f);
 		break;
 	case RC_CLIENT_EVENT_LEADERBOARD_FAILED:
 		NOTICE_LOG(ACHIEVEMENTS, "Leaderboard attempt failed: %s", event->leaderboard->title);
-		g_OSD.Show(OSDType::MESSAGE_INFO, ReplaceAll(ac->T("%1: Leaderboard attempt failed"), "%1", event->leaderboard->title), 3.0f);
+		g_OSD.Show(OSDType::MESSAGE_INFO, ApplySafeSubstitutions(ac->T("%1: Leaderboard attempt failed"), event->leaderboard->title), 3.0f);
 		// A leaderboard attempt has failed.
 		break;
 	case RC_CLIENT_EVENT_LEADERBOARD_SUBMITTED:
 		NOTICE_LOG(ACHIEVEMENTS, "Leaderboard result submitted: %s", event->leaderboard->title);
-		g_OSD.Show(OSDType::MESSAGE_SUCCESS, ReplaceAll(ReplaceAll(ac->T("%1: Submitting leaderboard score: %2!"), "%1", DeNull(event->leaderboard->title)), "%2", DeNull(event->leaderboard->tracker_value)), DeNull(event->leaderboard->description), 3.0f);
+		g_OSD.Show(OSDType::MESSAGE_SUCCESS,
+			ApplySafeSubstitutions(ac->T("Submitted %1 for %2"), DeNull(event->leaderboard->tracker_value), DeNull(event->leaderboard->title)),
+			DeNull(event->leaderboard->description), 3.0f);
 		System_PostUIMessage("play_sound", "leaderboard_submitted");
 		break;
 	case RC_CLIENT_EVENT_ACHIEVEMENT_CHALLENGE_INDICATOR_SHOW:

Tools/langtool/Cargo.lock

@@ -76,9 +76,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "proc-macro-error"
@@ -106,18 +106,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.60"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+checksum = "92de25114670a878b1261c79c9f8f729fb97e95bac93f6312f583c60dd6a1dfe"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "5907a1b7c277254a8b15170f6e7c97cfa60ee7872a3217663bb81151e48184bb"
 dependencies = [
  "proc-macro2",
 ]
@@ -174,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unicode-segmentation"

UI/MainScreen.cpp

@@ -433,7 +433,7 @@ std::string GameButton::DescribeText() const {
 		return "...";
 
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(u->T("%1 button"), "%1", ginfo->GetTitle());
+	return ApplySafeSubstitutions(u->T("%1 button"), ginfo->GetTitle());
 }
 
 class DirButton : public UI::Button {

UI/ReportScreen.cpp

@@ -338,7 +338,7 @@ void ReportScreen::UpdateCRCInfo() {
 
 	if (Reporting::HasCRC(gamePath_)) {
 		std::string crc = StringFromFormat("%08X", Reporting::RetrieveCRC(gamePath_));
-		updated = ReplaceAll(rp->T("FeedbackCRCValue", "Disc CRC: %1"), "%1", crc);
+		updated = ApplySafeSubstitutions(rp->T("FeedbackCRCValue", "Disc CRC: %1"), crc);
 	} else if (showCRC_) {
 		updated = rp->T("FeedbackCRCCalculating", "Disc CRC: Calculating...");
 	}

UI/RetroAchievementScreens.cpp

@@ -338,8 +338,8 @@ void RetroAchievementsSettingsScreen::CreateCustomizeTab(UI::ViewGroup *viewGrou
 
 	using namespace UI;
 	viewGroup->Add(new ItemHeader(ac->T("Sound effects")));
-	viewGroup->Add(new AudioFileChooser(&g_Config.sAchievementsUnlockAudioFile, "Achievement unlocked", UISound::ACHIEVEMENT_UNLOCKED));
-	viewGroup->Add(new AudioFileChooser(&g_Config.sAchievementsLeaderboardSubmitAudioFile, "Leaderboard score submission", UISound::LEADERBOARD_SUBMITTED));
+	viewGroup->Add(new AudioFileChooser(&g_Config.sAchievementsUnlockAudioFile, ac->T("Achievement unlocked"), UISound::ACHIEVEMENT_UNLOCKED));
+	viewGroup->Add(new AudioFileChooser(&g_Config.sAchievementsLeaderboardSubmitAudioFile, ac->T("Leaderboard score submission"), UISound::LEADERBOARD_SUBMITTED));
 }
 
 void RetroAchievementsSettingsScreen::CreateDeveloperToolsTab(UI::ViewGroup *viewGroup) {

UI/SavedataScreen.cpp

@@ -409,7 +409,7 @@ void SavedataButton::Draw(UIContext &dc) {
 
 std::string SavedataButton::DescribeText() const {
 	auto u = GetI18NCategory(I18NCat::UI_ELEMENTS);
-	return ReplaceAll(u->T("%1 button"), "%1", title_) + "\n" + subtitle_;
+	return ApplySafeSubstitutions(u->T("%1 button"), title_) + "\n" + subtitle_;
 }
 
 SavedataBrowser::SavedataBrowser(const Path &path, UI::LayoutParams *layoutParams)
@@ -465,9 +465,9 @@ void SavedataBrowser::SetSearchFilter(const std::string &filter) {
 	if (gameList_)
 		searchPending_ = true;
 	if (noMatchView_)
-		noMatchView_->SetText(ReplaceAll(sa->T("Nothing matching '%1' was found."), "%1", filter));
+		noMatchView_->SetText(ApplySafeSubstitutions(sa->T("Nothing matching '%1' was found."), filter));
 	if (searchingView_)
-		searchingView_->SetText(ReplaceAll(sa->T("Showing matches for '%1'."), "%1", filter));
+		searchingView_->SetText(ApplySafeSubstitutions(sa->T("Showing matches for '%1'."), filter));
 }
 
 void SavedataBrowser::SetSortOption(SavedataSortOption opt) {

UI/TabbedDialogScreen.cpp

@@ -130,7 +130,7 @@ void TabbedUIDialogScreenWithGameBackground::ApplySearchFilter() {
 
 		// Show an indicator that a filter is applied.
 		settingTabFilterNotices_[t]->SetVisibility(tabMatches ? UI::V_GONE : UI::V_VISIBLE);
-		settingTabFilterNotices_[t]->SetText(ReplaceAll(se->T("Filtering settings by '%1'"), "%1", searchFilter_));
+		settingTabFilterNotices_[t]->SetText(ApplySafeSubstitutions(se->T("Filtering settings by '%1'"), searchFilter_));
 
 		UI::View *lastHeading = nullptr;
 		for (int i = 1; i < tabContents->GetNumSubviews(); ++i) {
@@ -152,7 +152,7 @@ void TabbedUIDialogScreenWithGameBackground::ApplySearchFilter() {
 		matches = matches || tabMatches;
 	}
 
-	noSearchResults_->SetText(ReplaceAll(se->T("No settings matched '%1'"), "%1", searchFilter_));
+	noSearchResults_->SetText(ApplySafeSubstitutions(se->T("No settings matched '%1'"), searchFilter_));
 	noSearchResults_->SetVisibility(matches ? UI::V_GONE : UI::V_VISIBLE);
 	clearSearchChoice_->SetVisibility(searchFilter_.empty() ? UI::V_GONE : UI::V_VISIBLE);
 }

assets/lang/ar_AE.ini

@@ -7,17 +7,23 @@
 # perl -CSAD -p -i -e 's/(.* = )(?!\x{200e})(.*\p{Arabic}.*)/\1\x{200e}\2/g' ar_AE.ini
 
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -25,15 +31,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -339,6 +347,8 @@ Edit = Edit
 Enable All = ‎فعل الكل
 Enabled = Enabled
 Enter = ‎إدخال
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = ‎إنهاء
 GE Frame Dumps = GE Frame Dumps
@@ -351,6 +361,8 @@ Loading = ‎تحميل\nمن فضلك إنتظر...
 LoadingFailed = ‎غير قادر علي تحميل البيانات.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = ‎تحريك
 Move Down = Move Down
 Move Up = Move Up
@@ -628,10 +640,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = ‎ضبط تلقائي
 Autoconfigure for device = ‎إعداد تلقائي للعبة
 Bind All = Bind All
 Clear All = ‎إخلاء الكل
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = ‎إرجاع للإفتراضي
 Map a new key for = ‎خريطة مفتاح جديدة لـ
 Map Key = ‎خريطة مفتاح

assets/lang/az_AZ.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Gir
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Bitir
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Yüklənir\nZəhmət Olmasa Gözləyin...
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Move
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = Clear all
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restore defaults
 Map a new key for = Map a new key for
 Map Key = Map key

assets/lang/bg_BG.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Край
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Зареждане\nМоля изчакайте...
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Преместване
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = Изчисти всички
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Първоначални
 Map a new key for = Избери нов клавиш за
 Map Key = Map key

assets/lang/ca_ES.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternar velocitat del soroll
@@ -331,6 +339,8 @@ Edit = Editar
 Enable All = Activar tot
 Enabled = Enabled
 Enter = Confirmar
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filtrar
 Finish = Finalitzar
 GE Frame Dumps = Volcats de fotograma GE
@@ -343,6 +353,8 @@ Loading = Carregant\nEspera un moment...
 LoadingFailed = Les dadess del joc no s'ha pogut carregar.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Moure
 Move Down = Baixar
 Move Up = Pujar
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autoconfigurar
 Autoconfigure for device = Autoconfigurar per a dispositiu
 Bind All = Assignar tots
 Clear All = Esborrar tot
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restaurar
 Map a new key for = Prem una tecla per
 Map Key = Mapejar tecla

assets/lang/cz_CZ.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Potvrdit
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Potvrdit
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Načítání\nČekejte prosím...
 LoadingFailed = Nelze načíst data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Přesunout
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Automatické nastavení
 Autoconfigure for device = Automaticky nastavit pro zařízení
 Bind All = Bind All
 Clear All = Vše vyčistit
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Obnovit výchozí
 Map a new key for = Mapovat novou klávesu pro
 Map Key = Map key

assets/lang/da_DK.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Slut
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Henter\nVent venligst...
 LoadingFailed = Ikke muligt at indlæse data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Flyt
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autokonfigration
 Autoconfigure for device = Autokonfiguration af enhed
 Bind All = Bind All
 Clear All = Slet alt
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Sæt til standard
 Map a new key for = Map en ny taste for
 Map Key = Map key

assets/lang/de_DE.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Lautstärke für wechselnde Geschwindigkeit/Turbo
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Alle aktivieren
 Enabled = Enabled
 Enter = Eingabe
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Fertig
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Laden\nBitte warten...
 LoadingFailed = Daten konnten nicht geladen werden.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Bewegen
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP Archiv beschädigt
 Zip file does not contain PSP software = ZIP Datei beinhaltet keine PSP Software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autokonfiguration
 Autoconfigure for device = Autokonfiguration für Gerät
 Bind All = Bind All
 Clear All = Alle löschen
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Zurücksetzen
 Map a new key for = Drücke zuzuweisende Taste für
 Map Key = Taste zuweisen

assets/lang/dr_ID.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Mangkami
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Dibukka'i\nTajammi...
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Move
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = Paccingngi nasan
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Poleboko' nasan
 Map a new key for = Garaganni tombol baru
 Map Key = Map key

assets/lang/en_US.ini

@@ -26,32 +26,35 @@
 %d achievements, %d points = %d achievements, %d points
 %1: Leaderboard attempt started = %1: Leaderboard attempt started
 %1: Leaderboard attempt failed = %1: Leaderboard attempt failed
-%1: Submitting leaderboard score: %2! = %1: Submitting leaderboard score: %2!
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
 Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
 Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
-This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
-Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Save state loaded without achievement data = Save state loaded without achievement data
 Sound Effects = Sound Effects
 Statistics = Statistics
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
 Unofficial achievements = Unofficial achievements

assets/lang/es_ES.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternar velocidad de sonido
@@ -331,6 +339,8 @@ Edit = Editar
 Enable All = Activar todo
 Enabled = Enabled
 Enter = Intro
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filtrar
 Finish = Terminar
 GE Frame Dumps = Volcados de fotogramas GE
@@ -343,6 +353,8 @@ Loading = Cargando\nEspera un momento...
 LoadingFailed = Los datos del juego no se pudieron cargar.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Posición
 Move Down = Bajar
 Move Up = Subir
@@ -620,10 +632,12 @@ Zip archive corrupt = El archivo ZIP está dañado.
 Zip file does not contain PSP software = El archivo ZIP no contiene software de PSP.
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autoconfigurar
 Autoconfigure for device = Autoconfigurar para dispositivo
 Bind All = Asignar todos
 Clear All = Borrar todo
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restaurar
 Map a new key for = Pulsa una tecla para
 Map Key = Mapear tecla

assets/lang/es_LA.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,18 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+#Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternar velocidad de volumen
@@ -331,6 +340,8 @@ Edit = Editar
 Enable All = Activar todo
 Enabled = Enabled
 Enter = Confirmar
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filtrar
 Finish = Terminar
 GE Frame Dumps = Volcados de cuadros GE
@@ -343,6 +354,8 @@ Loading = Cargando\nPor favor espere...
 LoadingFailed = Los datos del juego no se pudieron cargar.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Mover
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +633,12 @@ Zip archive corrupt = El archivo ZIP está dañado.
 Zip file does not contain PSP software = El archivo ZIP no contiene software de PSP.
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autoconfigurar
 Autoconfigure for device = Autoconfigurar para dispositivo
 Bind All = Ocultar todo
 Clear All = Borrar todo
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restaurar
 Map a new key for = Presiona una tecla para
 Map Key = Asignar tecla

assets/lang/fa_IR.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = حجم سرعت متناوب
@@ -331,6 +339,8 @@ Edit = ویرایش
 Enable All = فعال کردن همه؟
 Enabled = Enabled
 Enter = ‎ورود
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = فیلتر
 Finish = ‎پایان
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = ‎درحال بارگیری\n...منتظر بمانید
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = حرکت
 Move Down = حرکت به پایین
 Move Up = حرکت به بالا
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = ‎پاکسازی همه
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = ‎پیشفرض همه
 Map a new key for = ‎برای این دکمه یک کلید انتخاب کنید
 Map Key = Map key

assets/lang/fi_FI.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Vaihtoehtoisen nopeuden äänenvoimakkuus
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Valmis
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Ladataan\nOdota...
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Move
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP-arkisto on korruptoitunut
 Zip file does not contain PSP software = ZIP-tiedosto ei sisällä PSP-ohjelmistoa
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = Clear all
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restore defaults
 Map a new key for = Map a new key for
 Map Key = Map key

assets/lang/fr_FR.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Volume en vitesse alternative
@@ -331,6 +339,8 @@ Edit = Éditer
 Enable All = Tout activer
 Enabled = Enabled
 Enter = Entrer
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Terminer
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Chargement\nVeuillez patienter...
 LoadingFailed = Chargement impossible.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Déplacer
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = Archive ZIP corrompue
 Zip file does not contain PSP software = Le fichier ZIP ne contient pas de logiciel PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Configuration automatique
 Autoconfigure for device = Configuration automatique pour l'appareil
 Bind All = Bind All
 Clear All = Réinitialiser
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Par défaut
 Map a new key for = Choisir une nouvelle touche pour
 Map Key = Assigner une touche

assets/lang/gl_ES.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Intro
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Terminar
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Cargando\nAgarda un momento...
 LoadingFailed = Os datos nom se puideron cargar.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Posición
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autoconfigurar
 Autoconfigure for device = Autoconfigurar para dispositivo
 Bind All = Bind All
 Clear All = Borrar todo
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restaurar
 Map a new key for = Pulsa unha tecla para
 Map Key = Map key

assets/lang/gr_EL.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = ΕΝΕΡΓΟΠΟΙΗΣΗ ΟΛΩΝ
 Enabled = Enabled
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = ΤΕΛΟΣ
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = ΦΟΡΤΩΣΗ\nΠΑΡΑΚΑΛΩ ΠΕΡΙΜΕΝΕΤΕ...
 LoadingFailed = ΑΔΥΝΑΜΙΑ ΦΟΡΤΩΣΗΣ ΔΕΔΟΜΕΝΩΝ.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = ΜΕΤΑΚΙΝΗΣΗ
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = Το αρχείο ZIP είναι κατεστραμμέν
 Zip file does not contain PSP software = Το αρχείο ZIP δεν περιέχει λογισμικό PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Αυτόματη ρύθμιση
 Autoconfigure for device = Αυτόματη ρύθμιση για τη συσκευή
 Bind All = Bind All
 Clear All = Καθαρισμός
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Επαναφορά
 Map a new key for = Πατήστε ένα πλήκτρο για το
 Map Key = ΡύΘμιση κουμπιού

assets/lang/he_IL.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = סנכה
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = םייס
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = ...ןתמה אנא ...ןעוט
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Move
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = נקה הכל
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = החזר הכל
 Map a new key for = מיפוי מקש נוסף ל
 Map Key = Map key

assets/lang/he_IL_invert.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = סנכה
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = םייס
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = ...ןתמה אנא ...ןעוט
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Move
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = לכה הקנ
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = לכה רזחה
 Map a new key for = ףסונ שקמ יופימ
 Map Key = Map key

assets/lang/hr_HR.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Naizmjenična brzina zvuka
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Uključi sve
 Enabled = Enabled
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Dovrši
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Učitavanje\nPričekajte...
 LoadingFailed = Nije moguće učitati datu.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Pomakni
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = Koruptana ZIP arhiva
 Zip file does not contain PSP software = ZIP datoteka ne sadrži PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Automatski konfiguriraj
 Autoconfigure for device = Automatski konfiguriraj za sve uređaje
 Bind All = Bind All
 Clear All = Obriši sve
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Vrati na zadano
 Map a new key for = Postavi novu tipku za
 Map Key = Postavi tipku

assets/lang/hu_HU.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternatív sebesség hangereje
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Mind bekapcsolása
 Enabled = Enabled
 Enter = Belép
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Kész
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Betöltés\nKérlek várj...
 LoadingFailed = Betöltés sikertelen.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Mozgat
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = A ZIP archívum sérült
 Zip file does not contain PSP software = A ZIP fájl nem tartalmaz PSP szoftvert
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Automatikus beállítás
 Autoconfigure for device = Eszköz auto-beállítása
 Bind All = Bind All
 Clear All = Összes törlése
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Összeset alapért.
 Map a new key for = Új gomb beállítása ehhez:
 Map Key = Billentyű társítása

assets/lang/id_ID.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Kecepatan volume alternatif
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Aktifkan semua
 Enabled = Enabled
 Enter = Masuk
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Selesai
 GE Frame Dumps = Buang laju bingkai GE
@@ -343,6 +353,8 @@ Loading = Memuat\nMohon Tunggu...
 LoadingFailed = Tidak dapat memuat data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Pindah
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = Arzip ZIP rusak
 Zip file does not contain PSP software = File ZIP tidak mengandung perangkat lunak PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Konfigurasi otomatis
 Autoconfigure for device = Konfigurasi otomatis untuk perangkat
 Bind All = Ikat/simpan semua
 Clear All = Bersihkan semua
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Kembalikan ke pengaturan awal
 Map a new key for = Tombol kunci baru ditetapkan ke
 Map Key = Tetapkan kunci/tombol

assets/lang/it_IT.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Volume velocizzato alternativo
@@ -331,6 +339,8 @@ Edit = Modifica
 Enable All = Attiva tutto
 Enabled = Enabled
 Enter = Invio
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filtro
 Finish = Fine
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Caricamento in corso.\nAttendere, prego...
 LoadingFailed = Impossibile caricare i dati.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Sposta
 Move Down = Sposta giù
 Move Up = Sposta su
@@ -621,10 +633,12 @@ Zip archive corrupt = Archivio ZIP corrotto
 Zip file does not contain PSP software = Il file ZIP non contiene software PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Configurazione automatica
 Autoconfigure for device = Configurazione Automatica per il Dispositivo
 Bind All = Mappa tutto
 Clear All = Pulisci Tutto
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Ripristina Tutto
 Map a new key for = Seleziona Tasto di Controllo per:
 Map Key = Mappatura tasto

assets/lang/ja_JP.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = カスタム速度時のボリューム
@@ -331,6 +339,8 @@ Edit = 編集
 Enable All = 全て有効にする
 Enabled = Enabled
 Enter = 決定
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = 終了
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = ロード中です。\nしばらくお待ちください...
 LoadingFailed = データをロードできませんでした。
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = 移動
 Move Down = 下へ移動
 Move Up = 上へ移動
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIPアーカイブが破損しています
 Zip file does not contain PSP software = ZIPファイルにPSPソフトウェアが含まれていません
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = 自動設定
 Autoconfigure for device = デバイスの自動設定
 Bind All = 全てを割り当てする
 Clear All = 全てクリアする
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = デフォルトに戻す
 Map a new key for = 新しいキーを入力
 Map Key = キーの割り当て指定

assets/lang/jv_ID.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Ketik
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Rampung
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Mbukak\nMohon nteni...
 LoadingFailed = Ora biso mbukak data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Pindahno
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Konfigurasi otomatis
 Autoconfigure for device = Konfigurasi otomatis kanggo piranti
 Bind All = Bind All
 Clear All = Ilangi kabeh
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Gawan kabeh
 Map a new key for = Petakan tombol anyar
 Map Key = Map key

assets/lang/ko_KR.ini

@@ -2,21 +2,25 @@
 %d achievements, %d points = %d 성과, %d 포인트
 %1: Leaderboard attempt started = %1: 순위표 시도 시작
 %1: Leaderboard attempt failed = %1: 순위표 시도 실패
-%1: Submitting leaderboard score: %2! = %1: 리더보드 점수 제출: %2!
+#%1: Submitting leaderboard score: %2! = %1: 리더보드 점수 제출: %2!
 Account = 계정
+Achievement Unlocked = Achievement Unlocked
 Achievements = 성과
 Achievements are disabled = 성과 비활성화
 Challenge Mode = 도전 모드
 Challenge Mode (no savestates) = 도전 모드 (저장 상태 없음)
+Customize = Customize
 Earned = %d 의 %d 성과 및 %d 의 %d 포인트 획득
 Encore Mode = 앙코르 모드
 How to use RetroAchievements = RetroAchievements 사용 방법
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = 순위표 제출 활성화
 Leaderboards = 순위표
 Links = 링크
 Locked achievements = 잠겨진 성과
 Log bad memory accesses = 불량 메모리 접속 로그
 Mastered %1 = 마스터한 %1
+Submitted %1 for %2 = Submitted %1 for %2
 This feature is not available in Challenge Mode = 도전 모드에서는 이 기능을 사용할 수 없음
 Save states not available in Challenge Mode = 도전 모드에서 사용할 수 없는 저장 상태
 Register on www.retroachievements.org = www.retroachievements.org에 등록
@@ -336,6 +340,8 @@ Edit = 편집
 Enable All = 모두 활성화
 Enabled = 활성화
 Enter = 입력
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = 필터
 Finish = 마침
 GE Frame Dumps = GE 프레임 덤프
@@ -348,6 +354,8 @@ Loading = 불러오기 중\n잠시만 기다려 주세요...
 LoadingFailed = 데이터를 불러올 수 없습니다.
 Log in = 로그인
 Log out = 로그아웃
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = 이동
 Move Up = 위로 이동
 Move Down = 아래로 이동

assets/lang/lo_LA.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = ຢືນຢັນ
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = ສິ້ນສຸດ
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = ກຳລັງໂຫຼດ\nກະລຸນາລໍຖ້າ...
 LoadingFailed = ບໍ່ສາມາດໂຫຼດຂໍ້ມູນ.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = ເຄື່ອນຍ້າຍ
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = ກຳນົດຄ່າອັດຕະໂນມັດ
 Autoconfigure for device = ກຳນົດຄ່າໃຫ້ອັດຕະໂນມັດສຳລັບອຸປະກອນນີ້
 Bind All = Bind All
 Clear All = ລຶບທັງໝົດ
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = ຄືນຄ່າເລີ່ມຕົ້ນໃໝ່ໝົດ
 Map a new key for = ປັບປຸ່ມໃໝ່ເພື່ອ
 Map Key = Map key

assets/lang/lt-LT.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Įeitis
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Baigti
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Kraunama\nPrašome palaukti...
 LoadingFailed = Neįmanoma krauti duomenų.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Perkelti
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Automatiškai sukonfiguruoti įrenginiui
 Bind All = Bind All
 Clear All = Ištrinti viską
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Akturti numatytus parametrus
 Map a new key for = Nustatyti naują klavišą
 Map Key = Map key

assets/lang/ms_MY.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Masuk
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Tamat
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Memuat\nSila tunggu...
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Move
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = Bersihkan semua
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Lalaikan semua
 Map a new key for = Petakan kekunci baru untuk
 Map Key = Map key

assets/lang/nl_NL.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Alles inschakelen
 Enabled = Enabled
 Enter = Bevestigen
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Voltooien
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Bezig met laden...\nEen ogenblik geduld.
 LoadingFailed = Kan de data niet laden.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Slepen
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autoconfiguratie
 Autoconfigure for device = Automatisch voor apparaat configureren
 Bind All = Bind All
 Clear All = Alles legen
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Herstellen
 Map a new key for = Stel een nieuwe toets in voor
 Map Key = Toets indelen

assets/lang/no_NO.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Ferdig
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Laster\nVent litt...
 LoadingFailed = Unable to load data.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Move
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = Clear all
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restore defaults
 Map a new key for = Map a new key for
 Map Key = Map key

assets/lang/pl_PL.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Konto
+Achievement Unlocked = Achievement Unlocked
 Achievements = Osiągnięcia
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Tryb Wyzwania
 Challenge Mode (no savestates) = Tryb Wyzwania (bez zapisów stanu)
+Customize = Customize
 Earned = Zdobyłeś %d z %d osiągnięć i %d z %d punktów
+Encore Mode = Encore Mode
 How to use RetroAchievements = Jak używać RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Tabele wyników
 Links = Linki
-Local = Lokalne
 Locked achievements = Zablokowane osiągnięcia
 Log bad memory accesses = Rejestruj złe dostępy do pamięci
 Mastered %1 = Wymaksowane %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Zarejestruj się na www.retroachievement
 RetroAchievements are not available for this game = Usługa RetroAchievements nie jest dostępna dla tej gry
 RetroAchievements website = Strona internetowa RetroAchievements
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Efekty dźwiękowe
 Statistics = Statystyki
-Submitted Score = Przesłany wynik
-Submitted Score = Przesłany wynik: %d (Najlepszy: %d)\nPozycja w tabeli wyników: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Synchronizacja osiągnięć...
 Test Mode = Tryb Testowy
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = Ta gra nie ma osiągnięć
 Unlocked achievements = Odblokowane osiągnięcia
-Unofficial = Nieoficjalne
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternatywna prędkość emulacji
@@ -331,6 +339,8 @@ Edit = Edytuj
 Enable All = Włącz wszystko
 Enabled = Włączono
 Enter = Dalej
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filtruj
 Finish = Zakończ
 GE Frame Dumps = Zrzuty klatek GE
@@ -343,6 +353,8 @@ Loading = Ładowanie\nProszę czekać...
 LoadingFailed = Nie można wczytać danych.
 Log in = Zaloguj
 Log out = Wyloguj
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Przenieś
 Move Down = Przenieś w dół
 Move Up = Przenieś w górę
@@ -426,6 +438,8 @@ PS1 EBOOTs are not supported by PPSSPP. = Pliki EBOOT PS1 nie są obsługiwane p
 PSX game image detected. = Plik jest obrazem MODE2. PPSSPP nie obsługuje gier z PS1.
 RAR file detected (Require UnRAR) = Wykryto plik RAR.\nRozpakuj go przed użyciem (spróbuj UnRAR).
 RAR file detected (Require WINRAR) = Wykryto plik RAR.\nRozpakuj go przed użyciem (spróbuj WinRAR).
+Running slow: try frameskip, sound is choppy when slow = Running slow: try frameskip, sound is choppy when slow
+Running slow: Try turning off Software Rendering = Running slow: try turning off "software rendering"
 Running slow: Wolne działanie: spróbuj pomijania klatek, dźwięk zacina przy wolnym działaniu
 Running slow: Wolne działanie: spróbuj wyłączyć "Renderowanie programowe"
 Save encryption failed. This save won't work on real PSP = Nie można zaszyfrować pliku zapisu gry. Ten zapis gry nie zadziała na prawdziwym PSP.
@@ -437,6 +451,8 @@ Unable to initialize rendering engine. = Nie można zainicjować silnika rendero
 Unable to write savedata, disk may be full = Nie można zapisać danych zapisu gry, dysk może być już zapełniony.
 Warning: Ostrzeżenie: Pamięć wideo jest PEŁNA, nastąpi zmniejszenie rozdzielczości i zmiana na powolne buforowanie.
 Warning: Ostrzeżenie: Pamięć wideo jest PEŁNA, nastąpi zmiana na powolne buforowanie.
+Warning: Video memory FULL, reducing upscaling and switching to slow caching mode = Warning: Video memory FULL, reducing upscaling and switching to slow caching mode.
+Warning: Video memory FULL, switching to slow caching mode = Warning: Video memory FULL, switching to slow caching mode.
 ZIP file detected (Require UnRAR) = Wykryto plik ZIP.\nRozpakuj go przed użyciem (spróbuj UnRAR).
 ZIP file detected (Require WINRAR) = Wykryto plik ZIP.\nRozpakuj go przed użyciem (spróbuj WinRAR).
 
@@ -620,10 +636,12 @@ Zip archive corrupt = Niepoprawne archiwum ZIP
 Zip file does not contain PSP software = Archiwum ZIP nie zawiera aplikacji dla PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autokonfiguracja
 Autoconfigure for device = Skonfiguruj automatycznie
 Bind All = Przypisz (wszystkie)
 Clear All = Wyczyść (wszystkie)
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Domyślne (wszystkie)
 Map a new key for = Przypisz nowy klawisz dla
 Map Key = Mapuj przycisk

assets/lang/pt_BR.ini

@@ -23,17 +23,23 @@
 # Happy translating.
 
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d conquistas, %d pontos
 Account = Conta
+Achievement Unlocked = Achievement Unlocked
 Achievements = Conquistas
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Modo de Desafio
 Challenge Mode (no savestates) = Modo de Desafio (sem save states)
+Customize = Customize
 Earned = Você ganhou %d de %d conquistas e %d de %d pontos
+Encore Mode = Encore Mode
 How to use RetroAchievements = Como usar RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = A submissão a tabela de classificação está ativada
 Leaderboards = Tabelas de Classificação
 Links = Links
-Local = Local
 Locked achievements = Conquistas trancadas
 Log bad memory accesses = Registrar acessos ruins da memória
 Mastered %1 = Conquistou o %1
@@ -41,15 +47,17 @@ Register on www.retroachievements.org = Registrar no www.retroachievements.org
 RetroAchievements are not available for this game = Os RetroAchievements não estão disponíveis pra este jogo
 RetroAchievements website = Site da Web dos RetroAchievements
 Rich Presence = Presença Rica
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Efeitos de Som
 Statistics = Estatísticas
-Submitted Score = Pontuação Submetida
-Submitted Score = Pontuação Submetida: %d (Melhor: %d)\nPosição na Tabela de Classificação: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Sincronizando os dados das conquistas...
 Test Mode = Modo Teste
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = Este jogo não tem conquistas
 Unlocked achievements = Conquistas destrancadas
-Unofficial = Não oficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Velocidade alternativa do volume
@@ -355,6 +363,8 @@ Edit = Editar
 Enable All = Ativar tudo
 Enabled = Ativado
 Enter = Inserir
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filtro
 Finish = Concluir
 GE Frame Dumps = Dumps do Frame do GE
@@ -367,6 +377,8 @@ Loading = Carregando\nPor favor espere...
 LoadingFailed = Incapaz de carregar os dados.
 Log in = Logar
 Log out = Sair
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Mover
 Move Up = Mover pra Cima
 Move Down = Mover pra Baixo
@@ -557,7 +569,7 @@ Frame Skipping = Pulo dos frames
 Frame Skipping Type = Tipo de pulo dos frames
 FullScreen = Tela cheia
 Geometry shader culling = Abate do shader da geometria
-Hack Settings = Configurações dos hacks (pode causar erros gráficos)									  
+Hack Settings = Configurações dos hacks (pode causar erros gráficos)
 Hardware Tessellation = Tesselação por hardware
 Hardware Transform = Transformação por hardware
 hardware transform error - falling back to software = Erro de transformação pelo hardware, retrocedendo pro software.
@@ -644,10 +656,12 @@ Zip archive corrupt = Arquivo ZIP corrompido
 Zip file does not contain PSP software = O arquivo ZIP não contém software do PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto-configurar
 Autoconfigure for device = Auto-configurar pro dispositivo
 Bind All = Vincular tudo
 Clear All = Limpar tudo
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restaurar os padrões
 Map a new key for = Mapear uma nova tecla pra
 Map Key = Mapear tecla
@@ -922,10 +936,10 @@ tools = Ferramentas grátis usadas:
 # Leave extra lines blank. 4 contributors per line seems to look best.
 translators1 = Papel, gabrielmop, Efraim Lopes, AkiraJkr
 translators2 = Felipe
-translators3 = 
-translators4 = 
-translators5 = 
-translators6 = 
+translators3 =
+translators4 =
+translators5 =
+translators6 =
 Twitter @PPSSPP_emu = Twitter @PPSSPP_emu
 website = Verifique o site da web:
 written = Escrito em C++ pela velocidade e portabilidade

assets/lang/pt_PT.ini

@@ -23,17 +23,23 @@
 # Happy translating.
 
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -41,15 +47,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Velocidade alternativa do volume
@@ -355,6 +363,8 @@ Edit = Editar
 Enable All = Ativar tudo
 Enabled = Enabled
 Enter = Inserir
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filtro
 Finish = Concluir
 GE Frame Dumps = Dumps do Frame do GE
@@ -367,6 +377,8 @@ Loading = Carregando\nPor favor espere...
 LoadingFailed = Incapaz de carregar os dados.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Mover
 Move Down = Move Down
 Move Up = Move Up
@@ -644,10 +656,12 @@ Zip archive corrupt = Ficheiro .zip compactado corrompido.
 Zip file does not contain PSP software = O ficheiro .zip não contém software de PSP.
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto-configurar
 Autoconfigure for device = Auto-configurar para o dispositivo
 Bind All = Vincular tudo
 Clear All = Limpar tudo
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Restaurar os padrões
 Map a new key for = Mapear uma nova tecla para
 Map Key = Mapear tecla

assets/lang/ro_RO.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -332,6 +340,8 @@ Edit = Edit
 Enable All = Enable all
 Enabled = Enabled
 Enter = Confirmare
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Stop
 GE Frame Dumps = GE Frame Dumps
@@ -344,6 +354,8 @@ Loading = Se încarcă\nAșteptați...
 LoadingFailed = Nu s-au putut încărca datele.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Mișcă
 Move Down = Move Down
 Move Up = Move Up
@@ -621,10 +633,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Configurare automată
 Autoconfigure for device = Configurare automată pt. dispozitiv
 Bind All = Bind All
 Clear All = Curătă tot
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Înapoi la inițial
 Map a new key for = Configurează o nouă tastă pentru
 Map Key = Map key

assets/lang/ru_RU.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Громкость при другой скорости
@@ -331,6 +339,8 @@ Edit = Изменить
 Enable All = Включить все
 Enabled = Enabled
 Enter = Ввод
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Фильтр
 Finish = Сохранить
 GE Frame Dumps = Дампы кадров GE
@@ -343,6 +353,8 @@ Loading = Загрузка\nПожалуйста, подождите...
 LoadingFailed = Невозможно загрузить даные.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Положение
 Move Down = Сдвинуть вверх
 Move Up = Сдвинуть вниз
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP-архив повреждён
 Zip file does not contain PSP software = В ZIP-файле отсутсвует ПО для PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Автоконфиг
 Autoconfigure for device = Автоконфиг для устройства
 Bind All = Настроить всё
 Clear All = Очистить все
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = По умолчанию
 Map a new key for = Назначить кнопку для
 Map Key = Назначить кнопку

assets/lang/sv_SE.ini

@@ -2,32 +2,35 @@
 %d achievements, %d points = %d achievements, %d poäng
 %1: Leaderboard attempt started = %1: Topplisteförsök startat
 %1: Leaderboard attempt failed = %1: Topplisteförsök misslyckades
-%1: Submitting leaderboard score: %2! = %1: Skickar in toppliste-poäng: %2!
 Account = Inloggning
-Achievement Unlocked = Achievement Unlocked
+Achievement Unlocked = Achievement avklarat!
 Achievements = Achievements
+Achievements are disabled = Achievements är avstängda
 Challenge Mode = Utmanings-läge
 Challenge Mode (no savestates) = Utmanings-läge (inga sparade state)
-Customize = Customize
+Customize = Inställningar
 Earned = Du har tjänat %d av %d achievements, och %d of %d poäng
-Failed to log in, check your username and password. = Misslyckades att logga in, kontrollera ditt användarnamn och lösenord.
+Encore Mode = Encore-läge (kan ta achievements igen)
 How to use RetroAchievements = Hur man använder RetroAchievements
 Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Skickar in poäng till ledartabeller
-Leaderboards = Leaderboards
-Links = Links
-Local = Lokal
+Leaderboards = Topplistor
+Links = Länkar
 Locked achievements = Låsta achievements
 Log bad memory accesses = Logga felaktiga minnesåtkomster
-Mastered %1 = Mästrade %1
+Mastered %1 = Klarade av %1!
 Register on www.retroachievements.org = Registrera på www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements finns inte tillgängliga för detta spel
-RetroAchievements website = RetroAchievements website
-Rich Presence = Visa vad du spelar på websiten
+RetroAchievements website = RetroAchievements webbsida
+Rich Presence = Visa vad du spelar live på webbsidan
+Save state loaded without achievement data = Sparad state laddad utan achievement-data
+Save states not available in Challenge Mode = Sparade states inte tillgängliga i utmaningsläge
 Sound Effects = Ljudeffekter
 Statistics = Statistik
+Submitted %1 for %2 = Skickade in %1 for %2
 Syncing achievements data... = Synkar achievementdata...
 Test Mode = Test-läge
+This feature is not available in Challenge Mode = Denna feature är inte tillgänglig i utmaningsläge
 This game has no achievements = Detta spel har inga achievements
 Unlocked achievements = Upplåsta achievements
 Unofficial achievements = Inofficiella achievements
@@ -320,7 +323,7 @@ ConnectingAP = Kopplar upp till acceesspunkten.\nVänta...
 ConnectingPleaseWait = Kopplar upp.\nVänta...
 ConnectionName = Uppkopplingsnamn
 Corrupted Data = Korrupt data
-Default = Default
+#Default = Default
 Delete = Radera
 Delete all = Radera allt
 Delete completed = Borttaget.
@@ -337,6 +340,8 @@ Edit = Redigera
 Enable All = Slå på allt
 Enabled = På
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Färdig
 GE Frame Dumps = GE Frame Dumps
@@ -349,6 +354,8 @@ Loading = Laddar\nVänta...
 LoadingFailed = Kunde inte ladda data.
 Log in = Logga in
 Log out = Logga ut
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Flytta
 Move Down = Flytta ner
 Move Up = Flytta upp
@@ -383,7 +390,7 @@ There is no data = Det finns ingen data.
 Toggle All = Vänd alla
 Toggle List = Toggle list
 Unsupported = Stöds ej
-Username = Username
+Username = Användarnamn
 When you save, it will load on a PSP, but not an older PPSSPP = When you save, it will load on a PSP, but not an older PPSSPP
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Ja
@@ -626,10 +633,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Autokonfiguration
 Autoconfigure for device = Autokonfigurera för enhet
 Bind All = Bind All
 Clear All = Rensa
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Återställ allt
 Map a new key for = Mappa ny knapp för
 Map Key = Mappa tangent

assets/lang/tg_PH.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Kahaliling bilis ng tunog
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Paganahin lahat
 Enabled = Enabled
 Enter = Pumasok
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Tapusin
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Sandali lamang...
 LoadingFailed = Loading ng datos ay pumalya.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Galawin
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file ay hindi naglalaman ng PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Auto configure
 Autoconfigure for device = Autoconfigure for device
 Bind All = Bind All
 Clear All = Burahin lahat
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Ibalik lahat sa dati
 Map a new key for = Map a new key for
 Map Key = Map key

assets/lang/th_TH.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = ระดับเสียงในโหมดเร่งความเร็ว
@@ -332,6 +340,8 @@ Edit = แก้ไข
 Enable All = เปิดใช้งานทั้งหมด
 Enabled = Enabled
 Enter = ยืนยัน
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = ตัวกรอง
 Finish = สิ้นสุด
 GE Frame Dumps = ไฟล์กราฟิกเอนจิ้นเฟรมดั๊มพ์
@@ -344,6 +354,8 @@ Loading = กำลังโหลด\nโปรดรอ...
 LoadingFailed = ไม่สามารถโหลดข้อมูลนี้ได้
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = ย้าย
 Move Down = ย้ายลงล่าง
 Move Up = ย้ายขึ้นบน
@@ -621,10 +633,12 @@ Zip archive corrupt = ไฟล์ ZIP ไม่สมบูรณ์ (เสี
 Zip file does not contain PSP software = ไฟล์ ZIP นี้ ไม่มีข้อมูลซอฟแวร์ของเกม PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = ค่าอัตโนมัติ
 Autoconfigure for device = กำหนดค่าให้อัตโนมัติสำหรับอุปกรณ์นี้
 Bind All = เซ็ตปุ่มทั้งหมด
 Clear All = ล้างทั้งหมด
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = คืนค่าเดิมทั้งหมด
 Map a new key for = ปรับปุ่มใหม่สำหรับ
 Map Key = ตั้งค่าปุ่ม

assets/lang/tr_TR.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternatif hız hacmi
@@ -333,6 +341,8 @@ Edit = Düzenle
 Enable All = Hepsini etkinleştir
 Enabled = Enabled
 Enter = Gir
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filtre
 Finish = Bitir
 GE Frame Dumps = GE Kare Dökümleri
@@ -345,6 +355,8 @@ Loading = Yükleniyor\nLütfen Bekleyin...
 LoadingFailed = Veri yüklenemedi.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Taşı
 Move Down = Move Down
 Move Up = Move Up
@@ -622,10 +634,12 @@ Zip archive corrupt = ZIP arşivi bozuk
 Zip file does not contain PSP software = ZIP dosyası PSP yazılımı içermiyor
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Otomatik ayarla
 Autoconfigure for device = Cihaz için otomatik ayarla
 Bind All = Hepsini Bağla
 Clear All = Hepsini Temizle
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Varsayılana Döndür
 Map a new key for = Yeni bir tuş girin
 Map Key = Tuş girin

assets/lang/uk_UA.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Гучність при альтернативній швидкості
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Ввімкнути все
 Enabled = Enabled
 Enter = Введення
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Зберегти
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Завантаження\nБудь ласка, зачекайте...
 LoadingFailed = Не вдалося завантажити дані.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Положення
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP архів пошкоджено
 Zip file does not contain PSP software = ZIP-файл не містить програмного забезпечення PSP
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Авто конфіг
 Autoconfigure for device = Авто конфіг для пристрою
 Bind All = Bind All
 Clear All = Очистити все
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Скинути все
 Map a new key for = Призначити кнопку для
 Map Key = Карта кнопки

assets/lang/vi_VN.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = Alternate speed volume
@@ -331,6 +339,8 @@ Edit = Edit
 Enable All = Cho phép tất cả
 Enabled = Enabled
 Enter = Enter
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = Filter
 Finish = Hoàn thành
 GE Frame Dumps = GE Frame Dumps
@@ -343,6 +353,8 @@ Loading = Đang load\nXin đợi...
 LoadingFailed = Không thể load dữ liệu này.
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = Di chuyển
 Move Down = Move Down
 Move Up = Move Up
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP archive corrupt
 Zip file does not contain PSP software = ZIP file does not contain PSP software
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = Tự động thiết lập
 Autoconfigure for device = Tự động thiết lập với thiết bị này
 Bind All = Bind All
 Clear All = Xóa tất cả
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = Trả lại thiết lập gốc
 Map a new key for = Nhập nút mới cho
 Map Key = bản đồ nút

assets/lang/zh_CN.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d achievements, %d points
 Account = Account
+Achievement Unlocked = Achievement Unlocked
 Achievements = Achievements
+Achievements are disabled = Achievements are disabled
 Challenge Mode = Challenge Mode
 Challenge Mode (no savestates) = Challenge Mode (no savestates)
+Customize = Customize
 Earned = You have earned %d of %d achievements, and %d of %d points
+Encore Mode = Encore Mode
 How to use RetroAchievements = How to use RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = Leaderboard submission is enabled
 Leaderboards = Leaderboards
 Links = Links
-Local = Local
 Locked achievements = Locked achievements
 Log bad memory accesses = Log bad memory accesses
 Mastered %1 = Mastered %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = Register on www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements are not available for this game
 RetroAchievements website = RetroAchievements website
 Rich Presence = Rich Presence
+Save state loaded without achievement data = Save state loaded without achievement data
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = Sound Effects
 Statistics = Statistics
-Submitted Score = Submitted Score
-Submitted Score = Submitted score: %d (Best: %d)\nLeaderboard Position: %d of %d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = Syncing achievements data...
 Test Mode = Test Mode
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = This game has no achievements
 Unlocked achievements = Unlocked achievements
-Unofficial = Unofficial
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = 备选速度时的音量
@@ -331,6 +339,8 @@ Edit = 编辑
 Enable All = 全部启用
 Enabled = Enabled
 Enter = 确定
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = 筛选
 Finish = 完成
 GE Frame Dumps = GE帧转储
@@ -343,6 +353,8 @@ Loading = 载入中\n请稍候...
 LoadingFailed = 无法载入存档。
 Log in = Log in
 Log out = Log out
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = 移动位置
 Move Down = 移至下层
 Move Up = 移至上层
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP 文档损坏
 Zip file does not contain PSP software = ZIP文件不包含PSP软件
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = 自动配置
 Autoconfigure for device = 根据设备配置
 Bind All = 全部绑定
 Clear All = 全部清除
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = 恢复默认
 Map a new key for = 输入一个新按键：
 Map Key = 按键映射

assets/lang/zh_TW.ini

@@ -1,15 +1,21 @@
 [Achievements]
+%1: Leaderboard attempt failed = %1: Leaderboard attempt failed
+%1: Leaderboard attempt started = %1: Leaderboard attempt started
 %d achievements, %d points = %d 個成就，%d 個點數
 Account = 帳戶
+Achievement Unlocked = Achievement Unlocked
 Achievements = 成就
+Achievements are disabled = Achievements are disabled
 Challenge Mode = 挑戰模式
 Challenge Mode (no savestates) = 挑戰模式 (無存檔)
+Customize = Customize
 Earned = 您已經取得 %d/%d 個成就，以及 %d/%d 個點數
+Encore Mode = Encore Mode
 How to use RetroAchievements = 如何使用 RetroAchievements
+Leaderboard score submission = Leaderboard score submission
 Leaderboard submission is enabled = 排行榜提交已啟用
 Leaderboards = 排行榜
 Links = 連結
-Local = 本機
 Locked achievements = 已鎖定的成就
 Log bad memory accesses = 記憶體存取記錄錯誤
 Mastered %1 = 已達成 %1
@@ -17,15 +23,17 @@ Register on www.retroachievements.org = 在 www.retroachievements.org 上註冊
 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
+Save states not available in Challenge Mode = Save states not available in Challenge Mode
 Sound Effects = 音效
 Statistics = 統計資料
-Submitted Score = 已提交的分數
-Submitted Score = 已提交的分數：%d (最佳：%d)\n排行榜位置：%d/%d
+Submitted %1 for %2 = Submitted %1 for %2
 Syncing achievements data... = 正在同步成就資料…
 Test Mode = 測試模式
+This feature is not available in Challenge Mode = This feature is not available in Challenge Mode
 This game has no achievements = 這個遊戲沒有成就
 Unlocked achievements = 已解鎖的成就
-Unofficial = 非官方
+Unofficial achievements = Unofficial achievements
 
 [Audio]
 Alternate speed volume = 替代速度音量
@@ -331,6 +339,8 @@ Edit = 編輯
 Enable All = 全部啟用
 Enabled = 已啟用
 Enter = 輸入
+Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection.
+Failed to log in, check your username and password. = Failed to log in, check your username and password.
 Filter = 篩選器
 Finish = 完成
 GE Frame Dumps = GE 影格傾印
@@ -343,6 +353,8 @@ Loading = 正在載入\n請稍候…
 LoadingFailed = 無法載入資料
 Log in = 登入
 Log out = 登出
+Logged in! = Logged in!
+Logging in... = Logging in...
 Move = 移動
 Move Down = 下移
 Move Up = 上移
@@ -620,10 +632,12 @@ Zip archive corrupt = ZIP 封存損毀
 Zip file does not contain PSP software = ZIP 檔案不包含 PSP 軟體
 
 [KeyMapping]
+Allow combo mappings = Allow combo mappings
 Autoconfigure = 自動設定
 Autoconfigure for device = 自動設定裝置
 Bind All = 全部繫結
 Clear All = 全部清除
+Combo mappings are not enabled = Combo mappings are not enabled
 Default All = 重設為預設值
 Map a new key for = 對應新按鍵：
 Map Key = 對應按鍵

unittest/UnitTest.cpp

@@ -971,6 +971,12 @@ bool TestEscapeMenuString() {
 	return true;
 }
 
+bool TestSubstitutions() {
+	std::string output = ApplySafeSubstitutions("%3 %2 %1", "a", "b", "c");
+	EXPECT_EQ_STR(output, std::string("c b a"));
+	return true;
+}
+
 typedef bool (*TestFunc)();
 struct TestItem {
 	const char *name;
@@ -1028,6 +1034,7 @@ TestItem availableTests[] = {
 	TEST_ITEM(InputMapping),
 	TEST_ITEM(EscapeMenuString),
 	TEST_ITEM(VFS),
+	TEST_ITEM(Substitutions),
 };
 
 int main(int argc, const char *argv[]) {