locale:ja_jp Add missing hotkey notations

NSIS: QoL changes, general cleanup, bug fixes (#3335 )
Uninstaller: - Removed dependency for AdvUninstallLog, it wasn't really used for anything. - Remove unpacked installer files upon successful installation. Installer: - Remove detection code for versions prior to 1.4. - Fix Unicode path issues. - Fix path issues if install folder already exists. - Remove language option. - Fix redistributable installation issues. - Move redistributable installation to after user proceeds with install.
2026-01-31 01:15:24 +01:00 · 2020-05-05 22:08:05 +02:00 · 2020-05-05 22:07:53 +02:00 · 2020-05-04 21:01:58 +02:00 · 2020-05-02 19:08:10 +02:00 · 2020-05-02 19:07:41 +02:00
34 changed files with 578 additions and 419 deletions
--- a/bin/Langs/ar_SA/pcsx2_Iconized.mo
+++ b/bin/Langs/ar_SA/pcsx2_Iconized.mo
--- a/bin/Langs/ar_SA/pcsx2_Main.mo
+++ b/bin/Langs/ar_SA/pcsx2_Main.mo
--- a/bin/Langs/fr_FR/pcsx2_Iconized.mo
+++ b/bin/Langs/fr_FR/pcsx2_Iconized.mo
--- a/bin/Langs/fr_FR/pcsx2_Main.mo
+++ b/bin/Langs/fr_FR/pcsx2_Main.mo
--- a/bin/Langs/ja_JP/pcsx2_Main.mo
+++ b/bin/Langs/ja_JP/pcsx2_Main.mo
--- a/bin/portable.ini
+++ b/bin/portable.ini
@@ -1 +1 @@
-RunWizard=0
+RunWizard=1
--- a/debian-packager/create_built_tarball.sh
+++ b/debian-packager/create_built_tarball.sh
@@ -31,7 +31,7 @@ EOF

 # Default value
 GIT_SHA1=0;
-BRANCH="master"
+BRANCH="1.6.x"
 while [ -n "$1" ]; do
 case $1 in
    -help|-h   ) help;shift 1;;
--- a/linux_various/generate_pot.sh
+++ b/linux_various/generate_pot.sh
@@ -21,7 +21,7 @@ set -e
 ######################################################################
 # Script configuration
 ######################################################################
-VERSION=1.3.0
+VERSION=1.6.0
 COPYRIGHT="PCSX2 Dev Team"
 BUG_MAIL="https://github.com/PCSX2/pcsx2/issues"

--- a/locales/ar_SA/pcsx2_Iconized.po
+++ b/locales/ar_SA/pcsx2_Iconized.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PCSX2 1.6.0\n"
 "Report-Msgid-Bugs-To: https://github.com/PCSX2/pcsx2/issues\n"
 "POT-Creation-Date: 2020-02-10 17:29+0000\n"
-"PO-Revision-Date: 2020-03-22 18:47+0100\n"
+"PO-Revision-Date: 2020-04-14 17:16+0300\n"
 "Language: ar_SA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,7 @@ msgstr ""
 "X-Poedit-KeywordsList: pxE;pxEt\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: trunk\n"
-"Last-Translator: RedDevilus\n"
+"Last-Translator: roxas0zero <roxas0zero@gmail.com>\n"
 "Language-Team: \n"
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-SearchPath-0: pcsx2\n"
@@ -27,11 +27,13 @@ msgid ""
 "There is not enough virtual memory available, or necessary virtual memory "
 "mappings have already been reserved by other processes, services, or DLLs."
 msgstr ""
+"لا تتوفر ذاكرة افتراضية كافية، أو تم حجز ذاكرة افتراضية ضرورية من قبل عمليات "
+"أو خدمات أو مكتبات DLL أخرى."

 #: pcsx2/CDVD/CDVD.cpp:2058
 msgid ""
 "Failed to read/write NVM/MEC file. Check your BIOS setup/permission settings."
-msgstr ""
+msgstr "فشل في قراءة أو كتابة ملف NVM/MEC. تحقق من إعدادات الـBIOS."

 #: pcsx2/System.cpp:112
 msgid ""
@@ -40,18 +42,23 @@ msgid ""
 "such as a small or disabled swapfile, or by another program that is hogging "
 "a lot of memory."
 msgstr ""
+"هذا المحول البرمجي لم يستطيع حجز ذاكرة متجاورة مطلوبة للتخزين المؤقت "
+"الداخلي. يمكن أن يحدث هذا الخطأ بسبب انخفاض الذاكرة الافتراضية، مثل ملف "
+"مبادلة صغير أو معطل، أو بسبب برنامج آخر يستخدم الكثير من الذاكرة."

 #: pcsx2/System.cpp:358
 msgid ""
 "PCSX2 is unable to allocate memory needed for the PS2 virtual machine. Close "
 "out some memory hogging background tasks and try again."
 msgstr ""
+"PCSX2 غير قادر على تخصيص الذاكرة اللازمة للجهاز الافتراضي PS2. أغلق بعض مهام "
+"الخلفية التي تعوق الذاكرة وحاول مرة أخرى."

 #: pcsx2/gui/AppInit.cpp:163
 msgid ""
 "Warning: Some of the configured PS2 recompilers failed to initialize and "
 "have been disabled:"
-msgstr ""
+msgstr "تحذير: فشلت بعض المحولات البرمجية للـ PS2 في التهيئة وتم تعطيلها:"

 #: pcsx2/gui/AppInit.cpp:221
 msgid ""
@@ -59,6 +66,9 @@ msgid ""
 "improve emulation speed substantially. You may have to manually re-enable "
 "the recompilers listed above, if you resolve the errors."
 msgstr ""
+"ملحوظة: Recompilers (معيدين الترجمة) ليسو ضروريين ليعمل PCSX2، إلا أنها عادة "
+"ما تحسن من سرعة المحاكاة بشكل كبير. قد تضطر إلى إعادة تمكين الـ Recompilers "
+"(معيدين الترجمة) المذكورة أعلاه يدويًا إذا قمت بحل الأخطاء."

 #: pcsx2/gui/AppMain.cpp:159
 msgid ""
@@ -66,6 +76,9 @@ msgid ""
 "obtain a BIOS from an actual PS2 unit that you own (borrowing doesn't "
 "count).  Please consult the FAQs and Guides for further instructions."
 msgstr ""
+"الـ PCSX2 يتطلب وجود ملفات PS2 BIOS ليعمل. لأسباب قانونية * يجب * الحصول على "
+"BIOS من وحدة PS2 فعلية تمتلكها (غير مستعارة). يرجى الرجوع إلى الأسئلة "
+"الشائعة والأدلة لمزيد من التعليمات."

 #: pcsx2/gui/AppMain.cpp:718
 msgid ""
@@ -73,6 +86,9 @@ msgid ""
 "'Cancel' to attempt to cancel the thread.\n"
 "'Terminate' to quit PCSX2 immediately.\n"
 msgstr ""
+"\"تجاهل\" للاستمرار في انتظار استجابة العملية.\n"
+"\"إلغاء\" لمحاولة إلغاء العملية.\n"
+"\"إنهاء\" لإنهاء PCSX2 على الفور.\n"

 #: pcsx2/gui/AppUserMode.cpp:54
 msgid ""
@@ -89,6 +105,8 @@ msgid ""
 "Please note that the resulting file may not actually contain all saves, "
 "depending on how many are in the source memory card."
 msgstr ""
+"يرجى ملاحظة أن الملف الناتج قد لا يحتوي على جميع التخزينات، اعتمادًا على "
+"العدد الموجود في كرت الذاكرة المصدر الأصل."

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:68
 msgid ""
@@ -96,34 +114,41 @@ msgid ""
 "emulator during the conversion process, even if the emulator is no longer "
 "responding to input."
 msgstr ""
+"تحذير: قد يستغرق تحويل كرت ذاكرة بعض الوقت ... يرجى عدم إغلاق المحاكي أثناء "
+"عملية التحويل، حتى إذا لم يعد المحاكي يستجيب لأي إدخال."

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:87
 msgid "Convert this memory card to a standard 8 MB Memory Card .ps2 file."
-msgstr ""
+msgstr "قم بتحويل كرت الذاكرة هذا إلى كرت ذاكرة بسعة 8 ميجابايت بصيغة ps2."

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:89
 msgid "Convert this memory card to a 16 MB Memory Card .ps2 file."
-msgstr ""
+msgstr "قم بتحويل كرت الذاكرة هذا إلى كرت ذاكرة بسعة 16 ميجابايت بصيغة ps2."

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:91
 msgid "Convert this memory card to a 32 MB Memory Card .ps2 file."
-msgstr ""
+msgstr "قم بتحويل كرت الذاكرة هذا إلى كرت ذاكرة بسعة 32 ميجابايت بصيغة ps2."

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:93
 msgid "Convert this memory card to a 64 MB Memory Card .ps2 file."
-msgstr ""
+msgstr "قم بتحويل كرت الذاكرة هذا إلى كرت ذاكرة بسعة 64 ميجابايت بصيغة ps2."

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:225
 msgid ""
 "NTFS compression can be changed manually at any time by using file "
 "properties from Windows Explorer."
 msgstr ""
+"يمكن تغيير ضغط الـ NTFS يدويًا في أي وقت باستخدام خصائص الملف من الـ Windows "
+"Explorer."

 #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:50
 msgid ""
 "This is the folder where PCSX2 saves your settings, including settings "
 "generated by most plugins (some older plugins may not respect this value)."
 msgstr ""
+"هذا هو المجلد الذي يحفظ فيه PCSX2 الإعدادات الخاصة بك ، بما في ذلك الإعدادات "
+"التي تم إنشاؤها بواسطة معظم الملحقات (قد لا تعمل بعض الملحقات القديمة بهذه "
+"الطريقة)."

 #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:53
 msgid ""
@@ -131,6 +156,8 @@ msgid ""
 "location contains existing PCSX2 settings, you will be given the option to "
 "import or overwrite them."
 msgstr ""
+"يمكنك تحديد موقعًا اختياريًا لحفظ اعدادات PCSX2 هنا. إذا كان الموقع يحتوي على "
+"إعدادات PCSX2 موجودة مسبقا، فسيتم منحك خيار استيرادها أو استبدالها."

 #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:99
 #, c-format
@@ -139,6 +166,9 @@ msgid ""
 "and BIOS.  It is recommended if this is your first time installing %s that "
 "you view the readme and configuration guide."
 msgstr ""
+"سيساعدك هذا المعالج في تهيئة الملحقات وكروت الذاكرة و الـ BIOS. إذا كانت هذه "
+"هي المرة الأولى التي تقوم فيها بتثبيت %s فمن المستحسن أن تقرأ الدليل "
+"التمهيدي ودليل التهيئة."

 #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:142
 msgid ""
@@ -146,6 +176,9 @@ msgid ""
 "You cannot use a copy obtained from a friend or the Internet.\n"
 "You must dump the BIOS from your *own* Playstation 2 console."
 msgstr ""
+"يتطلب PCSX2 نسخة * قانونية * من الـ PS2 BIOS لتشغيل الألعاب.\n"
+"لا يمكنك استخدام نسخة تم الحصول عليها من صديق أو عن طريق الإنترنت.\n"
+"يجب عليك استخراج BIOS من الـ Playstation 2 الخاصة بك."

 #: pcsx2/gui/Dialogs/ImportSettingsDialog.cpp:32
 #, c-format
@@ -156,12 +189,18 @@ msgid ""
 "\n"
 "(or press Cancel to select a different settings folder)"
 msgstr ""
+"تم العثور على إعدادات %s الموجودة في مجلد الإعدادات. هل ترغب في استيراد هذه "
+"الإعدادات أم استبدالها بالقيم الافتراضية لـ %s ؟\n"
+"\n"
+"(أو اضغط إلغاء لتحديد مجلد إعدادات مختلف)"

 #: pcsx2/gui/Dialogs/McdConfigDialog.cpp:30
 msgid ""
 "NTFS compression is built-in, fast, and completely reliable; and typically "
 "compresses memory cards very well (this option is highly recommended)."
 msgstr ""
+"ضغط NTFS مدمج وسريع وموثوق تمامًا ؛ وعادة ما يضغط بطاقات الذاكرة بشكل جيد "
+"للغاية (يوصى بهذا الخيار بشدة)."

 #: pcsx2/gui/Dialogs/McdConfigDialog.cpp:39
 msgid ""
@@ -169,6 +208,8 @@ msgid ""
 "after loading from savestates.  May not be compatible with all games (Guitar "
 "Hero)."
 msgstr ""
+"يتجنب تلف كرت الذاكرة عن طريق إجبار الألعاب على إعادة فهرسة محتويات الكرت "
+"بعد تحميل حفظ الحالة. قد لا يكون متوافقًا مع جميع الألعاب (Guitar Hero)."

 #: pcsx2/gui/Dialogs/McdConfigDialog.cpp:45
 msgid ""
@@ -176,6 +217,8 @@ msgid ""
 "software changes. This prevents the memory card from running out of space "
 "for saves."
 msgstr ""
+"(نوع المجلد فقط) إعادة فهرسة محتوى كرت الذاكرة في كل مرة يتغير فيها البرنامج "
+"الجاري تشغيله. هذا يمنع كرت الذاكرة من نفاد المساحة للحفظ."

 #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:38
 msgid ""
@@ -183,6 +226,9 @@ msgid ""
 "configured settings.  These command line options will not be reflected in "
 "the Settings dialog, and will be disabled if you apply any changes here."
 msgstr ""
+"تحذير ! أنت تقوم بتشغيل PCSX2 بخيارات الأوامر التي تتجاوز الإعدادات التي تم "
+"تكوينها. لن تنعكس خيارات الأوامر في قائمة الإعدادات، وسيتم تعطيلها عند تعديل "
+"الإعدادات هنا."

 #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:55
 msgid ""
@@ -191,6 +237,9 @@ msgid ""
 "not be reflected in the settings dialog, and will be disabled when you apply "
 "settings changes here."
 msgstr ""
+"تحذير ! أنت تقوم بتشغيل PCSX2 بخيارات الأوامر التي تتجاوز إعدادات الملحقات "
+"و / أو المجلد التي قمت بتكوينها. لن تنعكس خيارات الأوامر في قائمة الإعدادات، "
+"وسيتم تعطيلها عند تعديل الإعدادات هنا."

 #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:128
 msgid ""
@@ -216,6 +265,8 @@ msgid ""
 "This action will reset the existing PS2 virtual machine state; all current "
 "progress will be lost.  Are you sure?"
 msgstr ""
+"سيؤدي هذا الإجراء إلى إعادة تعيين حالة الجهاز الافتراضية الموجودة للـ PS2؛ "
+"ستفقد كل التقدم الحالي. هل أنت واثق؟"

 #: pcsx2/gui/MainMenuClicks.cpp:114
 #, c-format
@@ -236,32 +287,38 @@ msgid ""
 "problem\n"
 "and re-enable it at any time using Config:Memory cards from the main menu."
 msgstr ""
+"تم تعطيل فتحة %d تلقائيًا. يمكنك تصحيح المشكلة\n"
+"وإعادة تمكينه في أي وقت باستخدام تهيئة : كروت الذاكرة من القائمة الرئيسية."

 #: pcsx2/gui/MemoryCardFolder.h:539
 #, c-format
 msgid "(FolderMcd) Memory Card is full, could not add: %s"
-msgstr ""
+msgstr "(FolderMcd) كرت الذاكرة ممتلئة، ولا يمكن إضافتها: %s"

 #: pcsx2/gui/Panels/BiosSelectorPanel.cpp:131
 msgid ""
 "Please select a valid BIOS.  If you are unable to make a valid selection "
 "then press Cancel to close the Configuration panel."
 msgstr ""
+"يرجى اختيار ملف BIOS صالح. إذا كنت غير قادر على اختيار ملف صالح، فاضغط على "
+"إلغاء لإغلاق لوحة التكوين."

 #: pcsx2/gui/Panels/CpuPanel.cpp:112 pcsx2/gui/Panels/CpuPanel.cpp:180
 msgid "Notice: Most games are fine with the default options."
-msgstr ""
+msgstr "ملاحظة: معظم الألعاب تعمل بشكل جيد مع الخيارات الافتراضية."

 #: pcsx2/gui/Panels/DirPickerPanel.cpp:69
 msgid ""
 "The specified path/directory does not exist.  Would you like to create it?"
-msgstr ""
+msgstr "المسار المحدد غير موجود. هل ترغب في إنشائه؟"

 #: pcsx2/gui/Panels/DirPickerPanel.cpp:157
 msgid ""
 "When checked this folder will automatically reflect the default associated "
 "with PCSX2's current usermode setting. "
 msgstr ""
+"عند تحديد هذا الاختيار، هذا المجلد سيعكس تلقائيًا الإعدادات الافتراضية "
+"المرتبطة بإعدادات المستخدم الحالي لـ PCSX2."

 #: pcsx2/gui/Panels/GSWindowPanel.cpp:73
 msgid ""
@@ -273,6 +330,13 @@ msgid ""
 "16:9: Temporarily switch to a 16:9 aspect ratio while an FMV plays to "
 "correctly display a widescreen 16:9 FMV."
 msgstr ""
