From 7306257c0f4df9f00719e537e41c616d1550f278 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 27 Dec 2011 08:36:16 -0600 Subject: [PATCH] Update from master branch. Update Arabic, Hungarian, and Spanish translations. --- Languages/po/ar.po | 434 ++++++++++++++--- Languages/po/ca.po | 257 +++++++++- Languages/po/cs.po | 250 +++++++++- Languages/po/de.po | 251 +++++++++- Languages/po/dolphin-emu.pot | 251 +++++++++- Languages/po/el.po | 921 ++++++++++++++++++++++++++++------- Languages/po/en.po | 251 +++++++++- Languages/po/es.po | 447 +++++++++++++++-- Languages/po/fr.po | 913 +++++++++++++++++++++------------- Languages/po/he.po | 251 +++++++++- Languages/po/hu.po | 418 ++++++++++++---- Languages/po/it.po | 251 +++++++++- Languages/po/ja.po | 258 +++++++++- Languages/po/ko.po | 251 +++++++++- Languages/po/nb.po | 251 +++++++++- Languages/po/nl.po | 251 +++++++++- Languages/po/pl.po | 282 ++++++++++- Languages/po/pt.po | 257 +++++++++- Languages/po/pt_BR.po | 290 ++++++++++- Languages/po/ru.po | 251 +++++++++- Languages/po/sr.po | 251 +++++++++- Languages/po/zh_CN.po | 251 +++++++++- Languages/po/zh_TW.po | 251 +++++++++- 23 files changed, 7012 insertions(+), 727 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 59bf9c9782..10b8d4bb51 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-16 11:25-0500\n" "Last-Translator: mansoor\n" @@ -19,6 +20,10 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "PO-Revision-Date: 2011-10-16 11:25-0500\n" +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-27 08:27-0600\n" +>>>>>>> Update from master branch. "Last-Translator: mansoor\n" >>>>>>> Update Arabic and Japanese translations. "Language-Team: \n" @@ -103,6 +108,8 @@ msgid "" "%s failed to load as a memorycard \n" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" +"%s فشل تحميل في بطاقة الذاكرة \n" +"الملف ليس كبيرا بما يكفي لتكون بطاقة الذاكرة ملف صحيح (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -221,7 +228,7 @@ msgstr "&إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&JIT" -msgstr "" +msgstr "&JIT" #: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "&Load State" @@ -301,11 +308,11 @@ msgstr "&معلومات عن اللعبة" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" -msgstr "" +msgstr "(-)+zFar" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:53 msgid "(-)+zNear" -msgstr "" +msgstr "(-)+zNear" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:98 msgid "(UNKNOWN)" @@ -405,7 +412,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" -msgstr "" +msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 @@ -426,7 +433,7 @@ msgstr "ضبط:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" -msgstr "" +msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -547,6 +554,7 @@ msgstr "أضف باتش" msgid "Add new pane" msgstr "إضافة جزء جديد" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -556,6 +564,11 @@ msgstr "إضافة جزء جديد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "أضف" @@ -599,16 +612,17 @@ msgstr "إعدادات متقدمة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:666 msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" -msgstr "" +msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" -msgstr "" +msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملفات الجيم كيوب (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -616,6 +630,10 @@ msgstr "جميع ملفات الجيم كيوب (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "حفظ جميع الحالات (sav, s##)" @@ -676,7 +694,7 @@ msgstr "Apploader غير قادر على تحميل ملف من" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" -msgstr "" +msgstr "Apploader:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 msgid "Apply" @@ -711,11 +729,15 @@ msgstr "هل أنت متأكد أنك تريد حذف هذه الملف؟ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -736,11 +758,15 @@ msgstr "صوت الخلفية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -856,10 +882,14 @@ msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "أسفل" @@ -870,7 +900,7 @@ msgstr "يلزم التحكم: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" -msgstr "معطل" +msgstr "معطلة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Browse" @@ -892,11 +922,15 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -960,6 +994,7 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن فتح %s" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 @@ -967,15 +1002,21 @@ msgid "Cannot record movies in read-only mode." msgstr "لا يمكن تسجيل الأفلام في وضع للقراءة فقط." >>>>>>> Update Arabic and Japanese translations. +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 >>>>>>> Update Arabic and Japanese translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +>>>>>>> Update from master branch. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1013,7 +1054,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" -msgstr "" +msgstr "Caps Lock" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" @@ -1091,7 +1132,7 @@ msgstr "DVD اختيار الدليل أصل :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" -msgstr "" +msgstr "Choose a NAND root directory:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" @@ -1114,6 +1155,7 @@ msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" +"اختيار ملف لاستخدام رافعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله فقط)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1122,7 +1164,7 @@ msgstr "اختيار مجلد لاستخراج" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:297 msgid "Circle Stick" -msgstr "" +msgstr "دائرة العصا" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52 msgid "Classic" @@ -1150,10 +1192,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "إغلاق" @@ -1262,11 +1308,15 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "توصيل" @@ -1460,10 +1510,14 @@ msgstr "محرك محاكي الصوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1473,11 +1527,11 @@ msgstr "DSP LLE interpreter (بطيء)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" -msgstr "" +msgstr "DSP LLE on Thread" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" -msgstr "" +msgstr "DSP LLE recompiler" #: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "DSP settings" @@ -1485,7 +1539,7 @@ msgstr "إعدادات الصوت" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" -msgstr "" +msgstr "DVD Root:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" @@ -1506,7 +1560,7 @@ msgstr "" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:281 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:296 msgid "Dead Zone" -msgstr "" +msgstr "المنطقة الميتة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Debug" @@ -1590,11 +1644,11 @@ msgstr "الاتصال الهاتفي" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" -msgstr "" +msgstr "Direct3D11" #: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" -msgstr "" +msgstr "Direct3D9" #: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" @@ -1692,11 +1746,15 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1725,6 +1783,7 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولفين" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1740,6 +1799,14 @@ msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1789,11 +1856,11 @@ msgstr "وهمي " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" -msgstr "" +msgstr "Dump Audio" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" -msgstr "" +msgstr "Dump EFB Target" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" @@ -1801,7 +1868,7 @@ msgstr "تفريغ الإطارات" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" -msgstr "" +msgstr "Dump Textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" @@ -1833,6 +1900,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1842,6 +1910,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Dutch" @@ -1851,7 +1924,7 @@ msgstr "خروج" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" -msgstr "" +msgstr "EFB Copies" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format @@ -1977,6 +2050,7 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -1984,25 +2058,35 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "تمكين تنظيم حساب الإطار" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "تمكين الاسرار " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" -msgstr "" +msgstr "Enable DTK Music" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Enable Dual Core" -msgstr "" +msgstr "Enable Dual Core" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" @@ -2014,7 +2098,7 @@ msgstr "تمكين الاختصارات" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Enable Idle Skipping" -msgstr "" +msgstr "Enable Idle Skipping" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" @@ -2140,6 +2224,7 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2149,6 +2234,11 @@ msgstr "نهاية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "English" @@ -2178,6 +2268,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2195,6 +2286,19 @@ msgid "Error" msgstr "خطأ" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "خطأ" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ في تحميل اللغة المختارة. يتراجع إلى النظام الافتراضية." @@ -2607,7 +2711,7 @@ msgstr "الإطار المسبق" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" -msgstr "" +msgstr "Frame Dumps use FFV1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 msgid "Frame Range" @@ -2629,6 +2733,7 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2638,6 +2743,11 @@ msgstr "تحكم بكاميرا اللعبة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "French" @@ -2660,7 +2770,11 @@ msgstr "دقة العرض :" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:533 msgid "GCI File(*.gci)" -msgstr "" +msgstr "GCI File(*.gci)" + +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +msgid "GCMic Configuration" +msgstr "GCMic اعدادات" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy @@ -2705,10 +2819,14 @@ msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2732,11 +2850,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2745,6 +2868,7 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2754,6 +2878,11 @@ msgstr "الإعدادات العامة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "German" @@ -2891,11 +3020,16 @@ msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "الاختصارات" @@ -2931,7 +3065,7 @@ msgstr "IPL إعدادات" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 msgid "IR" -msgstr "" +msgstr "IR" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "IR Pointer" @@ -2962,6 +3096,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير " +"ماريو" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3056,7 +3195,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" -msgstr "في اللعبة" +msgstr "تتعطل في اللعبة" #: Source/Core/DolphinWX/Src/NetWindow.cpp:592 msgid "In-Game" @@ -3104,11 +3243,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3147,7 +3290,7 @@ msgstr "Interpreter (بطيئة جدا)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" -msgstr "مقدمة" +msgstr "تتعطل في المقدمة" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194 #, c-format @@ -3187,6 +3330,7 @@ msgstr "تسجيل الملف غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3196,6 +3340,11 @@ msgstr "غير صالح حالة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italian" @@ -3233,16 +3382,16 @@ msgstr "Korean" #. i18n: Left #: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" -msgstr "" +msgstr "L" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:39 msgid "L Button" -msgstr "" +msgstr "L Button" #. i18n: Left-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" -msgstr "" +msgstr "L-Analog" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" @@ -3348,6 +3497,7 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3361,6 +3511,13 @@ msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3389,7 +3546,7 @@ msgstr "المحلية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" -msgstr "" +msgstr "Lock Threads to Cores" #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" @@ -3422,7 +3579,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" -msgstr "" +msgstr "M Button" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119 #, c-format @@ -3440,11 +3597,15 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3476,10 +3637,14 @@ msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3675,11 +3840,15 @@ msgstr "التبويب" msgid "NP Up" msgstr "فوق" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3695,7 +3864,7 @@ msgstr "الاسم :" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 msgid "Native GCI files(*.gci)" -msgstr "" +msgstr "Native GCI files(*.gci)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 msgid "New Scan" @@ -3766,11 +3935,15 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "غير متصل" @@ -3832,9 +4005,13 @@ msgstr "فقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "فتح" @@ -3965,6 +4142,7 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3972,6 +4150,10 @@ msgstr "مسارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقفة" @@ -3982,7 +4164,7 @@ msgstr "لكل بكسل إضاءة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" -msgstr "مثالي" +msgstr "مثالية" #: Source/Core/DolphinWX/Src/FrameAui.cpp:608 #, c-format @@ -3992,12 +4174,17 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "بدأ اللعبه" @@ -4013,7 +4200,7 @@ msgstr "بدأ/ايقاف" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" -msgstr "القابلة للتشغيل" +msgstr "قابلة للتشغيل" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "Playback Options" @@ -4023,11 +4210,15 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4135,20 +4326,20 @@ msgstr "خروج" #. i18n: Right #: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" -msgstr "" +msgstr "R" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:40 msgid "R Button" -msgstr "" +msgstr "R Button" #. i18n: Right-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" -msgstr "" +msgstr "R-Analog" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" -msgstr "" +msgstr "RAM" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "RUSSIA" @@ -4238,6 +4429,7 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4249,6 +4441,12 @@ msgstr "تحديث القائمة" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "إزالة" @@ -4268,9 +4466,13 @@ msgstr "تقدم إلى الشاشة الرئيسية" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -4313,11 +4515,15 @@ msgstr "حفظ الحالة" msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4404,6 +4610,7 @@ msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +<<<<<<< HEAD ======= msgstr "" ======= @@ -4412,6 +4619,8 @@ msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "فحص %s" @@ -4451,6 +4660,7 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4466,6 +4676,14 @@ msgstr "اختر ملف تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "اختر ملف تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملف" @@ -4491,6 +4709,7 @@ msgstr "اختر النوافذ العائمة" msgid "Select the file to load" msgstr "حدد الملف لتحميل" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4503,15 +4722,22 @@ msgstr "حدد حالة التحميل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "حدد حفظ الملف" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "حدد حالة التحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "حدد حالة الحفظ" @@ -4618,7 +4844,7 @@ msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملف" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 msgid "Shake" -msgstr "" +msgstr "هزة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" @@ -4854,7 +5080,7 @@ msgstr "لقطة" #: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:52 msgid "Software Renderer" -msgstr "" +msgstr "Software Renderer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" @@ -4885,6 +5111,7 @@ msgstr "فشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4894,6 +5121,11 @@ msgstr "مجال" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanish" @@ -4927,21 +5159,25 @@ msgstr "حدد الخلفية ملف فيديو" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Speed up Disc Transfer Rate" -msgstr "" +msgstr "تسريع معدل نقل القرص" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:243 msgid "Square Stick" -msgstr "" +msgstr "مربع العصا" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4977,9 +5213,13 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -5057,15 +5297,23 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5079,6 +5327,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" +<<<<<<< HEAD msgstr "" ======= #, fuzzy @@ -5095,6 +5344,9 @@ msgstr "إزالة التخزين المؤقت" ======= msgstr "" >>>>>>> Update Arabic and Japanese translations. +======= +msgstr "Texture Cache" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5310,18 +5562,26 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "أعلى" @@ -5366,7 +5626,7 @@ msgstr "UDP منفذ :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" -msgstr "" +msgstr "UDP Wiimote" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "UNKNOWN" @@ -5428,6 +5688,7 @@ msgstr "تلقى رسالة مجهولة مع معرف : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5440,6 +5701,8 @@ msgstr "" "مواصلة?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5632,6 +5895,41 @@ msgstr "" ======= >>>>>>> Update Arabic and Japanese translations. +#: Source/Core/Core/Src/Movie.cpp:629 +#, c-format +msgid "" +"Warning: You loaded a save that's after the end of the current movie. (byte " +"%u > %u) (frame %u > %u). You should load another save before continuing, or " +"load this state with read-only mode off." +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +"should load another save before continuing, or load this state with read-" +"only mode off. Otherwise you'll probably get a desync." +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on frame %d. You should " +"load another save before continuing, or load this state with read-only mode " +"off. Otherwise you'll probably get a desync.\n" +"\n" +"More information: The current movie is %d frames long and the savestate's " +"movie is %d frames long.\n" +"\n" +"On frame %d, the current movie presses:\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"\n" +"On frame %d, the savestate's movie presses:\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5659,17 +5957,21 @@ msgstr "جهاز الوي" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" -msgstr "" +msgstr "Wii NAND Root:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "Wii Save Import" msgstr "استيراد حفظ الوي" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "ملفات حفظ الوي (*.bin)|*.bin" @@ -5700,11 +6002,15 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الفور?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5736,6 +6042,7 @@ msgstr "نوافذ اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5745,6 +6052,11 @@ msgstr "كلمة ختامية" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "العمل" @@ -5898,7 +6210,7 @@ msgstr "^أضف " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" -msgstr "" +msgstr "apploader (.img)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185 msgid "failed to read bk header" @@ -5916,7 +6228,7 @@ msgstr "فشل في قراءة عنوان" #: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." -msgstr "" +msgstr "iCacheJIT: قراءة شفرة تشغيل من %x. الرجاء التقرير." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format @@ -5925,7 +6237,7 @@ msgstr "ليس حفظ الوي أو قراءة فشلة لحجم عنوان ا #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" -msgstr "" +msgstr "s" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 #, c-format @@ -5934,15 +6246,15 @@ msgstr "أمر غير معروف 0x%08x" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" -msgstr "" +msgstr "wxExecute returned -1 on application run!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:55 msgid "zFar Correction: " -msgstr "" +msgstr "zFar تصحيح: " #: Source/Core/DolphinWX/Src/PHackSettings.cpp:50 msgid "zNear Correction: " -msgstr "" +msgstr "zNear تصحيح: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 msgid "| OR" @@ -6056,12 +6368,18 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "لا يمكن تسجيل الأفلام في وضع للقراءة فقط." ======= >>>>>>> Update Arabic and Japanese translations. +======= +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "لا يمكن تسجيل الأفلام في وضع للقراءة فقط." + +>>>>>>> Update from master branch. #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" @@ -6570,6 +6888,9 @@ msgstr "أو" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6577,10 +6898,13 @@ msgstr "أو" #~ "مؤشر غير معروف %#08x\n" #~ "مواصلة?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Arabic and Japanese translations. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index bb6dd4f690..e7664edac1 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -568,6 +572,7 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -577,6 +582,11 @@ msgstr "Afegeix un nou panell" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Afegir ..." @@ -644,6 +654,7 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -651,6 +662,10 @@ msgstr "Tots els fitxers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -739,11 +754,15 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -764,11 +783,15 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -885,10 +908,14 @@ msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Abaix" @@ -921,11 +948,15 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1183,10 +1214,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Tancar" @@ -1295,11 +1330,15 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connectant ..." @@ -1491,10 +1530,14 @@ msgstr "Motor d'emulació DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1725,11 +1768,15 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1758,6 +1805,7 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1773,6 +1821,14 @@ msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuració del control GC Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1869,6 +1925,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1878,6 +1935,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandès" @@ -2023,21 +2085,31 @@ msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2190,6 +2262,7 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2199,6 +2272,11 @@ msgstr "Fi" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Anglès" @@ -2228,6 +2306,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2245,6 +2324,19 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2703,6 +2795,7 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2712,6 +2805,11 @@ msgstr "Visió lliure" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francès" @@ -2779,10 +2877,14 @@ msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2806,11 +2908,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2819,6 +2926,7 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2828,6 +2936,11 @@ msgstr "Configuració General" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemany" @@ -2962,11 +3075,16 @@ msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3191,11 +3309,15 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3277,6 +3399,7 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3286,6 +3409,11 @@ msgstr "Estat invàlid" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italià" @@ -3443,6 +3571,7 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3456,6 +3585,13 @@ msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3537,11 +3673,15 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3573,10 +3713,14 @@ msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3776,11 +3920,15 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3867,11 +4015,15 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "No està connectat" @@ -3933,9 +4085,13 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Obrir" @@ -4066,6 +4222,7 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4073,6 +4230,10 @@ msgstr "Camins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4093,12 +4254,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Executar" @@ -4124,11 +4290,15 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4340,6 +4510,7 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4351,6 +4522,12 @@ msgstr "Actualitza la llista de jocs" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Treure" @@ -4370,9 +4547,13 @@ msgstr "Renderitzar a la finestra principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4415,11 +4596,15 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4503,11 +4688,15 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4547,6 +4736,7 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4562,6 +4752,14 @@ msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4586,6 +4784,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4598,15 +4797,22 @@ msgstr "Seleccioneu l'estat a carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4989,6 +5195,7 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4998,6 +5205,11 @@ msgstr "Espai" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanyol" @@ -5042,11 +5254,15 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5082,9 +5298,13 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -5162,9 +5382,13 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -5411,18 +5635,26 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Dalt" @@ -5532,6 +5764,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5544,6 +5777,8 @@ msgstr "" "Voleu continuar?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5769,11 +6004,15 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5804,11 +6043,15 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5840,6 +6083,7 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5849,6 +6093,11 @@ msgstr "Envoltant de paraula" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Treballant ..." @@ -6421,6 +6670,9 @@ msgstr "| O" #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6428,8 +6680,11 @@ msgstr "| O" #~ "Punter desconegud %#08x\n" #~ "Voleu continuar?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 728e2493b1..b561011572 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" <<<<<<< HEAD "PO-Revision-Date: 2011-10-15 14:50+0100\n" @@ -27,6 +28,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-12-19 07:39+0100\n" >>>>>>> Update Czeck translation. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-19 07:39+0100\n" +>>>>>>> Update from master branch. "Last-Translator: Zbyněk Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -562,6 +567,7 @@ msgstr "Přidat nový panel" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -580,6 +586,11 @@ msgstr "Přidat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Přidat..." @@ -646,6 +657,7 @@ msgstr "Všechny soubory Gamecube GCM )gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -660,6 +672,10 @@ msgstr "Všechny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Všechny Uložené Stavy (sav, s##)" @@ -762,6 +778,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= @@ -774,6 +791,9 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -795,6 +815,7 @@ msgstr "Backend Zvuku:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= @@ -807,6 +828,9 @@ msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -925,6 +949,7 @@ msgstr "Modrá vpravo" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -937,6 +962,9 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Dole" @@ -972,6 +1000,7 @@ msgstr "Vyrovnávací paměť:" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 @@ -984,6 +1013,9 @@ msgstr "Vyrovnávací paměť:" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1216,6 +1248,7 @@ msgstr "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1227,6 +1260,9 @@ msgstr "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" @@ -1339,6 +1375,7 @@ msgstr "Připojit Wiimote 4" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -1349,6 +1386,9 @@ msgstr "Připojit Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Připojuji..." @@ -1541,8 +1581,12 @@ msgstr "Jádro Emulátoru DSP" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1766,6 +1810,7 @@ msgstr "Rozdělit" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1776,6 +1821,9 @@ msgstr "Rozdělit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Chcete současnou emulaci zastavit?" @@ -1807,6 +1855,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" @@ -1835,6 +1884,14 @@ msgstr "Dolphin GCPad Nastavení" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1925,6 +1982,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -1943,6 +2001,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Nizozemština" @@ -2073,18 +2136,25 @@ msgstr "Zapnout Slučování Bloků" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "Povolit výpočet ohraničujícího rámečku" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2095,6 +2165,9 @@ msgstr "Povolit vyrovnávací paměť" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2232,6 +2305,7 @@ msgstr "End" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2250,6 +2324,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Angličtina" @@ -2303,13 +2382,25 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"Chyba v PlayWiimote. %u != %u, bajt %d.\n" +"Je nám líto, nahrávání Wii je dočasně nefunkční." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 ======= #: Source/Core/DolphinWX/Src/Main.cpp:356 @@ -2765,6 +2856,7 @@ msgstr "Rozhlížení pomocí myši" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2783,6 +2875,11 @@ msgstr "Rozhlížení pomocí myši" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francouzština" @@ -2861,8 +2958,12 @@ msgstr "Nastavení Gamecube &Pad" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2901,7 +3002,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" @@ -2914,6 +3016,7 @@ msgstr "Obecná Nastavení" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -2932,6 +3035,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Němčina" @@ -3073,6 +3181,7 @@ msgstr "Nastavení klávesových zkratek" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= @@ -3086,6 +3195,10 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3289,6 +3402,7 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě ne <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3299,6 +3413,9 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě ne ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3383,6 +3500,7 @@ msgstr "Neplatný stav" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3401,6 +3519,11 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italština" @@ -3561,6 +3684,7 @@ msgstr "Nahrát Stav..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" @@ -3587,6 +3711,13 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3671,6 +3802,7 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 @@ -3681,6 +3813,9 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3714,6 +3849,7 @@ msgstr "Bajt Paměti" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3726,6 +3862,9 @@ msgstr "Bajt Paměti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Paměťová karta" @@ -3916,6 +4055,7 @@ msgstr "NK Nahoru" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -3925,6 +4065,9 @@ msgstr "NK Nahoru" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4014,6 +4157,7 @@ msgstr "Nenastaven" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -4024,6 +4168,9 @@ msgstr "Nenastaven" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nepřipojen" @@ -4095,7 +4242,11 @@ msgstr "Pouze bloky %d jsou dostupné" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otevřít" @@ -4225,6 +4376,7 @@ msgstr "Cesty" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4237,6 +4389,10 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4272,9 +4428,14 @@ msgstr "Perspektiva %d" ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Spustit" @@ -4303,6 +4464,7 @@ msgstr "Hráči" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4313,6 +4475,9 @@ msgstr "Hráči" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Prosím potvrďte..." @@ -4526,6 +4691,7 @@ msgstr "Obnovit seznam her" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4548,6 +4714,12 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Odstranit" @@ -4578,6 +4750,7 @@ msgstr "Vykreslit do Hlavního okna" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4624,6 +4797,7 @@ msgstr "Uložit Sta&v" msgid "Safe" msgstr "Bezpečná" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4634,6 +4808,9 @@ msgstr "Bezpečná" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4721,6 +4898,7 @@ msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno... msgid "Scaled EFB Copy" msgstr "EFB Kopie Změněné Velikosti" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4731,6 +4909,9 @@ msgstr "EFB Kopie Změněné Velikosti" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -4772,6 +4953,7 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4795,6 +4977,14 @@ msgstr "Vyberte Soubor s Nahrávkou" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4823,6 +5013,7 @@ msgstr "Vyberte soubor k nahrání" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -4840,13 +5031,17 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 @@ -4857,6 +5052,9 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5219,6 +5417,7 @@ msgstr "Mezerník" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5237,6 +5436,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Španělština" @@ -5275,6 +5479,7 @@ msgstr "Standardní Ovladač" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 @@ -5284,6 +5489,9 @@ msgstr "Standardní Ovladač" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5330,7 +5538,11 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -5415,7 +5627,11 @@ msgstr "Deska vpravo" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Vytvořit Snímek Obrazovky" @@ -5650,15 +5866,20 @@ msgstr "Přepnout na Celou Obrazovku" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Přepnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Nahoře" @@ -5766,6 +5987,7 @@ msgstr "Přijata neznámá zpráva s id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Neznámá zpráva s id:%d přijata od hráče:%d Vyhazuji hráče!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5786,6 +6008,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6005,6 +6229,7 @@ msgstr "Import uložených pozic Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6015,6 +6240,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6048,6 +6276,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 @@ -6058,6 +6287,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Připojen" @@ -6092,6 +6324,7 @@ msgstr "Zalamování textu" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6106,6 +6339,11 @@ msgstr "Zalamování textu" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Pracuji..." @@ -6714,6 +6952,9 @@ msgstr "| NEBO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6721,6 +6962,7 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "Pokračovat?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= @@ -6757,6 +6999,8 @@ msgstr "| NEBO" >>>>>>> Update Greek and Czech translations ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index 8772af3d05..52e4251e01 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -555,6 +559,7 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -564,6 +569,11 @@ msgstr "Neue Palette hinzufügen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Hinzufügen..." @@ -632,6 +642,7 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -639,6 +650,10 @@ msgstr "Alle Gamecube GCM Dateien (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -721,11 +736,15 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -746,11 +765,15 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -865,10 +888,14 @@ msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Unten" @@ -901,11 +928,15 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1145,10 +1176,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Schließen" @@ -1258,11 +1293,15 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1455,10 +1494,14 @@ msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1675,11 +1718,15 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1709,6 +1756,7 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1724,6 +1772,14 @@ msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Konfiguration" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1811,6 +1867,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1820,6 +1877,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holländisch" @@ -1948,22 +2010,32 @@ msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2102,6 +2174,7 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2111,6 +2184,11 @@ msgstr "Ende" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Englisch" @@ -2140,6 +2218,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2157,6 +2236,19 @@ msgid "Error" msgstr "Fehler" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Fehler" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2617,6 +2709,7 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2626,6 +2719,11 @@ msgstr "Frei Umsehen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Französisch" @@ -2695,10 +2793,14 @@ msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2723,11 +2825,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2737,6 +2844,7 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2746,6 +2854,11 @@ msgstr "Interface Einstellungen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Deutsch" @@ -2871,11 +2984,16 @@ msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -3090,11 +3208,15 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3180,6 +3302,7 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3189,6 +3312,11 @@ msgstr "Ungültiger Status" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italienisch" @@ -3347,20 +3475,28 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3445,11 +3581,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3482,10 +3622,14 @@ msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Memory Card" @@ -3672,11 +3816,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,11 +3912,15 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nicht Verbunden" @@ -3830,9 +3982,13 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Öffnen" @@ -3964,6 +4120,7 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3971,6 +4128,10 @@ msgstr "Pfade" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3992,12 +4153,17 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Start" @@ -4024,11 +4190,15 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4244,6 +4414,7 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4255,6 +4426,12 @@ msgstr "Spieleliste aktualisieren" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Entfernen" @@ -4274,9 +4451,13 @@ msgstr "Im Hauptfenster Rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4319,11 +4500,15 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4408,11 +4593,15 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4452,6 +4641,7 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4467,6 +4657,14 @@ msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4493,6 +4691,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4505,15 +4704,22 @@ msgstr "Status zum Laden auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Status zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4869,6 +5075,7 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4878,6 +5085,11 @@ msgstr "Leertaste" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanisch" @@ -4913,11 +5125,15 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4953,9 +5169,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5029,9 +5249,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -5278,18 +5502,26 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Oben" @@ -5394,6 +5626,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5406,6 +5639,8 @@ msgstr "" "Fortfahren?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5616,11 +5851,15 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5651,11 +5890,15 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5688,6 +5931,7 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5697,6 +5941,11 @@ msgstr "Zeilenumbruch" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index dd44453140..271f6d526b 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -9,10 +9,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -510,6 +514,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -519,6 +524,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -572,6 +582,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -579,6 +590,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -656,11 +671,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -681,11 +700,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -794,10 +817,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -830,11 +857,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1057,10 +1088,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1169,11 +1204,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1349,10 +1388,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1562,11 +1605,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1595,6 +1642,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1610,6 +1658,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1692,6 +1748,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1701,6 +1758,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1824,21 +1886,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1964,6 +2036,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1973,6 +2046,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2002,6 +2080,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2019,6 +2098,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2433,6 +2525,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2442,6 +2535,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2508,10 +2606,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2533,11 +2635,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2546,6 +2653,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2555,6 +2663,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2670,11 +2783,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2864,11 +2982,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2945,6 +3067,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2954,6 +3077,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3104,6 +3232,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3117,6 +3246,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3193,11 +3329,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3229,10 +3369,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3409,11 +3553,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3500,11 +3648,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3566,9 +3718,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3694,6 +3850,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3701,6 +3858,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3721,12 +3882,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3752,11 +3918,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3962,6 +4132,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3973,6 +4144,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3989,9 +4166,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4034,11 +4215,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4122,11 +4307,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4166,6 +4355,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4181,6 +4371,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4203,6 +4401,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4215,15 +4414,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4557,6 +4763,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4566,6 +4773,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4601,11 +4813,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4641,9 +4857,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4716,9 +4936,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4931,18 +5155,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5044,6 +5276,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5054,6 +5287,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5255,11 +5490,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5286,11 +5525,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5322,6 +5565,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5331,6 +5575,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 7a97de70b5..f5da4c8403 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= @@ -23,6 +24,10 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 11:16+0200\n" >>>>>>> Update Greek and Czech translations +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -58,7 +63,8 @@ msgstr "" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." -msgstr "Το \"%s\" είναι ένα μη έγκυρο αρχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." +msgstr "" +"Το \"%s\" είναι ένα μη έγκυρο αρχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -86,7 +92,8 @@ msgstr "%s υπάρχει ήδη, θέλετε αντικατάσταση;" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αρχείο εικόνας είναι φθαρμένο." +msgstr "" +"%s απέτυχε να γίνει scrubbed. Πιθανότατα το αρχείο εικόνας είναι φθαρμένο." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format @@ -113,7 +120,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s απέτυχε να φορτώσει ως κάρτα μνήμης \n" -"το αρχείο δεν είναι αρκετά μεγάλο ώστε να αποτελεί έγκυρο αρχείο κάρτας μνήμης (0x%x bytes)" +"το αρχείο δεν είναι αρκετά μεγάλο ώστε να αποτελεί έγκυρο αρχείο κάρτας " +"μνήμης (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -144,7 +152,9 @@ msgstr "Το %s είναι ήδη συμπιεσμένο! Δε γίνεται ν #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, c-format msgid "%s is too long for the filename, max chars is 45" -msgstr "Το %s είναι πολύ μεγάλο για όνομα αρχείου, ο μέγιστος αριθμός χαρακτήρων είναι 45" +msgstr "" +"Το %s είναι πολύ μεγάλο για όνομα αρχείου, ο μέγιστος αριθμός χαρακτήρων " +"είναι 45" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:199 #, c-format @@ -385,11 +395,13 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following settings:\n" +"NetPlay will currently only work properly when using the following " +"settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to " +"[Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -403,10 +415,12 @@ msgstr "" " - Δύο Πυρήνες [ΑΝΕΝΕΡΓΟ]\n" " - Throttle Ήχου [ΑΝΕΝΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - Χειροκίνητη εισαγωγή του ακριβούς αριθμού των ελεγκτών που θα χρησιμοποιηθούν σαν [Τυπικός Ελεγκτής]\n" +" - Χειροκίνητη εισαγωγή του ακριβούς αριθμού των ελεγκτών που θα " +"χρησιμοποιηθούν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες πρέπει να έχουν την ίδια έκδοση και ρυθμίσεις του Dolphin.\n" -"Απενεργοποιήστε όλες τις κάρτες μνήμης ή στείλτε τες σε όλους τους παίκτες πριν την εκκίνηση.\n" +"Απενεργοποιήστε όλες τις κάρτες μνήμης ή στείλτε τες σε όλους τους παίκτες " +"πριν την εκκίνηση.\n" "Η υποστήριξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα πρέπει να έχετε κάνει προώθηση της πόρτας TCP στον host!!" @@ -466,12 +480,14 @@ msgstr "Ακριβής VBeam εξομοίωση" >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay functionality.\n" +"Some games depend on this for certain graphical effects or gameplay " +"functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακρίβεια τα EFB αντίγραφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για ορισμένα εφέ γραφικών ή λειτουργίες του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για ορισμένα εφέ γραφικών ή λειτουργίες " +"του gameplay.\n" "\n" "Αν δεν είστε σίγουροι, επιλέξτε EFB Αντίγραφα σε Υφή." @@ -497,23 +513,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) στην Προσθήκη Κωδικού (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) στην " +"Προσθήκη Κωδικού (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Fill και Slide (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Fill " +"και Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Ram Write και Fill (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Ram " +"Write και Fill (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Write To Pointer (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Write " +"To Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -522,8 +553,11 @@ msgstr "Σφάλμα Action Replay: Μη έγκυρη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Σφάλμα Action Replay: Οι λειτουργίες Master Code και Write To CCXXXXXX δεν έχουν υλοποιηθεί (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Σφάλμα Action Replay: Οι λειτουργίες Master Code και Write To CCXXXXXX δεν " +"έχουν υλοποιηθεί (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -574,6 +608,7 @@ msgstr "Προσθήκη νέου pane" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -592,6 +627,11 @@ msgstr "Προσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Προσθήκη..." @@ -603,7 +643,8 @@ msgstr "Διεύθυνση :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -613,7 +654,8 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -621,7 +663,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "Ρύθμιση της απαιτούμενης πίεσης του αναλογικού χειριστηρίου για την ενεργοποίηση των κουμπιών." +msgstr "" +"Ρύθμιση της απαιτούμενης πίεσης του αναλογικού χειριστηρίου για την " +"ενεργοποίηση των κουμπιών." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -646,6 +690,7 @@ msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -660,6 +705,10 @@ msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -677,11 +726,13 @@ msgstr "Όλα τα αρχεία (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Επιτρέπει την εναλλαγή ορισμένων επιλογών με τα πλήκτρα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παράθυρο εξομοίωσης.\n" +"Επιτρέπει την εναλλαγή ορισμένων επιλογών με τα πλήκτρα συντόμευσης 3, 4, 5, " +"6 και 7 μέσα από το παράθυρο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -760,8 +811,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για πάντα!" +msgstr "" +"Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για " +"πάντα!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= @@ -774,6 +828,9 @@ msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετ #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -795,6 +852,7 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= @@ -807,6 +865,9 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -830,7 +891,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Προσαρμόζει αυτόματα το μέγεθος του παραθύρου σύμφωνα με την εσωτερική ανάλυση.\n" +"Προσαρμόζει αυτόματα το μέγεθος του παραθύρου σύμφωνα με την εσωτερική " +"ανάλυση.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -859,7 +921,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= "Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις υφές.\n" +"Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις " +"υφές.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -953,8 +1016,12 @@ msgstr "Δεξί Μπλε" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Βάση" @@ -990,6 +1057,7 @@ msgstr "Buffer:" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 @@ -1002,6 +1070,9 @@ msgstr "Buffer:" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1026,12 +1097,16 @@ msgstr "Cache Display Lists" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel " +"depth calculations are necessary to properly emulate a small number of " +"games.\n" "\n" "If unsure, leave this checked." msgstr "" "Υπολογισμός των τιμών βάθους των 3D γραφικών ανά pixel αντί ανά vertex.\n" -"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι υπολογισμοί του βάθους ανά pixel είναι απαραίτητοι για την σωστή εξομοίωση ενός μικρού αριθμού παιχνιδιών.\n" +"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι " +"υπολογισμοί του βάθους ανά pixel είναι απαραίτητοι για την σωστή εξομοίωση " +"ενός μικρού αριθμού παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -1045,7 +1120,8 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γραφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχύτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μπορεί να προκαλέσει ορισμένες φορές προβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μπορεί να προκαλέσει ορισμένες " +"φορές προβλήματα.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -1199,22 +1275,29 @@ msgstr "Επιλέξτε ένα αρχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάρτα μνήμης:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Επιλέξτε ένα αρχείο για χρήση ως apploader: (έχει εφαρμογή σε δίσκους που " "απαρτίζονται μόνο από φακέλους)" +<<<<<<< HEAD ======= msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" msgstr "Επιλέξτε ένα αρχείο για χρήση ως apploader: (έχει εφαρμογή σε δίσκους που απαρτίζονται μόνο από φακέλους)" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1241,12 +1324,17 @@ msgid "Clear failed." msgstr "Το καθάρισμα απέτυχε." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεργοποιηθεί. Θα πρέπει να σταματήσετε χειροκίνητα το παιχνίδι." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " +"απενεργοποιηθεί. Θα πρέπει να σταματήσετε χειροκίνητα το παιχνίδι." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1258,6 +1346,9 @@ msgstr "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" @@ -1370,6 +1461,7 @@ msgstr "Σύνδεση Wiimote 4" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -1380,6 +1472,9 @@ msgstr "Σύνδεση Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Γίνεται Σύνδεση..." @@ -1420,10 +1515,15 @@ msgstr "Αποτυχία εκκίνησης backend %s" #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format -msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." +msgid "" +"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " +"backup. Please note that original Gamecube and Wii discs cannot be read by " +"most PC DVD drives." msgstr "" -"Δεν μπόρεσε να γίνει ανάγνωση \"%s\". Δεν υπάρχει δίσκος στον οδηγό, ή δεν είναι ένα αντίγραφο εικόνας GC/Wii.\n" -" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μπορούν να αναγνωστούν από τους περισσότερους PC DVD οδηγούς." +"Δεν μπόρεσε να γίνει ανάγνωση \"%s\". Δεν υπάρχει δίσκος στον οδηγό, ή δεν " +"είναι ένα αντίγραφο εικόνας GC/Wii.\n" +" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μπορούν να αναγνωστούν " +"από τους περισσότερους PC DVD οδηγούς." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1440,19 +1540,23 @@ msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -"Αδυναμία καθορισμού χειριστηρίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι τρέχει!\n" -"(ο καθορισμός των χειριστηρίων ενώ το παιχνίδι τρέχει δεν υποστηρίζεται προς το παρόν)" +"Αδυναμία καθορισμού χειριστηρίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι " +"τρέχει!\n" +"(ο καθορισμός των χειριστηρίων ενώ το παιχνίδι τρέχει δεν υποστηρίζεται προς " +"το παρόν)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write " +"protected?" msgstr "" "Δεν μπόρεσε να γίνει εγγραφή των αρχείων της κάρτας μνήμης %s.\n" "\n" -"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αρχείο έχει προστασία εγγραφής;" +"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αρχείο έχει " +"προστασία εγγραφής;" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1489,21 +1593,28 @@ msgstr "Δημιουργία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "Δημιουργήθηκε από KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Δημιουργήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" +<<<<<<< HEAD ======= msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "Δημιουργήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1511,7 +1622,9 @@ msgstr "Δημιουργήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Δημιουργήθηκε από black_rider και δημοσιεύθηκε στο ForumW.org > Web Developments" +msgstr "" +"Δημιουργήθηκε από black_rider και δημοσιεύθηκε στο ForumW.org > Web " +"Developments" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 msgid "Creator: " @@ -1586,8 +1699,12 @@ msgstr "Μηχανή Εξομοίωσης DSP" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γρήγορη)" @@ -1693,8 +1810,12 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "Εντοπίστηκε προσπάθεια ανάγνωσης περισσότερων δεδομένων από το DVD από όσα χωράνε μέσα στο buffer. Clamp." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"Εντοπίστηκε προσπάθεια ανάγνωσης περισσότερων δεδομένων από το DVD από όσα " +"χωράνε μέσα στο buffer. Clamp." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1750,24 +1871,30 @@ msgstr "Απενεργοποίηση Υφών" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely " +"on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Απενεργοποιεί την XFB εξομοίωση.\n" -"Επιταχύνει αρκετά την εξομοίωση αλλά προκαλεί μεγάλα ελαττώματα σε πολλά παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαρμογές).\n" +"Επιταχύνει αρκετά την εξομοίωση αλλά προκαλεί μεγάλα ελαττώματα σε πολλά " +"παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαρμογές).\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so " +"while checking this setting gives a great speedup it almost always also " +"causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Απενεργοποιεί την εξομοίωση των EFB αντιγραφών.\n" -"Χρησιμοποιούνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν και επιλέγοντάς το αυξάνονται κατά πολύ οι επιδόσεις, σχεδόν πάντα προκαλούνται προβλήματα.\n" +"Χρησιμοποιούνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν " +"και επιλέγοντάς το αυξάνονται κατά πολύ οι επιδόσεις, σχεδόν πάντα " +"προκαλούνται προβλήματα.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -1811,6 +1938,7 @@ msgstr "Divide" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1821,6 +1949,9 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;" @@ -1852,6 +1983,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" @@ -1880,6 +2012,14 @@ msgstr "Ρυθμίσεις Dolphin GCPad" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Ρυθμίσεις Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1891,18 +2031,23 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση " "αρχείων..." +<<<<<<< HEAD ======= msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." msgstr "Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση αρχείων..." @@ -1914,16 +2059,23 @@ msgstr "Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "Το Dolphin είναι ρυθμισμένο να αποκρύπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστούν όλα τα παιχνίδια..." +<<<<<<< HEAD ======= msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." msgstr "Το Dolphin είναι ρυθμισμένο να αποκρύπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστούν όλα τα παιχνίδια..." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1969,7 +2121,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καρέ σε ένα AVI αρχείο στο User/Dump/Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καρέ σε ένα AVI αρχείο στο User/Dump/" +"Frames/\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -1979,7 +2132,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του παιχνιδιού στο User/Dump/Textures//\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του παιχνιδιού στο User/Dump/Textures/" +"/\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -1996,6 +2150,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2014,6 +2169,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Ολλανδικά" @@ -2027,8 +2187,16 @@ msgstr "EFB Αντίγραφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." -msgstr "ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγούς που να είναι τουλάχιστον έκδοσης %d.%d -- Αν πρόσφατα αναβαθμίσατε την διανομή του Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δούνε τους νέους οδηγούς." +msgid "" +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"version %d.%d -- If you recently upgraded your Dolphin distribution, a " +"reboot is probably required at this point to get Windows to see the new " +"driver." +msgstr "" +"ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγούς που να είναι " +"τουλάχιστον έκδοσης %d.%d -- Αν πρόσφατα αναβαθμίσατε την διανομή του " +"Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δούνε " +"τους νέους οδηγούς." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2078,24 +2246,31 @@ msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is " +"necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Εξομοιώνει τα XFBs με ακρίβεια.\n" -"Επιβραδύνει αρκετά την εξομοίωση και αποτρέπει την απόδοση γραφικών υψηλής ανάλυσης, αλλά είναι απαραίτητο για την σωστή εξομοίωση ορισμένου αριθμού παιχνιδιών.\n" +"Επιβραδύνει αρκετά την εξομοίωση και αποτρέπει την απόδοση γραφικών υψηλής " +"ανάλυσης, αλλά είναι απαραίτητο για την σωστή εξομοίωση ορισμένου αριθμού " +"παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουροι, επιλέξτε εικονική XFB εξομοίωση." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as " +"slow as real XFB emulation. However, it may still fail for a lot of other " +"games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Εξομοιώνει XFBs χρησιμοποιώντας GPU αντικείμενα υφής.\n" -"Διορθώνει πολλά παιχνίδια που δεν δουλεύουν χωρίς XFB εξομοίωση, χωρίς παράληλα να είναι αργή όπως η πραγματική XFB εξομοίωση. Παρόλα αυτά μπορεί να αποτύχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαρμογές).\n" +"Διορθώνει πολλά παιχνίδια που δεν δουλεύουν χωρίς XFB εξομοίωση, χωρίς " +"παράληλα να είναι αργή όπως η πραγματική XFB εξομοίωση. Παρόλα αυτά μπορεί " +"να αποτύχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαρμογές).\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -2113,13 +2288,15 @@ msgstr "Ενεργοποίηση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " +"supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Ενεργοποιεί 3D εφέ μέσω στερεοσκοπίας χρησιμοποιώντας την τεχνολογία 3D Vision της Nvidia αν υποστηρίζεται από την GPU.\n" +"Ενεργοποιεί 3D εφέ μέσω στερεοσκοπίας χρησιμοποιώντας την τεχνολογία 3D " +"Vision της Nvidia αν υποστηρίζεται από την GPU.\n" "Πιθανώς μπορεί να προκαλέσει προβλήματα.\n" "Χρειάζεται λειτουργία πλήρης οθόνης για να λειτουργήσει.\n" "\n" @@ -2144,16 +2321,23 @@ msgstr "Ενεργοποίηση Block Merging" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ενεργοποίηση Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= @@ -2168,6 +2352,9 @@ msgstr "Ενεργοποίηση Cheat" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Ενεργοποίηση Cheat" @@ -2225,14 +2412,19 @@ msgid "" "If unsure, select 1x." msgstr "" "Ενεργοποιεί το ανισοτροπικό φιλτράρισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βρίσκονται σε οξείες οπτικές γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βρίσκονται σε οξείες οπτικές " +"γωνίες.\n" "Μπορεί να προκαλέσει προβλήματα σε έναν μικρό αριθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουροι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Ενεργοποιεί τη γρήγορη πρόσβαση δίσκου. Απαραίτητο για μερικά παιχνίδια. (ΕΝΕΡΓΟ = Γρήγορο, ΑΝΕΝΕΡΓΟ = Συμβατό)" +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Ενεργοποιεί τη γρήγορη πρόσβαση δίσκου. Απαραίτητο για μερικά παιχνίδια. " +"(ΕΝΕΡΓΟ = Γρήγορο, ΑΝΕΝΕΡΓΟ = Συμβατό)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2245,41 +2437,57 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Ενεργοποιήστε το αν θέλετε ολόκληρη η οθόνη να χρησιμοποιηθεί για την απεικόνιση.\n" +"Ενεργοποιήστε το αν θέλετε ολόκληρη η οθόνη να χρησιμοποιηθεί για την " +"απεικόνιση.\n" "Αν αυτό είναι απενεργοποιημένο, θα δημιουργηθεί ένα παράθυρο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather " +"than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Ενεργοποιήστε το αν θέλετε να χρησιμοποιήσετε το κύριο παράθυρο του Dolphin για απεικόνιση αντί για ξεχωριστό παράθυρο απεικόνισης.\n" +"Ενεργοποιήστε το αν θέλετε να χρησιμοποιήσετε το κύριο παράθυρο του Dolphin " +"για απεικόνιση αντί για ξεχωριστό παράθυρο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "Ενεργοποιήστε το για να επιταχύνετε το The Legend of Zelda: Twilight " "Princess. Απενεργοποιήστε το για τα υπόλοιπα παιχνίδια." +<<<<<<< HEAD ======= msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." msgstr "Ενεργοποιήστε το για να επιταχύνετε το The Legend of Zelda: Twilight Princess. Απενεργοποιήστε το για τα υπόλοιπα παιχνίδια." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" -msgstr "Ενεργοποιεί την Block Address Translation (BAT), μία λειτουργία της Μονάδας Διαχείρισης Μνήμης. Ακριβές ως προς το υλικό, αλλά αργό στην εξομοίωση. (Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)" +msgid "" +"Enables Block Address Translation (BAT); a function of the Memory Management " +"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " +"Fast)" +msgstr "" +"Ενεργοποιεί την Block Address Translation (BAT), μία λειτουργία της Μονάδας " +"Διαχείρισης Μνήμης. Ακριβές ως προς το υλικό, αλλά αργό στην εξομοίωση. " +"(Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" @@ -2292,13 +2500,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Ενεργοποιεί την προοδευτική σάρωση αν υποστηρίζεται από το εξομοιωμένο λογισμικό. Τα περισσότερα παιχνίδια δεν την χρειάζονται αυτήν την ρύθμιση.\n" +"Ενεργοποιεί την προοδευτική σάρωση αν υποστηρίζεται από το εξομοιωμένο " +"λογισμικό. Τα περισσότερα παιχνίδια δεν την χρειάζονται αυτήν την ρύθμιση.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Ενεργοποιεί τη Μονάδα Διαχείρισης Μνήμης, απαραίτητο για μερικά παιχνίδια. (Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)" +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Ενεργοποιεί τη Μονάδα Διαχείρισης Μνήμης, απαραίτητο για μερικά παιχνίδια. " +"(Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2317,6 +2530,7 @@ msgstr "Τέλος" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2335,6 +2549,11 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Αγγλικά" @@ -2386,10 +2605,11 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. @@ -2418,9 +2638,37 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +======= +#: Source/Core/Core/Src/Movie.cpp:820 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Σφάλμα: Προσπάθεια πρόσβασης των %s γραμματοσειρών αλλά δεν είναι φορτωμένες. Τα παιχνίδια μπορεί να μη δείχνουν τις γραμματοσειρές σωστά, ή να κρασάρουν." +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +#: Source/Core/DolphinWX/Src/Main.cpp:346 +msgid "Error loading selected language. Falling back to system default." +msgstr "" +"Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή " +"συστήματος." + +#: Source/Core/Common/Src/ChunkFile.h:180 +>>>>>>> Update from master branch. +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#, c-format +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Σφάλμα: Προσπάθεια πρόσβασης των %s γραμματοσειρών αλλά δεν είναι " +"φορτωμένες. Τα παιχνίδια μπορεί να μη δείχνουν τις γραμματοσειρές σωστά, ή " +"να κρασάρουν." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2433,7 +2681,8 @@ msgstr "Euphoria" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "Χειριστής εξαιρέσεων - πρόσβαση κάτω από την περιοχή μνήμης. %08llx%08llx" +msgstr "" +"Χειριστής εξαιρέσεων - πρόσβαση κάτω από την περιοχή μνήμης. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2585,10 +2834,12 @@ msgstr "" "Αποτυχία φόρτωσης DSP ROM:\t%s\n" "\n" "Αυτό το αρχείο χρειάζεται για να χρησιμοποιηθεί το DSP LLE.\n" -"Δεν συμπεριλαμβάνεται με το Dolphin γιατί περιέχει δεδομένα πνευματικής ιδιοκτησίας.\n" +"Δεν συμπεριλαμβάνεται με το Dolphin γιατί περιέχει δεδομένα πνευματικής " +"ιδιοκτησίας.\n" "Χρησιμοποιήστε το DSPSpy για να εξάγετε το αρχείο από την κονσόλα σας.\n" "\n" -"Μπορείτε να χρησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χρειάζεται ROM dumps.\n" +"Μπορείτε να χρησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χρειάζεται ROM " +"dumps.\n" "(Επιλέξτε την από την καρτέλα \"Ήχος\" του παραθύρου των γενικών ρυθμίσεων.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2797,7 +3048,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτράρισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεργοποιήσει.\n" -"Βελτιώνει ελαφρώς την ποιότητα των υφών αλλά μπορεί να προκαλέσει προβλήματα σε ορισμένα παιχνίδια.\n" +"Βελτιώνει ελαφρώς την ποιότητα των υφών αλλά μπορεί να προκαλέσει προβλήματα " +"σε ορισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -2816,10 +3068,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" -"Επιβάλει τη NTSC-J λειτουργία για να χρησιμοποιηθεί η Ιαπωνική ROM γραμματοσειρά.\n" -"Άμα αφεθεί αποεπιλεγμένο, το dolphin προεπιλέγει τη NTSC-U και ενεργοποιεί αυτόματα αυτήν την ρύθμιση όταν παίζονται Ιαπωνικά παιχνίδια." +"Επιβάλει τη NTSC-J λειτουργία για να χρησιμοποιηθεί η Ιαπωνική ROM " +"γραμματοσειρά.\n" +"Άμα αφεθεί αποεπιλεγμένο, το dolphin προεπιλέγει τη NTSC-U και ενεργοποιεί " +"αυτόματα αυτήν την ρύθμιση όταν παίζονται Ιαπωνικά παιχνίδια." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2874,6 +3129,7 @@ msgstr "Ελεύθερη Ματιά" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2892,6 +3148,11 @@ msgstr "Ελεύθερη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Γαλλικά" @@ -2961,6 +3222,7 @@ msgstr "Ρυθμίσεις Gamecube &Pad" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2973,6 +3235,9 @@ msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3011,7 +3276,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" @@ -3024,6 +3290,7 @@ msgstr "Γενικές Ρυθμίσεις" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3042,13 +3309,20 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Γερμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "GetARCode: Ο δείκτης είναι μεγαλύτερος από το μέγεθος %lu της λίστας των κωδικών ar" +msgstr "" +"GetARCode: Ο δείκτης είναι μεγαλύτερος από το μέγεθος %lu της λίστας των " +"κωδικών ar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Graphics" @@ -3076,15 +3350,19 @@ msgstr "Μεγαλύτερο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Greatly increases quality of textures generated using render to texture effects.\n" +"Greatly increases quality of textures generated using render to texture " +"effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although unlikely).\n" +"Slightly decreases performance and possibly causes issues (although " +"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει πολύ την ποιότητα των υφών που παράγονται χρησιμοποιώντας render to texture εφέ.\n" +"Βελτιώνει πολύ την ποιότητα των υφών που παράγονται χρησιμοποιώντας render " +"to texture εφέ.\n" "Μία αύξηση της εσωτερικής ανάλυσης θα βελτιώσει το εφέ αυτής της ρύθμισης.\n" -"Μειώνει ελαφρώς την επίδοση και είναι πιθανό να προκαλέσει προβλήματα (αν και σπάνια).\n" +"Μειώνει ελαφρώς την επίδοση και είναι πιθανό να προκαλέσει προβλήματα (αν " +"και σπάνια).\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -3162,7 +3440,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Αποκρύπτει τον δείκτη του ποντικιού αν βρίσκεται πάνω από το παράθυρο εξομοίωσης.\n" +"Αποκρύπτει τον δείκτη του ποντικιού αν βρίσκεται πάνω από το παράθυρο " +"εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -3194,8 +3473,13 @@ msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Πλήκτρα Συντόμευσης" @@ -3210,16 +3494,20 @@ msgstr "Υβριδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "IOCTL_ES_GETVIEWS: Απόπειρα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήριο: %08x/%08x" +msgstr "" +"IOCTL_ES_GETVIEWS: Απόπειρα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήριο: " +"%08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " +"in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: Το παιχνίδι προσπάθησε να επαναφορτώσει ios ή έναν τίτλο που δεν είναι διαθέσιμος στο nand dump\n" +"IOCTL_ES_LAUNCH: Το παιχνίδι προσπάθησε να επαναφορτώσει ios ή έναν τίτλο " +"που δεν είναι διαθέσιμος στο nand dump\n" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει τώρα." @@ -3266,9 +3554,13 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)" +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" +"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = " +"Συμβατό, Ανενεργό = Γρήγορο)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= @@ -3281,9 +3573,17 @@ msgid "" ======= msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " +"also have to disable Audio Throttle in DSP to make it effective." +>>>>>>> Update from master branch. msgstr "" -"Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, PAL:50),\n" -"θα πρέπει επίσης να απενεργοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " +"Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, " +"PAL:50),\n" +"θα πρέπει επίσης να απενεργοποιήσετε το Throttle Ήχου στο DSP για να έχει " +"αποτέλεσμα. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3292,24 +3592,29 @@ msgstr "Αγνόηση Αλλαγών Format" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes " +"graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Αγνοεί οποιαδήποτε αλλαγή στο EFB format.\n" -"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωρίς αρνητικές συνέπειες. Προκαλεί όμως ελαττώματα στα γραφικά σε ένα μικρό αριθμό παιχνιδιών.\n" +"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωρίς αρνητικές συνέπειες. " +"Προκαλεί όμως ελαττώματα στα γραφικά σε ένα μικρό αριθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related " +"features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Αγνοεί οποιοδήποτε αίτημα από την CPU για ανάγνωση ή εγγραφή στο EFB.\n" -"Βελτιώνει τις επιδόσεις σε ορισμένα παιχνίδια, αλλά μπορεί να απενεργοποιήσει ορισμένα χαρακτηριστικά που σχετίζονται με το gameplay ή εφέ γραφικών.\n" +"Βελτιώνει τις επιδόσεις σε ορισμένα παιχνίδια, αλλά μπορεί να " +"απενεργοποιήσει ορισμένα χαρακτηριστικά που σχετίζονται με το gameplay ή εφέ " +"γραφικών.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -3343,11 +3648,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper " +"fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά προκαλεί προβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση της ομίχλης.\n" +"Βελτιώνει τις επιδόσεις αλλά προκαλεί προβλήματα σε παιχνίδια που βασίζονται " +"στη σωστή εξομοίωση της ομίχλης.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -3357,7 +3664,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά προκαλεί την εξαφάνιση του φωτισμού στα περισσότερα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά προκαλεί την εξαφάνιση του φωτισμού στα " +"περισσότερα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -3407,12 +3715,16 @@ msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο Μενού Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει ακόμα." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει " +"ακόμα." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3423,6 +3735,9 @@ msgstr "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλα ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3507,6 +3822,7 @@ msgstr "Μη έγκυρο κατάσταση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3525,6 +3841,11 @@ msgstr "Μη έγκυρο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Ιταλικά" @@ -3685,6 +4006,7 @@ msgstr "Φόρτωση Σημείου Αποθήκευσης..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Φόρτωση Μενού Συστήματος Wii" @@ -3711,6 +4033,13 @@ msgstr "Φόρτωση Μενού Συστήματος Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Φόρτωση Μενού Συστήματος Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Φόρτωση Μενού Συστήματος Wii %d%c" @@ -3795,6 +4124,7 @@ msgstr "Αρχεία MadCatz Gameshark (*.gcs)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 @@ -3805,6 +4135,9 @@ msgstr "Αρχεία MadCatz Gameshark (*.gcs)" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Κύριο Stick" @@ -3848,14 +4181,22 @@ msgstr "Memory Byte" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Κάρτα Μνήμης" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "Διαχειριστής Καρτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγραφα ασφαλείας πριν την χρήση, αν και διορθωμένος μπορεί να χαλάσει πράγματα!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +msgstr "" +"Διαχειριστής Καρτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγραφα ασφαλείας πριν την " +"χρήση, αν και διορθωμένος μπορεί να χαλάσει πράγματα!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3876,7 +4217,9 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "Το μέγεθος του αρχείου της κάρτας μνήμης δεν ταιριάζει με το μέγεθος της κεφαλίδας." +msgstr "" +"Το μέγεθος του αρχείου της κάρτας μνήμης δεν ταιριάζει με το μέγεθος της " +"κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3906,11 +4249,13 @@ msgstr "Modifier" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation " +"reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Τροποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι κωδικοποιημένες.\n" +"Τροποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι " +"κωδικοποιημένες.\n" "Χρειάζεται επανεκκίνηση της εξομοίωσης στις περισσότερες περιπτώσεις.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -3938,7 +4283,8 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του ποντικιού πάνω από μία επιλογή για να εμφανιστεί μία λεπτομερής περιγραφή.\n" +"Μετακινήστε τον δείκτη του ποντικιού πάνω από μία επιλογή για να εμφανιστεί " +"μία λεπτομερής περιγραφή.\n" "\n" "\n" "\n" @@ -3949,8 +4295,12 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Απενεργοποιεί το ηχείο του Wiimote. Διορθώνει τυχαίες αποσυνδέσεις σε πραγματικά wiimotes. Δεν έχει καμία επίδραση σε εξομοιωμένα wiimotes." +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Απενεργοποιεί το ηχείο του Wiimote. Διορθώνει τυχαίες αποσυνδέσεις σε " +"πραγματικά wiimotes. Δεν έχει καμία επίδραση σε εξομοιωμένα wiimotes." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4039,6 +4389,7 @@ msgstr "NP Up" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4048,6 +4399,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4137,6 +4491,7 @@ msgstr "Μη Ορισμένο" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -4147,6 +4502,9 @@ msgstr "Μη Ορισμένο" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -4218,7 +4576,11 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Άνοιγμα" @@ -4279,7 +4641,8 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"Η σειρά των αρχείων στον Κατάλογο Αρχείων δεν ταιριάζει με την σειρά των block.\n" +"Η σειρά των αρχείων στον Κατάλογο Αρχείων δεν ταιριάζει με την σειρά των " +"block.\n" "Κάντε δεξί κλίκ, εξάγετε όλα τα αρχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάρτα μνήμης.\n" @@ -4289,8 +4652,12 @@ msgid "Other" msgstr "Άλλα" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεργοποιηθεί. Σταματήστε χειροκίνητα το παιχνίδι." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " +"απενεργοποιηθεί. Σταματήστε χειροκίνητα το παιχνίδι." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4348,6 +4715,7 @@ msgstr "Φάκελοι" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4360,6 +4728,10 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Παύση" @@ -4395,9 +4767,14 @@ msgstr "Οπτική %d" ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Αναπαραγωγή" @@ -4426,6 +4803,7 @@ msgstr "Παίχτες" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4436,6 +4814,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Παρακαλώ επιβεβαιώστε..." @@ -4649,6 +5030,7 @@ msgstr "Ανανέωση λίστας παιχνιδιών" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4671,6 +5053,12 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Αφαίρεση" @@ -4701,6 +5089,7 @@ msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4747,6 +5136,7 @@ msgid "Safe" msgstr "Ασφαλής" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +<<<<<<< HEAD ======= msgstr "" @@ -4760,6 +5150,8 @@ msgstr "Ασφαλής" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -4837,12 +5229,15 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγραφής της ταινίας..." +msgstr "" +"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " +"εγγραφής της ταινίας..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "Κλιμακούμενα EFB Αντίγραφα" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" @@ -4856,6 +5251,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -4884,10 +5282,8 @@ msgstr "Φίλτρο Αναζήτησης" msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF" @@ -4897,6 +5293,7 @@ msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4920,6 +5317,14 @@ msgstr "Επιλέξτε το Αρχείο Εγγραφής" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Επιλέξτε το Αρχείο Εγγραφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση" @@ -4948,6 +5353,7 @@ msgstr "Επιλέξτε το αρχείο για φόρτωση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Επιλέξτε αρχείο αποθήκευσης" @@ -4965,13 +5371,17 @@ msgstr "Επιλέξτε το σημείο φόρτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Επιλέξτε αρχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόρτωσης" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 @@ -4982,6 +5392,9 @@ msgstr "Επιλέξτε το σημείο φόρτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4999,7 +5412,8 @@ msgstr "" "Αυτόματα: Χρήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: Προσαρμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: Προσαρμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"Προσαρμογή στο παράθυρο: Προσαρμόζει την εικόνα στην αναλογία του παραθύρου.\n" +"Προσαρμογή στο παράθυρο: Προσαρμόζει την εικόνα στην αναλογία του " +"παραθύρου.\n" "\n" "Αν δεν είστε σίγουροι επιλέξτε Αυτόματα." @@ -5010,26 +5424,32 @@ msgstr "Επιλεγμένη γραμματοσειρά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. " +"Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" -"Επιλέγει την ανάλυση της οθόνης που θα χρησιμοποιηθεί σε λειτουργία πλήρους οθόνης. Αυτή θα πρέπει να είναι πάντα μεγαλύτερη ή ίση με την εσωτερική ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" +"Επιλέγει την ανάλυση της οθόνης που θα χρησιμοποιηθεί σε λειτουργία πλήρους " +"οθόνης. Αυτή θα πρέπει να είναι πάντα μεγαλύτερη ή ίση με την εσωτερική " +"ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" "\n" -"Αν δεν είστε σίγουροι, χρησιμοποιήστε την ανάλυση της επιφάνειας εργασίας σας.\n" +"Αν δεν είστε σίγουροι, χρησιμοποιήστε την ανάλυση της επιφάνειας εργασίας " +"σας.\n" "Αν πάλι δεν είστε σίγουροι, χρησιμοποιήστε την υψηλότερη λειτουργική ανάλυση." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " +"Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Επιλέγει το API γραφικών που θα χρησιμοποιηθεί εσωτερικά.\n" -"Το Direct3D 9 συνήθως είναι το γρηγορότερο. Το OpenGL είναι περισσότερο ακριβές όμως. Το Direct3D 11 βρίσκεται κάπου ενδιάμεσα μεταξύ των δύο.\n" +"Το Direct3D 9 συνήθως είναι το γρηγορότερο. Το OpenGL είναι περισσότερο " +"ακριβές όμως. Το Direct3D 11 βρίσκεται κάπου ενδιάμεσα μεταξύ των δύο.\n" "Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n" "\n" "Αν δεν είστε σίγουροι, χρησιμοποιήστε το Direct3D 9." @@ -5050,21 +5470,28 @@ msgstr "Διαχωριστής" msgid "Serbian" msgstr "Σερβικά" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Σειριακή Θύρα 1 - Αυτή είναι η θύρα που χρησιμοποιούν οι συσκευές όπως ο " "προσαρμογέας δικτύου" +<<<<<<< HEAD ======= msgid "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Σειριακή Θύρα 1 - Αυτή είναι η θύρα που χρησιμοποιούν οι συσκευές όπως ο προσαρμογέας δικτύου" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5082,7 +5509,9 @@ msgstr "Ορισμός ως προεπιλεγμένη Κάρτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive: Ο δείκτης είναι μεγαλύτερος από το μέγεθος λίστας των κωδικών ar %lu" +msgstr "" +"SetARCode_IsActive: Ο δείκτης είναι μεγαλύτερος από το μέγεθος λίστας των " +"κωδικών ar %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." @@ -5203,10 +5632,12 @@ msgstr "Εμφάνιση επιβεβαίωσης πριν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also " +"mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Εμφάνιση μηνύματος όταν προκύψει ένα πιθανά σοβαρό σφάλμα.\n" -"Απενεργοποιώντας αυτήν την επιλογή μπορεί να γλιτώσετε από ενοχλητικά μη κρίσιμα σφάλματα, αλλά \n" +"Απενεργοποιώντας αυτήν την επιλογή μπορεί να γλιτώσετε από ενοχλητικά μη " +"κρίσιμα σφάλματα, αλλά \n" "το Dolphin μπορεί να κρασάρει ξαφνικά χωρίς καμία εξήγηση. " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 @@ -5231,11 +5662,13 @@ msgstr "Εμφάνιση αποθηκευμένου τίτλου" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation speed.\n" +"Show the number of frames rendered per second as a measure of emulation " +"speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εμφανίζει τον αριθμό των καρέ που απεικονίζονται ανά δευτερόλεπτο, ως τρόπο μέτρησης της ταχύτητας εξομοίωσης.\n" +"Εμφανίζει τον αριθμό των καρέ που απεικονίζονται ανά δευτερόλεπτο, ως τρόπο " +"μέτρησης της ταχύτητας εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -5292,11 +5725,13 @@ msgstr "Παράλειψη EFB Πρόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Skip the destination alpha pass used in many games for various graphical effects.\n" +"Skip the destination alpha pass used in many games for various graphical " +"effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Παράλειψη του destination alpha pass που χρησιμοποιείται από πολλά παιχνίδια σε διάφορα γραφικά εφέ.\n" +"Παράλειψη του destination alpha pass που χρησιμοποιείται από πολλά παιχνίδια " +"σε διάφορα γραφικά εφέ.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -5304,13 +5739,16 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Επιταχύνει ελαφρώς τα EFB σε RAM αντίγραφα θυσιάζοντας την ακρίβεια της εξομοίωσης.\n" +"Επιταχύνει ελαφρώς τα EFB σε RAM αντίγραφα θυσιάζοντας την ακρίβεια της " +"εξομοίωσης.\n" "Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της cache υφών ή απενεργοποιήστε αυτήν την επιλογή.\n" +"Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της cache " +"υφών ή απενεργοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -5378,13 +5816,16 @@ msgstr "Απεικόνιση Λογισμικού" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other backends.\n" +"Software rendering is an order of magnitude slower than using the other " +"backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Η απεικόνιση λογισμικού είναι αρκετές βαθμίδες πιο αργή απ' ότι τα υπόλοιπα backends.\n" +"Η απεικόνιση λογισμικού είναι αρκετές βαθμίδες πιο αργή απ' ότι τα υπόλοιπα " +"backends.\n" "Είναι μόνο χρήσιμη για debugging σκοπούς.\n" -"Θέλετε όντως να χρησιμοποιήσετε την απεικόνιση λογισμικού; Αν δεν είστε σίγουροι, επιλέξτε 'Όχι'." +"Θέλετε όντως να χρησιμοποιήσετε την απεικόνιση λογισμικού; Αν δεν είστε " +"σίγουροι, επιλέξτε 'Όχι'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5407,6 +5848,7 @@ msgstr "Space" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5425,6 +5867,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Ισπανικά" @@ -5434,13 +5881,22 @@ msgstr "Ένταση ηχείου:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" +"Specifies the resolution used to render at. A high resolution will improve " +"visual quality a lot but is also quite heavy on performance and might cause " +"glitches in certain games.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " +"issues. Generally speaking, the lower the internal resolution is, the better " +"your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"Ορίζει την ανάλυση που θα χρησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή ανάλυση θα βελτιώσει την οπτική ποιότητα αρκετά αλλά επίσης θα έχει βαρύ αντίκτυπο στις επιδόσεις και μπορεί να προκαλέσει ελαττώματα σε ορισμένα παιχνίδια.\n" -"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αργό από το \"Μέγεθος Παραθύρου\" αλλά αποδίδει λιγότερα προβλήματα. Γενικά, όσο χαμηλότερη είναι η εσωτερική ανάλυση, θα είναι και καλύτερες οι επιδόσεις.\n" +"Ορίζει την ανάλυση που θα χρησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή " +"ανάλυση θα βελτιώσει την οπτική ποιότητα αρκετά αλλά επίσης θα έχει βαρύ " +"αντίκτυπο στις επιδόσεις και μπορεί να προκαλέσει ελαττώματα σε ορισμένα " +"παιχνίδια.\n" +"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αργό από το \"Μέγεθος Παραθύρου" +"\" αλλά αποδίδει λιγότερα προβλήματα. Γενικά, όσο χαμηλότερη είναι η " +"εσωτερική ανάλυση, θα είναι και καλύτερες οι επιδόσεις.\n" "\n" "Αν δεν είστε σίγουροι, επιλέξτε 640x528." @@ -5463,6 +5919,7 @@ msgstr "Τυπικός Controller" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 @@ -5472,6 +5929,9 @@ msgstr "Τυπικός Controller" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5518,7 +5978,11 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" @@ -5550,12 +6014,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a " +"great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n" -"Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +"Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα " +"παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -5621,6 +6087,7 @@ msgstr "Δεξί Table" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5629,6 +6096,9 @@ msgstr "Δεξί Table" ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Δημιουργία Στιγμιότυπου" @@ -5705,8 +6175,12 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." -msgstr "Αδυναμία ανοίγματος του αρχείου %s για εγγραφή. Παρακαλώ ελέγξτε αν είναι ήδη ανοιχτό από άλλο πρόγραμμα." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Αδυναμία ανοίγματος του αρχείου %s για εγγραφή. Παρακαλώ ελέγξτε αν είναι " +"ήδη ανοιχτό από άλλο πρόγραμμα." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5728,15 +6202,18 @@ msgstr "Το όνομα δεν μπορεί να περιέχει τον χαρ #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "Το αποτέλεσμα αποκρυπτογράφησης του κωδικού AR δεν περιέχει καθόλου γραμμές." +msgstr "" +"Το αποτέλεσμα αποκρυπτογράφησης του κωδικού AR δεν περιέχει καθόλου γραμμές." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να " +"χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από δεξιά." @@ -5760,11 +6237,16 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "Το σημείο αποθήκευσης που προσπαθείτε να αντιγράψετε έχει μη έγκυρο μέγεθος" +msgstr "" +"Το σημείο αποθήκευσης που προσπαθείτε να αντιγράψετε έχει μη έγκυρο μέγεθος" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "Η επιλεγμένη γλώσσα δεν υποστηρίζεται από το σύστημά σας. Επαναφορά στην προεπιλογή συστήματος." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"Η επιλεγμένη γλώσσα δεν υποστηρίζεται από το σύστημά σας. Επαναφορά στην " +"προεπιλογή συστήματος." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5800,8 +6282,12 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Πρέπει να υπάρχει εισητήριο για 00000001/00000002. Το NAND dump σας είναι πιθανότατα ημιτελές." +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Πρέπει να υπάρχει εισητήριο για 00000001/00000002. Το NAND dump σας είναι " +"πιθανότατα ημιτελές." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5809,25 +6295,40 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι ρυθμίσεις υπερισχύουν των γενικών ρυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόριστη η επιλογή το παιχνίδι χρησιμοποιεί τις γενικές ρυθμίσεις του Dolphin. " +"Αν είναι ακαθόριστη η επιλογή το παιχνίδι χρησιμοποιεί τις γενικές ρυθμίσεις " +"του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Αυτός ο προσομοιωτής action replay δεν υποστηρίζει κωδικούς που αλλάζουν το ίδιο το Action Replay." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Αυτός ο προσομοιωτής action replay δεν υποστηρίζει κωδικούς που αλλάζουν το " +"ίδιο το Action Replay." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." -msgstr "Αυτό μπορεί να προκαλέσει καθυστερήσεις στο Μενού Wii και σε μερικά παιχνίδια." +msgstr "" +"Αυτό μπορεί να προκαλέσει καθυστερήσεις στο Μενού Wii και σε μερικά " +"παιχνίδια." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. " +"Hold SHIFT and press one of the WASD keys to move the camera by a certain " +"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " +"SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Αυτό το χαρακτηριστικό σας επιτρέπει να πειράξετε την κάμερα του παιχνιδιού.\n" -"Κρατώντας πατημένο το δεξί πλήκτρο του ποντικιού μετακινήστε το ποντίκι για να μετακινήσετε τριγύρω την κάμερα. Κρατώντας πατημένο το SHIFT πιέστε ένα από τα WASD πλήκτρα για να μετακινήσετε την κάμερα κατά μία καθορισμένη απόσταση (SHIFT+0 για να κινηθεί γρηγορότερα και SHIFT+9 για να κινηθεί πιο αργά). Πατήστε SHIFT+R για να επαναφέρετε την κάμερα στην αρχική της θέση.\n" +"Αυτό το χαρακτηριστικό σας επιτρέπει να πειράξετε την κάμερα του " +"παιχνιδιού.\n" +"Κρατώντας πατημένο το δεξί πλήκτρο του ποντικιού μετακινήστε το ποντίκι για " +"να μετακινήσετε τριγύρω την κάμερα. Κρατώντας πατημένο το SHIFT πιέστε ένα " +"από τα WASD πλήκτρα για να μετακινήσετε την κάμερα κατά μία καθορισμένη " +"απόσταση (SHIFT+0 για να κινηθεί γρηγορότερα και SHIFT+9 για να κινηθεί πιο " +"αργά). Πατήστε SHIFT+R για να επαναφέρετε την κάμερα στην αρχική της θέση.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -5839,11 +6340,14 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"Χρησιμοποιείται για τον έλεγχο της ταχύτητας του παιχνιδιού με throttle ήχου.\n" -"Απενεργοποιώντας το μπορεί να προκλήθει αφύσικη ταχύτητα σε παιχνίδια, π.χ. πολύ γρήγορη.\n" +"Χρησιμοποιείται για τον έλεγχο της ταχύτητας του παιχνιδιού με throttle " +"ήχου.\n" +"Απενεργοποιώντας το μπορεί να προκλήθει αφύσικη ταχύτητα σε παιχνίδια, π.χ. " +"πολύ γρήγορη.\n" "Όμως ορισμένες φορές η ενεργοποίησή της μπορεί να προκαλέσει μόνιμο θόρυβο.\n" "\n" -"Συντόμευση πληκτρολογίου : Κρατήστε το πατημένο για να απενεργοποιηθεί η λειτουργία Throttle." +"Συντόμευση πληκτρολογίου : Κρατήστε το πατημένο για να απενεργοποιηθεί " +"η λειτουργία Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5851,16 +6355,20 @@ msgstr "Χρησιμοποιείται για την αναπαραγωγή μο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" -"This splits the Video and CPU threads, so they can be run on separate cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate " +"cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also " +"cause occasional crashes/glitches." msgstr "" -"Χωρίζει τα νήματα του Βίντεο και της CPU, ώστε να τρέχουν σε ξεχωριστούς πυρήνες.\n" +"Χωρίζει τα νήματα του Βίντεο και της CPU, ώστε να τρέχουν σε ξεχωριστούς " +"πυρήνες.\n" "Προκαλεί μεγάλη επιτάχυνση σε PC με περισσότερους από έναν πυρήνες,\n" "αλλά μπορεί να προκαλέσει κρασαρίσματα ή άλλα προβλήματα. " #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" -msgstr "Αυτό σας επιτρέπει την χειροκίνητη επεξεργασία του αρχείου ρυθμίσεων INI" +msgstr "" +"Αυτό σας επιτρέπει την χειροκίνητη επεξεργασία του αρχείου ρυθμίσεων INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5906,15 +6414,20 @@ msgstr "Εναλλαγή Πλήρους Οθόνης" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Εναλλαγή Πλήρους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Κορυφή" @@ -5930,8 +6443,7 @@ msgstr "Προσπάθεια φόρτωσης ενός άγνωστου τύπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Προσπάθεια ανάγνωσης από ένα μη έγκυρο SYSCONF" @@ -5983,10 +6495,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or " +"decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Δεν μπορεί να γίνει parse της γραμμής %lu από τον εισαγώμενο κωδικό AR ως ένας έγκυρος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. Σιγουρευτείτε ότι τον πληκτρολογήσατε σωστά.\n" +"Δεν μπορεί να γίνει parse της γραμμής %lu από τον εισαγώμενο κωδικό AR ως " +"ένας έγκυρος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. Σιγουρευτείτε ότι " +"τον πληκτρολογήσατε σωστά.\n" "Θα θέλατε να αγνοήσετε αυτήν την γραμμή και να συνεχίσετε με το parsing;" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -6022,6 +6537,7 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d Αποσύνδεση παίκτη!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -6042,6 +6558,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6080,19 +6598,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Χρησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"Μπορεί να βελτιώσει την ταχύτητα (ειδικά σε CPUs με περισσότερους από δύο πυρήνες).\n" +"Μπορεί να βελτιώσει την ταχύτητα (ειδικά σε CPUs με περισσότερους από δύο " +"πυρήνες).\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by " +"checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Συνήθως άμα αποτύχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μύνημα σφάλματος.\n" -"Παρόλα αυτά μπορείτε να παραλείψετε το αναδυόμενο μύνημα ώστε να έχετε gameplay χωρίς παρεμβάσεις επιλέγοντας αυτήν την ρύθμιση.\n" +"Συνήθως άμα αποτύχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μύνημα " +"σφάλματος.\n" +"Παρόλα αυτά μπορείτε να παραλείψετε το αναδυόμενο μύνημα ώστε να έχετε " +"gameplay χωρίς παρεμβάσεις επιλέγοντας αυτήν την ρύθμιση.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -6146,7 +6668,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " +"εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχύτητα εξομοίωσης είναι μικρότερη από 100%.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -6176,7 +6699,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Προειδοποίηση! Συστήνεται η δημιουργία αντιγράφου ασφαλείας όλων των αρχείων στον φάκελο:\n" +"Προειδοποίηση! Συστήνεται η δημιουργία αντιγράφου ασφαλείας όλων των αρχείων " +"στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -6188,7 +6712,8 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Προειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάρχοντα σημεία αποθήκευσης που υπάρχουν στον φάκελο:\n" +"Προειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάρχοντα σημεία αποθήκευσης " +"που υπάρχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αρχεία στη memcard\n" "Συνέχεια;" @@ -6264,6 +6789,7 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6274,6 +6800,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6307,6 +6836,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 @@ -6317,6 +6847,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -6351,6 +6884,7 @@ msgstr "Αναδίπλωση Λέξεων" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6365,6 +6899,11 @@ msgstr "Αναδίπλωση Λέξεων" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Σε εργασία..." @@ -6429,7 +6968,8 @@ msgstr "Πρέπει να εισάγετε ένα έγκυρο όνομα προ #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "Πρέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." +msgstr "" +"Πρέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6487,14 +7027,19 @@ msgstr "[Προσαρμοζόμενο]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using " +"the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. " +"Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[ΠΕΙΡΑΜΑΤΙΚΟ]\n" -"Στοχεύει στην επιτάχυνση της εξομοίωσης φορτώνοντας την αποκωδικοποίηση των υφών στην GPU χρησιμοποιώντας το OpenCL framework.\n" -"Παρ'όλα αυτά, προς το παρόν είναι γνωστό ότι προκαλεί προβλήματα στις υφές σε διάφορα παιχνίδια. Επίσης είναι πιο αργή από την τυπική αποκωδικοποίηση υφών από την CPU στις περισσότερες περιπτώσεις.\n" +"Στοχεύει στην επιτάχυνση της εξομοίωσης φορτώνοντας την αποκωδικοποίηση των " +"υφών στην GPU χρησιμοποιώντας το OpenCL framework.\n" +"Παρ'όλα αυτά, προς το παρόν είναι γνωστό ότι προκαλεί προβλήματα στις υφές " +"σε διάφορα παιχνίδια. Επίσης είναι πιο αργή από την τυπική αποκωδικοποίηση " +"υφών από την CPU στις περισσότερες περιπτώσεις.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -6541,7 +7086,9 @@ msgstr "iCacheJIT: Ανάγνωση Opcode από %x. Παρακαλώ να το #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αρχείου μεγέθους %x" +msgstr "" +"δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αρχείου " +"μεγέθους %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" @@ -6571,6 +7118,9 @@ msgstr "| OR" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μπορεί να γίνει εγγραφή ταινιών σε λειτουργία μόνο για ανάγνωση." @@ -6581,6 +7131,7 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" +<<<<<<< HEAD ======= #~ msgid "Disable Wiimote Speaker" #~ msgstr "Απενεργοποίηση Ηχείου Wiimote" @@ -6668,3 +7219,5 @@ msgstr "| OR" >>>>>>> Update Greek and Czech translations ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. diff --git a/Languages/po/en.po b/Languages/po/en.po index 2563333e4e..0667cfbf71 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -509,6 +513,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -518,6 +523,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -571,6 +581,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -578,6 +589,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -655,11 +670,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -680,11 +699,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -793,10 +816,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -829,11 +856,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1056,10 +1087,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1168,11 +1203,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1348,10 +1387,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1561,11 +1604,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1594,6 +1641,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1609,6 +1657,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1691,6 +1747,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1700,6 +1757,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1823,21 +1885,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1963,6 +2035,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1972,6 +2045,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2001,6 +2079,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2018,6 +2097,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2432,6 +2524,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2441,6 +2534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2507,10 +2605,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2532,11 +2634,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2545,6 +2652,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2554,6 +2662,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2669,11 +2782,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2863,11 +2981,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2944,6 +3066,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2953,6 +3076,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3103,6 +3231,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3116,6 +3245,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3192,11 +3328,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3228,10 +3368,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3408,11 +3552,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3499,11 +3647,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3565,9 +3717,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3693,6 +3849,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3700,6 +3857,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3720,12 +3881,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3751,11 +3917,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3961,6 +4131,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3972,6 +4143,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3988,9 +4165,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4033,11 +4214,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4121,11 +4306,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4165,6 +4354,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4180,6 +4370,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4202,6 +4400,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4214,15 +4413,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4556,6 +4762,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4565,6 +4772,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4600,11 +4812,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4640,9 +4856,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4715,9 +4935,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4930,18 +5154,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5043,6 +5275,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5053,6 +5286,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5254,11 +5489,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5285,11 +5524,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5321,6 +5564,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5330,6 +5574,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index b16d557823..5b7d2b9a35 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-09 00:28+0100\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-10-15 23:23+0100\n" >>>>>>> Updated Spanish translation +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-23 16:03+0100\n" +>>>>>>> Update from master branch. "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -47,7 +52,7 @@ msgid "" " Create a new 16MB Memcard?" msgstr "" "\"%s\" no existe.\n" -"¿Crear una nueva tarjeta de memoria de 16 MB?" +"¿Crear una nueva tarjeta de memoria de 16 MB?" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format @@ -123,8 +128,8 @@ msgid "" "If you select \"No\", audio will be garbled." msgstr "" "%s tiene un hash incorrecto.\n" -"¿Desea detener ahora para reparar el problema?\n" -"Si selecciona \"No\", el audio se oirá con ruidos." +"¿Deseas detener ahora para reparar el problema?\n" +"Si seleccionas \"No\", el audio se oirá con ruidos." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360 #, c-format @@ -161,7 +166,7 @@ msgstr "%sImportar GCI%s" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" -msgstr "%u Bloques libres; %u entradas de directorio libres" +msgstr "%u Bloques libres; %u entradas de dir. libres" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "&& AND" @@ -458,7 +463,7 @@ msgstr "" "Algunos juegos dependen de esto para algunos efectos gráficos o " "funcionalidad del juego.\n" "\n" -"Si está inseguro, elija EFB a textura." +"Si está inseguro, elige EFB a textura." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -537,7 +542,7 @@ msgstr "Error de Action Replay: Línea de código AR no válida: %s" #: Source/Core/Core/Src/ActionReplay.cpp:873 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" -msgstr "Error de Action Replay: Código Condicional: Tamaño no válido %08x (%s)" +msgstr "Error de Action Replay: Código condicional: Tamaño no válido %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:946 #, c-format @@ -575,6 +580,7 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -584,6 +590,11 @@ msgstr "Añadir nueva ventana" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Añadir..." @@ -630,7 +641,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -"Ajuste la presión requerida del control analógico para activar los botones." +"Ajusta la presión requerida del control analógico para activar los botones." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -652,6 +663,7 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -659,6 +671,10 @@ msgstr "Todos los archivos Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -742,25 +758,29 @@ msgstr "Árabe" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 #, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "¿Seguro que quiere borrar \"%s\"?" +msgstr "¿Estás seguro de que quieres borrar \"%s\"?" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -"¿Seguro que quiere borrar estos archivos?\n" +"¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!" +msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -781,11 +801,15 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -808,9 +832,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Automáticamente ajusta el tamaño de la ventana a su resolución interna.\n" +"Ajusta automáticamente el tamaño de la ventana a su resolución interna.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" @@ -902,10 +926,14 @@ msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Inferior" @@ -938,11 +966,15 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1031,7 +1063,7 @@ msgid "" "Are you trying to use the same file in both slots?" msgstr "" "No se puede usar ese archivo como una tarjeta de memoria.\n" -"¿Está intentando usar el mismo archivo en ambas ranuras?" +"¿Estás intentando usar el mismo archivo en ambas ranuras?" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, c-format @@ -1056,7 +1088,7 @@ msgstr "Bloq Mayús" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" -msgstr "Catalan" +msgstr "Catalán" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 msgid "Center" @@ -1139,7 +1171,7 @@ msgstr "Escoge una ISO por defecto:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" -msgstr "Escoja un directorio para añadir" +msgstr "Escoge un directorio para añadir" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" @@ -1149,16 +1181,20 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -"Escoja el archivo que usar como apploader (se aplica a los discos armados a " +"Escoge el archivo que usar como apploader (se aplica a los discos armados a " "partir de directorios solamente):" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 @@ -1196,10 +1232,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Cerrar" @@ -1308,11 +1348,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1430,11 +1474,15 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1509,10 +1557,14 @@ msgstr "Motor de emulación DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1743,11 +1795,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1776,6 +1832,7 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1791,6 +1848,14 @@ msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuración de GCPad Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1802,11 +1867,15 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1814,11 +1883,15 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1894,6 +1967,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1903,6 +1977,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandés" @@ -1923,7 +2002,7 @@ msgid "" "driver." msgstr "" "ERROR: Esta versión de Dolphin requiere un controlador TAP-Win32 que sea por " -"lo menos de versión %d.%d. Si recientemente actualizó su distribución de " +"lo menos de versión %d.%d. Si actualizaste recientemente tu distribución de " "Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo " "controlador." @@ -1966,7 +2045,7 @@ msgstr "Efecto" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" -msgstr "Bufer de frames embebido" +msgstr "Búfer de fotogramas embebido" #: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" @@ -2041,6 +2120,7 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2048,15 +2128,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Permitir el cálculo del cuadro delimitador" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2117,7 +2207,7 @@ msgstr "" "Mejora la calidad de las texturas que tienen un ángulo de visión obliquo.\n" "Puede causar problemas en algunos juegos.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" @@ -2142,7 +2232,7 @@ msgstr "" "representación.\n" "Si esto es desactivado, una ventana de renderizado se creará en su lugar.\n" "\n" -"Si no está seguro, déjelo sin marcar." +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -2154,13 +2244,17 @@ msgstr "" "Active esto si quiere usar la ventana principal de Dolphin para renderizar " "en vez de una ventana aparte.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si no estás seguro, déjalo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2191,7 +2285,8 @@ msgid "" msgstr "" "Activa el escaneo progresivo si es soportado por el software emulado.\n" "A muchos juegos no les afecta esto.\n" -"Si está inseguro, déjelo sin marcar." +"\n" +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "" @@ -2209,12 +2304,13 @@ msgid "" msgstr "" "Codificar el volcado de los frames usando el códec FFV1.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2224,6 +2320,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglés" @@ -2253,6 +2354,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2270,12 +2372,39 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"Error en PlayWiimote. %u != %u, byte %d.\n" +"Disculpa, la grabación de Wii no funciona temporalmente." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." #: Source/Core/Common/Src/ChunkFile.h:180 +<<<<<<< HEAD +======= +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" +"Error: Después de \"%s\", se ha encontrado %d (0x%X) en vezde la marca de " +"guardado %d (0x%X). Cancelando carga del guardado..." + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +>>>>>>> Update from master branch. #, c-format msgid "" <<<<<<< HEAD @@ -2440,7 +2569,7 @@ msgstr "Fallo al descargar los códigos." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" -msgstr "Fallo al extraer a %s!" +msgstr "Falló al extraer a %s!" #: Source/Core/Core/Src/DSP/DSPCore.cpp:66 #, c-format @@ -2466,12 +2595,12 @@ msgstr "" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:119 msgid "Failed to load bthprops.cpl" -msgstr "Fallo al cargar bthprops.cpl" +msgstr "Falló al cargar bthprops.cpl" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:83 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:92 msgid "Failed to load hid.dll" -msgstr "Fallo al cargar hid.dll" +msgstr "Falló al cargar hid.dll" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" @@ -2503,7 +2632,7 @@ msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -"Falló leer el directorio de respaldo correctamente\n" +"Falló la lectura del directorio de respaldo\n" "(0x4000-0x5FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:132 @@ -2511,7 +2640,7 @@ msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -"Falló leer el directorio correctamente\n" +"Falló la lectura del directorio\n" "(0x2000-0x3FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:121 @@ -2534,25 +2663,25 @@ msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "Fallo al leer la ID única de la imagen de disco" +msgstr "Falló al leer la ID única de la imagen de disco" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:83 msgid "Failed to write BT.DINF to SYSCONF" -msgstr "Fallo al escribir BT.DINF a SYSCONF" +msgstr "Falló al escribir BT.DINF a SYSCONF" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228 msgid "Failed to write bkhdr" -msgstr "Fallo al escribir bkhdr" +msgstr "Falló al escribir bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164 #, c-format msgid "Failed to write header for %s" -msgstr "Fallo al escribir la cabecera para %s" +msgstr "Falló al escribir la cabecera para %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258 #, c-format msgid "Failed to write header for file %d" -msgstr "Fallo al escribir la cabecera para el archivo %d" +msgstr "Falló al escribir la cabecera para el archivo %d" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" @@ -2687,7 +2816,7 @@ msgid "" "Choose no for sjis (NTSC-J)" msgstr "" "Formato como ASCII (NTSC\\PAL)?\n" -"Escoger no para sjis (NTSC-J)" +"Elige no para sjis (NTSC-J)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:278 msgid "Forward" @@ -2731,6 +2860,7 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2740,6 +2870,11 @@ msgstr "Cámara libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francés" @@ -2765,9 +2900,14 @@ msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "Configuración de registro" +======= +msgid "GCMic Configuration" +msgstr "Configuración del micro de GC" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2807,10 +2947,14 @@ msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2834,11 +2978,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2847,6 +2996,7 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2856,6 +3006,11 @@ msgstr "Ajustes generales" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemán" @@ -2895,6 +3050,7 @@ msgid "" "If unsure, leave this checked." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD "Mejora bastante la calidad de las texturas generadas usando los efectos de " "renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" @@ -2910,6 +3066,12 @@ msgstr "" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" "Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " >>>>>>> Updated Spanish translation +======= +"Mejora bastante la calidad de las texturas generadas usando los efectos de " +"renderización para la textura.\n" +"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" +"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " +>>>>>>> Update from master branch. "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -3008,11 +3170,16 @@ msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Atajos" @@ -3085,6 +3252,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"Si se elige, los registros del cuadro delimitador serán actualizados. Es " +"usado por los juegos de Paper Mario." +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3093,11 +3265,15 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3241,11 +3417,15 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3327,6 +3507,7 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3336,6 +3517,11 @@ msgstr "Estado no válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3493,6 +3679,7 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3506,6 +3693,13 @@ msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3587,11 +3781,15 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3623,10 +3821,14 @@ msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3733,6 +3935,9 @@ msgstr "" "\n" "\n" "\n" +"\n" +"\n" +"\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:72 msgid "Multiply" @@ -3830,11 +4035,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3914,18 +4123,22 @@ msgstr "Noruego Bokmal" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Not Equal" -msgstr "No Igual" +msgstr "No igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" -msgstr "No Definido" +msgstr "No definido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Sin conectar" @@ -3987,9 +4200,13 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4066,7 +4283,7 @@ msgid "" "manually stop the game." msgstr "" "¡¡El otro cliente se ha desconectado mientras el juego estaba ejecutándose!! " -"NetPlay ha sido deshabilitado. Debe detener el juego manualmente." +"NetPlay ha sido deshabilitado. Debes detener el juego manualmente." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4121,6 +4338,7 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4128,6 +4346,10 @@ msgstr "Directorios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4148,12 +4370,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Reproducir" @@ -4179,17 +4406,21 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." -msgstr "Confirme, por favor..." +msgstr "Confirma, por favor..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:578 msgid "Please create a perspective before saving" -msgstr "Por favor, cree una perspectiva antes de guardar" +msgstr "Por favor, crea una perspectiva antes de guardar" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:36 msgid "Plus-Minus" @@ -4235,17 +4466,29 @@ msgstr "Efecto de posprocesado:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayWiimote. %u > %u" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4394,6 +4637,7 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4405,6 +4649,12 @@ msgstr "Actualizar lista de juegos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Eliminar" @@ -4424,9 +4674,13 @@ msgstr "Renderizar a ventana principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4469,11 +4723,15 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4599,6 +4857,7 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4614,6 +4873,14 @@ msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4639,6 +4906,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4651,15 +4919,22 @@ msgstr "Selecciona el estado para cargar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4734,11 +5009,15 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5070,6 +5349,7 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5079,6 +5359,11 @@ msgstr "Espacio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Español" @@ -5122,11 +5407,15 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5162,9 +5451,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -5245,15 +5538,23 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Captura de pantalla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5499,18 +5800,26 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Superior" @@ -5583,7 +5892,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" "No es posible analizar la línea %lu del código AR introducido como un código " -"válido cifrado o descifrado. Asegúrese de que la ha escrito correctamente.\n" +"válido cifrado o descifrado. Asegúrate de que la has escrito correctamente.\n" "¿Te gustaría hacer caso omiso de esta línea y continuar el análisis?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -5622,6 +5931,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5631,6 +5941,8 @@ msgid "" msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5796,6 +6108,12 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +<<<<<<< HEAD +======= +"Advertencia: Has cargado un guardado de después del final de la película " +"actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " +"de continuar, o cargar éste sin el modo de solo lectura." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5804,6 +6122,13 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +<<<<<<< HEAD +======= +"Advertencia: has cargado una partida guardada con desjustes en %d bytes (0x" +"%X). Debe de cargar otro guardado antes de continuar, o cargar este guardado " +"con el modo de solo lectura desactivado. De lo contrario probablemente " +"obtenga una desincronización." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5823,6 +6148,24 @@ msgid "" "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +<<<<<<< HEAD +======= +"Advertencia: has cargado una partida guardada con desajustes en %d bytes. " +"Debes cargar otro guardado antes de continuar, o cargar este guardado con el " +"modo de solo lectura desactivado. De lo contrario, probablemente obtengas " +"una desincronización.\n" +"\n" +"Más información: La película actual dura %d fotogramas y el guardado de la " +"película dura %d fotogramas.\n" +"\n" +"En el fotograma %d, la película actual presiona:\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"\n" +"En el fotograma %d, el guardado de la película presiona:\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5857,11 +6200,15 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5892,11 +6239,15 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5928,6 +6279,7 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5937,6 +6289,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Trabajando..." @@ -5985,11 +6342,11 @@ msgstr "No puede cerrar ventanas que tengan páginas en ellas." #: Source/Core/DolphinWX/Src/NetWindow.cpp:194 msgid "You must choose a game!!" -msgstr "¡¡Debe elegir un juego!!" +msgstr "¡¡Debes elegir un juego!!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" -msgstr "¡Debe escribir un nombre!" +msgstr "¡Debes escribir un nombre!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." @@ -5997,11 +6354,11 @@ msgstr "Debes introducir un valor decimal o hexadecimal válido." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." -msgstr "Debe introducir un nombre de perfil válido." +msgstr "Debes introducir un nombre de perfil válido." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "Debe reiniciar Dolphin para que el cambio tenga efecto." +msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 5af84de44e..d5f462ae2c 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= @@ -23,6 +24,10 @@ msgstr "" "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-12-20 18:42+0100\n" >>>>>>> Update Hungarian and Turkish translations. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-10-28 23:40+0100\n" +>>>>>>> Update from master branch. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -64,9 +69,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -194,11 +199,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -262,7 +267,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Propriétés" @@ -306,7 +311,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -355,10 +360,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -415,8 +421,8 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -463,6 +469,7 @@ msgstr "" "Dans le doute, cochez plutôt EFB vers texture." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Action" @@ -563,11 +570,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Ajouter un patch" @@ -575,6 +582,7 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -590,6 +598,11 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Ajouter..." @@ -642,7 +655,7 @@ msgstr "" msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -650,14 +663,15 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -670,18 +684,22 @@ msgstr "Tous les fichiers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" @@ -728,7 +746,7 @@ msgstr "L'apploader n'a pas la bonne taille... est-ce vraiment un apploader ?" msgid "Apploader unable to load from file" msgstr "L'apploader ne peut charger depuis ce fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader :" @@ -747,7 +765,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabe" @@ -756,7 +774,7 @@ msgstr "Arabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -764,12 +782,13 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -779,6 +798,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -787,11 +809,11 @@ msgstr "Format d'écran :" msgid "At least one pane must remain open." msgstr "Au moins un panneau doit rester ouvert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -799,6 +821,7 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -808,6 +831,9 @@ msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -852,7 +878,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -862,7 +888,7 @@ msgid "Backend:" msgstr "Moteur :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -875,15 +901,15 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Bannière :" @@ -895,7 +921,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Paramètres de base" @@ -928,6 +954,7 @@ msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -935,6 +962,9 @@ msgstr "Bleu Droite" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Bas" @@ -943,7 +973,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Corrompu" @@ -951,7 +981,7 @@ msgstr "Corrompu" msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" @@ -959,7 +989,7 @@ msgstr "Choisir un dossier à ajouter" msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -967,6 +997,7 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -976,6 +1007,9 @@ msgstr "Buffer :" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -985,11 +1019,11 @@ msgstr "Boutons" msgid "C Stick" msgstr "Stick-C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" @@ -1042,16 +1076,12 @@ msgstr "Annuler" msgid "Cannot open %s" msgstr "Impossible d'ouvrir %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "Impossible d'enregistrer des films en mode Lecture seule." - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "" "Impossible de désenregistrer des évènements alors qu'il y en a en attente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1062,7 +1092,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1093,7 +1123,7 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalan" @@ -1110,6 +1140,7 @@ msgid "Change &Disc..." msgstr "&Changer de disque..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Changer de disque" @@ -1117,7 +1148,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1133,8 +1164,8 @@ msgstr "Change le signe du paramètre zFar (après correction)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Change le signe du paramètre zNear (après correction)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1154,31 +1185,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1186,6 +1217,7 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1196,6 +1228,9 @@ msgstr "Choisir une carte mémoire :" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1210,8 +1245,8 @@ msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créé ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1230,7 +1265,7 @@ msgstr "Classique" msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Echec de l'éffacement" @@ -1246,6 +1281,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1253,6 +1289,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1277,20 +1316,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1317,13 +1356,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1332,7 +1371,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1342,21 +1381,26 @@ msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Connecter la 1ère Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Connecter la 2è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Connecter la 3è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1366,6 +1410,9 @@ msgstr "Connecter la 4è Wiimote" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connexion..." @@ -1390,7 +1437,7 @@ msgstr "Echec de la copie" msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Core" @@ -1421,7 +1468,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1449,7 +1496,7 @@ msgstr "" "Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " "peut-être protégé contré l'écriture ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1466,7 +1513,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Pays :" @@ -1480,10 +1527,11 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1494,6 +1542,9 @@ msgstr "Créé par KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1506,11 +1557,11 @@ msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" @@ -1545,7 +1596,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Le dossier actuel a été changé de %s en %s après wxFileSelector !" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1553,15 +1604,15 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tchèque" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Pad numérique" @@ -1569,13 +1620,14 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 @@ -1583,18 +1635,21 @@ msgstr "Moteur d'émulation du DSP (Audio)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1602,7 +1657,7 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1610,7 +1665,7 @@ msgstr "Racine du DVD :" msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Date :" @@ -1639,16 +1694,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1656,7 +1711,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1700,8 +1755,8 @@ msgstr "" msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1786,7 +1841,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disque" @@ -1813,6 +1868,7 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1822,10 +1878,13 @@ msgstr "Diviser" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1850,6 +1909,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1874,6 +1934,14 @@ msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1885,6 +1953,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 @@ -1895,6 +1964,9 @@ msgstr "Dolphin dans &Google Code" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1915,8 +1987,12 @@ msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher d >>>>>>> Update translation files for recent changes in the code. ======= +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1953,7 +2029,7 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -2000,6 +2076,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -2015,6 +2092,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Néerlandais" @@ -2067,8 +2149,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Editer..." @@ -2080,7 +2162,7 @@ msgstr "Effets" msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" @@ -2118,7 +2200,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -2146,7 +2228,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Activer le contrôle audio" @@ -2160,18 +2242,25 @@ msgstr "Activer l'assemblage de blocs" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2181,10 +2270,13 @@ msgstr "Activer le cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Activer la musique DTK" @@ -2192,7 +2284,7 @@ msgstr "Activer la musique DTK" msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" @@ -2204,7 +2296,7 @@ msgstr "Activer les touches de raccourci" msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" @@ -2217,7 +2309,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -2281,6 +2373,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2291,6 +2384,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2315,7 +2411,7 @@ msgstr "" "de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. " "(ON = Compatible, OFF = Rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2353,6 +2449,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2368,6 +2465,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Anglais" @@ -2398,6 +2500,7 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2428,9 +2531,19 @@ msgid "" msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +>>>>>>> Update from master branch. msgid "Error" msgstr "Erreur" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2438,7 +2551,14 @@ msgstr "" "défaut du système." >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format <<<<<<< HEAD <<<<<<< HEAD @@ -2487,11 +2607,12 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exporter un fichier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exporter l'enregistrement..." @@ -2503,7 +2624,7 @@ msgstr "Exporter l'enregistrement..." msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" @@ -2535,44 +2656,44 @@ msgstr "Paramètres supplémentaires" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Paramètre supplémentaire utile dans ''Metroid: Other M'' uniquement." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extraction..." @@ -2588,7 +2709,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Taille FST :" @@ -2604,7 +2725,7 @@ msgstr "Ecoute impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2781,11 +2902,11 @@ msgstr "Fichier non compressé" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2805,7 +2926,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2839,7 +2960,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2871,6 +2992,7 @@ msgid "Frame " msgstr "Image " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avancement d'image" @@ -2886,7 +3008,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Image/s max :" @@ -2898,6 +3020,7 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2913,6 +3036,11 @@ msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Français" @@ -2938,18 +3066,24 @@ msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy msgid "GCMic Configuration" msgstr "Configuration de la journalisation" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID du jeu :" @@ -2965,7 +3099,7 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" @@ -2973,7 +3107,7 @@ msgstr "Paramètres spécifiques au jeu" msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "GameCube" @@ -2984,6 +3118,7 @@ msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2991,6 +3126,9 @@ msgstr "Paramètres de la &manette GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3015,6 +3153,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= @@ -3023,6 +3162,10 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3031,6 +3174,7 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -3046,6 +3190,11 @@ msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Allemand" @@ -3110,7 +3259,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grèque" @@ -3142,7 +3291,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Echec de la vérification de la somme de contrôle de l'entête" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hébreu" @@ -3207,6 +3356,7 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= @@ -3215,10 +3365,14 @@ msgstr "Configuration des raccourcis clavier" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Hongrois" @@ -3250,7 +3404,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -3266,11 +3420,11 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -3283,14 +3437,20 @@ msgid "Icon" msgstr "Icône" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -3298,6 +3458,7 @@ msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3308,6 +3469,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3406,7 +3570,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Dans le jeu" @@ -3435,7 +3599,7 @@ msgstr "Insérer" msgid "Insert Encrypted or Decrypted code here..." msgstr "Indiquer un code crypté ou décrypté ici..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3447,7 +3611,7 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3458,6 +3622,7 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3467,22 +3632,25 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3491,7 +3659,7 @@ msgstr "" "Erreur interne LZO - échec de la décompression (%d) (%li, %li) \n" "Essayez de charger à nouveau l'état" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" @@ -3499,11 +3667,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3520,7 +3688,7 @@ msgstr "Valeur non valide !" msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3540,14 +3708,15 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3563,6 +3732,11 @@ msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italien" @@ -3570,16 +3744,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonais" @@ -3588,16 +3762,17 @@ msgid "KOREA" msgstr "Corée" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Coréen" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3606,11 +3781,11 @@ msgid "L Button" msgstr "Bouton L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Langue :" @@ -3633,6 +3808,7 @@ msgid "Left Stick" msgstr "Stick Gauche" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3662,7 +3838,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3675,34 +3851,42 @@ msgid "Load Custom Textures" msgstr "Charger textures personnalisées" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "Charger l'état du Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "Charger l'état du Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "Charger l'état du Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "Charger l'état du Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "Charger l'état du Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "Charger l'état du Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "Charger l'état du Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" @@ -3710,6 +3894,7 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3731,6 +3916,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3759,7 +3951,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3814,6 +4006,7 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3823,15 +4016,18 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Concepteur :" @@ -3855,6 +4051,7 @@ msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3862,6 +4059,9 @@ msgstr "Octet mémoire" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Carte mémoire" @@ -3900,7 +4100,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Micro" @@ -3913,7 +4113,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3944,7 +4144,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Vibreur" @@ -4062,6 +4262,7 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -4071,6 +4272,9 @@ msgstr "NP Haut" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4109,7 +4313,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -4144,7 +4348,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norvégien Bokmål" @@ -4152,11 +4356,12 @@ msgstr "Norvégien Bokmål" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Non défini" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -4166,10 +4371,13 @@ msgstr "Non défini" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notes" @@ -4211,7 +4419,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Arrêt" @@ -4228,19 +4436,23 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -4279,7 +4491,7 @@ msgid "Opens the logger" msgstr "Ouvrir le journaliseur" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Options" @@ -4360,10 +4572,11 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4376,6 +4589,10 @@ msgstr "Chemins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4384,7 +4601,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Parfait" @@ -4397,6 +4614,7 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4407,18 +4625,24 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Démarrer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Jouer l'enregistrement..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Jouable" @@ -4430,6 +4654,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4439,6 +4664,9 @@ msgstr "Joueurs" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4450,23 +4678,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -4475,11 +4703,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4488,6 +4716,9 @@ msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" @@ -4503,8 +4734,11 @@ msgstr "" msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -4547,7 +4781,7 @@ msgid "Quit" msgstr "Quitter" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -4556,7 +4790,7 @@ msgid "R Button" msgstr "Bouton R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R Analog." @@ -4573,6 +4807,7 @@ msgid "Range" msgstr "Etendue" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Mode Lecture seule" @@ -4644,6 +4879,7 @@ msgid "Refresh" msgstr "Rafraîchir" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Rafraîchir la liste" @@ -4651,6 +4887,7 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4669,6 +4906,12 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Retirer" @@ -4689,11 +4932,15 @@ msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4716,15 +4963,15 @@ msgid "Right Stick" msgstr "Stick Droit" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Exécuter DSP LLE sur un thread dédié (non recommandé)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russe" @@ -4736,6 +4983,7 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4745,6 +4993,9 @@ msgstr "Sûr " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4759,34 +5010,42 @@ msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Sauvegarder l'état vers le Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Sauvegarder l'état vers le Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Sauvegarder l'état vers le Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Sauvegarder l'état vers le Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Sauvegarder l'état vers le Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Sauvegarder l'état vers le Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Sauvegarder l'état vers le Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" @@ -4794,12 +5053,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -4807,11 +5066,11 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4822,16 +5081,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Recherche..." @@ -4847,7 +5106,7 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" @@ -4862,6 +5121,7 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4886,6 +5146,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4911,6 +5179,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4928,18 +5197,25 @@ msgstr "Sélectionner l'état à charger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5011,10 +5287,11 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5025,6 +5302,9 @@ msgstr "Serbe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5042,7 +5322,7 @@ msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptat msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" @@ -5058,11 +5338,11 @@ msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" @@ -5070,7 +5350,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Nom court :" @@ -5130,7 +5410,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Afficher la langue :" @@ -5170,11 +5450,11 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5239,15 +5519,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" @@ -5326,11 +5606,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -5355,7 +5635,7 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Paramètres audio" @@ -5373,6 +5653,7 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5388,6 +5669,11 @@ msgstr "Espace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espagnol" @@ -5431,6 +5717,7 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5440,6 +5727,9 @@ msgstr "Contrôleur standard" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5454,14 +5744,16 @@ msgid "Start Re&cording" msgstr "Commencer l'enregistrement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Etat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Etats" @@ -5474,11 +5766,15 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -5522,8 +5818,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Langue du système :" @@ -5557,6 +5853,7 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5572,6 +5869,16 @@ msgid "Take Screenshot" msgstr "Capture d'écran" >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +msgid "Take Screenshot" +msgstr "Capture d'écran" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -5600,13 +5907,13 @@ msgstr "L'adresse n'est pas valide" msgid "The checksum was successfully fixed" msgstr "La somme de contrôle a été corrigée avec succès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "Le dossier sélectionné est déjà dans la liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -5696,7 +6003,7 @@ msgstr "Le fichier spécifié \"%s\" n'existe pas" msgid "The value is invalid" msgstr "La valeur n'est pas valide" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Thème" @@ -5728,7 +6035,7 @@ msgstr "" "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " "l'Action Replay lui-même." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." @@ -5751,7 +6058,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5767,11 +6074,11 @@ msgstr "" "Raccourci clavier : Appuyer pour instantanément désactiver cette " "option." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5799,7 +6106,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Titre" @@ -5816,17 +6123,22 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5834,10 +6146,13 @@ msgstr "Activer le plein écran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -5845,7 +6160,7 @@ msgstr "Chinois traditionnel" msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Déclencheurs" @@ -5861,7 +6176,7 @@ msgstr "" "Essai de lecture à partir d'un SYSCONF non valide\n" "Les IDs BT de la Wiimote ne sont pas disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turque" @@ -5954,6 +6269,7 @@ msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" >>>>>>> Update Hungarian and Turkish translations. +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5969,6 +6285,8 @@ msgstr "" "Continuer ?" >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5983,7 +6301,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5995,7 +6313,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -6051,7 +6369,7 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Vidéo" @@ -6059,7 +6377,7 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volume" @@ -6127,6 +6445,9 @@ msgstr "" "Continuer ?" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:629 #, c-format msgid "" @@ -6162,8 +6483,11 @@ msgid "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -6181,15 +6505,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -6197,6 +6521,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6206,6 +6531,9 @@ msgstr "Importer une sauvegarde Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6236,6 +6564,7 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -6245,6 +6574,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -6276,6 +6608,7 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6291,6 +6624,11 @@ msgstr "Casse" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Travail..." @@ -6354,7 +6692,7 @@ msgstr "Vous devez entrer une valeur décimale, hexadécimale ou octale valide." msgid "You must enter a valid profile name." msgstr "Vous devez entrer un profil de nom valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Vous devez redémarrer Dolphin pour que ce changement prenne effet." @@ -6377,7 +6715,7 @@ msgstr "" "Il devrait être de 0x%04x (au lieu de 0x%04llx).\n" "Voulez-vous en générer un nouveau ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -6448,7 +6786,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6465,7 +6803,7 @@ msgstr "Impossible de lire les données du fichier %s" msgid "failed to read header" msgstr "Impossible de lire l'entête" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -6486,7 +6824,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6598,6 +6936,9 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "Impossible d'ouvrir %s, une fonction manque" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Impossible d'enregistrer des films en mode Lecture seule." + #~ msgid "Config..." #~ msgstr "Configurer..." @@ -6697,9 +7038,6 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Paramètres graphiques de l'émulateur" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Activer le calcul de la boît de saut" - #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -6758,13 +7096,6 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "Erreur d'allocation du buffer" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "Erreur dans PlayWiimote. %u != %u, octet %d.\n" -#~ "Désolé, l'enregistrement Wii est temporairement instable." - #~ msgid "Error loading %s: can't read info" #~ msgstr "Erreur lors du chargement de %s : inpossible de lire l'info" @@ -6777,13 +7108,6 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erreur d'ouverture du fichier %s pour l'enregistrement" -#~ msgid "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Erreur : Apres \"%s\", %d (0x%X) a été trouvé au lieu du marqueur de " -#~ "sauvegarde %d (0x%X). Abandon du chargement de la sauvegarde d'état..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6822,9 +7146,6 @@ msgstr "| OR" #~ "en ont besoin pour fonctionneer correctement, mais peut être aussi très " #~ "lent." -#~ msgid "GCMic Configuration" -#~ msgstr "Configuration du micro de la GC" - #~ msgid "GFX Config" #~ msgstr "Configurer..." @@ -6848,13 +7169,6 @@ msgstr "| OR" #~ "Si un jeu bloque, fonctionne seulement avec l'Interpreteur ou que Dolphin " #~ "plante, cette option peut corriger le jeu." -#~ msgid "" -#~ "If checked, the bounding box registers will be updated. Used by the Paper " -#~ "Mario games." -#~ msgstr "" -#~ "Si coché, les registres de la boîte de saut seront mis à jour. Utilisé " -#~ "par les jeux Paper Mario." - #~ msgid "Input Source" #~ msgstr "Source d'entrée" @@ -6943,15 +7257,6 @@ msgstr "| OR" #~ " Exécutez-vous Dolphin à partir d'un média en lecture seule ou d'un " #~ "dossier d'où Dolphin n'est pas situé ?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "Fin prématurée du film dans PlayController. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "Fin prématurée du film dans PlayWiimote. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "Fin prématurée du film dans PlayWiimote. %u > %u" - #~ msgid "Projection Stats" #~ msgstr "Stats de projection" @@ -7077,9 +7382,6 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Démarrer la fenêtre de rendu en plein écran." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "Le fichier " @@ -7094,6 +7396,13 @@ msgstr "| OR" #~ msgstr "" #~ "Le type de configuration %d n'est pas pris en charge dans le plug-in %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Pointeur inconnu %#08x\n" +#~ "Continuer ?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Utiliser les FPS pour limiter" @@ -7124,60 +7433,6 @@ msgstr "| OR" #~ "Attendre les blancs verticaux (ou synchro verticale).\n" #~ "Réduit les sauts mais peut aussi baisser les performances" -#~ msgid "" -#~ "Warning: You loaded a save that's after the end of the current movie. " -#~ "(byte %u > %u) (frame %u > %u). You should load another save before " -#~ "continuing, or load this state with read-only mode off." -#~ msgstr "" -#~ "Attention : vous avez chargé une sauvegarde qui se situe après la fin du " -#~ "film actuel. (octet %u > %u) (image %u > %u). Vous devriez charger une " -#~ "autre sauvegarde avant de continuer, ou charger cette sauvegarde en " -#~ "désactivant le mode Lecture seule." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -#~ "should load another save before continuing, or load this state with read-" -#~ "only mode off. Otherwise you'll probably get a desync." -#~ msgstr "" -#~ "Attention : vous avez chargé une sauvegarde dont le film ne correspond " -#~ "pas à l'octet %d (0x%X). Vous devriez charger une autre sauvegarde avant " -#~ "de continuer, ou charger cet état en désactivant le mode Lecture seule. " -#~ "Autrement, vous aurez probablement une désynchronisation." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on frame %d. You should " -#~ "load another save before continuing, or load this state with read-only " -#~ "mode off. Otherwise you'll probably get a desync.\n" -#~ "\n" -#~ "More information: The current movie is %d frames long and the savestate's " -#~ "movie is %d frames long.\n" -#~ "\n" -#~ "On frame %d, the current movie presses:\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, " -#~ "DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=" -#~ "%d\n" -#~ "\n" -#~ "On frame %d, the savestate's movie presses:\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, " -#~ "DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" -#~ msgstr "" -#~ "Attention : vous avez chargé une sauvegarde dont le film ne correspond " -#~ "pas à l'image %d. Vous devriez charger une autre sauvegarde avant de " -#~ "continuer, ou charger cet état en désactivant le mode Lecture seule. " -#~ "Autrement, vous aurez probablement une désynchronisation.\n" -#~ "\n" -#~ "Infos complémentaires : Le film actuel fait %d images et alors que le " -#~ "film de la sauvegarde d'état fait %d images.\n" -#~ "\n" -#~ "A l'image %d, le film actuel appuie sur :\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " -#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=" -#~ "%d\n" -#~ "\n" -#~ "A l'image %d, le film de la sauvegarde d'état appuie sur :\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " -#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" - #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/he.po b/Languages/po/he.po index 857ec27567..ea10f8cea4 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -510,6 +514,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -519,6 +524,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -572,6 +582,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -579,6 +590,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -656,11 +671,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -681,11 +700,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -795,10 +818,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -831,11 +858,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1058,10 +1089,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1170,11 +1205,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1350,10 +1389,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1563,11 +1606,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1596,15 +1643,20 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +>>>>>>> Update from master branch. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 @@ -1612,6 +1664,10 @@ msgstr "הגדרות גרפיקה" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1694,6 +1750,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1703,6 +1760,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1826,21 +1888,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1966,6 +2038,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1975,6 +2048,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2004,6 +2082,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2021,6 +2100,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2435,6 +2527,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2444,6 +2537,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2513,10 +2611,14 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2538,11 +2640,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2552,6 +2659,7 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2561,6 +2669,11 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2676,11 +2789,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2870,11 +2988,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2951,6 +3073,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2960,6 +3083,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3110,6 +3238,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3123,6 +3252,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3200,11 +3336,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3236,10 +3376,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3416,11 +3560,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3507,11 +3655,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3573,9 +3725,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3701,6 +3857,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3708,6 +3865,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3728,12 +3889,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3759,11 +3925,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3969,6 +4139,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3980,6 +4151,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3996,9 +4173,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4041,11 +4222,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4129,11 +4314,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4173,6 +4362,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4188,6 +4378,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4210,6 +4408,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4222,15 +4421,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4566,6 +4772,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4575,6 +4782,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4610,11 +4822,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4650,9 +4866,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4725,9 +4945,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4940,18 +5164,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5053,6 +5285,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5063,6 +5296,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5265,11 +5500,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5296,11 +5535,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5332,6 +5575,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5341,6 +5585,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 4e43ee3092..27ed2a0941 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:41-0600\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-12-20 17:22-0600\n" >>>>>>> Update Hungarian and Turkish translations. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-27 08:22-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -586,6 +591,7 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mező hozzáadása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -595,6 +601,11 @@ msgstr "Új mező hozzáadása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Hozzáadás..." @@ -664,6 +675,7 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -671,6 +683,10 @@ msgstr "Minden Gamecube GCM fájl (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -769,11 +785,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -794,11 +814,15 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -916,10 +940,14 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Lent" @@ -952,11 +980,15 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1022,6 +1054,7 @@ msgstr "Mégsem" msgid "Cannot open %s" msgstr "%s nem nyitható meg" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 @@ -1029,15 +1062,21 @@ msgid "Cannot record movies in read-only mode." msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nem lehet események bejegyzéseket törölni függőben lévő eseményekkel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +>>>>>>> Update from master branch. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1214,10 +1253,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Bezárás" @@ -1326,11 +1369,15 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Csatlakozás..." @@ -1521,10 +1568,14 @@ msgstr "DSP emulátor motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1757,11 +1808,15 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működő emulációt?" @@ -1790,6 +1845,7 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1805,6 +1861,14 @@ msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad beállítások" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1901,6 +1965,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1910,6 +1975,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holland" @@ -2053,6 +2123,7 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2060,15 +2131,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Bounding Box kalkuláció használata" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2224,6 +2305,7 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2233,6 +2315,11 @@ msgstr "Vége" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Angol" @@ -2262,6 +2349,7 @@ msgstr "Egyenlő" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2279,6 +2367,21 @@ msgid "Error" msgstr "Hiba" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Hiba" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"PlayWiimote hiba. %u != %u, bájt %d.\n" +"Sajnos a Wii videó rögzítés egyenlőre nem működik." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2291,6 +2394,11 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD +======= +"Hiba: \"%s\" után, %d (0x%X) található a mentési jelölő helyett %d (0x%X). " +"Mentés betöltésének leállítása..." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2738,6 +2846,7 @@ msgstr "Rögzítendő képkockák" msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2747,6 +2856,11 @@ msgstr "Szabad nézet" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francia" @@ -2772,9 +2886,14 @@ msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "Napló beállítások" +======= +msgid "GCMic Configuration" +msgstr "GCMic beállítások" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2814,10 +2933,14 @@ msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2841,11 +2964,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Általános" @@ -2854,6 +2982,7 @@ msgstr "Általános" msgid "General Settings" msgstr "Általános beállítások" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2863,6 +2992,11 @@ msgstr "Általános beállítások" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Német" @@ -3002,11 +3136,16 @@ msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3079,6 +3218,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " +"játékok használják." +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3231,11 +3375,15 @@ msgid "" msgstr "" "InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3317,6 +3465,7 @@ msgstr "Nem megfelelő rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelő mentés" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3326,6 +3475,11 @@ msgstr "Nem megfelelő mentés" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Olasz" @@ -3483,6 +3637,7 @@ msgstr "Állás betöltése a 8. helyről" msgid "Load State..." msgstr "Állás betöltése..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3496,6 +3651,13 @@ msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3577,11 +3739,15 @@ msgstr "MMU sebesség növelő hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Főkar" @@ -3613,10 +3779,14 @@ msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Memóriakártya" @@ -3814,11 +3984,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3905,11 +4079,15 @@ msgstr "Nem egyenlő" msgid "Not Set" msgstr "Nincs beállítva" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3971,9 +4149,13 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Megnyitás" @@ -4104,6 +4286,7 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4111,6 +4294,10 @@ msgstr "Mappák" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4131,12 +4318,17 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Indítás" @@ -4162,11 +4354,15 @@ msgstr "Visszajátszási lehetőségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4218,17 +4414,29 @@ msgstr "Utófeldolgozási effektus:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4377,6 +4585,7 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4388,6 +4597,12 @@ msgstr "Játéklista frissítése" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Törlés" @@ -4407,9 +4622,13 @@ msgstr "Megjelenítés a főablakban" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4452,11 +4671,15 @@ msgstr "Ál&lás mentése" msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4540,11 +4763,15 @@ msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -4584,6 +4811,7 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4599,6 +4827,14 @@ msgstr "Válassz rögzítendő fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Válassz rögzítendő fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendő Wii WAD fájlt" @@ -4624,6 +4860,7 @@ msgstr "Válassz lebegő ablakokat" msgid "Select the file to load" msgstr "Betöltendő fájl kiválasztása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4636,15 +4873,22 @@ msgstr "Válassz betöltendő állásmentést" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Válassz betöltendő állásmentést" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Válassz mentendő állást" @@ -5026,6 +5270,7 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5035,6 +5280,11 @@ msgstr "Szóköz" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanyol" @@ -5078,11 +5328,15 @@ msgstr "Negyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5118,9 +5372,13 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -5206,15 +5464,23 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Pillanatkép készítése" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5455,18 +5721,26 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Fent" @@ -5577,6 +5851,7 @@ msgstr "" "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettől a játékostól:%d " "Játékos kirúgása!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5589,6 +5864,8 @@ msgstr "" "Folytatod?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5751,6 +6028,13 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " +"utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás előtt betölthetsz egy " +"másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " +"után." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5759,6 +6043,13 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " +"eltérés mutatkozik. Folytatás előtt betölthetsz egy másik mentést, vagy " +"betöltheted ezt a mentést az írásvédett mód kikapcsolása után. Ellenkező " +"esetben szinkronizációs hibák jelentkezhetnek." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5778,6 +6069,24 @@ msgid "" "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " +"mutatkozik. Folytatás előtt betölthetsz egy másik mentést, vagy betöltheted " +"ezt a mentést az írásvédett mód kikapcsolása után. Ellenkező esetben " +"szinkronizációs hibák jelentkezhetnek.\n" +"\n" +"Bővebb információk: A választott videó %d képkocka hosszú, a mentett állás " +"videója pedig %d képkocka hosszú.\n" +"\n" +"%d képkockánál a videó tömörítve lesz:\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"\n" +"%d képkockánál a mentett állás videója tömörítve lesz:\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5812,11 +6121,15 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5847,11 +6160,15 @@ msgstr "" "esetleg az üresjárati időkorlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5883,6 +6200,7 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5892,6 +6210,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Folyamatban..." @@ -6298,9 +6621,6 @@ msgstr "| VAGY" #~ msgid "Emulator Display Settings" #~ msgstr "Emulátor kijelző beállítások" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Bounding Box kalkuláció használata" - #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6358,13 +6678,6 @@ msgstr "| VAGY" #~ msgid "Error allocating buffer" #~ msgstr "Puffer kiosztási hiba" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "PlayWiimote hiba. %u != %u, bájt %d.\n" -#~ "Sajnos a Wii videó rögzítés egyenlőre nem működik." - #~ msgid "Error loading %s: can't read info" #~ msgstr "Hiba a(z) %s betöltése közben: az infó nem olvasható" @@ -6377,13 +6690,6 @@ msgstr "| VAGY" #~ msgid "Error opening file %s for recording" #~ msgstr "Hiba a(z) %s fájl rögzítéshez történő megnyitása közben" -#~ msgid "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölő helyett %d (0x" -#~ "%X). Mentés betöltésének leállítása..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6421,9 +6727,6 @@ msgstr "| VAGY" #~ "Ez sokkal pontosabb mint az EFB másolás textúrába, és néhány játékhoz " #~ "szükséges a megfelelő működéshez, ugyanakkor nagyon lassú is lehet." -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic beállítások" - #~ msgid "GFX Config" #~ msgstr "GFX beállítások" @@ -6447,13 +6750,6 @@ msgstr "| VAGY" #~ "Ha a játék leáll, csak Interpreter módban működik vagy ha a Dolphin " #~ "kifagy, akkor ez a beállítás javíthat a játékon." -#~ msgid "" -#~ "If checked, the bounding box registers will be updated. Used by the Paper " -#~ "Mario games." -#~ msgstr "" -#~ "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper " -#~ "Mario játékok használják." - #~ msgid "Input Source" #~ msgstr "Bemeneti forrás" @@ -6543,15 +6839,6 @@ msgstr "| VAGY" #~ " A Dolphin emulátort csak olvasható eszközről futtatod vagy egy olyan " #~ "könyvtárból amely nem tartalmazza az emulátort?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" - #~ msgid "Projection Stats" #~ msgstr "Kivetítési statisztikák" @@ -6671,9 +6958,6 @@ msgstr "| VAGY" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "A megjelenítési ablak teljes képernyős módban indul." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "A fájl" @@ -6723,60 +7007,6 @@ msgstr "| VAGY" #~ "Várakozás a függőleges képkioltásra.\n" #~ "Csökkenti a képszakadást de egyben a teljesítményt is." -#~ msgid "" -#~ "Warning: You loaded a save that's after the end of the current movie. " -#~ "(byte %u > %u) (frame %u > %u). You should load another save before " -#~ "continuing, or load this state with read-only mode off." -#~ msgstr "" -#~ "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " -#~ "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás előtt betölthetsz egy " -#~ "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód " -#~ "kikapcsolása után." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -#~ "should load another save before continuing, or load this state with read-" -#~ "only mode off. Otherwise you'll probably get a desync." -#~ msgstr "" -#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " -#~ "eltérés mutatkozik. Folytatás előtt betölthetsz egy másik mentést, vagy " -#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. Ellenkező " -#~ "esetben szinkronizációs hibák jelentkezhetnek." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on frame %d. You should " -#~ "load another save before continuing, or load this state with read-only " -#~ "mode off. Otherwise you'll probably get a desync.\n" -#~ "\n" -#~ "More information: The current movie is %d frames long and the savestate's " -#~ "movie is %d frames long.\n" -#~ "\n" -#~ "On frame %d, the current movie presses:\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, " -#~ "DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=" -#~ "%d\n" -#~ "\n" -#~ "On frame %d, the savestate's movie presses:\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, " -#~ "DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" -#~ msgstr "" -#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka " -#~ "eltérés mutatkozik. Folytatás előtt betölthetsz egy másik mentést, vagy " -#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. Ellenkező " -#~ "esetben szinkronizációs hibák jelentkezhetnek.\n" -#~ "\n" -#~ "Bővebb információk: A választott videó %d képkocka hosszú, a mentett " -#~ "állás videója pedig %d képkocka hosszú.\n" -#~ "\n" -#~ "%d képkockánál a videó tömörítve lesz:\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, " -#~ "DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=" -#~ "%d\n" -#~ "\n" -#~ "%d képkockánál a mentett állás videója tömörítve lesz:\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, " -#~ "DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" - #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/it.po b/Languages/po/it.po index c27de2da97..622cfea1fe 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -556,6 +560,7 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -565,6 +570,11 @@ msgstr "Aggiungi nuovo riquadro" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Aggiungi..." @@ -636,6 +646,7 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -643,6 +654,10 @@ msgstr "Tutti i file GCM GameCube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -726,11 +741,15 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -751,11 +770,15 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -869,10 +892,14 @@ msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Sotto" @@ -905,11 +932,15 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1148,10 +1179,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Chiudi" @@ -1261,11 +1296,15 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connessione in corso..." @@ -1455,10 +1494,14 @@ msgstr "Motore di Emulazione DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1678,11 +1721,15 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1711,6 +1758,7 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1726,6 +1774,14 @@ msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin - Configurazione Controlli GC" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1814,6 +1870,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1823,6 +1880,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Olandese" @@ -1952,22 +2014,32 @@ msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2108,6 +2180,7 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2117,6 +2190,11 @@ msgstr "Fine" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglese" @@ -2146,6 +2224,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2163,6 +2242,19 @@ msgid "Error" msgstr "Errore/i" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Errore/i" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2627,6 +2719,7 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2636,6 +2729,11 @@ msgstr "Visuale Libera" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francese" @@ -2704,10 +2802,14 @@ msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2731,11 +2833,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2745,6 +2852,7 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2754,6 +2862,11 @@ msgstr "Impostazioni Interfaccia" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Tedesco" @@ -2879,11 +2992,16 @@ msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -3097,11 +3215,15 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3185,6 +3307,7 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3194,6 +3317,11 @@ msgstr "Stato non valido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3352,20 +3480,28 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3448,11 +3584,15 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3484,10 +3624,14 @@ msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3673,11 +3817,15 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,11 +3912,15 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Non collegato" @@ -3830,9 +3982,13 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Apri" @@ -3966,6 +4122,7 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3973,6 +4130,10 @@ msgstr "Percorsi" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3994,12 +4155,17 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Gioca" @@ -4025,11 +4191,15 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4243,6 +4413,7 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4254,6 +4425,12 @@ msgstr "Aggiorna elenco giochi" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Rimuovi" @@ -4273,9 +4450,13 @@ msgstr "Rendering nella finestra Principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4318,11 +4499,15 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4407,11 +4592,15 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4451,6 +4640,7 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4466,6 +4656,14 @@ msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4491,6 +4689,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4503,15 +4702,22 @@ msgstr "Seleziona lo stato di gioco da caricare" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4866,6 +5072,7 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4875,6 +5082,11 @@ msgstr "Spazio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spagnolo" @@ -4910,11 +5122,15 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4950,9 +5166,13 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -5026,9 +5246,13 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -5274,18 +5498,26 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Sopra" @@ -5391,6 +5623,7 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5403,6 +5636,8 @@ msgstr "" "Continuare?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5615,11 +5850,15 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5650,11 +5889,15 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5687,6 +5930,7 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5696,6 +5940,11 @@ msgstr "Adatta Testo" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 1392815cb3..12fee69911 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= @@ -16,6 +17,9 @@ msgstr "" "PO-Revision-Date: 2011-08-19 08:37-0500\n" >>>>>>> Update translation files for recent changes in the code. ======= +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-10-12 20:45+0900\n" >>>>>>> Update Arabic and Japanese translations. "Last-Translator: DanbSky\n" @@ -566,6 +570,7 @@ msgstr "パッチを追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -575,6 +580,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "追加" @@ -640,6 +650,7 @@ msgstr "全ての GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -647,6 +658,10 @@ msgstr "GC GCMファイル (gcm)|*.gcm" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "全てのステートセーブファイル (sav, s##)" @@ -745,11 +760,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "このタイトルの実体ファイルを削除しますか?元に戻すことはできません!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比:" @@ -770,11 +789,15 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -890,10 +913,14 @@ msgstr "青 - 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "下部" @@ -926,11 +953,15 @@ msgstr "出力先を選択" msgid "Buffer:" msgstr "バッファ:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1178,10 +1209,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "閉じる" @@ -1290,11 +1325,15 @@ msgstr "3PのWii リモコンを接続/切断" msgid "Connect Wiimote 4" msgstr "4PのWii リモコンを接続/切断" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "接続中..." @@ -1486,10 +1525,14 @@ msgstr "DSPエミュレーション方式" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1720,11 +1763,15 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "動作中のゲームを停止しますか?" @@ -1753,6 +1800,7 @@ msgstr "Wii リモコンのエミュレーション設定" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1768,6 +1816,14 @@ msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "GCコントローラ設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1864,6 +1920,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1873,6 +1930,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "オランダ語" @@ -2017,21 +2079,31 @@ msgid "Enable Block Merging" msgstr "Enable Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "チートコードを有効化" @@ -2185,6 +2257,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2194,6 +2267,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "英語" @@ -2223,6 +2301,7 @@ msgstr "に一致する" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2240,6 +2319,19 @@ msgid "Error" msgstr "エラー" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "エラー" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2698,6 +2790,7 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2707,6 +2800,11 @@ msgstr "フリールック" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "フランス語" @@ -2774,10 +2872,14 @@ msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2801,11 +2903,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2814,6 +2921,7 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2823,6 +2931,11 @@ msgstr "一般" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "ドイツ語" @@ -2962,11 +3075,16 @@ msgstr "ホットキーの設定" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "ホットキー" @@ -3189,11 +3307,15 @@ msgstr "" "InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ" "ポートされていません" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WADファイルを追加しています..." @@ -3275,6 +3397,7 @@ msgstr "不正な録画ファイル" msgid "Invalid state" msgstr "不正なセーブ/ロードファイル" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3284,6 +3407,11 @@ msgstr "不正なセーブ/ロードファイル" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "イタリア語" @@ -3441,6 +3569,7 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルからロード" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3454,6 +3583,13 @@ msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( バージョン:%d %c )" @@ -3536,11 +3672,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3572,10 +3712,14 @@ msgstr "メモリバイト" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "メモリーカード" @@ -3771,11 +3915,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3862,11 +4010,15 @@ msgstr "に一致しない" msgid "Not Set" msgstr "未確認" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未接続" @@ -3928,9 +4080,13 @@ msgstr "残り %d ブロックしかありません!" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "開く" @@ -4061,6 +4217,7 @@ msgstr "パッチ" msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4068,6 +4225,10 @@ msgstr "フォルダ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時停止" @@ -4088,12 +4249,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "開始" @@ -4119,11 +4285,15 @@ msgstr "再生オプション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "確認" @@ -4335,6 +4505,7 @@ msgstr "ゲームリストを再更新" msgid "Refresh game list" msgstr "ゲームリストを再更新します" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4346,6 +4517,12 @@ msgstr "ゲームリストを再更新します" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "削除" @@ -4365,9 +4542,13 @@ msgstr "メインウィンドウ部分に描画" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "初期化" @@ -4410,11 +4591,15 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4498,11 +4683,15 @@ msgstr "Savestate movie %s の破損を確認しました。録画を中止し msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "確認中... .%s" @@ -4542,6 +4731,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "選択" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4557,6 +4747,14 @@ msgstr "録画ファイルを選択" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "録画ファイルを選択" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "追加するWADファイルを選択" @@ -4582,6 +4780,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードするファイルを選択" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4594,15 +4793,22 @@ msgstr "ロードするステートセーブファイルを選択" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "セーブファイルを選択" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "ロードするステートセーブファイルを選択" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "ステートセーブの保存先を選択" @@ -4981,6 +5187,7 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4990,6 +5197,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "スペイン語" @@ -5033,11 +5245,15 @@ msgstr "丸み" msgid "Standard Controller" msgstr "標準コントローラ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5073,9 +5289,13 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "停止" @@ -5153,9 +5373,13 @@ msgstr "右テーブル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "スクリーンショット" @@ -5407,18 +5631,26 @@ msgstr "全てのログ情報を選択/解除" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替え" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "上部" @@ -5527,6 +5759,7 @@ msgstr "次のIDから不明なメッセージを受信 : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5539,6 +5772,8 @@ msgstr "" "Continue?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5762,11 +5997,15 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiのセーブデータをインポート" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5797,11 +6036,15 @@ msgstr "" "またはしばらく入力がなかったため省電力モードに入ったのかもしれません\n" "再接続しますか?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5833,6 +6076,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5842,6 +6086,11 @@ msgstr "ワードラップ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "動作中..." @@ -6549,6 +6798,13 @@ msgstr "| (...もしくは)" ======= >>>>>>> Update translation files for recent changes in the code. +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" + #~ msgid "Use FPS For Limiting" #~ msgstr "有効化" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 6378880eee..a8cc90fdaa 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -553,6 +557,7 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 창 추가" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -562,6 +567,11 @@ msgstr "새로운 창 추가" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "추가..." @@ -629,6 +639,7 @@ msgstr "모든 GC/Wii 이미지들 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임큐브 GCM 파일들 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -636,6 +647,10 @@ msgstr "모든 게임큐브 GCM 파일들 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "모든 상태들 저장 (sav, s##)" @@ -723,11 +738,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -748,11 +767,15 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 에러.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "자동" @@ -868,10 +891,14 @@ msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "아래" @@ -904,11 +931,15 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버퍼:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1150,10 +1181,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "닫기" @@ -1262,11 +1297,15 @@ msgstr "위모트 3 연결" msgid "Connect Wiimote 4" msgstr "위모트 4 연결" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "연결중..." @@ -1458,10 +1497,14 @@ msgstr "DSP 에뮬레이터 엔진" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 에뮬레이션 (빠름)" @@ -1690,11 +1733,15 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "현재 에뮬레이션을 중단하고 싶습니까?" @@ -1723,6 +1770,7 @@ msgstr "돌핀 에뮬된 위모트 환경설정" msgid "Dolphin FIFO" msgstr "돌핀 FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1738,6 +1786,14 @@ msgstr "돌핀 GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "돌핀 GC패드 환경설정" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "돌핀 TAS 동영상 (*.dtm)" @@ -1833,6 +1889,7 @@ msgstr "" "\n" "확신 없다면, 이것을 언체크로 두세요." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1842,6 +1899,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "네덜란드어" @@ -1985,21 +2047,31 @@ msgid "Enable Block Merging" msgstr "블록 합치기 활성" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "캐쉬 활성" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "치트 활성" @@ -2150,6 +2222,7 @@ msgstr "" msgid "End" msgstr "끝" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2159,6 +2232,11 @@ msgstr "끝" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "영어" @@ -2188,6 +2266,7 @@ msgstr "같음" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "에러" @@ -2205,6 +2284,19 @@ msgid "Error" msgstr "에러" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "에러" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다." @@ -2659,6 +2751,7 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "자유로운 보기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2668,6 +2761,11 @@ msgstr "자유로운 보기" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "프랑스어" @@ -2735,10 +2833,14 @@ msgstr "게임큐브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)" @@ -2762,11 +2864,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "일반" @@ -2775,6 +2882,7 @@ msgstr "일반" msgid "General Settings" msgstr "일반 설정" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2784,6 +2892,11 @@ msgstr "일반 설정" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "독일어" @@ -2914,11 +3027,16 @@ msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "단축키들" @@ -3140,11 +3258,15 @@ msgstr "" "InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습" "니다." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3226,6 +3348,7 @@ msgstr "비적합 기록 파일" msgid "Invalid state" msgstr "비적합 상태" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3235,6 +3358,11 @@ msgstr "비적합 상태" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "이탈리아어" @@ -3392,6 +3520,7 @@ msgstr "슬롯8 상태 로드" msgid "Load State..." msgstr "상태 로드..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3405,6 +3534,13 @@ msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3486,11 +3622,15 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz 게임샤크 파일들(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "메인 스틱" @@ -3522,10 +3662,14 @@ msgstr "메모리 바이트" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "메모리 카드" @@ -3723,11 +3867,15 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3814,11 +3962,15 @@ msgstr "같지 않음" msgid "Not Set" msgstr "설정 안함" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "연결되지 않음" @@ -3880,9 +4032,13 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "열기" @@ -4010,6 +4166,7 @@ msgstr "패치" msgid "Paths" msgstr "경로" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4017,6 +4174,10 @@ msgstr "경로" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "일시정지" @@ -4037,12 +4198,17 @@ msgstr "관점 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr " 실행 " @@ -4068,11 +4234,15 @@ msgstr "재생 옵션" msgid "Players" msgstr "플레이어" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "확인해주세요..." @@ -4284,6 +4454,7 @@ msgstr "목록 새로 고침" msgid "Refresh game list" msgstr "게임 목록 새로 고침" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4295,6 +4466,12 @@ msgstr "게임 목록 새로 고침" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "제거" @@ -4314,9 +4491,13 @@ msgstr "메인 윈도우에 렌더" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4359,11 +4540,15 @@ msgstr "상태 저장(&v) " msgid "Safe" msgstr "안전" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "샘플율:" @@ -4447,11 +4632,15 @@ msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지... msgid "Scaled EFB Copy" msgstr "스케일된 EFB 복사" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "스캐닝 %s" @@ -4491,6 +4680,7 @@ msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음" msgid "Select" msgstr "선택" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4506,6 +4696,14 @@ msgstr "기록 파일 선택" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "기록 파일 선택" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD 파일 선택" @@ -4531,6 +4729,7 @@ msgstr "유동적인 윈도우즈 선택" msgid "Select the file to load" msgstr "로드할 파일 선택" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4543,15 +4742,22 @@ msgstr "로드할 상태 선택" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "저장 파일을 선택" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "로드할 상태 선택" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "저장할 상태 선택" @@ -4926,6 +5132,7 @@ msgstr "사운드 버퍼 생성 실패했습니다: %s" msgid "Space" msgstr "스페이스" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4935,6 +5142,11 @@ msgstr "스페이스" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "스페인어" @@ -4978,11 +5190,15 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5018,9 +5234,13 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -5097,9 +5317,13 @@ msgstr "테이블 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "스크린샷 찍기" @@ -5342,18 +5566,26 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "위" @@ -5461,6 +5693,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5473,6 +5706,8 @@ msgstr "" "계속합니까?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5694,11 +5929,15 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파일들 (*.bin)|*.bin" @@ -5729,11 +5968,15 @@ msgstr "" "혹은 아마도 아이들 타임 아웃이거나 다른 원인 때문인 것 같습니다.\n" "당신은 즉시 재연결 하고 싶습니까?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "위모트가 연결됨" @@ -5766,6 +6009,7 @@ msgstr "윈도우즈 오른쪽" msgid "Word Wrap" msgstr "자동 줄바꿈" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5775,6 +6019,11 @@ msgstr "자동 줄바꿈" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "작동중..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index f916e21416..d321d1dde5 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -559,6 +563,7 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -568,6 +573,11 @@ msgstr "Legg til ny rute" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Legg til..." @@ -635,6 +645,7 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -642,6 +653,10 @@ msgstr "Alle GameCube GCM-filer (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Er du sikker på at du vil slette denne filen?\n" "Den vil bli borte for alltid!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -758,11 +777,15 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved åpning av AO-device.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -878,10 +901,14 @@ msgstr "Blå Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Bunn" @@ -914,11 +941,15 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1162,10 +1193,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Lukk" @@ -1274,11 +1309,15 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Kobler til..." @@ -1469,10 +1508,14 @@ msgstr "CPU Emulatormotor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1703,11 +1746,15 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pågående emulering?" @@ -1736,6 +1783,7 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1751,6 +1799,14 @@ msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC-kontroll konfigurasjon" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1846,6 +1902,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1855,6 +1912,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Nederlansk" @@ -1998,21 +2060,31 @@ msgid "Enable Block Merging" msgstr "Aktiver Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2167,6 +2239,7 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2176,6 +2249,11 @@ msgstr "Slutt" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Engelsk" @@ -2205,6 +2283,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2222,6 +2301,19 @@ msgid "Error" msgstr "Feil" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Feil" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt språk. Faller tilbake til systemstandarden." @@ -2677,6 +2769,7 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2686,6 +2779,11 @@ msgstr "Fri Utkikk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Fransk" @@ -2753,10 +2851,14 @@ msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2780,11 +2882,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2793,6 +2900,7 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2802,6 +2910,11 @@ msgstr "Generelle Innstillinger" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Tysk" @@ -2933,11 +3046,16 @@ msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3156,11 +3274,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3242,6 +3364,7 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3251,6 +3374,11 @@ msgstr "Ugyldig save state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiensk" @@ -3408,6 +3536,7 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3421,6 +3550,13 @@ msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3502,11 +3638,15 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3538,10 +3678,14 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Minnekort" @@ -3739,11 +3883,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3830,11 +3978,15 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3896,9 +4048,13 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Åpne" @@ -4029,6 +4185,7 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4036,6 +4193,10 @@ msgstr "Mappestier" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4056,12 +4217,17 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Spill" @@ -4087,11 +4253,15 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4304,6 +4474,7 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4315,6 +4486,12 @@ msgstr "Oppdater spilliste" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Fjern" @@ -4334,9 +4511,13 @@ msgstr "Render til Hovedvindu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4379,11 +4560,15 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4467,11 +4652,15 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4511,6 +4700,7 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4526,6 +4716,14 @@ msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil å innstallere" @@ -4551,6 +4749,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil å laste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4563,15 +4762,22 @@ msgstr "Velg en save state å laste" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Velg en save state å laste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Velg en save state å lagre" @@ -4948,6 +5154,7 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4957,6 +5164,11 @@ msgstr "Mellomrom" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spansk" @@ -4999,11 +5211,15 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5039,9 +5255,13 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5120,9 +5340,13 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -5366,18 +5590,26 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topp" @@ -5484,6 +5716,7 @@ msgstr "Ukjent melding mottatt med ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5496,6 +5729,8 @@ msgstr "" "Fortsett?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5718,11 +5953,15 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5753,11 +5992,15 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5790,6 +6033,7 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5799,6 +6043,11 @@ msgstr "Ordkrumning" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 76e2b607fc..f6c2081f53 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -560,6 +564,7 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -569,6 +574,11 @@ msgstr "Voeg een nieuwe paneel toe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Voeg toe..." @@ -636,6 +646,7 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -643,6 +654,10 @@ msgstr "Alle Gamecube GCM bestanden (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -758,11 +777,15 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -874,10 +897,14 @@ msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Onder" @@ -910,11 +937,15 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1160,10 +1191,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Sluit" @@ -1273,11 +1308,15 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1469,10 +1508,14 @@ msgstr "DSP Emulator Motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1705,11 +1748,15 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1738,6 +1785,7 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1753,6 +1801,14 @@ msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Configuratie" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1847,6 +1903,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1856,6 +1913,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Nederlands" @@ -1999,22 +2061,32 @@ msgid "Enable Block Merging" msgstr "Activeer Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2170,6 +2242,7 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2179,6 +2252,11 @@ msgstr "Einde" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Engels" @@ -2208,6 +2286,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2225,6 +2304,19 @@ msgid "Error" msgstr "Error (Fout)" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error (Fout)" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2687,6 +2779,7 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2696,6 +2789,11 @@ msgstr "Vrije kijk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Frans" @@ -2764,10 +2862,14 @@ msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2791,11 +2893,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2804,6 +2911,7 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2813,6 +2921,11 @@ msgstr "Algemene Instellingen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Duits" @@ -2944,11 +3057,16 @@ msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Hotkeys" @@ -3173,11 +3291,15 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3260,6 +3382,7 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3269,6 +3392,11 @@ msgstr "Onjuiste staat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italië" @@ -3426,20 +3554,28 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3521,11 +3657,15 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3557,10 +3697,14 @@ msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3759,11 +3903,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,11 +3998,15 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Niet verbonden" @@ -3916,9 +4068,13 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Open" @@ -4050,6 +4206,7 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4057,6 +4214,10 @@ msgstr "Pad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4077,12 +4238,17 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Speel" @@ -4108,11 +4274,15 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4325,6 +4495,7 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4336,6 +4507,12 @@ msgstr "Ververs de speellijst" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Verwijder" @@ -4356,9 +4533,13 @@ msgstr "Geef weer op hoofdscherm" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4401,11 +4582,15 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4490,11 +4675,15 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4534,6 +4723,7 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4549,6 +4739,14 @@ msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4574,6 +4772,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4586,15 +4785,22 @@ msgstr "Selecteer de Staat om te laden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4967,6 +5173,7 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4976,6 +5183,11 @@ msgstr "Ruimte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spaans" @@ -5019,11 +5231,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5059,9 +5275,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5134,9 +5354,13 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -5383,18 +5607,26 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Boven" @@ -5504,6 +5736,7 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5516,6 +5749,8 @@ msgstr "" "Doorgaan?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5739,11 +5974,15 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5774,11 +6013,15 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5811,6 +6054,7 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5820,6 +6064,11 @@ msgstr "Regelafbreking" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 39aa254b51..1da1a68e37 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -558,6 +562,7 @@ msgstr "Dodaj łatkę" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -567,6 +572,11 @@ msgstr "Dodaj nowy panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Dodaj..." @@ -634,6 +644,7 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -641,6 +652,10 @@ msgstr "Pliki GCM" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -728,11 +743,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Czy jesteś pewny by usunąc ten plik? Przepadnie na zawsze!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -753,11 +772,15 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -873,10 +896,14 @@ msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Dół" @@ -909,11 +936,15 @@ msgstr "Szukaj folderu wyjściowego" msgid "Buffer:" msgstr "Bufor:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1114,11 +1145,15 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartę pamięci:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1161,10 +1196,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zamknij" @@ -1273,11 +1312,15 @@ msgstr "Połącz Wiilot 3" msgid "Connect Wiimote 4" msgstr "Połącz Wiilot 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Łączę..." @@ -1393,11 +1436,15 @@ msgstr "Utwórz nową perspektywę" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1474,10 +1521,14 @@ msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1708,11 +1759,15 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualną emulację?" @@ -1741,6 +1796,7 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1756,6 +1812,14 @@ msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Konfiguracja GCPad'a" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1767,11 +1831,15 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1779,11 +1847,15 @@ msgstr "" "Program nie mógł znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglądać pliki..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1859,6 +1931,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1868,6 +1941,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holenderski" @@ -2012,21 +2090,31 @@ msgid "Enable Block Merging" msgstr "Włącz łączenie bloków" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Włącz cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Włącz kody" @@ -2125,11 +2213,15 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2185,6 +2277,7 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2194,6 +2287,11 @@ msgstr "Koniec" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Angielski" @@ -2223,6 +2321,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Błąd" @@ -2240,6 +2339,19 @@ msgid "Error" msgstr "Błąd" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Błąd" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne." @@ -2248,6 +2360,9 @@ msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne." #, c-format msgid "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2697,6 +2812,7 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2706,6 +2822,11 @@ msgstr "Free Look" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francuski" @@ -2773,10 +2894,14 @@ msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamięci GC (*.raw,*.gcp)" @@ -2800,11 +2925,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2813,6 +2943,7 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2822,6 +2953,11 @@ msgstr "Ustawienia ogólne" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Niemiecki" @@ -2951,11 +3087,16 @@ msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -3035,11 +3176,15 @@ msgstr "" "Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3180,11 +3325,15 @@ msgid "" msgstr "" "InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3266,6 +3415,7 @@ msgstr "Newłaściwy plik nagrania" msgid "Invalid state" msgstr "Niewłaściwy stan" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3275,6 +3425,11 @@ msgstr "Niewłaściwy stan" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Włoski" @@ -3432,6 +3587,7 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3445,6 +3601,13 @@ msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3526,11 +3689,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gałka" @@ -3562,10 +3729,14 @@ msgstr "Bajt pamięci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Karta pamięci" @@ -3763,11 +3934,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3854,11 +4029,15 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nie połączono" @@ -3920,9 +4099,13 @@ msgstr "Dostępnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otwórz" @@ -4053,6 +4236,7 @@ msgstr "Patche" msgid "Paths" msgstr "Ścieżki" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4060,6 +4244,10 @@ msgstr "Ścieżki" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4080,12 +4268,17 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Play" @@ -4111,11 +4304,15 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4326,6 +4523,7 @@ msgstr "Odśwież listę" msgid "Refresh game list" msgstr "Odśwież listę gier" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4337,6 +4535,12 @@ msgstr "Odśwież listę gier" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Usuń" @@ -4356,9 +4560,13 @@ msgstr "Generuj w oknie głównym" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4401,11 +4609,15 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4489,11 +4701,15 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Sknauję %s" @@ -4533,6 +4749,7 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4548,6 +4765,14 @@ msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4573,6 +4798,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4585,15 +4811,22 @@ msgstr "Wybierz stan do wczytania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4666,11 +4899,15 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serial Port 1 - Port używany przez urządzenia takie jak net adapter" @@ -4972,6 +5209,7 @@ msgstr "Utworzenie bufora dźwięku nie powiodło się: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4981,6 +5219,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Hiszpański" @@ -5024,11 +5267,15 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5064,9 +5311,13 @@ msgstr "Gałka" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5144,9 +5395,13 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Zrób zdjęcie" @@ -5392,18 +5647,26 @@ msgstr "Przełącz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Przełącz na pełny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Góra" @@ -5512,6 +5775,7 @@ msgstr "Nieznana wiadomość o ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5524,6 +5788,8 @@ msgstr "" "Kontynuować?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5746,11 +6012,15 @@ msgstr "Źródło Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5781,11 +6051,15 @@ msgstr "" "lub zbyt długi czas nieobecności lub coś innego.\n" "Połączyć ponownie?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiilot połączony" @@ -5817,6 +6091,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5826,6 +6101,11 @@ msgstr "Zawijanie wierszy" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Pracuję..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 62025d0da8..89c344c8b5 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -560,6 +564,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -569,6 +574,11 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Adicionar..." @@ -637,6 +647,7 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -644,6 +655,10 @@ msgstr "Todos os ficheiros Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -758,11 +777,15 @@ msgstr "Áudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -879,10 +902,14 @@ msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Inferior" @@ -915,11 +942,15 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1168,10 +1199,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1280,11 +1315,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "A conectar..." @@ -1476,10 +1515,14 @@ msgstr "Motor de Emulador DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1710,11 +1753,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1743,6 +1790,7 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1758,6 +1806,14 @@ msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração de GCPad " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1854,6 +1910,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1863,6 +1920,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandês" @@ -2007,21 +2069,31 @@ msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2177,6 +2249,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2186,6 +2259,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglês" @@ -2215,6 +2293,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2232,6 +2311,19 @@ msgid "Error" msgstr "Erro" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Erro" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2692,6 +2784,7 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2701,6 +2794,11 @@ msgstr "Vista Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francês" @@ -2768,10 +2866,14 @@ msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2795,11 +2897,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2808,6 +2915,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2817,6 +2925,11 @@ msgstr "Definições Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemão" @@ -2947,11 +3060,16 @@ msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3175,11 +3293,15 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3261,6 +3383,7 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3270,6 +3393,11 @@ msgstr "Estado Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3427,6 +3555,7 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3440,6 +3569,13 @@ msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3521,11 +3657,15 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3557,10 +3697,14 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Cartão de memória" @@ -3759,11 +3903,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,11 +3998,15 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -3916,9 +4068,13 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4049,6 +4205,7 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4056,6 +4213,10 @@ msgstr "Caminhos" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4076,12 +4237,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Começar" @@ -4107,11 +4273,15 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4324,6 +4494,7 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4335,6 +4506,12 @@ msgstr "Actualizar lista de Jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Remover" @@ -4354,9 +4531,13 @@ msgstr "Renderizar para a Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4399,11 +4580,15 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4487,11 +4672,15 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4531,6 +4720,7 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4546,6 +4736,14 @@ msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4571,6 +4769,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4583,15 +4782,22 @@ msgstr "Seleccione o estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4972,6 +5178,7 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4981,6 +5188,11 @@ msgstr "Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanhol" @@ -5024,11 +5236,15 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5064,9 +5280,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5144,9 +5364,13 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -5398,18 +5622,26 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topo" @@ -5518,6 +5750,7 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5530,6 +5763,8 @@ msgstr "" "Continuar?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5755,11 +5990,15 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5791,11 +6030,15 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5828,6 +6071,7 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5837,6 +6081,11 @@ msgstr "Moldar o texto" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "A trabalhar..." @@ -6450,6 +6699,9 @@ msgstr "| OU" #~ msgstr "Começar a janela renderizada em ecrã inteiro" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6457,8 +6709,11 @@ msgstr "| OU" #~ "Apontador desconhecido %#08x\n" #~ "Continuar?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 8f2c968751..6dc3dd9b7b 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -8,12 +8,17 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:38-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-09-11 23:35-0300\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-18 13:38-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -563,6 +568,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -572,6 +578,11 @@ msgstr "Adicionar novo painél" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Adicionar..." @@ -639,6 +650,7 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -646,6 +658,10 @@ msgstr "Todos os arquivos Gamecube CGM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -735,11 +751,15 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -760,11 +780,15 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -881,10 +905,14 @@ msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Embaixo" @@ -917,11 +945,15 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1126,11 +1158,15 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1173,10 +1209,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1285,11 +1325,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1406,11 +1450,15 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1485,10 +1533,14 @@ msgstr "Engine de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1719,11 +1771,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1752,6 +1808,7 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1767,6 +1824,14 @@ msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração do GCPad do Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1778,11 +1843,15 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1790,11 +1859,15 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1870,6 +1943,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1879,6 +1953,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandês" @@ -2023,21 +2102,31 @@ msgid "Enable Block Merging" msgstr "Ativar Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2137,11 +2226,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2197,6 +2290,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2206,6 +2300,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglês" @@ -2235,6 +2334,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2252,11 +2352,34 @@ msgid "Error" msgstr "Erro" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Erro" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Common/Src/ChunkFile.h:180 +<<<<<<< HEAD +======= +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +>>>>>>> Update from master branch. #, c-format msgid "" <<<<<<< HEAD @@ -2711,6 +2834,7 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2720,6 +2844,11 @@ msgstr "Olhar Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francês" @@ -2787,10 +2916,14 @@ msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2814,11 +2947,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2827,6 +2965,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2836,6 +2975,11 @@ msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemão" @@ -2967,11 +3111,16 @@ msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Hotkeys" @@ -3051,11 +3200,15 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3199,11 +3352,15 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3285,6 +3442,7 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3294,6 +3452,11 @@ msgstr "Estado Salvo Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3451,6 +3614,7 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3464,6 +3628,13 @@ msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3546,11 +3717,15 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3582,10 +3757,14 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3784,11 +3963,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3875,11 +4058,15 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -3941,9 +4128,13 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4074,6 +4265,7 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4081,6 +4273,10 @@ msgstr "Diretórios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4101,12 +4297,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Executar" @@ -4132,11 +4333,15 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4347,6 +4552,7 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4358,6 +4564,12 @@ msgstr "Atualizar a lista de jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Remover" @@ -4377,9 +4589,13 @@ msgstr "Renderizar na Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4422,11 +4638,15 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4510,11 +4730,15 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4554,6 +4778,7 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4569,6 +4794,14 @@ msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4593,6 +4826,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4605,15 +4839,22 @@ msgstr "Selecione um estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecione um estado para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4687,11 +4928,15 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4998,6 +5243,7 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5007,6 +5253,11 @@ msgstr "Barra de Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanhol" @@ -5050,11 +5301,15 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5090,9 +5345,13 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5170,9 +5429,13 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar Tela" @@ -5421,18 +5684,26 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topo" @@ -5545,6 +5816,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5554,6 +5826,8 @@ msgid "" msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5779,11 +6053,15 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5814,11 +6092,15 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5850,6 +6132,7 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5859,6 +6142,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 02636c4777..31745e4349 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -543,6 +547,7 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -552,6 +557,11 @@ msgstr "Добавить панель" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Добавить..." @@ -606,6 +616,7 @@ msgstr "Все образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Все GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -613,6 +624,10 @@ msgstr "Все GCM-файлы Gamecube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Файлы быстрых сохранений (sav, s##)" @@ -693,11 +708,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение сторон:" @@ -719,11 +738,15 @@ msgstr "Система вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Авто" @@ -839,10 +862,14 @@ msgstr "Синяя справа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "снизу" @@ -875,11 +902,15 @@ msgstr "Укажите папку для сохранения" msgid "Buffer:" msgstr "Буфер:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1114,10 +1145,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Закрыть" @@ -1227,11 +1262,15 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Подключение..." @@ -1418,10 +1457,14 @@ msgstr "Режим эмуляции CPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1637,11 +1680,15 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Вы хотите остановить эмуляцию?" @@ -1671,6 +1718,7 @@ msgstr "Настройки эмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1686,6 +1734,14 @@ msgstr "Настройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Настройки Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1773,6 +1829,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1782,6 +1839,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1910,22 +1972,32 @@ msgid "Enable Block Merging" msgstr "Включить совмещение блоков" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кэшировать" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -2066,6 +2138,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2075,6 +2148,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. #, fuzzy msgid "English" msgstr "English" @@ -2105,6 +2183,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2122,6 +2201,19 @@ msgid "Error" msgstr "Ошибки" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Ошибки" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному." @@ -2556,6 +2648,7 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2565,6 +2658,11 @@ msgstr "Свободный обзор" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. #, fuzzy msgid "French" msgstr "French" @@ -2635,10 +2733,14 @@ msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)" @@ -2660,11 +2762,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2674,6 +2781,7 @@ msgstr "Общие" msgid "General Settings" msgstr "Настройки интерфейса" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2683,6 +2791,11 @@ msgstr "Настройки интерфейса" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. #, fuzzy msgid "German" msgstr "German" @@ -2811,11 +2924,16 @@ msgstr "Настройка \"горячих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Клавиши" @@ -3032,11 +3150,15 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "Устанавливается WAD в меню Wii..." @@ -3121,6 +3243,7 @@ msgstr "Неверный файл записи" msgid "Invalid state" msgstr "Неверное сохранение" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3130,6 +3253,11 @@ msgstr "Неверное сохранение" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3295,20 +3423,28 @@ msgstr "Быстрая &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3392,11 +3528,15 @@ msgstr "Ускорить MMU (спидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3429,10 +3569,14 @@ msgstr "Па&мять" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Карта памяти" @@ -3610,11 +3754,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3703,11 +3851,15 @@ msgstr "Не равно" msgid "Not Set" msgstr "Неизвестно" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Не подключено" @@ -3769,9 +3921,13 @@ msgstr "Доступно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Открыть" @@ -3897,6 +4053,7 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3904,6 +4061,10 @@ msgstr "Папки" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -3925,12 +4086,17 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Запуск" @@ -3958,11 +4124,15 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -4187,6 +4357,7 @@ msgstr "&Обновить список игр" msgid "Refresh game list" msgstr "Обновление списка игр" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4198,6 +4369,12 @@ msgstr "Обновление списка игр" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Удалить" @@ -4217,9 +4394,13 @@ msgstr "Выводить изображение в главное окно" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Сброс настроек" @@ -4262,11 +4443,15 @@ msgstr "Быстрое &сохранение" msgid "Safe" msgstr "безопасное" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. #, fuzzy msgid "Sample Rate:" msgstr "Частота" @@ -4359,11 +4544,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Поиск..." @@ -4403,6 +4592,7 @@ msgstr "Секция %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4418,6 +4608,14 @@ msgstr "Выберите файл для записи игрового проц #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Выберите файл для записи игрового процесса" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл сохранения для импорта" @@ -4444,6 +4642,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл для запуска..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4456,15 +4655,22 @@ msgstr "Выберите файл сохранения для загрузки" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Выберите файл сохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Выберите файл сохранения для загрузки" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Выберите или укажите файл для быстрого сохранения" @@ -4825,6 +5031,7 @@ msgstr "Ошибка создания аудио-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4834,6 +5041,11 @@ msgstr "Пробел" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4871,11 +5083,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4913,9 +5129,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -4988,9 +5208,13 @@ msgstr "Правая панель" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Сделать скриншот" @@ -5236,18 +5460,26 @@ msgstr "Включить все" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Включение полноэкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "сверху" @@ -5351,6 +5583,7 @@ msgstr "Получено неизвестное сообщение с id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5363,6 +5596,8 @@ msgstr "" "Продолжить?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5573,11 +5808,15 @@ msgstr "DVD-диск:" msgid "Wii Save Import" msgstr "Импорт сохранений Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы сохранений Wii (*.bin)|*.bin" @@ -5604,11 +5843,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5644,6 +5887,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Перенос строк" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5653,6 +5897,11 @@ msgstr "Перенос строк" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 098435044b..c90b7828e7 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -512,6 +516,7 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -521,6 +526,11 @@ msgstr "Dodaj nova okna" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Dodaj..." @@ -574,6 +584,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -581,6 +592,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -660,11 +675,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -685,11 +704,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -801,10 +824,14 @@ msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Donji deo/dno" @@ -837,11 +864,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1069,10 +1100,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zatvori" @@ -1181,11 +1216,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Povezivanje..." @@ -1361,10 +1400,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1576,11 +1619,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1610,6 +1657,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1625,6 +1673,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1707,6 +1763,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1716,6 +1773,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1839,21 +1901,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1979,6 +2051,7 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1988,6 +2061,11 @@ msgstr "Kraj" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2017,6 +2095,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2034,6 +2113,19 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2450,6 +2542,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2459,6 +2552,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2527,10 +2625,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2552,11 +2654,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2566,6 +2673,7 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2575,6 +2683,11 @@ msgstr "Opcije Uredjaja " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Nemacki " @@ -2692,11 +2805,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2892,11 +3010,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2974,6 +3096,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2983,6 +3106,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italianski " @@ -3134,20 +3262,28 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3224,11 +3360,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3261,10 +3401,14 @@ msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3441,11 +3585,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3532,11 +3680,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3598,9 +3750,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otvori " @@ -3726,6 +3882,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3733,6 +3890,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3754,12 +3915,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Pokreni " @@ -3786,11 +3952,15 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3998,6 +4168,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4009,6 +4180,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -4025,9 +4202,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -4070,11 +4251,15 @@ msgstr "" msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4158,11 +4343,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4202,6 +4391,7 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4217,6 +4407,14 @@ msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4243,6 +4441,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4255,15 +4454,22 @@ msgstr "Izaberi state za ucitavanje " #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4599,6 +4805,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4608,6 +4815,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4643,11 +4855,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4683,9 +4899,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -4758,9 +4978,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4975,18 +5199,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5088,6 +5320,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5098,6 +5331,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5305,11 +5540,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5336,11 +5575,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5373,6 +5616,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5382,6 +5626,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 331fbb422d..4a55b8ea04 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -540,6 +544,7 @@ msgstr "添加补丁" msgid "Add new pane" msgstr "添加新面板" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -549,6 +554,11 @@ msgstr "添加新面板" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "添加..." @@ -602,6 +612,7 @@ msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -609,6 +620,10 @@ msgstr "所有 Gamecube GCM 文件 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "所有存档状态 (sav, s##)" @@ -689,11 +704,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的要删除这些文件?这将是永久性的删除!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -714,11 +733,15 @@ msgstr "音频后端:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -831,10 +854,14 @@ msgstr "蓝 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "底部" @@ -867,11 +894,15 @@ msgstr "浏览输出目录" msgid "Buffer:" msgstr "缓冲区:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1107,10 +1138,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "关闭" @@ -1220,11 +1255,15 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "连接中..." @@ -1411,10 +1450,14 @@ msgstr "音频模拟引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1634,11 +1677,15 @@ msgstr "按模拟器显示输入读取" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "您确定是否停止当前模拟?" @@ -1668,6 +1715,7 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1683,6 +1731,14 @@ msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 手柄设置" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1766,6 +1822,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1775,6 +1832,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "荷兰语" @@ -1903,22 +1965,32 @@ msgid "Enable Block Merging" msgstr "启用区块合并" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "启用缓存" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "启用作弊" @@ -2053,6 +2125,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2062,6 +2135,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "英语" @@ -2091,6 +2169,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2108,6 +2187,19 @@ msgid "Error" msgstr "错误" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "错误" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2562,6 +2654,7 @@ msgstr "" msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2571,6 +2664,11 @@ msgstr "自由视点" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "法语" @@ -2639,10 +2737,14 @@ msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 内存卡 (*.raw,*.gcp)" @@ -2666,11 +2768,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2680,6 +2787,7 @@ msgstr "常规" msgid "General Settings" msgstr "界面设置" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2689,6 +2797,11 @@ msgstr "界面设置" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "德语" @@ -2811,11 +2924,16 @@ msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "热键" @@ -3025,11 +3143,15 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii 菜单中..." @@ -3114,6 +3236,7 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3123,6 +3246,11 @@ msgstr "Invalid state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "意大利语" @@ -3281,20 +3409,28 @@ msgstr "载入存档插槽 8" msgid "Load State..." msgstr "载入状态..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统菜单(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统菜单(%d %c)" @@ -3375,11 +3511,15 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇杆" @@ -3412,10 +3552,14 @@ msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "内存卡" @@ -3599,11 +3743,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3691,11 +3839,15 @@ msgstr "不等于" msgid "Not Set" msgstr "未设置" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未连接" @@ -3757,9 +3909,13 @@ msgstr "只有 %d 区块有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "打开" @@ -3890,6 +4046,7 @@ msgstr "补丁" msgid "Paths" msgstr "路径" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3897,6 +4054,10 @@ msgstr "路径" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "暂停" @@ -3918,12 +4079,17 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "开始" @@ -3950,11 +4116,15 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "请确认..." @@ -4169,6 +4339,7 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游戏列表" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4180,6 +4351,12 @@ msgstr "刷新游戏列表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "移除" @@ -4199,9 +4376,13 @@ msgstr "附加到主窗口" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "重置" @@ -4244,11 +4425,15 @@ msgstr "保存状态(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "采样率:" @@ -4333,11 +4518,15 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例复制" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫描中..." @@ -4377,6 +4566,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4392,6 +4582,14 @@ msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择要导入的存档" @@ -4418,6 +4616,7 @@ msgstr "选择浮动窗口" msgid "Select the file to load" msgstr "选择要载入的文件" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4430,15 +4629,22 @@ msgstr "选择要载入的状态" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "选择要载入的状态" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "选择要保存的状态" @@ -4787,6 +4993,7 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4796,6 +5003,11 @@ msgstr "空格" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "西班牙语" @@ -4831,11 +5043,15 @@ msgstr "方块键" msgid "Standard Controller" msgstr "标准控制器" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4871,9 +5087,13 @@ msgstr "摇杆" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "停止" @@ -4947,9 +5167,13 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "屏幕截图(&T)" @@ -5186,18 +5410,26 @@ msgstr "切换所有日志类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切换全屏" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "顶部" @@ -5301,6 +5533,7 @@ msgstr "Unknown message received with id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5313,6 +5546,8 @@ msgstr "" "继续?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5523,11 +5758,15 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5558,11 +5797,15 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5595,6 +5838,7 @@ msgstr "窗口右侧" msgid "Word Wrap" msgstr "自动换行" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5604,6 +5848,11 @@ msgstr "自动换行" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index ab270c846f..d171170136 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -540,6 +544,7 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增面版" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -549,6 +554,11 @@ msgstr "新增面版" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "新增..." @@ -615,6 +625,7 @@ msgstr "所有 GC/Wii 映像檔 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -622,6 +633,10 @@ msgstr "所有 Gamecube GCM 檔案 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "所有即時存檔 (sav, s##)" @@ -702,11 +717,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是否真的要刪除這些檔案?刪了之後就回不來了哦!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "畫面比例:" @@ -727,11 +746,15 @@ msgstr "聲音裝置:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon:開啟 AO 裝置出錯。\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -844,10 +867,14 @@ msgstr "藍 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "下方" @@ -880,11 +907,15 @@ msgstr "瀏覽輸出的資料夾" msgid "Buffer:" msgstr "緩衝:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1116,10 +1147,14 @@ msgstr "在遊戲執行時客戶端斷開連接!!網路對戰已經被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "關閉" @@ -1229,11 +1264,15 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "正在連接..." @@ -1419,10 +1458,14 @@ msgstr "DSP 模擬引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (快)" @@ -1642,11 +1685,15 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "您要停止目前的模擬嗎?" @@ -1676,6 +1723,7 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1691,6 +1739,14 @@ msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 控制器設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1774,6 +1830,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1783,6 +1840,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Dutch" @@ -1909,22 +1971,32 @@ msgid "Enable Block Merging" msgstr "開啟塊合併" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "開啟快取" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "開啟作弊" @@ -2056,6 +2128,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2065,6 +2138,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "English" @@ -2094,6 +2172,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2111,6 +2190,19 @@ msgid "Error" msgstr "錯誤" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "錯誤" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀取選擇的語系出錯。返回使用系統預設值。" @@ -2563,6 +2655,7 @@ msgstr "" msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2572,6 +2665,11 @@ msgstr "自由視點" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "French" @@ -2640,10 +2738,14 @@ msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 記憶卡 (*.raw,*.gcp)" @@ -2667,11 +2769,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2681,6 +2788,7 @@ msgstr "一般" msgid "General Settings" msgstr "界面設定" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2690,6 +2798,11 @@ msgstr "界面設定" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "German" @@ -2812,11 +2925,16 @@ msgstr "快捷鍵設定" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "快捷鍵" @@ -3018,11 +3136,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler,但是這個平台尚未支援此功能。" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "正在安裝 WAD 至 Wii 選單..." @@ -3106,6 +3228,7 @@ msgstr "無效的錄像檔" msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3115,6 +3238,11 @@ msgstr "無效的狀態" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italian" @@ -3273,20 +3401,28 @@ msgstr "讀取儲存格 8" msgid "Load State..." msgstr "讀取進度檔..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "讀取 Wii 系統選單 (%d%c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "讀取 Wii 系統選單 (%d%c)" @@ -3367,11 +3503,15 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主搖桿" @@ -3404,10 +3544,14 @@ msgstr "記憶卡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "記憶卡" @@ -3591,11 +3735,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3683,11 +3831,15 @@ msgstr "不相等" msgid "Not Set" msgstr "未設定" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未連接" @@ -3749,9 +3901,13 @@ msgstr "僅 %d 個區塊可用" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "開啟" @@ -3880,6 +4036,7 @@ msgstr "修正" msgid "Paths" msgstr "路徑" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3887,6 +4044,10 @@ msgstr "路徑" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "暫停" @@ -3908,12 +4069,17 @@ msgstr "版式 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "執行" @@ -3940,11 +4106,15 @@ msgstr "選項" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "請確認..." @@ -4158,6 +4328,7 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "更新遊戲列表" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4169,6 +4340,12 @@ msgstr "更新遊戲列表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "移除" @@ -4188,9 +4365,13 @@ msgstr "渲染至主視窗" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "重置" @@ -4233,11 +4414,15 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "取樣率:" @@ -4322,11 +4507,15 @@ msgstr "儲存的影片 %s 是損毀的,影片錄製停止..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4366,6 +4555,7 @@ msgstr "項目 %s 在 SYSCONF 中找不到" msgid "Select" msgstr "選擇" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4381,6 +4571,14 @@ msgstr "選擇已錄製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "選擇已錄製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "選擇要安裝的 Wii WAD" @@ -4406,6 +4604,7 @@ msgstr "選擇浮動視窗" msgid "Select the file to load" msgstr "選擇要讀取的檔案" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4418,15 +4617,22 @@ msgstr "選擇要讀取的進度" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "選擇存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "選擇要讀取的進度" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "選擇要儲存的進度" @@ -4774,6 +4980,7 @@ msgstr "聲音緩衝建立失敗:%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4783,6 +4990,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanish" @@ -4818,11 +5030,15 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4858,9 +5074,13 @@ msgstr "搖桿" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "停止" @@ -4934,9 +5154,13 @@ msgstr "Table 右" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "截取畫面" @@ -5163,18 +5387,26 @@ msgstr "全選/全部取消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切換全螢幕" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "上方" @@ -5278,6 +5510,7 @@ msgstr "接收到帶有未知 id 的錯誤訊息:%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5290,6 +5523,8 @@ msgstr "" "是否繼續?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5500,11 +5735,15 @@ msgstr "DVD 根:" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5535,11 +5774,15 @@ msgstr "" "或閒置的時間太久。\n" "是否要重新連接?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5572,6 +5815,7 @@ msgstr "視窗 右" msgid "Word Wrap" msgstr "自動換行" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5581,6 +5825,11 @@ msgstr "自動換行" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "執行中..."