+"مطفأ: يعطل تحول نسبة العرض إلى الارتفاع المؤقتة.\n"
+"\n"
+"4:3: يقوم بالتبديل مؤقتًا إلى نسبة العرض إلى الارتفاع 4:3 حين يتم تشغيل FMV "
+"لعرض 4:3 FMV بشكل صحيح.\n"
+"\n"
+"16:9: يقوم بالتبديل مؤقتًا إلى نسبة العرض إلى الارتفاع 16:9 حين يتم تشغيل FMV "
+"لعرض 16:9 FMV بشاشة عريضة بشكل صحيح."

 #: pcsx2/gui/Panels/GSWindowPanel.cpp:75
 msgid ""
@@ -293,6 +357,8 @@ msgid ""
 "usually only applies to fullscreen mode, and may not work with all GS "
 "plugins."
 msgstr ""
+"يزيل Vsync تمزق الشاشة ولكن عادةً ما يكون له تأثير كبير على الأداء. عادةً ما "
+"تنطبق فقط على وضع الشاشة الكاملة، وقد لا تعمل مع جميع ملحقات GS."

 #: pcsx2/gui/Panels/GSWindowPanel.cpp:81
 msgid ""
@@ -300,6 +366,9 @@ msgid ""
 "if using the mouse as a primary control device for gaming.  By default the "
 "mouse auto-hides after 2 seconds of inactivity."
 msgstr ""
+"حدد هذا الاختيار لإجبار مؤشر الماوس على عدم الظهور في نافذة GS؛ مفيد إذا كنت "
+"تستخدم الماوس كجهاز تحكم أساسي للألعاب. يتم إخفاء الماوس تلقائيًا بعد ثانيتين "
+"من عدم النشاط."

 #: pcsx2/gui/Panels/GSWindowPanel.cpp:84
 msgid ""
@@ -307,12 +376,16 @@ msgid ""
 "emulation. You can still toggle fullscreen display at any time using alt-"
 "enter."
 msgstr ""
+"لتمكين تبديل الوضع التلقائي إلى وضع الشاشة الكاملة عند بدء أو استئناف "
+"المحاكاة. بإمكانك تبديل العرض الى الشاشة الكاملة في أي وقت باستخدام alt-"
+"enter."

 #: pcsx2/gui/Panels/GSWindowPanel.cpp:87
 msgid ""
 "Completely closes the often large and bulky GS window when pressing ESC or "
 "pausing the emulator."
 msgstr ""
+"يغلق نافذة GS الكبيرة والضخمة عند الضغط على ESC أو إيقاف تشغيل المحاكي مؤقتًا."

 #: pcsx2/gui/Panels/GameFixesPanel.cpp:69
 msgid ""
@@ -321,6 +394,10 @@ msgid ""
 " * SSX (Fixes bad graphics and crashes)\n"
 " * Resident Evil: Dead Aim (Causes garbled textures)"
 msgstr ""
+"معروف بأنه يؤثر على الألعاب التالية:\n"
+"  * Digital Devil Saga (إصلاح الـ FMV وإصلاح التعطلات)\n"
+"  * SSX (إصلاح الرسومات وإصلاح التعطلات)\n"
+"  * Resident Evil: Dead Aim (يسبب تشوه الـ textures)"

 #: pcsx2/gui/Panels/GameFixesPanel.cpp:78
 msgid ""
@@ -329,12 +406,18 @@ msgid ""
 " * Growlanser II and III\n"
 " * Wizardry"
 msgstr ""
+"معروف بأنه يؤثر على الألعاب التالية:\n"
+" * Bleach Blade Battler\n"
+" * Growlanser II and III\n"
+" * Wizardry"

 #: pcsx2/gui/Panels/GameFixesPanel.cpp:83
 msgid ""
 "Known to affect following games:\n"
 " * Mana Khemia 1 (Going \"off campus\")\n"
 msgstr ""
+"معروف بأنه يؤثر على الألعاب التالية:\n"
+" * Mana Khemia 1 (Going \"off campus\")\n"

 #: pcsx2/gui/Panels/GameFixesPanel.cpp:88
 msgid ""
@@ -342,6 +425,9 @@ msgid ""
 " * Test Drive Unlimited\n"
 " * Transformers"
 msgstr ""
+"معروف بأنه يؤثر على الألعاب التالية:\n"
+" * Test Drive Unlimited\n"
+" * Transformers"

 #: pcsx2/gui/Panels/GameFixesPanel.cpp:124
 msgid ""
@@ -350,6 +436,10 @@ msgid ""
 "fixes for specific games). Manual game fixes will NOT increase your "
 "performance. In fact they may decrease it."
 msgstr ""
+"من الأفضل تمكين \"إصلاحات اللعبة التلقائية\" في القائمة الرئيسية بدلاً من "
+"ذلك، وترك هذه الصفحة فارغة (\"تلقائي\" يعني: استخدام إصلاحات محددة بشكل "
+"انتقائي لألعاب محددة تلقائيا). لن تؤدي إصلاحات الألعاب اليدوية إلى زيادة "
+"الأداء. في الواقع قد تقلل من ذلك."

 #: pcsx2/gui/Panels/GameFixesPanel.cpp:128
 msgid ""
@@ -365,16 +455,18 @@ msgid ""
 "You are about to delete the formatted memory card '%s'. All data on this "
 "card will be lost!  Are you absolutely and quite positively sure?"
 msgstr ""
+"أنت على وشك حذف كرت الذاكرة المهيئ '%s'. ستفقد جميع البيانات الموجودة على "
+"هذا الكرت ! هل أنت متأكد تمامًا ؟"

 #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:718
 msgid ""
 "Failed: Duplicate is only allowed to an empty PS2-Port or to the file system."
-msgstr ""
+msgstr "فشل: لا يسمح بالنسخ المكرر إلا لمنفذ PS2 فارغ أو لنظام الملفات."

 #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:760
 #, c-format
 msgid "Failed: Destination memory card '%s' is in use."
-msgstr ""
+msgstr "فشل: كرت ذاكرة المحدد '%s' قيد الاستخدام."

 #: pcsx2/gui/Panels/MiscPanelStuff.cpp:36
 msgid ""
@@ -394,19 +486,23 @@ msgstr ""

 #: pcsx2/gui/Panels/PathsPanel.cpp:40
 msgid "This folder is where PCSX2 loads cheats from."
-msgstr ""
+msgstr "هذا المجلد هو المكان الذي يقوم PCSX2 بتحميل اكواد الغش منه."

 #: pcsx2/gui/Panels/PathsPanel.cpp:48
 msgid ""
 "This folder is where PCSX2 records savestates; which are recorded either by "
 "using menus/toolbars, or by pressing F1/F3 (save/load)."
 msgstr ""
+"هذا المجلد هو المكان الذي يحفظ فيه PCSX2 حالات الحفظ؛ التي يتم تسجيلها إما "
+"باستخدام القوائم / أشرطة الأدوات ، أو بالضغط على F3 / F1 (حفظ / تحميل)."

 #: pcsx2/gui/Panels/PathsPanel.cpp:56
 msgid ""
 "This folder is where PCSX2 saves screenshots.  Actual screenshot image "
 "format and style may vary depending on the GS plugin being used."
 msgstr ""
+"هذا المجلد هو المكان الذي يحفظ فيه PCSX2 لقطات الشاشة. قد يختلف شكل وصيغة "
+"ملف صورة لقطة الشاشة اعتمادًا على ملحق الـ GS المستخدم."

 #: pcsx2/gui/Panels/PathsPanel.cpp:64
 msgid ""
@@ -414,6 +510,9 @@ msgid ""
 "plugins will also adhere to this folder, however some older plugins may "
 "ignore it."
 msgstr ""
+"هذا المجلد هو المكان الذي يحفظ فيه PCSX2 ملفات السجلات وملفات التشخيص "
+"المستخرجة. ستلتزم معظم الملحقات بهذا المجلد، ولكن بعض الملحقات القديمة قد "
+"تتجاهله."

 #: pcsx2/gui/Panels/PluginSelectorPanel.cpp:240
 msgid ""
@@ -424,6 +523,11 @@ msgid ""
 "\n"
 "Are you sure you want to apply settings now?"
 msgstr ""
+"تحذير! يتطلب تغيير الملحقات إيقاف تشغيل جهاز الـ PS2 وإعادة تشغيله بالكامل. "
+"سيحاول PCSX2 حفظ الحالة واستعادتها، ولكن إذا كانت الملحقات المحددة حديثًا غير "
+"متوافقة، فقد يفشل الاسترداد، وسيفقد التقدم الحالي.\n"
+"\n"
+"هل أنت متأكد أنك تريد تطبيق الإعدادات الآن؟"

 #: pcsx2/gui/Panels/PluginSelectorPanel.cpp:452
 #, c-format
@@ -432,6 +536,9 @@ msgid ""
 "make a valid selection due to missing plugins or an incomplete install of "
 "%s, then press Cancel to close the Configuration panel."
 msgstr ""
+"يجب أن تحتوي جميع الملحقات على تحديدات صالحة لتشغيل%s. إذا كنت غير قادر على "
+"إجراء تحديد صالح بسبب فقدان المكونات الإضافية أو عدم اكتمال تثبيت %s، فاضغط "
+"على إلغاء لإغلاق لوحة التكوين."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:29
 #, c-format
@@ -439,6 +546,9 @@ msgid ""
 "50% cyclerate. Significant reduction of CPU requirements. Speedup for very "
 "lightweight games, slows down others. FMVs and audio may stutter or skip."
 msgstr ""
+"معدل دورة بنسبة 50%. يخفض بشكل عالي من متطلبات قوة المعالج (CPU). قد يسرع "
+"الألعاب الخفيفة جدًا، يبطئ الألعاب الاخرى. الـ FMV والصوت قد تتلعثم أو لا "
+"تعمل."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:35
 #, c-format
@@ -446,6 +556,8 @@ msgid ""
 "60% cyclerate. Moderate reduction of CPU requirements. Speedup for "
 "lightweight games, slows down others. FMVs and audio may stutter or skip."
 msgstr ""
+"معدل دورة بنسبة 60%. يخفض بشكل متوسط من متطلبات قوة المعالج (CPU). قد يسرع "
+"الألعاب الخفيفة، يبطئ الألعاب الاخرى. الـ FMV والصوت قد تتلعثم أو لا تعمل."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:41
 #, c-format
@@ -453,11 +565,13 @@ msgid ""
 "75% cyclerate. Slight reduction of CPU requirements. Speedup for less "
 "demanding games, slows down others."
 msgstr ""
+"معدل دورة بنسبة 75%. يخفض بشكل صغير من متطلبات قوة المعالج (CPU). قد يسرع "
+"الألعاب المتوسطة، يبطئ الألعاب الاخرى."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:47
 msgid ""
 "Default cyclerate. Runs the emulated PS2 Emotion Engine at normal speed."
-msgstr ""
+msgstr "معدل الدورة الافتراضي. يحاكي الـ PS2 EE بسرعة عادية."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:53
 #, c-format
@@ -465,6 +579,8 @@ msgid ""
 "130% cyclerate. Moderate increase of CPU requirements. Variable framerate "
 "games may have higher internal framerates."
 msgstr ""
+"معدل دورة بنسبة 130%. يتطلب زيادة متوسطة في قوة المعالج (CPU). الألعاب ذات "
+"الأطارات المتغيرة قد تحصل على إطارات داخلية أعلى."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:59
 #, c-format
@@ -473,6 +589,9 @@ msgid ""
 "games will have higher internal framerates. FMVs may be slow. May cause "
 "stability problems."
 msgstr ""
+"معدل دورة بنسبة 180%. يتطلب زيادة عالية في قوة المعالج (CPU). الألعاب ذات "
+"الأطارات المتغيرة قد تحصل على إطارات داخلية أعلى. قد تكون FMVs بطيئة. قد "
+"يسبب مشاكل الاستقرار."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:64
 #, c-format
@@ -481,28 +600,38 @@ msgid ""
 "games will have higher internal framerates. FMVs may be slow. May cause "
 "stability problems."
 msgstr ""
+"معدل دورة بنسبة 300%. يتطلب زيادة عالية جدا في قوة المعالج (CPU). الألعاب "
+"ذات الأطارات المتغيرة قد تحصل على إطارات داخلية أعلى. قد تكون FMVs بطيئة. قد "
+"يسبب مشاكل الاستقرار."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:81
 msgid "Disables EE Cycle Skipping. Most compatible setting."
-msgstr ""
+msgstr "يعطل تخطي دورة الـ EE. هذا الإعداد هو الأكثر توافقًا."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:87
 msgid ""
 "Mild EE Cycle Skipping. Mild slow down for most games, but may help some "
 "games with mild VU starvation problems run at full speed."
 msgstr ""
+"تخطي دورة EE بشكل قليل. قد يسبب تباطؤ خفيف في معظم الألعاب، ولكن قد يساعد في "
+"تشغيل بعض الألعاب التي تعاني من مشاكل قليلة في قلة الـ VU أن تعمل بأقصى سرعة."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:93
 msgid ""
 "Moderate EE Cycle Skipping. Slow down for most games, but may help some "
 "games with moderate VU starvation problems run at full speed."
 msgstr ""
+"تخطي دورة EE بشكل متوسط. قد يسبب تباطؤ في معظم الألعاب، ولكن قد يساعد في "
+"تشغيل بعض الألعاب التي تعاني من مشاكل متوسطة في قلة الـ VU أن تعمل بأقصى "
+"سرعة."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:98
 msgid ""
 "Maximum EE Cycle Skipping. Mostly harmful. May help games with significant "
 "VU starvation problems run at full speed."
 msgstr ""
+"تخطي دورة EE بشكل أقصى. ضارة في الغالب، ولكن قد يساعد في تشغيل بعض الألعاب "
+"التي تعاني من مشاكل عالية في قلة الـ VU أن تعمل بأقصى سرعة."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:123
 msgid ""
@@ -510,6 +639,9 @@ msgid ""
 "audio, and false FPS readings.  When having emulation problems, disable this "
 "panel first."
 msgstr ""
+"عادة ما تقوم Speedhacks (هاكات السرعة) بتحسين سرعة المحاكاة، ولكنها يمكن أن "
+"تتسبب في حدوث خلل في الجرفكس والصوت وقراءات اطارات خاطئة. عند مواجهة مشكلات "
+"في المحاكاة، قم بتعطيل هذه اللوحة أولاً."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:149
 msgid ""
@@ -533,6 +665,8 @@ msgid ""
 "time. This is safe most of the time, and Super VU does something similar by "
 "default."
 msgstr ""
+"يحدّث علامات الحالة فقط على الكتل التي ستقرأها، بدلاً من كل الوقت. هذا آمن في "
+"معظم الأوقات، ويقوم Super VU بشيء مماثل بشكل افتراضي."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:182
 msgid ""
@@ -564,24 +698,32 @@ msgid ""
 "Check HDLoader compatibility lists for known games that have issues with "
 "this (often marked as needing 'mode 1' or 'slow DVD')."
 msgstr ""
+"تحقق من قوائم توافق HDLoader للألعاب المعروفة التي بها مشاكل معها (غالبًا ما "
+"يتم وضع علامة على أنها بحاجة إلى \"mode 1\" أو \"slow DVD\")."

 #: pcsx2/gui/Panels/VideoPanel.cpp:35
 msgid ""
 "Note that when Framelimiting is disabled, Turbo and SlowMotion modes will "
 "not be available either."
 msgstr ""
+"لاحظ أنه عند تعطيل اختيار الـ(حد الاطارات)، لن يكون وضعا (التربو) و (الحركة "
+"البطيئة) متاحين أيضًا."

 #: pcsx2/gui/Panels/VideoPanel.cpp:219
 msgid ""
 "Notice: Due to PS2 hardware design, precise frame skipping is impossible. "
 "Enabling it will cause severe graphical errors in some games."
 msgstr ""
+"ملاحظة: بسبب تصميم أجهزة الـ PS2، من المستحيل تخطي الإطار بشكل دقيق. سيؤدي "
+"تمكينه إلى حدوث أخطاء رسومية شديدة في بعض الألعاب."

 #: pcsx2/gui/Panels/VideoPanel.cpp:296
 msgid ""
 "Enable this if you think MTGS thread sync is causing crashes or graphical "
 "errors."
 msgstr ""
+"حدد هذا الاختيار إذا كنت تعتقد أن مزامنة مسار MTGS تتسبب في أعطال أو أخطاء "
+"رسومية."

 #: pcsx2/vtlb.cpp:835
 msgid ""
@@ -589,6 +731,8 @@ msgid ""
 "caused by having a small or disabled swapfile, or by other programs that are "
 "hogging resources."
 msgstr ""
+"الموارد الافتراضية الخاصة بنظامك منخفضة جدا لتشغيل PCSX2. يمكن أن يحدث هذا "
+"بسبب وجود ملف مبادلة صغير أو معطل، أو بسبب البرامج الأخرى التي تعوق الموارد."

 #: pcsx2/x86/sVU_zerorec.cpp:367
 msgid ""
@@ -597,3 +741,7 @@ msgid ""
 "not a critical error, since the sVU rec is obsolete, and you should use "
 "microVU instead anyway. :)"
 msgstr ""
+"تم نفاد الذاكرة (نوعا ما): الـ recompiler SuperVU لم يستطيع حجز نطاقات "
+"الذاكرة المحددة المطلوبة، ولن تكون متاحة للاستخدام. هذا ليس خطأ فادحًا، نظرًا "
+"لأن تسجيل الـ recompiler SuperVU أصبح قديمًا، ويجب عليك استخدام microVU بدلاً "
+"من ذلك على أي حال. :)"
--- a/locales/ar_SA/pcsx2_Main.po
+++ b/locales/ar_SA/pcsx2_Main.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PCSX2 1.6.0\n"
 "Report-Msgid-Bugs-To: https://github.com/PCSX2/pcsx2/issues\n"
 "POT-Creation-Date: 2020-01-15 22:32+1300\n"
-"PO-Revision-Date: 2020-03-22 18:49+0100\n"
-"Last-Translator: RedDevilus\n"
+"PO-Revision-Date: 2020-04-01 11:56+0300\n"
+"Last-Translator: roxas0zero <roxas0zero@gmail.com>\n"
 "Language-Team: Plubu (Plubutusty@gmail.com)\n"
 "Language: ar_001\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "خطأ تحليلي"

 #: common/include/Utilities/Exceptions.h:279
 msgid "Your machine's hardware is incapable of running PCSX2.  Sorry dood."
-msgstr "إن الهاردوير الخاص بجهازك غير قادر على تشغيل PCSX2 . أسف يا صاحبي ."
+msgstr "إن الهاردوير الخاص بجهازك غير قادر على تشغيل PCSX2. أسف يا صاحبي."

 #: common/src/Utilities/Exceptions.cpp:204
 msgid "Oh noes! Out of memory!"
@@ -47,8 +47,8 @@ msgid ""
 "drivers, services, or may simply have insufficient memory or resources to "
 "meet PCSX2's lofty needs."
 msgstr ""
-"فشل في التخطيط الوهمي للذاكرة! ربما النظام الخاص بك يتعارض مع تعاريف "
-"الأجهزة , الخدمات أو ربما ليس لديك ذاكرة كافية أو الموارد تكفي ل PCSX2."
+"فشل في تخطيط الذاكرة الوهمية ! ربما النظام الخاص بك يتعارض مع تعاريف الأجهزة "
+"أو الخدمات أو ربما ليس لديك ذاكرة كافية أو موارد تكفي ل PCSX2."

 #: common/src/Utilities/Exceptions.cpp:290
 msgid "Path: "
@@ -60,7 +60,7 @@ msgstr "[غير مسمى أو غير معروف]"

 #: common/src/Utilities/Exceptions.cpp:314
 msgid "A file could not be created."
-msgstr "لم يستطع إنشاء الملف."
+msgstr "لم يتم إنشاء الملف."

 #: common/src/Utilities/Exceptions.cpp:334
 msgid "File not found."
@@ -71,46 +71,45 @@ msgid ""
 "Permission denied while trying to open file, likely due to insufficient user "
 "account rights."
 msgstr ""
-"لا يوجد صلاحيات كافية لفتح الملف  , على الأغلب بسبب حقوق المستخدم الغير "
-"كافية ."
+"لا يوجد صلاحيات كافية لفتح الملف, على الأغلب بسبب حقوق المستخدم الغير كافية."

 #: common/src/Utilities/Exceptions.cpp:374
 msgid ""
 "Unexpected end of file or stream encountered.  File is probably truncated or "
 "corrupted."
-msgstr "نهاية غير متوقعة للملف. الملف على الأغلب فاسد."
+msgstr "نهاية غير متوقعة للملف. الملف على الأغلب تالف."

 #: common/src/Utilities/ThreadTools.cpp:41
 msgid "Threading activity: start, detach, sync, deletion, etc."
-msgstr "نشاط العملية , بدأ , فصل , تزامن , حذف ,إلخ..."
+msgstr "نشاط العملية: بدأ, فصل, تزامن, حذف, إلخ..."

 #: common/src/Utilities/ThreadingDialogs.cpp:30
 msgid "Waiting for tasks..."
-msgstr "في إنتظار مهام ..."
+msgstr "في انتظار مهام ..."

 #: common/src/Utilities/ThreadingDialogs.cpp:42
 msgid "Waiting for task..."
-msgstr "في إنتظار مهمة ..."
+msgstr "في انتظار مهمة ..."

 #: common/src/Utilities/wxAppWithHelpers.cpp:35
 msgid "Includes idle event processing and some other uncommon event usages."
-msgstr "يتضمن أحداث معالجة خاملة و بعض الإستخدامات الغير شائعة."
+msgstr "يتضمن معالجة أحداث خاملة وبعض الأستخدامات الأخرى للحدث الغير شائعة."

 #: pcsx2/CDVD/InputIsoFile.cpp:248
 msgid "Unrecognized ISO image file format"
-msgstr "صيغة ملف الـ ISO غير مدعومة"
+msgstr "صيغة ملف الـ ISO هذه غير مدعومة"

 #: pcsx2/Elfheader.cpp:163
 msgid "Cannot load ELF binary image.  The file may be corrupt or incomplete."
-msgstr "لا يمكن تشغيل ملف ELF. الملف قد يكون فاسد أو غير مكتمل."
+msgstr "لا يمكن تشغيل ملف ELF. الملف قد يكون تالف أو غير مكتمل."

 #: pcsx2/Elfheader.cpp:165
 msgid ""
 "If loading from an ISO image, this error may be caused by an unsupported ISO "
 "image type or a bug in PCSX2 ISO image support."
 msgstr ""
-"إذا تم التشغيل من ملف ISO هذا الخطأ, ربما سببه صيغة الملف ISO غير مدعومة أو "
-"خطأ في دعم ملفات الـ ISO."
+"اذا قمت بتشغيل ملف ISO, فربما سبب هذه المشكله أن صيغة ملف الـ ISO هذه غير "
+"مدعومة أو يوجد خطأ في دعم ملفات الـ ISO."

 #: pcsx2/MTGS.cpp:877
 msgid ""
@@ -121,7 +120,7 @@ msgstr "إن عملية MTGS أصبحت لا تستجيب أثناء الإنت
 #: pcsx2/PluginManager.cpp:709
 msgid ""
 "The savestate cannot be loaded, as it appears to be corrupt or incomplete."
-msgstr "لم يتم قراءة حفظ الحالة , على ما يبدو أنها فاسدة أو غير كاملة."
+msgstr "لم يتم قراءة حفظ الحالة, على ما يبدو أنها تالفة أو غير مكتملة."

 #: pcsx2/PluginManager.cpp:720
 #, c-format
@@ -129,7 +128,7 @@ msgid ""
 "%s plugin failed to open.  Your computer may have insufficient resources, or "
 "incompatible hardware/drivers."
 msgstr ""
-"الملحق لم يعمل. ربما كمبوترك موارد غير كافية أو درايف/هاردوير غير متوافق. %s."
+"الملحق %s فشل بالعمل. جهازك لديه موارد غير كافية أو جهاز/تعريف غير متوافق."

 #: pcsx2/PluginManager.cpp:727
 #, c-format
@@ -137,8 +136,8 @@ msgid ""
 "%s plugin failed to initialize.  Your system may have insufficient memory or "
 "resources needed."
 msgstr ""
-"فشل الملحق بالقيام بعملية التهيئة. ربما نظامك ليس لديه ذاكرة كافية أو "
-"الموارد اللازمة. %s."
+"فشل الملحق %s بالقيام بعملية التهيئة. ربما نظامك ليس لديه ذاكرة كافية أو "
+"الموارد اللازمة."

 #: pcsx2/PluginManager.cpp:955
 #, c-format
@@ -148,7 +147,7 @@ msgstr "ملف الملحق %s المضبوط ليس موجودا"
 #: pcsx2/PluginManager.cpp:959
 #, c-format
 msgid "The configured %s plugin file is not a valid dynamic library"
-msgstr "ملف الملحق المضبوط %s ليس مكتبة ديناميكية صالحة"
+msgstr "ملف الملحق %s المضبوط ليس مكتبة ديناميكية صالحة"

 #: pcsx2/PluginManager.cpp:976
 #, c-format
@@ -156,20 +155,21 @@ msgid ""
 "The configured %s plugin is not a PCSX2 plugin, or is for an older "
 "unsupported version of PCSX2."
 msgstr ""
-"الملحق  %s  ليس ملحقا خاصا بـ PCSX2 أو هو لنسخة قديمة غير مدعومة حاليا في "
+"الملحق %s ليس ملحقا خاصا بـ PCSX2 أو قد يكون لنسخة قديمة غير مدعومة حاليا في "
 "هذه النسخة."

 #: pcsx2/PluginManager.cpp:1010
 msgid ""
 "The plugin reports that your hardware or software/drivers are not supported."
-msgstr "وصلنا تقرير من الملحق أن الـ \"سوفتوير\" أو التعاريف غير مدعومة."
+msgstr "وصلنا تقرير من الملحق أن الـجهاز أو التعاريف غير مدعومة."

 #: pcsx2/PluginManager.cpp:1031
 msgid ""
 "Configured plugin is not a PCSX2 plugin, or is for an older unsupported "
 "version of PCSX2."
 msgstr ""
-"الملحق ليس ملحقا خاصا بـ PCSX2 أو هو لنسخة قديمة غير مدعوم في النسخة الحالية."
+"الملحق ليس ملحقا خاصا بـ PCSX2 أو قد يكون لنسخة قديمة غير مدعوم في النسخة "
+"الحالية."

 #: pcsx2/PluginManager.cpp:1056
 #, c-format
@@ -177,12 +177,12 @@ msgid ""
 "Configured %s plugin is not a valid PCSX2 plugin, or is for an older "
 "unsupported version of PCSX2."
 msgstr ""
-"الملحق  %s  ليس ملحقا خاصا بـ PCSX2 أو هو لنسخة قديمة غير مدعومة حاليا في "
+"الملحق %s ليس ملحقا صالح بـ PCSX2 أو قد يكون لنسخة قديمة غير مدعومة حاليا في "
 "هذه النسخة."

 #: pcsx2/PluginManager.cpp:1490
 msgid "Internal Memorycard Plugin failed to initialize."
-msgstr "ملحق كروت الذاكرة الخارجي فشل في التهيئة."
+msgstr "ملحق كرت الذاكرة الداخلي فشل في التهيئة."

 #: pcsx2/PluginManager.cpp:1883
 msgid "Unloaded Plugin"
@@ -191,23 +191,23 @@ msgstr "ملحق لم يتم تشغيله"
 #: pcsx2/Recording/NewRecordingFrame.cpp:24
 #: pcsx2/gui/Debugger/DisassemblyDialog.cpp:227
 msgid "panel"
-msgstr ""
+msgstr "لوحة"

 #: pcsx2/Recording/NewRecordingFrame.cpp:29
 msgid "File Path"
-msgstr ""
+msgstr "مسار الملف"

 #: pcsx2/Recording/NewRecordingFrame.cpp:30
 msgid "Author"
-msgstr ""
+msgstr "المؤلف"

 #: pcsx2/Recording/NewRecordingFrame.cpp:31
 msgid "Record From"
-msgstr ""
+msgstr "تسجيل من"

 #: pcsx2/Recording/NewRecordingFrame.cpp:41
 msgid "Ok"
-msgstr ""
+msgstr "حسنا"

 #: pcsx2/Recording/NewRecordingFrame.cpp:42 pcsx2/gui/AppInit.cpp:742
 msgid "Cancel"
@@ -216,42 +216,41 @@ msgstr "إلغاء"
 #: pcsx2/SaveState.cpp:340
 msgid "Cannot load savestate.  It is of an unknown or unsupported version."
 msgstr ""
-"لا يمكن تشغيل savestate . إنها لنسخة غير معروفة أو غير مدعومة لـ PCSX2."
+"لا يمكن قراءة حفظ الحالة. إنها لنسخة غير معروفة أو غير مدعومة لـ PCSX2."

 #: pcsx2/SourceLog.cpp:96
 msgid "Dumps detailed information for PS2 executables (ELFs)."
-msgstr "يستخرح المعلومات من ملفات ELF."
+msgstr "يستخرح معلومات تفصيلية من ملفات التنفيذية لـ PS2 صيغة (ELF)."

 #: pcsx2/SourceLog.cpp:101
 msgid ""
 "Logs manual protection, split blocks, and other things that might impact "
 "performance."
-msgstr ""
-"يسجل الحماية اليدوية , يفصل الـ blocks و أشياء أخرى يمكن أن تقلل من الأداء."
+msgstr "يسجل الحماية اليدوية, يفصل الـكتل وأشياء أخرى يمكن أن تقلل من الأداء."

 #: pcsx2/SourceLog.cpp:106
 msgid "Shows the game developer's logging text (EE processor)"
-msgstr "يعرض نص السجل الخاص بمصمم اللعبة ( معالج ال EE )"
+msgstr "يعرض نص السجل الخاص بمصمم اللعبة (معالج الـ EE)"

 #: pcsx2/SourceLog.cpp:111
 msgid "Shows the game developer's logging text (IOP processor)"
-msgstr "يعرض نص السجل الخاص بمصمم اللعبة ( معالج ال IOP )"
+msgstr "يعرض نص السجل الخاص بمصمم اللعبة (معالج الـ IOP)"

 #: pcsx2/SourceLog.cpp:116
 msgid "Shows DECI2 debugging logs (EE processor)"
-msgstr "يعرض سجلات إكتشاف الأخطاء"
+msgstr "يعرض سجلات إكتشاف الأخطاء الخاصة بـ DECI2 (معالج الـ EE)"

 #: pcsx2/SourceLog.cpp:121
 msgid "Shows strings printed to the system output stream."
-msgstr ""
+msgstr "يعرض السلاسل المطبوعة على دفق نظام الإخراج."

 #: pcsx2/SourceLog.cpp:127
 msgid "Shows recording related logs and information"
-msgstr ""
+msgstr "يعرض تسجيل السجلات والمعلومات ذات الصلة"

 #: pcsx2/SourceLog.cpp:132
 msgid "Shows detailed controller input values for port 1, every frame"
-msgstr ""
+msgstr "يعرض قيم إدخال وحدة التحكم بالتفصيل للمنفذ رقم 1 لكل إطار"

 #: pcsx2/SourceLog.cpp:168
 msgid "SYSCALL and DECI2 activity."
@@ -523,7 +522,7 @@ msgstr "تفعيل وضع العمليات المحمولة ( يتطلب صلا

 #: pcsx2/gui/AppInit.cpp:268
 msgid "update options to ease profiling (debug)"
-msgstr ""
+msgstr "حدث الخيارات لتسهيل التنميط (debug)"

 #: pcsx2/gui/AppInit.cpp:272
 #, c-format
@@ -674,7 +673,7 @@ msgstr "تنفيذ الجهاز الوهمي لـ PS2..."

 #: pcsx2/gui/AppRes.cpp:46
 msgid "Always ask when booting"
-msgstr ""
+msgstr "اسأل دائمًا عند التشغيل"

 #: pcsx2/gui/AppRes.cpp:46
 msgid ""
@@ -878,19 +877,19 @@ msgstr "%s حول البرنامج"

 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:54
 msgid "Website"
-msgstr ""
+msgstr "موقع الكتروني"

 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:56
 msgid "Support Forums"
-msgstr ""
+msgstr "منتديات الدعم"

 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:58
 msgid "GitHub Repository"
-msgstr ""
+msgstr "مستودع GitHub"

 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:60
 msgid "License"
-msgstr ""
+msgstr "رخصة"

 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:62
 msgid "PlayStation 2 Emulator:"
@@ -899,7 +898,7 @@ msgstr "محاكي الـ Playstation 2:"
 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:64
 msgid ""
 "Big thanks to everyone who contributed to the project throughout the years."
-msgstr ""
+msgstr "شكر كبير لكل من ساهم في المشروع على مر السنين."

 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:66
 msgid "Close"
@@ -945,12 +944,12 @@ msgstr "تجاهل"
 #: pcsx2/gui/Dialogs/ConfirmationDialogs.cpp:267
 #: pcsx2/gui/Dialogs/ConfirmationDialogs.cpp:276
 msgid "Retry"
-msgstr ""
+msgstr "أعد المحاولة"

 #: pcsx2/gui/Dialogs/ConfirmationDialogs.cpp:270
 #: pcsx2/gui/Dialogs/ConfirmationDialogs.cpp:273
 msgid "Abort"
-msgstr ""
+msgstr "إحباط"

 #: pcsx2/gui/Dialogs/ConfirmationDialogs.cpp:280
 msgid "Reset"
@@ -958,39 +957,39 @@ msgstr "إعادة تشغيل"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:36
 msgid "Convert a memory card to a different format"
-msgstr ""
+msgstr "تحويل كرت الذاكرة إلى صيغة مختلفة"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:47
 msgid "Convert"
-msgstr ""
+msgstr "تحويل"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:53
 msgid "Convert: "
-msgstr ""
+msgstr "تحويل: "

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:56
 msgid "To: "
-msgstr ""
+msgstr "الى: "

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:87
 msgid "8MB File"
-msgstr ""
+msgstr "ملف 8 ميجا بايت"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:89
 msgid "16MB File"
-msgstr ""
+msgstr "ملف 16 ميجا بايت"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:91
 msgid "32MB File"
-msgstr ""
+msgstr "ملف 32 ميجا بايت"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:93
 msgid "64MB File"
-msgstr ""
+msgstr "ملف 64 ميجا بايت"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:95
 msgid "Convert this memory card to a folder of individual saves."
-msgstr ""
+msgstr "تحويل كرت الذاكرة هذه إلى مجلد حفظ فردي."

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:95
 msgid "Folder"
@@ -1011,11 +1010,11 @@ msgstr "إنشاء كرت ذاكرة"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:153
 msgid "This target type is not supported!"
-msgstr ""
+msgstr "نوع الهدف هذا غير متوافق !"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:159
 msgid "Memory Card conversion failed for unknown reasons."
-msgstr ""
+msgstr "فشل تحويل كرت الذاكرة لأسباب غير معروفة."

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:41
 msgid "Create a new memory card"
@@ -1115,7 +1114,7 @@ msgstr ""

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:255
 msgid "Folder [experimental]"
-msgstr ""
+msgstr "مجلد [تجريبي]"

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:255
 msgid "Store memory card contents in the host filesystem instead of a file."
@@ -1131,7 +1130,7 @@ msgstr ""

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:259
 msgid "128 KiB (PSX)"
-msgstr ""
+msgstr "128 كيلوبايت (PSX)"

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:259
 msgid ""
@@ -1145,7 +1144,7 @@ msgstr ""
 msgid ""
 "This memory card is required by PSX games. It is not compatible with PS2 "
 "games."
-msgstr ""
+msgstr "كرت الذاكرة هذه مطلوبة من قبل ألعاب PSX. وهو غير متوافق مع ألعاب PS2."

 #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:48
 #, c-format
@@ -1302,7 +1301,7 @@ msgstr "تسجل الأحداث كلما مرّت في ال PS2 الوهميّة

 #: pcsx2/gui/GlobalCommands.cpp:316
 msgid "Exit PCSX2?"
-msgstr ""
+msgstr "هل تريد الخروج من PCSX2؟"

 #: pcsx2/gui/GlobalCommands.cpp:622
 msgid "Save state"
@@ -1471,7 +1470,7 @@ msgstr ""

 #: pcsx2/gui/MainFrame.cpp:473
 msgid "Enable &Recording Tools"
-msgstr ""
+msgstr "تمكين أدوات التسجيل"

 #: pcsx2/gui/MainFrame.cpp:478
 msgid "Enable &Host Filesystem"
@@ -1597,7 +1596,7 @@ msgstr ""

 #: pcsx2/gui/MainFrame.cpp:556
 msgid "Creates a block dump for debugging purposes."
-msgstr ""
+msgstr "ينشئ كتلة تفريغ لأغراض التصحيح (debug)."

 #: pcsx2/gui/MainFrame.cpp:560
 msgid "Video"
@@ -1605,11 +1604,11 @@ msgstr "الفيديو ( GS )"

 #: pcsx2/gui/MainFrame.cpp:561
 msgid "Start Recording"
-msgstr ""
+msgstr "ابدأ التسجيل"

 #: pcsx2/gui/MainFrame.cpp:562
 msgid "Stop Recording"
-msgstr ""
+msgstr "أوقف التسجيل"

 #: pcsx2/gui/MainFrame.cpp:564
 msgid "Screenshot"
@@ -1617,23 +1616,23 @@ msgstr "اللقطات"

 #: pcsx2/gui/MainFrame.cpp:569
 msgid "New"
-msgstr ""
+msgstr "جديد"

 #: pcsx2/gui/MainFrame.cpp:570
 msgid "Stop"
-msgstr ""
+msgstr "توقف"

 #: pcsx2/gui/MainFrame.cpp:571
 msgid "Play"
-msgstr ""
+msgstr "تشغيل"

 #: pcsx2/gui/MainFrame.cpp:573
 msgid "Virtual Pad (Port 1)"
-msgstr ""
+msgstr "لوحة افتراضية (منفذ 1)"

 #: pcsx2/gui/MainFrame.cpp:574
 msgid "Virtual Pad (Port 2)"
-msgstr ""
+msgstr "لوحة افتراضية (منفذ 2)"

 #: pcsx2/gui/MainFrame.cpp:649
 msgid "Paus&e"
@@ -1689,7 +1688,7 @@ msgstr "تشغيل الـ PS2 مستخدما الـ DVD المحدد أو ملف

 #: pcsx2/gui/MainFrame.cpp:721
 msgid "Boo&t BIOS"
-msgstr ""
+msgstr "تشغيل الـ BIOS"

 #: pcsx2/gui/MainFrame.cpp:722
 msgid "Boot the VM without any source media"
@@ -1811,7 +1810,7 @@ msgstr ""

 #: pcsx2/gui/MainMenuClicks.cpp:419
 msgid "Confirm clearing ISO list"
-msgstr ""
+msgstr "أكد مسح قائمة الـ ISO"

 #: pcsx2/gui/MainMenuClicks.cpp:420
 msgid ""
@@ -2312,6 +2311,10 @@ msgid ""
 "Note: Only available when a memory card is formatted. Not available for PSX "
 "memory cards."
 msgstr ""
+"حول كرت الذاكرة هذا الى او من مجلد كرت ذاكرة. يقوم بإنشاء نسخة من كرت "
+"الذاكرة الحالي من النوع الجديد.\n"
+"\n"
+"ملاحظة: متوفر فقط عند تهيئة كرت الذاكرة. غير متاح لكروت ذاكرة الـ PSX."

 #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:493
 msgid "Delete"
@@ -2462,7 +2465,7 @@ msgstr "تم تهيئته ( مفرمت )"

 #: pcsx2/gui/Panels/MemoryCardListView.cpp:104
 msgid "Type"
-msgstr ""
+msgstr "نوع"

 #: pcsx2/gui/Panels/MemoryCardListView.cpp:105
 msgid "Last Modified"
@@ -2535,10 +2538,9 @@ msgstr "إجعل هذه اللغة الإفتراضية ( الأساسية ) ح

 #: pcsx2/gui/Panels/PathsPanel.cpp:38
 msgid "Cheats:"
-msgstr ""
+msgstr "خدع: "

 #: pcsx2/gui/Panels/PathsPanel.cpp:39
-#, fuzzy
 msgid "Select folder for Cheats"
 msgstr "إختر ملفا لـ \"حفظ الحالة\""

@@ -2788,27 +2790,27 @@ msgstr "المحد من الفرامات"

 #: pcsx2/gui/RecentIsoList.cpp:139
 msgid "Clear ISO list"
-msgstr ""
+msgstr "امسح قائمة الـ ISO"

 #: pcsx2/gui/Saveslots.h:96
 #, c-format
 msgid "Slot %d - Empty"
-msgstr "فارغ %d - Empty"
+msgstr "فتحة %d - فارغة"

 #: pcsx2/gui/Saveslots.h:98
 #, c-format
 msgid "Slot %d - %s %s"
-msgstr "فراع %d - %s %s"
+msgstr "فتحة %d - %s %s"

 #: pcsx2/gui/Saveslots.h:100
 #, c-format
 msgid "Slot %d - Unknown Time"
-msgstr ""
+msgstr "فتحة %d - وقت غير معروف"

 #: pcsx2/gui/Saveslots.h:113
 #, c-format
 msgid "Write time is %s %s."
-msgstr ""
+msgstr "وقت الكتابة هو %s %s."

 #: pcsx2/gui/SysState.cpp:291 pcsx2/gui/SysState.cpp:298
 msgid "Cannot load this savestate. The state is an unsupported version."
--- a/locales/fr_FR/pcsx2_Iconized.po
+++ b/locales/fr_FR/pcsx2_Iconized.po
@@ -6,8 +6,8 @@ msgstr ""
 "Project-Id-Version: PCSX2 1.6.0\n"
 "Report-Msgid-Bugs-To: https://github.com/PCSX2/pcsx2/issues\n"
 "POT-Creation-Date: 2020-02-10 17:29+0000\n"
-"PO-Revision-Date: 2020-02-16 18:44+0100\n"
-"Last-Translator: CaptainTearow\n"
+"PO-Revision-Date: 2020-04-26 17:08+0200\n"
+"Last-Translator: LaneSh4d0w\n"
 "Language-Team: Atomic83;goldeng;piorrro33 <odakawoi@yahoo.fr;"
 "piorrro33@outlook.com>\n"
 "Language: fr_FR\n"
@@ -30,12 +30,11 @@ msgstr ""
 "été réservé par d'autres processus, services ou DLL."

 #: pcsx2/CDVD/CDVD.cpp:2058
-#, fuzzy
 msgid ""
 "Failed to read/write NVM/MEC file. Check your BIOS setup/permission settings."
 msgstr ""
-"Echec de l'écriture/lecture du fichier NMV/MEC Vérifiez vos paramètres/"
-"permissions dans votre bios."
+"Echec d'écriture/lecture du fichier NVM/MEC. Vérifiez vos paramètres/"
+"permissions dans votre BIOS."

 #: pcsx2/System.cpp:112
 msgid ""
@@ -84,8 +83,8 @@ msgid ""
 "obtain a BIOS from an actual PS2 unit that you own (borrowing doesn't "
 "count).  Please consult the FAQs and Guides for further instructions."
 msgstr ""
-"PCSX2 nécessite un BIOS PS2 valide. D'un point de vue légal, vous devez "
-"obtenir votre BIOS \n"
+"PCSX2 nécessite un BIOS PS2 valide pour pouvoir fonctionner. D'un point de "
+"vue légal, vous devez obtenir le BIOS \n"
 "à partir de votre PROPRE console (emprunter une console ne satisfait pas ces "
 "exigences).\n"
 "Veuillez consulter la FAQ ou les guides disponibles pour plus de "
@@ -97,9 +96,9 @@ msgid ""
 "'Cancel' to attempt to cancel the thread.\n"
 "'Terminate' to quit PCSX2 immediately.\n"
 msgstr ""
-"Cliquez sur Ignorer pour attendre jusqu'à ce que le processus réponde.\n"
-"Cliquez sur Annuler pour mettre fin au processus.\n"
-"Cliquez sur Terminer pour fermer immédiatement PCSX2.\n"
+"Cliquez sur 'Ignorer' pour attendre jusqu'à ce que le processus réponde.\n"
+"Cliquez sur 'Annuler' pour mettre fin au processus.\n"
+"Cliquez sur 'Terminer' pour fermer immédiatement PCSX2.\n"

 #: pcsx2/gui/AppUserMode.cpp:54
 msgid ""
@@ -122,8 +121,8 @@ msgid ""
 "Please note that the resulting file may not actually contain all saves, "
 "depending on how many are in the source memory card."
 msgstr ""
-"Le fichier de sortie pourrait ne pas contenir toutes les sauvegardes, "
-"suivant le nombre qu'il y avait dans la carte mémoire source."
+"Veuillez savoir que le fichier de sortie pourrait ne pas contenir toutes les "
+"sauvegardes, suivant le nombre contenu dans la carte mémoire source."

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:68
 msgid ""
@@ -155,8 +154,9 @@ msgid ""
 "NTFS compression can be changed manually at any time by using file "
 "properties from Windows Explorer."
 msgstr ""
-"La compression NTFS peut être modifiée manuellement depuis l'explorateur "
-"Windows (clic droit sur le fichier, puis \"Propriétés\")."
+"La compression NTFS peut être modifiée manuellement à n'importe quel moment\n"
+"depuis l'explorateur Windows (clic droit sur le fichier, puis \"Propriétés"
+"\")."

 #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:50
 msgid ""
@@ -209,7 +209,7 @@ msgid ""
 "\n"
 "(or press Cancel to select a different settings folder)"
 msgstr ""
-"Des paramètres existants %s ont été trouvés dans le dossier de "
+"Des paramètres existants de %s ont été trouvés dans le dossier de "
 "configuration. Voulez-vous importer ces données ou les remplacer avec les "
 "valeurs par défaut de %s ?\n"
 "\n"
@@ -221,8 +221,9 @@ msgid ""
 "NTFS compression is built-in, fast, and completely reliable; and typically "
 "compresses memory cards very well (this option is highly recommended)."
 msgstr ""
-"La compression NTFS est sûre et rapide : c'est le format le plus adapté pour "
-"les cartes mémoires !"
+"La compression NTFS est intégrée, rapide et entièrement fiable; et compresse "
+"généralement les cartes mémoire très bien (cette option est fortement "
+"recommandée)."

 #: pcsx2/gui/Dialogs/McdConfigDialog.cpp:39
 msgid ""
@@ -230,10 +231,10 @@ msgid ""
 "after loading from savestates.  May not be compatible with all games (Guitar "
 "Hero)."
 msgstr ""
-"Permet d'éviter d'endommager la carte mémoire (fichiers corrompus) en "
-"obligeant les jeux à ré-indexer le contenu présent sur la carte.\n"
+"Permet d'éviter de corrompre la carte mémoire en obligeant les jeux à "
+"réindexer le contenu présent sur la carte.\n"
 "Cette option peut être incompatible avec certains jeux (Guitar Hero, par "
-"exemple) !"
+"exemple)."

 #: pcsx2/gui/Dialogs/McdConfigDialog.cpp:45
 msgid ""
@@ -374,6 +375,13 @@ msgid ""
 "16:9: Temporarily switch to a 16:9 aspect ratio while an FMV plays to "
 "correctly display a widescreen 16:9 FMV."
 msgstr ""
+"Off: Désactive temporairement le changement du ratio de l'image.\n"
+"\n"
+"4/3 : Change temporairement le ratio de l'image en 4/3 pendant qu'une "
+"cinématique en 4:3 est joué.\n"
+"\n"
+"16:9 : Change temporairement le ratio de l'image en 16/9 pendant qu'une "
+"cinématique en 16:9 est joué."

 #: pcsx2/gui/Panels/GSWindowPanel.cpp:75
 msgid ""
@@ -407,7 +415,7 @@ msgstr ""
 "lors de mouvements horizontaux, mais occasionne également des pertes en "
 "termes de performances. Il vaut mieux ne l'utiliser qu'en mode plein-écran.\n"
 "\n"
-"Attention : Certains plugins vidéo ne fonctionnent pas avec cette option !"
+"Attention, certains plugins vidéo ne fonctionnent pas avec cette option."

 #: pcsx2/gui/Panels/GSWindowPanel.cpp:81
 msgid ""
@@ -484,7 +492,6 @@ msgstr ""
 "* Transformers"

 #: pcsx2/gui/Panels/GameFixesPanel.cpp:124
-#, fuzzy
 msgid ""
 "It's better to enable 'Automatic game fixes' at the main menu instead, and "
 "leave this page empty ('Automatic' means: selectively use specific tested "
@@ -492,8 +499,9 @@ msgid ""
 "performance. In fact they may decrease it."
 msgstr ""
 "Il est préférable d'utiliser l'option \"Patchs automatiques\" disponible "
-"dans le menu \"Système\" de l'émulateur plutôt que d'utiliser cette page. "
-"Ces patchs n'augmenteront PAS vos FPS, peut-être même le contraire.\n"
+"dans le menu \"Système\" de l'émulateur plutôt que d'utiliser cette page.\n"
+"Ces patchs n'augmenteront PAS la performance dans le jeu, il se peut que ce "
+"soit même le contraire.\n"
 "(\"Patchs automatiques\" : utilise uniquement le patch associé au jeu émulé)"

 #: pcsx2/gui/Panels/GameFixesPanel.cpp:128
@@ -558,7 +566,7 @@ msgstr ""

 #: pcsx2/gui/Panels/PathsPanel.cpp:40
 msgid "This folder is where PCSX2 loads cheats from."
-msgstr "PCSX2 charge les triches depuis ce dossier."
+msgstr "PCSX2 charge les codes de triches depuis ce dossier."

 #: pcsx2/gui/Panels/PathsPanel.cpp:48
 msgid ""
@@ -622,6 +630,10 @@ msgid ""
 "50% cyclerate. Significant reduction of CPU requirements. Speedup for very "
 "lightweight games, slows down others. FMVs and audio may stutter or skip."
 msgstr ""
+"50% cyclerate. Réduction significative des exigences liées au CPU. "
+"Amélioration des performances sur des jeux non gourmands, ralentit les autres. "
+"Les cinématiques et les fichiers audios peuvent saccader voire même ne pas "
+"se jouer."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:35
 #, c-format
@@ -629,6 +641,10 @@ msgid ""
 "60% cyclerate. Moderate reduction of CPU requirements. Speedup for "
 "lightweight games, slows down others. FMVs and audio may stutter or skip."
 msgstr ""
+"60% cyclerate. Réduction modérée des exigences liées au CPU. Amélioration "
+"des performances sur des jeux peu gourmands, ralentit les autres. " 
+"Les cinématiques et les fichiers audios peuvent saccader voire même " 
+"ne pas se jouer."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:41
 #, c-format
@@ -636,11 +652,15 @@ msgid ""
 "75% cyclerate. Slight reduction of CPU requirements. Speedup for less "
 "demanding games, slows down others."
 msgstr ""
+"75% cyclerate. Petite réduction des exigences liées au CPU. Amélioration des "
+"performances sur des jeux moins demandeurs, ralentit les autres."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:47
 msgid ""
 "Default cyclerate. Runs the emulated PS2 Emotion Engine at normal speed."
 msgstr ""
+"Nombre de cycles par défaut. Fait tourner le PS2 Emotion Engine à vitesse "
+"normale."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:53
 #, c-format
@@ -648,6 +668,8 @@ msgid ""
 "130% cyclerate. Moderate increase of CPU requirements. Variable framerate "
 "games may have higher internal framerates."
 msgstr ""
+"130% cyclerate. Augmentation modérée des exigences liées au CPU. Les jeux "
+"ayant un nombre d'images variable peuvent bénéficier d'une augmentation."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:59
 #, c-format
@@ -656,6 +678,9 @@ msgid ""
 "games will have higher internal framerates. FMVs may be slow. May cause "
 "stability problems."
 msgstr ""
+"180% cyclerate. Augmentation significative des exigences liées au CPU. Les "
+"jeux ayant un nombre d'images variable bénéficieront d'une augmentation. Les "
+"cinématiques peuvent être lentes. Peut causer des problèmes de stabilités."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:64
 #, c-format
@@ -664,30 +689,41 @@ msgid ""
 "games will have higher internal framerates. FMVs may be slow. May cause "
 "stability problems."
 msgstr ""
+"300% cyclerate. Augmentation extrême des exigences liées au CPU. Les jeux "
+"ayant un nombre d'images par secondes variable bénéficieront d'une "
+"augmentation. Les cinématiques peuvent être lents. Peut causer des "
+"problèmes de stabilité."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:81
-#, fuzzy
 msgid "Disables EE Cycle Skipping. Most compatible setting."
-msgstr ""
-"0 - Désactive le VU Cycle Stealing : compatibilité maximale, évidemment !"
+msgstr "Désactive l'EE Cycle Skipping. Paramètre le plus compatible."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:87
 msgid ""
 "Mild EE Cycle Skipping. Mild slow down for most games, but may help some "
 "games with mild VU starvation problems run at full speed."
 msgstr ""
+"EE Cycle Skipping léger. Léger ralentissement sur la plupart des jeux, "
+"mais peut permettre à des jeux ayant des légers problèmes de VU de "
+"pouvoir être joués à leur vitesse maximale."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:93
 msgid ""
 "Moderate EE Cycle Skipping. Slow down for most games, but may help some "
 "games with moderate VU starvation problems run at full speed."
 msgstr ""
+"EE Cycle Skipping modéré. Ralentissement sur la plupart des jeux, "
+"mais peut permettre à des jeux ayant des problèmes de VU de "
+"pouvoir être joués à leur vitesse maximale."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:98
 msgid ""
 "Maximum EE Cycle Skipping. Mostly harmful. May help games with significant "
 "VU starvation problems run at full speed."
 msgstr ""
+"EE Cycle Skipping maximal. Plutôt mauvais pour l'émulation. Peut permettre "
+"à des jeux ayant des problèmes de VU très importants de pouvoir "
+"être joués à leur vitesse maximale."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:123
 msgid ""
@@ -763,7 +799,6 @@ msgid ""
 msgstr "Vise surtout l'EE idle loop à l'adresse 0x81FC0 du kernel."

 #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:206
-#, fuzzy
 msgid ""
 "Check HDLoader compatibility lists for known games that have issues with "
 "this (often marked as needing 'mode 1' or 'slow DVD')."
--- a/locales/fr_FR/pcsx2_Main.po
+++ b/locales/fr_FR/pcsx2_Main.po
@@ -6,8 +6,8 @@ msgstr ""
 "Project-Id-Version: PCSX2 1.6.0\n"
 "Report-Msgid-Bugs-To: https://github.com/PCSX2/pcsx2/issues\n"
 "POT-Creation-Date: 2020-02-10 17:29+0000\n"
-"PO-Revision-Date: 2020-02-16 18:44+0100\n"
-"Last-Translator: CaptainTearow\n"
+"PO-Revision-Date: 2020-04-26 17:09+0200\n"
+"Last-Translator: LaneSh4d0w\n"
 "Language-Team: Atomic83;goldeng;piorrro33 <odakawoi@yahoo.fr;"
 "piorrro33@outlook.com>\n"
 "Language: fr\n"
@@ -27,7 +27,7 @@ msgstr "Erreur critique."

 #: common/include/Utilities/Exceptions.h:255
 msgid "Parse error"
-msgstr "erreur d'analyse"
+msgstr "Erreur d'analyse"

 #: common/include/Utilities/Exceptions.h:279
 msgid "Your machine's hardware is incapable of running PCSX2.  Sorry dood."
@@ -51,7 +51,7 @@ msgstr ""

 #: common/src/Utilities/Exceptions.cpp:290
 msgid "Path: "
-msgstr "Chemin d'accès :"
+msgstr "Chemin d'accès : "

 #: common/src/Utilities/Exceptions.cpp:294
 msgid "[Unnamed or unknown]"
@@ -97,7 +97,7 @@ msgstr "Inclut certains événements d'usage peu commun."

 #: pcsx2/CDVD/InputIsoFile.cpp:248
 msgid "Unrecognized ISO image file format"
-msgstr "Format du fichier ISO non reconnu."
+msgstr "Format du fichier ISO non reconnu"

 #: pcsx2/Elfheader.cpp:163
 msgid "Cannot load ELF binary image.  The file may be corrupt or incomplete."
@@ -207,19 +207,19 @@ msgstr "panneau"

 #: pcsx2/Recording/NewRecordingFrame.cpp:29
 msgid "File Path"
-msgstr ""
+msgstr "Chemin du fichier"

 #: pcsx2/Recording/NewRecordingFrame.cpp:30
 msgid "Author"
-msgstr ""
+msgstr "Auteur"

 #: pcsx2/Recording/NewRecordingFrame.cpp:31
 msgid "Record From"
-msgstr ""
+msgstr "Enregistrer depuis"

 #: pcsx2/Recording/NewRecordingFrame.cpp:41
 msgid "Ok"
-msgstr ""
+msgstr "Ok"

 #: pcsx2/Recording/NewRecordingFrame.cpp:42 pcsx2/gui/AppInit.cpp:742
 msgid "Cancel"
@@ -500,7 +500,7 @@ msgstr "désactive l'affichage du GUI lorsqu'un jeu est lancé"

 #: pcsx2/gui/AppInit.cpp:251
 msgid "when nogui - prompt before exiting on suspend"
-msgstr "Quand nogui est activé - demander avant de quitter si en pause"
+msgstr "quand nogui est activé - demander avant de quitter si en pause"

 #: pcsx2/gui/AppInit.cpp:253
 msgid "executes an ELF image"
@@ -588,7 +588,7 @@ msgstr ""

 #: pcsx2/gui/AppInit.cpp:557
 msgid "PCSX2 Error: Hardware Deficiency"
-msgstr "Erreur PCSX2 : Hardware."
+msgstr "Erreur PCSX2 : Déficience matérielle"

 #: pcsx2/gui/AppInit.cpp:557 pcsx2/gui/AppInit.cpp:569
 #, c-format
@@ -598,7 +598,7 @@ msgstr "Cliquez sur OK pour fermer %s."
 #: pcsx2/gui/AppInit.cpp:570
 #, c-format
 msgid "%s Critical Error"
-msgstr "Erreur critique de %s !"
+msgstr "Erreur critique de %s"

 #: pcsx2/gui/AppInit.cpp:740
 msgid "OK"
@@ -662,7 +662,7 @@ msgstr "&Accueil"

 #: pcsx2/gui/AppInit.cpp:757
 msgid "Show about dialog"
-msgstr "Ouvre une boîte de dialogue (qui vaut le coup)."
+msgstr "Ouvre une boîte de dialogue (qui vaut le coup)"

 #: pcsx2/gui/AppMain.cpp:79
 msgid ""
@@ -722,9 +722,8 @@ msgid ""
 msgstr ""

 #: pcsx2/gui/AppRes.cpp:48
-#, fuzzy
 msgid "Browse for an ISO that is not in your recent history."
-msgstr "Trouve un ISO qui n'apparaît pas dans l'historique récent."
+msgstr "Trouver un ISO qui n'apparaît pas dans l'historique récent."

 #: pcsx2/gui/AppRes.cpp:48
 msgid "Browse..."
@@ -759,7 +758,7 @@ msgstr "Utiliser le mode User Documents"
 #: pcsx2/gui/AppUserMode.cpp:171
 #, c-format
 msgid "%s is switching to local install mode."
-msgstr "%s utilise à présent le mode d'installation local"
+msgstr "%s utilise à présent le mode d'installation local."

 #: pcsx2/gui/AppUserMode.cpp:172
 msgid ""
@@ -827,7 +826,9 @@ msgstr "Thème \"Dark\""
 msgid ""
 "Classic black color scheme for people who enjoy having text seared into "
 "their optic nerves."
-msgstr "Thème \"Classic black\""
+msgstr ""
+"Thème \"Classic Black\" pour les personnes qui aiment avoir le texte gravé "
+"dans leurs nerfs optiques."

 #: pcsx2/gui/ConsoleLogger.cpp:435
 msgid "&Save..."
@@ -918,7 +919,7 @@ msgstr "&Sources"
 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:36
 #, c-format
 msgid "About %s"
-msgstr "En savoir plus sur %s !"
+msgstr "En savoir plus sur %s"

 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:54
 msgid "Website"
@@ -953,7 +954,7 @@ msgstr "&Fermer"

 #: pcsx2/gui/Dialogs/AssertionDialog.cpp:24
 msgid "Assertion Failure - "
-msgstr "Assertion Failure -"
+msgstr "Assertion Failure - "

 #: pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp:185
 msgid "Saves a snapshot of this settings panel to a PNG file."
@@ -1010,11 +1011,11 @@ msgstr "Convertir"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:53
 msgid "Convert: "
-msgstr "Convertir:"
+msgstr "Convertir: "

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:56
 msgid "To: "
-msgstr "En :"
+msgstr "En: "

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:87
 msgid "8MB File"
@@ -1034,7 +1035,8 @@ msgstr "Fichier de 64 Mo"

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:95
 msgid "Convert this memory card to a folder of individual saves."
-msgstr "Convertir cette carte mémoire en un dossier "
+msgstr ""
+"Convertir cette carte mémoire en un dossier de sauvegardes individuelles."

 #: pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp:95
 msgid "Folder"
@@ -1077,11 +1079,11 @@ msgstr "Nouvelle carte mémoire :"

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:73
 msgid "At folder:    "
-msgstr "Dans le dossier :"
+msgstr "Dans le dossier :    "

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:76
 msgid "Select file name: "
-msgstr "Nom du fichier :"
+msgstr "Nom du fichier : "

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:180
 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:192
@@ -1298,11 +1300,11 @@ msgstr "%s est lancé depuis un nouveau dossier et nécessite d'être configuré

 #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:36
 msgid "Config Overrides Warning"
-msgstr "Attention ! Configuration écrasée !"
+msgstr "Attention ! Configuration écrasée"

 #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:53
 msgid "Components Overrides Warning"
-msgstr "Attention ! Composants remplacés !"
+msgstr "Attention ! Composants remplacés"

 #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:135
 msgid "Preset:"
@@ -1390,7 +1392,7 @@ msgstr ""

 #: pcsx2/gui/GlobalCommands.cpp:636
 msgid "Load State Backup"
-msgstr "Charger le backup."
+msgstr "Charger le backup"

 #: pcsx2/gui/GlobalCommands.cpp:637
 msgid "Loads virtual machine state backup for current slot."
@@ -1414,7 +1416,7 @@ msgstr "On passe au slot précédent !"

 #: pcsx2/gui/IsoDropTarget.cpp:55
 msgid "Drag and Drop Error"
-msgstr "Erreur du glisser-déposer !"
+msgstr "Erreur du glisser-déposer"

 #: pcsx2/gui/IsoDropTarget.cpp:56
 #, c-format
@@ -1503,7 +1505,7 @@ msgstr "Démarrage du ELF..."

 #: pcsx2/gui/MainFrame.cpp:446
 msgid "For running raw PS2 binaries directly"
-msgstr "Pour lancer directement des fichiers exécutables binaires."
+msgstr "Pour lancer directement des fichiers PS2"

 #: pcsx2/gui/MainFrame.cpp:455
 msgid "&Load state"
@@ -1523,7 +1525,7 @@ msgstr "Patchs automatiques"

 #: pcsx2/gui/MainFrame.cpp:464
 msgid "Automatically applies needed Gamefixes to known problematic games"
-msgstr "Applique automatiquement les patchs associés à certains jeux."
+msgstr "Applique automatiquement les patchs associés à certains jeux"

 #: pcsx2/gui/MainFrame.cpp:466
 msgid "Enable &Cheats"
@@ -1560,7 +1562,7 @@ msgstr "Quitter"
 #: pcsx2/gui/MainFrame.cpp:488
 #, c-format
 msgid "Closing %s may be hazardous to your health"
-msgstr "Fermer %s est dangereux pour la santé !"
+msgstr "Fermer %s est dangereux pour la santé"

 #: pcsx2/gui/MainFrame.cpp:495
 #, fuzzy
@@ -1737,7 +1739,7 @@ msgstr ""

 #: pcsx2/gui/MainFrame.cpp:682
 msgid "Use fast boot to skip PS2 startup and splash screens"
-msgstr "Démarre le système en sautant les logos PS2/Sony."
+msgstr "Démarre le système en sautant les logos PS2/Sony"

 #: pcsx2/gui/MainFrame.cpp:687
 #, fuzzy
@@ -2403,7 +2405,7 @@ msgstr "Convertir ..."

 #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:404
 msgid "Card: "
-msgstr "Carte :"
+msgstr "Carte : "

 #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:462
 #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:500
@@ -2639,7 +2641,7 @@ msgstr "User Documents (recommandé)"

 #: pcsx2/gui/Panels/MiscPanelStuff.cpp:46
 msgid "Location: "
-msgstr "Emplacement :"
+msgstr "Emplacement : "

 #: pcsx2/gui/Panels/MiscPanelStuff.cpp:50
 msgid "Custom folder:"
@@ -2722,7 +2724,7 @@ msgstr "Choisir le dossier où se trouvent les plugins PCSX2"

 #: pcsx2/gui/Panels/PluginSelectorPanel.cpp:365
 msgid "Configure..."
-msgstr "Configurer"
+msgstr "Configurer…"

 #: pcsx2/gui/Panels/PluginSelectorPanel.cpp:374
 msgid "Click the Browse button to select a different folder for PCSX2 plugins."
--- a/locales/ja_JP/pcsx2_Main.po
+++ b/locales/ja_JP/pcsx2_Main.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PCSX2 1.6.0\n"
 "Report-Msgid-Bugs-To: https://github.com/PCSX2/pcsx2/issues\n"
 "POT-Creation-Date: 2020-02-10 17:29+0000\n"
-"PO-Revision-Date: 2020-02-11 21:17+0900\n"
+"PO-Revision-Date: 2020-05-01 13:25+0900\n"
 "Last-Translator: Chromaryu <knight.ryu12@gmail.com>\n"
 "Language-Team: DeltaHF Chromaryu\n"
 "Language: ja_JP\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Poedit-KeywordsList: ;_;pxL;_d;pxDt;_t;pxLt\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: ../..\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-SearchPath-0: pcsx2\n"
 "X-Poedit-SearchPath-1: common\n"

@@ -747,7 +747,7 @@ msgstr "ログのセーブ"

 #: pcsx2/gui/ConsoleLogger.cpp:417
 msgid "&Small"
-msgstr "小"
+msgstr "小(&S)"

 #: pcsx2/gui/ConsoleLogger.cpp:417
 msgid "Fits a lot of log in a microcosmically small area."
@@ -755,7 +755,7 @@ msgstr "沢山のログを蚤より果てしなく小さなエリアに収めら

 #: pcsx2/gui/ConsoleLogger.cpp:419
 msgid "&Normal font"
-msgstr "中"
+msgstr "中(&N)"

 #: pcsx2/gui/ConsoleLogger.cpp:419
 msgid "It's what I use (the programmer guy)."
@@ -763,7 +763,7 @@ msgstr "私が使ってる奴だ（byプログラマの人）。"

 #: pcsx2/gui/ConsoleLogger.cpp:421
 msgid "&Large"
-msgstr "大"
+msgstr "大(&L)"

 #: pcsx2/gui/ConsoleLogger.cpp:421
 msgid "Its nice and readable."
@@ -771,7 +771,7 @@ msgstr "きれいで読みやすい。"

 #: pcsx2/gui/ConsoleLogger.cpp:423
 msgid "&Huge"
-msgstr "特大"
+msgstr "特大(&H)"

 #: pcsx2/gui/ConsoleLogger.cpp:423
 msgid "In case you have a really high res display."
@@ -779,7 +779,7 @@ msgstr "超高解像度ディスプレイを持っている人用。"

 #: pcsx2/gui/ConsoleLogger.cpp:427
 msgid "&Light theme"
-msgstr "ライトテーマ"
+msgstr "ライトテーマ(&L)"

 #: pcsx2/gui/ConsoleLogger.cpp:427
 msgid "Default soft-tone color scheme."
@@ -787,7 +787,7 @@ msgstr "デフォルトのソフトトーンカラースキーム。"

 #: pcsx2/gui/ConsoleLogger.cpp:428
 msgid "&Dark theme"
-msgstr "ダークテーマ"
+msgstr "ダークテーマ(&D)"

 #: pcsx2/gui/ConsoleLogger.cpp:428
 msgid ""
@@ -799,7 +799,7 @@ msgstr ""

 #: pcsx2/gui/ConsoleLogger.cpp:435
 msgid "&Save..."
-msgstr "保存..."
+msgstr "保存...(&S)"

 #: pcsx2/gui/ConsoleLogger.cpp:435
 msgid "Save log contents to file"
@@ -807,7 +807,7 @@ msgstr "ログ内容をファイルに保存"

 #: pcsx2/gui/ConsoleLogger.cpp:436
 msgid "C&lear"
-msgstr "クリア"
+msgstr "クリア(&l)"

 #: pcsx2/gui/ConsoleLogger.cpp:436
 msgid "Clear the log window contents"
@@ -815,7 +815,7 @@ msgstr "ログウィンドウの内容をクリア"

 #: pcsx2/gui/ConsoleLogger.cpp:438
 msgid "Auto&dock"
-msgstr "オートドック"
+msgstr "オートドック(&d)"

 #: pcsx2/gui/ConsoleLogger.cpp:438
 msgid "Dock log window to main PCSX2 window"
@@ -823,11 +823,11 @@ msgstr "PCSX2のウインドウにログウィンドウをドック"

 #: pcsx2/gui/ConsoleLogger.cpp:439
 msgid "&Appearance"
-msgstr "外観テーマ"
+msgstr "外観テーマ(&A)"

 #: pcsx2/gui/ConsoleLogger.cpp:441
 msgid "&Close"
-msgstr "閉じる"
+msgstr "閉じる(&C)"

 #: pcsx2/gui/ConsoleLogger.cpp:441
 msgid "Close this log window; contents are preserved"
@@ -835,7 +835,7 @@ msgstr "ログウィンドウを閉じる (内容は保たれます)"

 #: pcsx2/gui/ConsoleLogger.cpp:445
 msgid "Dev/&Verbose"
-msgstr "開発者用詳細表示"
+msgstr "開発者用詳細表示(&V)"

 #: pcsx2/gui/ConsoleLogger.cpp:445
 msgid "Shows PCSX2 developer logs"
@@ -843,7 +843,7 @@ msgstr "PCSX2開発者用ログを表示"

 #: pcsx2/gui/ConsoleLogger.cpp:446
 msgid "&CDVD reads"
-msgstr "CDVD読み込み"
+msgstr "CDVD読み込み(&C)"

 #: pcsx2/gui/ConsoleLogger.cpp:446
 msgid "Shows disk read activity"
@@ -851,7 +851,7 @@ msgstr "ディスク読み込みアクティビティを表示"

 #: pcsx2/gui/ConsoleLogger.cpp:463
 msgid "&Enable all"
-msgstr "全て有効化"
+msgstr "全て有効化(&E)"

 #: pcsx2/gui/ConsoleLogger.cpp:463
 msgid "Enables all log source filters."
@@ -859,7 +859,7 @@ msgstr "全てのログソースフィルタを有効にします。"

 #: pcsx2/gui/ConsoleLogger.cpp:464
 msgid "&Disable all"
-msgstr "全て無効化"
+msgstr "全て無効化(&D)"

 #: pcsx2/gui/ConsoleLogger.cpp:464
 msgid "Disables all log source filters."
@@ -867,7 +867,7 @@ msgstr "全てのログソースフィルタを無効にします。"

 #: pcsx2/gui/ConsoleLogger.cpp:465
 msgid "&Restore Default"
-msgstr "デフォルトに戻す"
+msgstr "デフォルトに戻す(&R)"

 #: pcsx2/gui/ConsoleLogger.cpp:465
 msgid "Restore default source filters."
@@ -875,11 +875,11 @@ msgstr "全てのログソースフィルタを有効にします。"

 #: pcsx2/gui/ConsoleLogger.cpp:467
 msgid "&Log"
-msgstr "ログ"
+msgstr "ログ(&L)"

 #: pcsx2/gui/ConsoleLogger.cpp:468
 msgid "&Sources"
-msgstr "ソース"
+msgstr "ソース(&S)"

 #: pcsx2/gui/Dialogs/AboutBoxDialog.cpp:36
 #, c-format
@@ -1037,7 +1037,7 @@ msgstr "作成"

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:72
 msgid "New memory card:"
-msgstr "新規メモリーカード："
+msgstr "新規メモリーカード:"

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:73
 msgid "At folder:    "
@@ -1055,11 +1055,11 @@ msgstr "メモリーカードの作成"

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:191
 msgid "Error: The directory for the memory card could not be created."
-msgstr "エラー：メモリーカード用のディレクトリの作成ができませんでした。"
+msgstr "エラー:メモリーカード用のディレクトリの作成ができませんでした。"

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:206
 msgid "Error: The memory card could not be created."
-msgstr "エラー：メモリーカードの作成ができませんでした。"
+msgstr "エラー:メモリーカードの作成ができませんでした。"

 #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:221
 msgid "Use NTFS compression when creating this card."
@@ -1405,11 +1405,11 @@ msgstr "ファイル..."

 #: pcsx2/gui/MainFrame.cpp:349
 msgid "&Show Console"
-msgstr "コンソールを表示"
+msgstr "コンソールを表示(&S)"

 #: pcsx2/gui/MainFrame.cpp:351
 msgid "&Console to Stdio"
-msgstr "コンソールから標準入出力へ"
+msgstr "コンソールから標準入出力へ(&C)"

 #: pcsx2/gui/MainFrame.cpp:364
 msgid "&System"
@@ -1502,7 +1502,7 @@ msgstr "内部仮想マシンを停止し、プラグインを終了します。

 #: pcsx2/gui/MainFrame.cpp:487
 msgid "E&xit"
-msgstr "終了 (&x)"
+msgstr "終了(&x)"

 #: pcsx2/gui/MainFrame.cpp:488
 #, c-format
@@ -1515,11 +1515,11 @@ msgstr "ISOセレクター(&S)"

 #: pcsx2/gui/MainFrame.cpp:496
 msgid "Plugin &Menu"
-msgstr "プラグイン&Menu"
+msgstr "プラグインメニュー(&M)"

 #: pcsx2/gui/MainFrame.cpp:499
 msgid "&ISO"
-msgstr "&ISO"
+msgstr "ISO(&I)"

 #: pcsx2/gui/MainFrame.cpp:499
 msgid "Makes the specified ISO image the CDVD source."
@@ -1571,7 +1571,7 @@ msgstr "ハードディスク (Dev9) (&D)"

 #: pcsx2/gui/MainFrame.cpp:519
 msgid "&USB"
-msgstr "&USB"
+msgstr "USB(&U)"

 #: pcsx2/gui/MainFrame.cpp:520
 msgid "&Firewire"
@@ -1600,7 +1600,7 @@ msgstr "PCSX2について (&A)"

 #: pcsx2/gui/MainFrame.cpp:551
 msgid "&Open Debug Window..."
-msgstr "デバッグウィンドウを開く (%O)"
+msgstr "デバッグウィンドウを開く (&O)"

 #: pcsx2/gui/MainFrame.cpp:554
 msgid "&Logging..."
@@ -1681,11 +1681,11 @@ msgstr "急速起動でPS2の起動画面をスキップします"

 #: pcsx2/gui/MainFrame.cpp:687
 msgid "Boot ISO (&fast)"
-msgstr "ISO起動 (急速)"
+msgstr "ISO起動 (急速) (&f)"

 #: pcsx2/gui/MainFrame.cpp:690
 msgid "Boot CDVD (&fast)"
-msgstr "CDVD起動 (急速)"
+msgstr "CDVD起動 (急速) (&f)"

 #: pcsx2/gui/MainFrame.cpp:713
 msgid "Boo&t ISO (full)"
@@ -1717,7 +1717,7 @@ msgstr "プラグインがロードされていません"

 #: pcsx2/gui/MainFrame.cpp:808
 msgid "&Core GS Settings..."
-msgstr "GSコア設定..."
+msgstr "GSコア設定...(&C)"

 #: pcsx2/gui/MainFrame.cpp:809
 msgid ""
@@ -1727,7 +1727,7 @@ msgstr "仮想マシンで制御されるハードウェアエミュレーショ

 #: pcsx2/gui/MainFrame.cpp:811
 msgid "&Window Settings..."
-msgstr "GSウィンドウ設定..."
+msgstr "GSウィンドウ設定...(&W)"

 #: pcsx2/gui/MainFrame.cpp:812
 msgid "Modify window and appearance options, including aspect ratio."
--- a/nsis/ApplyExeProps.nsh
+++ b/nsis/ApplyExeProps.nsh
@@ -4,7 +4,7 @@
 ; (for the professionalism!!)

 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName"     "${APP_NAME}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright"  "<EFBFBD> 2019 PCSX2 Dev Team"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright"  "Copyright 2019 PCSX2 Dev Team"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a Playstation 2 Emulator for the PC."
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"     "${APP_VERSION}"

--- a/nsis/SectionUninstaller.nsh
+++ b/nsis/SectionUninstaller.nsh
@@ -2,17 +2,10 @@
 ;                         Shared Install Functions
 ; =======================================================================

-Function .onInit
-
-  ;prepare Advanced Uninstall log always within .onInit function
-  !insertmacro UNINSTALL.LOG_PREPARE_INSTALL
-
-FunctionEnd
-
 Function .onInstSuccess
+; Remove unpacked files

-  ;create/update log always within .onInstSuccess function
-  !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
+  RMDir /r "$TEMP\PCSX2 ${APP_VERSION}"

 FunctionEnd

@@ -20,25 +13,18 @@ FunctionEnd
 ;                         Shared Uninstall Functions
 ; =======================================================================

-; begin uninstall, could be added on top of uninstall section instead
-Function un.onInit
-  !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
-  FunctionEnd
-
 Function un.onUninstSuccess
-  !insertmacro UNINSTALL.LOG_END_UNINSTALL
  ; And remove the various install dir(s) but only if they're clean of user content:

-  RMDir "$DOCUMENTS\PCSX2"
-  RMDir "$INSTDIR\langs"
-
-  RMDir /r "$INSTDIR\plugins"
+  Delete "$INSTDIR\Uninst-pcsx2.exe"
  RMDir "$INSTDIR"
-  FunctionEnd
+
+FunctionEnd
 ; =======================================================================
 ;                           Un.Installer Sections
 ; =======================================================================
 Section "Un.Program and Plugins ${APP_NAME}"
+SectionIn RO

  ; First thing, remove the registry entry in case uninstall doesn't complete successfully
  ;   otherwise, pcsx2 will be "confused" if it's re-installed later.
@@ -51,8 +37,6 @@ Section "Un.Program and Plugins ${APP_NAME}"
  ; Remove regkey generated by NSIS for uninstall functions
  DeleteRegKey HKLM "${INSTDIR_REG_KEY}"

-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR"
-  
  ; Remove shortcuts, if any
  Delete "$DESKTOP\${APP_NAME}.lnk"
  Delete "$SMPROGRAMS\${APP_NAME}.lnk"
@@ -81,6 +65,7 @@ Section /o "Un.Configuration files (Programs and Plugins)"
  RMDir /r "$DOCUMENTS\PCSX2\inis\"
 SectionEnd

+; /o for optional and unticked by default
 Section /o "Un.Memory Cards and Savestates"
  SetShellVarContext current
  RMDir /r "$DOCUMENTS\PCSX2\memcards\"
@@ -98,8 +83,6 @@ SectionEnd

 ; /o for optional and unticked by default
 Section /o "Un.BIOS files"
-
  SetShellVarContext current
  RMDir /r "$DOCUMENTS\PCSX2\bios\"
-
 SectionEnd
--- a/nsis/SectionVersionCheck.nsh
+++ b/nsis/SectionVersionCheck.nsh
@@ -7,35 +7,27 @@ Function UninstallPrevious
 ; $needle: String to search for
 ; $Haystack: String to look in

-; Search for 1.0.0
-ReadRegStr $R7 HKLM "${INSTDIR_REG_KEY}" "Uninst-pcsx2Directory"
-${StrContains} "$4" "1.0.0" "$R7"
-
 ; This will become the primary version check for 1.6.0 and later
 ReadRegStr $R1 HKLM "${INSTDIR_REG_KEY}" "DisplayVersion"
+ReadRegStr $R2 HKLM Software\PCSX2 "Install_Dir"
+${If} $R1 != ""
+${AndIf} $R2 != ""
+    Goto UserPrompt
+${EndIf}

 ; Search for 1.4.0
-ReadRegStr $R2 HKLM "${INSTDIR_REG_KEY}" "Uninst-pcsx2 1.4.0Directory"
-${StrContains} "$2" "1.4.0" "$R2"
-
-; Search for 1.2.1
-ReadRegStr $R3 HKLM "${INSTDIR_REG_KEY}-r5875" "Uninst-pcsx2-r5875Directory"
-${StrContains} "$3" "1.2.1" "$R3"
-
-; Search for 0.9.8
-ReadRegStr $R5 HKLM "${INSTDIR_REG_KEY}-r4600" "Uninst-pcsx2-r4600Directory"
-${StrContains} "$5" "0.9.8" "$R5"
+ReadRegStr $R3 HKLM "${INSTDIR_REG_KEY}" "Uninst-pcsx2 1.4.0Directory"
+${StrContains} "$2" "1.4.0" "$R3"

 ; If all cases return null, our work here is done.
 ${If} $R2 == ""
 ${AndIf} $R3 == ""
-${AndIf} $R5 == ""
-${AndIf} $R7 == ""
 Return
 ${EndIf}

+UserPrompt:
 ; Installing another version
-MessageBox MB_ICONEXCLAMATION|MB_OKCANCEL "Another version of PCSX2 is already installed. The current configuration folder in Documents will be duplicated and renamed as PCSX2_backup. Click OK to uninstall PCSX2 or Cancel to abort the setup." IDOK SetUninstPath IDCANCEL false
+MessageBox MB_ICONEXCLAMATION|MB_OKCANCEL "An existing version of PCSX2 has been detected and will be REMOVED. The config folder in Documents will be duplicated (if it exists) and renamed as PCSX2_backup. Backup any important files and click OK to uninstall PCSX2 or Cancel to abort the setup." IDOK SetUninstPath IDCANCEL false

 false:
 Quit
@@ -45,54 +37,27 @@ SetOutPath "$DOCUMENTS"
 CopyFiles /SILENT "$DOCUMENTS\PCSX2" "$DOCUMENTS\PCSX2_backup"
 RMDir /r "$DOCUMENTS\PCSX2"

-${If} $R7 != ""
-    ${AndIf} $R1 != ""
-    ${OrIf} $4 == "1.0.0"
+${If} $R1 != ""
    Goto ExecNormal
 ${EndIf}

-${If} $R2 != ""
+${If} $R3 != ""
    ${AndIf} $2 == "1.4.0"
    Goto Exec1.4.0
 ${EndIf}

-${If} $R3 != ""
-    ${AndIf} $3 == "1.2.1"
-    Goto Exec1.2.1
-${EndIf}
-
-${If} $R5 != ""
-    ${AndIf} $5 == "0.9.8"
-    Goto Exec0.9.8
-${EndIf}
-
 ExecNormal:
    SetOutPath "$TEMP"
-    CopyFiles /SILENT /FILESONLY "$R7\Uninst-pcsx2.exe" "$TEMP"
-        ExecWait '"$TEMP\Uninst-pcsx2.exe" /S _?=$R7'
+    CopyFiles /SILENT /FILESONLY "$R2\Uninst-pcsx2.exe" "$TEMP"
+        ExecWait '"$TEMP\Uninst-pcsx2.exe" /S _?=$R2'
        Delete "$TEMP\Uninst-pcsx2.exe"
        Return

 Exec1.4.0:
    SetOutPath "$TEMP"
-    CopyFiles /SILENT /FILESONLY "$R2\Uninst-pcsx2 1.4.0.exe" "$TEMP"
-        ExecWait '"$TEMP\Uninst-pcsx2 1.4.0.exe" /S _?=$R2'
+    CopyFiles /SILENT /FILESONLY "$R3\Uninst-pcsx2 1.4.0.exe" "$TEMP"
+        ExecWait '"$TEMP\Uninst-pcsx2 1.4.0.exe" /S _?=$R3'
        Delete "$TEMP\Uninst-pcsx2 1.4.0.exe"
        DeleteRegKey HKLM Software\PCSX2
        Return
-
-Exec1.2.1:
-    SetOutPath "$TEMP"
-    CopyFiles /SILENT /FILESONLY "$R3\Uninst-pcsx2-r5875.exe" "$TEMP"
-        ExecWait '"$TEMP\Uninst-pcsx2-r5875.exe" /S _?=$R3'
-        Delete "$TEMP\Uninst-pcsx2-r5875.exe"
-        Return
-
-Exec0.9.8:
-    SetOutPath "$TEMP"
-    CopyFiles /SILENT /FILESONLY "$R5\Uninst-pcsx2-r4600.exe" "$TEMP"
-        ExecWait '"$TEMP\Uninst-pcsx2-r4600.exe" /S _?=$R5'
-        Delete "$TEMP\Uninst-pcsx2-r4600.exe"
-        Return
-
-FunctionEnd
+FunctionEnd
--- a/nsis/SharedCore.nsh
+++ b/nsis/SharedCore.nsh
@@ -13,18 +13,40 @@
  ;SetShellVarContext all
  ;SetShellVarContext current

-Section "!${APP_NAME} (required)" SEC_CORE
+Function RedistInstallation
+!include WinVer.nsh

-    SectionIn RO
+; Check if the VC runtimes are installed
+ReadRegDword $R5 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"

-CopyFiles /SILENT "$TEMP\PCSX2_installer_temp" "$INSTDIR"
-CopyFiles /SILENT "$TEMP\PCSX2_installer_temp\Docs" "$INSTDIR"
-CopyFiles /SILENT "$TEMP\PCSX2_installer_temp\Shaders" "$INSTDIR"
-CopyFiles /SILENT "$TEMP\PCSX2_installer_temp\Plugins" "$INSTDIR"
+${If} $R5 == "1"
+    Goto DxSetup
+${EndIf}
+
+; Download and install the VC redistributable from the internet
+inetc::get /CONNECTTIMEOUT 30 /RECEIVETIMEOUT 30 "https://aka.ms/vs/16/release/VC_redist.x86.exe" "$TEMP\VC_redist.x86.exe" /END
+    ExecShellWait open "$TEMP\VC_redist.x86.exe" "/INSTALL /Q /NORESTART"
+    Delete "$TEMP\VC_redist.x86.exe"
+
+DxSetup:
+${If} ${AtLeastWin8.1}
+Return
+${EndIf}
+
+; Download and install DirectX (only applies to OSes older than 8.1)
+inetc::get /CONNECTTIMEOUT 30 /RECEIVETIMEOUT 30 "https://download.microsoft.com/download/1/7/1/1718CCC4-6315-4D8E-9543-8E28A4E18C4C/dxwebsetup.exe" "$TEMP/dxwebsetup.exe" /END
+    ExecShellWait open "$TEMP\dxwebsetup.exe" "/Q"
+    Delete "$TEMP\dxwebsetup.exe"
+FunctionEnd
+
+Section "" SEC_REDIST
+Call RedistInstallation
 SectionEnd

-Section "Additional Languages" SEC_LANGS
-CopyFiles /SILENT "$TEMP\PCSX2_installer_temp\Langs" "$INSTDIR"
+; Copy unpacked files from TEMP to the user specified directory
+Section "!${APP_NAME} (required)" SEC_CORE
+SectionIn RO
+CopyFiles /SILENT "$TEMP\PCSX2 ${APP_VERSION}\*" "$INSTDIR\" 24000
 SectionEnd

 !include "SharedShortcuts.nsh"
@@ -32,11 +54,9 @@ SectionEnd
 LangString DESC_CORE       ${LANG_ENGLISH} "Core components (binaries, plugins, documentation, etc)."
 LangString DESC_STARTMENU  ${LANG_ENGLISH} "Adds shortcuts for PCSX2 to the start menu (all users)."
 LangString DESC_DESKTOP    ${LANG_ENGLISH} "Adds a shortcut for PCSX2 to the desktop (all users)."
-LangString DESC_LANGS      ${LANG_ENGLISH} "Adds additional languages other than the system default to PCSX2."

  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_CORE}        $(DESC_CORE)
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_STARTMENU}   $(DESC_STARTMENU)
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP}     $(DESC_DESKTOP)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LANGS}       $(DESC_LANGS)
  !insertmacro MUI_FUNCTION_DESCRIPTION_END
--- a/nsis/SharedDefs.nsh
+++ b/nsis/SharedDefs.nsh
@@ -4,12 +4,16 @@
 ; This reduces duplicate code throughout both installers.

 ManifestDPIAware true
+Unicode true
 ShowInstDetails nevershow
 ShowUninstDetails nevershow

 SetCompressor /SOLID lzma
 SetCompressorDictSize 24

+Var UserPrivileges
+Var IsAdmin
+
 !ifndef APP_VERSION
  !define APP_VERSION      "1.6.0"
 !endif
@@ -30,4 +34,32 @@ Name "${APP_NAME}"
 !define MUI_HEADERIMAGE_BITMAP "banner.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 !define MUI_ICON "AppIcon.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico"
+
+Function IsUserAdmin
+!include WinVer.nsh
+# No user should ever have to experience this pain ;)
+  ${IfNot} ${AtLeastWinVista}
+    MessageBox MB_OK "Your operating system is unsupported by PCSX2. Please upgrade your operating system or install PCSX2 1.4.0."
+    Quit
+  ${EndIf}
+
+UserInfo::GetOriginalAccountType
+Pop $UserPrivileges
+
+  # GetOriginalAccountType will check the tokens of the original user of the
+  # current thread/process. If the user tokens were elevated or limited for
+  # this process, GetOriginalAccountType will return the non-restricted
+  # account type.
+  # On Vista with UAC, for example, this is not the same value when running
+  # with `RequestExecutionLevel user`. GetOriginalAccountType will return
+  # "admin" while GetAccountType will return "user".
+  ;UserInfo::GetOriginalAccountType
+  ;Pop $R2
+
+${If} $UserPrivileges == "Admin"
+    StrCpy $IsAdmin 1
+    ${ElseIf} $UserPrivileges == "User"
+    StrCpy $IsAdmin 0
+${EndIf}
+FunctionEnd
--- a/nsis/pcsx2_full_install.nsi
+++ b/nsis/pcsx2_full_install.nsi
@@ -6,10 +6,8 @@
 !include "SharedDefs.nsh"

 RequestExecutionLevel admin
-AllowRootDirInstall true

 ; This is the uninstaller name.
-!define UNINSTALL_LOG    "Uninst-pcsx2"
 !define INSTDIR_REG_ROOT "HKLM"
 !define OUTFILE_POSTFIX "include_standard"

@@ -17,11 +15,12 @@ AllowRootDirInstall true
 OutFile "pcsx2-${APP_VERSION}-${OUTFILE_POSTFIX}.exe"

 ; The default installation directory for the full installer
-InstallDir "$PROGRAMFILES\PCSX2 ${APP_VERSION}"
+InstallDir "$PROGRAMFILES\PCSX2"

 !define INSTDIR_REG_KEY  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_FILENAME}"

-!include "AdvUninstLog.nsh"
+!include "StrContains.nsh"
+!include "SectionVersionCheck.nsh"

 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
@@ -39,13 +38,9 @@ InstallDir "$PROGRAMFILES\PCSX2 ${APP_VERSION}"
 !insertmacro MUI_UNPAGE_INSTFILES
 !insertmacro MUI_LANGUAGE "English"

-; This defines the Advanced Uninstaller mode of operation...
-!insertmacro UNATTENDED_UNINSTALL

 !include "nsDialogs.nsh"
 !include "ApplyExeProps.nsh"
-!include "StrContains.nsh"
-!include "SectionVersionCheck.nsh"

 Section "" 
 Call UninstallPrevious
@@ -64,14 +59,10 @@ Section ""
  WriteRegStr   HKLM "${INSTDIR_REG_KEY}"  "DisplayIcon"      "$INSTDIR\pcsx2.exe"
  WriteRegStr   HKLM "${INSTDIR_REG_KEY}"  "DisplayVersion"   "${APP_VERSION}"
  WriteRegStr   HKLM "${INSTDIR_REG_KEY}"  "HelpLink"         "https://forums.pcsx2.net"
-  ${GetSize} "$INSTDIR" "/S=0K" $6 $7 $8
-  IntFmt $6 "0x%08X" $6
-  WriteRegDWORD HKLM "${INSTDIR_REG_KEY}"  "EstimatedSize"    "$6"
-  WriteRegStr   HKLM "${INSTDIR_REG_KEY}"  "UninstallString"  "${UNINST_EXE}"
+  WriteRegStr   HKLM "${INSTDIR_REG_KEY}"  "UninstallString"  "$INSTDIR\Uninst-pcsx2.exe"
  WriteRegDWORD HKLM "${INSTDIR_REG_KEY}"  "NoModify" 1
  WriteRegDWORD HKLM "${INSTDIR_REG_KEY}"  "NoRepair" 1
-  WriteUninstaller "${UNINST_EXE}"
-  RMDir /r "$TEMP\PCSX2_installer_temp"
+  WriteUninstaller "$INSTDIR\Uninst-pcsx2.exe"
 SectionEnd

 Section "" SID_PCSX2
--- a/nsis/pcsx2_shared_init.nsi
+++ b/nsis/pcsx2_shared_init.nsi
@@ -8,12 +8,7 @@ RequestExecutionLevel user
 !define OUTFILE_POSTFIX "setup"
 OutFile "pcsx2-${APP_VERSION}-${OUTFILE_POSTFIX}.exe"

-Var UserPrivileges
-Var IsAdmin
-Var DirectXSetupError
-
 ; Dialogs and Controls
-Var hwnd
 Var PreInstall_Dialog
 Var PreInstall_DlgBack
 Var PreInstall_DlgNext
@@ -35,37 +30,10 @@ Page Custom IsUserAdmin
 Page Custom PreInstallDialog
 Page Custom InstallMode InstallModeLeave

-Function IsUserAdmin
-!include WinVer.nsh
-# No user should ever have to experience this pain ;)
-  ${IfNot} ${AtLeastWinVista}
-    MessageBox MB_OK "Your operating system is unsupported by PCSX2. Please upgrade your operating system or install PCSX2 1.4.0."
-    Quit
-  ${EndIf}
-
-ClearErrors
-UserInfo::GetName
-  Pop $R8
-
-UserInfo::GetOriginalAccountType
-Pop $UserPrivileges
-
-  # GetOriginalAccountType will check the tokens of the original user of the
-  # current thread/process. If the user tokens were elevated or limited for
-  # this process, GetOriginalAccountType will return the non-restricted
-  # account type.
-  # On Vista with UAC, for example, this is not the same value when running
-  # with `RequestExecutionLevel user`. GetOriginalAccountType will return
-  # "admin" while GetAccountType will return "user".
-  ;UserInfo::GetOriginalAccountType
-  ;Pop $R2
-
-${If} $UserPrivileges == "Admin"
-    StrCpy $IsAdmin 1
-    ${ElseIf} $UserPrivileges == "User"
-    StrCpy $IsAdmin 0
-${EndIf}
-FunctionEnd
+; Function located in SharedDefs
+Section ""
+Call IsUserAdmin
+SectionEnd

 Function PreInstallDialog

@@ -85,73 +53,23 @@ FunctionEnd

 Function NSD_Timer.Callback
 ${NSD_KillTimer} NSD_Timer.Callback
-    SendMessage $hwnd ${PBM_SETRANGE32} 0 100

-!include WinVer.nsh
-!include "X64.nsh" 
-
-# If the user is running at least Windows 8.1
-# or has no admin rights, don't waste time trying
-# to install the DX and VS runtimes.
-${If} ${AtLeastWin8.1}
-${OrIf} $IsAdmin == 0
-Goto CopyInstallerFiles
-SendMessage $HWNDPARENT ${WM_COMMAND} 1 0
-${EndIf}
-
-# Check if the VC runtimes are installed
-${If} ${RunningX64}
-ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
-${Else}
-   ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
-${EndIf}
-    Pop $R0
-
-# If the runtimes are already here, check for DX.
-${If} $R0 == "1"
-Goto ExecDxSetup
-${EndIf}
-
-# Download and install the VC redistributable from the internet
-${NSD_CreateLabel} 0 45 100% 10u "Downloading Visual C++ package"
-Pop $hwnd
-inetc::get "https://aka.ms/vs/16/release/VC_redist.x86.exe" "$TEMP\vcredist_Update_x86.exe" /SILENT /CONNECTTIMEOUT 30 /RECEIVETIMEOUT 30 /END
-    ${NSD_CreateLabel} 0 45 100% 10u "Installing Visual C++ package"
-    Pop $hwnd
-    ExecWait '"$TEMP\vcredist_Update_x86.exe /S"'
-    SendMessage $hwnd ${PBM_SETPOS} 40 0
-    Delete "$TEMP\vcredist_Update_x86.exe"
-
-# Download and install DirectX
-ExecDxSetup:
-${NSD_CreateLabel} 0 45 100% 10u "Installing DXWebSetup package"
-Pop $hwnd
-SendMessage $hwnd ${PBM_SETPOS} 80 0
-
-SetOutPath "$TEMP"
-File "dxwebsetup.exe"
-ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError
-
-SendMessage $hwnd ${PBM_SETPOS} 100 0
-Delete "$TEMP\dxwebsetup.exe"
-Sleep 20
 ;-----------------------------------------
 ; Copy installer files to a temp directory instead of repacking twice (for each installer)
-CopyInstallerFiles:
    ${NSD_CreateLabel} 0 45 80% 10u "Unpacking files. Maybe it's time to upgrade that computer!"
-  SetOutPath "$TEMP\PCSX2_installer_temp"
+  SetOutPath "$TEMP\PCSX2 ${APP_VERSION}"
    File ..\bin\pcsx2.exe
    File ..\bin\GameIndex.dbf
    File ..\bin\cheats_ws.zip
    File ..\bin\PCSX2_keys.ini.default
-  SetOutPath "$TEMP\PCSX2_installer_temp\Docs"
+  SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Docs"
    File ..\bin\docs\*

-  SetOutPath "$TEMP\PCSX2_installer_temp\Shaders"
+  SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Shaders"
    File ..\bin\shaders\GSdx.fx
    File ..\bin\shaders\GSdx_FX_Settings.ini

-  SetOutPath "$TEMP\PCSX2_installer_temp\Plugins"
+  SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Plugins"
    File /nonfatal ..\bin\Plugins\gsdx32-sse2.dll
    File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll
    File /nonfatal ..\bin\Plugins\gsdx32-avx2.dll
@@ -162,7 +80,7 @@ CopyInstallerFiles:
    File /nonfatal ..\bin\Plugins\DEV9null.dll
    File /nonfatal ..\bin\Plugins\FWnull.dll

-    SetOutPath "$TEMP\PCSX2_installer_temp\Langs"
+    SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Langs"
    File /nonfatal /r ..\bin\Langs\*.mo
    ${NSD_CreateLabel} 0 45 100% 10u "Moving on"
 ;-----------------------------------------
@@ -258,7 +176,7 @@ FunctionEnd
 !include "ApplyExeProps.nsh"

 ; The default installation directory for the portable binary.
-InstallDir "$DOCUMENTS\$R8\PCSX2 ${APP_VERSION}"
+InstallDir "$DOCUMENTS\PCSX2 ${APP_VERSION}"

 ; Path references for the core files here
 !include "SharedCore.nsh"
@@ -266,7 +184,7 @@ InstallDir "$DOCUMENTS\$R8\PCSX2 ${APP_VERSION}"
 Section "" INST_PORTABLE
 SetOutPath "$INSTDIR"
 File portable.ini
-RMDir /r "$TEMP\PCSX2_installer_temp"
+RMDir /r "$TEMP\PCSX2 ${APP_VERSION}"
 SectionEnd

 Section "" SID_PCSX2
--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -17,6 +17,10 @@

 #include "x86emitter/tools.h"

+// Disable TAS on release builds, threading issue maybe? It hangs the emu.
+// Linux always hangs, Windows far less but it's still an issue.
+#define DISABLE_RECORDING
+
 class IniInterface;

 enum PluginsEnum_t
--- a/pcsx2/DebugTools/DebugInterface.cpp
+++ b/pcsx2/DebugTools/DebugInterface.cpp
@@ -174,7 +174,7 @@ void DebugInterface::pauseCpu()
 {
 	SysCoreThread& core = GetCoreThread();
 	if (!core.IsPaused())
-		core.Pause();
+		core.Pause(true);
 }

 void DebugInterface::resumeCpu()
--- a/pcsx2/Interpreter.cpp
+++ b/pcsx2/Interpreter.cpp
@@ -60,7 +60,7 @@ void intBreakpoint(bool memcheck)
 	}

 	CBreakPoints::SetBreakpointTriggered(true);
-	GetCoreThread().PauseSelf();
+	GetCoreThread().PauseSelfDebug();
 	throw Exception::ExitCpuExecute();
 }

--- a/pcsx2/SysForwardDefs.h
+++ b/pcsx2/SysForwardDefs.h
@@ -16,9 +16,9 @@
 #pragma once

 static const int PCSX2_VersionHi	= 1;
-static const int PCSX2_VersionMid	= 5;
+static const int PCSX2_VersionMid	= 6;
 static const int PCSX2_VersionLo	= 0;
-static const bool PCSX2_isReleaseVersion = 0;
+static const bool PCSX2_isReleaseVersion = 1;

 class SysCoreThread;

--- a/pcsx2/System/SysThreadBase.cpp
+++ b/pcsx2/System/SysThreadBase.cpp
@@ -124,7 +124,7 @@ void SysThreadBase::Suspend( bool isBlocking )
 //   The previous suspension state; true if the thread was running or false if it was
 //   closed, not running, or paused.
 //
-void SysThreadBase::Pause()
+void SysThreadBase::Pause(bool debug)
 {
 	if( IsSelf() || !IsRunning() ) return;

@@ -143,7 +143,10 @@ void SysThreadBase::Pause()

 		pxAssertDev( m_ExecMode == ExecMode_Pausing, "ExecMode should be nothing other than Pausing..." );

-		OnPause();
+		if (debug)
+			OnPauseDebug();
+		else
+			OnPause();
 		m_sem_event.Post();
 	}

@@ -165,6 +168,21 @@ void SysThreadBase::PauseSelf()
 	}
 }

+void SysThreadBase::PauseSelfDebug()
+{
+	if (!IsSelf() || !IsRunning()) return;
+
+	{
+		ScopedLock locker(m_ExecModeMutex);
+
+		if (m_ExecMode == ExecMode_Opened)
+			m_ExecMode = ExecMode_Pausing;
+
+		OnPauseDebug();
+		m_sem_event.Post();
+	}
+}
+
 // Resumes the core execution state, or does nothing is the core is already running.  If
 // settings were changed, resets will be performed as needed and emulation state resumed from
 // memory savestates.
--- a/pcsx2/System/SysThreads.h
+++ b/pcsx2/System/SysThreads.h
@@ -112,8 +112,9 @@ public:

 	virtual void Suspend( bool isBlocking = true );
 	virtual void Resume();
-	virtual void Pause();
+	virtual void Pause(bool debug = false);
 	virtual void PauseSelf();
+	virtual void PauseSelfDebug();

 protected:
 	virtual void OnStart();
@@ -123,6 +124,7 @@ protected:
 	// Resume() has a lot of checks and balances to prevent re-entrance and race conditions.
 	virtual void OnResumeReady() {}
 	virtual void OnPause() {}
+	virtual void OnPauseDebug() {}

 	virtual bool StateCheckInThread();
 	virtual void OnCleanupInThread();
--- a/pcsx2/gui/AppCoreThread.cpp
+++ b/pcsx2/gui/AppCoreThread.cpp
@@ -210,7 +210,13 @@ void AppCoreThread::OnResumeReady()

 void AppCoreThread::OnPause()
 {
-	sApp.PostAppMethod( &Pcsx2App::enterDebugMode );
+	//sApp.PostAppMethod( &Pcsx2App::enterDebugMode );
+	_parent::OnPause();
+}
+
+void AppCoreThread::OnPauseDebug()
+{
+	sApp.PostAppMethod(&Pcsx2App::enterDebugMode);
 	_parent::OnPause();
 }

--- a/pcsx2/gui/AppCoreThread.h
+++ b/pcsx2/gui/AppCoreThread.h
@@ -147,6 +147,7 @@ protected:

 	virtual void OnResumeReady();
 	virtual void OnPause();
+	virtual void OnPauseDebug();
 	virtual void OnResumeInThread( bool IsSuspended );
 	virtual void OnSuspendInThread();
 	virtual void OnCleanupInThread();
--- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
@@ -22,6 +22,7 @@
 #include "DebugTools/MipsStackWalk.h"
 #include "BreakpointWindow.h"
 #include "PathDefs.h"
+#include "wx/busyinfo.h"

 #ifdef _WIN32
 #include <Windows.h>
@@ -127,19 +128,29 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu)

 	mainSizer->Layout();

+	symbolCount = 0;
+
 	lastCycles = 0;
 	loadCycles();
 }

+void CpuTabPage::clearSymbolMap()
+{
+	symbolCount = 0;
+	functionList->Clear();
+}
+
 void CpuTabPage::reloadSymbolMap()
 {
-	functionList->Clear();
-
-	auto funcs = symbolMap.GetAllSymbols(ST_FUNCTION);
-	for (size_t i = 0; i < funcs.size(); i++)
+	if (!symbolCount)
 	{
-		wxString name = wxString(funcs[i].name.c_str(),wxConvUTF8);
-		functionList->Append(name,(void*)funcs[i].address);
+		auto funcs = symbolMap.GetAllSymbols(ST_FUNCTION);
+		symbolCount = funcs.size();
+		for (size_t i = 0; i < funcs.size(); i++)
+		{
+			wxString name = wxString(funcs[i].name.c_str(), wxConvUTF8);
+			functionList->Append(name, (void*)funcs[i].address);
+		}
 	}
 }

@@ -545,6 +556,9 @@ void DisassemblyDialog::onDebuggerEvent(wxCommandEvent& evt)
 		onBreakpointClick(evt);
 	} else if (type == debEVT_MAPLOADED)
 	{
+		wxBusyInfo wait("Please wait, Reloading ELF functions");
+		eeTab->clearSymbolMap();
+		iopTab->clearSymbolMap();
 		eeTab->reloadSymbolMap();
 		iopTab->reloadSymbolMap();
 	} else if (type == debEVT_STEPOUT)
@@ -575,8 +589,14 @@ void DisassemblyDialog::update()
 void DisassemblyDialog::reset()
 {
 	eeTab->getDisassembly()->clearFunctions();
-	eeTab->reloadSymbolMap();
+	eeTab->clearSymbolMap();
 	iopTab->getDisassembly()->clearFunctions();
+	iopTab->clearSymbolMap();
+}
+
+void DisassemblyDialog::populate()
+{
+	eeTab->reloadSymbolMap();
 	iopTab->reloadSymbolMap();
 }

@@ -610,6 +630,11 @@ void DisassemblyDialog::setDebugMode(bool debugMode, bool switchPC)

 		if (debugMode)
 		{
+				if (!CBreakPoints::GetBreakpointTriggered())
+				{
+					wxBusyInfo wait("Please wait, Reading ELF functions");
+					populate();
+				}
 			CBreakPoints::ClearTemporaryBreakPoints();
 			breakRunButton->SetLabel(L"Run");

--- a/pcsx2/gui/Debugger/DisassemblyDialog.h
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.h
@@ -54,6 +54,7 @@ public:
 	void showMemoryView() { setBottomTabPage(memory); };
 	void loadCycles();
 	void reloadSymbolMap();
+	void clearSymbolMap();
 	u32 getStepOutAddress();

 	void listBoxHandler(wxCommandEvent& event);
@@ -74,6 +75,7 @@ private:
 	ThreadList* threadList;
 	StackFramesList* stackFrames;
 	u32 lastCycles;
+	u32 symbolCount;
 };

 class DisassemblyDialog : public wxFrame
@@ -87,6 +89,7 @@ public:
 	
 	void update();
 	void reset();
+	void populate();
 	void setDebugMode(bool debugMode, bool switchPC);
 	
 #ifdef _WIN32
--- a/pcsx2/x86/ix86-32/iR5900-32.cpp
+++ b/pcsx2/x86/ix86-32/iR5900-32.cpp
@@ -1148,7 +1148,7 @@ void dynarecCheckBreakpoint()
 		return;

 	CBreakPoints::SetBreakpointTriggered(true);
-	GetCoreThread().PauseSelf();
+	GetCoreThread().PauseSelfDebug();
 	recExitExecution();
 }

@@ -1159,7 +1159,7 @@ void dynarecMemcheck()
 		return;

 	CBreakPoints::SetBreakpointTriggered(true);
-	GetCoreThread().PauseSelf();
+	GetCoreThread().PauseSelfDebug();
 	recExitExecution();
 }

--- a/plugins/GSdx/Renderers/DX11/GSDevice11.cpp
+++ b/plugins/GSdx/Renderers/DX11/GSDevice11.cpp
@@ -645,9 +645,6 @@ void GSDevice11::ClearStencil(GSTexture* t, uint8 c)

 GSTexture* GSDevice11::CreateSurface(int type, int w, int h, int format)
 {
-	ASSERT(w > 0 && w <= m_d3d_texsize);
-	ASSERT(h > 0 && h <= m_d3d_texsize);
-
 	HRESULT hr;

 	D3D11_TEXTURE2D_DESC desc;
--- a/plugins/GSdx/Renderers/OpenGL/GSTextureOGL.cpp
+++ b/plugins/GSdx/Renderers/OpenGL/GSTextureOGL.cpp
@@ -155,9 +155,6 @@ namespace PboPool {
 GSTextureOGL::GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read, bool mipmap)
 	: m_clean(false), m_generate_mipmap(true), m_local_buffer(nullptr), m_r_x(0), m_r_y(0), m_r_w(0), m_r_h(0), m_layer(0)
 {
-	ASSERT(w > 0);
-	ASSERT(h > 0);
-
 	// OpenGL didn't like dimensions of size 0
 	m_size.x = std::max(1,w);
 	m_size.y = std::max(1,h);
--- a/plugins/onepad/res/game_controller_db.txt
+++ b/plugins/onepad/res/game_controller_db.txt
@@ -95,6 +95,8 @@
 050000007e0500000620000001000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Linux,
 030000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Linux,
 050000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Linux,
+03000000242f00002d00000011010000,JYS Wireless Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000242f00008a00000011010000,JYS Wireless Adapter,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b3,platform:Linux,
 030000006f0e00000103000000020000,Logic3 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006d04000019c2000010010000,Logitech Cordless RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d04000016c2000010010000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
@@ -148,6 +150,8 @@
 030000000d0f00000900000010010000,Natec Genesis P44,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000001008000001e5000010010000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b6,start:b9,x:b3,y:b0,platform:Linux,
 060000007e0500000820000000000000,Nintendo Combined Joy-Cons (joycond),a:b0,b:b1,back:b9,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+050000007e0500000920000001800000,Nintendo Switch Pro Controller (joycond),a:b0,b:b1,x:b3,y:b2,back:b9,guide:b11,start:b10,leftstick:b12,rightstick:b13,leftshoulder:b5,rightshoulder:b6,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b7,righttrigger:b8,platform:Linux,
+030000007e0500000920000011810000,Nintendo Switch Pro Controller Wired (joycond),a:b0,b:b1,x:b3,y:b2,back:b9,guide:b11,start:b10,leftstick:b12,rightstick:b13,leftshoulder:b5,rightshoulder:b6,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b7,righttrigger:b8,platform:Linux,
 030000007e0500003703000000016800,Nintendo GameCube Controller,a:b0,b:b2,dpdown:b6,dpleft:b4,dpright:b5,dpup:b7,lefttrigger:a4,leftx:a0,lefty:a1~,rightshoulder:b9,righttrigger:a5,rightx:a2,righty:a3~,start:b8,x:b1,y:b3,platform:Linux,
 050000007e0500000920000001000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 050000007e0500003003000001000000,Nintendo Wii Remote Pro Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
@@ -164,6 +168,7 @@
 03000000ff1100003133000010010000,PC Game Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 030000006f0e00006401000001010000,PDP Battlefield One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e00003101000000010000,PDP EA Sports Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000c802000012010000,PDP Kingdom Hearts Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e0000a802000023020000,PDP Wired Controller for Xbox One,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 030000004c050000da0c000011010000,Playstation Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
 03000000c62400000053000000010000,PowerA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -236,6 +241,7 @@
 03000000250900000500000000010000,Sony PS2 pad with SmartJoy adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
 030000005e0400008e02000073050000,Speedlink TORID Wireless Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400008e02000020200000,SpeedLink XEOX Pro Analog Gamepad pad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d11800000094000011010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 03000000de2800000112000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
 03000000de2800000211000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
 03000000de2800004211000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
@@ -248,11 +254,15 @@
 03000000381000003114000075010000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 05000000110100001914000009010000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000ad1b000038f0000090040000,Street Fighter IV FightStick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000003b07000004a1000000010000,Suncom SFX Plus for USB,a:b0,b:b2,x:b1,y:b3,back:b7,start:b8,leftshoulder:b6,rightshoulder:b9,leftx:a0,lefty:a1,lefttrigger:b4,righttrigger:b5,platform:Linux,
 03000000666600000488000000010000,Super Joy Box 5 Pro,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
 0300000000f00000f100000000010000,Super RetroPort,a:b1,b:b5,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Linux,
+03000000457500002211000010010000,SZMY-POWER CO. LTD. GAMEPAD,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000008f0e00000d31000010010000,SZMY-POWER CO. LTD. GAMEPAD 3 TURBO,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000004f04000020b3000010010000,Thrustmaster 2 in 1 DT,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
 030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
 030000004f04000023b3000000010000,Thrustmaster Dual Trigger 3-in-1,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000b50700000399000000010000,Thrustmaster Firestorm Digital 2,a:b2,b:b4,x:b3,y:b5,back:b11,start:b1,leftstick:b10,rightstick:b0,leftshoulder:b6,rightshoulder:b8,leftx:a0,lefty:a1,lefttrigger:b7,righttrigger:b9,platform:Linux,
 030000004f04000000b3000010010000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Linux,
 030000004f04000026b3000002040000,Thrustmaster Gamepad GP XID,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c6240000025b000002020000,Thrustmaster GPX Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
Author	SHA1	Message	Date
knight-ryu12	aaaf29557f	locale:ja_jp Add missing hotkey notations	2020-05-05 22:08:05 +02:00
Christian Kenny	d503b56e8c	NSIS: QoL changes, general cleanup, bug fixes (#3335 ) Uninstaller: - Removed dependency for AdvUninstallLog, it wasn't really used for anything. - Remove unpacked installer files upon successful installation. Installer: - Remove detection code for versions prior to 1.4. - Fix Unicode path issues. - Fix path issues if install folder already exists. - Remove language option. - Fix redistributable installation issues. - Move redistributable installation to after user proceeds with install.	2020-05-05 22:07:53 +02:00
lightningterror	c03b06e52f	onepad: Update to latest controller database.	2020-05-04 21:01:58 +02:00
$refractionpcsx2$ refractionpcsx2	ef9f2486d3	Debugger: Fix editing of function names	2020-05-02 19:08:10 +02:00
$refractionpcsx2$ refractionpcsx2	5c8c4ce6fb	Only reload the function symbols in debugger once per game	2020-05-02 19:07:41 +02:00
$refractionpcsx2$ refractionpcsx2	6fc63116bf	Fix up debugger stepping	2020-05-02 05:54:41 +02:00
$refractionpcsx2$ refractionpcsx2	bb09753485	Separate debug pausing from savestates and recording frame advance	2020-05-02 05:35:45 +02:00
lightningterror	113d07775e	onepad: Add PDP Kingdom Hearts Controller. Close #3342	2020-05-02 05:08:40 +02:00
$refractionpcsx2$ refractionpcsx2	a14a6683a4	Move debugger function list reset to when the debugger breaks in to the code. Stops a long freeze when first launching a game	2020-05-02 05:08:23 +02:00
lightningterror	7e7f6543d2	Revert "Locale:ja_JP:Update Hotkey notation" This reverts commit `a7717b9ff1`. It actually broke hotkeys, we noticed a bit too late.	2020-05-01 00:12:19 +02:00
knight-ryu12	e810b76f04	Locale:ja_JP:Update Hotkey notation	2020-04-30 21:59:43 +02:00
lightningterror	f6a9498fb8	Revert "gsdx-ogl/d3d11: Add a assert when texture is too small or too big." This reverts commit `99f814d376`. The assert gets triggered on Linux and so debug build can't be used properly. Would be nice to investigate why in the first place but until then revert the entire commit. We have checks for texture limits anyway so it shouldn't be an issue.	2020-04-29 20:00:53 +02:00
Shadix Aced	38ac62700d	Locales: Update translations (fr-FR). (#3326 )	2020-04-28 14:37:11 +02:00
lightningterror	0cfd2234b0	onepad: Add SZMY-POWER CO. LTD. GAMEPAD to db. Close #3329	2020-04-28 14:35:58 +02:00
Abdullah Hashim	2cca4cd5f9	Locales: Update Arabic Translations ar_SA. (#3302 )	2020-04-14 18:43:15 +02:00
lightningterror	3f970e37c8	onepad: Add SZMY-POWER CO. LTD. GAMEPAD 3 TURBO controller. Issue: https://github.com/PCSX2/pcsx2/issues/3309	2020-04-14 18:42:50 +02:00
lightningterror	ac11927e94	onepad: Update to latest controller database.	2020-04-08 19:36:56 +02:00
lightningterror	551cc381d3	onepad: Update to latest controller database.	2020-03-31 16:05:28 +02:00
lightningterror	876c3bc720	pcsx2: Bump version number to 1.6.0. Bump version number to 1.6, set it as release build, update debian packger to use 1.6.x branch instead of master.	2020-03-23 00:19:27 +01:00
lightningterror	9778dde77a	pcsx2-tas: Disable TAS functionality for 1.6 stable release. Disable TAS on release builds, threading issue maybe? It hangs the emu. Linux always hangs, Windows far less but it's still an issue.	2020-03-23 00:19:27 +01:00
lightningterror	be5fafdd2d	config: Adjust portable.ini runwizard for 1.6 release. Change the runwizard value to 1.	2020-03-23 00:19:27 +01:00